News for hackers. Stuff that matters.

A comment on High-Level Problems with Git and How to Fix Them. Parent comment

Re:High-Level Problems with Git and How to Fix Them by bringtheaction on Tuesday December 12, 2017 @02:02AM (#15903559)
Problem with stashing is that you then need to redo the work of staging afterward.
[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by zaarn on Tuesday December 12, 2017 @02:55AM (#15903768)
You only need to git stash pop and the staging area is back as it where, there is no need to redo the work of staging.
[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by maccam94 on Tuesday December 12, 2017 @04:52AM (#15904241)
you can --keep-index to avoid stashing it, and then make an additional stash. If you have modifications within the same file it'll complain about conflicts though, so on the second sash you'll have to `git stash show -p | git apply -R` and then drop the stash, which is super clunky.
[ Parent | on HN ]
Re:High-Level Problems with Git and How to Fix Them by __david__ on Tuesday December 12, 2017 @02:57AM (#15903777)
Stashing saves/restores the staging area so you shouldn't need to redo anything.
[ Parent | on HN ]