diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-31 22:11:21 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-31 22:11:21 +0000 |
| commit | 9e39507860f707da6967f6e2cdec8974241d9918 (patch) | |
| tree | 9c57a3d231215b8d48a0dd06221fdd4f22d70416 /git-merge.txt | |
| parent | 7f80ae8006f163acc614aebc362adf92788b20a6 (diff) | |
| download | git-htmldocs-9e39507860f707da6967f6e2cdec8974241d9918.tar.gz | |
Autogenerated HTML docs for v1.6.0-rc1-34-g0fe8c
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.txt b/git-merge.txt index 2db888098..17a15acb0 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -32,8 +32,8 @@ include::merge-options.txt[] it is created). The 'git-fmt-merge-msg' script can be used to give a good default for automated 'git-merge' invocations. -<remote>:: - Other branch head merged into our branch. You need at +<remote>...:: + Other branch heads to merge into our branch. You need at least one <remote>. Specifying more than one <remote> obviously means you are trying an Octopus. |