diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 00:23:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 00:23:53 +0300 |
| commit | 5cf00cbc0f0134d658c0507160854e677af6d199 (patch) | |
| tree | fd8a504418b0f0a21d59855b976428b1efe18fd9 /range-diff.c | |
| parent | fe8f41fb2a61b36d51099f895e9902fcccc2a2df (diff) | |
| parent | ee6cbf712edcbd1dc14993ab2452fbe882dc524a (diff) | |
Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
* es/format-patch-interdiff:
format-patch: allow --interdiff to apply to a lone-patch
log-tree: show_log: make commentary block delimiting reusable
interdiff: teach show_interdiff() to indent interdiff
format-patch: teach --interdiff to respect -v/--reroll-count
format-patch: add --interdiff option to embed diff in cover letter
format-patch: allow additional generated content in make_cover_letter()
Diffstat (limited to 'range-diff.c')
0 files changed, 0 insertions, 0 deletions