summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)Author
2022-07-01pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason
2022-05-20Merge branch 'gc/pull-recurse-submodules'Junio C Hamano
2022-05-11pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo
2022-02-25Merge branch 'ja/i18n-common-messages'Junio C Hamano
2022-02-18Merge branch 'js/short-help-outside-repo-fix'Junio C Hamano
2022-02-08checkout/fetch/pull/pack-objects: allow `-h` outside a repositoryJohannes Schindelin
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Junio C Hamano
2022-02-04i18n: factorize "invalid value" messagesJean-Noël Avila
2022-01-14pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain
2021-12-22fetch/pull: use the sparse indexDerrick Stolee
2021-12-10Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'Junio C Hamano
2021-11-23Merge branch 'ev/pull-already-up-to-date-is-noop' into maintJunio C Hamano
2021-11-22Merge branch 'ev/pull-already-up-to-date-is-noop'Junio C Hamano
2021-11-19pull: don't say that merge is "the default strategy"Alex Henrie
2021-11-18pull: should be noop when already-up-to-dateErwin Villejo
2021-11-10Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano
2021-11-04Merge branch 'ar/fix-git-pull-no-verify'Junio C Hamano
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano
2021-10-28pull: honor --no-verify and do not call the commit-msg hookAlex Riesen
2021-10-18Merge branch 'js/retire-preserve-merges'Junio C Hamano
2021-09-20Merge branch 'js/run-command-close-packs'Junio C Hamano
2021-09-09Close object store closer to spawning child processesJohannes Schindelin
2021-09-08pull: release packs before fetchingJohannes Schindelin
2021-09-08pull: remove support for `--rebase=preserve`Johannes Schindelin
2021-07-22pull: fix handling of multiple headsElijah Newren
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren
2021-07-22pull: since --ff-only overrides, handle it firstElijah Newren
2021-07-21pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie
2021-06-19pull: trivial whitespace style fixFelipe Contreras
2021-06-19pull: trivial cleanupFelipe Contreras
2021-06-19pull: cleanup autostash checkFelipe Contreras
2020-12-16pull: display default warning only when non-ffFelipe Contreras
2020-12-16pull: correct condition to trigger non-ff adviceJunio C Hamano
2020-12-16pull: get rid of unnecessary global variableJunio C Hamano
2020-12-14pull: give the advice for choosing rebase/merge much laterFelipe Contreras
2020-12-14pull: refactor fast-forward checkFelipe Contreras
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano
2020-11-30Merge branch 'js/pull-rebase-use-advise'Junio C Hamano
2020-11-19pull: colorize the hint about setting `pull.rebase`Johannes Schindelin
2020-11-17pull: check for local submodule modifications with the right rangePhilippe Blain
2020-11-17pull --rebase: compute rebase arguments in separate functionPhilippe Blain
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn
2020-09-29Merge branch 'ah/pull'Junio C Hamano
2020-09-25pull: don't warn if pull.ff has been setAlex Henrie
2020-07-31strvec: rename struct fieldsJeff King
2020-07-28strvec: fix indentation in renamed callsJeff King
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King
2020-07-07Merge branch 'cb/is-descendant-of'Junio C Hamano