diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-10 15:29:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-10 15:29:34 -0700 |
| commit | 823eebb8a31b328e252543cfa25ebf5c575fa6d8 (patch) | |
| tree | dfd5992a4dc3ebf603b43ea8b24f3c47e7b7796d /git-checkout.txt | |
| parent | 2f7978279c72985d4856b2bd0fdde97473366213 (diff) | |
| download | git-htmldocs-823eebb8a31b328e252543cfa25ebf5c575fa6d8.tar.gz | |
Autogenerated HTML docs for v2.5.0-rc1-32-ge59f6
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index d263a5652..2df6d0d4b 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -3,7 +3,7 @@ git-checkout(1) NAME ---- -git-checkout - Checkout a branch or paths to the working tree +git-checkout - Switch branches or restore working tree files SYNOPSIS -------- @@ -89,6 +89,10 @@ Omitting <branch> detaches HEAD at the tip of the current branch. (i.e. commit, tag or tree) to update the index for the given paths before updating the working tree. + +'git checkout' with <paths> or `--patch` is used to restore modified or +deleted paths to their original contents from the index or replace paths +with the contents from a named <tree-ish> (most often a commit-ish). ++ The index may contain unmerged entries because of a previous failed merge. By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out. |