summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-cache.txt
AgeCommit message (Collapse)AuthorFilesLines
2005-08-05[PATCH] Assorted documentation patchesLibravatar Johannes Schindelin1-1/+1
[jc: Johannes spent time and effort to see how consistent our use of terminilogy is, and as a byproduct made these corrections not related to the terminology unification. I really appreciate it.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-01[PATCH] git-merge-cache -q doesn't complain about failing merge programLibravatar Petr Baudis1-2/+7
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-05-11Document git-merge-cache -oLibravatar Petr Baudis1-1/+8
2005-05-10[PATCH 1/4] split core-git.txt and updateLibravatar David Greaves1-0/+77
Split the core-git.txt file Formatting fix to the diff-format.txt Signed-off-by: David Greaves <david@dgreaves.com>