From 4aad08e061df699b49e24c4d34698d734473fb66 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 2 Jan 2013 14:16:07 -0800 Subject: format-patch: document and test --reroll-count Signed-off-by: Junio C Hamano --- Documentation/git-format-patch.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 6d43f56279..736d8bf887 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -18,7 +18,7 @@ SYNOPSIS [--start-number ] [--numbered-files] [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] + [--subject-prefix=Subject-Prefix] [--reroll-count ] [--to=] [--cc=] [--cover-letter] [--quiet] [] @@ -166,6 +166,14 @@ will want to ensure that threading is disabled for `git send-email`. allows for useful naming of a patch series, and can be combined with the `--numbered` option. +--reroll-count=:: + Mark the series as the -th iteration of the topic. The + output filenames have `v` pretended to them, and the + subject prefix ("PATCH" by default, but configurable via the + `--subject-prefix` option) has ` v` 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. + --to=:: Add a `To:` header to the email headers. This is in addition to any configured headers, and may be used multiple times. -- cgit v1.2.3 From 7952ea66e72d1129afbebcdde11dcbeecd92698a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 2 Jan 2013 14:19:05 -0800 Subject: format-patch: give --reroll-count a short synonym -v Accept "-v" as a synonym to "--reroll-count", so that users can say "git format-patch -v4 master", instead of having to fully spell it out as "git format-patch --reroll-count=4 master". As I do not think of a reason why users would want to tell the command to be "verbose", I think this should be OK. Signed-off-by: Junio C Hamano --- Documentation/git-format-patch.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 736d8bf887..ae3212e8d8 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -18,7 +18,7 @@ SYNOPSIS [--start-number ] [--numbered-files] [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] - [--subject-prefix=Subject-Prefix] [--reroll-count ] + [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) ] [--to=] [--cc=] [--cover-letter] [--quiet] [] @@ -166,6 +166,7 @@ will want to ensure that threading is disabled for `git send-email`. allows for useful naming of a patch series, and can be combined with the `--numbered` option. +-v :: --reroll-count=:: Mark the series as the -th iteration of the topic. The output filenames have `v` pretended to them, and the -- cgit v1.2.3