From dddfb3f1263d20a050890256dcbd5aeb00f221bb Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Sun, 21 Mar 2010 18:30:17 +0100 Subject: Documentation/gitdiffcore: Remove misleading date in heading Ever since the automatic conversion into man form, the heading contained a misidentified subheading reading "June 2005". Remove this since the documentation is more recent, and the correct date is in the footer. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/gitdiffcore.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/gitdiffcore.txt') diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index e8041bc08f..3cd21b64eb 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -3,7 +3,7 @@ gitdiffcore(7) NAME ---- -gitdiffcore - Tweaking diff output (June 2005) +gitdiffcore - Tweaking diff output SYNOPSIS -------- -- cgit v1.3 From d07ef715757ab1c2436c59adca92484fa46b2b41 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 18 May 2010 12:49:33 +0200 Subject: Documentation/gitdiffcore: fix order in pickaxe description Reverse the order of "origin" and "result" so that the sentence really describes an addition rather than a removal. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/gitdiffcore.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/gitdiffcore.txt') diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 9de8caf5d1..5d91a7e5b3 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -227,8 +227,8 @@ changes that touch a specified string, and is controlled by the commands. When diffcore-pickaxe is in use, it checks if there are -filepairs whose "original" side has the specified string and -whose "result" side does not. Such a filepair represents "the +filepairs whose "result" side has the specified string and +whose "origin" side does not. Such a filepair represents "the string appeared in this changeset". It also checks for the opposite case that loses the specified string. -- cgit v1.3 From a2c2cef0cd5210aa870e1d226d348a7ddd0277ff Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 31 Aug 2010 14:16:39 -0700 Subject: gitdiffcore doc: update pickaxe description The old text described the original design (one side does not have it at all while the other side has it); this was later amended to check if the number of occurrences changed, which is what we currently do with -S. Signed-off-by: Junio C Hamano --- Documentation/gitdiffcore.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/gitdiffcore.txt') diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 5d91a7e5b3..6af29a4603 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -227,9 +227,9 @@ changes that touch a specified string, and is controlled by the commands. When diffcore-pickaxe is in use, it checks if there are -filepairs whose "result" side has the specified string and -whose "origin" side does not. Such a filepair represents "the -string appeared in this changeset". It also checks for the +filepairs whose "result" side and whose "origin" side have +different number of specified string. Such a filepair represents +"the string appeared in this changeset". It also checks for the opposite case that loses the specified string. When `\--pickaxe-all` is not in effect, diffcore-pickaxe leaves -- cgit v1.3