path: root/Documentation
diff options
authorJohannes Schindelin <>2007-07-10 17:50:44 (GMT)
committerJunio C Hamano <>2007-07-11 23:03:58 (GMT)
commit6f084a56fcb3543d88d252bb49c1d2bbf2bd0cf3 (patch)
tree00a572bf2d745f3d55a0b00d29682fb779cd5b04 /Documentation
parentb42f69273bf5ae2d5bb0c7479bfa9827e7b351ac (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation')
2 files changed, 3 insertions, 7 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index aeece84..4b67f0a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -309,10 +309,7 @@ branch.autosetupmerge::
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 can have values
- 'false' (never touch the configuration), 'all' (do this
- for all branches), or 'true' (do this only when
- branching from a remote tracking branch), and defaults to 'true'.
+ and `--no-track` options. This option defaults to false.
When in branch <name>, it tells `git fetch` which remote to fetch.
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.
When -b is given and a branch is created off a remote branch,