2 ms·

Thanks for the examples! The magit page is a little hard for me to grok why it might be worth switching to something else. > Did you know that you can stash in

by cdrini 6y ago

Thanks for the examples! The magit page is a little hard for me to grok why it might be worth switching to something else. > Did you know that you can stash index and working tree separately? What does this mean? Can you give an example? > Also, I've become my team's go-to rebase monkey. Haha, hello friend. I love rebasing; it always breaks my heart a little when I see "Merged master into branch X" commits :P My main git rebase flow is `git checkout master; git pull upstream master; git checkout X; git rebase -i master` + vim. Having multiple branches that depend on a shared branch does get a little messy though. How does magit make this flow better? > Conflicts still suck, but less so. Hahaha, that's all you can hope for with merge conflicts!

adimitrov 6y ago
`git status` always shows you some of three things: files not tracked by git, tracked files with modifications that are not staged, and tracked files with modifications that are staged. You can stash tracked files with modifications, or tracked files without modifications separately! Scenario: I've staged a couple files for a commit I'm preparing, but I see that there's an unrelated change in the unstaged files that I want to do in a commit that should come first. So I stash everything I've staged. I do not stash what I haven't staged! Now I can create that new commit, and pop the stash later to come back to the commit I wanted to originally write.