diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-03-14 11:19:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-03-14 11:19:26 +0000 |
| commit | 103ad7fa163b20b6629d6162e5b261a124e1e486 (patch) | |
| tree | 4d3a9d38b101f57e14b36af1aa2c0190e16687a5 /git-branch.txt | |
| parent | c51fede9f2fdd66e06416d7865b023924b52e659 (diff) | |
| download | git-htmldocs-103ad7fa163b20b6629d6162e5b261a124e1e486.tar.gz | |
Autogenerated HTML docs for v1.5.0.3-438-gc49b2
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt index 3ea3b8063..603f87f3b 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git-branch' [--color | --no-color] [-r | -a] [-v [--abbrev=<length> | --no-abbrev]] -'git-branch' [-l] [-f] <branchname> [<start-point>] +'git-branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>] 'git-branch' (-m | -M) [<oldbranch>] <newbranch> 'git-branch' (-d | -D) [-r] <branchname>... @@ -26,6 +26,13 @@ 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. +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 +the default using the global `branch.autosetupmerge` configuration +flag. Otherwise, it can be chosen per-branch 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 <newbranch>, and a reflog entry is created to remember the branch |