From: Junio C Hamano Date: Tue, 19 Feb 2013 20:56:07 GMT Subject: Re: [PATCH v4 1/3] user-manual: Reorganize the reroll sections, adding 'git rebase -i' Message-ID: <7vobfg3tw8.fsf@alter.siamese.dyndns.org> In-Reply-To: <20130219185119.GD8170@odin.tremily.us> "W. Trevor King" writes: > On Tue, Feb 19, 2013 at 10:47:04AM -0800, Junio C Hamano wrote: >> "W. Trevor King" writes: >> > +Sometimes you want to edit a commit deeper in your history. One >> > +approach is to use `git format-patch` to create a series of patches, >> > +then reset the state to before the patches: >> > >> > ------------------------------------------------- >> > +$ git format-patch origin >> > +$ git reset --hard origin >> > ------------------------------------------------- >> >> Technically speaking, this does not "reset to before the patches". >> You would need "git reset --hard $(git merge-base origin HEAD)" or >> something like that. > > They'll be fine if they haven't fetched since they started their > branch ;). > > It does look like I've got an extra comma an a missing “and”. What > about: > > …create series of patches and then reset… The original doesn't look too odd to me, but I'll amend to what you just wrote. Thanks.