From: "Carlos Martín Nieto" <cmn@elego.de>
To: Domenico Andreoli <cavokz@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Merging tags does not fast-forward with git 1.7.9
Date: Thu, 09 Feb 2012 17:06:41 +0100 [thread overview]
Message-ID: <1328803601.3416.0.camel@centaur.lab.cmartin.tk> (raw)
In-Reply-To: <20120209095415.GA19230@glitch>
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
On Thu, 2012-02-09 at 10:54 +0100, Domenico Andreoli wrote:
> Hi,
>
> with the recent changes in tag merging (I updated git to 1.7.9),
> my usual "git merge v3.X-rcY" command does not fast-forward any more.
> Of course the initial head is something like "v3.X-rcZ" without any
> change so that it should (and usually did) fast-forward to the new head.
>
> The editor is instead fired off and I have to fill the details of a
> merge commit, diverging from mainline as soon as I save and exit.
>
> Is there any simple and clear explanation for this? Thank you.
>
> cheers,
> Domenico
>
> ps: I admit I didn't follow the details about tag signatures so probably
> I missed something that I shouldn't.
This was discussed recently
http://thread.gmane.org/gmane.comp.version-control.git/189825
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2012-02-09 16:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 9:54 Merging tags does not fast-forward with git 1.7.9 Domenico Andreoli
2012-02-09 15:50 ` Dan Johnson
2012-02-09 16:04 ` Domenico Andreoli
2012-02-09 16:30 ` Andreas Schwab
2012-02-09 16:06 ` Carlos Martín Nieto [this message]
2012-02-09 16:18 ` Domenico Andreoli
2012-02-09 18:05 ` Junio C Hamano
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=1328803601.3416.0.camel@centaur.lab.cmartin.tk \
--to=cmn@elego.de \
--cc=cavokz@gmail.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).