Age | Commit message (Expand) | Author |
---|---|---|
2010-12-02 | Merge branch 'cb/maint-orphan-merge-noclobber' into maint | Junio C Hamano |
2010-11-15 | do not overwrite untracked during merge from unborn branch | Clemens Buchacher |
2010-07-21 | Convert "! git" to "test_must_fail git" | Jared Hance |
2008-12-15 | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano |
2008-12-15 | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher |