aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-11-27Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano1-0/+12
2017-11-21pull: pass -4/-6 option to 'git fetch'Shuyu Wei1-0/+12
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano1-1/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-08reduce_heads: fix memory leaksMartin Ågren1-1/+4
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-1/+1
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King1-0/+6
2017-09-07pull: honor submodule.recurse config optionNicolas Morey-Chaisemartin1-0/+4
2017-09-07pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren1-2/+2
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-10/+63
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller1-10/+63
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-2/+1
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano1-11/+14
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier1-11/+14
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-2/+1
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-5/+5
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano1-2/+2
2017-04-20use git_path_* helper functionsJeff King1-2/+2
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-3/+3
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson1-1/+1
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson1-11/+11
2017-03-28builtin/pull: convert to struct object_idbrian m. carlson1-36/+36
2017-03-26builtin/pull: convert portions to struct object_idbrian m. carlson1-3/+3
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano1-4/+18
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano1-4/+18
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin1-1/+1
2016-10-07wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin1-76/+1
2016-10-07pull: make code more similar to the shell script againJohannes Schindelin1-10/+20
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin1-8/+8
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-1/+1
2016-06-17i18n: advice: internationalize message for conflictsVasco Almeida1-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseAlexander Hirsch1-0/+3
2016-05-17Merge branch 'va/i18n-misc-updates'Junio C Hamano1-7/+7
2016-04-29Merge branch 'jc/merge-refuse-new-root'Junio C Hamano1-0/+6
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano1-0/+6
2016-04-19i18n: builtin/pull.c: split strings marked for translationVasco Almeida1-4/+4
2016-04-19i18n: builtin/pull.c: mark placeholders for translationVasco Almeida1-3/+3
2016-03-21pull --rebase: add --[no-]autostash flagMehul Jain1-0/+12
2016-03-21git-pull.c: introduce git_pull_config()Mehul Jain1-3/+15
2016-01-28Merge branch 'jc/strbuf-getline'Junio C Hamano1-1/+1
2016-01-26Merge branch 'js/pull-rebase-i'Junio C Hamano1-2/+7
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-1/+1
2016-01-13pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin1-2/+7
2015-12-16submodules: allow parallel fetching, add tests and documentationStefan Beller1-0/+6
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Convert struct object to object_idbrian m. carlson1-1/+1
2015-10-16Merge branch 'pt/pull-builtin' into maintJunio C Hamano1-1/+1
2015-10-16pull: enclose <options> in brackets in the usage stringAlex Henrie1-1/+1
2015-09-11pull: don't mark values for option "rebase" for translationRalf Thielow1-1/+1
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano1-0/+1
2015-07-22pull: allow dirty tree when rebase.autostash enabledKevin Daudt1-1/+5
2015-06-18pull: remove redirection to git-pull.shPaul Tan1-7/+0
2015-06-18pull --rebase: error on no merge candidate casesPaul Tan1-3/+12
2015-06-18pull --rebase: exit early when the working directory is dirtyPaul Tan1-1/+76
2015-06-18pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan1-1/+34
2015-06-18pull: teach git pull about --rebasePaul Tan1-2/+245
2015-06-18pull: set reflog messagePaul Tan1-0/+22
2015-06-18pull: implement pulling into an unborn branchPaul Tan1-1/+28
2015-06-18pull: fast-forward working tree if head is updatedPaul Tan1-0/+30
2015-06-18pull: check if in unresolved merge statePaul Tan1-0/+9
2015-06-18pull: support pull.ff configPaul Tan1-0/+29
2015-06-18pull: error on no merge candidatesPaul Tan1-0/+113
2015-06-18pull: pass git-fetch's options to git-fetchPaul Tan1-0/+95
2015-06-15pull: pass git-merge's options to git-mergePaul Tan1-0/+75
2015-06-15pull: pass verbosity, --progress flags to fetch and mergePaul Tan1-0/+36
2015-06-15pull: implement fetch + mergePaul Tan1-1/+61
2015-06-15pull: implement skeletal builtin pullPaul Tan1-0/+33
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-06 03:40:05 +0000