summaryrefslogtreecommitdiff
path: root/git-resolve-script
Commit message (Expand)AuthorAgeFilesLines
* More work on merging with git-read-tree..Linus Torvalds2005-06-051-4/+2
* git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds2005-06-051-2/+3
* git-resolve-script: use "git-apply --stat" instead of diffstatLinus Torvalds2005-05-301-2/+2
* [PATCH] optimize git-resolve-scriptJeff Garzik2005-05-251-2/+2
* Introduce GIT_DIR environment variable.Junio C Hamano2005-05-091-5/+10
* Fix git-resolve-script.Linus Torvalds2005-05-051-1/+1
* Split "git-pull-script" into two partsLinus Torvalds2005-05-051-0/+56