diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-14 14:23:53 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-14 14:23:53 -0700 |
commit | 5cf00cbc0f0134d658c0507160854e677af6d199 (patch) | |
tree | fd8a504418b0f0a21d59855b976428b1efe18fd9 /tempfile.c | |
parent | Merge branch 'js/range-diff' into es/format-patch-rangediff (diff) | |
parent | format-patch: allow --interdiff to apply to a lone-patch (diff) | |
download | tgif-5cf00cbc0f0134d658c0507160854e677af6d199.tar.xz |
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 'tempfile.c')
0 files changed, 0 insertions, 0 deletions