diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-03 12:05:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-03 12:05:58 +0200 |
| commit | e66273a6abb8e9cd0967d52113e29c8014a255f8 (patch) | |
| tree | 6f17cc631f26ba74a7a94156e03e3add7ec0711c /t/t4006-diff-mode.sh | |
| parent | Merge branch 'js/rebase-i' (diff) | |
| parent | git-merge: add --ff and --no-ff options (diff) | |
| download | git-e66273a6abb8e9cd0967d52113e29c8014a255f8.tar.xz git-e66273a6abb8e9cd0967d52113e29c8014a255f8.zip | |
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
Diffstat (limited to 't/t4006-diff-mode.sh')
0 files changed, 0 insertions, 0 deletions