summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:32 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:32 -0700
commit6da2d9595161441cbed1b1f579b8dd46970a8e20 (patch)
tree1bde41b69722ae519ed4c29709e6c3f0dc87d1a6 /Documentation/git-merge-one-file.txt
parentMerge branch 'pw/add-p-recount' (diff)
parentcompletion: collapse extra --no-.. options (diff)
downloadtgif-6da2d9595161441cbed1b1f579b8dd46970a8e20.tar.xz
Merge branch 'nd/completion-negation'
Continuing with the idea to programmatically enumerate various pieces of data required for command line completion, the codebase has been taught to enumerate options prefixed with "--no-" to negate them. * nd/completion-negation: completion: collapse extra --no-.. options completion: suppress some -no- options parse-options: option to let --git-completion-helper show negative form
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions