merge-recursive: options to ignore whitespace changes

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index a741769742a0b65cf940a14b3fd391c621ca5f7d..7183aa9abbc35018dc50a7c0e5254cc72115af23 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -335,6 +335,10 @@ The 'extra-info' is again command-dependent.  If it is empty, the
 preceding SP is also omitted.  Currently, no commands pass any
 'extra-info'.
 
+The hook always runs after the automatic note copying (see
+"notes.rewrite.<command>" in linkgit:git-config.txt) has happened, and
+thus has access to these notes.
+
 The following command-specific comments apply:
 
 rebase::