summaryrefslogtreecommitdiff
path: root/git-pull-script
Commit message (Expand)AuthorAgeFilesLines
* Update the merge scripts for the big git rename.Linus Torvalds2005-04-291-11/+11
* [PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe2005-04-291-1/+1
* git-pull-script: do automatic mergesLinus Torvalds2005-04-261-3/+11
* Update "git-pull-script" to use "read-tree -m" forLinus Torvalds2005-04-191-2/+2
* Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds2005-04-191-1/+3
* [PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano2005-04-181-1/+1
* Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds2005-04-181-2/+2
* Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds2005-04-181-0/+46