[PATCH 0/3] Support `git pull --rebase=interactive`
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 12, 2016, 15:22 UTC
- Message-ID
- <cover.1452612112.git.johannes.schindelin@gmx.de>
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 valuesDocumentation/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