summaryrefslogtreecommitdiff
path: root/daemon.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-03-06 14:54:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-03-06 14:54:03 -0800
commit60f8b895180409303e11fa09c1405865365a70be (patch)
tree03adf6870e2ac80314fc5bc6847760678a366f6c /daemon.c
parentMerge branch 'sg/t6300-modernize' (diff)
parentadd -p: improve error messages (diff)
downloadtgif-60f8b895180409303e11fa09c1405865365a70be.tar.xz
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
Diffstat (limited to 'daemon.c')
0 files changed, 0 insertions, 0 deletions