Skip to content

Status message updates #113

Merged
merged 1 commit into from Sep 1, 2013

2 participants

@lurch
lurch commented Aug 26, 2013

Make it clearer that "modules" actually means "kernel modules", and display a message while extracting tarball (which can take a while).

@popcornmix
Collaborator

Needs rebase

@lurch
lurch commented Sep 1, 2013

Hopefully done.

@popcornmix
Collaborator

Not right. 3 commits remain.

@lurch
lurch commented Sep 1, 2013

*sigh* IIRC I did git checkout patch-5 and then git rebase master, manually fixed the merge, ran git add rpi-update and then git rebase --continue finished off with git push -f.
What did I do wrong, and how do I fix it?

@popcornmix
Collaborator

I don't know the best way, but I would:

# copy files somewhere safe
git checkout 5437dc0e03  ;# current top of upstream
# copy files back
git add / git commit
git push -f
@lurch lurch Status message updates
Make it clearer that "modules" actually means "kernel modules", and display a message while extracting tarball (which can take a while).
b514610
@lurch
lurch commented Sep 1, 2013

Finally sorted, I think. I somehow had the "Remove embedded shebang" change in two separate commits on lurch/rpi-update which was causing all kinds of problems. After tearing my hair out (and creating / deleting multiple local repositories) I think I've finally managed to get 'git rebase' to fix it. Fingers crossed ;-)

@popcornmix popcornmix merged commit 3a2399c into Hexxeh:master Sep 1, 2013
@lurch lurch deleted the lurch:patch-5 branch Sep 1, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.