Pull: Disable --no-ff when --ff-only is checked and vice versa

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>