From: Junio C Hamano <hidden> Date: 2016-06-15 22:56:50
Ramkumar Ramachandra [off-list ref] 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").