summaryrefslogtreecommitdiffstats
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorLines
2022-11-21{builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason-1/+1
2022-11-21cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason-2/+2
2022-10-30use child_process members "args" and "env" directlyRené Scharfe-76/+71
2022-07-01pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason-6/+10
2022-05-20Merge branch 'gc/pull-recurse-submodules'Junio C Hamano-3/+7
2022-05-11pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo-3/+7
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano-3/+3
2022-02-18Merge branch 'js/short-help-outside-repo-fix'Junio C Hamano-2/+4
2022-02-08checkout/fetch/pull/pack-objects: allow `-h` outside a repositoryJohannes Schindelin-2/+4
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Junio C Hamano-4/+3
2022-02-04i18n: factorize "invalid value" messagesJean-Noël Avila-3/+3
2022-01-14pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain-4/+3
2021-12-22fetch/pull: use the sparse indexDerrick Stolee-0/+2
2021-12-10Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'Junio C Hamano-1/+1
2021-11-23Merge branch 'ev/pull-already-up-to-date-is-noop' into maintJunio C Hamano-2/+4
2021-11-21Merge branch 'ev/pull-already-up-to-date-is-noop'Junio C Hamano-2/+4
2021-11-19pull: don't say that merge is "the default strategy"Alex Henrie-1/+1
2021-11-18pull: should be noop when already-up-to-dateErwin Villejo-2/+4
2021-11-10Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano-1/+28
2021-11-04Merge branch 'ar/fix-git-pull-no-verify'Junio C Hamano-0/+6
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano-1/+28
2021-10-28pull: honor --no-verify and do not call the commit-msg hookAlex Riesen-0/+6
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano-6/+3
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano-1/+2
2021-09-09Close object store closer to spawning child processesJohannes Schindelin-2/+1
2021-09-08pull: release packs before fetchingJohannes Schindelin-0/+2
2021-09-07pull: remove support for `--rebase=preserve`Johannes Schindelin-6/+3
2021-07-22pull: fix handling of multiple headsElijah Newren-4/+14
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren-0/+2
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren-4/+6
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren-1/+15
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren-8/+8
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie-3/+8
2021-06-19pull: trivial whitespace style fixFelipe Contreras-3/+3
2021-06-19pull: trivial cleanupFelipe Contreras-4/+2
2021-06-19pull: cleanup autostash checkFelipe Contreras-9/+7
2020-12-15pull: display default warning only when non-ffFelipe Contreras-2/+5
2020-12-15pull: correct condition to trigger non-ff adviceJunio C Hamano-13/+19
2020-12-15pull: get rid of unnecessary global variableJunio C Hamano-6/+5
2020-12-14pull: give the advice for choosing rebase/merge much laterFelipe Contreras-14/+18
2020-12-14pull: refactor fast-forward checkFelipe Contreras-11/+15
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano-12/+36
2020-11-30Merge branch 'js/pull-rebase-use-advise'Junio C Hamano-12/+12
2020-11-19pull: colorize the hint about setting `pull.rebase`Johannes Schindelin-12/+12
2020-11-16pull: check for local submodule modifications with the right rangePhilippe Blain-1/+1
2020-11-16pull --rebase: compute rebase arguments in separate functionPhilippe Blain-11/+35
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn-1/+1
2020-09-29Merge branch 'ah/pull'Junio C Hamano-2/+1
2020-09-24pull: don't warn if pull.ff has been setAlex Henrie-2/+1
2020-07-30strvec: rename struct fieldsJeff King-8/+8
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 08:37:53 +0000