aboutsummaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
Commit message (Expand)AuthorAge
* use 'commit-ish' instead of 'committish'Richard Hansen2013-09-04
* merge script: learn --[no-]rerere-autoupdateJonathan Nieder2010-08-18
* merge script: notice @{-1} shorthandJonathan Nieder2010-08-18
* merge script: handle --no-ff --no-commit correctlyJonathan Nieder2010-08-18
* merge script: --ff-only to disallow true mergeJonathan Nieder2010-08-18
* merge script: handle many-way octopusJonathan Nieder2010-08-18
* merge script: handle -m --log correctlyJonathan Nieder2010-08-18
* merge script: forbid merge -s indexJonathan Nieder2010-08-18
* merge script: allow custom strategiesJonathan Nieder2010-08-18
* merge script: merge -X<option>Jonathan Nieder2010-08-18
* merge script: improve log message subjectJonathan Nieder2010-08-18
* merge script: refuse to merge during mergeJonathan Nieder2010-08-18
* merge script: tweak unmerged files message to match builtinJonathan Nieder2010-08-18
* merge script: --squash, --ff from unborn branch are errorsJonathan Nieder2010-08-18
* git merge -X<option>Avery Pennarun2010-01-17
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-24
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
* Build in mergeMiklos Vajna2008-07-07
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-06 04:35:13 +0000