projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8af1274) | patch
git-am: do not fail if 3-way fallback succeeds.
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Oct 2005 18:46:43 +0000 (11:46 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Oct 2005 18:46:43 +0000 (11:46 -0700)
commit73319032c8d2b2c73138d5caee1d2838fe1305d2
treeb66dab45d46cde41f3d4e365faf03c405d0e6c3ftree | snapshot
parent8af12741ee0e35f43b3180b435cd33642c183e97commit | diff
git-am: do not fail if 3-way fallback succeeds.

The current one incorrectly stops there without committing.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-am.sh diff | blob | history
The core git plumbing