From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2018 19:15:11 +0000 (-0800)
Subject: Merge branch 'pw/add-p-single' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e2bd585e36b95b2716478bfdc8a30a977876dc6?hp=--cc

Merge branch 'pw/add-p-single' into next

"git add -p" used to offer "/" (look for a matching hunk) as a
choice, even there was only one hunk, which has been corrected.
Also the single-key help is now given only for keys that are
enabled (e.g. help for '/' won't be shown when there is only one
hunk).

* pw/add-p-single:
add -p: improve error messages
add -p: only bind search key if there's more than one hunk
add -p: only display help for active keys
---

0e2bd585e36b95b2716478bfdc8a30a977876dc6