From: Nguyen Thai Ngoc Duy Date: Thu, 10 May 2012 12:40:49 GMT Subject: Re: [PATCH 2/8] apply: accept --threeway command line option Message-ID: In-Reply-To: <1336629745-22436-3-git-send-email-gitster@pobox.com> On Thu, May 10, 2012 at 1:02 PM, Junio C Hamano wrote: > 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. -- Duy