Re:Julia Evans: Git rebase, what can go wrong
by nomel on Monday November 06, 2023 @02:16PM
(#38167375)
> * press the "annotate" button in my IDE and can see which commit introduced each line
In PyCharm, I can see which commit introduced each line, regardless of branching. Is this an IDE limitation you're seeing?
Some with drilling down through a files history.
> every step of the way, I get a meaningful description of why
Isn't this more about commit messages, than anything else?
Re:Julia Evans: Git rebase, what can go wrong
by nemetroid on Monday November 06, 2023 @04:07PM
(#38169019)
The context of my comment is the usefulness of a clean history, not about merging vs rebasing.
> Is this an IDE limitation you're seeing?
I'm using Jetbrains too.
Re:Julia Evans: Git rebase, what can go wrong
by WorldMaker on Monday November 06, 2023 @03:35PM
(#38168593)
* `git log --first-parent -S`
* `git blame --first-parent`
* `git bisect --first-parent`
* At least one "tig-like" with a --first-parent first UI: https://github.com/kalkin/git-log-viewer
* use filtering commands like "git log -S"
* press the "annotate" button in my IDE and can see which commit introduced each line
* run "git bisect"
* use "tig" to drill down through the history of a file (shortcut "," is "move to commit preceding current line's blame commit")
...every step of the way, I get a meaningful description of why a change was made and what other diffs were necessary to achieve that change. And not just "fix", "bug", "PR commments".