summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)Author
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
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin
2018-04-26pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano
2018-02-15Merge branch 'sb/pull-rebase-submodule'Junio C Hamano
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy
2018-01-25builtin/pull: respect verbosity settings in submodulesStefan Beller
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano
2017-11-27Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano
2017-11-21pull: pass -4/-6 option to 'git fetch'Shuyu Wei
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson
2017-11-08reduce_heads: fix memory leaksMartin Ågren
2017-11-06Merge branch 'bc/object-id'Junio C Hamano
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King
2017-09-07pull: honor submodule.recurse config optionNicolas Morey-Chaisemartin
2017-09-07pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano
2017-06-24Merge branch 'bw/config-h'Junio C Hamano
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller
2017-06-15config: don't include config.h by defaultBrandon Williams
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano
2017-04-21use git_path_* helper functionsJeff King
2017-03-31Rename sha1_array to oid_arraybrian m. carlson
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson
2017-03-28builtin/pull: convert to struct object_idbrian m. carlson
2017-03-27builtin/pull: convert portions to struct object_idbrian m. carlson
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano
generated by cgit v0.10.2-6-g49f6 at 2024-04-23 09:55:03 (GMT)