diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:24:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 21:24:18 -0700 |
| commit | 78ed88d80a8cc9e2388ebe7631d71253e1d55aab (patch) | |
| tree | 060b4e8f75accc932befb149c66bc8e4fa0bd6e5 /revision.h | |
| parent | c336bc104c47cc9c2f7caf6bce468fe00a8f6850 (diff) | |
| parent | a73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff) | |
| download | git-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.tar.gz git-78ed88d80a8cc9e2388ebe7631d71253e1d55aab.tar.xz | |
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 'revision.h')
| -rw-r--r-- | revision.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/revision.h b/revision.h index cb5ab3513..a95bd0b3f 100644 --- a/revision.h +++ b/revision.h @@ -41,6 +41,10 @@ struct rev_cmdline_info { } *rev; }; +#define REVISION_WALK_WALK 0 +#define REVISION_WALK_NO_WALK_SORTED 1 +#define REVISION_WALK_NO_WALK_UNSORTED 2 + struct rev_info { /* Starting list */ struct commit_list *commits; @@ -62,7 +66,7 @@ struct rev_info { /* Traversal flags */ unsigned int dense:1, prune:1, - no_walk:1, + no_walk:2, show_all:1, remove_empty_trees:1, simplify_history:1, |