Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: check_cherry_pick should exclude commits already in our history
[gitweb.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 4d266de9ccb9d6881b18162c132ccd8475ca50ee..921b38f18374c20d1f94c0907a629425acb38aa4 100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-8,7
+8,7
@@
git-merge-index - Run a merge for files needing merging
SYNOPSIS
--------
-'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>
\
*)
+'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
-----------