author | Junio C Hamano <gitster@pobox.com> | |
Sun, 31 May 2009 23:17:58 +0000 (16:17 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 31 May 2009 23:17:58 +0000 (16:17 -0700) | ||
commit | c6e73936b9ea26fcad0d77d68194545082343c43 | |
tree | 6cc2136936d1c2422205ff63ae4d3da32396ae79 | tree | snapshot |
parent | 919cc4d0688cea6b7c0ed8c515f5907fcd85002c | commit | diff |
parent | 57343652a55bdc3e7f3cf8c6def94dac482c72e5 | commit | diff |
Merge branch 'sb/show-branch-parse-options'
* sb/show-branch-parse-options:
show-branch: migrate to parse-options API
parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
Conflicts:
parse-options.h
* sb/show-branch-parse-options:
show-branch: migrate to parse-options API
parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's
Conflicts:
parse-options.h
parse-options.c | diff1 | | diff2 | | blob | history |
parse-options.h | diff1 | | diff2 | | blob | history |