projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix filename verification when in a subdirectory
[git.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index
6030642
..
fbc986a
100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-20,7
+20,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
--::
-
Interpret all following arguments as filename
s.
+
Do not interpret any more arguments as option
s.
-a::
Run merge against all files in the index that need merging.