Merge branch 'es/format-patch-rangediff'
commit881c019ea6a0a45f97fb8a1865a88b07263a02ca
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:56 +0000 (17 13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:56 +0000 (17 13:53 -0700)
tree1bbb5da82ce92a3ba85114ae641d8fcf62b8d7d6
parent688cb1c9891943db1575db38bc0575f75f8b928b
parent40ce41604daf200cdc85abded0133d40faafc2f8
Merge branch 'es/format-patch-rangediff'

"git format-patch" learned a new "--range-diff" option to explain
the difference between this version and the previous attempt in
the cover letter (or after the tree-dashes as a comment).

* es/format-patch-rangediff:
  format-patch: allow --range-diff to apply to a lone-patch
  format-patch: add --creation-factor tweak for --range-diff
  format-patch: teach --range-diff to respect -v/--reroll-count
  format-patch: extend --range-diff to accept revision range
  format-patch: add --range-diff option to embed diff in cover letter
  range-diff: relieve callers of low-level configuration burden
  range-diff: publish default creation factor
  range-diff: respect diff_option.file rather than assuming 'stdout'
builtin/log.c
builtin/range-diff.c
log-tree.c
range-diff.c
revision.h
t/t3206-range-diff.sh