aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-cache.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-merge-cache.txt')
-rw-r--r--Documentation/git-merge-cache.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt
index f1fbb5dde..bd3c9ca75 100644
--- 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 future arguments as filenames.
+ Interpret all following arguments as filenames.
-a::
Run merge against all files in the cache that need merging.