Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 1 | git-merge-file(1) |
Junio C Hamano | 38477d9 | 2006-12-17 00:46:35 -0800 | [diff] [blame] | 2 | ================= |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | c3f0baa | 2007-01-18 15:53:37 -0800 | [diff] [blame] | 6 | git-merge-file - Run a three-way file merge |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | [verse] |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 12 | 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 13 | [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 14 | [--[no-]diff3] [--object-id] <current> <base> <other> |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 15 | |
| 16 | |
| 17 | DESCRIPTION |
| 18 | ----------- |
Martin Ågren | 8077612 | 2023-11-01 19:24:18 +0000 | [diff] [blame] | 19 | Given three files `<current>`, `<base>` and `<other>`, |
| 20 | 'git merge-file' incorporates all changes that lead from `<base>` |
| 21 | to `<other>` into `<current>`. The result ordinarily goes into |
| 22 | `<current>`. 'git merge-file' is useful for combining separate changes |
| 23 | to an original. Suppose `<base>` is the original, and both |
| 24 | `<current>` and `<other>` are modifications of `<base>`, |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 25 | then 'git merge-file' combines both changes. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 26 | |
Martin Ågren | 8077612 | 2023-11-01 19:24:18 +0000 | [diff] [blame] | 27 | A conflict occurs if both `<current>` and `<other>` have changes |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 28 | in a common segment of lines. If a conflict is found, 'git merge-file' |
Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 29 | normally outputs a warning and brackets the conflict with lines containing |
| 30 | <<<<<<< and >>>>>>> markers. A typical conflict will look like this: |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 31 | |
| 32 | <<<<<<< A |
| 33 | lines in file A |
| 34 | ======= |
| 35 | lines in file B |
| 36 | >>>>>>> B |
| 37 | |
| 38 | If there are conflicts, the user should edit the result and delete one of |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 39 | the alternatives. When `--ours`, `--theirs`, or `--union` option is in effect, |
Martin Ågren | 8077612 | 2023-11-01 19:24:18 +0000 | [diff] [blame] | 40 | however, these conflicts are resolved favouring lines from `<current>`, |
| 41 | lines from `<other>`, or lines from both respectively. The length of the |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 42 | conflict markers can be given with the `--marker-size` option. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 43 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 44 | If `--object-id` is specified, exactly the same behavior occurs, except that |
| 45 | instead of specifying what to merge as files, it is specified as a list of |
| 46 | object IDs referring to blobs. |
| 47 | |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 48 | The exit value of this program is negative on error, and the number of |
Jeff King | e34f802 | 2015-10-28 18:44:21 -0400 | [diff] [blame] | 49 | conflicts otherwise (truncated to 127 if there are more than that many |
| 50 | conflicts). If the merge was clean, the exit value is 0. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 51 | |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 52 | 'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it |
Jonathan Nieder | 2fd02c9 | 2008-07-03 00:55:07 -0500 | [diff] [blame] | 53 | implements all of RCS 'merge''s functionality which is needed by |
Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 54 | linkgit:git[1]. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 55 | |
| 56 | |
| 57 | OPTIONS |
| 58 | ------- |
| 59 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 60 | --object-id:: |
| 61 | Specify the contents to merge as blobs in the current repository instead of |
| 62 | files. In this case, the operation must take place within a valid repository. |
| 63 | + |
| 64 | If the `-p` option is specified, the merged file (including conflicts, if any) |
| 65 | goes to standard output as normal; otherwise, the merged file is written to the |
| 66 | object store and the object ID of its blob is written to standard output. |
| 67 | |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 68 | -L <label>:: |
| 69 | This option may be given up to three times, and |
| 70 | specifies labels to be used in place of the |
| 71 | corresponding file names in conflict reports. That is, |
Jonathan Nieder | b1889c3 | 2008-06-30 01:09:04 -0500 | [diff] [blame] | 72 | `git merge-file -L x -L y -L z a b c` generates output that |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 73 | looks like it came from files x, y and z instead of |
| 74 | from files a, b and c. |
| 75 | |
| 76 | -p:: |
| 77 | Send results to standard output instead of overwriting |
Martin Ågren | 8077612 | 2023-11-01 19:24:18 +0000 | [diff] [blame] | 78 | `<current>`. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 79 | |
| 80 | -q:: |
Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 81 | Quiet; do not warn about conflicts. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 82 | |
Ralf Thielow | 67ed84f | 2013-08-09 20:09:32 +0200 | [diff] [blame] | 83 | --diff3:: |
| 84 | Show conflicts in "diff3" style. |
| 85 | |
Elijah Newren | ddfc44a8 | 2021-12-01 00:05:07 +0000 | [diff] [blame] | 86 | --zdiff3:: |
| 87 | Show conflicts in "zdiff3" style. |
| 88 | |
Junio C Hamano | 73eb40e | 2008-06-20 00:17:27 -0700 | [diff] [blame] | 89 | --ours:: |
| 90 | --theirs:: |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 91 | --union:: |
Junio C Hamano | 73eb40e | 2008-06-20 00:17:27 -0700 | [diff] [blame] | 92 | Instead of leaving conflicts in the file, resolve conflicts |
Bert Wesarg | 3a15048 | 2010-03-01 22:46:28 +0100 | [diff] [blame] | 93 | favouring our (or their or both) side of the lines. |
Junio C Hamano | 73eb40e | 2008-06-20 00:17:27 -0700 | [diff] [blame] | 94 | |
Antonin Delpeuch | 4f7fd79 | 2023-11-20 19:18:52 +0000 | [diff] [blame] | 95 | --diff-algorithm={patience|minimal|histogram|myers}:: |
| 96 | Use a different diff algorithm while merging. The current default is "myers", |
| 97 | but selecting more recent algorithm such as "histogram" can help |
| 98 | avoid mismerges that occur due to unimportant matching lines |
| 99 | (such as braces from distinct functions). See also |
| 100 | linkgit:git-diff[1] `--diff-algorithm`. |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 101 | |
| 102 | EXAMPLES |
| 103 | -------- |
| 104 | |
Jeff King | 5d2fc91 | 2011-08-03 20:13:29 -0600 | [diff] [blame] | 105 | `git merge-file README.my README README.upstream`:: |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 106 | |
| 107 | combines the changes of README.my and README.upstream since README, |
| 108 | tries to merge them and writes the result into README.my. |
| 109 | |
Jeff King | 5d2fc91 | 2011-08-03 20:13:29 -0600 | [diff] [blame] | 110 | `git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`:: |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 111 | |
| 112 | merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels |
| 113 | `a` and `c` instead of `tmp/a123` and `tmp/c345`. |
| 114 | |
brian m. carlson | e1068f0 | 2023-11-01 19:24:19 +0000 | [diff] [blame] | 115 | `git merge-file -p --object-id abc1234 def567 890abcd`:: |
| 116 | |
| 117 | combines the changes of the blob abc1234 and 890abcd since def567, |
| 118 | tries to merge them and writes the result to standard output |
| 119 | |
Johannes Schindelin | 9abaa7f | 2006-12-16 12:22:18 +0100 | [diff] [blame] | 120 | GIT |
| 121 | --- |
Christian Couder | 9e1f0a8 | 2008-06-06 09:07:32 +0200 | [diff] [blame] | 122 | Part of the linkgit:git[1] suite |