[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Mon, 9 Jul 2012 15:57:53 +0530
From: Sayantan Datta <std2048@...il.com>
To: john-dev@...ts.openwall.com
Subject: Re: Pull requests
On Mon, Jul 9, 2012 at 3:46 PM, magnum <john.magnum@...hmail.com> wrote:
> On 2012-07-09 12:08, magnum wrote:
> > On 2012-07-09 11:51, Sayantan Datta wrote:
> >> On Mon, Jul 9, 2012 at 8:59 AM, Solar Designer <solar@...nwall.com>
> wrote:
> >>
> >>> On Mon, Jul 09, 2012 at 11:06:41AM +0800, myrice wrote:
> >>>> I have sent a pull request(xsha512-cuda bug fix) to magnum-jumbo. I
> >>>> think I should resend it to Jumbo-7, right?
> >>>
> >>> I'm not magnum, but bugfixes should definitely be getting into the
> >>> -fixes branch as well.
> >>>
> >>> Alexander
> >>>
> >>
> >> I'm a liitle confused with the whole process. First I push to my remote
> >> branch using command:
> >> git push
> https://github.com/Sayantan2048/magnum-jumbo.gitmagnum-jumbo:1.7.9-jumbo-6-fixes
> >
> > That URL is wrong.
> >
> >> Then I sent a pull request to
> >> magnumripper/magnum-jumbo@....9-jumbo-6-fixes.However it says my
> >> 1.7.9-jumbo-6-fixes branch is ahead by 38 commits.
> >> However it should be only 1.
> >
> > From what I can see you haven't got the 1.7.9-jumbo-6-fixes branch in
> > your repo.
>
> Now I see it. But it looks like you've done something wrong. You have
> magnum-jumbo stuff in your -fixes branch.
>
> magnum
>
Okay I got it. I wasn't changing my local working branch to
1.7.9-jumbo-6-fixes.
Regards,
Sayantan
Content of type "text/html" skipped
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.
