summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Expand)Author
2018-03-26Remove contrib/examples/*Ævar Arnfjörð Bjarmason
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren
2014-06-09contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto
2014-04-17git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-02-13Remove git-resolve.Junio C Hamano