From: Stephan Beyer <s-beyer@gmx.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH try2] Improve error output of git-rebase
Date: Sun, 17 Aug 2008 06:11:35 +0200 [thread overview]
Message-ID: <20080817041135.GA23513@leksak.fem-net> (raw)
In-Reply-To: <1218945930-29281-1-git-send-email-s-beyer@gmx.net>
Hi,
Stephan Beyer wrote:
> @@ -285,7 +294,7 @@ else
> if test -d "$dotest"
> then
> die "previous rebase directory $dotest still exists." \
> - 'try git-rebase < --continue | --abort >'
> + 'Try git-rebase (--continue | --abort | --skip)'
^^
This should perhaps be dashless. :\
And when "git rebase -m" has been invoked, a conflict occurs and the
user is typing "git rebase", then
fatal: Needed a single revision
invalid upstream
shows up again. So the patch does not affect all cases... :|
Regards
--
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
next prev parent reply other threads:[~2008-08-17 4:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-17 0:26 [PATCH] Improve error output of git-rebase without any arguments Stephan Beyer
2008-08-17 2:37 ` Junio C Hamano
2008-08-17 4:05 ` [PATCH try2] Improve error output of git-rebase Stephan Beyer
2008-08-17 4:11 ` Stephan Beyer [this message]
2008-08-17 4:25 ` [PATCH try3] " Stephan Beyer
2008-08-17 5:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080817041135.GA23513@leksak.fem-net \
--to=s-beyer@gmx.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox