From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 12 Jan 2013 02:34:10 +0000 (-0800)
Subject: Merge branch 'jc/format-patch-reroll'
X-Git-Tag: v1.8.2-rc0~138
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/98294e9875c05cdf2d4f16d446cb89ba6d41014a

Merge branch 'jc/format-patch-reroll'

Teach "format-patch" to prefix v4- to its output files for the
fourth iteration of a patch series, to make it easier for the
submitter to keep separate copies for iterations.

* jc/format-patch-reroll:
  format-patch: give --reroll-count a short synonym -v
  format-patch: document and test --reroll-count
  format-patch: add --reroll-count=$N option
  get_patch_filename(): split into two functions
  get_patch_filename(): drop "just-numbers" hack
  get_patch_filename(): simplify function signature
  builtin/log.c: stop using global patch_suffix
  builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()
  builtin/log.c: drop unused "numbered" parameter from make_cover_letter()
---

98294e9875c05cdf2d4f16d446cb89ba6d41014a
diff --cc Documentation/git-format-patch.txt
index 259dce4994,ae3212e8d8..9a914d0159
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -18,9 -18,9 +18,9 @@@ SYNOPSI
  		   [--start-number <n>] [--numbered-files]
  		   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
  		   [--ignore-if-in-upstream]
- 		   [--subject-prefix=Subject-Prefix]
+ 		   [--subject-prefix=Subject-Prefix] [(--reroll-count|-v) <n>]
  		   [--to=<email>] [--cc=<email>]
 -		   [--cover-letter] [--quiet]
 +		   [--cover-letter] [--quiet] [--notes[=<ref>]]
  		   [<common diff options>]
  		   [ <since> | <revision range> ]