+1 for not using git pull. Use git fetch, and then decide on the appropriate action.
In addition, I don't commit or merge onto master (or any shared tracking branch) until I'm ready to push, so I very rarely have a fetch that isn't a fast forward anyway.
I do tend to rebase my development branches.
Achievements
51
Karma
1,746
Total ProTip Views
Charity
Fork and commit to someone's open source project in need
+1 for not using git pull. Use git fetch, and then decide on the appropriate action.
In addition, I don't commit or merge onto master (or any shared tracking branch) until I'm ready to push, so I very rarely have a fetch that isn't a fast forward anyway.
I do tend to rebase my development branches.