Documentation: tiny git config manual tweaks
As a verb, 'setup' is spelled 'set up'. “diff commands such as diff-files” scans better without a comma. Clarify that shallow and deep are special non-boolean values for format.thread rather than boolean values with some other name. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Jonathan Nieder committed
Jan 9, 2010 at 21:01 UTC
63487e14c834f5e5093f8ef25fe983fffa1ff7a4
1 file changed
+4
-4
Documentation/config.txt
+4
-4
@@ -537,7 +537,7 @@ apply.whitespace::
537
as the '--whitespace' option. See linkgit:git-apply[1].
538
539
branch.autosetupmerge::
540
- Tells 'git branch' and 'git checkout' to setup new branches
540
+ Tells 'git branch' and 'git checkout' to set up new branches
541
so that linkgit:git-pull[1] will appropriately merge from the
542
starting point branch. Note that even if this option is not set,
543
this behavior can be chosen per-branch using the `--track`
@@ -725,7 +725,7 @@ diff.autorefreshindex::
725
contents in the work tree match the contents in the
726
index. This option defaults to true. Note that this
727
affects only 'git diff' Porcelain, and not lower level
728
- 'diff' commands, such as 'git diff-files'.
728
+ 'diff' commands such as 'git diff-files'.
729
730
diff.external::
731
If this config variable is set, diff generation is not
@@ -841,8 +841,8 @@ format.pretty::
841
842
format.thread::
843
The default threading style for 'git format-patch'. Can be
844
- either a boolean value, `shallow` or `deep`. `shallow`
845
- threading makes every mail a reply to the head of the series,
844
+ a boolean value, or `shallow` or `deep`. `shallow` threading
845
+ makes every mail a reply to the head of the series,
846
where the head is chosen from the cover letter, the
847
`\--in-reply-to`, and the first patch mail, in this order.
848
`deep` threading makes every mail a reply to the previous one.