X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=send-pack.c;h=b74fd454f2f09d23ffde7db015d4a7458dfcd348;hb=faf8280850e9af4ef63decd8d4e65a7609544c21;hp=5e127a1b7b33bdc9aaafc80873c5c987573566bd;hpb=784c099a30368af4238e2713e6220688119239a1;p=git.git

diff --git a/send-pack.c b/send-pack.c
index 5e127a1b7..b74fd454f 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -297,9 +297,9 @@ static int send_pack(int in, int out, struct remote *remote, int nr_refspec, cha
 				 * commits at the remote end and likely
 				 * we were not up to date to begin with.
 				 */
-				error("remote '%s' is not a strict "
-				      "subset of local ref '%s'. "
-				      "maybe you are not up-to-date and "
+				error("remote '%s' is not an ancestor of\n"
+				      " local  '%s'.\n"
+				      " Maybe you are not up-to-date and "
 				      "need to pull first?",
 				      ref->name,
 				      ref->peer_ref->name);