| commit | 920f22e6bc2ddc28b1d70eb8167fe17f0f1601eb | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Fri, 22 Dec 2017 14:10:02 +0000 (22 15:10 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 Jul 2018 21:47:05 +0000 (11 14:47 -0700) | ||
| tree | a9762ca9b073559e1126a381cf80ea6a46eb8993 | treesnapshot (tar.gz zip) |
| parent | e3331758f12da22f4103eec7efe1b5304a9be5e9 | commitdiff |
merge: allow reading the merge commit message from a file
This is consistent with `git commit` which, like `git merge`, supports
passing the commit message via `-m <msg>` and, unlike `git merge` before
this patch, via `-F <file>`.
It is useful to allow this for scripted use, or for the upcoming patch
to allow (re-)creating octopus merges in `git rebase --rebase-merges`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This is consistent with `git commit` which, like `git merge`, supports
passing the commit message via `-m <msg>` and, unlike `git merge` before
this patch, via `-F <file>`.
It is useful to allow this for scripted use, or for the upcoming patch
to allow (re-)creating octopus merges in `git rebase --rebase-merges`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diffblobblamehistory | |
| builtin/merge.c | diffblobblamehistory |