简体   繁体   English

使用差异工具在上次提交和当前状态之间查看差异

[英]View diff with diff tool between last commit and current status

I know this must be a very basic question but I'm brand new to git . 我知道这肯定是一个非常基本的问题,但是我是git新手。

I want to launch the diff tool ( Meld in my case) to see the differences between my latest push (the status in the master branch in Github ) and the current status of my repo. 我想启动diff工具(以我的情况为Meld ),以查看最新推送( Github的master分支中的状态)与我的仓库当前状态之间的差异。 I have not committed any changes yet and if I run git status I see that some files have changed since my last commit+push. 我还没有提交任何更改,如果我运行git status我看到自从上次提交+推送以来某些文件已更改。

I've tried 我试过了

git diff --cached --color

but it does nothing. 但它什么也没做。

What command should I use? 我应该使用什么命令?

Try git difftool . 尝试git difftool That should launch your configured "difftool" from your ~/.gitconfig. 那应该从〜/ .gitconfig启动配置的“ difftool”。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM