将以下代码保存到一个文件中，例如，名为stash。用法是stash＜filename_regex＞。参数是文件完整路径的正则表达式。例如，要隐藏a/b/c.txt、隐藏a/b/c.txt或隐藏.*/c.txt等。

$ chmod +x stash
$ stash .*.xml
$ stash xyz.xml

要复制到文件中的代码：

#! /usr/bin/expect --
log_user 0
set filename_regexp [lindex $argv 0]

spawn git stash -p

for {} 1 {} {
  expect {
    -re "diff --git a/($filename_regexp) " {
      set filename $expect_out(1,string)
    }
    "diff --git a/" {
      set filename ""
    }
    "Stash this hunk " {
      if {$filename == ""} {
        send "n\n"
      } else {
        send "a\n"
        send_user "$filename\n"
      }
    }
    "Stash deletion " {
      send "n\n"
    }
    eof {
      exit
    }
  }
}

我没有找到我需要的答案，这很简单：

git add -A
git reset HEAD fileThatYouWantToStash
git commit -m "committing all but one file"
git stash

这只存储了一个文件。

当git stash-p（或git add-p with stash--keep index）太麻烦时，我发现使用diff、checkout和apply更容易：

仅“隐藏”特定文件/dir：

git diff path/to/dir > stashed.diff
git checkout path/to/dir

然后

git apply stashed.diff

git stash push -p -m "my commit message"

-p让我们选择应该隐藏的大块；也可以选择整个文件。

系统将提示您对每个大块执行一些操作：

   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

有时，我在提交分支之前对其进行了不相关的更改，我想将其移动到另一个分支并单独提交（如master）。我这样做：

git stash
git checkout master
git stash pop
git add <files that you want to commit>
git commit -m 'Minor feature'
git stash
git checkout topic1
git stash pop
...<resume work>...

请注意，第一个stash和stash pop可以取消，您可以在结账时将所有更改转移到主分支，但前提是没有冲突。此外，如果您要为部分更改创建新分支，则需要隐藏。

假设没有冲突和新分支，您可以简化它：

git checkout master
git add <files that you want to commit>
git commit -m 'Minor feature'
git checkout topic1
...<resume work>...

甚至不需要Stash。。。

更新（2015年2月14日）-我重写了一点脚本，以更好地处理冲突的情况，现在应该将其显示为未合并的冲突，而不是.rej文件。

我经常发现，与@bukzor的方法相反更直观。也就是说，要进行一些更改，然后只隐藏那些已进行的更改。

不幸的是，git没有提供git存储——只有索引或类似的内容，所以我编写了一个脚本来实现这一点。

#!/bin/sh

# first, go to the root of the git repo
cd `git rev-parse --show-toplevel`

# create a commit with only the stuff in staging
INDEXTREE=`git write-tree`
INDEXCOMMIT=`echo "" | git commit-tree $INDEXTREE -p HEAD`

# create a child commit with the changes in the working tree
git add -A
WORKINGTREE=`git write-tree`
WORKINGCOMMIT=`echo "" | git commit-tree $WORKINGTREE -p $INDEXCOMMIT`

# get back to a clean state with no changes, staged or otherwise
git reset -q --hard

# Cherry-pick the index changes back to the index, and stash.
# This cherry-pick is guaranteed to succeed
git cherry-pick -n $INDEXCOMMIT
git stash

# Now cherry-pick the working tree changes. This cherry-pick may fail
# due to conflicts
git cherry-pick -n $WORKINGCOMMIT

CONFLICTS=`git ls-files -u`
if test -z "$CONFLICTS"; then
    # If there are no conflicts, it's safe to reset, so that
    # any previously unstaged changes remain unstaged
    #
    # However, if there are conflicts, then we don't want to reset the files
    # and lose the merge/conflict info.
    git reset -q
fi

您可以将上面的脚本保存为路径上的某个位置的git stash索引，然后将其作为git stach索引调用

# <hack hack hack>
git add <files that you want to stash>
git stash-index

现在，存储包含一个新条目，该条目仅包含您已暂存的更改，而您的工作树仍然包含任何未暂存的更改。

在某些情况下，工作树的更改可能取决于索引的更改，因此当您隐藏索引更改时，工作树更改会发生冲突。在这种情况下，您将得到通常的未合并冲突，可以使用gitmerge/gitmergetool/等解决。