| 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 | 9882a52 | 2007-04-27 08:22:22 | [diff] [blame] | 12 | git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD |
| Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 13 | git-fmt-merge-msg [--summary | --no-summary] -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 | |
| 27 | --summary:: |
| 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 | |
| 32 | --no-summary:: |
| 33 | Do not list one-line descriptions from the actual commits being |
| 34 | merged. |
| 35 | |
| 36 | --file <file>, -F <file>:: |
| 37 | Take the list of merged objects from <file> instead of |
| 38 | stdin. |
| 39 | |
| 40 | CONFIGURATION |
| 41 | ------------- |
| 42 | |
| 43 | merge.summary:: |
| 44 | Whether to include summaries of merged commits in newly |
| 45 | merge commit messages. False by default. |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 46 | |
| 47 | SEE ALSO |
| 48 | -------- |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame^] | 49 | linkgit:git-merge[1] |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 50 | |
| 51 | |
| 52 | Author |
| 53 | ------ |
| 54 | Written by Junio C Hamano <junkio@cox.net> |
| 55 | |
| 56 | Documentation |
| 57 | -------------- |
| 58 | Documentation by Petr Baudis, Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 59 | |
| 60 | GIT |
| 61 | --- |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame^] | 62 | Part of the linkgit:git[7] suite |
