summaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
AgeCommit message (Expand)Author
2005-06-08Leave merge failures in the filesystemLinus Torvalds
2005-05-07Use backticks in git-merge-one-file-script instead of $(command).Junio C Hamano
2005-05-02Update git-merge-one-file-script.Junio C Hamano
2005-05-01[PATCH] Really fix git-merge-one-file-script this time.Junio C Hamano
2005-04-29[PATCH] leftover bits for git renameJunio C Hamano
2005-04-29Update the merge scripts for the big git rename.Linus Torvalds
2005-04-24[PATCH] make file merging respect permissionsJames Bottomley
2005-04-19[PATCH] SCSI trees, merges and git statusJames Bottomley
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds