From: Federico Mena Quintero Date: Tue, 18 Sep 2007 01:10:05 GMT Subject: [PATCH 2/4] Copy the docs for --track and --notrack from git-checkout to git-branch Message-ID: <1190077805.22387.61.camel@cacharro.xalalinux.org> In-Reply-To: <1190077493.22387.54.camel@cacharro.xalalinux.org> The docs for git-branch did not mention --track and --notrack in the OPTIONS section. Signed-off-by: Federico Mena Quintero --- Documentation/git-branch.txt | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 47e6f49..8b98b52 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -93,6 +93,20 @@ 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, otherwise you'll have 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 -- 1.5.2.4