| 组合差异 | git diff 显示含冲突标记的区块 |
|---|---|
| 单侧对比 | git diff --ours / git diff --theirs |
| 索引对比 | git diff :2:file :3:file 比较两方版本 |
常用示例
常用示例
git diff
git diff --ours -- src/app.js
git diff --theirs -- src/app.js
git diff :2:src/app.js :3:src/app.js组合差异在暂存前显示，git add 之后该文件从 git diff 输出中消失，改用 git diff --cached 查看已解决内容。