summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
commit6e67619d0cdc175557ca633dec391d4e795cf965 (patch)
tree4bf38f387e838a3ce2c08ab55e1f617c7d501f20 /Documentation/git-merge-one-file.txt
parentMerge branch 'js/configurable-tab' (diff)
parentupdate-index: migrate to parse-options API (diff)
downloadtgif-6e67619d0cdc175557ca633dec391d4e795cf965.tar.xz
Merge branch 'jn/parse-options-extra'
* jn/parse-options-extra: update-index: migrate to parse-options API setup: save prefix (original cwd relative to toplevel) in startup_info parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION parse-options: allow git commands to invent new option types parse-options: never suppress arghelp if LITERAL_ARGHELP is set parse-options: do not infer PARSE_OPT_NOARG from option type parse-options: sanity check PARSE_OPT_NOARG flag parse-options: move NODASH sanity checks to parse_options_check parse-options: clearer reporting of API misuse parse-options: Don't call parse_options_check() so much
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions