| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [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 | -------- |
| Junio C Hamano | a9b8d24 | 2007-05-19 04:51:55 | [diff] [blame] | 11 | [verse] |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame^] | 12 | 'git fmt-merge-msg' [--log | --no-log] <$GIT_DIR/FETCH_HEAD |
| 13 | 'git fmt-merge-msg' [--log | --no-log] -F <file> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [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 |
| 19 | passed as the '<merge-message>' argument of `git-merge`. |
| 20 | |
| 21 | This script is intended mostly for internal use by scripts |
| 22 | automatically invoking `git-merge`. |
| 23 | |
| Junio C Hamano | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 24 | OPTIONS |
| 25 | ------- |
| 26 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 27 | --log:: |
| Junio C Hamano | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 28 | In addition to branch names, populate the log message with |
| 29 | one-line descriptions from the actual commits that are being |
| 30 | merged. |
| 31 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 32 | --no-log:: |
| Junio C Hamano | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 33 | Do not list one-line descriptions from the actual commits being |
| 34 | merged. |
| 35 | |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 36 | --summary:: |
| 37 | --no-summary:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 38 | Synonyms to --log and --no-log; these are deprecated and will be |
| 39 | removed in the future. |
| 40 | |
| Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 41 | -F <file>:: |
| 42 | --file <file>:: |
| Junio C Hamano | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 43 | Take the list of merged objects from <file> instead of |
| 44 | stdin. |
| 45 | |
| 46 | CONFIGURATION |
| 47 | ------------- |
| 48 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 49 | merge.log:: |
| Junio C Hamano | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 50 | Whether to include summaries of merged commits in newly |
| 51 | merge commit messages. False by default. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 52 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 53 | merge.summary:: |
| 54 | Synonym to `merge.log`; this is deprecated and will be removed in |
| 55 | the future. |
| 56 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 57 | SEE ALSO |
| 58 | -------- |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 59 | linkgit:git-merge[1] |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 60 | |
| 61 | |
| 62 | Author |
| 63 | ------ |
| 64 | Written by Junio C Hamano <junkio@cox.net> |
| 65 | |
| 66 | Documentation |
| 67 | -------------- |
| 68 | Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 69 | |
| 70 | GIT |
| 71 | --- |
| Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 72 | Part of the linkgit:git[1] suite |
