summaryrefslogtreecommitdiff
path: root/t/t4254-am-corrupt.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-01 13:49:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-01 13:49:13 -0700
commit341a196ab6603aa7be709812132fd906a3d2359c (patch)
treeffb5cced1ece0bba1636b163b86f314e819a4620 /t/t4254-am-corrupt.sh
parentThe second batch -- mostly minor typofixes (diff)
parentfmt-merge-msg: allow merge destination to be omitted again (diff)
downloadtgif-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/t4254-am-corrupt.sh')
0 files changed, 0 insertions, 0 deletions