summaryrefslogtreecommitdiff
path: root/git-pull-script
AgeCommit message (Expand)AuthorFilesLines
2005-05-05git-pull-script: do the diffstat also for the fast-forward caseLibravatar Linus Torvalds1-0/+1
2005-05-04Teach "git-pull-script" about alternate HEAD's to pull..Libravatar Linus Torvalds1-2/+3
2005-05-04git-pull-script: add a final "diffstat" to show the result of the merge.Libravatar Linus Torvalds1-0/+1
2005-04-29Update the merge scripts for the big git rename.Libravatar Linus Torvalds1-11/+11
2005-04-29[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptLibravatar Rene Scharfe1-1/+1
2005-04-26git-pull-script: do automatic mergesLibravatar Linus Torvalds1-3/+11
2005-04-19Update "git-pull-script" to use "read-tree -m" forLibravatar Linus Torvalds1-2/+2
2005-04-19Make git-pull-script do the right thing for symlinked HEAD's.Libravatar Linus Torvalds1-1/+3
2005-04-18[PATCH] Do not let rsync obliterate .git/object symbolic link.Libravatar Junio C Hamano1-1/+1
2005-04-18Add "update-cache --refresh" to git-pull-script to make sureLibravatar Linus Torvalds1-2/+2
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Libravatar Linus Torvalds1-0/+46
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 02:05:22 +0000