Hacker Newsnew | comments | show | ask | jobs | submit login

Actually it's just $ git pull --rebase

If you do have local changes, then you would need to git stash/stash --pop before/after that command. I use rebase to keep down on unneeded merges for the common case of having exactly one upstream and not merging several branches together.




If you simplify like so, it is still push and pull. One less thing to type.

-----


I'll never understand this subset of the development community who is obsessed with saving a few keystrokes. It almost invariably comes at the cost of flexibility, and creates a set of developers who only know the abstraction.

I'm looking at you, jQuery.

-----




Guidelines | FAQ | Support | API | Lists | Bookmarklet | DMCA | Y Combinator | Apply | Contact

Search: