3 ms·
Committing your entire working copy to a separate branch can work just like a safe stash: $ git branch master * cool-feature-1 $ git checkout
by randallsquared 10y ago
Committing your entire working copy to a separate branch can work just like a safe stash:
$ git branch
master
* cool-feature-1
$ git checkout -b stash-2016.09.30T01.10
$ git add -A; git commit -m "stashing WIP for later; maybe add some commentary to remind myself what I'm doing"
$ git branch
master
cool-feature-1
* stash-2016.09.30T01.10
$ git checkout master
$ git branch
* master
cool-feature-1
stash-2016.09.30T01.10
# do other things
# later...
$ git checkout cool-feature-1
$ git merge --no-commit --no-ff stash-2016.09.30T01.10
Automatic merge went well; stopped before committing as requested
$ git reset
$ git status
On branch cool-feature-1
Untracked files:
...
And now your old WIP is back, ready to keep working, and in the meantime you could have pushed up your "stash" to a remote and grabbed it back.
There might be something terribly wrong with this, but if there's not, then I don't understand why git stash doesn't do something similar to this by default.