Age | Commit message (Expand) | Author | Files | Lines |
2016-05-17 | Merge branch 'va/i18n-misc-updates' | Junio C Hamano | 1 | -7/+7 |
2016-04-29 | Merge branch 'jc/merge-refuse-new-root' | Junio C Hamano | 1 | -0/+6 |
2016-04-21 | pull: pass --allow-unrelated-histories to "git merge" | Junio C Hamano | 1 | -0/+6 |
2016-04-19 | i18n: builtin/pull.c: split strings marked for translation | Vasco Almeida | 1 | -4/+4 |
2016-04-19 | i18n: builtin/pull.c: mark placeholders for translation | Vasco Almeida | 1 | -3/+3 |
2016-03-21 | pull --rebase: add --[no-]autostash flag | Mehul Jain | 1 | -0/+12 |
2016-03-21 | git-pull.c: introduce git_pull_config() | Mehul Jain | 1 | -3/+15 |
2016-01-28 | Merge branch 'jc/strbuf-getline' | Junio C Hamano | 1 | -1/+1 |
2016-01-26 | Merge branch 'js/pull-rebase-i' | Junio C Hamano | 1 | -2/+7 |
2016-01-15 | strbuf: introduce strbuf_getline_{lf,nul}() | Junio C Hamano | 1 | -1/+1 |
2016-01-13 | pull: allow interactive rebase with --rebase=interactive | Johannes Schindelin | 1 | -2/+7 |
2015-12-16 | submodules: allow parallel fetching, add tests and documentation | Stefan Beller | 1 | -0/+6 |
2015-11-20 | Remove get_object_hash. | brian m. carlson | 1 | -1/+1 |
2015-11-20 | Convert struct object to object_id | brian m. carlson | 1 | -1/+1 |
2015-10-16 | Merge branch 'pt/pull-builtin' into maint | Junio C Hamano | 1 | -1/+1 |
2015-10-16 | pull: enclose <options> in brackets in the usage string | Alex Henrie | 1 | -1/+1 |
2015-09-11 | pull: don't mark values for option "rebase" for translation | Ralf Thielow | 1 | -1/+1 |
2015-08-25 | Merge branch 'mh/tempfile' | Junio C Hamano | 1 | -0/+1 |
2015-07-22 | pull: allow dirty tree when rebase.autostash enabled | Kevin Daudt | 1 | -1/+5 |
2015-06-18 | pull: remove redirection to git-pull.sh | Paul Tan | 1 | -7/+0 |
2015-06-18 | pull --rebase: error on no merge candidate cases | Paul Tan | 1 | -3/+12 |
2015-06-18 | pull --rebase: exit early when the working directory is dirty | Paul Tan | 1 | -1/+76 |
2015-06-18 | pull: configure --rebase via branch.<name>.rebase or pull.rebase | Paul Tan | 1 | -1/+34 |
2015-06-18 | pull: teach git pull about --rebase | Paul Tan | 1 | -2/+245 |
2015-06-18 | pull: set reflog message | Paul Tan | 1 | -0/+22 |
2015-06-18 | pull: implement pulling into an unborn branch | Paul Tan | 1 | -1/+28 |
2015-06-18 | pull: fast-forward working tree if head is updated | Paul Tan | 1 | -0/+30 |
2015-06-18 | pull: check if in unresolved merge state | Paul Tan | 1 | -0/+9 |
2015-06-18 | pull: support pull.ff config | Paul Tan | 1 | -0/+29 |
2015-06-18 | pull: error on no merge candidates | Paul Tan | 1 | -0/+113 |
2015-06-18 | pull: pass git-fetch's options to git-fetch | Paul Tan | 1 | -0/+95 |
2015-06-15 | pull: pass git-merge's options to git-merge | Paul Tan | 1 | -0/+75 |
2015-06-15 | pull: pass verbosity, --progress flags to fetch and merge | Paul Tan | 1 | -0/+36 |
2015-06-15 | pull: implement fetch + merge | Paul Tan | 1 | -1/+61 |
2015-06-15 | pull: implement skeletal builtin pull | Paul Tan | 1 | -0/+33 |