| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 2015-10-16 | 1 | -1/+1 |
|\ |
|
| * | pull: enclose <options> in brackets in the usage stringpt/pull-builtin | Alex Henrie | 2015-10-16 | 1 | -1/+1 |
* | | pull: don't mark values for option "rebase" for translation | Ralf Thielow | 2015-09-11 | 1 | -1/+1 |
* | | Merge branch 'mh/tempfile' | Junio C Hamano | 2015-08-25 | 1 | -0/+1 |
* | | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostash | Kevin Daudt | 2015-07-22 | 1 | -1/+5 |
|/ |
|
* | pull: remove redirection to git-pull.sh | Paul Tan | 2015-06-18 | 1 | -7/+0 |
* | pull --rebase: error on no merge candidate cases | Paul Tan | 2015-06-18 | 1 | -3/+12 |
* | pull --rebase: exit early when the working directory is dirty | Paul Tan | 2015-06-18 | 1 | -1/+76 |
* | pull: configure --rebase via branch.<name>.rebase or pull.rebase | Paul Tan | 2015-06-18 | 1 | -1/+34 |
* | pull: teach git pull about --rebase | Paul Tan | 2015-06-18 | 1 | -2/+245 |
* | pull: set reflog message | Paul Tan | 2015-06-18 | 1 | -0/+22 |
* | pull: implement pulling into an unborn branch | Paul Tan | 2015-06-18 | 1 | -1/+28 |
* | pull: fast-forward working tree if head is updated | Paul Tan | 2015-06-18 | 1 | -0/+30 |
* | pull: check if in unresolved merge state | Paul Tan | 2015-06-18 | 1 | -0/+9 |
* | pull: support pull.ff config | Paul Tan | 2015-06-18 | 1 | -0/+29 |
* | pull: error on no merge candidates | Paul Tan | 2015-06-18 | 1 | -0/+113 |
* | pull: pass git-fetch's options to git-fetch | Paul Tan | 2015-06-18 | 1 | -0/+95 |
* | pull: pass git-merge's options to git-merge | Paul Tan | 2015-06-15 | 1 | -0/+75 |
* | pull: pass verbosity, --progress flags to fetch and merge | Paul Tan | 2015-06-15 | 1 | -0/+36 |
* | pull: implement fetch + merge | Paul Tan | 2015-06-15 | 1 | -1/+61 |
* | pull: implement skeletal builtin pull | Paul Tan | 2015-06-15 | 1 | -0/+33 |