summaryrefslogtreecommitdiff
path: root/mailmap.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:55 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:55 +0900
commit9aefd353804b744e05f253fb196029be620b26c0 (patch)
treea3fc63fb2803a3177958643e11b105ff3a22dcf4 /mailmap.c
parentMerge branch 'ab/range-diff-no-patch' (diff)
parentbuilt-in rebase --autostash: leave the current branch alone if possible (diff)
downloadtgif-9aefd353804b744e05f253fb196029be620b26c0.tar.xz
Merge branch 'js/rebase-autostash-detach-fix'
"git rebase --autostash" did not correctly re-attach the HEAD at times. * js/rebase-autostash-detach-fix: built-in rebase --autostash: leave the current branch alone if possible built-in rebase: demonstrate regression with --autostash
Diffstat (limited to 'mailmap.c')
0 files changed, 0 insertions, 0 deletions