diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:33:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 22:33:51 -0700 |
| commit | ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9 (patch) | |
| tree | b868ef92c090819f91ced2de2c179f40030934ae /parse-options.h | |
| parent | b85997d14d1873a4baa3d04966cd5947e6134acd (diff) | |
| parent | 3000658f7c15c880f976aac0ade73efd3b1e9790 (diff) | |
| download | git-ae90e16a3a7586bc25b7c7de50e4c3ba4806b3b9.tar.gz | |
Merge branch 'js/remote'
* js/remote:
"remote update": print remote name being fetched from
builtin remote rm: remove symbolic refs, too
remote: fix "update [group...]"
remote show: Clean up connection correctly if object fetch wasn't done
builtin-remote: prune remotes correctly that were added with --mirror
Make git-remote a builtin
Test "git remote show" and "git remote prune"
parseopt: add flag to stop on first non option
path-list: add functions to work with unsorted lists
Conflicts:
parse-options.c
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index dc0807834f..1af62b0485 100644 --- a/parse-options.h +++ b/parse-options.h @@ -19,6 +19,7 @@ enum parse_opt_type { enum parse_opt_flags { PARSE_OPT_KEEP_DASHDASH = 1, + PARSE_OPT_STOP_AT_NON_OPTION = 2, }; enum parse_opt_option_flags { |