Junio C Hamano | 215a7ad | 2005-09-07 17:26:23 -0700 | [diff] [blame] | 1 | git-merge-index(1) |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 2 | ================== |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 3 | |
| 4 | NAME |
| 5 | ---- |
Junio C Hamano | c3f0baa | 2007-01-18 15:53:37 -0800 | [diff] [blame] | 6 | git-merge-index - Run a merge for files needing merging |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
Martin von Zweigbergk | 7791a1d | 2011-07-01 22:38:26 -0400 | [diff] [blame] | 11 | [verse] |
Jean-Noël Avila | a443b76 | 2021-11-06 19:48:54 +0100 | [diff] [blame] | 12 | 'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) ) |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 13 | |
| 14 | DESCRIPTION |
| 15 | ----------- |
Lukas_Sandström | 5f3aa19 | 2005-11-11 02:12:27 +0100 | [diff] [blame] | 16 | This looks up the <file>(s) in the index and, if there are any merge |
Thomas Ackermann | d5fa1f1 | 2013-04-15 19:49:04 +0200 | [diff] [blame] | 17 | entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 18 | argument if no file), and <file> as argument 4. File modes for the three |
| 19 | files are passed as arguments 5, 6 and 7. |
| 20 | |
| 21 | OPTIONS |
| 22 | ------- |
sean | e994004 | 2006-05-05 15:05:24 -0400 | [diff] [blame] | 23 | \--:: |
Nikolai Weibull | 16cc50d | 2005-12-09 00:28:05 +0100 | [diff] [blame] | 24 | Do not interpret any more arguments as options. |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 25 | |
| 26 | -a:: |
Lukas_Sandström | 5f3aa19 | 2005-11-11 02:12:27 +0100 | [diff] [blame] | 27 | Run merge against all files in the index that need merging. |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 28 | |
Petr Baudis | 7ffeb8c | 2005-05-11 04:49:36 +0200 | [diff] [blame] | 29 | -o:: |
| 30 | Instead of stopping at the first failed merge, do all of them |
| 31 | in one shot - continue with merging even when previous merges |
| 32 | returned errors, and only return the error code after all the |
Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 33 | merges. |
Petr Baudis | 7ffeb8c | 2005-05-11 04:49:36 +0200 | [diff] [blame] | 34 | |
Petr Baudis | bbd14cb | 2005-07-29 14:53:38 +0200 | [diff] [blame] | 35 | -q:: |
Ralf Wildenhues | 29b802a | 2008-12-09 07:23:51 +0100 | [diff] [blame] | 36 | Do not complain about a failed merge program (a merge program |
| 37 | failure usually indicates conflicts during the merge). This is for |
Petr Baudis | bbd14cb | 2005-07-29 14:53:38 +0200 | [diff] [blame] | 38 | porcelains which might want to emit custom messages. |
| 39 | |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 40 | If 'git merge-index' is called with multiple <file>s (or -a) then it |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 41 | processes them in turn only stopping if merge returns a non-zero exit |
| 42 | code. |
| 43 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 44 | Typically this is run with a script calling Git's imitation of |
Jonathan Nieder | 0979c10 | 2008-07-03 00:37:18 -0500 | [diff] [blame] | 45 | the 'merge' command from the RCS package. |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 46 | |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 47 | A sample script called 'git merge-one-file' is included in the |
Petr Baudis | bbd14cb | 2005-07-29 14:53:38 +0200 | [diff] [blame] | 48 | distribution. |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 49 | |
Thomas Ackermann | 2de9b71 | 2013-01-21 20:17:53 +0100 | [diff] [blame] | 50 | ALERT ALERT ALERT! The Git "merge object order" is different from the |
Jonathan Nieder | 2fd02c9 | 2008-07-03 00:55:07 -0500 | [diff] [blame] | 51 | RCS 'merge' program merge object order. In the above ordering, the |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 52 | original is first. But the argument order to the 3-way merge program |
Jonathan Nieder | 2fd02c9 | 2008-07-03 00:55:07 -0500 | [diff] [blame] | 53 | 'merge' is to have the original in the middle. Don't ask me why. |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 54 | |
| 55 | Examples: |
| 56 | |
Martin Ågren | b7e1ba5 | 2019-09-07 16:12:52 +0200 | [diff] [blame] | 57 | ---- |
| 58 | torvalds@ppc970:~/merge-test> git merge-index cat MM |
| 59 | This is MM from the original tree. # original |
| 60 | This is modified MM in the branch A. # merge1 |
| 61 | This is modified MM in the branch B. # merge2 |
| 62 | This is modified MM in the branch B. # current contents |
| 63 | ---- |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 64 | |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 65 | or |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 66 | |
Martin Ågren | b7e1ba5 | 2019-09-07 16:12:52 +0200 | [diff] [blame] | 67 | ---- |
| 68 | torvalds@ppc970:~/merge-test> git merge-index cat AA MM |
| 69 | cat: : No such file or directory |
| 70 | This is added AA in the branch A. |
| 71 | This is added AA in the branch B. |
| 72 | This is added AA in the branch B. |
| 73 | fatal: merge program failed |
| 74 | ---- |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 75 | |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 76 | where the latter example shows how 'git merge-index' will stop trying to |
Jonathan Nieder | 483bc4f | 2008-06-30 13:56:34 -0500 | [diff] [blame] | 77 | merge once anything has returned an error (i.e., `cat` returned an error |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 78 | for the AA file, because it didn't exist in the original, and thus |
Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 79 | 'git merge-index' didn't even try to merge the MM thing). |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 80 | |
David Greaves | 2cf565c | 2005-05-10 22:32:30 +0100 | [diff] [blame] | 81 | GIT |
| 82 | --- |
Christian Couder | 9e1f0a8 | 2008-06-06 09:07:32 +0200 | [diff] [blame] | 83 | Part of the linkgit:git[1] suite |