diff options
| author |  Stephan Beyer <s-beyer@gmx.net> | 2016-12-07 22:51:30 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-12-08 09:09:44 -0800 |
| commit | 1868331f136cfda63ec3296dad66b48f7e9ffe00 (patch) | |
| tree | 5baa5e1a96f9e57c684b7f5ba59dcd7d6835ebb0 /http-push.c | |
| parent | am: fix filename in safe_to_abort() error message (diff) | |
| download | tgif-1868331f136cfda63ec3296dad66b48f7e9ffe00.tar.xz | |
am: change safe_to_abort()'s not rewinding error into a warning
The error message tells the user that something went terribly wrong
and the --abort could not be performed. But the --abort is performed,
only without rewinding. By simply changing the error into a warning,
we indicate the user that she must not try something like
"git am --abort --force", instead she just has to check the HEAD.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-push.c')
0 files changed, 0 insertions, 0 deletions