reflog inspection: introduce shortcut "-g"

[git.git] / Documentation / git-merge.txt

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0f79665ea6e6bf1ffd4ff67f7aee2fcbddec0555..3c08a6f7db0954d2a7fea46b0309434766f73b68 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -3,7 +3,7 @@ git-merge(1)
 
 NAME
 ----
-git-merge - Grand Unified Merge Driver
+git-merge - Join two or more development histories together
 
 
 SYNOPSIS