summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)Author
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
2019-04-01builtin/pull: make hash-size independentbrian m. carlson
2019-02-20completion: add more parameter value completionNguyễn Thái Ngọc Duy
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano
2018-11-12wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-11-07pull: handle --verify-signatures for unborn branchJeff King
2018-10-22submodule.c: remove some of the_repository referencesNguyễn Thái Ngọc Duy
2018-10-19Merge branch 'nd/the-index'Junio C Hamano
2018-09-21submodule.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-21merge.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-17Merge branch 'jk/cocci'Junio C Hamano
2018-09-17Merge branch 'ds/reachable'Junio C Hamano
2018-08-29convert "oidcmp() != 0" to "!oideq()"Jeff King
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King
2018-08-27Merge branch 'rs/opt-updates'Junio C Hamano
2018-08-21parseopt: group literal string alternatives in argument helpRené Scharfe
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Junio C Hamano
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeJohannes Schindelin
2018-07-20commit.h: remove method declarationsDerrick Stolee
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-06-28Merge branch 'ab/refspec-init-fix'Junio C Hamano
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day
2018-06-11refspec: s/refspec_item_init/&_or_die/gÆvar Arnfjörð Bjarmason
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano
2018-05-17path.c: migrate global git_path_* to take a repository argumentStefan Beller
2018-05-17pull: convert get_tracking_branch to use refspec_item_initBrandon Williams
2018-05-17refspec: rename struct refspec to struct refspec_itemBrandon Williams
2018-05-17refspec: move refspec parsing logic into its own fileBrandon Williams