4 ms·
git stash has other cool features and use cases (for example, when you want to pull from upstream and you have conflicting changes.) http://git-scm.com/book/ch
by niggler 14y ago
git stash has other cool features and use cases (for example, when you want to pull from upstream and you have conflicting changes.) http://git-scm.com/book/ch6-3.html http://git-scm.com/book/ch6-3.html is a nice summary and the manpage also gives some sample workflows.
- drstewart 14y agoI actually saw this as a strike against git usability -- this should happen transparently imo, why should I have to git stash save; git pull --rebase; git stash pop for things to apply cleanly? Just do it automatically and fail if the stash application fails.
- andrewflnr 14y agoBecause then git would be doing magic stuff you don't (necessarily) understand, and people who like that aren't git's target audience. Those are all separate pieces of functionality that shouldn't be stuck together by default.
- jzwinck 14y agoThe same argument could be applied against git pull, which is really the concatenation of fetch and merge (or rebase). I agree with the previous poster that there should be better defaults available to non-tweakers.
- andrewflnr 14y agoGit pull always seemed weird to me too. I don't use it.
- Spiritus 14y agoYou could just create an alias for that.
- jahewson 14y agoI'd call that "happening opaquely"