admin-merge: use --no-ff
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:44:35 +0000 (23:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:44:35 +0000 (23:44 +0200)
commit6cc00fffaff25a20152ddd04d8c9a11677a88cda
tree903ac24e9a16bd7fb2d6e4f39a71ff90b5e70992
parent106111952f4e664956f8c74023ebffa05579e2e7
admin-merge: use --no-ff
all