**** BEGIN LOGGING AT Wed Apr 18 02:59:59 2012 Apr 18 18:18:39 why when I do "git pull --rebase origin/master" as per the HACKING doc, do I get: fatal: 'origin/master' does not appear to be a git repository Apr 18 18:20:28 * wmat pushes for review anyway as it's a docs change Apr 18 18:21:49 wmat: url? Apr 18 18:21:52 wmat: let me have a look Apr 18 18:22:59 prpplague: the OpenOCD HACKING doc recommends rebasing before pushing changes for review via "git pull --rebase origin/master" command. When I do so, I get the fatal error as posted above. Apr 18 18:23:26 wmat: ahh, let me have a look Apr 18 18:23:31 prpplague: are you on the openocd mailing list? My push just showed up. Apr 18 18:23:54 wmat: no, i haven't been on the list for a while Apr 18 18:24:03 that's not really relevant though, as I'm either doing something wrong with git, or the server is misconfigured. Apr 18 18:25:46 hmm, the automated jenkins tool just told me my patch set failed(?) Apr 18 18:28:45 * prpplague tests the hacking docs Apr 18 18:43:02 wmat: git pull --rebase origin master Apr 18 18:43:19 wmat: shouldn't be a slash there if i understand correctly Apr 18 18:45:17 wmat: if you do a pull on master first, you can then do: git rebase origin/master Apr 18 18:49:44 but of course, thx man! Apr 18 18:51:23 when following the steps in HACKING, you require the space, so I'll make that doc change too Apr 18 18:51:37 oh crap, time to pick up kids Apr 18 18:56:13 hehe Apr 18 19:37:38 made it to the school as the bell was ringing ;) Apr 18 19:39:22 hehe Apr 18 20:47:04 wmat: did you get the page with the comparisons of libftdi and libftd2xx ported? Apr 18 20:47:28 * wmat looks Apr 18 20:50:11 no, that was one of the orphaned pages I was curious about Apr 18 20:50:17 I can bring it over right now Apr 18 20:51:14 wmat: ok if you have a minute to do it Apr 18 20:51:19 done Apr 18 20:51:23 wmat: i was going to add a couple links Apr 18 20:51:30 just need to figure out where to link it from Apr 18 20:53:50 prpplague: I linked from the installing section of the OpenOCD page Apr 18 20:54:05 * prpplague looks Apr 18 20:54:22 wmat: ahh ok Apr 18 20:54:31 wmat: i linked on the compiling pages as well Apr 18 20:54:41 that's fine Apr 18 20:56:35 :) **** ENDING LOGGING AT Thu Apr 19 02:59:59 2012