summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2008-02-19 16:24:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-20 05:22:29 (GMT)
commit572fc81d21b26d856dd3c2cc366b7452a4ed16e4 (patch)
tree622e63b08bb0c79021d70ce2bc0d75a6f6565210 /Documentation/config.txt
parent9ed36cfa35cfbd09c454f12194a91cd50ba284d1 (diff)
downloadgit-572fc81d21b26d856dd3c2cc366b7452a4ed16e4.zip
git-572fc81d21b26d856dd3c2cc366b7452a4ed16e4.tar.gz
git-572fc81d21b26d856dd3c2cc366b7452a4ed16e4.tar.bz2
doc: documentation update for the branch track changes
Documents the branch.autosetupmerge=always setting and usage of --track when branching from a local branch. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 877eda9..f5994bd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -330,10 +330,14 @@ apply.whitespace::
branch.autosetupmerge::
Tells `git-branch` and `git-checkout` to setup new branches
- so that linkgit:git-pull[1] will appropriately merge from that
- remote branch. Note that even if this option is not set,
+ 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`
- and `--no-track` options. This option defaults to false.
+ and `--no-track` options. The valid settings are: `false` -- no
+ automatic setup is done; `true` -- automatic setup is done when the
+ starting point is a remote branch; `always` -- automatic setup is
+ done when the starting point is either a local branch or remote
+ branch. This option defaults to true.
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.