summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
AgeCommit message (Expand)Author
2014-06-09contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto
2014-04-17git-merge.sh: use the $( ... ) construct for command substitutionElia Pinto
2013-09-04use 'commit-ish' instead of 'committish'Richard Hansen
2010-08-18merge script: learn --[no-]rerere-autoupdateJonathan Nieder
2010-08-18merge script: notice @{-1} shorthandJonathan Nieder
2010-08-18merge script: handle --no-ff --no-commit correctlyJonathan Nieder
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
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 04:34:07 (GMT)