From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Mar 2018 22:54:03 +0000 (-0800)
Subject: Merge branch 'pw/add-p-single'
X-Git-Tag: v2.17.0-rc0~43
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/60f8b895180409303e11fa09c1405865365a70be?ds=inline;hp=--cc

Merge branch 'pw/add-p-single'

"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
---

60f8b895180409303e11fa09c1405865365a70be