summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
AgeCommit message (Expand)Author
2010-08-18merge script: --ff-only to disallow true mergeJonathan Nieder
2010-08-18merge script: handle many-way octopusJonathan Nieder
2010-08-18merge script: handle -m --log correctlyJonathan Nieder
2010-08-18merge script: forbid merge -s indexJonathan Nieder
2010-08-18merge script: allow custom strategiesJonathan Nieder
2010-08-18merge script: merge -X<option>Jonathan Nieder
2010-08-18merge script: improve log message subjectJonathan Nieder
2010-08-18merge script: refuse to merge during mergeJonathan Nieder
2010-08-18merge script: tweak unmerged files message to match builtinJonathan Nieder
2010-08-18merge script: --squash, --ff from unborn branch are errorsJonathan Nieder
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