diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-28 14:47:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 14:47:24 -0700 |
| commit | 89740333e8d398f1da701e9023675321bbb9a85b (patch) | |
| tree | 47427bee5ebcc3b42699f12580dc299ad2f312c5 /Documentation | |
| parent | Merge branch 'nd/pretty-formats' (diff) | |
| parent | documentation: trivial whitespace cleanups (diff) | |
| download | tgif-89740333e8d398f1da701e9023675321bbb9a85b.tar.xz | |
Merge branch 'maint'
* maint:
documentation: trivial whitespace cleanups
t/Makefile: remove smoke test targets
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index c67038b56d..6e53fc5074 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1104,11 +1104,11 @@ 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 @@ -1225,7 +1225,7 @@ gitcvs.dbname:: gitcvs.dbdriver:: Used Perl DBI driver. You can specify any available driver - for this here, but it might not work. git-cvsserver is tested + for this here, but it might not work. git-cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Experimental feature. May not contain double colons (`:`). Default: 'SQLite'. |