| commit | 881d72eff8b0d23c8edc6f8d9673f8daafaace6f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 1 Dec 2018 12:41:42 +0000 (1 21:41 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 1 Dec 2018 12:41:42 +0000 (1 21:41 +0900) | ||
| tree | 9858e8976d76dce70351bced3cc5edb6ea3cf1bb | treesnapshot (tar.gz zip) |
| parent | 945f6bd1ce99b3c3576d52778055086caaed1fb8 | commitdiff |
| parent | 8797f0f008722537f56ed0bf16ebec45682b7497 | commitdiff |
Merge branch 'js/rebase-stat-unrelated-fix'
"git rebase --stat" to transplant a piece of history onto a totally
unrelated history were not working before and silently showed wrong
result. With the recent reimplementation in C, it started to instead
die with an error message, as the original logic was not prepared
to cope with this case. This has now been fixed.
* js/rebase-stat-unrelated-fix:
rebase --stat: fix when rebasing to an unrelated history
"git rebase --stat" to transplant a piece of history onto a totally
unrelated history were not working before and silently showed wrong
result. With the recent reimplementation in C, it started to instead
die with an error message, as the original logic was not prepared
to cope with this case. This has now been fixed.
* js/rebase-stat-unrelated-fix:
rebase --stat: fix when rebasing to an unrelated history
| builtin/rebase.c | diff1 | diff2 | blobhistory |
| t/t3406-rebase-message.sh | diff1 | diff2 | blobhistory |