summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-02 21:43:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-02 21:43:14 (GMT)
commit8a4394d1c12658b0dc6bd67d7bc6897def692851 (patch)
tree65f399cb89946c9718c4f4f6f452d9d7bcecf3ef /Documentation/git-format-patch.txt
parent861794b60d3a61822daf59bbde39a2a2e362738d (diff)
parentdb91988aa102d48af1c1203d8cc2d01240df7365 (diff)
downloadgit-8a4394d1c12658b0dc6bd67d7bc6897def692851.zip
git-8a4394d1c12658b0dc6bd67d7bc6897def692851.tar.gz
git-8a4394d1c12658b0dc6bd67d7bc6897def692851.tar.bz2
Merge branch 'zh/format-patch-fractional-reroll-count'
"git format-patch -v<n>" learned to allow a reroll count that is not an integer. * zh/format-patch-fractional-reroll-count: format-patch: allow a non-integral version numbers
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 5cd8578..911da18 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -238,6 +238,11 @@ populated with placeholder text.
`--subject-prefix` option) has ` v<n>` appended to it. E.g.
`--reroll-count=4` may produce `v4-0001-add-makefile.patch`
file that has "Subject: [PATCH v4 1/20] Add makefile" in it.
+ `<n>` does not have to be an integer (e.g. "--reroll-count=4.4",
+ or "--reroll-count=4rev2" are allowed), but the downside of
+ using such a reroll-count is that the range-diff/interdiff
+ with the previous version does not state exactly which
+ version the new interation is compared against.
--to=<email>::
Add a `To:` header to the email headers. This is in addition