From: Matthieu Moy Date: Sat, 23 Oct 2010 16:31:21 GMT Subject: [PATCH 10/10] git-branch.txt: mention --set-upstream as a way to change upstream configuration Message-ID: <1287851481-27952-11-git-send-email-Matthieu.Moy@imag.fr> In-Reply-To: <1287851481-27952-1-git-send-email-Matthieu.Moy@imag.fr> Signed-off-by: Matthieu Moy --- Documentation/git-branch.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 7f23c56..9106d38 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 -- 1.7.3.2.537.g7e355