undefined | Better HN

0 pointsdreamcompiler5y ago0 comments

Agree with everything in this post except I find stash extremely useful when a pull would disrupt my current working directory. "If I only had a VCS to temporarily hang on to my local changes while I merge the team's."

Stash, pull, stash pop. Done.

(I don't use rebase because I like my history to tell the truth rather than be fictional. Maybe stash is less necessary with rebase; IDK.)

0 comments

3 comments · 1 top-level

boring_twenties5y ago· 2 in thread

You don't need stash for that though, you can just create a branch.

git branch my_stash git commit -am WIP # instead of stash save git pull git cherry-pick -n WIP git branch -D my_stash

nemetroid5y ago

You don’t need to create a branch for that though, you can just use stash.

boring_twenties5y ago

And how is that better?

You have to remember a second command with its own peculiar syntax and semantics, but don't gain any functionality.

Stash is a superfluous misfeature.

2 more replies

j / k navigate · click thread line to collapse