From: Marcin Borkowski <mbork@mbork.pl>
To: Help Gnu Emacs mailing list <help-gnu-emacs@gnu.org>
Subject: Re: A problem with Magit
Date: Sun, 26 Jul 2015 21:21:36 +0200 [thread overview]
Message-ID: <87k2tmg1xb.fsf@mbork.pl> (raw)
In-Reply-To: <87k2tn2q8n.fsf@mbork.pl>
Hi there,
I found the culprit: it was a good ol'editing conflict. The two commits
I wanted to swap involved edits too close to each other.
Best,
mb
On 2015-07-26, at 12:00, Marcin Borkowski <mbork@mbork.pl> wrote:
> Hi all,
>
> I tried interactive rebase in Magit today, and ran into this (in the
> magit-process buffer):
>
> ,----
> | Waiting for Emacs...
> | *ERROR*: Canceled by user
> | Could not execute editor
> `----
>
> All I did was to swap to commits, so theoretically this should run
> smoothly.
>
> The only Magit-relevant setting in my init.el is (setq
> magit-revert-buffers nil).
>
> However, there is one (potential) problem: when I start Magit, I see
> this:
>
> ,----
> | Error (magit): Magit requires Git >= 1.9.4, you are using 1.9.1.
> `----
>
> I'm not sure whether this is relevant, but I include it here just in
> case. (Of course, I'm going to upgrade my Ubuntu ASAP.)
>
> Where should I look for solution?
>
> Best,
--
Marcin Borkowski
http://octd.wmi.amu.edu.pl/en/Marcin_Borkowski
Faculty of Mathematics and Computer Science
Adam Mickiewicz University
next prev parent reply other threads:[~2015-07-26 19:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-26 10:00 A problem with Magit Marcin Borkowski
2015-07-26 14:13 ` Michael Heerdegen
2015-07-26 19:19 ` Marcin Borkowski
2015-07-26 14:37 ` John Mastro
2015-07-26 19:18 ` Marcin Borkowski
2015-07-26 19:21 ` Marcin Borkowski [this message]
[not found] <mailman.7409.1437904828.904.help-gnu-emacs@gnu.org>
2015-07-26 15:39 ` Rusi
2015-07-26 19:20 ` Marcin Borkowski
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87k2tmg1xb.fsf@mbork.pl \
--to=mbork@mbork.pl \
--cc=help-gnu-emacs@gnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).