Sunday, 2010-12-05

« Saturday, 2010-12-04 Index Monday, 2010-12-06 »
*** Cybodog has joined #openstack00:23
*** aimon has joined #openstack00:24
*** eldarnugaev has joined #openstack01:15
*** miclorb has joined #openstack01:17
*** MarkAtwood has joined #openstack01:21
*** eldarnugaev has quit IRC01:23
*** Cybo has joined #openstack01:34
*** azneita has joined #openstack01:36
*** Cybo has quit IRC01:40
*** Cybo has joined #openstack01:46
*** Cybo has joined #openstack01:49
*** eldarnugaev has joined #openstack01:53
*** miclorb has quit IRC02:02
*** eldarnugaev has quit IRC02:16
*** dirakx has joined #openstack02:24
*** azneita has quit IRC03:55
*** kirkland has quit IRC04:26
*** omidhdl has joined #openstack04:41
*** omidhdl1 has joined #openstack04:43
*** omidhdl has quit IRC04:43
*** elasticdog has quit IRC04:54
*** omidhdl1 has left #openstack04:58
*** omidhdl has joined #openstack04:59
*** Cybo has quit IRC05:01
*** omidhdl has quit IRC05:03
*** sirp has quit IRC06:15
*** omidhdl has joined #openstack06:44
*** GasbaKid has joined #openstack06:47
*** Cybodog has quit IRC06:47
*** omidhdl has quit IRC07:20
*** omidhdl has joined #openstack08:06
mtaylorhey - any of you git folks in channel?08:13
_0x44Yes.08:14
mtaylor_0x44: woot. so - I have this git repo ... and I did a git pull...08:16
mtaylorwell, I had changes in my tree, so this wound up generating a merge revision... but the changes already existed upstream, so the merge rev is empty08:16
mtayloris there any sensible way to get rid of said revision and just make my local thing the same as upstream again?08:17
_0x44Yes, git pull --rebase08:17
_0x44Errr, well: git reset --hard HEAD~1; git pull --rebase;08:18
mtaylor_0x44: ok. sweet. so, git reset --hard HEAD-1 did what I needed to the local repo08:19
mtaylorI'd already pushed my change to my github fork, so the pull/rebase was pulling in the change again I think08:20
* mtaylor really needs to actually learn what he's doing with git one of these days...08:20
mtaylor_0x44: thanks! that was killer helpful08:20
_0x44mtaylor: You're welcome :) I'm one of the freaks who has git pull rebase by default, which means that no matter what my master branch has a linear dev history08:21
*** allsystemsarego has joined #openstack09:23
*** hky has quit IRC09:24
*** deshantm has quit IRC09:27
*** deshantm_cosi has quit IRC09:27
*** deshantm_cosi has joined #openstack09:40
*** deshantm has joined #openstack09:40
*** arcane has quit IRC09:46
*** miclorb_ has joined #openstack10:47
*** nijaba has quit IRC11:21
*** nijaba has joined #openstack11:22
*** nijaba has joined #openstack11:22
*** eldarnugaev has joined #openstack11:34
*** miclorb_ has quit IRC12:07
*** jkakar has quit IRC12:17
*** jkakar has joined #openstack12:19
*** omidhdl has left #openstack12:28
*** eldarnugaev has quit IRC12:44
*** rchavik has joined #openstack13:22
*** omidhdl has joined #openstack13:26
*** omidhdl1 has joined #openstack13:27
*** omidhdl has quit IRC13:27
*** aimon has quit IRC14:00
*** eldarnugaev has joined #openstack14:40
*** rchavik has quit IRC15:14
*** Cybodog has joined #openstack15:14
*** Cybodog has quit IRC15:17
*** Cybodog has joined #openstack15:23
*** Cybodog has quit IRC15:24
*** Ryan_Lane|away is now known as Ryan_Lane15:37
*** rchavik has joined #openstack15:38
*** eldarnugaev has quit IRC15:40
*** omidhdl1 has left #openstack15:41
*** eldarnugaev has joined #openstack15:44
*** rchavik has quit IRC15:49
*** eldarnugaev has quit IRC15:55
*** infernix has quit IRC16:02
*** rsampaio has joined #openstack16:03
*** infernix has joined #openstack16:04
*** Cybodog has joined #openstack16:39
*** sirp1 has joined #openstack17:03
*** creiht_ has joined #openstack17:15
*** odyi` has joined #openstack17:16
*** cory__ has joined #openstack17:16
*** infernix has quit IRC17:16
*** jfluhmann_ has quit IRC17:16
*** londo_ has quit IRC17:16
*** zul has quit IRC17:16
*** fabiand has quit IRC17:16
*** dagger has quit IRC17:16
*** notmyname has quit IRC17:16
*** dendrobates has quit IRC17:16
*** jtimberman has quit IRC17:16
*** creiht has quit IRC17:16
*** odyi has quit IRC17:16
*** cory_ has quit IRC17:16
*** pquerna has quit IRC17:16
*** timrc has quit IRC17:16
*** pquerna_ has joined #openstack17:16
*** dendroba` has joined #openstack17:16
*** jfluhmann_ has joined #openstack17:16
*** infernix has joined #openstack17:16
*** zul has joined #openstack17:16
*** dagger has joined #openstack17:16
*** londo_ has joined #openstack17:16
*** jtimberman has joined #openstack17:17
*** notmyname has joined #openstack17:20
*** ChanServ sets mode: +v notmyname17:20
*** odyi` is now known as odyi17:22
*** timrc has joined #openstack17:46
*** sirp1 has quit IRC17:50
mtaylorany vim gods laying around?17:59
*** pquerna_ has quit IRC18:05
*** pquerna_ has joined #openstack18:05
*** pquerna_ is now known as pquerna18:05
*** sirp1 has joined #openstack18:14
*** sirp1 has quit IRC18:25
*** GasbaKid has quit IRC18:47
*** GasbaKid has joined #openstack19:15
*** finch has joined #openstack19:20
alekibangomtaylor: ask real question19:28
alekibango:)19:28
mtayloralekibango: fair enough - solution found elsewhere though :)19:29
alekibango:)19:29
alekibangomtaylor: i know some 20-30 % of vim19:29
alekibangowhich makes me pretty tough :)19:29
mtaylorexcellent.19:29
alekibangoonce i even wrote python folding for vim :)  in python19:30
alekibangobut mostly, just fraction of vim is enough to know19:31
mtaylorI have only written a small patch to a codestyle plugin in vim ... I did once write a playwrighting system in a combination of elisp and latex though :)19:31
alekibangonever enjoyed lisp or lambda calcul much... :)19:32
*** deshantm_cosi has quit IRC19:37
*** deshantm has quit IRC19:40
*** rsampaio has quit IRC19:46
*** rsampaio has joined #openstack19:47
*** deshantm_cosi has joined #openstack19:48
*** rsampaio_ has joined #openstack19:49
*** rsampaio has quit IRC19:49
*** deshantm has joined #openstack19:52
*** rsampaio has joined #openstack19:56
*** rsampaio_ has quit IRC19:57
*** rsampaio has quit IRC20:06
*** heckj has joined #openstack20:13
*** MarkAtwood has quit IRC20:39
*** odyi has quit IRC20:44
*** brd_from_italy has joined #openstack20:46
*** masticator has joined #openstack20:54
*** masticator has left #openstack20:54
*** odyi has joined #openstack20:56
*** Cybo has joined #openstack21:19
*** Daviey has quit IRC21:19
*** Daviey has joined #openstack21:21
*** zul has quit IRC21:38
*** eldarnugaev has joined #openstack21:50
*** JuanPerez has joined #openstack21:53
*** JuanPerez_ has joined #openstack22:01
*** JuanPerez__ has joined #openstack22:02
*** fabiand has joined #openstack22:03
*** JuanPerez has quit IRC22:03
*** JuanPerez__ is now known as JuanPerez22:03
*** JuanPerez_ has quit IRC22:06
*** joearnold has joined #openstack22:10
*** eldarnugaev has quit IRC22:11
*** joearnold has quit IRC22:14
*** JuanPerez has quit IRC22:25
*** ctennis has quit IRC22:30
*** maplebed has joined #openstack22:36
*** matiu has joined #openstack22:45
*** JordanRinke2 has joined #openstack22:49
*** JordanRinke1 has quit IRC22:51
*** ctennis has joined #openstack22:54
*** ctennis has joined #openstack22:54
*** eldarnugaev has joined #openstack22:57
*** davidX- has quit IRC23:05
*** Ryan_Lane has quit IRC23:06
*** brd_from_italy has quit IRC23:11
*** arcane has joined #openstack23:16
*** joearnold has joined #openstack23:26
*** eldarnugaev has quit IRC23:33
*** ctennis has quit IRC23:35
*** joearnold has quit IRC23:38
*** matiu has quit IRC23:40
*** maplebed has quit IRC23:42
*** heckj has quit IRC23:45
*** ctennis has joined #openstack23:46
*** matiu has joined #openstack23:47
« Saturday, 2010-12-04 Index Monday, 2010-12-06 »

Generated by irclog2html.py 2.14.0 by Marius Gedminas - find it at mg.pov.lt!