development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Document git-merge-cache -o

Browse source
This commit is contained in:
Petr Baudis 2005-05-11 04:49:36 +02:00 committed by Petr Baudis
parent 2a45925180
commit 7ffeb8c24b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Documentation/git-merge-cache.txt
View file

@ -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
--------------