![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Oct 2007 10:05:58 +0000 (03:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Oct 2007 10:05:58 +0000 (03:05 -0700) | ||
| commit | e66273a6abb8e9cd0967d52113e29c8014a255f8 | |
| tree | 6f17cc631f26ba74a7a94156e03e3add7ec0711c | tree | snapshot |
| parent | 9b0185ca06001219f5ffcccb5c09b9a9bb42e7c2 | commit | diff |
| parent | d66424c4ac661c69640765260235452499d80378 | commit | diff |
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
* 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
| Documentation/config.txt | diff1 | | diff2 | | blob | history |
| Documentation/git-merge.txt | diff1 | | diff2 | | blob | history |
| git-merge.sh | diff1 | | diff2 | | blob | history |