diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-28 00:27:44 +0000 |
commit | 24bc09a2408f779de87b173b93386f5d1cbeee34 (patch) | |
tree | fed4584ad7fba36e609ec2ad9eed33fc9aee2c1d /git-branch.txt | |
parent | 69f491759956153218a1ac862629c439a194d865 (diff) | |
download | git-htmldocs-24bc09a2408f779de87b173b93386f5d1cbeee34.tar.gz |
Autogenerated HTML docs for v1.5.4.3-325-g6d21
Diffstat (limited to 'git-branch.txt')
-rw-r--r-- | git-branch.txt | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/git-branch.txt b/git-branch.txt index 7e8874aca..6f07a17a2 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -35,11 +35,10 @@ 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 sets up the -branch so that linkgit:git-pull[1] will appropriately merge from that -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. +branch so that linkgit:git-pull[1] will appropriately merge from +the remote branch. This behavior may be changed via 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>. If <oldbranch> had a corresponding reflog, it is renamed to match @@ -105,20 +104,19 @@ OPTIONS Display the full sha1s in output listing rather than abbreviating them. --track:: - 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. - 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 - '--no-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 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. <branchname>:: The name of the branch to create or delete. |