diff options
| author | Federico Mena Quintero <federico@novell.com> | 2007-10-02 18:33:30 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-02 17:26:52 -0700 |
| commit | 84d176cef65ad23e11643d463c69ad313b728eda (patch) | |
| tree | 907bfbb737ba3b6c0023ddc93daf590ad392b413 | |
| parent | ac150747d7cc62d53daf9f7c128a0fa88a399f44 (diff) | |
| download | git-84d176cef65ad23e11643d463c69ad313b728eda.tar.gz git-84d176cef65ad23e11643d463c69ad313b728eda.tar.xz | |
Add documentation for --track and --no-track to the git-branch docs.
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-branch.txt | 15 |
1 files changed, 15 insertions, 0 deletions
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 <repository> <refspec>" 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. + <branchname>:: The name of the branch to create or delete. The new branch name must pass all checks defined by |