diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2008-08-17 06:25:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-16 23:21:18 -0700 |
| commit | 9b752a6e31f93f2925856a0c0607c2ffc2a93375 (patch) | |
| tree | f397949119d809a4ce7524e5377133ad149d5651 /t/t4100-apply-stat.sh | |
| parent | 20a55f4b2ef033dbb4a344e467716e03e13263a4 (diff) | |
| download | git-9b752a6e31f93f2925856a0c0607c2ffc2a93375.tar.gz git-9b752a6e31f93f2925856a0c0607c2ffc2a93375.tar.xz | |
Improve error output of git-rebase
"git rebase" without arguments on initial startup showed:
fatal: Needed a single revision
invalid upstream
This patch makes it show the ordinary usage string.
If .git/rebase-merge or .git/rebase-apply/rebasing exists, git-rebase
will die with a message saying that a rebase is in progress and the user
should try --skip/--abort/--continue.
If .git/rebase-apply/applying exists, git-rebase will die with a message
saying that git-am is in progress, regardless how many arguments are
given.
If no arguments are given and .git/rebase-apply/ exists, but neither a
rebasing nor applying file is in that directory, git-rebase dies with a
message saying that rebase-apply exists and no arguments were given.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4100-apply-stat.sh')
0 files changed, 0 insertions, 0 deletions