Question

$ git log --name-status -M -C -1
commit 6348fc30be8c7eda09220c8f36468678dcb73837 (HEAD -> 256818)
Author: Qiqi Gu <gqqnb@gmail.com>
Date:   Tue Nov 14 14:15:10 2017 -0800

    - Extract controls so that they can be reused in ReviewApplication.aspx and viewSummary.aspx.
    - Revise to link to avoid an extra postback
    BugzID: 256818

M       App_LocalResources/viewSummary.aspx.pl.resx
M       App_LocalResources/viewSummary.aspx.resx
M       Xpress/LoanApp/App_LocalResources/ReviewApplication.aspx.pl.resx
M       Xpress/LoanApp/App_LocalResources/ReviewApplication.aspx.resx
M       Xpress/LoanApp/ReviewApplication.aspx
M       Xpress/LoanApp/ReviewApplication.aspx.vb
C093    App_LocalResources/viewSummary.aspx.resx        Xpress/inc/App_LocalResources/ReviewApplication.ascx.resx
C065    Xpress/LoanApp/ReviewApplication.aspx   Xpress/inc/ReviewApplication.ascx
A       Xpress/inc/ReviewApplication.ascx.vb
M       inc/LoanAppControls/ReturnHome.ascx
M       inc/LoanAppControls/ReturnHome.ascx.vb
M       viewSummary.aspx
M       viewSummary.aspx.vb

如何使用外部difftool进行查看 “C093 App_LocalResources / viewSummary.aspx.resx Xpress / inc / App_LocalResources / ReviewApplication.ascx.resx”？

此命令有效，但我必须手动指定旧文件和新文件的路径。我希望只指定新文件，然后git计算出原始文件，并在外部差异中进行比较。

$ git difftool HEAD^:App_LocalResources/viewSummary.aspx.resx HEAD:Xpress/inc/App_LocalResources/ReviewApplication.ascx.resx

Answer 1

我想出来..只需要使用difftool并提供与git show相同的选项

git difftool  -M -C --find-copies-harder 6348fc^ 6348fc

如何在外部差异工具中显示复制和修改？

1 个答案: