Git从另一个分支复制文件而不暂存

Question

我已经 found如何将文件从一个分支批量复制到另一个分支:

Edit please note, if you think this question is a duplicate of this, please observe that that's the question I linked above^^, and what follows below explains the different functionality that I want.

$ git checkout directory/somefile.php feature-B

但是，此解决方案已经对更改进行了分阶段:

$ git status
On branch feature-A
Your branch is up-to-date with 'origin/feature-A'.
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   directory/somefile.php

但我不想添加所有更改。我想做一个 add -p并采取大部分但不是全部的变化。我想要的是这个:

$ git status
On branch feature-A
Your branch is up-to-date with 'origin/feature-A'.
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:   directory/somefile.php

no changes added to commit (use "git add" and/or "git commit -a")

当然，我可以做 git reset取消更改，但我想第一次得到我想要的东西，没有第二步。

如何在不暂存的情况下从另一个分支复制文件？

Answer 1

你可以使用 git show 然后重定向......虽然它不是很优雅

git show feature-B:directory/somefile.php > directory/somefile.php