Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
duianto opened this issue Feb 13, 2019 · 0 comments
Open

Comments

@duianto
Copy link
Contributor

duianto commented Feb 13, 2019

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

This is what it looked like when the level was:

  • Reset (githug reset merge_squash)
  • Logged (git log --all --oneline)

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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant