Gazler / githug

Git your game on!
MIT License
6.86k stars 1.03k forks source link

Resetting merge_squash twice, log shows different branch/commit order #251

Open duianto opened 5 years ago

duianto commented 5 years ago

Sometimes the branch and commit order changes when the merge_squash level is reset.

This is what it looked like when the level was:

twice.

powershell_2019-02-13_21-17-31

The same thing is seen with git log --all, it was just more compact to show them with --oneline.

Is it just an issue with how git log works when several commits have the same time (hh:mm:ss), which probably happens because github reset <level> creates the commits quickly.

Maybe the commits are read in a random order and since the next read commit has the same time stamp, they end up in a random order.

However git log --all --graph --online shows them in the correct order after every reset:

* 603c7cd (long-feature-branch) Time
* 96bcbd3 Takes
* a9a8600 Developing new features
| * bc5e60d (HEAD -> master) Second commit
|/
* 321e479 First commit