aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-23 00:15:35 -0700
committerJunio C Hamano <junkio@cox.net>2007-05-23 00:15:35 -0700
commitc80e07d4959591f5addcd48c7d42017b40c25f36 (patch)
tree7c4efc66c415a180ef62015b17607dad44cccadf /Documentation
parent523d12e5003eee0c2cb670b51e39d719cd56aacd (diff)
parent9902387d20e7a73662a97f5c4b66ba4ec80dc9ce (diff)
downloadgit-c80e07d4959591f5addcd48c7d42017b40c25f36.tar.gz
git-c80e07d4959591f5addcd48c7d42017b40c25f36.tar.xz
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: Document branch.autosetupmerge.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4bbe1162c..c1306a69e 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -287,6 +287,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".