summaryrefslogtreecommitdiff
path: root/git-pull-script
AgeCommit message (Expand)Author
2005-05-05Split "git-pull-script" into two partsLinus Torvalds
2005-05-05git-pull-script: do the diffstat also for the fast-forward caseLinus Torvalds
2005-05-05Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds
2005-05-04git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds
2005-04-29Update the merge scripts for the big git rename.Linus Torvalds
2005-04-29[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe
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