| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 |
| * | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 |
| * | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 |
| * | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 |
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |