summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2017-08-23treewide: correct several "up-to-date" to "up to date"Libravatar Martin Ă…gren1-1/+1
2014-06-09contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Libravatar Elia Pinto1-1/+1
2014-04-17git-resolve.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-1/+1
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2007-07-02Rewrite "git-frotz" to "git frotz"Libravatar Junio C Hamano1-17/+17
2007-02-12Remove git-resolve.Libravatar Junio C Hamano1-0/+112