summaryrefslogtreecommitdiff
path: root/git-pull-script
AgeCommit message (Expand)Author
2005-04-26git-pull-script: do automatic mergesLinus Torvalds
2005-04-19Update "git-pull-script" to use "read-tree -m" forLinus Torvalds
2005-04-19Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds
2005-04-18[PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano
2005-04-18Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds