Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index f1a570a874ff0ccc2c2ffb6271ac76529506c4cc..36f00aed6798d543b2ee8f7315e447726fa100e5 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -110,9 +110,9 @@ OPTIONS
 
 --user-path::
 --user-path=path::
-       Allow ~user notation to be used in requests.  When
+       Allow {tilde}user notation to be used in requests.  When
        specified with no parameter, requests to
-       git://host/~alice/foo is taken as a request to access
+       git://host/{tilde}alice/foo is taken as a request to access
        'foo' repository in the home directory of user `alice`.
        If `--user-path=path` is specified, the same request is
        taken as a request to access `path/foo` repository in