summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano1-4/+5
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-1/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-2/+2
2018-05-18pull: convert get_tracking_branch to use refspec_item_initBrandon Williams1-4/+4
2018-05-18refspec: rename struct refspec to struct refspec_itemBrandon Williams1-1/+1
2018-05-18refspec: move refspec parsing logic into its own fileBrandon Williams1-0/+1
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-1/+1
2018-04-26pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin1-4/+10
2018-04-11exec_cmd: rename to use dash in file nameStefan Beller1-1/+1
2018-03-14Merge branch 'nd/parseopt-completion'Junio C Hamano1-1/+1
2018-02-15Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-0/+2
2018-02-09parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy1-1/+1
2018-01-25builtin/pull: respect verbosity settings in submodulesStefan Beller1-0/+2
2017-12-13Merge branch 'bc/hash-algo'Junio C Hamano1-1/+1
2017-11-27Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano1-0/+12
2017-11-21pull: pass -4/-6 option to 'git fetch'Shuyu Wei1-0/+12
2017-11-15Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano1-1/+4
2017-11-13Switch empty tree and blob lookups to use hash abstractionbrian m. carlson1-1/+1
2017-11-08reduce_heads: fix memory leaksMartin Ågren1-1/+4
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2017-10-16refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson1-1/+1
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King1-0/+6
2017-09-07pull: honor submodule.recurse config optionNicolas Morey-Chaisemartin1-0/+4
2017-09-07pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin1-2/+2
2017-08-22Merge branch 'ma/parse-maybe-bool'Junio C Hamano1-2/+2
2017-08-07treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren1-2/+2
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano1-10/+63
2017-06-24Merge branch 'bw/config-h'Junio C Hamano1-0/+1
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller1-10/+63
2017-06-15config: don't include config.h by defaultBrandon Williams1-0/+1
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-2/+1
2017-06-05Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano1-10/+13
2017-06-01pull: ff --rebase --autostash works in dirty repoTyler Brazier1-10/+13
2017-05-26use xfopen() in more placesNguyễn Thái Ngọc Duy1-2/+1
2017-05-08merge: convert checkout_fast_forward to struct object_idbrian m. carlson1-2/+2
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-5/+5
2017-04-26Merge branch 'jk/war-on-git-path'Junio C Hamano1-2/+2
2017-04-20use git_path_* helper functionsJeff King1-2/+2
2017-03-31Rename sha1_array to oid_arraybrian m. carlson1-3/+3
2017-03-31Make sha1_array_append take a struct object_id *brian m. carlson1-1/+1
2017-03-28sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson1-11/+11
2017-03-28builtin/pull: convert to struct object_idbrian m. carlson1-36/+36
2017-03-26builtin/pull: convert portions to struct object_idbrian m. carlson1-3/+3
2016-12-19Merge branch 'jc/pull-rebase-ff'Junio C Hamano1-4/+18
2016-11-29pull: fast-forward "pull --rebase=true"Junio C Hamano1-4/+18
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin1-1/+1
2016-10-07wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin1-76/+1
2016-10-07pull: make code more similar to the shell script againJohannes Schindelin1-10/+20
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin1-8/+8
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-1/+1
generated by cgit (git 2.54.0.dirty) at 2026-09-13 18:00:39 +0000