diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-02 21:34:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-02 21:34:43 +0200 |
| commit | 3c6151dad310db71f599dbfbac329fa961f29794 (patch) | |
| tree | 0ee09af08ab3a485aeb9629250eaa8d6401d0b9b /send-pack.c | |
| parent | Sync with 2.3.5 (diff) | |
| parent | send-pack: unify error messages for unsupported capabilities (diff) | |
| download | git-3c6151dad310db71f599dbfbac329fa961f29794.tar.xz git-3c6151dad310db71f599dbfbac329fa961f29794.zip | |
Merge branch 'sb/atomic-push'
* sb/atomic-push:
send-pack: unify error messages for unsupported capabilities
Diffstat (limited to 'send-pack.c')
| -rw-r--r-- | send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/send-pack.c b/send-pack.c index 9d2b0c52ed..189bdde0c2 100644 --- a/send-pack.c +++ b/send-pack.c @@ -363,7 +363,7 @@ int send_pack(struct send_pack_args *args, return 0; } if (args->atomic && !atomic_supported) - die(_("server does not support --atomic push")); + die(_("the receiving end does not support --atomic push")); use_atomic = atomic_supported && args->atomic; |