{"thread":{"id":"33418","subject":"[PATCH v2 0/3] Some small fixes to glossary-content.txt","startedAt":"2013-04-07T15:06:37Z","lastAt":"2013-04-07T19:14:07Z","messageCount":8,"participants":["Thomas Ackermann","Junio C Hamano","Simon Ruderich"],"isPatch":true,"patchVersion":2,"patchTotal":3},"messages":[{"id":"213408","messageId":"1613609657.1719438.1365347197409.JavaMail.ngmail@webmail09.arcor-online.net","threadId":"33418","inReplyTo":null,"subject":"[PATCH v2 0/3] Some small fixes to glossary-content.txt","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-07T15:06:37Z","receivedAt":"2013-04-07T15:06:37Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"This is a reroll of my patches for glossary-content.txt\nwith Junio's comments/suggestions included:\n\n[PATCH 1/3] glossary: remove outdated/misleading/irrelevant entries\n- keep entries for \"directory\" and \"evil merge\"\n- keep comparison of \"Git tag\" to \"Lisp tag\"\n[PATCH 2/3] glossary: improve description of SHA-1 related topics\n- more suitable description for \"object name\"\n- use \"SHA-1\" instead of \"SHA1\"\n[PATCH 3/3] glossary: remove definition of refspec and pathspec\n- further small changes to description of refspec and pathspec\n\n\n---\nThomas\n"},{"id":"213409","messageId":"2094586774.1719611.1365347377194.JavaMail.ngmail@webmail09.arcor-online.net","threadId":"33418","inReplyTo":"1613609657.1719438.1365347197409.JavaMail.ngmail@webmail09.arcor-online.net","subject":"[PATCH v2 1/3] glossary: remove outdated/misleading/irrelevant entries","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-07T15:09:37Z","receivedAt":"2013-04-07T15:09:37Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 11 +----------\n 1 file changed, 1 insertion(+), 10 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex eb7ba84..5a7a486 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -104,9 +104,6 @@ to point at the new commit.\n \tan arbitrary <<def_commit,commit>> that isn't necessarily the tip of any\n \tparticular branch.  In this case HEAD is said to be \"detached\".\n \n-[[def_dircache]]dircache::\n-\tYou are *waaaaay* behind. See <<def_index,index>>.\n-\n [[def_directory]]directory::\n \tThe list you get with \"ls\" :-)\n \n@@ -115,11 +112,6 @@ to point at the new commit.\n \tit contains modifications which have not been <<def_commit,committed>> to the current\n \t<<def_branch,branch>>.\n \n-[[def_ent]]ent::\n-\tFavorite synonym to \"<<def_tree-ish,tree-ish>>\" by some total geeks. See\n-\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n-\texplanation. Avoid this term, not to confuse people.\n-\n [[def_evil_merge]]evil merge::\n \tAn evil merge is a <<def_merge,merge>> that introduces changes that\n \tdo not appear in any <<def_parent,parent>>.\n@@ -257,8 +249,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \t<<def_object,object>>.\n \n [[def_octopus]]octopus::\n-\tTo <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an\n-\tintelligent predator.\n+\tTo <<def_merge,merge>> more than two <<def_branch,branches>>.\n \n [[def_origin]]origin::\n \tThe default upstream <<def_repository,repository>>. Most projects have\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"213410","messageId":"824604721.1719644.1365347429662.JavaMail.ngmail@webmail09.arcor-online.net","threadId":"33418","inReplyTo":"1613609657.1719438.1365347197409.JavaMail.ngmail@webmail09.arcor-online.net","subject":"[PATCH v2 2/3] glossary: improve description of SHA-1 related topics","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-07T15:10:29Z","receivedAt":"2013-04-07T15:10:29Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 5a7a486..4dd0a52 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -153,7 +153,7 @@ to point at the new commit.\n \tcreated. Configured via the `.git/info/grafts` file.\n \n [[def_hash]]hash::\n-\tIn Git's context, synonym to <<def_object_name,object name>>.\n+\tIn Git's context, synonym for <<def_object_name,object name>>.\n \n [[def_head]]head::\n \tA <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a\n@@ -225,7 +225,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \n [[def_object]]object::\n \tThe unit of storage in Git. It is uniquely identified by the\n-\t<<def_SHA1,SHA1>> of its contents. Consequently, an\n+\t<<def_SHA1,SHA-1>> of its contents. Consequently, an\n \tobject can not be changed.\n \n [[def_object_database]]object database::\n@@ -237,10 +237,9 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tSynonym for <<def_object_name,object name>>.\n \n [[def_object_name]]object name::\n-\tThe unique identifier of an <<def_object,object>>. The <<def_hash,hash>>\n-\tof the object's contents using the Secure Hash Algorithm\n-\t1 and usually represented by the 40 character hexadecimal encoding of\n-\tthe <<def_hash,hash>> of the object.\n+\tThe unique identifier of an <<def_object,object>>.  The\n+\tobject name is usually represented by a 40 character\n+\thexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>\n \n [[def_object_type]]object type::\n \tOne of the identifiers \"<<def_commit_object,commit>>\",\n@@ -376,7 +375,7 @@ should not be combined with other pathspec.\n \tto the result.\n \n [[def_ref]]ref::\n-\tA 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that\n+\tA 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that\n \tdenotes a particular <<def_object,object>>. They may be stored in\n \ta file under `$GIT_DIR/refs/` directory, or\n \tin the `$GIT_DIR/packed-refs` file.\n@@ -432,8 +431,9 @@ should not be combined with other pathspec.\n [[def_SCM]]SCM::\n \tSource code management (tool).\n \n-[[def_SHA1]]SHA1::\n-\tSynonym for <<def_object_name,object name>>.\n+[[def_SHA1]]SHA-1::\n+\t\"Secure Hash Algorithm 1\"; a cryptographic hash function. \n+\tIn the context of Git used as a synonym for <<def_object_name,object name>>.\n \n [[def_shallow_repository]]shallow repository::\n \tA shallow <<def_repository,repository>> has an incomplete\n@@ -447,7 +447,7 @@ should not be combined with other pathspec.\n \tits history can be later deepened with linkgit:git-fetch[1].\n \n [[def_symref]]symref::\n-\tSymbolic reference: instead of containing the <<def_SHA1,SHA1>>\n+\tSymbolic reference: instead of containing the <<def_SHA1,SHA-1>>\n \tid itself, it is of the format 'ref: refs/some/thing' and when\n \treferenced, it recursively dereferences to this reference.\n \t'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"213411","messageId":"1013848876.1719712.1365347486383.JavaMail.ngmail@webmail09.arcor-online.net","threadId":"33418","inReplyTo":"1613609657.1719438.1365347197409.JavaMail.ngmail@webmail09.arcor-online.net","subject":"[PATCH v2 3/3] glossary: remove definition of refspec and pathspec","fromName":"Thomas Ackermann","fromEmail":"th.acker@arcor.de","sentAt":"2013-04-07T15:11:26Z","receivedAt":"2013-04-07T15:11:26Z","isPatch":true,"sender":{"key":"th.acker@arcor.de","avatar":"https://avatars.githubusercontent.com/u/1358536?v=4"},"body":"\nSigned-off-by: Thomas Ackermann <th.acker@arcor.de>\n---\n Documentation/glossary-content.txt | 64 ++------------------------------------\n 1 file changed, 2 insertions(+), 62 deletions(-)\n\ndiff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\nindex 4dd0a52..f21678d 100644\n--- a/Documentation/glossary-content.txt\n+++ b/Documentation/glossary-content.txt\n@@ -268,59 +268,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n \tpack.\n \n [[def_pathspec]]pathspec::\n-       Pattern used to specify paths.\n-+\n-Pathspecs are used on the command line of \"git ls-files\", \"git\n-ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\",\n-and many other commands to\n-limit the scope of operations to some subset of the tree or\n-worktree.  See the documentation of each command for whether\n-paths are relative to the current directory or toplevel.  The\n-pathspec syntax is as follows:\n-\n-* any path matches itself\n-* the pathspec up to the last slash represents a\n-  directory prefix.  The scope of that pathspec is\n-  limited to that subtree.\n-* the rest of the pathspec is a pattern for the remainder\n-  of the pathname.  Paths relative to the directory\n-  prefix will be matched against that pattern using fnmatch(3);\n-  in particular, '*' and '?' _can_ match directory separators.\n-+\n-For example, Documentation/*.jpg will match all .jpg files\n-in the Documentation subtree,\n-including Documentation/chapter_1/figure_1.jpg.\n-\n-+\n-A pathspec that begins with a colon `:` has special meaning.  In the\n-short form, the leading colon `:` is followed by zero or more \"magic\n-signature\" letters (which optionally is terminated by another colon `:`),\n-and the remainder is the pattern to match against the path. The optional\n-colon that terminates the \"magic signature\" can be omitted if the pattern\n-begins with a character that cannot be a \"magic signature\" and is not a\n-colon.\n-+\n-In the long form, the leading colon `:` is followed by a open\n-parenthesis `(`, a comma-separated list of zero or more \"magic words\",\n-and a close parentheses `)`, and the remainder is the pattern to match\n-against the path.\n-+\n-The \"magic signature\" consists of an ASCII symbol that is not\n-alphanumeric.\n-+\n---\n-top `/`;;\n-\tThe magic word `top` (mnemonic: `/`) makes the pattern match\n-\tfrom the root of the working tree, even when you are running\n-\tthe command from inside a subdirectory.\n---\n-+\n-Currently only the slash `/` is recognized as the \"magic signature\",\n-but it is envisioned that we will support more types of magic in later\n-versions of Git.\n-+\n-A pathspec with only a colon means \"there is no pathspec\". This form\n-should not be combined with other pathspec.\n+       Pattern used to limit paths in Git commands.\n \n [[def_parent]]parent::\n \tA <<def_commit_object,commit object>> contains a (possibly empty) list\n@@ -389,15 +337,7 @@ should not be combined with other pathspec.\n [[def_refspec]]refspec::\n \tA \"refspec\" is used by <<def_fetch,fetch>> and\n \t<<def_push,push>> to describe the mapping between remote\n-\t<<def_ref,ref>> and local ref. They are combined with a colon in\n-\tthe format <src>:<dst>, preceded by an optional plus sign, +.\n-\tFor example: `git fetch $URL\n-\trefs/heads/master:refs/heads/origin` means \"grab the master\n-\t<<def_branch,branch>> <<def_head,head>> from the $URL and store\n-\tit as my origin branch head\". And `git push\n-\t$URL refs/heads/master:refs/heads/to-upstream` means \"publish my\n-\tmaster branch head as to-upstream branch at $URL\". See also\n-\tlinkgit:git-push[1].\n+\t<<def_ref,ref>> and local ref. \n \n [[def_remote_tracking_branch]]remote-tracking branch::\n \tA regular Git <<def_branch,branch>> that is used to follow changes from\n-- \n1.8.1.msysgit.1\n\n\n---\nThomas\n"},{"id":"213428","messageId":"7vobdq45ku.fsf@alter.siamese.dyndns.org","threadId":"33418","inReplyTo":"2094586774.1719611.1365347377194.JavaMail.ngmail@webmail09.arcor-online.net","subject":"Re: [PATCH v2 1/3] glossary: remove outdated/misleading/irrelevant entries","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-07T17:24:17Z","receivedAt":"2013-04-07T17:24:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> -[[def_dircache]]dircache::\n> -\tYou are *waaaaay* behind. See <<def_index,index>>.\n> -\n> ...\n> -[[def_ent]]ent::\n> -\tFavorite synonym to \"<<def_tree-ish,tree-ish>>\" by some total geeks. See\n> -\thttp://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth\n> -\texplanation. Avoid this term, not to confuse people.\n> -\n> ...\n>  [[def_octopus]]octopus::\n> -\tTo <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an\n> -\tintelligent predator.\n> +\tTo <<def_merge,merge>> more than two <<def_branch,branches>>.\n\n\nI agree that these are distracting and confusing than useful\nhistorical references to our target audience.  People from an\nearlier days of the project may miss the occasional entries with\nthese \"fun\" phrasing, but we are no longer the primary target of\nglossary.\n\nWill queue unless others object.  Thanks.\n"},{"id":"213429","messageId":"7vhaji45jv.fsf@alter.siamese.dyndns.org","threadId":"33418","inReplyTo":"824604721.1719644.1365347429662.JavaMail.ngmail@webmail09.arcor-online.net","subject":"Re: [PATCH v2 2/3] glossary: improve description of SHA-1 related topics","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-07T17:24:52Z","receivedAt":"2013-04-07T17:24:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n> ---\n\nThe readers of the history may still want to see \"improve how\"\nexplained in the log.\n\n\tThe name of the hash function is \"SHA-1\", not \"SHA1\".\n\n\tAlso to people who look up \"object name\" in the glossary,\n\tthe details of which hash function is applied on what to\n\tcompute \"object name\" is not important (the fact that the\n\tname is meant to be an unique identifier for the contents\n\tstored in the object is).\n\nor something?\n\n(no review comment below this line; patch kept for others' reference)\n\n>  Documentation/glossary-content.txt | 20 ++++++++++----------\n>  1 file changed, 10 insertions(+), 10 deletions(-)\n>\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index 5a7a486..4dd0a52 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -153,7 +153,7 @@ to point at the new commit.\n>  \tcreated. Configured via the `.git/info/grafts` file.\n>  \n>  [[def_hash]]hash::\n> -\tIn Git's context, synonym to <<def_object_name,object name>>.\n> +\tIn Git's context, synonym for <<def_object_name,object name>>.\n>  \n>  [[def_head]]head::\n>  \tA <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a\n> @@ -225,7 +225,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n>  \n>  [[def_object]]object::\n>  \tThe unit of storage in Git. It is uniquely identified by the\n> -\t<<def_SHA1,SHA1>> of its contents. Consequently, an\n> +\t<<def_SHA1,SHA-1>> of its contents. Consequently, an\n>  \tobject can not be changed.\n>  \n>  [[def_object_database]]object database::\n> @@ -237,10 +237,9 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n>  \tSynonym for <<def_object_name,object name>>.\n>  \n>  [[def_object_name]]object name::\n> -\tThe unique identifier of an <<def_object,object>>. The <<def_hash,hash>>\n> -\tof the object's contents using the Secure Hash Algorithm\n> -\t1 and usually represented by the 40 character hexadecimal encoding of\n> -\tthe <<def_hash,hash>> of the object.\n> +\tThe unique identifier of an <<def_object,object>>.  The\n> +\tobject name is usually represented by a 40 character\n> +\thexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>\n>  \n>  [[def_object_type]]object type::\n>  \tOne of the identifiers \"<<def_commit_object,commit>>\",\n> @@ -376,7 +375,7 @@ should not be combined with other pathspec.\n>  \tto the result.\n>  \n>  [[def_ref]]ref::\n> -\tA 40-byte hex representation of a <<def_SHA1,SHA1>> or a name that\n> +\tA 40-byte hex representation of a <<def_SHA1,SHA-1>> or a name that\n>  \tdenotes a particular <<def_object,object>>. They may be stored in\n>  \ta file under `$GIT_DIR/refs/` directory, or\n>  \tin the `$GIT_DIR/packed-refs` file.\n> @@ -432,8 +431,9 @@ should not be combined with other pathspec.\n>  [[def_SCM]]SCM::\n>  \tSource code management (tool).\n>  \n> -[[def_SHA1]]SHA1::\n> -\tSynonym for <<def_object_name,object name>>.\n> +[[def_SHA1]]SHA-1::\n> +\t\"Secure Hash Algorithm 1\"; a cryptographic hash function. \n> +\tIn the context of Git used as a synonym for <<def_object_name,object name>>.\n>  \n>  [[def_shallow_repository]]shallow repository::\n>  \tA shallow <<def_repository,repository>> has an incomplete\n> @@ -447,7 +447,7 @@ should not be combined with other pathspec.\n>  \tits history can be later deepened with linkgit:git-fetch[1].\n>  \n>  [[def_symref]]symref::\n> -\tSymbolic reference: instead of containing the <<def_SHA1,SHA1>>\n> +\tSymbolic reference: instead of containing the <<def_SHA1,SHA-1>>\n>  \tid itself, it is of the format 'ref: refs/some/thing' and when\n>  \treferenced, it recursively dereferences to this reference.\n>  \t'<<def_HEAD,HEAD>>' is a prime example of a symref. Symbolic\n"},{"id":"213430","messageId":"7va9pa45jf.fsf@alter.siamese.dyndns.org","threadId":"33418","inReplyTo":"1013848876.1719712.1365347486383.JavaMail.ngmail@webmail09.arcor-online.net","subject":"Re: [PATCH v2 3/3] glossary: remove definition of refspec and pathspec","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-07T17:25:08Z","receivedAt":"2013-04-07T17:25:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Ackermann <th.acker@arcor.de> writes:\n\n> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n\nIt looks, at least to me, that the patch is about \"give only\ndefinitions for refspec and pathspec\" removing other excessive\ninformation that are better left to the real manual pages.\n\n\tSubject: glossary: just define refspec and pathspec\n\n\tIn the glossary, just describe what it is and what it is for\n\tto define these terms.  How to formulate and use refspec and\n\tpathspec are already described in the documentation for X\n\tand Y, respectively.\n\nor something, perhaps?  By the way, what are the values of X and Y?\nIf there is none, some of the text lost by this patch need to be\nmoved to and massaged to match the flow of some documentation pages\nthat currently lack these information.\n\n> ---\n>  Documentation/glossary-content.txt | 64 ++------------------------------------\n>  1 file changed, 2 insertions(+), 62 deletions(-)\n>\n> diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt\n> index 4dd0a52..f21678d 100644\n> --- a/Documentation/glossary-content.txt\n> +++ b/Documentation/glossary-content.txt\n> @@ -268,59 +268,7 @@ This commit is referred to as a \"merge commit\", or sometimes just a\n>  \tpack.\n>  \n>  [[def_pathspec]]pathspec::\n> -       Pattern used to specify paths.\n> -+\n> -Pathspecs are used on the command line of \"git ls-files\", \"git\n> -ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\",\n> -and many other commands to\n> -limit the scope of operations to some subset of the tree or\n> -worktree.  See the documentation of each command for whether\n> -paths are relative to the current directory or toplevel.  The\n> -pathspec syntax is as follows:\n> -\n> -* any path matches itself\n> -* the pathspec up to the last slash represents a\n> -  directory prefix.  The scope of that pathspec is\n> -  limited to that subtree.\n> -* the rest of the pathspec is a pattern for the remainder\n> -  of the pathname.  Paths relative to the directory\n> -  prefix will be matched against that pattern using fnmatch(3);\n> -  in particular, '*' and '?' _can_ match directory separators.\n> -+\n> -For example, Documentation/*.jpg will match all .jpg files\n> -in the Documentation subtree,\n> -including Documentation/chapter_1/figure_1.jpg.\n> -\n> -+\n> -A pathspec that begins with a colon `:` has special meaning.  In the\n> -short form, the leading colon `:` is followed by zero or more \"magic\n> -signature\" letters (which optionally is terminated by another colon `:`),\n> -and the remainder is the pattern to match against the path. The optional\n> -colon that terminates the \"magic signature\" can be omitted if the pattern\n> -begins with a character that cannot be a \"magic signature\" and is not a\n> -colon.\n> -+\n> -In the long form, the leading colon `:` is followed by a open\n> -parenthesis `(`, a comma-separated list of zero or more \"magic words\",\n> -and a close parentheses `)`, and the remainder is the pattern to match\n> -against the path.\n> -+\n> -The \"magic signature\" consists of an ASCII symbol that is not\n> -alphanumeric.\n> -+\n> ---\n> -top `/`;;\n> -\tThe magic word `top` (mnemonic: `/`) makes the pattern match\n> -\tfrom the root of the working tree, even when you are running\n> -\tthe command from inside a subdirectory.\n> ---\n> -+\n> -Currently only the slash `/` is recognized as the \"magic signature\",\n> -but it is envisioned that we will support more types of magic in later\n> -versions of Git.\n> -+\n> -A pathspec with only a colon means \"there is no pathspec\". This form\n> -should not be combined with other pathspec.\n> +       Pattern used to limit paths in Git commands.\n>  \n>  [[def_parent]]parent::\n>  \tA <<def_commit_object,commit object>> contains a (possibly empty) list\n> @@ -389,15 +337,7 @@ should not be combined with other pathspec.\n>  [[def_refspec]]refspec::\n>  \tA \"refspec\" is used by <<def_fetch,fetch>> and\n>  \t<<def_push,push>> to describe the mapping between remote\n> -\t<<def_ref,ref>> and local ref. They are combined with a colon in\n> -\tthe format <src>:<dst>, preceded by an optional plus sign, +.\n> -\tFor example: `git fetch $URL\n> -\trefs/heads/master:refs/heads/origin` means \"grab the master\n> -\t<<def_branch,branch>> <<def_head,head>> from the $URL and store\n> -\tit as my origin branch head\". And `git push\n> -\t$URL refs/heads/master:refs/heads/to-upstream` means \"publish my\n> -\tmaster branch head as to-upstream branch at $URL\". See also\n> -\tlinkgit:git-push[1].\n> +\t<<def_ref,ref>> and local ref. \n>  \n>  [[def_remote_tracking_branch]]remote-tracking branch::\n>  \tA regular Git <<def_branch,branch>> that is used to follow changes from\n"},{"id":"213454","messageId":"20130407191407.GA13708@ruderich.org","threadId":"33418","inReplyTo":"824604721.1719644.1365347429662.JavaMail.ngmail@webmail09.arcor-online.net","subject":"Re: [PATCH v2 2/3] glossary: improve description of SHA-1 related topics","fromName":"Simon Ruderich","fromEmail":"simon@ruderich.org","sentAt":"2013-04-07T19:14:07Z","receivedAt":"2013-04-07T19:14:07Z","isPatch":true,"sender":{"key":"simon@ruderich.org","avatar":"https://avatars.githubusercontent.com/u/390994?v=4"},"body":"On Sun, Apr 07, 2013 at 05:10:29PM +0200, Thomas Ackermann wrote:\n> Signed-off-by: Thomas Ackermann <th.acker@arcor.de>\n> ---\n> [snip]\n>\n>  [[def_object_name]]object name::\n> -\tThe unique identifier of an <<def_object,object>>. The <<def_hash,hash>>\n> -\tof the object's contents using the Secure Hash Algorithm\n> -\t1 and usually represented by the 40 character hexadecimal encoding of\n> -\tthe <<def_hash,hash>> of the object.\n> +\tThe unique identifier of an <<def_object,object>>.  The\n> +\tobject name is usually represented by a 40 character\n> +\thexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>\n                                                                        ^\nTrailing . missing.\n\nRegards\nSimon\n-- \n+ privacy is necessary\n+ using gnupg http://gnupg.org\n+ public key id: 0x92FEFDB7E44C32F9\n"}]}