| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | t6038 (merge.renormalize): check that it can be turned off | Jonathan Nieder | 2010-08-06 |
| * | t6038 (merge.renormalize): try checkout -m and cherry-pick | Jonathan Nieder | 2010-08-06 |
| * | t6038 (merge.renormalize): style nitpicks | Jonathan Nieder | 2010-08-06 |
| * | Try normalizing files to avoid delete/modify conflicts when merging | Eyvind Bernhardsen | 2010-07-02 |
| * | Avoid conflicts when merging branches with mixed normalization | Eyvind Bernhardsen | 2010-07-02 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |