summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-7.expect
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-12-22 12:39:39 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-22 12:39:39 -0800
commit69310a34cb6dcca32b08cf3ea9e91ab19354a874 (patch)
treeec479739306acda64f72421ac37c2ef79c8f880d /t/t4100/t-apply-7.expect
parent\n usage in stderr output (diff)
downloadtgif-69310a34cb6dcca32b08cf3ea9e91ab19354a874.tar.xz
send-pack: reword non-fast-forward error message.
Wnen refusing to push a head, we said cryptic "remote 'branch' object X does not exist on local" or "remote ref 'branch' is not a strict subset of local ref 'branch'". That was gittish. Since the most likely reason this happens is because the pushed head was not up-to-date, clarify the error message to say that straight, and suggest pulling first. First noticed by Johannes and seconded by Andreas. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4100/t-apply-7.expect')
0 files changed, 0 insertions, 0 deletions