diff options
author | Jeff King <peff@peff.net> | 2017-03-16 20:19:42 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-03-17 10:31:48 -0700 |
commit | 994292130121175dcb53f72541b7445e4b054d75 (patch) | |
tree | 90459e6ab2e776777fb7147d0cf0e627e3f08dd8 /builtin/diff.c | |
parent | rebase -i: use the rebase--helper builtin (diff) | |
download | tgif-994292130121175dcb53f72541b7445e4b054d75.tar.xz |
sequencer: drop "warning:" when stopping for edit
Since the conversion from shell to C in 56dc3ab04 (sequencer
(rebase -i): implement the 'edit' command, 2017-01-02),
stopping at an "edit" instruction went from:
$ git rebase -i
Stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
You can amend the commit now, with
[...more instructions...]
to:
$ git rebase -i
warning: stopped at 6ce6b914a... odb_pack_keep(): stop generating keepfile name
You can amend the commit now, with
[...more instructions...]
The "warning" implies that it's something unexpected, but
it's not. Let's switch back to the original message.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions