From: Federico Mena Quintero Date: Tue, 2 Oct 2007 23:33:30 +0000 (-0500) Subject: Add documentation for --track and --no-track to the git-branch docs. X-Git-Tag: v1.5.3.4~9 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=84d176cef65ad23e11643d463c69ad313b728eda;p=git.git Add documentation for --track and --no-track to the git-branch docs. Signed-off-by: Federico Mena Quintero Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 33bc31b0d..c83996149 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -91,6 +91,21 @@ OPTIONS --no-abbrev:: Display the full sha1s in output listing rather than abbreviating them. +--track:: + Set up configuration so that git-pull will automatically + retrieve data from the remote branch. Use this if you always + pull from the same remote branch into the new branch, or if you + don't want to use "git pull " explicitly. Set the + branch.autosetupmerge configuration variable to true if you + want git-checkout and git-branch to always behave as if + '--track' were given. + +--no-track:: + When -b is given and a branch is created off a remote branch, + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. + :: The name of the branch to create or delete. The new branch name must pass all checks defined by