path: root/builtin/pull.c
AgeCommit message (Expand)Author
2016-05-17Merge branch 'va/i18n-misc-updates'Junio C Hamano
2016-04-29Merge branch 'jc/merge-refuse-new-root'Junio C Hamano
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano
2016-04-19i18n: builtin/pull.c: split strings marked for translationVasco Almeida
2016-04-19i18n: builtin/pull.c: mark placeholders for translationVasco Almeida
2016-03-21pull --rebase: add --[no-]autostash flagMehul Jain
2016-03-21git-pull.c: introduce git_pull_config()Mehul Jain
2016-01-29Merge branch 'jc/strbuf-getline'Junio C Hamano
2016-01-26Merge branch 'js/pull-rebase-i'Junio C Hamano
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano
2016-01-13pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin
2015-12-16submodules: allow parallel fetching, add tests and documentationStefan Beller
2015-11-20Remove get_object_hash.brian m. carlson
2015-11-20Convert struct object to object_idbrian m. carlson
2015-10-16Merge branch 'pt/pull-builtin' into maintJunio C Hamano
2015-10-16pull: enclose <options> in brackets in the usage stringAlex Henrie
2015-09-11pull: don't mark values for option "rebase" for translationRalf Thielow
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano
2015-07-22pull: allow dirty tree when rebase.autostash enabledKevin Daudt
2015-06-18pull: remove redirection to git-pull.shPaul Tan
2015-06-18pull --rebase: error on no merge candidate casesPaul Tan
2015-06-18pull --rebase: exit early when the working directory is dirtyPaul Tan
2015-06-18pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan
2015-06-18pull: teach git pull about --rebasePaul Tan
2015-06-18pull: set reflog messagePaul Tan
2015-06-18pull: implement pulling into an unborn branchPaul Tan
2015-06-18pull: fast-forward working tree if head is updatedPaul Tan
2015-06-18pull: check if in unresolved merge statePaul Tan
2015-06-18pull: support pull.ff configPaul Tan
2015-06-18pull: error on no merge candidatesPaul Tan
2015-06-18pull: pass git-fetch's options to git-fetchPaul Tan
2015-06-15pull: pass git-merge's options to git-mergePaul Tan
2015-06-15pull: pass verbosity, --progress flags to fetch and mergePaul Tan
2015-06-15pull: implement fetch + mergePaul Tan
2015-06-15pull: implement skeletal builtin pullPaul Tan