projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2055f3b
)
git merge documentation: -m is optional
author
Matthias Lederhofer
<matled@gmx.net>
Mon, 5 Feb 2007 11:37:27 +0000
(12:37 +0100)
committer
Junio C Hamano
<junkio@cox.net>
Tue, 13 Feb 2007 03:19:45 +0000
(19:19 -0800)
Changed -m=<msg> to -m <msg> too.
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-merge.txt
patch
|
blob
|
history
diff --git
a/Documentation/git-merge.txt
b/Documentation/git-merge.txt
index 3c08a6f7db0954d2a7fea46b0309434766f73b68..e53ff4b4e7464079ac6e19f2bceafcb44044fb39 100644
(file)
--- 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
-----------