From: John Tapsell <johnflux@gmail.com>
Date: Thu, 19 Feb 2009 10:05:57 GMT
Subject: git merge --abort
Message-ID: <43d8ce650902190205yc2274c5gb8e658c8608267ff@mail.gmail.com>

Hi,

 I hope you don't mind me generating lots of noise here..

  It's not obvious how to abort a merge between two trees.  Would
aliasing  "git merge --abort"  to "git reset --hard"  be sensible?  Is
there a better way to abort a merge?  Especially if you have
uncommitted changes.

  If that idea isn't liked, instead maybe we can add a note to 'git
merge --help' on how to abort.

John