aboutsummaryrefslogtreecommitdiffstats
path: root/git-pull-script
AgeCommit message (Expand)AuthorFilesLines
2005-07-16[PATCH] fetch/pull: short-hand notation for remote repositories.Junio C Hamano1-16/+3
2005-07-08Make "git resolve" take the merge message in $3Linus Torvalds1-1/+1
2005-07-08Add "git-sh-setup-script" for common git shell script setupLinus Torvalds1-3/+2
2005-06-28Duh. Fix transposed characters in git-pull-scriptLinus Torvalds1-1/+1
2005-06-27Teach git-pull-script about pulling tagsLinus Torvalds1-2/+7
2005-06-21Clean up different special *HEAD handlingLinus Torvalds1-1/+1
2005-06-08Make default merge messages denser.Linus Torvalds1-3/+1
2005-06-06Make fetch/pull scripts terminate cleanly on errorsLinus Torvalds1-1/+1
2005-05-25git-pull-script: pretty-print the merge head informationLinus Torvalds1-3/+12
2005-05-22Split up git-pull-script into separate "fetch" and "merge" phases.Linus Torvalds1-33/+1
2005-05-09Introduce GIT_DIR environment variable.Junio C Hamano1-5/+11
2005-05-06Add http and local transport support for git-pull-script.Junio C Hamano1-6/+31
2005-05-05Split "git-pull-script" into two partsLinus Torvalds1-45/+1
2005-05-05git-pull-script: do the diffstat also for the fast-forward caseLinus Torvalds1-0/+1
2005-05-04Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds1-2/+3
2005-05-04git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds1-0/+1
2005-04-29Update the merge scripts for the big git rename.Linus Torvalds1-11/+11
2005-04-29[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe1-1/+1
2005-04-26git-pull-script: do automatic mergesLinus Torvalds1-3/+11
2005-04-19Update "git-pull-script" to use "read-tree -m" forLinus Torvalds1-2/+2
2005-04-19Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds1-1/+3
2005-04-18[PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano1-1/+1
2005-04-18Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds1-2/+2
2005-04-18Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds1-0/+46