From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Apr 2013 15:53:45 GMT
Subject: Re: Ensimag students projects, version 2013
Message-ID: <7vk3o3zt6e.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CALkWK0nFB1dzmp6yC9XS4ADmWf9tfQYtsSH0K1u0dtBWT0CRNw@mail.gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

> - Make the -3 and -c switches in git am configuration variables.  I
> have an alias.

 - Make failed "git am --3way" due to "unusable index" a bit more
   helpful. Right now, the information on which hunk failed to apply
   is lost, and there is no "git am --no-3way" (the user needs to
   know the trick ">.git/rebase-apply/threeway").