summaryrefslogtreecommitdiff
path: root/git-resolve-script
AgeCommit message (Expand)AuthorFilesLines
2005-06-06git-resolve-script: stop when the automated merge failsLibravatar Linus Torvalds1-1/+5
2005-06-06git-resolve-script: don't wait for three seconds any moreLibravatar Linus Torvalds1-3/+0
2005-06-05More work on merging with git-read-tree..Libravatar Linus Torvalds1-4/+2
2005-06-05git-read-tree: be a lot more careful about merging dirty treesLibravatar Linus Torvalds1-2/+3
2005-05-30git-resolve-script: use "git-apply --stat" instead of diffstatLibravatar Linus Torvalds1-2/+2
2005-05-25[PATCH] optimize git-resolve-scriptLibravatar Jeff Garzik1-2/+2
2005-05-09Introduce GIT_DIR environment variable.Libravatar Junio C Hamano1-5/+10
2005-05-05Fix git-resolve-script.Libravatar Linus Torvalds1-1/+1
2005-05-05Split "git-pull-script" into two partsLibravatar Linus Torvalds1-0/+56