summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-10 22:42:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-10 22:42:55 (GMT)
commitc2b927932d90588e7094100b470b9e94bd769afe (patch)
treeca85ef0330ea4906103141855f79914710b52463 /revision.h
parent1c0712dea8fd927faa49fe494f507d18f0d41264 (diff)
parenta73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff)
downloadgit-c2b927932d90588e7094100b470b9e94bd769afe.zip
git-c2b927932d90588e7094100b470b9e94bd769afe.tar.gz
git-c2b927932d90588e7094100b470b9e94bd769afe.tar.bz2
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 'revision.h')
-rw-r--r--revision.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/revision.h b/revision.h
index cb5ab35..a95bd0b 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,