index c1306a69e54d61104f249eacf5c158e31c73e143..fdb71de9f6c4f508996ccdf7970522ba53bb0dfe 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
as the '--whitespace' option. See gitlink:git-apply[1].
branch.autosetupmerge::
- Tells `git-branch' and `git-checkout' to setup new branches
+ Tells `git-branch` and `git-checkout` to setup new branches
so that gitlink:git-pull[1] will appropriately merge from that
remote branch. Note that even if this option is not set,
this behavior can be chosen per-branch using the `--track`