git-branch.txt: mention --set-upstream as a way to change upstream configuration
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Nov 2, 2010 at 16:31 UTC
4eec6f988dc1638ff5b5ee3131f7452d29042a61
1 file changed
+2
-1
Documentation/git-branch.txt
+2
-1
@@ -41,7 +41,8 @@ When a local branch is started off a remote-tracking branch, git sets up the
41
branch so that 'git pull' will appropriately merge from
42
the remote-tracking branch. This behavior may be changed via the global
43
`branch.autosetupmerge` configuration flag. That setting can be
44
-overridden by using the `--track` and `--no-track` options.
44
+overridden by using the `--track` and `--no-track` options, and
45
+changed later using `git branch --set-upstream`.
46
47
With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
48
If <oldbranch> had a corresponding reflog, it is renamed to match