diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:47:01 -0700 |
| commit | b773fc34a0425790db7fe7c6a2d02d742ff41081 (patch) | |
| tree | 27f2e05802b258f82f3ab254f380be9e8e264524 /parse-options.h | |
| parent | 633ce9a3ba973acf19a122e1359b7ae724887d70 (diff) | |
| parent | 049716b370f2cebdbdeb278eb2a8c4eff8ed0acd (diff) | |
| download | git-b773fc34a0425790db7fe7c6a2d02d742ff41081.tar.gz git-b773fc34a0425790db7fe7c6a2d02d742ff41081.tar.xz | |
Merge branch 'jc/branch-merged'
* jc/branch-merged:
branch --merged/--no-merged: allow specifying arbitrary commit
branch --contains: default to HEAD
parse-options: add PARSE_OPT_LASTARG_DEFAULT flag
Conflicts:
Documentation/git-branch.txt
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 c5f0b4b4d..bc317e751 100644 --- a/parse-options.h +++ b/parse-options.h @@ -28,6 +28,7 @@ enum parse_opt_option_flags { PARSE_OPT_NOARG = 2, PARSE_OPT_NONEG = 4, PARSE_OPT_HIDDEN = 8, + PARSE_OPT_LASTARG_DEFAULT = 16, }; struct option; |