diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-23 18:42:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-23 18:42:24 -0700 |
| commit | 65360346309a550185363ef5b846a1202175a4e6 (patch) | |
| tree | 446dc992310fb50da71a9b1eb7b00f60ecb1e3cb | |
| parent | Make non-static functions, that may be static, static (diff) | |
| parent | git-checkout: fix command line parsing. (diff) | |
| download | tgif-65360346309a550185363ef5b846a1202175a4e6.tar.xz | |
Merge branch 'maint' into ph/checkout
* maint:
git-checkout: fix command line parsing.
| -rw-r--r-- | builtin-checkout.c | 3 |
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)) |