From: Marc Strapetz <marc.strapetz@syntevo.com>
To: git@vger.kernel.org
Subject: non-interactive rebase opens vim
Date: Wed, 23 Feb 2011 14:21:08 +0100 [thread overview]
Message-ID: <4D6509C4.4000501@syntevo.com> (raw)
I've started a non-interactive rebase (of 3 commits) which results in a
conflict for the first commit. After resolving the conflict, I've invoked
git rebase --continue
which brings up vim. I would not expect that. The main problem with this
behavior is that, when invoked from our GUI client, this results in the
client hanging forever. What forces git to open vim and how can I avoid
that?
git version 1.7.3.1.msysgit.0
--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com
next reply other threads:[~2011-02-23 13:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 13:21 Marc Strapetz [this message]
2011-02-23 13:38 ` non-interactive rebase opens vim Marc Weber
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=4D6509C4.4000501@syntevo.com \
--to=marc.strapetz@syntevo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).