Merge branch 'tc/commit-abbrev-fix' into maint

[git.git] / Documentation / gitdiffcore.txt

diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 9de8caf5d11445f6db7193f7b7a4151c97befb29..5d91a7e5b3a40cbf41f03a81799c162775c36607 100644 (file)
--- 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
 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.
 
 string appeared in this changeset".  It also checks for the
 opposite case that loses the specified string.