diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-12-22 15:10:02 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-11 14:47:05 -0700 |
| commit | 920f22e6bc2ddc28b1d70eb8167fe17f0f1601eb (patch) | |
| tree | a9762ca9b073559e1126a381cf80ea6a46eb8993 /t/t4018/cpp-function-returning-nested | |
| parent | Second batch for 2.19 cycle (diff) | |
| download | tgif-920f22e6bc2ddc28b1d70eb8167fe17f0f1601eb.tar.xz | |
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>
Diffstat (limited to 't/t4018/cpp-function-returning-nested')
0 files changed, 0 insertions, 0 deletions