| -:#milkymist- [freenode-info] if you're at a conference and other people are having trouble connecting, please mention it to staff: http://freenode.net/faq.shtml#gettinghelp | 11:53 | |
| lekernel | git add -p => edit hunk => "Your edited hunk does not apply." even if I haven't changed anything | 12:48 |
|---|---|---|
| lekernel | meh | 12:48 |
| wpwrak | interesting. didn't even know that use of git add. sounds ridiculously dangerous, though ;-) | 13:49 |
| ysionneau | no it's nice | 13:56 |
| ysionneau | sometimes you want to git add -p to only stage a chunk of your local modifications to one file | 13:56 |
| ysionneau | but sometimes git refuses to split a block into two hunks | 13:57 |
| ysionneau | so you end up doing EDIT and it's fine :) | 13:57 |
| wpwrak | sounds like a hairy crossover between git and quilt ... | 13:58 |
| ysionneau | lekernel: what editor are you using? | 14:00 |
| ysionneau | maybe it comes from the editor | 14:00 |
| ysionneau | strange though | 14:01 |
| ysionneau | if you don't modify anything it should just apply :/ make sure you don't remove the first caracter of one line | 14:02 |
| ysionneau | each line must begin with either "+" or "-" or a space | 14:02 |
| lekernel | vi | 14:39 |
| ysionneau | hum weird :( | 14:44 |
| cde | anyone one having some experience of cypress fx3 debugging with openocd? | 14:45 |
| cde | s/one/here/ | 14:45 |
| ysionneau | nop | 14:45 |
| mumptai | moin | 17:24 |
| wpwrak | e.g., the WE# pin. in the original it's on 55, the others have it on 13 (and A25 on 55). | 23:33 |
| wpwrak | parts obsolecence .. the final frontier :) | 23:34 |
| --- Sat Aug 24 2013 | 00:00 | |
Generated by irclog2html.py 2.9.2 by Marius Gedminas - find it at mg.pov.lt!