summaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAgeFilesLines
* Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
* Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-161-1/+1
|\
| * pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-111-1/+1
* | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-0/+1
* | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostashKevin Daudt2015-07-221-1/+5
|/
* pull: remove redirection to git-pull.shPaul Tan2015-06-181-7/+0
* pull --rebase: error on no merge candidate casesPaul Tan2015-06-181-3/+12
* pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-181-1/+76
* pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-181-1/+34
* pull: teach git pull about --rebasePaul Tan2015-06-181-2/+245
* pull: set reflog messagePaul Tan2015-06-181-0/+22
* pull: implement pulling into an unborn branchPaul Tan2015-06-181-1/+28
* pull: fast-forward working tree if head is updatedPaul Tan2015-06-181-0/+30
* pull: check if in unresolved merge statePaul Tan2015-06-181-0/+9
* pull: support pull.ff configPaul Tan2015-06-181-0/+29
* pull: error on no merge candidatesPaul Tan2015-06-181-0/+113
* pull: pass git-fetch's options to git-fetchPaul Tan2015-06-181-0/+95
* pull: pass git-merge's options to git-mergePaul Tan2015-06-151-0/+75
* pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-151-0/+36
* pull: implement fetch + mergePaul Tan2015-06-151-1/+61
* pull: implement skeletal builtin pullPaul Tan2015-06-151-0/+33
View Lorry Controller Status