{"thread":{"id":"12035","subject":"[PATCH] rebase -i: accept -m as advertised in the man page","startedAt":"2008-02-11T13:45:26Z","lastAt":"2008-02-11T13:45:26Z","messageCount":1,"participants":["Uwe Kleine-König"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"68392","messageId":"1202737526-18210-1-git-send-email-Uwe.Kleine-Koenig@digi.com","threadId":"12035","inReplyTo":null,"subject":"[PATCH] rebase -i: accept -m as advertised in the man page","fromName":"Uwe Kleine-König","fromEmail":"uwe.kleine-koenig@digi.com","sentAt":"2008-02-11T13:45:26Z","receivedAt":"2008-02-11T13:45:26Z","isPatch":true,"sender":{"key":"u.kleine-koenig@pengutronix.de","avatar":"https://gravatar.com/avatar/354b5e3ceb2806a2f1e1e382ac29ddbdad18288654da62b61eb13583a857eee7?d=mp&s=160"},"body":"Signed-off-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>\n---\n git-rebase--interactive.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 402ff37..fb12b03 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -432,7 +432,7 @@ do\n \t\t\tshift ;;\n \t\tesac\n \t\t;;\n-\t--merge)\n+\t-m|--merge)\n \t\t# we use merge anyway\n \t\t;;\n \t-C*)\n-- \n1.5.4\n"}]}