summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-02 00:45:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-02 00:45:59 (GMT)
commit142c945e6e6d944aff4187c55c3655d9608ca376 (patch)
tree42df0d87177a5dc119f5f184c19343ccede81605 /Documentation/git-merge-index.txt
parent6acef043581d69597860f3343ec2691c72b0803c (diff)
parent094574b32b799af01e5c0e0a44c2f41eb4a3f671 (diff)
downloadgit-142c945e6e6d944aff4187c55c3655d9608ca376.zip
git-142c945e6e6d944aff4187c55c3655d9608ca376.tar.gz
git-142c945e6e6d944aff4187c55c3655d9608ca376.tar.bz2
Merge branch 'maint'
* maint: docs: fix filter-branch subdir example for exotic repo names
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions