On Mon, May 30, 2016 at 10:18:59PM +0200, 'Guyzmo' via vim_dev wrote: > Basically, I'd advise to avoid as much as possible to use `git pull` in > a git flow except when just updating an unmodified local workspace to > the remote, as git pull is a shorthand for: > > git fetch origin ; git rebase origin/master
Since this is the second time you've repeated this, I figure it's worth correcting. pull is more like “git fetch origin; git merge origin/master”. If you want to do a rebase, then it would be “git pull --rebase”. Cheers, -- James GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <[email protected]> -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
