summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-23 18:42:24 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-23 18:42:24 -0700
commit65360346309a550185363ef5b846a1202175a4e6 (patch)
tree446dc992310fb50da71a9b1eb7b00f60ecb1e3cb /builtin-checkout.c
parent186458b11b090835fa793bcdbf6b5552b053276c (diff)
parentf5242ebf0dcd858ae9c72f39aed9773696d7283d (diff)
downloadgit-65360346309a550185363ef5b846a1202175a4e6.tar.gz
Merge branch 'maint' into ph/checkout
* maint: git-checkout: fix command line parsing.
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index fbd5105a83..9cadf9c299 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -438,7 +438,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)
opts.track = git_branch_track;
- argc = parse_options(argc, argv, options, checkout_usage, 0);
+ argc = parse_options(argc, argv, options, checkout_usage,
+ PARSE_OPT_KEEP_DASHDASH);
if (argc) {
arg = argv[0];
if (get_sha1(arg, rev))