[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20180905091308.GA2220@pi3.com.pl>
Date: Wed, 5 Sep 2018 11:13:08 +0200
From: Adam Zabrocki <pi3@....com.pl>
To: lkrg-users@...ts.openwall.com
Subject: Re: Small fixes = { .gitignore, Makefile, ... }
Hi,
I was not aware about "git-am", will keep it in mind - thanks.
Also, I had a lot of stashed changes and private dev branches which I needed to
merge. Some of them where desync from the official lkrg-main repo. In that kind
of cases I'm trying to manually apply and verify each of the commit / changes
to be sure that I won't break anythink.
I hope it is not a problem for you.
Thanks,
Adam
On Wed, Sep 05, 2018 at 08:55:23AM +0000, Mikhail Klementev wrote:
> Hello,
>
> Sorry, I meant git-am.
>
> It apply patches as commit.
>
> On Wed, Sep 05, 2018 at 10:39:35AM +0200, Adam Zabrocki wrote:
> > Hi,
> >
> > I believe this is what I did... Why?
> >
> > Best regards,
> > Adam
> >
> > On Wed, Sep 05, 2018 at 07:18:03AM +0000, Mikhail Klementev wrote:
> > > Hello,
> > >
> > > Why you don't use "git apply" for merge patches?
> > >
> > > On Wed, Sep 05, 2018 at 02:51:48AM +0200, Adam Zabrocki wrote:
> > > > Hi,
> > > >
> > > > I've merged Mikhail's patches to the official LKRG bitbucket repo. But
> > > > before I've done it, first I've pushed very big and heavy feature -
> > > > *_JUMP_LABEL support for kernel modules. All changes you can see here:
> > > >
> > > > https://bitbucket.org/Adam_pi3/lkrg-main/commits/all
> > > >
> > > > Thanks again Mikhail for your patches!
> > > > Adam
> > >
> > > --
> > > With eval and apply,
> > > Mikhail Klementev.
> >
> >
> >
> > --
> > pi3 (pi3ki31ny) - pi3 (at) itsec pl
> > http://pi3.com.pl
>
> --
> With eval and apply,
> Mikhail Klementev.
--
pi3 (pi3ki31ny) - pi3 (at) itsec pl
http://pi3.com.pl
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
