summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-22 14:35:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-22 14:35:57 -0700
commitf71be5cc062e23c481944ba3f7e6d25fdcf58f28 (patch)
tree50a72ab2c11c9fe476f9c4de79d4c782714d21a4 /Documentation/diff-options.txt
parentMerge branch 'vr/help-per-platform' (diff)
parentDocumentation: Fix misspellings (diff)
downloadtgif-f71be5cc062e23c481944ba3f7e6d25fdcf58f28.tar.xz
Merge branch 'maint'
* maint: Documentation: Fix misspellings
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6cfedd85dc..cf4b216598 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -59,7 +59,7 @@ endif::git-format-patch[]
Generate a diffstat. By default, as much space as necessary
will be used for the filename part, and the rest for the graph
part. Maximum width defaults to terminal width, or 80 columns
- if not connected to a terminal, and can be overriden by
+ if not connected to a terminal, and can be overridden by
`<width>`. The width of the filename part can be limited by
giving another width `<name-width>` after a comma. The width
of the graph part can be limited by using