aboutsummaryrefslogtreecommitdiffstats
path: root/git-merge-one-file-script
AgeCommit message (Expand)AuthorFilesLines
2005-07-29[PATCH] Trivial tidyupsPetr Baudis1-4/+3
2005-06-25[PATCH] git-merge-one-file-script: do not misinterpret rm failure.Junio C Hamano1-2/+5
2005-06-08One more time.. Clean up git-merge-one-file-scriptLinus Torvalds1-42/+15
2005-06-08Fix up git-merge-one-file-scriptLinus Torvalds1-7/+18
2005-06-08Merge my and Petr's git-merge-one-file-script modificationsLinus Torvalds1-1/+2
2005-06-08[PATCH] git-merge-one-file-script cleanups from CogitoPetr Baudis1-15/+29
2005-06-08Make sure we error out if we can't remove a file on automatic merges.Linus Torvalds1-1/+2
2005-06-08[PATCH] Fix git-merge-one-file permissions auto-mergingPetr Baudis1-0/+4
2005-06-08Leave merge failures in the filesystemLinus Torvalds1-12/+19
2005-05-07Use backticks in git-merge-one-file-script instead of $(command).Junio C Hamano1-4/+4
2005-05-01Update git-merge-one-file-script.Junio C Hamano1-38/+26
2005-05-01[PATCH] Really fix git-merge-one-file-script this time.Junio C Hamano1-23/+18
2005-04-29[PATCH] leftover bits for git renameJunio C Hamano1-3/+3
2005-04-29Update the merge scripts for the big git rename.Linus Torvalds1-7/+7
2005-04-23[PATCH] make file merging respect permissionsJames Bottomley1-8/+39
2005-04-18[PATCH] SCSI trees, merges and git statusJames Bottomley1-1/+10
2005-04-18Change merge-cache and git-merge-one-file to use the SHA1 of the fileLinus Torvalds1-22/+38
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds1-0/+35
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-14 07:15:38 +0000