Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Alex Pilon
On Mon, May 16, 2016 at 06:57:51AM -0400, Robert P. J. Day wrote: > i'm assuming that i can use a combination of cherry picking and > rebasing to "extract" any linear sequence of commits from a branch if > i decide they properly belonged elsewhere. > > is it just me, or do other people think this i

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Richard Guy Briggs
On 16/05/16, Robert P. J. Day wrote: > > i hope rob doesn't mind my replying to his personal note from a > while back and CC'ing the list, since there's a bit more here than > meets the eye, and i wanted to make sure i was presenting it fairly. > > the problem was, having added, say, 5 linear

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-16 Thread Robert P. J. Day
i hope rob doesn't mind my replying to his personal note from a while back and CC'ing the list, since there's a bit more here than meets the eye, and i wanted to make sure i was presenting it fairly. the problem was, having added, say, 5 linear commits to a branch (A, B, C, D, E): ... X <--

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Robert P. J. Day
On Tue, 10 May 2016, Richard Guy Briggs wrote: > On 16/05/10, Robert P. J. Day wrote: > > SCENARIO: most recent 5 commits on a clean, linear history branch: > > > > ... X <--- A <--- B <--- C <--- D <--- E (HEAD) > > > > suddenly, i wish i hadn't done A, but want to leave the more > > recent

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Alex Pilon
On Tue, May 10, 2016 at 06:14:21AM -0400, Robert P. J. Day wrote: > i can remove the first line and save to get: > > ... X <--- B' <--- C' <--- D' <--- E' (HEAD) > > is there a way to do that without having to fire up an interactive > rebase session? Provided you never have rebase/merge/cherry

Re: [OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Richard Guy Briggs
On 16/05/10, Robert P. J. Day wrote: > SCENARIO: most recent 5 commits on a clean, linear history branch: > > ... X <--- A <--- B <--- C <--- D <--- E (HEAD) > > suddenly, i wish i hadn't done A, but want to leave the more recent > commits on that branch (rebased of course). > > pretty s

[OCLUG-Tech] git question: how can i drop the n'th last commit?

2016-05-10 Thread Robert P. J. Day
ASIDE: i know of several ways to do this, i'm just wondering if there's a particularly elegant way i haven't thought of. SCENARIO: most recent 5 commits on a clean, linear history branch: ... X <--- A <--- B <--- C <--- D <--- E (HEAD) suddenly, i wish i hadn't done A, but want to leave