summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Collapse)AuthorFilesLines
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
It's a compound word. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-17/+17
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-02-12Remove git-resolve.Libravatar Junio C Hamano1-0/+112
Signed-off-by: Junio C Hamano <junkio@cox.net>