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 /line-log.h | |
| 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 'line-log.h')
0 files changed, 0 insertions, 0 deletions