aboutsummaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAge
* 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
* | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-11
* | Merge branch 'mh/tempfile'Junio C Hamano2015-08-25
* | pull: allow dirty tree when rebase.autostash enabledKevin Daudt2015-07-22
|/
* pull: remove redirection to git-pull.shPaul Tan2015-06-18
* pull --rebase: error on no merge candidate casesPaul Tan2015-06-18
* pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-18
* pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-18
* pull: teach git pull about --rebasePaul Tan2015-06-18
* pull: set reflog messagePaul Tan2015-06-18
* pull: implement pulling into an unborn branchPaul Tan2015-06-18
* pull: fast-forward working tree if head is updatedPaul Tan2015-06-18
* pull: check if in unresolved merge statePaul Tan2015-06-18
* pull: support pull.ff configPaul Tan2015-06-18
* pull: error on no merge candidatesPaul Tan2015-06-18
* pull: pass git-fetch's options to git-fetchPaul Tan2015-06-18
* pull: pass git-merge's options to git-mergePaul Tan2015-06-15
* pull: pass verbosity, --progress flags to fetch and mergePaul Tan2015-06-15
* pull: implement fetch + mergePaul Tan2015-06-15
* pull: implement skeletal builtin pullPaul Tan2015-06-15