summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 13:01:33 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-20 13:01:33 -0800
commitcae7151e252324e9304d6480a74d89ba7ed9aa8f (patch)
treeecf187f60c344020fdc3925e3d6b293ea784fb64 /Documentation/git-merge-index.txt
parentMerge branch 'maint-1.6.5' into maint (diff)
parentgit-rm doc: Describe how to sync index & work tree (diff)
downloadtgif-cae7151e252324e9304d6480a74d89ba7ed9aa8f.tar.xz
Merge branch 'bg/maint-add-all-doc' into maint
* bg/maint-add-all-doc: git-rm doc: Describe how to sync index & work tree git-add/rm doc: Consistently back-quote Documentation: 'git add -A' can remove files
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions