Age | Commit message (Expand) | Author |
---|---|---|
2015-04-29 | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano |
2013-07-22 | update URL to the marc.info mail archive | Ondřej Bílka |
2008-07-14 | t6021: add a new test for git-merge-resolve | Miklos Vajna |
2007-06-07 | War on whitespace | Junio C Hamano |
2006-10-28 | tests: merge-recursive is usable without Python | Junio C Hamano |
2006-07-10 | Fix more typos, primarily in the code | Pavel Roskin |
2006-02-19 | Optionally work without python | Johannes Schindelin |
2005-12-03 | New test case: Criss-cross merge | Fredrik Kuivinen |