summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)Author
7 daysMerge 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-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
2020-06-29Merge branch 'rs/pull-leakfix'Junio C Hamano
2020-06-23commit-reach: avoid is_descendant_of() shimCarlo Marcelo Arenas Belón
2020-06-19pull: plug minor memory leak after using is_descendant_of()René Scharfe
2020-05-05Merge branch 'dl/opt-callback-cleanup'Junio C Hamano
2020-04-29Merge branch 'dl/merge-autostash'Junio C Hamano
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-04-22Merge branch 'jk/oid-array-cleanups'Junio C Hamano
2020-04-22Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Junio C Hamano
2020-04-22Merge branch 'rs/pull-options-sync-code-and-doc'Junio C Hamano
2020-04-10pull: pass --autostash to mergeDenton Liu
2020-03-30oid_array: rename source file from sha1-arrayJeff King
2020-03-29pull: pass documented fetch options onRené Scharfe
2020-03-27pull: avoid running both merge and rebaseElijah Newren
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie
2020-02-25Merge branch 'bw/remote-rename-update-config'Junio C Hamano
2020-02-10pull --rebase/remote rename: document and honor single-letter abbreviations r...Bert Wesarg
2020-01-15gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen
2019-08-19pull, fetch: add --set-upstream optionCorentin BOMPARD
2019-06-21pull: add --[no-]show-forced-updates passthroughDerrick Stolee
2019-05-08Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano
2019-04-18merge: cleanup messages like commitDenton Liu