aboutsummaryrefslogtreecommitdiff
path: root/git-pull-script
Commit message (Expand)AuthorAge
* git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds2005-05-04
* Update the merge scripts for the big git rename.Linus Torvalds2005-04-29
* [PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe2005-04-29
* git-pull-script: do automatic mergesLinus Torvalds2005-04-26
* Update "git-pull-script" to use "read-tree -m" forLinus Torvalds2005-04-19
* Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds2005-04-19
* [PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano2005-04-18
* Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds2005-04-18
* Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds2005-04-18