# [PATCH 1/2] Document the master@{n} reflog query syntax. 5 messages from 2007-01-18 to 2007-01-18. Participants: Shawn O. Pearce, Jim Treadway, Andreas Ericsson. Thread: https://gitlist.dev/t/6417 ## Shawn O. Pearce, 2007-01-18 02:08 Subject: [PATCH 1/2] Document the master@{n} reflog query syntax. Message-ID: <20070118020804.GA23488@spearce.org> URL: https://gitlist.dev/e/20070118020804.GA23488%40spearce.org ``` In ab2a1a32 Junio improved the reflog query logic to support obtaining the n-th prior value of a ref, but this was never documented in git-rev-parse. Now it is. Signed-off-by: Shawn O. Pearce --- Documentation/git-rev-parse.txt | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 4eaf5a0..7bfbe1b 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -148,10 +148,18 @@ blobs contained in a commit. enclosed in a brace pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1 second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value - of the ref at a prior point in time. This suffix may only be + of the ref at a prior point in time.This suffix may only be used immediately following a ref name and the ref must have an existing log ($GIT_DIR/logs/). +* A ref followed by the suffix '@' with an ordinal specification + enclosed in a brace pair (e.g. '\{1\}', '\{15\}') to specify + the n-th prior value of that ref. For example 'master@\{1\}' + is the immediate prior value of 'master' while 'master@\{5\}' + is the 5th prior value of 'master'. This suffix may only be used + immediately following a ref name and the ref must have an existing + log ($GIT_DIR/logs/). + * A suffix '{caret}' to a revision parameter means the first parent of that commit object. '{caret}' means the th parent (i.e. 'rev{caret}' -- 1.5.0.rc1.g556b ``` ## Jim Treadway, 2007-01-18 02:30 Subject: Re: [PATCH 1/2] Document the master@{n} reflog query syntax. Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0701171829240.27034%40elephant.stardot-tech.com In-Reply-To: <20070118020804.GA23488@spearce.org> ``` On Wed, 17 Jan 2007, Shawn O. Pearce wrote: > In ab2a1a32 Junio improved the reflog query logic to support > obtaining the n-th prior value of a ref, but this was never > documented in git-rev-parse. Now it is. > > Signed-off-by: Shawn O. Pearce > --- > Documentation/git-rev-parse.txt | 10 +++++++++- > 1 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt > index 4eaf5a0..7bfbe1b 100644 > --- a/Documentation/git-rev-parse.txt > +++ b/Documentation/git-rev-parse.txt > @@ -148,10 +148,18 @@ blobs contained in a commit. > enclosed in a brace > pair (e.g. '\{yesterday\}', '\{1 month 2 weeks 3 days 1 hour 1 > second ago\}' or '\{1979-02-26 18:30:00\}') to specify the value > - of the ref at a prior point in time. This suffix may only be > + of the ref at a prior point in time.This suffix may only be I'm guessing that the above was unintentional? ``` ## Shawn O. Pearce, 2007-01-18 02:50 Subject: Re: [PATCH 1/2] Document the master@{n} reflog query syntax. Message-ID: <20070118025003.GC23124@spearce.org> URL: https://gitlist.dev/e/20070118025003.GC23124%40spearce.org In-Reply-To: ``` Jim Treadway wrote: > On Wed, 17 Jan 2007, Shawn O. Pearce wrote: > >- of the ref at a prior point in time. This suffix may only be > >+ of the ref at a prior point in time.This suffix may only be > > I'm guessing that the above was unintentional? Yes. Danngit. Junio, can you hand edit that patch? -- Shawn. ``` ## Andreas Ericsson, 2007-01-18 10:33 Subject: Re: [PATCH 1/2] Document the master@{n} reflog query syntax. Message-ID: <45AF4CDF.5010406@op5.se> URL: https://gitlist.dev/e/45AF4CDF.5010406%40op5.se In-Reply-To: <20070118025003.GC23124@spearce.org> ``` Shawn O. Pearce wrote: > Jim Treadway wrote: >> On Wed, 17 Jan 2007, Shawn O. Pearce wrote: >>> - of the ref at a prior point in time. This suffix may only be >>> + of the ref at a prior point in time.This suffix may only be >> I'm guessing that the above was unintentional? > > Yes. Danngit. Junio, can you hand edit that patch? > I'm starting to see --amend as an extremely useful thing to have, and I'm sure Junio thinks the same. For fixes this small, it sure is easier to just --amend the commit than to ask for a new patch to apply. Out of curiousity, how many other SCM's allow you to --amend a commit? -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 ``` ## Shawn O. Pearce, 2007-01-18 15:48 Subject: Re: [PATCH 1/2] Document the master@{n} reflog query syntax. Message-ID: <20070118154845.GD15428@spearce.org> URL: https://gitlist.dev/e/20070118154845.GD15428%40spearce.org In-Reply-To: <45AF4CDF.5010406@op5.se> ``` Andreas Ericsson wrote: > Shawn O. Pearce wrote: > >Jim Treadway wrote: > >>On Wed, 17 Jan 2007, Shawn O. Pearce wrote: > >>>- of the ref at a prior point in time. This suffix may only be > >>>+ of the ref at a prior point in time.This suffix may only be > >>I'm guessing that the above was unintentional? > > > >Yes. Danngit. Junio, can you hand edit that patch? > > > > I'm starting to see --amend as an extremely useful thing to have, and > I'm sure Junio thinks the same. For fixes this small, it sure is easier > to just --amend the commit than to ask for a new patch to apply. I still shouldn't have let that change sneak into the diff. I know how it happened, I wanted to copy part of that line so I wiggled it around in vi, copied it, then hit undo. I didn't undo back far enough. Then I didn't read the diff closely enough before sending. > Out of curiousity, how many other SCM's allow you to --amend a commit? None that I know of. -- Shawn. ```