summaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
AgeCommit message (Expand)AuthorFilesLines
2005-09-07Big tool rename.Libravatar Junio C Hamano1-88/+0
2005-08-29[PATCH] Make "git resolve" less scaryLibravatar Linus Torvalds1-1/+3
2005-07-29[PATCH] Trivial tidyupsLibravatar Petr Baudis1-4/+3
2005-06-25[PATCH] git-merge-one-file-script: do not misinterpret rm failure.Libravatar Junio C Hamano1-2/+5
2005-06-08One more time.. Clean up git-merge-one-file-scriptLibravatar Linus Torvalds1-42/+15
2005-06-08Fix up git-merge-one-file-scriptLibravatar Linus Torvalds1-7/+18
2005-06-08Merge my and Petr's git-merge-one-file-script modificationsLibravatar Linus Torvalds1-1/+2
2005-06-08[PATCH] git-merge-one-file-script cleanups from CogitoLibravatar Petr Baudis1-15/+29
2005-06-08Make sure we error out if we can't remove a file on automatic merges.Libravatar Linus Torvalds1-1/+2
2005-06-08[PATCH] Fix git-merge-one-file permissions auto-mergingLibravatar Petr Baudis1-0/+4
2005-06-08Leave merge failures in the filesystemLibravatar Linus Torvalds1-12/+19
2005-05-07Use backticks in git-merge-one-file-script instead of $(command).Libravatar Junio C Hamano1-4/+4
2005-05-01Update git-merge-one-file-script.Libravatar Junio C Hamano1-38/+26
2005-05-01[PATCH] Really fix git-merge-one-file-script this time.Libravatar Junio C Hamano1-23/+18
2005-04-29[PATCH] leftover bits for git renameLibravatar Junio C Hamano1-3/+3
2005-04-29Update the merge scripts for the big git rename.Libravatar Linus Torvalds1-7/+7
2005-04-23[PATCH] make file merging respect permissionsLibravatar James Bottomley1-8/+39
2005-04-18[PATCH] SCSI trees, merges and git statusLibravatar James Bottomley1-1/+10
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLibravatar Linus Torvalds1-22/+38
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Libravatar Linus Torvalds1-0/+35