summaryrefslogtreecommitdiffstats
path: root/builtin/pull.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge branch 'ah/pull'Junio C Hamano2020-09-291-2/+1
|\
| * pull: don't warn if pull.ff has been setAlex Henrie2020-09-251-2/+1
* | strvec: rename struct fieldsJeff King2020-07-311-8/+8
* | strvec: fix indentation in renamed callsJeff King2020-07-291-3/+3
* | strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-291-74/+74
* | Merge branch 'cb/is-descendant-of'Junio C Hamano2020-07-071-1/+2
|\ \
| * | commit-reach: avoid is_descendant_of() shimCarlo Marcelo Arenas Belón2020-06-241-1/+2
| |/
* | Merge branch 'rs/pull-leakfix'Junio C Hamano2020-06-291-0/+1
|\ \ | |/ |/|
| * pull: plug minor memory leak after using is_descendant_of()René Scharfe2020-06-191-0/+1
* | Merge branch 'dl/opt-callback-cleanup'Junio C Hamano2020-05-051-4/+4
|\ \
| * | Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-4/+4
* | | Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-301-4/+5
|\ \ \ | |/ / |/| |
| * | pull: pass --autostash to mergeDenton Liu2020-04-101-4/+5
| |/
* | Merge branch 'jk/oid-array-cleanups'Junio C Hamano2020-04-221-1/+1
|\ \
| * | oid_array: rename source file from sha1-arrayJeff King2020-03-301-1/+1
| |/
* | Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Junio C Hamano2020-04-221-1/+4
|\ \
| * | pull: avoid running both merge and rebaseElijah Newren2020-03-271-1/+4
* | | Merge branch 'rs/pull-options-sync-code-and-doc'Junio C Hamano2020-04-221-0/+18
|\ \ \
| * | | pull: pass documented fetch options onRené Scharfe2020-03-291-0/+18
| |/ /
* | / pull: warn if the user didn't say whether to rebase or to mergeAlex Henrie2020-03-101-0/+16
| |/ |/|
* | Merge branch 'bw/remote-rename-update-config'Junio C Hamano2020-02-251-25/+4
|\ \
| * | pull --rebase/remote rename: document and honor single-letter abbreviations r...Bert Wesarg2020-02-101-25/+4
| |/
* / gpg-interface: add minTrustLevel as a configuration optionHans Jerry Illikainen2020-01-151-1/+12
|/
* pull, fetch: add --set-upstream optionCorentin BOMPARD2019-08-191-0/+6
* pull: add --[no-]show-forced-updates passthroughDerrick Stolee2019-06-211-0/+7
* Merge branch 'dl/merge-cleanup-scissors-fix'Junio C Hamano2019-05-081-0/+12
|\
| * merge: cleanup messages like commitDenton Liu2019-04-181-0/+12
* | builtin/pull: make hash-size independentbrian m. carlson2019-04-011-5/+6
|/
* completion: add more parameter value completionNguyễn Thái Ngọc Duy2019-02-201-0/+4
* cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 11:36:56 +0100