From: Matthieu Moy Date: Tue, 2 Nov 2010 15:31:28 +0000 (+0100) Subject: git-branch.txt: mention --set-upstream as a way to change upstream configuration X-Git-Tag: v1.7.4-rc0~122^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4eec6f988dc1638ff5b5ee3131f7452d29042a61;p=git.git git-branch.txt: mention --set-upstream as a way to change upstream configuration Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 7f23c5682..9106d38e4 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -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, will be renamed to . If had a corresponding reflog, it is renamed to match