Always merge with `ff = only`
Always merge with `ff = only`

@jferris:

This has the effect that Git will never implicitly do a merge commit,
including while doing git pull. If I'm unexpectedly out of sync when I
git pull, I get this message:

> fatal: Not possible to fast-forward, aborting.

At that point, I know that I've forgotten to do something in my normal
workflow, and I retrace my steps.

@gylaz:

I like the value of seeing a failure message if a pull (or just merge)
fails due to not being able to get fast-forwarded. Then I can look to
see whose changes went out, that I may have not expected to be there.

prabinv/dotfiles,ecnalyr/dotfiles,donedgardo/dotfiles,Thau/dotfiles,donedgardo/dotfiles,ncepuwanghui/dotfiles,secteur0/dotfiles,lannn/dotfiles,venetucci/dotfiles,vpfaulkner/dotfiles,Danielpk/dotfiles,ericeslinger/dotfiles,danbee/old-dotfiles,plainspace/dotfiles-thoughtbot,ZloeSabo/dotfiles,taboularasa/dotfiles,bulleric/dotfiles,boha/dotfiles,Meabed/dots,DBeddows/dotfiles,aliceyoung9/dotfiles,dainmiller/thoughtbot-dotfile-mods,ajkamel/dotfiles,pol/dotfiles,maxschram/dotfiles,ren/dotfiles,tyrelsouza/dotfiles,rruettimann/dotfiles,donigian/dotfiles,christnil/dotfiles,danbee/dotfiles,Jiwoong/dotfiles,ransingh/dotfiles,dainmiller/thoughtbot-dotfile-mods,jochambo/dotfiles,Jaicob/dotfiles,jaypal/dotfiles-1,netzfisch/dotfiles-old,daino3/my_dotfiles,prabinv/dotfiles,denniszelada/dotfiles,squidpunch/dotfiles,ransingh/dotfiles,aliceyoung9/dotfiles,agbodike/dotfiles,sillvan/dotfiles-2,timgremore/dotfiles,sillvan/dotfiles-2,crueber/dotfiles,zhublik/dotfiles,taboularasa/dotfiles,mspringfield/dotfiles,bibstha/dotfiles-1,vimukthiweerasiri/my_shortcuts,ThomasKearney/dotfiles,mynewsdesk/dotfiles,yeuem1vannam/dotfiles,stsc3000/dotfiles,szewacheung/dotfiles,bdvholmes/dotfiles,garrettd714/dotfiles,ThomasKearney/dotfiles,mmhmm/dotfiles,taboularasa/dotfiles,Jiwoong/dotfiles,netzfisch/dotfiles-old,housegold/dotfiles,astoellis/dotfiles,omarismail/dotfiles,MichaelHaffley/dotfiles,hythyt9898/dotfiles,bulleric/dotfiles,tyrelsouza/dotfiles,taboularasa/dotfiles,reshleman/thoughtbot-dotfiles,x2q/dotfiles,taboularasa/dotfiles,SampleLiao/dotfiles,ncepuwanghui/dotfiles,ivangeorgiew/dotfiles,rotati/dotfiles,mspringfield/dotfiles,krschultz/dotfiles,cstivers78/dotfiles,bschmoker/dotfiles,tiagozuim/dotfiles,firmanm/dotfiles,koerbcm/dotfiles,zinthemoney/dotfiles,andrewliebchen/dotfiles,Jaicob/dotfiles,wizztjh/dotfiles,danielnolan/dotfiles,elijahkim/dotfiles,secoast00/dotfiles,T1D/dotfiles,sohara/dotfiles,firmanm/dotfiles,poyu007/dotfiles,ivangeorgiew/dotfiles,youleiy/dotfiles,ericeslinger/dotfiles,Schultz/dotfiles,alexbaldwin/dotfiles,robkilby/dotfiles,szewacheung/dotfiles,ZloeSabo/dotfiles,hsavit1/dotfiles-1,squidpunch/dotfiles,daino3/my_dotfiles,taboularasa/dotfiles,reshleman/thoughtbot-dotfiles,rotati/dotfiles,jochambo/dotfiles,kategengler/dotfiles,x2q/dotfiles,koerbcm/dotfiles,zhublik/dotfiles,sanga/dotfiles,vimukthiweerasiri/my_shortcuts,SampleLiao/dotfiles,ncuesta/dotfiles,bigbam505/dotfiles-work,joegesualdo/dotfiles,poyu007/dotfiles,Mslef/dotfiles,kkelleey/dotfiles,omarismail/dotfiles,JahBrewski/dotfiles,taboularasa/dotfiles,sohara/dotfiles,toobulkeh/dotfiles,soon0009/thoughtbot-dotfiles,mmhmm/dotfiles,crueber/dotfiles,garrettd714/dotfiles,koerbcm/dotfiles,taboularasa/dotfiles,koerbcm/dotfiles,nebulab/dotfiles,ransingh/dotfiles,maxschram/dotfiles,Schultz/dotfiles,wizztjh/dotfiles,ericeslinger/dotfiles,ren/dotfiles,boha/dotfiles,ericeslinger/dotfiles,sutanto/dotfiles,sutanto/dotfiles,Jon-Long/dotfiles,turino/dotfiles,Meabed/dots,dthyresson/dotfiles,bibstha/dotfiles-1,taboularasa/dotfiles,marygale/dotfiles,venetucci/dotfiles,rruettimann/dotfiles,joegesualdo/dotfiles,krschultz/dotfiles,timgremore/dotfiles,elijahkim/dotfiles,taboularasa/dotfiles,nebulab/dotfiles,granteagon/dotfiles-1,EpionHealth/dotfiles,aliceyoung9/crusty-dotfiles,vpfaulkner/dotfiles,moofish32/dotfiles,voanhduy1512/dotfiles,danbee/dotfiles,hythyt9898/dotfiles,JahBrewski/dotfiles,aliceyoung9/crusty-dotfiles,hobofan/dotfiles,hsavit1/dotfiles-1,YepengFan/dotfiles,clembradley/dotfiles,EpionHealth/dotfiles,stereobooster/dotfiles,bigbam505/dotfiles-work,Jon-Long/dotfiles,T1D/dotfiles,scalixte-mdsol/dotfiles,bdvholmes/dotfiles,revgum/dotfiles,stsc3000/dotfiles,revgum/dotfiles,youleiy/dotfiles,ncuesta/dotfiles,lannn/dotfiles,taboularasa/dotfiles,kkelleey/dotfiles,clembradley/dotfiles,taboularasa/dotfiles,stsc3000/dotfiles,denniszelada/dotfiles,scalixte-mdsol/dotfiles,hallzy/dotfiles-1,tchiarato/dotfiles,Mslef/dotfiles,dthyresson/dotfiles,ericeslinger/dotfiles,plainspace/dotfiles-thoughtbot,zinthemoney/dotfiles,housegold/dotfiles,granteagon/dotfiles-1,yeuem1vannam/dotfiles,soon0009/thoughtbot-dotfiles,donigian/dotfiles,Danielpk/dotfiles,rootulp/dotfiles,Thau/dotfiles,bschmoker/dotfiles,tiagozuim/dotfiles,koerbcm/dotfiles,hobofan/dotfiles,astoellis/dotfiles,danbee/old-dotfiles,DBeddows/dotfiles,taboularasa/dotfiles,MichaelHaffley/dotfiles,joegesualdo/dotfiles,taboularasa/dotfiles,pol/dotfiles,agbodike/dotfiles,marygale/dotfiles,andrewliebchen/dotfiles,mynewsdesk/dotfiles,danielnolan/dotfiles,ajkamel/dotfiles,tchiarato/dotfiles,voanhduy1512/dotfiles,kategengler/dotfiles,christnil/dotfiles,hallzy/dotfiles-1,YepengFan/dotfiles,housegold/dotfiles,rootulp/dotfiles,secteur0/dotfiles,tsigo/dotfiles-thoughtbot,moofish32/dotfiles,taboularasa/dotfiles,jaypal/dotfiles-1