Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-12-02 | Merge branch 'cb/maint-orphan-merge-noclobber' into maint | 1 | -0/+16 | |
2010-11-15 | do not overwrite untracked during merge from unborn branch | 1 | -0/+16 | |
2010-07-20 | Convert "! git" to "test_must_fail git" | 1 | -6/+6 | |
2008-12-15 | merge-recursive: do not clobber untracked working tree garbage | 1 | -1/+1 | |
2008-12-15 | modify/delete conflict resolution overwrites untracked file | 1 | -0/+87 |