6 ms·
>This is also the primary reason why I highly dislike merge commits: They make git logs extremely unreadable. I am new to git. You will have to merge eventuall
by abhishekjha 8y ago
>This is also the primary reason why I highly dislike merge commits: They make git logs extremely unreadable.
I am new to git. You will have to merge eventually with somebody when you are collaborating. Can you really avoid merge commits?
I don't like how `git reflog` keeps track of which hash did I switch to. I only jump to hashes for a quick run. I don't want it actually tracking that in the log. Does anybody know how to avoid that as well?
- aviraldg 8y agoYes, you can rebase: https://www.atlassian.com/git/tutorials/merging-vs-rebasing https://www.atlassian.com/git/tutorials/merging-vs-rebasing (best used with --ff-only in your config to avoid unnecessary/unintentional merge commits)
- nordsieck 8y ago>> This is also the primary reason why I highly dislike merge commits: They make git logs extremely unreadable. > I am new to git. You will have to merge eventually with somebody when you are collaborating. Can you really avoid merge commits? Many developers prefer to only rebase, such that master looks like a single chain of commits without any branching or other administrative structure.
- drums8787 8y agoAgree, learn to rebase well. Having a chain of atomic, well commented commits is bliss.