From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Fri, 22 Oct 2010 15:20:59 GMT
Subject: Re: git merge --abort? [was: Re: [PATCHv4 00/21] git notes merge]
Message-ID: <AANLkTimzryq2Qa5sZNmXVY5Z1epg5Zxe3TMk9CX_+VX8@mail.gmail.com>
In-Reply-To: <201010221712.06059.johan@herland.net>

Heya,

On Fri, Oct 22, 2010 at 10:12, Johan Herland <johan@herland.net> wrote:
> Yes, that makes sense to me, especially if we make a 'git merge --abort'
> synonym. Alternatively, we can make 'git merge --abort' check for
> MERGE_HEAD, and then defer to 'git reset --merge', while leaving 'git
> reset --merge' as-is.

ACK to that. I think people using 'git reset --merge' know what
they're doing, and should be able to clobber their changes (viz. `git
reset --hard`), while 'git merge --abort' should do more handholding
and make sure you don't lose any data. (If I had more time I'd
implement that 'core.nodataloss' flag...)

-- 
Cheers,

Sverre Rabbelier