Merge branch 'mz/cherry-pick-cmdline-order' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:24:18 +0000 (21:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 04:24:18 +0000 (21:24 -0700)
* 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
revision.c
revision.h
t/t4202-log.sh

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