From: Domenico Andreoli <cavokz@gmail.com>
To: git@vger.kernel.org
Subject: Merging tags does not fast-forward with git 1.7.9
Date: Thu, 9 Feb 2012 10:54:15 +0100 [thread overview]
Message-ID: <20120209095415.GA19230@glitch> (raw)
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.
next reply other threads:[~2012-02-09 9:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 9:54 Domenico Andreoli [this message]
2012-02-09 15:50 ` Merging tags does not fast-forward with git 1.7.9 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
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=20120209095415.GA19230@glitch \
--to=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.