| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'cb/leading-path-removal' | Junio C Hamano | 2010-11-29 | 1 | -23/+79 |
| |\ | |||||
| | * | use persistent memory for rejected paths | Clemens Buchacher | 2010-11-15 | 1 | -3/+16 |
| | * | do not overwrite files in leading path | Clemens Buchacher | 2010-10-13 | 1 | -1/+1 |
| | * | t7607: add leading-path tests | Clemens Buchacher | 2010-10-13 | 1 | -0/+51 |
| | * | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 2010-10-13 | 1 | -23/+15 |
| * | | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 2010-11-24 | 1 | -0/+16 |
| |\ \ | |/ |/| | |||||
| | * | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 2010-11-15 | 1 | -0/+16 |
| * | | Convert "! git" to "test_must_fail git" | Jared Hance | 2010-07-20 | 1 | -6/+6 |
| |/ | |||||
| * | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 2008-12-15 | 1 | -1/+1 |
| * | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 2008-12-15 | 1 | -0/+87 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |