git-branch.txt: mention --set-upstream as a way to change upstream configuration
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Tue, 2 Nov 2010 15:31:28 +0000 (16:31 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Nov 2010 16:20:48 +0000 (09:20 -0700)
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-branch.txt

index 7f23c5682f5b1d000d51837addaef4fb110189d1..9106d38e406003cd53fd690ca66ee8e98630e4e3 100644 (file)
@@ -41,7 +41,8 @@ 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
-overridden by using the `--track` and `--no-track` options.
+overridden by using the `--track` and `--no-track` options, and
+changed later using `git branch --set-upstream`.
 
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
 If <oldbranch> had a corresponding reflog, it is renamed to match