summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:10:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-02-27 10:10:28 -0800
commit443d803e0dacd0a1c6700503689f3cd95751aba1 (patch)
tree8e876ee7fd8896ce98cf6b2abff856be63f71749 /Documentation/git-merge-index.txt
parentMerge branch 'mh/maint-ceil-absolute' (diff)
parentUpdate draft release notes to 1.8.1.5 (diff)
downloadtgif-443d803e0dacd0a1c6700503689f3cd95751aba1.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.8.1.5 Documentation/submodule: Add --force to update synopsis
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions