diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-02-13 05:16:23 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-02-13 05:16:23 +0000 |
| commit | 5dad0838933088ec5053644099611e05dc078fec (patch) | |
| tree | 8d7054bb3c4c211bd66260ca6aa0a3472ce8dcbd /git-merge.txt | |
| parent | 9dd8bb07118fe70186522d7d8fd7da7a785a2a5e (diff) | |
| download | git-htmldocs-5dad0838933088ec5053644099611e05dc078fec.tar.gz | |
Autogenerated HTML docs for v1.5.0-rc4-359-g07fe
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 3c08a6f7d..e53ff4b4e 100644 --- a/git-merge.txt +++ b/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 ----------- |