| 00:18.34 | *** join/#edev JoeLlama (~snork@unaffiliated/joellama) |
| 00:40.25 | *** join/#edev sjs205_ (~sjs205@host86-147-242-11.range86-147.btcentralplus.com) |
| 02:52.47 | *** join/#edev prpplague (~prpplague@ppp-70-249-146-60.dsl.rcsntx.swbell.net) |
| 03:01.22 | *** join/#edev landley (~landley@cpe-24-27-31-176.austin.res.rr.com) |
| 03:01.22 | *** mode/#edev [+o landley] by ChanServ |
| 03:25.20 | prpplague | ho ho hum |
| 03:31.20 | *** join/#edev sjs205_ (~sjs205@host81-151-43-45.range81-151.btcentralplus.com) |
| 04:23.25 | *** mode/#edev [+o prpplague] by ChanServ |
| 05:08.02 | *** join/#edev JoeLlama (~snork@unaffiliated/joellama) |
| 08:23.31 | *** join/#edev FrankSansC (~quassel@LVelizy-156-45-9-168.w80-11.abo.wanadoo.fr) |
| 08:26.48 | *** join/#edev florian_kc (~fuchs@port-217-146-132-69.static.qsc.de) |
| 08:26.48 | *** join/#edev florian_kc (~fuchs@Maemo/community/contributor/florian) |
| 10:29.38 | *** join/#edev htns (~htns@175.139.210.69) |
| 11:06.04 | *** join/#edev gvandenbosch (~gvandenbo@86.81.67.223) |
| 11:33.06 | *** join/#edev sjs205 (~sjs205@host81-151-43-45.range81-151.btcentralplus.com) |
| 11:46.27 | *** join/#edev dijenerate (~dijenerat@204.212.240.159) |
| 12:30.25 | *** part/#edev Madsy (~madsy@fu/coder/madsy) |
| 12:53.35 | *** join/#edev dijenerate (~dijenerat@65.48.221.116) |
| 13:48.44 | *** join/#edev n900evil (~Speedevil@tor/regular/SpeedEvil) |
| 14:08.32 | *** join/#edev dijenerate (~dijenerat@173.225.251.175) |
| 14:08.58 | *** join/#edev kergoth (~kergoth@ip24-251-167-38.ph.ph.cox.net) |
| 14:15.00 | *** join/#edev kergoth (~kergoth@ip24-251-167-38.ph.ph.cox.net) |
| 14:29.14 | *** join/#edev CosmicPenguin (~nobody@soa.codeaurora.org) |
| 14:29.14 | *** mode/#edev [+o CosmicPenguin] by ChanServ |
| 14:52.14 | *** join/#edev GPSFan (~kenm@64.92.145.112) |
| 14:52.14 | *** mode/#edev [+o GPSFan] by ChanServ |
| 15:03.14 | *** join/#edev sndcrb (~sndcrb@dsl-hkibrasgw2-fef8de00-126.dhcp.inet.fi) |
| 15:33.48 | *** join/#edev prpplague (~danders@nat/ti/x-jwvlosjbduvwrvie) |
| 15:37.28 | *** join/#edev risca (~risca@norr-133-234.eduroam.liu.se) |
| 15:42.49 | *** join/#edev jevin (~jevin@napalm.jevinskie.com) |
| 15:44.17 | *** mode/#edev [+o prpplague] by ChanServ |
| 15:50.06 | *** join/#edev ZeZu (null@c-98-227-57-88.hsd1.in.comcast.net) |
| 17:04.45 | prpplague | CosmicPenguin: hmm git brain cramp |
| 17:05.46 | prpplague | CosmicPenguin: i have a local branch with the same name as a remote tag, how do i specify the local branch rather than the remote tag when doing something like git log ? |
| 17:12.26 | prpplague | anyone else know off hand? |
| 17:12.43 | CosmicPenguin | ummm... not sure |
| 17:13.02 | *** join/#edev florian (~fuchs@sign-4d091b31.pool.mediaWays.net) |
| 17:13.02 | *** join/#edev florian (~fuchs@Maemo/community/contributor/florian) |
| 17:14.18 | CosmicPenguin | I'm sure there is a way, just not something I've run into |
| 17:14.46 | prpplague | i've run into it a couple of times were i've named the branch the same as the tag |
| 17:15.09 | prpplague | CosmicPenguin: i.e. git checkout -b v3.0 v3.0 |
| 17:16.02 | CosmicPenguin | and the remote tag is being used rather than the local branch? |
| 17:18.45 | prpplague | CosmicPenguin: yea if you do a git log v3.0 , you get the remote branch log with a warning that the refspec is ambigious |
| 17:20.06 | CosmicPenguin | I'm gonna have to give you a big ol' shrug, because I don't know |
| 17:20.58 | kergoth | git log refs/heads/foo |
| 17:21.02 | kergoth | use the full path to the ref |
| 17:21.09 | kergoth | refs/remotes/some_remote/foo |
| 17:21.24 | prpplague | kergoth: ahh |
| 17:21.31 | prpplague | kergoth: dandy |
| 17:21.34 | prpplague | kergoth: that works |
| 17:21.43 | kergoth | git just takes the short form and tries to figure out what you wanted, normally :) |
| 17:21.48 | kergoth | and normally that's fine, since its unambiguous |
| 17:22.03 | prpplague | kergoth: right that is what i figured, just didn't understand the syntax |
| 17:22.10 | kergoth | nods |
| 17:22.22 | prpplague | makes some notes |
| 17:22.48 | prpplague | kergoth: thanks! |
| 17:23.54 | kergoth | http://progit.org/book/ch9-3.html has some further detail and examples showing the full paths |
| 17:23.55 | kergoth | np |
| 17:24.48 | prpplague | kergoth: yea i was searching progit, but i was looking for something about the ambigious items |
| 17:25.07 | kergoth | yeah, pro git is great as a learning resource, but not quite as helpful as reference material |
| 17:25.46 | prpplague | kergoth: hehe, took me a while to get used to using git over cvs, but i'd never go back now, hehe |
| 17:27.10 | CosmicPenguin | picks jaw up off floor |
| 17:27.46 | MonMotha | I have to say git seems superior to cvs/svn in just about every way |
| 17:28.13 | MonMotha | though I've not used some of the other popular distributed systems (e.g. Hg) |
| 17:28.48 | *** join/#edev kergoth__ (~kergoth@ip24-251-167-38.ph.ph.cox.net) |
| 17:29.43 | CosmicPenguin | Who needs progit when we have kergoth__ ? :) |
| 17:29.52 | prpplague | CosmicPenguin: indeed |
| 17:30.19 | prpplague | gives kergoth some cookies backed with prozac |
| 17:31.38 | kergoth | hg vs git seems like ruby vs python.. functionally equivalent, just a matter of personal preference. I'm a git and python guy, never got very familiar with hg or ruby |
| 17:31.39 | kergoth | heh |
| 17:35.29 | *** join/#edev landley (~landley@mdb0436d0.tmodns.net) |
| 17:35.30 | *** mode/#edev [+o landley] by ChanServ |
| 17:46.42 | *** join/#edev orbarron1 (~orb@nat/ti/x-fuopfyklmgueausg) |
| 19:19.16 | dijenerate | prpplague: ping |
| 19:23.09 | prpplague | pong |
| 19:23.13 | prpplague | dijenerate: pong |
| 19:24.52 | *** join/#edev keesj_ (~keesj@ip49-193-210-87.adsl2.static.versatel.nl) |
| 19:24.53 | *** join/#edev file (~file@2001:4978:2d7:0:20c:29ff:feff:49c0) |
| 19:24.53 | *** join/#edev m4t (matt@theorize.org) |
| 19:25.06 | *** join/#edev MuscleNerd (~MuscleNer@99-65-242-37.lightspeed.irvnca.sbcglobal.net) |
| 19:25.42 | dijenerate | prpplague: hi how goes it? |
| 19:25.48 | prpplague | dijenerate: it goes |
| 19:26.03 | prpplague | dijenerate: lots of TI OMAP fun |
| 19:26.18 | dijenerate | prpplague: ok, so it goes stressfully? |
| 19:26.27 | dijenerate | prpplague: pm 1 sec |
| 19:50.36 | *** join/#edev kergoth (~kergoth@ip24-251-167-38.ph.ph.cox.net) |
| 20:10.56 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:39.39 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:42.03 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:43.50 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:45.28 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:47.14 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:48.04 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 20:52.58 | *** join/#edev SpeedEvil (~user@tor/regular/SpeedEvil) |
| 21:07.15 | landley | Trying to move sys_base in the versatilepb board from 0x10000000 to 0x20000000 in kernel and qemu so arm can use 512 megs ram instead of 256. |
| 21:07.49 | landley | Alas, the clean #define is not universally used... |
| 21:08.31 | landley | In the kernel, I mean. |
| 21:34.24 | *** join/#edev prpplague (~prpplague@ppp-70-249-146-60.dsl.rcsntx.swbell.net) |
| 21:36.34 | *** join/#edev JoeLlama (~snork@unaffiliated/joellama) |
| 22:40.36 | *** join/#edev jonmasters (~jcm@edison.jonmasters.org) |
| 22:43.23 | *** join/#edev gustavoz (~gustavoz@host172.190-224-153.telecom.net.ar) |