Age | Commit message (Expand) | Author |
---|---|---|
2005-12-02 | merge-one-file: make sure we do not mismerge symbolic links. | Junio C Hamano |
2005-12-02 | merge-one-file: make sure we create the merged file. | Junio C Hamano |
2005-12-02 | git-merge-one-file: do not worry about 'rmdir -p' not removing directory. | Junio C Hamano |
2005-11-30 | merge-one-file: leave unmerged index entries upon automerge failure. | Linus Torvalds |
2005-11-20 | merge-one-file: use rmdir -p | Junio C Hamano |
2005-11-20 | merge-one-file: remove empty directories | Junio C Hamano |
2005-11-12 | merge-one-file: use empty- or common-base condintionally in two-stage merge. | Junio C Hamano |
2005-11-12 | merge-one-file: use common as base, instead of emptiness. | Junio C Hamano |
2005-11-12 | merge with /dev/null as base, instead of punting O==empty case | Junio C Hamano |
2005-09-08 | Big tool rename. | Junio C Hamano |