path: root/interdiff.h
AgeCommit message (Collapse)Author
2018-07-23interdiff: teach show_interdiff() to indent interdiffEric Sunshine
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 <> Signed-off-by: Junio C Hamano <>
2018-07-23format-patch: add --interdiff option to embed diff in cover letterEric Sunshine
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 <> Signed-off-by: Junio C Hamano <>