From bbd14cb0113ca26d679970f4db9ad953fb273e36 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Fri, 29 Jul 2005 14:53:38 +0200 Subject: [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 Signed-off-by: Junio C Hamano --- Documentation/git-merge-cache.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-merge-cache.txt b/Documentation/git-merge-cache.txt index 3fb4d492b..f1fbb5dde 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] (-a | -- | \*) +'git-merge-cache' [-o] [-q] (-a | -- | \*) 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 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 -- cgit v1.2.1