summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-05-31 16:17:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-05-31 16:17:58 -0700
commitc6e73936b9ea26fcad0d77d68194545082343c43 (patch)
tree6cc2136936d1c2422205ff63ae4d3da32396ae79 /rerere.c
parentMerge branch 'mm/apply-double-slash' (diff)
parentshow-branch: migrate to parse-options API (diff)
downloadtgif-c6e73936b9ea26fcad0d77d68194545082343c43.tar.xz
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
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions