Re: [PATCH 00/18] git notes merge
- From
Sverre Rabbelier <srabbelier@gmail.com>
- Date
- Sep 29, 2010, 15:20 UTC
- Message-ID
- <AANLkTinjAoAYW2as1VfeWJ=t4MORjC9s7=eMCbYttier@mail.gmail.com>
- In-Reply-To
- <201009291716.52831.johan@herland.net>
Heya,
On Wed, Sep 29, 2010 at 17:16, Johan Herland <johan@herland.net> wrote:
> Yeah, I'm torn as well. What about providing both? Or is that bloat?
Definitely not both, that would be confusing, and would limit us if we decide to add 'git merge --abort' later on.
Show 5 quoted lines
>> 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')?
Hmmm, I don't know if that does what the user wants, (I haven't used 'git reset --merge' before), but if it does, that sounds like a good solution.
-- Cheers, Sverre Rabbelier