diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-09-01 13:43:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-09-01 13:43:55 -0700 |
| commit | 061219fa7cf1063ac7f0dace55e8d175c7a91879 (patch) | |
| tree | 18a4084832d40e2da609753af4bf504acb143667 /t/t7500-commit.sh | |
| parent | d3fd3d1f9bbb454864bd004dc3f29f99e4087889 (diff) | |
| parent | cf65426de682bf4e336eddd2964a7c1585597f48 (diff) | |
| download | git-061219fa7cf1063ac7f0dace55e8d175c7a91879.tar.gz | |
Merge branch 'en/rebase-against-rebase-fix' into maint
* en/rebase-against-rebase-fix:
pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches
t5520-pull: Add testcases showing spurious conflicts from git pull --rebase
Diffstat (limited to 't/t7500-commit.sh')
0 files changed, 0 insertions, 0 deletions