projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] New git-apply test cases for scanning forwards and backwards.
[git.git]
/
Documentation
/
git-merge-cache.txt
diff --git
a/Documentation/git-merge-cache.txt
b/Documentation/git-merge-cache.txt
index
3fb4d49
..
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
--------
SYNOPSIS
--------
-'git-merge-cache' [-o] <merge-program> (-a | -- | <file>\*)
+'git-merge-cache' [-o]
[-q]
<merge-program> (-a | -- | <file>\*)
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-21,7
+21,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
--::
OPTIONS
-------
--::
- Interpret all f
uture
arguments as filenames.
+ Interpret all f
ollowing
arguments as filenames.
-a::
Run merge against all files in the cache that need merging.
-a::
Run merge against all files in the cache that need merging.
@@
-32,6
+32,11
@@
OPTIONS
returned errors, and only return the error code after all the
merges are over.
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.
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
the RCS package.
A sample script called "git-merge-one-file-script" is included in the
-ditribution.
+di
s
tribution.
ALERT ALERT ALERT! The git "merge object order" is different from the
RCS "merge" program merge object order. In the above ordering, the
ALERT ALERT ALERT! The git "merge object order" is different from the
RCS "merge" program merge object order. In the above ordering, the