diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-06-02 13:35:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-06-02 13:35:52 -0700 |
commit | 2c9c1c517896ece5003489adac6eaae5f7ad27b3 (patch) | |
tree | 0ae245fa8246de533af71cc3f615d39a0ca74fcb /t/t0056-git-C.sh | |
parent | Sixth batch for 2.5 cycle (diff) | |
parent | t5520: check reflog action in fast-forward merge (diff) | |
download | tgif-2c9c1c517896ece5003489adac6eaae5f7ad27b3.tar.xz |
Merge branch 'pt/pull-tests' into pt/pull-optparse
* 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 't/t0056-git-C.sh')
0 files changed, 0 insertions, 0 deletions