aboutsummaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorJulian Phillips <julian@quantumfyre.co.uk>2008-03-24 03:06:20 +0000
committerJunio C Hamano <gitster@pobox.com>2008-03-25 00:00:07 -0700
commit76ce946294bd17f350c7c0a3927d8986b73ed480 (patch)
treed9519688c6be04a2e44ec5fe0063aab823eb8bfc /Documentation/glossary.txt
parent995e8df4a9de9cf7c1b98dac922d96dc6606946d (diff)
downloadgit-76ce946294bd17f350c7c0a3927d8986b73ed480.tar.gz
git-76ce946294bd17f350c7c0a3927d8986b73ed480.tar.xz
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>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index ab4caf4e2..51b63532b 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -45,9 +45,12 @@ GIT Glossary
"changesets" with git.
[[def_checkout]]checkout::
- The action of updating the <<def_working_tree,working tree>> to a
- <<def_revision,revision>> which was stored in the
- <<def_object_database,object database>>.
+ The action of updating all or part of the
+ <<def_working_tree,working tree>> with a <<def_tree_object,tree object>>
+ or <<def_blob_object,blob>> from the
+ <<def_object_database,object database>>, and updating the
+ <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has
+ been pointed at a new <<def_branch,branch>>.
[[def_cherry-picking]]cherry-picking::
In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of