Sunday, 2014-11-23

*** tpb has joined #timvideos00:00 [freenode-info] if you're at a conference and other people are having trouble connecting, please mention it to staff:
*** hyades has joined #timvideos01:31
*** hyades has quit IRC03:35
*** hyades has joined #timvideos04:45
*** thiagoss has quit IRC04:45
*** thiagoss has joined #timvideos04:49
*** jmc75 has joined #timvideos07:07
*** jmc75 has quit IRC08:36
*** jmc75 has joined #timvideos08:44
*** jmc75 has quit IRC11:29
*** jmc75 has joined #timvideos11:35
*** jmc75 has quit IRC12:56
*** jmc75 has joined #timvideos12:57
*** jmc75 has quit IRC13:02
*** jmc75 has joined #timvideos13:04
apsmithro: Check this out :D -
tpbTitle: Welcome lucky user! (at
*** jmc75 has quit IRC18:20
*** jmc75 has joined #timvideos18:20
*** jmc75 has quit IRC19:37
*** jmc75 has joined #timvideos19:37
puckmithro:  pong (slow transmit times)20:42
pucker, 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:
tpbTitle: Commits · CarlFK/gst-switch · GitHub (at
CarlFKanyone know how to squash those into 1 so I can get on with my pull request?20:58
*** jmc75 has quit IRC22:01
mithroCarlFK: morning22:24
tpbTitle: USB FPGA Project (at
CarlFKmithro: hey - can you walk me though git squish?  cuz my last 3 attempts just make more commits22:26
tpbTitle: makestuff/libfpgalink · GitHub (at
mithroCarlFK: sure22:41
mithroCarlFK: what are you trying to do?22:48
CarlFKmithro: create a pull request that is just the file in it's current state, not split into 2 diffs22:48
mithroCarlFK: so you want to do a "git rebase --interactive"22:49
CarlFKthat brings up vim with "noop" at the top:
tpbTitle: Ubuntu Pastebin (at
mithroCarlFK: then it thinks you have no changes in reference to your base22:53
mithroCarlFK: looking at
tpbTitle: Commits · CarlFK/gst-switch · GitHub (at
mithroCarlFK: which commits do you want to squash?22:54
CarlFKmithro: the top 4 - 3 on Nov 23 and 1 on Nov 22 - all are about  tests/    which is really just a new file22:56
mithroCarlFK: okay22:58
mithroCarlFK: first thing, create a new branch at the starting point by doing a "git checkout <commit id> -b new-branch"22:58
CarlFKmithro:  $ git checkout 9387328468aa464ac9f69c72e27526eeb4692584 -b lag-demo23:05
CarlFKSwitched to a new branch 'lag-demo'23:05
*** hyades has quit IRC23:15
CarlFKi'm heading over to PS1 for a while, will continue this later23:32
mithroCarlFK: opps sorry got distracted23:37
*** CarlFK has quit IRC23:43

Generated by 2.13.1 by Marius Gedminas - find it at!