Commit message (Expand) | Author | Age | |
---|---|---|---|
* | builtin-merge.c: Fix option parsing | Michele Ballabio | 2008-07-20 |
* | Teach 'git merge' that some merge strategies no longer exist | Miklos Vajna | 2008-07-20 |
* | Merge branch 'mv/merge-in-c' | Junio C Hamano | 2008-07-15 |
* | Teach merge.log to "git-merge" again | Junio C Hamano | 2008-07-10 |
* | Build in merge | Miklos Vajna | 2008-07-07 |