X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fglossary.txt;h=51b63532b67870960351bf6942f7baf7a7a64c6f;hb=31a3c6bb45aa61e45f1663871620eaf742f0abbb;hp=ab4caf4e26c77e64679250e291279ee0f9c9c42a;hpb=f85fd3f0d1213a2b714fddc7a834817aceeca932;p=git.git 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 <> to a - <> which was stored in the - <>. + The action of updating all or part of the + <> with a <> + or <> from the + <>, and updating the + <> and <> if the whole working tree has + been pointed at a new <>. [[def_cherry-picking]]cherry-picking:: In <> jargon, "cherry pick" means to choose a subset of