summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-03 15:35:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-03 15:35:19 -0700
commitc4da6c0b76691c63e3f4aea3f1079b37ac0e6d98 (patch)
tree7b7173e18d6823c743fd58df05144387261347b2 /revision.h
parentMerge branch 'cb/http-multi-curl-auth' into maint (diff)
parentcherry-pick: do not expect file arguments (diff)
downloadtgif-c4da6c0b76691c63e3f4aea3f1079b37ac0e6d98.tar.xz
Merge branch 'cb/cherry-pick-rev-path-confusion' into maint
The command line parser choked "git cherry-pick $name" when $name can be both revision name and a pathname, even though $name can never be a path in the context of the command. By Clemens Buchacher * cb/cherry-pick-rev-path-confusion: cherry-pick: do not expect file arguments
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/revision.h b/revision.h
index b8e9223954..1a0838473f 100644
--- a/revision.h
+++ b/revision.h
@@ -183,6 +183,7 @@ struct setup_revision_opt {
const char *def;
void (*tweak)(struct rev_info *, struct setup_revision_opt *);
const char *submodule;
+ int assume_dashdash;
};
extern void init_revisions(struct rev_info *revs, const char *prefix);