]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mz/cherry-pick-cmdline-order'
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:54 +0000 (15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Sep 2012 22:42:55 +0000 (15:42 -0700)
"git cherry-pick A C B" used to replay changes in A and then B and
then C if these three commits had committer timestamps in that
order, which is not what the user who said "A C B" naturally expects.

* mz/cherry-pick-cmdline-order:
  cherry-pick/revert: respect order of revisions to pick
  demonstrate broken 'git cherry-pick three one two'
  teach log --no-walk=unsorted, which avoids sorting

1  2 
Documentation/rev-list-options.txt
builtin/log.c
builtin/revert.c
revision.c
revision.h
sequencer.c
t/t4202-log.sh

Simple merge
diff --cc builtin/log.c
Simple merge
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc t/t4202-log.sh
Simple merge