Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-pull-script: do automatic merges | Linus Torvalds | 2005-04-26 | 1 | -3/+11 |
* | Update "git-pull-script" to use "read-tree -m" for | Linus Torvalds | 2005-04-19 | 1 | -2/+2 |
* | Make git-pull-script do the right thing for symlinked HEAD's. | Linus Torvalds | 2005-04-19 | 1 | -1/+3 |
* | [PATCH] Do not let rsync obliterate .git/object symbolic link. | Junio C Hamano | 2005-04-18 | 1 | -1/+1 |
* | Add "update-cache --refresh" to git-pull-script to make sure | Linus Torvalds | 2005-04-18 | 1 | -2/+2 |
* | Add the simple scripts I used to do a merge with content conflicts. | Linus Torvalds | 2005-04-18 | 1 | -0/+46 |