Commit message (Expand) | Author | Age | |
---|---|---|---|
* | contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>" | Elia Pinto | 2014-06-09 |
* | git-resolve.sh: use the $( ... ) construct for command substitution | Elia Pinto | 2014-04-17 |
* | Use 'fast-forward' all over the place | Felipe Contreras | 2009-10-24 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
* | Remove git-resolve. | Junio C Hamano | 2007-02-12 |