projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with gitk
[git.git]
/
Documentation
/
git-merge-cache.txt
diff --git
a/Documentation/git-merge-cache.txt
b/Documentation/git-merge-cache.txt
index
f1fbb5d
..
bd3c9ca
100644
(file)
--- a/
Documentation/git-merge-cache.txt
+++ b/
Documentation/git-merge-cache.txt
@@
-21,7
+21,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
--::
- Interpret all f
uture
arguments as filenames.
+ Interpret all f
ollowing
arguments as filenames.
-a::
Run merge against all files in the cache that need merging.