Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-pull: do not barf on -a flag meant for git-fetch. | Junio C Hamano | 2005-10-03 | 1 | -1/+2 |
* | Use git-merge in git-pull (second try). | Junio C Hamano | 2005-09-29 | 1 | -4/+44 |
* | Use git-update-ref in scripts. | Junio C Hamano | 2005-09-28 | 1 | -3/+3 |
* | Fix default pull not to do an unintended Octopus. | Junio C Hamano | 2005-09-28 | 1 | -1/+3 |
* | Prettyprint octopus merge message. | Junio C Hamano | 2005-09-22 | 1 | -7/+2 |
* | Revert "Use git-merge instead of git-resolve in git-pull." | Junio C Hamano | 2005-09-21 | 1 | -33/+7 |
* | Revert "Make Octopus merge message a bit nicer." | Junio C Hamano | 2005-09-21 | 1 | -76/+5 |
* | Make Octopus merge message a bit nicer. | Junio C Hamano | 2005-09-20 | 1 | -5/+76 |
* | Use git-merge instead of git-resolve in git-pull. | Junio C Hamano | 2005-09-20 | 1 | -7/+33 |
* | Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93. | Junio C Hamano | 2005-09-15 | 1 | -1/+1 |
* | Make merge comment git-pull makes for an octopus a bit prettier. | Junio C Hamano | 2005-09-13 | 1 | -3/+5 |
* | Big tool rename. | Junio C Hamano | 2005-09-07 | 1 | -0/+44 |