summaryrefslogtreecommitdiff
path: root/git-pull-script
Commit message (Expand)AuthorAgeFilesLines
* Fix pulling into the same branch.Junio C Hamano2005-08-261-1/+19
* [PATCH] Use git-octopus when pulling more than one heads.Junio C Hamano2005-08-241-2/+12
* [PATCH] Retire git-parse-remote.Junio C Hamano2005-08-241-5/+9
* [PATCH] fetch/pull: short-hand notation for remote repositories.Junio C Hamano2005-07-161-16/+3
* Make "git resolve" take the merge message in $3Linus Torvalds2005-07-081-1/+1
* Add "git-sh-setup-script" for common git shell script setupLinus Torvalds2005-07-081-3/+2
* Duh. Fix transposed characters in git-pull-scriptLinus Torvalds2005-06-281-1/+1
* Teach git-pull-script about pulling tagsLinus Torvalds2005-06-271-2/+7
* Clean up different special *HEAD handlingLinus Torvalds2005-06-211-1/+1
* Make default merge messages denser.Linus Torvalds2005-06-081-3/+1
* Make fetch/pull scripts terminate cleanly on errorsLinus Torvalds2005-06-061-1/+1
* git-pull-script: pretty-print the merge head informationLinus Torvalds2005-05-251-3/+12
* Split up git-pull-script into separate "fetch" and "merge" phases.Linus Torvalds2005-05-221-33/+1
* Introduce GIT_DIR environment variable.Junio C Hamano2005-05-091-5/+11
* Add http and local transport support for git-pull-script.Junio C Hamano2005-05-061-6/+31
* Split "git-pull-script" into two partsLinus Torvalds2005-05-051-45/+1
* git-pull-script: do the diffstat also for the fast-forward caseLinus Torvalds2005-05-051-0/+1
* Teach "git-pull-script" about alternate HEAD's to pull..Linus Torvalds2005-05-041-2/+3
* git-pull-script: add a final "diffstat" to show the result of the merge.Linus Torvalds2005-05-041-0/+1
* Update the merge scripts for the big git rename.Linus Torvalds2005-04-291-11/+11
* [PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-scriptRene Scharfe2005-04-291-1/+1
* git-pull-script: do automatic mergesLinus Torvalds2005-04-261-3/+11
* Update "git-pull-script" to use "read-tree -m" forLinus Torvalds2005-04-191-2/+2
* Make git-pull-script do the right thing for symlinked HEAD's.Linus Torvalds2005-04-191-1/+3
* [PATCH] Do not let rsync obliterate .git/object symbolic link.Junio C Hamano2005-04-181-1/+1
* Add "update-cache --refresh" to git-pull-script to make sureLinus Torvalds2005-04-181-2/+2
* Add the simple scripts I used to do a merge with content conflicts.Linus Torvalds2005-04-181-0/+46
View Lorry Controller Status