projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ec15be0) | patch
apply: accept -3/--3way command line option
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2012 20:21:53 +0000 (13:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2012 21:36:51 +0000 (14:36 -0700)
commitcfb6f9acc392561bb339763564e21b684e50ce83
treedd788798f02e6f669a3e6c4c58f3a70daceb46e6tree | snapshot
parentec15be02679ed5a98e4a96b23b99dd1b90196faecommit | diff
apply: accept -3/--3way command line option

Begin 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, other than
making sure that "--reject" and "--3way" are not given together, and
making "--3way" imply "--index".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/apply.c diff | blob | history
t/t4117-apply-reject.sh diff | blob | history
Git—the stupid content tracker