The original pick-list before I did the squash looked like this, if it is of any relevance:
pick a1b2c3 Added feature A pick ... pick ... pick ... pick b3c2a1 Fixed feature A bug On Mar 26, 10:46 pm, Blixt <[email protected]> wrote: > I'd like to ask if other people think this information is misleading? > I just did another rebase which I think is perfectly legitimate, but > which messes with the timestamps being shown in certain GitHub views. > Here's what I did: > > 1) Committed a new feature (let's call it feature A) > 2) Did some other, unrelated work, committed a few times > 3) I then realized that feature A had a bug in it, so I fixed it and > committed > 4) I then thought, "I haven't pushed this yet, so I'll just rebase the > fix into the previous commit": > > $ git rebase -i HEAD~5 # Feature A commit was five commits behind HEAD > > pick a1b2c3 Added feature A > squash b3c2a1 Fixed feature A bug > pick ... > pick ... > pick ... > > After this I pushed to GitHub. Now GitHub shows the rebase time of the > files changed by the above commits, rather than showing the actual > commit times. It's worth pointing out that some views DO show the > actual committed time, making it all the more confusing. > > Thoughts? > > On Mar 18, 11:07 pm, Blixt <[email protected]> wrote: > > > > > Looking through the commit log more detailed using gitk, I've found > > what I believe to be the reason it looks messed up on GitHub: While > > the "Author" field has the correct date/time, the "Committer" field > > has today, since I rebased today. I guess GitHub uses the Committer > > timestamp in some cases, and the Author timestamp in others. > > > Is there anything I can do to "fix" this? I would like the old history > > to look correct, since the commits were originally committed at the > > time they were authored. I would like my rebasing to be invisible to > > anyone looking at the repository. Since the repository has not been > > touched by anyone but me, there aren't any issues with modifying the > > commit history. > > > On Mar 18, 9:05 pm, Lee Hambley <[email protected]> wrote: > > > > > Hey! I reworked the history of my repository before I added it to > > > > GitHub. I had to fix some old commit messages that were multi-line, > > > > and I also removed some files that shouldn't have been in the > > > > repository as well as changed all text files to use \n instead of \r > > > > \n. > > > > Provided you did it with the git tools, that shouldn't have happened.... > > > however if you were hacking around in the files, maybe you broke > > > something? > > > > -- Lee Hambley > > > > Twitter: @leehambley | @capistranorb -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
