| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge-recursive: demonstrate an incorrect conflict with submodule | Johannes Sixt | 2010-06-11 |
| * | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 |
| * | refuse to merge during a merge | Clemens Buchacher | 2009-06-01 |
| * | Remove empty directories in recursive merge | Alex Riesen | 2008-09-26 |
| * | tests: use "git xyzzy" form (t0000 - t3599) | Nanako Shiraishi | 2008-09-03 |
| * | merge: fix numerus bugs around "trivial merge" area | Junio C Hamano | 2008-08-23 |
| * | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 2008-05-24 |
| * | War on whitespace | Junio C Hamano | 2007-06-07 |
| * | Remove case-sensitive file in t3030-merge-recursive. | Brian Gernhardt | 2007-04-19 |
| * | t3030: merge-recursive backend test. | Junio C Hamano | 2007-04-10 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |