Re: [PATCH 00/18] git notes merge
- From
Johan Herland <johan@herland.net>
- Date
- Sep 29, 2010, 15:16 UTC
- Message-ID
- <201009291716.52831.johan@herland.net>
- In-Reply-To
- <AANLkTi=gL_6ueBvO7URth-rbbHyZLpwYEAMwErh1ciba@mail.gmail.com>
On Wednesday 29 September 2010, Sverre Rabbelier wrote:
Show 6 quoted lines
> On Wed, Sep 29, 2010 at 02:23, Johan Herland wrote: > > Alternatively, the user can call 'git notes merge --reset' to > > abort the notes merge. > > I'm torn, but I think that since we actually can here, we should call > it 'git notes merge --abort'.
Yeah, I'm torn as well. What about providing both? Or is that bloat?
> I know that there's no 'git merge --abort', but IIRC that's for > technical reasons only.
Maybe there _should_ be a 'git merge --abort' (as a synonym to 'git reset --merge')?
...Johan
-- Johan Herland, <johan@herland.net> www.herland.net