是否可将一定数量的未解析内容添加到一个diff文件中
发布于 2018-02-06 12:00:55
统一的diff以两个行头开始:
--- from-file from-file-modification-time
+++ to-file to-file-modification-time
忽略此标头之前的任何内容,可以在这里添加任何注释,例如:
This may be some useful description of this patch that
will be ignored by the diff/patch utility.
--- a/foo 2002-02-21 23:30:39.942229878 -0800
+++ b/foo 2002-02-21 23:30:50.442260588 -0800
@@ -1,7 +1,6 @@
-The Way that can be told of is not the eternal Way;
-The name that can be named is not the eternal name.
The Nameless is the origin of Heaven and Earth;
-The Named is the mother of all things.
+The named is the mother of all things.
+
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
GIT本身在标题之前使用这个空间来获取一些元数据,例如:
diff --git a/foo b/foo
index 59a4d1f..e48dfe7 100644
--- a/foo
+++ b/foo
发布于 2018-02-06 13:08:39
可以用#
而不是-
或+
在diff文件中用于内联注释(可由GNU修补程序识别),或在@JakubJirutka提到的开头添加注释
This may be some useful description of this patch that
will be ignored by the diff/patch utility.
--- a/foo 2002-02-21 23:30:39.942229878 -0800
+++ b/foo 2002-02-21 23:30:50.442260588 -0800
@@ -1,7 +1,6 @@
# comments on the deletion of the two lines
-The Way that can be told of is not the eternal Way;
-The name that can be named is not the eternal name.
The Nameless is the origin of Heaven and Earth;
-The Named is the mother of all things.
+The named is the mother of all things.
+
Therefore let there always be non-being,
so we may see their subtlety,
And let there always be being,
https://stackoverflow.com/questions/-100007344
复制相似问题