summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorLibravatar Eric Sunshine <sunshine@sunshineco.com>2018-07-22 05:57:07 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-23 12:50:06 -0700
commit3b026417eaa1f32f53b85d1b131194ae1cbbf068 (patch)
tree88021090ad5695a6497243778afdc12d437b9007 /t/t6020-merge-df.sh
parentformat-patch: teach --interdiff to respect -v/--reroll-count (diff)
downloadtgif-3b026417eaa1f32f53b85d1b131194ae1cbbf068.tar.xz
interdiff: teach show_interdiff() to indent interdiff
A future change will allow "git format-patch --interdiff=<prev> -1" to insert an interdiff into the commentary section of the lone patch of a 1-patch series. However, to prevent the inserted interdiff from confusing git-am, as well as human readers, it needs to be indented. Therefore, teach show_interdiff() how to indent. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-merge-df.sh')
0 files changed, 0 insertions, 0 deletions