From: Junio C Hamano Date: Sun, 28 Apr 2013 21:47:24 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Url: https://repo.or.cz/w/git/mingw.git/commitdiff_plain/89740333e8d398f1da701e9023675321bbb9a85b Merge branch 'maint' * maint: documentation: trivial whitespace cleanups t/Makefile: remove smoke test targets --- 89740333e8d398f1da701e9023675321bbb9a85b diff --cc Documentation/config.txt index c67038b56d,e97faccb7d..6e53fc5074 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -1104,17 -1090,12 +1104,17 @@@ format.thread: value disables threading. format.signoff:: - A boolean value which lets you enable the `-s/--signoff` option of - format-patch by default. *Note:* Adding the Signed-off-by: line to a - patch should be a conscious act and means that you certify you have - the rights to submit this work under the same open source license. - Please see the 'SubmittingPatches' document for further discussion. + A boolean value which lets you enable the `-s/--signoff` option of + format-patch by default. *Note:* Adding the Signed-off-by: line to a + patch should be a conscious act and means that you certify you have + the rights to submit this work under the same open source license. + Please see the 'SubmittingPatches' document for further discussion. +format.coverLetter:: + A boolean that controls whether to generate a cover-letter when + format-patch is invoked, but in addition can be set to "auto", to + generate a cover-letter only when there's more than one patch. + filter..clean:: The command which is used to convert the content of a worktree file to a blob upon checkin. See linkgit:gitattributes[5] for