diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:58 -0700 |
| commit | 0e04b248b5d5828b907a346e920dda4003311406 (patch) | |
| tree | 0182a9c3998c6391b84fabe4b0500fac2cc62730 /commit.c | |
| parent | Merge branch 'sb/glossary-submodule' (diff) | |
| parent | t5520: check reflog action in fast-forward merge (diff) | |
| download | tgif-0e04b248b5d5828b907a346e920dda4003311406.tar.xz | |
Merge branch 'pt/pull-tests'
Add more test coverage to "git pull".
* pt/pull-tests:
t5520: check reflog action in fast-forward merge
t5521: test --dry-run does not make any changes
t5520: test --rebase failure on unborn branch with index
t5520: test --rebase with multiple branches
t5520: test work tree fast-forward when fetch updates head
t5520: test for failure if index has unresolved entries
t5520: test no merge candidates cases
t5520: prevent field splitting in content comparisons
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions