git/Documentation/git-format-patch.txt, branch v2.13.2

Merge branch 'xy/format-patch-base'

2017-04-24T05:07:55Z

Doc cleanup. * xy/format-patch-base: doc: trivial typo in git-format-patch.txt

doc: trivial typo in git-format-patch.txt

2017-04-18T03:25:12Z

Signed-off-by: Giuseppe Bilotta Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

doc: change erroneous --[no]-whatever into --[no-]whatever

2017-03-20T17:04:57Z

Change these two obvious typos to be in line with the rest of the documentation, which uses the correct --[no-]whatever form. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

format-patch: add "--rfc" for the common case of [RFC PATCH]

2016-09-21T15:58:10Z

Add an alias for --subject-prefix='RFC PATCH', which is used commonly in some development communities to deserve such a short-hand. Signed-off-by: Josh Triplett Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'tr/doc-tt'

2016-06-27T16:56:42Z

The documentation set has been updated so that literal commands, configuration variables and environment variables are consistently typeset in fixed-width font and bold in manpages. * tr/doc-tt: doc: change configuration variables format doc: more consistency in environment variables format doc: change environment variables format doc: clearer rule about formatting literals

doc: change configuration variables format

2016-06-08T19:04:55Z

This change configuration variables that where in italic style to monospace font according to the guideline. It was obtained with grep '[[:alpha:]]*\.[[:alpha:]]*::$' config.txt | \ sed -e 's/::$//' -e 's/\./\\\\./' | \ xargs -iP perl -pi -e "s/\'P\'/\`P\`/g" ./*.txt Signed-off-by: Tom Russello Signed-off-by: Erwan Mathoniere Signed-off-by: Samuel Groot Signed-off-by: Matthieu Moy Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

format-patch: introduce --base=auto option

2016-04-26T17:51:50Z

Introduce --base=auto to record the base commit info automatically, the base_commit will be the merge base of tip commit of the upstream branch and revision-range specified in cmdline. Helped-by: Junio C Hamano Helped-by: Wu Fengguang Signed-off-by: Xiaolong Ye Signed-off-by: Junio C Hamano

format-patch: add '--base' option to record base tree info

2016-04-26T17:50:13Z

Maintainers or third party testers may want to know the exact base tree the patch series applies to. Teach git format-patch a '--base' option to record the base tree info and append it at the end of the first message (either the cover letter or the first patch in the series). The base tree info consists of the "base commit", which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more "prerequisite patches", which are well-known patches in flight that is not yet part of the "base commit" that need to be applied on top of "base commit" in topological order before the patches can be applied. The "base commit" is shown as "base-commit: " followed by the 40-hex of the commit object name. A "prerequisite patch" is shown as "prerequisite-patch-id: " followed by the 40-hex "patch id", which can be obtained by passing the patch through the "git patch-id --stable" command. Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like: ---P---X---Y---Z---A---B---C With "git format-patch --base=P -3 C" (or variants thereof, e.g. with "--cover-letter" of using "Z..C" instead of "-3 C" to specify the range), the base tree information block is shown at the end of the first message the command outputs (either the first patch, or the cover letter), like this: base-commit: P prerequisite-patch-id: X prerequisite-patch-id: Y prerequisite-patch-id: Z Helped-by: Junio C Hamano Helped-by: Wu Fengguang Signed-off-by: Xiaolong Ye Signed-off-by: Junio C Hamano

Merge branch 'ak/format-patch-odir-config'

2016-01-26T23:40:30Z

"git format-patch" learned to notice format.outputDirectory configuration variable. This allows "-o " option to be omitted on the command line if you always use the same directory in your workflow. * ak/format-patch-odir-config: format-patch: introduce format.outputDirectory configuration

Merge branch 'dw/signoff-doc'

2016-01-20T19:43:29Z

The documentation has been updated to hint the connection between the '--signoff' option and DCO. * dw/signoff-doc: Expand documentation describing --signoff