diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-12-22 12:39:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-22 12:39:39 -0800 |
| commit | 69310a34cb6dcca32b08cf3ea9e91ab19354a874 (patch) | |
| tree | ec479739306acda64f72421ac37c2ef79c8f880d /Documentation/diff-options.txt | |
| parent | \n usage in stderr output (diff) | |
| download | tgif-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 'Documentation/diff-options.txt')
0 files changed, 0 insertions, 0 deletions