diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 12:57:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-23 22:50:06 +0300 |
| commit | 3b026417eaa1f32f53b85d1b131194ae1cbbf068 (patch) | |
| tree | 88021090ad5695a6497243778afdc12d437b9007 /interdiff.h | |
| parent | 5ac290f9c00edb8963585c322fae9fb06a98167d (diff) | |
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 'interdiff.h')
| -rw-r--r-- | interdiff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/interdiff.h b/interdiff.h index 793c0144fe..01c730a5c9 100644 --- a/interdiff.h +++ b/interdiff.h @@ -3,6 +3,6 @@ struct rev_info; -void show_interdiff(struct rev_info *); +void show_interdiff(struct rev_info *, int indent); #endif |