diff options
author | Jeff King <peff@peff.net> | 2008-12-10 04:25:19 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-12-10 19:07:35 -0800 |
commit | 07e62b733fad4236371a8cd6abc32409fb1fb87d (patch) | |
tree | 56fe6e2d7752e6731780037598e21babc5376821 /t/t5515/refs.br-remote-glob | |
parent | Fix typo in comment in builtin-add.c (diff) | |
download | tgif-07e62b733fad4236371a8cd6abc32409fb1fb87d.tar.xz |
rebase: improve error messages about dirty state
If you have unstaged changes in your working tree and try to
rebase, you will get the cryptic "foo: needs update"
message, but nothing else. If you have staged changes, you
get "your index is not up-to-date".
Let's improve this situation in two ways:
- for unstaged changes, let's also tell them we are
canceling the rebase, and why (in addition to the "needs
update" lines)
- for the staged changes case, let's use language that is a
little more clear to the user: their index contains
uncommitted changes
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-remote-glob')
0 files changed, 0 insertions, 0 deletions