CODEWITHSUNDEEP
gitgit-stash
ynkr
ynkr

Reputation: 28054

How can I git stash a specific file?

How can I stash a specific file leaving the others currently modified out of the stash I am about to save?

For example, if git status gives me this:

younker % gst      
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#   modified:   app/controllers/cart_controller.php
#   modified:   app/views/cart/welcome.thtml
#
no changes added to commit (use "git add" and/or "git commit -a")

and I only want to stash app/views/cart/welcome.thtml, how would I do that? Something like (but of course this does not work):

git stash save welcome_cart app/views/cart/welcome.thtml

Upvotes: 2525

Views: 1411784

Answers (14)

svick
svick

Reputation: 244988

Since git 2.13, there is a command to save a specific path to the stash: git stash push <path>. For example:

git stash push -m welcome_cart app/views/cart/welcome.thtml

With earlier versions:

You can do that using git stash --patch (or git stash -p) -- you'll enter interactive mode where you'll be presented with each hunk that was changed. Use n to skip the files that you don't want to stash, y when you encounter the one that you want to stash, and q to quit and leave the remaining hunks unstashed. a will stash the shown hunk and the rest of the hunks in that file.

Not the most user-friendly approach, but it gets the work done if you really need it.

Upvotes: 3483

HongchaoZhang
HongchaoZhang

Reputation: 5022

For stashing one file:

git stash -- filename.txt

To give a message in the command rather than enter it when prompted, add -m before the file part, e.g. git stash -m "stash-message" -- filename1.txt

For stashing more than one file:

git stash -m "stash-message" -- filename1.txt filename2.txt…

Upvotes: 376

Vicky P
Vicky P

Reputation: 762

Short and Simple solution:

git stash -- filename.ext

in your case git stash -- app/views/cart/welcome.thtml

Upvotes: 32

Matt C.
Matt C.

Reputation: 3310

My preferred method (the easiest in my opinion) is simply:

git stash -- <path/to/directory>

or

git stash -- path/to/directory/file.py

Upvotes: 6

Omid
Omid

Reputation: 161

Since git 2.35.0 you can stash staged changes using --staged | -S flag.

For instance:

git stash --staged

--staged

This option is only valid for push and save commands.

Stash only the changes that are currently staged. This is similar to basic git commit except the state is committed to the stash instead of current branch.

The --patch option has priority over this one.

https://git-scm.com/docs/git-stash/2.35.0#Documentation/git-stash.txt---staged

The nice part about this new feature is that not only it's possible to stash specific untracked files, but also it's possible to stash specific part of the code changes in tracked files; when you add those to stage using --patch | -p flag.

Upvotes: 12

scott
scott

Reputation: 111

I think using git stash push <path> will be nice! it also supports patterns.

  • eg. git stash push welcome.*ml will stash any start with welcome. and end with ml files. This is suitable for you.

Upvotes: 3

Omkesh Sajjanwar
Omkesh Sajjanwar

Reputation: 863

  • git status (make sure your changes that can stash)

src/config/bl.go

src/config/dl.go

If you want to stash only dl.go

  • git stash push -m "< enter your msg eg:dl files reverted> " src/config/dl.go

Show your stash list

  • git stash list

Then checkout your branch and apply stash

  • git stash apply stash{0}

Upvotes: 16

Justin
Justin

Reputation: 396

@svick has posted a great answer. I wanted to stash all my .java files and leave build.gradle untouched so I ran:

git stash push *.java

Upvotes: 6

smithWEBtek
smithWEBtek

Reputation: 111

  1. stage the changes you do NOT want to stash.
  2. stash the remaining unstaged files with:
$ git stash save <give_it_a_name> --keep-index

The unstaged files are now stashed. See the stash list with your named stash:

$ git stash list

stash@{0}: On mybranch: WIP220412-1119am
stash@{1}: On mybranch: WIP220312-749am

To restore the stashed files:

$ git stash apply stash@{<index_of_saved_stash>}
$ git stash apply stash@{0}

The changes stashed in WIP220412-1119am are now restored. And the stash list remains as well, (instead of "git stash pop", you can retain the list this way.)

Upvotes: 5

Akshay
Akshay

Reputation: 1113

If you are using visual studio code there is a simpler way to stash selected files.

  1. Make sure you have installed GitLens extension in VSCode
  2. Go to Source Control tab
  3. Select files those you want to stash
  4. Right click on it, you will see many options. Click on Stash Changes

enter image description here

  1. Now it will ask you to add some stash message. Add understandable message and hit enter.

enter image description here

Upvotes: 57

Sairam Gourishetty
Sairam Gourishetty

Reputation: 700

In Source Control tab of vs-code, hold shift key and then select the files you want to stash, then right click and choose stash changes option.

Upvotes: -1

skalee
skalee

Reputation: 12675

I usually add to index changes I don't want to stash and then stash with --keep-index option.

git add app/controllers/cart_controller.php
git stash --keep-index
git reset

The last step is optional, but usually, you want it. It removes changes from the index.

Warning As noted in the comments, git stash --keep-index pushes everything onto the stash, both staged and unstaged. The --keep-index just leaves the index alone after the stash is done. This can cause merge conflicts when you later pop the stash.

Upvotes: 402

georgiecasey
georgiecasey

Reputation: 23391

If you're OK with using a GIT GUI client, Fork can pretty seamlessly do this as of May 2020. A GIF of the partial stash functionality will show this better than any words: GIF of partial stash functionality in git-fork

Note that Fork (which is a difficult name to Google for!) is not free software and costs $50 after the evaluation period, but you can just ignore the popups like you do for WinRAR or WinZip.

Upvotes: 7

dlq
dlq

Reputation: 3229

To add to svick's answer, the -m option simply adds a message to your stash, and is entirely optional. Thus, the command

git stash push [paths you wish to stash]

is perfectly valid. So for instance, if I want to only stash changes in the src/ directory, I can just run

git stash push src/

Upvotes: 192

Related Questions