| *** tpb has joined #timvideos | 00:00 | |
| -kornbluth.freenode.net- [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 | 00:00 | |
| *** hyades has joined #timvideos | 01:31 | |
| *** hyades has quit IRC | 03:35 | |
| *** hyades has joined #timvideos | 04:45 | |
| *** thiagoss has quit IRC | 04:45 | |
| *** thiagoss has joined #timvideos | 04:49 | |
| *** jmc75 has joined #timvideos | 07:07 | |
| *** jmc75 has quit IRC | 08:36 | |
| *** jmc75 has joined #timvideos | 08:44 | |
| *** jmc75 has quit IRC | 11:29 | |
| *** jmc75 has joined #timvideos | 11:35 | |
| *** jmc75 has quit IRC | 12:56 | |
| *** jmc75 has joined #timvideos | 12:57 | |
| *** jmc75 has quit IRC | 13:02 | |
| *** jmc75 has joined #timvideos | 13:04 | |
| aps | mithro: Check this out :D - http://aps-sids.github.io/sids/ | 13:39 |
|---|---|---|
| tpb | Title: Welcome lucky user! (at aps-sids.github.io) | 13:39 |
| *** jmc75 has quit IRC | 18:20 | |
| *** jmc75 has joined #timvideos | 18:20 | |
| *** jmc75 has quit IRC | 19:37 | |
| *** jmc75 has joined #timvideos | 19:37 | |
| puck | mithro: pong (slow transmit times) | 20:42 |
| puck | er, retransmit... | 20:42 |
| CarlFK | I am still floundering with "fixup" and trying to tidy up my commits. I try to squash 2 commits, and now I have 3: https://github.com/CarlFK/gst-switch/commits/master | 20:58 |
| tpb | Title: Commits · CarlFK/gst-switch · GitHub (at github.com) | 20:58 |
| CarlFK | anyone know how to squash those into 1 so I can get on with my pull request? | 20:58 |
| *** jmc75 has quit IRC | 22:01 | |
| mithro | CarlFK: morning | 22:24 |
| mithro | shenki: http://www.fpgaz.com/usbp/ | 22:25 |
| tpb | Title: USB FPGA Project (at www.fpgaz.com) | 22:25 |
| mithro | shenki: https://github.com/makestuff/libfpgalink | 22:26 |
| CarlFK | mithro: hey - can you walk me though git squish? cuz my last 3 attempts just make more commits | 22:26 |
| tpb | Title: makestuff/libfpgalink · GitHub (at github.com) | 22:26 |
| mithro | CarlFK: sure | 22:41 |
| mithro | CarlFK: what are you trying to do? | 22:48 |
| CarlFK | mithro: create a pull request that is just the file in it's current state, not split into 2 diffs | 22:48 |
| mithro | CarlFK: so you want to do a "git rebase --interactive" | 22:49 |
| CarlFK | that brings up vim with "noop" at the top: http://paste.ubuntu.com/9203793/ | 22:51 |
| tpb | Title: Ubuntu Pastebin (at paste.ubuntu.com) | 22:51 |
| mithro | CarlFK: then it thinks you have no changes in reference to your base | 22:53 |
| mithro | CarlFK: looking at https://github.com/CarlFK/gst-switch/commits/master | 22:54 |
| tpb | Title: Commits · CarlFK/gst-switch · GitHub (at github.com) | 22:54 |
| mithro | CarlFK: which commits do you want to squash? | 22:54 |
| CarlFK | mithro: the top 4 - 3 on Nov 23 and 1 on Nov 22 - all are about tests/test_ui_lag1.sh which is really just a new file | 22:56 |
| mithro | CarlFK: okay | 22:58 |
| mithro | CarlFK: first thing, create a new branch at the starting point by doing a "git checkout <commit id> -b new-branch" | 22:58 |
| CarlFK | mithro: $ git checkout 9387328468aa464ac9f69c72e27526eeb4692584 -b lag-demo | 23:05 |
| CarlFK | Switched to a new branch 'lag-demo' | 23:05 |
| *** hyades has quit IRC | 23:15 | |
| CarlFK | i'm heading over to PS1 for a while, will continue this later | 23:32 |
| mithro | CarlFK: opps sorry got distracted | 23:37 |
| *** CarlFK has quit IRC | 23:43 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!