tokkee.org
Code
projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/gitk/gitk
[git.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index b726ddfe125f54986dad4c0f19c53d657de082b5..5d816d0d8b02222517cd4bf320dc3d345fb8d94b 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
gitlink
:git[7] suite
+Part of the
linkgit
:git[7] suite