Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge 1.5.5.4 in
[gitweb.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 19ee017aede4bf8fa0a0046b2bf347e3d75c4a12..a0ead2bbf33d7b244ec94e6f7dc06c062e52cb8d 100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-84,4
+84,4
@@
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
GIT
---
-Part of the linkgit:git[
7
] suite
+Part of the linkgit:git[
1
] suite