diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-12 03:18:52 +0000 |
| commit | 9c33415fc305e37bd5a1f399bae1c3b9e2559571 (patch) | |
| tree | d062fd43e7c3a543176e5d390ac730c6b2a99b5c /git-branch.txt | |
| parent | 49dccafcce2c8a846416d30bc7cac6a72d67c102 (diff) | |
| download | git-htmldocs-9c33415fc305e37bd5a1f399bae1c3b9e2559571.tar.gz | |
Autogenerated HTML docs for v1.5.4.1-97-g40aab
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/git-branch.txt b/git-branch.txt index f920c04cc..7e8874aca 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -34,11 +34,11 @@ Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the new branch. -When a local branch is started off a remote branch, git can setup the +When a local branch is started off a remote branch, git sets up the branch so that linkgit:git-pull[1] will appropriately merge from that -remote branch. If this behavior is desired, it is possible to make it -the default using the global `branch.autosetupmerge` configuration -flag. Otherwise, it can be chosen per-branch using the `--track` +remote branch. If this behavior is not desired, it is possible to +disable it using the global `branch.autosetupmerge` configuration +flag. That setting can be overridden by using the `--track` and `--no-track` options. With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>. @@ -108,10 +108,11 @@ OPTIONS 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 + don't want to use "git pull <repository> <refspec>" explicitly. + This behavior is the default. Set the + branch.autosetupmerge configuration variable to false if you want git-checkout and git-branch to always behave as if - '--track' were given. + '--no-track' were given. --no-track:: When a branch is created off a remote branch, |