summaryrefslogtreecommitdiffstats
path: root/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-31 23:04:31 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-31 23:04:31 +0000
commit167b1384c594ba1ce67e6aae4e4c3cfb304bf025 (patch)
tree31e32edd1f8c3544e90e2768653cffa0be026cf1 /diff-format.txt
parent197c229dba62a22dd8e42d6fc026a00de2944081 (diff)
downloadgit-htmldocs-167b1384c594ba1ce67e6aae4e4c3cfb304bf025.tar.gz
Autogenerated HTML docs for v1.7.0-rc1-7-gc0da5
Diffstat (limited to 'diff-format.txt')
-rw-r--r--diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-format.txt b/diff-format.txt
index b71712473..15c7e794f 100644
--- a/diff-format.txt
+++ b/diff-format.txt
@@ -19,7 +19,7 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
git-diff-files [<pattern>...]::
compares the index and the files on the filesystem.
-The "git-diff-tree" command begins its ouput by printing the hash of
+The "git-diff-tree" command begins its output by printing the hash of
what is being compared. After that, all the commands print one output
line per changed file.