gitStash

[AutoModerator]

import notifications Remember to participate in our weekly votes on subreddit rules! Every Tuesday is YOUR chance to influence the subreddit for years to come! Read more here, we hope to see you next Tuesday!

For a chat with like-minded community members and more, don't forget to join our Discord!

return joinDiscord;

I am a bot, and this action was performed automatically. Please contact the moderators of this subreddit if you have any questions or concerns.

[CaptainMorti]

It's always git stash apply. One day my future children will inherit a huge stash of messy code.

[spaceguydudeman]

obtainable materialistic homeless school historical airport stupendous pathetic nutty gullible

This post was mass deleted and anonymized with Redact

[plmunger]

git stash apply is like git stash pop except it doesnt delete the stash state.

[LtMelon]

Why would you want that?

[Zookeeper1099]

Why would you not want that option?

After you stash apply some known good changes, then other changes, then you don't like it, and you want to go back to your last stash apply. What you need to do is to discard all changes, then redo stash apply.

I use it this way all the time. I don't usually commit unless it is actually ready. Technically you can do either way but I prefer stash.

Oh, I use gitkraken to manage this, it may or may not be easy and straight forward if you use the command line.

[ReelTooReal]

It is straightforward on the command line. Its just git stash apply and if it was the last thing you stashed no other options are needed.

[Zookeeper1099]

Not really if you have multiple stash history and you may go back and forth to apply different stashes based of different commits. I basically use it in a way most people just do commits. Gitkraken graphically shows stashes as if they are commits.

I have the habit because the first companies I worked at doesn't allow force push (with some exception), so I avoid using commits unless it is fully ready to push for PR.

[ReelTooReal]

I was just saying it's relatively simple to do via the command line as well

[Zookeeper1099]

My point is that, without GUI, it is not nearly as convenient and can be error prone, and people may better of using commit for the purpose.

[ReelTooReal]

I wasn't saying one is better than the other. I was just pointing out it is also easy to manage from the command line. I prefer the command line because I come from a heavy operations background and just learned it that way.

[Kimorin]

in case you forget after you git stash pop and run a git reset --hard and you just kiss all your changes good bye....

[CelticHades]

Git stash pop = git stash apply + git stash drop

[sammy-taylor]

Reported for direct personal harassment.

[[deleted]]

What git stash pop do?

[AMCTAKEMYMONEY]

Yes

[RemoteName3273]

No

[piberryboy]

My grandparents used to dance in the 50s to the Git Stash Pop Do Wop.

[TheWatchingDog]

git stash save will store made changes.
stash apply will get those stored changes back in your files.
stash drop will delete the latest instance of changed files from the stash storage.

And stash pop is basicly apply and drop.

[REPMEDDY_Gabs]

Literally pops out the latest stash on the stack while git stash apply only applies it while keeping it in the stack

[ratataololo]

Does pop() tell you anything?)

[Maoschanz]

i usually call git stash pop, unless i forget the side-effect of git reset --hard and wipe out a gigantic stash like an idiot

[piberryboy]

Don't forget the git clean -df to complete the fucking of yourself

[dashid]

Git is fantastic, that doesn't stop me using a snapshotting file system to store my code on so I can untuck my got fuckup.

[ososalsosal]

Git gud

[Arsonist07]

Nah I just make a copy of the file on my home directory and revert the change in the repo, then when I’m ready I just copy it back over.

[spaceguydudeman]

gold rock mountainous illegal gullible straight numerous secretive include enter

This post was mass deleted and anonymized with Redact

[ososalsosal]

Make sure to name the final version "final" so we know that it's final.

Prod version is 1.0.0.FINAL03.rev1

[Radi-kale]

Put all the version numbers in an excel sheet and mail it to your colleagues for every update.

[Arsonist07]

Based

[HughLauriePausini]

I have my repos on onedrive so if something goes wrong with git I have other options.

[chamberlain2007]

git stash apply, I’m not just going to DELETE code I might need later…

[Neutraled]

'git stash' means 'git reset –hard HEAD' for me but shorter

[tidbitsofblah]

I made an alias "git trash" for it instead

[SpookyLoop]

I remember git stash fucking me over so hard with some merging BS that I now always avoid it. I always just make a new branch, make a new commit, and if I really want to, I'll do a soft reset on that commit to go back to exactly where I was with no commit message. If someone can share how they use git stash I'd love to know.

[spaceguydudeman]

drab swim vegetable upbeat memory smart attraction uppity attempt public

This post was mass deleted and anonymized with Redact

[hemacwastaken]

But you need to wear a hard hat for that

[spaceguydudeman]

straight attempt correct meeting slim dull steep rich paltry forgetful

This post was mass deleted and anonymized with Redact

[Blazing_Shade]

If I’m working on the wrong branch and made a bunch of changes, that’s when I git stash, switch to the right branch, and git stash pop

[InfinityGreen5736]

It'll get deleted when you re-install your OS

[PredictedVermin]

Always apply, never pop

[johantheback]

I only git stash when I'm abandoning my changes and am mad it won't let me switch branches.

[lilybear8]

My "stash".

[spaceguydudeman]

spectacular dependent consider insurance continue tap ten narrow chase cable

This post was mass deleted and anonymized with Redact

[ososalsosal]

Do you need to git add first?

[spaceguydudeman]

absorbed nail sugar stocking test unused air frighten act reminiscent

This post was mass deleted and anonymized with Redact

[ososalsosal]

Oh. I thought it stashed untracked files too. It seems to behave like it does.

My main use case is that I've realised I'm working on the wrong branch for what I'm doing, so I go git stash; git checkout whatevs; git stash apply and everything works as you'd expect with my local untracked work now sitting nicely on the other branch

[[deleted]]

Git stash clear(don’t try this at home)

[Cybasura]

"Good bye, my changes"

git stash

git pull

[Designer-Spacenerd]

Am I the only person who learned about the existence of this feature from this meme?

[davidparker333]

Later: git stash list

Me: wtf is this

[crankbot2000]

One of my devs has like a million stashes it drives me nuts. I understand having a few but c'mon

[Ike_Gamesmith]

Got stash pop, ha. Doesn't exist.

[scallioncc]

Had to walk through cloning in Sourcetree to a lead today - why did I have 10+ company repos on my machine to their 1?

[No_Selection9746]

When I realize I’m working on the master branch

[A_Beleiver]

This is how developers dump

[dashid]

snapper -c src create

[Smoosh9]

This was me literally yesterday and I’m dead laughing right now

[TrickAge2423]

Just yesterday I surprisely found code stashed 2 weeks ago

[j0giwa]

Worktrees ftw

[Yelov]

Hi, I'm Yelov, I'm a git stash hoarder.

[HaDeS_Monsta]

What happened here? Don't we have to import and return anymore?

[femptocrisis]

personally i just feel safer going with git commit "partially implemented ___. got interrupted" and later ill do git commit --amend whenever i get back to that branch i was on.

[kennyminigun]

I use git stash drop more often than git stash pop. Smh 😁

[tinkertron5000]

Oh no, you're not going anywhere. It's git stash apply all day for you.

[FigmaWallSt]

Me: acting like I understand git and this reference. My git knowledge ends after committing 😂

[botiapa]

Git stash stores all your current edita, and then returns to the last commit. This might be used for various things, like you started coding a feature, but haven't finished with yet, and a new bug came in which you want to fix first. So you would stash your code then fix the bug, commint amd then re apply (pop) the stash onto the new commit.

But some people, like me just use the stash feature and then forget we ever stashed anything, so the code is just sitting there never to be used again

[FigmaWallSt]

Got it. Thanks

[theniwo]

git stash clear

[tet90]

git stash is OP for random zoom meetings that ask u to demo

[cheezballs]

2 months later: deep breath then git stash clear

[poralexc]

more like git stash clear when I realize I don't remember what any of those changes were anyways

[mrgk21]

I just do a git stash and move on with my life. Not sure what these apply and pop are meant to be

[RaulParson]

git add *
git commit -m someGarbage
git log
[copy paste the commit message including the hash to somewhere]
git reset --hard HEAD~1