Git: how to use stash

#1

Post by robertp1984 » Thu, Feb 20, 2014, 6:33 AM UTC

Re: Git: how to use stash

#2

Post by garrettlarson » Thu, Feb 20, 2014, 7:20 AM UTC

Does anyone know why stash names are so ugly? I've always found typing "git stash apply stash@{3}" to be pretty painful (not to mention redundant).

Re: Git: how to use stash

#3

Post by doognukem » Thu, Feb 20, 2014, 7:33 AM UTC

I sometimes prefer using the git-wip commands.

https://github.com/tjmehta/git-wip

Let's me organize my "stashes" based on work-in-progress local branch commits. Also easier to rebase onto if it's a local branch that hasn't been pushed yet etc.

  git wip 
    - alias for git add .; git commit -m __wip;

  git unwip 
    - checks if last commit is a __wip and git reset HEAD^

Re: Git: how to use stash

#4

Post by sauronlord » Thu, Feb 20, 2014, 7:44 AM UTC

Curious.... why not use feature branches for absolutely everything and follow the git flow and treat hot fixes as prescribed?

Re: Git: how to use stash

#5

Post by pg_bot » Thu, Feb 20, 2014, 7:58 AM UTC

Missing my favorite flag for stash: --include-untracked. This will also stash any files that are not currently being tracked by git.

Re: Git: how to use stash

#6

Post by kooshball » Thu, Feb 20, 2014, 8:11 AM UTC

My favorite stash option is -p which let you select which lines you want to stash.

Re: Git: how to use stash

#7

Post by wldlyinaccurate » Thu, Feb 20, 2014, 8:15 AM UTC

I hardly use stash any more. If I need to "stash" something, I just commit it. The reason this is okay is because we work on very small branches, with the aim of squashing everything into a single commit before merging it with master. So it doesn't matter if I commit half-baked code to my branch, since it's going to be squashed anyway.

Re: Git: how to use stash

#8

Post by adsche » Thu, Feb 20, 2014, 8:29 AM UTC

kooshball wrote: post #6

My favorite stash option is -p which let you select which lines you want to stash.

Yes, -p is great, also on `git add`.

Re: Git: how to use stash

#9

Post by gamehead200 » Thu, Feb 20, 2014, 8:34 AM UTC

sauronlord wrote: post #4

Curious.... why not use feature branches for absolutely everything and follow the git flow and treat hot fixes as prescribed?

Depends on what you're working on, really. I find myself using stash when I quickly want to undo a change to check something, but preserve it for future use.

Re: Git: how to use stash

#10

Post by ozh » Thu, Feb 20, 2014, 8:42 AM UTC

garrettlarson wrote: post #2

Does anyone know why stash names are so ugly? I've always found typing "git stash apply stash@{3}" to be pretty painful (not to mention redundant).

Making an alias to use something like `stash apply #3` shouldn't be too complicated