From: Jonathan Nieder Date: Sun, 10 Jan 2010 03:01:21 +0000 (-0600) Subject: Documentation: tiny git config manual tweaks X-Git-Tag: v1.7.0-rc0~7^2~10 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63487e14c834f5e5093f8ef25fe983fffa1ff7a4;p=git.git 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 Signed-off-by: Thomas Rast --- diff --git a/Documentation/config.txt b/Documentation/config.txt index b6bd80e4a..8d3397c69 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -537,7 +537,7 @@ apply.whitespace:: as the '--whitespace' option. See linkgit:git-apply[1]. branch.autosetupmerge:: - Tells 'git branch' and 'git checkout' to setup new branches + Tells 'git branch' and 'git checkout' to set up new branches so that linkgit:git-pull[1] will appropriately merge from the starting point branch. Note that even if this option is not set, this behavior can be chosen per-branch using the `--track` @@ -725,7 +725,7 @@ diff.autorefreshindex:: contents in the work tree match the contents in the index. This option defaults to true. Note that this affects only 'git diff' Porcelain, and not lower level - 'diff' commands, such as 'git diff-files'. + 'diff' commands such as 'git diff-files'. diff.external:: If this config variable is set, diff generation is not @@ -841,8 +841,8 @@ format.pretty:: format.thread:: The default threading style for 'git format-patch'. Can be - either a boolean value, `shallow` or `deep`. `shallow` - threading makes every mail a reply to the head of the series, + a boolean value, or `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.