| commit | 60f8b895180409303e11fa09c1405865365a70be | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Mar 2018 22:54:03 +0000 (6 14:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Mar 2018 22:54:03 +0000 (6 14:54 -0800) | ||
| tree | 03adf6870e2ac80314fc5bc6847760678a366f6c | treesnapshot (tar.gz zip) |
| parent | 44f2f3f919353f4732910b6e0f10d5aae90bd5b7 | commitdiff |
| parent | 4bdd6e7ce33c72dfaa79c4139d30bd809ec8eda7 | commitdiff |
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
"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