summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2022-02-05Merge branch 'pb/pull-rebase-autostash-fix'Libravatar Junio C Hamano1-4/+3
2022-01-14pull --rebase: honor rebase.autostash when fast-forwardingLibravatar Philippe Blain1-4/+3
2021-12-22fetch/pull: use the sparse indexLibravatar Derrick Stolee1-0/+2
2021-12-10Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'Libravatar Junio C Hamano1-1/+1
2021-11-23Merge branch 'ev/pull-already-up-to-date-is-noop' into maintLibravatar Junio C Hamano1-2/+4
2021-11-21Merge branch 'ev/pull-already-up-to-date-is-noop'Libravatar Junio C Hamano1-2/+4
2021-11-19pull: don't say that merge is "the default strategy"Libravatar Alex Henrie1-1/+1
2021-11-18pull: should be noop when already-up-to-dateLibravatar Erwin Villejo1-2/+4
2021-11-10Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Libravatar Junio C Hamano1-1/+28
2021-11-04Merge branch 'ar/fix-git-pull-no-verify'Libravatar Junio C Hamano1-0/+6
2021-10-29pull: --ff-only should make it a noop when already-up-to-dateLibravatar Junio C Hamano1-1/+28
2021-10-28pull: honor --no-verify and do not call the commit-msg hookLibravatar Alex Riesen1-0/+6
2021-10-18Merge branch 'js/retire-preserve-merges'Libravatar Junio C Hamano1-6/+3
2021-09-20Merge branch 'js/run-command-close-packs'Libravatar Junio C Hamano1-1/+2
2021-09-09Close object store closer to spawning child processesLibravatar Johannes Schindelin1-2/+1
2021-09-08pull: release packs before fetchingLibravatar Johannes Schindelin1-0/+2
2021-09-07pull: remove support for `--rebase=preserve`Libravatar Johannes Schindelin1-6/+3
2021-07-22pull: fix handling of multiple headsLibravatar Elijah Newren1-4/+14
2021-07-22pull: update docs & code for option compatibility with rebasingLibravatar Elijah Newren1-0/+2
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-4/+6
2021-07-22pull: make --rebase and --no-rebase override pull.ff=onlyLibravatar Elijah Newren1-1/+15
2021-07-22pull: since --ff-only overrides, handle it firstLibravatar Elijah Newren1-8/+8
2021-07-20pull: abort if --ff-only is given and fast-forwarding is impossibleLibravatar Alex Henrie1-3/+8
2021-06-19pull: trivial whitespace style fixLibravatar Felipe Contreras1-3/+3
2021-06-19pull: trivial cleanupLibravatar Felipe Contreras1-4/+2
2021-06-19pull: cleanup autostash checkLibravatar Felipe Contreras1-9/+7
2020-12-15pull: display default warning only when non-ffLibravatar Felipe Contreras1-2/+5
2020-12-15pull: correct condition to trigger non-ff adviceLibravatar Junio C Hamano1-13/+19
2020-12-15pull: get rid of unnecessary global variableLibravatar Junio C Hamano1-6/+5
2020-12-14pull: give the advice for choosing rebase/merge much laterLibravatar Felipe Contreras1-14/+18
2020-12-14pull: refactor fast-forward checkLibravatar Felipe Contreras1-11/+15
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Libravatar Junio C Hamano1-12/+36
2020-11-30Merge branch 'js/pull-rebase-use-advise'Libravatar Junio C Hamano1-12/+12
2020-11-19pull: colorize the hint about setting `pull.rebase`Libravatar Johannes Schindelin1-12/+12
2020-11-16pull: check for local submodule modifications with the right rangeLibravatar Philippe Blain1-1/+1
2020-11-16pull --rebase: compute rebase arguments in separate functionLibravatar Philippe Blain1-11/+35
2020-10-20Documentation: stylistically normalize references to Signed-off-by:Libravatar Bradley M. Kuhn1-1/+1
2020-09-29Merge branch 'ah/pull'Libravatar Junio C Hamano1-2/+1
2020-09-24pull: don't warn if pull.ff has been setLibravatar Alex Henrie1-2/+1
2020-07-30strvec: rename struct fieldsLibravatar Jeff King1-8/+8
2020-07-28strvec: fix indentation in renamed callsLibravatar Jeff King1-3/+3
2020-07-28strvec: convert builtin/ callers away from argv_array nameLibravatar Jeff King1-74/+74
2020-07-06Merge branch 'cb/is-descendant-of'Libravatar Junio C Hamano1-1/+2
2020-06-29Merge branch 'rs/pull-leakfix'Libravatar Junio C Hamano1-0/+1
2020-06-23commit-reach: avoid is_descendant_of() shimLibravatar Carlo Marcelo Arenas Belón1-1/+2
2020-06-19pull: plug minor memory leak after using is_descendant_of()Libravatar René Scharfe1-0/+1
2020-05-05Merge branch 'dl/opt-callback-cleanup'Libravatar Junio C Hamano1-4/+4
2020-04-29Merge branch 'dl/merge-autostash'Libravatar Junio C Hamano1-4/+5
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-4/+4
2020-04-22Merge branch 'jk/oid-array-cleanups'Libravatar Junio C Hamano1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:41:06 +0000