summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-11-22 11:15:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-22 21:33:01 (GMT)
commitdffc86002862753376e31a16a1c1c0306716fbe6 (patch)
treec098a98940bf752949aa942d1e8d722a0dd9451f /merge-file.h
parentf80a87262aa4468b0941d38deffdb97a757307c5 (diff)
downloadgit-dffc86002862753376e31a16a1c1c0306716fbe6.zip
git-dffc86002862753376e31a16a1c1c0306716fbe6.tar.gz
git-dffc86002862753376e31a16a1c1c0306716fbe6.tar.bz2
revert: rearrange pick_revisions() for clarity
Deal completely with "cherry-pick --quit" and --continue at the beginning of pick_revisions(), leaving the rest of the function for the more interesting "git cherry-pick <commits>" case. No functional change intended. The impact is just to unindent the code a little. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions