|
From: | Achim Gratz |
Subject: | Re: [O] Invalid function: with-parsed-tramp-file-name with Perl |
Date: | Fri, 21 Sep 2012 19:49:17 +0200 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) |
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
[Prev in Thread] | Current Thread | [Next in Thread] |