RE: Segfault on git for Windows

2017-04-05 Thread Rémi Galan Alfonso
> Hi Rémi, > > On Wed, 5 Apr 2017, Rémi Galan Alfonso wrote: > > > At $DAYWORK, the code is versionned under SVN. Since I haven't used SVN > > before and try to have a clean and bisectable history, I installed git > > with the intent to manage my code locally

Segfault on git for Windows

2017-04-05 Thread Rémi Galan Alfonso
EAD points to an unborn branch (master) Checking object directories: 100% (256/256), done. notice: No default references Thanks, Rémi Galan Alfonso

Re: [PATCH 1/3] Add --gui option to mergetool

2017-03-03 Thread Rémi Galan Alfonso
Hi, Denton Liu writes: > [...] > > +test_expect_success 'gui mergetool' ' > + test_when_finished "git reset --hard" && > + test_when_finished "git config merge.tool mytool" && > + test_when_finished "git config --unset merge.guitool" && > + git config merge.tool