Merge branch 'es/format-patch-doc-hide-no-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)
commita3fa565...276ed923ef079188459242f3f7e6264d
tree90b3a76...3ef323acd739dc9f1fae5be72e22e5b8copy hash to clipboard (tree)
parent3c383a3...c854232b2a678110dd191b639a8b7989copy hash to clipboard (diff)
parentb73a1bc...1a9f9290bdc024c816d6c41b353c5eabcopy hash to clipboard (diff)
Documentation/diff-options.txt