{"thread":{"id":"16803","subject":"[PATCH] git-mergetool: properly handle \"git mergetool -- filename\"","startedAt":"2008-12-20T01:01:01Z","lastAt":"2008-12-20T20:09:15Z","messageCount":2,"participants":["David Aguilar","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"98407","messageId":"593cce2ad8b4d21995b24f0186e846d98306ae60.1229734788.git.davvid@gmail.com","threadId":"16803","inReplyTo":null,"subject":"[PATCH] git-mergetool: properly handle \"git mergetool -- filename\"","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2008-12-20T01:01:01Z","receivedAt":"2008-12-20T01:01:01Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Like many git commands, git-mergetool allows \"--\" to signal\nthe end of option processing.  This adds a missing \"shift\"\nstatement so that this is correctly handled.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n git-mergetool.sh |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 94187c3..d4078a6 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -296,6 +296,7 @@ do\n \t    esac\n \t    ;;\n \t--)\n+\t    shift\n \t    break\n \t    ;;\n \t-*)\n-- \n1.6.1.rc3.38.gec9f0\n"},{"id":"98448","messageId":"7vocz6wqvo.fsf@gitster.siamese.dyndns.org","threadId":"16803","inReplyTo":"593cce2ad8b4d21995b24f0186e846d98306ae60.1229734788.git.davvid@gmail.com","subject":"Re: [PATCH] git-mergetool: properly handle \"git mergetool -- filename\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-12-20T20:09:15Z","receivedAt":"2008-12-20T20:09:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}