summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMatthias Lederhofer <matled@gmx.net>2007-02-05 11:37:27 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-13 03:19:45 (GMT)
commit1e8b0d486e9b244eb1692886ffb50ef728696c52 (patch)
tree7e5e6bac2886199b23be662fb6b2e317a7706e3b /Documentation/git-merge.txt
parent2055f3b5780daae6ec841cd47cae53358cb8827d (diff)
downloadgit-1e8b0d486e9b244eb1692886ffb50ef728696c52.zip
git-1e8b0d486e9b244eb1692886ffb50ef728696c52.tar.gz
git-1e8b0d486e9b244eb1692886ffb50ef728696c52.tar.bz2
git merge documentation: -m is optional
Changed -m=<msg> to -m <msg> too. Signed-off-by: Matthias Lederhofer <matled@gmx.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3c08a6f..e53ff4b 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git-merge' [-n] [--no-commit] [--squash] [-s <strategy>]...
- -m=<msg> <remote> <remote>...
+ [-m <msg>] <remote> <remote>...
DESCRIPTION
-----------