aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-23 00:16:11 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-23 00:16:11 -0700
commite97593693ed36da918413732c9ca4b09c3e9d213 (patch)
tree9c06adffc5bf959829e20024fdadc4c9f8d9e230 /Documentation/config.txt
parenta3342a2f52a5351739577f8773eab2a1db20b651 (diff)
parentc80e07d4959591f5addcd48c7d42017b40c25f36 (diff)
downloadgit-e97593693ed36da918413732c9ca4b09c3e9d213.tar.gz
git-e97593693ed36da918413732c9ca4b09c3e9d213.tar.xz
Merge branch 'maint'
* maint: Document branch.autosetupmerge.
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 179cb177d..eb2e79ae2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -280,6 +280,13 @@ apply.whitespace::
Tells `git-apply` how to handle whitespaces, in the same way
as the '--whitespace' option. See gitlink:git-apply[1].
+branch.autosetupmerge::
+ 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`
+ and `--no-track` options. This option defaults to false.
+
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.
If this option is not given, `git fetch` defaults to remote "origin".