| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix expr usage for FreeBSD | Dennis Stosberg | 2006-06-27 | 1 | -1/+1 |
* | git-merge --squash | Junio C Hamano | 2006-06-24 | 1 | -2/+5 |
* | git-pull: abort when fmt-merge-msg fails. | Junio C Hamano | 2006-06-24 | 1 | -1/+1 |
* | git-pull: reword "impossible to fast-forward" message. | Junio C Hamano | 2006-03-22 | 1 | -1/+7 |
* | git-pull: further safety while on tracking branch. | Junio C Hamano | 2006-03-22 | 1 | -1/+3 |
* | git-pull: run repo-config with dash form. | Junio C Hamano | 2006-03-18 | 1 | -2/+2 |
* | Let merge set the default strategy. | Mark Hollomon | 2006-03-15 | 1 | -7/+3 |
* | Avoid using "git-var -l" until it gets fixed. | Junio C Hamano | 2006-02-12 | 1 | -4/+4 |
* | Trivial usage string clean-up | freku045@student.liu.se | 2005-12-14 | 1 | -11/+2 |
* | git-sh-setup: die if outside git repository. | Junio C Hamano | 2005-11-25 | 1 | -1/+1 |
* | Make git-recursive the default strategy for git-pull. | Junio C Hamano | 2005-11-09 | 1 | -2/+14 |
* | Recover dropped +x bit from git-pull.sh by accident. | Junio C Hamano | 2005-11-07 | 1 | -0/+0 |
* | Refactored merge options into separate merge-options.txt. | Jon Loeliger | 2005-11-06 | 1 | -1/+11 |
* | Document the --no-commit flag better | Junio C Hamano | 2005-11-04 | 1 | -1/+1 |
* | Add --no-commit to git-merge/git-pull. | Junio C Hamano | 2005-11-03 | 1 | -2/+4 |
* | 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 |