git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Renato Botelho <garga@FreeBSD.org>, git@vger.kernel.org
Subject: Re: Commit change disappeared from repository
Date: Fri, 24 Apr 2020 09:21:20 -0400	[thread overview]
Message-ID: <7dec4168-9eed-7f89-e33c-db0b50157407@gmail.com> (raw)
In-Reply-To: <7b4f2b10-e80d-d4af-6154-6665e37da623@FreeBSD.org>

On 4/23/2020 3:22 PM, Renato Botelho wrote:
> Hello,
> 
> I'm sending it here to devel list because after asking around at IRC and
> also to friends we ended up with no reasonable explanation about what
> happened, and it lead me to consider maybe it could be a bug (!?!?)

This is a common confusion with Git history. The best description of what
is going on is [1], in my opinion.

[1] https://docs.microsoft.com/en-us/azure/devops/repos/git/git-log-history-simplification

There are other history options that will likely show the error.
Specifically, run "git log --full-history --simplify-merges <path>" to
do a full graph traversal and reduce the output as much as possible.

99% of these cases are due to someone resolving a merge conflict incorrectly,
and you'll find that merge with the "git log" command above.

Thanks,
-Stolee


  reply	other threads:[~2020-04-24 13:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-23 19:22 Commit change disappeared from repository Renato Botelho
2020-04-24 13:21 ` Derrick Stolee [this message]
2020-04-24 14:34   ` Renato Botelho

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7dec4168-9eed-7f89-e33c-db0b50157407@gmail.com \
    --to=stolee@gmail.com \
    --cc=garga@FreeBSD.org \
    --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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).