Date: Tue, 22 May 2012 22:37:27 +0200 From: magnum <john.magnum@...hmail.com> To: john-dev@...ts.openwall.com Subject: Re: OpenCL SWAP64 on 7970 On 05/22/2012 06:49 PM, myrice wrote: > On Wed, May 23, 2012 at 12:19 AM, Claudio André > <claudioandre.br@...il.com> wrote: >> Strange, it is on magum-jumbo commit (authored 19 days ago). >> https://github.com/magnumripper/magnum-jumbo/commit/5d5544dfe03ef56bfe26a28bfd0353076258e2d3#diff-4 >> > > Hmm, I don't know why I didn't get it. I managed my own version > "myrice-JtR", I have the old version. But I have already do: > git fetch magnum magnum-jumbo:magnum-jumbo > magnum is the git url to magnum-jumbo A "git fetch" will only update the git database, not your current branch. You would normally do a "git fetch && git pull". Also, if you have local commits that are not in magnum-jumbo, it might be better to use "git fetch && git pull --rebase" because it will save us an unnecessary merge in the history. As far as I know, it doesn't hurt to *always* use that --rebase option when pulling from upstream. magnum
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.