2 ms·
So let's say I branched off of master 3 months ago, and slowly developed the feature. Now if I rebase, will the commit history show all my local commits at the
by BeetleB 10y ago
So let's say I branched off of master 3 months ago, and slowly developed the feature. Now if I rebase, will the commit history show all my local commits at the time they occurred (i.e. spread across 3 months)? Or will it show up as a single commit at the end?
As for "reading through them", I usually use a GUI that shows the commit history, and it will show all the commits in a branch in, well, a branch. I can easily ignore them.
- jdmichal 10y agoGit actually maintains the following: Author and AuthorDate: These will not change during a rebase. Unless maybe you do an interactive rebase and edit the commit... I'm not 100% sure how those interact. Commit and CommitDate: These will change during a rebase, as a rebase is recreating the commit and that will be done with the current user and date.
- Rusky 10y agoIt will show them at the time they occurred, with an additional notation for when the rebase command recreated them. On the other hand, it will not show any conflicts resolved during the rebase- it will just look like you knew all along what master was going to look like.