diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:42:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 15:42:55 -0700 |
| commit | c2b927932d90588e7094100b470b9e94bd769afe (patch) | |
| tree | ca85ef0330ea4906103141855f79914710b52463 /builtin/revert.c | |
| parent | 1c0712dea8fd927faa49fe494f507d18f0d41264 (diff) | |
| parent | a73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff) | |
| download | git-c2b927932d90588e7094100b470b9e94bd769afe.tar.gz | |
Merge branch 'mz/cherry-pick-cmdline-order'
"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
Diffstat (limited to 'builtin/revert.c')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 17dc8c8d1e..c5e36b94c0 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -195,7 +195,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) struct setup_revision_opt s_r_opt; opts->revs = xmalloc(sizeof(*opts->revs)); init_revisions(opts->revs, NULL); - opts->revs->no_walk = 1; + opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; if (argc < 2) usage_with_options(usage_str, options); memset(&s_r_opt, 0, sizeof(s_r_opt)); |