aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
Commit message (Expand)AuthorAge
* git merge -X<option>Avery Pennarun2010-01-17
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
* Build in mergeMiklos Vajna2008-07-07