summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2017-11-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idLibravatar brian m. carlson1-1/+1
2017-10-13pull: pass --signoff/--no-signoff to "git merge"Libravatar W. Trevor King1-0/+6
2017-09-07pull: honor submodule.recurse config optionLibravatar Nicolas Morey-Chaisemartin1-0/+4
2017-09-07pull: fix cli and config option parsing orderLibravatar Nicolas Morey-Chaisemartin1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Libravatar Junio C Hamano1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolLibravatar Martin Ågren1-2/+2
2017-07-13Merge branch 'sb/pull-rebase-submodule'Libravatar Junio C Hamano1-10/+63
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Libravatar Stefan Beller1-10/+63
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-2/+1
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Libravatar Junio C Hamano1-11/+14
2017-06-01pull: ff --rebase --autostash works in dirty repoLibravatar Tyler Brazier1-11/+14
2017-05-26use xfopen() in more placesLibravatar Nguyễn Thái Ngọc Duy1-2/+1
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-5/+5
2017-04-26Merge branch 'jk/war-on-git-path'Libravatar Junio C Hamano1-2/+2
2017-04-20use git_path_* helper functionsLibravatar Jeff King1-2/+2
2017-03-31Rename sha1_array to oid_arrayLibravatar brian m. carlson1-3/+3
2017-03-31Make sha1_array_append take a struct object_id *Libravatar brian m. carlson1-1/+1
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idLibravatar brian m. carlson1-11/+11
2017-03-28builtin/pull: convert to struct object_idLibravatar brian m. carlson1-36/+36
2017-03-26builtin/pull: convert portions to struct object_idLibravatar brian m. carlson1-3/+3
2016-12-19Merge branch 'jc/pull-rebase-ff'Libravatar Junio C Hamano1-4/+18
2016-11-29pull: fast-forward "pull --rebase=true"Libravatar Junio C Hamano1-4/+18
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesLibravatar Johannes Schindelin1-1/+1
2016-10-07wt-status: make the require_clean_work_tree() function reusableLibravatar Johannes Schindelin1-76/+1
2016-10-07pull: make code more similar to the shell script againLibravatar Johannes Schindelin1-10/+20
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Libravatar Johannes Schindelin1-8/+8
2016-07-13Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-1/+1
2016-06-17i18n: advice: internationalize message for conflictsLibravatar Vasco Almeida1-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseLibravatar Alexander Hirsch1-0/+3
2016-05-17Merge branch 'va/i18n-misc-updates'Libravatar Junio C Hamano1-7/+7
2016-04-29Merge branch 'jc/merge-refuse-new-root'Libravatar Junio C Hamano1-0/+6
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Libravatar Junio C Hamano1-0/+6
2016-04-19i18n: builtin/pull.c: split strings marked for translationLibravatar Vasco Almeida1-4/+4
2016-04-19i18n: builtin/pull.c: mark placeholders for translationLibravatar Vasco Almeida1-3/+3
2016-03-21pull --rebase: add --[no-]autostash flagLibravatar Mehul Jain1-0/+12
2016-03-21git-pull.c: introduce git_pull_config()Libravatar Mehul Jain1-3/+15
2016-01-28Merge branch 'jc/strbuf-getline'Libravatar Junio C Hamano1-1/+1
2016-01-26Merge branch 'js/pull-rebase-i'Libravatar Junio C Hamano1-2/+7
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Libravatar Junio C Hamano1-1/+1
2016-01-13pull: allow interactive rebase with --rebase=interactiveLibravatar Johannes Schindelin1-2/+7
2015-12-16submodules: allow parallel fetching, add tests and documentationLibravatar Stefan Beller1-0/+6
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2015-10-16Merge branch 'pt/pull-builtin' into maintLibravatar Junio C Hamano1-1/+1
2015-10-16pull: enclose <options> in brackets in the usage stringLibravatar Alex Henrie1-1/+1
2015-09-11pull: don't mark values for option "rebase" for translationLibravatar Ralf Thielow1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 14:18:06 +0000