summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
AgeCommit message (Expand)Author
2010-01-18git merge -X<option>Avery Pennarun
2009-10-25Use 'fast-forward' all over the placeFelipe Contreras
2008-07-17Merge branch 'sb/dashless'Junio C Hamano
2008-07-08Build in mergeMiklos Vajna