From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Fri, 22 Oct 2010 15:57:32 GMT
Subject: Re: git merge --abort? [was: Re: [PATCHv4 00/21] git notes merge]
Message-ID: <AANLkTimFsVDoPUiVgPpWe+iZZOUNuUKN=0tya6PFwK5N@mail.gmail.com>
In-Reply-To: <20101022154815.GE9224@burratino>

Heya,

On Fri, Oct 22, 2010 at 10:48, Jonathan Nieder <jrnieder@gmail.com> wrote:
> I doubt[*] 'git reset --merge' could be anything but a mistake when used
> outside the context of a merge (remember that the plumbing is called
> "read-tree", not "reset").

In that case, we should perhaps deprecate 'git reset --merge' and
encourage users to use 'git merge --abort' instead. (I was thinking
first that it doesn't make sense conceptually to have a command under
'git reset' that only works for merges, but we have the same with 'git
checkout' already in the form of 'git checkout --ours', so perhaps
it's ok to keep 'git reset --merge' then.)

-- 
Cheers,

Sverre Rabbelier