undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-file: add option to select union merge favor

Browse Source 
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bert Wesarg 2010-03-01 22:46:28 +01:00 committed by Junio C Hamano
parent 11f3aa2305
commit 3a15048d83
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/git-merge-file.txt
View File

@ -10,7 +10,7 @@ SYNOPSIS
-------- --------
[verse] [verse]
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
[--ours|--theirs] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
<current-file> <base-file> <other-file> <current-file> <base-file> <other-file>
@ -35,10 +35,10 @@ normally outputs a warning and brackets the conflict with lines containing
>>>>>>> B >>>>>>> B
If there are conflicts, the user should edit the result and delete one of If there are conflicts, the user should edit the result and delete one of
the alternatives. When `--ours` or `--theirs` option is in effect, however, the alternatives. When `--ours`, `--theirs`, or `--union` option is in effect,
these conflicts are resolved favouring lines from `<current-file>` or however, these conflicts are resolved favouring lines from `<current-file>`,
lines from `<other-file>` respectively. The length of the conflict markers lines from `<other-file>`, or lines from both respectively. The length of the
can be given with the `--marker-size` option. conflict markers can be given with the `--marker-size` option.
The exit value of this program is negative on error, and the number of 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. conflicts otherwise. If the merge was clean, the exit value is 0.
@ -68,8 +68,9 @@ OPTIONS
--ours:: --ours::
--theirs:: --theirs::
--union::
Instead of leaving conflicts in the file, resolve conflicts Instead of leaving conflicts in the file, resolve conflicts
favouring our (or their) side of the lines. favouring our (or their or both) side of the lines.
EXAMPLES EXAMPLES

2
builtin-merge-file.c
View File

@ -36,6 +36,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
XDL_MERGE_FAVOR_OURS), XDL_MERGE_FAVOR_OURS),
OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version", OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version",
XDL_MERGE_FAVOR_THEIRS), XDL_MERGE_FAVOR_THEIRS),
OPT_SET_INT(0, "union", &xmp.favor, "for conflicts, use a union version",
XDL_MERGE_FAVOR_UNION),
OPT_INTEGER(0, "marker-size", &xmp.marker_size, OPT_INTEGER(0, "marker-size", &xmp.marker_size,
"for conflicts, use this marker size"), "for conflicts, use this marker size"),
OPT__QUIET(&quiet), OPT__QUIET(&quiet),