[PATCH] New git-apply test cases for patches with mulitple fragments.

[git.git] / Documentation / git-merge-cache.txt

diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt
index 343607c..bd3c9ca 100644 (file)
--- a/Documentation/git-merge-cache.txt
+++ b/Documentation/git-merge-cache.txt
@@ -9,7 +9,7 @@ git-merge-cache - Runs a merge for files needing merging
 
 SYNOPSIS
 --------
-'git-merge-cache' <merge-program> (-a | -- | <file>\*) 
+'git-merge-cache' [-o] [-q] <merge-program> (-a | -- | <file>\*) 
 
 DESCRIPTION
 -----------
@@ -21,11 +21,22 @@ 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.
 
+-o::
+       Instead of stopping at the first failed merge, do all of them
+       in one shot - continue with merging even when previous merges
+       returned errors, and only return the error code after all the
+       merges are over.
+
+-q::
+       Do not complain about failed merge program (the merge program
+       failure usually indicates conflicts during merge). This is for
+       porcelains which might want to emit custom messages.
+
 If "git-merge-cache" is called with multiple <file>s (or -a) then it
 processes them in turn only stopping if merge returns a non-zero exit
 code.
@@ -34,7 +45,7 @@ Typically this is run with the a script calling the merge command from
 the RCS package.
 
 A sample script called "git-merge-one-file-script" is included in the
-ditribution.
+distribution.
 
 ALERT ALERT ALERT! The git "merge object order" is different from the
 RCS "merge" program merge object order. In the above ordering, the
@@ -66,6 +77,7 @@ for the AA file, because it didn't exist in the original, and thus
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>
+One-shot merge by Petr Baudis <pasky@ucw.cz>
 
 Documentation
 --------------