summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
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
2018-05-18refspec: move refspec parsing logic into its own fileLibravatar Brandon Williams1-0/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesLibravatar Johannes Schindelin1-1/+1
2018-04-26pull: accept --rebase=merges to recreate the branch topologyLibravatar Johannes Schindelin1-4/+10
2018-04-11exec_cmd: rename to use dash in file nameLibravatar Stefan Beller1-1/+1
2018-03-14Merge branch 'nd/parseopt-completion'Libravatar Junio C Hamano1-1/+1
2018-02-15Merge branch 'sb/pull-rebase-submodule'Libravatar Junio C Hamano1-0/+2
2018-02-09parse-options: let OPT__FORCE take optional flags argumentLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-01-25builtin/pull: respect verbosity settings in submodulesLibravatar Stefan Beller1-0/+2
2017-12-13Merge branch 'bc/hash-algo'Libravatar Junio C Hamano1-1/+1
2017-11-27Merge branch 'sw/pull-ipv46-passthru'Libravatar Junio C Hamano1-0/+12
2017-11-21pull: pass -4/-6 option to 'git fetch'Libravatar Shuyu Wei1-0/+12
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Libravatar Junio C Hamano1-1/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionLibravatar brian m. carlson1-1/+1
2017-11-08reduce_heads: fix memory leaksLibravatar Martin Ågren1-1/+4
2017-11-06Merge branch 'bc/object-id'Libravatar Junio C Hamano1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idLibravatar brian m. carlson1-1/+1
2017-10-13pull: pass --signoff/--no-signoff to "git merge"Libravatar W. Trevor King1-0/+6
2017-09-07pull: honor submodule.recurse config optionLibravatar Nicolas Morey-Chaisemartin1-0/+4
2017-09-07pull: fix cli and config option parsing orderLibravatar Nicolas Morey-Chaisemartin1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Libravatar Junio C Hamano1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolLibravatar Martin Ågren1-2/+2
2017-07-13Merge branch 'sb/pull-rebase-submodule'Libravatar Junio C Hamano1-10/+63
2017-06-24Merge branch 'bw/config-h'Libravatar Junio C Hamano1-0/+1
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Libravatar Stefan Beller1-10/+63
2017-06-15config: don't include config.h by defaultLibravatar Brandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Libravatar Junio C Hamano1-2/+1
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Libravatar Junio C Hamano1-11/+14
2017-06-01pull: ff --rebase --autostash works in dirty repoLibravatar Tyler Brazier1-11/+14
2017-05-26use xfopen() in more placesLibravatar Nguyễn Thái Ngọc Duy1-2/+1
2017-05-08merge: convert checkout_fast_forward to struct object_idLibravatar brian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idLibravatar brian m. carlson1-5/+5
2017-04-26Merge branch 'jk/war-on-git-path'Libravatar Junio C Hamano1-2/+2
2017-04-20use git_path_* helper functionsLibravatar Jeff King1-2/+2
2017-03-31Rename sha1_array to oid_arrayLibravatar brian m. carlson1-3/+3
2017-03-31Make sha1_array_append take a struct object_id *Libravatar brian m. carlson1-1/+1
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idLibravatar brian m. carlson1-11/+11
2017-03-28builtin/pull: convert to struct object_idLibravatar brian m. carlson1-36/+36
2017-03-26builtin/pull: convert portions to struct object_idLibravatar brian m. carlson1-3/+3
2016-12-19Merge branch 'jc/pull-rebase-ff'Libravatar Junio C Hamano1-4/+18
2016-11-29pull: fast-forward "pull --rebase=true"Libravatar Junio C Hamano1-4/+18
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesLibravatar Johannes Schindelin1-1/+1
2016-10-07wt-status: make the require_clean_work_tree() function reusableLibravatar Johannes Schindelin1-76/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:21:49 +0000