Refer to branch.<name>.remote/merge when documenting --track
Make it easier for readers to find the actual config variables that implement the "upstream" relationship. Suggested-by: Per Cederqvist <cederp@opera.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johan Herland committed
Sep 8, 2013 at 22:58 UTC
fef0e991aa51481f047473e79a8f4d61f56dd60f
1 file changed
+4
-2
Documentation/git-branch.txt
+4
-2
@@ -48,7 +48,8 @@ working tree to it; use "git checkout <newbranch>" to switch to the
48
new branch.
49
50
When a local branch is started off a remote-tracking branch, Git sets up the
51
-branch so that 'git pull' will appropriately merge from
51
+branch (specifically the `branch.<name>.remote` and `branch.<name>.merge`
52
+configuration entries) so that 'git pull' will appropriately merge from
53
the remote-tracking branch. This behavior may be changed via the global
54
`branch.autosetupmerge` configuration flag. That setting can be
55
overridden by using the `--track` and `--no-track` options, and
@@ -156,7 +157,8 @@ This option is only applicable in non-verbose mode.
157
158
-t::
159
--track::
159
- When creating a new branch, set up configuration to mark the
160
+ When creating a new branch, set up `branch.<name>.remote` and
161
+ `branch.<name>.merge` configuration entries to mark the
162
start-point branch as "upstream" from the new branch. This
163
configuration will tell git to show the relationship between the
164
two branches in `git status` and `git branch -v`. Furthermore,