projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe8f41f ee6cbf7)
Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2018 21:23:53 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Aug 2018 21:23:53 +0000 (14:23 -0700)
commit5cf00cbc0f0134d658c0507160854e677af6d199
treefd8a504418b0f0a21d59855b976428b1efe18fd9tree | snapshot
parentfe8f41fb2a61b36d51099f895e9902fcccc2a2dfcommit | diff
parentee6cbf712edcbd1dc14993ab2452fbe882dc524acommit | 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()
Makefile diff1 | diff2 | blob | history
builtin/log.c diff1 | diff2 | blob | history
log-tree.c diff1 | diff2 | blob | history
revision.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.