kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Matthieu Moy 2010-11-02 16:31:28 +01:00 committed by Junio C Hamano
parent 45dfd40396
commit 4eec6f988d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-branch.txt
View 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 branch so that 'git pull' will appropriately merge from
the remote-tracking branch. This behavior may be changed via the global the remote-tracking branch. This behavior may be changed via the global
`branch.autosetupmerge` configuration flag. That setting can be `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>. With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
If <oldbranch> had a corresponding reflog, it is renamed to match If <oldbranch> had a corresponding reflog, it is renamed to match