summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2005-05-11 02:49:36 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-11 02:49:36 (GMT)
commit7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a (patch)
treea5f8a0d3792dfc03b96e0a9240f8fe32de7e6748 /Documentation
parent2a45925180152b3e54248de4d7f69e8cc5c4051f (diff)
downloadgit-7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a.zip
git-7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a.tar.gz
git-7ffeb8c24bb3eb83bf39e9d0348899f7f8178b2a.tar.bz2
Document git-merge-cache -o
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-merge-cache.txt9
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt
index 343607c..3fb4d49 100644
--- 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] <merge-program> (-a | -- | <file>\*)
DESCRIPTION
-----------
@@ -26,6 +26,12 @@ OPTIONS
-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.
+
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.
@@ -66,6 +72,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
--------------