git status
# On branch master
# Changes to be committed:
#
# modified: file1
# modified: file2
# modified: file3
# Unmerged paths:
# (use "git add/rm ..." as appropriate to mark resolution)
#
# both modified: file4
#
git checkout feature
git checkout -b temp
git rebase -i master
# Above will drop you in an editor and pick the changes you want ala:
pick 7266df7 First change
pick 1b3f7df Another change
pick 5bbf56f Last change
# Rebase b44c147..5bbf56f onto b44c147
#
# Commands:
# pick = use commit
# edit = use commit, but stop for amending
# squash = use commit, but meld into previous commit
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
#
git checkout master
git pull . temp
git branch -d temp
#!/bin/bash
# git-interactive-merge
from=$1
to=$2
git checkout $from
git checkout -b ${from}_tmp
git rebase -i $to
# Above will drop you in an editor and pick the changes you want
git checkout $to
git pull . ${from}_tmp
git branch -d ${from}_tmp
您可能希望将`git rebase -i $ to`更改为`git rebase -i $ to || $ SHELL`,这样如果rebase失败,用户可以根据需要调用`git --skip`等.还值得用"&&"而不是换行链接这些行. 不幸的是,似乎答案中的链接已经死了.
5> Chronial..：
还有另外一种方法:
git checkout -p
这是之间的混合git checkout,并git add -p与可能相当地正是你正在寻找:
-p, --patch
Interactively select hunks in the difference between the
(or the index, if unspecified) and the working tree. The chosen
hunks are then applied in reverse to the working tree (and if a
was specified, the index).
This means that you can use git checkout -p to selectively discard
edits from your current working tree. See the “Interactive Mode”
section of git-add(1) to learn how to operate the --patch mode.
这是迄今为止最简单,最简单的方法,只要您只有可管理的更改数量即可合并.我希望更多的人会注意到这个答案并提出它.示例:git checkout --patch exp1 file_to_merge 真正最简单的方法。git checkout -p featurebranch文件名。最好的是，当命令运行时，它会给您ay / n / e /？/ ...等。决定如何合并文件的选项。我尝试使用e，甚至可以在应用之前编辑补丁。多么酷。真正的一个班轮，用于合并其他分支机构的选择性文件。
#make a new branch ( this will be temporary)
git checkout -b newbranch
# grab the changes
git merge --no-commit featurebranch
# unstage those changes
git reset HEAD
(you can now see the files from the merge are unstaged)
# now you can chose which files are to be merged.
git add -p
# remember to "git add" any new files you wish to keep
git commit
12> Stunner..：
我发现这篇文章包含了最简单的答案.仅仅做:
$ #git checkout
例:
$ #pulling .gitignore file from branchB into current branch
$ git checkout branchB .gitignore
有关详细信息,请参阅帖子.
这并没有真正合并,它会覆盖当前分支上的文件.
13> dsieczko..：
最简单的方法是将您的仓库设置为要合并的分支然后运行,
git checkout [branch with file] [path to file you would like to merge]
如果你跑
git status
你会看到文件已经上演了......
然后跑
git commit -m "Merge changes on '[branch]' to [file]"
#!/bin/bash
E_BADARGS=65
if [ $# -ne 2 ]
then
echo "Usage: `basename $0` branch path"
exit $E_BADARGS
fi
git merge $1 --no-commit
IFS=$'\n'
# list of changes due to merge | replace nulls w newlines | strip lines to just filenames | ensure lines are unique
for f in $(git status --porcelain -z -uno | tr '\000' '\n' | sed -e 's/^[[:graph:]][[:space:]]\{1,\}//' | uniq); do
[[ $f == $2* ]] && continue
if git reset $f >/dev/null 2>&1; then
# reset failed... file was previously unversioned
echo Deleting $f
rm $f
else
echo Reverting $f
git checkout -- $f >/dev/null 2>&1
fi
done
unset IFS
京公网安备 11010802040832号 | 京ICP备19059560号-6 