# git stash path/to/only/one/subdirectory 2 messages from 2010-12-08 to 2010-12-08. Participants: Patrick Doyle, Johan Herland. Thread: https://gitlist.dev/t/25992 ## Patrick Doyle, 2010-12-08 14:15 Subject: git stash path/to/only/one/subdirectory Message-ID: URL: https://gitlist.dev/e/AANLkTim%2BsOeVfkAac1v-CsD5GG8Vj2VSjXn-9SSw%2BHjb%40mail.gmail.com ``` Looking at the man page for git-stash, it seems like I can do this with the --patch option to git-stash, but I figured I'd ask the questions anyway... Is it possible to git-stash a single directory, while leaving the rest of my working copy in the state it's in? In my particular case (as of 9:00am this morning), I've realized that I want to split my work into 2 separate commits; I'm not done with either of them yet; and they are in completely separate directories from each other. I would like to do something like: $ git stash --subdir-only dir1 edit/test stuff in dir2, possibly committing once or twice along the way $ git commit dir2 go off and do other stuff for a while, and come back to the dir1 stuff I was playing with $ git stash pop finish the dir1 work $ git commit dir1 If this capability doesn't exist, I could try adding it... would other folks see this as useful? --wpd ``` ## Johan Herland, 2010-12-08 15:38 Subject: Re: git stash path/to/only/one/subdirectory Message-ID: <201012081638.56543.johan@herland.net> URL: https://gitlist.dev/e/201012081638.56543.johan%40herland.net In-Reply-To: ``` On Wednesday 08 December 2010, Patrick Doyle wrote: > Looking at the man page for git-stash, it seems like I can do this > with the --patch option to git-stash, but I figured I'd ask the > questions anyway... > > Is it possible to git-stash a single directory, while leaving the > rest of my working copy in the state it's in? > > In my particular case (as of 9:00am this morning), I've realized that > I want to split my work into 2 separate commits; I'm not done with > either of them yet; and they are in completely separate directories > from each other. I would like to do something like: > > $ git stash --subdir-only dir1 > edit/test stuff in dir2, possibly committing once or twice along the > way $ git commit dir2 > go off and do other stuff for a while, and come back to the dir1 > stuff I was playing with > $ git stash pop > finish the dir1 work > $ git commit dir1 Usually, I solve these problems by staging dir2 with 'git add dir2' and then committing it ('git commit' without -a), then running 'git stash' to remove dir1 changes from the worktree. I can now test the dir2 changes and fix the dir2 commit (if needed) with 'git commit --amend'. Then, when it looks good, I can bring dir1 back with 'git stash pop' and continue working on that. You should also look at 'git add -p' to stage changes hunk-by-hunk. That is really helpful when dir1 changes and dir2 changes are not in separate directories. ...Johan -- Johan Herland, www.herland.net ```