Made --no-ff work again like expected...
Amended .gitignore