aboutsummaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAge
* Switch empty tree and blob lookups to use hash abstractionbrian m. carlson2017-11-13
* Merge branch 'bc/object-id'Junio C Hamano2017-11-06
|\
| * refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
* | pull: pass --signoff/--no-signoff to "git merge"W. Trevor King2017-10-13
|/
* pull: honor submodule.recurse config optionNicolas Morey-Chaisemartin2017-09-07
* pull: fix cli and config option parsing orderNicolas Morey-Chaisemartin2017-09-07
* Merge branch 'ma/parse-maybe-bool'Junio C Hamano2017-08-22
|\
| * treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-07
* | Merge branch 'sb/pull-rebase-submodule'Junio C Hamano2017-07-13
|\ \
| * | pull: optionally rebase submodules (remote submodule changes only)Stefan Beller2017-06-23
* | | Merge branch 'bw/config-h'Junio C Hamano2017-06-24
|\ \ \ | |/ / |/| |
| * | config: don't include config.h by defaultBrandon Williams2017-06-15
* | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-13
|\ \ \
| * | | use xfopen() in more placesNguyễn Thái Ngọc Duy2017-05-26
| |/ /
* | | Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-05
|\ \ \
| * | | pull: ff --rebase --autostash works in dirty repoTyler Brazier2017-06-01
| |/ /
* | | merge: convert checkout_fast_forward to struct object_idbrian m. carlson2017-05-08
* | | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-08
|/ /
* | Merge branch 'jk/war-on-git-path'Junio C Hamano2017-04-26
|\ \
| * | use git_path_* helper functionsJeff King2017-04-20
| |/
* | Rename sha1_array to oid_arraybrian m. carlson2017-03-31
* | Make sha1_array_append take a struct object_id *brian m. carlson2017-03-31
* | sha1-array: convert internal storage for struct sha1_array to object_idbrian m. carlson2017-03-28
* | builtin/pull: convert to struct object_idbrian m. carlson2017-03-28
* | builtin/pull: convert portions to struct object_idbrian m. carlson2017-03-26
|/
* Merge branch 'jc/pull-rebase-ff'Junio C Hamano2016-12-19
|\
| * pull: fast-forward "pull --rebase=true"Junio C Hamano2016-11-29
* | wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-07
* | wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-07
* | pull: make code more similar to the shell script againJohannes Schindelin2016-10-07
* | pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin2016-10-07
* | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-13
|\ \
| * | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-17
* | | pull: warn on --verify-signatures with --rebaseAlexander Hirsch2016-05-20
|/ /
* | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-17
|\ \
| * | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-19
| * | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-19
* | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-29
|\ \ \
| * | | pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano2016-04-21
* | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-21
* | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-21
| |/ / |/| |
* | | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-28
|\ \ \
| * | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-15
| |/ /
* | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-26
|\ \ \
| * | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-13
| |/ /
* | | submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-16
|/ /
* | Remove get_object_hash.brian m. carlson2015-11-20
* | Convert struct object to object_idbrian m. carlson2015-11-20
|/
* Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-16
|\
| * pull: enclose <options> in brackets in the usage stringAlex Henrie2015-10-16