summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
AgeCommit message (Expand)AuthorFilesLines
2005-12-07git-merge-one: new merge world order.Libravatar Junio C Hamano1-16/+9
2005-12-06git-merge-one-file: resurrect leading path creation.Libravatar Junio C Hamano1-2/+10
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Libravatar Junio C Hamano1-0/+8
2005-12-02merge-one-file: make sure we create the merged file.Libravatar Junio C Hamano1-1/+7
2005-12-01git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Libravatar Junio C Hamano1-1/+1
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Libravatar Linus Torvalds1-5/+1
2005-11-20merge-one-file: use rmdir -pLibravatar Junio C Hamano1-5/+1
2005-11-19merge-one-file: remove empty directoriesLibravatar Junio C Hamano1-1/+6
2005-11-11merge-one-file: use empty- or common-base condintionally in two-stage merge.Libravatar Junio C Hamano1-0/+6
2005-11-11merge-one-file: use common as base, instead of emptiness.Libravatar Junio C Hamano1-2/+4
2005-11-11merge with /dev/null as base, instead of punting O==empty caseLibravatar Junio C Hamano1-4/+16
2005-09-07Big tool rename.Libravatar Junio C Hamano1-0/+88
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 20:42:31 +0000