Re: Unexpected cherry-pick behaviour
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Dec 16, 2013, 18:53 UTC
- Message-ID
- <B4E4F29CB20847DEB23F21255A040187@PhilipOakley>
- In-Reply-To
- <0172E9F1B5F945EB9294F1066C2FB72E@PhilipOakley>
From: "Philip Oakley" <philipoakley@iee.org>
Show 20 quoted lines
> From: "Junio C Hamano" <gitster@pobox.com>, Saturday, December 14, > 2013 7:39 PM >> "Philip Oakley" <philipoakley@iee.org> writes: >> >>> Would this be a good use of the >>> * Magic pathspecs like ":(icase) >>> that was recently released (v1.8.5 2Dec13) so that the merge >>> stages >>> can be named. >> >> Because the pathspec mechahism is for you to tell an operation that >> works on a collection of paths (e.g. "all the paths in the HEAD", >> "all the paths at stage #1 in the index") to narrow the set it >> operates on down to only those that match, I do not think it is a >> good match at all to what you are trying to do. >> > > My point was that the ":1:" syntax already was a "path at stage #1 in > the index" indicator, and that it would be good to have a memorable > name for the :1:2:3: stages as per Antoine's query.
Could someone point me at where is this syntax decoded? My initial hunt around the code base didn't find the relevant location.
Show 10 quoted lines
> > It maybe that my referring to it as a 'magic pathspec' was a mistake, > but the difficulty of remembering which number is ours:theirs:base > still stands. > > (for general info; the :<stage>: format is defined in 'git revision > (7)' as the last method for Specifying Revisions) > > Philip > --
Philip