summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2010-05-18 12:49:33 +0200
committerJunio C Hamano <gitster@pobox.com>2010-05-18 21:55:11 -0700
commitd07ef715757ab1c2436c59adca92484fa46b2b41 (patch)
tree37883189179f08a04af44bff9d6cf3bb654e942b
parentf3838ce16aaa8ab576a78c980b0962226f6e7a33 (diff)
downloadgit-d07ef715757ab1c2436c59adca92484fa46b2b41.tar.gz
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 <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/gitdiffcore.txt4
1 files changed, 2 insertions, 2 deletions
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.