aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-resolve.sh
Commit message (Expand)AuthorAge
* treewide: correct several "up-to-date" to "up to date"Martin Ă…gren2017-08-23
* contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto2014-06-09
* git-resolve.sh: use the $( ... ) construct for command substitutionElia Pinto2014-04-17
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
* Rewrite "git-frotz" to "git frotz"Junio C Hamano2007-07-02
* Remove git-resolve.Junio C Hamano2007-02-12