projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4d8fa91) | patch
[PATCH] git-merge-cache -q doesn't complain about failing merge program
authorPetr Baudis <pasky@suse.cz>
Fri, 29 Jul 2005 12:53:38 +0000 (14:53 +0200)
committerJunio C Hamano <junkio@cox.net>
Mon, 1 Aug 2005 22:20:14 +0000 (15:20 -0700)
commitbbd14cb0113ca26d679970f4db9ad953fb273e36
tree2e95edc112e7e6254ba6f817887dc94acbcdf370tree | snapshot
parent4d8fa916c9ff89613234f41b9222a2b679bce5c3commit | diff
[PATCH] git-merge-cache -q doesn't complain about failing merge program

git-merge-cache reporting failed merge program is undesirable for
Cogito, since it emits its own more appropriate error message in that
case. However, I want to show other possible git-merge-cache error
messages. So -q will just silence this particular error.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge-cache.txt diff | blob | history
merge-cache.c diff | blob | history
The core git plumbing