Re: [git-users] lost file with git add - git rm -f

On Mon, 1 Aug 2016 13:44:55 +0200 (CEST) Xen wrote: [...] > > git wiped the file from disk. I worked very hard on that file > > (several days( and I really hope this can be recovered. I could not > > find a solution on the web. [...] > I hope the advice that was given to you

Re: [git-users] lost file with git add - git rm -f

Konstantin Khomoutov schreef op 02-08-2016 13:21: On Mon, 1 Aug 2016 13:44:55 +0200 (CEST) Xen wrote: [...] > git wiped the file from disk. I worked very hard on that file > (several days( and I really hope this can be recovered. I could not > find a solution on the web.

Re: [git-users] Mergetool / vimdiff: How to select a hunk?

On 2016-08-02, at 4:25 AM, Konstantin Khomoutov wrote: > On Tue, 26 Jul 2016 18:25:19 -0700 > Michael wrote: > >> When a merge makes a mess, git offers, from "git mergetool", vimdiff. >> >> Is there an easy way to select one of the hunks

Re: [git-users] Mergetool / vimdiff: How to select a hunk?

I’d try something like this: http://lmgtfy.com/?q=vimdiff+cheat+sheet Gergely Polonkai [image: https://]about.me/gergely.polonkai 2016-08-02 16:42 GMT+02:00 Michael