| Age | Commit message (Expand) | Author |
|---|---|---|
| 2011-03-10 | i18n: git-merge basic messages | Ævar Arnfjörð Bjarmason |
| 2011-02-10 | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano |
| 2010-11-30 | Merge branch 'cb/leading-path-removal' | Junio C Hamano |
| 2010-11-24 | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano |
| 2010-11-15 | use persistent memory for rejected paths | Clemens Buchacher |
| 2010-11-15 | do not overwrite untracked during merge from unborn branch | Clemens Buchacher |
| 2010-10-13 | do not overwrite files in leading path | Clemens Buchacher |
| 2010-10-13 | t7607: add leading-path tests | Clemens Buchacher |
| 2010-10-13 | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher |
| 2010-08-25 | Exhibit merge bug that clobbers index&WT | Thomas Rast |
| 2010-07-20 | 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 |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |