diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-12 12:34:15 -0700 |
| commit | af543833d4e10163af8045859cc081969fa5fcec (patch) | |
| tree | 8d131837c007202fa2e733996c8b5384fe73bde5 /notes-merge.c | |
| parent | Merge branch 'rs/test-ctype' (diff) | |
| parent | apply: use OPT_NOOP_NOARG (diff) | |
| download | tgif-af543833d4e10163af8045859cc081969fa5fcec.tar.xz | |
Merge branch 'jc/parse-options-boolean'
* jc/parse-options-boolean:
apply: use OPT_NOOP_NOARG
revert: use OPT_NOOP_NOARG
parseopt: add OPT_NOOP_NOARG
archive.c: use OPT_BOOL()
parse-options: deprecate OPT_BOOLEAN
Conflicts:
builtin/revert.c
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions