path: root/builtin/pull.c
AgeCommit message (Expand)Author
2018-02-15Merge branch 'sb/pull-rebase-submodule'Junio C Hamano
2018-01-25builtin/pull: respect verbosity settings in submodulesStefan Beller
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano
2017-11-27Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano
2017-11-21pull: pass -4/-6 option to 'git fetch'Shuyu Wei
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson
2017-11-08reduce_heads: fix memory leaksMartin Ågren
2017-11-06Merge branch 'bc/object-id'Junio C Hamano
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King
2017-09-07pull: honor submodule.recurse config optionNicolas Morey-Chaisemartin
2017-09-07pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller
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