asedeno.scripts.mit.edu Git - git.git/history

]> asedeno.scripts.mit.edu Git - git.git/history - t/t7600-merge.sh

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

local clone of git.git