Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rename --exec to --upload-pack for fetch-pack and peek-remote
[gitweb.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 0cf505ea84d231e4e4997676d4169c5c5c7dd9f9..b8ee1ff2b0681ea9fbc83618b1d09d95f3a902ff 100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-3,7
+3,7
@@
git-merge-index(1)
NAME
----
-git-merge-index - Run
s
a merge for files needing merging
+git-merge-index - Run a merge for files needing merging
SYNOPSIS