path: root/builtin/pull.c
AgeCommit message (Expand)Author
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano
2017-04-21use git_path_* helper functionsJeff King
2017-03-31Rename sha1_array to oid_arraybrian m. carlson
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson
2017-03-28builtin/pull: convert to struct object_idbrian m. carlson
2017-03-27builtin/pull: convert portions to struct object_idbrian m. carlson
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin
2016-10-07wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin
2016-10-07pull: make code more similar to the shell script againJohannes Schindelin
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano
2016-06-17i18n: advice: internationalize message for conflictsVasco Almeida
2016-05-20pull: warn on --verify-signatures with --rebaseAlexander Hirsch
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