diff options
author | Ben Wijen <ben@wijen.net> | 2019-08-30 17:16:05 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-09-07 10:17:05 -0700 |
commit | d2172ef02dee468b85bc4567332cbf58cd6b4b0a (patch) | |
tree | 540c247acc482e67a82b8cde319c05c319adc420 /Documentation/config/guitool.txt | |
parent | Git 2.23 (diff) | |
download | tgif-d2172ef02dee468b85bc4567332cbf58cd6b4b0a.tar.xz |
builtin/rebase.c: make sure the active branch isn't moved when autostashing
Consider the following scenario:
git checkout not-the-master
work work work
git rebase --autostash upstream master
Here 'rebase --autostash <upstream> <branch>' incorrectly moves the
active branch (not-the-master) to master (before the rebase).
The expected behavior: (58794775:/git-rebase.sh:526)
AUTOSTASH=$(git stash create autostash)
git reset --hard
git checkout master
git rebase upstream
git stash apply $AUTOSTASH
The actual behavior: (6defce2b:/builtin/rebase.c:1062)
AUTOSTASH=$(git stash create autostash)
git reset --hard master
git checkout master
git rebase upstream
git stash apply $AUTOSTASH
This commit reinstates the 'legacy script' behavior as introduced with
58794775: rebase: implement --[no-]autostash and rebase.autostash
Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config/guitool.txt')
0 files changed, 0 insertions, 0 deletions