I believe you can set the default to be --ff-only then you only need to specify ... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

ZeroGravitas on Nov 2, 2023 | parent | context | favorite | on: Confusing Git Terminology

I believe you can set the default to be --ff-only then you only need to specify if you want to merge.

Despite knowing this is an option it's still hard for me to find decent documentation, but I think this is probably the best I found:

https://salferrarello.com/git-warning-pulling-without-specif...

andrewla on Nov 2, 2023 [–]

That's even worse because it will just do the wrong thing when I'm on a different setup. At least with an alias the system can say "yeah, I ain't never heard of 'ff'" so I can fall back on a default.

Consider applying for YC's Spring batch! Applications are open till Feb 11.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact