#timvideos

CarlFK: I'm back now

mithro: i'm back

CarlFK: okay

so you created the lag-demo branch

right

now you want to "rebase your master onto lag-demo"

git rebase --interactive master lag-demo

that should pop-up in vim a list of the commits which are new on master that are not on lag-demo

nope. i have the "noop" again

start up gitk

CarlFK: gitk should show where your branches are

CarlFK: oh wait

I got that rebase command around the wrong way

it should have been "git rebase --interactive lag-demo master"

git rebase --interactive lag-demo master => noop

gitk installed. I see the lag-demo branch.

CarlFK: hrm?

CarlFK: use "gitk --all"

CarlFK: if you say my nick, then I get notified even if I'm not looking

mithro: "gitk --all" - gui up, not sure what to do next

CarlFK: you should see all your branches

CarlFK: upload a screenshot and I can tell you what you are seeing

CarlFK: you want to check that master and lag-demo are at different locations

mithro: what's a location?

CarlFK: commits

IE the little tags should be pointing at different things

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

I think the tags are pointing at the same thing

you should learn to do squashing but I'm probably okay with these commits being unsquashed

CarlFK: probably this helps in future :P - http://justinhileman.info/article/git-pretty/

Title: Git pretty — justin hileman dot info (at justinhileman.info)

heading home... bb in 20 m

[gst-switch] CarlFK opened pull request #38: Adds test_ui_lag1.sh (master...master) http://git.io/a6q-_g

[gst-switch] mithro pushed 5 new commits to master: http://git.io/7s3grA

gst-switch/master 9387328 Carl Karsten: Add test script that exposes lag between thumb and main screen.

gst-switch/master fda7e1a Carl Karsten: test_ui_lag1: Add more sources, add source # to each.

gst-switch/master 9789a90 Carl Karsten: Add test script that exposes lag between thumb and main screen.

~seen tija

mithro: tija was last seen in #timvideos 5 weeks, 6 days, 3 hours, 28 minutes, and 9 seconds ago: <tija> who is parx?

~seen rohit

mithro: I have not seen rohit.

[gst-switch] mithro opened pull request #39: Disabling the pyliny precommit hook. (master...disable-py-commit-hook) http://git.io/EwtAUA

[gst-switch] mithro opened pull request #40: Use sync=false on imagesinks as feeds are live. (master...sync-false) http://git.io/POxy9A

[gst-switch] mithro opened pull request #41: Pylint fixes (master...pylint-fixes) http://git.io/39V-yg

[gst-switch] mithro opened pull request #42: Replace faac component with voaacenc. (master...faac-replace) http://git.io/BCvpCA