summaryrefslogtreecommitdiff
path: root/Documentation/diff-generate-patch.txt
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2008-12-19 12:14:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-20 03:10:46 (GMT)
commit04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2 (patch)
treef2756934c58c5f1e0e94709009847894af512b9c /Documentation/diff-generate-patch.txt
parent87c8a56e4f71cc7e22c16caa4adc2ae17f6aa93d (diff)
downloadgit-04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2.zip
git-04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2.tar.gz
git-04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2.tar.bz2
Documentation: fix typos, grammar, asciidoc syntax
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
-rw-r--r--Documentation/diff-generate-patch.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 517e1eb..0f25ba7 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -143,15 +143,15 @@ different from it.
A `-` character in the column N means that the line appears in
fileN but it does not appear in the result. A `+` character
-in the column N means that the line appears in the last file,
+in the column N means that the line appears in the result,
and fileN does not have that line (in other words, the line was
added, from the point of view of that parent).
In the above example output, the function signature was changed
from both files (hence two `-` removals from both file1 and
file2, plus `++` to mean one line that was added does not appear
-in either file1 nor file2). Also two other lines are the same
-from file1 but do not appear in file2 (hence prefixed with ` +`).
+in either file1 nor file2). Also eight other lines are the same
+from file1 but do not appear in file2 (hence prefixed with `{plus}`).
When shown by `git diff-tree -c`, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the