summaryrefslogtreecommitdiff
path: root/builtin/pull.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * pull: fast-forward "pull --rebase=true"jc/pull-rebase-ffJunio C Hamano2016-11-291-4/+18
* | wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin2016-10-071-1/+1
* | wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin2016-10-071-76/+1
* | pull: make code more similar to the shell script againJohannes Schindelin2016-10-071-10/+20
* | pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin2016-10-071-8/+8
* | Merge branch 'va/i18n-even-more'Junio C Hamano2016-07-131-1/+1
|\ \
| * | i18n: advice: internationalize message for conflictsVasco Almeida2016-06-171-1/+1
* | | pull: warn on --verify-signatures with --rebaseah/no-verify-signature-with-pull-rebaseAlexander Hirsch2016-05-201-0/+3
|/ /
* | Merge branch 'va/i18n-misc-updates'Junio C Hamano2016-05-171-7/+7
|\ \
| * | i18n: builtin/pull.c: split strings marked for translationVasco Almeida2016-04-191-4/+4
| * | i18n: builtin/pull.c: mark placeholders for translationVasco Almeida2016-04-191-3/+3
* | | Merge branch 'jc/merge-refuse-new-root'Junio C Hamano2016-04-291-0/+6
|\ \ \
| * | | pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+6
* | | | pull --rebase: add --[no-]autostash flagMehul Jain2016-03-211-0/+12
* | | | git-pull.c: introduce git_pull_config()Mehul Jain2016-03-211-3/+15
| |/ / |/| |
* | | Merge branch 'jc/strbuf-getline'Junio C Hamano2016-01-281-1/+1
|\ \ \
| * | | strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano2016-01-151-1/+1
| |/ /
* | | Merge branch 'js/pull-rebase-i'Junio C Hamano2016-01-261-2/+7
|\ \ \
| * | | pull: allow interactive rebase with --rebase=interactiveJohannes Schindelin2016-01-131-2/+7
| |/ /
* | | submodules: allow parallel fetching, add tests and documentationStefan Beller2015-12-161-0/+6
|/ /
* | Remove get_object_hash.brian m. carlson2015-11-201-1/+1
* | Convert struct object to object_idbrian m. carlson2015-11-201-1/+1
|/
* Merge branch 'pt/pull-builtin' into maintJunio C Hamano2015-10-161-1/+1
|\
| * pull: enclose <options> in brackets in the usage stringpt/pull-builtinAlex Henrie2015-10-161-1/+1
* | pull: don't mark values for option "rebase" for translationRalf Thielow2015-09-111-1/+1
* | Merge branch 'mh/tempfile'Junio C Hamano2015-08-251-0/+1
* | pull: allow dirty tree when rebase.autostash enabledkd/pull-rebase-autostashKevin Daudt2015-07-221-1/+5
|/
* pull: remove redirection to git-pull.shPaul Tan2015-06-181-7/+0
* pull --rebase: error on no merge candidate casesPaul Tan2015-06-181-3/+12
* pull --rebase: exit early when the working directory is dirtyPaul Tan2015-06-181-1/+76
* pull: configure --rebase via branch.<name>.rebase or pull.rebasePaul Tan2015-06-181-1/+34
* pull: teach git pull about --rebasePaul Tan2015-06-181-2/+245
* pull: set reflog messagePaul Tan2015-06-181-0/+22
* pull: implement pulling into an unborn branchPaul Tan2015-06-181-1/+28
* pull: fast-forward working tree if head is updatedPaul Tan2015-06-181-0/+30
* pull: check if in unresolved merge statePaul Tan2015-06-181-0/+9
* pull: support pull.ff configPaul Tan2015-06-181-0/+29
* pull: error on no merge candidatesPaul Tan2015-06-181-0/+113
View Lorry Controller Status