与Jefromi的答案相比，这种方法的优势可能在于您不必记住git重置的哪个行为是正确的：）

 # Create a branch to throw away, on which we'll do the cherry-pick:
 git checkout -b to-discard

 # Do the cherry-pick:
 git cherry-pick stuff

 # Switch back to the branch you were previously on:
 git checkout -

 # Update the working tree and the index with the versions of A and B
 # from the to-discard branch:
 git checkout to-discard -- A B

 # Commit those changes:
 git commit -m "Cherry-picked changes to A and B from [stuff]"

 # Delete the temporary branch:
 git branch -D to-discard

使用gitmerge--squashbranch_name，这将从其他分支获取所有更改，并为您准备提交。现在删除所有不需要的更改并保留所需的更改。git不会知道有合并。

与Jefromi的答案相比，这种方法的优势可能在于您不必记住git重置的哪个行为是正确的：）

 # Create a branch to throw away, on which we'll do the cherry-pick:
 git checkout -b to-discard

 # Do the cherry-pick:
 git cherry-pick stuff

 # Switch back to the branch you were previously on:
 git checkout -

 # Update the working tree and the index with the versions of A and B
 # from the to-discard branch:
 git checkout to-discard -- A B

 # Commit those changes:
 git commit -m "Cherry-picked changes to A and B from [stuff]"

 # Delete the temporary branch:
 git branch -D to-discard

我找到了另一种方法来防止樱桃采摘上的任何冲突合并，IMO很容易记住和理解。因为您实际上不是在挑选提交，而是其中的一部分，所以您需要先拆分它，然后创建一个符合您需要的提交，然后再挑选它。

首先从要拆分并签出的提交创建分支：

$ git checkout COMMIT-TO-SPLIT-SHA -b temp

然后恢复上一次提交：

$ git reset HEAD~1

然后添加您要选择的文件/更改：

$ git add FILE

并提交：

$ git commit -m "pick me"

请注意提交散列，让我们将其称为PICK-SHA，然后返回主分支，例如master强制结账：

$ git checkout -f master

和樱桃选择承诺：

$ git cherry-pick PICK-SHA

现在可以删除临时分支：

$ git branch -d temp -f

自动化程度更高：

#!/usr/bin/env bash

filter_commit_to_files() {
    FILES="$1"
    SHA="$2"
    git show "$SHA" -- $FILES | git apply --index -
    git commit -c "$SHA"
}

示例用法：

filter_commit_to_files "file1.txt file2.txt" 07271c5e

我通过复制并粘贴到外壳中来定义它。您不需要here文档。

我会使用cherry-pick-n（--no-commit）来完成，它允许您在提交之前检查（和修改）结果：

git cherry-pick -n <commit>

# unstage modifications you don't want to keep, and remove the
# modifications from the work tree as well.
# this does work recursively!
git checkout HEAD <path>

# commit; the message will have been stored for you by cherry-pick
git commit

如果绝大多数修改都是您不想要的，那么您可以重新设置所有内容，然后添加您想要的内容，而不是检查各个路径（中间步骤）：

# unstage everything
git reset HEAD

# stage the modifications you do want
git add <path>

# make the work tree match the index
# (do this from the top level of the repo)
git checkout .