Re: Commit change disappeared from repository
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Apr 24, 2020, 13:21 UTC
- Message-ID
- <7dec4168-9eed-7f89-e33c-db0b50157407@gmail.com>
- In-Reply-To
- <7b4f2b10-e80d-d4af-6154-6665e37da623@FreeBSD.org>
On 4/23/2020 3:22 PM, Renato Botelho wrote:
Show 5 quoted lines
> 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