summaryrefslogtreecommitdiffstats
path: root/builtin/pull.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/gpg-lazy-init'Junio C Hamano2023-03-171-6/+0
|\
| * gpg-interface: lazily initialize and read the configurationJunio C Hamano2023-02-101-6/+0
* | cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren2023-02-241-0/+1
|/
* {builtin/*,repository}.c: add & use "USE_THE_INDEX_VARIABLE"Ævar Arnfjörð Bjarmason2022-11-211-1/+1
* cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason2022-11-211-2/+2
* use child_process members "args" and "env" directlyRené Scharfe2022-10-301-76/+71
* pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason2022-07-011-6/+10
* Merge branch 'gc/pull-recurse-submodules'Junio C Hamano2022-05-211-3/+7
|\
| * pull: do not let submodule.recurse override fetch.recurseSubmodulesGlen Choo2022-05-121-3/+7
* | Merge branch 'ja/i18n-common-messages'Junio C Hamano2022-02-261-3/+3
|\ \
| * | i18n: factorize "invalid value" messagesJean-Noël Avila2022-02-041-3/+3
* | | Merge branch 'js/short-help-outside-repo-fix'Junio C Hamano2022-02-181-2/+4
|\ \ \
| * | | checkout/fetch/pull/pack-objects: allow `-h` outside a repositoryJohannes Schindelin2022-02-081-2/+4
| |/ /
* | | Merge branch 'pb/pull-rebase-autostash-fix'Junio C Hamano2022-02-051-4/+3
|\ \ \ | |/ / |/| |
| * | pull --rebase: honor rebase.autostash when fast-forwardingPhilippe Blain2022-01-141-4/+3
| * | Merge branch 'ev/pull-already-up-to-date-is-noop' into maintJunio C Hamano2021-11-231-2/+4
| |\ \
* | | | fetch/pull: use the sparse indexDerrick Stolee2021-12-221-0/+2
* | | | Merge branch 'ah/advice-pull-has-no-preference-between-rebase-and-merge'Junio C Hamano2021-12-101-1/+1
|\ \ \ \
| * | | | pull: don't say that merge is "the default strategy"Alex Henrie2021-11-191-1/+1
* | | | | Merge branch 'ev/pull-already-up-to-date-is-noop'Junio C Hamano2021-11-221-2/+4
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | pull: should be noop when already-up-to-dateErwin Villejo2021-11-181-2/+4
* | | | Merge branch 'jc/fix-pull-ff-only-when-already-up-to-date'Junio C Hamano2021-11-111-1/+28
|\| | |
| * | | pull: --ff-only should make it a noop when already-up-to-dateJunio C Hamano2021-10-291-1/+28
| |/ /
* | | Merge branch 'ar/fix-git-pull-no-verify'Junio C Hamano2021-11-041-0/+6
|\ \ \
| * | | pull: honor --no-verify and do not call the commit-msg hookAlex Riesen2021-10-281-0/+6
| |/ /
* | | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-191-6/+3
|\ \ \
| * | | pull: remove support for `--rebase=preserve`Johannes Schindelin2021-09-081-6/+3
* | | | Merge branch 'js/run-command-close-packs'Junio C Hamano2021-09-211-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Close object store closer to spawning child processesJohannes Schindelin2021-09-091-2/+1
| * | | pull: release packs before fetchingJohannes Schindelin2021-09-081-0/+2
| |/ /
* | | pull: fix handling of multiple headsElijah Newren2021-07-221-4/+14
* | | pull: update docs & code for option compatibility with rebasingElijah Newren2021-07-221-0/+2
* | | pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-4/+6
* | | pull: make --rebase and --no-rebase override pull.ff=onlyElijah Newren2021-07-221-1/+15
* | | pull: since --ff-only overrides, handle it firstElijah Newren2021-07-221-8/+8
* | | pull: abort if --ff-only is given and fast-forwarding is impossibleAlex Henrie2021-07-211-3/+8
|/ /
* | pull: trivial whitespace style fixFelipe Contreras2021-06-191-3/+3
* | pull: trivial cleanupFelipe Contreras2021-06-191-4/+2
* | pull: cleanup autostash checkFelipe Contreras2021-06-191-9/+7
* | pull: display default warning only when non-ffFelipe Contreras2020-12-161-2/+5
* | pull: correct condition to trigger non-ff adviceJunio C Hamano2020-12-161-13/+19
* | pull: get rid of unnecessary global variableJunio C Hamano2020-12-161-6/+5
* | pull: give the advice for choosing rebase/merge much laterFelipe Contreras2020-12-141-14/+18
* | pull: refactor fast-forward checkFelipe Contreras2020-12-141-11/+15
|/
* Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2020-12-031-12/+36
|\
| * pull: check for local submodule modifications with the right rangePhilippe Blain2020-11-171-1/+1
| * pull --rebase: compute rebase arguments in separate functionPhilippe Blain2020-11-171-11/+35
* | Merge branch 'js/pull-rebase-use-advise'Junio C Hamano2020-11-301-12/+12
|\ \
| * | pull: colorize the hint about setting `pull.rebase`Johannes Schindelin2020-11-191-12/+12
| |/
* / Documentation: stylistically normalize references to Signed-off-by:Bradley M. Kuhn2020-10-201-1/+1
|/
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 03:18:47 +0100