Re: [PATCH] gnu: add lispf4

[Nils Gillmann]

Ricardo Wurmus <address@hidden> writes:

> Nils Gillmann <address@hidden> writes:
>
>> Thanks for your review, the patch number 2 based on 1 should fix all the
>> problems you noted.
>
> Hmm, for some reason I cannot apply these patches to current master.
> What commit is this based on?  (Are other people able to apply them to
> current master?)
I should have rebased, shouldn't I?
commit e81e5fa5070135e8b3bc2b23235a3fe092b551d2
(Tue Feb 2) is the commit in my local branch before this.
>
> When resending patches in the future could you please squash the two
> commits into one?  This make reviewing and applying easier.  You can use
> “git commit --amend” to change the last commit; when the commit is not
> the most recent you can use “git rebase -i commit-hash^” to
> interactively move around and squash commits.
>
> ~~ Ricardo
>

I try to rebase with current master and merge the 2 patches from the
relatively old branch, just have to remember how without breaking
things.. in short I suppose it will be: squash the two commits (newer
one into older one iirc?), tell branch to track master, rebase branch?

-- 
ng/ni*
vcard: http://krosos.sdf.org