{"thread":{"id":"21576","subject":"[PATCH] bash: add the merge option --ff-only","startedAt":"2009-11-11T04:49:07Z","lastAt":"2009-11-11T04:49:07Z","messageCount":1,"participants":["Björn Gustavsson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127293","messageId":"4AFA4243.4090305@gmail.com","threadId":"21576","inReplyTo":null,"subject":"[PATCH] bash: add the merge option --ff-only","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-11-11T04:49:07Z","receivedAt":"2009-11-11T04:49:07Z","isPatch":true,"sender":{"key":"bgustavsson@gmail.com","avatar":"https://avatars.githubusercontent.com/u/74840?v=4"},"body":"Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>\n---\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e3ddecc..a0917d1 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1224,7 +1224,7 @@ _git_log ()\n \n __git_merge_options=\"\n \t--no-commit --no-stat --log --no-log --squash --strategy\n-\t--commit --stat --no-squash --ff --no-ff\n+\t--commit --stat --no-squash --ff --no-ff --ff-only\n \"\n \n _git_merge ()\n-- \n1.6.5.1.69.g36942\n"}]}