summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
AgeCommit message (Expand)Author
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