diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:38:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:38:32 -0700 |
| commit | 104d3794481c83f8db00ccf85134fc55c76852f9 (patch) | |
| tree | ddd0c863652be1ecade06d66bca1e8eb5fb37409 /builtin-merge-file.c | |
| parent | Merge branch 'fl/git-pm' (diff) | |
| parent | grep: make callback functions static (diff) | |
| download | tgif-104d3794481c83f8db00ccf85134fc55c76852f9.tar.xz | |
Merge branch 'rs/grep-parseopt'
* rs/grep-parseopt:
grep: make callback functions static
grep: use parseopt
grep: remove global variable builtin_grep
parseopt: add PARSE_OPT_NODASH
parseopt: add OPT_NUMBER_CALLBACK
parseopt: add OPT_NEGBIT
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions