Merge branch 'sh/rebase-i-p'

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index b08a08cd95b6da192a008c58d7973769dfe3fc8c..f1a570a874ff0ccc2c2ffb6271ac76529506c4cc 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -270,6 +270,15 @@ selectively enable/disable services per repository::
 ----------------------------------------------------------------
 
 
+ENVIRONMENT
+-----------
+'git-daemon' will set REMOTE_ADDR to the IP address of the client
+that connected to it, if the IP address is available. REMOTE_ADDR will
+be available in the environment of hooks called when
+services are performed.
+
+
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>, YOSHIFUJI Hideaki