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 /commit.c | |
| parent | Merge branch 'maint-1.7.1' into maint (diff) | |
| parent | pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches (diff) | |
| download | git-061219fa7cf1063ac7f0dace55e8d175c7a91879.tar.gz git-061219fa7cf1063ac7f0dace55e8d175c7a91879.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions