projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a200337) | patch
git-am: propagate --3way options as well
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Dec 2008 23:38:27 +0000 (15:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2008 02:45:02 +0000 (18:45 -0800)
commit22db240dd1791b32e7f6d25a466c2835bdccb51e
tree5a3d5b0d6e6e328a7dbaa1c50560551faa643c76tree | snapshot
parenta20033796b312390ea8a50917bea623efd6fad97commit | diff
git-am: propagate --3way options as well

The reasoning is the same as the previous patch, where we made -C<n>
and -p<n> propagate across a failure.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh diff | blob | history
Git—the stupid content tracker