3 Commits

Author	SHA1	Message	Date
Petr Baudis	bbd14cb011	[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>	2005-08-01 15:20:14 -07:00
Petr Baudis	7ffeb8c24b	Document git-merge-cache -o	2005-05-11 04:49:36 +02:00
David Greaves	2cf565c53c	[PATCH 1/4] split core-git.txt and update ... Split the core-git.txt file Formatting fix to the diff-format.txt Signed-off-by: David Greaves <david@dgreaves.com>	2005-05-10 14:55:22 -07:00