summaryrefslogtreecommitdiffstats
path: root/builtin/pull.c
AgeCommit message (Expand)AuthorLines
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano-1/+1
2016-06-17i18n: advice: internationalize message for conflictsVasco Almeida-1/+1
2016-05-20pull: warn on --verify-signatures with --rebaseAlexander Hirsch-0/+3
2016-05-17Merge branch 'va/i18n-misc-updates'Junio C Hamano-7/+7
2016-04-29Merge branch 'jc/merge-refuse-new-root'Junio C Hamano-0/+6
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano-0/+6
2016-04-19i18n: builtin/pull.c: split strings marked for translationVasco Almeida-4/+4
2016-04-19i18n: builtin/pull.c: mark placeholders for translationVasco Almeida-3/+3
2016-03-21pull --rebase: add --[no-]autostash flagMehul Jain-0/+12
2016-03-21git-pull.c: introduce git_pull_config()Mehul Jain-3/+15
2016-01-28Merge branch 'jc/strbuf-getline'Junio C Hamano-1/+1
2016-01-26Merge branch 'js/pull-rebase-i'Junio C Hamano-2/+7
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano-1/+1
2016-01-13pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin-2/+7
2015-12-16submodules: allow parallel fetching, add tests and documentationStefan Beller-0/+6
2015-11-20Remove get_object_hash.brian m. carlson-1/+1
2015-11-20Convert struct object to object_idbrian m. carlson-1/+1
2015-10-16Merge branch 'pt/pull-builtin' into maintJunio C Hamano-1/+1
2015-10-16pull: enclose <options> in brackets in the usage stringAlex Henrie-1/+1
2015-09-11pull: don't mark values for option "rebase" for translationRalf Thielow-1/+1
2015-08-25Merge branch 'mh/tempfile'Junio C Hamano-0/+1
2015-07-22pull: allow dirty tree when rebase.autostash enabledKevin Daudt-1/+5
2015-06-18pull: remove redirection to git-pull.shPaul Tan-7/+0
2015-06-18pull --rebase: error on no merge candidate casesPaul Tan-3/+12
2015-06-18pull --rebase: exit early when the working directory is dirtyPaul Tan-1/+76
2015-06-18pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan-1/+34
2015-06-18pull: teach git pull about --rebasePaul Tan-2/+245
2015-06-18pull: set reflog messagePaul Tan-0/+22
2015-06-18pull: implement pulling into an unborn branchPaul Tan-1/+28
2015-06-18pull: fast-forward working tree if head is updatedPaul Tan-0/+30
2015-06-18pull: check if in unresolved merge statePaul Tan-0/+9
2015-06-18pull: support pull.ff configPaul Tan-0/+29
2015-06-18pull: error on no merge candidatesPaul Tan-0/+113
2015-06-18pull: pass git-fetch's options to git-fetchPaul Tan-0/+95
2015-06-15pull: pass git-merge's options to git-mergePaul Tan-0/+75
2015-06-15pull: pass verbosity, --progress flags to fetch and mergePaul Tan-0/+36
2015-06-15pull: implement fetch + mergePaul Tan-1/+61
2015-06-15pull: implement skeletal builtin pullPaul Tan-0/+33
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-01 06:38:47 +0000