git-status: do not be totally useless in a read-only repository.

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0f79665ea6e6bf1ffd4ff67f7aee2fcbddec0555..e53ff4b4e7464079ac6e19f2bceafcb44044fb39 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -3,14 +3,14 @@ git-merge(1)
 
 NAME
 ----
-git-merge - Grand Unified Merge Driver
+git-merge - Join two or more development histories together
 
 
 SYNOPSIS
 --------
 [verse]
 'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
-       -m=<msg> <remote> <remote>...
+       [-m <msg>] <remote> <remote>...
 
 DESCRIPTION
 -----------