[Koha-patches] [PATCH] If itemnumber is sent to catalogue/moredetail.pl use it

Andrew Moore andrew.moore at liblime.com
Wed Aug 27 19:08:37 CEST 2008


On Wed, Aug 27, 2008 at 9:46 AM, Michael Hafen <mdhafen at tech.washk12.org> wrote:
> I'll attach a new patch.  The lines that are failing there are from a
> different patch of mine.  I'll have to watch out for that in the future.

Hi Michael -

In case it helps, here's a trick that I use to help me around such
cases. It may help you or others in this spot. You may already know
way more than this about git, but maybe it will help others.

I use 'git rebase --interactive HEAD~5' to see the last 5 commits on
my tree. Then, I re-order them so that the top-most one of my patches
(just below the ones that are coming from the main tree) is the one
that I want to send in. Then, when you exit the editor, it will
rearrange your patches. When you 'git format-patch origin', the first
one it makes is the one that you want to send in, and it's made
against the current HEAD. Your other patches will be formatted to be
made on top of that one and will be numbered with larger numbers.

This may help you make sure that your submitted patches are made
against the central HEAD and that any local customizations are not
included.

-Andy



More information about the Koha-patches mailing list