Re: [Freemint-discuss] Bintray integration / git force-push needed

[Vincent R. <vin...@fr...>]

On 20/03/2018 at 06:47, Miro Kropáček wrote:
> Maybe someone with better git knowledge can explain the finer details?

The following command gives the best view of actual log:

git log --oneline --decorate --graph

You can see all the commits correctly sorted, as well as merged branches 
with ASCII-art. This is the closer view of the reality of the history.

That being said, FreeMiNT history is a mess. This is because Pull 
Requests are *merged*. That gives importance to what *really* happened 
on the contributor's fork: when it has been forked, when commits have 
really been done, or even reworked... And usually, that's completely 
useless.

What is really important, is to take the contributors's patches, and 
include them into official sources (and history). Exactly like when the 
patches were contributed to the mailing list. The solution is simple: 
use *rebase* to integrate pull requests, instead of *merge*. I already 
have advocated that solution to keep a linear history, as before, and 
for clarity. I have applied that to EmuTOS contributions, and it worked 
fine.

Of course, we could still *merge* the Pull Requests some times, when it 
makes sense, but IMHO this should not be the general solution. Use 
*rebase* in most case. Otherwise, don't complain about messy history.

-- 
Vincent Rivière