user/sven/git.git/interdiff.c, branch v2.26.0-rc2Git
https://git.stealer.net/cgit.cgi/user/sven/git.git/atom?h=v2.26.0-rc22018-07-23T19:50:06Zinterdiff: teach show_interdiff() to indent interdiff2018-07-23T19:50:06ZEric Sunshinesunshine@sunshineco.com2018-07-22T09:57:07Zurn:sha1:3b026417eaa1f32f53b85d1b131194ae1cbbf068
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>
format-patch: add --interdiff option to embed diff in cover letter2018-07-23T19:50:06ZEric Sunshinesunshine@sunshineco.com2018-07-22T09:57:05Zurn:sha1:126facf8219177bc265be725a8579c86ebdf99a5
When submitting a revised version of a patch series, it can be helpful
(to reviewers) to include a summary of changes since the previous
attempt in the form of an interdiff, however, doing so involves manually
copy/pasting the diff into the cover letter.
Add an --interdiff option to automate this process. The argument to
--interdiff specifies the tip of the previous attempt against which to
generate the interdiff. For example:
git format-patch --cover-letter --interdiff=v1 -3 v2
The previous attempt and the patch series being formatted must share a
common base.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>