aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
Commit message (Collapse)AuthorAge
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
| | | | | | | It's a compound word. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
| | | | | | This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Remove git-resolve.Junio C Hamano2007-02-12
Signed-off-by: Junio C Hamano <junkio@cox.net>