diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 05:57:06 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-23 12:50:06 -0700 |
| commit | 5ac290f9c00edb8963585c322fae9fb06a98167d (patch) | |
| tree | df27551cf485fa788794bd019f7729655a842716 /t/t6037-merge-ours-theirs.sh | |
| parent | format-patch: add --interdiff option to embed diff in cover letter (diff) | |
| download | tgif-5ac290f9c00edb8963585c322fae9fb06a98167d.tar.xz | |
format-patch: teach --interdiff to respect -v/--reroll-count
The --interdiff option introduces the embedded interdiff generically as
"Interdiff:", however, we can do better when --reroll-count is specified
by emitting "Interdiff against v{n}:" instead.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions