aboutsummaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAge
* i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-19
* i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-19
* Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-28
|\
| * strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-15
* | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-26
|\ \
| * | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-13
| |/
* | submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-16
|/
* Remove get_object_hash.brian m. carlson2015-11-20
* Convert struct object to object_idbrian m. carlson2015-11-20
* Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-16
|\
| * pull: enclose <options> in brackets in the usage stringAlex Henrie2015-10-16
* | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-11
* | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
* | pull: allow dirty tree when rebase.autostash enabledKevin Daudt2015-07-22
|/
* pull: remove redirection to git-pull.shPaul Tan2015-06-18
* pull --rebase: error on no merge candidate casesPaul Tan2015-06-18
* pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-18
* pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-18
* pull: teach git pull about --rebasePaul Tan2015-06-18
* pull: set reflog messagePaul Tan2015-06-18
* pull: implement pulling into an unborn branchPaul Tan2015-06-18
* pull: fast-forward working tree if head is updatedPaul Tan2015-06-18
* pull: check if in unresolved merge statePaul Tan2015-06-18
* pull: support pull.ff configPaul Tan2015-06-18
* pull: error on no merge candidatesPaul Tan2015-06-18
* pull: pass git-fetch's options to git-fetchPaul Tan2015-06-18
* pull: pass git-merge's options to git-mergePaul Tan2015-06-15
* pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-15
* pull: implement fetch + mergePaul Tan2015-06-15
* pull: implement skeletal builtin pullPaul Tan2015-06-15