| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 1 | git-fmt-merge-msg(1) |
| 2 | ==================== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-fmt-merge-msg - Produce a merge commit message |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| Matthias Kestenholz | e448ff8 | 2007-05-18 15:39:33 +0200 | [diff] [blame] | 11 | [verse] |
| Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 12 | 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] <$GIT_DIR/FETCH_HEAD |
| 13 | 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file> |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 14 | |
| 15 | DESCRIPTION |
| 16 | ----------- |
| 17 | Takes the list of merged objects on stdin and produces a suitable |
| 18 | commit message to be used for the merge commit, usually to be |
| Thomas Rast | 0b444cd | 2010-01-10 00:33:00 +0100 | [diff] [blame] | 19 | passed as the '<merge-message>' argument of 'git merge'. |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 20 | |
| Jonathan Nieder | 0f8a02c | 2009-10-09 05:16:15 -0500 | [diff] [blame] | 21 | This command is intended mostly for internal use by scripts |
| 22 | automatically invoking 'git merge'. |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 23 | |
| Andrew Ruder | 2bc060c | 2007-04-26 23:58:57 -0500 | [diff] [blame] | 24 | OPTIONS |
| 25 | ------- |
| 26 | |
| Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 27 | --log[=<n>]:: |
| Andrew Ruder | 2bc060c | 2007-04-26 23:58:57 -0500 | [diff] [blame] | 28 | In addition to branch names, populate the log message with |
| 29 | one-line descriptions from the actual commits that are being |
| Ramkumar Ramachandra | 96e9420 | 2010-09-08 23:29:54 +0530 | [diff] [blame] | 30 | merged. At most <n> commits from each merge parent will be |
| 31 | used (20 if <n> is omitted). This overrides the `merge.log` |
| 32 | configuration variable. |
| Andrew Ruder | 2bc060c | 2007-04-26 23:58:57 -0500 | [diff] [blame] | 33 | |
| SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 34 | --no-log:: |
| Andrew Ruder | 2bc060c | 2007-04-26 23:58:57 -0500 | [diff] [blame] | 35 | Do not list one-line descriptions from the actual commits being |
| 36 | merged. |
| 37 | |
| Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 38 | --summary:: |
| 39 | --no-summary:: |
| SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 40 | Synonyms to --log and --no-log; these are deprecated and will be |
| 41 | removed in the future. |
| 42 | |
| Jonathan Nieder | 2102440 | 2010-08-17 18:00:34 -0500 | [diff] [blame] | 43 | -m <message>:: |
| 44 | --message <message>:: |
| 45 | Use <message> instead of the branch names for the first line |
| 46 | of the log message. For use with `--log`. |
| 47 | |
| Stephan Beyer | 3240240 | 2008-06-08 03:36:09 +0200 | [diff] [blame] | 48 | -F <file>:: |
| 49 | --file <file>:: |
| Andrew Ruder | 2bc060c | 2007-04-26 23:58:57 -0500 | [diff] [blame] | 50 | Take the list of merged objects from <file> instead of |
| 51 | stdin. |
| 52 | |
| 53 | CONFIGURATION |
| 54 | ------------- |
| 55 | |
| Junio C Hamano | 8c80ff3 | 2012-02-23 11:20:15 -0800 | [diff] [blame] | 56 | merge.branchdesc:: |
| 57 | In addition to branch names, populate the log message with |
| 58 | the branch description text associated with them. Defaults |
| 59 | to false. |
| 60 | |
| SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 61 | merge.log:: |
| Ramkumar Ramachandra | bda3b8f | 2010-09-08 23:29:55 +0530 | [diff] [blame] | 62 | In addition to branch names, populate the log message with at |
| 63 | most the specified number of one-line descriptions from the |
| 64 | actual commits that are being merged. Defaults to false, and |
| Ralf Wildenhues | 469bfc9 | 2011-01-03 20:03:34 +0100 | [diff] [blame] | 65 | true is a synonym for 20. |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 66 | |
| SZEDER Gábor | 6cd9cfe | 2008-04-06 03:23:45 +0200 | [diff] [blame] | 67 | merge.summary:: |
| 68 | Synonym to `merge.log`; this is deprecated and will be removed in |
| 69 | the future. |
| 70 | |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 71 | SEE ALSO |
| 72 | -------- |
| Dan McGee | 5162e69 | 2007-12-29 00:20:38 -0600 | [diff] [blame] | 73 | linkgit:git-merge[1] |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 74 | |
| Petr Baudis | 3c64314 | 2005-11-01 21:45:55 +0100 | [diff] [blame] | 75 | GIT |
| 76 | --- |
| Christian Couder | 9e1f0a8 | 2008-06-06 09:07:32 +0200 | [diff] [blame] | 77 | Part of the linkgit:git[1] suite |
