| commit | 07e62b733fad4236371a8cd6abc32409fb1fb87d | |
| author | Jeff King <peff@peff.net> | |
| Wed, 10 Dec 2008 09:25:19 +0000 (10 04:25 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Dec 2008 03:07:35 +0000 (10 19:07 -0800) | ||
| tree | 56fe6e2d7752e6731780037598e21babc5376821 | treesnapshot (tar.gz zip) |
| parent | 71fe9451312b159eb4d42a9407c6f9e8b6b26176 | commitdiff |
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>
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>
| git-rebase.sh | diffblobblamehistory |