![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 13 May 2011 17:45:21 +0000 (10:45 -0700) |
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
Trivial merge