| *** tpb has joined #timvideos | 00:00 | |
| *** CarlFK has joined #timvideos | 01:10 | |
| *** ChanServ sets mode: +v CarlFK | 01:10 | |
| mithro | CarlFK: I'm back now | 02:02 |
|---|---|---|
| CarlFK | mithro: i'm back | 02:15 |
| mithro | CarlFK: okay | 02:15 |
| mithro | so you created the lag-demo branch | 02:16 |
| CarlFK | right | 02:16 |
| mithro | now you want to "rebase your master onto lag-demo" | 02:16 |
| mithro | git rebase --interactive master lag-demo | 02:16 |
| mithro | that should pop-up in vim a list of the commits which are new on master that are not on lag-demo | 02:16 |
| CarlFK | nope. i have the "noop" again | 02:17 |
| mithro | start up gitk | 02:18 |
| mithro | CarlFK: gitk should show where your branches are | 02:20 |
| mithro | CarlFK: oh wait | 02:22 |
| mithro | I got that rebase command around the wrong way | 02:22 |
| mithro | it should have been "git rebase --interactive lag-demo master" | 02:23 |
| CarlFK | git rebase --interactive lag-demo master => noop | 02:26 |
| CarlFK | gitk installed. I see the lag-demo branch. | 02:27 |
| *** hyades has joined #timvideos | 02:38 | |
| mithro | CarlFK: hrm? | 02:42 |
| mithro | CarlFK: use "gitk --all" | 02:42 |
| mithro | CarlFK: if you say my nick, then I get notified even if I'm not looking | 02:42 |
| CarlFK | mithro: "gitk --all" - gui up, not sure what to do next | 02:44 |
| mithro | CarlFK: you should see all your branches | 02:44 |
| mithro | CarlFK: upload a screenshot and I can tell you what you are seeing | 02:44 |
| *** techman83 has quit IRC | 02:57 | |
| mithro | CarlFK: you want to check that master and lag-demo are at different locations | 02:58 |
| *** techman83 has joined #timvideos | 02:58 | |
| *** ChanServ sets mode: +v techman83 | 02:58 | |
| CarlFK | mithro: what's a location? | 03:07 |
| mithro | CarlFK: commits | 03:07 |
| mithro | IE the little tags should be pointing at different things | 03:07 |
| CarlFK | btw, this is all so you have a cleaner PR, so im OK if you want to just take the one file in the 3 commits thats fine | 03:09 |
| CarlFK | I think the tags are pointing at the same thing | 03:09 |
| *** thaytan has quit IRC | 03:37 | |
| *** thaytan has joined #timvideos | 03:39 | |
| *** ChanServ sets mode: +v thaytan | 03:39 | |
| mithro | you should learn to do squashing but I'm probably okay with these commits being unsquashed | 03:47 |
| aps | CarlFK: probably this helps in future :P - http://justinhileman.info/article/git-pretty/ | 03:59 |
| tpb | Title: Git pretty — justin hileman dot info (at justinhileman.info) | 03:59 |
| *** CarlFK has quit IRC | 04:01 | |
| *** CarlFK has joined #timvideos | 04:31 | |
| *** ChanServ sets mode: +v CarlFK | 04:31 | |
| CarlFK | heading home... bb in 20 m | 05:14 |
| *** CarlFK has quit IRC | 05:14 | |
| *** CarlFK has joined #timvideos | 05:43 | |
| *** ChanServ sets mode: +v CarlFK | 05:43 | |
| *** hyades has quit IRC | 05:45 | |
| *** hyades has joined #timvideos | 06:09 | |
| *** 32NAAICW2 has quit IRC | 07:10 | |
| *** 14WAARXJA has joined #timvideos | 07:12 | |
| *** slomo has joined #timvideos | 07:31 | |
| *** tvCommitBot has joined #timvideos | 07:36 | |
| tvCommitBot | [gst-switch] CarlFK opened pull request #38: Adds test_ui_lag1.sh (master...master) http://git.io/a6q-_g | 07:36 |
| *** tvCommitBot has left #timvideos | 07:36 | |
| *** tvCommitBot has joined #timvideos | 11:15 | |
| tvCommitBot | [gst-switch] mithro pushed 5 new commits to master: http://git.io/7s3grA | 11:15 |
| tvCommitBot | gst-switch/master 9387328 Carl Karsten: Add test script that exposes lag between thumb and main screen. | 11:15 |
| tvCommitBot | gst-switch/master fda7e1a Carl Karsten: test_ui_lag1: Add more sources, add source # to each. | 11:15 |
| tvCommitBot | gst-switch/master 9789a90 Carl Karsten: Add test script that exposes lag between thumb and main screen. | 11:15 |
| *** tvCommitBot has left #timvideos | 11:15 | |
| mithro | ~seen tija | 11:15 |
| tpb | mithro: tija was last seen in #timvideos 5 weeks, 6 days, 3 hours, 28 minutes, and 9 seconds ago: <tija> who is parx? | 11:15 |
| mithro | ~seen rohit | 11:15 |
| tpb | mithro: I have not seen rohit. | 11:15 |
| *** tvCommitBot has joined #timvideos | 11:36 | |
| tvCommitBot | [gst-switch] mithro opened pull request #39: Disabling the pyliny precommit hook. (master...disable-py-commit-hook) http://git.io/EwtAUA | 11:36 |
| *** tvCommitBot has left #timvideos | 11:36 | |
| *** tvCommitBot has joined #timvideos | 11:36 | |
| tvCommitBot | [gst-switch] mithro opened pull request #40: Use sync=false on imagesinks as feeds are live. (master...sync-false) http://git.io/POxy9A | 11:36 |
| *** tvCommitBot has left #timvideos | 11:36 | |
| *** tvCommitBot has joined #timvideos | 12:29 | |
| tvCommitBot | [gst-switch] mithro opened pull request #41: Pylint fixes (master...pylint-fixes) http://git.io/39V-yg | 12:29 |
| *** tvCommitBot has left #timvideos | 12:29 | |
| *** CARAM_ has quit IRC | 13:25 | |
| *** 14WAARXJA has quit IRC | 13:26 | |
| *** hyades has quit IRC | 13:26 | |
| *** hyades has joined #timvideos | 13:28 | |
| *** CARAM_ has joined #timvideos | 13:29 | |
| *** puck has quit IRC | 14:12 | |
| *** puck has joined #timvideos | 14:12 | |
| *** tvCommitBot has joined #timvideos | 14:21 | |
| tvCommitBot | [gst-switch] mithro opened pull request #42: Replace faac component with voaacenc. (master...faac-replace) http://git.io/BCvpCA | 14:21 |
| *** tvCommitBot has left #timvideos | 14:21 | |
| *** jmc75 has joined #timvideos | 17:29 | |
| *** jmc75 has quit IRC | 17:32 | |
| *** jmc75 has joined #timvideos | 17:44 | |
| *** jmc75 has quit IRC | 17:48 | |
| *** rnikhil275 has joined #timvideos | 18:04 | |
| *** hyades has quit IRC | 18:35 | |
| *** slomo_ has joined #timvideos | 18:39 | |
| *** slomo has quit IRC | 18:42 | |
| *** slomo_ has quit IRC | 19:44 | |
| *** slomo has joined #timvideos | 19:48 | |
| *** slomo has quit IRC | 20:28 | |
| *** slomo has joined #timvideos | 20:29 | |
| *** CarlFK has quit IRC | 21:37 | |
| *** hyades has joined #timvideos | 22:21 | |
| *** CarlFK has joined #timvideos | 22:30 | |
| *** ChanServ sets mode: +v CarlFK | 22:30 | |
| *** slomo has quit IRC | 22:31 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!