Re: git-dpm vs gbp-pq: new upstream and patch refresh (long)
On Thu, 04 Sep 2014, Barry Warsaw wrote:
> On Sep 04, 2014, at 04:36 PM, Scott Kitterman wrote:
>
> >Actually, nevermind. That's not the problem you were trying to solve,
> >although you could remove the patch as described and then apply the updated
> >patch at the end of the series.
>
> Yeah, though sometimes for legitimate reasons you can't reorder patches. It
> vaguely feels like with git-dpm since the patch branch is never pushed, you
> could "uncommit" (`git reset --hard HEAD^`) and stash each commit until you
> got to the one you wanted to amend, then unstash and recommit back up the
> stack. E.g. just like quilt push/pop.
As others have mentionned, you should use "git rebase -i <ancestor>". This is what
you want to use on your patch-queue branch to modifiy individual commits,
reorder them, or drop them.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Discover the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/
Reply to: