summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:42:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:42:34 -0800
commit6141e0cc00d556a0dd5a2b84c4d92508bfe4ed3b (patch)
tree2bd7261b7aeefeddb6a93a8a7a1d1636f3feec7b /Documentation/git-merge-index.txt
parentMerge branch 'js/ci-squelch-doc-warning' into maint (diff)
parentconvert: fix typo (diff)
downloadtgif-6141e0cc00d556a0dd5a2b84c4d92508bfe4ed3b.tar.xz
Merge branch 'js/convert-typofix' into maint
Typofix. * js/convert-typofix: convert: fix typo
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions