summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2020-09-24pull: don't warn if pull.ff has been setLibravatar Alex Henrie1-2/+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
2020-04-22Merge branch 'en/pull-do-not-rebase-after-fast-forwarding'Libravatar Junio C Hamano1-1/+4
2020-04-22Merge branch 'rs/pull-options-sync-code-and-doc'Libravatar Junio C Hamano1-0/+18
2020-04-10pull: pass --autostash to mergeLibravatar Denton Liu1-4/+5
2020-03-30oid_array: rename source file from sha1-arrayLibravatar Jeff King1-1/+1
2020-03-28pull: pass documented fetch options onLibravatar René Scharfe1-0/+18
2020-03-27pull: avoid running both merge and rebaseLibravatar Elijah Newren1-1/+4
2020-03-10pull: warn if the user didn't say whether to rebase or to mergeLibravatar Alex Henrie1-0/+16
2020-02-25Merge branch 'bw/remote-rename-update-config'Libravatar Junio C Hamano1-25/+4
2020-02-10pull --rebase/remote rename: document and honor single-letter abbreviations r...Libravatar Bert Wesarg1-25/+4
2020-01-15gpg-interface: add minTrustLevel as a configuration optionLibravatar Hans Jerry Illikainen1-1/+12
2019-08-19pull, fetch: add --set-upstream optionLibravatar Corentin BOMPARD1-0/+6
2019-06-21pull: add --[no-]show-forced-updates passthroughLibravatar Derrick Stolee1-0/+7
2019-05-09Merge branch 'dl/merge-cleanup-scissors-fix'Libravatar Junio C Hamano1-0/+12
2019-04-18merge: cleanup messages like commitLibravatar Denton Liu1-0/+12
2019-04-01builtin/pull: make hash-size independentLibravatar brian m. carlson1-5/+6
2019-02-20completion: add more parameter value completionLibravatar Nguyễn Thái Ngọc Duy1-0/+4
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-1/+2
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Libravatar Junio C Hamano1-0/+11
2018-11-12wt-status.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+2
2018-11-07pull: handle --verify-signatures for unborn branchLibravatar Jeff King1-0/+11
2018-10-22submodule.c: remove some of the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-10-19Merge branch 'nd/the-index'Libravatar Junio C Hamano1-3/+6
2018-09-21submodule.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-09-21merge.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-2/+5
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano1-2/+2
2018-09-17Merge branch 'ds/reachable'Libravatar Junio C Hamano1-0/+1
2018-08-29convert "oidcmp() != 0" to "!oideq()"Libravatar Jeff King1-1/+1
2018-08-29convert "oidcmp() == 0" to oideq()Libravatar Jeff King1-1/+1
2018-08-27Merge branch 'rs/opt-updates'Libravatar Junio C Hamano1-1/+1
2018-08-21parseopt: group literal string alternatives in argument helpLibravatar René Scharfe1-1/+1
2018-08-17Merge branch 'js/pull-rebase-type-shorthand'Libravatar Junio C Hamano1-3/+3
2018-08-06pull --rebase=<type>: allow single-letter abbreviations for the typeLibravatar Johannes Schindelin1-3/+3
2018-07-20commit.h: remove method declarationsLibravatar Derrick Stolee1-0/+1
2018-06-29commit: add repository argument to lookup_commit_referenceLibravatar Stefan Beller1-5/+10
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-2/+2
2018-06-28Merge branch 'ab/refspec-init-fix'Libravatar Junio C Hamano1-1/+1
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Libravatar Junio C Hamano1-2/+2
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Libravatar Robert P. J. Day1-2/+2
2018-06-11refspec: s/refspec_item_init/&_or_die/gLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Libravatar Junio C Hamano1-4/+5
2018-05-30Merge branch 'js/use-bug-macro'Libravatar Junio C Hamano1-1/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentLibravatar Stefan Beller1-2/+2
2018-05-18pull: convert get_tracking_branch to use refspec_item_initLibravatar Brandon Williams1-4/+4
2018-05-18refspec: rename struct refspec to struct refspec_itemLibravatar Brandon Williams1-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 09:11:32 +0000