Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/gitdiffcore: fix order in pickaxe description
author
Michael J Gruber
<git@drmicha.warpmail.net>
Tue, 18 May 2010 10:49:33 +0000
(12:49 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 19 May 2010 04:55:11 +0000
(21:55 -0700)
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>
Documentation/gitdiffcore.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
f3838ce
)
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
-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.