Re: [PATCH 2/8] apply: accept --threeway command line option

Nguyen Thai Ngoc Duy [off-list ref] writes:

On Thu, May 10, 2012 at 1:02 PM, Junio C Hamano [off-list ref] wrote:

quoted

This is the beginning of teaching the three-way merge fallback logic "git
am -3" uses to the underlying "git apply". It only implements the command
line parsing part, and does not do anything interesting yet.

Can we reuse '-3/--3way' instead of --threeway? I already have hard
time remembering which command uses -m/--merge, which one -3.

Oh, not just "Can we reuse", but we definitely should.  Thanks for
pointing it out.

It was just that I didn't check what "am" exactly calls it, as I always
just type "am -s3c" these days ;-).