summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* use 'commit-ish' instead of 'committish'Richard Hansen2013-09-041-1/+1
* merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-181-2/+5
* merge script: notice @{-1} shorthandJonathan Nieder2010-08-181-2/+4
* merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-181-2/+10
* merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-181-2/+15
* merge script: handle many-way octopusJonathan Nieder2010-08-181-3/+3
* merge script: handle -m --log correctlyJonathan Nieder2010-08-181-4/+10
* merge script: forbid merge -s indexJonathan Nieder2010-08-181-0/+5
* merge script: allow custom strategiesJonathan Nieder2010-08-181-2/+6
* merge script: merge -X<option>Jonathan Nieder2010-08-181-1/+7
* merge script: improve log message subjectJonathan Nieder2010-08-181-8/+19
* merge script: refuse to merge during mergeJonathan Nieder2010-08-181-0/+3
* merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-181-1/+1
* merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-181-0/+4
* 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
View Lorry Controller Status