summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
AgeCommit message (Expand)Author
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-04-13Shell utilities: Guard against expr' magic tokens.Mark Wooding
2006-01-06trivial: remove the dots at the end of file names from merge-one-fileAlex Riesen
2005-12-07git-merge-one: new merge world order.Junio C Hamano
2005-12-06git-merge-one-file: resurrect leading path creation.Junio C Hamano
2005-12-02merge-one-file: make sure we do not mismerge symbolic links.Junio C Hamano
2005-12-02merge-one-file: make sure we create the merged file.Junio C Hamano
2005-12-02git-merge-one-file: do not worry about 'rmdir -p' not removing directory.Junio C Hamano
2005-11-30merge-one-file: leave unmerged index entries upon automerge failure.Linus Torvalds
2005-11-20merge-one-file: use rmdir -pJunio C Hamano
2005-11-20merge-one-file: remove empty directoriesJunio C Hamano
2005-11-12merge-one-file: use empty- or common-base condintionally in two-stage merge.Junio C Hamano
2005-11-12merge-one-file: use common as base, instead of emptiness.Junio C Hamano
2005-11-12merge with /dev/null as base, instead of punting O==empty caseJunio C Hamano
2005-09-08Big tool rename.Junio C Hamano