Age | Commit message (Expand) | Author |
---|---|---|
2010-08-18 | merge script: allow custom strategies | Jonathan Nieder |
2010-08-18 | merge script: merge -X<option> | Jonathan Nieder |
2010-08-18 | merge script: improve log message subject | Jonathan Nieder |
2010-08-18 | merge script: refuse to merge during merge | Jonathan Nieder |
2010-08-18 | merge script: tweak unmerged files message to match builtin | Jonathan Nieder |
2010-08-18 | merge script: --squash, --ff from unborn branch are errors | Jonathan Nieder |
2010-01-18 | git merge -X<option> | Avery Pennarun |
2009-10-25 | Use 'fast-forward' all over the place | Felipe Contreras |
2008-07-17 | Merge branch 'sb/dashless' | Junio C Hamano |
2008-07-08 | Build in merge | Miklos Vajna |