Merge branch 'as/diff-options-grammofix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Aug 2017 16:29:14 +0000 (09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Aug 2017 16:29:14 +0000 (09:29 -0700)
commitddd1133...5e1c549ff9b73c6aafc16460dcf3570e
tree489bf58...46f6304564d0f3028a1f67dc36a7f098copy hash to clipboard (tree)
parent384a8b2...1c076693d00c97184b5c41ab3a95e64dcopy hash to clipboard (diff)
parentbc9b7e2...7f4bca81bd6aa46a078aa9f87017dc06copy hash to clipboard (diff)