diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-05 21:13:21 -0800 |
| commit | 076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch) | |
| tree | 6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-branch.txt | |
| parent | 3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff) | |
| download | git-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz | |
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-branch.txt')
| -rw-r--r-- | git-branch.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-branch.txt b/git-branch.txt index 45a225e0a..d4a9be22e 100644 --- a/git-branch.txt +++ b/git-branch.txt @@ -45,7 +45,7 @@ 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-tracking branch, git sets up the +When a local branch is started off a remote-tracking branch, Git sets up the branch 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 |