| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2011-02-09 | Merge branch 'tr/merge-unborn-clobber' |  Junio C Hamano | 1 | -0/+16 |
| 2010-11-29 | Merge branch 'cb/leading-path-removal' | Junio C Hamano | 1 | -23/+79 |
| 2010-11-24 | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 1 | -0/+16 |
| 2010-11-15 | use persistent memory for rejected paths |  Clemens Buchacher | 1 | -3/+16 |
| 2010-11-15 | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 1 | -0/+16 |
| 2010-10-13 | do not overwrite files in leading path | Clemens Buchacher | 1 | -1/+1 |
| 2010-10-13 | t7607: add leading-path tests | Clemens Buchacher | 1 | -0/+51 |
| 2010-10-13 | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 1 | -23/+15 |
| 2010-08-25 | Exhibit merge bug that clobbers index&WT |  Thomas Rast | 1 | -0/+16 |
| 2010-07-20 | Convert "! git" to "test_must_fail git" |  Jared Hance | 1 | -6/+6 |
| 2008-12-15 | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 1 | -1/+1 |
| 2008-12-15 | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 1 | -0/+87 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |