Hacker News new | ask | show | jobs
by SDGT 4331 days ago
Best practices are to not use pull unless you certainly know you should.

Things should be fetched then merged with two separate commands.

1 comments

Pulling is equivelent to doing a fetch then a merge. Unless you plan on doing something between the two steps (like inspecting FETCH_HEAD yourself), then there is no advantage to not simply pulling.

Of course, if (like thrush) you do not plan on doing a merge, then you will need to do the fetch manually and do what you do want to do. Although, git pull does have a --rebase option, but I am not sure if you can pass the -i flag to it.

Having taught people how to use git, I found that it is easier to not show them the pull command until they are used to doing fetch && merge.