| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge: teach -Xours/-Xtheirs to symbolic link mergejc/merge-symlink-ours-theirs | Junio C Hamano | 2018-01-03 | 1 | -0/+32 |
| * | attr: "binary" attribute should choose built-in "binary" merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+1 |
| * | merge: teach -Xours/-Xtheirs to binary ll-merge driver | Junio C Hamano | 2012-09-08 | 1 | -1/+13 |
| * | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 | 1 | -1/+1 |
| * | Teach git-pull to pass -X<option> to git-merge | Avery Pennarun | 2010-01-17 | 1 | -0/+8 |
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -0/+56 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |