【git】看懂git diff
来源:互联网 发布:win7系统优化工具 编辑:程序博客网 时间:2024/06/02 03:55
Git diff
可以用来比较:
1.staging area和working area的文件 (无其他参数时)
- git diff
2.master分支和working area的文件 (用master参数)
- git diff master
- git diff HEAD
4.用远程master分支比较当前工作区
- git diff refs/remotes/origin/master
5.经常还要用到master分支的某个文件的历史版本和working area的该文件的比较
- git diff 0c5ee16a6a4c849d0ae0448caa8ff174399c7c3c ./socket_helper.cpp
diff的命令输出格式注意:
- ---代表源文件
- +++代表目标文件
-开头的行,是只出现在源文件中的行
+开头的行,是只出现在目标文件中的行
空格开头的行,是源文件和目标文件中都出现的行
差异按照差异小结进行组织,每个差异小结的第一行都是定位语句,由@@开头,@@结尾。
- chenshu@chenshu-yangzhou-home:~/kaimei/data_service/src$ git diff 0c5ee16a6a4c849d0ae0448caa8ff174399c7c3c ./socket_helper.cpp
- diff --git a/data_service/src/socket_helper.cpp b/data_service/src/socket_helper.cpp
- index d606452..047e213 100755
- --- a/data_service/src/socket_helper.cpp
- +++ b/data_service/src/socket_helper.cpp
- @@ -4,6 +4,7 @@
- #include "data/login_response.h"
- #include "data/heartbeat_response.h"
- #include "helper/parser.h"
- +#include "helper/time_measure.h"
- #include <booster/log.h>
- #include "exception/socket_error.h"
- #include "exception/data_error.h"
1.某个提交记录0c5ee代表的socket_helper.cpp文件是源文件,当前working area的socket_helper文件是目标文件。
2.在源文件第4行开始的6行和目标文件第4行开始的7行构成一个差异小结
3.这个差异小结中,目标文件添加了一行#include "helper/time_measure.h"
4.其他空格开头的行表明没有差异。
0 0
- 【git】看懂git diff
- 【git】看懂git diff
- Git diff
- git diff
- git diff
- git diff
- git diff
- Git diff
- git diff
- Git diff
- git diff
- git diff
- git diff
- git diff
- Git diff
- git diff
- git diff
- git diff
- 在自己的网站上实现QQ授权登录
- 大型网站架构系列:缓存在分布式系统中的应用(一)
- Java基础: 位运算 << >> >>>
- 跨平台传输中使用base64来保证非ascii码字符串的完整性
- 如何让 Spring Boot 项目发布到 Tomcat 服务器
- 【git】看懂git diff
- 注意了!你的工资将决定这个冬天你的御寒方式!
- adb logcat 查看日志命令行用法
- 怎样才能将Excel中隐藏的列显示出来
- UVa 10017 - The Never Ending Towers of Hanoi
- ubuntu出现有线已连接却无法上网的解决方法(ubuntu连不上网)
- 菜鸟之--Python的一些使用
- Maven工程产生Jar时Main-Class和Class-Path的配置文件
- 帅呆了的a++