Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Make do_each_ref() follow symlinks.
[gitweb.git]
/
Documentation
/
git-merge-cache.txt
diff --git
a/Documentation/git-merge-cache.txt
b/Documentation/git-merge-cache.txt
index f1fbb5ddec3d37dbeff1d0b89ba61dfea8915350..bd3c9ca75f4267a32a8efc852bbfc97b3f06db9d 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.