summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-1/+2
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-4/+4
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-2/+2
2008-07-07Build in mergeLibravatar Miklos Vajna1-0/+554