有没有git-mergetool
表现得像--follow
from的标志git-log
?
--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,视情况而定。