| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: deprecate 'git merge <message> HEAD <commit>' syntaxjc/merge | Junio C Hamano | 2015-04-29 | 1 | -3/+3 |
| * | update URL to the marc.info mail archive | Ondřej Bílka | 2013-07-22 | 1 | -1/+1 |
| * | t6021: add a new test for git-merge-resolve | Miklos Vajna | 2008-07-13 | 1 | -0/+4 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+1 |
| * | tests: merge-recursive is usable without Python | Junio C Hamano | 2006-10-27 | 1 | -6/+0 |
| * | Fix more typos, primarily in the code | Pavel Roskin | 2006-07-10 | 1 | -1/+1 |
| * | Optionally work without python | Johannes Schindelin | 2006-02-18 | 1 | -0/+6 |
| * | New test case: Criss-cross merge | Fredrik Kuivinen | 2005-12-03 | 1 | -0/+92 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |