{"thread":{"id":"26942","subject":"[PATCH 0/3] revisions.txt improvements","startedAt":"2011-03-31T11:03:06Z","lastAt":"2011-04-04T18:18:50Z","messageCount":20,"participants":["Michael J Gruber","Bert Wesarg","Jakub Narebski","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"164772","messageId":"cover.1301569271.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":null,"subject":"[PATCH 0/3] revisions.txt improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-31T11:03:06Z","receivedAt":"2011-03-31T11:03:06Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"No blurb, commit messages say it all.\n\nMichael J Gruber (3):\n revisions.txt: consistent use of quotes\n revisions.txt: structure with a labelled list\n revisions.txt: language improvements\n\n Documentation/revisions.txt | 198 +++++++++++++++++++++++--------------------\n 1 files changed, 107 insertions(+), 91 deletions(-)\n\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164773","messageId":"9ceacbc745405ffef097896afd123806e1f9bc90.1301569271.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCH 1/3] revisions.txt: consistent use of quotes","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-31T11:03:07Z","receivedAt":"2011-03-31T11:03:07Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Our use of quotes is inconsistent everywhere and within some files.\nBefore reworking the structure of revisions.txt, make the quotes\nconsistent:\n\n`git command`\n\n'some snippet or term'\n\nThe former gets typeset as code, the latter with some form of emphasis.\nthe man backend uses two types of emphasis.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 104 +++++++++++++++++++++---------------------\n 1 files changed, 52 insertions(+), 52 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 04fceee..b994bab 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -13,45 +13,45 @@ blobs contained in a commit.\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from 'git describe'; i.e. a closest tag, optionally\n+* An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n- `g`, and an abbreviated object name.\n+ 'g', and an abbreviated object name.\n \n * A symbolic ref name. E.g. 'master' typically means the commit\n- object referenced by refs/heads/master. If you\n- happen to have both heads/master and tags/master, you can\n+ object referenced by 'refs/heads/master'. If you\n+ happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n- When ambiguous, a `` is disambiguated by taking the\n+ When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if `$GIT_DIR/` exists, that is what you mean (this is usually\n- useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD`\n- and `CHERRY_PICK_HEAD`);\n+ . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n+ and 'CHERRY_PICK_HEAD');\n \n- . otherwise, `refs/` if exists;\n+ . otherwise, 'refs/' if exists;\n \n- . otherwise, `refs/tags/` if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n- . otherwise, `refs/heads/` if exists;\n+ . otherwise, 'refs/heads/' if exists;\n \n- . otherwise, `refs/remotes/` if exists;\n+ . otherwise, 'refs/remotes/' if exists;\n \n- . otherwise, `refs/remotes//HEAD` if exists.\n+ . otherwise, 'refs/remotes//HEAD' if exists.\n +\n-HEAD names the commit your changes in the working tree is based on.\n-FETCH_HEAD records the branch you fetched from a remote repository\n-with your last 'git fetch' invocation.\n-ORIG_HEAD is created by commands that moves your HEAD in a drastic\n-way, to record the position of the HEAD before their operation, so that\n+'HEAD' names the commit your changes in the working tree is based on.\n+'FETCH_HEAD' records the branch you fetched from a remote repository\n+with your last `git fetch` invocation.\n+'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+way, to record the position of the 'HEAD' before their operation, so that\n you can change the tip of the branch back to the state before you ran\n them easily.\n-MERGE_HEAD records the commit(s) you are merging into your branch\n-when you run 'git merge'.\n-CHERRY_PICK_HEAD records the commit you are cherry-picking\n-when you run 'git cherry-pick'.\n+'MERGE_HEAD' records the commit(s) you are merging into your branch\n+when you run `git merge`.\n+'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+when you run `git cherry-pick`.\n +\n-Note that any of the `refs/*` cases above may come either from\n-the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n+Note that any of the 'refs/*' cases above may come either from\n+the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n * A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n@@ -59,10 +59,10 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n- existing log ($GIT_DIR/logs/). Note that this looks up the state\n+ existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n of your *local* ref at a given time; e.g., what was in your local\n- `master` branch last week. If you want to look at commits made during\n- certain times, see `--since` and `--until`.\n+ 'master' branch last week. If you want to look at commits made during\n+ certain times, see '--since' and '--until'.\n \n * A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n@@ -70,7 +70,7 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ($GIT_DIR/logs/).\n+ log ('$GIT_DIR/logs/').\n \n * You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n@@ -98,36 +98,36 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the usage of this form.\n \n * A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. `v0.99.8{caret}\\{commit\\}`) means the object\n+ brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). `rev{caret}0`\n- introduced earlier is a short-hand for `rev{caret}\\{commit\\}`.\n+ dereferenced anymore (in which case, barf). 'rev{caret}0'\n+ introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n \n * A suffix '{caret}' followed by an empty brace pair\n- (e.g. `v0.99.8{caret}\\{\\}`) means the object could be a tag,\n+ (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n * A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. `HEAD^{/fix nasty bug}`):\n- this is the same as `:/fix nasty bug` syntax below except that\n+ pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n+ this is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the ref before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names\n+* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n '!', you have to repeat that; the special sequence ':/!',\n followed by something else than '!' is reserved for now.\n The regular expression can match any part of the commit message. To\n- match messages starting with a string, one can use e.g. `:/^foo`.\n+ match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. `HEAD:README`); this names the blob or tree\n+* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. `:README`)\n+ ':path' (with an empty part before the colon, e.g. ':README')\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -136,9 +136,9 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the same tree structure with the working tree.\n \n * A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. `:0:README`); this names a blob object in the\n+ colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. `:README`) names a stage 0 entry. During a merge, stage\n+ that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n@@ -175,31 +175,31 @@ G H I J\n SPECIFYING RANGES\n -----------------\n \n-History traversing commands such as 'git log' operate on a set\n+History traversing commands such as `git log` operate on a set\n of commits, not just a single commit. To these commands,\n specifying a single revision with the notation described in the\n previous section means the set of commits reachable from that\n commit, following the commit ancestry chain.\n \n-To exclude commits reachable from a commit, a prefix `{caret}`\n-notation is used. E.g. `{caret}r1 r2` means commits reachable\n-from `r2` but exclude the ones reachable from `r1`.\n+To exclude commits reachable from a commit, a prefix '{caret}'\n+notation is used. E.g. '{caret}r1 r2' means commits reachable\n+from 'r2' but exclude the ones reachable from 'r1'.\n \n This set operation appears so often that there is a shorthand\n-for it. When you have two commits `r1` and `r2` (named according\n+for it. When you have two commits 'r1' and 'r2' (named according\n to the syntax explained in SPECIFYING REVISIONS above), you can ask\n for commits that are reachable from r2 excluding those that are reachable\n-from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.\n+from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.\n \n-A similar notation `r1\\...r2` is called symmetric difference\n-of `r1` and `r2` and is defined as\n-`r1 r2 --not $(git merge-base --all r1 r2)`.\n+A similar notation 'r1\\...r2' is called symmetric difference\n+of 'r1' and 'r2' and is defined as\n+'r1 r2 --not $(git merge-base --all r1 r2)'.\n It is the set of commits that are reachable from either one of\n-`r1` or `r2` but not from both.\n+'r1' or 'r2' but not from both.\n \n Two other shorthands for naming a set that is formed by a commit\n-and its parent commits exist. The `r1{caret}@` notation means all\n-parents of `r1`. `r1{caret}!` includes commit `r1` but excludes\n+and its parent commits exist. The 'r1{caret}@' notation means all\n+parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes\n all of its parents.\n \n Here are a handful of examples:\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164775","messageId":"9e7095318e6dc40657db0cfef3400a66f6de20a4.1301569271.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCH 2/3] revisions.txt: structure with a labelled list","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-31T11:03:08Z","receivedAt":"2011-03-31T11:03:08Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, the reader has to parse a textual description in order to\nfind a specific syntax in the list.\n\nRestructure as a labelled list with systematic labels as well as\nconcrete examples as a visual guide.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 86 +++++++++++++++++++++++++-----------------\n 1 files changed, 51 insertions(+), 35 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex b994bab..fa399df 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -1,23 +1,26 @@\n SPECIFYING REVISIONS\n --------------------\n \n-A revision parameter typically, but not necessarily, names a\n+A revision parameter '' typically, but not necessarily, names a\n commit object. They use what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n ones listed near the end of this list are to name trees and\n blobs contained in a commit.\n \n-* The full SHA1 object name (40-byte hexadecimal string), or\n+'', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n+ The full SHA1 object name (40-byte hexadecimal string), or\n a substring of such that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from `git describe`; i.e. a closest tag, optionally\n+'', e.g. 'v1.7.4.2-679-g3bee7fb'::\n+ An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n-* A symbolic ref name. E.g. 'master' typically means the commit\n+'', e.g. 'master', 'heads/master', 'refs/heads/master'::\n+ A symbolic ref name. E.g. 'master' typically means the commit\n object referenced by 'refs/heads/master'. If you\n happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n@@ -30,7 +33,7 @@ blobs contained in a commit.\n \n . otherwise, 'refs/' if exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n . otherwise, 'refs/heads/' if exists;\n \n@@ -53,7 +56,8 @@ when you run `git cherry-pick`.\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n-* A ref followed by the suffix '@' with a date specification\n+'@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\n+ A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n@@ -64,58 +68,68 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n 'master' branch last week. If you want to look at commits made during\n certain times, see '--since' and '--until'.\n \n-* A ref followed by the suffix '@' with an ordinal specification\n+'@\\{\\}', e.g. 'master@\\{1\\}'::\n+ A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ('$GIT_DIR/logs/').\n+ log ('$GIT_DIR/logs/').\n \n-* You can use the '@' construct with an empty ref part to get at a\n+'@\\{\\}', e.g. '@\\{1\\}'::\n+ You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n-* The special construct '@\\{-\\}' means the th branch checked out\n+'@\\{\\}', e.g. '@\\{-1\\}'::\n+ The special construct '@\\{-\\}' means the th branch checked out\n before the current one.\n \n-* The suffix '@\\{upstream\\}' to a ref (short form 'ref@\\{u\\}') refers to\n+'@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n+ The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n the branch the ref is set to build on top of. Missing ref defaults\n to the current branch.\n \n-* A suffix '{caret}' to a revision parameter (e.g. 'HEAD{caret}') means the first parent of\n+'{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n+ A suffix '{caret}' to a revision parameter means the first parent of\n that commit object. '{caret}' means the th parent (i.e.\n- 'rev{caret}'\n- is equivalent to 'rev{caret}1'). As a special rule,\n- 'rev{caret}0' means the commit itself and is used when 'rev' is the\n+ '{caret}'\n+ is equivalent to '{caret}1'). As a special rule,\n+ '{caret}0' means the commit itself and is used when '' is the\n object name of a tag object that refers to a commit object.\n \n-* A suffix '{tilde}' to a revision parameter means the commit\n+'{tilde}', e.g. 'master{tilde}3'::\n+ A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. rev~3 is\n- equivalent to rev{caret}{caret}{caret} which is equivalent to\n- rev{caret}1{caret}1{caret}1. See below for a illustration of\n+ commit object, following only the first parent. I.e. '{tilde}3' is\n+ equivalent to '{caret}{caret}{caret}' which is equivalent to\n+ '{caret}1{caret}1{caret}1'. See below for a illustration of\n the usage of this form.\n \n-* A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n+ A suffix '{caret}' followed by an object type name enclosed in\n+ brace pair means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). 'rev{caret}0'\n- introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n+ dereferenced anymore (in which case, barf). '{caret}0'\n+ introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n \n-* A suffix '{caret}' followed by an empty brace pair\n- (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n+ A suffix '{caret}' followed by an empty brace pair\n+ means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n-* A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n- this is the same as ':/fix nasty bug' syntax below except that\n+'{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n+ A suffix '{caret}' to a revision parameter, followed by a brace\n+ pair that contains a text led by a slash,\n+ is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n- the ref before '{caret}'.\n+ the '' before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n+':/', e.g. ':/fix nasty bug'::\n+ A colon, followed by a slash, followed by a text, names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n@@ -124,10 +138,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n+':', e.g. 'HEAD:README', ':README', 'master:./README'::\n+ A suffix ':' followed by a path names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. ':README')\n+ ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -135,10 +150,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n This is most useful to address a blob or tree from a commit or tree that has\n the same tree structure with the working tree.\n \n-* A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n+'::', e.g. ':0:README', ':README'::\n+ A colon, optionally followed by a stage number (0 to 3) and a\n+ colon, followed by a path, names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n+ that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164774","messageId":"48111612952115ce454de0766e3537da92e141ac.1301569271.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCH 3/3] revisions.txt: language improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-31T11:03:09Z","receivedAt":"2011-03-31T11:03:09Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 68 +++++++++++++++++++++---------------------\n 1 files changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex fa399df..288fa6e 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -2,20 +2,20 @@ SPECIFYING REVISIONS\n --------------------\n \n A revision parameter '' typically, but not necessarily, names a\n-commit object. They use what is called an 'extended SHA1'\n+commit object. It uses what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n-ones listed near the end of this list are to name trees and\n+ones listed near the end of this list name trees and\n blobs contained in a commit.\n \n '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n The full SHA1 object name (40-byte hexadecimal string), or\n- a substring of such that is unique within the repository.\n+ a substring that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n- name the same commit object if there are no other object in\n+ name the same commit object if there is no other object in\n your repository whose object name starts with dae86e.\n \n '', e.g. 'v1.7.4.2-679-g3bee7fb'::\n- An output from `git describe`; i.e. a closest tag, optionally\n+ Output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n@@ -27,30 +27,30 @@ blobs contained in a commit.\n When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ . If '$GIT_DIR/' exists, that is what you mean (this is usually\n useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n and 'CHERRY_PICK_HEAD');\n \n- . otherwise, 'refs/' if exists;\n+ . otherwise, 'refs/' if it exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if it exists;\n \n- . otherwise, 'refs/heads/' if exists;\n+ . otherwise, 'refs/heads/' if it exists;\n \n- . otherwise, 'refs/remotes/' if exists;\n+ . otherwise, 'refs/remotes/' if it exists;\n \n- . otherwise, 'refs/remotes//HEAD' if exists.\n+ . otherwise, 'refs/remotes//HEAD' it if exists.\n +\n-'HEAD' names the commit your changes in the working tree is based on.\n-'FETCH_HEAD' records the branch you fetched from a remote repository\n+'HEAD' names the commit on which you based the changes in the working tree.\n+'FETCH_HEAD' records the branch which you fetched from a remote repository\n with your last `git fetch` invocation.\n-'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic\n way, to record the position of the 'HEAD' before their operation, so that\n-you can change the tip of the branch back to the state before you ran\n-them easily.\n-'MERGE_HEAD' records the commit(s) you are merging into your branch\n+you can easily change the tip of the branch back to the state before you ran\n+them.\n+'MERGE_HEAD' records the commit(s) which you are merging into your branch\n when you run `git merge`.\n-'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+'CHERRY_PICK_HEAD' records the commit which you are cherry-picking\n when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n@@ -60,7 +60,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n- second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n+ second ago\\}' or '\\{1979-02-26 18:30:00\\}') specifies the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n@@ -70,7 +70,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. 'master@\\{1\\}'::\n A ref followed by the suffix '@' with an ordinal specification\n- enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n+ enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n@@ -79,8 +79,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. '@\\{1\\}'::\n You can use the '@' construct with an empty ref part to get at a\n- reflog of the current branch. For example, if you are on the\n- branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n+ reflog of the current branch. For example, if you are on\n+ branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n '@\\{\\}', e.g. '@\\{-1\\}'::\n The special construct '@\\{-\\}' means the th branch checked out\n@@ -88,7 +88,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n- the branch the ref is set to build on top of. Missing ref defaults\n+ the branch the ref is set to build on top of. A missing ref defaults\n to the current branch.\n \n '{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n@@ -102,9 +102,9 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{tilde}', e.g. 'master{tilde}3'::\n A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. '{tilde}3' is\n+ commit object, following only the first parents. I.e. '{tilde}3' is\n equivalent to '{caret}{caret}{caret}' which is equivalent to\n- '{caret}1{caret}1{caret}1'. See below for a illustration of\n+ '{caret}1{caret}1{caret}1'. See below for an illustration of\n the usage of this form.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n@@ -113,7 +113,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n dereferenced anymore (in which case, barf). '{caret}0'\n- introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n+ is a short-hand for '{caret}\\{commit\\}'.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n A suffix '{caret}' followed by an empty brace pair\n@@ -124,7 +124,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n A suffix '{caret}' to a revision parameter, followed by a brace\n pair that contains a text led by a slash,\n- is the same as ':/fix nasty bug' syntax below except that\n+ is the same as the ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the '' before '{caret}'.\n \n@@ -133,8 +133,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n- '!', you have to repeat that; the special sequence ':/!',\n- followed by something else than '!' is reserved for now.\n+ '!' you have to repeat that; the special sequence ':/!',\n+ followed by something else than '!', is reserved for now.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n@@ -145,19 +145,19 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n- A path starting with './' or '../' is relative to current working directory.\n- The given path will be converted to be relative to working tree's root directory.\n+ A path starting with './' or '../' is relative to the current working directory.\n+ The given path will be converted to be relative to the working tree's root directory.\n This is most useful to address a blob or tree from a commit or tree that has\n- the same tree structure with the working tree.\n+ the same tree structure as the working tree.\n \n '::', e.g. ':0:README', ':README'::\n A colon, optionally followed by a stage number (0 to 3) and a\n colon, followed by a path, names a blob object in the\n- index at the given path. Missing stage number (and the colon\n+ index at the given path. A missing stage number (and the colon\n that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n- the branch being merged.\n+ the branch which is being merged.\n \n Here is an illustration, by Jon Loeliger. Both commit nodes B\n and C are parents of commit node A. Parent commits are ordered\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164784","messageId":"4D94713B.5090603@drmicha.warpmail.net","threadId":"26942","inReplyTo":"AANLkTikofGHcJtHMAqhAM7ofD=f2jybPAiJTnV=4ciu7@mail.gmail.com","subject":"Re: [PATCH 3/3] revisions.txt: language improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-03-31T12:19:07Z","receivedAt":"2011-03-31T12:19:07Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Bert Wesarg venit, vidit, dixit 31.03.2011 14:19:\n> On Thu, Mar 31, 2011 at 13:03, Michael J Gruber\n> wrote:\n>> Signed-off-by: Michael J Gruber \n>> ---\n>> Documentation/revisions.txt | 68 +++++++++++++++++++++---------------------\n>> 1 files changed, 34 insertions(+), 34 deletions(-)\n>>\n>> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\n>> index fa399df..288fa6e 100644\n>> --- a/Documentation/revisions.txt\n>> +++ b/Documentation/revisions.txt\n>> @@ -27,30 +27,30 @@ blobs contained in a commit.\n>> When ambiguous, a '' is disambiguated by taking the\n>> first match in the following rules:\n>>\n>> - . if '$GIT_DIR/' exists, that is what you mean (this is usually\n>> + . If '$GIT_DIR/' exists, that is what you mean (this is usually\n>> useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n>> and 'CHERRY_PICK_HEAD');\n>>\n>> - . otherwise, 'refs/' if exists;\n>> + . otherwise, 'refs/' if it exists;\n>>\n>> - . otherwise, 'refs/tags/' if exists;\n>> + . otherwise, 'refs/tags/' if it exists;\n>>\n>> - . otherwise, 'refs/heads/' if exists;\n>> + . otherwise, 'refs/heads/' if it exists;\n>>\n>> - . otherwise, 'refs/remotes/' if exists;\n>> + . otherwise, 'refs/remotes/' if it exists;\n>>\n>> - . otherwise, 'refs/remotes//HEAD' if exists.\n>> + . otherwise, 'refs/remotes//HEAD' it if exists.\n> \n> s/it if/if it/\n\nUh, thanks. Waiting for more feedback before a re-roll.\n\n> \n>> +\n>> -'HEAD' names the commit your changes in the working tree is based on.\n>> -'FETCH_HEAD' records the branch you fetched from a remote repository\n>> +'HEAD' names the commit on which you based the changes in the working tree.\n>> +'FETCH_HEAD' records the branch which you fetched from a remote repository\n>> with your last `git fetch` invocation.\n>> -'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n>> +'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic\n>> way, to record the position of the 'HEAD' before their operation, so that\n>> -you can change the tip of the branch back to the state before you ran\n>> -them easily.\n>> -'MERGE_HEAD' records the commit(s) you are merging into your branch\n>> +you can easily change the tip of the branch back to the state before you ran\n>> +them.\n>> +'MERGE_HEAD' records the commit(s) which you are merging into your branch\n>> when you run `git merge`.\n>> -'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n>> +'CHERRY_PICK_HEAD' records the commit which you are cherry-picking\n>> when you run `git cherry-pick`.\n>> +\n>> Note that any of the 'refs/*' cases above may come either from\n"},{"id":"164783","messageId":"AANLkTikofGHcJtHMAqhAM7ofD=f2jybPAiJTnV=4ciu7@mail.gmail.com","threadId":"26942","inReplyTo":"48111612952115ce454de0766e3537da92e141ac.1301569271.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 3/3] revisions.txt: language improvements","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2011-03-31T12:19:29Z","receivedAt":"2011-03-31T12:19:29Z","isPatch":true,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Thu, Mar 31, 2011 at 13:03, Michael J Gruber\n wrote:\n> Signed-off-by: Michael J Gruber \n> ---\n>  Documentation/revisions.txt |   68 +++++++++++++++++++++---------------------\n>  1 files changed, 34 insertions(+), 34 deletions(-)\n>\n> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\n> index fa399df..288fa6e 100644\n> --- a/Documentation/revisions.txt\n> +++ b/Documentation/revisions.txt\n> @@ -27,30 +27,30 @@ blobs contained in a commit.\n>   When ambiguous, a '' is disambiguated by taking the\n>   first match in the following rules:\n>\n> -  . if '$GIT_DIR/' exists, that is what you mean (this is usually\n> +  . If '$GIT_DIR/' exists, that is what you mean (this is usually\n>     useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n>     and 'CHERRY_PICK_HEAD');\n>\n> -  . otherwise, 'refs/' if exists;\n> +  . otherwise, 'refs/' if it exists;\n>\n> -  . otherwise, 'refs/tags/' if exists;\n> +  . otherwise, 'refs/tags/' if it exists;\n>\n> -  . otherwise, 'refs/heads/' if exists;\n> +  . otherwise, 'refs/heads/' if it exists;\n>\n> -  . otherwise, 'refs/remotes/' if exists;\n> +  . otherwise, 'refs/remotes/' if it exists;\n>\n> -  . otherwise, 'refs/remotes//HEAD' if exists.\n> +  . otherwise, 'refs/remotes//HEAD' it if exists.\n\ns/it if/if it/\n\n>  +\n> -'HEAD' names the commit your changes in the working tree is based on.\n> -'FETCH_HEAD' records the branch you fetched from a remote repository\n> +'HEAD' names the commit on which you based the changes in the working tree.\n> +'FETCH_HEAD' records the branch which you fetched from a remote repository\n>  with your last `git fetch` invocation.\n> -'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n> +'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic\n>  way, to record the position of the 'HEAD' before their operation, so that\n> -you can change the tip of the branch back to the state before you ran\n> -them easily.\n> -'MERGE_HEAD' records the commit(s) you are merging into your branch\n> +you can easily change the tip of the branch back to the state before you ran\n> +them.\n> +'MERGE_HEAD' records the commit(s) which you are merging into your branch\n>  when you run `git merge`.\n> -'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n> +'CHERRY_PICK_HEAD' records the commit which you are cherry-picking\n>  when you run `git cherry-pick`.\n>  +\n>  Note that any of the 'refs/*' cases above may come either from\n"},{"id":"164836","messageId":"m3mxkb3qwt.fsf@localhost.localdomain","threadId":"26942","inReplyTo":"9e7095318e6dc40657db0cfef3400a66f6de20a4.1301569271.git.git@drmicha.warpmail.net","subject":"Re: [PATCH 2/3] revisions.txt: structure with a labelled list","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-03-31T21:46:23Z","receivedAt":"2011-03-31T21:46:23Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Michael J Gruber writes:\n\n> -* The special construct '@\\{-\\}' means the th branch checked out\n> +'@\\{\\}', e.g. '@\\{-1\\}'::\n> + The special construct '@\\{-\\}' means the th branch checked out\n> before the current one.\n\nI think you meant\n\n +'@\\{-\\}', e.g. '@\\{-1\\}'::\n\nhere.\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"164857","messageId":"4D95785A.7010701@drmicha.warpmail.net","threadId":"26942","inReplyTo":"m3mxkb3qwt.fsf@localhost.localdomain","subject":"Re: [PATCH 2/3] revisions.txt: structure with a labelled list","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-01T07:01:46Z","receivedAt":"2011-04-01T07:01:46Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jakub Narebski venit, vidit, dixit 31.03.2011 23:46:\n> Michael J Gruber writes:\n> \n>> -* The special construct '@\\{-\\}' means the th branch checked out\n>> +'@\\{\\}', e.g. '@\\{-1\\}'::\n>> + The special construct '@\\{-\\}' means the th branch checked out\n>> before the current one.\n> \n> I think you meant\n> \n> +'@\\{-\\}', e.g. '@\\{-1\\}'::\n> \n> here.\n\nThanks, good spotting!\n\nI'll recheck the processed form and send out a v2 today.\n\nMichael\n"},{"id":"164873","messageId":"cover.1301649867.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCHv2 0/3] revisions.txt improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-01T09:27:39Z","receivedAt":"2011-04-01T09:27:39Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"v2 with the fixes suggested by Bert and Jakub.\n(1/3 unchanged but resent)\n\n\nMichael J Gruber (3):\n revisions.txt: consistent use of quotes\n revisions.txt: structure with a labelled list\n revisions.txt: language improvements\n\n Documentation/revisions.txt | 198 +++++++++++++++++++++++--------------------\n 1 files changed, 107 insertions(+), 91 deletions(-)\n\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164874","messageId":"84663544e6ecb5dde76adaf9f2de2ffa0d230fd3.1301649867.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCH 1/3] revisions.txt: consistent use of quotes","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-01T09:27:40Z","receivedAt":"2011-04-01T09:27:40Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Our use of quotes is inconsistent everywhere and within some files.\nBefore reworking the structure of revisions.txt, make the quotes\nconsistent:\n\n`git command`\n\n'some snippet or term'\n\nThe former gets typeset as code, the latter with some form of emphasis.\nthe man backend uses two types of emphasis.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 104 +++++++++++++++++++++---------------------\n 1 files changed, 52 insertions(+), 52 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 04fceee..b994bab 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -13,45 +13,45 @@ blobs contained in a commit.\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from 'git describe'; i.e. a closest tag, optionally\n+* An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n- `g`, and an abbreviated object name.\n+ 'g', and an abbreviated object name.\n \n * A symbolic ref name. E.g. 'master' typically means the commit\n- object referenced by refs/heads/master. If you\n- happen to have both heads/master and tags/master, you can\n+ object referenced by 'refs/heads/master'. If you\n+ happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n- When ambiguous, a `` is disambiguated by taking the\n+ When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if `$GIT_DIR/` exists, that is what you mean (this is usually\n- useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD`\n- and `CHERRY_PICK_HEAD`);\n+ . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n+ and 'CHERRY_PICK_HEAD');\n \n- . otherwise, `refs/` if exists;\n+ . otherwise, 'refs/' if exists;\n \n- . otherwise, `refs/tags/` if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n- . otherwise, `refs/heads/` if exists;\n+ . otherwise, 'refs/heads/' if exists;\n \n- . otherwise, `refs/remotes/` if exists;\n+ . otherwise, 'refs/remotes/' if exists;\n \n- . otherwise, `refs/remotes//HEAD` if exists.\n+ . otherwise, 'refs/remotes//HEAD' if exists.\n +\n-HEAD names the commit your changes in the working tree is based on.\n-FETCH_HEAD records the branch you fetched from a remote repository\n-with your last 'git fetch' invocation.\n-ORIG_HEAD is created by commands that moves your HEAD in a drastic\n-way, to record the position of the HEAD before their operation, so that\n+'HEAD' names the commit your changes in the working tree is based on.\n+'FETCH_HEAD' records the branch you fetched from a remote repository\n+with your last `git fetch` invocation.\n+'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+way, to record the position of the 'HEAD' before their operation, so that\n you can change the tip of the branch back to the state before you ran\n them easily.\n-MERGE_HEAD records the commit(s) you are merging into your branch\n-when you run 'git merge'.\n-CHERRY_PICK_HEAD records the commit you are cherry-picking\n-when you run 'git cherry-pick'.\n+'MERGE_HEAD' records the commit(s) you are merging into your branch\n+when you run `git merge`.\n+'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+when you run `git cherry-pick`.\n +\n-Note that any of the `refs/*` cases above may come either from\n-the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n+Note that any of the 'refs/*' cases above may come either from\n+the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n * A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n@@ -59,10 +59,10 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n- existing log ($GIT_DIR/logs/). Note that this looks up the state\n+ existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n of your *local* ref at a given time; e.g., what was in your local\n- `master` branch last week. If you want to look at commits made during\n- certain times, see `--since` and `--until`.\n+ 'master' branch last week. If you want to look at commits made during\n+ certain times, see '--since' and '--until'.\n \n * A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n@@ -70,7 +70,7 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ($GIT_DIR/logs/).\n+ log ('$GIT_DIR/logs/').\n \n * You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n@@ -98,36 +98,36 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the usage of this form.\n \n * A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. `v0.99.8{caret}\\{commit\\}`) means the object\n+ brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). `rev{caret}0`\n- introduced earlier is a short-hand for `rev{caret}\\{commit\\}`.\n+ dereferenced anymore (in which case, barf). 'rev{caret}0'\n+ introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n \n * A suffix '{caret}' followed by an empty brace pair\n- (e.g. `v0.99.8{caret}\\{\\}`) means the object could be a tag,\n+ (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n * A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. `HEAD^{/fix nasty bug}`):\n- this is the same as `:/fix nasty bug` syntax below except that\n+ pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n+ this is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the ref before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names\n+* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n '!', you have to repeat that; the special sequence ':/!',\n followed by something else than '!' is reserved for now.\n The regular expression can match any part of the commit message. To\n- match messages starting with a string, one can use e.g. `:/^foo`.\n+ match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. `HEAD:README`); this names the blob or tree\n+* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. `:README`)\n+ ':path' (with an empty part before the colon, e.g. ':README')\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -136,9 +136,9 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the same tree structure with the working tree.\n \n * A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. `:0:README`); this names a blob object in the\n+ colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. `:README`) names a stage 0 entry. During a merge, stage\n+ that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n@@ -175,31 +175,31 @@ G H I J\n SPECIFYING RANGES\n -----------------\n \n-History traversing commands such as 'git log' operate on a set\n+History traversing commands such as `git log` operate on a set\n of commits, not just a single commit. To these commands,\n specifying a single revision with the notation described in the\n previous section means the set of commits reachable from that\n commit, following the commit ancestry chain.\n \n-To exclude commits reachable from a commit, a prefix `{caret}`\n-notation is used. E.g. `{caret}r1 r2` means commits reachable\n-from `r2` but exclude the ones reachable from `r1`.\n+To exclude commits reachable from a commit, a prefix '{caret}'\n+notation is used. E.g. '{caret}r1 r2' means commits reachable\n+from 'r2' but exclude the ones reachable from 'r1'.\n \n This set operation appears so often that there is a shorthand\n-for it. When you have two commits `r1` and `r2` (named according\n+for it. When you have two commits 'r1' and 'r2' (named according\n to the syntax explained in SPECIFYING REVISIONS above), you can ask\n for commits that are reachable from r2 excluding those that are reachable\n-from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.\n+from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.\n \n-A similar notation `r1\\...r2` is called symmetric difference\n-of `r1` and `r2` and is defined as\n-`r1 r2 --not $(git merge-base --all r1 r2)`.\n+A similar notation 'r1\\...r2' is called symmetric difference\n+of 'r1' and 'r2' and is defined as\n+'r1 r2 --not $(git merge-base --all r1 r2)'.\n It is the set of commits that are reachable from either one of\n-`r1` or `r2` but not from both.\n+'r1' or 'r2' but not from both.\n \n Two other shorthands for naming a set that is formed by a commit\n-and its parent commits exist. The `r1{caret}@` notation means all\n-parents of `r1`. `r1{caret}!` includes commit `r1` but excludes\n+and its parent commits exist. The 'r1{caret}@' notation means all\n+parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes\n all of its parents.\n \n Here are a handful of examples:\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164875","messageId":"b37095f8802face1fc7920359cf2db3536a5d3a2.1301649867.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCHv2 2/3] revisions.txt: structure with a labelled list","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-01T09:27:41Z","receivedAt":"2011-04-01T09:27:41Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, the reader has to parse a textual description in order to\nfind a specific syntax in the list.\n\nRestructure as a labelled list with systematic labels as well as\nconcrete examples as a visual guide.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 86 +++++++++++++++++++++++++-----------------\n 1 files changed, 51 insertions(+), 35 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex b994bab..92bc662 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -1,23 +1,26 @@\n SPECIFYING REVISIONS\n --------------------\n \n-A revision parameter typically, but not necessarily, names a\n+A revision parameter '' typically, but not necessarily, names a\n commit object. They use what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n ones listed near the end of this list are to name trees and\n blobs contained in a commit.\n \n-* The full SHA1 object name (40-byte hexadecimal string), or\n+'', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n+ The full SHA1 object name (40-byte hexadecimal string), or\n a substring of such that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from `git describe`; i.e. a closest tag, optionally\n+'', e.g. 'v1.7.4.2-679-g3bee7fb'::\n+ An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n-* A symbolic ref name. E.g. 'master' typically means the commit\n+'', e.g. 'master', 'heads/master', 'refs/heads/master'::\n+ A symbolic ref name. E.g. 'master' typically means the commit\n object referenced by 'refs/heads/master'. If you\n happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n@@ -30,7 +33,7 @@ blobs contained in a commit.\n \n . otherwise, 'refs/' if exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n . otherwise, 'refs/heads/' if exists;\n \n@@ -53,7 +56,8 @@ when you run `git cherry-pick`.\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n-* A ref followed by the suffix '@' with a date specification\n+'@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\n+ A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n@@ -64,58 +68,68 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n 'master' branch last week. If you want to look at commits made during\n certain times, see '--since' and '--until'.\n \n-* A ref followed by the suffix '@' with an ordinal specification\n+'@\\{\\}', e.g. 'master@\\{1\\}'::\n+ A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ('$GIT_DIR/logs/').\n+ log ('$GIT_DIR/logs/').\n \n-* You can use the '@' construct with an empty ref part to get at a\n+'@\\{\\}', e.g. '@\\{1\\}'::\n+ You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n-* The special construct '@\\{-\\}' means the th branch checked out\n+'@\\{-\\}', e.g. '@\\{-1\\}'::\n+ The special construct '@\\{-\\}' means the th branch checked out\n before the current one.\n \n-* The suffix '@\\{upstream\\}' to a ref (short form 'ref@\\{u\\}') refers to\n+'@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n+ The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n the branch the ref is set to build on top of. Missing ref defaults\n to the current branch.\n \n-* A suffix '{caret}' to a revision parameter (e.g. 'HEAD{caret}') means the first parent of\n+'{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n+ A suffix '{caret}' to a revision parameter means the first parent of\n that commit object. '{caret}' means the th parent (i.e.\n- 'rev{caret}'\n- is equivalent to 'rev{caret}1'). As a special rule,\n- 'rev{caret}0' means the commit itself and is used when 'rev' is the\n+ '{caret}'\n+ is equivalent to '{caret}1'). As a special rule,\n+ '{caret}0' means the commit itself and is used when '' is the\n object name of a tag object that refers to a commit object.\n \n-* A suffix '{tilde}' to a revision parameter means the commit\n+'{tilde}', e.g. 'master{tilde}3'::\n+ A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. rev~3 is\n- equivalent to rev{caret}{caret}{caret} which is equivalent to\n- rev{caret}1{caret}1{caret}1. See below for a illustration of\n+ commit object, following only the first parent. I.e. '{tilde}3' is\n+ equivalent to '{caret}{caret}{caret}' which is equivalent to\n+ '{caret}1{caret}1{caret}1'. See below for a illustration of\n the usage of this form.\n \n-* A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n+ A suffix '{caret}' followed by an object type name enclosed in\n+ brace pair means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). 'rev{caret}0'\n- introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n+ dereferenced anymore (in which case, barf). '{caret}0'\n+ introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n \n-* A suffix '{caret}' followed by an empty brace pair\n- (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n+ A suffix '{caret}' followed by an empty brace pair\n+ means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n-* A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n- this is the same as ':/fix nasty bug' syntax below except that\n+'{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n+ A suffix '{caret}' to a revision parameter, followed by a brace\n+ pair that contains a text led by a slash,\n+ is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n- the ref before '{caret}'.\n+ the '' before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n+':/', e.g. ':/fix nasty bug'::\n+ A colon, followed by a slash, followed by a text, names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n@@ -124,10 +138,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n+':', e.g. 'HEAD:README', ':README', 'master:./README'::\n+ A suffix ':' followed by a path names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. ':README')\n+ ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -135,10 +150,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n This is most useful to address a blob or tree from a commit or tree that has\n the same tree structure with the working tree.\n \n-* A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n+'::', e.g. ':0:README', ':README'::\n+ A colon, optionally followed by a stage number (0 to 3) and a\n+ colon, followed by a path, names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n+ that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164876","messageId":"cc9e86c7a7cacc7eea66090b38443739e6fbc672.1301649867.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301569271.git.git@drmicha.warpmail.net","subject":"[PATCHv2 3/3] revisions.txt: language improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-01T09:27:42Z","receivedAt":"2011-04-01T09:27:42Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 68 +++++++++++++++++++++---------------------\n 1 files changed, 34 insertions(+), 34 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 92bc662..25125c3 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -2,20 +2,20 @@ SPECIFYING REVISIONS\n --------------------\n \n A revision parameter '' typically, but not necessarily, names a\n-commit object. They use what is called an 'extended SHA1'\n+commit object. It uses what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n-ones listed near the end of this list are to name trees and\n+ones listed near the end of this list name trees and\n blobs contained in a commit.\n \n '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n The full SHA1 object name (40-byte hexadecimal string), or\n- a substring of such that is unique within the repository.\n+ a substring that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n- name the same commit object if there are no other object in\n+ name the same commit object if there is no other object in\n your repository whose object name starts with dae86e.\n \n '', e.g. 'v1.7.4.2-679-g3bee7fb'::\n- An output from `git describe`; i.e. a closest tag, optionally\n+ Output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n@@ -27,30 +27,30 @@ blobs contained in a commit.\n When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ . If '$GIT_DIR/' exists, that is what you mean (this is usually\n useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n and 'CHERRY_PICK_HEAD');\n \n- . otherwise, 'refs/' if exists;\n+ . otherwise, 'refs/' if it exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if it exists;\n \n- . otherwise, 'refs/heads/' if exists;\n+ . otherwise, 'refs/heads/' if it exists;\n \n- . otherwise, 'refs/remotes/' if exists;\n+ . otherwise, 'refs/remotes/' if it exists;\n \n- . otherwise, 'refs/remotes//HEAD' if exists.\n+ . otherwise, 'refs/remotes//HEAD' if it exists.\n +\n-'HEAD' names the commit your changes in the working tree is based on.\n-'FETCH_HEAD' records the branch you fetched from a remote repository\n+'HEAD' names the commit on which you based the changes in the working tree.\n+'FETCH_HEAD' records the branch which you fetched from a remote repository\n with your last `git fetch` invocation.\n-'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic\n way, to record the position of the 'HEAD' before their operation, so that\n-you can change the tip of the branch back to the state before you ran\n-them easily.\n-'MERGE_HEAD' records the commit(s) you are merging into your branch\n+you can easily change the tip of the branch back to the state before you ran\n+them.\n+'MERGE_HEAD' records the commit(s) which you are merging into your branch\n when you run `git merge`.\n-'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+'CHERRY_PICK_HEAD' records the commit which you are cherry-picking\n when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n@@ -60,7 +60,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n- second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n+ second ago\\}' or '\\{1979-02-26 18:30:00\\}') specifies the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n@@ -70,7 +70,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. 'master@\\{1\\}'::\n A ref followed by the suffix '@' with an ordinal specification\n- enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n+ enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n@@ -79,8 +79,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. '@\\{1\\}'::\n You can use the '@' construct with an empty ref part to get at a\n- reflog of the current branch. For example, if you are on the\n- branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n+ reflog of the current branch. For example, if you are on\n+ branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n '@\\{-\\}', e.g. '@\\{-1\\}'::\n The special construct '@\\{-\\}' means the th branch checked out\n@@ -88,7 +88,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n- the branch the ref is set to build on top of. Missing ref defaults\n+ the branch the ref is set to build on top of. A missing ref defaults\n to the current branch.\n \n '{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n@@ -102,9 +102,9 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{tilde}', e.g. 'master{tilde}3'::\n A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. '{tilde}3' is\n+ commit object, following only the first parents. I.e. '{tilde}3' is\n equivalent to '{caret}{caret}{caret}' which is equivalent to\n- '{caret}1{caret}1{caret}1'. See below for a illustration of\n+ '{caret}1{caret}1{caret}1'. See below for an illustration of\n the usage of this form.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n@@ -113,7 +113,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n dereferenced anymore (in which case, barf). '{caret}0'\n- introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n+ is a short-hand for '{caret}\\{commit\\}'.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n A suffix '{caret}' followed by an empty brace pair\n@@ -124,7 +124,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n A suffix '{caret}' to a revision parameter, followed by a brace\n pair that contains a text led by a slash,\n- is the same as ':/fix nasty bug' syntax below except that\n+ is the same as the ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the '' before '{caret}'.\n \n@@ -133,8 +133,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n- '!', you have to repeat that; the special sequence ':/!',\n- followed by something else than '!' is reserved for now.\n+ '!' you have to repeat that; the special sequence ':/!',\n+ followed by something else than '!', is reserved for now.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n@@ -145,19 +145,19 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n- A path starting with './' or '../' is relative to current working directory.\n- The given path will be converted to be relative to working tree's root directory.\n+ A path starting with './' or '../' is relative to the current working directory.\n+ The given path will be converted to be relative to the working tree's root directory.\n This is most useful to address a blob or tree from a commit or tree that has\n- the same tree structure with the working tree.\n+ the same tree structure as the working tree.\n \n '::', e.g. ':0:README', ':README'::\n A colon, optionally followed by a stage number (0 to 3) and a\n colon, followed by a path, names a blob object in the\n- index at the given path. Missing stage number (and the colon\n+ index at the given path. A missing stage number (and the colon\n that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n- the branch being merged.\n+ the branch which is being merged.\n \n Here is an illustration, by Jon Loeliger. Both commit nodes B\n and C are parents of commit node A. Parent commits are ordered\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"164931","messageId":"7vsju1eiff.fsf@alter.siamese.dyndns.org","threadId":"26942","inReplyTo":"cc9e86c7a7cacc7eea66090b38443739e6fbc672.1301649867.git.git@drmicha.warpmail.net","subject":"Re: [PATCHv2 3/3] revisions.txt: language improvements","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-04-01T22:05:40Z","receivedAt":"2011-04-01T22:05:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> Signed-off-by: Michael J Gruber \n\nThanks.\n\n> Documentation/revisions.txt | 68 +++++++++++++++++++++---------------------\n> 1 files changed, 34 insertions(+), 34 deletions(-)\n>\n> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\n> index 92bc662..25125c3 100644\n> --- a/Documentation/revisions.txt\n> +++ b/Documentation/revisions.txt\n> @@ -2,20 +2,20 @@ SPECIFYING REVISIONS\n> --------------------\n> \n> A revision parameter '' typically, but not necessarily, names a\n> -commit object. They use what is called an 'extended SHA1'\n> +commit object. It uses what is called an 'extended SHA1'\n> syntax. Here are various ways to spell object names. The\n> -ones listed near the end of this list are to name trees and\n> +ones listed near the end of this list name trees and\n> blobs contained in a commit.\n> \n> '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n> The full SHA1 object name (40-byte hexadecimal string), or\n> - a substring of such that is unique within the repository.\n> + a substring that is unique within the repository.\n\nDo we need to rephrase this a bit more, so that it would be clear that\n\"e86e1950b\" is not an abbreviated object name, even though it is a\nsubstring and may be unique within the repository?\n\nPerhaps \"a prefix of such a full SHA-1 object name that is unique...\"?\n\n> @@ -79,8 +79,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n> \n> '@\\{\\}', e.g. '@\\{1\\}'::\n> You can use the '@' construct with an empty ref part to get at a\n> + reflog of the current branch. For example, if you are on\n> + branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n\nIs that \"a reflog of the current branch\", or because there is only one\nreflog, should it be \"the reflog of the current branch\"? Ah, we mean one\nentry in the reflog (an entry of the reflog of the current branch), so\nthis probably is Ok.\n\n> @@ -133,8 +133,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n> a commit whose commit message matches the specified regular expression.\n> This name returns the youngest matching commit which is\n> reachable from any ref. If the commit message starts with a\n> + '!' you have to repeat that; the special sequence ':/!',\n> + followed by something else than '!', is reserved for now.\n\nHmm, shouldn't it be \"something OTHER than\" instead?\n\nGrammar is hard; thanks for cleaning them up.\n"},{"id":"164990","messageId":"4D987087.1050305@drmicha.warpmail.net","threadId":"26942","inReplyTo":"7vsju1eiff.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv2 3/3] revisions.txt: language improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-03T13:05:11Z","receivedAt":"2011-04-03T13:05:11Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Junio C Hamano venit, vidit, dixit 02.04.2011 00:05:\n> Michael J Gruber writes:\n> \n>> Signed-off-by: Michael J Gruber \n> \n> Thanks.\n> \n>> Documentation/revisions.txt | 68 +++++++++++++++++++++---------------------\n>> 1 files changed, 34 insertions(+), 34 deletions(-)\n>>\n>> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\n>> index 92bc662..25125c3 100644\n>> --- a/Documentation/revisions.txt\n>> +++ b/Documentation/revisions.txt\n>> @@ -2,20 +2,20 @@ SPECIFYING REVISIONS\n>> --------------------\n>> \n>> A revision parameter '' typically, but not necessarily, names a\n>> -commit object. They use what is called an 'extended SHA1'\n>> +commit object. It uses what is called an 'extended SHA1'\n>> syntax. Here are various ways to spell object names. The\n>> -ones listed near the end of this list are to name trees and\n>> +ones listed near the end of this list name trees and\n>> blobs contained in a commit.\n>> \n>> '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n>> The full SHA1 object name (40-byte hexadecimal string), or\n>> - a substring of such that is unique within the repository.\n>> + a substring that is unique within the repository.\n> \n> Do we need to rephrase this a bit more, so that it would be clear that\n> \"e86e1950b\" is not an abbreviated object name, even though it is a\n> substring and may be unique within the repository?\n> \n> Perhaps \"a prefix of such a full SHA-1 object name that is unique...\"?\n\nYes, definitely, I missed that.\n\n> \n>> @@ -79,8 +79,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n>> \n>> '@\\{\\}', e.g. '@\\{1\\}'::\n>> You can use the '@' construct with an empty ref part to get at a\n>> + reflog of the current branch. For example, if you are on\n>> + branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n> \n> Is that \"a reflog of the current branch\", or because there is only one\n> reflog, should it be \"the reflog of the current branch\"? Ah, we mean one\n> entry in the reflog (an entry of the reflog of the current branch), so\n> this probably is Ok.\n\n\"reflog entry of the...\" would be clearer, yes.\n\n> \n>> @@ -133,8 +133,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n>> a commit whose commit message matches the specified regular expression.\n>> This name returns the youngest matching commit which is\n>> reachable from any ref. If the commit message starts with a\n>> + '!' you have to repeat that; the special sequence ':/!',\n>> + followed by something else than '!', is reserved for now.\n> \n> Hmm, shouldn't it be \"something OTHER than\" instead?\n\nI think both are correct, \"else\" is maybe slightly more\nAmerican/colloquial in this context. I'd be happy with both.\n\n> \n> Grammar is hard; thanks for cleaning them up.\n> \n\nI too :)\n"},{"id":"165070","messageId":"7vvcyvcg6o.fsf@alter.siamese.dyndns.org","threadId":"26942","inReplyTo":"b37095f8802face1fc7920359cf2db3536a5d3a2.1301649867.git.git@drmicha.warpmail.net","subject":"Re: [PATCHv2 2/3] revisions.txt: structure with a labelled list","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-04-03T19:01:35Z","receivedAt":"2011-04-03T19:01:35Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Michael J Gruber writes:\n\n> -* The special construct '@\\{-\\}' means the th branch checked out\n> +'@\\{-\\}', e.g. '@\\{-1\\}'::\n> + The special construct '@\\{-\\}' means the th branch checked out\n> before the current one.\n\nThis is outside the scope of this patch, but there is nothing _special_\nabout @{-} at all. When it appeared it might have been special but not\nanymore. We should reserve the word \"special\" only for \"special\" cases.\n\ne.g. this one is perfectly fine:\n\n> +'{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n> + A suffix '{caret}' to a revision parameter means the first parent of\n> that commit object. '{caret}' means the th parent (i.e.\n> + '{caret}'\n> + is equivalent to '{caret}1'). As a special rule,\n> + '{caret}0' means the commit itself and is used when '' is the\n> object name of a tag object that refers to a commit object.\n\nA^1, A^2,..., A^$n all all parents of A; A^0 is not a parent of A but we\nstill accept it as a special rule.\n"},{"id":"165118","messageId":"cover.1301930700.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301649867.git.git@drmicha.warpmail.net","subject":"[PATCHv3 0/3] revisions.txt improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-04T15:27:02Z","receivedAt":"2011-04-04T15:27:02Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"v3 as per discussion with Junio.\n(1/3, 2/3 unchanged but resent)\n\nMichael J Gruber (3):\n revisions.txt: consistent use of quotes\n revisions.txt: structure with a labelled list\n revisions.txt: language improvements\n\n Documentation/revisions.txt | 198 +++++++++++++++++++++++--------------------\n 1 files changed, 107 insertions(+), 91 deletions(-)\n\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"165119","messageId":"84663544e6ecb5dde76adaf9f2de2ffa0d230fd3.1301930700.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301649867.git.git@drmicha.warpmail.net","subject":"[PATCHv3 1/3] revisions.txt: consistent use of quotes","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-04T15:27:03Z","receivedAt":"2011-04-04T15:27:03Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Our use of quotes is inconsistent everywhere and within some files.\nBefore reworking the structure of revisions.txt, make the quotes\nconsistent:\n\n`git command`\n\n'some snippet or term'\n\nThe former gets typeset as code, the latter with some form of emphasis.\nthe man backend uses two types of emphasis.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 104 +++++++++++++++++++++---------------------\n 1 files changed, 52 insertions(+), 52 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 04fceee..b994bab 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -13,45 +13,45 @@ blobs contained in a commit.\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from 'git describe'; i.e. a closest tag, optionally\n+* An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n- `g`, and an abbreviated object name.\n+ 'g', and an abbreviated object name.\n \n * A symbolic ref name. E.g. 'master' typically means the commit\n- object referenced by refs/heads/master. If you\n- happen to have both heads/master and tags/master, you can\n+ object referenced by 'refs/heads/master'. If you\n+ happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n- When ambiguous, a `` is disambiguated by taking the\n+ When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if `$GIT_DIR/` exists, that is what you mean (this is usually\n- useful only for `HEAD`, `FETCH_HEAD`, `ORIG_HEAD`, `MERGE_HEAD`\n- and `CHERRY_PICK_HEAD`);\n+ . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n+ and 'CHERRY_PICK_HEAD');\n \n- . otherwise, `refs/` if exists;\n+ . otherwise, 'refs/' if exists;\n \n- . otherwise, `refs/tags/` if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n- . otherwise, `refs/heads/` if exists;\n+ . otherwise, 'refs/heads/' if exists;\n \n- . otherwise, `refs/remotes/` if exists;\n+ . otherwise, 'refs/remotes/' if exists;\n \n- . otherwise, `refs/remotes//HEAD` if exists.\n+ . otherwise, 'refs/remotes//HEAD' if exists.\n +\n-HEAD names the commit your changes in the working tree is based on.\n-FETCH_HEAD records the branch you fetched from a remote repository\n-with your last 'git fetch' invocation.\n-ORIG_HEAD is created by commands that moves your HEAD in a drastic\n-way, to record the position of the HEAD before their operation, so that\n+'HEAD' names the commit your changes in the working tree is based on.\n+'FETCH_HEAD' records the branch you fetched from a remote repository\n+with your last `git fetch` invocation.\n+'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+way, to record the position of the 'HEAD' before their operation, so that\n you can change the tip of the branch back to the state before you ran\n them easily.\n-MERGE_HEAD records the commit(s) you are merging into your branch\n-when you run 'git merge'.\n-CHERRY_PICK_HEAD records the commit you are cherry-picking\n-when you run 'git cherry-pick'.\n+'MERGE_HEAD' records the commit(s) you are merging into your branch\n+when you run `git merge`.\n+'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+when you run `git cherry-pick`.\n +\n-Note that any of the `refs/*` cases above may come either from\n-the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n+Note that any of the 'refs/*' cases above may come either from\n+the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n * A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n@@ -59,10 +59,10 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n- existing log ($GIT_DIR/logs/). Note that this looks up the state\n+ existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n of your *local* ref at a given time; e.g., what was in your local\n- `master` branch last week. If you want to look at commits made during\n- certain times, see `--since` and `--until`.\n+ 'master' branch last week. If you want to look at commits made during\n+ certain times, see '--since' and '--until'.\n \n * A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n@@ -70,7 +70,7 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ($GIT_DIR/logs/).\n+ log ('$GIT_DIR/logs/').\n \n * You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n@@ -98,36 +98,36 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the usage of this form.\n \n * A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. `v0.99.8{caret}\\{commit\\}`) means the object\n+ brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). `rev{caret}0`\n- introduced earlier is a short-hand for `rev{caret}\\{commit\\}`.\n+ dereferenced anymore (in which case, barf). 'rev{caret}0'\n+ introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n \n * A suffix '{caret}' followed by an empty brace pair\n- (e.g. `v0.99.8{caret}\\{\\}`) means the object could be a tag,\n+ (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n * A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. `HEAD^{/fix nasty bug}`):\n- this is the same as `:/fix nasty bug` syntax below except that\n+ pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n+ this is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the ref before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. `:/fix nasty bug`): this names\n+* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n '!', you have to repeat that; the special sequence ':/!',\n followed by something else than '!' is reserved for now.\n The regular expression can match any part of the commit message. To\n- match messages starting with a string, one can use e.g. `:/^foo`.\n+ match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. `HEAD:README`); this names the blob or tree\n+* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. `:README`)\n+ ':path' (with an empty part before the colon, e.g. ':README')\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -136,9 +136,9 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.\n the same tree structure with the working tree.\n \n * A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. `:0:README`); this names a blob object in the\n+ colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. `:README`) names a stage 0 entry. During a merge, stage\n+ that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n@@ -175,31 +175,31 @@ G H I J\n SPECIFYING RANGES\n -----------------\n \n-History traversing commands such as 'git log' operate on a set\n+History traversing commands such as `git log` operate on a set\n of commits, not just a single commit. To these commands,\n specifying a single revision with the notation described in the\n previous section means the set of commits reachable from that\n commit, following the commit ancestry chain.\n \n-To exclude commits reachable from a commit, a prefix `{caret}`\n-notation is used. E.g. `{caret}r1 r2` means commits reachable\n-from `r2` but exclude the ones reachable from `r1`.\n+To exclude commits reachable from a commit, a prefix '{caret}'\n+notation is used. E.g. '{caret}r1 r2' means commits reachable\n+from 'r2' but exclude the ones reachable from 'r1'.\n \n This set operation appears so often that there is a shorthand\n-for it. When you have two commits `r1` and `r2` (named according\n+for it. When you have two commits 'r1' and 'r2' (named according\n to the syntax explained in SPECIFYING REVISIONS above), you can ask\n for commits that are reachable from r2 excluding those that are reachable\n-from r1 by `{caret}r1 r2` and it can be written as `r1..r2`.\n+from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.\n \n-A similar notation `r1\\...r2` is called symmetric difference\n-of `r1` and `r2` and is defined as\n-`r1 r2 --not $(git merge-base --all r1 r2)`.\n+A similar notation 'r1\\...r2' is called symmetric difference\n+of 'r1' and 'r2' and is defined as\n+'r1 r2 --not $(git merge-base --all r1 r2)'.\n It is the set of commits that are reachable from either one of\n-`r1` or `r2` but not from both.\n+'r1' or 'r2' but not from both.\n \n Two other shorthands for naming a set that is formed by a commit\n-and its parent commits exist. The `r1{caret}@` notation means all\n-parents of `r1`. `r1{caret}!` includes commit `r1` but excludes\n+and its parent commits exist. The 'r1{caret}@' notation means all\n+parents of 'r1'. 'r1{caret}!' includes commit 'r1' but excludes\n all of its parents.\n \n Here are a handful of examples:\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"165120","messageId":"b37095f8802face1fc7920359cf2db3536a5d3a2.1301930700.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301649867.git.git@drmicha.warpmail.net","subject":"[PATCHv3 2/3] revisions.txt: structure with a labelled list","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-04T15:27:04Z","receivedAt":"2011-04-04T15:27:04Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Currently, the reader has to parse a textual description in order to\nfind a specific syntax in the list.\n\nRestructure as a labelled list with systematic labels as well as\nconcrete examples as a visual guide.\n\nSigned-off-by: Michael J Gruber \n---\n Documentation/revisions.txt | 86 +++++++++++++++++++++++++-----------------\n 1 files changed, 51 insertions(+), 35 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex b994bab..92bc662 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -1,23 +1,26 @@\n SPECIFYING REVISIONS\n --------------------\n \n-A revision parameter typically, but not necessarily, names a\n+A revision parameter '' typically, but not necessarily, names a\n commit object. They use what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n ones listed near the end of this list are to name trees and\n blobs contained in a commit.\n \n-* The full SHA1 object name (40-byte hexadecimal string), or\n+'', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n+ The full SHA1 object name (40-byte hexadecimal string), or\n a substring of such that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n name the same commit object if there are no other object in\n your repository whose object name starts with dae86e.\n \n-* An output from `git describe`; i.e. a closest tag, optionally\n+'', e.g. 'v1.7.4.2-679-g3bee7fb'::\n+ An output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n-* A symbolic ref name. E.g. 'master' typically means the commit\n+'', e.g. 'master', 'heads/master', 'refs/heads/master'::\n+ A symbolic ref name. E.g. 'master' typically means the commit\n object referenced by 'refs/heads/master'. If you\n happen to have both 'heads/master' and 'tags/master', you can\n explicitly say 'heads/master' to tell git which one you mean.\n@@ -30,7 +33,7 @@ blobs contained in a commit.\n \n . otherwise, 'refs/' if exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if exists;\n \n . otherwise, 'refs/heads/' if exists;\n \n@@ -53,7 +56,8 @@ when you run `git cherry-pick`.\n Note that any of the 'refs/*' cases above may come either from\n the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n-* A ref followed by the suffix '@' with a date specification\n+'@\\{\\}', e.g. 'master@\\{yesterday\\}', 'HEAD@\\{5 minutes ago\\}'::\n+ A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n@@ -64,58 +68,68 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n 'master' branch last week. If you want to look at commits made during\n certain times, see '--since' and '--until'.\n \n-* A ref followed by the suffix '@' with an ordinal specification\n+'@\\{\\}', e.g. 'master@\\{1\\}'::\n+ A ref followed by the suffix '@' with an ordinal specification\n enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n immediately following a ref name and the ref must have an existing\n- log ('$GIT_DIR/logs/').\n+ log ('$GIT_DIR/logs/').\n \n-* You can use the '@' construct with an empty ref part to get at a\n+'@\\{\\}', e.g. '@\\{1\\}'::\n+ You can use the '@' construct with an empty ref part to get at a\n reflog of the current branch. For example, if you are on the\n branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n-* The special construct '@\\{-\\}' means the th branch checked out\n+'@\\{-\\}', e.g. '@\\{-1\\}'::\n+ The special construct '@\\{-\\}' means the th branch checked out\n before the current one.\n \n-* The suffix '@\\{upstream\\}' to a ref (short form 'ref@\\{u\\}') refers to\n+'@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n+ The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n the branch the ref is set to build on top of. Missing ref defaults\n to the current branch.\n \n-* A suffix '{caret}' to a revision parameter (e.g. 'HEAD{caret}') means the first parent of\n+'{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n+ A suffix '{caret}' to a revision parameter means the first parent of\n that commit object. '{caret}' means the th parent (i.e.\n- 'rev{caret}'\n- is equivalent to 'rev{caret}1'). As a special rule,\n- 'rev{caret}0' means the commit itself and is used when 'rev' is the\n+ '{caret}'\n+ is equivalent to '{caret}1'). As a special rule,\n+ '{caret}0' means the commit itself and is used when '' is the\n object name of a tag object that refers to a commit object.\n \n-* A suffix '{tilde}' to a revision parameter means the commit\n+'{tilde}', e.g. 'master{tilde}3'::\n+ A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. rev~3 is\n- equivalent to rev{caret}{caret}{caret} which is equivalent to\n- rev{caret}1{caret}1{caret}1. See below for a illustration of\n+ commit object, following only the first parent. I.e. '{tilde}3' is\n+ equivalent to '{caret}{caret}{caret}' which is equivalent to\n+ '{caret}1{caret}1{caret}1'. See below for a illustration of\n the usage of this form.\n \n-* A suffix '{caret}' followed by an object type name enclosed in\n- brace pair (e.g. 'v0.99.8{caret}\\{commit\\}') means the object\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n+ A suffix '{caret}' followed by an object type name enclosed in\n+ brace pair means the object\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n- dereferenced anymore (in which case, barf). 'rev{caret}0'\n- introduced earlier is a short-hand for 'rev{caret}\\{commit\\}'.\n+ dereferenced anymore (in which case, barf). '{caret}0'\n+ introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n \n-* A suffix '{caret}' followed by an empty brace pair\n- (e.g. 'v0.99.8{caret}\\{\\}') means the object could be a tag,\n+'{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n+ A suffix '{caret}' followed by an empty brace pair\n+ means the object could be a tag,\n and dereference the tag recursively until a non-tag object is\n found.\n \n-* A suffix '{caret}' to a revision parameter followed by a brace\n- pair that contains a text led by a slash (e.g. 'HEAD^{/fix nasty bug}'):\n- this is the same as ':/fix nasty bug' syntax below except that\n+'{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n+ A suffix '{caret}' to a revision parameter, followed by a brace\n+ pair that contains a text led by a slash,\n+ is the same as ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n- the ref before '{caret}'.\n+ the '' before '{caret}'.\n \n-* A colon, followed by a slash, followed by a text (e.g. ':/fix nasty bug'): this names\n+':/', e.g. ':/fix nasty bug'::\n+ A colon, followed by a slash, followed by a text, names\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n@@ -124,10 +138,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n-* A suffix ':' followed by a path (e.g. 'HEAD:README'); this names the blob or tree\n+':', e.g. 'HEAD:README', ':README', 'master:./README'::\n+ A suffix ':' followed by a path names the blob or tree\n at the given path in the tree-ish object named by the part\n before the colon.\n- ':path' (with an empty part before the colon, e.g. ':README')\n+ ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n A path starting with './' or '../' is relative to current working directory.\n@@ -135,10 +150,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n This is most useful to address a blob or tree from a commit or tree that has\n the same tree structure with the working tree.\n \n-* A colon, optionally followed by a stage number (0 to 3) and a\n- colon, followed by a path (e.g. ':0:README'); this names a blob object in the\n+'::', e.g. ':0:README', ':README'::\n+ A colon, optionally followed by a stage number (0 to 3) and a\n+ colon, followed by a path, names a blob object in the\n index at the given path. Missing stage number (and the colon\n- that follows it, e.g. ':README') names a stage 0 entry. During a merge, stage\n+ that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n the branch being merged.\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"165121","messageId":"948c323701bf21e699c3348c777bce6e0442dd8e.1301930700.git.git@drmicha.warpmail.net","threadId":"26942","inReplyTo":"cover.1301649867.git.git@drmicha.warpmail.net","subject":"[PATCHv3 3/3] revisions.txt: language improvements","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2011-04-04T15:27:05Z","receivedAt":"2011-04-04T15:27:05Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Signed-off-by: Michael J Gruber \n---\n Diff to v2:\n \n '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n The full SHA1 object name (40-byte hexadecimal string), or\n - a substring that is unique within the repository.\n + a leading substring that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n name the same commit object if there is no other object in\n your repository whose object name starts with dae86e.\n @@ -79,11 +79,11 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. '@\\{1\\}'::\n You can use the '@' construct with an empty ref part to get at a\n - reflog of the current branch. For example, if you are on\n + reflog entry of the current branch. For example, if you are on\n branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n '@\\{-\\}', e.g. '@\\{-1\\}'::\n - The special construct '@\\{-\\}' means the th branch checked out\n + The construct '@\\{-\\}' means the th branch checked out\n before the current one.\n \n '@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n\n Documentation/revisions.txt | 70 +++++++++++++++++++++---------------------\n 1 files changed, 35 insertions(+), 35 deletions(-)\n\ndiff --git a/Documentation/revisions.txt b/Documentation/revisions.txt\nindex 92bc662..b290b61 100644\n--- a/Documentation/revisions.txt\n+++ b/Documentation/revisions.txt\n@@ -2,20 +2,20 @@ SPECIFYING REVISIONS\n --------------------\n \n A revision parameter '' typically, but not necessarily, names a\n-commit object. They use what is called an 'extended SHA1'\n+commit object. It uses what is called an 'extended SHA1'\n syntax. Here are various ways to spell object names. The\n-ones listed near the end of this list are to name trees and\n+ones listed near the end of this list name trees and\n blobs contained in a commit.\n \n '', e.g. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'::\n The full SHA1 object name (40-byte hexadecimal string), or\n- a substring of such that is unique within the repository.\n+ a leading substring that is unique within the repository.\n E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both\n- name the same commit object if there are no other object in\n+ name the same commit object if there is no other object in\n your repository whose object name starts with dae86e.\n \n '', e.g. 'v1.7.4.2-679-g3bee7fb'::\n- An output from `git describe`; i.e. a closest tag, optionally\n+ Output from `git describe`; i.e. a closest tag, optionally\n followed by a dash and a number of commits, followed by a dash, a\n 'g', and an abbreviated object name.\n \n@@ -27,30 +27,30 @@ blobs contained in a commit.\n When ambiguous, a '' is disambiguated by taking the\n first match in the following rules:\n \n- . if '$GIT_DIR/' exists, that is what you mean (this is usually\n+ . If '$GIT_DIR/' exists, that is what you mean (this is usually\n useful only for 'HEAD', 'FETCH_HEAD', 'ORIG_HEAD', 'MERGE_HEAD'\n and 'CHERRY_PICK_HEAD');\n \n- . otherwise, 'refs/' if exists;\n+ . otherwise, 'refs/' if it exists;\n \n- . otherwise, 'refs/tags/' if exists;\n+ . otherwise, 'refs/tags/' if it exists;\n \n- . otherwise, 'refs/heads/' if exists;\n+ . otherwise, 'refs/heads/' if it exists;\n \n- . otherwise, 'refs/remotes/' if exists;\n+ . otherwise, 'refs/remotes/' if it exists;\n \n- . otherwise, 'refs/remotes//HEAD' if exists.\n+ . otherwise, 'refs/remotes//HEAD' if it exists.\n +\n-'HEAD' names the commit your changes in the working tree is based on.\n-'FETCH_HEAD' records the branch you fetched from a remote repository\n+'HEAD' names the commit on which you based the changes in the working tree.\n+'FETCH_HEAD' records the branch which you fetched from a remote repository\n with your last `git fetch` invocation.\n-'ORIG_HEAD' is created by commands that moves your 'HEAD' in a drastic\n+'ORIG_HEAD' is created by commands that move your 'HEAD' in a drastic\n way, to record the position of the 'HEAD' before their operation, so that\n-you can change the tip of the branch back to the state before you ran\n-them easily.\n-'MERGE_HEAD' records the commit(s) you are merging into your branch\n+you can easily change the tip of the branch back to the state before you ran\n+them.\n+'MERGE_HEAD' records the commit(s) which you are merging into your branch\n when you run `git merge`.\n-'CHERRY_PICK_HEAD' records the commit you are cherry-picking\n+'CHERRY_PICK_HEAD' records the commit which you are cherry-picking\n when you run `git cherry-pick`.\n +\n Note that any of the 'refs/*' cases above may come either from\n@@ -60,7 +60,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n A ref followed by the suffix '@' with a date specification\n enclosed in a brace\n pair (e.g. '\\{yesterday\\}', '\\{1 month 2 weeks 3 days 1 hour 1\n- second ago\\}' or '\\{1979-02-26 18:30:00\\}') to specify the value\n+ second ago\\}' or '\\{1979-02-26 18:30:00\\}') specifies the value\n of the ref at a prior point in time. This suffix may only be\n used immediately following a ref name and the ref must have an\n existing log ('$GIT_DIR/logs/'). Note that this looks up the state\n@@ -70,7 +70,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. 'master@\\{1\\}'::\n A ref followed by the suffix '@' with an ordinal specification\n- enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') to specify\n+ enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies\n the n-th prior value of that ref. For example 'master@\\{1\\}'\n is the immediate prior value of 'master' while 'master@\\{5\\}'\n is the 5th prior value of 'master'. This suffix may only be used\n@@ -79,16 +79,16 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n \n '@\\{\\}', e.g. '@\\{1\\}'::\n You can use the '@' construct with an empty ref part to get at a\n- reflog of the current branch. For example, if you are on the\n- branch 'blabla', then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n+ reflog entry of the current branch. For example, if you are on\n+ branch 'blabla' then '@\\{1\\}' means the same as 'blabla@\\{1\\}'.\n \n '@\\{-\\}', e.g. '@\\{-1\\}'::\n- The special construct '@\\{-\\}' means the th branch checked out\n+ The construct '@\\{-\\}' means the th branch checked out\n before the current one.\n \n '@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'::\n The suffix '@\\{upstream\\}' to a ref (short form '@\\{u\\}') refers to\n- the branch the ref is set to build on top of. Missing ref defaults\n+ the branch the ref is set to build on top of. A missing ref defaults\n to the current branch.\n \n '{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::\n@@ -102,9 +102,9 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{tilde}', e.g. 'master{tilde}3'::\n A suffix '{tilde}' to a revision parameter means the commit\n object that is the th generation grand-parent of the named\n- commit object, following only the first parent. I.e. '{tilde}3' is\n+ commit object, following only the first parents. I.e. '{tilde}3' is\n equivalent to '{caret}{caret}{caret}' which is equivalent to\n- '{caret}1{caret}1{caret}1'. See below for a illustration of\n+ '{caret}1{caret}1{caret}1'. See below for an illustration of\n the usage of this form.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{commit\\}'::\n@@ -113,7 +113,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n could be a tag, and dereference the tag recursively until an\n object of that type is found or the object cannot be\n dereferenced anymore (in which case, barf). '{caret}0'\n- introduced earlier is a short-hand for '{caret}\\{commit\\}'.\n+ is a short-hand for '{caret}\\{commit\\}'.\n \n '{caret}\\{\\}', e.g. 'v0.99.8{caret}\\{\\}'::\n A suffix '{caret}' followed by an empty brace pair\n@@ -124,7 +124,7 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n '{caret}\\{/\\}', e.g. 'HEAD^{/fix nasty bug}'::\n A suffix '{caret}' to a revision parameter, followed by a brace\n pair that contains a text led by a slash,\n- is the same as ':/fix nasty bug' syntax below except that\n+ is the same as the ':/fix nasty bug' syntax below except that\n it returns the youngest matching commit which is reachable from\n the '' before '{caret}'.\n \n@@ -133,8 +133,8 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n a commit whose commit message matches the specified regular expression.\n This name returns the youngest matching commit which is\n reachable from any ref. If the commit message starts with a\n- '!', you have to repeat that; the special sequence ':/!',\n- followed by something else than '!' is reserved for now.\n+ '!' you have to repeat that; the special sequence ':/!',\n+ followed by something else than '!', is reserved for now.\n The regular expression can match any part of the commit message. To\n match messages starting with a string, one can use e.g. ':/^foo'.\n \n@@ -145,19 +145,19 @@ the '$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file.\n ':path' (with an empty part before the colon)\n is a special case of the syntax described next: content\n recorded in the index at the given path.\n- A path starting with './' or '../' is relative to current working directory.\n- The given path will be converted to be relative to working tree's root directory.\n+ A path starting with './' or '../' is relative to the current working directory.\n+ The given path will be converted to be relative to the working tree's root directory.\n This is most useful to address a blob or tree from a commit or tree that has\n- the same tree structure with the working tree.\n+ the same tree structure as the working tree.\n \n '::', e.g. ':0:README', ':README'::\n A colon, optionally followed by a stage number (0 to 3) and a\n colon, followed by a path, names a blob object in the\n- index at the given path. Missing stage number (and the colon\n+ index at the given path. A missing stage number (and the colon\n that follows it) names a stage 0 entry. During a merge, stage\n 1 is the common ancestor, stage 2 is the target branch's version\n (typically the current branch), and stage 3 is the version from\n- the branch being merged.\n+ the branch which is being merged.\n \n Here is an illustration, by Jon Loeliger. Both commit nodes B\n and C are parents of commit node A. Parent commits are ordered\n-- \n1.7.4.2.668.gba03a4\n"},{"id":"165130","messageId":"7voc4l98xh.fsf@alter.siamese.dyndns.org","threadId":"26942","inReplyTo":"cover.1301930700.git.git@drmicha.warpmail.net","subject":"Re: [PATCHv3 0/3] revisions.txt improvements","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-04-04T18:18:50Z","receivedAt":"2011-04-04T18:18:50Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}