]> granicus.if.org Git - git/commitdiff
projects / git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a3655a bf1e28e)
Merge branch 'bw/rebase-autostash-keep-current-branch' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2019 22:21:51 +0000 (15:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Sep 2019 22:21:51 +0000 (15:21 -0700)
"git rebase --autostash <upstream> <branch>", when <branch> is
different from the current branch, incorrectly moved the tip of the
current branch, which has been corrected.

* bw/rebase-autostash-keep-current-branch:
  builtin/rebase.c: Remove pointless message
  builtin/rebase.c: make sure the active branch isn't moved when autostashing

1  2 
builtin/rebase.c patch | diff1 | diff2 | blob | history

diff --cc builtin/rebase.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.