Merge branch 'lh/merge'
* lh/merge: git-merge: add --ff and --no-ff options git-merge: add support for --commit and --no-squash git-merge: add support for branch.<name>.mergeoptions git-merge: refactor option parsing git-merge: fix faulty SQUASH_MSG Add test-script for git-merge porcelain
Junio C Hamano committed
Oct 3, 2007 at 03:05 UTC
e66273a6abb8e9cd0967d52113e29c8014a255f8
No changes.