| Commit message (Expand) | Author | Age |
* | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 2016-12-19 |
|\ |
|
| * | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 2016-11-29 |
* | | t5520: become resilient to GETTEXT_POISON | Vasco Almeida | 2016-08-12 |
* | | t5520: verify that `pull --rebase` shows the helpful advice when failing | Johannes Schindelin | 2016-07-26 |
* | | Merge branch 'va/i18n-even-more' | Junio C Hamano | 2016-07-13 |
|\ \ |
|
| * | | i18n: advice: internationalize message for conflicts | Vasco Almeida | 2016-06-17 |
* | | | pull: warn on --verify-signatures with --rebase | Alexander Hirsch | 2016-05-20 |
|/ / |
|
* | | t5520: test --[no-]autostash with pull.rebase=true | Mehul Jain | 2016-04-04 |
* | | t5520: reduce commom lines of code | Mehul Jain | 2016-04-04 |
* | | t5520: factor out common "failing autostash" code | Mehul Jain | 2016-04-04 |
* | | t5520: factor out common "successful autostash" code | Mehul Jain | 2016-04-04 |
* | | t5520: use better test to check stderr output | Mehul Jain | 2016-04-04 |
* | | t5520: ensure consistent test conditions | Mehul Jain | 2016-04-04 |
* | | t5520: use consistent capitalization in test titles | Mehul Jain | 2016-04-04 |
* | | pull --rebase: add --[no-]autostash flag | Mehul Jain | 2016-03-21 |
* | | pull: allow interactive rebase with --rebase=interactive | Johannes Schindelin | 2016-01-13 |
|/ |
|
* | Merge branch 'kd/pull-rebase-autostash' | Junio C Hamano | 2015-08-17 |
|\ |
|
| * | pull: allow dirty tree when rebase.autostash enabled | Kevin Daudt | 2015-07-22 |
* | | pull: handle git-fetch's options as well | Paul Tan | 2015-06-02 |
* | | t5520: check reflog action in fast-forward merge | Paul Tan | 2015-05-29 |
* | | t5520: test --rebase failure on unborn branch with index | Paul Tan | 2015-05-29 |
* | | t5520: test --rebase with multiple branches | Paul Tan | 2015-05-29 |
* | | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 2015-05-29 |
* | | t5520: test for failure if index has unresolved entries | Paul Tan | 2015-05-29 |
* | | t5520: test no merge candidates cases | Paul Tan | 2015-05-18 |
* | | t5520: prevent field splitting in content comparisons | Paul Tan | 2015-05-18 |
|/ |
|
* | t5520: test pulling an octopus into an unborn branch | Junio C Hamano | 2015-04-29 |
* | t5520: style fixes | Junio C Hamano | 2015-04-29 |
* | pull: allow pull to preserve merges when rebasing | Stephen Haberman | 2013-09-04 |
* | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 2013-06-27 |
|\ |
|
| * | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 2013-06-20 |
* | | t5520: use test_config to set/unset git config variables (leftover bits) | Ramkumar Ramachandra | 2013-03-28 |
* | | t5520: use test_config to set/unset git config variables | Yann Droneaud | 2013-03-25 |
|/ |
|
* | pull: introduce a pull.rebase option to enable --rebase | Ævar Arnfjörð Bjarmason | 2011-11-07 |
* | pull: do not clobber untracked files on initial pull | Jeff King | 2011-03-25 |
* | Use reflog in 'pull --rebase . foo' | Martin von Zweigbergk | 2010-11-29 |
* | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 2010-08-21 |
|\ |
|
| * | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 2010-08-12 |
| * | t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | Elijah Newren | 2010-08-12 |
* | | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan | 2010-05-31 |
|/ |
|
* | allow pull --rebase on branch yet to be born | Jeff King | 2009-08-12 |
* | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 |
* | t5520-pull: Test for rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 |
* | parse-remote: support default reflist in get_remote_merge_branch | Santi Béjar | 2009-06-11 |
* | pull: allow "git pull origin $something:$current_branch" into an unborn branch | Junio C Hamano | 2008-10-17 |
* | pull --rebase: exit early when the working directory is dirty | Johannes Schindelin | 2008-05-22 |
* | pull --rebase: be cleverer with rebased upstream branches | Johannes Schindelin | 2008-01-26 |
* | Teach 'git pull' about --rebase | Johannes Schindelin | 2007-11-28 |
* | War on whitespace | Junio C Hamano | 2007-06-07 |
* | git-fetch, git-branch: Support local --track via a special remote '.' | Paolo Bonzini | 2007-03-16 |