Il giorno venerdì 15 gennaio 2016 17:36:51 UTC+1, Bram Moolenaar ha scritto:
> 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'd also say it's the most simple to remember once you know a bit of git basics. git isn't difficult, it's just powerful and so it requires a bit of study. like vim ;) btw, just in case someone is wondering... the stash is a stack where I can "put aside" my local modifications, so all I'm doing is: $ git stash -> put this stuff aside for a moment $ git pull -> fetch and merge the new patches $ git stash pop -> get back my stuff and apply it to the updated repo hope this helps -- -- 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.
