IRCloggy #git 2015-10-16

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2015-10-16

→ jmpp joined00:01
← skcin7_ left00:01
→ semajnz joined00:07
→ ashleyis joined00:07
→ weltall joined00:07
→ styx_ joined00:07
→ KronTMX joined00:07
→ Kronuz joined00:07
→ belak joined00:07
→ jcp joined00:07
→ M-ou-se joined00:07
→ warthog9 joined00:07
→ here joined00:07
→ ollien joined00:07
→ TheMoonMaster joined00:07
→ MrC joined00:07
→ Dynetrekk1 joined00:07
→ spacepluk joined00:07
→ Bigcheese joined00:07
→ GothAlice joined00:07
→ camt joined00:07
→ _W_ joined00:07
→ jayne joined00:07
→ nellicus_ joined00:07
→ dawik_ joined00:07
→ msm_ joined00:07
→ DarkSector joined00:07
→ Cyclohexane joined00:07
→ CJ_ joined00:07
→ atrioom joined00:07
→ gnarf joined00:07
→ d-skull joined00:07
→ MajorPayne joined00:07
→ thesquib_ joined00:07
→ joevandyk joined00:07
→ icedp joined00:07
→ ninsei joined00:07
→ moritz joined00:07
→ jmatth joined00:07
→ Ravana joined00:07
→ Samual joined00:07
→ imMute joined00:07
→ jorj joined00:07
→ cmn joined00:07
→ mansel_ joined00:07
→ ndimitrij joined00:07
→ sitaram joined00:07
→ canine joined00:07
→ rzeka joined00:07
→ therealklanni joined00:07
→ Afforess joined00:07
→ RichiH joined00:07
→ ghormoon joined00:07
→ Kamilion joined00:07
→ tanath joined00:07
→ Remram joined00:07
→ james3015 joined00:07
→ renoirb joined00:07
→ slixpk joined00:07
→ trv joined00:07
→ monty joined00:07
→ tHEMtZ joined00:07
→ jwmann joined00:07
→ timthowtdi joined00:07
→ ygeLN joined00:07
→ kennon joined00:07
→ thibaultcha_ joined00:07
→ runnyspot joined00:07
→ marko__ joined00:07
→ Guest37717 joined00:07
→ harv joined00:07
→ rawburt joined00:07
→ fugi joined00:07
→ Hello71 joined00:07
→ mic4ael joined00:07
→ ngrud joined00:07
→ __name__ joined00:07
→ tachoknight joined00:07
→ ioremap joined00:07
→ Cata|Work joined00:07
→ nwf joined00:07
→ Ranhir joined00:07
→ fullstack joined00:07
→ hvoigt joined00:07
→ Kartagis joined00:07
→ jave joined00:07
→ brandonw joined00:07
→ M-mistake joined00:07
→ cmoneylulz joined00:07
→ jpleau joined00:07
→ JyZyXEL joined00:07
→ alduin joined00:07
→ kini joined00:07
→ diogenese joined00:07
→ tomboy64 joined00:07
→ Guest45515 joined00:07
→ bremner joined00:07
→ doop joined00:07
→ lordvadr joined00:07
→ SpeakerToMeat joined00:07
→ moop joined00:07
→ Kneiva joined00:07
→ freeze joined00:07
→ raenk joined00:07
→ Vadtec joined00:07
→ abh joined00:07
→ monokrome joined00:07
→ aucecil joined00:07
→ amaury_d joined00:07
→ Walex joined00:07
→ tureba joined00:07
→ linuxmint joined00:07
→ |ifei5good joined00:07
→ jatb joined00:07
→ s00pcan joined00:07
→ puff joined00:07
→ Ragnar joined00:07
→ rgenito joined00:07
→ tgies joined00:07
→ kadoban joined00:07
→ dzan joined00:07
→ elementalest joined00:07
→ maletor|work joined00:07
→ heroux joined00:07
→ albel727 joined00:07
→ SJr joined00:07
→ kgirthofer joined00:07
→ unforgiven512 joined00:07
→ boushi joined00:07
→ cdg joined00:07
→ felix891 joined00:07
→ halfline joined00:07
→ xudongz joined00:07
→ tpollard joined00:07
→ krawchyk joined00:07
→ polyzen joined00:07
→ nidr0x joined00:07
→ nanga joined00:07
→ ag4ve joined00:07
→ bollullera joined00:07
→ Pieplay joined00:07
→ negaduck_ joined00:07
→ twem2 joined00:07
verne.freenode.net set mode: +v00:07
→ cbonobo__ joined00:07
→ cite joined00:07
→ joelsmith joined00:07
→ juvenal joined00:07
→ SleePy joined00:07
→ enleeten joined00:07
→ connor_goodwolf joined00:07
→ bitkiller joined00:07
→ Nikhil_D1 joined00:07
→ juril joined00:07
→ Milos_ joined00:07
→ dustinm joined00:07
→ yeshacker joined00:07
→ Xe joined00:07
→ dsdeiz joined00:07
→ dualbus joined00:07
→ mukmuk joined00:07
→ deed02392 joined00:07
→ Caius joined00:07
→ KekSi joined00:07
→ rlf joined00:07
→ Guest51173 joined00:07
→ noahsussman joined00:07
→ _flow_ joined00:07
→ PotatoTrumpet joined00:07
→ Somatt_wrk joined00:07
→ someara joined00:07
→ yoyoyo_ joined00:07
→ Sonderblade joined00:07
→ waveclaw joined00:07
→ tchan joined00:07
→ tterrag joined00:07
→ jantje joined00:07
→ osse joined00:07
→ Exagone313 joined00:07
→ constantinexvi joined00:07
→ pilif joined00:07
→ XVar joined00:07
→ caffeinatedcode` joined00:07
→ tzero joined00:07
→ awx joined00:07
→ jon-mac joined00:07
→ fracting joined00:07
→ axisys joined00:07
→ eka_ joined00:07
→ cebor joined00:07
→ rasto joined00:07
verne.freenode.net set mode: +vv00:07
→ mostlybadfly joined00:07
→ Gamecubic joined00:07
→ jakob_ joined00:07
→ anth0ny_ joined00:07
→ SwedFTP joined00:07
→ qsuscs joined00:07
→ toydestroyer joined00:07
→ gargola joined00:07
→ diprotic joined00:07
→ Nikoli_ joined00:07
→ tiredcat_ joined00:07
→ FireArrow133 joined00:07
→ gfixler1 joined00:07
→ zizzfizzix joined00:07
→ sokoll joined00:07
→ knittl joined00:07
→ avar joined00:07
→ ribasushi joined00:07
→ EXAAAN82 joined00:07
→ hwoarang joined00:07
→ vith joined00:07
→ UukGoblin joined00:07
→ hexagoxel_ joined00:07
→ jaeckel joined00:07
→ plasticboy joined00:07
→ mutex_ joined00:07
→ ycon_ joined00:07
→ diget joined00:07
→ Vile joined00:07
→ emma joined00:07
→ edenc joined00:07
→ tinanoo1 joined00:07
→ oojacoboo joined00:07
→ Joel joined00:07
→ storrgie joined00:07
→ rwb joined00:07
→ Xack joined00:07
→ Zemeio joined00:07
→ the_cybersphinx joined00:07
→ forgot joined00:07
→ bond joined00:07
→ siprbaum joined00:07
→ qpdb_ joined00:07
→ kenansulayman joined00:07
→ TheBrayn joined00:07
→ Guest66862 joined00:07
→ sjohnson joined00:07
verne.freenode.net set mode: +v00:07
→ krabat joined00:07
→ joseph_86 joined00:07
→ d0lph1n98_ joined00:07
→ zifnab06 joined00:07
→ nopf_ joined00:07
→ acetakwas joined00:07
→ [swift] joined00:07
→ mwhooker joined00:07
→ Internet13 joined00:07
→ irqq joined00:07
→ jeffreylevesque joined00:07
→ tirengarfio_ joined00:07
→ tirengarfio joined00:07
→ nettoweb joined00:07
→ katherine joined00:07
→ void___ joined00:07
→ t0by joined00:07
→ meLon joined00:07
→ ExeciN joined00:07
→ benbergman joined00:07
→ D-Boy joined00:07
→ pipern joined00:07
→ Chunk2 joined00:07
→ bket joined00:07
→ geekthattweaks joined00:07
→ relrod joined00:07
→ hseg joined00:07
→ Werring joined00:07
→ flaguy48 joined00:07
→ wcypierre joined00:07
→ sross07 joined00:07
→ djh joined00:07
→ Ankhers joined00:07
→ hfp_work joined00:07
→ alip_ joined00:07
→ cbreak joined00:07
→ doubled112 joined00:07
→ johnnyfive joined00:07
→ v0n joined00:07
→ felher joined00:07
→ drodger joined00:07
→ SirFunk joined00:07
→ Sigma joined00:07
→ linduxed joined00:07
→ nikow_ joined00:07
→ simpleuser joined00:07
→ evie_hammond joined00:07
→ darnir joined00:07
→ soerenb joined00:07
verne.freenode.net set mode: +v00:07
→ sekrit joined00:07
→ lahwran joined00:07
→ deryni joined00:07
→ r3ply joined00:07
→ yarnfive8 joined00:07
→ loglaunch joined00:07
→ eli joined00:07
→ ktosiek joined00:07
→ aboccia joined00:07
→ sb joined00:07
→ cydrobolt joined00:07
→ JTAASQIY joined00:07
→ weylin joined00:07
→ ivan\ joined00:07
→ Esya| joined00:07
→ Cerise joined00:07
→ kloeri joined00:07
→ sunny256 joined00:07
→ callumacrae joined00:07
→ chadi_ joined00:07
→ Simonious joined00:07
sb → 7JTAASV7700:07
→ Meteorhead joined00:08
→ JanC joined00:08
→ skn joined00:08
→ Cork joined00:08
→ sybariten joined00:08
→ krzywy joined00:08
→ Yomi joined00:08
→ meiand joined00:08
→ soloone joined00:08
→ PasiFist joined00:08
→ ValicekB joined00:08
← avar left00:08
→ catsup joined00:08
→ Lyqyd joined00:08
→ Junior joined00:08
→ eXeC64 joined00:08
→ rivarun joined00:08
→ deavidsedice joined00:08
→ Gitzilla joined00:08
→ durham joined00:08
→ MaceBewley joined00:08
→ afuentes joined00:08
→ sespiros joined00:08
→ tomog999_ joined00:08
→ jost joined00:08
→ sarri joined00:08
→ Vampire0_ joined00:08
→ wave joined00:08
→ pmartnhoj joined00:08
→ Puffball joined00:08
→ same_ol_1eez joined00:08
→ kandinski joined00:08
→ u1106 joined00:08
→ m0v0nage_ joined00:08
verne.freenode.net set mode: +v00:08
← mukmuk left00:09
← vith left00:09
→ tomzx_ joined00:09
← tomzx_ left00:09
→ tokik_ joined00:09
→ avar joined00:09
← tokik_ left00:09
← sokoll left00:10
→ sokoll joined00:10
← oojacoboo left00:10
← Nikhil_D1 left00:10
→ Nikhil_D1 joined00:10
→ mukmuk joined00:11
→ madebymarkca joined00:11
→ wizonesolutions joined00:11
→ danemacm1 joined00:11
→ strayPuppy joined00:11
→ F1AASOXA joined00:11
→ k_j joined00:11
→ molten_tar joined00:11
→ PinealGlandOptic joined00:11
→ WakiMiko joined00:11
→ ashnur joined00:11
→ kapowaz joined00:11
→ pratikmallya joined00:11
→ t0w3r joined00:11
→ diegoviola joined00:11
→ howitdo joined00:11
→ sdothum joined00:11
→ puchu joined00:11
→ roo joined00:11
→ nydel07 joined00:11
→ akiva joined00:11
→ rodrigograca31 joined00:11
→ ekleog joined00:11
→ sea-gull joined00:11
→ tobyx joined00:11
→ VoidFox joined00:11
→ eggoez joined00:11
→ gavlee joined00:11
→ jokajak joined00:11
→ robbyoconnor joined00:11
→ Lycerion_ joined00:11
→ martinklepsch joined00:11
→ Seveas joined00:11
→ aarobc joined00:11
→ nacsurte joined00:11
→ PerlJam joined00:11
→ Karunamon|2 joined00:11
→ Neic0 joined00:11
→ deepy joined00:11
→ go1111111 joined00:11
→ ohcibi joined00:11
→ moei joined00:11
→ ddr2 joined00:11
→ tmokros joined00:11
→ martin_g joined00:11
→ tom39291_ joined00:11
→ pizzaops joined00:11
→ lebster joined00:11
verne.freenode.net set mode: +ov00:11
→ edenist joined00:11
→ AustinMatherne joined00:11
→ Novitsh joined00:11
→ Ph_ joined00:11
→ nitrix joined00:11
→ Bombe joined00:11
→ antispaceman joined00:11
→ angelsl joined00:11
→ hplar joined00:11
→ MatthewWilkes joined00:11
→ abra0 joined00:11
→ xnrand joined00:11
→ nephyrin joined00:11
→ Guest35651 joined00:11
→ maqr_ joined00:11
→ damwdan joined00:11
→ RTG` joined00:11
→ JonasF joined00:11
→ Trivium joined00:11
→ shymega joined00:11
→ Ragnor joined00:11
→ skelterjohn joined00:11
→ Awesomecase joined00:11
→ leprechau joined00:11
→ bttf joined00:11
→ guardian joined00:11
→ veverak joined00:11
→ monster_ joined00:11
→ fk joined00:11
→ Stummi joined00:11
→ rishi joined00:11
→ tuor joined00:11
→ mithro joined00:11
→ boxrick1 joined00:11
→ sublimate joined00:11
→ [diecast] joined00:11
→ joshc joined00:11
→ DistantStar joined00:11
→ pflanze joined00:11
→ Ziber joined00:11
→ ciaranm joined00:11
→ martinbjeldbak joined00:11
→ awt joined00:11
→ EvanDotPro joined00:11
→ rdema_ joined00:11
→ deltab joined00:11
→ Renter joined00:11
→ eagles0513875 joined00:11
→ Liam` joined00:11
→ ORiON-- joined00:11
→ Blkt joined00:11
→ Hobbyboy joined00:11
→ artgoeshere joined00:11
→ doppo joined00:11
→ mementomori joined00:11
→ interru joined00:11
→ abec0 joined00:11
→ Nickeeh joined00:11
→ duckson joined00:11
→ tapout joined00:11
→ heftig joined00:11
→ bauruine joined00:11
→ nemesit|znc joined00:11
→ GameGamer43 joined00:11
→ Nothing4You joined00:11
→ manuel____ joined00:11
← emma left00:12
→ tomzx_ joined00:12
← tomzx_ left00:12
→ emma joined00:12
→ qsusxs joined00:13
→ TDJACR joined00:13
→ philophil_ joined00:13
→ eikood joined00:13
→ murr4y joined00:13
→ msonntag joined00:13
→ d1b_ joined00:13
→ axelunicorn joined00:13
→ up_the_irons joined00:13
→ cagedwisdom joined00:13
→ howdoi joined00:13
→ epic joined00:13
→ opdavies joined00:13
→ wenzowski joined00:13
→ daleharvey joined00:13
→ CussBot joined00:13
→ maxorator joined00:13
→ synchronous joined00:13
→ leTali joined00:13
→ pks joined00:13
→ Atrumx joined00:13
→ scorphus joined00:13
→ Muzer joined00:13
→ CustosLim3n joined00:13
→ perrier joined00:13
→ j416 joined00:13
→ ScottE joined00:13
→ murph joined00:13
→ killerpty joined00:13
→ elmcrest joined00:13
→ pokergod joined00:13
→ cspotcode joined00:13
→ raven-au joined00:13
→ rfv joined00:13
→ adambrenecki joined00:13
→ Impaloo joined00:13
→ Asenar joined00:13
→ ColdKeyboard joined00:13
→ ashka joined00:13
→ smw joined00:13
→ aseidl joined00:13
→ errr joined00:13
→ preyalone joined00:13
→ Spinkzeit joined00:13
→ gsingh93 joined00:13
→ n-st joined00:13
→ davidstrauss_ joined00:13
→ GodEater` joined00:13
→ tcurdt joined00:13
→ bashcoder joined00:13
→ Boniche joined00:13
→ Silex joined00:13
→ skasturi joined00:13
→ Outsider__ joined00:13
→ Didac joined00:13
→ HedgeMage joined00:13
→ jgornick joined00:13
→ sfr^ joined00:13
→ asdofindia joined00:13
→ spriz joined00:13
→ lungaro joined00:13
→ DSH105 joined00:13
→ Rubin joined00:13
→ ToxicFrog joined00:13
→ rmrrn joined00:13
→ linuxmodder joined00:13
→ shauna joined00:13
→ superteece joined00:13
→ ujjain joined00:13
→ Chnkr joined00:13
→ MacGyver joined00:13
→ Dandelock joined00:13
→ kalz joined00:13
← tomboy64 left00:14
← UukGoblin left00:14
→ mezod_ joined00:15
→ ToBeFree joined00:15
← cdg left00:15
← t0w3r left00:15
→ unreal joined00:15
→ uber joined00:15
→ SimonNa joined00:15
→ sburg joined00:15
→ Arsonide joined00:15
→ babilen_ joined00:15
→ marvinpi1to joined00:15
→ bambams_ joined00:15
→ JJM joined00:15
→ mage_ joined00:15
→ pvac joined00:15
→ synthmeat joined00:15
→ jonmasters joined00:15
→ luto joined00:15
→ darkbasic_ joined00:15
→ bsanford joined00:15
→ tonyj joined00:15
→ huhlig joined00:15
→ upene joined00:15
→ todd_dsm_wk joined00:15
→ baako joined00:15
→ hyperair joined00:15
→ Celelibi joined00:15
→ CalimeroTeknik joined00:15
→ jast joined00:15
→ BBBThunda joined00:15
→ eMBee joined00:15
→ Sp4rKy joined00:15
→ chamunks joined00:15
→ gniourf joined00:15
→ ItSANgo joined00:15
→ kaictl joined00:15
→ sonOfRa joined00:15
→ vok` joined00:15
→ mrkat joined00:15
→ penna joined00:15
→ michael_mbp joined00:15
→ nemix_ joined00:15
→ akkad joined00:15
→ sdboyer joined00:15
→ Gege joined00:15
→ pfg joined00:15
→ bbhoss joined00:15
→ kwmiebach joined00:15
→ tg joined00:15
→ tobias joined00:15
→ atrus joined00:15
→ milki joined00:15
→ xrogaan joined00:15
→ forrestv joined00:15
→ BinGOs joined00:15
→ ionelmc joined00:15
→ rudi_s_ joined00:15
→ invultri_ joined00:15
→ cxreg2 joined00:15
→ hiironymus joined00:15
→ troyt_ joined00:15
→ grawity joined00:15
→ blr joined00:15
→ comps joined00:15
→ drawkula joined00:15
→ roflin joined00:15
→ DTekk joined00:15
→ tomzx joined00:15
→ drupald joined00:15
→ nuck joined00:15
→ LoganG joined00:15
→ kegster joined00:15
→ henriquev joined00:15
→ mehdi joined00:15
→ clone1018 joined00:15
→ MLM joined00:15
→ yena joined00:15
→ pcarrier joined00:15
→ quackgyver joined00:15
→ cpt-oblivious joined00:15
→ phroa joined00:15
→ mattp__ joined00:15
→ timmu joined00:15
→ schlumpi joined00:15
→ derpvid_ joined00:15
→ ubuntu__ joined00:15
→ barq joined00:15
→ danmackay joined00:15
→ RickyB98 joined00:15
→ dr_lepper joined00:15
→ BtbN joined00:15
→ Olipro joined00:15
→ BlessJah joined00:15
→ bipolar joined00:15
→ zapb_ joined00:15
→ beagleGuy_ joined00:15
→ uidzer0 joined00:15
→ dewdrop joined00:15
→ saidelike joined00:15
→ Stravy joined00:15
→ EspadaV8 joined00:15
→ greymalkin joined00:15
→ ggherdov joined00:15
→ shennyg joined00:15
→ vertreko joined00:15
→ creppe joined00:15
→ hendry joined00:15
→ isomorphismes joined00:15
→ DonVitoCorleone joined00:15
→ nevyn joined00:15
→ b_jonas joined00:15
→ Ratler joined00:15
→ wwalker joined00:15
→ taru joined00:15
→ viktorgodard joined00:15
→ legumbre joined00:15
→ fold1 joined00:15
→ Guest987 joined00:15
→ maxb joined00:15
→ aspiers joined00:15
→ Arokh joined00:15
→ Cathy joined00:15
→ pasky joined00:15
← tomzx left00:15
→ mgsloan joined00:15
→ WizJin joined00:16
→ kriskropd_ joined00:16
→ tm512 joined00:16
→ stealthii joined00:16
→ torpig joined00:16
→ GGMethos joined00:16
→ VirtuallySuzen joined00:16
→ mroth joined00:16
→ bendangelo joined00:16
→ madduck joined00:16
→ tristanp joined00:16
→ cwillu_at_work joined00:16
→ terminal_echo joined00:16
→ jas4711 joined00:16
→ Tee_Pee joined00:16
→ brewmaster joined00:16
→ jason237 joined00:16
→ FabTG joined00:16
→ seagoj joined00:16
→ data joined00:16
→ FIQ joined00:16
→ hfp joined00:16
→ neunon joined00:16
→ gv joined00:16
→ grammar_nazi joined00:16
→ Caelum joined00:16
→ totesmuhgoats joined00:16
→ Kulrak joined00:16
→ noteness joined00:16
→ imdsm joined00:16
→ Thra11 joined00:16
→ ScottG489 joined00:16
→ stfn joined00:16
→ lacrosse joined00:16
→ guide_ joined00:16
→ blarson_ joined00:16
→ neurodam1ge joined00:16
→ skoopty joined00:16
→ crater2160 joined00:16
→ frdmn joined00:16
→ Keridos joined00:16
→ Dewin joined00:16
→ nothingmuch joined00:16
→ da5id joined00:16
→ jonha joined00:16
→ akitada joined00:16
→ yrashk joined00:16
verne.freenode.net set mode: +vv00:16
→ batrick joined00:16
→ jackburton joined00:16
→ DolphinDream joined00:16
→ Trieste joined00:16
→ crash\ joined00:16
→ oremanj joined00:16
→ jokester joined00:16
→ nutron joined00:16
→ rcn joined00:16
→ iamtakingiteasy joined00:16
→ Mogget joined00:16
→ HarryHallman joined00:16
→ BooK joined00:16
→ Diittosword joined00:16
→ kaendfinger joined00:16
→ PaulePanter joined00:16
→ varesa joined00:16
→ spb joined00:16
→ scoobertron joined00:16
→ zz_ag4ve joined00:16
→ shachaf joined00:16
→ andres joined00:16
→ avtobiff joined00:16
→ Peng joined00:16
→ dangranos joined00:16
→ timewalker joined00:16
→ UukGoblin joined00:16
→ c74d joined00:16
← mukmuk left00:16
← kenansulayman left00:16
→ EvilJStoker joined00:16
→ blueyed joined00:16
→ cworth joined00:16
→ aretecode joined00:16
→ tazle_ joined00:16
→ Fiouz joined00:16
→ vals_ joined00:16
→ zac_g joined00:16
→ HicksD joined00:16
→ de-vri-es joined00:16
→ mrkake joined00:16
→ Phoenixz joined00:16
→ ses1984 joined00:16
→ joki joined00:16
→ leeN joined00:16
→ StuartMI joined00:16
→ rideh joined00:16
→ harish_ joined00:16
→ Sleepy63 joined00:16
→ h12o joined00:16
→ NeverDie joined00:16
→ tyreld joined00:16
→ Nevik joined00:16
→ ffualo joined00:16
→ dharrigan joined00:16
→ Dumle29 joined00:16
→ nowhereman joined00:16
→ Steve_Jobs joined00:16
→ graChe28 joined00:16
→ apeiros joined00:16
→ cloudcell_ joined00:16
→ Dazzyp joined00:16
→ mp3 joined00:16
→ andyr joined00:16
→ robinsmidsrod joined00:16
→ rex_lee_ joined00:16
→ Diabolik joined00:16
→ teadrop_ joined00:16
→ worstadmin joined00:16
→ dlitz_ joined00:16
→ Pieter_ joined00:16
→ SirCmpwn joined00:16
→ jasom joined00:16
→ Mathiasdm joined00:16
→ wcpan joined00:16
→ apiarian joined00:16
→ crane joined00:16
→ abyss43 joined00:16
→ twisted` joined00:16
→ moritz_s joined00:16
→ kirjs_________ joined00:16
→ trig-ger joined00:16
→ neersighted joined00:16
→ ghoti joined00:16
→ rockfruit joined00:16
→ Slush- joined00:16
→ qpok joined00:16
→ ntio joined00:16
→ themill joined00:16
→ nioncode joined00:16
→ AlHafoudh joined00:16
→ Zarthus joined00:16
→ webmeister joined00:16
→ matthiaskrgr joined00:16
→ vmiklos joined00:16
→ iokill joined00:16
→ Joost` joined00:16
→ kisonecat joined00:16
→ daurnimator joined00:16
→ addshore joined00:16
→ WillMoogle joined00:16
→ venmx joined00:16
→ hyperdrive joined00:16
→ Learath2 joined00:16
→ Phtes joined00:16
→ chigang joined00:16
→ z4zz joined00:16
→ niax joined00:16
← dkog left00:16
→ kenansulayman joined00:16
→ toothrot joined00:16
→ angular_mike_ joined00:17
→ tokik_ joined00:17
→ tomboy64 joined00:17
← tokik_ left00:17
← krawchyk left00:17
→ ketas joined00:17
→ Orbitrix joined00:17
→ c74d3a4e joined00:17
→ Vgr joined00:17
→ markovh joined00:17
→ mac_ified joined00:17
→ wgrant joined00:17
→ jrnieder joined00:17
→ woodruffw joined00:17
→ ngladitz joined00:17
→ Deltanic joined00:17
→ MeltedLux joined00:17
→ ToBeCloud joined00:17
→ ahr3n_ joined00:17
→ Noldorin joined00:17
→ ShapeShifter499 joined00:17
→ Sasazuka joined00:17
→ dzho joined00:17
→ Mixologic_ joined00:17
→ rom1504 joined00:17
→ cast joined00:17
→ hahuang65 joined00:17
→ mkoskar joined00:17
→ surfdue joined00:17
→ Lunatrius joined00:17
→ own3dz joined00:17
→ Milos joined00:17
→ Corosus joined00:17
→ odigity joined00:17
→ Nitrus^ joined00:17
→ Fissure1 joined00:17
→ irc-5225225 joined00:17
→ gusnan joined00:17
→ MatToufoutu joined00:17
→ mischief joined00:17
→ dmarr joined00:17
→ marienz joined00:17
→ Lovich joined00:17
→ versa joined00:17
→ i_ron joined00:17
→ colona joined00:17
→ absence joined00:17
→ devhost joined00:17
→ hellschreiber joined00:17
→ kjnilsson joined00:17
→ Juri_Agarin joined00:17
→ UmbraMalison joined00:17
verne.freenode.net set mode: +v00:17
→ chris2 joined00:17
→ sontek joined00:17
→ SegFaultAX joined00:17
→ jbondhus_ joined00:17
→ Chaser joined00:17
→ SJS joined00:17
→ roknir joined00:17
→ sQVe joined00:17
→ crisumi_ joined00:17
→ boblee joined00:17
→ mquin joined00:17
→ AeroNotix joined00:17
→ ada joined00:17
→ ziemniako joined00:17
→ GarethAdams joined00:17
→ mrballcb joined00:17
→ YoungFrog joined00:17
→ OliverJAsh joined00:17
→ quadz joined00:17
→ mjbrender joined00:17
→ iamdevnul joined00:17
→ faheem__ joined00:17
→ ELLIOTTCABLE joined00:17
→ oxsyn joined00:17
→ du joined00:17
→ RichardJ joined00:17
→ sparr joined00:17
→ Bucciarati joined00:17
→ OMGOMG joined00:17
→ MissionCritical joined00:17
→ terkelg_ joined00:17
→ souther joined00:17
→ Ram-Z joined00:17
→ SupaHam joined00:17
→ likewhoa joined00:17
→ musca joined00:17
→ ReScO joined00:17
→ Khisanth joined00:17
→ Timvde joined00:17
→ dx joined00:17
→ ChrisWarrick joined00:17
→ myme joined00:17
→ rpd joined00:17
→ Pavr joined00:17
→ mischat joined00:17
→ ruskie joined00:17
→ ilmari joined00:17
→ haaja joined00:17
→ dsop joined00:17
→ hasB4K joined00:17
→ sLite joined00:17
→ ThiefMaster joined00:17
→ AlexanderS joined00:17
→ manitu joined00:17
→ mukmuk joined00:17
← MissionCritical left00:17
→ fstd joined00:17
→ ec\ joined00:17
→ BombStrike joined00:17
→ dostoyevsky joined00:17
→ Orphis joined00:17
→ CentaurWarchief joined00:17
→ Chipzz joined00:17
→ guipop joined00:17
→ tokik joined00:17
→ cYmen___ joined00:17
→ ethanol joined00:17
→ ohm`_ joined00:17
→ vikas027 joined00:17
→ jwest joined00:17
→ cina joined00:17
→ sparetire_ joined00:17
→ SWAT joined00:17
→ FilipNortic joined00:17
→ ianbrandt joined00:17
→ Joseph__Silber joined00:17
→ ssarah_ joined00:17
→ jedix joined00:17
→ Korsi joined00:17
→ bahar_ joined00:17
→ vigilvindex joined00:17
→ argoneus joined00:17
→ foul_owl joined00:17
→ steven joined00:17
→ ejnahc joined00:17
→ tomek joined00:17
→ systmkor joined00:17
→ Peuc joined00:17
→ mattcen joined00:17
→ jab416171 joined00:17
→ drbean joined00:17
→ GingerGeek joined00:17
→ holodoc joined00:17
→ narendraj9 joined00:17
→ BytesAndCoffee joined00:17
→ nurupo joined00:17
→ salamanderrake joined00:17
→ cluelesscoder joined00:17
→ anuvrat joined00:17
→ lamont joined00:17
→ Esya joined00:17
→ hide_ joined00:17
→ frobnic joined00:17
→ AKPWD joined00:17
→ mika joined00:17
→ exceion_ joined00:17
→ rxc joined00:17
→ Goles joined00:17
→ ahf joined00:17
→ Soliton joined00:17
→ ska-fan joined00:17
→ ctag joined00:17
→ Kuukunen joined00:17
→ BeerSerc joined00:17
→ same_ol_geez joined00:17
← pratikmallya left00:17
→ tokik_ joined00:18
← c74d3a4e left00:18
← avar left00:18
→ Ceber joined00:18
← own3dz left00:18
← DSH105 left00:18
← vikas027 left00:18
← tokik left00:18
→ avar joined00:18
→ Zoddo joined00:19
→ a3Dman joined00:19
→ fscala joined00:19
→ Mekkis joined00:19
→ biertie joined00:19
→ erichmenge joined00:19
→ likecolacola joined00:19
→ tjbp joined00:19
→ tsunamie joined00:19
→ tomzx joined00:19
← juvenal left00:19
→ XDS2010 joined00:19
→ geomyidae_ joined00:19
→ ajpiano joined00:19
→ Klumben joined00:19
→ zivester_ joined00:19
→ ome joined00:19
→ DANtheBE- joined00:19
→ converge joined00:19
→ chimeracoder joined00:19
→ ironGiant joined00:19
→ blackjid joined00:19
→ bandroidx_ joined00:19
→ frogonwheels_ joined00:19
→ tfnico joined00:19
→ otter768 joined00:19
→ madewokherd joined00:19
→ jhermann joined00:19
→ hackel joined00:19
→ mw joined00:19
→ prosodyVC joined00:19
→ fedexo joined00:19
→ CheckDavid joined00:19
→ Rikairchy joined00:19
→ lmat joined00:19
→ DuncanT joined00:19
→ averell joined00:19
→ CEnnis91 joined00:19
→ t-mart__ joined00:19
→ joako joined00:19
→ multi_io joined00:19
→ Rhonda joined00:19
→ guampa joined00:19
→ Happzz joined00:19
→ Archyme_ joined00:19
→ workistoofun joined00:19
→ Tesseract85 joined00:19
→ lykinsbd joined00:19
→ ldlework joined00:19
→ aps joined00:19
→ blahdodo joined00:19
→ phantomcircuit joined00:19
→ ojacobson joined00:19
→ Tuna-Fish joined00:19
→ scarcry joined00:19
→ wagle joined00:19
→ Diitto joined00:19
→ alexsystemf joined00:19
→ cstrahan joined00:19
→ justanotheruser joined00:19
→ niko joined00:19
→ Mocramis joined00:19
→ damccull joined00:19
→ evanc joined00:19
→ dsteplight___ joined00:19
→ Aaeriele joined00:19
→ linagee joined00:19
→ Bilge joined00:19
→ naitsirhc joined00:19
→ Takumo joined00:19
→ mariorz joined00:19
→ daxroc joined00:19
→ esc_ joined00:19
→ Deez_Nuts joined00:19
→ codeflavour joined00:19
→ Andre_work joined00:19
→ mitzip_ joined00:19
→ andschwa_ joined00:19
→ drager joined00:19
→ markelite joined00:19
→ [cust] joined00:19
→ SIGKILLer joined00:19
→ yac joined00:19
→ JrCs joined00:19
→ sarrri joined00:19
→ Guest56459 joined00:19
→ ixian joined00:19
→ apipkin joined00:19
→ cschneid joined00:19
→ oomi joined00:19
→ sjLonghorn joined00:19
→ iooner joined00:19
→ devster31 joined00:19
→ tmz joined00:19
→ technivore joined00:19
→ rancyd joined00:19
→ arand joined00:19
→ CrazyBonz joined00:19
→ berndj joined00:19
→ jpnurmi joined00:19
→ _rgn joined00:19
→ oldrobot joined00:19
→ Virox joined00:19
→ vishal joined00:19
→ Kobaz joined00:19
verne.freenode.net set mode: +v00:19
→ ArmOrAttAk joined00:19
→ HyP3r joined00:19
→ preilly joined00:19
→ Eugene joined00:19
→ zequence joined00:19
→ _ikke_ joined00:19
→ quizzi joined00:19
→ Grum joined00:19
→ agile_prg joined00:19
→ bjornars joined00:19
→ dwmw2 joined00:19
→ PEMapModder joined00:19
→ tobiasvl joined00:19
→ Jeroen joined00:19
→ ariver joined00:19
→ jhass joined00:19
→ Hedgework joined00:19
→ sadmac joined00:19
→ nedbat joined00:19
→ gitinfo joined00:19
→ someplace joined00:19
→ VampiricPadraig_ joined00:19
→ clone1018_ joined00:19
→ Forkk_ joined00:19
→ JelmerD joined00:19
→ ozymandias_ joined00:19
→ c0ded joined00:19
→ mmattice joined00:19
→ wanders joined00:19
→ kdlv joined00:19
→ CareBear\ joined00:19
→ hegge joined00:19
→ salparadise joined00:19
→ markmarkmark joined00:19
→ BennyPlayboy joined00:19
→ Jupelius joined00:19
→ chernjie joined00:19
verne.freenode.net set mode: +vvo00:19
→ tomzx_ joined00:20
→ DSH105 joined00:20
← tomzx_ left00:20
← DANtheBE- left00:20
→ DANtheBEASTman joined00:20
→ tomzx_ joined00:20
← tomzx_ left00:20
→ WABFSU3 joined00:20
→ beckyconning_ joined00:20
← stealthii left00:21
→ stealthii joined00:21
← WizJin left00:21
→ WizJin joined00:21
← angular_mike_ left00:21
→ angular_mike_ joined00:21
→ c74d3a4e joined00:21
→ malukenho joined00:21
← wizonesolutions left00:21
→ wizonesolutions joined00:21
→ jonadab joined00:21
← ome left00:21
→ ome joined00:21
← geomyidae_ left00:21
→ geomyidae_ joined00:21
← XDS2010 left00:21
→ XDS2010 joined00:21
← mukmuk left00:22
→ boombatower joined00:22
← c74d3a4e left00:23
→ streeves joined00:23
← Ceber left00:23
→ kanzure joined00:23
← tm512 left00:23
← beckyconning_ left00:23
→ beckyconning_ joined00:23
→ sgambino joined00:23
→ Mission-Critical joined00:24
gitinfo set mode: +v00:24
gitinfo set mode: +v00:24
streeves hi all: I'm a little stumped, trying to access a repo with Git for Windows client, & don't know how to use my private key file00:24
I think I just need to put it in a folder but I'm not sure which one00:25
← avar left00:25
→ tm512 joined00:25
→ avar joined00:26
Lycerion_ → Lycerion00:27
← kanzure left00:27
→ mukmuk joined00:29
← Milos_ left00:29
Pieplay Git for windows is a really bad program00:30
← Xe left00:30
→ Xe joined00:30
← uber left00:30
→ uber joined00:30
streeves Pieplay: what do you suggest instead?00:30
← toothrot left00:30
→ toothrot joined00:30
← malukenho left00:30
← jonadab left00:30
← sgambino left00:30
Pieplay Sourcetree, it's free but you do have to register after a while00:31
← TDJACR left00:31
→ TDJACR joined00:31
← markovh left00:31
→ markovh joined00:31
← ToBeFree left00:31
→ ToBeFree joined00:31
→ MattMaker joined00:31
→ felixn joined00:31
→ glebihan_ joined00:31
hexagoxel_ → hexagoxel00:31
→ oojacoboo joined00:31
→ heinrich5991 joined00:31
→ armyriad joined00:31
→ lvh joined00:31
→ mission712 joined00:31
→ malukenho joined00:31
→ PaulCapestany joined00:31
kenansulayman → Guest7068500:31
EvilJStoker → Guest9325800:31
strayPuppy → Guest6941900:31
madebymarkca → Guest3088200:31
c74d → Guest5875100:31
zizzfizzix → Guest2302100:31
wgrant → Guest2760100:31
fstd → Guest249600:31
unreal → Guest4570600:31
→ thinkxl joined00:31
→ marlinc joined00:31
→ Gravitron joined00:31
→ r3g3x joined00:31
→ ploopkazoo joined00:32
← Vgr left00:32
→ Vgr joined00:32
→ Brando753 joined00:32
← Guest93258 left00:32
→ Guest93258 joined00:32
← Vgr left00:32
← tomzx left00:32
→ Shentino joined00:32
Guest93258 → EvilJStoker00:32
→ Vgr joined00:32
← Vgr left00:32
→ Vgr joined00:32
streeves pieplay: thank you!00:33
Pieplay I'm sorry, you where talking about github desktop before right?00:33
prosodyVC → prosodyvVC00:33
← Guest69419 left00:33
streeves uhm, I'm not sure, honestly, I downloaded Git for Windows from git-scm.com a while ago00:34
→ tomzx joined00:35
Pieplay oh, the command line is pretty good yea00:35
→ eliasp joined00:35
← qsusxs left00:35
→ strayPup1 joined00:35
strayPup1 → StrayPuppy00:35
← avar left00:36
← Guest30882 left00:36
← cbonobo__ left00:36
→ avar joined00:36
← avar left00:36
→ avar joined00:36
← msonntag left00:36
← mp3 left00:36
→ daito joined00:37
→ kanzure joined00:37
→ madebymarkca joined00:38
← streeves left00:38
→ msonntag joined00:38
→ jonadab joined00:39
puff Late last night, I was confused by the results from git diff, which seemed to show that the edits I'd made to this file, foo.py were already in git. So I made a backup copy of the file, named it foo2.py, and did a git reset on foo.py. Migrated some changes over to foo.py, added/commited, I'm fine.00:39
→ zumba_addict joined00:39
→ mellernoia joined00:39
← otter768 left00:39
puff This morning I did "rm foo2.py". Now "git status" says "Changes not staged for commit:" deleted: foo2.py00:39
And git diff shows the entire missing contents of foo2.py as a diff.00:40
→ otter768 joined00:40
→ cemez joined00:41
jonadab puff: When you committed, did you commit foo2.py?00:41
→ vith joined00:41
puff jonadab: I don't recall doing so.00:42
← avar left00:42
← MaceBewley left00:42
← Pieplay left00:42
← daito left00:42
puff ah... now I see it in my history. Guess I must have slipped.00:42
→ avar joined00:42
← avar left00:42
→ avar joined00:42
→ nyuszika7h_ joined00:43
puff Okay, I'mn to that fussed about it, I guess I just do a "git add foo2.py" and "git commit -m 'removing accidentally added file'"?00:43
Guess I was more tired than I thought, last night :-).00:43
→ ___thomasreggi__ joined00:43
← Milos left00:44
→ Milos joined00:44
→ mp3 joined00:44
→ MaceBewley joined00:44
→ weaksauce joined00:46
tokik_ → tokik00:47
→ moird joined00:47
jonadab Ok, git hooks question: is there a way to use a hook to change how merges happen, in order to prevent a certainly class of highly predicatable and meaingless conflict?00:49
*certain00:49
→ snthsnth joined00:49
jonadab The situation is, ancient open-source license that is literally older than GPL1 has a clause requiring a comment near the top of every file stating who last edited and when.00:49
We have a git hook that auto-updates the comment on every commit.00:49
But the last-edited comments cause merge conflicts every time two branches touched the same file for any reason.00:50
← converge left00:50
← leeN left00:50
jonadab I can easily write a Perl script that, given two versions of a file, can figure out which one has the more recent last-edited comment and make them match.00:50
But how do I hook that up to automagically happen every time I do a git merge?00:51
← nicechap left00:51
← jmpp left00:52
← marvinpi1to left00:52
← nettoweb left00:53
← ToBeCloud left00:56
← madebymarkca left00:56
Eugene jonadab - man git-mergetool00:56
gitinfo jonadab: the git-mergetool manpage is available at http://jk.gs/git-mergetool.html00:56
← ___thomasreggi__ left00:56
Eugene That's a good place to start. You'll be inventing your own mergetool, basically00:57
← rodrigograca31 left00:57
jonadab I see.00:57
This says it "typically" runs after a merge.00:57
Does that mean I could have an atypical setup where it runs before/during?00:57
→ mizu_no_oto joined00:57
← Gravitron left00:59
← sburg left00:59
← fedexo left00:59
→ pwnz0r joined00:59
jonadab Logically, this last-edited comment should not ever cause a merge conflict, because taking the most recent one should be _part_ of the merge process.01:00
→ kermit joined01:00
jonadab Ideally, I mean.01:00
→ krawchyk joined01:01
→ qsusxs joined01:01
jonadab Heck, I think we would technically be in compliance if merging just automatically updated the comment to the current author and date for every file that changes.01:01
→ madebymarkca joined01:01
jonadab Because merging a change counts as editing. When the license was written, they used a text editor to do it.01:01
puchu 1;3~/exit01:02
→ dickdaley joined01:02
← puchu left01:02
→ faux___ joined01:02
← dickdaley left01:02
← Milos left01:02
jonadab Or, at least, a coherent argument could be made for that.01:02
→ Milos joined01:02
→ nicechap joined01:04
← boxrick1 left01:04
← Milos left01:04
→ Milos joined01:04
← ELLIOTTCABLE left01:04
← Outsider__ left01:04
← lacrosse left01:04
→ Gravitron joined01:05
← sublimate left01:05
← evanc left01:05
← polyzen left01:05
← preyalone left01:05
← mariorz left01:06
← pwnz0r left01:06
← |ifei5good left01:06
← faux___ left01:06
→ polyzen joined01:07
← CheckDavid left01:07
← krawchyk left01:07
← harish_ left01:09
← MattMaker left01:09
jonadab Heck, if we want to get exceptionally technical, the act of editing the comment is in itself a form of editing. So we can update the comment any time we want. And there's no reason _not_ to do so, because we have git blame if we actually care about the file's edit history for real.01:11
→ pwnz0r joined01:12
→ daito joined01:13
→ ahr3n joined01:14
← pwnz0r left01:15
← mizu_no_oto left01:15
← maletor|work left01:16
→ keroro520 joined01:16
← eka_ left01:17
← ahr3n_ left01:18
→ faux___ joined01:18
→ pwnz0r joined01:18
← Sasazuka left01:19
← akiva left01:22
→ jmpp joined01:23
→ modocache joined01:24
← molten_tar left01:24
→ sburg joined01:25
→ rchavik joined01:26
→ devoldmx joined01:27
← pks left01:28
← modocache left01:28
→ settermjd joined01:28
← Guest27601 left01:30
→ pks joined01:31
→ krawchyk joined01:32
→ nettoweb joined01:34
→ Limes joined01:34
← zumba_addict left01:36
StrayPuppy → sPu01:37
sPu → strayPuppy01:37
← albel727 left01:38
→ mizu_no_oto joined01:39
← jmpp left01:41
← bollullera left01:43
← jackburton left01:45
← tristanp left01:46
→ tristanp joined01:46
→ jmpp joined01:47
← msonntag left01:48
bambams_ → bambams01:48
→ skcin7 joined01:48
→ sespiros_ joined01:48
← skcin7 left01:48
← sespiros left01:49
→ msonntag joined01:49
← Corosus left01:49
→ Corosus joined01:50
← ItSANgo left01:50
→ ItSANgo joined01:51
→ Vampire0 joined01:51
→ dsdeiz_ joined01:51
puff jonadab: Dangit... so I did "git add foo2.py" (the file which is not there anymore) and "git commit -m 'removing foo2.py'"01:52
and it's still showing up in git status and git diff.01:52
Do I need to make a dummy foo2.py and "git rm foo2.py"?01:53
→ boxrick1 joined01:53
→ lacrosse joined01:53
← dsdeiz left01:53
jonadab How about git reset HEAD foo2.py and git checkout foo2.py ?01:54
← settermjd left01:54
→ sublimate joined01:54
← Vampire0_ left01:54
puff Too late, did "touch foo2.py; git add foo2.py; git commit -m "removing" foo2.py; git rm foo2.py ; git commit -m "removing" foo2.py.01:55
that seems to have solved it.01:55
→ Outsider__ joined01:56
→ fedexo joined01:57
→ ELLIOTTCABLE joined01:58
→ pantsman- joined02:00
← zivester_ left02:00
← gfixler1 left02:01
← acetakwas left02:01
strayPuppy → submissivePuppy02:01
→ preyalone joined02:01
← devoldmx left02:01
→ juvenal joined02:01
submissivePuppy → strayPuppy02:02
← pwnz0r left02:02
← mellernoia left02:03
→ arup_r joined02:03
→ m0ltar joined02:04
→ jackburton joined02:05
→ mariorz joined02:06
→ evanc joined02:06
→ skirk joined02:08
→ joufflu joined02:09
← mezod_ left02:10
← StuartMI left02:11
← sespiros_ left02:11
→ zivester_ joined02:13
→ acetakwas joined02:13
← qsusxs left02:14
→ Goplat joined02:14
→ toogy joined02:15
→ Technocrat7 joined02:15
→ durham_ joined02:15
← darkbasic_ left02:15
→ Zamyatin joined02:15
→ darkbasic joined02:16
← durham left02:18
← otter768 left02:18
→ fcoelho joined02:19
→ otter768 joined02:19
← durham_ left02:19
→ alanwill joined02:20
→ harish_ joined02:20
← Technocrat7 left02:21
← joufflu left02:21
← thiago left02:23
← likecolacola left02:24
→ takahan_ joined02:24
← mizu_no_oto left02:25
→ MattMaker joined02:26
← takahan_ left02:26
← MattMaker left02:27
→ takahan_ joined02:27
← ShapeShifter499 left02:27
← takahan_ left02:27
→ blackpajamas joined02:28
← ada left02:28
← bitkiller left02:28
← diegoviola left02:28
→ MattMaker joined02:29
← vok` left02:29
← heroux left02:30
← Limes left02:31
→ heroux joined02:31
→ ada joined02:32
→ jzk joined02:32
← MattMaker left02:32
← jzk left02:32
→ joufflu joined02:32
← krawchyk left02:32
→ Limes joined02:34
→ MattMaker joined02:35
→ penna_ joined02:36
← beckyconning_ left02:38
→ jzk joined02:38
← sburg left02:40
← m0ltar left02:40
← MattMaker left02:40
← penna left02:40
← felix891 left02:40
← MaceBewley left02:41
← sparetire_ left02:41
← acetakwas left02:43
← Arsonide left02:43
→ Arsonide joined02:44
← toothrot left02:44
→ reim joined02:45
← reim left02:46
→ reim joined02:47
← axelunicorn left02:49
→ arescorpio joined02:52
← Noldorin left02:53
← EvilJStoker left02:53
← nettoweb left02:54
→ vok` joined02:55
← ItSANgo left02:55
→ EvilJStoker joined02:55
→ zacts joined02:56
← zacts left02:56
← polyzen left02:57
→ polyzen joined02:57
→ bmilesp joined03:00
→ diegoviola joined03:01
→ jalopezsilva joined03:02
→ qsusxs joined03:02
← msonntag left03:03
→ thiago joined03:07
→ gfixler joined03:07
→ CKyle joined03:08
← geomyidae_ left03:08
→ felix891 joined03:10
→ MattMaker joined03:12
→ ShapeShifter499 joined03:13
→ ne1 joined03:13
gitinfo set mode: +v03:13
ne1 anyone know to do a pull request?03:14
i'm getting permission denied when i push to my own branch03:14
← felix891 left03:15
→ MattMake_ joined03:16
← tristanp left03:16
← MattMaker left03:17
← Zamyatin left03:19
← armyriad left03:19
← bket left03:20
→ MattMaker joined03:20
← MattMaker left03:20
← MattMake_ left03:21
→ MattMaker joined03:21
← juvenal left03:21
← MattMaker left03:23
→ jceb joined03:24
→ modocache joined03:25
← zivester_ left03:25
→ zivester joined03:25
→ MattMaker joined03:27
→ bket joined03:27
→ devoldmx joined03:28
← modocache left03:29
→ dsdeiz joined03:29
milki push and pull-request are different things03:30
← ShapeShifter499 left03:30
→ iamjarvo_ joined03:30
← dsdeiz_ left03:30
ne1 yes i got it now thx03:30
← ne1 left03:30
→ choki joined03:33
← irqq left03:35
← oojacoboo left03:35
→ irqq joined03:36
→ nettoweb joined03:37
→ tristanp joined03:38
← gsingh93 left03:38
← cemez left03:39
← daito left03:40
→ gsingh93 joined03:41
← nettoweb left03:41
→ juvenal joined03:41
→ gopar joined03:43
← cluelesscoder left03:43
→ oojacoboo joined03:43
← snthsnth left03:44
← gargola left03:45
← FireArrow133 left03:49
← soloone left03:50
← juvenal left03:51
← krzywy left03:51
→ Freeman_ joined03:51
→ gaiko joined03:51
← Bilge left03:51
← Takumo left03:51
← devster31 left03:51
← iooner left03:51
← Virox left03:51
← Freeman_ left03:52
← averell left03:52
← vishal left03:52
← Jeroen left03:52
← VampiricPadraig_ left03:52
→ vishal joined03:52
→ Jeroen joined03:52
→ krzywy joined03:52
→ soloone joined03:53
→ devster31 joined03:53
→ iooner joined03:53
→ Bilge joined03:53
→ Virox joined03:53
→ VampiricPadraig joined03:53
← VampiricPadraig left03:53
→ VampiricPadraig joined03:53
← jalopezsilva left03:53
← Guest58751 left03:53
→ Takumo joined03:54
← Takumo left03:54
→ Takumo joined03:54
→ Rodya_ joined03:54
→ Guest58751 joined03:54
← Rodya_ left03:55
← kgirthofer left03:55
← gaiko left03:57
→ scarabx joined03:57
← thinkxl left04:00
← devoldmx left04:01
→ acetakwas joined04:03
→ Zamyatin joined04:03
← joufflu left04:04
→ juvenal joined04:04
← arup_r left04:05
← Gravitron left04:05
← Ragnar left04:06
→ theskillwithin joined04:08
→ snthsnth joined04:08
→ Dragooon joined04:10
← ycon_ left04:13
← Dragooon left04:14
← zac_g left04:15
→ jalopezsilva joined04:16
← juvenal left04:20
← iamjarvo_ left04:20
← jon-mac left04:21
puff Is there a git command that will tell me what will get overwritten if I do a git pull, but without actually doing the pull?04:22
← oojacoboo left04:24
← fscala left04:25
← scarabx left04:27
thiago puff: no04:27
→ fscala joined04:27
thiago what are you trying to do?04:28
→ dsantiago joined04:28
puff I'm still shaky on the merging process, so I"m paranodi.04:28
paranoid, too.04:28
← acetakwas left04:29
thiago worst case scenario, you undo the merge04:29
puff Yeah, see "I'm still shaky on the merging process" :-)04:29
thiago like I said, there's nothing to fear04:30
puff hm, "Not committing merge; use 'git commit' to complete the merge.'04:30
thiago *as long as you commit*04:30
← frdmn left04:30
← ome left04:30
puff thiago: ?04:30
thiago always keep your changes committed04:30
puff Yeah.04:30
thiago if you're unsure of the operation, commit everything04:31
→ GT4066 joined04:31
puff Well, I was trying to commit a change, but then it said "hint: Updates were rejected because the remote contains work that you do"04:31
so I did git pull, and now it says "Not committing merge; use 'git commit' to complete the merge."04:31
So what's the next step?04:31
What's annoying is I'm pretty sure the other commit is an entirely separate file from the ones I need to commit.04:32
thiago the next step is to start reading from the top04:32
git probably told you there was a conflict that you needed to resolve04:32
← Padawan left04:32
puff I did "git status" and it said "Your branch is up-to-date with 'origin/master'."04:33
← CKyle left04:33
puff And I have changes not staged for commit.04:33
And an untracked file.04:33
← bendangelo left04:33
→ scarabx joined04:35
thiago like I said, *keep stuff committed*04:36
untracked is ok, since Git never touches those files04:36
← WizJin left04:36
puff Is there a preferred pastebin here?04:36
https://bpaste.net/show/7b12a132377804:37
thiago one that works and is wide enough04:37
(that excludes GitHub's gist)04:37
← Orbitrix left04:37
→ Dragooon joined04:38
→ Sasazuka joined04:38
→ WizJin joined04:38
thiago what are you trying to do?04:38
→ PCatinean joined04:39
puff I was trying to commit my changes.04:39
thiago after the push?04:39
it's in the wrong order04:39
puff Yeah, that was a mitake.04:40
Mistake.04:40
thiago ok, skipping the first push04:40
→ daito joined04:40
thiago did you read what push said, anyway?04:40
the part about removing that annoying message?04:40
← fedexo left04:40
→ cmoneylu_ joined04:41
puff I mistakenly did add, then push, without committing. The first push failed, I committed, tried to push again, that failed with an error because "Updates were rejected because the remote contains work that you do not have locally"04:41
The matching/simple stuff?04:41
thiago yes04:41
puff I read it, didn't quite understand it, decided not to mess with it until I have time to read up on it.04:41
thiago ok04:42
← xudongz left04:42
thiago just run: git config --global push.default simple04:42
puff okay. done.04:42
thiago don't bother trying to understand the current behaviour. Just opt in to the new behaviour04:42
puff Okay.04:43
thiago also, consider upgrading Git04:43
puff Okay.04:43
← Dragooon left04:43
thiago anyway, you did everything right, but then you ended up here:04:43
error: Terminal is dumb, but EDITOR unset04:43
what kind of terminal are you on?04:43
puff Yeah, that's because this is all happening inside an emacs shell buffer.04:44
← ahr3n left04:44
thiago that explains the dumb terminal04:44
puff Yeah.;04:44
thiago you need to commit the merge now04:44
puff So what04:44
thiago just "git commit"04:45
puff So, what's committing a merge, vs normal commit?04:45
← daito left04:45
→ ayaz joined04:45
thiago a normal commit has one parent commit04:45
a merge commit has two or more: it's merging two or more branches together04:45
you need to run git commit because your terminal was dumb04:45
puff Ah... so it's like I have a regular commit teed up and ready to go, and waiting for the commit command.04:45
It wants a -m or -F message.04:45
→ acetakwas joined04:45
puff Should I use the message from my previous commit attempt?04:46
thiago if it has been a regular terminal, the text editor would have shown up for you to write the merge message. When you exited the text editor, the merge would be done.04:46
← Lyqyd left04:46
thiago you should write the message in the text editor04:46
it will have a suggestion for you04:47
puff okay04:48
→ daito joined04:48
puff Okay, so just do "git commit " in a normal shell window, accept whatever the message is that git prefills, save, exit?04:49
thiago yes04:49
puff ok.04:49
thiago or edit the message to explain why you've done that merge04:49
puff Okay, I think that worked.04:49
Didn't say anything after I exited nano.04:49
← mac_ified left04:50
thiago if you git log now, you should see the merge commit04:50
puff yup!04:50
thanks.04:50
So I can continue on my merry way, now?04:50
Do I still need to commit my changed file and push?04:51
...and meanwhile, just got an email from the other dev, he just pushed some more changes.04:51
← JJM left04:51
puff Hm, the file I was trying to commit is not showing up in "git status", so I guess it's in there.04:52
→ vikas027 joined04:55
→ iamjarvo_ joined04:55
← cmoneylu_ left04:55
← iamjarvo_ left04:56
→ devoldmx joined04:58
← MattMaker left05:01
→ MattMaker joined05:01
← tpollard left05:01
→ AnalogSuzen joined05:03
→ MrGaraj joined05:03
→ ___thomasreggi__ joined05:04
vals_ → tango_05:04
MrGaraj hello everybody. I need a little guidance. I've made a commit then a pull. But I am not interested on what i've commited so I want to delete that. How can I do this ?05:04
← arescorpio left05:05
→ {AS} joined05:05
→ frdmn joined05:05
← frdmn left05:05
→ frdmn joined05:05
← VirtuallySuzen left05:06
→ bb010g joined05:06
gitinfo set mode: +v05:06
→ unreal joined05:06
→ clemf joined05:08
← MrGaraj left05:08
← Guest45706 left05:09
→ Gravitron joined05:10
→ nowhere_man joined05:12
→ Raging_Hog joined05:12
→ zoso joined05:12
→ Dragooon joined05:13
→ sanketdg joined05:13
← nowhereman left05:13
← Phoenixz left05:14
← jceb left05:14
← irqq left05:15
← keroro520 left05:15
→ nilg joined05:16
nyuszika7h_ → nyuszika7h05:16
← snthsnth left05:17
→ Technocrat7 joined05:17
puff thiago: Thank you for your help.05:19
thiago puff: you're welcome05:19
→ gaucheph joined05:19
← gaucheph left05:20
→ jagob joined05:20
← sdothum left05:21
← clemf left05:21
puff As a general recommendation, kdiff3 (for doing file tree diffs) and meld are awesome tools for cleaning up messes.05:21
thiago loves kdiff305:22
milki o yeah?05:22
hm, KDE of course05:22
← acetakwas left05:22
milki lets see what its package dependencies are05:22
← SimonNa left05:22
thiago best three-way merge tool there is05:23
saved me countless hours of merge conflict resolution05:23
← Gamecubic left05:23
← ___thomasreggi__ left05:23
puff milki: kdiff3 has always run fine under gnome and xfce, for me.05:24
I love, love, love meld's word-ballon UI.05:24
milki o, its graphical05:24
puff Yeah.05:24
milki right05:24
← devoldmx left05:24
puff kdiff3's UI is a little awkward, but damn is it handy.05:24
→ gaucheph joined05:25
→ devoldmx joined05:25
puff I've gotta learn how to tell kdiff3 to ignore certain file extensions.05:25
milki the sample looks the same as vimdiff05:25
but with more windows on the top05:25
puff I remember when ubuntu left kdiff3 out of the repos for one version, because they were upgrading gnome or something.05:25
I was frantic :-).05:25
→ modocache joined05:26
puff milki: I'm not familiar with vimdiff. Anyway, it's free and easy as pie to apt-get it, so why not look for yourself?05:26
milki because i need to download kdelib too -.-05:26
← Zemeio left05:26
puff what distro are you on?05:26
milki arch05:26
puff Ah.05:26
milki :P05:26
puff Yeah, okay, that makes sense.05:26
puff ducks.05:26
→ Manikandan joined05:26
← nowhere_man left05:26
→ nowhere_man joined05:27
milki not running gnome nor kde05:27
of course05:27
i should install docker, then it wont matter05:28
though, i havent tried running docker container with an x server before...05:28
o, just sharing the socket05:28
← faux___ left05:28
milki thats not hard05:28
yeah, i can totally try out new things this way then05:29
→ keroro520 joined05:29
milki actually... i could run everything out of a docker container then...05:29
HMMM05:29
← fcoelho left05:29
milki then my apps just become dockerfiles in a git repo05:29
>.>05:29
this is brilliant05:30
← alanwill left05:30
← modocache left05:30
→ Zemeio joined05:31
→ ronskisika joined05:32
→ kgirthofer joined05:32
← Raging_Hog left05:32
→ alanwill joined05:33
→ xbob joined05:34
→ akagr joined05:35
← multi_io left05:35
← madebymarkca left05:36
→ madebymarkca joined05:36
← choki left05:36
→ multi_io joined05:37
← akagr left05:38
Eugene docks milki to a pier05:39
← Dragooon left05:40
→ patrick99e99 joined05:40
→ akagr joined05:41
← JanC left05:42
→ felix891 joined05:43
→ User458764 joined05:44
← knittl left05:45
→ knittl joined05:45
→ faux___ joined05:45
→ eijk joined05:46
← felix891 left05:47
→ fcoelho joined05:48
→ ThomasLocke joined05:48
← Gravitron left05:49
← terminal_echo left05:49
← akkad left05:50
→ petersr joined05:50
← eijk left05:50
michael_mbp hey all05:51
← petersr left05:51
→ gfixler1 joined05:52
→ akkad joined05:52
→ MrWoohoo joined05:53
← zivester left05:53
→ akiva joined05:54
← t0by left05:56
→ JanC joined05:57
→ kozko joined05:58
→ _devopstw joined05:58
← jagob left06:00
← _devopstw left06:01
→ Saturn812 joined06:02
puff michael_mbp: hey.06:02
→ Kicer86 joined06:02
← Technocrat7 left06:03
puff Man, I hate it when I get stuck on a git problem, it always disrupts my momentum.06:03
→ nerd joined06:06
→ lb joined06:08
→ cabaire joined06:08
← akiva left06:09
← moei left06:10
→ moei joined06:11
→ dionysus69 joined06:12
→ roelmonnens joined06:13
→ dreiss_ joined06:14
→ rscata joined06:14
← User458764 left06:14
→ jagob joined06:14
→ akiva joined06:19
→ eka joined06:20
→ acolson joined06:21
→ Oog joined06:21
osse puff: get a flywheel06:21
← Diitto left06:22
← jagob left06:23
→ eGGsha joined06:24
Celelibi How do I count the number of commits between two other commits?06:25
thiago git rev-list A..B | wc -l06:25
← michael_mbp left06:26
→ michael_mbp joined06:26
Celelibi thanks.06:26
grawity git rev-list --count A..B, no?06:30
thiago I thought it existed, but it's not on the man page06:30
← Oog left06:31
→ stevenbenner joined06:32
← Vile left06:32
→ tvw joined06:34
→ skylite joined06:34
→ irqq joined06:35
Celelibi Awesome.06:36
← darkbasic left06:36
← gaucheph left06:36
→ darkbasic joined06:36
← kozko left06:38
→ User458764 joined06:38
→ skynxnex joined06:39
osse thiago: it is in my man page. does that make me better than you ?06:41
→ dionysus70 joined06:46
← dionysus69 left06:46
dionysus70 → dionysus6906:46
← daito left06:49
→ youngbaks joined06:51
→ chaudhryjunaid joined06:54
← dionysus69 left06:54
→ elsevero joined06:54
→ dionysus69 joined06:54
→ nydel07_ joined06:54
← nydel07_ left06:55
→ linuxmint2 joined06:58
→ Sceorem joined06:59
← dreiss_ left07:00
→ daito joined07:00
grawity more man-ly, perhaps07:02
← youngbaks left07:02
→ Darcidride joined07:03
→ Spark joined07:03
Spark hi, if you delete the wrong commits with git rebase -i, how do you get them back?07:03
the commits are orpaned somewhere right?07:04
grawity git reflog07:04
moritz Spark: look into 'git reflog' to find the commit before the rebase07:04
→ nnyk joined07:04
moritz Spark: start a new branch there ("git branch recovery <hash>")07:04
→ TomyWork joined07:04
moritz and then recover them at leisure07:04
or if you want to throw away the whole rebase -i, do a git reset --hard <hash>07:05
Spark that's the one, thanks07:05
→ JohnBat26 joined07:05
→ Amandil joined07:06
← uber left07:06
← gopar left07:06
← nerd left07:07
→ felix89 joined07:07
← eka left07:07
← fracting left07:08
← jalopezsilva left07:09
→ eka joined07:10
← scarabx left07:12
← Sasazuka left07:12
→ encod3 joined07:13
← maxorator left07:14
→ maxorator joined07:15
→ stee joined07:17
← mitzip_ left07:18
← thiago left07:18
→ mitzip joined07:18
← pmartnhoj left07:18
← mostlybadfly left07:19
→ youngbaks joined07:20
→ uber joined07:20
→ fracting joined07:20
← tyreld left07:23
→ bonswouar joined07:24
→ joel_falcou joined07:25
→ nfk|laptop joined07:26
→ modocache joined07:27
← uber left07:29
Seveas Spark: there's also git fsck for finding lost objects07:29
← akiva left07:29
→ rj1 joined07:30
← modocache left07:31
← akagr left07:31
→ Balliad joined07:31
→ albel727 joined07:33
← yeshacker left07:34
→ RoelStorms joined07:34
→ d3m0n joined07:35
← felix89 left07:35
d3m0n How can I totally reclone master into an already existing branch07:35
Essentially i want to scrap everything in a branch and start new07:36
I tried rebase but it just gave me a bunch of conflict crap07:36
→ scarabx joined07:36
← Amandil left07:37
→ Amandil joined07:38
← User458764 left07:40
→ rendar joined07:40
→ roxlu joined07:40
← diegoviola left07:42
← benbergman left07:42
→ aidalgol joined07:42
← totesmuhgoats left07:42
→ benbergman joined07:43
→ jalnt joined07:43
→ uber joined07:43
kadoban d3m0n: Just delete the branch and start a new one?07:43
← MattMaker left07:43
← malukenho left07:43
d3m0n kadoban: Then I have to set up all the deploy and remote stuff :/07:43
→ subscope joined07:43
→ MattMaker joined07:43
d3m0n Actually, I can create a new local branch and just push all the change to the remote branch instead of deleteing?07:44
Or I mean delete local and create new local branch07:44
→ jalnt_laptop joined07:44
← jalnt left07:45
← Amandil left07:45
→ malukenho joined07:46
→ jagob joined07:46
→ pmartnhoj joined07:46
→ Amandil joined07:46
→ ilmgb joined07:47
→ nerd joined07:48
← aidalgol left07:49
kadoban d3m0n: No longer sure what you're actually trying to do. :-/07:50
d3m0n I want my local branch thats NOT MASTER to MATCH master07:50
→ malukenh_ joined07:50
d3m0n I DONT want to DELETE my REMOTE BRANCH because I HAVE DEPLOY SERVERS ALREADY SET UP07:50
→ akiva joined07:51
← malukenho left07:51
→ wCPO joined07:52
← wCPO left07:52
→ wCPO joined07:52
← michael_mbp left07:52
→ Wetmelon joined07:52
grawity oh is it CAPS LOCK DAY yet07:53
Xe I HOPE IT IS07:53
THAT IS MY FAVORITE DAY07:53
grawity GIT RESET --HARD ORIGIN/MASTER07:53
Xe DONT YOU LOVE IT TOO GRAWITY?07:54
Wetmelon YAYYY!07:54
d3m0n grawity: Already DID THAT and it gave CONFLICTSS07:54
Xe D3M0N JUST FIND THE CONFLICTS AND RESOLVE THEM BY HAND07:54
← chaudhryjunaid left07:54
Xe IT'S NOT THAT HARD TO DO07:54
← youngbaks left07:54
grawity HOW THE FUCK DOES RESET --HARD GIVE CONFLICTS07:55
d3m0n YOU OBVIOUSLY DIDNT READ WHAT I SAY BEFORE07:55
EXACTLY MY POINT07:55
grawity IT DOES NOT MERGE ANYTHING07:55
Xe GRAWITY: THEIR HISTORY IS FUCKED?07:55
→ filisko_ joined07:55
grawity THERE CANNOT possibly BE A MERGE CONFLICT07:55
→ SimonNa joined07:55
grawity IT'S LIKE SETTING WATER ON FIRE07:55
d3m0n ... that's possible ...07:55
← Ravana left07:56
← patrick99e99 left07:56
→ michael_mbp joined07:56
→ mikecmpbll joined07:56
← ilmgb left07:56
Xe TRY TO GIT STASH THAT STUFF?07:57
GIT STASH AVOIDS SETTING WATER ON FIRE I HOPE07:57
→ malukenho joined07:57
mrkat lol git07:57
Xe UNLESS THAT WATER IS ACTUALLY JET FUEL07:57
AND YOUR CODE IS STEEL BEAMS07:57
→ ilmgb joined07:57
→ Ravana joined07:57
→ endiruna joined07:57
mrkat OOPS CAPSLOCK WAS OFF MY BAD07:57
← scarabx left07:57
Xe → XE07:58
grawity no, seriously, `git reset --hard` is one of those commands which don't *do* merge conflicts07:58
XE grawity: untracked files?07:58
grawity (it's even one of those commands usually used to *escape* a conflict)07:58
mrkat stuff shows as modified on `git status`, grawity?07:58
← fracting left07:58
XE d3m0n: `git status`?07:58
XE → Xe07:59
qsusxs why is Seveas op07:59
me missing backlog07:59
← malukenh_ left07:59
qsusxs server slept Q_Q07:59
d3m0n Xe: I actually can't do that anymore , just deleted and recreated07:59
mrkat we had this kind of twilight zone behavior recently, turned out it was a misformed .gitattributes07:59
qsusxs also who is qsuscs07:59
d3m0n It was fubar07:59
grawity d3m0n: well then everything is solved07:59
Xe well07:59
that is one way to fix it07:59
grawity NEXT CUSTOMER, PLEASE07:59
d3m0n lmao yea i suppose "solved"07:59
grawity hey you were the one who decided to give up and nuke it from orbit07:59
Xe it's the only way to be sure grawity08:00
the only way to be sure08:00
→ yeshacker joined08:01
Seveas qsusxs: I'm having a laziness contest with Eugene08:01
← qsuscs left08:01
qsusxs → qsuscs08:01
← vikas027 left08:01
ChanServ set mode: +v08:01
← ilmgb left08:02
qsuscs oh and i thought you were promoted op08:02
← lb left08:02
Seveas that wouldn't be a promotion08:02
qsuscs 08:02
→ chaudhryjunaid joined08:03
← xbob left08:03
→ nchambers joined08:04
← jagob left08:04
→ malukenh_ joined08:04
← neunon left08:05
→ lb joined08:06
← nchambers left08:06
→ neunon joined08:07
← malukenho left08:07
→ claudiu04 joined08:08
pvac → v08:09
v → pvac08:09
← reim left08:09
→ geoid joined08:10
→ Alienpruts joined08:10
→ fracting joined08:10
→ totesmuhgoats joined08:11
→ xbob joined08:11
← darkbasic left08:11
→ darkbasic joined08:12
→ bongjovi joined08:12
← boombatower left08:13
← sarri left08:14
→ sarri joined08:15
← dostoyevsky left08:16
← joel_falcou left08:17
← mwhooker left08:18
→ youngbaks joined08:18
← akiva left08:18
→ marcogmonteiro joined08:19
← bb010g left08:20
babilen_ → babilen08:21
→ geoid_ joined08:21
← filisko_ left08:21
← justanotheruser left08:21
→ justanotheruser joined08:22
→ Phylock joined08:23
← geoid left08:24
← rasto left08:24
→ bvi joined08:26
→ leeN joined08:27
← Zamyatin left08:28
→ reim joined08:29
← chaudhryjunaid left08:29
← afuentes left08:29
→ filisko joined08:30
← youngbaks left08:30
→ afuentes joined08:32
→ patrick99e99 joined08:32
→ malukenho joined08:33
→ asnoehu joined08:35
← malukenh_ left08:36
→ goTAN joined08:36
← elsevero left08:36
→ rasto joined08:37
← fscala left08:38
← jalnt_laptop left08:38
→ User458764 joined08:38
← goTAN left08:38
→ fscala joined08:40
→ felix89 joined08:41
→ doener joined08:42
mcepl → mcepl_away08:44
→ goTAN joined08:44
← faux___ left08:44
mcepl_away → mcepl08:45
→ noisebleed joined08:47
← Vgr left08:47
→ Infamous joined08:47
rivarun i have a repository (A), from which i want to make a PR for (B). (B) has one commit. using `git rebase -i --root`, i put that commit as my root commit. however, its hash changes right away, even though i kept it pristine. how do i go about doing this, without checking out the entire (B) and cherry-picking the range of all the commits of (A)?08:48
← User458764 left08:48
← atrioom left08:48
Stummi can someone give me an example how to use filter-branch to make a given commit the initial/root commit? (e.g. dropping all older commits)08:49
I don't seem to get it right :/08:49
← malukenho left08:50
→ malukenh_ joined08:50
← rchavik left08:50
tobiasvl Stummi: can't you just use !interactive_rebase for that?08:50
gitinfo Stummi: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.08:50
canton7 tobiasvl, not if he has any merges past that point08:51
tobiasvl ah, that's true. I always forget that it clobbers merges :/08:51
canton7 Stummi, what have you tried so far? I've got a rough idea of what's needed, but starting from a known bad point will be easiest08:52
← kalz left08:52
→ faux___ joined08:53
→ dimi1947 joined08:53
→ khmarbaise joined08:54
→ User458764 joined08:54
→ kalz joined08:54
canton7 Stummi, something like git filter-branch --parent-filter 'sed "s/^-p parent-to-remove\$//"' HEAD would do it, I would have thought?08:55
→ elsevero joined08:56
← malukenh_ left08:56
← Goplat left08:56
← reim left08:56
Stummi I think thats what I tried, but without the HEAD argument. One moment08:56
← faux___ left08:57
→ nene1 joined08:57
← patrick99e99 left08:57
← subscope left08:58
Stummi canton7, thanks. Thats strange because thats one thing I tried before and which didn't worked. Maybe I copied the wrong hash or something08:59
canton7 heh, it's the magic of IRC. We have the power to make things work :)08:59
Stummi but as a side effect, gitk crashes now on this directory ;)08:59
canton7 oh fun08:59
Stummi But I made a git clone with file:// of this filtered branch it works again in the cloned09:00
s/branch/repo09:00
→ kurkale6ka joined09:00
tobiasvl wow09:01
→ subscope joined09:02
canton7 Stummi, gitk caching some stuff it shouldn't, maybe?09:02
→ ifra201 joined09:02
Stummi No Idea, didn't really bothered to look closer at this since it worked after a clone09:03
→ halas joined09:03
← dimi1947 left09:03
→ jost_ joined09:04
→ sparetire_ joined09:04
→ m_ben joined09:05
← jost_ left09:05
← bvi left09:05
← SimonNa left09:05
→ jost_ joined09:06
→ achadwick joined09:07
← jost left09:08
→ King_Hual joined09:08
← lungaro left09:09
→ Vile joined09:12
← endiruna left09:12
→ lungaro joined09:14
→ chaudhryjunaid joined09:15
→ malukenho joined09:15
← Wetmelon left09:15
→ soc42 joined09:16
→ rchavik joined09:17
→ bvi joined09:17
→ reim joined09:19
← rchavik left09:19
→ m0nkmaster joined09:21
→ Octothorpe joined09:23
← goTAN left09:24
→ vigintas joined09:25
→ MaceBewley joined09:26
← cabaire left09:26
→ rchavik joined09:26
→ modocache joined09:27
← zoso left09:28
← daito left09:29
→ ilmgb joined09:29
← harish_ left09:31
← vigintas left09:31
← modocache left09:32
→ vigintas joined09:32
← kadoban left09:32
← vigintas left09:33
→ vigintas joined09:33
→ Hounddog joined09:33
← vigintas left09:34
→ faux___ joined09:34
→ vigintas joined09:34
← milki left09:36
→ vikas027 joined09:36
← reim left09:37
← faux___ left09:38
→ malukenh_ joined09:39
→ daito joined09:40
← ilmgb left09:41
← malukenho left09:41
→ milki joined09:42
→ _Archyme_ joined09:44
← Archyme_ left09:45
→ nettoweb joined09:46
→ zoso joined09:47
← zoso left09:49
→ zoso joined09:49
→ weyer joined09:50
→ faux___ joined09:50
← Phylock left09:51
← tzero left09:51
→ dopesong joined09:52
← darkbasic left09:53
← User458764 left09:54
← tirengarfio left09:55
← tirengarfio_ left09:55
← faux___ left09:55
← King_Hual left09:56
→ darkbasic joined09:57
→ King_Hual joined09:59
→ User458764 joined09:59
→ rodrigograca31 joined10:01
← alanwill left10:03
→ barduck joined10:04
→ redi joined10:06
redi Hi gits. Any idea why gitweb would not show a proper 'blob' view, just showing blank lines, all numbered 0 ?10:07
If I edit gitweb.conf to enable 'blame' view that works fine. But not the 'blob'10:07
← nettoweb left10:07
→ reim joined10:07
→ RaceCondition joined10:10
→ ilmgb joined10:12
← daito left10:12
← nfk|laptop left10:13
← chaudhryjunaid left10:14
← User458764 left10:15
redi e.g. http://src.isvolatileusefulwiththreads.com/?p=gcc.git;a=blob;f=libstdc%2B%2B-v3/include/experimental/io_context;10:15
← dopesong left10:15
→ dopesong joined10:16
redi but some files work: http://src.isvolatileusefulwiththreads.com/?p=gcc.git;a=blob;f=README;10:16
→ noisebleed_ joined10:16
← noisebleed left10:19
← dopesong left10:20
→ cdg joined10:22
→ patrick99e99 joined10:22
→ akagr joined10:23
→ harish joined10:25
← subscope left10:26
← patrick99e99 left10:26
→ dopesong joined10:27
← reim left10:28
→ ProbabilityMoon joined10:29
→ tirengarfio joined10:29
← vikas027 left10:29
← zoso left10:30
→ dEPy joined10:31
← qsuscs left10:31
← dopesong left10:32
→ faux___ joined10:32
← mgsloan left10:33
← akagr left10:33
← _Archyme_ left10:33
→ User458764 joined10:36
← faux___ left10:36
Kartagis hrm. when I did git checkout -b branchname, I got D <file>. why?10:37
why was that file deleted?10:37
→ wakd joined10:38
← khmarbaise left10:38
← wakd left10:39
→ wakd joined10:39
→ avichalp joined10:39
_ikke_ Kartagis: That's the status in the index10:40
Probably was already deleted before you created the branch10:40
← ilmgb left10:42
Kartagis hrm10:42
→ ilmgb joined10:42
dEPy yep, if you did nothing else then should be deleted before10:43
← pipern left10:44
→ jagob joined10:44
→ faux___ joined10:46
→ kristofferR joined10:46
← soc42 left10:46
→ kukks joined10:48
← kukks left10:48
→ kukks joined10:48
→ mgsloan joined10:51
→ nettoweb joined10:51
← m0nkmaster left10:51
→ mizu_no_oto joined10:52
→ xxtjaxx joined10:52
← RoelStorms left10:52
← baako left10:54
← mikecmpbll left10:54
xxtjaxx Hey! I just created a branch based on a tag and pushed that branch back to origin. That worked fine. What I need now is to pull in specific commit ids from another branch. How would I do that?10:54
→ reim joined10:55
→ baako joined10:55
← cdg left10:56
← ilmgb left10:56
→ Imaginativeone joined10:57
→ dopesong joined10:58
← dEPy left10:59
← User458764 left11:00
← faux___ left11:00
→ stamina joined11:02
→ subscope joined11:02
← dopesong left11:03
← reim left11:03
→ Guest90723 joined11:04
← ayaz left11:04
← malukenh_ left11:04
← nnyk left11:05
← Kulrak left11:05
← d3m0n left11:06
→ malukenho joined11:07
← Guest90723 left11:08
→ in3xes joined11:09
_ikke_ xxtjaxx: man git cherry-pick11:09
gitinfo xxtjaxx: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html11:09
← totesmuhgoats left11:09
← mizu_no_oto left11:10
→ jceb joined11:10
← devoldmx left11:11
→ devoldmx joined11:11
→ Marenz-work joined11:12
← bongjovi left11:12
Marenz-work greetings11:12
I have two commits followed by a merge commit. I want to merge the two commits but I am getting conflicts as soon as I apply the merge commit... that confuses me, I mean the content shouldn't really have changed, right?11:14
And I don't wanna fix all those conflicts again11:14
→ reim joined11:14
→ Juzzika joined11:15
← skn left11:16
← devoldmx left11:16
→ totesmuhgoats joined11:17
→ shiriru joined11:17
← benbergman left11:17
→ msonntag joined11:17
→ mostlybadfly joined11:17
nopf_ → nopf11:17
→ benbergman joined11:18
roxlu Ok... hopefully someone knows this. I merged some code by using "git checkout --theirs file.cpp" which removed my changes :# Is there a way to redo this merge so I can add my changes into file.cpp ?11:18
→ Kulrak joined11:18
← Kulrak left11:18
→ Kulrak joined11:18
→ sespiros joined11:18
← negaduck_ left11:20
Seveas git merge --abort11:21
roxlu Seveas yeah, though this merge was done lots of commits ago11:21
→ User458764 joined11:21
← mgsloan left11:22
roxlu I know which commit has the removed lines though. I'm trying to figure out how to get those removed lines "back" into file.cpp (not sure how to formulate this correctly )11:22
← ronskisika left11:23
← WizJin left11:24
Seveas then don't bother retrying the merge, just forward-port your changes. Maybe with git format-patch and git am11:24
roxlu Ok, I'll read up on "forward-port"11:25
← cagedwisdom left11:25
Marenz-work can I get the conflict fixes from a merge commit?11:26
→ mizu_no_oto joined11:26
→ EduardoMartins joined11:26
→ rnsanchez joined11:26
← User458764 left11:26
→ dopesong joined11:26
→ sdothum joined11:27
Marenz-work Oooh11:28
← tiredcat_ left11:28
Marenz-work "Merge conflict resolutions or manual amendments to merge commits are not preserved."11:28
great11:28
Anyway that they ARE preserved?11:28
→ modocache joined11:28
← tvw left11:29
→ nfk|laptop joined11:29
← afuentes left11:30
→ WizJin joined11:30
← dopesong left11:31
← jceb left11:31
→ qsuscs joined11:32
→ RoelStorms joined11:32
← kristofferR left11:33
← modocache left11:33
← RoelStorms left11:33
→ JJM joined11:33
← msonntag left11:35
← dionysus69 left11:36
→ choki joined11:37
→ patrick99e99 joined11:37
← reim left11:37
→ msonntag joined11:38
→ nnyk joined11:39
→ dionysus69 joined11:40
→ fedexo joined11:41
← patrick99e99 left11:41
← aretecode left11:41
← JJM left11:46
xxtjaxx _ikke_: thanks! Used it to pull 2 merges I wanted into the branch!11:46
ChanServ set mode: +v11:46
← Sceorem left11:47
← pvac left11:47
Marenz-work When I manually cherry-pick a merge commit with -m1 it only has one parent :/11:54
Oh.11:57
" When you cherry-pick a merge commit, it collapses all the changes made in the parent you didn't specify to -m into that one commit. You lose all their history, and glom together all their diffs."11:57
Well, how do I get this drat merge with my manual conflict resolves then, gah11:57
→ negaduck joined11:57
Marenz-work hmm maybe...11:57
Marenz-work tries11:57
michael_mbp hmm11:58
how can I view a bunch of commits, as though they were just one change set?11:59
qsuscs michael_mbp: git diff foo bar11:59
← Guest2496 left11:59
→ fstd joined11:59
michael_mbp qsuscs: ha cheers11:59
I was doing git log foo..HEAD --stat11:59
just needed to make it diff12:00
→ dopesong joined12:00
qsuscs you can also do just "foo.."12:00
michael_mbp combined stat is what I wanted :)12:00
qsuscs HEAD is implied12:00
michael_mbp ooh nice.12:00
that's what she said!!12:00
tee hee12:00
qsuscs but i’m a guy12:00
→ m0ltar joined12:00
michael_mbp true.12:00
was funnier in my head12:00
qsuscs (pun not intended)12:01
← jeffreylevesque left12:01
michael_mbp LOL12:01
→ Sceorem joined12:01
← dopesong left12:04
→ macrover joined12:05
→ bongjovi joined12:05
→ Daxaar joined12:06
← macrover left12:06
→ dopesong joined12:08
→ krawchyk joined12:10
→ khmarbaise joined12:10
← krawchyk left12:10
→ sburg joined12:10
→ krawchyk joined12:11
→ e01 joined12:12
e01 hi12:12
i am trying to migrate svn repo to git but have problems12:13
← dopesong left12:13
← gfixler1 left12:13
e01 I get error "Author: nikolayi not defined in /home/e01/authors.txt file" but i am sure it is in the authors.txt12:14
← JohnBat26 left12:14
e01 any idea?12:14
→ User458764 joined12:15
← malukenho left12:16
→ dopesong joined12:18
→ reim joined12:18
← pantsman- left12:20
← nnyk left12:20
← UukGoblin left12:20
→ UukGoblin joined12:20
→ darkbasic_ joined12:21
← darkbasic left12:21
→ tvw joined12:22
← dopesong left12:23
→ jeffreylevesque joined12:23
→ malukenho joined12:23
← subscope left12:23
← Xack left12:24
→ toothrot joined12:24
→ tomboy65 joined12:24
→ sgambino joined12:25
← Daxaar left12:25
← tomboy64 left12:25
→ Matrixiumn joined12:26
← jagob left12:26
→ s8321414 joined12:27
← mizu_no_oto left12:28
→ Vgr joined12:28
← King_Hual left12:28
→ mastro joined12:30
→ dopesong joined12:31
→ scarabx joined12:32
michael_mbp qsuscs: so I've got 2 commits12:32
in HEAD and HEAD^12:32
I was to stage them12:32
should I fixup, then git reset --soft HEAD^ ?12:33
i.e. meld both into 1 commit12:33
then stage.12:33
?12:33
← benbergman left12:33
osse you want to combine HEAD and HEAD^ into one?12:34
→ benbergman joined12:34
osse git reset --soft HEAD~ && git commit --amend12:34
michael_mbp osse, well I can rebase and12:34
HEAD~ ?12:34
osse michael_mbp: same as HEAD^12:35
Matrixiumn → Xack12:35
← dopesong left12:36
michael_mbp ha12:36
going git reset --soft HEAD~ twice12:36
got both commits into the stage12:36
← scarabx left12:36
osse don't use --amend then12:37
michael_mbp not commiting12:37
osse also you coul have done git reset --soft HEAD~212:37
michael_mbp want to pick what I commit from the whole mix12:37
ah gotcha12:37
osse git reset HEAD~2 then :p12:37
← Imaginativeone left12:37
→ MarkyC joined12:37
→ King_Hual joined12:38
← King_Hual left12:38
→ King_Hual joined12:38
michael_mbp no need to pass --soft?12:38
so I ended up doing12:38
git reset --soft HEAD~2 && git reset HEAD12:38
suppose git reset HEAD~2 does the same then?12:38
→ subscope joined12:38
osse oui12:38
michael_mbp nice... got it12:39
← keroro520 left12:39
gitinfo set mode: +v12:40
sespiros is it possible to use bfg to replace passwords in git history with specific string instead of REMOVED?12:40
← blackjid left12:41
→ blackjid joined12:41
→ buffal0 joined12:42
← justanotheruser left12:44
← sburg left12:45
→ ms7 joined12:45
→ JohnBat26 joined12:45
ms7 I committed a new file with some stuff in it. Then I deleted the file in a commit because I didn’t need it. What happens when I squash those two commits in an interactive rebase?12:46
Seveas sespiros: yes12:46
← User458764 left12:46
Seveas https://github.com/rtyley/bfg-repo-cleaner/blob/master/bfg/src/main/scala/com/madgag/git/bfg/cli/CLIConfig.scala#L8012:46
osse ms7: it'll be like the file never existed12:47
← wCPO left12:47
← rwb left12:47
ms7 osse: But will there be a commit resulting from that squash? Or do both commits just get deleted?12:47
osse ms7: if that's the only thing hose commits do then I *think* it will be deleted12:48
→ Zamyatin joined12:48
osse if it isn't then you can remove it afterwards12:48
Seveas ms7: if nothing but that file was done in those commits, then just drop them both instead of squashing12:48
osse yeah, I was about to say that12:48
goddammit Seveas12:48
→ bitkiller joined12:48
Seveas hugs osse12:49
Seveas there there, you're still awesome12:49
ms7 Seveas: I was thinking that as well, but there’s a single change to another file in the first commit. I figure it’s fine to drop both commits and just redo the small change afterwards.12:49
Seveas ms7: neh, in that case squash them12:49
← RaceCondition left12:49
Seveas the first commit will remain, with just the change to the other file12:50
→ rwb joined12:50
ms7 Seveas: all right, that makes sense.12:50
osse weelll technically it's a new commit. atomic and immutable blablablablab12:50
← choki left12:50
Seveas technically correct is the best correct!12:50
← rwb left12:50
ms7 Rebasing this mess really forces you to think before you commit your changes next time… :D12:50
← kukks left12:51
→ rwb joined12:51
osse ms7: hang in there. once you feel comfortable with rebasing then it lets you think less!12:51
ms7 osse: :)12:51
osse git commit -am yolo; git commit this; git commit that -m "fuck it, I'll fix it in a rebase #swag"12:52
→ jceb joined12:52
→ prog_ joined12:52
→ Imaginativeone joined12:52
← Xack left12:52
→ Dro__ joined12:53
← Zamyatin left12:53
← prog_ left12:54
← JohnBat26 left12:54
← tvw left12:54
Seveas git config alias.yolo commit -am "YOLO"12:54
→ Matrixiumn joined12:54
← claudiu04 left12:55
← bmilesp left12:55
→ converge joined12:56
→ mizu_no_oto joined12:56
→ Phylock joined12:57
← sdothum left12:58
← nerd left12:59
→ rwb1 joined12:59
← jackburton left12:59
→ sdothum joined12:59
Matrixiumn → Xack13:00
→ ncd|leeN joined13:00
→ algae joined13:00
← rwb left13:00
rwb1 → rwb13:00
Imaginativeone → Imaginativeone_a13:01
→ roygbiv joined13:01
← Imaginativeone_a left13:01
→ absk007 joined13:01
← eGGsha left13:02
← malukenho left13:02
→ rwb1 joined13:02
← leeN left13:03
← skylite left13:03
← Gitzilla left13:04
← yeshacker left13:04
→ kukks joined13:04
← kukks left13:04
→ kukks joined13:04
← rwb left13:04
rwb1 → rwb13:04
← toothrot left13:05
→ jackburton joined13:06
jantje Hi13:08
git diff has two colums with + and - signs, the diff is about13:08
index bb30545,c8d7d80..000000013:08
is the left column about the 'index' and left column about X..Y ?13:08
→ dopesong joined13:09
→ iamjarvo_ joined13:09
→ tomog999 joined13:09
→ wxg joined13:11
→ Chaoborid joined13:11
← tomog999_ left13:12
← xxtjaxx left13:12
→ goTAN joined13:12
→ mbrzuzy joined13:13
← fedexo left13:13
→ tvw joined13:13
→ cdg joined13:14
→ CKyle joined13:14
→ JJM joined13:14
→ Anxi80 joined13:14
← cdg left13:14
→ cdg joined13:15
← Chaoborid left13:16
→ rwb1 joined13:20
_ikke_ jantje: unusual notation...13:21
← Anxi80 left13:21
→ Anxi80 joined13:21
← subscope left13:21
_ikke_ What are you diffing?13:21
michael_mbp the joy of gerrit.13:21
→ RockLee joined13:21
→ subscope joined13:22
← skynxnex left13:23
← iamjarvo_ left13:23
→ skynxnex joined13:23
← rwb left13:24
→ Dragooon joined13:24
→ skynxnex_ joined13:24
← rwb1 left13:24
→ patrick99e99 joined13:25
← Impaloo left13:25
← ms7 left13:25
→ Impaloo joined13:25
← skynxnex left13:28
← Impaloo left13:28
← wxg left13:28
→ Imaginativeone joined13:29
→ rwb joined13:29
← jackburton left13:29
→ modocache joined13:29
← GT4066 left13:30
← patrick99e99 left13:30
→ Impaloo joined13:30
→ buffffal00 joined13:30
← Juzzika left13:31
michael_mbp after git reset --soft13:31
how can I get those commits back?13:31
← fracting left13:31
→ cvanball joined13:31
← buffal0 left13:33
ToxicFrog michael_mbp: git reflog will tell you the commit ID(s).13:33
What you do with those depends on what you mean by "get them back"13:33
← modocache left13:33
michael_mbp I see the shas13:34
do I cherry pick 'em?13:34
→ ms7 joined13:34
michael_mbp seems to work!13:35
ToxicFrog michael_mbp: if you've made more commits since you did the soft reset, cherry-pick or rebase are good options, yes. If you just wish you hadn't reset in the first place, a reset --hard will get you back to where you were.13:37
→ gabble_ joined13:37
michael_mbp so reset --soft13:37
then reset --hard gets you back?13:37
← RockLee left13:37
michael_mbp no, hadn't made any changes13:37
← kukks left13:37
michael_mbp just wanted to get the HEAD reference back to where it was from --soft.13:37
← goTAN left13:38
→ victortyau joined13:39
← CKyle left13:39
← negaduck left13:39
ToxicFrog michael_mbp: "reset --soft" changes HEAD and leaves the working copy alone. "reset --hard" changes both HEAD and the working copy.13:40
michael_mbp git reset HEAD@{1} would have worked too.13:40
ToxicFrog Yes.13:40
michael_mbp cheers mate.13:40
more than one way to skin a cat13:40
← Junior left13:40
← darkbasic_ left13:41
→ darkbasic joined13:41
← Octothorpe left13:41
→ bmilesp joined13:42
→ jmckind joined13:42
← Phylock left13:45
← darkbasic left13:46
→ nerd joined13:46
→ jbafford joined13:47
← elsevero left13:47
→ darkbasic joined13:48
→ fracting joined13:48
← puff left13:48
→ aretecode joined13:51
→ modocache joined13:51
jbafford hi. I have a svn repo I’m trying to import to git. The complication is, the svn repo had a non-standard directory structure through about half of the repo, after which the location of everything was fixed. If I use svn2git —trunk=/ (which i need to properly import the early history), my repo ends with everything in trunk/. Is there a good way I can either during the import or after (at the point where the svn dir structure fixed) keep the “proper”13:51
organization so I don’t to have another “move all the files” commit?13:51
→ Padawan joined13:52
← darkbasic left13:52
→ ilmgb joined13:52
← converge left13:53
→ negaduck joined13:53
→ darkbasic joined13:54
← ms7 left13:55
→ chaudhryjunaid joined13:57
Seveas jbafford: a filter-branch with tree-filter comes to mind13:57
← chaudhryjunaid left13:57
← Vile left13:58
← avichalp left13:58
← bonswouar left13:58
→ youngbaks joined13:58
← darkbasic left13:58
→ sburg joined13:58
← ilmgb left13:59
← Manikandan left13:59
jbafford Seveas: so something like git filter-branch —tree-filter ‘mv trunk/* .; rmdir trunk’ midpoint..HEAD?14:00
← reim left14:00
← xbob left14:00
← rscata left14:01
→ ilmgb joined14:01
→ phaleth joined14:01
→ darkbasic joined14:02
← mizu_no_oto left14:02
→ cbonobo joined14:03
→ s2013 joined14:03
s2013 how can i check which branch a file exists in14:03
→ IrishPrime joined14:04
→ m0viefreak joined14:04
→ Dougie187 joined14:05
CareBear\ s2013 : you have to iterate all branches and check if the file exists in each one14:05
s2013 is there a command that does that14:05
CareBear\ no14:05
s2013 damn14:05
ok14:05
i have like 100s of branches14:05
need to find a file14:05
CareBear\ so you learn some shell scripting14:06
jbafford Seveas: yup, that’s exactly what I needed. Thanks!14:06
CareBear\ or you can script in some other language - doesn't have to be shell :)14:06
s2013 : are you looking for a file, or for a commit?14:07
s2013 a file14:07
→ happy-dude joined14:07
CareBear\ s2013 : if you are looking for a commit (which introduced the file) then you can use git branch --contains $commit to show all branches which have this commit14:08
s2013 hmm let me try14:08
CareBear\ the file was added to the different branches by different commits?14:08
← Impaloo left14:08
→ Impaloo joined14:08
s2013 so what happened was i added a file.. it was a configuration file.. not the most important.. dont need it most of the time.. last time i did it was a while ago.. but when i went to look for that file cause i need it now.. i noticed the file was gone.. then i went on gitignore and turns out someone put that file on gitignore14:09
Seveas s2013: for ref in $(git for-each-ref --format='%(refname)'); do git ls-tree -r $ref | grep -q your-file-name-here && echo $ref; done14:09
CareBear\ s2013 : and your goal is to recover the initial version of the file, which you committed?14:10
→ reim joined14:10
s2013 yea14:10
CareBear\ s2013 : then you're actually looking for the commit where it was introduced, in order to checkout the file from that commit14:10
s2013 Seveas thanks. let me try the commit route firt14:11
first*14:11
Seveas s2013: git log --all -- 'your.file.name'14:11
CareBear\ Seveas++14:11
→ Gamecubic joined14:12
← Impaloo left14:12
→ Impaloo joined14:12
→ converge joined14:13
→ The_Phoenix joined14:13
← krawchyk left14:13
→ Zamyatin joined14:13
← s8321414 left14:13
→ eKyNoX joined14:13
← Impaloo left14:14
→ Impaloo joined14:14
→ krawchyk joined14:14
→ lg188 joined14:15
CareBear\ s2013 : got it?14:16
→ buffal0 joined14:17
→ pratikmallya joined14:17
← sdothum left14:17
← ilmgb left14:18
→ ilmgb joined14:18
→ elsevero joined14:18
← reim left14:19
← buffffal00 left14:19
→ buffal0_ joined14:19
← Anxi80 left14:19
→ sdothum joined14:20
→ RaceCondition joined14:20
ggherdov Hello, I changed the permission of a versioned file from 664 to 600, but git says "nothing changed" (I'd like to record such change in git). Minimal example at https://bpaste.net/show/8bb2deeaa78214:20
← Joel left14:20
→ pratikma_ joined14:20
ggherdov any hint ?14:21
canton7 ggherdov, git only tracks the executable bit14:21
← negaduck left14:21
→ Vile joined14:21
ggherdov canton7: ah ok thanks.14:22
← sburg left14:22
s2013 CareBear\ sorry, didnt work. but i rebuilt that file .. if iremembered the config settings correctly14:22
← geoid_ left14:22
→ kukks joined14:22
← kukks left14:22
→ kukks joined14:22
← buffal0 left14:23
← ilmgb left14:23
← pratikmallya left14:23
← Trivium left14:24
← dsdeiz left14:24
CareBear\ s2013 : oh ok14:24
← mbrzuzy left14:24
→ mbrzuzy joined14:25
← mbrzuzy left14:25
→ Gitzilla joined14:25
← nettoweb left14:25
→ ilmgb joined14:25
← RaceCondition left14:25
Dro__ → Dro14:26
→ geoid_ joined14:27
← converge left14:28
← s2013 left14:28
← fracting left14:29
→ s2013 joined14:29
← bvi left14:30
← subscope left14:30
→ subscope joined14:31
← geoid_ left14:31
→ blinkdesign joined14:31
→ reim joined14:31
← eKyNoX left14:31
← hahuang65 left14:32
← buffal0_ left14:32
→ dimi1947 joined14:32
← vigintas left14:32
← hseg left14:33
← m0viefreak left14:33
→ m0viefreak joined14:33
→ Anticom joined14:33
→ notebox joined14:33
→ AaronMT joined14:33
→ RaceCondition joined14:34
dimi1947 I have not quite understood when do we have merge conflict14:34
→ geoid_ joined14:34
→ Joel joined14:34
dimi1947 I tried to merge a branch into master and I got some merge conflicts14:34
→ Dreamer3 joined14:34
← ssarah_ left14:35
CareBear\ dimi1947 : a merge is the joining of two previously independent development efforts. a merge conflict occurs when changes in these two branches of development overlap - both branches have changed the same piece of code.14:35
← s2013 left14:35
← blinkdesign left14:35
→ vigintas joined14:35
dimi1947 ok....I got it...14:35
Dro → v14:35
→ axl_ joined14:35
→ negaduck joined14:35
dimi1947 nonetheless here is the problem14:35
v → Dro14:35
→ s2013 joined14:35
→ gfixler1 joined14:36
dimi1947 I changed code only in the branch that was going for merging...not in the mster branch...that is what makes it weird14:36
CareBear\ is some developer in your team using windows?14:37
← skynxnex_ left14:37
CareBear\ it may be that line endings have changed because of that, which will also cause a conflict14:39
dimi1947 I am a solo dev and a write code in windows14:39
CareBear\ but anyway - just look at the conflicts, maybe it will then be clearer why they have happened14:39
line endings can certainly cause problems, it may have happened if you copied some files between different operating systems and then committed them14:40
but look at the conflicts14:40
dimi1947 I do not understand....I saw the coflict and it is code that I had replaced with other code14:40
→ ___thomasreggi__ joined14:40
→ smithbone joined14:40
CareBear\ replacing code is also changing code :)14:41
dimi1947 yes but when I merged..the old code returned...side by side with the new one14:41
CareBear\ so if in one branch you've made some change to the old code, and in the other branch you completely replace the old code, then that will be a conflict14:41
← gfixler1 left14:41
← acolson left14:41
CareBear\ you have to resolve conflicts manually14:41
in order to get the result you want14:42
dimi1947 manually....elaborate14:42
CareBear\ how it works depends on what tools you use14:42
← doener left14:42
dimi1947 elaborate...give example14:42
CareBear\ I recommend always using git commands in a shell14:42
dimi1947 I use git bash and git gui14:42
CareBear\ then when you run git merge and there is a conflict the merge is "paused" and the code files are left in a conflicting state14:43
→ User458764 joined14:43
→ Trivium joined14:43
dimi1947 I am exactly at this point14:43
in git bash14:43
CareBear\ you can then use any kind of merge tool you like to do resolve the conflicts - both the old and the new code will be found inside the files, inside markers which show what is the old and what is the new code14:44
← hackel left14:44
dimi1947 example of merge tool...you mean an editor for example?14:44
← Alienpruts left14:44
CareBear\ yes - I like to use an editor. but there are also some gui merge tools, but I don't know any so I can't speak about them. anyway you will now have to change the files to be the way you want them to be - maybe puzzling together parts from both old and new code, maybe just taking all the old code out and only keeping the new code. remember to also remove the markers that show what is old and what is new14:45
→ malukenho joined14:45
← nfk|laptop left14:45
← lb left14:46
CareBear\ search for <<< in the source to find all conflict start markers14:46
← Sp4rKy left14:46
→ Sp4rKy joined14:46
← cvanball left14:46
→ dreiss_ joined14:48
→ fracting joined14:48
→ picachu joined14:49
← subscope left14:49
→ Noldorin joined14:49
← malukenho left14:50
← katherine left14:50
dimi1947 did it....14:50
→ goTAN joined14:50
→ joeyDB joined14:50
CareBear\ does it make sense now?14:51
← gabble_ left14:51
→ mbrzuzy joined14:51
CareBear\ if you have changed the file to be what you want it to be after the merge, then you run git add $file and check with git status if there are some remaining conflicts. if yes then repeat for all files. when there are no more conflicts run git merge --continue14:52
← madewokherd left14:52
← mastro left14:52
← linuxmint left14:52
← cast left14:52
← User458764 left14:53
← roelmonnens left14:53
→ clemf joined14:54
→ editshare-ericf joined14:54
← r3g3x left14:54
← D-Boy left14:54
← elsevero left14:55
→ gabble_ joined14:55
→ patrick99e99 joined14:57
→ User458764 joined14:58
→ Wetmelon joined14:58
← Saturn812 left14:59
→ Sasazuka joined14:59
dimi1947 are you sure there is command git merge --continue15:02
I tried and I got a message saying uknown option continue15:02
← bsanford left15:03
← joeyDB left15:03
→ devoldmx joined15:03
← irqq left15:03
→ keroro520 joined15:04
→ tzero joined15:05
→ justanotheruser joined15:06
← ThomasLocke left15:06
→ hackel joined15:07
← mcepl left15:07
← Sasazuka left15:07
→ D-Boy joined15:08
→ Alienpruts joined15:08
← mbrzuzy left15:08
dimi1947 I cannot neither abort the merge...a file says is not up to date and cannot merge15:08
→ MrObvious joined15:09
dimi1947 I finally commited the file and thus was able to abort15:10
→ dsdeiz joined15:10
Imaginativeone → Imaginativeone_a15:10
canton7 'git merge --abort' should work at *any* point15:10
← Imaginativeone_a left15:10
dimi1947 in my case it did not...I had to commit some files first...unmerged conflicts15:12
→ Gravitron joined15:13
jantje _ikke_: an incoming commit from upstream, which conflicts with an uncommitted local change that i'm popping from the stash15:13
← ilmgb left15:13
→ unreal_ joined15:13
→ ilmgb joined15:13
← howdoi left15:13
ChanServ set mode: +o15:14
← moird left15:14
→ djx joined15:14
Eugene changed the topic to: Welcome to #git, the place for git help and FRIDAYS! | Current stable version: 2.6.1 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-sweep: It's brooms, all the way down.15:14
Eugene set mode: -o15:14
← dsdeiz left15:14
→ dsdeiz joined15:14
← Sceorem left15:15
→ thiago joined15:15
← Anticom left15:15
→ BigWillie joined15:15
djx hey, I'm currently on a branch called foo. I need to rebase some commits already made on foo (not all of them) to master and I need to push master. how can I rebase a specific commit without switching branches?15:16
→ shinnya joined15:16
djx is it possible or do I have to stash changes?15:16
← unreal left15:16
canton7 djx, rebase will always check out something or other15:16
Eugene stash, switch branches, rebase(or cherry-pick), push.15:16
canton7 djx, you cannot rebase without first stashing unchanged changes15:16
→ blinkdesign joined15:16
djx ah okay, just to make sure15:16
canton7 djx, there's an argument to rebase which will do the checkout before doing anything else, if you want to save yourself a step :P15:16
djx lol15:17
thanks guys ;-)15:17
← roxlu left15:17
← barduck left15:17
← blinkdesign left15:17
→ mbrzuzy joined15:17
← ilmgb left15:17
jantje So, I have clients pulling from a mirror and pushing to the master server. The repository will be serving a lot of developers all committing to the same branch(es). So we're a bit afraid that one person has to du multiple git pull cycles before it can push15:17
→ cdg_ joined15:18
jantje is there an easy way to pull the avagere number of commits per hour15:18
→ Sadeukko joined15:18
← cdg left15:19
→ blinkdesign joined15:20
→ unreal joined15:20
← dopesong left15:20
→ Imaginativeone joined15:20
← TomyWork left15:21
→ madewokherd joined15:21
← rasto left15:21
← unreal_ left15:22
→ malukenho joined15:22
→ dopesong joined15:23
→ axtx joined15:23
→ moird joined15:23
→ hahuang61 joined15:23
← rchavik left15:23
← blinkdesign left15:25
← jmpp left15:25
← pratikma_ left15:27
← dopesong left15:27
→ jackburton joined15:27
→ dopesong joined15:28
← djx left15:29
→ jmpp joined15:30
← dsdeiz left15:31
← hahuang61 left15:31
Imaginativeone → Imaginativeone_a15:31
← Imaginativeone_a left15:31
← Meteorhead left15:32
← dopesong left15:32
← ProbabilityMoon left15:32
→ jteneyck joined15:34
← jteneyck left15:34
→ jteneyck joined15:34
← achadwick left15:34
→ rasto joined15:34
→ pratikmallya joined15:34
→ astrofog joined15:35
← e01 left15:35
← justanotheruser left15:36
→ justanotheruser joined15:37
→ blinkdesign joined15:37
← blinkdesign left15:37
← dimi1947 left15:37
← Balliad left15:37
→ bendangelo joined15:38
→ Haaibo joined15:38
→ nnyk joined15:40
→ blinkdesign joined15:40
← EduardoMartins left15:40
→ cdg joined15:43
← lg188 left15:44
← gabble_ left15:44
→ dimi1947 joined15:44
← nnyk left15:45
← Alienpruts left15:45
dimi1947 I created in the master branch a gitignore file with some entries...I then checkout out to another branch...returned to master again and the .gitignore file had lost its effectiveness...files marked in gitignore were started to be tracked AGAIN15:46
← ifra201 left15:46
→ armyriad joined15:46
→ darkbasic_ joined15:47
← darkbasic left15:47
← cdg_ left15:47
← armyriad left15:48
← The_Phoenix left15:48
← kukks left15:48
← sdothum left15:48
→ armyriad joined15:48
← cdg left15:48
← Dro left15:48
→ kpease joined15:49
← jteneyck left15:49
← jeffreylevesque left15:50
← bendangelo left15:51
← blinkdesign left15:52
→ blinkdesign joined15:52
→ Sasazuka joined15:53
→ EduardoMartins joined15:53
→ elsevero joined15:55
→ cerkauskas joined15:55
← strayPuppy left15:56
← blinkdesign left15:56
→ blinkdesign joined15:56
→ dsdeiz joined15:56
← User458764 left15:57
dimi1947 I cannot use git rm cached...there is a strange problem with the path15:58
jmckind → jmckind_15:58
← blinkdesign left15:58
→ blinkdesign joined15:58
← dionysus69 left15:59
← JJM left15:59
→ dopesong joined15:59
Haaibo → unaffiliated15:59
→ Peaker joined15:59
→ barduck joined16:00
jmckind_ → jmckind16:00
Peaker Hey, is there any program that tries to automatically rebase&test&push branches it finds under a certain name (such as proposed/<name>) and then if it fails, create (rejected/<name>)?16:00
thinking of writing one -- but if one exists I'd be happy to use that instead16:00
→ mwhooker joined16:01
→ ilmgb joined16:03
→ xbob joined16:03
← blinkdesign left16:04
← dopesong left16:04
→ nonconvergent joined16:04
← Darcidride left16:04
→ xudongz joined16:05
→ snowcycle joined16:05
→ blinkdesign joined16:05
nonconvergent How do I ignore a directory no matter where it occurs? We have a bunch of modules with target/ and I want to ignore them all. just target/ in the gitignore is what I want, right?16:05
→ zadock joined16:05
Seveas Peaker: you're looking for CI software like jenkins or gerrit16:06
← justanotheruser left16:06
→ gopar joined16:06
→ samw joined16:06
Seveas nonconvergent: echo target >> .gitignore16:06
→ justanotheruser joined16:06
→ irqq joined16:07
Seveas but yeah, target/ should work too16:07
→ sigdk joined16:07
← mwhooker left16:07
milki Peaker: you can test with man git check-ignore16:08
gitinfo Peaker: the git-check-ignore manpage is available at http://jk.gs/git-check-ignore.html16:08
milki er16:08
thats for nonconvergent16:08
→ dionysus69 joined16:08
← Peaker left16:08
→ JJM joined16:09
→ cabaire joined16:09
→ Peaker joined16:10
← blinkdesign left16:10
→ kukks joined16:12
← kukks left16:12
→ kukks joined16:12
→ faux___ joined16:12
→ MasterPiece joined16:12
← unaffiliated left16:13
→ imachuchu joined16:13
← justanotheruser left16:13
→ justanotheruser joined16:14
← halas left16:14
← phaleth left16:14
→ darkbasic joined16:15
→ xudongz1 joined16:15
← youngbaks left16:15
← darkbasic_ left16:15
← xudongz left16:16
xudongz1 → xudongz16:16
← bongjovi left16:16
← faux___ left16:16
→ pratikma_ joined16:18
← MrObvious left16:18
← patrick99e99 left16:18
→ juvenal joined16:18
→ sdothum joined16:19
→ User458764 joined16:19
← darkbasic left16:19
→ SharksAbove joined16:19
← SharksAbove left16:19
→ SharksAbove joined16:19
SharksAbove → Haaibo16:20
→ darkbasic joined16:20
← xudongz left16:20
← pratikmallya left16:20
→ arup_r joined16:21
→ maletor joined16:22
← Asenar left16:22
← hackel left16:22
→ hackel joined16:23
← ncd|leeN left16:23
→ BlaXpirit joined16:24
BlaXpirit hello. i'm using git clone --depth 1 to get the latest revision and download as little as possible.16:24
how can i update the repository to the latest commit, again downloading as little as possible?16:25
← darkbasic left16:25
← jceb left16:25
Eugene Generally, `git fetch` will only grab what is needed. This sounds like a !xy problem, and see also about using !shallow at all16:26
gitinfo Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...16:26
A shallow clone will clone a repository to a certain "depth", which sounds like a good idea for only obtaining the latest revision of a given repo. However, they often don't work as-advertised(breaking on fetch and push operations). Instead you should consider git-archive's --remote feature, or perhaps you're really encountering a !binary problem16:26
→ darkbasic joined16:26
BlaXpirit Eugene, i don't need to work or do anything with that repository16:27
i just need to always get its latest contents, downloading as little as possible16:27
← hackel left16:28
← nerd left16:28
→ bongjovi joined16:28
BlaXpirit additionally, just removing and redownloading it is also not a good option, because i need to recompile stuff only if there are any changes16:29
← User458764 left16:29
← ag4ve left16:29
BlaXpirit here is what i'm doing now: https://travis-ci.org/BlaXpirit/nim-random/jobs/85706393#L9916:29
→ durham joined16:30
← armyriad left16:30
BlaXpirit and i'm pretty sure that fetch+merge downloads much more than clone here16:30
← kurkale6ka left16:31
← bongjovi left16:31
→ User458764 joined16:31
→ rath joined16:31
← noisebleed_ left16:32
← justanotheruser left16:32
→ armyriad joined16:32
← MasterPiece left16:33
← tvw left16:33
→ HardWall joined16:34
← pR0Ps left16:34
→ kadoban joined16:34
→ tvw joined16:35
→ bongjovi joined16:36
→ wakd_ joined16:36
← bongjovi left16:36
→ youngbaks joined16:37
← hwoarang left16:38
← wakd left16:38
← Chunk2 left16:38
← maletor left16:38
← thiago left16:39
→ hwoarang joined16:39
← Sasazuka left16:39
← mrballcb left16:39
← Zemeio left16:40
← Zamyatin left16:42
→ joel_falcou joined16:42
← youngbaks left16:42
← jrnieder left16:43
← mutex_ left16:43
← dionysus69 left16:44
→ dionysus69 joined16:44
← tango_ left16:45
← jmckind left16:46
→ Chunk2 joined16:46
← andyr left16:47
← shinnya left16:47
← cerkauskas left16:47
→ dopesong joined16:48
← khmarbaise left16:49
← darkbasic left16:49
→ MasterPiece joined16:50
→ tango_ joined16:51
← tango_ left16:51
→ darkbasic joined16:52
→ pantsman- joined16:53
→ tango_ joined16:53
← dopesong left16:53
→ pratikmallya joined16:53
→ civo joined16:53
gitinfo set mode: +v16:53
civo hey!16:53
gitinfo civo: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.16:53
grammar_nazi → J3RN16:53
J3RN → grammar_nazi16:54
Seveas hello civo16:54
civo Is there a way to manually set the commit date in git-commit?16:54
Remram --date16:54
grammar_nazi → malide16:55
civo --date sets the author date, afaik16:55
malide → grammar_nazi16:55
→ doener joined16:55
← Peaker left16:55
→ youngbaks joined16:56
Remram you can set GIT_COMMITTER_DATE16:56
← pratikma_ left16:56
Remram GIT_COMMITTER_DATE="..." git commit16:56
BlaXpirit http://stackoverflow.com/questions/3895453/how-do-i-make-a-git-commit-in-the-past#comment-30157795 seems legit16:56
civo Remram: thank you!16:56
← ilmgb left16:56
→ bendangelo joined16:56
→ duckmaestro joined16:57
→ ilmgb joined16:57
→ islalobo joined16:57
← fscala left16:57
→ blinkdesign joined16:58
→ darkbasic_ joined16:59
← mbrzuzy left16:59
← barduck left17:00
→ mutex joined17:00
← darkbasic left17:00
← elsevero left17:00
← malukenho left17:00
→ sburg joined17:01
→ fscala joined17:01
← ilmgb left17:02
← samw left17:02
→ kpease_ joined17:03
sigdk I'm following a tutorial on git... http://rypress.com/tutorials/git/rebasing I don't see those "starts" at the commit history. Do I run a newer version than that used there or I did something wrong ?17:04
zifnab06 → zifnab17:06
← kpease left17:06
Zarthus you mean 'stars'?17:06
← darkbasic_ left17:07
← nicechap left17:07
→ darkbasic joined17:07
→ Asiajey joined17:07
← Asiajey left17:07
→ Asiajey joined17:07
→ Sasazuka joined17:07
← Asiajey left17:07
sigdk Zarthus, asterisks at the commit log17:07
see the url at the top17:08
Zarthus I can't replicate the exact way he has them, but I'd imagine they're branches17:08
← marcogmonteiro left17:09
BlaXpirit never seen those, at least don't remember17:09
→ sarink joined17:09
← vigintas left17:09
← madebymarkca left17:09
sarink how do i discard all local changes? i've tried.... git checkout -- ., git reset --hard origin/branch, git clean -df, git checkout branch, git checkout .17:10
also this is on a gigantic repo so each of those commands takes like 20s17:10
i'm getting upset17:10
i'm definitely at the origin of the repo (i can see the .git folder)17:10
→ samw joined17:11
← samw left17:11
← User458764 left17:11
← blinkdesign left17:12
→ fedexo joined17:13
← joseph_86 left17:13
→ Rodya_ joined17:13
← clemf left17:13
← shiriru left17:13
→ nate_c joined17:13
→ converge joined17:14
→ patrick99e99 joined17:14
→ skylite joined17:14
Seveas sarink: exept for untracked files those commands should have cleaned things up17:15
sarink Seveas: something really weird is happening. even if i do a git add .; git commit -m "asdf" it says "changes not staged for commit: bunch of stuff, no changes added to commit"17:16
is my git broken17:16
← keroro520 left17:16
Seveas sarink: can you pastebin your terminal output?17:16
← dreiss_ left17:17
← JJM left17:17
← dimi1947 left17:18
sarink Seveas: http://pastebin.com/6NfZsuAa17:18
← sigdk left17:18
→ ahrof joined17:18
← cabaire left17:19
← patrick99e99 left17:19
Seveas sarink: smells like strange filters or crlf issues17:19
what does git diff say?17:19
sarink let you know in about 60 seconds bc that's how long it will take17:19
Seveas :)17:20
← darkbasic left17:20
Seveas sarink: while you're at it, pastebin the output of git config --list (make sure you run it in the repo)17:20
→ darkbasic joined17:21
sarink Seveas: git diff shows a bunch of legitimate changes (that i don't want, ofc)17:21
→ samw joined17:21
→ Jackneill joined17:21
Seveas sarink: can you pastebin the output?17:22
→ keroro520 joined17:23
→ madebymarkca joined17:25
sarink Seveas: https://gist.github.com/sarink/17d8b716026f2f041cb217:25
→ mbrzuzy joined17:25
← gfixler left17:26
← RaceCondition left17:27
→ whitby joined17:28
Seveas sarink: can you disable this webui thing and try again?17:28
yes, I'm just stabbing in the dark there, but I can't think of another explanation. It's weird!17:29
→ thiago_ joined17:30
sarink in the meantime ill just re-clone the repo, it'll take like 20 min but i've already spent more than that17:31
→ RaceCondition joined17:31
sarink i dont know what is happening17:31
→ dreiss_ joined17:31
sarink i've disabled webui17:32
gonna see what checkout -- . and status returns now17:32
Seveas: no dice17:33
← converge left17:33
← roygbiv left17:33
→ clemf joined17:34
Seveas sarink: how about a post-checkout hook?17:34
kpease_ → kpease17:35
→ d4rklit3 joined17:37
← madebymarkca left17:37
grammar_nazi → malide17:38
malide → grammar_nazi17:38
← doener left17:39
← {AS} left17:41
← dreiss_ left17:41
gitinfo set mode: +v17:41
→ joeyDB joined17:42
gitinfo set mode: +v17:42
← jbondhus_ left17:42
→ jbondhus joined17:42
← keroro520 left17:42
absk007 how do I devoice?17:42
→ dmod_ joined17:43
gitinfo set mode: +v17:43
← jbondhus left17:43
→ jbondhus_ joined17:43
dmod_ What is the best way to auth using a rsa key and git-scm?17:43
← axtx left17:44
absk007 dmod_, put the .ssh_rsa private key in ~/.ssh and start the ssh agent. Access the git+ssh urls17:44
→ axtx joined17:44
absk007 dmod_, don't forget to add your public auth key in your repo server17:45
← clemf left17:45
← kpease left17:45
← Rodya_ left17:46
→ petersr joined17:46
Seveas absk007: /part and rejoin :)17:46
→ Nizumzen joined17:46
← irc-5225225 left17:46
→ StuckMojo joined17:47
← EduardoMartins left17:47
absk007 Seveas, is it bad to have a voice? My throats are paining, tho. :P17:47
StuckMojo hi. i just merged a branch into master, but i forgot to make a merge commit (so i could easily undo it if needed). any way to fix that?17:47
Seveas absk007: it's necessary to have +v unless you're identified with nickserv17:48
← xbob left17:48
absk007 StuckMojo, git reset HEAD^ and git merge --no-ff other-branch17:48
Seveas and here, have some rooibos with honey, that should help the throat :)17:48
← petersr left17:48
→ irc-5225225 joined17:48
← joeyDB left17:49
absk007 Seveas, thanks17:49
StuckMojo absk007: i did this to test that: in master: git checkout -b test; git reset HEAD^; git log17:49
→ User458764 joined17:49
StuckMojo the log still shows commits from that merged branch17:49
oh wai17:50
oh wait17:50
absk007 StuckMojo, well you need to do that in master17:50
StuckMojo i've not pushed yet17:50
i can go to another copy of the repo, see what the last commit in master was. rewind to that17:50
absk007 StuckMojo, nope! Stay here. Stay safe. You've git reflog to your rescue :)17:51
StuckMojo ok, i'm at least backing up the repo first ;)17:51
Seveas always sensible17:51
← User458764 left17:52
absk007 StuckMojo, nope! no need. Nothing is going to break.17:52
Seveas but you're on the right track. reset --hard to the pre-merge commit you find in the reflog (should be master@{1})17:52
and then merge --no-ff17:52
→ buffal0 joined17:54
StuckMojo hmm...ok back in master. after git reset HEAD^ git log still shows commits from that other branch17:54
error: Your local changes to the following files would be overwritten by merge:17:54
← michael_mbp left17:54
← eMBee left17:55
← Sadeukko left17:55
Seveas StuckMojo: yeah HEAD^ isn't the right thing there17:56
ahrof git checkout first17:56
← rath left17:56
Seveas and now that you've done that, master@{1} will be wrong too, find the right sha1 in git reflog master and reset to that17:56
← algae left17:56
← samw left17:57
→ samw joined17:58
BlaXpirit I want to get the latest contents of a repository (doing this with clone --depth 1) and then I want to periodically update it to the latest commit, downloading as little as possible (so preferably keeping it a shallow depth-1 clone). I don't need to do any work with the repository, just compile the files. How can I do this?17:58
→ kpease joined17:58
StuckMojo that error came from git merge --no-ff other-branch17:58
← samw left17:59
→ joeyDB joined17:59
absk007 StuckMojo, oh! damn! git reset HEAD^ was not the right think if you had more than one commit from the other-branch merged in fast fwd17:59
← civo left17:59
→ michael_mbp joined17:59
StuckMojo i went with: ssh other box, git log -1, back to original box, git reset --hard <commit from box B>; rm untracked files, git merge --no-ff --no-commit other-branch17:59
→ mwhooker joined17:59
StuckMojo git status; git commit17:59
fixed17:59
absk007: yeah there were a lot18:00
what would have been correct?18:00
→ noisebleed joined18:00
→ zivester joined18:01
← zadock left18:01
→ dreiss_ joined18:01
StuckMojo Seveas: so i could have found the pre-merge commit w/o going to another box that didn't have the merge yet?18:01
← s2013 left18:02
→ killa_kyle joined18:02
StuckMojo yeah that would have worked18:02
← youngbaks left18:03
← skylite left18:03
→ vigintas joined18:03
StuckMojo i did't know git could tell which branch commits came from18:03
that's always been my one weak spot with git18:03
after a merge i thought there was no way to tell18:03
← vigintas left18:03
← killa_kyle left18:03
→ vigintas1 joined18:03
→ algae joined18:03
StuckMojo so i always preface my commit messages with "branch_name: desc"18:04
that way after merges i can see in git log where they came from18:04
→ khmarbaise joined18:04
→ skylite joined18:04
← dreiss_ left18:05
← Amandil left18:05
→ Anamdil joined18:05
← jost_ left18:06
← sburg left18:06
→ straycat joined18:07
Seveas StuckMojo: you can find it in the reflog (git reflog master)18:07
← islalobo left18:07
← dionysus69 left18:07
StuckMojo last question: what's the version of reset that removes untracked files and such18:08
← vigintas1 left18:08
→ samw joined18:08
StuckMojo i.e. gets you to *exactly* what the working tree and everything looked like at that commit hash?18:08
it's like one step up from --hard18:08
grawity well that's pretty much what --hard does18:09
you can run a `git clean -fdx` to remove untracked junk18:09
→ blinkdesign joined18:09
grawity but tracked files are all 'reset' by --hard18:09
StuckMojo yeah sometimes with git reset --hard there are untracked stuff left around, so then i can't git checkout because they'd be overwritten18:10
Seveas reset never removes untracked files, so you need a combination of git clean -dfx and git reset --hard18:10
→ Anxi80 joined18:10
← Anxi80 left18:10
→ Anxi80 joined18:10
StuckMojo okie dokie oggy doggy18:10
thanks again folks18:10
→ tomboy64 joined18:10
StuckMojo er..wait18:11
← tomboy65 left18:11
StuckMojo so, now that i do have a merge commit, that means it's much easier to un-merge if i wanted to, right?18:11
→ dopesong joined18:11
StuckMojo git undo <merge commit hash> or some such, no?18:11
git revert i mean18:11
and what's the setting to default to making a merge commit?18:12
→ pratikma_ joined18:12
← dopesong left18:13
StuckMojo aha merge.ff18:13
← hyperair left18:14
← blinkdesign left18:14
→ islalobo joined18:15
← RaceCondition left18:15
madewokherd I don't think you can revert merges (and if you can, it sounds like a bad idea)18:15
← pratikmallya left18:15
StuckMojo ORLY?18:15
hmmm18:15
→ {AS} joined18:16
madewokherd if you want to "undo" a fast-forward just move to the commit you were at previously (git reflog can help with finding it)18:16
← Nizumzen left18:16
Seveas madewokherd: you can definitely revert merges, and it's not always a bad idea18:17
grawity you can sort-of revert merges (by specifying which parent you want)18:17
→ killa_kyle joined18:17
→ akiva joined18:17
← k_j left18:17
grawity but afaik it makes it troublesome to merge the same thing again18:17
straycat #git-devel is really quite quiet18:17
← kukks left18:17
grawity afaik most of the -devel happens on the mailing list18:17
StuckMojo Seveas: i guess if you revert, it's then hard to merge again?18:17
→ ASOLAr joined18:18
← killa_kyle left18:18
madewokherd the things you'd merged will still be in your history, so an attempt to merge them again will do nothing18:18
→ elsevero joined18:18
→ clemf joined18:18
StuckMojo ah yeah18:18
madewokherd futher updates may fail to merge because they're based on things you've reverted18:19
StuckMojo just read that in the man page18:19
See the revert-a-faulty-merge How-To[1] for more details.18:19
dmod_ absk007: even tho I have the key in my ~/.ssh its still asking for a password any clues?18:19
straycat grawity, ahh, yes i've sent an rfc there too, slightly worried i should have asked around first before coding my idea...18:19
StuckMojo in any case, merge commits seem like a good idea regardless18:19
so at least you can tell when merges happened18:19
i can anyway because of prepending brnach_name: to my commit messages18:20
madewokherd seems like once you have one that isn't upstream, you'll keep getting them18:20
StuckMojo but that's a kludge18:20
← GarethAdams left18:20
StuckMojo crap. git-htmldocs isn't in homebrew18:21
→ killa_kyle joined18:22
→ blinkdesign joined18:22
← killa_kyle left18:23
StuckMojo oh, i guess it's included in /usr/local/Cellar/git/2.6.1/share/doc/git-doc/18:23
→ killa_kyle joined18:23
StuckMojo yup, under howto in there18:25
ok, l8rz, and thanks again!!18:25
← StuckMojo left18:25
← Gravitron left18:25
→ GarethAdams joined18:26
← bendangelo left18:26
→ GT4066 joined18:26
→ bsanford joined18:26
→ pR0Ps joined18:27
← clemf left18:28
← joki left18:29
→ vigintas joined18:29
→ User458764 joined18:29
← vigintas left18:29
→ CheckDavid joined18:29
→ vigintas joined18:30
→ joki joined18:30
→ clemf joined18:30
absk007 dmod_, you did everything as this one says right? https://confluence.atlassian.com/bitbucket/set-up-ssh-for-git-728138079.html18:31
← samw left18:31
→ cvanball joined18:32
← elsevero left18:32
→ samw joined18:33
← de-vri-es left18:33
→ de-vri-es joined18:33
→ dionysus69 joined18:33
← samw left18:34
→ fees joined18:34
→ boner joined18:34
← pokergod left18:34
← vigintas left18:36
← islalobo left18:37
→ vigintas joined18:37
→ malukenho joined18:37
dmod_ absk007: does it matter if i used puttyGen originally?18:37
absk007 dmod_, nope!18:37
dmod_ ok thats weird its still not letting me use it...18:38
← vok` left18:38
dmod_ absk007: https://www.irccloud.com/pastebin/6TumdwnX/18:38
→ gfixler joined18:38
absk007 if you've a private key in ~/.ssh and an ssh agent running that's good to go18:38
→ vok` joined18:39
→ Imaginativeone joined18:39
→ strayPuppy joined18:39
→ zumba_ad_ joined18:40
absk007 dmod_, have you configd. your public ssh key in the remote server i.e. adding it to auth_keys18:41
← clemf left18:41
dmod_ Its on my friends server he said he added it.18:41
absk007 dmod_, he is lying. Fight with him.18:41
;)18:41
→ geomyidae_ joined18:42
absk007 dmod_, why is it asking for ssh passphrase twice and then asking the password? Did you repeat something?18:42
dmod_ nope18:42
→ samw joined18:43
→ clemf joined18:43
→ JJM joined18:44
→ mizu_no_oto joined18:46
← clemf left18:46
← devoldmx left18:47
← samw left18:48
absk007 dmod_, does your friend have a ssh server running? :P18:48
→ oojacoboo joined18:48
dmod_ I can connect to it using putty just not git or the ssh command18:48
absk007 has your friend copied your public ssh key to the remote's ~/.ssh dir?18:50
← mbrzuzy left18:51
→ FireArrow133 joined18:51
dmod_ 2:35 PM <jakimfett> ok...the key is set up18:52
grawity specifically, has your friend copied the key to ~/.ssh/authorized_keys18:52
was the key actually in OpenSSH format18:52
can you run `ssh -vv [email@hidden.address]18:52
Nugget https://macnugget.org/projects/publickeys/18:52
grawity and pastebin the output of that?18:52
← notebox left18:54
dmod_ Thought i saved it as openSSH guess not because once i over wrote it it worked.18:54
→ dopesong joined18:54
grawity "saved it as openssh" – puttygen has two options for that18:55
in the main screen it shows the public key18:55
← MasterPiece left18:55
grawity in the export menu it lets you save the private key18:55
→ clemf joined18:57
→ jerematic joined18:57
← jerematic left18:57
→ Ceber joined18:57
→ s2013 joined18:58
← negaduck left18:58
← astrofog left18:58
→ Gravitron joined18:59
→ citizen-stig joined19:00
← jmpp left19:02
→ RaceCondition joined19:02
→ justanotheruser joined19:03
← lmat left19:03
→ shinnya joined19:03
← killa_kyle left19:03
→ mbrzuzy joined19:03
← kadoban left19:03
→ s00pcan_ joined19:04
→ samw joined19:04
→ CKyle joined19:04
← IrishPrime left19:04
→ anchorite joined19:04
→ converge joined19:05
← samw left19:07
→ sfan786 joined19:07
← s00pcan_ left19:08
← ASOLAr left19:09
→ rubdos joined19:11
← User458764 left19:11
rubdos My girlfriend probably messed up, she gets ' ! [remote rejected] master -> master (invalid files) ' when trying to push.19:11
I cannot find references via Google to that specific message (invalid files). Should I have a look in the GIT source?19:12
← dsdeiz left19:12
← tvw left19:13
← arup_r left19:13
nonconvergent rubdos What's git remote -vv look like?19:14
→ samw joined19:14
nonconvergent What's she got staged?19:14
rubdos asking it, nonconvergent; I'm remote atm.19:14
← shinnya left19:14
→ ASOLAr joined19:15
rubdos Just... "invalid files", never heard of.19:15
→ killa_kyle joined19:15
rubdos git status:19:15
On branch master19:15
Your branch is ahead of 'origin/master' by 2 commits.19:15
(use "git push" to publish your local commits)19:15
nothing to commit, working directory clean19:15
nonconvergent You're ahead by 2 commits with nothing to commit?19:16
rubdos additional (including remote -vv) http://fpaste.org/280115/22959144/19:16
nonconvergent, so git push shouldn't fail anything. Not even diverged19:16
← sfan786 left19:16
rubdos Could that be the overleaf git implementation that sucks?19:16
nonconvergent I don't know what overleaf is.19:17
→ daito joined19:17
rubdos overleaf is an online LaTeX collaboration tool, which "supports" git.19:17
← khmarbaise left19:17
← ASOLAr left19:17
← sanketdg left19:17
→ ASOLAr joined19:18
→ tgunr joined19:18
→ cagedwisdom joined19:18
← clemf left19:18
→ RaceCondition_ joined19:18
rubdos Would you (or someone else) have any clue what "invalid files" means?19:19
perhaps disk corruption of the .git tree?19:19
→ King_Hual` joined19:19
grawity the message doesn't seem to be in git.git19:19
← RaceCondition left19:19
RaceCondition_ → RaceCondition19:19
rubdos grawity, so, probably the server sends that.19:20
git fsck doesn't give any errors, all objects pass. Probably overleaf bug.19:21
*insert rant about depending on proprietary software*19:21
→ clemf joined19:22
← daito left19:22
← King_Hual left19:22
← ___thomasreggi__ left19:22
← cagedwisdom left19:26
Imaginativeone → Imaginativeone_a19:26
→ Alenah joined19:26
rockfruit → charles-fruit19:26
charles-fruit → rockfruit19:26
← converge left19:27
← ASOLAr left19:27
← strayPuppy left19:28
← JJM left19:28
Imaginativeone_a → Imaginativeone19:29
→ Amandil joined19:29
→ converge joined19:29
← clemf left19:31
← Anamdil left19:31
→ clemf joined19:32
→ sgen_ joined19:32
→ JJM joined19:33
→ clemf_ joined19:33
→ sfan786 joined19:35
→ paul424 joined19:35
← King_Hual` left19:35
→ King_Hual joined19:35
← justanotheruser left19:35
← clemf left19:36
→ justanotheruser joined19:37
← GT4066 left19:37
← anth0ny_ left19:37
→ anth0ny joined19:38
← Ceber left19:38
→ cagedwisdom joined19:38
→ k_j joined19:39
→ jmibanez joined19:40
← blinkdesign left19:40
← thiago_ left19:41
→ thiago joined19:41
→ mac_ified joined19:41
← tinanoo1 left19:41
→ jmpp joined19:41
← pratikma_ left19:41
→ pratikmallya joined19:42
→ tinanoo joined19:42
→ neodon joined19:43
← King_Hual left19:44
→ ___thomasreggi__ joined19:44
→ King_Hual joined19:44
← justanotheruser left19:45
→ patric100e99 joined19:45
← goTAN left19:46
← tinanoo left19:47
jwmann Can gitconfig's command line alias reference custom functions defined in bashrc/profile19:47
?19:47
← nilg left19:47
← ahrof left19:47
jwmann Because it doesn't seem like it19:47
→ strayPuppy joined19:48
→ RealityVoid joined19:50
← patric100e99 left19:50
→ tinanoo joined19:50
← HardWall left19:50
← converge left19:52
→ jeffmjack joined19:53
→ houtens joined19:54
→ choki joined19:54
← tinanoo left19:55
← joeyDB left19:56
← k_j left19:56
← Gravitron left19:58
→ tinanoo joined19:58
→ PCatinean_ joined19:58
Seveas jwmann: it can't. try !bash -l 'your alias'19:59
← leTali left19:59
← bitkiller left19:59
→ converge joined19:59
← surfdue left19:59
→ User458764 joined19:59
jwmann Seveas: Thanks! I literally just figured that out like 3 minutes ago :P19:59
Except I'm using bash -c -l20:00
← axtx left20:00
jwmann When I noticed that I could just do that, I facepalmed because I use the exact same techinique in my vimrc20:00
← modocache left20:00
jwmann Gahhh20:00
Seveas pats jwmann on the back20:01
Seveas there there, you're not that stupid :)20:01
jwmann sobs in the corner20:01
← mbrzuzy left20:01
jwmann Hheheheh :P20:02
→ blinkdesign joined20:02
→ MattMake_ joined20:02
← PCatinean left20:02
→ leTali joined20:03
→ surfdue joined20:03
← samw left20:03
→ ASOLAr joined20:03
→ samw joined20:04
← wakd_ left20:04
← MattMaker left20:05
← Hounddog left20:05
← King_Hual left20:05
→ Gravitron joined20:06
← dopesong left20:07
← ASOLAr left20:07
← samw left20:07
← geoid_ left20:07
→ hyperair joined20:08
→ aviraldg joined20:08
→ geoid_ joined20:08
← mizu_no_oto left20:11
→ Darcidride joined20:12
← clemf_ left20:12
← choki left20:12
← User458764 left20:12
← geoid_ left20:12
→ wakd joined20:13
← sfan786 left20:13
→ clemf joined20:14
→ IOhannes joined20:14
→ samw joined20:14
← IOhannes left20:15
→ k_j joined20:15
← madewokherd left20:15
→ mbrzuzy joined20:15
→ sfan786 joined20:16
→ nerd joined20:16
→ User458764 joined20:16
→ asdjsonyou joined20:17
← irqq left20:19
→ cmtptr joined20:21
cmtptr I use git-p4 to interface with a perforce repo. Recently somebody submitted a third party package to perforce which contains its own .git dir. Now git is all kinds of upset with "Invalid path" errors, and perpetually have this path in my staging index marked as deleted. What do I do?20:22
← anth0ny left20:23
→ anth0ny joined20:23
← MattMake_ left20:23
qsuscs cmtptr: tell the other guy to fix that shit.20:23
→ Ceber joined20:23
qsuscs respectively i suppose the repo admins to remove it from the history20:24
cmtptr of course, but when that results in no action (and at my workplace, it will), can I resolve this on my end?20:24
qsuscs hmh20:25
maybe you can remove the .git with p4 itself and sync with git-p4 again20:25
→ joeyDB joined20:25
cmtptr I guess the worst-case is that I could exclude that path from my perforce view and re-clone20:25
← buffal0 left20:26
→ dreiss_ joined20:27
Seveas git, *really* doesn't want to have a folder named .git in a tree20:27
cmtptr I understand that. I don't either20:27
← skylite left20:27
← rwb left20:28
cmtptr my question is more about how can I fix this (that is, exclude that path) in such a way that subsequent git-p4-rebases won't try to import it again20:28
and how do I fix the history that's currently there to get rid of it20:28
qsuscs hm, i suppose it doesn’t care when it IS in history as long as you don’t checkout it or so20:29
← k_j left20:30
→ sheilong joined20:30
qsuscs bribe the p4 admin :p20:30
← joel_falcou left20:30
→ bendangelo joined20:31
← {AS} left20:31
← encod3 left20:31
← Anxi80 left20:32
→ nettoweb joined20:33
← Amandil left20:33
← dreiss_ left20:33
← asdjsonyou left20:33
← strayPuppy left20:35
→ Macaveli joined20:36
← paul424 left20:36
→ MattMaker joined20:37
← rnsanchez left20:37
→ Dro joined20:37
→ youngbaks joined20:38
→ citizen_stig joined20:38
→ maletor joined20:41
← citizen-stig left20:41
← BigWillie left20:42
← mbrzuzy left20:44
← filisko left20:44
← Gravitron left20:44
← algae left20:45
← wakd left20:45
→ LaptopBrain joined20:45
→ strayPuppy joined20:47
← ___thomasreggi__ left20:47
→ jteneyck joined20:47
← jteneyck left20:47
→ jteneyck joined20:47
→ citizen-stig joined20:48
→ ___thomasreggi__ joined20:49
→ ASOLAr joined20:49
← citizen_stig left20:51
← User458764 left20:51
← jteneyck left20:52
→ SimonNa joined20:52
→ jeffreylevesque joined20:53
→ xlegoman joined20:53
→ maletor_ joined20:55
← maletor_ left20:55
← sfan786 left20:55
← maletor left20:55
→ zaherdirkey joined20:56
→ sfan786 joined20:56
← joeyDB left20:56
← sfan786 left20:56
zaherdirkey hi, when i merge a branch, do i will lose my commits notes in that branch?20:56
grawity no20:57
nonconvergent zaherdirkey: You never lose notes20:57
but notes are always local.20:57
→ elsevero joined20:57
← youngbaks left20:57
zaherdirkey it ask me to commit after merge, with all midification for that branch20:58
→ diegoviola joined20:58
grawity nonconvergent: they aren't necessarily; I know a few repos which push/fetch notes20:58
→ wakd joined20:58
← nemix_ left20:59
← citizen-stig left20:59
zaherdirkey i want my notes in the master branch too20:59
→ nemix_ joined20:59
→ gfixler1 joined20:59
→ nemix__ joined21:00
← Darcidride left21:00
← eka left21:00
← elsevero left21:01
← gfixler left21:01
→ mezcan joined21:02
→ nerium joined21:02
→ elsevero joined21:02
nerium Are submoduls just subfolders with a .git folder?21:02
← samw left21:02
← rubdos left21:03
gitinfo set mode: +v21:03
vishal nerium: yes but they are managed by the (man git-submodule) family of commands21:03
gitinfo nerium: the git-submodule manpage is available at http://jk.gs/git-submodule.html21:03
→ pantsman_ joined21:03
nerium vishal: Exactly, thanks!21:03
Seveas nerium: usually the url of the repo is also recorded in .gitmodules, which is one of the things git-submodule does21:03
qsuscs and it’s not stored as a tree object21:03
← nemix_ left21:04
qsuscs also it’s not necessarily a .git _folder_, it might be a file pointing to a folder (plaintext, not a symlink or so)21:04
→ samw joined21:04
← darkbasic left21:05
← pantsman- left21:05
← victortyau left21:05
→ maletor joined21:06
← krawchyk left21:06
← anchorite left21:07
← bendangelo left21:07
→ darkbasic joined21:08
→ GT4066 joined21:08
← AaronMT left21:08
← pantsman_ left21:08
← samw left21:08
→ HardWall joined21:08
← RealityVoid left21:10
← ASOLAr left21:12
→ samw joined21:14
← cbonobo left21:15
← CKyle left21:16
→ Vile1 joined21:16
← Kicer86 left21:17
→ daito joined21:18
← Vile left21:19
← a3Dman left21:19
→ flashpoint9 joined21:19
← jmpp left21:20
← cmoneylulz left21:20
← mezcan left21:20
→ ASOLAr joined21:20
← sgambino left21:21
qsuscs osse: in awk, how do you print nothing unless an explicit match is found?21:21
← cvanball left21:21
← MarkyC left21:21
qsuscs that is, i have /regex/ { do stuff }, in all other cases nothing shall be done21:21
← ASOLAr left21:22
← daito left21:22
grawity isn't that ... the default?21:22
qsuscs obviously not21:23
← Jackneill left21:23
grawity well I dunno, | awk '/foo/ {print}' seems to only print matching lines21:23
qsuscs wat21:24
yeah now it does that, too21:24
wtf awk21:24
← bmilesp left21:24
qsuscs okay wtf. it does work when i pass the script in argv21:24
with awk -f, it does not.21:25
→ Nizumzen joined21:25
→ basis joined21:25
← editshare-ericf left21:25
grawity maybe your -f file has syntax errors and gets parsed as separate /cond/ and {stuff} blocks21:25
→ jmpp joined21:26
grawity a /cond/ with no code block means {print}, and a {stuff} block with no condition matches everything...21:26
→ a3Dman joined21:26
→ kadoban joined21:26
qsuscs http://ur1.ca/o1tyz21:26
(more is to come, but the print $2 is the first step)21:26
grawity http://sprunge.us/UIgE21:27
qsuscs :awk:21:28
← SimonNa left21:29
← blinkdesign left21:30
grawity basically the 'FS="="' line is parsed as a condition21:30
← killa_kyle left21:30
← Dragooon left21:30
qsuscs ahhhh i see21:30
← jmpp left21:30
← zumba_ad_ left21:30
qsuscs and it evaluates to true, and the rest is implied as {print}21:30
grawity yes21:31
→ blinkdesign joined21:31
→ patrick99e99 joined21:34
→ Chaoborid joined21:35
→ variable joined21:35
← Padawan left21:35
← Dro left21:36
← Chaoborid left21:36
→ knownasilya joined21:36
→ Ploppz joined21:37
← mwhooker left21:37
→ chaoborid joined21:37
Ploppz I committed the changes in my local working directory and called `git fetch origin myBranch`, then `git merge FETCH_HEAD`, but it says "Already up to date.". However, it really is not... any ideas?21:37
→ Padawan joined21:38
← patrick99e99 left21:39
→ jalnt_laptop joined21:40
→ zac_g joined21:41
→ ASOLAr joined21:42
← variable left21:42
→ encod3 joined21:42
← ___thomasreggi__ left21:44
← tristanp left21:44
Ploppz _never mind_21:45
← Ploppz left21:45
← LaptopBrain left21:45
→ ___thomasreggi__ joined21:45
→ tristanp joined21:45
→ boombatower joined21:45
→ encod3_ joined21:45
← encod3 left21:45
← tristanp left21:46
→ tristanp joined21:46
← gopar left21:46
← chaoborid left21:46
← encod3_ left21:48
← converge left21:49
→ Chaoborid joined21:49
→ awkwardusername joined21:50
← awkwardusername left21:50
← blinkdesign left21:50
→ awkwardusername joined21:50
← sarink left21:53
← m0ltar left21:54
← Macaveli left21:55
→ mgsloan joined21:55
← nerium left21:56
→ toothrot joined21:57
→ m0ltar joined21:58
→ blinkdesign joined21:58
→ CKyle joined21:59
→ josdeha_rt joined22:00
→ ProbabilityMoon joined22:00
← tristanp left22:01
→ converge joined22:01
← PCatinean_ left22:01
← pratikmallya left22:01
→ tristanp joined22:01
← nidr0x left22:02
→ btree joined22:02
← HardWall left22:03
← btree left22:04
← Dougie187 left22:04
→ madewokherd joined22:04
→ tyreld joined22:05
→ Macaveli joined22:06
← tristanp left22:06
→ King_Hual joined22:07
→ nb_bez___ joined22:08
← pflanze left22:09
→ patrick99e99 joined22:10
→ treehug88 joined22:10
→ pratikmallya joined22:10
← sheilong left22:11
→ nidr0x joined22:11
← blinkdesign left22:11
← flashpoint9 left22:11
← nidr0x left22:12
→ nidr0x joined22:13
→ mwhooker joined22:13
← dionysus69 left22:13
← stamina left22:14
← maletor left22:15
← josdeha_rt left22:16
→ sburg joined22:16
→ tristanp joined22:17
← Chaoborid left22:17
← d4rklit3 left22:18
← nettoweb left22:18
→ artisanIndia joined22:19
artisanIndia I have a repo with old code laravel 4.2 to be precise and now I have upgraded the website from 4.2 to 5.1 on my localhost now when I am trying to push it to repo I am getting error22:19
→ negaduck joined22:20
absk007 artisanIndia, what error?22:21
← CKyle left22:21
← vok` left22:24
artisanIndia no error22:24
when I am pushing this new code it says that I should pull first22:25
if I will pull my code will be old again22:25
← Peuc left22:26
← ProbabilityMoon left22:26
→ jmpp joined22:26
→ maletor joined22:26
← converge left22:28
← axl_ left22:28
→ gopar joined22:28
← artisanIndia left22:28
absk007 artisanIndia, git branch new-branch; git fetch upstream; git reset upstream --hard; git rebase upstream; git merge --no-ff -s recursive -X theirs new-branch22:29
Imaginativeone → Imaginativeone_a22:29
→ editshare-ericf joined22:29
Imaginativeone_a → Imaginativeone22:29
← tristanp left22:30
→ nene2 joined22:30
← jmpp left22:31
→ jteneyck joined22:32
→ vok` joined22:32
← nene1 left22:32
→ nerium joined22:33
← void___ left22:33
→ swappermall joined22:33
→ void___ joined22:34
← elsevero left22:36
← basis left22:38
→ atomicb0mb joined22:38
← nonconvergent left22:39
Imaginativeone → Imaginativeone_a22:39
← Imaginativeone_a left22:39
→ cvanball joined22:40
→ Zamolxe joined22:40
← Macaveli left22:40
← editshare-ericf left22:41
← Zamolxe left22:43
← ___thomasreggi__ left22:43
→ cyphase joined22:44
→ samw_ joined22:46
→ teknozulu joined22:47
teknozulu I have now made sure git isn't tracking any binaries (git ls-files shows only want I want to be there), but when I push it'll try to upload something that's multiple megabytes22:48
how do I find out what it is trying to do?22:48
→ sabgenton joined22:49
→ basis joined22:49
← samw left22:50
→ k_j joined22:50
→ Imaginativeone joined22:50
← nerd left22:50
← samw_ left22:52
→ nettoweb joined22:52
← sabgenton left22:52
→ sabgenton joined22:52
sabgenton Is there a way to type `git pull someRemote` and have it default to branch foo?22:52
(I don't mean git config branch.foo.merge refs/heads/foo)22:52
→ scriptThis joined22:54
→ jmpp joined22:55
← jeffreylevesque left22:55
→ daito joined22:55
← zaherdirkey left22:56
→ jeffreylevesque_ joined22:56
→ glen joined22:56
glen why clone of this repo depth=1 still clones almost full 900mb? git clone https://github.com/cdnjs/cdnjs.git --depth=1 t122:56
without depth size is ~1g22:57
→ tomog999_ joined22:57
glen i mean with --bare option, with local checkout it's 22g22:57
→ zacts joined22:58
← cvanball left22:58
← jalnt_laptop left22:58
← scriptThis left22:59
→ scriptThis joined22:59
← tomog999 left23:00
← daito left23:00
← clone1018_ left23:00
← jteneyck left23:01
→ jalnt_laptop joined23:01
← mgsloan left23:01
→ elsevero joined23:01
← scriptThis left23:02
→ mgsloan joined23:02
boombatower glen: looks like most of the comments are updating deps...eww23:02
→ ScriptThis joined23:02
boombatower such bloat23:02
← ScriptThis left23:03
← boombatower left23:03
glen nevertheless i don't understand why it fetches more than one commit, shouldn't --depth=1 fetch only 1 commit of all fetched branches?23:03
→ ScriptThis joined23:03
← ScriptThis left23:05
← jeffreylevesque_ left23:06
← mgsloan left23:07
→ MrObvious joined23:07
← basis left23:07
→ mgsloan joined23:08
← zacts left23:09
MrObvious So I just committed my changes and it appeared git had no problems23:09
← atomicb0mb left23:09
→ clone1018_ joined23:10
MrObvious but when I check github - there are no changes at all23:10
what am I missing ?23:10
glen git push23:10
MrObvious right23:10
hold on23:10
glen here's the git clone --depth and without : http://sprunge.us/SVEL23:11
Imaginativeone → Imaginativeone_a23:11
← Imaginativeone_a left23:12
glen i've expected t1 to be rather smaller, but it's 90% of the full size23:12
→ samw joined23:13
→ daito joined23:14
MrObvious glen, I cloned the project I'm working on - and when I pushed the changes git tells me I dont have permission23:16
→ ScriptThis joined23:16
MrObvious is there a way to push the changes to the fork of that project instead of the original project ?23:16
← picachu left23:16
→ picachu_ joined23:17
Bombe MrObvious, sure. Just add a new remote and push your changes to that.23:17
MrObvious without having to clone the fork and download the files23:17
glen so apparently not the history is big, but the single checkout is big. after clone with depth indeed only 1 revision is there23:17
MrObvious Bombe, how do I tell git to push changes to the fork instead to the original ?23:18
← ScriptThis left23:18
glen MrObvious: git remote myrepo add YOUR_REPO URL; git push -u myrepo23:18
← kpease left23:18
MrObvious perfect23:18
→ ScriptThis joined23:18
MrObvious thanks23:18
glen but it's better to rename upstream repo: git remote rename origin upstream; git remote add origin yoururl23:18
this way master branch stays linked with "upstream" and other branches with "origin"23:19
← daito left23:19
MrObvious turns out I have to study the terminology first23:20
← JJM left23:20
← s2013 left23:20
← ScriptThis left23:21
→ t-ask joined23:21
→ ScriptThis joined23:21
→ jteneyck joined23:21
← akiva left23:22
t-ask Just a question. How do I see that I didn't forget to merge the current branch from remote? I check it with "git status" then it shows me the branch name. I thought, ok fine i'm on it. While it turned out that I just git fetched the remote.23:24
is there a better way to check if I'm up-to-date?23:24
absk007 t-ask, `git log origin/curr-branch..`23:25
if anything shows, you're ahead23:25
trv i have two cvs->git imported repos of the same project. i investigate why hashes are different for them, although history is absolutely the same. the difference starts right after the first commit, two files having different create hashes in one repo i have [index 0000000..47afb61] in second - [index 0000000..47afb61a]23:25
← m_ben left23:25
trv i do git checkout <commit> <file> from both repo's and compare sha256 output - they're the same23:26
Celelibi Can I cherry-pick a commit, but just for a file or two?23:26
← madewokherd left23:26
absk007 Celelibi, you can `git co <commit> -- filename`23:27
trv where i can take a look - why git creates different hash values for absolutely the same files, which were committed in the same time by one person?23:27
Celelibi absk007: but then I won't get the commit message or any meta information.23:27
absk007 Celelibi, while committing that file, `git commit -c <commit-hash>`23:28
trv, because git != cvs23:28
→ madewokherd joined23:28
← jeffmjack left23:28
← thiago left23:32
→ MistahKurtz joined23:34
→ Maple__ joined23:37
← snowcycle left23:41
→ malukenh_ joined23:44
→ clemf_ joined23:44
← malukenho left23:44
absk007 trv, https://gist.github.com/masak/2415865#file-explanation-md23:44
← sgen_ left23:45
← clemf left23:46
← Nikhil_D1 left23:46
→ Nikhil_D joined23:47
← geomyidae_ left23:48
← swappermall left23:48
→ seven-dev joined23:51
← jteneyck left23:51
← BlaXpirit left23:52
→ Gravitron joined23:53
← CheckDavid left23:53
→ swappermall joined23:53
← zivester left23:54
← hexagoxel left23:55
← pratikmallya left23:55
← King_Hual left23:56
→ hexagoxel joined23:56
← fracting left23:56
← juvenal left23:57
→ Lyqyd joined23:57
← fstd left23:59
→ fstd joined23:59

Logs Search ←Prev date Next date→ Channels Documentation