我正在尝试在 Xcode 中跟踪 assets.xcassets 文件中的差异,但我找不到 git blame 的方法。
1 回答
1
在终端中做差异很容易:
humlet:Assets.xcassets matt$ git diff 0e010a 6d516c -- Image.imageset/Contents.json
diff --git a/Testing/Assets.xcassets/Image.imageset/Contents.json b/Testing/Assets.xcassets/Image.imageset/Contents.json
index 6376a19..5804661 100644
--- a/Testing/Assets.xcassets/Image.imageset/Contents.json
+++ b/Testing/Assets.xcassets/Image.imageset/Contents.json
@@ -1,17 +1,30 @@
{
"images" : [
{
- "idiom" : "universal",
- "filename" : "me.jpg",
+ "idiom" : "iphone",
"scale" : "1x"
},
{
- "idiom" : "universal",
+ "idiom" : "iphone",
"scale" : "2x"
},
{
- "idiom" : "universal",
+ "idiom" : "iphone",
"scale" : "3x"
+ },
+ {
+ "idiom" : "ipad",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "filename" : "me.jpg",
+ "unassigned" : true,
+ "scale" : "1x"
}
],
"info" : {
如您所见,这两次提交之间发生的事情是我删除了插槽的“通用”显示并改为显示“iPhone”和“iPad”插槽。
于 2017-09-12T00:08:57.747 回答