summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2005-07-29 12:53:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-01 22:20:14 (GMT)
commitbbd14cb0113ca26d679970f4db9ad953fb273e36 (patch)
tree2e95edc112e7e6254ba6f817887dc94acbcdf370 /Documentation
parent4d8fa916c9ff89613234f41b9222a2b679bce5c3 (diff)
downloadgit-bbd14cb0113ca26d679970f4db9ad953fb273e36.zip
git-bbd14cb0113ca26d679970f4db9ad953fb273e36.tar.gz
git-bbd14cb0113ca26d679970f4db9ad953fb273e36.tar.bz2
[PATCH] git-merge-cache -q doesn't complain about failing merge program
git-merge-cache reporting failed merge program is undesirable for Cogito, since it emits its own more appropriate error message in that case. However, I want to show other possible git-merge-cache error messages. So -q will just silence this particular error. Signed-off-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-merge-cache.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt
index 3fb4d49..f1fbb5d 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' [-o] <merge-program> (-a | -- | <file>\*)
+'git-merge-cache' [-o] [-q] <merge-program> (-a | -- | <file>\*)
DESCRIPTION
-----------
@@ -32,6 +32,11 @@ OPTIONS
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.
@@ -40,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