| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | 1 | -2/+4 |
| * | refuse to merge during a merge | Clemens Buchacher | 2009-06-01 | 1 | -0/+3 |
| * | Remove empty directories in recursive merge | Alex Riesen | 2008-09-26 | 1 | -0/+11 |
| * | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 | 1 | -7/+7 |
| * | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 | 1 | -0/+11 |
| * | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 2008-05-24 | 1 | -21/+21 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 | 1 | -1/+0 |
| * | Remove case-sensitive file in t3030-merge-recursive. | Brian Gernhardt | 2007-04-19 | 1 | -52/+52 |
| * | t3030: merge-recursive backend test. | Junio C Hamano | 2007-04-10 | 1 | -0/+528 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |