From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Paul Tan <pyokagan@gmail.com>
Subject: [PATCH 0/3] Support `git pull --rebase=interactive`
Date: Tue, 12 Jan 2016 16:22:06 +0100 (CET) [thread overview]
Message-ID: <cover.1452612112.git.johannes.schindelin@gmx.de> (raw)
A couple of years ago, I found the need to collaborate on topic branches
that were rebased all the time, and I really needed to see what I was
rebasing when pulling, so I introduced an interactively-rebasing pull.
This patch series ports that work to the builtin pull.
Johannes Schindelin (3):
Teach 'git pull' to handle --rebase=interactive
Teach 'git remote' that the config var branch.*.rebase can be
'interactive'
completion: add missing branch.*.rebase values
Documentation/config.txt | 1 +
Documentation/git-pull.txt | 4 +++-
builtin/pull.c | 7 ++++++-
builtin/remote.c | 8 ++++++--
contrib/completion/git-completion.bash | 2 +-
t/t5520-pull.sh | 10 ++++++++++
6 files changed, 27 insertions(+), 5 deletions(-)
--
2.6.3.windows.1.300.g1c25e49
next reply other threads:[~2016-01-12 15:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 15:22 Johannes Schindelin [this message]
2016-01-12 15:22 ` [PATCH 1/3] Teach 'git pull' to handle --rebase=interactive Johannes Schindelin
2016-01-12 23:40 ` Junio C Hamano
2016-01-13 6:52 ` Johannes Schindelin
2016-01-12 15:22 ` [PATCH 2/3] Teach 'git remote' that the config var branch.*.rebase can be 'interactive' Johannes Schindelin
2016-01-12 23:53 ` Junio C Hamano
2016-01-13 6:51 ` Johannes Schindelin
2016-01-13 9:42 ` Matthieu Moy
2016-01-13 12:03 ` Johannes Schindelin
2016-01-13 12:24 ` Matthieu Moy
2016-01-13 13:26 ` Johannes Schindelin
2016-01-12 15:22 ` [PATCH 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-12 23:54 ` Junio C Hamano
2016-01-13 6:57 ` [PATCH v2 0/3] Support `git pull --rebase=interactive` Johannes Schindelin
2016-01-13 6:57 ` [PATCH v2 1/3] pull: allow interactive rebase with --rebase=interactive Johannes Schindelin
2016-01-13 10:33 ` Paul Tan
2016-01-13 12:13 ` Johannes Schindelin
2016-01-13 17:36 ` Junio C Hamano
2016-01-13 18:50 ` Johannes Schindelin
2016-01-13 20:58 ` Junio C Hamano
2016-01-13 6:57 ` [PATCH v2 2/3] remote: handle the config setting branch.*.rebase=interactive Johannes Schindelin
2016-01-13 6:57 ` [PATCH v2 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 0/3] Support `git pull --rebase=interactive` Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 1/3] pull: allow interactive rebase with --rebase=interactive Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 2/3] remote: handle the config setting branch.*.rebase=interactive Johannes Schindelin
2016-01-13 12:17 ` [PATCH v3 3/3] completion: add missing branch.*.rebase values Johannes Schindelin
2016-01-13 21:20 ` [PATCH v3 0/3] Support `git pull --rebase=interactive` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1452612112.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).