diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-01-09 21:01:21 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-09 22:41:08 -0800 |
| commit | 578b62bfa239caca89e37fca05dcbed5add17699 (patch) | |
| tree | ebdca68187c8e1313e8bd4e495230fc6c1f7a80a | |
| parent | efc266e8aedfd6c5011ea645a85e0744aaecb5d1 (diff) | |
| download | git-578b62bfa239caca89e37fca05dcbed5add17699.tar.gz git-578b62bfa239caca89e37fca05dcbed5add17699.tar.xz | |
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: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bcfed1c11..f7728ec40 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. |