summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-19 13:17:56 -0700
commiteae0216646039b203cd60c4294ef79f805fbd696 (patch)
treeb374774c4f0e3c7923123babf06de68e2dfd9188 /builtin/merge-base.c
parentMerge branch 'jc/test-prereq-validate' (diff)
parentrebase -i: redo tasks that die during cherry-pick (diff)
downloadtgif-eae0216646039b203cd60c4294ef79f805fbd696.tar.xz
Merge branch 'ph/rebase-i-redo'
"git rebase -i" moved the "current" command from "todo" to "done" a bit too prematurely, losing a step when a "pick" did not even start. * ph/rebase-i-redo: rebase -i: redo tasks that die during cherry-pick
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions