development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tb/checkout-doc'

Browse source 
Doc update.

* tb/checkout-doc:
  git-checkout.txt: document "git checkout <pathspec>" better
This commit is contained in:
Junio C Hamano 2015-07-10 14:17:54 -07:00
parent bbddc51664 c4ac525c84
commit e12fc40a15
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/git-checkout.txt
View file

@ -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.