From: Igor Lautar <igor.lautar@gmail.com>
To: Tomas Carnecky <tomas.carnecky@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: commit gone after merge - how to debug?
Date: Mon, 26 Nov 2012 14:24:53 +0100 [thread overview]
Message-ID: <CAO1Khk_r5eubm6M815FCxXLRpm-zPhzfFasug497saev8o-qeQ@mail.gmail.com> (raw)
In-Reply-To: <1353935441-ner-9639@calvin>
On Mon, Nov 26, 2012 at 2:10 PM, Tomas Carnecky
<tomas.carnecky@gmail.com> wrote:
> On Mon, 26 Nov 2012 14:06:09 +0100, Igor Lautar <igor.lautar@gmail.com> wrote:
>> git log <file modified by commit>
>> - commit NOT shown in file history any more and file does not have this change
>
> does `git log --full-history <file modified by commit>` show the commit?
Indeed it does.
Did the merge with verbosity set to 5. It says the commit I'm merging
in is virtual (probably as it is a merge commit in itself?).
Why would commit be left behind after merge? What kind of history
triggers this scenario?
Just trying to understand reasoning as its counter-intuitive to what I
know now. This may affect our workflow (ie., change it so we avoid it
happening).
prev parent reply other threads:[~2012-11-26 13:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 13:06 commit gone after merge - how to debug? Igor Lautar
2012-11-26 13:10 ` Tomas Carnecky
2012-11-26 13:23 ` Matthieu Moy
2012-11-26 13:29 ` Igor Lautar
2012-11-26 13:38 ` Matthieu Moy
2012-11-26 13:58 ` Igor Lautar
2012-11-26 14:03 ` Matthieu Moy
2012-11-26 14:15 ` Igor Lautar
2012-11-26 14:19 ` Matthieu Moy
2012-11-26 14:23 ` Igor Lautar
2012-11-26 14:50 ` Matthieu Moy
2012-11-26 17:01 ` Igor Lautar
2012-11-26 13:24 ` Igor Lautar [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=CAO1Khk_r5eubm6M815FCxXLRpm-zPhzfFasug497saev8o-qeQ@mail.gmail.com \
--to=igor.lautar@gmail.com \
--cc=git@vger.kernel.org \
--cc=tomas.carnecky@gmail.com \
/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).