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'
This commit is contained in:
@ -224,6 +224,12 @@ struct rev_info {
|
||||
const struct object_id *idiff_oid2;
|
||||
const char *idiff_title;
|
||||
|
||||
/* range-diff */
|
||||
const char *rdiff1;
|
||||
const char *rdiff2;
|
||||
int creation_factor;
|
||||
const char *rdiff_title;
|
||||
|
||||
/* commit counts */
|
||||
int count_left;
|
||||
int count_right;
|
||||
|
Reference in New Issue
Block a user