{"thread":{"id":"6417","subject":"[PATCH 1/2] Document the master@{n} reflog query syntax.","startedAt":"2007-01-18T02:08:04Z","lastAt":"2007-01-18T15:48:45Z","messageCount":5,"participants":["Shawn O. Pearce","Jim Treadway","Andreas Ericsson"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"31939","messageId":"20070118020804.GA23488@spearce.org","threadId":"6417","inReplyTo":null,"subject":"[PATCH 1/2] Document the master@{n} reflog query syntax.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-18T02:08:04Z","receivedAt":"2007-01-18T02:08:04Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"In ab2a1a32 Junio improved the reflog query logic to support\nobtaining the n-th prior value of a ref, but this was never\ndocumented in git-rev-parse. Now it is.\n\nSigned-off-by: Shawn O. Pearce \n---\n Documentation/git-rev-parse.txt | 10 +++++++++-\n 1 files changed, 9 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 4eaf5a0..7bfbe1b 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -148,10 +148,18 @@ blobs contained in a commit.\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- of the ref at a prior point in time. This suffix may only be\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/).\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+ 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+\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-- \n1.5.0.rc1.g556b\n"},{"id":"31941","messageId":"Pine.LNX.4.64.0701171829240.27034@elephant.stardot-tech.com","threadId":"6417","inReplyTo":"20070118020804.GA23488@spearce.org","subject":"Re: [PATCH 1/2] Document the master@{n} reflog query syntax.","fromName":"Jim Treadway","fromEmail":"jim@stardot-tech.com","sentAt":"2007-01-18T02:30:05Z","receivedAt":"2007-01-18T02:30:05Z","isPatch":true,"sender":{"key":"jim@stardot-tech.com","avatar":null},"body":"On Wed, 17 Jan 2007, Shawn O. Pearce wrote:\n\n> In ab2a1a32 Junio improved the reflog query logic to support\n> obtaining the n-th prior value of a ref, but this was never\n> documented in git-rev-parse. Now it is.\n>\n> Signed-off-by: Shawn O. Pearce \n> ---\n> Documentation/git-rev-parse.txt | 10 +++++++++-\n> 1 files changed, 9 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\n> index 4eaf5a0..7bfbe1b 100644\n> --- a/Documentation/git-rev-parse.txt\n> +++ b/Documentation/git-rev-parse.txt\n> @@ -148,10 +148,18 @@ blobs contained in a commit.\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> - of the ref at a prior point in time. This suffix may only be\n> + of the ref at a prior point in time.This suffix may only be\n\nI'm guessing that the above was unintentional?\n"},{"id":"31942","messageId":"20070118025003.GC23124@spearce.org","threadId":"6417","inReplyTo":"Pine.LNX.4.64.0701171829240.27034@elephant.stardot-tech.com","subject":"Re: [PATCH 1/2] Document the master@{n} reflog query syntax.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-18T02:50:03Z","receivedAt":"2007-01-18T02:50:03Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Jim Treadway wrote:\n> On Wed, 17 Jan 2007, Shawn O. Pearce wrote:\n> >- of the ref at a prior point in time. This suffix may only be\n> >+ of the ref at a prior point in time.This suffix may only be\n> \n> I'm guessing that the above was unintentional?\n\nYes. Danngit. Junio, can you hand edit that patch?\n\n-- \nShawn.\n"},{"id":"31958","messageId":"45AF4CDF.5010406@op5.se","threadId":"6417","inReplyTo":"20070118025003.GC23124@spearce.org","subject":"Re: [PATCH 1/2] Document the master@{n} reflog query syntax.","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2007-01-18T10:33:03Z","receivedAt":"2007-01-18T10:33:03Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Shawn O. Pearce wrote:\n> Jim Treadway wrote:\n>> On Wed, 17 Jan 2007, Shawn O. Pearce wrote:\n>>> - of the ref at a prior point in time. This suffix may only be\n>>> + of the ref at a prior point in time.This suffix may only be\n>> I'm guessing that the above was unintentional?\n> \n> Yes. Danngit. Junio, can you hand edit that patch?\n> \n\nI'm starting to see --amend as an extremely useful thing to have, and \nI'm sure Junio thinks the same. For fixes this small, it sure is easier \nto just --amend the commit than to ask for a new patch to apply.\n\nOut of curiousity, how many other SCM's allow you to --amend a commit?\n\n-- \nAndreas Ericsson andreas.ericsson@op5.se\nOP5 AB www.op5.se\nTel: +46 8-230225 Fax: +46 8-230231\n"},{"id":"31996","messageId":"20070118154845.GD15428@spearce.org","threadId":"6417","inReplyTo":"45AF4CDF.5010406@op5.se","subject":"Re: [PATCH 1/2] Document the master@{n} reflog query syntax.","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2007-01-18T15:48:45Z","receivedAt":"2007-01-18T15:48:45Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Andreas Ericsson wrote:\n> Shawn O. Pearce wrote:\n> >Jim Treadway wrote:\n> >>On Wed, 17 Jan 2007, Shawn O. Pearce wrote:\n> >>>- of the ref at a prior point in time. This suffix may only be\n> >>>+ of the ref at a prior point in time.This suffix may only be\n> >>I'm guessing that the above was unintentional?\n> >\n> >Yes. Danngit. Junio, can you hand edit that patch?\n> >\n> \n> I'm starting to see --amend as an extremely useful thing to have, and \n> I'm sure Junio thinks the same. For fixes this small, it sure is easier \n> to just --amend the commit than to ask for a new patch to apply.\n\nI still shouldn't have let that change sneak into the diff. I know\nhow it happened, I wanted to copy part of that line so I wiggled\nit around in vi, copied it, then hit undo. I didn't undo back far\nenough. Then I didn't read the diff closely enough before sending.\n\n> Out of curiousity, how many other SCM's allow you to --amend a commit?\n\nNone that I know of.\n\n-- \nShawn.\n"}]}