From: Johannes Sixt <J.Sixt@eudaptics.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] A more sensible error message why 'git rebase --continue' failed
Date: Mon, 20 Aug 2007 11:35:28 +0200 [thread overview]
Message-ID: <46C96060.7AC79FAD@eudaptics.com> (raw)
In-Reply-To: 11875724181583-git-send-email-evan@fallingsnow.net
Evan Phoenix wrote:
>
> The current message is a bit cryptic, indicating that only changes which contained
> merge conflicts should be added to the index, but in fact, all outstanding
> changes must be.
I don't think that all files must be added if rebase -m was used: in
this case, non-conflicting changes are already in the index.
-- Hannes
prev parent reply other threads:[~2007-08-20 9:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 1:13 [PATCH] A more sensible error message why 'git rebase --continue' failed Evan Phoenix
2007-08-20 6:25 ` Junio C Hamano
2007-08-20 7:10 ` Evan Phoenix
2007-08-20 13:59 ` Steven Grimm
2007-08-20 9:35 ` Johannes Sixt [this message]
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=46C96060.7AC79FAD@eudaptics.com \
--to=j.sixt@eudaptics.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.