Merge branch 'pk/rebase-in-c-2-basic'

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 206e3aef648a7af8d033c60385c4b73b45b08683..aab5453bbbb239931ee2006095135c8db9f0f9ea 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -29,6 +29,10 @@ guide is brought up. The 'man' program is used by default for this
 purpose, but this can be overridden by other options or configuration
 variables.
 
+If an alias is given, git shows the definition of the alias on
+standard output. To get the manual page for the aliased command, use
+`git COMMAND --help`.
+
 Note that `git --help ...` is identical to `git help ...` because the
 former is internally converted into the latter.