summaryrefslogtreecommitdiff
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-07-10 17:50:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-11 23:03:58 (GMT)
commit6f084a56fcb3543d88d252bb49c1d2bbf2bd0cf3 (patch)
tree00a572bf2d745f3d55a0b00d29682fb779cd5b04 /Documentation/git-checkout.txt
parentb42f69273bf5ae2d5bb0c7479bfa9827e7b351ac (diff)
downloadgit-6f084a56fcb3543d88d252bb49c1d2bbf2bd0cf3.zip
git-6f084a56fcb3543d88d252bb49c1d2bbf2bd0cf3.tar.gz
git-6f084a56fcb3543d88d252bb49c1d2bbf2bd0cf3.tar.bz2
branch --track: code cleanup and saner handling of local branches
This patch cleans up some complicated code, and replaces it with a cleaner version, using code from remote.[ch], which got extended a little in the process. This also enables us to fix two cases: The earlier "fix" to setup tracking only when the original ref started with "refs/remotes" is wrong. You are absolutely allowed to use a separate layout for your tracking branches. The correct fix, of course, is to set up tracking information only when there is a matching remote.<nick>.fetch line containing a colon. Another corner case was not handled properly. If two remotes write to the original ref, just warn the user and do not set up tracking. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 8292952..818b720 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -52,9 +52,8 @@ OPTIONS
set up configuration so that git-pull will automatically
retrieve data from the remote branch. Set the
branch.autosetupmerge configuration variable to true if you
- want git-checkout and git-branch to behave as if
- '--track' were given when you branch from a remote
- tracking branch.
+ want git-checkout and git-branch to always behave as if
+ '--track' were given.
--no-track::
When -b is given and a branch is created off a remote branch,