Allow --ff with merge
Allow --ff with merge

Closes #973

hopil/hub,ryo33/hub,terry2000/hub,rlugojr/hub,boris-rea/hub,pwaller/hub,hb9kns/hub,github/hub,pwaller/hub,dongjoon-hyun/hub,nmfzone/hub,xantage/hub,boris-rea/hub,pcorpet/hub,nlutsenko/hub,dongjoon-hyun/hub,whilp/hub,nmfzone/hub,github/hub,SanCoder-Q/hub,boris-rea/hub,github/hub,ASidlinskiy/hub,xantage/hub,jpkrohling/hub,AndBicScadMedia/hub,pwaller/hub,cpick/hub,cpick/hub,jpkrohling/hub,dongjoon-hyun/hub,terry2000/hub,rlugojr/hub,whilp/hub,naru0504/hub,elancom/hub,AndBicScadMedia/hub,pcorpet/hub,naru0504/hub,tomasv/hub,elancom/hub,elancom/hub,naru0504/hub,SanCoder-Q/hub,ASidlinskiy/hub,hb9kns/hub,jpkrohling/hub,tomasv/hub,ryo33/hub,ASidlinskiy/hub,sbp/hub,tomasv/hub,whilp/hub,rlugojr/hub,nlutsenko/hub,github/hub,hopil/hub,sbp/hub,nlutsenko/hub,cpick/hub,AndBicScadMedia/hub,hopil/hub,SanCoder-Q/hub,terry2000/hub,xantage/hub,ryo33/hub,sbp/hub,hb9kns/hub,pcorpet/hub,nmfzone/hub