diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:32 +0900 |
| commit | 974bdb02058a82b57bcfebe184f57ebe74eecac5 (patch) | |
| tree | bc8e05ab280e94161f026f5e0bf533e07693b5db /t/t3032-merge-recursive-space-options.sh | |
| parent | Merge branch 'ds/include-exclude' (diff) | |
| parent | builtin/rebase.c: Remove pointless message (diff) | |
| download | tgif-974bdb02058a82b57bcfebe184f57ebe74eecac5.tar.xz | |
Merge branch 'bw/rebase-autostash-keep-current-branch'
"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
Diffstat (limited to 't/t3032-merge-recursive-space-options.sh')
0 files changed, 0 insertions, 0 deletions