Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sun, 12 Jul 2015 16:37:53 +0200
From: Frank Dittrich <frank.dittrich@...lbox.org>
To: john-dev@...ts.openwall.com
Subject: Re: more robustness

On 07/12/2015 03:53 PM, Solar Designer wrote:
> On Sun, Jul 12, 2015 at 07:46:48PM +0800, Kai Zhao wrote:
>> There are 4 bugs found by the latest --fuzz.
>>
>> https://github.com/loverszhaokai/JohnTheRipper/tree/fuzz_option
> 
> Somehow pulling this branch resulted in conflicts:

I'd consider those repositories where the owner is the only one pushing
changes to be more or less "private".
Unless I do have local commits, in case of conflicts I do either a
$ git pull --force
or
$ git reset --hard HEAD~20
$ git pull

Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ