summaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAgeFilesLines
* commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-5/+10
* Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-2/+2
|\
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-2/+2
* | Merge branch 'ab/refspec-init-fix'Junio C Hamano2018-06-281-1/+1
|\ \
| * | refspec: s/refspec_item_init/&_or_die/gÆvar Arnfjörð Bjarmason2018-06-111-1/+1
* | | Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano2018-06-181-2/+2
|\ \ \
| * | | Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day2018-06-131-2/+2
* | | | Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano2018-05-301-4/+5
|\ \ \ \ | | |/ / | |/| |
| * | | pull: convert get_tracking_branch to use refspec_item_initBrandon Williams2018-05-181-4/+4
| * | | refspec: rename struct refspec to struct refspec_itemBrandon Williams2018-05-181-1/+1
| * | | refspec: move refspec parsing logic into its own fileBrandon Williams2018-05-181-0/+1
* | | | Merge branch 'js/use-bug-macro'Junio C Hamano2018-05-301-1/+1
|\ \ \ \
| * | | | Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin2018-05-061-1/+1
| |/ / /
* | | | pull: accept --rebase=merges to recreate the branch topologyJohannes Schindelin2018-04-261-4/+10
|/ / /
* | | exec_cmd: rename to use dash in file nameStefan Beller2018-04-111-1/+1
| |/ |/|
* | Merge branch 'nd/parseopt-completion'Junio C Hamano2018-03-141-1/+1
|\ \
| * | parse-options: let OPT__FORCE take optional flags argumentNguyễn Thái Ngọc Duy2018-02-091-1/+1
| |/
* | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2018-02-151-0/+2
|\ \ | |/ |/|
| * builtin/pull: respect verbosity settings in submodulessb/pull-rebase-submoduleStefan Beller2018-01-251-0/+2
* | Merge branch 'bc/hash-algo'Junio C Hamano2017-12-131-1/+1
|\ \
| * | Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-131-1/+1
* | | Merge branch 'sw/pull-ipv46-passthru'Junio C Hamano2017-11-271-0/+12
|\ \ \
| * | | pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthruShuyu Wei2017-11-211-0/+12
* | | | Merge branch 'ma/reduce-heads-leakfix'Junio C Hamano2017-11-151-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | reduce_heads: fix memory leaksma/reduce-heads-leakfixMartin Ågren2017-11-081-1/+4
* | | | Merge branch 'bc/object-id'Junio C Hamano2017-11-061-1/+1
|\ \ \ \
| * | | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-1/+1
| |/ / /
* | | | pull: pass --signoff/--no-signoff to "git merge"wk/pull-signoffW. Trevor King2017-10-131-0/+6
|/ / /
* | | pull: honor submodule.recurse config optionnm/pull-submodule-recurse-configNicolas Morey-Chaisemartin2017-09-071-0/+4
* | | pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin2017-09-071-2/+2
* | | Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-221-2/+2
|\ \ \
| * | | treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-071-2/+2
* | | | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-131-10/+63
|\ \ \ \ | | |_|/ | |/| |
| * | | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-231-10/+63
* | | | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
* | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-131-2/+1
|\ \ \ \
| * | | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-261-2/+1
| |/ / /
* | | | Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-051-11/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-11/+14
| |/ /
* | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-081-2/+2
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-5/+5
|/ /
* | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-261-2/+2
|\ \
| * | use git_path_* helper functionsJeff King2017-04-201-2/+2
| |/
* | Rename sha1_array to oid_arraybrian m. carlson2017-03-311-3/+3
* | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-311-1/+1
* | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-281-11/+11
* | builtin/pull: convert to struct object_idbrian m. carlson2017-03-281-36/+36
* | builtin/pull: convert portions to struct object_idbrian m. carlson2017-03-261-3/+3
|/
* Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-191-4/+18
|\
View Lorry Controller Status