From 4eec6f988dc1638ff5b5ee3131f7452d29042a61 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 2 Nov 2010 16:31:28 +0100 Subject: [PATCH] git-branch.txt: mention --set-upstream as a way to change upstream configuration Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- Documentation/git-branch.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 7f23c5682f..9106d38e40 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 -- 2.11.4.GIT