From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Tim Friske <me@tifr.de>
Cc: git@vger.kernel.org
Subject: Re: Git not creating merge commit when merging signed/annotated tag
Date: Tue, 05 Jun 2018 14:25:50 +0200 [thread overview]
Message-ID: <87r2llzagh.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <374116891.50361.1528200631824@office.mailbox.org>
On Tue, Jun 05 2018, Tim Friske wrote:
> Hi Everyone,
>
> ten days ago I asked on https://unix.stackexchange.com/ why Git is not creating a merge commit when merging a signed/annotated tag. Does someone has an answer to my question https://unix.stackexchange.com/questions/446154/git-not-creating-merge-commit-when-merging-signed-annotated-tag?
>
> Thank you in advance!
I believe my answer in this recent thread which brought up the same
topic applies to your situation as well:
https://public-inbox.org/git/CANgJU+VFCY0LNRLMSGtD7ScpcLaPFMzUOyw6Bjgk6q=Kx9DvCg@mail.gmail.com/
Try to apply the patch I noted to builtin/merge.c there and see if you
don't get the same message printed out.
prev parent reply other threads:[~2018-06-05 12:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 12:10 Git not creating merge commit when merging signed/annotated tag Tim Friske
2018-06-05 12:25 ` Ævar Arnfjörð Bjarmason [this message]
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=87r2llzagh.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=me@tifr.de \
/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).