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

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

format-patch: introduce format.outputDirectory configuration

2016-01-13T18:55:01Z

We can pass -o/--output-directory to the format-patch command to store patches in some place other than the working directory. This patch introduces format.outputDirectory configuration option for same purpose. The case of usage of this configuration option can be convenience to not pass every time -o/--output-directory if an user has pattern to store all patches in the /patches directory for example. The format.outputDirectory has lower priority than command line option, so if user will set format.outputDirectory and pass the command line option, a result will be stored in a directory that passed to command line option. Signed-off-by: Alexander Kuleshov Signed-off-by: Stephen P. Smith Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

Expand documentation describing --signoff

2016-01-05T21:42:39Z

Modify various document (man page) files to explain in more detail what --signoff means. This was inspired by https://lwn.net/Articles/669976/ where paulj noted, "adding [the] '-s' argument to [a] git commit doesn't really mean you have even heard of the DCO...". Extending git's documentation will make it easier to argue that developers understood --signoff when they use it. Signed-off-by: David A. Wheeler Signed-off-by: Junio C Hamano

format-patch: add an option to suppress commit hash

2015-12-15T18:03:40Z

Oftentimes, patches created by git format-patch will be stored in version control or compared with diff. In these cases, two otherwise identical patches can have different commit hashes, leading to diff noise. Teach git format-patch a --zero-commit option that instead produces an all-zero hash to avoid this diff noise. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

Merge branch 'po/doc-branch-desc'

2015-09-17T19:29:03Z

The branch descriptions that are set with "git branch --edit-description" option were used in many places but they weren't clearly documented. * po/doc-branch-desc: doc: show usage of branch description

doc: show usage of branch description

2015-09-14T19:50:33Z

The branch description will be included in 'git format-patch --cover-letter' and in 'git pull-request' emails. It can also be used in the automatic merge message. Tell the reader. While here, clarify that the description may be a multi-line explanation of the purpose of the branch's patch series. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

Merge branch 'fk/doc-format-patch-vn'

2015-06-24T19:21:56Z

Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo

doc: format-patch: fix typo

2015-06-10T21:37:04Z

reroll count documentation states that v will be pretended to the filename. Judging by the examples that should have been 'prepended'. Signed-off-by: Frans Klaver Signed-off-by: Junio C Hamano

*config.txt: stick to camelCase naming convention

2015-03-14T05:13:46Z

This should improve readability. Compare "thislongname" and "thisLongName". The following keys are left in unchanged. We can decide what to do with them later. - am.keepcr - core.autocrlf .safecrlf .trustctime - diff.dirstat .noprefix - gitcvs.usecrlfattr - gui.blamehistoryctx .trustmtime - pull.twohead - receive.autogc - sendemail.signedoffbycc .smtpsslcertpath .suppresscc Helped-by: Eric Sunshine Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano