summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-01-13 13:17:15 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-01-13 12:59:15 -0800
commitf5eb87b98dd6aa587683057b9f5bd063e682e145 (patch)
tree6a8efdcf373a731fa660412f0669b5fab564037a /.mailmap
parentGit 2.7 (diff)
downloadtgif-f5eb87b98dd6aa587683057b9f5bd063e682e145.tar.xz
pull: allow interactive rebase with --rebase=interactive
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. The way builtin pull works, this change also supports the value 'interactive' for the 'branch.<name>.rebase' config variable, which is a neat thing because users can now configure given branches for interactively-rebasing pulls without having to type out the complete `--rebase=interactive` option every time they pull. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions