aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2025-08-04Merge branch 'ps/config-wo-the-repository'Junio C Hamano1-4/+5
2025-08-01Merge branch 'ly/pull-autostash'Junio C Hamano1-3/+17
2025-07-23config: move Git config parsing into "environment.c"Patrick Steinhardt1-0/+1
2025-07-23config: drop `git_config_get_value()` wrapperPatrick Steinhardt1-3/+3
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-1/+1
2025-07-21pull: add pull.autoStash config optionLidong Yan1-3/+17
2025-07-07Merge branch 'jk/submodule-remote-lookup-cleanup'Junio C Hamano1-1/+1
2025-06-23remote: remove branch->merge_name and fix branch_release()Jacob Keller1-1/+1
2025-06-13merge/pull: add the "--compact-summary" optionJunio C Hamano1-0/+3
2025-03-21refspec: replace `refspec_item_init()` with fetch/push variantsTaylor Blau1-1/+1
2025-03-21refspec: remove refspec_item_init_or_die()Taylor Blau1-1/+2
2025-03-21refspec: treat 'fetch' as a Boolean valueTaylor Blau1-1/+1
2024-12-06global: trivial conversions to fix `-Wsign-compare` warningsPatrick Steinhardt1-3/+1
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+2
2024-11-04doc: correct misleading descriptions for --shallow-excludeElijah Newren1-2/+2
2024-10-02Merge branch 'ps/leakfixes-part-7'Junio C Hamano1-4/+7
2024-09-27builtin/pull: fix leaking "ff" optionPatrick Steinhardt1-4/+7
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-0/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-07-02Merge branch 'ps/use-the-repository'Junio C Hamano1-3/+3
2024-06-14hash: require hash algorithm in `oidread()` and `oidclr()`Patrick Steinhardt1-3/+3
2024-06-07global: improve const correctness when assigning string constantsPatrick Steinhardt1-26/+26
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-1/+1
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-1/+1
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-2/+2
2024-02-29commit-reach(get_octopus_merge_bases): pass on "missing commits" errorsJohannes Schindelin1-2/+3
2024-02-28commit-reach(repo_in_merge_bases_many): report missing commitsJohannes Schindelin1-0/+4
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-5/+0
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+3
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+3
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-2/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21merge.h: move declarations for merge.c from cache.hElijah Newren1-0/+1
2023-05-09Merge branch 'ob/messages-capitalize-exception'Junio C Hamano1-1/+1
2023-04-28messages: capitalization and punctuation exceptionsOswald Buddenhagen1-1/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-2/+2
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-2/+2
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-03-17Merge branch 'jc/gpg-lazy-init'Junio C Hamano1-6/+0
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2023-02-09gpg-interface: lazily initialize and read the configurationJunio C Hamano1-6/+0
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason1-1/+1
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason1-2/+2
2022-10-30use child_process members "args" and "env" directlyRené Scharfe1-76/+71
2022-07-01pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason1-6/+10
2022-05-20Merge branch 'gc/pull-recurse-submodules'Junio C Hamano1-3/+7
2022-05-11pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo1-3/+7
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano1-3/+3
2022-02-18Merge branch 'js/short-help-outside-repo-fix'Junio C Hamano1-2/+4
2022-02-08checkout/fetch/pull/pack-objects: allow `-h` outside a repositoryJohannes Schindelin1-2/+4
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Junio C Hamano1-4/+3
2022-02-04i18n: factorize "invalid value" messagesJean-Noël Avila1-3/+3
2022-01-14pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain1-4/+3
2021-12-22fetch/pull: use the sparse indexDerrick Stolee1-0/+2
2021-12-10Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'Junio C Hamano1-1/+1
2021-11-23Merge branch 'ev/pull-already-up-to-date-is-noop' into maintJunio C Hamano1-2/+4
2021-11-21Merge branch 'ev/pull-already-up-to-date-is-noop'Junio C Hamano1-2/+4
2021-11-19pull: don't say that merge is "the default strategy"Alex Henrie1-1/+1
2021-11-18pull: should be noop when already-up-to-dateErwin Villejo1-2/+4
2021-11-10Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano1-1/+28
2021-11-04Merge branch 'ar/fix-git-pull-no-verify'Junio C Hamano1-0/+6
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano1-1/+28
2021-10-28pull: honor --no-verify and do not call the commit-msg hookAlex Riesen1-0/+6
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano1-6/+3
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano1-1/+2
2021-09-09Close object store closer to spawning child processesJohannes Schindelin1-2/+1
2021-09-08pull: release packs before fetchingJohannes Schindelin1-0/+2
2021-09-07pull: remove support for `--rebase=preserve`Johannes Schindelin1-6/+3
2021-07-22pull: fix handling of multiple headsElijah Newren1-4/+14
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren1-0/+2
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren1-4/+6
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren1-1/+15
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren1-8/+8
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie1-3/+8
2021-06-19pull: trivial whitespace style fixFelipe Contreras1-3/+3
2021-06-19pull: trivial cleanupFelipe Contreras1-4/+2
2021-06-19pull: cleanup autostash checkFelipe Contreras1-9/+7
2020-12-15pull: display default warning only when non-ffFelipe Contreras1-2/+5
2020-12-15pull: correct condition to trigger non-ff adviceJunio C Hamano1-13/+19
2020-12-15pull: get rid of unnecessary global variableJunio C Hamano1-6/+5
2020-12-14pull: give the advice for choosing rebase/merge much laterFelipe Contreras1-14/+18
2020-12-14pull: refactor fast-forward checkFelipe Contreras1-11/+15
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano1-12/+36
2020-11-30Merge branch 'js/pull-rebase-use-advise'Junio C Hamano1-12/+12
2020-11-19pull: colorize the hint about setting `pull.rebase`Johannes Schindelin1-12/+12
2020-11-16pull: check for local submodule modifications with the right rangePhilippe Blain1-1/+1
2020-11-16pull --rebase: compute rebase arguments in separate functionPhilippe Blain1-11/+35
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn1-1/+1
2020-09-29Merge branch 'ah/pull'Junio C Hamano1-2/+1
2020-09-24pull: don't warn if pull.ff has been setAlex Henrie1-2/+1
2020-07-30strvec: rename struct fieldsJeff King1-8/+8
2020-07-28strvec: fix indentation in renamed callsJeff King1-3/+3
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-74/+74
2020-07-06Merge branch 'cb/is-descendant-of'Junio C Hamano1-1/+2
2020-06-29Merge branch 'rs/pull-leakfix'Junio C Hamano1-0/+1
2020-06-23commit-reach: avoid is_descendant_of() shimCarlo Marcelo Arenas Belón1-1/+2
2020-06-19pull: plug minor memory leak after using is_descendant_of()René Scharfe1-0/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano1-4/+4
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano1-4/+5
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu1-4/+4
2020-04-22Merge branch 'jk/oid-array-cleanups'Junio C Hamano1-1/+1
2020-04-22Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Junio C Hamano1-1/+4
2020-04-22Merge branch 'rs/pull-options-sync-code-and-doc'Junio C Hamano1-0/+18
2020-04-10pull: pass --autostash to mergeDenton Liu1-4/+5
2020-03-30oid_array: rename source file from sha1-arrayJeff King1-1/+1
2020-03-28pull: pass documented fetch options onRené Scharfe1-0/+18
2020-03-27pull: avoid running both merge and rebaseElijah Newren1-1/+4
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie1-0/+16
2020-02-25Merge branch 'bw/remote-rename-update-config'Junio C Hamano1-25/+4
2020-02-10pull --rebase/remote rename: document and honor single-letter abbreviations r...Bert Wesarg1-25/+4
2020-01-15gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen1-1/+12
2019-08-19pull, fetch: add --set-upstream optionCorentin BOMPARD1-0/+6
2019-06-21pull: add --[no-]show-forced-updates passthroughDerrick Stolee1-0/+7
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano1-0/+12
2019-04-18merge: cleanup messages like commitDenton Liu1-0/+12
2019-04-01builtin/pull: make hash-size independentbrian m. carlson1-5/+6
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy1-0/+4
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-1/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano1-0/+11
2018-11-12wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+2
2018-11-07pull: handle --verify-signatures for unborn branchJeff King1-0/+11
2018-10-22submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-3/+6
2018-09-21submodule.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-2/+5
2018-09-17Merge branch 'jk/cocci'Junio C Hamano1-2/+2
2018-09-17Merge branch 'ds/reachable'Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-1/+1
2018-08-27Merge branch 'rs/opt-updates'Junio C Hamano1-1/+1
2018-08-21parseopt: group literal string alternatives in argument helpRené Scharfe1-1/+1
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Junio C Hamano1-3/+3
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeJohannes Schindelin1-3/+3
2018-07-20commit.h: remove method declarationsDerrick Stolee1-0/+1
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller1-5/+10
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-2/+2
2018-06-28Merge branch 'ab/refspec-init-fix'Junio C Hamano1-1/+1
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano1-2/+2
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day1-2/+2
2018-06-11refspec: s/refspec_item_init/&_or_die/gÆvar Arnfjörð Bjarmason1-1/+1
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano1-4/+5
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-1/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-2/+2
2018-05-18pull: convert get_tracking_branch to use refspec_item_initBrandon Williams1-4/+4
2018-05-18refspec: rename struct refspec to struct refspec_itemBrandon Williams1-1/+1
2018-05-18refspec: move refspec parsing logic into its own fileBrandon Williams1-0/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-1/+1
2018-04-26pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin1-4/+10
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller1-1/+1
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-1/+1
2018-02-15Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-0/+2
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy1-1/+1
2018-01-25builtin/pull: respect verbosity settings in submodulesStefan Beller1-0/+2
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
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 04:14:54 +0000