summaryrefslogtreecommitdiff
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorFilesLines
2016-10-07pull: make code more similar to the shell script againLibravatar Johannes Schindelin1-10/+20
2016-10-07pull: drop confusing prefix parameter of die_on_unclean_work_tree()Libravatar Johannes Schindelin1-8/+8
2016-07-13Merge branch 'va/i18n-even-more'Libravatar Junio C Hamano1-1/+1
2016-06-17i18n: advice: internationalize message for conflictsLibravatar Vasco Almeida1-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseLibravatar Alexander Hirsch1-0/+3
2016-05-17Merge branch 'va/i18n-misc-updates'Libravatar Junio C Hamano1-7/+7
2016-04-29Merge branch 'jc/merge-refuse-new-root'Libravatar Junio C Hamano1-0/+6
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Libravatar Junio C Hamano1-0/+6
2016-04-19i18n: builtin/pull.c: split strings marked for translationLibravatar Vasco Almeida1-4/+4
2016-04-19i18n: builtin/pull.c: mark placeholders for translationLibravatar Vasco Almeida1-3/+3
2016-03-21pull --rebase: add --[no-]autostash flagLibravatar Mehul Jain1-0/+12
2016-03-21git-pull.c: introduce git_pull_config()Libravatar Mehul Jain1-3/+15
2016-01-28Merge branch 'jc/strbuf-getline'Libravatar Junio C Hamano1-1/+1
2016-01-26Merge branch 'js/pull-rebase-i'Libravatar Junio C Hamano1-2/+7
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Libravatar Junio C Hamano1-1/+1
2016-01-13pull: allow interactive rebase with --rebase=interactiveLibravatar Johannes Schindelin1-2/+7
2015-12-16submodules: allow parallel fetching, add tests and documentationLibravatar Stefan Beller1-0/+6
2015-11-20Remove get_object_hash.Libravatar brian m. carlson1-1/+1
2015-11-20Convert struct object to object_idLibravatar brian m. carlson1-1/+1
2015-10-16Merge branch 'pt/pull-builtin' into maintLibravatar Junio C Hamano1-1/+1
2015-10-16pull: enclose <options> in brackets in the usage stringLibravatar Alex Henrie1-1/+1
2015-09-11pull: don't mark values for option "rebase" for translationLibravatar Ralf Thielow1-1/+1
2015-08-25Merge branch 'mh/tempfile'Libravatar Junio C Hamano1-0/+1
2015-07-22pull: allow dirty tree when rebase.autostash enabledLibravatar Kevin Daudt1-1/+5
2015-06-18pull: remove redirection to git-pull.shLibravatar Paul Tan1-7/+0
2015-06-18pull --rebase: error on no merge candidate casesLibravatar Paul Tan1-3/+12
2015-06-18pull --rebase: exit early when the working directory is dirtyLibravatar Paul Tan1-1/+76
2015-06-18pull: configure --rebase via branch.<name>.rebase or pull.rebaseLibravatar Paul Tan1-1/+34
2015-06-18pull: teach git pull about --rebaseLibravatar Paul Tan1-2/+245
2015-06-18pull: set reflog messageLibravatar Paul Tan1-0/+22
2015-06-18pull: implement pulling into an unborn branchLibravatar Paul Tan1-1/+28
2015-06-18pull: fast-forward working tree if head is updatedLibravatar Paul Tan1-0/+30
2015-06-18pull: check if in unresolved merge stateLibravatar Paul Tan1-0/+9
2015-06-18pull: support pull.ff configLibravatar Paul Tan1-0/+29
2015-06-18pull: error on no merge candidatesLibravatar Paul Tan1-0/+113
2015-06-18pull: pass git-fetch's options to git-fetchLibravatar Paul Tan1-0/+95
2015-06-15pull: pass git-merge's options to git-mergeLibravatar Paul Tan1-0/+75
2015-06-15pull: pass verbosity, --progress flags to fetch and mergeLibravatar Paul Tan1-0/+36
2015-06-15pull: implement fetch + mergeLibravatar Paul Tan1-1/+61
2015-06-15pull: implement skeletal builtin pullLibravatar Paul Tan1-0/+33
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 05:50:59 +0000