diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2018-07-22 09:57:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-14 21:27:05 (GMT) |
| commit | 8631bf1cdd7296684deebab2708761bfc8085fc2 (patch) | |
| tree | 2aaa3d26b0a0f847db6b518c65a755ebda0fe63f /Documentation/git-format-patch.txt | |
| parent | 4ee99689410cf7275f21833779da89626eb6edd6 (diff) | |
| download | git-8631bf1cdd7296684deebab2708761bfc8085fc2.zip git-8631bf1cdd7296684deebab2708761bfc8085fc2.tar.gz git-8631bf1cdd7296684deebab2708761bfc8085fc2.tar.bz2 | |
format-patch: add --creation-factor tweak for --range-diff
When generating a range-diff, matching up commits between two version of
a patch series involves heuristics, thus may give unexpected results.
git-range-diff allows tweaking the heuristic via --creation-factor.
Follow suit by accepting --creation-factor in combination with
--range-diff when generating a range-diff for a cover-letter.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-format-patch.txt')
| -rw-r--r-- | Documentation/git-format-patch.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 425145f..9b2e172 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -24,7 +24,7 @@ SYNOPSIS [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] [--notes[=<ref>]] [--interdiff=<previous>] - [--range-diff=<previous>] + [--range-diff=<previous> [--creation-factor=<percent>]] [--progress] [<common diff options>] [ <since> | <revision range> ] @@ -250,6 +250,12 @@ feeding the result to `git send-email`. disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`). +--creation-factor=<percent>:: + Used with `--range-diff`, tweak the heuristic which matches up commits + between the previous and current series of patches by adjusting the + creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) + for details. + --notes[=<ref>]:: Append the notes (see linkgit:git-notes[1]) for the commit after the three-dash line. |