| 2007-09-24 | git-merge: add --ff and --no-ff options | blob | diff | raw | |
| 2007-09-24 | git-merge: add support for --commit and --no-squash | blob | diff | raw | diff to current | |
| 2007-09-24 | git-merge: add support for branch.<name>.mergeoptions | blob | diff | raw | diff to current | |
| 2007-09-24 | Add test-script for git-merge porcelain | blob | diff | raw | diff to current | |