| 00:16.12 | *** join/#openjtag roxfan (dunno@91.180.122.2) |
| 00:56.40 | *** join/#openjtag _julian (~quassel@hmbg-4d06fba5.pool.mediaWays.net) |
| 05:40.42 | *** join/#openjtag Weaselweb (~quassel@2001:6f8:9e4:123:21a:92ff:fe5a:1409) |
| 06:06.46 | *** join/#openjtag drath (~vmaster@178-27-180-11-dynip.superkabel.de) |
| 07:57.19 | *** join/#openjtag joelholdsworth (~joel@179.158.187.81.in-addr.arpa) |
| 08:34.19 | *** join/#openjtag Uhrheber (~Uhrheber@piratenpartei/rp/Uhrheber) |
| 09:30.53 | *** join/#openjtag ntfreak (~ntfreak@unaffiliated/ntfreak) |
| 10:44.44 | *** join/#openjtag Uhrheber (~Uhrheber@piratenpartei/rp/Uhrheber) |
| 14:50.45 | *** join/#openjtag Foxx_GiTS (~Foxx@pool-71-255-49-179.nycmny.east.verizon.net) |
| 15:31.43 | *** part/#openjtag Uhrheber (~Uhrheber@piratenpartei/rp/Uhrheber) |
| 15:52.53 | *** join/#openjtag dmarion (~Adium@cpe-109-60-80-170.zg3.cable.xnet.hr) |
| 16:03.51 | *** join/#openjtag drath (~vmaster@178-27-180-11-dynip.superkabel.de) |
| 16:30.16 | *** join/#openjtag prpplague (~danders@192.94.92.11) |
| 17:01.31 | *** join/#openjtag Uhrheber (~meister@piratenpartei/rp/Uhrheber) |
| 17:38.35 | *** part/#openjtag Uhrheber (~meister@piratenpartei/rp/Uhrheber) |
| 17:46.11 | *** join/#openjtag joelholdsworth (~joel@179.158.187.81.in-addr.arpa) |
| 18:04.53 | *** join/#openjtag _julian_ (~quassel@hmbg-4d06fba5.pool.mediaWays.net) |
| 18:16.16 | *** join/#openjtag prpplague^2 (~danders@192.91.66.189) |
| 18:18.39 | wmat | 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 |
| 18:20.28 | wmat | pushes for review anyway as it's a docs change |
| 18:21.49 | prpplague^2 | wmat: url? |
| 18:21.53 | prpplague^2 | wmat: let me have a look |
| 18:22.59 | wmat | 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. |
| 18:23.26 | prpplague | wmat: ahh, let me have a look |
| 18:23.30 | wmat | prpplague: are you on the openocd mailing list? My push just showed up. |
| 18:23.54 | prpplague | wmat: no, i haven't been on the list for a while |
| 18:24.03 | wmat | that's not really relevant though, as I'm either doing something wrong with git, or the server is misconfigured. |
| 18:25.46 | wmat | hmm, the automated jenkins tool just told me my patch set failed(?) |
| 18:28.46 | prpplague | tests the hacking docs |
| 18:43.03 | prpplague | wmat: git pull --rebase origin master |
| 18:43.19 | prpplague | wmat: shouldn't be a slash there if i understand correctly |
| 18:45.18 | prpplague | wmat: if you do a pull on master first, you can then do: git rebase origin/master |
| 18:49.44 | wmat | but of course, thx man! |
| 18:51.23 | wmat | when following the steps in HACKING, you require the space, so I'll make that doc change too |
| 18:51.37 | wmat | oh crap, time to pick up kids |
| 18:56.14 | prpplague | hehe |
| 19:37.38 | wmat | made it to the school as the bell was ringing ;) |
| 19:39.22 | prpplague | hehe |
| 20:00.40 | *** join/#openjtag Uhrheber (~meister@piratenpartei/rp/Uhrheber) |
| 20:47.05 | prpplague | wmat: did you get the page with the comparisons of libftdi and libftd2xx ported? |
| 20:47.27 | wmat | looks |
| 20:50.11 | wmat | no, that was one of the orphaned pages I was curious about |
| 20:50.17 | wmat | I can bring it over right now |
| 20:51.14 | prpplague | wmat: ok if you have a minute to do it |
| 20:51.18 | wmat | done |
| 20:51.23 | prpplague | wmat: i was going to add a couple links |
| 20:51.30 | wmat | just need to figure out where to link it from |
| 20:53.50 | wmat | prpplague: I linked from the installing section of the OpenOCD page |
| 20:54.05 | prpplague | looks |
| 20:54.22 | prpplague | wmat: ahh ok |
| 20:54.31 | prpplague | wmat: i linked on the compiling pages as well |
| 20:54.41 | wmat | that's fine |
| 20:56.35 | prpplague | :) |
| 21:31.44 | *** part/#openjtag Uhrheber (~meister@piratenpartei/rp/Uhrheber) |