summaryrefslogtreecommitdiffstats
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorLines
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-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
2020-07-28strvec: fix indentation in renamed callsJeff King-3/+3
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King-74/+74
2020-07-06Merge branch 'cb/is-descendant-of'Junio C Hamano-1/+2
2020-06-29Merge branch 'rs/pull-leakfix'Junio C Hamano-0/+1
2020-06-23commit-reach: avoid is_descendant_of() shimCarlo Marcelo Arenas Belón-1/+2
2020-06-19pull: plug minor memory leak after using is_descendant_of()René Scharfe-0/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano-4/+4
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano-4/+5
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu-4/+4
2020-04-22Merge branch 'jk/oid-array-cleanups'Junio C Hamano-1/+1
2020-04-22Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Junio C Hamano-1/+4
2020-04-22Merge branch 'rs/pull-options-sync-code-and-doc'Junio C Hamano-0/+18
2020-04-10pull: pass --autostash to mergeDenton Liu-4/+5
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-30 20:06:39 +0000