diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
| commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
| tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /git-checkout.txt | |
| parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
| download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz | |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index 3ad9760a4..c0f9c6e88 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -8,8 +8,8 @@ git-checkout - Checkout a branch or paths to the working tree SYNOPSIS -------- [verse] -'git-checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] -'git-checkout' [<tree-ish>] <paths>... +'git checkout' [-q] [-f] [[--track | --no-track] -b <new_branch> [-l]] [-m] [<branch>] +'git checkout' [<tree-ish>] <paths>... DESCRIPTION ----------- @@ -23,7 +23,7 @@ options, which will be passed to `git branch`. When <paths> are given, this command does *not* switch branches. It updates the named paths in the working tree from -the index file (i.e. it runs `git-checkout-index -f -u`), or +the index file (i.e. it runs `git checkout-index -f -u`), or from a named commit. In this case, the `-f` and `-b` options are meaningless and giving either of them results in an error. <tree-ish> argument can be @@ -49,14 +49,14 @@ OPTIONS -t:: --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 <repository> <refspec>" 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. @@ -112,7 +112,7 @@ current branch and directly point at the commit named by the tag (`v2.6.18` in the above example). You can use usual git commands while in this state. You can use -`git-reset --hard $othercommit` to further move around, for +`git reset --hard $othercommit` to further move around, for example. You can make changes and create a new commit on top of a detached HEAD. You can even create a merge by using `git merge $othercommit`. |