=== mdomsch_ is now known as mdomsch | ||
Solarion | any chance on getting usb persist enabled in the hardy kernel? | 02:44 |
---|---|---|
Solarion | would help those with ee's a lot | 02:44 |
Solarion | eee, even. :) | 02:44 |
cyrusjunior | Hello All. | 03:32 |
=== doko_ is now known as doko | ||
amitk | Solarion: could you elaborate what you are looking for? | 11:06 |
Solarion | amitk: still there? | 13:52 |
* Solarion is UTC-6 | 13:53 | |
Solarion | guess not | 14:11 |
=== asac_ is now known as asac | ||
Solarion | so usb support is compiled in, not modular? | 15:01 |
clever | i seem to have a usbcore.ko loaded in 6.06 | 15:32 |
rtg | tjaalton: the -11 headers are in the archive. | 15:44 |
soren | I have a question about the gitguide on the wiki. | 16:31 |
soren | It says that if I have local commits, the way to update my tree from ubuntu's main branch is to: | 16:31 |
soren | git log origin..HEAD | awk '/^commit/{print $2}' | tac > local-commits | 16:31 |
soren | so I have all my local commit shas in local-commits in a sensible order.. | 16:32 |
soren | Then: | 16:32 |
soren | git branch new-head | 16:32 |
soren | That will create a new branch based on my current branch which is the one with my local commits, right? | 16:32 |
soren | Assuming that that's indeed the case, let's move on: | 16:33 |
soren | git checkout new-head | 16:33 |
soren | Switches my working tree to the new-head. | 16:33 |
soren | And then it wants me to do: | 16:33 |
soren | for cmt in `cat local-commits`; do git-cherry-pick $cmt || exit; done | 16:34 |
soren | ...but if the branch is based on my branch with all my local commits, how does it make sense to cherry pick all the commits again? They're already there? | 16:34 |
soren | And that "exit" should probably really be a "break". | 16:35 |
soren | rtg: Ah, great timing. Got a minute to clear some git business up for me? | 16:37 |
Nafallo | I hope this channel is http-logged ;-) | 16:40 |
soren | because... | 16:40 |
Nafallo | hehe. it's not logging fast enough :-P | 16:41 |
soren | I was going to /msg it to him. | 16:42 |
Nafallo | just checked to see if I could save you some typing ;-) | 16:43 |
soren | :) | 16:44 |
soren | Aha. "git branch new-head origin" rather than "git branch new-head" restores sanity. | 16:49 |
soren | Yay wikis. | 16:50 |
=== allee_ is now known as allee | ||
tjaalton | rtg: thanks, lrm uploading | 17:39 |
=== luka74 is now known as Lure | ||
__Neo__ | Hi, is there a variant of Ubuntu that uses official (or mirrors of) Debian repositories either stable or later? | 18:20 |
Nafallo | __Neo__: wrong channel for that question. | 18:22 |
Nafallo | __Neo__: you could actually try #ubuntu | 18:22 |
__Neo__ | ok | 18:24 |
=== allee_ is now known as allee |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!