是否有git-mergetool
的標誌,其行爲如同--follow
從git-log
?git mergetool --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」。
請不要編輯問題以完全更改它。而是提出一個新問題。在整個變更之前,我已經把它回滾到了這個版本。 – qqx