Merge branch 'jk/parse-options-concat' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:23 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Aug 2016 18:55:24 +0000 (11:55 -0700)
commit60b84ba...6c588c09759b90b96e072cceb862a859
tree90b7431...65568e56ad10815a9a005682d54a5a95copy hash to clipboard (tree)
parentdbc5276...edbe5ac86951a054e6e8ae610f073d9dcopy hash to clipboard (diff)
parent023ff39...2994804e4a7b2274b22336bdb37d4a54copy hash to clipboard (diff)