| 2014-11-22 |
| ← fstd left | 00:01 |
| ← jagob left | 00:01 |
| → jagob joined | 00:01 |
| → Gizburdt joined | 00:02 |
| → NoNMaDDeN joined | 00:02 |
|
Vivekananda_y510
| hi everyone . I wonder if this is a good way of setting up a website management workflow. I also dont understand parts of it and hope someone can help / explain : http://toroid.org/ams/git-website-howto | 00:03 |
| ← Gizburdt left | 00:05 |
| ← chrisshattuck left | 00:05 |
| → Cassiel joined | 00:05 |
| ← kermit left | 00:05 |
| → kukks joined | 00:06 |
| ← kukks left | 00:06 |
| → kukks joined | 00:06 |
| ← jagob left | 00:06 |
| ← a_le_ left | 00:06 |
| ← User458764 left | 00:06 |
| → kermit joined | 00:06 |
| ← zumba_addict left | 00:07 |
| → desposo joined | 00:08 |
| → zumba_addict joined | 00:08 |
| ← knownasilya left | 00:09 |
| ← ItSANgo left | 00:09 |
| → ItSANgo joined | 00:09 |
| ← ItSANgo left | 00:10 |
| → ItSANgo joined | 00:10 |
| ← safinaskar left | 00:11 |
| → Gizburdt joined | 00:11 |
| ← ItSANgo left | 00:11 |
| ← Gizburdt left | 00:12 |
| ← sente left | 00:12 |
| ← souther left | 00:15 |
| ← doppo left | 00:15 |
| → m0ltar joined | 00:16 |
| ← m0ltar left | 00:16 |
| ← King_Hual` left | 00:16 |
| → solker joined | 00:17 |
| → Gizburdt joined | 00:18 |
| → EvilPenguin joined | 00:19 |
| → adamben joined | 00:20 |
| → doppo joined | 00:21 |
| → a_le joined | 00:21 |
| → sm joined | 00:21 |
| → souther joined | 00:21 |
| ← adamben_ left | 00:21 |
| ← tang^ left | 00:22 |
| ← solker left | 00:22 |
|
sm
| g'day all. Thanks for an awesome tool. I wonder, how can I do merge --rebase, similar to pull --rebase ? | 00:22 |
| ← martinklepsch left | 00:22 |
| ← Zupoman left | 00:22 |
| → ascarter joined | 00:22 |
| → hexagoxel_ joined | 00:22 |
| → martinklepsch joined | 00:22 |
| ← decompiled left | 00:22 |
| ← martinklepsch left | 00:23 |
|
sm
| I've got 1.9.3 here | 00:23 |
| → martinklepsch joined | 00:23 |
| ← martinklepsch left | 00:24 |
| ← BlaXpirit left | 00:24 |
| → martinklepsch joined | 00:24 |
|
reaverb
| sm: Use "git rebase foo" :D | 00:25 |
|
Vivekananda_y510
| anyone to my response? | 00:25 |
| → ojacobson joined | 00:26 |
|
sm
| reaverb: aha. thank you | 00:26 |
| ← hexagoxel left | 00:26 |
| ← baweaver left | 00:27 |
| ← EvilPenguin left | 00:28 |
| ← ciampix left | 00:28 |
| ← Gizburdt left | 00:30 |
| → Gizburdt joined | 00:33 |
| ← lindenle left | 00:33 |
| → faylite joined | 00:34 |
| ← Takle left | 00:36 |
| → Xiti` joined | 00:37 |
| ← hahuang65 left | 00:38 |
| ← Xiti left | 00:41 |
| ← aynik left | 00:42 |
| ← beastd left | 00:43 |
| ← desposo left | 00:44 |
| ← corni left | 00:45 |
|
Vivekananda_y510
| noone around | 00:45 |
|
| interesting | 00:45 |
| → reaverb1 joined | 00:48 |
| ← reaverb left | 00:50 |
| reaverb1 → reaverb | 00:50 |
| ← martinklepsch left | 00:50 |
| → Droolio joined | 00:50 |
| ← NoNMaDDeN left | 00:51 |
| ← tvw left | 00:52 |
| ← nfk left | 00:53 |
| → Consuela joined | 00:54 |
| → chindy joined | 00:55 |
| → EminenceHC joined | 00:56 |
| ← Noldorin left | 00:58 |
| ← in_deep_thought left | 00:58 |
| → baweaver joined | 00:59 |
| → oriba joined | 01:00 |
| ← ascarter left | 01:00 |
| ← AR45 left | 01:00 |
| ← thiago left | 01:00 |
| ← EminenceHC left | 01:00 |
| → AR45 joined | 01:01 |
| ← mellernoia left | 01:01 |
| ← AR45 left | 01:02 |
| → AR45 joined | 01:02 |
| → Lyqyd joined | 01:04 |
| ← nezZario left | 01:04 |
| ← checkit left | 01:06 |
| → jb55_ joined | 01:06 |
| ← hexagoxel_ left | 01:07 |
| ← imachuchu left | 01:07 |
| ← jb55 left | 01:09 |
| ← Xiti` left | 01:10 |
| ← jb55_ left | 01:10 |
| → Xiti joined | 01:10 |
| ← parallel21 left | 01:11 |
| ← chindy left | 01:12 |
| ← robustus left | 01:12 |
| ← CussBot left | 01:12 |
| → CussBot joined | 01:13 |
| → robustus joined | 01:13 |
| → mmitchell joined | 01:14 |
| → eletuchy_ joined | 01:14 |
| ← KONIG left | 01:16 |
| ← oriba left | 01:17 |
| → oriba joined | 01:17 |
| ← eletuchy left | 01:18 |
| → m0ltar joined | 01:18 |
| ← mmitchell left | 01:18 |
| → solker joined | 01:18 |
| ← eletuchy_ left | 01:19 |
| → kadoban joined | 01:20 |
| ← solker left | 01:22 |
| ← MLM left | 01:23 |
| ← OptimizedCoder left | 01:23 |
| → imastupidguest joined | 01:26 |
| → msmith_ joined | 01:27 |
|
Vivekananda_y510
| hello | 01:27 |
|
| anyone here and care to comment ? | 01:27 |
|
| hi everyone . I wonder if this is a good way of setting up a website management workflow. I also dont understand parts of it and hope someone can help / explain : http://toroid.org/ams/git-website-howto | 01:27 |
| ← ManikM left | 01:28 |
| → ManikM joined | 01:28 |
| ← Quevin_ left | 01:28 |
| ← FreezingCold left | 01:28 |
| ← Quevin left | 01:29 |
| ← eyeRobut left | 01:29 |
| ← t0th_-__ left | 01:29 |
| → Gitzilla joined | 01:29 |
| ← dreiss left | 01:29 |
| ← Gizburdt left | 01:30 |
| → Gizburdt joined | 01:30 |
| ← baweaver left | 01:30 |
| ← acharlieh left | 01:30 |
| ← blackmesa left | 01:31 |
| ← skylite_ left | 01:31 |
| → jacksparrow007 joined | 01:31 |
| ← msmith_ left | 01:32 |
| → lindenle joined | 01:34 |
| ← danmackay left | 01:34 |
|
reaverb
| Vivekananda_y510: Maybe try to get as far as you can and then ask a specific question? It's kind of hard to respond clairfy "parts of something". I've never set up a a web page so I'm not qualified to comment, but that tutorial looks reasonable to me. | 01:34 |
| ← AR45 left | 01:34 |
| ← Gizburdt left | 01:34 |
| → ErKa joined | 01:36 |
| ← jacksparrow007 left | 01:36 |
| ← palcu_ left | 01:38 |
| → danmackay joined | 01:38 |
| ← lindenle left | 01:38 |
| ← oriba left | 01:38 |
| → ascarter joined | 01:39 |
| ← CussBot left | 01:39 |
| → CussBot joined | 01:39 |
| ← wakd left | 01:41 |
| → wakd joined | 01:41 |
| → Warrior-kk joined | 01:44 |
|
Vivekananda_y510
| reaverb, okay | 01:44 |
|
| reaverb, as to specific question I want to learn basics ( stress on basics ) of hooks. I dont know enough to comprehend what they are and how they work esp in that example | 01:45 |
| ← netcarver left | 01:47 |
| ← ErKa left | 01:48 |
|
reaverb
| hooks are just a script which is automatically run when git does something. | 01:49 |
| → Gasseus joined | 01:49 |
|
reaverb
| In this case the post-recieve script is run after you push something to the webserver. | 01:49 |
|
| hook scrips are placed in the .git/hooks folder. | 01:50 |
| ← arnaud left | 01:50 |
|
Vivekananda_y510
| okay that made sense | 01:52 |
|
| let me read further then | 01:52 |
| ← Gasseus left | 01:53 |
| → zumba_ad_ joined | 01:54 |
| ← faylite left | 01:56 |
| → winst joined | 01:56 |
| → andrew__ joined | 01:57 |
| ← kballou left | 01:58 |
| → teran_ joined | 01:58 |
| → fstd joined | 01:58 |
| → puff` joined | 01:59 |
| ← joelm left | 02:00 |
| → EminenceHC joined | 02:00 |
| puff` → puff | 02:00 |
| ← Chex left | 02:00 |
| ← weltall left | 02:00 |
| ← aucecil left | 02:00 |
| ← ascarter left | 02:00 |
| ← Lyqyd left | 02:00 |
| ← kukks left | 02:00 |
| ← zhxt_work left | 02:00 |
| ← lidaaa left | 02:00 |
| ← Guest26571 left | 02:00 |
| ← gv left | 02:00 |
| ← joki left | 02:00 |
| ← rasto left | 02:00 |
| ← msonntag left | 02:00 |
| ← zapb_ left | 02:00 |
| ← huglester left | 02:00 |
| ← DolphinDream left | 02:00 |
| ← adhawkins left | 02:00 |
| ← BooK left | 02:00 |
| ← Websoftwarez left | 02:00 |
| ← brandonw left | 02:00 |
| ← Stravy left | 02:00 |
| ← moparisthebest left | 02:00 |
| ← qknight left | 02:00 |
| ← Dreamer3 left | 02:00 |
| ← Garen left | 02:00 |
| ← pr0t left | 02:00 |
| ← kdlv left | 02:00 |
| ← ToxicFrog left | 02:00 |
| ← damccull left | 02:00 |
| ← k4r1m left | 02:00 |
| ← ensirius left | 02:00 |
| ← cart05 left | 02:00 |
| ← ybit left | 02:00 |
| ← heinrich5991 left | 02:00 |
| ← chadi left | 02:00 |
| ← errr left | 02:00 |
| ← leprechau left | 02:00 |
| ← mrkake left | 02:00 |
| ← Intensity left | 02:00 |
| ← wakd left | 02:00 |
| ← Droolio left | 02:00 |
| ← doppo left | 02:00 |
| ← MattMaker left | 02:00 |
| ← offbyone left | 02:00 |
| ← Kabaka left | 02:00 |
| ← phantombeta left | 02:00 |
| ← Gamecubic left | 02:00 |
| ← Blaguvest left | 02:00 |
| ← dtrott left | 02:00 |
| ← israelpattison left | 02:00 |
| ← duckydan left | 02:00 |
| ← trey left | 02:00 |
| ← eric___ left | 02:00 |
| ← up_the_irons left | 02:00 |
| ← ScottE left | 02:00 |
| ← fahadash left | 02:00 |
| ← poisond left | 02:00 |
| ← bauruine left | 02:00 |
| ← HicksD left | 02:00 |
| ← DSH105 left | 02:00 |
| ← aseidl left | 02:00 |
| ← SupaHam left | 02:00 |
| ← i_ron left | 02:00 |
| ← HedgeMage left | 02:00 |
| ← greymalkin left | 02:00 |
| ← wcpan left | 02:00 |
| ← Dougie187 left | 02:00 |
| ← GGMethos left | 02:00 |
| ← e66 left | 02:00 |
| ← bdavenport left | 02:00 |
| ← jazper- left | 02:00 |
| ← sd1074 left | 02:00 |
| ← bandroidx left | 02:00 |
| ← netameta left | 02:00 |
| ← sarri left | 02:00 |
| ← mibofra left | 02:00 |
| ← blarson left | 02:00 |
| ← mhite left | 02:00 |
| ← Peuc left | 02:00 |
| ← synfinatic left | 02:00 |
| ← sfr^ left | 02:00 |
| ← heftig left | 02:00 |
| ← scorphus left | 02:00 |
| ← manuel_ left | 02:00 |
| ← hagabaka left | 02:00 |
| ← TDJACR left | 02:00 |
| ← variable left | 02:00 |
| ← uidzer0 left | 02:00 |
| ← markmarkmark left | 02:00 |
| ← titou left | 02:00 |
| ← c0ded left | 02:00 |
| ← Forkk left | 02:00 |
| ← roto left | 02:00 |
| ← cwillu_at_work left | 02:00 |
| ← lasers left | 02:00 |
| ← chrisgeorge left | 02:00 |
| ← skelterjohn left | 02:00 |
| ← Fifty5Plus left | 02:00 |
| ← adev left | 02:00 |
| ← dziga left | 02:00 |
| ← GarethAdams left | 02:00 |
| ← armenb left | 02:00 |
| ← bobdobbs left | 02:00 |
| ← bb010g left | 02:00 |
| ← lachesis left | 02:00 |
| ← murph left | 02:00 |
| ← Klumben left | 02:00 |
| ← sword` left | 02:00 |
| ← ag4ve_ left | 02:00 |
| ← slixpk left | 02:00 |
| ← blackjid_ left | 02:00 |
| ← Seveas left | 02:00 |
| ← stealthii left | 02:00 |
| ← jxport left | 02:00 |
| ← tapout left | 02:00 |
| ← kossy left | 02:00 |
| ← reaverb left | 02:00 |
| ← zumba_addict left | 02:00 |
| ← xender left | 02:00 |
| ← teran left | 02:00 |
| ← Sadeukko left | 02:00 |
| ← Raverix left | 02:00 |
| ← kyb3r_ left | 02:00 |
| ← howitdo left | 02:00 |
| ← Vampire0_ left | 02:00 |
| ← b10s left | 02:00 |
| ← GodEater left | 02:00 |
| ← learner left | 02:00 |
| ← M-ou-se left | 02:00 |
| ← sitaram left | 02:00 |
| ← eternnoir left | 02:00 |
| ← kirin` left | 02:00 |
| ← Pezmc left | 02:00 |
| ← scriptThis left | 02:00 |
| ← uber left | 02:00 |
| ← RichardJ left | 02:00 |
| ← Vinnie_win left | 02:00 |
| ← Mark_ left | 02:00 |
| ← slobo left | 02:00 |
| ← Tabmow left | 02:00 |
| ← scarcry left | 02:00 |
| ← lahwran left | 02:00 |
| ← asedeno left | 02:00 |
| ← jrdavid_ left | 02:00 |
| ← raatiniemi left | 02:00 |
| ← jnewt left | 02:00 |
| ← kandinski left | 02:00 |
| → nettoweb joined | 02:01 |
| ← kadoban left | 02:03 |
|
imastupidguest
| Is there any way to make git send a test email to the account I've configured? | 02:03 |
| ← EminenceHC left | 02:04 |
|
imastupidguest
| And, is there more to setting up email in git than just configuring the user.email field? | 02:04 |
| ← srcerer left | 02:04 |
| ← fstd left | 02:05 |
| ← teran_ left | 02:05 |
|
soerenb
| depends on your host | 02:06 |
| → GGMethos joined | 02:06 |
|
soerenb
| if you have a well configured sendmail compatible MTA on your host, things should work | 02:07 |
|
| otherwise you may have to configure some smtp related options as well | 02:07 |
| → fstd joined | 02:07 |
| → bauruine joined | 02:08 |
| → teran joined | 02:08 |
| → bb010g joined | 02:08 |
|
imastupidguest
| soerenb: I know next to nothing about git or how sending email from the local machine works. Als I know is I may like git to send certain emails (like errors or such) to my online gmx email account. | 02:08 |
| ← Consuela left | 02:08 |
|
soerenb
| you're talkinjg about hosting git? | 02:09 |
|
| that's another completely different thing | 02:09 |
| → wakd joined | 02:09 |
|
soerenb
| and without knowing any of these things, things are not likely to work | 02:09 |
| → hagabaka joined | 02:10 |
| ← nettoweb left | 02:10 |
|
soerenb
| i think there are usually come example email notification hooks i a repo's hooks directory | 02:10 |
|
| that is probably something to look at | 02:10 |
|
imastupidguest
| soerenb: Well, truth is, I'm not really sure. No, I use bitbucket. But it seemed intuitive that I might want git to send some automated messages to my online email. I don't really know. Haven't thought too deeply about it. | 02:10 |
|
| ok | 02:10 |
|
soerenb
| sounds like it | 02:10 |
| → t0th_-__ joined | 02:11 |
|
imastupidguest
| Well, I'll prob see things more clearly as I work w/ git a little more. Then I can worry about things like this I guess :> | 02:11 |
|
| Is there any way to set up git so, at least, it will push to my bitbucket repo whenever I do a push locally? | 02:12 |
|
| I know I'd want that | 02:12 |
|
soerenb
| how many repos do you have? | 02:13 |
|
imastupidguest
| One so far :> | 02:13 |
|
| I'm such a newb | 02:14 |
| → FreezingCold joined | 02:14 |
|
soerenb
| yeah, you should probably get familiar with git a little more and then ask questions when you actually have a problem that you couldn't figure out. have a look at !guide and !tutorial | 02:14 |
|
gitinfo
| [!simpleguide] The Simple Git Guide by Roger Dudler: http://rogerdudler.github.io/git-guide/ | 02:14 |
|
| A list of interactive git tutorials: http://try.github.com | 02:14 |
|
imastupidguest
| Well, correction, one empty repo still in the middle of set up on bitbucket and just installed git locally. Haven't made the corresponding repo yet. | 02:15 |
| ← NosBit left | 02:15 |
|
imastupidguest
| well I know what I want to do right off the bat. I'm setting up my repo on bitbucket now. This involves some work locally to do so | 02:15 |
|
| might as well set up git to push to bitbucket whenever a local push is done right now too, no? | 02:16 |
|
soerenb
| what you say doesn't make much sense | 02:16 |
|
| hence, take a look at the links above | 02:16 |
|
imastupidguest
| I have them. Thank you tho | 02:16 |
| ← andrew__ left | 02:17 |
| ← zumba_ad_ left | 02:17 |
|
winst
| !guide | 02:17 |
|
gitinfo
| [!simpleguide] The Simple Git Guide by Roger Dudler: http://rogerdudler.github.io/git-guide/ | 02:17 |
|
winst
| !tutorial | 02:18 |
|
gitinfo
| A list of interactive git tutorials: http://try.github.com | 02:18 |
| → zumba_addict joined | 02:18 |
| → Vampire0_ joined | 02:18 |
|
imastupidguest
| It's cool guys. Thanks for your time | 02:18 |
| ← fstd left | 02:19 |
| ← a_le left | 02:19 |
| → solker joined | 02:19 |
| → fstd joined | 02:19 |
| → a_le joined | 02:20 |
| ← str left | 02:21 |
| ← affa09 left | 02:21 |
| ← LucasTT left | 02:23 |
| ← solker left | 02:24 |
| → Consuela joined | 02:24 |
| ← Sasazuka left | 02:25 |
| ← a_le left | 02:25 |
| → cagedwisdom joined | 02:26 |
| → affa09 joined | 02:27 |
| ← affa09 left | 02:27 |
| → affa09 joined | 02:28 |
| ← fstd left | 02:28 |
| ← _Atom_ left | 02:29 |
| → githogori joined | 02:31 |
| → thiago joined | 02:31 |
| ← St_Marx left | 02:31 |
| → MattMaker joined | 02:31 |
| → jxport joined | 02:32 |
| → Seveas joined | 02:32 |
| → stealthii joined | 02:32 |
| → blackjid_ joined | 02:32 |
| → slixpk joined | 02:32 |
| → ag4ve_ joined | 02:32 |
| → sword` joined | 02:32 |
| → murph joined | 02:32 |
| → lachesis joined | 02:32 |
| → armenb joined | 02:32 |
| → GarethAdams joined | 02:32 |
| → dziga joined | 02:32 |
| → adev joined | 02:32 |
| → skelterjohn joined | 02:32 |
| → Fifty5Plus joined | 02:32 |
| → chrisgeorge joined | 02:32 |
| → lasers joined | 02:32 |
| → cwillu_at_work joined | 02:32 |
| → roto joined | 02:32 |
| → Forkk joined | 02:32 |
| → c0ded joined | 02:32 |
| → titou joined | 02:32 |
| → bobdobbs joined | 02:32 |
| → markmarkmark joined | 02:32 |
| → uidzer0 joined | 02:32 |
| → variable joined | 02:32 |
| → manuel_ joined | 02:32 |
| → scorphus joined | 02:32 |
| → heftig joined | 02:32 |
| → sfr^ joined | 02:32 |
| → synfinatic joined | 02:32 |
| → Peuc joined | 02:32 |
| → mhite joined | 02:32 |
| → blarson joined | 02:32 |
| → mibofra joined | 02:32 |
| → sarri joined | 02:32 |
| → netameta joined | 02:32 |
| → bandroidx joined | 02:32 |
| → sd1074 joined | 02:32 |
| → jazper- joined | 02:32 |
| → bdavenport joined | 02:32 |
| → e66 joined | 02:32 |
| → Dougie187 joined | 02:32 |
| → wcpan joined | 02:32 |
| → greymalkin joined | 02:32 |
| → HedgeMage joined | 02:32 |
| → aseidl joined | 02:32 |
| → i_ron joined | 02:32 |
| → SupaHam joined | 02:32 |
| → HicksD joined | 02:32 |
| → DSH105 joined | 02:32 |
| → fahadash joined | 02:32 |
| → ScottE joined | 02:32 |
| → up_the_irons joined | 02:32 |
| → poisond joined | 02:32 |
| → trey joined | 02:32 |
| → duckydan joined | 02:32 |
| → israelpattison joined | 02:32 |
| → Gamecubic joined | 02:32 |
| → phantombeta joined | 02:32 |
| → offbyone joined | 02:32 |
| → dtrott joined | 02:32 |
| → doppo joined | 02:32 |
| → Droolio joined | 02:32 |
| → kossy joined | 02:32 |
| → Klumben joined | 02:32 |
| → GHAAPEPQ joined | 02:32 |
| → ErKa joined | 02:32 |
| → reaverb joined | 02:32 |
| → xender joined | 02:32 |
| → Sadeukko joined | 02:32 |
| → Raverix joined | 02:32 |
| → b10s joined | 02:32 |
| → kyb3r_ joined | 02:32 |
| → howitdo joined | 02:32 |
| → GHAAOZZM joined | 02:32 |
| → GodEater joined | 02:32 |
| → learner joined | 02:32 |
| → M-ou-se joined | 02:32 |
| → sitaram joined | 02:32 |
| → eternnoir joined | 02:32 |
| → kirin` joined | 02:32 |
| → Pezmc joined | 02:32 |
| → scriptThis joined | 02:32 |
| → uber joined | 02:32 |
| → RichardJ joined | 02:32 |
| → Vinnie_win joined | 02:32 |
| → Mark_ joined | 02:32 |
| → slobo joined | 02:32 |
| → Tabmow joined | 02:32 |
| → scarcry joined | 02:32 |
| → lahwran joined | 02:32 |
| → asedeno joined | 02:32 |
| → jrdavid_ joined | 02:32 |
| → raatiniemi joined | 02:32 |
| → jnewt joined | 02:32 |
| → kandinski joined | 02:32 |
| ← ErKa left | 02:32 |
| ← reaverb left | 02:32 |
| ← xender left | 02:32 |
| ← Sadeukko left | 02:32 |
| ← Raverix left | 02:32 |
| ← kyb3r_ left | 02:32 |
| ← howitdo left | 02:32 |
| ← b10s left | 02:32 |
| ← GodEater left | 02:32 |
| ← learner left | 02:32 |
| ← M-ou-se left | 02:32 |
| ← sitaram left | 02:32 |
| ← eternnoir left | 02:32 |
| ← kirin` left | 02:32 |
| ← Pezmc left | 02:32 |
| ← scriptThis left | 02:32 |
| ← uber left | 02:32 |
| ← RichardJ left | 02:32 |
| ← Vinnie_win left | 02:32 |
| ← Mark_ left | 02:32 |
| ← slobo left | 02:32 |
| ← Tabmow left | 02:32 |
| ← scarcry left | 02:32 |
| ← lahwran left | 02:32 |
| ← asedeno left | 02:32 |
| ← jrdavid_ left | 02:32 |
| ← raatiniemi left | 02:32 |
| ← jnewt left | 02:32 |
| ← kandinski left | 02:32 |
| thomas → 7JTABGLNG | 02:32 |
| → fstd joined | 02:32 |
| → andrew__ joined | 02:32 |
| → Lyqyd joined | 02:32 |
| → zhxt_work joined | 02:32 |
| → Guest26571 joined | 02:32 |
| → gv joined | 02:32 |
| → joki joined | 02:32 |
| → rasto joined | 02:32 |
| → msonntag joined | 02:32 |
| → zapb_ joined | 02:32 |
| → huglester joined | 02:32 |
| → DolphinDream joined | 02:32 |
| → adhawkins joined | 02:32 |
| → BooK joined | 02:32 |
| → Websoftwarez joined | 02:32 |
| → brandonw joined | 02:32 |
| → Stravy joined | 02:32 |
| → moparisthebest joined | 02:32 |
| → qknight joined | 02:32 |
| → Dreamer3 joined | 02:32 |
| → Garen joined | 02:32 |
| → pr0t joined | 02:32 |
| → kdlv joined | 02:32 |
| → ToxicFrog joined | 02:32 |
| → damccull joined | 02:32 |
| → k4r1m joined | 02:32 |
| → ensirius joined | 02:32 |
| → cart05 joined | 02:32 |
| → ybit joined | 02:32 |
| → heinrich5991 joined | 02:32 |
| → chadi joined | 02:32 |
| → errr joined | 02:32 |
| → leprechau joined | 02:32 |
| → mrkake joined | 02:32 |
| → Intensity joined | 02:32 |
| 7JTABGLNG → thomas | 02:33 |
| ← c74d left | 02:34 |
| → jottr joined | 02:35 |
| → c74d joined | 02:35 |
| ← endiruna left | 02:36 |
| → palcu joined | 02:38 |
| ← jottr left | 02:40 |
| ← fstd left | 02:40 |
| ← andrew__ left | 02:40 |
| ← Lyqyd left | 02:40 |
| ← zhxt_work left | 02:40 |
| ← Guest26571 left | 02:40 |
| ← gv left | 02:40 |
| ← joki left | 02:40 |
| ← rasto left | 02:40 |
| ← msonntag left | 02:40 |
| ← zapb_ left | 02:40 |
| ← huglester left | 02:40 |
| ← DolphinDream left | 02:40 |
| ← adhawkins left | 02:40 |
| ← BooK left | 02:40 |
| ← Websoftwarez left | 02:40 |
| ← brandonw left | 02:40 |
| ← Stravy left | 02:40 |
| ← moparisthebest left | 02:40 |
| ← qknight left | 02:40 |
| ← Dreamer3 left | 02:40 |
| ← Garen left | 02:40 |
| ← pr0t left | 02:40 |
| ← kdlv left | 02:40 |
| ← ToxicFrog left | 02:40 |
| ← damccull left | 02:40 |
| ← k4r1m left | 02:40 |
| ← ensirius left | 02:40 |
| ← cart05 left | 02:40 |
| ← ybit left | 02:40 |
| ← heinrich5991 left | 02:40 |
| ← chadi left | 02:40 |
| ← errr left | 02:40 |
| ← leprechau left | 02:40 |
| ← mrkake left | 02:40 |
| ← Intensity left | 02:40 |
| ← kossy left | 02:40 |
| ← Klumben left | 02:40 |
| ← aseidl left | 02:40 |
| ← sfr^ left | 02:40 |
| ← SupaHam left | 02:40 |
| ← bdavenport left | 02:40 |
| → aseidl joined | 02:40 |
| → sfr^ joined | 02:41 |
| → SupaHam joined | 02:41 |
| → kossy joined | 02:41 |
| → tapout joined | 02:41 |
| → GHAAPEPQ joined | 02:41 |
| → ErKa joined | 02:41 |
| → reaverb joined | 02:41 |
| → xender joined | 02:41 |
| → Sadeukko joined | 02:41 |
| → Raverix joined | 02:41 |
| → b10s joined | 02:41 |
| → kyb3r_ joined | 02:41 |
| → howitdo joined | 02:41 |
| → GodEater joined | 02:41 |
| → learner joined | 02:41 |
| → M-ou-se joined | 02:41 |
| → sitaram joined | 02:41 |
| → eternnoir joined | 02:41 |
| → kirin` joined | 02:41 |
| → Pezmc joined | 02:41 |
| → scriptThis joined | 02:41 |
| → uber joined | 02:41 |
| → RichardJ joined | 02:41 |
| → Vinnie_win joined | 02:41 |
| → Mark_ joined | 02:41 |
| → slobo joined | 02:41 |
| → Tabmow joined | 02:41 |
| → scarcry joined | 02:41 |
| → lahwran joined | 02:41 |
| → asedeno joined | 02:41 |
| → jrdavid_ joined | 02:41 |
| → raatiniemi joined | 02:41 |
| → jnewt joined | 02:41 |
| → kandinski joined | 02:41 |
| ← ErKa left | 02:42 |
| ← kirin` left | 02:42 |
| ← uber left | 02:42 |
| → Klumben joined | 02:42 |
| ← offbyone left | 02:43 |
| → uber joined | 02:43 |
| → Kabaka joined | 02:44 |
| ← palcu left | 02:44 |
| → pppp2 joined | 02:45 |
| → offbyone joined | 02:46 |
| → andrew__ joined | 02:46 |
| → Lyqyd joined | 02:46 |
| → zhxt_work joined | 02:46 |
| → Guest26571 joined | 02:46 |
| → gv joined | 02:46 |
| → joki joined | 02:46 |
| → rasto joined | 02:46 |
| → msonntag joined | 02:46 |
| → zapb_ joined | 02:46 |
| → huglester joined | 02:46 |
| → DolphinDream joined | 02:46 |
| → adhawkins joined | 02:46 |
| → BooK joined | 02:46 |
| → Websoftwarez joined | 02:46 |
| → brandonw joined | 02:46 |
| → Stravy joined | 02:46 |
| → moparisthebest joined | 02:46 |
| → qknight joined | 02:46 |
| → Dreamer3 joined | 02:46 |
| → Garen joined | 02:46 |
| → pr0t joined | 02:46 |
| → kdlv joined | 02:46 |
| → ToxicFrog joined | 02:46 |
| → damccull joined | 02:46 |
| → k4r1m joined | 02:46 |
| → ensirius joined | 02:46 |
| → cart05 joined | 02:46 |
| → ybit joined | 02:46 |
| → heinrich5991 joined | 02:46 |
| → chadi joined | 02:46 |
| → errr joined | 02:46 |
| → leprechau joined | 02:46 |
| → mrkake joined | 02:46 |
| → Intensity joined | 02:46 |
| → fstd joined | 02:46 |
| → Chex joined | 02:46 |
| → weltall joined | 02:46 |
| → aucecil joined | 02:46 |
| ← ybit left | 02:46 |
| ← Guest26571 left | 02:46 |
| ← neunon left | 02:47 |
| → ybit3 joined | 02:47 |
| → jacksparrow007 joined | 02:48 |
| → neunon joined | 02:49 |
| → Guest26571 joined | 02:50 |
| → moire_ joined | 02:50 |
| → lidaaa joined | 02:51 |
| ← winst left | 02:51 |
| → kirin` joined | 02:52 |
| → AR45 joined | 02:53 |
| ← m0viefreak left | 02:55 |
| → stbaby joined | 02:56 |
| ← m0ltar left | 03:00 |
| ← MattMaker left | 03:01 |
| → a_le joined | 03:01 |
| → crumpler joined | 03:03 |
| → EminenceHC joined | 03:03 |
| → darkbasic joined | 03:04 |
| → fahadash_ joined | 03:06 |
| ← a_le left | 03:06 |
| → parallel21 joined | 03:07 |
| → lindenle joined | 03:08 |
| ← EminenceHC left | 03:08 |
| ← fahadash left | 03:08 |
| → Sasazuka joined | 03:09 |
| ← jacksparrow007 left | 03:09 |
| ← akushner_ left | 03:09 |
| → aartist joined | 03:10 |
| ← lindenle left | 03:12 |
| → jackspar_ joined | 03:13 |
| ← andrew__ left | 03:15 |
| → Noldorin joined | 03:15 |
| ← dtrott left | 03:15 |
| → andrew__ joined | 03:15 |
| → msmith_ joined | 03:15 |
| → eyeRobut joined | 03:16 |
| ← msmith_ left | 03:20 |
| → solker joined | 03:20 |
| → Goplat joined | 03:22 |
| → MattMaker joined | 03:23 |
| ← solker left | 03:25 |
| → bdavenport joined | 03:25 |
| ← AR45 left | 03:25 |
| → watabou joined | 03:27 |
| ← CheckDavid left | 03:27 |
| → Motoko joined | 03:27 |
| ← ManikM left | 03:28 |
| → ManikM joined | 03:28 |
| ← Sasazuka left | 03:29 |
| ← russt left | 03:30 |
| → fatalhalt joined | 03:30 |
| ← fatalhalt left | 03:30 |
| → dreiss joined | 03:31 |
| ← Cheaterman1 left | 03:33 |
| ← msonntag left | 03:35 |
| → Literphor joined | 03:37 |
| → jt__ joined | 03:37 |
| → msonntag joined | 03:37 |
| ← qbann0p left | 03:38 |
| ← githogori left | 03:38 |
| ← pheaver left | 03:38 |
| ← dreiss left | 03:41 |
| → palcu joined | 03:41 |
| ← robustus left | 03:42 |
| ← imastupidguest left | 03:43 |
| ← reaverb left | 03:44 |
| → robustus joined | 03:45 |
| → githogori joined | 03:45 |
| ← palcu left | 03:46 |
| ← crumpler left | 03:49 |
| → skorgon joined | 03:51 |
| → nezZario joined | 03:51 |
| → _Atom_ joined | 03:52 |
| → arnaud joined | 03:55 |
| → zanchoPa1sa joined | 03:55 |
| ← Literphor left | 03:57 |
| → csstylish_ joined | 03:57 |
| ← csstylish left | 03:58 |
| ← zanchoPansa left | 03:58 |
| → CKyle joined | 03:58 |
| → EminenceHC joined | 03:59 |
| → JEEBcz joined | 03:59 |
| ← leeN left | 04:00 |
| ← alip left | 04:00 |
| → Literphor joined | 04:00 |
| → leeN joined | 04:00 |
| ← JEEB left | 04:01 |
| → ivan\ joined | 04:01 |
| ← zapb_ left | 04:02 |
| ← ciaranm left | 04:02 |
| ← kloeri left | 04:02 |
| ← EminenceHC left | 04:03 |
| ← joeyDB left | 04:06 |
| ← PaulCapestany left | 04:06 |
| → maestrojed joined | 04:07 |
| → PaulCapestany joined | 04:07 |
| → EminenceHC joined | 04:07 |
| → saumye joined | 04:08 |
| → zapb_ joined | 04:08 |
| ← dcpc007 left | 04:09 |
| → dcpc007 joined | 04:10 |
| ← maestrojed left | 04:10 |
| ← NanoArro1 left | 04:11 |
| ← jorj left | 04:11 |
| ← CKyle left | 04:11 |
| ← basiclaser_ left | 04:11 |
| → maestrojed joined | 04:11 |
| ← deepy left | 04:11 |
| ← EminenceHC left | 04:12 |
| ← PaulCapestany left | 04:12 |
| → msankhala joined | 04:12 |
| ← wookienz left | 04:12 |
| → deepy joined | 04:13 |
| → ciaranm joined | 04:14 |
| deepy → Guest71107 | 04:14 |
| → PaulCapestany joined | 04:14 |
| → dsdeiz joined | 04:14 |
| → alip joined | 04:14 |
| → wookienz joined | 04:14 |
| ← PaulCapestany left | 04:14 |
| → NanoArro1 joined | 04:15 |
| → PaulCapestany joined | 04:15 |
| ← t0th_-__ left | 04:17 |
| → kloeri joined | 04:18 |
| ← skorgon left | 04:20 |
| → solker joined | 04:21 |
| → astrofog joined | 04:21 |
| → skorgon joined | 04:22 |
| ← skorgon left | 04:22 |
| → skorgon joined | 04:22 |
| ← aartist left | 04:22 |
| → thedodd joined | 04:22 |
| → liamkeily joined | 04:23 |
| → jottr joined | 04:24 |
| ← skelterjohn left | 04:25 |
| ← solker left | 04:25 |
| → mmitchell joined | 04:26 |
| → The_Phoenix joined | 04:26 |
| ← jackspar_ left | 04:26 |
| ← FreezingCold left | 04:26 |
| ← maestrojed left | 04:27 |
| ← MACscr left | 04:28 |
| ← jottr left | 04:29 |
| ← Noldorin left | 04:30 |
| → Sleepy63 joined | 04:30 |
| → dtrott joined | 04:31 |
| → FreezingCold joined | 04:32 |
| → a_le joined | 04:36 |
| ← a_le left | 04:37 |
| → a_le joined | 04:37 |
| → Pyrogerg joined | 04:46 |
| ← msankhala left | 04:47 |
| → Sasazuka joined | 04:48 |
| → Gabri joined | 04:49 |
| ← githogori left | 04:49 |
| ← Gabri left | 04:50 |
| → johnny2600 joined | 04:53 |
| ← Literphor left | 04:53 |
| ← nnyk left | 04:53 |
| → githogori joined | 04:56 |
| → russt joined | 04:57 |
| ← Sadeukko left | 05:00 |
| ← Consuela left | 05:01 |
| ← creppe left | 05:03 |
| ← moire_ left | 05:03 |
| → creppe joined | 05:03 |
| → msmith_ joined | 05:04 |
| ← The_Phoenix left | 05:05 |
| harish_ → harish | 05:05 |
| ← harish left | 05:05 |
| ← SumDude_ left | 05:05 |
| → harish joined | 05:05 |
| ← msmith_ left | 05:09 |
| → EminenceHC joined | 05:09 |
| → NoNMaDDeN joined | 05:10 |
| ← mmitchell left | 05:12 |
| → sinequanon joined | 05:12 |
| ← Guest38666 left | 05:12 |
| → Guest38666 joined | 05:12 |
| Guest38666 → Cork | 05:12 |
| ← jt__ left | 05:14 |
| ← sinequanon left | 05:14 |
| ← EminenceHC left | 05:14 |
| → sinequanon joined | 05:15 |
| → henditan joined | 05:18 |
| ← dsdeiz left | 05:20 |
| → kerrick joined | 05:21 |
| ← zanchoPa1sa left | 05:21 |
| ← Motoko left | 05:21 |
| → solker joined | 05:22 |
| → zanchoPansa joined | 05:22 |
| → The_Phoenix joined | 05:24 |
| ← solker left | 05:26 |
| ← lyang0 left | 05:26 |
| → palcu joined | 05:27 |
| → lyang0 joined | 05:27 |
| ← ManikM left | 05:27 |
| → ManikM joined | 05:28 |
| ← kerrick left | 05:30 |
| ← palcu left | 05:32 |
| → RustyShackleford joined | 05:33 |
| → sinequan_ joined | 05:34 |
|
RustyShackleford
| should each commit result in a working project? | 05:34 |
| ← sinequanon left | 05:34 |
|
RustyShackleford
| Lets say you modify two files which are interdependant | 05:34 |
|
| and you commit the changes to each file in separate commits | 05:35 |
|
| if you check out file A commit, the outdated file B will cause a compile error, for example | 05:35 |
| → Ansikt joined | 05:37 |
|
c74d
| In my ideal setup, there would be least one branch, I’ll call it S, for which each commit would be a working state of the project; the changes to A and B would be in separate commits, but those commits would be to a topic branch, which would then be merged into the S branch, and the merge commit would be the commit that is a working state of the project. | 05:38 |
| ← thedodd left | 05:40 |
| ← pppp2 left | 05:40 |
| ← sinequan_ left | 05:42 |
|
puff
| Some of the sources I'm reading about git refer to the SHA1 digest as a 160 character value, some as a 40 character hexadecimal value. | 05:43 |
|
| Was there some sort of schism, or major changeover? | 05:43 |
| → sinequanon joined | 05:44 |
|
Ansikt
| Can someone explain how to use git hub, that would be appreciated. | 05:44 |
|
puff
| Ansikt: What's the question? | 05:44 |
|
Ansikt
| I mean, I use get every day, but I just like...can't grok what my workflow is supposed to look like when making pull requests to someone's repo | 05:44 |
|
RustyShackleford
| c74d: how often do you make branches? | 05:44 |
|
Ansikt
| *use git | 05:45 |
|
RustyShackleford
| its a good idea when your project is established | 05:45 |
|
puff
| Ansikt: I'm a bit of a newbie with github myself, but I'm not sure what you're getting at. | 05:45 |
|
c74d
| RustyShackleford: generally, I create a new branch for each fix or enhancement. | 05:45 |
|
RustyShackleford
| but if you're starting a new one, branches seems kind of overkill until it's at a certain point of being done | 05:45 |
|
Ansikt
| puff, So, what I'm used to is: git checkout [some branch]; git pull; vim whatever.py; git commit -am 'stuff'; git push; | 05:46 |
| ← listochkin left | 05:46 |
| → acharlieh joined | 05:47 |
| ← a_le left | 05:47 |
|
puff
| Ansikt: Okay... and? | 05:47 |
|
Ansikt
| but with github, I....what? Copy someone's by forking it, make a branch, commit to that branch, merge it into trunk or whatever, then pull request my fork against theirs, then delete my fork, then create another fork to keep working? | 05:47 |
|
| Am I getting this right? It seems incredibly complex and awkward, which makes me thing I'm just not 'getting it' | 05:48 |
| → BiggFREE joined | 05:48 |
|
puff
| Ansikt: I think there are two different levels of using github, and you're confusing the two. | 05:48 |
|
Ansikt
| *think, someone's repository | 05:48 |
|
puff
| Ansikt: The one you described as "normal" is how you use github too. | 05:49 |
|
| Ansikt: The second one is a similar, but different mode of communication. | 05:49 |
|
c74d
| Ansikt: fork, create a new branch, commit to that branch, file a pull request *for that branch*. | 05:49 |
|
Ansikt
| Yes, that's what I meant - that's normal git. Not sure how to use the github stuff that git doesn't have out of the box | 05:49 |
|
puff
| Ansikt: E.g. you can not only do normal git type stuff within a single project, but you can also do project-to-project communication via forking and pull requests. | 05:49 |
|
Ansikt
| So, if I want to see the changes of other contributors to that project, do I re-fork the thing? | 05:50 |
|
c74d
| Ansikt: don’t merge your branch into “trunk or whatever”, the owner of the upstream repository does that. | 05:50 |
|
puff
| Ansikt: Hm, I'd guess you'd pull new changes to the original into your fork. | 05:50 |
|
c74d
| Ansikt: you can pull changes from the upstream repository, then push those to your fork. | 05:50 |
|
Ansikt
| Wait, I thought you merged to the branch you wanted in your repo, then they merged it into their repo? | 05:51 |
| → kadoban joined | 05:51 |
|
puff
| c74d: Okay, I'm going to shut up now and pay attention to what you're saying :-). | 05:51 |
|
| Ansikt: Although I'll say one last thing... and I'm only just beginning to get a handle on git's internals, so maybe I'm wrong about this, but I think that at the fundamental level, a lot of this is all just an arbitrary structure that we map onto git's data structures. | 05:52 |
| → jasno joined | 05:52 |
| ← Sasazuka left | 05:52 |
| ← BiggFREE left | 05:53 |
| ← russt left | 05:53 |
|
c74d
| Ansikt: E.g.: I fork userfoo/repo to me/repo. I create branch `xyz` in me/repo. I commit to branch `xyz`. I file a pull request to userfoo/repo, requesting that `xyz` in me/repo be merged into branch `master` in userfoo/repo. Then, if userfoo grants my pull request, userfoo pulls me/repo:xyz into userfoo/repo:master, and closes the pull request. | 05:54 |
| → jstimm joined | 05:54 |
| ← jstimm left | 05:55 |
|
Ansikt
| c74d: Okay, got it. So they actually take my feature branch. | 05:55 |
|
c74d
| At any time, I can fetch changes from userfoo/repo into my local clone, then push them to my fork on GitHub. | 05:55 |
|
| Ansikt: yes, if you use a feature branch (which you should)> | 05:56 |
|
| s/>/./ | 05:56 |
|
jasno
| hey all, question: I'm rebasing a branch which was branched from master. Nothing fancy as far as I can tell. 'git checkout branch ; git rebase master' results in conflicts in a file which was added in the branch and does not exist in master. Any idea why there could be a conflict? It makes no sense to me. | 05:56 |
| → ome joined | 05:57 |
| → dsdeiz joined | 05:57 |
| → russt joined | 05:58 |
| ← shinnya left | 05:59 |
| → jceb joined | 05:59 |
| ← UmbraMalison left | 06:01 |
| → lindenle joined | 06:02 |
| → UmbraMalison joined | 06:04 |
| ← madewokherd left | 06:04 |
| ← eyeRobut left | 06:05 |
| → maestrojed joined | 06:05 |
| ← Fandekasp left | 06:06 |
| ← Ansikt left | 06:06 |
| → Fandekasp joined | 06:06 |
| ← kadoban left | 06:08 |
| ← diegoviola left | 06:08 |
| → crystal77 joined | 06:09 |
| ← githogori left | 06:09 |
| Guest26571 → cyphase | 06:09 |
| cyphase → Guest71539 | 06:10 |
| ← lindenle left | 06:10 |
| ← Guest71539 left | 06:10 |
| → githogori joined | 06:10 |
| → cyphase_ joined | 06:11 |
| → EminenceHC joined | 06:11 |
| ← crystal77 left | 06:11 |
| → jottr joined | 06:12 |
| ← nephyrin left | 06:13 |
| ← adamben left | 06:13 |
| → nephyrin joined | 06:14 |
| → EvilPenguin joined | 06:14 |
| ← EminenceHC left | 06:16 |
| → vrishab joined | 06:17 |
| ← jottr left | 06:17 |
| → beautifulmind joined | 06:19 |
| ← beautifulmind left | 06:22 |
| → jacksparrow007 joined | 06:22 |
| → solker joined | 06:22 |
| → ascarter joined | 06:22 |
| ← vrishab left | 06:23 |
| ← EvilPenguin left | 06:24 |
| ← jacksparrow007 left | 06:27 |
| ← solker left | 06:27 |
| → punchagan joined | 06:29 |
| → jacksparrow007 joined | 06:29 |
| → Literphor joined | 06:30 |
| → Consuela joined | 06:32 |
| → brucelee joined | 06:33 |
| → msankhala joined | 06:35 |
| ← saumye left | 06:36 |
| ← zapb_ left | 06:37 |
| → zapb_ joined | 06:37 |
| → kriks joined | 06:38 |
| → beautifulmind joined | 06:39 |
| → mkaesz joined | 06:40 |
| ← ascarter left | 06:40 |
| ← dtrott left | 06:41 |
| ← d10n-work left | 06:42 |
| ← Nijikokun left | 06:43 |
| ← russt left | 06:44 |
| ← The_Phoenix left | 06:45 |
| → marthinal joined | 06:46 |
| ← skorgon left | 06:46 |
| → The_Phoenix joined | 06:47 |
| ← henditan left | 06:48 |
| → henditan joined | 06:48 |
| → dreiss joined | 06:49 |
| ← henditan left | 06:49 |
| → henditan joined | 06:50 |
| ← maestrojed left | 06:51 |
| → msmith_ joined | 06:53 |
| ← jasno left | 06:54 |
| ← The_Phoenix left | 06:54 |
| ← hagabaka left | 06:54 |
| ← brucelee left | 06:54 |
| → hagabaka joined | 06:56 |
| → EminenceHC joined | 06:56 |
| → The_Phoenix joined | 06:56 |
| ← msmith_ left | 06:57 |
| → ciampix joined | 06:58 |
| ChanServ set mode: +o | 06:59 |
| ← sinequanon left | 07:00 |
| ← polyzen left | 07:00 |
| ← _Atom_ left | 07:01 |
| ← EminenceHC left | 07:01 |
| Eugene changed the topic to: Welcome to #git, the place for gits of the round table | Current stable version: 2.1.3 | We eat ham and jam and commitalot! | Start here: http://jk.gs/git | But many times we're given trees that're quite unmergable | Getting "cannot send to channel"? /msg gitinfo .voice | On second thought, let's not go to #gitalot. It is a silly place. | 07:01 |
| Eugene kicked Eugene (Eugene) | 07:01 |
| → Eugene joined | 07:01 |
| ← The_Phoenix left | 07:02 |
| → dtrott joined | 07:04 |
| → shinnya joined | 07:05 |
| → The_Phoenix joined | 07:05 |
| → govg joined | 07:08 |
| → brucelee joined | 07:11 |
| ← tango_ left | 07:11 |
| → learner1 joined | 07:11 |
| → tango_ joined | 07:11 |
| → EminenceHC joined | 07:12 |
| ← The_Phoenix left | 07:12 |
| ← Goplat left | 07:13 |
| ← learner left | 07:14 |
| → nkouevda joined | 07:14 |
| → The_Phoenix joined | 07:16 |
| → crystal77 joined | 07:16 |
| ← EminenceHC left | 07:17 |
| → DanMAbraham joined | 07:17 |
| ← toothrot left | 07:20 |
| → qbann0p joined | 07:20 |
| ← dtrott left | 07:22 |
| → solker joined | 07:23 |
| → Junior joined | 07:26 |
| ← The_Phoenix left | 07:26 |
| ← andrew__ left | 07:27 |
| → andrew__ joined | 07:27 |
| ← msankhala left | 07:27 |
| ← solker left | 07:27 |
| ← ManikM left | 07:28 |
| → The_Phoenix joined | 07:28 |
| → ManikM joined | 07:28 |
| ← acharlieh left | 07:30 |
| ← The_Phoenix left | 07:34 |
| → The_Phoenix joined | 07:35 |
| → unixpro1970 joined | 07:37 |
| → kerrick joined | 07:38 |
| ← ManikM left | 07:38 |
| ← Fandekasp left | 07:39 |
| ← andrew__ left | 07:39 |
| → andrew__ joined | 07:39 |
|
phy1729
| #gitalot isn't very silly | 07:40 |
| → eletuchy joined | 07:40 |
| ← andrew__ left | 07:43 |
| → andrew__ joined | 07:43 |
| ← eletuchy left | 07:44 |
| ← qbann0p left | 07:44 |
| → eletuchy joined | 07:45 |
| → winst joined | 07:45 |
| ← thedudez0r left | 07:48 |
| → msankhala joined | 07:49 |
| ← Literphor left | 07:49 |
| ← jceb left | 07:50 |
| ← The_Phoenix left | 07:50 |
| → Literphor joined | 07:50 |
|
milki
| 0lol | 07:51 |
| ← githogori left | 07:52 |
| → githogori joined | 07:53 |
| → sgen_ joined | 07:54 |
| ← arnaud left | 07:54 |
| → thedudez0r joined | 07:54 |
| → The_Phoenix joined | 07:54 |
| → EvilPenguin joined | 07:55 |
| ← DanMAbraham left | 07:57 |
| → LucasKA joined | 07:57 |
| ← brucelee left | 07:58 |
| ← sgen_ left | 08:00 |
| → sinequanon joined | 08:00 |
| → jottr joined | 08:01 |
| → sgen joined | 08:02 |
| → qbann0p joined | 08:03 |
| ← Raverix left | 08:03 |
| ← beautifulmind left | 08:04 |
| → BenjaminDeuter joined | 08:05 |
| → saumye joined | 08:05 |
| ← jottr left | 08:05 |
| ← sinequanon left | 08:06 |
|
puff
| In my git repo, when I do "git cat-file -p commitobjectname", the author line looks like: author name [email@hidden.address] 1409497211 -0400" Those last two numbers, are they unix time and time zone? | 08:06 |
| ← nezZario left | 08:07 |
| ← Literphor left | 08:08 |
| ← unixpro1970 left | 08:09 |
| ← The_Phoenix left | 08:09 |
| → palcu joined | 08:09 |
|
milki
| puff: yes | 08:10 |
|
RichiH
| other than GIT_DIR and GIT_WORK_TREE, are there other ENV variables which would force git to operate in weird places or modes? context is that i want to make myrepos aware of those and bail out if any of them are set | 08:10 |
|
puff
| milki: Thanks. | 08:10 |
| ← dreiss left | 08:12 |
|
puff
| milki: hm, do you know offhand what the official name is for that timezone format? | 08:12 |
|
bremner
| RichiH: see ENVIRONMENT VARIABLES in man git | 08:12 |
|
gitinfo
| RichiH: the git manpage is available at http://jk.gs/git.html | 08:12 |
|
thiago
| puff: it's the same as ISO dates | 08:13 |
| → The_Phoenix joined | 08:13 |
|
puff
| thiago: Thanks. | 08:13 |
|
thiago
| $ date --rfc-2822 | 08:13 |
|
| Sat, 22 Nov 2014 00:13:38 -0800 | 08:13 |
| ← Sonderblade left | 08:13 |
| ← johnny2600 left | 08:14 |
| ← jacksparrow007 left | 08:14 |
| → dsdeiz_ joined | 08:15 |
| → EminenceHC joined | 08:16 |
| ← dsdeiz left | 08:17 |
| → doev joined | 08:17 |
|
RichiH
| bremner: good point | 08:17 |
|
bremner
| rtfm ;) | 08:18 |
|
| as usual, which fm is the key ;) | 08:18 |
| ← thiago left | 08:18 |
|
RichiH
| bremner: true | 08:19 |
|
milki
| puff: https://github.com/jelmer/dulwich/blob/master/dulwich/objects.py#L1223 | 08:19 |
|
RichiH
| bremner: it's made worse by the fact that someone of such deplorable character needed to point me to this | 08:19 |
|
| what a sad world we live in | 08:19 |
| → Literphor joined | 08:19 |
|
RichiH
| there's quite a bit of potential footy-shooty in there | 08:20 |
|
bremner
| yep. foot-shooting is a git core-competency | 08:21 |
| ← EminenceHC left | 08:21 |
| ← astrofog left | 08:21 |
| ← ome left | 08:21 |
| → tvw joined | 08:21 |
| ← MattMaker left | 08:22 |
| → darnir joined | 08:22 |
| ← The_Phoenix left | 08:22 |
|
RichiH
| bremner: but the knobs on the gun were so shiny.. :( | 08:22 |
| → blackmesa joined | 08:22 |
| ← FreezingCold left | 08:22 |
| ← Gamecubic left | 08:23 |
|
RichiH
| Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a ":" separated (on Windows ";" separated) list of Git object directories which can be used to search for Git | 08:23 |
|
| that... | 08:23 |
| → geomyidae_ joined | 08:23 |
|
RichiH
| ...is delightfully evil | 08:23 |
| → solker joined | 08:24 |
| → helgikrs joined | 08:24 |
| → The_Phoenix joined | 08:25 |
|
RichiH
| as long as i am here, is there a way to always push to several remotes from one branch? i.e. multi-tracking | 08:26 |
| ← qbann0p left | 08:26 |
|
milki
| no | 08:27 |
| → virtualsue joined | 08:27 |
| ← solker left | 08:28 |
|
RichiH
| pity | 08:30 |
| ← joki left | 08:34 |
| → vurma joined | 08:34 |
| ← Warrior-kk left | 08:35 |
| ← wakd left | 08:36 |
| → FreezingCold joined | 08:36 |
| ← helgikrs left | 08:36 |
| → helgikrs joined | 08:36 |
| ← The_Phoenix left | 08:37 |
| → KONIG joined | 08:37 |
| → lacrymology joined | 08:39 |
| → The_Phoenix joined | 08:39 |
| ← palcu left | 08:39 |
|
lacrymology
| is there a way to unversion files but so they don't get deleted when the change gets pulled? | 08:39 |
| → joki joined | 08:40 |
|
RichiH
| lacrymology: copy them away, git rm, commit, copy back | 08:40 |
| ← blackmesa left | 08:41 |
| → msmith_ joined | 08:42 |
| → xtriz__ joined | 08:43 |
| ← xtriz__ left | 08:44 |
| ← msankhala left | 08:44 |
| → Jackneill joined | 08:44 |
| → xtriz__ joined | 08:44 |
| → Nijikokun joined | 08:45 |
| ← xtriz__ left | 08:45 |
| ← aidalgol left | 08:45 |
| → xtriz__ joined | 08:45 |
| ← Vile left | 08:45 |
| ← xtriz__ left | 08:46 |
| → xtriz__ joined | 08:46 |
| ← IIT_ left | 08:46 |
| ← msmith_ left | 08:46 |
| ← xtriz__ left | 08:47 |
|
puff
| Does anything in git use trees other than commits? | 08:47 |
| → xtriz__ joined | 08:47 |
|
puff
| milki: cool, thanks. | 08:48 |
| ← The_Phoenix left | 08:49 |
| ← xtriz__ left | 08:50 |
| → The_Phoenix joined | 08:52 |
| ← vurma left | 08:53 |
|
puff
| Dang. | 08:53 |
| → MACscr joined | 08:54 |
| ← zumba_addict left | 08:55 |
| → zumba_addict joined | 08:55 |
| → jagob joined | 08:59 |
| ← The_Phoenix left | 08:59 |
| ← govg left | 09:00 |
|
darnir
| I'm unable to use git send-email -8 to send the last 8 patches | 09:00 |
|
| git keeps complaining that no patch files were provided. | 09:00 |
|
| Must I always run got format-patch and feed them to git send-email? | 09:00 |
| → The_Phoenix joined | 09:01 |
| ← fahadash_ left | 09:01 |
| ← winst left | 09:01 |
| ← virtualsue left | 09:02 |
| → pantsman- joined | 09:02 |
| → ecky--ptang-zoob joined | 09:03 |
| ← hdon left | 09:03 |
| → Trudko joined | 09:03 |
| → nnyk joined | 09:04 |
| → introom joined | 09:05 |
|
introom
| hi. | 09:05 |
| ← ruukasu left | 09:06 |
|
introom
| how can I tell git to ignore the trailling slash of symbolic links? | 09:06 |
|
| namely not differentiate ../myfile and ../myfile/ | 09:07 |
| ← bgerber left | 09:08 |
| → barduck joined | 09:08 |
| → bgerber joined | 09:09 |
| → dc5ala joined | 09:09 |
| → solker joined | 09:12 |
| ← alanwill left | 09:12 |
| ← LucasKA left | 09:12 |
| ← lidaaa left | 09:13 |
| ← NoNMaDDeN left | 09:13 |
| → dtrott joined | 09:15 |
| ← Literphor left | 09:15 |
| ← ecky--ptang-zoob left | 09:15 |
| → ecky--ptang-zoob joined | 09:16 |
| → mihaicris joined | 09:17 |
| → nour joined | 09:18 |
| ← The_Phoenix left | 09:18 |
|
milki
| how did it get a trailing slash o.O | 09:19 |
| → EminenceHC joined | 09:20 |
| → aggn joined | 09:21 |
| → The_Phoenix joined | 09:22 |
| → eletuchy_ joined | 09:23 |
| ← eletuchy left | 09:23 |
| → msankhala joined | 09:23 |
| → a-l-e joined | 09:23 |
| ← mihaicris left | 09:24 |
| → circ-user-Ak4h5 joined | 09:24 |
| ← EminenceHC left | 09:24 |
| → mihaicris joined | 09:25 |
| ← mihaicris left | 09:25 |
| → mihaicris joined | 09:26 |
| ← The_Phoenix left | 09:28 |
| ← blahdodo left | 09:28 |
| → BlaXpirit joined | 09:28 |
| ← Cassiel left | 09:29 |
| ← mihaicris left | 09:29 |
| → NoNMaDDeN joined | 09:30 |
| → robbyoconnor joined | 09:31 |
| → blahdodo joined | 09:31 |
| ← nnyk left | 09:33 |
| ← crystal77 left | 09:35 |
| → The_Phoenix joined | 09:36 |
| → darkbasic_ joined | 09:36 |
| ← henditan left | 09:37 |
| ← darkbasic left | 09:38 |
| ← liamkeily left | 09:39 |
| ← The_Phoenix left | 09:41 |
| ← watabou left | 09:43 |
| ← saumye left | 09:44 |
| → Vile joined | 09:45 |
| ← stbaby left | 09:45 |
| → The_Phoenix joined | 09:46 |
| → stbaby joined | 09:46 |
| → listochkin joined | 09:47 |
| ← nilg left | 09:48 |
| ← Arsonide left | 09:48 |
| → Arsonide joined | 09:49 |
| ← solker left | 09:49 |
| → nilg joined | 09:50 |
| → jottr joined | 09:50 |
| → sinequanon joined | 09:50 |
| ← smw left | 09:51 |
| ← listochkin left | 09:52 |
| → aidalgol joined | 09:54 |
| → brucelee joined | 09:54 |
| ← sinequanon left | 09:54 |
| → endiruna joined | 09:55 |
| ← jottr left | 09:55 |
| ← kerrick left | 09:57 |
| ← The_Phoenix left | 09:57 |
| ← brucelee left | 09:59 |
| → The_Phoenix joined | 10:01 |
| → francisfish joined | 10:01 |
| → jacksparrow007 joined | 10:02 |
| → crystal77 joined | 10:02 |
| → faylite joined | 10:04 |
| ← pikaren left | 10:05 |
| ← githogori left | 10:06 |
| ← The_Phoenix left | 10:07 |
| ← jacksparrow007 left | 10:07 |
| → saumye joined | 10:08 |
| → govg_ joined | 10:08 |
| → The_Phoenix joined | 10:12 |
| ← francisfish left | 10:12 |
| ← saumye left | 10:14 |
| ← andrew__ left | 10:16 |
| → palcu joined | 10:17 |
| → WaReZ joined | 10:19 |
| ← The_Phoenix left | 10:19 |
| ← msankhala left | 10:19 |
| → francisfish joined | 10:20 |
| → EminenceHC joined | 10:21 |
| ← aggn left | 10:21 |
| → settermjd joined | 10:21 |
| → The_Phoenix joined | 10:22 |
| → St_Marx joined | 10:24 |
| → corni joined | 10:24 |
| ← corni left | 10:24 |
| → corni joined | 10:24 |
| ← St_Marx left | 10:25 |
| → msankhala joined | 10:26 |
| ← EminenceHC left | 10:26 |
| → saumye joined | 10:26 |
| ← Vivekananda_y510 left | 10:27 |
| → St_Marx joined | 10:29 |
| ← The_Phoenix left | 10:29 |
| → msmith_ joined | 10:31 |
| → hifi joined | 10:31 |
| ← saumye left | 10:31 |
|
hifi
| hello, I'm trying to figure out a way to pack a single branch (like master) into something that can be custom transported to a target empty git --bare repository and set up as the master branch there | 10:32 |
| ← rivarun left | 10:33 |
| → The_Phoenix joined | 10:33 |
| ← circ-user-Ak4h5 left | 10:33 |
|
bremner
| git push remote myspecialsnowflakebranch:master | 10:33 |
|
hifi
| the keyword was 'custom' | 10:34 |
| ← msankhala left | 10:34 |
| → virtualsue joined | 10:34 |
| → Sonderblade joined | 10:34 |
|
bremner
| you want a harder method? what does custom mean? | 10:34 |
|
hifi
| the starting point is that I wouldn't have a git repository on the remote system to begin with, the fallback would be to make a bare clone from a single branch locally, tar that up and transfer that tar and unpack it there | 10:35 |
|
| sort of bootstrap a project from a template, but I can't use standard git commands to do the actual transfer | 10:35 |
| ← msmith_ left | 10:36 |
|
bremner
| well, what can you do? | 10:36 |
|
hifi
| but I can prepare a package that I can transfer and unpack, so if there's some git magic to create a full history pack from a single ref and then use some plumbing to unpack it to another base as its master, that'd be swell | 10:36 |
| ← ecky--ptang-zoob left | 10:36 |
|
bremner
| well, man git-bundle might help | 10:36 |
|
gitinfo
| the git-bundle manpage is available at http://jk.gs/git-bundle.html | 10:36 |
|
hifi
| why I'm not surprised someone might have thought about it :) | 10:37 |
|
| thanks, I'll try if that does the trick | 10:37 |
|
| it certainly looks like it | 10:37 |
| → petersr joined | 10:37 |
|
qsuscs
| bazaar combines git-bundle and git-format-patch | 10:39 |
| → jottr joined | 10:39 |
|
qsuscs
| i.e. their "format-patch" produces a diff and encoded (base64, i think) the necessary bazaar metadata to reconstruct the whole commit | 10:39 |
| → stamina joined | 10:40 |
| ← D-Boy left | 10:40 |
| ← The_Phoenix left | 10:41 |
| → Shusshu joined | 10:41 |
| ← dc5ala left | 10:42 |
|
hifi
| one more thing, how do I attach the 'master' branch to the unpacked bundle head? | 10:43 |
| ← Shusshu left | 10:43 |
|
hifi
| git bundle list-heads shows the tree-ish or commit-ish, whichever it is for the branch I bundled and unpacking unpacks it but it doesn't automatically set the bare master to track it | 10:44 |
| → Kicer86 joined | 10:44 |
|
bremner
| maybe git symbolic-ref | 10:44 |
|
| or maybe git branch works in bare repos. | 10:45 |
|
| git branch master $SHA1 | 10:45 |
| ← WaReZ left | 10:45 |
| → The_Phoenix joined | 10:45 |
|
bremner
| don't you need to fetch from the bundle? | 10:45 |
|
hifi
| it does, thanks | 10:45 |
|
| what I did was: 'git bundle create master.bundle master' on the template repository, transferred master.bundle to a remote system where the bare repository is, 'git bundle unbundle master.bundle' and finally 'git branch master <commit-ish>' to create the bare master | 10:47 |
|
| worked flawlessly | 10:47 |
|
bremner
| cool. | 10:48 |
|
hifi
| I can create a post-receive hook on the template repository to generate the bundle from master automatically so the transfer system can pick up the latest master whenever I need to create a clone of the master branch to a new bare as a starting point for a project | 10:48 |
|
| it's too funny git had the plumbing in place to do this, I thought I'd be laughed out for trying to do something odd | 10:49 |
| → solker joined | 10:50 |
| → msankhala joined | 10:50 |
| → voltagex joined | 10:51 |
| ← The_Phoenix left | 10:51 |
|
voltagex
| hi, how do I set a section called [filter "gpg"] using git config --local? | 10:52 |
| ← CEnnis91 left | 10:52 |
| ← crystal77 left | 10:52 |
| → ruukasu joined | 10:52 |
| → fr33domlover joined | 10:52 |
| ruukasu → 14WAAQ4X1 | 10:53 |
| → solker_ joined | 10:54 |
| ← solker left | 10:54 |
| ← msankhala left | 10:54 |
| → The_Phoenix joined | 10:54 |
| → brucelee joined | 10:55 |
| ← 14WAAQ4X1 left | 10:58 |
| → pikaren joined | 10:58 |
| → koderok joined | 10:59 |
| ← koderok left | 10:59 |
| ← The_Phoenix left | 11:00 |
| ← brucelee left | 11:00 |
| → blackmesa joined | 11:00 |
| ← settermjd left | 11:01 |
| → The_Phoenix joined | 11:01 |
| → jceb joined | 11:02 |
| → D-Boy joined | 11:03 |
| ← dtrott left | 11:04 |
| → CustosL1men joined | 11:05 |
| Solid1_afk → Solid1 | 11:06 |
| ← virtualsue left | 11:06 |
| → virtualsue joined | 11:06 |
| ← faylite left | 11:07 |
| ← eletuchy_ left | 11:07 |
| ← Trudko left | 11:07 |
| ← joki left | 11:07 |
| ← EvilPenguin left | 11:07 |
| ← nkouevda left | 11:07 |
| ← mkaesz left | 11:07 |
| ← darnir left | 11:07 |
| ← bdavenport left | 11:07 |
| ← offbyone left | 11:07 |
| ← Klumben left | 11:07 |
| ← kossy left | 11:07 |
| ← tapout left | 11:07 |
| ← sfr^ left | 11:07 |
| ← SupaHam left | 11:07 |
| ← aseidl left | 11:07 |
| ← Droolio left | 11:07 |
| ← doppo left | 11:07 |
| ← phantombeta left | 11:07 |
| ← israelpattison left | 11:07 |
| ← duckydan left | 11:07 |
| ← trey left | 11:07 |
| ← up_the_irons left | 11:07 |
| ← ScottE left | 11:07 |
| ← poisond left | 11:07 |
| ← HicksD left | 11:07 |
| ← DSH105 left | 11:07 |
| ← i_ron left | 11:07 |
| ← HedgeMage left | 11:07 |
| ← greymalkin left | 11:07 |
| ← wcpan left | 11:07 |
| ← Dougie187 left | 11:07 |
| ← e66 left | 11:07 |
| ← jazper- left | 11:07 |
| ← sd1074 left | 11:07 |
| ← bandroidx left | 11:07 |
| ← netameta left | 11:07 |
| ← sarri left | 11:07 |
| ← mibofra left | 11:07 |
| ← blarson left | 11:07 |
| ← mhite left | 11:07 |
| ← Peuc left | 11:07 |
| ← synfinatic left | 11:07 |
| ← heftig left | 11:07 |
| ← scorphus left | 11:07 |
| ← manuel_ left | 11:07 |
| ← variable left | 11:07 |
| ← uidzer0 left | 11:07 |
| ← markmarkmark left | 11:07 |
| ← titou left | 11:07 |
| ← c0ded left | 11:07 |
| ← Forkk left | 11:07 |
| ← roto left | 11:07 |
| ← cwillu_at_work left | 11:07 |
| ← lasers left | 11:07 |
| ← chrisgeorge left | 11:07 |
| ← Fifty5Plus left | 11:07 |
| ← adev left | 11:07 |
| ← dziga left | 11:07 |
| ← GarethAdams left | 11:07 |
| ← armenb left | 11:07 |
| ← bobdobbs left | 11:07 |
| ← lachesis left | 11:07 |
| ← murph left | 11:07 |
| ← sword` left | 11:07 |
| ← ag4ve_ left | 11:07 |
| ← slixpk left | 11:07 |
| ← blackjid_ left | 11:07 |
| ← Seveas left | 11:07 |
| ← stealthii left | 11:07 |
| ← jxport left | 11:07 |
| ← The_Phoenix left | 11:07 |
| ← fr33domlover left | 11:08 |
| ← aidalgol left | 11:09 |
| → SupaHam joined | 11:09 |
| → kossy joined | 11:10 |
| → aseidl joined | 11:10 |
| → faylite joined | 11:10 |
| → eletuchy_ joined | 11:10 |
| → Trudko joined | 11:10 |
| → joki joined | 11:10 |
| → darnir joined | 11:10 |
| → EvilPenguin joined | 11:10 |
| → nkouevda joined | 11:10 |
| → bdavenport joined | 11:10 |
| → offbyone joined | 11:10 |
| → sfr^ joined | 11:10 |
| → Droolio joined | 11:10 |
| → doppo joined | 11:10 |
| → phantombeta joined | 11:10 |
| → israelpattison joined | 11:10 |
| → duckydan joined | 11:10 |
| → trey joined | 11:10 |
| → poisond joined | 11:10 |
| → up_the_irons joined | 11:10 |
| → ScottE joined | 11:10 |
| → DSH105 joined | 11:10 |
| → HicksD joined | 11:10 |
| → i_ron joined | 11:10 |
| → HedgeMage joined | 11:10 |
| → greymalkin joined | 11:10 |
| → wcpan joined | 11:10 |
| → Dougie187 joined | 11:10 |
| → e66 joined | 11:10 |
| → jazper- joined | 11:10 |
| → sd1074 joined | 11:10 |
| → bandroidx joined | 11:10 |
| → netameta joined | 11:10 |
| → sarri joined | 11:10 |
| → mibofra joined | 11:10 |
| → blarson joined | 11:10 |
| → mhite joined | 11:10 |
| → Peuc joined | 11:10 |
| → synfinatic joined | 11:10 |
| → heftig joined | 11:10 |
| → scorphus joined | 11:10 |
| → manuel_ joined | 11:10 |
| → variable joined | 11:10 |
| → uidzer0 joined | 11:10 |
| → markmarkmark joined | 11:10 |
| → bobdobbs joined | 11:10 |
| → titou joined | 11:10 |
| → c0ded joined | 11:10 |
| → Forkk joined | 11:10 |
| → roto joined | 11:10 |
| → cwillu_at_work joined | 11:10 |
| → lasers joined | 11:10 |
| → chrisgeorge joined | 11:10 |
| → Fifty5Plus joined | 11:10 |
| → adev joined | 11:10 |
| → dziga joined | 11:10 |
| → GarethAdams joined | 11:10 |
| → armenb joined | 11:10 |
| → lachesis joined | 11:10 |
| → murph joined | 11:10 |
| → sword` joined | 11:10 |
| → ag4ve_ joined | 11:10 |
| → slixpk joined | 11:10 |
| → blackjid_ joined | 11:10 |
| → stealthii joined | 11:10 |
| → Seveas joined | 11:10 |
| → jxport joined | 11:10 |
| → Klumben joined | 11:10 |
| ← bdavenport left | 11:10 |
| ← lachesis left | 11:10 |
| ← sfr^ left | 11:10 |
| ← armenb left | 11:10 |
| ← mibofra left | 11:10 |
| ← variable left | 11:10 |
| ← ag4ve_ left | 11:10 |
| ← bandroidx left | 11:10 |
| ← stealthii left | 11:10 |
| ← kossy left | 11:10 |
| ← aseidl left | 11:10 |
| ← lasers left | 11:10 |
| ← Klumben left | 11:10 |
| ← scorphus left | 11:10 |
| → bdavenport_ joined | 11:10 |
| → armenb joined | 11:10 |
| → lachesis joined | 11:10 |
| → tapout joined | 11:10 |
| → aseidl joined | 11:10 |
| → kossy joined | 11:10 |
| → bandroidx joined | 11:10 |
| → sfr^ joined | 11:10 |
| → lasers joined | 11:10 |
| → The_Phoenix joined | 11:10 |
| → variable joined | 11:11 |
| bdavenport_ → bdavenport | 11:11 |
| → mkaesz joined | 11:11 |
| ← c74d left | 11:11 |
| → mibofra joined | 11:11 |
| → stealthii joined | 11:11 |
| ← Kicer86 left | 11:11 |
| ← petersr left | 11:11 |
| ← stbaby left | 11:11 |
| ← zumba_addict left | 11:11 |
| ← zapb_ left | 11:11 |
| ← leeN left | 11:11 |
| ← msonntag left | 11:11 |
| ← Lyqyd left | 11:11 |
| ← zhxt_work left | 11:11 |
| ← gv left | 11:11 |
| ← rasto left | 11:11 |
| ← huglester left | 11:11 |
| ← DolphinDream left | 11:11 |
| ← adhawkins left | 11:11 |
| ← BooK left | 11:11 |
| ← Websoftwarez left | 11:11 |
| ← brandonw left | 11:11 |
| ← Stravy left | 11:11 |
| ← moparisthebest left | 11:11 |
| ← qknight left | 11:11 |
| ← Dreamer3 left | 11:11 |
| ← Garen left | 11:11 |
| ← pr0t left | 11:11 |
| ← kdlv left | 11:11 |
| ← ToxicFrog left | 11:11 |
| ← damccull left | 11:11 |
| ← k4r1m left | 11:11 |
| ← ensirius left | 11:11 |
| ← cart05 left | 11:11 |
| ← heinrich5991 left | 11:11 |
| ← chadi left | 11:11 |
| ← errr left | 11:11 |
| ← leprechau left | 11:11 |
| ← mrkake left | 11:11 |
| ← Intensity left | 11:11 |
| ← offbyone left | 11:12 |
| → Kicer86 joined | 11:13 |
| → petersr joined | 11:13 |
| → stbaby joined | 11:13 |
| → zumba_addict joined | 11:13 |
| → zapb_ joined | 11:13 |
| → leeN joined | 11:13 |
| → msonntag joined | 11:13 |
| → zhxt_work joined | 11:13 |
| → gv joined | 11:13 |
| → rasto joined | 11:13 |
| → huglester joined | 11:13 |
| → DolphinDream joined | 11:13 |
| → adhawkins joined | 11:13 |
| → BooK joined | 11:13 |
| → Websoftwarez joined | 11:13 |
| → brandonw joined | 11:13 |
| → Stravy joined | 11:13 |
| → moparisthebest joined | 11:13 |
| → qknight joined | 11:13 |
| → Dreamer3 joined | 11:13 |
| → Garen joined | 11:13 |
| → pr0t joined | 11:13 |
| → kdlv joined | 11:13 |
| → ToxicFrog joined | 11:13 |
| → damccull joined | 11:13 |
| → k4r1m joined | 11:13 |
| → ensirius joined | 11:13 |
| → cart05 joined | 11:13 |
| → heinrich5991 joined | 11:13 |
| → chadi joined | 11:13 |
| → errr joined | 11:13 |
| → leprechau joined | 11:13 |
| → mrkake joined | 11:13 |
| → Intensity joined | 11:13 |
| → msankhala joined | 11:13 |
| → skylite joined | 11:13 |
| ← heinrich5991 left | 11:13 |
| → u1106 joined | 11:13 |
| → heinrich5991 joined | 11:13 |
| → c74d joined | 11:14 |
| → Klumben joined | 11:14 |
| ← pikaren left | 11:14 |
| → pikaren joined | 11:15 |
| ← pikaren left | 11:15 |
| ← jceb left | 11:15 |
| → offbyone joined | 11:15 |
| → pikaren joined | 11:15 |
| → ag4ve_ joined | 11:15 |
| → bvi joined | 11:16 |
| → finster joined | 11:17 |
| → KeroroGunsou joined | 11:17 |
| ← KeroroGunsou left | 11:17 |
| ← Solid1 left | 11:17 |
| → khmarbaise joined | 11:17 |
|
khmarbaise
| msfvcc | 11:17 |
| ← skylite left | 11:19 |
| ← nour left | 11:20 |
| → tak30 joined | 11:20 |
| ← tak30 left | 11:25 |
| → tak30 joined | 11:26 |
| → EminenceHC joined | 11:26 |
| → Zupoman joined | 11:26 |
| → Solid1 joined | 11:26 |
| → GT joined | 11:28 |
| ← pikaren left | 11:28 |
| → pikaren joined | 11:28 |
| ← c74d left | 11:29 |
| ← otter768 left | 11:29 |
| → c74d joined | 11:30 |
| ← EminenceHC left | 11:30 |
| → hans2 joined | 11:38 |
| → sinequanon joined | 11:39 |
| ← c74d left | 11:40 |
| ← bvi left | 11:40 |
| ← sb left | 11:41 |
| ← The_Phoenix left | 11:41 |
| ← pikaren left | 11:42 |
| → pikaren joined | 11:42 |
| → strictlyb joined | 11:42 |
| → creep joined | 11:43 |
| → nfk joined | 11:43 |
| → c74d joined | 11:43 |
| ← tvw left | 11:43 |
| ← sinequanon left | 11:43 |
| ← hans2 left | 11:43 |
| → The_Phoenix joined | 11:44 |
| → hans2 joined | 11:44 |
| ← msankhala left | 11:44 |
| ← hans2 left | 11:44 |
| → hans2 joined | 11:45 |
| ← pikaren left | 11:46 |
| → pikaren joined | 11:46 |
| → lonelybyte joined | 11:46 |
| ← lonelybyte left | 11:47 |
| ← wookienz left | 11:47 |
| ← nkouevda left | 11:48 |
| → wookienz joined | 11:48 |
| ← pikaren left | 11:49 |
| → lonelybyte joined | 11:49 |
| → pikaren joined | 11:50 |
| ← lonelybyte left | 11:50 |
| ← The_Phoenix left | 11:50 |
| → jacksparrow007 joined | 11:51 |
| → The_Phoenix joined | 11:52 |
| ← juril left | 11:52 |
| ← pikaren left | 11:52 |
| ← wookienz left | 11:53 |
| ← c74d left | 11:53 |
| → King_Hual` joined | 11:54 |
| → wookienz joined | 11:54 |
| → c74d joined | 11:55 |
| ← jacksparrow007 left | 11:56 |
| ← St_Marx left | 11:56 |
| → ecky--ptang-zoob joined | 11:57 |
| ← The_Phoenix left | 11:57 |
| ← jagob left | 11:57 |
| → pikaren joined | 11:58 |
| → s8321414 joined | 11:59 |
| → EminenceHC joined | 11:59 |
| → nnyk joined | 12:00 |
| ← Guest71107 left | 12:00 |
| → Guest71107 joined | 12:00 |
| Guest71107 → deepy | 12:00 |
| → The_Phoenix joined | 12:02 |
| → nettoweb joined | 12:03 |
| ← nnyk left | 12:03 |
| ← nettoweb left | 12:03 |
| → nettoweb joined | 12:03 |
| ← EminenceHC left | 12:04 |
| ← mkaesz left | 12:04 |
| → nnyk joined | 12:04 |
| ← blackmesa left | 12:04 |
| ← nettoweb left | 12:05 |
| ← ap0c left | 12:05 |
| → nettoweb joined | 12:05 |
| → khmarbaise_ joined | 12:06 |
| ← khmarbaise_ left | 12:06 |
| → khmarbaise_ joined | 12:06 |
| ← Nijikokun left | 12:07 |
| → St_Marx joined | 12:07 |
| → jayeshsolanki joined | 12:07 |
| → Nijikokun joined | 12:07 |
|
grawity
| voltagex: filter.gpg.<option> | 12:08 |
| ← khmarbaise left | 12:08 |
| khmarbaise_ → khmarbaise | 12:08 |
| → danemacmillan joined | 12:09 |
| ← pikaren left | 12:10 |
| ← nettoweb left | 12:10 |
| ← hans2 left | 12:11 |
| → nrsk joined | 12:11 |
| → liamkeily joined | 12:13 |
| ← ciampix left | 12:14 |
| → weevieL joined | 12:16 |
| → pikaren joined | 12:16 |
| → jceb joined | 12:16 |
| → CheckDavid joined | 12:16 |
| → subhojit777 joined | 12:17 |
| ← weevieL left | 12:19 |
| → msmith_ joined | 12:19 |
| ← The_Phoenix left | 12:20 |
| → Gizburdt joined | 12:21 |
| → weevieL joined | 12:23 |
| → Comentarinformal joined | 12:23 |
| ← msmith_ left | 12:24 |
| ← ecky--ptang-zoob left | 12:24 |
| → The_Phoenix joined | 12:24 |
| ← metze left | 12:25 |
| ← weevieL left | 12:25 |
| → learner joined | 12:26 |
| → King_Hual joined | 12:26 |
| → polyzen joined | 12:27 |
| ← King_Hual` left | 12:28 |
| ← learner1 left | 12:29 |
| → AR45 joined | 12:29 |
| → joo-_ joined | 12:29 |
|
Comentarinformal
| Hey there. Soo I'm not sure what's going on in my bitbucket git, and I'm having problems with git checkouts pointing to the wrong commit, SourceTree indicating origin/master as a different one... Full problem here. http://pastebin.com/raw.php?i=LSyjnew8 | 12:29 |
| → hexagoxel joined | 12:29 |
| ← The_Phoenix left | 12:30 |
| → learner1 joined | 12:31 |
| → EminenceHC joined | 12:31 |
| ← Nijikokun left | 12:31 |
| ← learner left | 12:31 |
| ← sgen left | 12:32 |
| → The_Phoenix joined | 12:32 |
| ← EminenceHC left | 12:36 |
| → merovingian joined | 12:36 |
| → nnyk_ joined | 12:36 |
| ← The_Phoenix left | 12:38 |
| → eletuchy joined | 12:39 |
| → chrisgeorge_ joined | 12:39 |
| ← eletuchy_ left | 12:39 |
| → Trudko_ joined | 12:39 |
| ← nnyk left | 12:40 |
| ← sfr^ left | 12:40 |
| ← GarethAdams left | 12:40 |
| → sfr^ joined | 12:40 |
| → The_Phoenix joined | 12:40 |
| ← jceb left | 12:40 |
| ← Trudko left | 12:41 |
| Trudko_ → Trudko | 12:41 |
| → durre joined | 12:41 |
| ← chrisgeorge left | 12:41 |
|
merovingian
| uhhh hello | 12:42 |
| → GarethAdams joined | 12:43 |
| → scorphus joined | 12:43 |
| ← scorphus left | 12:43 |
| → scorphus joined | 12:43 |
|
hexagoxel
| that did not trigger the bot.. :D | 12:44 |
|
| hi | 12:44 |
|
| hello | 12:44 |
| → nnyk joined | 12:44 |
| ← Junior left | 12:45 |
|
hexagoxel
| uh.. nevermind | 12:46 |
|
| merovingian: just ask your question and wait some time for replies | 12:46 |
| ← mibofra left | 12:46 |
| → mibofra joined | 12:46 |
|
merovingian
| hexagoxel: no questions really | 12:47 |
|
| how do i say | 12:47 |
|
| just lurking general | 12:47 |
|
| new at irc :/ | 12:47 |
| ← nnyk_ left | 12:48 |
| → kcj joined | 12:48 |
| ← wookienz left | 12:48 |
| → wookienz joined | 12:48 |
|
hexagoxel
| sure, fine :) just my default reaction; too often people are afraid to ask | 12:48 |
|
Comentarinformal
| I was wondering before, but I noticed I wasn't breaking any topic, so might as well :V | 12:49 |
|
| s/topic/conversation | 12:49 |
|
merovingian
| hexagoxel: its nice somenoe replied :) gives me hope to continue down the irc path.. i was close to killing the process reallỵ | 12:50 |
|
| okay proceed with the genius pleasẹ. dont mind me | 12:51 |
| polyzen → bender | 12:51 |
|
hexagoxel
| merovingian: it depends a lot on the channel.. some are mostly support/short topic-related questions; others have longer discussions sometimes; then there are channels explicitly for off-topic stuff | 12:52 |
| → vin-ivar joined | 12:52 |
| ← vin-ivar left | 12:52 |
| ← barduck left | 12:52 |
| ← merovingian left | 12:52 |
| ← khmarbaise left | 12:52 |
| ← The_Phoenix left | 12:53 |
| → Lingo_ joined | 12:53 |
| → The_Phoenix joined | 12:55 |
| ← joo-_ left | 12:56 |
| → brucelee joined | 12:57 |
| → si13b joined | 12:58 |
| ← bdavenport left | 12:58 |
| ← fstd left | 13:00 |
| → fstd joined | 13:00 |
| → jagob joined | 13:01 |
| → forwchen joined | 13:01 |
| ← brucelee left | 13:02 |
| ← forwchen left | 13:02 |
| → forwchen joined | 13:03 |
| ← The_Phoenix left | 13:03 |
| ← forwchen left | 13:03 |
| → forwchen joined | 13:04 |
| ← wookienz left | 13:04 |
| ← forwchen left | 13:05 |
| → The_Phoenix joined | 13:05 |
| → forwchen joined | 13:05 |
| ← forwchen left | 13:06 |
| → forwchen joined | 13:07 |
| ← forwchen left | 13:07 |
| → fr33domlover joined | 13:07 |
| → forwchen joined | 13:08 |
| → wookienz joined | 13:08 |
| ← Gizburdt left | 13:08 |
| ← forwchen left | 13:08 |
| → khmarbaise joined | 13:09 |
| → forwchen joined | 13:09 |
| ← forwchen left | 13:10 |
| → marchdown joined | 13:10 |
| ← The_Phoenix left | 13:10 |
| → eyeRobut joined | 13:10 |
| → The_Phoenix joined | 13:13 |
| → listochkin joined | 13:14 |
| ← eyeRobut left | 13:14 |
| → darkbasic joined | 13:15 |
| → saumye joined | 13:15 |
| ← darkbasic_ left | 13:15 |
| ← CustosL1men left | 13:17 |
| → quantum_kat joined | 13:18 |
| ← quantum_kat left | 13:18 |
| → nnyk_ joined | 13:19 |
| → quantum_kat joined | 13:19 |
| ← quantum_kat left | 13:20 |
| → teleporting_kat joined | 13:21 |
| ← nnyk left | 13:22 |
| ← AR45 left | 13:24 |
| ← durre left | 13:25 |
| → russt joined | 13:25 |
| ← The_Phoenix left | 13:26 |
| → sinequanon joined | 13:27 |
| ← Lingo_ left | 13:29 |
| → The_Phoenix joined | 13:30 |
| → otter768 joined | 13:30 |
| ← sinequanon left | 13:32 |
| → EminenceHC joined | 13:32 |
| ← pikaren left | 13:32 |
| → pikaren joined | 13:32 |
| → AR45 joined | 13:33 |
| → clauswitt joined | 13:34 |
| ← otter768 left | 13:35 |
| → nowhere_man joined | 13:35 |
| ← palcu left | 13:36 |
| ← EminenceHC left | 13:37 |
| ← kcj left | 13:39 |
| ← clauswitt left | 13:39 |
| → jacksparrow007 joined | 13:40 |
| ← wookienz left | 13:40 |
| ← The_Phoenix left | 13:42 |
| ← khmarbaise left | 13:42 |
| ← jacksparrow007 left | 13:42 |
| → wookienz joined | 13:43 |
| → CEnnis91 joined | 13:43 |
| → jacksparrow007 joined | 13:43 |
| → The_Phoenix joined | 13:45 |
| ← jottr left | 13:45 |
| → alanwill joined | 13:46 |
| → CarlFK joined | 13:47 |
|
CarlFK
| I committed, now want to add another change to that commit .. I think squash is what I want? | 13:47 |
| ← liamkeily left | 13:47 |
| → CKyle joined | 13:48 |
| ← creep left | 13:48 |
| ← vlovgr left | 13:49 |
| ← The_Phoenix left | 13:49 |
| ← wookienz left | 13:50 |
| → wookienz joined | 13:50 |
| → chisler joined | 13:50 |
|
CarlFK
| hmm.. I haven't committed the last change. do I need to do that, or is there something like squash that works with my current state? | 13:50 |
| ← alanwill left | 13:50 |
| → Oliht joined | 13:50 |
| → vlovgr joined | 13:51 |
| → paul424 joined | 13:51 |
|
si13b
| if you haven't committed you can just "git add" the file again to add your extra change to the file | 13:52 |
| → The_Phoenix joined | 13:53 |
| ← jacksparrow007 left | 13:53 |
| → Neozonz joined | 13:55 |
| ← teran left | 13:56 |
|
CarlFK
| si13b: um.. im lost now - here is what I did: http://paste.ubuntu.com/9172746/ and where I was expecting to see +# demos issue:... https://github.com/CarlFK/gst-switch/commit/22757d238a78c874a740e95ebd4a7bb90bbbac99 | 13:56 |
| ← stamina left | 13:56 |
|
si13b
| push will only push your committed changes upstream | 13:57 |
|
| add doesn't commit, it just stages the file for commit | 13:57 |
|
| if you change the file again, you can stage that change to the file too | 13:58 |
| → juril joined | 13:58 |
|
CarlFK
| but how to I add the change to the commit ? | 13:58 |
|
si13b
| with git add | 13:59 |
| ← wookienz left | 13:59 |
|
si13b
| so do "git add test_ui_lag1.sh" again | 13:59 |
|
| then "git commit" when you're ready | 13:59 |
| ← SwedFTP left | 13:59 |
|
CarlFK
| won't that make a new commit ? | 14:00 |
|
si13b
| no | 14:00 |
|
| "git add" doesn't do anything related to commits | 14:00 |
|
| it just stages files | 14:00 |
| → wookienz joined | 14:00 |
|
CarlFK
| then "git commit" when you're ready <- won't that make a new commit ? | 14:00 |
| → ciampix joined | 14:00 |
|
si13b
| yes "git commit" will make a new commit, but in that link you didn't do "git commit"! | 14:01 |
| → jacksparrow007 joined | 14:01 |
| ← The_Phoenix left | 14:01 |
| ← CKyle left | 14:01 |
|
CarlFK
| so I do a 2nd commit, then squash. there isnt a 1 step way to do that right? | 14:03 |
| ← s8321414 left | 14:03 |
|
si13b
| if you've already committed your change (but you didn't do that in the link you provided), then yes you will need to squash :) | 14:03 |
|
hexagoxel
| CarlFK: are you looking for `git commit --amend` ? | 14:04 |
|
CarlFK
| hexagoxel: beats me ;) | 14:04 |
| → The_Phoenix joined | 14:04 |
|
CarlFK
| that sounds like it.. /me googs | 14:04 |
| ← The_Phoenix left | 14:04 |
| → The_Phoenix joined | 14:04 |
| → khmarbaise joined | 14:05 |
|
hexagoxel
| CarlFK: `git status` might be better suited to see the state of things than `git diff` | 14:06 |
|
| after adding stuff to index, you can use `git diff --staged` to see those (not-yet-committed) changes | 14:06 |
| ← tak30 left | 14:07 |
| → msmith_ joined | 14:08 |
|
CarlFK
| "don’t amend your last commit if you’ve already pushed it." I did push, so looks like I need to do the 2nd commit, then squash. | 14:09 |
| ← Droolio left | 14:09 |
| → toothrot joined | 14:09 |
|
hexagoxel
| but squashing is rewriting history as well | 14:09 |
|
| also, because you had not committed yet, pushing was a no-op | 14:10 |
| ← sarri left | 14:10 |
|
hexagoxel
| see output of git status | 14:10 |
| ← The_Phoenix left | 14:10 |
|
CarlFK
| git status ... modified: test_ui_lag1.sh | 14:10 |
|
si13b
| then just "git add" again CarlFK | 14:11 |
|
| on test_ui_lag1.sh | 14:11 |
| ← endiruna left | 14:12 |
|
CarlFK
| I think i want git commit --amend | 14:12 |
| → sarri joined | 14:12 |
| → The_Phoenix joined | 14:12 |
| ← msmith_ left | 14:13 |
|
CarlFK
| that's the same as "git commit; git squash " right? | 14:13 |
| Solid1 → Solid1_afk | 14:13 |
| → ocharles_ joined | 14:13 |
|
ocharles_
| How do I find out how a commit is reachable? I have a commit that shows up in `git log --all`, but `git branch -a --contains <sha>` doesn't show any results | 14:14 |
|
| Yet after expiring the reflog and pruning, the commit still exists | 14:14 |
| ← Oliht left | 14:14 |
|
ocharles_
| oh... I think it might be because I have a shallow clone of this branch | 14:15 |
|
| yep, that's got it | 14:15 |
| ← solker_ left | 14:16 |
|
arand
| CarlFK: No it isn't. | 14:18 |
| ← The_Phoenix left | 14:18 |
| ← AR45 left | 14:18 |
|
arand
| CarlFK: Oops, ignore me. | 14:19 |
|
bremner
| CarlFK: git squash must be some kind of alias? | 14:20 |
| → The_Phoenix joined | 14:20 |
| ← si13b left | 14:21 |
| ← wookienz left | 14:22 |
| → wookienz joined | 14:22 |
| ← jacksparrow007 left | 14:24 |
|
CarlFK
| oh, my bad. by "git squash" I meant "git rebase -i HEAD~1" .. and squash the last commit | 14:24 |
| ← shinnya left | 14:24 |
| → mathijsjh joined | 14:24 |
| → CKyle joined | 14:25 |
| ← Vile left | 14:25 |
| → solker joined | 14:25 |
| ← russt left | 14:25 |
|
bremner
| CarlFK: then yeah, that's pretty much the same as commit --amend. Might be exactly the same. | 14:26 |
|
hexagoxel
| few, that is what i assumed :) | 14:26 |
|
CarlFK
| thanks .. I think I --amend covers 90% of why I rebase | 14:26 |
| ← Sleepy63 left | 14:26 |
| ← The_Phoenix left | 14:27 |
|
bremner
| CarlFK: at the risk of belabouring the obvious, all the same caveats about rewriting history apply to commit --amend as apply to rebase. | 14:27 |
| ← lacrymology left | 14:27 |
| → ColdKeyboard joined | 14:28 |
| ← wookienz left | 14:29 |
|
CarlFK
| bremner: no prob. rebase is like a gun. /me rants about gun control | 14:29 |
| ← solker left | 14:29 |
| → shinnya joined | 14:30 |
|
CarlFK
| yesterday a friend got pretty mad a cowerker for reckless rebasing and trashing 1/2 days work | 14:30 |
| → ehmatthes joined | 14:30 |
| → wookienz joined | 14:30 |
| → The_Phoenix joined | 14:31 |
| ← Consuela left | 14:31 |
| → dreiss joined | 14:31 |
| → mribeirodantas joined | 14:32 |
| ← fstd left | 14:32 |
| → Skapadapaduu joined | 14:33 |
| → fstd joined | 14:34 |
| → EminenceHC joined | 14:36 |
|
j416
| CarlFK: that part about "don't amend if you've pushed" applies to squash as well -- same thing. What it meas is you can cause confusion if other people have your branch and suddenly you alter history (by replacing commits). | 14:36 |
| → Consuela joined | 14:36 |
|
CarlFK
| j416: im creating confusing and I am the only one touching it... I now have 3 commits for this one change | 14:37 |
|
j416
| CarlFK: Although, if you don't care about others (maybe there are no others or they can adapt), go ahead and change history all you like! | 14:37 |
| → dangerousdave joined | 14:37 |
|
j416
| CarlFK: squash them into one and git push --force | 14:38 |
|
| CarlFK: not a problem | 14:38 |
| ← EminenceHC left | 14:40 |
|
CarlFK
| git log looks good. git push (with or without --force) gives me: fatal: You are not currently on a branch. | 14:41 |
|
| how did that happen? | 14:41 |
| → eyeRobut joined | 14:41 |
| → skelterjohn joined | 14:41 |
| ← mathijsjh left | 14:41 |
| ← AliRezaTaleghani left | 14:41 |
| ← petersr left | 14:42 |
| → jottr joined | 14:42 |
|
hexagoxel
| CarlFK: you are not in the middle of a rebase? did you checkout a commit? there are a few ways it can happen.. | 14:47 |
| ← The_Phoenix left | 14:47 |
| ← jottr left | 14:48 |
| → lpmulligan joined | 14:48 |
|
bremner
| !detached | 14:48 |
|
gitinfo
| A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach | 14:48 |
|
CarlFK
| hexagoxel: maybe? | 14:48 |
|
bremner
| CarlFK: see !reattach | 14:48 |
|
gitinfo
| CarlFK: Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue | 14:48 |
| → palcu joined | 14:49 |
| → Takle joined | 14:49 |
| → The_Phoenix joined | 14:50 |
|
CarlFK
| git status ... You are currently editing a commit while rebasing branch 'master' on '1ff2dd4'. | 14:51 |
| ← jayeshsolanki left | 14:54 |
|
CarlFK
| hexagoxel: everything iv done: http://paste.ubuntu.com/9173714/ I am guessing the answer to your question is 2074 git rebase -i HEAD~2 | 14:54 |
|
hexagoxel
| so.. all the time you were in the middle of a rebase? | 14:56 |
| ← The_Phoenix left | 14:56 |
|
hexagoxel
| and you pushed and pulled .. meh | 14:56 |
| → ruukasu joined | 14:56 |
|
hexagoxel
| i'd recommend to `git status` often and avoid such | 14:57 |
| ← ciampix left | 14:57 |
| ← zumba_addict left | 14:57 |
| → zumba_addict joined | 14:58 |
|
CarlFK
| so this is now an academic exercise so I learn some git. or I can rm -rf this whole thing and start over. | 14:58 |
| → The_Phoenix joined | 14:58 |
|
hexagoxel
| there are ways to salvage, most likely | 14:58 |
| → brucelee joined | 14:58 |
|
hexagoxel
| hard to tell without the repo | 14:58 |
| ← dangerousdave left | 14:59 |
| ← lpmulligan left | 14:59 |
| → dozepih joined | 14:59 |
|
hexagoxel
| i'd use gitk and enable all branches to get an overview as a first step | 14:59 |
|
Comentarinformal
| I'll just repeat my question in case someone joined after it that may help... | 15:00 |
|
| I'm not sure what's going on in my bitbucket git, and I'm having problems with git checkouts pointing to the wrong commit, SourceTree indicating origin/master as a different one... Full problem here. http://pastebin.com/raw.php?i=LSyjnew8 | 15:00 |
| → liamkeily joined | 15:00 |
| ← saumye left | 15:00 |
| ← brucelee left | 15:03 |
| → tak30 joined | 15:03 |
| → saumye joined | 15:03 |
| ← Takle left | 15:04 |
| ← palcu left | 15:04 |
| ← The_Phoenix left | 15:05 |
| ← ruukasu left | 15:05 |
| ← tak30 left | 15:07 |
| → Takle_ joined | 15:08 |
| → Gizburdt joined | 15:08 |
| → The_Phoenix joined | 15:08 |
| → mmitchell joined | 15:09 |
| → palcu joined | 15:09 |
| ← Takle_ left | 15:10 |
| → ciampix joined | 15:11 |
| ← marchdown left | 15:12 |
| → marchdown joined | 15:12 |
| chrisgeorge_ → chrisgeorge | 15:13 |
| ← dozepih left | 15:13 |
| → tak30 joined | 15:14 |
| → daedeloth joined | 15:15 |
| ← The_Phoenix left | 15:15 |
| → mizu_no_oto joined | 15:15 |
| → HelloShitty joined | 15:15 |
| → sinequanon joined | 15:16 |
| ← khmarbaise left | 15:16 |
| → The_Phoenix joined | 15:19 |
| ← sinequanon left | 15:21 |
| → ruukasu joined | 15:21 |
| ← virtualsue left | 15:22 |
| ← zumba_addict left | 15:24 |
| → joo-_ joined | 15:25 |
| → zumba_addict joined | 15:25 |
| ← offbyone left | 15:25 |
| ← juril left | 15:25 |
| → solker joined | 15:26 |
| ← paul424 left | 15:26 |
| → offbyone joined | 15:26 |
| → aspiers joined | 15:28 |
| ← eyeRobut left | 15:29 |
| ← mribeirodantas left | 15:29 |
| → ErKa joined | 15:30 |
| ← solker left | 15:31 |
| ← offbyone left | 15:31 |
| → WaReZ joined | 15:31 |
| → otter768 joined | 15:31 |
| → offbyone joined | 15:31 |
| ← chisler left | 15:31 |
| → msankhala joined | 15:31 |
| → chisler joined | 15:32 |
| ← The_Phoenix left | 15:33 |
| ← nnyk_ left | 15:33 |
| ← vladgh left | 15:34 |
| ← fr33domlover left | 15:34 |
| → vladgh joined | 15:34 |
| → fr33domlover joined | 15:35 |
| → alanwill joined | 15:35 |
| → The_Phoenix joined | 15:35 |
| ← otter768 left | 15:36 |
| ← punchagan left | 15:36 |
| → KONIG_ joined | 15:37 |
| → Noldorin joined | 15:37 |
| → palcu_ joined | 15:37 |
| ← palcu_ left | 15:37 |
| ← mmitchell left | 15:38 |
| → palcu_ joined | 15:38 |
| ← KONIG left | 15:38 |
| ← palcu_ left | 15:38 |
| → wakd joined | 15:38 |
| → palcu_ joined | 15:39 |
| → EminenceHC joined | 15:40 |
| ← palcu left | 15:40 |
| → palcu joined | 15:40 |
| ← alanwill left | 15:40 |
| → jceb joined | 15:41 |
| → palcu__ joined | 15:43 |
| ← cagedwisdom left | 15:43 |
| ← palcu_ left | 15:44 |
| ← EminenceHC left | 15:44 |
| → juril joined | 15:45 |
| ← palcu left | 15:45 |
| → RaceCondition joined | 15:46 |
| ← palcu__ left | 15:46 |
| ← Neozonz left | 15:47 |
| ← Gizburdt left | 15:47 |
| → hans2 joined | 15:47 |
| → chrisshattuck joined | 15:48 |
| → reaverb joined | 15:48 |
| → AR45 joined | 15:48 |
| → Gizburdt joined | 15:49 |
| ← Gizburdt left | 15:50 |
| ← msankhala left | 15:50 |
| ← KONIG_ left | 15:51 |
| ← hans2 left | 15:52 |
| → mribeirodantas joined | 15:52 |
| ← Ankhers left | 15:53 |
| → eyeRobut joined | 15:54 |
| ← wookienz left | 15:55 |
| ← The_Phoenix left | 15:55 |
| → palcu joined | 15:56 |
| → Ansikt joined | 15:56 |
| ← offbyone left | 15:56 |
| ← dsdeiz_ left | 15:56 |
| ← RaceCondition left | 15:56 |
| → offbyone joined | 15:56 |
| ← Trudko left | 15:56 |
| → wookienz joined | 15:57 |
| → msmith joined | 15:57 |
| ← bgerber left | 15:58 |
| → msankhala joined | 15:58 |
| → The_Phoenix joined | 15:58 |
| → brucelee joined | 15:59 |
| ← msankhala left | 15:59 |
| → msankhala joined | 16:00 |
| ← msmith left | 16:01 |
| ← ruukasu left | 16:03 |
| ← ehmatthes left | 16:03 |
| → ladderff joined | 16:03 |
| ← brucelee left | 16:03 |
|
ladderff
| Hello, wondering how to do a rebase or whatever the equivalent is on a bare repository. Specifically I just want to excise a commit, so, A-B-C-D => A-C-D | 16:04 |
|
| I know how to do that with rebase on a regular repo | 16:04 |
| ← msankhala left | 16:05 |
| ← saumye left | 16:07 |
|
arand
| ladderff: Best bet is probably to make a clone and not try to do it in the bare repo... | 16:08 |
| → diegoaguilar joined | 16:08 |
| → zivester joined | 16:08 |
|
ladderff
| arand: yeah, that occured to me | 16:08 |
|
| arand: just doesn't make sense to me that there would be no way to do something like that to a bare repo | 16:09 |
|
| arand: is it a form of, eg, protecting the user from himself | 16:09 |
| → m0ltar joined | 16:10 |
|
ladderff
| arand: as in discouraging any history rewriting in the bare repo | 16:10 |
| → Takle joined | 16:10 |
| ← CustosLimen left | 16:10 |
| → mennea joined | 16:10 |
|
arand
| There's potential for situations where manual resolving in a working dir is needed, hence makes sense to not try it. | 16:12 |
|
ladderff
| arand: fair enough | 16:12 |
| → nnyk_ joined | 16:13 |
| → sinequanon joined | 16:17 |
| ← jceb left | 16:17 |
| → csstylish joined | 16:17 |
| ← csstylish_ left | 16:17 |
| → rindolf joined | 16:18 |
|
rindolf
| Hi all. | 16:18 |
|
| How do I resolve this problem with git rebase? http://fpaste.scsys.co.uk/445080 HELP! | 16:19 |
| → saumye joined | 16:20 |
| → tanath_ joined | 16:21 |
| ← AR45 left | 16:21 |
| ← fr33domlover left | 16:21 |
| ← sinequanon left | 16:21 |
| → fr33domlover joined | 16:22 |
|
Lekensteyn
| rindolf: why are you rebasing? Your current commit has no objects | 16:22 |
| ← tanath left | 16:22 |
|
rindolf
| Lekensteyn: I did a git pull --rebase | 16:22 |
|
| Lekensteyn: anyway , I did a git rebase --skip and my problems got fixed - thanks. | 16:23 |
|
Lekensteyn
| was your working dir clena? | 16:23 |
|
rindolf
| Lekensteyn: clean? | 16:23 |
|
Lekensteyn
| yeah, like, no uncommitted changes? | 16:23 |
|
rindolf
| Lekensteyn: yes. | 16:23 |
| ← tak30 left | 16:23 |
| ← Pyrogerg left | 16:24 |
| → diegoviola joined | 16:26 |
| ← juril left | 16:26 |
| → solker joined | 16:26 |
| → juril joined | 16:28 |
| → khmarbaise joined | 16:28 |
| ← mennea left | 16:28 |
| ← duckydan left | 16:29 |
| → mennea joined | 16:29 |
| ← ghoti left | 16:30 |
| ← saumye left | 16:31 |
| → ghoti joined | 16:31 |
| ← solker left | 16:31 |
| → jottr joined | 16:31 |
| ← juril left | 16:32 |
| ← WaReZ left | 16:32 |
| → smccarthy joined | 16:33 |
| → AR45 joined | 16:34 |
| ← palcu left | 16:35 |
| → MattMaker joined | 16:35 |
| → palcu joined | 16:35 |
| ← danemacmillan left | 16:35 |
| ← ladderff left | 16:35 |
| → endiruna joined | 16:35 |
| ← khmarbaise left | 16:35 |
| ← Takle left | 16:35 |
| ← smccarthy left | 16:35 |
| → bgerber joined | 16:36 |
| → smccarthy joined | 16:36 |
| ← palcu left | 16:36 |
| ← jottr left | 16:36 |
| → duckydan joined | 16:36 |
| → Ankhers joined | 16:37 |
| → skylite joined | 16:37 |
| ← m0ltar left | 16:39 |
| ← reaverb left | 16:42 |
| → crystal77 joined | 16:43 |
| ← nrsk left | 16:44 |
| → Motoko joined | 16:45 |
| → juril joined | 16:45 |
| ← Consuela left | 16:46 |
| → EminenceHC joined | 16:46 |
| ← mizu_no_oto left | 16:47 |
| → snuffeluffegus joined | 16:48 |
| → nrsk joined | 16:48 |
| → Gizburdt joined | 16:48 |
| ← endiruna left | 16:48 |
| ← corni left | 16:49 |
| ← listochkin left | 16:50 |
| ← EminenceHC left | 16:50 |
| → ecky--ptang-zoob joined | 16:51 |
| ← Ankhers left | 16:52 |
| → netcarver joined | 16:52 |
| → listochkin joined | 16:52 |
| → amikiri joined | 16:52 |
| → danemacmillan joined | 16:52 |
| → Ankhers joined | 16:53 |
| → nour joined | 16:54 |
| → hdon joined | 16:55 |
| → kukks joined | 16:55 |
| → msankhala joined | 16:55 |
| ← zivester left | 16:56 |
| ← Ansikt left | 16:57 |
| → Takle joined | 16:58 |
| ← mennea left | 16:58 |
| ← danemacmillan left | 16:59 |
| → mennea joined | 16:59 |
| ← wakd left | 16:59 |
| ← teleporting_kat left | 16:59 |
| ← jnewt left | 17:00 |
| → brucelee joined | 17:00 |
| ← jagob left | 17:01 |
| ← aspiers left | 17:04 |
| → mizu_no_oto joined | 17:04 |
| ← listochkin left | 17:04 |
| ← brucelee left | 17:05 |
| ← zumba_addict left | 17:06 |
| → teleporting_kat joined | 17:06 |
| → zumba_addict joined | 17:07 |
| → thilonel joined | 17:08 |
| ← Ankhers left | 17:09 |
| ← thilonel left | 17:09 |
| → endiruna joined | 17:09 |
| → punch joined | 17:10 |
| ← pantsman- left | 17:10 |
| ← Gizburdt left | 17:12 |
| ← nilg left | 17:12 |
| → herdingcat joined | 17:13 |
| → githogori joined | 17:13 |
| → Blaguvest joined | 17:14 |
| → madewokherd joined | 17:14 |
| ← b10s left | 17:17 |
| → Shusshu joined | 17:18 |
| → Lingo__ joined | 17:18 |
| ← Shusshu left | 17:18 |
| → Pyrogerg joined | 17:18 |
| ← endiruna left | 17:19 |
| ← eyeRobut left | 17:20 |
| ← timewa1ker left | 17:20 |
| ← FreezingCold left | 17:20 |
| ← smccarthy left | 17:20 |
| → smccarthy joined | 17:20 |
| → listochkin joined | 17:21 |
| → Ankhers joined | 17:21 |
| ← chrisshattuck left | 17:22 |
| ← wookienz left | 17:23 |
| ← Pyrogerg left | 17:23 |
| → tummy joined | 17:24 |
| → Gamecubic joined | 17:24 |
| ← joo-_ left | 17:24 |
| → joo-_ joined | 17:25 |
| ← Ankhers left | 17:25 |
| → wookienz joined | 17:25 |
| → Pyrogerg joined | 17:26 |
| ← joo-_ left | 17:27 |
| → solker joined | 17:27 |
| ← herdingcat left | 17:27 |
| → mennea_ joined | 17:28 |
| → corni joined | 17:28 |
| ← corni left | 17:28 |
| → corni joined | 17:28 |
| ← mennea left | 17:30 |
| → winst joined | 17:30 |
| → lindenle joined | 17:30 |
| → endiruna joined | 17:31 |
| ← lindenle left | 17:31 |
| ← solker left | 17:32 |
| gitinfo set mode: +v | 17:32 |
| → otter768 joined | 17:32 |
| ← Motoko left | 17:32 |
| ← githogori left | 17:32 |
| → chrisshattuck joined | 17:33 |
| → johtso_ joined | 17:34 |
| → kotopies joined | 17:34 |
| ← kotopies left | 17:34 |
| → kotopies joined | 17:34 |
| → jottr joined | 17:35 |
| → khmarbaise joined | 17:36 |
| ← winst left | 17:36 |
| → palcu joined | 17:36 |
| → alanwill joined | 17:36 |
| ← csstylish left | 17:37 |
| ← kukks left | 17:37 |
| ← otter768 left | 17:37 |
| → csstylish joined | 17:37 |
| → Goplat joined | 17:38 |
| → b10s joined | 17:40 |
| → Rastus_Vernon joined | 17:40 |
| ← learner1 left | 17:41 |
| → shigosei joined | 17:43 |
| ← listochkin left | 17:43 |
| ← mizu_no_oto left | 17:44 |
| → listochkin joined | 17:45 |
| → blackmesa joined | 17:45 |
| → tak30 joined | 17:45 |
| → russt joined | 17:46 |
| → msmith joined | 17:46 |
| ← pikaren left | 17:46 |
| ← punch left | 17:47 |
| → CoderBugM joined | 17:47 |
| ← CoderBugM left | 17:47 |
| ← kotopies left | 17:48 |
| → m0ltar joined | 17:48 |
| ← msmith left | 17:50 |
| → darkbasic_ joined | 17:50 |
|
thedudez0r
| ok so if I clone another repo inside the current one, and I wish to keep track of the much needed files inside it, I can't just "git add" them? I need to use submodules? | 17:50 |
| → EminenceHC joined | 17:50 |
| → MLM joined | 17:50 |
|
thedudez0r
| I already tried removing the .git directory inside the inner repo and then add files manually but I got an error | 17:51 |
| ← chrisshattuck left | 17:51 |
| ← darkbasic left | 17:51 |
| → bhuvanaurora joined | 17:51 |
| → timewa1ker joined | 17:52 |
| ← nour left | 17:52 |
| ← madewokherd left | 17:52 |
|
arand
| thedudez0r: What error? That should work, but you loose their upstream history. | 17:53 |
| ← darnir left | 17:53 |
| → joo-_ joined | 17:53 |
| → will joined | 17:54 |
| → danemacmillan joined | 17:54 |
| ← Blaguvest left | 17:55 |
| → dangerousdave joined | 17:55 |
| → learner joined | 17:55 |
| ← EminenceHC left | 17:55 |
|
will
| test | 17:55 |
| ← nnyk_ left | 17:56 |
|
_ikke_
| succeeded | 17:56 |
| ← joo-_ left | 17:56 |
|
bremner
| The Triumph of the Will. | 17:56 |
| → pikaren joined | 17:57 |
|
will
| Hi All! | 17:57 |
| → hahuang65 joined | 17:57 |
| → solker joined | 17:57 |
| ← mennea_ left | 17:57 |
| → thiago_ joined | 17:58 |
|
thedudez0r
| what's the best practice to ensure that you add a directory with all its contents recursively? | 17:58 |
| → aidalgol joined | 17:58 |
| → mennea joined | 17:58 |
|
thedudez0r
| including .dotfiles and .dotdirs | 17:58 |
|
| forget that last part | 17:58 |
|
bremner
| uhh, it's the default? | 17:58 |
| thiago_ → thiago | 17:59 |
| ← danemacmillan left | 17:59 |
|
thedudez0r
| so only "git add dirName" is needed? | 17:59 |
| → arnaud joined | 17:59 |
|
bremner
| afaik. Did you try it? | 17:59 |
|
thedudez0r
| yes | 17:59 |
|
| but then I changed a file inside that dir, and "git status" didn't show it | 18:00 |
| → brucelee joined | 18:00 |
| → eyeRobut joined | 18:01 |
| → jgardella joined | 18:01 |
|
thedudez0r
| stackoverflow showed some results | 18:01 |
|
bremner
| seems to work for me. | 18:02 |
|
| not sure what's different for you. Maybe you have the directory ignored? | 18:02 |
|
will
| can a network failure influence repo to be in corrupted state? | 18:02 |
|
| when pushing from local repo to a remote one? | 18:03 |
| ← govg_ left | 18:03 |
|
will
| has someone experienced this issue? | 18:04 |
| ← dangerousdave left | 18:04 |
| → govg joined | 18:05 |
| → FreezingCold joined | 18:05 |
| → sinequanon joined | 18:06 |
| ← brucelee left | 18:06 |
|
_ikke_
| iirc, updating refs is an atomic operation | 18:06 |
|
bremner
| will: what kind of corruption? | 18:07 |
| → jagob joined | 18:08 |
| → a_le joined | 18:09 |
| → TDJACR joined | 18:09 |
| ← sinequanon left | 18:10 |
|
will
| like this fatal: loose object 7fcab8648a989d9bb3f5246e6be7220395493395 (stored in .git/objects/7f/cab8648a989d9bb3f5246e6be7220395493395) is corrupt | 18:11 |
| ← jgardella left | 18:11 |
| ← a_le left | 18:12 |
| → joo-_ joined | 18:12 |
| → sinequanon joined | 18:12 |
|
bremner
| it's kind of an obvious thing for the protocol to check in transit. disk problems might be more likely. But I don't really know. | 18:13 |
|
will
| bremmer: like loose object xxxxxx is corrupt | 18:13 |
| ← Lingo__ left | 18:13 |
|
_ikke_
| loose object doesn't sound like comming from a push | 18:13 |
|
thiago
| right | 18:13 |
|
| a push should not include a loose object | 18:13 |
| → madewokherd joined | 18:14 |
|
thiago
| pushes push packs, not loose objects | 18:14 |
| ← The_Phoenix left | 18:14 |
|
thiago
| loose objects are created with git add and git gc | 18:14 |
| → Lingo__ joined | 18:14 |
|
will
| hum | 18:14 |
|
| ok | 18:14 |
| → nnyk_ joined | 18:14 |
| ← joo-_ left | 18:14 |
|
will
| is push an atomic operation? | 18:15 |
|
thiago
| not exactly | 18:16 |
|
| a push can contain multiple refs being updated. That's definitely not atomic. | 18:16 |
|
| each ref getting updated is atomic, though | 18:16 |
| ← darkbasic_ left | 18:16 |
| → darkbasic joined | 18:16 |
|
_ikke_
| But still not cause of corruption | 18:17 |
| ← subhojit777 left | 18:17 |
| → lolo974 joined | 18:18 |
| ← ojacobson left | 18:19 |
| → daito joined | 18:19 |
|
will
| so if some instabillity in a network occurs during the push.. there's a way to get a corruption ? | 18:19 |
| → Literphor joined | 18:20 |
| → The_Phoenix joined | 18:20 |
| ← govg left | 18:20 |
| ← sinequanon left | 18:21 |
| ← The_Phoenix left | 18:21 |
| → mizu_no_oto joined | 18:22 |
| → durre joined | 18:22 |
|
bremner
| is this a hypothetical question? or do you refer to your actual corruption? | 18:23 |
| → jgardella joined | 18:23 |
| → joo-_ joined | 18:24 |
| → msmith_ joined | 18:24 |
| ← msmith_ left | 18:24 |
| → msmith_ joined | 18:25 |
|
thiago
| will: no, a push should not cause a corruption because the receiver should check the pack before accepting it | 18:25 |
| ← Lingo__ left | 18:25 |
| ← doev left | 18:26 |
|
thiago
| it's possible for a pack to be correct but incomplete. In that case, you do have a repository problem, but not the one you mentioned | 18:26 |
| ← joo-_ left | 18:26 |
| ← msmith_ left | 18:26 |
|
will
| yes about the corruption. Because after my push the network got down. Then when I make a pull got this is corrupted message. | 18:26 |
| → msmith_ joined | 18:27 |
| ← daito left | 18:27 |
| → khmarbaise_ joined | 18:27 |
|
thiago
| like I said, a push does not create loose objects | 18:27 |
| ← mennea left | 18:27 |
| → mennea joined | 18:28 |
|
will
| thanks thiago | 18:28 |
| → govg joined | 18:29 |
| ← lolo974 left | 18:29 |
| ← khmarbaise left | 18:29 |
| khmarbaise_ → khmarbaise | 18:29 |
| → smw joined | 18:29 |
| → lolo974 joined | 18:29 |
| → donmichelangelo joined | 18:30 |
|
will
| but are there some way to push (not a forced one) put a remote repo in corrupted state? | 18:31 |
|
thiago
| yes | 18:31 |
| → WaReZ joined | 18:31 |
|
thiago
| like I said, a push with a valid pack, but not containing all objects that the receiver needs | 18:32 |
|
| and it requires that the receiver isn't configured to do a full check on the pushed data | 18:32 |
|
will
| a push to a branch? not master | 18:32 |
|
| hum ok | 18:32 |
|
thiago
| to any branch | 18:32 |
| ← michelangelo left | 18:32 |
| → kgadek joined | 18:34 |
| → CoderBugM joined | 18:35 |
|
will
| because this push was on a branch.. an all the repo got corrupted. (but others repos are ok) | 18:36 |
|
kgadek
| hi all. I have some repo developed by 3 people and now we'd like to make it public. HOWEVER… you know the term "fuck-debbuging"? (printf("fuck fuck fuck"))? Since I believe we have such things somewehere in history I'd like to squash it and call it "version one". HOWEVER I'd like to retain the ownership of changes (so `git blame` works well). I hoped to squash the history to 3 commits, one per author, each introducing the own | 18:37 |
|
| lines of code. Is such thing even possible?… | 18:37 |
| → dangerousdave joined | 18:38 |
| → joo-_ joined | 18:38 |
|
will
| so my remote server is not well configured | 18:38 |
|
kgadek
| one idea I have is to have `git rebase <init> -i`, reorder the commits and mark all-but-three as 'fixup' | 18:38 |
| ← durre left | 18:39 |
|
thiago
| kgadek: yes, but each of those commits will not make sense | 18:39 |
| → maestrojed joined | 18:39 |
|
kgadek
| thiago: that's not a big problem | 18:39 |
|
thiago
| ok, then do it | 18:39 |
|
kgadek
| ok, so the `rebase` path is the way to go? | 18:40 |
|
thiago
| no | 18:40 |
| → iamjarvo joined | 18:40 |
|
thiago
| create a new root commit, add someone's lines, commit | 18:40 |
|
| add someone else's lines, commit | 18:40 |
|
| add the third one's lines, commit | 18:40 |
| ← bhuvanaurora left | 18:41 |
|
kgadek
| well, that's 10K lines of code | 18:41 |
| ← r00tWearsRedHats left | 18:41 |
| ← madewokherd left | 18:41 |
|
kgadek
| so manual way is not possible actually | 18:41 |
| ← fr33domlover left | 18:41 |
|
thiago
| then write a script | 18:42 |
| ← snuffeluffegus left | 18:42 |
| → fr33domlover joined | 18:42 |
|
kgadek
| *sigh*, hoped there is a quicker way… Okay then. Thanks! | 18:43 |
|
milki
| heh | 18:43 |
| ← Takle left | 18:43 |
|
milki
| its not that hard -.- | 18:43 |
| → CustosL1men joined | 18:44 |
|
thiago
| kgadek: since no one does that, there's no easier way | 18:44 |
| → btree joined | 18:44 |
|
milki
| just use the tip and git blame data | 18:44 |
| ← fstd left | 18:44 |
|
will
| thiago when you said: "but not containing all objects that the receiver needs". A network failure can influence the server to get all the objects. Am I right? | 18:44 |
|
thiago
| will: no | 18:44 |
| → skorgon joined | 18:44 |
| ← skorgon left | 18:44 |
| → skorgon joined | 18:44 |
|
thiago
| will: this is not a network failure. It's a sender failure. | 18:45 |
| → ruukasu joined | 18:45 |
| ← lolo974 left | 18:45 |
| → lolo974 joined | 18:47 |
| ← csstylish left | 18:47 |
|
will
| but all my lasts commits are ok.. using git push origin <branch-name> | 18:47 |
| → csstylish joined | 18:47 |
|
will
| why the last one failed... due to notwork problem and misconfuration of the server to do a full check in the receivede data... | 18:48 |
| → Takle joined | 18:49 |
|
thiago
| we're not convinced it was caused by the push | 18:49 |
| ← dangerousdave left | 18:49 |
|
will
| Disk faliure? | 18:50 |
|
thiago
| yes | 18:50 |
|
will
| could be | 18:50 |
| ← Literphor left | 18:50 |
| ← CoderBugM left | 18:51 |
|
will
| but other repos in my server are ok | 18:51 |
| ← m0ltar left | 18:51 |
| ← russt left | 18:51 |
| ← Takle left | 18:52 |
| ← blackmesa left | 18:52 |
| → Takle joined | 18:52 |
| → dangerousdave joined | 18:52 |
| ← smccarthy left | 18:53 |
| ← weeb1e_ left | 18:53 |
| → virtualsue joined | 18:53 |
| → smccarthy joined | 18:54 |
| → kerrick joined | 18:55 |
| → danemacmillan joined | 18:55 |
| → EminenceHC joined | 18:55 |
| ← PaulCapestany left | 18:57 |
| → PaulCapestany joined | 18:57 |
| ← smccarthy left | 18:58 |
| → smccarthy joined | 18:59 |
|
thedudez0r
| ok confirmed, git add --all didn't add one of the folders | 18:59 |
| ← danemacmillan left | 19:00 |
| ← EminenceHC left | 19:00 |
|
will
| ok guys! Thanks! Thanks Thiago! | 19:00 |
| → durre joined | 19:01 |
| → Vile joined | 19:02 |
|
thedudez0r
| man why can't I add that directory? | 19:03 |
|
| git add directory outputs nothing | 19:03 |
|
| and git status doesnt' show a change | 19:03 |
|
phy1729
| anything in the directory? | 19:04 |
|
thedudez0r
| yes, files + subdirs | 19:04 |
|
thiago
| are all files already added? | 19:05 |
|
| all non-ignored files already added | 19:05 |
| ← rindolf left | 19:05 |
|
thedudez0r
| it;s worth noticing that that particular directory WAS/IS a cloned repo, I just stripped the .git directory in it | 19:05 |
| ← nrsk left | 19:06 |
| → kukks joined | 19:06 |
| ← kukks left | 19:06 |
| → kukks joined | 19:06 |
|
thedudez0r
| there is no .gitignore | 19:06 |
|
| nor anything set in .git/info/exclude | 19:07 |
|
thiago
| is it a submodule? | 19:07 |
| ← liamkeily left | 19:07 |
| → ojacobson joined | 19:08 |
|
thedudez0r
| i did a couple submodule commands on the repo earlier i think | 19:08 |
|
thiago
| that might be why | 19:08 |
|
thedudez0r
| git submodule status | 19:08 |
| ← solker left | 19:08 |
|
thiago
| git thinks that subdir is a submodule | 19:09 |
|
| you can't add files inside the submodule | 19:09 |
|
thedudez0r
| No submodule mapping found in .gitmodules for path 'tmux-logging' | 19:09 |
|
thiago
| it may be a submodule without .gitmodules | 19:10 |
|
| if you did git add while the .git dir was there | 19:10 |
|
| git rm --cached tmux-logging | 19:10 |
|
| then commit | 19:10 |
| → chrisshattuck joined | 19:11 |
|
thedudez0r
| nigga u wack | 19:12 |
|
| thanks | 19:12 |
| ← btree left | 19:13 |
| ← chrisshattuck left | 19:13 |
| ← Tuna-Fish left | 19:13 |
| → d10n-work joined | 19:14 |
| ← ecky--ptang-zoob left | 19:15 |
| ← alanwill left | 19:15 |
| → ecky--ptang-zoob joined | 19:16 |
| → weevieL joined | 19:16 |
| ← weevieL left | 19:17 |
| → aspiers joined | 19:17 |
| → zivester joined | 19:18 |
| ← nnyk_ left | 19:19 |
| ← Dougie187 left | 19:21 |
| ← will left | 19:22 |
| ← durre left | 19:22 |
| ← israelpattison left | 19:23 |
| → israelpattison joined | 19:23 |
| → Tuna-Fish joined | 19:24 |
| ← kyb3r_ left | 19:26 |
| → nkouevda joined | 19:28 |
| ← mennea left | 19:28 |
| → mennea_ joined | 19:28 |
| ← mizu_no_oto left | 19:29 |
| → Literphor joined | 19:30 |
| ← eyeRobut left | 19:32 |
| → stamina joined | 19:32 |
| → otter768 joined | 19:33 |
| ← lolo974 left | 19:33 |
| → fstd joined | 19:34 |
| → mizu_no_oto joined | 19:34 |
| ← lng left | 19:34 |
| ← aspiers left | 19:36 |
| ← dreiss left | 19:36 |
| → lng joined | 19:36 |
| ← Literphor left | 19:36 |
|
thedudez0r
| is it possible to have 2 branchesj | 19:36 |
|
| one in which you use submodules, and one in which you don't? | 19:36 |
| → eghdk joined | 19:37 |
| ← GT left | 19:37 |
|
thedudez0r
| or are submodules a global kind of thing | 19:37 |
|
eghdk
| I noticed some .iml files being changed but they are not staged. I added *.iml to my gitignore but now a git status still shows the .iml files are there in the unstaged area. | 19:37 |
|
thedudez0r
| unequivocally inherited by all branches | 19:37 |
| → Literphor joined | 19:37 |
|
_ikke_
| No, they are branch specific | 19:37 |
|
thedudez0r
| nice | 19:37 |
| ← otter768 left | 19:38 |
| ← teleporting_kat left | 19:38 |
| ← ojacobson left | 19:40 |
| ← virtualsue left | 19:43 |
| ← eghdk left | 19:44 |
| → ascarter joined | 19:45 |
| ← msmith_ left | 19:46 |
| → Sceorem joined | 19:47 |
|
thedudez0r
| i'm seeing the benefit of git already | 19:47 |
| → hich joined | 19:47 |
|
thedudez0r
| if only i had been experienced at version control back in 2007~08 | 19:47 |
|
hich
| has anyone installed pygit2? | 19:48 |
|
thedudez0r
| so many lost configuration files, and so many tracks of the changes i made | 19:48 |
|
| I'm using it mainly for backing up/ keeping track of config files mostly | 19:49 |
| ← stamina left | 19:50 |
| → kyb3r_ joined | 19:50 |
| ← chris2 left | 19:50 |
|
thedudez0r
| and I make different branches for different "flavors" of the configs | 19:50 |
| → msmith_ joined | 19:50 |
|
thedudez0r
| that's kind of what I see git is for, but it's mostly used for software development where complexity is higher | 19:51 |
|
| but it can have so many simpler and powerful uses that you wouldn't believe | 19:52 |
| ← MLM left | 19:53 |
| ← tak30 left | 19:53 |
| ← maestrojed left | 19:55 |
| → ojacobson joined | 19:55 |
| ← faylite left | 19:55 |
| → LeMike joined | 19:56 |
| → danemacmillan joined | 19:56 |
| ← Literphor left | 19:56 |
| ← LeMike left | 19:56 |
| → giusef joined | 19:56 |
| → LeMike joined | 19:57 |
| → eyeRobut joined | 19:57 |
| ← zumba_addict left | 19:58 |
| → mennea joined | 19:58 |
| ← msankhala left | 19:58 |
| ← kyb3r_ left | 19:58 |
| → Literphor joined | 19:59 |
| ← mennea_ left | 19:59 |
| → zumba_addict joined | 19:59 |
| ← SjB_ left | 19:59 |
| → eletuchy_ joined | 20:00 |
| ← danemacmillan left | 20:00 |
| → basiclaser_ joined | 20:01 |
| → EminenceHC joined | 20:01 |
| ← LeMike left | 20:02 |
| → cagedwisdom joined | 20:02 |
| ← msmith_ left | 20:02 |
| ← eletuchy left | 20:02 |
| → LeMike joined | 20:03 |
| → dset0x joined | 20:03 |
| → trewe joined | 20:05 |
| ← ascarter left | 20:06 |
| ← EminenceHC left | 20:06 |
| ← giusef left | 20:06 |
| ← joo-_ left | 20:08 |
| → chris2 joined | 20:10 |
| ← kriks left | 20:10 |
| ← aidalgol left | 20:11 |
| ← khmarbaise left | 20:11 |
| → lindenle joined | 20:12 |
| ← LeMike left | 20:13 |
| ← amikiri left | 20:13 |
| ← zivester left | 20:14 |
| → LeMike joined | 20:15 |
| → Nechradile joined | 20:16 |
| ← lindenle left | 20:17 |
| → zivester joined | 20:18 |
| ← LeMike left | 20:18 |
| → r00tWearsRedHats joined | 20:18 |
| → LeMike joined | 20:18 |
|
Seveas
| hich: yeah, I use it | 20:19 |
| ← LeMike left | 20:19 |
|
hich
| Seveas: cool i just managed to install it | 20:19 |
| ← smccarthy left | 20:19 |
| → smccarthy joined | 20:19 |
|
hich
| i was installing the wrong version against what i have for libgit2, now it's sorted. | 20:19 |
| → LeMike joined | 20:20 |
|
Seveas
| yeah, those are very much linked | 20:20 |
|
hich
| do you know if the python process launches a subprocess to run git in, via this module, or does it all stay in process? | 20:20 |
|
Seveas
| in process. libgit is a reimplementation of the git functionality | 20:20 |
|
hich
| ok great. | 20:21 |
| ← smccarthy left | 20:21 |
| → kdoza joined | 20:21 |
| ← nkouevda left | 20:22 |
| ← LeMike left | 20:22 |
| ← kukks left | 20:24 |
| → ascarter joined | 20:24 |
| ← skylite left | 20:25 |
| → skylite joined | 20:25 |
| ← mennea left | 20:28 |
| → mennea joined | 20:28 |
| → Lyqyd joined | 20:28 |
| → snuffeluffegus joined | 20:29 |
| ← bambams left | 20:29 |
| → bambams joined | 20:30 |
| ← bambams left | 20:30 |
| → bambams joined | 20:30 |
| ← FreezingCold left | 20:30 |
| → mellernoia joined | 20:30 |
| ← Nechradile left | 20:30 |
| → gfixler joined | 20:30 |
| → nnyk_ joined | 20:32 |
| → tanath__ joined | 20:33 |
| ← tanath_ left | 20:34 |
| ← Skapadapaduu left | 20:34 |
| → FreezingCold joined | 20:35 |
| → Dougie187 joined | 20:35 |
| → ScioMin joined | 20:35 |
| → chrisshattuck joined | 20:37 |
| → tristanp joined | 20:37 |
| ← jgardella left | 20:37 |
| ← ojacobson left | 20:38 |
| ← fr33domlover left | 20:39 |
| → fr33domlover joined | 20:40 |
| → bvi joined | 20:41 |
| ← bvi left | 20:41 |
| ← ascarter left | 20:41 |
| → joo-_ joined | 20:43 |
| → EminenceHC joined | 20:43 |
| ← thedudez0r left | 20:44 |
| ← joo-_ left | 20:47 |
| → BSaboia joined | 20:48 |
| ← EminenceHC left | 20:48 |
| ← dset0x left | 20:49 |
| → thedudez0r joined | 20:50 |
| → m0ltar joined | 20:50 |
| ← Literphor left | 20:51 |
| → slassh joined | 20:52 |
| ← zivester left | 20:52 |
| ← iamjarvo left | 20:52 |
| → zivester joined | 20:52 |
| ← Jackneill left | 20:54 |
| → Consuela joined | 20:55 |
| → jottr_ joined | 20:55 |
| ← ColdKeyboard left | 20:56 |
| ← dangerousdave left | 20:56 |
| → rivarun joined | 20:56 |
| → ColdKeyboard joined | 20:56 |
| → danemacmillan joined | 20:57 |
| ← mennea left | 20:58 |
| ← learner left | 20:58 |
| ← tristanp left | 20:58 |
| → dangerousdave joined | 20:58 |
| ← Sceorem left | 20:58 |
| → mennea joined | 20:58 |
| → tristanp joined | 20:59 |
| ← jottr left | 20:59 |
| → tristanp_ joined | 20:59 |
| ← tristanp left | 20:59 |
| ← kdoza left | 20:59 |
| ← FreezingCold left | 21:00 |
| → str joined | 21:01 |
| ← danemacmillan left | 21:01 |
| → karthik_ joined | 21:02 |
| → learner1 joined | 21:03 |
| ← ruukasu left | 21:04 |
| ← str left | 21:05 |
| → EminenceHC joined | 21:07 |
| → jb55 joined | 21:08 |
| ← dangerousdave left | 21:08 |
| → amikiri joined | 21:09 |
| → pantsman- joined | 21:10 |
| → adamben joined | 21:11 |
| → Literphor joined | 21:11 |
| ← marthinal left | 21:12 |
| ← EminenceHC left | 21:12 |
| ← Consuela left | 21:12 |
| → alanwill joined | 21:13 |
| → Skapadapaduu joined | 21:13 |
| → fahadash joined | 21:14 |
| → dangerousdave joined | 21:15 |
| ← learner1 left | 21:16 |
| ← a-l-e left | 21:16 |
| ← chrisshattuck left | 21:17 |
| ← palcu left | 21:17 |
| → aswen joined | 21:18 |
| ← ecky--ptang-zoob left | 21:18 |
| ← alanwill left | 21:18 |
| ← tristanp_ left | 21:19 |
| → learner joined | 21:19 |
| ← crystal77 left | 21:22 |
| → iamtakingiteasy joined | 21:22 |
| → Velzes joined | 21:23 |
| ← Velzes left | 21:23 |
| → Velzes joined | 21:24 |
| ← dangerousdave left | 21:25 |
| ← adamben left | 21:25 |
| → MLM joined | 21:26 |
| ← nnyk_ left | 21:27 |
| cyphase_ → cyphase | 21:31 |
| ← ScioMin left | 21:33 |
| → Sceorem joined | 21:33 |
| → brucelee joined | 21:33 |
| → otter768 joined | 21:34 |
| ← mizu_no_oto left | 21:34 |
| → adamben joined | 21:34 |
| ← adamben left | 21:34 |
| → adamben joined | 21:34 |
| → crystal77 joined | 21:35 |
| → acharlieh joined | 21:36 |
| → palcu joined | 21:36 |
| ← dougsland left | 21:36 |
| → RaceCondition joined | 21:36 |
| → Consuela joined | 21:36 |
| → githogori joined | 21:37 |
| ← brucelee left | 21:38 |
| ← Consuela left | 21:38 |
| ← otter768 left | 21:38 |
| ← mennea left | 21:39 |
| → mennea joined | 21:39 |
| → Consuela joined | 21:40 |
| → bhuvanaurora joined | 21:41 |
| ← AR45 left | 21:42 |
| → AR45 joined | 21:42 |
| → tanath_ joined | 21:43 |
| ← githogori left | 21:43 |
| ← acharlieh left | 21:44 |
| ← tanath__ left | 21:44 |
| → acharlieh joined | 21:45 |
| ← bhuvanaurora left | 21:45 |
| ← earny left | 21:46 |
| → ap0c joined | 21:46 |
| ← ap0c left | 21:46 |
| → ap0c joined | 21:46 |
| ← learner left | 21:49 |
| ← NBhosting left | 21:50 |
| → dtrott joined | 21:52 |
| ← acharlieh left | 21:53 |
| ← zivester left | 21:53 |
| ← listochkin left | 21:53 |
| → zivester joined | 21:54 |
| → slacko293941 joined | 21:55 |
| → maestrojed joined | 21:55 |
| → iamjarvo joined | 21:56 |
| ← BenjaminDeuter left | 21:58 |
| ← jottr_ left | 21:58 |
| → madewokherd joined | 21:59 |
| → nkouevda joined | 22:00 |
| → acharlieh joined | 22:03 |
| ← snuffeluffegus left | 22:03 |
| ← CussBot left | 22:07 |
| ← St_Marx left | 22:07 |
| → CussBot joined | 22:07 |
| ← madewokherd left | 22:07 |
| → St_Marx joined | 22:08 |
| ← Literphor left | 22:09 |
| → EminenceHC joined | 22:09 |
| ← jmpp left | 22:11 |
| → jmpp joined | 22:11 |
| → dangerousdave joined | 22:13 |
| ← EminenceHC left | 22:13 |
| ← BSaboia left | 22:15 |
| ← carlosr left | 22:16 |
| ← NoNMaDDeN left | 22:18 |
| → note joined | 22:20 |
| ← mennea left | 22:20 |
| → LeMike joined | 22:20 |
| → mennea joined | 22:21 |
| ← dangerousdave left | 22:23 |
| ← adamben left | 22:23 |
| → carlosr joined | 22:27 |
| → msmith_ joined | 22:29 |
| ← mribeirodantas left | 22:30 |
| → mribeirodantas joined | 22:31 |
| ← reconmaster left | 22:32 |
| → ascarter joined | 22:33 |
| ← ascarter left | 22:35 |
| → FreezingCold joined | 22:36 |
| ← palcu left | 22:37 |
| → ojacobson joined | 22:39 |
| ← RaceCondition left | 22:39 |
| → lpmulligan joined | 22:41 |
| → kukks joined | 22:41 |
| ← mennea left | 22:41 |
| → palcu joined | 22:41 |
| ← palcu left | 22:41 |
| → palcu joined | 22:41 |
| ← basiclaser_ left | 22:41 |
| ← skylite left | 22:44 |
| ← iamjarvo left | 22:45 |
| → RaceCondition joined | 22:45 |
| ← slassh left | 22:47 |
| ← Takle left | 22:49 |
| ← Dougie187 left | 22:50 |
| → unixpro1970 joined | 22:51 |
| ← palcu left | 22:52 |
| ← FreezingCold left | 22:52 |
| ← ghoti left | 22:52 |
| → listochkin joined | 22:53 |
| → stringer joined | 22:55 |
| ← netcarver left | 22:55 |
| → FreezingCold joined | 22:56 |
| ← eyeRobut left | 22:58 |
| → eyeRobut joined | 22:59 |
| → ghoti joined | 23:01 |
| → alanwill joined | 23:01 |
| → Gino_ joined | 23:01 |
| ← BlaXpirit left | 23:02 |
| ← slacko293941 left | 23:02 |
| ← jave left | 23:03 |
| → jave joined | 23:05 |
|
stringer
| I know this should be a simple thing to do, but can someone please point me to a doc which shows how to create a new repo (or push an existing) from CLI where you've not made an existing repo in github already? I've attempted to "git remote add origin ..." and "git push -u origin master" but it always returns that it can't find the remote repo. Is there *any* way to get around hitting the browser to create the new repo, or by u | 23:05 |
|
| sing the API? I've attempted using the api, v3 specifically, but the host password doesn't allow me to auth. Is there a way to use a token there? | 23:05 |
|
| (doesn't allow me to auth == my known good passowrd results in the same thing as me giving a blank PW.) | 23:06 |
|
ojacobson
| stringer: within _git_, 'git init' and 'git clone' are the primary tools for creating repos. (There are other, lower-level tools, but they're equivalent. Just more flexible and harder to use.) | 23:06 |
|
| For _github_, you can use their API. Consider using the `hub` client. | 23:06 |
| ← eyeRobut left | 23:06 |
|
ojacobson
| Git itself does not have a tool for creating remote repos the way hg does (you can' | 23:06 |
|
| you can't 'git clone . ssh://.../foo.git', for example) | 23:07 |
|
stringer
| ojacobson: Thanks, I'll give it a look. My pref would be to do this within a python script (I have a mass migration project) but can always subprocess out. | 23:07 |
| → dangerousdave joined | 23:07 |
| ← dangerousdave left | 23:07 |
|
Seveas
| stringer: github3.py can help you | 23:07 |
|
stringer
| I'll take a look for it.. thanks ojacobson and Seveas ;) | 23:07 |
| → mizu_no_oto joined | 23:08 |
| pantsman- → pantsman | 23:09 |
| ← pantsman left | 23:09 |
| → pantsman joined | 23:09 |
|
Gino_
| hope someone can help me understand something here. I have a directory structure like this. ~/apps/ and inside apps/ i have 10-15 various projects. only 2 or 3 are from cloned repos. Im confused b/c if i'm in apps/projectA, and do git branch, i see the branches for a different project ive been working on? | 23:09 |
| → adamben joined | 23:09 |
|
frogonwheels
| Gino_: have you got a ~/apps/.git ? | 23:11 |
|
| (you shouldn't) | 23:11 |
| ← arnaud left | 23:11 |
|
frogonwheels
| Gino_: that would be very unusual if everything is set up correctly. | 23:11 |
| ← thedudez0r left | 23:12 |
|
Gino_
| hmmmm, yikes, it looks like i do | 23:13 |
|
| not sure how that happened | 23:13 |
|
frogonwheels
| Gino_: git init in the wrong dir? | 23:13 |
| ← chisler left | 23:13 |
|
frogonwheels
| do you have a .git in projectA ? | 23:14 |
|
| (cause even if there's one in ~/apps/ the projectA/.git should take precedence | 23:14 |
| ← hfp_work left | 23:15 |
| ← hfp left | 23:15 |
| ← dtrott left | 23:16 |
|
Gino_
| alas, i do not...but there is one in projectB, which explains why when i go to that one, then i see the correct branches | 23:16 |
| → delight_ joined | 23:16 |
| → EminenceHC joined | 23:16 |
| → blackmesa joined | 23:17 |
|
Gino_
| so i think ive been saving project a to apps/.git? | 23:17 |
| ← mribeirodantas left | 23:17 |
| → thedudez0r joined | 23:17 |
|
frogonwheels
| Gino_: :| yeah. or two. If history is not too imporant, just start where you are... otherwise It might be possible to recover the history | 23:18 |
| → NoNMaDDeN joined | 23:18 |
| → hfp joined | 23:18 |
|
Gino_
| ok thanks frogonwheels! | 23:19 |
| → hfp_work joined | 23:19 |
| → brucelee joined | 23:20 |
| ← enitiz left | 23:21 |
| → sq-one joined | 23:21 |
| ← EminenceHC left | 23:21 |
| → kcj joined | 23:21 |
| ← NoNMaDDeN left | 23:24 |
| ← stringer left | 23:24 |
| → imastupidguest joined | 23:24 |
| ← King_Hual left | 23:25 |
|
imastupidguest
| Is there any way to make a commit message go onto a new line (when it is long)? | 23:25 |
| ← eletuchy_ left | 23:25 |
|
qsuscs
| well, insert a \n? | 23:26 |
|
Seveas
| imastupidguest: don't use commit -m and it'll open an editor :) | 23:26 |
|
thiago
| imastupidguest: yes. If you want a newline, insert a newline | 23:26 |
|
imastupidguest
| qsuscs: That works eh? thx man, I shoulda figured that. | 23:26 |
| → chrisgeorge_ joined | 23:26 |
|
thiago
| what's the issue? | 23:26 |
|
imastupidguest
| right on | 23:26 |
|
| lol - how dumb | 23:27 |
| delight_ → delight | 23:28 |
|
imastupidguest
| yeah, works :) | 23:28 |
| ← shigosei left | 23:29 |
| ← lpmulligan left | 23:30 |
| ← chrisgeorge left | 23:31 |
| ← corni left | 23:32 |
| → ruukasu joined | 23:32 |
| ← Kicer86 left | 23:34 |
| → dtrott joined | 23:34 |
| → otter768 joined | 23:35 |
| ← m0ltar left | 23:35 |
| ← msmith_ left | 23:36 |
| ← chrisgeorge_ left | 23:36 |
| → chrisgeorge joined | 23:36 |
| → Olipro joined | 23:39 |
| ← skorgon left | 23:39 |
| → RaceCondition_ joined | 23:39 |
| ← ghoti left | 23:39 |
| ← otter768 left | 23:39 |
| ← blackmesa left | 23:42 |
| ← jokke left | 23:42 |
| ← RaceCondition left | 23:43 |
| RaceCondition_ → RaceCondition | 23:43 |
| → msmith_ joined | 23:43 |
| ← msmith_ left | 23:45 |
|
frogonwheels
| imastupidguest: remember to use two newlines after the first line | 23:46 |
| → m0ltar joined | 23:46 |
| ← jagob left | 23:46 |
| → eletuchy joined | 23:47 |
| → jagob joined | 23:47 |
| ← FreezingCold left | 23:47 |
| ← Sceorem left | 23:48 |
| → FreezingCold joined | 23:48 |
| ← pantsman left | 23:48 |
| ← ag4ve_ left | 23:49 |
| → ghoti joined | 23:51 |
| ← note left | 23:52 |
| → palcu joined | 23:52 |
| → rumiboy joined | 23:52 |
| ← ruukasu left | 23:53 |
| → weeb1e joined | 23:53 |
| → ruukasu joined | 23:53 |
| ← rumiboy left | 23:54 |
| ← ciampix left | 23:55 |
| ← adamben left | 23:56 |
| → adamben joined | 23:57 |
| ← palcu left | 23:57 |
| → wakd joined | 23:58 |
| → nnyk_ joined | 23:58 |