注意:我刚刚用24小时的时间重写了这个答案:) 在我的shell历史中，整个过程就是三个简单的语句。不过，为了方便起见，我已经将它们解压缩了。

这样，我希望你能看到我是怎么做的，而不是盲目地复制/粘贴东西。

这里是一步一步的。

假设源在~/OLDREPO中包含存储。创建一个TEST克隆，不包含任何存储:

cd ~/OLDREPO
git clone . /tmp/TEST

将所有的存储作为临时分支:

git send-pack /tmp/TEST $(for sha in $(git rev-list -g stash); \
    do echo $sha:refs/heads/stash_$sha; done)

在接收端循环转换回存储:

cd /tmp/TEST/
for a in $(git rev-list --no-walk --glob='refs/heads/stash_*'); 
do 
    git checkout $a && 
    git reset HEAD^ && 
    git stash save "$(git log --format='%s' -1 HEAD@{1})"
done

如果愿意，清理临时分支

git branch -D $(git branch|cut -c3-|grep ^stash_)

做一个git藏匿清单，你会像这样:

stash@{0}: On (no branch): On testing: openmp import
stash@{1}: On (no branch): On testing: zfsrc
stash@{2}: On (no branch): WIP on sehe: 7006283 fixed wrong path to binary in debianized init script (reported as part of issue
stash@{3}: On (no branch): WIP on debian-collab: c5c8037 zfs_pool_alert should be installed by default
stash@{4}: On (no branch): WIP on xattrs: 3972694 removed braindead leftover -O0 flag
stash@{5}: On (no branch): WIP on testing: 3972694 removed braindead leftover -O0 flag
stash@{6}: On (no branch): WIP on testing: db9f77e fuse_unmount_all could be starved for the mtx lock
stash@{7}: On (no branch): WIP on xattrs: db9f77e fuse_unmount_all could be starved for the mtx lock
stash@{8}: On (no branch): WIP on testing: 28716d4 fixed implicit declaration of stat64
stash@{9}: On (no branch): WIP on emmanuel: bee6660 avoid unrelated changes

在最初的存储库中，看起来是一样的

stash@{0}: WIP on emmanuel: bee6660 avoid unrelated changes
stash@{1}: WIP on testing: 28716d4 fixed implicit declaration of stat64
stash@{2}: WIP on xattrs: db9f77e fuse_unmount_all could be starved for the mtx lock
stash@{3}: WIP on testing: db9f77e fuse_unmount_all could be starved for the mtx lock
stash@{4}: WIP on testing: 3972694 removed braindead leftover -O0 flag
stash@{5}: WIP on xattrs: 3972694 removed braindead leftover -O0 flag
stash@{6}: WIP on debian-collab: c5c8037 zfs_pool_alert should be installed by default
stash@{7}: WIP on sehe: 7006283 fixed wrong path to binary in debianized init script (reported as part of issue #57)
stash@{8}: On testing: zfsrc
stash@{9}: On testing: openmp import

我会选择第二种方法，尽管不知道为什么不能提交给main/feature分支。也有可能进行“樱桃挑选”。

我有点晚了，但我相信我找到了一些适合我的东西，如果你的情况相同或相似，它可能也适用于你。

我在它自己的分支里做一个特性。分支不会合并到master中并推送，直到它完成或者我已经提交了我觉得可以向公众展示的内容。所以当我想要将非阶段性的更改转移到另一台计算机时，我所做的是:

Make a commit, with a commit message like "[non-commit] FOR TRANSFER ONLY", featuring the content you want transfered. Login to the other computer. Then do: git pull ssh+git://<username>@<domain>/path/to/project/ rb:lb The URL might differ for you if you access your repository in a different way. This will pull changes from that URL from the remote branch "rb" into the local branch "lb". Note that I have an ssh server running on my own computer, and am able to access the repository that way. git reset HEAD^ (implies --mixed) This resets the HEAD to point to the state before the "[non-commit]" commit.

从git-reset (1): "——mixed:重置索引，但不重置工作树(即，更改的文件被保留，但不标记为提交)[…]"

因此，您最终将对文件进行更改，但不需要提交到master，也不需要存储。

然而，这将需要你git重置——在你做了“[非提交]”的存储库中硬HEAD^，因为那个提交是垃圾。

我将简单地创建一个新的stash分支，并在不需要该分支时删除该分支。

在机器1上:

git add . // Add work-in-progress job
git checkout -b stash-branch // Create and checkout to stash-branch
git commit -m 'WIP: job description' // Commit message
git push origin stash-branch // Push to remote

在机器2上:

git pull origin stash-branch // Pull the stash-branch
git checkout master // Checkout to working branch
git rebase stash-branch // Rebase the stash-branch
git reset --soft // Equivalent to stash!!
git branch -d stash-branch // Delete branch when not needed from local
git push -d origin stash-branch // Delete branch when not needed from remote

似乎有一个非常巧妙的技巧来解决这个问题。你可以使用git diff >文件。Diff(并提交文件)，然后使用git apply file恢复更改。Diff(来自任何地方)来实现相同的结果。

这里也解释了这一点。

我想，藏东西的意思就是把一些不那么重要的东西藏在当地的地毯下面。没有人应该知道你最喜欢的废话;-)唯一的“但是”是:但是如果我在几个工作站上开发呢?那么scp就更好了。