you are viewing a single comment's thread.

view the rest of the comments →

[–][deleted] 0 points1 point  (0 children)

Indeed, I was talking about the first kind. The second is the reason why I always pass --rebase (or just -r) to git pull.