{"thread":{"id":"1575","subject":"Subject: [PATCH] Updates to glossary","startedAt":"2005-08-18T19:17:47Z","lastAt":"2005-08-18T21:36:44Z","messageCount":5,"participants":["Johannes Schindelin","Daniel Barkalow","Matthias Urlichs"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"7513","messageId":"Pine.LNX.4.63.0508182117160.6210@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1575","inReplyTo":null,"subject":"Subject: [PATCH] Updates to glossary","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-18T19:17:47Z","receivedAt":"2005-08-18T19:17:47Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Changes to the descriptions of tree and tag objects, a link for ent, and\ndescriptions for rewind, rebase and core git were added.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n---\n\n Documentation/glossary.txt |   28 ++++++++++++++++++++++------\n 1 files changed, 22 insertions(+), 6 deletions(-)\n\n83d69aaac371160ea0da0a6de6c9898c8f6915b2\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -26,9 +26,9 @@ blob object::\n \tUntyped object, e.g. the contents of a file.\n \n tree object::\n-\tAn object containing a list of blob and/or tree objects.\n-\t(A tree usually corresponds to a directory without\n-\tsubdirectories).\n+\tAn object containing a list of file names and modes along with refs\n+\tto the associated blob and/or tree objects. A tree object is\n+\tequivalent to a directory.\n \n tree::\n \tEither a working tree, or a tree object together with the\n@@ -118,11 +118,14 @@ tree-ish::\n \ttag object pointing to a tag or commit or tree object.\n \n ent::\n-\tFavorite synonym to \"tree-ish\" by some total geeks.\n+\tFavorite synonym to \"tree-ish\" by some total geeks. See\n+\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n+\texplanation.\n \n tag object::\n-\tAn object containing a ref pointing to another object. It can\n-\tcontain a (PGP) signature, in which case it is called \"signed\n+\tAn object containing a ref pointing to another object, which can\n+\tcontain a message just like a commit object. It can also\n+\tcontain a (PGP) signature, in which case it is called a \"signed\n \ttag object\".\n \n tag::\n@@ -143,6 +146,15 @@ resolve::\n \tThe action of fixing up manually what a failed automatic merge\n \tleft behind.\n \n+rewind::\n+\tTo throw away part of the development, i.e. to assign the head to\n+\tan earlier revision.\n+\n+rebase::\n+\tTo clean a branch by starting from the head of the main line of\n+\tdevelopment (\"master\"), and reapply the (possibly cherry-picked)\n+\tchanges from that branch.\n+\n repository::\n \tA collection of refs together with an object database containing\n \tall objects, which are reachable from the refs, possibly accompanied\n@@ -196,6 +208,10 @@ pack index::\n \tThe list of identifiers, and other information, of the objects in a\n \tpack, to assist in efficiently accessing the contents of a pack. \n \n+core git::\n+\tFundamental data structures and utilities of git. Exposes only\n+\tlimited source code management tools.\n+\n plumbing::\n \tCute name for core git.\n \n"},{"id":"7518","messageId":"pan.2005.08.18.21.15.02.716698@smurf.noris.de","threadId":"1575","inReplyTo":"Pine.LNX.4.63.0508182117160.6210@wgmdd8.biozentrum.uni-wuerzburg.de","subject":"Re: Subject: [PATCH] Updates to glossary","fromName":"Matthias Urlichs","fromEmail":"smurf@smurf.noris.de","sentAt":"2005-08-18T21:15:04Z","receivedAt":"2005-08-18T21:15:04Z","isPatch":true,"sender":{"key":"matthias@urlichs.de","avatar":"https://gravatar.com/avatar/2708905af227313eba6f2b2ae0f7d0259b5ac5d71baef58fe5a13c699ce0bbf0?d=mp&s=160"},"body":"Hi, Johannes Schindelin wrote:\n\n> Subject: Subject: [PATCH] Updates to glossary\n\nSomething is stuttering here -- one \"Subject:\" is quite sufficient.\n\n-- \nMatthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de\nDisclaimer: The quote was selected randomly. Really. | http://smurf.noris.de\n - -\nHarris's Lament:\n\tAll the good ones are taken.\n"},{"id":"7517","messageId":"Pine.LNX.4.63.0508181702051.23242@iabervon.org","threadId":"1575","inReplyTo":"Pine.LNX.4.63.0508182117160.6210@wgmdd8.biozentrum.uni-wuerzburg.de","subject":"Re: Subject: [PATCH] Updates to glossary","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2005-08-18T21:17:34Z","receivedAt":"2005-08-18T21:17:34Z","isPatch":true,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Thu, 18 Aug 2005, Johannes Schindelin wrote:\n\n>  tree object::\n> -\tAn object containing a list of blob and/or tree objects.\n> -\t(A tree usually corresponds to a directory without\n> -\tsubdirectories).\n> +\tAn object containing a list of file names and modes along with refs\n> +\tto the associated blob and/or tree objects. A tree object is\n> +\tequivalent to a directory.\n\nActually, it contains object names, not refs, to be completely precise.\n(refs would imply an additional indirection.)\n\n\t-Daniel\n*This .sig left intentionally blank*\n"},{"id":"7519","messageId":"Pine.LNX.4.63.0508182334290.6724@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1575","inReplyTo":"pan.2005.08.18.21.15.02.716698@smurf.noris.de","subject":"Re: Subject: [PATCH] Updates to glossary","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-18T21:35:17Z","receivedAt":"2005-08-18T21:35:17Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 18 Aug 2005, Matthias Urlichs wrote:\n\n> Hi, Johannes Schindelin wrote:\n> \n> > Subject: Subject: [PATCH] Updates to glossary\n> \n> Something is stuttering here -- one \"Subject:\" is quite sufficient.\n\nSubject! Subject! Subject! ;-)\n\nMy bad.\nDscho\n"},{"id":"7520","messageId":"Pine.LNX.4.63.0508182336240.6724@wgmdd8.biozentrum.uni-wuerzburg.de","threadId":"1575","inReplyTo":"Pine.LNX.4.63.0508181702051.23242@iabervon.org","subject":"Re: Subject: [PATCH] Updates to glossary","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2005-08-18T21:36:44Z","receivedAt":"2005-08-18T21:36:44Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 18 Aug 2005, Daniel Barkalow wrote:\n\n> On Thu, 18 Aug 2005, Johannes Schindelin wrote:\n> \n> >  tree object::\n> > -\tAn object containing a list of blob and/or tree objects.\n> > -\t(A tree usually corresponds to a directory without\n> > -\tsubdirectories).\n> > +\tAn object containing a list of file names and modes along with refs\n> > +\tto the associated blob and/or tree objects. A tree object is\n> > +\tequivalent to a directory.\n> \n> Actually, it contains object names, not refs, to be completely precise.\n> (refs would imply an additional indirection.)\n\nAgree.\nDscho\n"}]}