All geek questions in one place

How to show copy and change in external diff tool?

$ 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

How to use external external diffftool to view "C093 App_LocalResources / viewSummary.aspx.resx Xpress / inc / App_LocalResources / ReviewApplication.ascx.resx"?

This command works, but I need to manually specify the path to the old and new file. I hope to specify only the new file, and git is the source, and lanuch is the comparison in my external diff.

$ git difftool HEAD^:App_LocalResources/viewSummary.aspx.resx HEAD:Xpress/inc/App_LocalResources/ReviewApplication.ascx.resx
+4
source share
1 answer

I understand .. You just need to use diffftool and give the same opportunity as git show

git difftool  -M -C --find-copies-harder 6348fc^ 6348fc
+3
source

Source: https://habr.com/ru/post/1689351/

More articles:


All Articles