![[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) | ||
| commit | e31b0183729cab2d6a8e2c76f009017355dacf06 | |
| tree | f76385fbc62c0bd508891c681594537f378fcf50 | tree | snapshot |
| parent | bc67ad8c375ce8f31021411f088a968f12cb2675 | commit | diff |
| parent | c192f9c865dbdae48c0400d717581d34cd315fb8 | commit | diff |
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff
* aw/maint-rebase-i-p-no-ff:
git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff