From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: Invalid function: with-parsed-tramp-file-name with Perl
Date: Fri, 21 Sep 2012 19:49:17 +0200 [thread overview]
Message-ID: <87a9wjs1uq.fsf@Rainer.invalid> (raw)
In-Reply-To: 18599.1348180015@alphaville
Nick Dokos writes:
> OK. Is there no way to fix that? That's pretty confusing.
If you already know the tag is on a merge commit on the wrong side:
git tag fixup release_7.8.11
git tag -d release_7.8.11
git tag release_7.8.11 fixup^2
git tag -d fixup
> And how can I tell that I have fallen into this trap?
Probably easiest to see in gitk. Otherwise,
git --no-pager show release_7.8.11
tells you you are dealing with a merge and what the two parents are.
Regards,
Achim.
--
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+
Factory and User Sound Singles for Waldorf Q+, Q and microQ:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds
next prev parent reply other threads:[~2012-09-21 17:49 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-21 11:54 Invalid function: with-parsed-tramp-file-name with Perl Loris Bennett
2012-06-21 13:53 ` Nick Dokos
2012-06-21 14:51 ` Loris Bennett
2012-06-21 15:13 ` Nick Dokos
2012-06-25 7:05 ` Loris Bennett
2012-09-18 14:04 ` Loris Bennett
2012-09-19 7:45 ` Bastien
2012-09-19 9:28 ` Loris Bennett
2012-09-19 9:59 ` Bastien
2012-09-19 10:29 ` Loris Bennett
2012-09-19 13:49 ` Nick Dokos
2012-09-19 18:52 ` Achim Gratz
2012-09-19 19:51 ` Nick Dokos
2012-09-20 14:12 ` Loris Bennett
2012-09-20 15:11 ` Nick Dokos
2012-09-20 15:30 ` Nick Dokos
2012-09-20 17:21 ` Nick Dokos
2012-09-20 17:36 ` Nick Dokos
2012-09-20 18:29 ` Eric Schulte
2012-09-20 19:18 ` Achim Gratz
2012-09-20 20:51 ` Nick Dokos
2012-09-20 21:00 ` Achim Gratz
2012-09-20 22:26 ` Nick Dokos
2012-09-21 17:49 ` Achim Gratz [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-22 5:05 Nick Dokos
2012-09-22 6:41 ` Achim Gratz
2012-09-22 6:57 ` Bastien
2012-09-22 7:03 ` Achim Gratz
2012-09-22 8:19 ` Bastien
2012-09-22 11:57 ` Achim Gratz
2012-09-22 16:14 ` Bastien
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a9wjs1uq.fsf@Rainer.invalid \
--to=stromeko@nexgo.de \
--cc=emacs-orgmode@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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
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).