Age | Commit message (Expand) | Author | Files | Lines |
2018-11-02 | tests: optionally skip `git rebase -p` tests | Johannes Schindelin | 1 | -2/+4 |
2018-08-17 | Merge branch 'js/pull-rebase-type-shorthand' | Junio C Hamano | 1 | -0/+12 |
2018-08-06 | pull --rebase=<type>: allow single-letter abbreviations for the type | Johannes Schindelin | 1 | -0/+12 |
2018-07-11 | has_uncommitted_changes(): fall back to empty tree | Jeff King | 1 | -0/+12 |
2017-07-17 | rebase: make resolve message clearer for inexperienced users | William Duclot | 1 | -2/+2 |
2017-06-01 | pull: ff --rebase --autostash works in dirty repo | Tyler Brazier | 1 | -0/+18 |
2016-12-19 | Merge branch 'jc/pull-rebase-ff' | Junio C Hamano | 1 | -0/+17 |
2016-11-29 | pull: fast-forward "pull --rebase=true" | Junio C Hamano | 1 | -0/+17 |
2016-08-12 | t5520: become resilient to GETTEXT_POISON | Vasco Almeida | 1 | -2/+2 |
2016-07-26 | t5520: verify that `pull --rebase` shows the helpful advice when failing | Johannes Schindelin | 1 | -0/+32 |
2016-07-13 | Merge branch 'va/i18n-even-more' | Junio C Hamano | 1 | -1/+1 |
2016-06-17 | i18n: advice: internationalize message for conflicts | Vasco Almeida | 1 | -1/+1 |
2016-05-20 | pull: warn on --verify-signatures with --rebase | Alexander Hirsch | 1 | -0/+16 |
2016-04-04 | t5520: test --[no-]autostash with pull.rebase=true | Mehul Jain | 1 | -0/+10 |
2016-04-04 | t5520: reduce commom lines of code | Mehul Jain | 1 | -9/+7 |
2016-04-04 | t5520: factor out common "failing autostash" code | Mehul Jain | 1 | -15/+11 |
2016-04-04 | t5520: factor out common "successful autostash" code | Mehul Jain | 1 | -29/+15 |
2016-04-04 | t5520: use better test to check stderr output | Mehul Jain | 1 | -6/+4 |
2016-04-04 | t5520: ensure consistent test conditions | Mehul Jain | 1 | -0/+2 |
2016-04-04 | t5520: use consistent capitalization in test titles | Mehul Jain | 1 | -2/+2 |
2016-03-21 | pull --rebase: add --[no-]autostash flag | Mehul Jain | 1 | -0/+70 |
2016-01-13 | pull: allow interactive rebase with --rebase=interactive | Johannes Schindelin | 1 | -0/+10 |
2015-08-17 | Merge branch 'kd/pull-rebase-autostash' | Junio C Hamano | 1 | -0/+11 |
2015-07-22 | pull: allow dirty tree when rebase.autostash enabled | Kevin Daudt | 1 | -0/+12 |
2015-06-02 | pull: handle git-fetch's options as well | Paul Tan | 1 | -0/+20 |
2015-05-29 | t5520: check reflog action in fast-forward merge | Paul Tan | 1 | -3/+10 |
2015-05-29 | t5520: test --rebase failure on unborn branch with index | Paul Tan | 1 | -0/+15 |
2015-05-29 | t5520: test --rebase with multiple branches | Paul Tan | 1 | -0/+9 |
2015-05-29 | t5520: test work tree fast-forward when fetch updates head | Paul Tan | 1 | -0/+21 |
2015-05-29 | t5520: test for failure if index has unresolved entries | Paul Tan | 1 | -0/+19 |
2015-05-18 | t5520: test no merge candidates cases | Paul Tan | 1 | -0/+55 |
2015-05-18 | t5520: prevent field splitting in content comparisons | Paul Tan | 1 | -35/+35 |
2015-04-29 | t5520: test pulling an octopus into an unborn branch | Junio C Hamano | 1 | -0/+9 |
2015-04-29 | t5520: style fixes | Junio C Hamano | 1 | -16/+6 |
2013-09-04 | pull: allow pull to preserve merges when rebasing | Stephen Haberman | 1 | -0/+89 |
2013-06-27 | Merge branch 'jk/pull-into-dirty-unborn' | Junio C Hamano | 1 | -0/+29 |
2013-06-20 | pull: merge into unborn by fast-forwarding from empty tree | Thomas Rast | 1 | -0/+29 |
2013-03-28 | t5520: use test_config to set/unset git config variables (leftover bits) | Ramkumar Ramachandra | 1 | -3/+3 |
2013-03-25 | t5520: use test_config to set/unset git config variables | Yann Droneaud | 1 | -8/+4 |
2011-11-07 | pull: introduce a pull.rebase option to enable --rebase | Ævar Arnfjörð Bjarmason | 1 | -2/+21 |
2011-03-25 | pull: do not clobber untracked files on initial pull | Jeff King | 1 | -0/+11 |
2010-11-29 | Use reflog in 'pull --rebase . foo' | Martin von Zweigbergk | 1 | -0/+7 |
2010-08-21 | Merge branch 'en/rebase-against-rebase-fix' | Junio C Hamano | 1 | -0/+62 |
2010-08-12 | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches | Elijah Newren | 1 | -2/+2 |
2010-08-12 | t5520-pull: Add testcases showing spurious conflicts from git pull --rebase | Elijah Newren | 1 | -0/+62 |
2010-05-31 | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan | 1 | -1/+1 |
2009-08-12 | allow pull --rebase on branch yet to be born | Jeff King | 1 | -0/+11 |
2009-07-19 | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 1 | -3/+2 |
2009-07-19 | t5520-pull: Test for rebased upstream + fetch + pull --rebase | Santi Béjar | 1 | -0/+14 |
2009-06-11 | parse-remote: support default reflist in get_remote_merge_branch | Santi Béjar | 1 | -0/+14 |