Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Document --ignore-space-at-eol option.
[gitweb.git]
/
Documentation
/
git-merge.txt
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
-----------