Hi, On Fri, Jan 15, 2016 at 8:36 AM, Bram Moolenaar <[email protected]> wrote: > > Matteo Cavalleri wrote: > >> I usually do >> >> $ git stash >> $ git pull >> $ git stash pop >> >> this is supposing I have no reasons to commit my changes. > > OK, that is three commands. But I suppose it's the shortest that works. > > I notice that git annoyingly requires configuring the user name and > email for this. >
After updating the Vim sources (with local changes) using the above commands, to diff between the local copy and the master, do you use the following command? $ git diff origin/master Thanks, Yegappan -- -- 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.
