summaryrefslogtreecommitdiff
path: root/interdiff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-09-30 13:19:32 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-09-30 13:19:32 +0900
commit974bdb02058a82b57bcfebe184f57ebe74eecac5 (patch)
treebc8e05ab280e94161f026f5e0bf533e07693b5db /interdiff.c
parentMerge branch 'ds/include-exclude' (diff)
parentbuiltin/rebase.c: Remove pointless message (diff)
downloadtgif-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 'interdiff.c')
0 files changed, 0 insertions, 0 deletions