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`
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
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.