summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:58 -0700
commitf382c24ef0331d5b56461cb0c0480b58ae75cf7c (patch)
treef8b1ea94b81b89d64d47315920a6a0f87d08cd44 /Documentation/git-merge-file.txt
parentMerge branch 'nd/config-blame-sort' (diff)
parentconfig: document git config getter return value (diff)
downloadtgif-f382c24ef0331d5b56461cb0c0480b58ae75cf7c.tar.xz
Merge branch 'hn/config-in-code-comment'
Header update. * hn/config-in-code-comment: config: document git config getter return value
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions