4 ms·

"git checkout -" is even better if you alias "checkout" to "co" since it just becomes "git co -". Stash has to be my favorite (especially with "-u" AKA "includ

"git checkout -" is even better if you alias "checkout" to "co" since it just becomes "git co -". Stash has to be my favorite (especially with "-u" AKA "include untracked"). I'm generally very comfortable doing even advanced stuff in git, but still get paranoid about some things. Especially when I'm trying to troubleshoot something for someone else. Being able to stash away current changes in a place that is separate from any particular branch is invaluable. I often show stash to people that make a habit of copying their entire project directory before doing something they aren't sure about (backups aren't inherently a bad idea, but that's why you push early and often).

napsterbr 8y ago
> "git checkout -" is even better if you alias "checkout" to "co" since it just becomes "git co -". And even better if you alias `git` to `g`!
- jacobsenscott 8y ago
  Just go all out - alias g-='git checkout -'
  - epicide 8y ago
    Aliasing 'gg' to that would actually be pretty good. Unless you really need git gui.
  - pellucide 8y ago
    alias gb='git checkokut -' gb for go back.
captn3m0 8y ago
Is there any good way to keep track of stashes? I keep stashing stuff that I forget about and end up rewriting 2 weeks later.
- nimrody 8y ago
  Yes. Use a local branch. They are cheap to create. You can name the branch and, of course, write a descriptive commit message. Stashes are for quick save and restore. Branches are way more powerful.
  - ramses0 8y ago
    Hard agree here. Better to make "git my-stash working-on-foo" alias which makes a separate branch. Stashes have become an anti-pattern for me after having too many fail to reapply or drift out of date.
- ishwarn 8y ago
  I've made it a habit to `git stash list` and `git stash show -p stash@{2}` when I want to inspect the stashed changes.
- emmelaich 8y ago
  I have some aliases sl (stash list) and pop/drop for git stash pop/drop. Also make a habit of saving your stashes with a meaningful label. But yeah, like others suggest -- use branches.
- hasperdi 8y ago
  Git worktree changed my life. I can quickly switch branches and work on multiple branches at the same time.

napsterbr 8y ago

> "git checkout -" is even better if you alias "checkout" to "co" since it just becomes "git co -". And even better if you alias `git` to `g`!

jacobsenscott 8y ago
Just go all out - alias g-='git checkout -'
- epicide 8y ago
  Aliasing 'gg' to that would actually be pretty good. Unless you really need git gui.
- pellucide 8y ago
  alias gb='git checkokut -' gb for go back.

captn3m0 8y ago

Is there any good way to keep track of stashes? I keep stashing stuff that I forget about and end up rewriting 2 weeks later.

nimrody 8y ago
Yes. Use a local branch. They are cheap to create. You can name the branch and, of course, write a descriptive commit message. Stashes are for quick save and restore. Branches are way more powerful.
- ramses0 8y ago
  Hard agree here. Better to make "git my-stash working-on-foo" alias which makes a separate branch. Stashes have become an anti-pattern for me after having too many fail to reapply or drift out of date.
ishwarn 8y ago
I've made it a habit to `git stash list` and `git stash show -p stash@{2}` when I want to inspect the stashed changes.
emmelaich 8y ago
I have some aliases sl (stash list) and pop/drop for git stash pop/drop. Also make a habit of saving your stashes with a meaningful label. But yeah, like others suggest -- use branches.
hasperdi 8y ago
Git worktree changed my life. I can quickly switch branches and work on multiple branches at the same time.