From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 07 Apr 2011 23:26:55 GMT
Subject: Re: [PATCH] merge: allow "-" as a short-hand for "previous branch"
Message-ID: <7vbp0h63sw.fsf@alter.siamese.dyndns.org>
In-Reply-To: <BANLkTikA3dFQpZWC=TC3+zp2FS=uBBxf0Q@mail.gmail.com>

Thomas Adam <thomas@xteddy.org> writes:

> I agree this is is useful, but is there a danger of this being a
> common typo, and people merging in previous branches a lot more often
> than they ever intended?  In the case of "git checkout -" that's not
> as fatal, but if I ever mistype "git merge -" -- I'm now left with an
> unraveling exercise to do.

Just like you can checkout the previous branch back if you found you
checked out a wrong branch by a typo, if you found that you merged a wrong
branch, you can just reset it away back to ORIG_HEAD, no?

Or am I missing something more obvious?