有没有一个标志可以在
基本上,我希望它在合并重命名的文件时,而不是认为它们被删除。
git-mergetool
中像git-log
的--follow
一样运行? --follow
Continue listing the history of a file beyond renames (works only
for a single file).
基本上,我希望它在合并重命名的文件时,而不是认为它们被删除。
git-mergetool
提供以下功能: When git mergetool is invoked with this tool (either through the -t
or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name
of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing
the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be
merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
在文件被重命名/移动的情况下,我希望BASE/LOCAL/REMOTE仍然能够正常工作。我希望git-mergetool
可以“跟随”将BASE重命名为LOCAL或REMOTE,具体取决于情况。