Merge branch 'pj/maint-ldflags'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 671f533ca30c1fb0ddae8a15f9c586c431c8fef5..43793d75005a7af875a055d377a8ab6a13510682 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -116,7 +116,7 @@ endif::git-format-patch[]
 --abbrev[=<n>]::
        Instead of showing the full 40-byte hexadecimal object
        name in diff-raw format output and diff-tree header
-       lines, show only handful hexdigits prefix.  This is
+       lines, show only a partial prefix.  This is
        independent of --full-index option above, which controls
        the diff-patch output format.  Non default number of
        digits can be specified with --abbrev=<n>.