diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:42 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-12-01 21:41:42 +0900 |
| commit | d32fa3c6f7f441c7c9f16d0661ce041e6f9a3439 (patch) | |
| tree | 7337c0018c55bb91e000b78c8c2b8e973e71e070 /Documentation | |
| parent | Merge branch 'ja/i18n-fix' (diff) | |
| parent | format-patch: do not let its diff-options affect --range-diff (diff) | |
| download | tgif-d32fa3c6f7f441c7c9f16d0661ce041e6f9a3439.tar.xz | |
Merge branch 'jc/format-patch-range-diff-fix'
"git format-patch --range-diff" by mistake passed the diff options
used to generate the primary output of the command to the
range-diff machinery, which caused the range-diff in the cover
letter to include fairly useless "--stat" output. This has been
corrected by forcing a non-customizable default formatting options
on the range-diff machinery when driven by format-patch.
* jc/format-patch-range-diff-fix:
format-patch: do not let its diff-options affect --range-diff
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-format-patch.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index aba4c5febe..27304428a1 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -250,6 +250,11 @@ feeding the result to `git send-email`. feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`). ++ +Note that diff options passed to the command affect how the primary +product of `format-patch` is generated, and they are not passed to +the underlying `range-diff` machinery used to generate the cover-letter +material (this may change in the future). --creation-factor=<percent>:: Used with `--range-diff`, tweak the heuristic which matches up commits |