2006-12-16 11:22:18 +00:00
|
|
|
git-merge-file(1)
|
2006-12-17 08:46:35 +00:00
|
|
|
=================
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2007-01-18 23:53:37 +00:00
|
|
|
git-merge-file - Run a three-way file merge
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
|
|
|
[verse]
|
2008-06-30 06:09:04 +00:00
|
|
|
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
|
2008-06-20 07:17:27 +00:00
|
|
|
[--ours|--theirs] [-p|--stdout] [-q|--quiet]
|
|
|
|
<current-file> <base-file> <other-file>
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2010-01-09 23:33:00 +00:00
|
|
|
'git merge-file' incorporates all changes that lead from the `<base-file>`
|
2006-12-16 11:22:18 +00:00
|
|
|
to `<other-file>` into `<current-file>`. The result ordinarily goes into
|
2010-01-09 23:33:00 +00:00
|
|
|
`<current-file>`. 'git merge-file' is useful for combining separate changes
|
2006-12-16 11:22:18 +00:00
|
|
|
to an original. Suppose `<base-file>` is the original, and both
|
2008-12-09 06:23:51 +00:00
|
|
|
`<current-file>` and `<other-file>` are modifications of `<base-file>`,
|
2010-01-09 23:33:00 +00:00
|
|
|
then 'git merge-file' combines both changes.
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
A conflict occurs if both `<current-file>` and `<other-file>` have changes
|
2010-01-09 23:33:00 +00:00
|
|
|
in a common segment of lines. If a conflict is found, 'git merge-file'
|
2008-12-09 06:23:51 +00:00
|
|
|
normally outputs a warning and brackets the conflict with lines containing
|
|
|
|
<<<<<<< and >>>>>>> markers. A typical conflict will look like this:
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
<<<<<<< A
|
|
|
|
lines in file A
|
|
|
|
=======
|
|
|
|
lines in file B
|
|
|
|
>>>>>>> B
|
|
|
|
|
|
|
|
If there are conflicts, the user should edit the result and delete one of
|
2008-06-20 07:17:27 +00:00
|
|
|
the alternatives. When `--ours` or `--theirs` option is in effect, however,
|
|
|
|
these conflicts are resolved favouring lines from `<current-file>` or
|
|
|
|
lines from `<other-file>` respectively.
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
The exit value of this program is negative on error, and the number of
|
|
|
|
conflicts otherwise. If the merge was clean, the exit value is 0.
|
|
|
|
|
2010-01-09 23:33:00 +00:00
|
|
|
'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it
|
2008-07-03 05:55:07 +00:00
|
|
|
implements all of RCS 'merge''s functionality which is needed by
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git[1].
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
|
|
|
|
OPTIONS
|
|
|
|
-------
|
|
|
|
|
|
|
|
-L <label>::
|
|
|
|
This option may be given up to three times, and
|
|
|
|
specifies labels to be used in place of the
|
|
|
|
corresponding file names in conflict reports. That is,
|
2008-06-30 06:09:04 +00:00
|
|
|
`git merge-file -L x -L y -L z a b c` generates output that
|
2006-12-16 11:22:18 +00:00
|
|
|
looks like it came from files x, y and z instead of
|
|
|
|
from files a, b and c.
|
|
|
|
|
|
|
|
-p::
|
|
|
|
Send results to standard output instead of overwriting
|
|
|
|
`<current-file>`.
|
|
|
|
|
|
|
|
-q::
|
2008-12-09 06:23:51 +00:00
|
|
|
Quiet; do not warn about conflicts.
|
2006-12-16 11:22:18 +00:00
|
|
|
|
2008-06-20 07:17:27 +00:00
|
|
|
--ours::
|
|
|
|
--theirs::
|
|
|
|
Instead of leaving conflicts in the file, resolve conflicts
|
|
|
|
favouring our (or their) side of the lines.
|
|
|
|
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
EXAMPLES
|
|
|
|
--------
|
|
|
|
|
|
|
|
git merge-file README.my README README.upstream::
|
|
|
|
|
|
|
|
combines the changes of README.my and README.upstream since README,
|
|
|
|
tries to merge them and writes the result into README.my.
|
|
|
|
|
|
|
|
git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345::
|
|
|
|
|
|
|
|
merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels
|
|
|
|
`a` and `c` instead of `tmp/a123` and `tmp/c345`.
|
|
|
|
|
|
|
|
|
|
|
|
Author
|
|
|
|
------
|
|
|
|
Written by Johannes Schindelin <johannes.schindelin@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
|
2008-07-03 05:37:18 +00:00
|
|
|
with parts copied from the original documentation of RCS 'merge'.
|
2006-12-16 11:22:18 +00:00
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|