diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:55 -0700 |
| commit | 688cb1c9891943db1575db38bc0575f75f8b928b (patch) | |
| tree | 0c240ea594d33be0c9a75098eb6d843dc92cb023 /builtin/ls-files.c | |
| parent | Merge branch 'cc/delta-islands' (diff) | |
| parent | format-patch: allow --interdiff to apply to a lone-patch (diff) | |
| download | tgif-688cb1c9891943db1575db38bc0575f75f8b928b.tar.xz | |
Merge branch 'es/format-patch-interdiff'
"git format-patch" learned a new "--interdiff" option to explain
the difference between this version and the previous atttempt in
the cover letter (or after the tree-dashes as a comment).
* 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 'builtin/ls-files.c')
0 files changed, 0 insertions, 0 deletions