diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-04-17 08:28:11 +0000 |
| commit | 0e3cb537e5dee1347d53fc91ed855a1e84127503 (patch) | |
| tree | 96798e6364c62384423f5a2490c9630dfea97a60 /git-checkout.txt | |
| parent | 29ee16327f63eaf6dfd0a3348669ea607e921032 (diff) | |
| download | git-htmldocs-0e3cb537e5dee1347d53fc91ed855a1e84127503.tar.gz | |
Autogenerated HTML docs for v1.5.1.1-135-gf948
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index f5b2d5017..4f2e847dc 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -23,9 +23,9 @@ 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 a -named commit. In -this case, `-f` and `-b` options are meaningless and giving +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 used to specify a specific tree-ish (i.e. commit, tag or tree) to update the index for the given paths before updating the @@ -38,7 +38,8 @@ OPTIONS Quiet, supress feedback messages. -f:: - Force a re-read of everything. + Proceed even if the index or the working tree differs + from HEAD. This is used to throw away local changes. -b:: Create a new branch named <new_branch> and start it at @@ -48,13 +49,17 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, - setup so that git-pull will automatically retrieve data from - the remote branch. + set up configuration so that git-pull will automatically + retrieve data from the remote branch. 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, - force that git-pull will automatically retrieve data from - the remote branch independent of the configuration settings. + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. -l:: Create the new branch's ref log. This activates recording of |