diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-01 13:49:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-01 13:49:13 -0700 |
| commit | 341a196ab6603aa7be709812132fd906a3d2359c (patch) | |
| tree | ffb5cced1ece0bba1636b163b86f314e819a4620 /t/t4013/diff.log_-p_master | |
| parent | The second batch -- mostly minor typofixes (diff) | |
| parent | fmt-merge-msg: allow merge destination to be omitted again (diff) | |
| download | tgif-341a196ab6603aa7be709812132fd906a3d2359c.tar.xz | |
Merge branch 'jc/fmt-merge-msg-suppress-destination' into master
"git merge" learned to selectively omit " into <branch>" at the end
of the title of default merge message with merge.suppressDest
configuration.
* jc/fmt-merge-msg-suppress-destination:
fmt-merge-msg: allow merge destination to be omitted again
Revert "fmt-merge-msg: stop treating `master` specially"
Diffstat (limited to 't/t4013/diff.log_-p_master')
| -rw-r--r-- | t/t4013/diff.log_-p_master | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master index 1841cded94..bf1326dc36 100644 --- a/t/t4013/diff.log_-p_master +++ b/t/t4013/diff.log_-p_master @@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9 Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 - Merge branch 'side' into master + Merge branch 'side' commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Author: A U Thor <author@example.com> |