summaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-091-1/+1
* git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-171-1/+1
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-021-17/+17
* Remove git-resolve.Junio C Hamano2007-02-121-0/+112