summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* git merge -X<option>Avery Pennarun2010-01-171-1/+2
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-4/+4
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-2/+2
* Build in mergeMiklos Vajna2008-07-071-0/+554