summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-15 04:24:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-15 04:24:18 (GMT)
commit78ed88d80a8cc9e2388ebe7631d71253e1d55aab (patch)
tree060b4e8f75accc932befb149c66bc8e4fa0bd6e5 /builtin/log.c
parentc336bc104c47cc9c2f7caf6bce468fe00a8f6850 (diff)
parenta73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff)
downloadgit-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.zip
git-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.tar.gz
git-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.tar.bz2
Merge branch 'mz/cherry-pick-cmdline-order' into maint
* 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
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index c22469c..dff7921 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -456,7 +456,7 @@ int cmd_show(int argc, const char **argv, const char *prefix)
init_revisions(&rev, prefix);
rev.diff = 1;
rev.always_show_header = 1;
- rev.no_walk = 1;
+ rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
rev.diffopt.stat_width = -1; /* Scale to real terminal size */
memset(&opt, 0, sizeof(opt));