summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-21 15:15:27 -0700
commite8f871a9cefbcf46211c1fe0d0893f1ef5eb304b (patch)
treeef1bc3e80629d8dffa58bf8d5d6399771657f78b /t/t7605-merge-resolve.sh
parentMerge branch 'ks/perf-build-with-autoconf' (diff)
parentformat-patch: show base info before email signature (diff)
downloadtgif-e8f871a9cefbcf46211c1fe0d0893f1ef5eb304b.tar.xz
Merge branch 'jt/format-patch-base-info-above-sig'
"git format-patch --base=..." feature that was recently added showed the base commit information after "-- " e-mail signature line, which turned out to be inconvenient. The base information has been moved above the signature line. * jt/format-patch-base-info-above-sig: format-patch: show base info before email signature
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions