Commit message (Expand) | Author | Age | |
---|---|---|---|
* | read-tree -m -u: do not overwrite or remove untracked working tree files. | Junio C Hamano | 2006-05-17 |
* | Optionally work without python | Johannes Schindelin | 2006-02-18 |
* | merge-recursive: conflicting rename case. | Junio C Hamano | 2005-12-21 |
* | t/t6022: a new test for renaming merge. | Junio C Hamano | 2005-12-11 |