Merge branch 'nk/diff-files-vs-fsmonitor'

[thirdparty/git.git] / Documentation / diff-options.txt

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 012daf9452d83956d28aef368da7108dfe094d38..ee52b65e4613b7dedf76ddb5278e87dbeed36c59 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -73,6 +73,11 @@ ifndef::git-format-patch[]
        Synonym for `-p --raw`.
 endif::git-format-patch[]
 
+ifdef::git-log[]
+-t::
+       Show the tree objects in the diff output.
+endif::git-log[]
+
 --indent-heuristic::
        Enable the heuristic that shifts diff hunk boundaries to make patches
        easier to read. This is the default.
@@ -441,10 +446,11 @@ 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 a partial prefix.  This is
-       independent of the `--full-index` option above, which controls
-       the diff-patch output format.  Non default number of
-       digits can be specified with `--abbrev=<n>`.
+       lines, show only a partial prefix.
+       In diff-patch output format, `--full-index` takes higher
+       precedence, i.e. if `--full-index` is specified, full blob
+       names will be shown regardless of `--abbrev`.
+       Non default number of digits can be specified with `--abbrev=<n>`.
 
 -B[<n>][/<m>]::
 --break-rewrites[=[<n>][/<m>]]::