summaryrefslogtreecommitdiff
path: root/builtin/help.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-28 14:47:57 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-28 14:47:57 +0900
commit4da3e234f5a3989328c4dc8368cf5906f8679b30 (patch)
tree23d86e9fdcd61fc73422c9efc8e35eb8c959d3b3 /builtin/help.c
parentMerge branch 'ks/doc-use-camelcase-for-config-name' (diff)
parentmerge-strategies: avoid implying that "-s theirs" exists (diff)
downloadtgif-4da3e234f5a3989328c4dc8368cf5906f8679b30.tar.xz
Merge branch 'jc/merge-x-theirs-docfix'
The documentation for '-X<option>' for merges was misleadingly written to suggest that "-s theirs" exists, which is not the case. * jc/merge-x-theirs-docfix: merge-strategies: avoid implying that "-s theirs" exists
Diffstat (limited to 'builtin/help.c')
0 files changed, 0 insertions, 0 deletions