Hi Bob - Something went wrong with your tree. See the attached picture. That's what I see with gitk --all, which I highly recommend using. I'm not aware of a nice way to view git branches like that on github, which is unfortunate.
It looks like you successfully amended your commits (the two at the bottom of the list are actually the newer ones), but then you merged them back into your old submission. You probably merged with your origin and then pushed, instead of doing a push -f (which replaces the branch, thus removing the old commits, which is what we wanted). Most people won't need to do a git merge when preparing / editing code submissions. If you do a non-fast-forward merge, it's a sign that something went wrong. Anyways, I was able to extract your two commits from your branch and merge them manually. To get back in sync, I recommend doing a git reset --hard to my repo/master. Thanks again for the fix! Barret Merged to master at 3239f74daaf6..3febcc12e8f5 (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/3239f74daaf6...3febcc12e8f5 On 2016-04-07 at 13:59 Bob <[email protected]> wrote: > Per mailing list, and discussion in irc. Patch to help enable > building Akaros GCC with GCC 6. > > Tested with GCC 6. > You can view, comment on, or merge this pull request online at: > > https://github.com/brho/akaros/pull/29 > > -- Commit Summary -- > > * Added gcc r233572 patch > * GCC patch r233572 added to makefile. > > -- File Changes -- > > M tools/compilers/gcc-glibc/Makefile (1) > A tools/compilers/gcc-glibc/gcc-4.9.2-r233572.patch (127) > > -- Patch Links -- > > https://github.com/brho/akaros/pull/29.patch > https://github.com/brho/akaros/pull/29.diff > > --- > You are receiving this because you are subscribed to this thread. > Reply to this email directly or view it on GitHub: > https://github.com/brho/akaros/pull/29 > -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
