相关疑难解决方法(0)

手册页git-diff很长,并解释了许多初学者似乎不需要的案例.例如:

git diff origin/master

我一直在从返回的信息中收集数据

git diff <commitId>..<commitId>

然后我遇到了 @@ -1 +1 @@

我无法弄清楚那是什么告诉我的.我在Google上搜索了一下,但无济于事.

以下是什么意思？

diff -rBNu src.orig/java/org/apache/nutch/analysis/NutchAnalysisConstants.java src/java/org/apache/nutch/analysis/NutchAnalysisConstants.java
--- src.orig/java/org/apache/nutch/analysis/NutchAnalysisConstants.java 2009-03-10 11:34:01.000000000 -0700
+++ src/java/org/apache/nutch/analysis/NutchAnalysisConstants.java  2009-03-10 14:11:55.000000000 -0700
@@ -4,9 +4,12 @@

+  int CJK = 21;
+  int DIGIT = 22;

   int DEFAULT = 0;

   String[] tokenImage = {
     "<EOF>",
+    "\"OR\"",
     "<WORD>",
     "<ACRONYM>",
     "<SIGRAM>",
@@ -39,6 +42,8 @@
     "\"\\\"\"",
     "\":\"",
     "\"/\"",
+    "\"(\"",
+    "\")\"",
     "\".\"",
     "\"@\"",
     "\"\\\'\"",

我的HTTP响应头中有"Server:Apache",并希望将其删除.我按照说明添加到httpd.conf:

ServerSignature Off  
ServerTokens Prod
Header unset Server

但最后一行没有效果.前两行改变了标题的内容(之前它还包含有关OS和PHP的信息),但我需要完全删除它.这该怎么做？