Documentation/git-checkout: Update summary to reflect current abilities
For a while now, git-checkout has been more powerful than the man-page summary would suggest (the main text does describe the new features), so update the summary to hopefully better reflect the current functionality. Also update the glossary description of the word checkout. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Julian Phillips committed
Mar 24, 2008 at 03:06 UTC
76ce946294bd17f350c7c0a3927d8986b73ed480
2 files changed
+7
-4
Documentation/git-checkout.txt
+1
-1
@@ -3,7 +3,7 @@ git-checkout(1)
3
4
NAME
5
----
6
-git-checkout - Checkout and switch to a branch
6
+git-checkout - Checkout a branch or paths to the working tree
7
8
SYNOPSIS
9
--------
Documentation/glossary.txt
+6
-3
@@ -45,9 +45,12 @@ GIT Glossary
45
"changesets" with git.
46
47
[[def_checkout]]checkout::
48
- The action of updating the <<def_working_tree,working tree>> to a
49
- <<def_revision,revision>> which was stored in the
50
- <<def_object_database,object database>>.
48
+ The action of updating all or part of the
49
+ <<def_working_tree,working tree>> with a <<def_tree_object,tree object>>
50
+ or <<def_blob_object,blob>> from the
51
+ <<def_object_database,object database>>, and updating the
52
+ <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has
53
+ been pointed at a new <<def_branch,branch>>.
54
55
[[def_cherry-picking]]cherry-picking::
56
In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of