summaryrefslogtreecommitdiffstats
path: root/git-diff.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
committerJunio C Hamano <junio@hera.kernel.org>2006-06-04 07:24:48 +0000
commit341071d878757c06a3931db660fe318effc8317e (patch)
tree8cb7bf28351c062adbe71172b942a3228d40725d /git-diff.txt
parentbb8fb05ed082c81af81f9eecf356f993e2ef83b7 (diff)
downloadgit-htmldocs-341071d878757c06a3931db660fe318effc8317e.tar.gz
Autogenerated HTML docs for v1.3.3-g16a4
Diffstat (limited to 'git-diff.txt')
-rw-r--r--git-diff.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-diff.txt b/git-diff.txt
index 7267bcd7a..7ab208037 100644
--- a/git-diff.txt
+++ b/git-diff.txt
@@ -85,7 +85,7 @@ $ git diff arch/i386 include/asm-i386 <3>
nor deletion.
<2> show only names and the nature of change, but not actual
diff output. --name-status disables usual patch generation
-which in turn also disables recursive behaviour, so without -r
+which in turn also disables recursive behavior, so without -r
you would only see the directory name if there is a change in a
file in a subdirectory.
<3> limit diff output to named subtrees.