diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-20 14:03:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 14:03:37 -0700 |
| commit | 79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8 (patch) | |
| tree | 9b5ca4ba3e78d726bab8e54347738b373d3a2eef /git-branch.txt | |
| parent | 211db89d8b8d8c3006e084f43dd6471163c7b998 (diff) | |
| download | git-htmldocs-79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8.tar.gz | |
Autogenerated HTML docs for v1.8.4-474-g128a96
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-branch.txt b/git-branch.txt index b7cb625b8..311b33674 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -48,7 +48,8 @@ working tree to it; use "git checkout <newbranch>" to switch to the new branch. When a local branch is started off a remote-tracking branch, Git sets up the -branch so that 'git pull' will appropriately merge from +branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` +configuration entries) so that 'git pull' will appropriately merge from the remote-tracking 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, and @@ -156,7 +157,8 @@ This option is only applicable in non-verbose mode. -t:: --track:: - When creating a new branch, set up configuration to mark the + When creating a new branch, set up `branch.<name>.remote` and + `branch.<name>.merge` configuration entries to mark the start-point branch as "upstream" from the new branch. This configuration will tell git to show the relationship between the two branches in `git status` and `git branch -v`. Furthermore, |