summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2015-12-27contrib/examples/git-merge.sh: use the $( ... ) construct for command substit...Libravatar Elia Pinto1-2/+2
2014-06-09contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Libravatar Elia Pinto1-2/+2
2014-04-17git-merge.sh: use the $( ... ) construct for command substitutionLibravatar Elia Pinto1-2/+2
2013-09-04use 'commit-ish' instead of 'committish'Libravatar Richard Hansen1-1/+1
2010-08-18merge script: learn --[no-]rerere-autoupdateLibravatar Jonathan Nieder1-2/+5
2010-08-18merge script: notice @{-1} shorthandLibravatar Jonathan Nieder1-2/+4
2010-08-18merge script: handle --no-ff --no-commit correctlyLibravatar Jonathan Nieder1-2/+10
2010-08-18merge script: --ff-only to disallow true mergeLibravatar Jonathan Nieder1-2/+15
2010-08-18merge script: handle many-way octopusLibravatar Jonathan Nieder1-3/+3
2010-08-18merge script: handle -m --log correctlyLibravatar Jonathan Nieder1-4/+10
2010-08-18merge script: forbid merge -s indexLibravatar Jonathan Nieder1-0/+5
2010-08-18merge script: allow custom strategiesLibravatar Jonathan Nieder1-2/+6
2010-08-18merge script: merge -X<option>Libravatar Jonathan Nieder1-1/+7
2010-08-18merge script: improve log message subjectLibravatar Jonathan Nieder1-8/+19
2010-08-18merge script: refuse to merge during mergeLibravatar Jonathan Nieder1-0/+3
2010-08-18merge script: tweak unmerged files message to match builtinLibravatar Jonathan Nieder1-1/+1
2010-08-18merge script: --squash, --ff from unborn branch are errorsLibravatar Jonathan Nieder1-0/+4
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 19:43:40 +0000