projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 64edf4b) | patch
git-merge: fail correctly when we cannot fast forward.
authorJunio C Hamano <junkio@cox.net>
Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Mar 2007 21:04:54 +0000 (13:04 -0800)
commit7d79c860a6e2a8ceee10039153b47f0a8580607d
tree44e8371528b304b0cf8eaa65097006f8a7867876tree | snapshot
parent64edf4b2eb19e5b94eda60c0e21d85e45602a8f1commit | diff
git-merge: fail correctly when we cannot fast forward.

When we cannot fast forward the working tree and the current
branch, git-merge did not exit with non-zero status.

Noticed by Larry Streepy, the section to be fixed identfied by
Johannes Schindelin.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.