Merge branch 'jk/config-path-include-fix' into maint

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index bf824108c116a34972d1dacf1e9fb77db097b2c5..058ac0dc854bfd55a13dd0776beaf36b37e8b8a9 100644 (file)
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -24,6 +24,8 @@ objects unreachable from any of these head objects from the object database.
 In addition, it
 prunes the unpacked objects that are also found in packs by
 running 'git prune-packed'.
+It also removes entries from .git/shallow that are not reachable by
+any ref.
 
 Note that unreachable, packed objects will remain.  If this is
 not desired, see linkgit:git-repack[1].