diff options
| author | Stephen Boyd <bebarino@gmail.com> | 2009-04-23 02:37:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-23 04:20:34 -0700 |
| commit | fd1ff306b7a02f9412f8ed4881dd239d8a4a709a (patch) | |
| tree | 6f6a7e52329c98a46c28622c53e36dc3cee83d65 /Documentation | |
| parent | 48d3448dd5700f9ea8a142935fd4263ba1fb79c6 (diff) | |
| download | git-fd1ff306b7a02f9412f8ed4881dd239d8a4a709a.tar.gz git-fd1ff306b7a02f9412f8ed4881dd239d8a4a709a.tar.xz | |
Documentation: use lowercase for shallow and deep threading
Even when a sentence is started with 'shallow' or 'deep' use the
lowercase version to maintain consistency.
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 4 | ||||
| -rw-r--r-- | Documentation/git-format-patch.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index a9055c94a..0c1224a01 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -745,11 +745,11 @@ format.pretty:: format.thread:: The default threading style for 'git-format-patch'. Can be - either a boolean value, `shallow` or `deep`. 'Shallow' + either a boolean value, `shallow` or `deep`. `shallow` threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `\--in-reply-to`, and the first patch mail, in this order. - 'Deep' threading makes every mail a reply to the previous one. + `deep` threading makes every mail a reply to the previous one. A true boolean value is the same as `shallow`, and a false value disables threading. diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 5eddca92c..4a43c64bb 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -128,9 +128,9 @@ include::diff-options.txt[] the Message-Id header to reference. + The optional <style> argument can be either `shallow` or `deep`. -'Shallow' threading makes every mail a reply to the head of the +'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the -`\--in-reply-to`, and the first patch mail, in this order. 'Deep' +`\--in-reply-to`, and the first patch mail, in this order. 'deep' threading makes every mail a reply to the previous one. If not specified, defaults to the 'format.thread' configuration, or `shallow` if that is not set. |