X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-branch.txt;h=6103d62fe3dca23c78b16dbdbb5ba231a6b39bf7;hb=5c7eee03da32ac8ff5e91159670558b0d7fb9b1a;hp=450f90368f74ce104adaea4d8f290dbd99eb84e1;hpb=049716b370f2cebdbdeb278eb2a8c4eff8ed0acd;p=git.git diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 450f90368..6103d62fe 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -8,12 +8,12 @@ git-branch - List, create, or delete branches SYNOPSIS -------- [verse] -'git-branch' [--color | --no-color] [-r | -a] +'git branch' [--color | --no-color] [-r | -a] [-v [--abbrev= | --no-abbrev]] [(--merged | --no-merged | --contains) []] -'git-branch' [--track | --no-track] [-l] [-f] [] -'git-branch' (-m | -M) [] -'git-branch' (-d | -D) [-r] ... +'git branch' [--track | --no-track] [-l] [-f] [] +'git branch' (-m | -M) [] +'git branch' (-d | -D) [-r] ... DESCRIPTION ----------- @@ -40,7 +40,7 @@ working tree to it; use "git checkout " to switch to the new branch. When a local branch is started off a remote branch, git sets up the -branch so that linkgit:git-pull[1] will appropriately merge from +branch so that 'git-pull' will appropriately merge from the remote 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. @@ -57,7 +57,7 @@ has a reflog then the reflog will also be deleted. Use -r together with -d to delete remote-tracking branches. Note, that it only makes sense to delete remote-tracking branches if they no longer exist -in remote repository or if linkgit:git-fetch[1] was configured not to fetch +in remote repository or if 'git-fetch' was configured not to fetch them again. See also 'prune' subcommand of linkgit:git-remote[1] for way to clean up all obsolete remote-tracking branches. @@ -110,14 +110,14 @@ OPTIONS Display the full sha1s in output listing rather than abbreviating them. --track:: - When creating a new branch, set up configuration so that git-pull + When creating a new branch, set up configuration so that 'git-pull' will automatically retrieve data from the start point, which must be a branch. Use this if you always pull from the same upstream branch into the new branch, and if you don't want to use "git pull " explicitly. This behavior is the default when the start point is a remote branch. Set the branch.autosetupmerge configuration variable to `false` if you want - git-checkout and git-branch to always behave as if '--no-track' were + 'git-checkout' and 'git-branch' to always behave as if '--no-track' were given. Set it to `always` if you want this behavior when the start-point is either a local or remote branch. @@ -205,7 +205,7 @@ but different purposes: Author ------ -Written by Linus Torvalds and Junio C Hamano +Written by Linus Torvalds and Junio C Hamano Documentation --------------