summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.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/git-checkout.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/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt23
1 files changed, 11 insertions, 12 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 584359f..4014e72 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -48,20 +48,19 @@ OPTIONS
may restrict the characters allowed in a branch name.
--track::
- When -b is given and a branch is created off a remote branch,
- set up configuration so that git-pull will automatically
- retrieve data from the remote branch. Use this if you always
- pull from the same remote branch into the new branch, or if you
- don't want to use "git pull <repository> <refspec>" explicitly. Set the
- branch.autosetupmerge configuration variable to true if you
- want git-checkout and git-branch to always behave as if
- '--track' were given.
+ When creating a new branch, set up configuration so that git-pull
+ will automatically retrieve data from the start point, which must be
+ a branch. Use this if you always pull from the same upstream branch
+ into the new branch, and if you don't want to use "git pull
+ <repository> <refspec>" explicitly. This behavior is the default
+ when the start point is a remote branch. Set the
+ branch.autosetupmerge configuration variable to `false` if you want
+ git-checkout and git-branch to always behave as if '--no-track' were
+ given. Set it to `always` if you want this behavior when the
+ start-point is either a local or remote branch.
--no-track::
- When -b is given and a branch is created off a remote branch,
- set up configuration so that git-pull will not retrieve data
- from the remote branch, ignoring the branch.autosetupmerge
- configuration variable.
+ Ignore the branch.autosetupmerge configuration variable.
-l::
Create the new branch's reflog. This activates recording of