{"thread":{"id":"16909","subject":"[PATCH] bash: add '--merge' to 'git reset'","startedAt":"2008-12-29T15:05:46Z","lastAt":"2009-01-06T08:18:08Z","messageCount":2,"participants":["SZEDER Gábor","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"98891","messageId":"1230563146-18958-1-git-send-email-szeder@ira.uka.de","threadId":"16909","inReplyTo":null,"subject":"[PATCH] bash: add '--merge' to 'git reset'","fromName":"SZEDER Gábor","fromEmail":"szeder@ira.uka.de","sentAt":"2008-12-29T15:05:46Z","receivedAt":"2008-12-29T15:05:46Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>\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 3491fd0..f6c3755 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1408,7 +1408,7 @@ _git_reset ()\n \tlocal cur=\"${COMP_WORDS[COMP_CWORD]}\"\n \tcase \"$cur\" in\n \t--*)\n-\t\t__gitcomp \"--mixed --hard --soft\"\n+\t\t__gitcomp \"--merge --mixed --hard --soft\"\n \t\treturn\n \t\t;;\n \tesac\n-- \n1.6.1.57.gdceb8\n"},{"id":"99432","messageId":"7vmye4luf3.fsf@gitster.siamese.dyndns.org","threadId":"16909","inReplyTo":"1230563146-18958-1-git-send-email-szeder@ira.uka.de","subject":"Re: [PATCH] bash: add '--merge' to 'git reset'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-01-06T08:18:08Z","receivedAt":"2009-01-06T08:18:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks; applied.\n"}]}