william-r
12/8/2017 - 3:51 PM

Git fast forward merges and pulls

FF = fast forward

ff_merge_pull.sh
content_copyfile_download
#Don't do extra commit on pull, do FF
git config --global --add pull.ff only

#Doing merge? Dont FF
git config --global --add merge.ff false