Git Tricks: Avoiding merge when dealing with remote conflicts

Re:Git Tricks: Avoiding merge when dealing with remote confl... by lazulicurio on Monday October 21, 2019 @08:26PM (#21319114)

> are you saying that git pull can produce some unwanted artifacts? (e.g. not do exactly what you want it to do?)

Not in the sense that git pull has unpredictable behavior, but I like being able to view the remote history and manually diff against my local branch if there are changes that have been made.

[ Parent | on HN ]

Re:Git Tricks: Avoiding merge when dealing with remote confl... by jolmg on Monday October 21, 2019 @08:51PM (#21319277)

Though it's still better to do fetch when you want to compare first, pull outputs the ranges of commits that it's pulling for each branch, so you can just copy and paste that into a diff or log command, too.

I say this because I used to just ignore the output, but then I found that it's useful, too.

So, if git-pull outputs

   b3b2007..9bad624  master       -> origin/master

I can do `git diff b3b2007..9bad624` or `git log b3b2007..9bad624` to see what I just pulled.

[ Parent | on HN ]