summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-19 20:17:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-19 20:17:56 (GMT)
commiteae0216646039b203cd60c4294ef79f805fbd696 (patch)
treeb374774c4f0e3c7923123babf06de68e2dfd9188 /builtin/merge.c
parent072f391c53cb6845777f01db03d9b06c33ac87e3 (diff)
parent8cbc57ca1109ba455c6098654b7d732a01fd89fd (diff)
downloadgit-eae0216646039b203cd60c4294ef79f805fbd696.zip
git-eae0216646039b203cd60c4294ef79f805fbd696.tar.gz
git-eae0216646039b203cd60c4294ef79f805fbd696.tar.bz2
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.c')
0 files changed, 0 insertions, 0 deletions