<wpwrak>
hmm a git question: if i have a topic branch with one file that's been developed there, plus some other changes. is there a way to merge that file back into the original branch not not merge the other changes ?
<kristianpaul>
i have same questions the other day and some body said i should chery pick..
<wpwrak>
but wouldn't that apply for just one commit ? the file in question has lots of commits
<xiangfu>
git cherry-pick, only apply one commit you want
<kristianpaul>
cp tmp then cp again to the swiched branch then?
<kristianpaul>
or git diff if there no other files changed..
<wpwrak>
and bye bye history :)
<kristianpaul>
ahh!
<kristianpaul>
good point
<wpwrak>
maybe i'll just revert the changes i don't like and then merge
<xiangfu>
if 'the other changes' is all at last, that will be easy, you can checkout a new-temp branch, then merge it.
<xiangfu>
if 'the other changes' is mess, run 100 times cherry-pick ;-)
<wpwrak>
xiangfu: (temp branch) ah yes, that would be an even cleaner variant. thanks !
<wpwrak>
xiangfu: (100 cherries) yuck :)
<kristianpaul>
later you'll have 100 temps branchs :p
<kristianpaul>
(kidding)
<wpwrak>
well, thinking of it, i can just keep the "off-topic" commit in this case, because i want it anyway
<kristianpaul>
wpwrak: can i boost atben up to 1W? :-)
<wpwrak>
kristianpaul: if you get one of those chinese RF amps ... ;-)
<kristianpaul>
ah
<kristianpaul>
well i can get those for my rfm12b then
<kristianpaul>
actually there lots of schmatics for that freq
<kristianpaul>
k
<xiangfu>
got atben atusb yesterday.
<kristianpaul>
feel behind
<qi-bot>
[commit] Werner Almesberger: atusb: use MODULE_AUTHOR according to include/linux/module.h; added myself (ben-wpan-stefan) http://qi-hw.com/p/qi-kernel/8463388
<kristianpaul>
but i should find something usefull for the rfm12b modules before try something else
<qi-bot>
[commit] Werner Almesberger: atusb: added section titles and moved code in a more logical order (ben-wpan) http://qi-hw.com/p/qi-kernel/0d9f58b
<qi-bot>
[commit] Werner Almesberger: atusb: merged error checking and request completion for control transfers (ben-wpan) http://qi-hw.com/p/qi-kernel/247b48a
<qi-bot>
[commit] Werner Almesberger: Revert "ieee802154/at86rf230: Be more verbose and disable irq handling for now" (ben-wpan) http://qi-hw.com/p/qi-kernel/7a7da98
<qi-bot>
[commit] Werner Almesberger: atusb: moved firmware version info before AT86RF230 driver bringup (ben-wpan) http://qi-hw.com/p/qi-kernel/4c977e4
<qi-bot>
[commit] Werner Almesberger: atusb: implement interrupt synchronization via a 10 ms delay timer (ben-wpan) http://qi-hw.com/p/qi-kernel/eb1a51e
<qi-bot>
[commit] Werner Almesberger: atusb: updated to do list and added missing \n to dev_info (ben-wpan) http://qi-hw.com/p/qi-kernel/1b9d72f
<qi-bot>
[commit] Werner Almesberger: atusb: changed interrupt synchronization from fixed delay to SPI_WRITE2_SYNC (ben-wpan) http://qi-hw.com/p/qi-kernel/b2d71a9
<qi-bot>
[commit] Werner Almesberger: atusb: use MODULE_AUTHOR according to include/linux/module.h; added myself (ben-wpan) http://qi-hw.com/p/qi-kernel/8463388
<wpwrak>
the joy of merging ...
<qi-bot>
[commit] Werner Almesberger: atusb, atben: moved from spi/ to ieee802154/; renamed atusb to spi_atusb (ben-wpan) http://qi-hw.com/p/qi-kernel/6c17a31
<ezdagor>
Anyone know of a non-Ipv6 DHCP server for the NanoNote?
<ezdagor>
(I tried ISC DHCP, but wouldn't compile)
<wpwrak>
DocScrutinizer: i sometimes hear one of my atusb "sing" (faint noise at high frequency) when sending. is this something to be worried about ?
<wpwrak>
DocScrutinizer: i can't quite pinpoint where the sound is coming from. if i push against components, nothing changes.
<wpwrak>
DocScrutinizer: ah no, it's coming from the PC. funny :)
<kyak>
wpwrak: saw your message regarding atusb and dirtpan working together. Is it documented how to build the kernel module or whatever is required (apart from userland tools, which i already have) to make atusb work?
<wpwrak>
kyak: (tcp) note that anything even just a little demanding will fail because of the timing problems that still need solving. the things i've done to dirtpan are just a band-aid
<wpwrak>
Jay7: you're late - we had these news already yesterday :)
<Jay7>
wpwrak: I'm slow a bit :)
<kristianpaul>
!ping
<Ayla>
hello
<kristianpaul>
Hi
<Ayla>
I made a mistake, I pushed some changes for gmenu2x on a branch with a typo in the name
<Ayla>
as a result it did create a new branch on the repo
<Ayla>
how can I fix this? :x
<kristianpaul>
i think you can merge tha branch to another one and commit from there
<kristianpaul>
but i'm not git expert
<kristianpaul>
thaT
<Ayla>
yes, but the branch is on the git repo on the Qi project server
<kristianpaul>
you mean you pushed that branch as well, i see
<kristianpaul>
well is kinda same situation  i think, all those are branches anyway
<wpwrak>
Ayla: the command works, despite looking ... odd. i've used it recently ;-)
<Ayla>
wpwrak: looks like I cannot do that
<Ayla>
"fatal: The remote end hung up unexpectedly"
<Ayla>
I believe I don't have the rights to delete a branch
<Ayla>
I type "git push origin :install-locations"
<wpwrak>
Ayla: the command looks correct (hmm, does the remote branch actually still exist ? which repo ?
<Ayla>
ok, I deleted it
<wpwrak>
Ayla: henceforth you shall be called Conan, the destroyer :)
<qi-bot>
[commit] Ayla: GMenu2X now won't load skin files from the Default skin when using another skin. (install_locations) http://qi-hw.com/p/gmenu2x/439d25c
<kristianpaul>
hum, why qi-bot dont tell about deletions..
<Ayla>
ouf
<Ayla>
I'm glad I succeeded to do that commit :)
<kristianpaul>
:-)
<wpwrak>
kristianpaul: (qi-bot) in 1984, did you every see them mention public announcements of deletions ?
<kristianpaul>
wasnt in this world by 1984
<Ayla>
mth: can I merge the master branch into install_locations? The master GMenu2X works OK?