Merge branch 'xy/format-patch-prereq-patch-id-fix'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 30aad8396d17ed482f4ae0d3768af4495a21c966..41064909ee42bca9a5decd375bc62ad658ae3c81 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -133,7 +133,7 @@ These parameters can also be set individually with `--stat-width=<width>`,
        as file creations or deletions ("new" or "gone", optionally "+l"
        if it's a symlink) and mode changes ("+x" or "-x" for adding
        or removing executable bit respectively) in diffstat. The
-       information is put betwen the filename part and the graph
+       information is put between the filename part and the graph
        part. Implies `--stat`.
 
 --numstat::