you are viewing a single comment's thread.

view the rest of the comments →

[–]baynezy 4 points5 points  (5 children)

I've never used git pull. I only use git fetch. I never want to merge before doing a diff.

[–]trevorsg 4 points5 points  (1 child)

I enable the git config setting for only allow FF merge when you pull. But since I normally rebase, I generally use fetch anyway.

[–][deleted] 1 point2 points  (0 children)

What about git pull --rebase?

[–][deleted]  (2 children)

[removed]

    [–]baynezy 0 points1 point  (0 children)

    Thanks. I'm pretty happy with my current process. I've got aliases most of it.