diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-03 12:05:53 +0000 |
commit | 1b50ce9004d2296213fca188964ee273b87b2d12 (patch) | |
tree | fce55ef06d77843213ec1fe5add1d9ff75e79a77 /git-branch.txt | |
parent | 58992c945be1eab6cb6bc22216c90de22b30341f (diff) | |
download | git-htmldocs-1b50ce9004d2296213fca188964ee273b87b2d12.tar.gz |
Autogenerated HTML docs for v1.5.3.4-203-gcc61a
Diffstat (limited to 'git-branch.txt')
-rw-r--r-- | git-branch.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/git-branch.txt b/git-branch.txt index 33bc31b0d..b7285bcdb 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -26,6 +26,10 @@ It will start out with a head equal to the one given as <start-point>. If no <start-point> is given, the branch will be created with a head equal to that of the currently checked out branch. +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 branch so that gitlink:git-pull[1] will appropriately merge from that remote branch. If this behavior is desired, it is possible to make it @@ -91,6 +95,21 @@ OPTIONS --no-abbrev:: 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. Set the + branch.autosetupmerge configuration variable to true if you + 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, + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. + <branchname>:: The name of the branch to create or delete. The new branch name must pass all checks defined by |