{"thread":{"id":"39123","subject":"[PATCH] Documentation/git-merge.txt: improve SYNOPSIS","startedAt":"2015-04-21T11:08:08Z","lastAt":"2015-04-21T11:08:08Z","messageCount":1,"participants":["sorganov@gmail.com"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"259730","messageId":"1429614488-20731-1-git-send-email-sorganov@gmail.com","threadId":"39123","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge.txt: improve SYNOPSIS","fromName":"","fromEmail":"sorganov@gmail.com","sentAt":"2015-04-21T11:08:08Z","receivedAt":"2015-04-21T11:08:08Z","isPatch":true,"sender":{"key":"sorganov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8501568?v=4"},"body":"From: Sergey Organov <sorganov@gmail.com>\n\nGet rid of outdated explicit list of options.\n\nReflect that the obsolete form:\n\n'git merge' <msg> HEAD <commit>...\n\ncould also have options.\n\nSigned-off-by: Sergey Organov <sorganov@gmail.com>\n---\n Documentation/git-merge.txt | 6 ++----\n 1 file changed, 2 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 1f94908..1de61a4 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -9,10 +9,8 @@ git-merge - Join two or more development histories together\n SYNOPSIS\n --------\n [verse]\n-'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]\n-\t[-s <strategy>] [-X <strategy-option>] [-S[<key-id>]]\n-\t[--[no-]rerere-autoupdate] [-m <msg>] [<commit>...]\n-'git merge' <msg> HEAD <commit>...\n+'git merge' [options] [-m <msg>] [<commit>...]\n+'git merge' [options] <msg> HEAD <commit>...\n 'git merge' --abort\n \n DESCRIPTION\n-- \n1.9.3\n"}]}