You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Is your feature request related to a problem? Please describe
In a typical feature branch workflow, you often merge the latest changes from master into the feature branch.
When you do this, the tide prompt shows you how many commits you're ahead of @{upstream}, but it counts each merged commit from master individually, rather than treating it as 1 single merge commit. So if there were 100 commits in master, the prompt shows ↑101, not ↑1.
This can be misleading because, if you were to rebase master, you'd also get a high number like (↑100), but often rebasing is not desired. So it's hard to tell from the prompt which one you did.
Describe the solution you'd like
By using --first-parent in this code, git will count a merge commit as a single commit.
(I have no problem making the change, just wanted to get feedback first 😄)
Additional context
This is for the typical github PR workflow -- if we update a PR, we only want to merge master, not rebase master, so that history is preserved. With this change, a high number like ↑100 is a sign you messed up your history.
The text was updated successfully, but these errors were encountered:
Is your feature request related to a problem? Please describe
In a typical feature branch workflow, you often merge the latest changes from master into the feature branch.
When you do this, the tide prompt shows you how many commits you're ahead of
@{upstream}
, but it counts each merged commit from master individually, rather than treating it as 1 single merge commit. So if there were 100 commits in master, the prompt shows↑101
, not↑1
.This can be misleading because, if you were to rebase master, you'd also get a high number like (
↑100
), but often rebasing is not desired. So it's hard to tell from the prompt which one you did.Describe the solution you'd like
By using
--first-parent
in this code, git will count a merge commit as a single commit.(I have no problem making the change, just wanted to get feedback first 😄)
Additional context
This is for the typical github PR workflow -- if we update a PR, we only want to merge master, not rebase master, so that history is preserved. With this change, a high number like
↑100
is a sign you messed up your history.The text was updated successfully, but these errors were encountered: