Stash only one file out of multiple files that have changed with Git?
我怎样才能隐藏我的分支上多个已更改文件中的一个？
Warning
As noted in the comments, this puts everything into 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.
This will stash everything that you haven't previously added. Just git add the things you want to keep, then run it.
git stash --keep-index
For example, if you want to split an old commit into more than one changeset, you can use this procedure:
git rebase -i <last good commit> edit . git reset HEAD^ git add <files you want to keep in this change> git stash --keep-index git add any changes. git commit git stash pop git rebase --continue You can also use git stash save -p "my commit message" . This way you can select which hunks should be added to stash, whole files can be selected as well.
You'll be prompted with a few actions for each hunk:
y - stash this hunk
n - do not stash this hunk
q - quit; do not stash this hunk or any of the remaining ones
a - stash this hunk and all later hunks in the file
d - do not stash this hunk or any of the later hunks in the file
g - select a hunk to go to
/ - search for a hunk matching the given regex
j - leave this hunk undecided, see next undecided hunk
J - leave this hunk undecided, see next hunk
k - leave this hunk undecided, see previous undecided hunk
K - leave this hunk undecided, see previous hunk
s - split the current hunk into smaller hunks
e - manually edit the current hunk
? - print help
Since git is fundamentally about managing a all repository content and index (and not one or several files), git stash deals, not surprisingly, with the all working directory.
Actually, since Git 2.13 (Q2 2017), you can stash individual files, with:
git stash push [--] [<pathspec>...]
See "Stash changes to specific files" for more.
The original answer (below, June 2010) was about manually selecting what you want to stash.
Casebash comments:
This (the stash --patch original solution) is nice, but often I've modified a lot of files so using patch is annoying
bukzor's answer (upvoted, November 2011) suggests a more practical solution, based on
git add + git stash --keep-index .
Go see and upvote his answer, which should be the official one (instead of mine).
About that option, chhh points out an alternative workflow in the comments:
you should " git reset --soft " after such a stash to get your clear staging back:
In order to get to the original state - which is a clear staging area and with only some select un-staged modifications, one could softly reset the index to get (without committing anything like you - bukzor - did).
(Original answer June 2010: manual stash)
Yet, git stash save --patch could allows you to achieve the partial stashing you are after:
With --patch , you can interactively select hunks from in the diff between HEAD and the working tree to be stashed.
The stash entry is constructed such that its index state is the same as the index state of your repository, and its worktree contains only the changes you selected interactively. The selected changes are then rolled back from your worktree.
However that will save the full index (which may not be what you want since it might include other files already indexed), and a partial worktree (which could look like the one you want to stash).
git stash --patch --no-keep-index
might be a better fit.
If --patch doesn't work, a manual process might:
For one or several files, an intermediate solution would be to:
(Actually, eleotlecram proposes an interesting alternative)
git stash git stash # this time, only the files you want are stashed git stash pop stash@{1} # re-apply all your files modifications git checkout -- afile # reset the file to the HEAD content, before any local modifications At the end of that rather cumbersome process, you will have only one or several files stashed.
链接地址: http://www.djcxy.com/p/610.html上一篇: 在JavaScript中循环访问数组
下一篇: 只用Git修改多个文件中的一个文件？