diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-11-02 22:39:44 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-03 21:29:18 -0700 |
| commit | 00ae82895e7f30e52ff12edc1076409c7c53d99e (patch) | |
| tree | 6da5a6c41d4cee71a7ab986809ae6b7f01eb7408 /builtin-branch.c | |
| parent | e3d6d56f1c2097f13a427e158638e5e0918e5705 (diff) | |
| download | git-00ae82895e7f30e52ff12edc1076409c7c53d99e.tar.gz | |
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>
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index d6d5cff6b8..fbd90e42d1 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -148,7 +148,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds) if (!force && !in_merge_bases(rev, &head_rev, 1)) { - error("The branch '%s' is not a strict subset of " + error("The branch '%s' is not an ancestor of " "your current HEAD.\n" "If you are sure you want to delete it, " "run 'git branch -D %s'.", argv[i], argv[i]); |