From: "Rafael Ascensão" <rafa.almas@gmail.com>
To: Gray King <grayking.w@gmail.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: Lost changes after merge
Date: Tue, 30 Oct 2018 15:29:29 +0000 [thread overview]
Message-ID: <20181030152929.uxxf3r6gsslr4vpp@rigel> (raw)
In-Reply-To: <CAP1N1j7AbiYLfe4EiFn-4zdBd-nD2paXx1hZhqiUCOq4iLh9zw@mail.gmail.com>
The commits you mentioned are not present on the new pastes.
On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote:
> Sorry, seems the link has been expired, here is the new one:
> * Before merge run `git log --format="%h %p %d" -n 20 --all --graph`:
>
One thing I noticed, is that you're using %p with --graph. And --graph
enables parent rewriting. Which may surprise you if you don't know what
it does.
But apart from that, and assuming you only did `git merge f087081868`
everything looks normal between those two pastes.
Cheers,
Rafael Ascensão
next prev parent reply other threads:[~2018-10-30 15:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-29 8:49 Lost changes after merge Gray King
2018-10-29 8:51 ` Gray King
2018-10-29 14:18 ` Jeff King
2018-10-30 2:46 ` Gray King
2018-10-30 15:29 ` Rafael Ascensão [this message]
2018-10-31 15:30 ` Brandon McCaig
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=20181030152929.uxxf3r6gsslr4vpp@rigel \
--to=rafa.almas@gmail.com \
--cc=git@vger.kernel.org \
--cc=grayking.w@gmail.com \
--cc=peff@peff.net \
/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).