errors: "strict subset" -> "ancestor"
authorJ. Bruce Fields <bfields@citi.umich.edu>
Sat, 3 Nov 2007 02:39:44 +0000 (22:39 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Nov 2007 04:29:18 +0000 (21:29 -0700)
commit00ae82895e7f30e52ff12edc1076409c7c53d99e
tree6da5a6c41d4cee71a7ab986809ae6b7f01eb7408
parente3d6d56f1c2097f13a427e158638e5e0918e5705
errors: "strict subset" -> "ancestor"

The term "ancestor" is a bit more intuitive (and more consistent with
the documentation) than the term "strict subset".

Also, remove superfluous "ref", capitalize, and add some carriage
returns, changing:

    error: remote 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'. maybe you are not up-to-date and need to pull first?
    error: failed to push to 'ssh://linux-nfs.org/~bfields/exports/git.git'

to:

    error: remote 'refs/heads/master' is not an ancestor of
    local 'refs/heads/master'.
    Maybe you are not up-to-date and need to pull first?
    error: failed to push to 'ssh://linux-nfs.org/~bfields/exports/git.git'

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-branch.c
http-push.c
send-pack.c