git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Documentation/git-merge: at least one <remote> not two

From
jidanni@jidanni.org <jidanni@jidanni.org>
Date
Jan 1, 2009, 18:41 UTC
Message-ID
<87d4f6vph7.fsf@jidanni.org>
Make SYNOPSIS match usage message
Signed-off-by: jidanni <jidanni@jidanni.org>
---
 Documentation/git-merge.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f7be584..a3ac828 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
-	[-m <msg>] <remote> <remote>...
+	[-m <msg>] <remote>...
 'git merge' <msg> HEAD <remote>...
 
 DESCRIPTION

-- 
1.6.0.6
Next: Junio C Hamano
Message 1 of 3 in “Documentation/git-merge: at least one <remote> not two”
  1. Documentation/git-merge: at least one <remote> not twojidanni@jidanni.org, Jan 1, 2009
  2. Junio C HamanoJan 1, 2009
  3. Sitaram ChamartyJan 2, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.