IRCloggy #git 2017-08-17

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.

2017-08-17

→ Rotaerk joined00:00
→ kadoban joined00:00
← mud left00:01
← mikecmpbll left00:05
← cagomez left00:06
← svm_invictvs left00:06
→ dendazen joined00:07
← chachasmooth left00:08
→ dabura667 joined00:08
← oprypin left00:08
→ BlaXpirit joined00:09
BlaXpirit → oprypin00:09
← kadoban left00:09
→ orbyt_ joined00:11
→ chachasmooth joined00:11
→ ecuanaso joined00:12
→ Fudge joined00:12
Fudge hi trying to figure out from a script how to get my public ssh key00:12
the script says00:12
# Fetch SSH key from github.00:13
wget -q https://github.com/pin.keys -O postinst/authorized_keys00:13
← redtail left00:13
Fudge if I am authorized to github with git config global user.name and email will it get my key?00:14
← dreiss left00:14
← dendazen left00:15
← j08nY left00:19
→ Bobdude joined00:20
→ Rodya_ joined00:21
← Elon_Satoshi left00:21
← darth_platypus left00:22
← dviola left00:23
← Cabanossi left00:26
← blinkingprompt left00:27
→ Cabanossi joined00:28
← Bobdude left00:29
← ecuanaso left00:31
← brent__ left00:33
→ brent__ joined00:34
← brent__ left00:34
← rda-mac left00:34
→ agnki joined00:34
→ rda-mac joined00:35
→ brent__ joined00:35
→ boombatower joined00:35
← brent__ left00:36
← xaa left00:37
→ Lyqyd joined00:37
→ Bobdude joined00:37
→ kadoban joined00:38
← rda-mac left00:39
→ Elon_Satoshi joined00:39
→ Gurkenglas_ joined00:39
← itseris left00:41
→ tlaxkit joined00:41
← theoceaniscool left00:42
← CussBot left00:42
→ CussBot joined00:43
→ theoceaniscool joined00:44
← EvilPenguin left00:44
→ dviola joined00:45
← caseyowo left00:48
→ bronson joined00:50
← Tobbi left00:52
← theoceaniscool left00:52
← govg left00:53
← Brain left00:54
← kadoban left00:55
← thiago left00:55
→ czart__ joined00:55
← bronson left00:56
← kjhoj left00:58
→ kadoban joined00:59
→ Brain joined00:59
← Hello71 left00:59
← czart_ left00:59
Frogging101 Fudge: git's config won't affect wget. I'm not sure what https://github.com/pin.keys is supposed to return01:00
Fudge ok thanks very much mate01:00
Frogging101 only way it could get you *your* keys is if it reads the github login cookie.01:00
(I don't know if it does, this is hypothetical)01:00
where did you find this script?01:01
Fudge: oh! It looks like https://github.com/[username].keys returns your keys01:04
see for example https://github.com/frogging101.keys01:04
Fudge git clone https://github.com/pin/debian-vm-install.git01:05
→ gopar joined01:05
← phinxy left01:05
← hendry left01:06
Frogging101 makes sense. his github name is pin so that's what was in the script :p01:06
Fudge ah right I see01:06
thank you :D01:06
← Achylles left01:07
Frogging101 thank you too, I learned something new today as well :p01:07
Fudge i couldnt understand why pin was there or what it meant, cheers for that :D01:07
i read the api allows anyones pub keys to be available which is really quick and easy01:07
Frogging101 yeah that's convenient01:08
← gopar left01:10
← ti2 left01:10
→ finalbeta joined01:11
→ ti2 joined01:12
→ ogny joined01:14
← Gustavo6046 left01:14
→ supremum joined01:15
← ogny left01:15
← kfoonamalik left01:15
→ justan0theruser joined01:24
→ cam27 joined01:24
→ jottr_ joined01:25
← justanotheruser left01:25
→ gopar joined01:25
← gopar left01:25
→ dec0n joined01:25
→ YuGiOhJCJ joined01:26
← Cabanossi left01:26
← jottr left01:28
→ Cabanossi joined01:28
← Gurkenglas_ left01:29
→ Wulf4 joined01:32
← Murr left01:33
→ Murr joined01:33
→ cdg joined01:33
→ redtail joined01:34
→ snowkidimd joined01:35
← Kevgeon left01:35
← Wulf left01:35
Wulf4 → Wulf01:35
← Oatmeal left01:36
← cdg left01:38
← dviola left01:39
← jottr_ left01:40
→ Sasazuka__ joined01:42
← Sasazuka left01:43
← rewt left01:45
← ilbot3 left01:45
→ ResidentBiscuit joined01:45
→ dreiss joined01:47
← Sasazuka__ left01:47
← donmichelangelo left01:48
→ rewt joined01:49
← sunri5e left01:50
← KeyJoo left01:52
← leeN left01:52
→ ilbot3 joined01:52
→ dviola joined01:53
→ morenoh149 joined01:55
→ sunri5e joined01:56
← einnjo left01:56
→ LeBlaaanc joined01:56
→ einnjo joined01:57
← morenoh149 left02:00
← einnjo left02:01
← in1t3r_ left02:02
→ in1t3r joined02:02
→ jameser joined02:03
← jpX left02:03
← in1t3r left02:03
→ in1t3r joined02:04
← agnki left02:06
← snowkidimd left02:06
← cagedwisdom left02:07
→ snowkidi_ joined02:08
← chachasmooth left02:09
→ cqi joined02:10
→ kpease joined02:10
← kpease left02:11
→ chachasmooth joined02:11
← snowkidi_ left02:13
silverdust What's the way to see file changes from a hash in commit history again? Kinda like git diff from that point in time against other time02:14
→ snowkidimd joined02:15
← tterrag left02:17
← str left02:17
← dermoth left02:20
→ dermoth joined02:20
→ cagedwisdom joined02:20
← tlaxkit left02:21
← s17 left02:21
← vdl left02:21
→ ShapeShifter499 joined02:21
← chachasmooth left02:22
→ LeelooMinai joined02:25
→ mizu_no_oto joined02:26
→ Vortex34 joined02:27
→ JanC_ joined02:28
→ Oatmeal joined02:28
← dabura667 left02:28
→ chachasmooth joined02:29
JanC → Guest644702:29
← Guest6447 left02:29
JanC_ → JanC02:29
← LeBlaaanc left02:29
← Vortex35 left02:30
← dec0n left02:31
← jab416171 left02:32
→ dec0n joined02:33
LeelooMinai Channel alive? I have a simple question. Is my understanding of rebase correct? From what I just read I imagine it as asking for a set of patches/commits that would be required to move some node in a tree to another position in a tree, so kind of like grafting a branch?02:33
← fstd left02:36
→ fstd joined02:36
→ jab416171 joined02:37
← Brain left02:37
→ lagothrix joined02:39
→ LeBlaaanc joined02:41
← Cabanossi left02:41
← lagothri1 left02:42
→ Cabanossi joined02:43
← lb1c left02:44
→ lb1c joined02:44
→ EvilPenguin joined02:49
← LeBlaaanc left02:51
→ mintmike joined02:52
→ bronson joined02:52
→ justanotheruser joined02:52
← mizu_no_oto left02:52
← chachasmooth left02:53
→ LeBlaaanc joined02:54
→ chachasmooth joined02:54
← justanotheruser left02:54
→ justanotheruser joined02:55
← justan0theruser left02:56
← ResidentBiscuit left02:56
← mintmike left02:56
← bronson left02:56
← Kazuto left02:58
← LeBlaaanc left03:00
← pks left03:02
→ Brain joined03:03
← EvilPenguin left03:04
→ pks joined03:04
← ahr3n left03:05
→ sarbs joined03:08
Frogging101 LeelooMinai: Yeah, basically like grafting except it "replays" a set of changes instead of just forcibly changing a node's parent03:08
→ Hello71 joined03:08
Frogging101 creates an entirely new set of commits, too. Doesn't "move" them per se. But the branch head will be moved to the new head03:09
← Cabanossi left03:09
LeelooMinai hmm, what to you mean replays a set of changes?03:09
← redtail left03:11
LeelooMinai O, you mean from the common ancestor to the current point?03:11
→ Cabanossi joined03:11
→ ISmithers joined03:12
Frogging101 yeah03:14
(in the default behaviour, there's an option that lets you rebase part of a branch)03:14
← boombatower left03:14
← snowkidimd left03:15
LeelooMinai Right, ok03:16
→ snowkidimd joined03:16
→ sevensidedmarble joined03:20
→ marble__ joined03:20
← marble__ left03:20
← snowkidimd left03:21
← sielicki left03:23
LeelooMinai Damn, maybe joinint this channel was not a good idea - now I am flooded with some troll messages with links to naked children:(03:24
← chachasmooth left03:24
→ fatalhalt joined03:24
→ chachasmooth joined03:24
→ howdoi joined03:25
numbdewd lol, it seems a common problem right now - i tried reporting and apparently theyre well aware and trying to deal with...03:25
→ CBF16888 joined03:25
numbdewd hopefully over soon -_03:25
-_- *03:25
→ Doginal joined03:27
← maurer left03:28
→ Goplat joined03:28
numbdewd www.enom.com responsible for domain it seem.. ramhost.us / robertmarder.com (noc@ , abuse@ ) phone to Robert responsible for the IP block +1-940-580-1040 .. if bothered enough give em a call and tell em whats bein hosted on their server and ask if they think they can get to it and stop its takedown before FBI will :d03:28
← cagedwisdom left03:29
numbdewd (afaik, usually such cases be taken more serious than any phishing or such ever was -- and near always, almost instant after report has been sent in they take action..usually swift). serious shit lol03:29
→ darth_platypus joined03:29
← MattMaker left03:30
→ lzybassist joined03:31
LeelooMinai Right, apparently adding +R mode is a good idea - it blocks messages from unidentified people03:31
Frogging101 yeah that's effective03:32
100% effective03:32
← Murr left03:33
→ Murr joined03:33
← ContessaTP left03:34
Frogging101 also it's a good rule of thumb not to click on spam links in general, even relatively benign ones will never be anything you want to see03:34
← rtjure left03:34
← Doginal left03:35
Frogging101 (because if you did you would have found it yourself instead of having it forced on you :p)03:35
→ LeBlaaanc joined03:35
← lzybassist left03:35
→ akushner___ joined03:38
→ rtjure joined03:39
← akushner___ left03:40
→ ZyX-I joined03:41
← dviola left03:42
→ Kazuto joined03:42
← Kazuto left03:42
→ Kazuto joined03:42
← olalonde left03:44
→ donmichelangelo joined03:44
→ kfoonamalik joined03:45
← guampa left03:45
← Brain left03:45
← orbyt_ left03:48
← CBF16888 left03:49
→ cdg joined03:49
→ ShekharReddy joined03:51
← sz0 left03:52
← energizer left03:52
→ energizer joined03:53
← Ownix left03:53
→ Brain joined03:54
← cdg left03:54
→ svm_invictvs joined03:54
← Cabanossi left03:56
→ morenoh149 joined03:56
→ Cabanossi joined03:56
→ khisanth_ joined03:57
→ Bobguy joined03:59
← Brain left04:00
→ navidr joined04:00
← Khisanth left04:00
→ ahr3n joined04:01
← morenoh149 left04:01
← Bobdude left04:03
→ roygbiv joined04:03
← albel727 left04:04
→ albel727 joined04:04
← sevensidedmarble left04:06
← chachasmooth left04:07
→ chachasmooth joined04:10
→ sarri joined04:11
← sarri left04:11
→ sarri joined04:11
← leafff left04:12
← Puffball left04:14
→ Puffball joined04:16
← netj left04:20
→ netj joined04:21
← Elon_Satoshi left04:21
← supremum left04:23
→ Elon_Satoshi joined04:24
→ govg joined04:24
← antfoo left04:25
→ gavin17 joined04:27
→ antfoo joined04:27
gavin17 When using ssh for github do I have to do: " eval "$(ssh-agent -s)" " everytime? or only once?04:28
I'm following this guide: https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/04:28
← kfoonamalik left04:29
→ zefferno joined04:29
kadoban gavin17: Most linuxes and etc. have the ssh-agent running in the background, or you should set it up so it does anyway.04:30
I just run ssh-add04:30
← roygbiv left04:30
gavin17 if I push to a repo and it asks for my passphrase does that mean it's running?04:31
kadoban No, that's what it does anyway. If you've done ssh-add on the correct key and it's still asking for your passphrase every time you push, it's not working correctly.04:32
gavin17 oh dear04:32
what would be the service name for the ssh-agent?04:33
kadoban No idea04:33
gavin17 Time for further research04:34
→ fatihgenc joined04:34
← singlerider left04:35
_ikke_ gavin17: ssh-agent is not a service04:35
gavin17: You have to indeed run it every time04:35
gavin17: I use keychain (http://www.funtoo.org/Keychain) to manage a single 'global' ssh agent04:36
gavin17 _ikke_: So it's insecure to enter my passphrase everytime? I followed the guide on github04:37
_ikke_ gavin17: No, it's not insecure04:37
kadoban It's just annoying04:38
gavin17 I wonder if I can use kde-wallet?04:38
← chachasmooth left04:38
_ikke_ https://askubuntu.com/questions/393653/using-ssh-with-wallet-on-kde04:38
→ kfoonamalik joined04:39
← bitmod left04:39
← sweatsuit left04:39
→ bitmod joined04:39
← beerdrop left04:39
_ikke_ export SSH_ASKPASS=/usr/bin/ksshaskpass04:39
so this is the important part of that04:39
→ chachasmooth joined04:40
kadoban _ikke_: Though it sounds like that didn't work for the person, and no answer seemed to help.04:40
→ kfoonama1ik joined04:40
_ikke_ "You should get no password prompt, and as it seems to work on a machine with no Desktop "04:40
That's on one of the answers04:40
← cam27 left04:40
→ john_hexis joined04:40
gavin17 _ikke_: So once I start using a ssh agent I won't have to keep entering my passphrase?04:40
← kfoonama1ik left04:40
→ high_fiver joined04:41
kadoban Yeah, but there's no setup instructions there except creating the key, so that answer doesn't seem to make a lot of sense. And they seem to be saying it doesn't use KDE or anything.04:41
gavin17 hmm04:41
I look into different ssh agents04:41
← bitmod left04:42
← dermoth left04:42
← YuGiOhJCJ left04:42
← Sharker left04:42
← exotime left04:42
← treehug88 left04:42
← robattila256 left04:42
← BlackPanx left04:42
← infernix left04:42
← Jonno_FTW left04:42
← APic left04:42
← qassim left04:42
← orzo left04:42
← liste left04:42
← tanuki left04:42
← jimmyrcom left04:42
← guideline left04:42
← catsup left04:42
← thallada left04:42
← CalimeroTeknik left04:42
← nellicus_ left04:42
← fcanela left04:42
← kke left04:42
← rigid left04:42
← jimInDevNull left04:42
← eldritch left04:42
← pepijndevos left04:42
← Sigma left04:42
← tabakhase left04:42
← rapha left04:42
← marvi left04:42
← knittl left04:42
← volestorm left04:42
← raulp left04:42
← artgoeshere left04:42
← Rhonda left04:42
← pigeon left04:42
← wadadli left04:42
← EgS left04:42
← fox_ left04:42
← markmarkmark left04:42
← SirFunk left04:42
← mulvane left04:42
← HalfEatenPie left04:42
← tazle_ left04:42
← nexxus6 left04:42
→ ilogger2 joined04:43
→ yaiyan joined04:43
→ sven^ joined04:43
→ kg6hum joined04:43
→ peb` joined04:43
→ enkrypt joined04:43
→ MACscr joined04:43
→ bsanford joined04:43
→ Sigma joined04:43
→ Derperperd joined04:43
→ Goplat joined04:43
→ hahuang65 joined04:43
→ [Kid] joined04:44
→ odamn joined04:44
→ __name__ joined04:44
→ ephemera_ joined04:44
→ krabat joined04:44
→ rk joined04:44
→ kisonecat joined04:44
→ Ratler joined04:44
→ tohuw joined04:44
→ Gianormagantrous joined04:44
→ bket joined04:44
→ lagothrix joined04:44
→ hanna joined04:44
→ ahf joined04:44
→ ak102 joined04:44
→ Fudge joined04:44
→ ravndal joined04:44
→ raulp joined04:44
→ Neico joined04:44
→ fstd joined04:44
→ rnsanchez joined04:44
→ brokensyntax joined04:44
→ ollien joined04:44
→ Esya joined04:44
→ hplar_ joined04:44
→ dserodio joined04:44
→ _W_ joined04:44
→ Mekkis joined04:44
→ msm joined04:44
→ rt joined04:44
→ Elon_Satoshi joined04:44
→ Dyonisos joined04:44
→ swalladge joined04:44
→ dilfridge joined04:44
→ sarri joined04:44
→ kini joined04:44
→ Xe joined04:44
_ikke_ gavin17: No, but you should add the public key to the systems you want to access04:44
→ SporkWitch joined04:44
→ Remram joined04:44
← Ratler left04:44
→ Ratler joined04:44
← __name__ left04:44
→ __name__ joined04:44
→ qpdb joined04:44
→ bipolar joined04:44
→ smithbone joined04:44
→ EgS joined04:44
→ Jguy joined04:44
→ Pulp joined04:44
→ rapha joined04:44
→ nioncode joined04:44
→ netj joined04:44
→ ashnur joined04:44
← ak102 left04:44
→ ak102 joined04:44
→ malide joined04:44
→ ezio joined04:44
← lagothrix left04:44
→ lagothrix joined04:44
→ volestorm joined04:44
→ cydrobolt joined04:44
→ eldritch joined04:44
→ ignarps joined04:44
→ quite joined04:44
← fstd left04:44
→ fstd joined04:44
→ javaJake joined04:44
→ de-vri-es joined04:44
→ czart joined04:44
→ blueyed joined04:44
→ boshhead joined04:44
→ BlackPanx joined04:44
→ wgrant joined04:44
→ steffen joined04:44
→ maqr joined04:44
→ Patrick joined04:44
gavin17 what does "K-LINED" mean?04:44
← Xe left04:44
→ Xe joined04:44
→ karelk joined04:44
→ zachary12 joined04:44
← EgS left04:44
→ EgS joined04:44
→ HM joined04:44
→ thoros joined04:44
→ jason237 joined04:44
→ zofrex joined04:44
← Jguy left04:44
→ Jguy joined04:44
→ Matsv joined04:44
→ monty joined04:44
→ wouter0100 joined04:44
→ ujjain joined04:44
→ ochorocho_ joined04:44
→ Trel joined04:44
← Remram left04:44
→ Remram joined04:44
→ jorj joined04:44
swalladge → Guest9848104:44
→ njs126 joined04:44
→ eblip joined04:44
← javaJake left04:44
→ javaJake joined04:44
→ zerow joined04:44
→ Timvde joined04:44
← eldritch left04:44
→ eldritch joined04:44
→ Chaser_ joined04:44
tohuw → Guest8201304:44
← ignarps left04:45
→ ignarps joined04:45
→ joes joined04:45
→ neunon joined04:45
→ roger_raymond joined04:45
← boshhead left04:45
→ boshhead joined04:45
← maqr left04:45
→ maqr joined04:45
→ thesquib joined04:45
→ fury_ joined04:45
→ skalpin_ joined04:45
_ikke_ gavin17: that's an IRC ban04:45
→ perrier-jouet joined04:45
← dserodio left04:45
→ dserodio joined04:45
← monty left04:45
→ monty joined04:45
→ jdiez joined04:45
← sarri left04:45
→ sarri joined04:45
→ nanga joined04:45
→ exotime joined04:45
→ polyrob joined04:45
→ __main__ joined04:45
→ chadi joined04:45
Patrick → Guest8162404:45
→ preaction joined04:45
→ ghormoon joined04:45
→ ubuntu1 joined04:45
← neunon left04:45
→ neunon joined04:45
← jdiez left04:45
→ jdiez joined04:45
→ Willis joined04:45
_ikke_ on irc network level04:45
→ martybr joined04:45
→ serialoverflow joined04:45
→ mrkake joined04:45
→ Karazhan joined04:45
→ eto joined04:45
→ ahr3n joined04:45
cydrobolt → Guest8973704:45
→ nephyrin joined04:45
→ deltam joined04:45
→ causa_sui joined04:45
→ robnester joined04:45
→ JoshL joined04:45
→ ewitz joined04:45
→ TinkerTyper joined04:45
→ cyberz joined04:45
→ imrg joined04:45
→ zero85 joined04:45
→ dogmatic69 joined04:45
→ Vgr joined04:45
→ nivag joined04:45
→ Cabanossi joined04:45
→ khisanth_ joined04:45
→ chamunks joined04:45
→ olivetree_ joined04:45
← ashnur left04:45
→ ashnur joined04:45
→ oprypin joined04:45
→ Vortex34 joined04:45
→ whitby joined04:45
→ om_henners joined04:45
→ spaceone joined04:45
← chadi left04:45
→ chadi joined04:45
→ AlHafoudh joined04:45
→ vishal joined04:45
→ Razesdark joined04:45
→ Stummi joined04:45
→ MikeChernev joined04:45
← deltam left04:45
→ deltam joined04:45
_ikke_ http://www.ircbeginner.com/ircinfo/h-klines.html04:45
→ diginaut joined04:45
→ eb0t joined04:45
→ tijensse joined04:45
→ BenderRodriguez joined04:46
→ HurricaneHarry joined04:46
gavin17 So did I just witness a purge?04:46
→ malt3 joined04:46
→ wloncom joined04:46
→ SerusWork joined04:46
← Vgr left04:46
→ Vgr joined04:46
← polyrob left04:46
→ polyrob joined04:46
→ Jak_o_Shadows joined04:46
→ jokajak joined04:46
→ Dick_Hammer joined04:46
→ jameser joined04:46
→ crater2150 joined04:46
Willis → Guest9516104:46
→ nikivi joined04:46
→ shampine joined04:46
→ bcc joined04:46
→ kaosine joined04:46
← BenderRodriguez left04:46
→ BenderRodriguez joined04:46
→ visual joined04:46
→ danemacmillan joined04:46
→ Vaelatern joined04:46
→ nellicus_ joined04:46
→ relrod joined04:46
← jokajak left04:46
→ jokajak joined04:46
khisanth_ → Guest5151104:46
_ikke_ wow, I didn't even notice04:46
← Jak_o_Shadows left04:46
→ Jak_o_Shadows joined04:46
→ pitastrudl joined04:46
→ pR0Ps joined04:46
→ Persikka joined04:46
→ hfp_work joined04:46
→ rafalcpp joined04:46
→ nexxus6 joined04:46
→ tinanoo joined04:46
→ XVar joined04:46
← deltam left04:46
→ fscala joined04:46
→ paskl joined04:46
→ Squarism joined04:46
→ kculpis joined04:46
→ Tykling joined04:46
→ Cthalupa joined04:46
← kculpis left04:46
→ Puffball joined04:46
→ evil-god joined04:46
→ chitopunk joined04:46
preaction there's a bit of a spam problem right now04:46
→ bibek22 joined04:46
→ solos joined04:46
→ maxorator joined04:46
→ MaekSo joined04:46
→ traxo-xx joined04:46
→ jrahmy joined04:46
→ Murr joined04:46
→ tctara joined04:46
→ qassim joined04:46
→ digs joined04:46
→ blackwell joined04:46
← XVar left04:46
→ XVar joined04:46
→ andschwa joined04:46
→ opr joined04:46
→ freekevin joined04:46
← evil-god left04:47
→ evil-god joined04:47
→ ugjka joined04:47
→ holdsworth joined04:47
→ greenbagels joined04:47
← ujjain left04:47
→ ujjain joined04:47
→ uebera|| joined04:47
→ Calinou joined04:47
→ BSaboia joined04:47
→ ericnoan joined04:47
← opr left04:47
→ opr joined04:47
→ amosbird joined04:47
→ simon816 joined04:47
→ jast joined04:47
→ moritz joined04:47
← bcc left04:47
→ bcc joined04:47
→ a3Dman joined04:47
← ericnoan left04:47
→ ericnoan joined04:47
← uebera|| left04:47
→ uebera|| joined04:47
→ pigeon joined04:47
→ muep joined04:47
→ anbz joined04:47
→ filcab joined04:47
→ Impaloo joined04:47
→ john_hexis joined04:47
→ bwn joined04:47
→ enckse joined04:47
→ SebastianFlyte joined04:47
→ rominronin joined04:47
→ deltam joined04:47
→ sorenb joined04:47
→ jerrcs joined04:47
→ Mindi joined04:47
→ mattp__ joined04:47
→ kenansulayman joined04:47
→ yan__ joined04:47
→ joeytwiddle joined04:47
← filcab left04:47
→ filcab joined04:47
→ fibo_mach joined04:47
→ _cyril_ joined04:47
→ high_fiver joined04:47
→ johnny56 joined04:47
← greenbagels left04:47
digs → Guest6229704:47
→ ertes joined04:47
← deltam left04:47
→ deltam joined04:47
→ Paraxial joined04:47
→ rebrec joined04:47
→ pelegreno______ joined04:47
← high_fiver left04:47
→ kculpis joined04:47
→ G0Y0 joined04:47
→ SlashLife joined04:47
→ drawkula joined04:47
→ PioneerAxon joined04:47
→ zaratustra joined04:47
→ MrC joined04:47
→ Mathiasdm joined04:47
→ elbeardmorez joined04:47
← pigeon left04:47
→ JrCs joined04:47
→ hwoarang joined04:48
→ theskillwithin joined04:48
→ Sargun joined04:48
→ lss8 joined04:48
→ Inception joined04:48
→ mattcen joined04:48
→ holodoc joined04:48
→ musca joined04:48
→ ilbot3 joined04:48
→ ColdKeyboard joined04:48
← lss8 left04:48
→ lss8 joined04:48
← hwoarang left04:48
→ hwoarang joined04:48
← Sargun left04:48
→ Sargun joined04:48
→ webstrand joined04:48
→ rtjure joined04:48
→ thomasb9511 joined04:48
→ hurricanehrndz joined04:48
→ vamiry joined04:48
→ Afforess joined04:48
← G0Y0 left04:48
→ G0Y0 joined04:48
→ daynaskully joined04:48
→ infernix joined04:48
→ sangy joined04:48
→ cwre joined04:48
→ sentriz joined04:48
→ Sc0rpius joined04:48
→ A|TARIS joined04:48
→ MuffinMedic joined04:48
→ dustinm joined04:48
← thomasb9511 left04:48
→ thomasb9511 joined04:48
→ db joined04:48
→ naf joined04:48
→ srcerer_ joined04:48
_ikke_ But a lot of them also seem to come back again04:48
→ absolutejam joined04:48
→ planigan joined04:48
→ Peuc joined04:48
→ caffeinatedcode joined04:48
→ Zarthus joined04:48
→ AndreSomers joined04:48
→ caliculk joined04:48
→ greenbagels joined04:48
← relrod left04:48
→ relrod joined04:48
→ Cathy joined04:48
→ rigid joined04:48
→ fox joined04:48
→ Hogofwar joined04:48
→ Shakeel_ joined04:48
→ bttf joined04:48
→ cworth joined04:48
→ kozy joined04:48
→ gnarf joined04:48
→ high_fiver joined04:48
→ mmattice joined04:48
preaction i mean, i got klined, but am not a spam bot04:48
→ thinkpad joined04:48
→ kaldoran joined04:48
→ _monokrome joined04:48
_ikke_ heh04:48
→ sostenuto joined04:48
gavin17 _ikke_: Is it like a spam attack?04:48
← mmattice left04:48
→ mmattice joined04:48
→ Kulrak joined04:48
→ Ram-Z_ joined04:48
→ SirFunk joined04:48
→ Nicmavr joined04:48
→ vmiklos joined04:48
→ pdgwien joined04:49
→ ski7777 joined04:49
→ LeelooMinai joined04:49
← caffeinatedcode left04:49
→ caffeinatedcode joined04:49
→ wagle joined04:49
→ Zoxc joined04:49
db → Guest6970704:49
preaction well, not that i'd admit at least04:49
→ Shayan-To joined04:49
→ Xethron joined04:49
→ kriskropd joined04:49
_ikke_ I'm not sure what is happening04:49
→ barduck joined04:49
← Xethron left04:49
→ Xethron joined04:49
→ tanuki joined04:49
→ APK joined04:49
← Kulrak left04:49
→ Kulrak joined04:49
→ lus joined04:49
→ Loomaanaatii joined04:49
→ fk joined04:49
→ sborza joined04:49
fox → Guest1531404:49
→ Werring joined04:49
→ PaulCapestany joined04:49
→ justinmrkva joined04:49
→ thejoecarroll joined04:49
→ felixsanz joined04:49
→ todd_dsm joined04:49
→ butterthebuddha joined04:49
→ Peetz0r joined04:49
← high_fiver left04:49
→ gruetzkopf joined04:49
→ ahrs joined04:49
→ ygeLN joined04:49
→ DogHackit joined04:49
→ bluepixel joined04:49
→ pepijndevos joined04:49
→ warthog9 joined04:49
→ Mixologic joined04:49
→ prg318 joined04:49
→ fxrs joined04:49
→ olbat[m] joined04:49
_ikke_ I filter out joins/parts so I didn't notice it04:49
← ygeLN left04:49
→ ygeLN joined04:49
← rigid left04:49
→ rigid joined04:49
← olbat[m] left04:49
→ olbat[m] joined04:49
← olbat[m] left04:49
→ olbat[m] joined04:49
→ j416 joined04:49
→ babilen joined04:49
→ linuxdaemon joined04:49
→ martinklepsch joined04:49
→ pks joined04:49
→ c^ joined04:49
→ weylin joined04:49
→ incredible joined04:49
→ HalfEatenPie joined04:49
→ Whiskey joined04:49
→ fletom joined04:49
Nicmavr → Guest6093404:49
gruetzkopf → Guest1408004:49
← babilen left04:49
→ babilen joined04:49
→ sns joined04:49
→ nadley joined04:49
→ thiago joined04:49
← thiago left04:49
→ thiago joined04:49
→ sunrunner20 joined04:50
→ Ekho joined04:50
→ TooLmaN joined04:50
→ Arguggi joined04:50
→ high_fiver joined04:50
→ CalimeroTeknik joined04:50
→ ribasushi joined04:50
→ fcanela joined04:50
→ cyberzeus joined04:50
→ wadadli joined04:50
→ waveclaw joined04:50
→ davidstrauss joined04:50
→ Dewin joined04:50
→ jrm joined04:50
→ jstimm joined04:50
→ RiPer joined04:50
→ tilpner joined04:50
→ ninsei joined04:50
→ felipedvorak joined04:50
→ kevr joined04:50
→ chrisml joined04:50
→ tmz joined04:50
→ dsantiago joined04:50
→ acetakwas joined04:50
→ stux|RC-only joined04:50
→ spritian joined04:50
→ jeffreylevesque joined04:50
→ emPi joined04:50
→ Gonzo89 joined04:50
→ Kronuz joined04:50
→ Brando753-o_O_o joined04:50
→ erin1983684 joined04:50
→ sim590 joined04:50
→ shakalaka joined04:50
→ scottjl joined04:50
→ markmarkmark joined04:50
→ Arokh joined04:50
→ sunri5e joined04:50
→ lohfu joined04:50
→ tchan1 joined04:50
→ fatalhalt joined04:50
→ apeiros joined04:50
→ berndj joined04:50
→ nicolai86 joined04:50
→ markzen joined04:50
→ catern joined04:50
→ bodie_ joined04:50
→ utrack joined04:50
→ monty_hall joined04:50
→ marlinc joined04:50
→ SkyPatrol joined04:50
→ artgoeshere joined04:50
→ tang joined04:50
→ NightMonkey joined04:50
→ tg joined04:50
← high_fiver left04:50
→ jab416171 joined04:50
→ nd joined04:50
→ SReject joined04:50
← SReject left04:50
→ SReject joined04:50
→ mdbk joined04:50
→ nikow joined04:50
_ikke_ #freenode is throttles, so I guess a lot of users are asking what is happening04:50
→ seitensei joined04:50
→ duckydan joined04:50
→ zeroed joined04:50
→ Xarodon joined04:51
→ danmackay joined04:51
→ AciD joined04:51
→ HelloShitty joined04:51
→ colona joined04:51
→ dmc joined04:51
→ high_fiver joined04:51
→ devster31 joined04:51
→ disi joined04:51
→ madewokherd joined04:51
→ chu joined04:51
→ rewt joined04:51
→ LeBlaaanc joined04:51
→ konsolebox joined04:51
→ jimInDevNull joined04:51
→ giraffe joined04:51
preaction yes04:51
AciD → Guest6269604:51
→ pewpew joined04:51
→ jidar joined04:51
preaction lot of PM spam happening04:51
giraffe → Guest2980504:51
→ valkyr2e joined04:51
→ Anthaas joined04:51
→ pix9 joined04:51
→ justanotheruser joined04:52
→ boubou- joined04:52
preaction because this is apparently what some people find entertaining04:52
→ beerdrop joined04:52
→ strugee joined04:52
→ sybariten joined04:52
→ mintmike joined04:52
→ milki joined04:52
→ Ankhers joined04:52
→ diget joined04:52
gavin17 preaction: What are they pm spamming?04:52
→ jscob joined04:52
→ sejo joined04:52
_ikke_ Right, but I wonder why so many 'normal' users seem to be k-lined and later joining again04:52
→ murr5y joined04:52
→ Davey joined04:52
← Davey left04:52
→ Davey joined04:52
→ steven| joined04:52
→ Kamilion joined04:52
preaction _ikke_: overbroad klines, like the one that got me04:52
→ osse_ joined04:52
→ midnightmagic joined04:53
→ leonarth joined04:53
→ diogenese joined04:53
→ Exagone313 joined04:53
← linuxdaemon left04:53
preaction gavin17: does it really matter? do we have to dignify it by repeating it?04:53
→ gdh joined04:53
→ bronson joined04:53
→ adamus1red joined04:53
→ linuxdaemon joined04:53
→ ExeciN joined04:53
gavin17 preaction: Must be really bad then04:53
→ SCHAPiE joined04:53
→ abra0 joined04:53
→ Bercik joined04:53
→ acidjazz1 joined04:53
→ Map joined04:54
→ yanome joined04:54
→ noodle joined04:54
→ agnki joined04:54
→ cqi joined04:54
→ HyP3r joined04:54
→ dhollin3 joined04:54
_ikke_ mainly anoying04:54
Map → Guest9511504:54
→ anderson joined04:54
_ikke_ the PM lots of users04:54
→ lukky513 joined04:54
→ Shavik joined04:54
gavin17 I guess I got lucky04:54
→ Cork joined04:55
→ jwest joined04:55
_ikke_ Often they join a channel and start spamming everyone in that channel04:55
So it depends on in which channels you are04:55
→ cfoch-al1 joined04:55
→ thallada joined04:55
← Guest98481 left04:56
→ Brain joined04:56
gavin17 I was in this one, python, and linux04:56
must have been a big channel04:56
← mintmike left04:56
→ mns joined04:57
→ qgTG joined04:57
→ Levex joined04:57
← bronson left04:58
_ikke_ gavin17: To come back to you question: https://wiki.archlinux.org/index.php/KDE_Wallet#Using_the_KDE_Wallet_to_store_ssh_keys04:58
This is archlinux, but it also should work in other distros04:58
→ jaeckel joined04:58
→ Lunatrius joined04:58
← LeBlaaanc left04:59
→ hue joined04:59
→ svm_invictvs joined05:00
→ varesa joined05:01
→ SpeakerToMeat_ joined05:01
→ LeBlaaanc joined05:02
← Brain left05:02
→ michael_mbp joined05:03
→ MissionCritical joined05:03
← high_fiver left05:03
→ bitmod joined05:03
→ df0_ joined05:03
→ Sharker joined05:04
gavin17 _ikke_: Is there anything I need to do to the "/home/you/.ssh/id_rsa" directory or is leaving as is already secure? Am I safe if I just continue to not use a ssh client?05:06
→ jceb joined05:06
→ cite joined05:07
→ mdk joined05:07
→ lordjancso joined05:09
← Guest62696 left05:09
→ AciD` joined05:10
← spaceone left05:10
_ikke_ ssh is pretty pesky about it. If there is permissions wrong for example, it will refuse to use it05:10
← npgm left05:11
→ spaceone joined05:11
→ ntnn joined05:11
→ Oatmeal joined05:12
→ imack joined05:12
→ StephenS joined05:13
→ thekingofbandit joined05:13
→ tterrag joined05:13
→ dersand joined05:14
← APK left05:14
→ Dev0n joined05:14
→ SirPole joined05:14
→ APK joined05:14
gavin17 _ikke_: So if it all works and it just asks me for a password everytime I shouldn't worry about security?05:14
→ inovas joined05:15
APK → AKPWD05:15
→ sitaram joined05:16
← sitaram left05:16
→ sitaram joined05:16
→ Bock joined05:16
→ heinrich5991 joined05:17
_ikke_ gavin17: If it asks for a password, it's not working, if it's asking for a passphrase, then it is working05:18
A password means that you are logging in using a username and password05:19
a passphrase it the key to unlock the ssh key so that it can be used05:19
gavin17 git push origin master, outputs "Enter passphrase for key '/home/user109/.ssh/id_rsa': "05:20
→ swalladge[m] joined05:20
→ reactormonk[m] joined05:20
→ nappy[m] joined05:20
→ primeos[m] joined05:20
→ UncleCJ joined05:20
→ hiq[m] joined05:20
→ monomon[m] joined05:20
→ dikiaap joined05:20
→ abithvijayan[m] joined05:20
→ unclechu joined05:20
→ dyce[m] joined05:20
→ spinningarrow[m] joined05:20
→ Miguelngel[m] joined05:20
→ heftig joined05:20
→ flo[m] joined05:20
→ waltervargas[m] joined05:20
→ patrickr[m] joined05:20
→ Demos[m] joined05:20
→ aidalgol joined05:20
→ Techie[m] joined05:20
→ Remramm joined05:20
→ aviraldg joined05:20
→ dreadful[m] joined05:20
→ musicmatze[m] joined05:20
→ am2on joined05:20
→ KevinMGranger joined05:20
→ ushaNg6i[m] joined05:20
→ JerkyMcJerkface[ joined05:20
→ tkore joined05:21
← Cabanossi left05:25
→ menip joined05:26
→ fatihgenc joined05:27
→ Cabanossi joined05:27
→ gkatsev joined05:27
→ frobnic joined05:27
→ cdg joined05:28
← beerdrop left05:29
← madewokherd left05:29
← todd_dsm left05:30
← fatihgenc left05:32
→ lzybassist joined05:32
→ todd_dsm_ joined05:32
→ fatihgenc joined05:32
← cdg left05:32
← Murr left05:33
→ guideline joined05:33
→ Murr joined05:33
← fatihgenc left05:36
← lzybassist left05:36
→ fatihgenc joined05:37
→ energizer joined05:37
→ lu_zero joined05:37
→ Raging_Hog joined05:38
→ kyan joined05:40
→ beerdrop joined05:41
← fatihgenc left05:42
→ fatihgenc joined05:42
→ ronskisika joined05:44
← Raging_Hog left05:44
← srcerer_ left05:44
→ Anja joined05:44
→ atomi joined05:45
sitaram testing; can someone respond? I got disconnected but *without* an auto reconnect so I had to kill irssi and try again. No idea what happened05:45
Ram-Z_ → Ram-Z05:46
boubou- → boubou05:46
→ lss8_ joined05:47
→ ghoti joined05:49
← quite left05:49
← lss8 left05:49
→ quite joined05:50
→ Brain joined05:52
→ cjohnson joined05:52
→ kfoonamalik joined05:57
→ morenoh149 joined05:57
→ doev joined05:59
← jceb left06:00
_ikke_ sitaram: pong06:01
sitaram: there was a big k-line this morning06:01
→ ppang joined06:01
← ignarps left06:01
→ Guest10 joined06:02
← morenoh149 left06:02
rjsalts everyone on ipv406:03
→ govg joined06:03
← kculpis left06:03
→ Phylock joined06:05
_ikke_ Then there must be around 600 users in this channel connected via ipv606:05
(including me)06:05
"If you were k-lined, it was a mistake, our apologies"06:06
→ rscata joined06:06
→ j08nY joined06:07
← menip left06:08
← LeBlaaanc left06:08
← zerow left06:09
→ Rotaerk joined06:10
→ roelmonnens joined06:11
→ Silmarilion joined06:11
← Vgr left06:11
→ DragonDiesSnowBe joined06:14
→ dege joined06:14
← al-damiri left06:15
← ahr3n left06:15
→ LeBlaaanc joined06:15
← cyberzeus left06:16
Seveas fun06:16
→ peepsalot joined06:16
Seveas finally ipv6 has a use \o/06:16
← imack left06:16
→ Vgr joined06:16
← Vgr left06:16
→ Vgr joined06:16
_ikke_ heh06:16
→ JeroenT joined06:17
rjsalts supposedly they were playing whack-a-mole with the spammers and accidentally took out 0/006:17
→ zerow joined06:18
rjsalts because of a bug in their scripts06:18
← Vgr left06:18
Seveas the look on the face of whoever made that mistake must have been priceless06:19
→ Vgr joined06:19
← Vgr left06:19
→ Vgr joined06:19
→ oRiCLe joined06:19
→ flobin joined06:20
kadoban I'm going to imagine it was a "Die die die, IRC scum, muahahaha!" face. The "bug" thing is just a cover.06:21
→ tunekey joined06:21
gitinfo set mode: +v06:21
oRiCLe hey all, been trying to google a solution but havent yet found, got a programming env that stores its programs in its database, have written a program to dump them all to individual text files, set that folder up as a git repo, and then pushing, but when i do another export of the programs, it overwrites the files so git considers it a remove and add, not update, any way to force recognising it as an update only?06:21
← rscata left06:22
→ Kevgeon joined06:23
→ akushner___ joined06:23
→ Disgeae joined06:24
→ chachasmooth joined06:24
← DragonDiesSnowBe left06:25
→ ogny joined06:26
← ogny left06:26
→ ogny joined06:26
grawity don't bother; the commit contents will be exactly the same either way06:26
oRiCLe yeah but it doesnt show the differences between the old and new file as considers it different file?06:27
→ cyberzeus joined06:27
← svm_invictvs left06:27
grawity where are you getting this "different file" from?06:27
← j08nY left06:27
grawity that is, what does `git status` show?06:27
if the filenames are different *and* the contents are below similarity threshold, then yeah, it'll be shown as a different file06:28
→ rscata joined06:28
oRiCLe most are exactly the same files with same contents which is what i cant work out why :S06:28
→ mintmike joined06:28
← oprypin left06:28
→ oprypin joined06:29
→ edvb joined06:29
← oprypin left06:30
→ rajspy84 joined06:30
grawity without seeing anything at all from your status output, I can't work it out either06:30
← Guest10 left06:30
← rajspy84 left06:31
← cyberzeus left06:31
← LeBlaaanc left06:32
→ cyberzeus joined06:32
← flobin left06:33
→ flobin joined06:34
LeelooMinai When they write "configured upstream for the current branch", that means what?06:34
← flobin left06:34
→ flobin joined06:35
← flobin left06:35
preaction LeelooMinai: the .git/config file has a "fetch" and "url" settings for the branch, so when you do just "git pull" or "git push", it goes there06:36
→ opalepatrick joined06:38
← Cabanossi left06:39
LeelooMinai A, ok, so "Upstream branch to compare against." <- they probably imply that the compare is done to HEAD on that configured location, right?06:39
Also, can an "upstream" branch be local?06:40
→ mexen joined06:41
→ ISmithers joined06:41
AndreasLutro upstream is usually just a remote, and a remote can be local06:41
→ darkbit joined06:41
← darkbit left06:41
→ Cabanossi joined06:42
LeelooMinai Remote being local implies what?06:42
← oRiCLe left06:42
← df0_ left06:42
→ ferr joined06:42
preaction git remotes can be other directories on the current machine, yes06:42
→ Guest10 joined06:43
← mexen left06:43
LeelooMinai Would that be inside that config file? Instead of remote machine url, local directory is allowed and it would be still "upstream" in git?06:43
AndreasLutro `man git remote`06:44
gitinfo the git-remote manpage is available at https://gitirc.eu/git-remote.html06:44
AndreasLutro when you `git clone` something, the url you clone from is automatically "origin" - you can add your own with `git remote add ...`06:44
→ jceb joined06:45
LeelooMinai Right, I am a bit confused with that whole upstream terminology I guess.06:45
Does it have some strict definition? I mean is it branch, nodes, something else?06:46
AndreasLutro nope. it can mean branches or remotes. usually just a word to indicate that this is the "root source" of changes in your repository06:47
selckin feel like itss usually the default remote branch (ie where git push/pull looks at), but as things in git, the words mean lotsa things06:47
→ mika joined06:47
← mika left06:47
→ mika joined06:47
AndreasLutro usually is, yes - but if you fork a repo on github for example, the original repo is almost always considered "upstream", not your fork06:48
selckin yeah but then you're like in project context, not git06:48
→ armyriad joined06:49
LeelooMinai Well,I was in context of git rebase - I think there they mean the branch the current branch diverged from (?)06:49
→ schleppel joined06:49
AndreasLutro oh I forgot, there's also git branch --set-upstream-to - which in this context means, which remote branch does your local branch follow06:49
LeelooMinai: yeah that sounds about right. it's common to have a pull request, it gets out of date, they ask you to rebase against the original (upstream) branch06:49
pull/merge request06:50
→ swalladge joined06:50
→ dermoth joined06:50
← dave0x6d left06:52
→ bybb joined06:52
← Rotaerk left06:52
→ Rotaerk joined06:53
→ bronson joined06:54
← kyan left06:54
→ rudi_s joined06:56
→ KeyJoo joined06:56
Disgeae Is there a way to create a branch with 'git checkout -b newbranch' and automatically add the upstream to be the same?06:57
← mika left06:58
← mintmike left06:58
→ mika joined06:58
← mika left06:58
→ mika joined06:58
selckin -t i believe, but don't know the details06:58
← bronson left06:59
AndreasLutro do you need to? if you have `git config push.default` to either simple or current, git tends to figure things out on its own06:59
→ robotroll joined07:00
→ RichiH joined07:00
← jameser left07:01
→ phluks joined07:01
→ flobin joined07:01
→ Kaisyu joined07:01
→ jameser joined07:02
← edvb left07:04
← Brain left07:05
→ overlord_tm joined07:05
→ thethorongil joined07:08
→ Sp4rKy joined07:08
← Sp4rKy left07:08
→ Sp4rKy joined07:08
← Puffball left07:08
→ seschwar joined07:09
→ djb-irc joined07:09
→ Puffball joined07:10
Disgeae Oh I haven't set that, explains, thanks.07:12
jast 'push.default' set to 'simple' uses tracking info, too (and it's the default in git 2, anyway)07:13
Disgeae Wasn't for me :(07:14
steven| → steven07:15
→ jntme joined07:15
→ TomyWork joined07:16
← Kevgeon left07:17
← SirPole left07:17
→ tango_ joined07:17
→ SirPole joined07:17
← thethorongil left07:18
→ thethorongil joined07:18
← Guest82013 left07:18
→ Guest82013 joined07:18
Guest82013 → TOhuw07:18
→ wandering_vagran joined07:19
TOhuw → Tohuw07:19
→ synthmeat joined07:19
→ ignarps joined07:20
← ignarps left07:21
← fatihgenc left07:21
→ fatihgenc joined07:22
→ TheWild joined07:23
TheWild hello07:23
← SirPole left07:23
→ Ragnor joined07:24
→ SirPole joined07:24
TheWild hypothetical: there was a source code A. It was shared with many developers. Each one introduced changes producing final sources B, C, D...07:24
A was lost.07:24
→ flaviodesousa joined07:24
TheWild now what?07:24
we want to introduce git07:25
selckin hire competent ppl07:25
grawity find all sources you have, sort from oldest to newest07:25
`git init` an empty repo; copy oldest version; git add --all; git commit07:25
nuke all files with `git rm -rf .`; copy the next version in; git add --all; git commit07:26
etc.07:26
← Cabanossi left07:26
grawity well, that's assuming you want to put all the existing versions in git07:26
jast that only makes sense if B, C, D are actually a sequence of sorts07:26
grawity hmm true07:26
jast if everyone has been doing their own thing, there isn't really any meaningful history you can create out of the various snapshots07:26
TheWild problem is that B, C, D aren't necessarily a sequence07:26
→ Cabanossi joined07:27
jast there's really no way around doing a fair bit of manual work07:27
Seveas create 4 different orphan branches and use git merge to create the One True Source07:27
grawity do the same stuff but in branches07:27
jast I'm guessing you want to bring it all together?07:27
TheWild yes07:27
jast right, and really the only way is to pick one of the versions as a starting point, then compare it to each of the others in turn and combine things07:28
nothing is going to make this easier for you, no merge strategy can do anything more than mark all the files with differences as conflicted all over07:29
close to all over, anyway07:29
I mean, you can give it a try, commit one of the versions as a starting point, commit another one on an --orphan branch, merge the two, see if you get useful conflict markers07:30
← Goplat left07:31
← ogny left07:31
← bybb left07:31
→ aca20031 joined07:32
← Murr left07:33
→ xaa joined07:33
→ Murr joined07:33
→ lzybassist joined07:33
TheWild Well, I give it a try sometime. You shed me some light on the problem. Thank you grawity, jast, Seveas.07:33
← osse_ left07:33
← babilen left07:33
→ babilen joined07:34
→ osse joined07:34
→ dodobrain joined07:34
TheWild The problem was just imagined. I thought how we would merge our separated sources if git was only one CSV and has just began to exist.07:34
← ISmithers left07:34
← dodobrain left07:34
→ dodobrain joined07:34
TheWild *CVS07:34
← jceb left07:35
← dodobrain left07:35
← rtjure left07:35
→ manuelschneid3r joined07:35
→ dodobrain joined07:35
← dodobrain left07:35
→ dodobrain joined07:35
← dodobrain left07:36
← chachasmooth left07:37
← lzybassist left07:37
→ belmoussaoui joined07:38
→ Acerific joined07:39
← Acerific left07:39
→ Acerific joined07:39
→ rtjure joined07:39
→ chachasmooth joined07:39
← jntme left07:40
→ Kevgeon joined07:42
← kfoonamalik left07:43
→ cdg joined07:44
← Acerific left07:47
← cdg left07:48
→ kfoonamalik joined07:49
→ mintmike joined07:50
← thiago left07:51
→ harv joined07:51
→ jceb joined07:51
→ ukleinek joined07:51
← kfoonamalik left07:51
← fatihgenc left07:52
→ fatihgenc joined07:52
→ ojacobson joined07:54
→ Phanes joined07:54
← Phanes left07:54
→ Phanes joined07:54
→ Arkaniad joined07:54
← swalladge left07:54
→ nshp joined07:54
→ ReenignE joined07:55
← ReenignE left07:55
→ ReenignE joined07:55
→ rxo joined07:55
→ todder joined07:55
← jameser left07:55
→ pmn joined07:55
← roelmonnens left07:56
→ jameser joined07:56
→ esc joined07:56
← esc left07:56
→ esc joined07:56
← SlashLife left07:56
← fatihgenc left07:56
→ fatihgenc joined07:57
← ilbot3 left07:57
← vishal left07:57
← jdiez left07:57
← thethorongil left07:57
→ kurkale61 joined07:57
← cyberz left07:57
→ roelmonnens joined07:58
→ morenoh149 joined07:58
→ Es0teric joined07:59
→ mikecmpbll joined07:59
→ bordeaux_facile joined07:59
→ jdiez joined07:59
→ cyberz joined07:59
→ vishal joined07:59
→ SlashLife joined07:59
← hurricanehrndz left08:00
→ kfoonamalik joined08:00
→ redtail joined08:00
← lss8_ left08:00
→ oxymoron93 joined08:00
→ lss8 joined08:00
← lss8 left08:00
→ lss8 joined08:00
← agnki left08:01
← belmoussaoui left08:01
→ swalladge joined08:01
→ belmoussaoui joined08:01
← fatihgenc left08:02
← fatalhalt left08:02
→ fatihgenc joined08:02
← SirPole left08:02
← morenoh149 left08:02
Guest15314 → fox__08:03
→ hurricanehrndz joined08:03
← lss8 left08:03
→ lss8 joined08:03
← jason237 left08:04
→ ilbot3 joined08:04
← belmoussaoui left08:06
→ belmoussaoui joined08:07
→ APic joined08:09
← roelmonnens left08:10
→ rzo1 joined08:10
→ roelmonnens joined08:10
→ Floflobel joined08:13
← rzo1 left08:14
← ReenignE left08:14
← rxo left08:14
← todder left08:14
← pmn left08:14
→ Xiti joined08:14
← fatihgenc left08:14
→ rxo joined08:15
→ todder joined08:15
→ ReenignE joined08:15
← ReenignE left08:15
→ ReenignE joined08:15
→ pmn joined08:16
→ pbandark joined08:17
← pbandark left08:18
→ fatihgenc joined08:19
← kfoonamalik left08:21
← belmoussaoui left08:21
→ kfoonamalik joined08:21
→ belmoussaoui joined08:21
→ mrmaximuzz joined08:23
→ djh joined08:24
← mrmaximuzz left08:24
← vamiry left08:25
→ Murii joined08:25
lss8 → lss8_08:26
→ vamiry joined08:26
lss8_ → lss808:26
← cqi left08:26
→ Gurkenglas_ joined08:26
← belmoussaoui left08:26
→ belmoussaoui joined08:27
→ aard joined08:27
kurkale61 → kurkale6ka08:30
→ King_Hual joined08:31
← King_Hual left08:31
→ King_Hual joined08:31
← Pulp left08:35
← fox__ left08:35
→ misosoup joined08:36
← fatihgenc left08:36
→ fatihgenc joined08:37
← mintmike left08:37
← chachasmooth left08:38
→ ionelmc joined08:38
→ chachasmooth joined08:39
← Cabanossi left08:40
→ linuxenko joined08:42
→ thblt joined08:42
→ Cabanossi joined08:42
→ fees joined08:42
→ fatihgenc_ joined08:43
→ pbandark joined08:43
→ mintmike joined08:43
← misosoup left08:44
← sarri left08:46
← fatihgenc left08:46
→ wy4 joined08:47
→ valhalla_22 joined08:47
→ Tobbi joined08:47
valhalla_22 i dont want to keep track of my log files , how can i do that.08:47
wy4 when i do a git push it tells me this $ git push fatal: The current branch sit has no upstream branch. To push the current branch and set the remote as upstream, use git push --set-upstream origin sit08:47
Vampire0 valhalla_22, man gitignore08:48
gitinfo valhalla_22: the gitignore manpage is available at https://gitirc.eu/gitignore.html08:48
→ sbasso joined08:48
Vampire0 wy4, and your question is? The error message is pretty obvious and explicit in my opinion :-)08:48
valhalla_22 Vampire0: its still showing the file name in github , i dont want to see that also08:49
→ taalas joined08:49
valhalla_22 i did in gitignore /*.log08:49
wy4 Vampire0 Im able to do a git push --tags08:49
bt after tat im nt able to do a git push08:49
→ Raging_Hog joined08:49
wy4 and if i do git status nothing to commit, working tree clean08:50
osse valhalla_22: git rm *.log08:50
valhalla_22: git commit08:50
Vampire0 wy4, read the error message again, it tells you exactly what the problem is and one way to resolve it. If you don't understand it and want more info, ask in more detail08:50
valhalla_22 i did git rm --cached file name , and it deleted the file from both place.08:51
osse good. now commit and push08:51
← jceb left08:51
Vampire0 valhalla_22, gitignore is just working on untracked files, so if you want to ignore already tracked files, you need to remove them from the repository like osse suggested08:51
gitinfo set mode: +v08:51
taalas Hi! I would appreciate advice on the following: I have a repository which currently has mixed line endings (LF, CRLF and mixed files). I have found instructions on how to correct this and force consistent line endings. Only thing I am unsure about is when best to do this. I use a main and a develop branch and regularly rebase between those. Currently develop differs from main. Should I wait until both are identical again or won't there be p08:52
→ vamiry_ joined08:52
← vamiry left08:52
← ronskisika left08:53
vamiry_ → vamiry08:54
valhalla_22 ty i will look into it.08:54
→ bronson joined08:55
← overlord_tm left08:56
→ sarri joined08:56
← sarri left08:56
→ sarri joined08:56
→ tcp_j joined08:58
→ Darcidride joined08:58
← tcp_j left08:58
Vampire0 taalas, IRC has a maximum message length, all after "won't there be" was cut08:59
← bronson left08:59
← valhalla_22 left09:01
taalas Vampire0: Sorry, will post the rest of the sentence again...09:01
← pbandark left09:01
taalas ...problems merging/rebasing?09:01
← Guest10 left09:02
→ pbandark joined09:03
→ jceb joined09:04
→ luleq joined09:04
→ claudio joined09:05
← luleq left09:06
← claudio left09:06
→ claudio joined09:07
→ luleq joined09:07
← Es0teric left09:07
← claudio left09:07
← luleq left09:07
→ JimDungo joined09:08
→ aspiers joined09:08
→ luleq joined09:08
← luleq left09:09
thblt Hi! Is there a way to list tags *on the current branch only*?09:09
← flobin left09:09
Vampire0 taalas, I guess whether you will have problems depends on the exact settings of the eol-related config options and whether you normalize the eols in both branches or only in one. But even if you will have conflicts in the whole file when you cherry-pick or rebase or whatever, it can be easily resolved, it just might be tedious. We have files that have win-eol in one branch and *nix-eol in the other and I g09:10
et the whole file conflicted then. But I use P4Merge as merge tool (the best free diff and merge tool that I know) and it ignores the line-endings, resolving the pseudo-conflict at once and I just have to press save, as I configured it to use the wanted line ending by default09:10
→ humboldt_ joined09:10
grawity thblt: git tag --merged HEAD09:10
thblt grawity: Thank you!09:10
→ redtime joined09:11
Vampire0 thblt, or simply `git tag --merged`. HEAD is the default ref there09:12
→ aax joined09:12
→ xaa__ joined09:13
thblt Thanks. Another question: I can reasonably assume that tags are in chronological order, right?09:13
oxymoron93 well yeah, they should be09:13
thblt (I'm working on a small UI for a submodule-based package manager for Emacs, and I'm trying to determine most recent version)09:14
grawity they're in alphabetical order09:14
oxymoron93 woah09:14
Vampire0 thblt, how would you define chronological order?09:14
thblt, commits are **not** necessarily in chronological order09:14
grawity luckily tags aren't made in the form of a DAG09:14
thblt Vampire0: given that I'm on a single branch, the sequence of commits should be (reasonably) ordered, shouldn't it?09:14
grawity so they *can* be chronologically ordered very easily09:15
← humboldt_ left09:15
grawity although you have at least three timelines (for annotated tags; two otherwise); it seems `git tag --sort taggerdate` works well enough09:15
← xaa left09:15
→ star_prone joined09:15
Vampire0 thblt, they **are** ordered, by parent-child relationship, **not** by date09:16
grawity it's reasonable to expect that the committer date will mirror that order 99% of the time, though09:16
Vampire0 thblt, if you e. g. make an interactive rebase and switch the order of commits on your single branch, you have a non-chronological order regarding author dates already09:16
→ raijin joined09:16
→ avarab joined09:17
← avarab left09:17
→ avarab joined09:17
thblt grawity: didn't think of rebase, thanks for pointing it out.09:17
← aax left09:17
← redtail left09:17
Vampire0 sure grawity, that's why I asked how he defines chronological order. you have commiter date, author date, tagger date and commits are not necessarily ordered by any of them09:17
grawity the original question was about order of *tags* though09:18
Vampire0 thblt, I pointed out rebase ;-)09:18
jast specific answer: 'git tag -l' sorts the output by tag *name*09:18
← avarab left09:18
grawity tags are independent of each other; if tag A has tagger date of today, and tag B has tagger date of yesterday, that's pretty unambiguous09:18
→ avarab joined09:18
← avarab left09:18
→ avarab joined09:18
thblt Vampire0: Sorry, thank *you* then :)09:18
grawity you can't "swap" them with rebase09:18
← qpdb left09:18
markzen man gitignore09:18
gitinfo the gitignore manpage is available at https://gitirc.eu/gitignore.html09:18
Vampire0 grawity, yes, but to be aware that not even the commits are ordered chronological can make one think about whether maybe commit-order is the wnated order and not chronological order09:18
jast e.g 'v1.0', 'v1.1', 'v1.10', 'v1.2' etc.09:19
markzen man gitattributes09:19
gitinfo the gitattributes manpage is available at https://gitirc.eu/gitattributes.html09:19
thblt jast: I've been thinking I could even parse the version tags, but now I've seen what people do with them, I'm afraid.09:19
→ notebox joined09:20
jast 'git log', on the other hand, defaults to reverse chronological order by author timestamp09:20
avarab → avar09:20
jast thblt: to sort chronologically you can use shell magic, something like this:09:20
Vampire0 jast, git log uses chronological order? It should use commit order, shouldn't it?09:20
jast not by default09:20
→ indistylo joined09:21
→ gxt joined09:21
→ valhalla_22 joined09:22
→ Kuukunen joined09:22
jast thblt: git for-each-ref --sort=creatordate 'refs/tags/*'09:22
that was easier than I thought, actually :)09:23
← energizer left09:23
→ jntme joined09:23
valhalla_22 i have some code on on my branch , i want to see it on master.09:23
osse there is also version sort09:23
grawity you know, `git tag` has --sort09:23
valhalla_22 hwo can i do that09:23
jast oh, it does. I missed that in the code, but it's obvious in the docs :)09:24
thblt jast: grawity: Vampire0: Thanks a lot. It seems trickier than I expected, but for my use case, "tag --sort taggerdate --merged HEAD" seems to work perfectly.09:26
← notebox left09:28
→ notebox joined09:30
→ energizer joined09:30
→ db8093246 joined09:31
← kurkale6ka left09:32
→ kurkale6ka joined09:32
← Murr left09:32
→ Murr joined09:33
→ chll_ joined09:33
→ lzybassist joined09:34
→ cagedwisdom joined09:34
← enkrypt left09:35
→ cdg joined09:35
G0Y0 → Goyo09:36
← fatihgenc_ left09:36
→ fatihgenc_ joined09:37
valhalla_22 my branch is update but recently git says , we cannot checkout the branch .the problem is i have added two characters in gitignore ,due to which git chekcout is not taking place09:37
Vampire0 valhalla_22, !repro09:38
gitinfo valhalla_22: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see09:38
← lzybassist left09:38
→ kurkale61 joined09:39
← cdg left09:39
← valhalla_22 left09:39
← kurkale6ka left09:41
→ cqi joined09:41
← fatihgenc_ left09:42
→ fatihgenc_ joined09:42
taalas Vampire0: Thanks! That helps alot.09:42
→ Borg- joined09:44
Vampire0 taalas, yw09:45
← notebox left09:46
→ nowhere_man joined09:46
→ enkrypt joined09:48
← nowhere_man left09:51
→ argoneus joined09:52
← KeyJoo left09:53
← Cabanossi left09:54
← belmoussaoui left09:56
→ kadoban joined09:56
→ valhalla_22 joined09:57
→ Cabanossi joined09:57
→ belmoussaoui joined09:57
← valhalla_22 left09:57
→ courrier joined09:58
→ ams__ joined09:59
→ morenoh149 joined09:59
→ supremum joined10:00
→ Improvotter joined10:01
← belmoussaoui left10:02
→ russell-1 joined10:02
← morenoh149 left10:03
→ nowhere_man joined10:04
← JeroenT left10:04
russell-1 → russell---10:04
→ JeroenT joined10:05
← Kevgeon left10:06
← energizer left10:07
→ valhalla_22 joined10:08
→ robotrolll joined10:08
valhalla_22 how can i sync my local version to recent commit .10:08
← JeroenT left10:09
gitinfo set mode: +v10:09
Borg- valhalla_22: local wcopy clear?10:09
← courrier left10:10
← Kaisyu left10:10
← PioneerAxon left10:11
← robotroll left10:11
← olbat[m] left10:11
→ PioneerAxon joined10:11
robotrolll → robotroll10:11
← ionelmc left10:11
→ Lynxium joined10:11
← lagothrix left10:12
← opencw left10:12
← ukleinek left10:12
→ Nickeeh joined10:12
→ Blkt joined10:12
→ ztane joined10:13
→ stoopkid_ joined10:13
→ spm_draget joined10:13
← Lynxium left10:13
valhalla_22 Borg-: sorry for not being so verbose , my branch is dev_workout ,i want to sync with that only , because 25 minutes ago ,i have pushed the code to my github branch ;although i know the answer which is if i am living on that branch then just do the git pull BUT i wanted to be sure , what i am doing.10:13
→ Seveas joined10:13
→ AndrewGazelka joined10:13
← Mindi left10:13
← Guest81624 left10:13
→ n-st joined10:14
→ Kaisyu joined10:14
→ dilijev joined10:14
→ nezZario joined10:14
← sangy left10:15
← BlackPanx left10:15
Borg- valhalla_22: pushed from other repository? if yes. then git pull on another one.. yes10:15
→ theoceaniscool joined10:16
→ Patrick joined10:16
Patrick → Guest3273710:16
→ Mindi joined10:16
valhalla_22 ohh i did that ,i lost the change .10:16
→ sangy joined10:16
valhalla_22 i did git pull10:16
→ nemesit|znc joined10:16
→ RickyB98 joined10:16
→ FiendKing04 joined10:16
← RickyB98 left10:16
→ RickyB98 joined10:16
→ CustosLimen joined10:16
→ ablackack joined10:17
→ BlackPanx joined10:17
→ johnnyfive joined10:17
Borg- valhalla_22: huh? how come? but do not despair.. your changes.. are stull there..10:17
→ atrus joined10:17
Borg- still even...10:17
taalas Vampire0: Just out of curiosity: Is p4merge able to show a single file containing merge conflicts (indicated by <<</>>>) in 3-way-merge form?10:18
valhalla_22 yeah i only remember this commit no 53b7df310:18
Borg- valhalla_22: so, what happened on git pull?10:18
→ TSS_ joined10:18
→ lagothrix joined10:18
→ souther joined10:19
← apeiros left10:19
← Hogofwar left10:19
valhalla_22 i was living on my branch then did git pull and i lost the change10:20
→ saidelike joined10:20
valhalla_22 can u tell me how to acces this commit no 53b7df310:20
i think this is address of what i did 25 min ago10:20
→ SegFaultAX joined10:20
→ apeiros joined10:21
→ Hogofwar joined10:22
→ ToBeCloud joined10:24
gitinfo set mode: +v10:24
valhalla_22 Borg-: can i access the repository by commit hash number,i just have lost the change on local .10:24
→ olbat[m] joined10:24
← xaa__ left10:24
→ leah2 joined10:24
→ Codaraxis joined10:24
← Cabanossi left10:24
→ xaa__ joined10:25
→ ssarah joined10:25
→ mulvane joined10:25
← mulvane left10:25
→ mulvane joined10:25
→ Peng joined10:26
→ opencw joined10:26
→ Peng_ joined10:26
← Guest60934 left10:27
→ Cabanossi joined10:27
← disi left10:27
→ up_the_irons joined10:27
valhalla_22 how to revert the git pull10:27
→ ukleinek joined10:28
← cagedwisdom left10:28
← Gonzo89 left10:29
selckin !reflog10:29
gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`10:29
valhalla_22 yeah i want to access to head{1} ,should i be doing this git reset --hard HEAD{1}10:30
Borg- valhalla_22: depends what happened..10:30
valhalla_22: can you find your last good commit issuing git log ?10:31
if yes.. then git reset will work fine..10:31
selckin !backup10:31
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups10:31
jast it's HEAD@{1}, not HEAD{1}10:31
→ \drew joined10:31
→ treehug88 joined10:31
→ cdown joined10:31
→ lzybassist joined10:31
valhalla_22 i think my there are many ways to solve my problem :-)10:31
jast as long as you don't have uncommitted changes ('git status' to check), you should be fine without a backup10:31
selckin suspect hes in conflict state tho10:32
valhalla_22 no not backup , what i did git pull ,due to which i lost my changes , just tell me how to rever git pull ,and thing will automatically in order.10:32
Borg- valhalla_22: what do you mean lost changes?10:32
uncommited?10:33
valhalla_22 no all were commited changes ,will paste help you ??10:33
→ Nicmavr joined10:33
Borg- then they are still there...10:33
Nicmavr → Guest2282810:34
Borg- yeah, show me message from git pull.. pastebin or whatever10:34
because I dont know what really happened... merge or force update...10:34
valhalla_22 ok10:35
→ silenc3r joined10:35
← lzybassist left10:35
→ disi joined10:37
valhalla_22 Borg-: here it is https://pastebin.com/xSycqEpz ,my best status was at head{1} ,after doing git pull i am at head{0} ,can i revert back the pull or move my pointer to head{1}.10:38
Borg- hmmm10:39
valhalla_22 :-)10:39
Borg- everything looks legit... what actually did you losed?10:39
ah wait10:39
I see it now10:40
Vampire0 taalas, nope, as far as I know it is not unfortunately, that's one of the very few mancos. :-) But for Git this is not relevant, as you can simply call `git mergetool` and it automatically opens the tool with the right file-stages, or you can checkout the single stages to different files manually and call the tool :-)10:40
valhalla_22 i loosed head{1}10:40
→ JeroenT joined10:41
← jameser left10:41
Borg- yeah.. but something strange.. why HEAD@{0} and HEAD@{1} have same SHA-1 ?10:41
thblt I'm confused, again. In detached branch mode, does the question "from which branch does the current commit come from" has a meaning? This commit can potentially be in a *lot* of branches, right?10:41
s/has a meaning/have a meaning. Sorry for my English.10:41
→ jameser joined10:42
← jameser left10:42
Vampire0 thblt, it is not detached branch, but detached HEAD, as HEAD is not attached to any branch. And "from which branch does a commit come from" never has a meaning10:42
Borg- valhalla_22: actualy, im kinda confused......10:43
thblt Vampire0: thanks (again!), that's what I thought.10:43
Vampire0 thblt, commits are not related to branches, just to parents. You can at one exact point in time say "now is commit XYZ contained in the history of branch ABC", but this can change anytime10:43
valhalla_22 Borg-: what else do u need .10:43
← jntme left10:43
russell--- → russell--10:44
Vampire0 thblt, you can imagine refs (branches, tags, stash, ...) as post-it notes that you at any time can peel off and stick to another commit at will10:44
Borg- valhalla_22: what 'git show HEAD@{1}' shows?10:45
thblt Vampire0: thanks *a lot*, that's really helpful.10:45
→ kanzure joined10:45
→ kristofferR joined10:45
← Elon_Satoshi left10:45
→ pasky joined10:46
Borg- yo pasky ;)10:46
pasky Hey!10:46
→ imack joined10:46
valhalla_22 https://pastebin.com/bTeXiGuU Borg-10:46
Borg- pasky: ltns... :) left IRCnet completly?10:47
thblt So (context is still an UI for an Emacs package manager based on submodules), if I want to show the user a list of available tags *on a given branch* so they can choose to update a package to one of these tags, the user has to give me the name of the branch (I can default to "master", of course)10:47
Borg- pasky: can you help? I have strange stuff here, from valhalla_22 ...10:47
pasky: https://pastebin.com/xSycqEpz10:47
valhalla_22 Borg-: you dont need to think about sha1 ,only think of them as pointer then it will be very simple to visualize.10:47
pasky Borg-: I'm still on a few cz channels on IRCnet. But kinda busy for IRC in general nowadays.10:47
Borg- valhalla_22: good.. your change its there...10:47
pasky I'll take a look!10:47
Borg- pasky: why HEAD@{1} have same SHA as upper log? or. I dont get something there? :)10:48
→ Jackneill joined10:48
→ Elon_Satoshi joined10:48
Borg- valhalla_22: what git status says?10:49
you are at clean status at 53b7df3 ?10:49
valhalla_22 in simple words i commited a sin named in time frame git pull , all i need to time travel to head{1} ,my work is done. In mathematical stement it is problem of traversing but i dont have enough knowledge to talk to git .10:49
so i am asking here.10:50
Borg- valhalla_22: you can do it easly.. via git reset... but before doing so10:50
we need to cleanly understand if this is what you want10:50
← hfp_work left10:50
valhalla_22 yes ,10:50
i want only that if it meant that time travelling thing .10:51
Borg- the only thing I dont like there is via I see 2 same SHA1. or.. they arent same.. but you are unlucky and first 7 hex are same :)10:51
→ Slush- joined10:51
Borg- I need full SHAs...10:51
valhalla_22 what i need to do that10:51
Borg-: you are making it little hushy pushy , by overthinking,i suggest , that can put my thing into risk,may be .10:52
Vampire0 Borg-, what you don't get about the same SHAs is simply that it is normal behavior.10:52
Borg- Vampire0: can you elaborate?10:53
← chachasmooth left10:53
Vampire0 Borg-, if you do `git checkout master && git checkout master`, you will see the same in your reflog10:53
← cdown left10:53
Vampire0 Borg-, I'd vote for calling this a bug, but maybe it is not, I don't know10:53
valhalla_22 Borg-: you need to revisit the concept of sha1 ,may be that will help .10:54
Borg- let me clone a test repo and see it10:54
valhalla_22 HOW CAN I ROLL BACK MY GIT PULL .10:54
→ hfp_work joined10:54
pasky Borg-, valhalla_22: if you're on branch xyz, `git checkout xyz` even though it's a nop it'll create a reflog entry (with the same commit id as before), you can easily try that on any repo you have around10:54
→ chachasmooth joined10:54
grawity Borg-: if two commits have different full hashes, but same 7-digit prefix, then git will simply show 8 digits10:54
if the first 8 digits are the same, git will show 910:54
Borg- ahh ok10:55
pasky so if you were on branch sankalp_dev, git checkout sankalp_dev will do nothing but it will create a reflog entry10:55
Vampire0 valhalla_22, you should start with not shouting10:55
→ hehehe joined10:55
valhalla_22 k10:55
Borg- valhalla_22: yeah, calm down...10:55
hehehe hi10:55
Borg- valhalla_22: if you are in hurry: git reset --hard HEAD@{1}10:55
Vampire0 valhalla_22, just reset to the commit before the pull10:55
Borg- buuuut! if anything wrong.. that was NOT me.. ;) ok?10:56
also10:56
backup stuff.. :)10:56
Vampire0 borg not helpful, as HEAD@{0}and HEAD@{1} are identical10:56
hehehe if I am looking at https://github.com/opencart/opencart how I can check which version of OpenCart is master branch using?10:56
valhalla_22 yeah ok like what things can go wrong .10:56
← Cabanossi left10:56
→ aviany joined10:56
→ bronson joined10:56
→ cagedwisdom joined10:56
selckin valhalla_22: you complained that we suggested to backup no time to worry about what can go wrong now10:56
→ Cabanossi joined10:56
Vampire0 valhalla_22, btw. the reflog does not show any pull, are you sure you pulled in that branch?10:56
Borg- % git reflog10:57
7017c8c HEAD@{0}: checkout: moving from master to master10:57
7017c8c HEAD@{1}: checkout: moving from master to master10:57
7017c8c HEAD@{2}: clone: from git://server/botlog10:57
wow.. indeed :)10:57
valhalla_22 is there some bug !!10:57
Borg- its indeed confusing.. dunno.. never had a NEED to use git reflog10:57
valhalla_22 me too .10:58
i just use git log --oneline10:58
Borg- If I ever had a problems...with any way.. I use git log or git fsck --unreachable and I work on SHAs10:58
grawity your reflog seems completely normal10:58
Vampire0 Borg-, that are other use-cases, always depends on the situation10:58
→ basiclaser joined10:58
Vampire0 Borg-, unreachable will not give you stuff in the reflog, as those **are** reachable10:59
valhalla_22 okk ,first solution is git reset --hard HEAD@{1} ,what about accesing the repository via sha1 number,such type is possible or not.10:59
Borg- valhalla_22: 'repository via sha1' ??? uhh.... you can access commits by SHA110:59
pasky Vampire0: are you sure about that? that'd mean git would never garbage collect *anything* you ever had checked out, even if it's long unreferenced in history10:59
Vampire0 valhalla_22, no, that's not first solution, it will be a no-op. HEAD@{1} is the same as HEAD@{0} in your case10:59
← nowhere_man left11:00
valhalla_22 yeah Borg- in hurry i typed wrong .11:00
Vampire0 pasky, the reflog expires after 30 (configurable) days, THEN they are unreachable and garbage collected11:00
Borg- okey... so maybe its stupid question.. so what is that HEAD@{} thingie then?11:00
→ rda-mac joined11:00
Borg- I know HEAD^ and HEAD~<N>11:00
Vampire0 valhalla_22, you can always work with SHAs, but your HEAD reflog does not show any pull11:00
→ Ruler- joined11:00
← manuelschneid3r left11:00
← bronson left11:01
→ manuelschneid3r joined11:01
Vampire0 valhalla_22, what does `git reflog sankalp_dev` say?11:01
Borg- okey.. I think im confusing refs with reflog :) now I start to understand11:01
Vampire0 Borg-, man gitrevisions11:01
gitinfo Borg-: the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html11:01
← basiclaser left11:01
Borg- reflog. is well... :) logs on ref11:01
lets take a look at URL too11:01
pasky Vampire0: My reflog goes through the complete history of the project. Perhaps if git gc is triggered and mine was never big enough on this particular repo?11:01
Vampire0 Borg-, exactly, the reflog is the history of the according ref11:01
← Elon_Satoshi left11:01
Vampire0 pasky, size shouldn't matter, just age11:02
→ basiclaser joined11:02
valhalla_22 what is my solution then ?11:02
Vampire0 [13:01:15] <Vampire0> valhalla_22, what does `git reflog sankalp_dev` say?11:02
→ roelmonn_ joined11:03
valhalla_22 Vampire0: wait11:03
→ deltab joined11:03
Vampire0 pasky, by the way it is 90 days by default, not 30, my bad11:03
pasky, man git config and search for reflogExpire11:03
gitinfo pasky: the git-config manpage is available at https://gitirc.eu/git-config.html11:03
valhalla_22 it says this https://pastebin.com/zSHNGxXD11:04
← rda-mac left11:04
→ kurkale6ka joined11:05
← roelmonnens left11:05
valhalla_22 how can i jump to this commit number starting 53b..11:05
Borg- valhalla_22: well, you are on IT.. actually11:06
valhalla_22 really but i am on hEAD{0}11:06
now11:06
Borg- NO..11:06
you are confusing logs with reflog11:06
Vampire0 valhalla_22, also this reflog does not show any pull11:06
Borg-, actually he is right11:07
Borg-, he is *always* on HEAD@{0}11:07
← kurkale61 left11:07
Borg- hmm? how come.. from that I see.. he dont git checkout sankalp_dev; being on branch sankalp_dev, right?11:07
so noop11:07
Vampire0 HEAD@{0} == HEAD == currently checked out commit or branch11:07
Borg- s/dont/did/11:07
also in his case... HEAD@{1} == HEAD@{0] == HEAD right?11:08
reflog just recorded dummy checkout..11:08
→ OMGOMG joined11:08
grawity yeah, the reflog of HEAD can certainly record dummy checkouts11:08
Vampire0 Borg-, yes, in his specific case, but my formula is always true11:08
valhalla_22 i am getting confused.11:08
Borg- so I dont understand what he really losed :)11:09
Vampire0 valhalla_22, well, you are on 53b7df3 as the reflog of HEAD shows11:09
valhalla_22, so what is your problem actually?11:09
Borg- yeah ;)11:09
grawity hmm, where was the reflog of HEAD pastebinned?11:09
Vampire0 grawity, yes11:09
Borg- https://pastebin.com/xSycqEpz11:09
valhalla_22 Vampire0: i updated my gitingore with lot of lines , right now i am not abe to see it .11:09
grawity right11:09
Borg- valhalla_22: are you 1000% sure you commited them?11:09
Vampire0 valhalla_22, what do you mean by "see it"?11:10
Borg- maybe you done that on different branch?11:10
valhalla_22 yes ,i can see it on my github11:10
Vampire0 valhalla_22, is that a public repo?11:10
valhalla_22 nope11:10
Vampire0 valhalla_22, what is the SHA on GitHub where you can see the changes being committed?11:10
valhalla_22 53b7df311:11
→ kurkale61 joined11:12
→ ondra_ joined11:12
Borg- valhalla_22: git status ? says something?11:12
→ CussBot joined11:12
Vampire0 valhalla_22, and git status?11:12
← kurkale6ka left11:12
Borg- pasky: I'll msg you on IRCnet.. coz im leaving to work :)11:13
→ Silenced joined11:13
valhalla_22 mate! its very easy problem of traversing with respect to timeframe .I will solve it on my own .11:13
Borg- pasky: oh you are not there ;) I will catch you here then.. no problem11:13
Borg- → Borg032411:14
→ tvw joined11:14
→ Borg- joined11:14
valhalla_22 just tell me this how can i sync my reposotory with respect to commited on . 53b7df311:14
gitinfo set mode: +v11:14
Vampire0 valhalla_22, I didn't get the last two sentences11:14
valhalla_22, if GitHub shows the changes in commit 53b7df3 and you have commit 53b7df3, then you have it11:15
Borg0324 unless.. you are the luckest guy in earth.. and got struck by SHA1 collisions? ;)))))11:15
nah.. impossible.. then he couldnt commit that changes to github11:15
Vampire0 valhalla_22, there is no need to "sync that SHA" if that was the question, because the full history, changes, commiter and author information and so on are part of the SHA11:15
← cagedwisdom left11:16
Vampire0 valhalla_22, so if you have the same SHA, the commits and their history are nearly certainly identical11:16
Borg0324 valhalla_22: you still didnt pasted git status11:16
Vampire0 valhalla_22, what does `git diff @^!` and `git status` say?11:16
Borg0324 pasky: can u do /umode -R ? :) im not registered here11:17
valhalla_22 ok wait.11:17
https://paste.pound-python.org/show/PhLLAJp5hBrlllaM0ELp/11:17
hehehe /join #chemistry11:18
Vampire0 valhalla_22, well there you have it, you modified your .gitignore file locally11:18
valhalla_22, now do `git diff`11:19
Borg- lol..11:19
case closed...11:19
Vampire0 valhalla_22, you will probably see that you just locally deleted your lines you are missing11:19
valhalla_22 aah finally .11:19
→ danieli joined11:19
→ paul424 joined11:19
Borg- heh.. he was commands that he never really should know they exist.. like git reflog..11:19
Vampire0 valhalla_22, then do `git checkout -- .gitignore` to revert that if you want11:19
← danieli left11:19
→ danieli joined11:19
Borg- git status is very importand commmand!!!!!11:19
← Borg0324 left11:20
Vampire0 Borg-, git reflog is a very important command that everyone should optimally know too11:20
valhalla_22 lolz it is .i qs gettign intuition that we are making it complicated.11:20
but what about git pull11:20
i did that too11:20
Borg- Vampire0: honestly... I never used it until today ;)11:20
→ cagedwisdom joined11:20
Vampire0 valhalla_22, no you didn't, or at least it had no effect because there were no upstream commits to integrate11:21
valhalla_22 whenever in doubt just use git status11:21
Vampire0 valhalla_22, but it would have told you in the output11:21
Borg- yep.11:21
bbl :)11:21
Vampire0 Borg-, and I use it often. :-)11:21
Borg-, everything is possible in other ways, but it is much easier when using the reflog :-)11:21
← mintmike left11:22
valhalla_22 ok leave aside in logically its very simple problem , all i want to sync my snapshot of local to 53b comit ,and my problem will be gone.11:23
Vampire0 valhalla_22, can you rephrase please?11:24
valhalla_22 for me git is all about bunch of tree and monkey jumping.11:24
valhalla_22 Vampire0: ok ,i am doing again .11:24
← ssarah left11:25
→ altendky joined11:25
→ xall joined11:25
← Cabanossi left11:25
valhalla_22 i messed in my local ,its ok .Now i just want to resync the local branch to my remote branch of github .11:25
→ Milijus joined11:25
← kristofferR left11:26
→ Cavallari joined11:26
← Milijus left11:26
valhalla_22 also i dont want to keep my local changes .11:26
→ curiouser joined11:26
← aviany left11:26
→ Milijus joined11:26
Vampire0 valhalla_22, but they ARE in sync. both point to 53b7df3 and you have no local commits on that branch, so what is your problem actually?11:26
→ Cabanossi joined11:26
valhalla_22 then why i can not checkout to another branch11:27
→ ssarah joined11:27
valhalla_22 expressing problem in words which is laconic is also NP problem.11:28
← Milijus left11:28
← Guest32737 left11:28
→ Patrick joined11:28
→ Milijus joined11:28
Patrick → Guest2541011:28
→ mintmike joined11:28
valhalla_22 Vampire0: if i am in sync then why i cannot do checkout to another branch .11:29
i have my branch valhalla_dev i cant move to that11:29
→ nuked0ne joined11:30
← Milijus left11:30
Vampire0 valhalla_22, !repro11:30
gitinfo valhalla_22: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see11:30
→ Milijus joined11:30
← phluks left11:30
← bsanford left11:31
← Milijus left11:31
→ bsanford joined11:31
valhalla_22 https://paste.pound-python.org/show/l3gnPNW0HoPN6CTnF9W1/11:31
→ c-alpha_ joined11:31
← Murr left11:33
← mintmike left11:33
→ jntme joined11:33
→ Murr joined11:33
valhalla_22 Vampire0: i reproed it11:33
← jntme left11:34
Vampire0 valhalla_22, well, the error is quite obvious and explicit, so what is your question?11:34
→ orbyt_ joined11:35
→ kurkale6ka joined11:36
← ilbot3 left11:36
valhalla_22 how can i do checkout.11:36
Vampire0 valhalla_22, by reading the error message11:36
valhalla_22, as that message and git status and git diff tell you, you have non-committed changes to .gitignore. The branch you want to switch to has a different .gitignore than the branch you are on, so a switch to that branch involves updating that file which has non-commited changes, so Git is yelling and preventing you from loosing changes11:36
→ ilbot3 joined11:37
← ondra_ left11:37
valhalla_22 but i dont want the change , becuase all i deleted two space.11:37
Vampire0 valhalla_22, so do as the error message tells you and either commit those changes or stash those changes. (Actually you also have the option to force the checkout which will overwrite your local changes or to revert your changes which will also make your local changes gone)11:37
valhalla_22, well, then revert it, I told you long ago how to do it, but you ignore each second message directed to you11:38
valhalla_22, !justdo11:38
gitinfo valhalla_22: [!justdoit] If you go to the trouble of asking questions, please go to the trouble of taking the advice offered, Take backups (type "!backup" as a reply to learn more) if necessary -- or in fact, it's a good idea anyway. You can almost always censor log messages if you have to. We are literally helpless unless you tell us what we need or do what we ask. Please, Just Do It™.11:38
← Silenced left11:38
← kurkale61 left11:38
valhalla_22 ok ,since i have pushed the code 1 hour ago , i can allow it loose it.11:38
ok ,since i have pushed the code 1 hour ago , i can allow to loose it.11:38
→ sigma___ joined11:39
→ Achylles joined11:39
Vampire0 [13:18:51] <Vampire0> valhalla_22, well there you have it, you modified your .gitignore file locally11:39
[13:19:01] <Vampire0> valhalla_22, now do `git diff`11:39
[13:19:06] <+Borg-> lol..11:39
[13:19:10] <+Borg-> case closed...11:39
[13:19:19] <Vampire0> valhalla_22, you will probably see that you just locally deleted your lines you are missing11:39
[13:19:20] <valhalla_22> aah finally .11:39
[13:19:21] * danieli (~duniel@85.113.170.231) hat #git betreten11:39
[13:19:38] * paul424 (~chatzilla@37.248.153.196) hat #git betreten11:40
[13:19:39] <Vampire0> valhalla_22, then do `git checkout -- .gitignore` to revert that if you want11:40
→ leeN joined11:40
Vampire0 20 wasted minutes11:40
valhalla_22 yes , i also lost time ,i apologise for that.11:40
danieli wat11:40
→ dec0n joined11:40
danieli oh, i joined with bad timing11:40
← treehug88 left11:41
→ xcm joined11:41
sigma___ → sigma__11:42
→ mintmike joined11:42
→ juvenal joined11:43
← paul424 left11:44
← nuked0ne left11:44
← wandering_vagran left11:44
valhalla_22 i dont follow just do it , as git sometime make me depressed if anything gets wrong .Think it like this monkey jumping on tree is adventurous but if monkey missed the shot while jumping he just falls and hurt itself. I am that monkey.11:45
→ paul424 joined11:45
valhalla_22 Vampire0: i just added *.log in gitiignore file still its tracking it. while doing git status, all i want , git should not yell at me tracking log files.11:47
→ jntme joined11:47
jast !ignore_tracked11:48
gitinfo Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.11:48
← cagedwisdom left11:48
← Peng left11:49
Peng_ → Peng11:49
→ Peng_ joined11:50
valhalla_22 well thankyou Vampire0 Borg- and pasky11:50
→ rda-mac joined11:51
→ kurkale61 joined11:51
Vampire0 valhalla_22, yw11:52
→ tcp_j joined11:52
tcp_j hm11:52
valhalla_22 i duuno its just courtesy.11:52
→ sturner joined11:52
→ olbat joined11:52
← perrier-jouet left11:53
Vampire0 valhalla_22, yeah, that's fine, it even increases our !karma :-)11:53
gitinfo valhalla_22: This channel is equipped with karma measuring devices. If you want to help someone to karmic nirvana, please mention their name when thanking them ("thank you", "thanks", "thx", etc.). Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Karma is not for those seeking instant gratification.11:53
valhalla_22 !karma11:53
gitinfo This channel is equipped with karma measuring devices. If you want to help someone to karmic nirvana, please mention their name when thanking them ("thank you", "thanks", "thx", etc.). Try ".karma <nick>" or ".topkarma" to show karma status of a person but don't expect immediate increase. Karma is not for those seeking instant gratification.11:53
→ perrier-jouet joined11:53
→ dviola joined11:53
valhalla_22 .karma valhalla_2211:53
gitinfo the karma of the given users is shrouded in the mists of uncertainty.11:53
← c-alpha_ left11:53
← kurkale6ka left11:54
valhalla_22 .karma Borg-11:54
gitinfo the karma of the given users is shrouded in the mists of uncertainty.11:54
← xcm left11:54
valhalla_22 .karma Vampire011:54
gitinfo the Genuine Real Life Karma™ REST API results are back! v‍ampire0: 46 (2 in past 30 days) (5 given out)11:55
→ zefferno joined11:55
valhalla_22 .topkarma11:56
gitinfo top karmic beings of past 30 days ('all' arg to see totals): _‍ikke_: 3, g‍rawity: 2, v‍ampire0: 2, o‍sse: 1, a‍ndreaslutro: 111:56
← ilbot3 left11:56
→ cojack joined11:58
→ nuked0ne joined11:58
→ mr_sm1th joined11:58
gitinfo set mode: +v11:59
cojack Hello guys, I have a question did some1 try to pass the progress of git cloen to dialog --gauge? Im trying without luck, any1?11:59
→ ilbot3 joined11:59
→ dzho joined12:00
→ morenoh149 joined12:00
→ Silenced joined12:00
← Silenced left12:01
valhalla_22 cojack: please use english , some1 != someone12:01
→ wandering_vagran joined12:01
→ FatKiwi joined12:02
← nuked0ne left12:03
Vampire0 valhalla_22, and yw != you're welcome? o_O12:03
crem != != isn't equal12:03
valhalla_22 👀12:04
← morenoh149 left12:05
AndreasLutro Please properly capitalise your sentences, and no extra whitespace before your commas, please. And don't forget the full stop at the end!12:05
→ tcorneli joined12:05
crem +112:06
grawity cojack: you'd need to somehow parse `git clone --progress`, since there isn't a single well-defined percentage12:06
→ nuked0ne joined12:06
← tvw left12:07
← kurkale61 left12:07
cojack grawity: I'm trying, found a solution here https://stackoverflow.com/questions/26411342/get-git-clone-progress-for-dialog-gauge but it doesn't work anymore12:07
→ kurkale6ka joined12:07
← chachasmooth left12:09
→ xcm joined12:09
→ chachasmooth joined12:09
→ cbonobo joined12:10
← cbonobo left12:11
← roelmonn_ left12:11
→ cbonobo joined12:11
→ roelmonnens joined12:11
dhollin3 → dhollinger12:14
→ kurkale61 joined12:15
← Gurkenglas_ left12:16
→ donmichelangelo joined12:17
← kurkale6ka left12:17
← silenc3r left12:19
← King_Hual left12:21
→ aviany joined12:22
→ Tee_Pee joined12:22
→ ionelmc joined12:23
Borg- Vampire0: hehe, yeah.. 20 mins wasted.. because I assuemed user done git status and know what happens in his repository.. geez.. lesson learned!12:25
← Cabanossi left12:25
→ Cabanossi joined12:27
→ notebox joined12:27
Vampire0 Borg-, reading the error message of checkout would have helped already actually12:27
→ quackgyver joined12:28
← orbyt_ left12:29
← Tobbi left12:30
→ jameser joined12:31
← supremum left12:32
← ToBeCloud left12:33
valhalla_22 Borg-: you made it overcomplexed12:33
i sinned ,then you exaggerated it by raising the topic of SHA1 ,lolz12:33
← paul424 left12:33
← Chaser_ left12:34
← aviany left12:34
→ Chaser joined12:34
→ perlpilot joined12:34
taalas Vampire0: ah ok, thank you. I have yet to find a tool that will open single conflicted files in merge view ;) As I work remotely on a non GUI system this would have been an excellent time-saver...12:34
Vampire0 taalas, connected via SSH?12:35
taalas Vampire0: yep...and a samba share12:36
Vampire0 taalas, just use X forwarding, works like a charm. The GUI program will be launched on the headless system, but the GUI is displayed on your local system12:36
taalas, all you need is a local X-Server running, e. g. Cygwin-X or XMing12:36
taalas Vampire0: local system is Windows though...so no X without major pain12:36
Vampire0 taalas, no pain at all12:37
taalas Vampire0: there is a cygwin-x?12:37
grawity xserver is the easy part12:37
as long as you don't need to run local clients12:37
Vampire0 taalas, yes, there is a gui package for Cygwin, so if you have Cygwin anyway get that, and you are done12:37
yanome → yn12:37
taalas Vampire0, grawity that is an excellent idea...I might do that...never thought about running a graphical client remotely12:38
Vampire0 taalas, neither Cygwin-X nor XMing involve any pain in getting them to run12:38
taalas Sounds perfect, thanks12:38
→ mpeter joined12:39
Vampire0 taalas, besides that, I think Winmerge and TortoiseMerge can open conflict files, but I'm not sure12:40
← xall left12:41
→ HardlySeen joined12:42
→ fission6 joined12:42
taalas Vampire0: I am almost certain Winmerge can't, not sure about TortoiseMerge...I might be wrong though12:43
→ ketas joined12:44
→ timvisher joined12:49
← eb0t left12:50
← fees left12:51
Vampire0 taalas, http://manual.winmerge.org/Compare_files.html point 4.312:51
eblip → eb0t12:51
← czart left12:51
→ czart joined12:52
→ Walex joined12:52
← chachasmooth left12:53
ketas → ketas-12:54
→ chachasmooth joined12:54
→ lmat joined12:56
→ bronson joined12:57
→ ketas joined12:57
→ DamienCassou joined12:57
DamienCassou hi12:57
I very regularly do `git reset --hard origin/the-branch-I-m-in`. Is there a shorter way to say "I don't care about what I have locally, please take what's in the remote"?12:58
← ketas- left12:59
_ikke_ git reset --hard @{u} if you have setup tracking information13:00
← \drew left13:00
→ kurkale6ka joined13:00
← valhalla_22 left13:00
_ikke_ What is the reason you use it very regular?13:00
→ \drew joined13:01
← kurkale61 left13:02
← bronson left13:02
→ _ikke_ joined13:03
→ cdg joined13:04
DamienCassou _ikke_: thank you for your answer. I've never seen these `@{XX}` variables. I will read about them. Thanks13:05
_ikke_ man gitrevisions13:05
gitinfo the gitrevisions manpage is available at https://gitirc.eu/gitrevisions.html13:05
→ dave0x6d joined13:06
DamienCassou _ikke_: I sometimes have to commit and push in Windows but I never want these commits to be merged upstream for several reasons (e.g., I can't sign my commits in Windows). So I always fetch, rewrite and force-push these commits from Linux. When I'm back in Windows, I don't care about what's there anymore.13:07
← Cavallari left13:07
← basiclaser left13:07
_ikke_ Ok, so you use git to synchronize13:09
← wy4 left13:09
DamienCassou indeed13:09
→ cdg_ joined13:10
→ str joined13:12
→ kurkale61 joined13:12
← cdg left13:14
← xaa__ left13:14
← kurkale6ka left13:15
gitinfo set mode: +v13:15
zofrex TIL @{u}13:15
_ikke_ shorthand for @{upstream}13:16
zofrex that's super handy13:16
so `git merge @{u}` will merge tracking branches in for example?13:16
_ikke_ right13:17
← Achylles left13:17
_ikke_ You can also set git config merge.defaultToUpstream13:17
then you can just do git merge13:17
← govg left13:21
← sigma__ left13:21
← jntme left13:23
→ jakogut joined13:23
kurkale61 → kurkale6ka13:24
← Cabanossi left13:25
← jakogut left13:26
→ jakogut joined13:26
→ Cabanossi joined13:27
Vampire0 _ikke_, shouldn't that be the default behavior?13:27
_ikke_, from man git merge: If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page.13:28
gitinfo _ikke_: the git-merge manpage is available at https://gitirc.eu/git-merge.html13:28
_ikke_ My experience says it's not, that's why I even know that config value13:28
→ JeremyD joined13:29
JeremyD → SleePy13:30
Vampire0 _ikke_, hm, what does it without the option?13:31
→ am55 joined13:31
← am55 left13:31
→ am55 joined13:31
→ kufin joined13:31
Vampire0 taalas, while I was in that man page I found merge.renormalize, might be of interest for you: https://git-scm.com/docs/git-merge#git-merge-mergerenormalize13:32
← Murr left13:32
→ Murr joined13:33
_ikke_ tests seems to indicate that it does default to true, hmmm13:33
zofrex _ikke_: nice! :D13:33
thanks13:34
_ikke_ Apparently the default has flipped since 2.1.013:35
But that's almost 3 years old13:36
while I do recall more recently that it complained about that config value13:36
← notebox left13:40
→ Rodya_ joined13:43
→ nethobo joined13:44
→ nethob0 joined13:45
Vampire0 hm, strange13:45
← nethob0 left13:45
→ rwb joined13:45
Vampire0 so what does it do if you set it to false?13:45
← oxymoron93 left13:46
→ aboccia joined13:46
← JimDungo left13:47
→ belmoussaoui_ joined13:47
_ikke_ It complains with: fatal: No commit specified and merge.defaultToUpstream not set.13:47
Vampire0 ah, ok, thx _ikke_13:48
_ikke_ That's the message a remember getting even recently13:49
without setting that config value to false13:49
← Rodya_ left13:49
→ ResidentBiscuit joined13:49
← lordjancso left13:49
← Murii left13:50
← Rotaerk left13:51
← ppang left13:52
← Ruler- left13:53
← mr_sm1th left13:54
→ ppang joined13:54
← ppang left13:54
← danemacmillan left13:54
← TheWild left13:54
→ danemacmillan joined13:55
→ ekinmur joined13:55
→ ecuanaso joined13:55
→ MarioBranco joined13:55
→ gugah joined13:56
← BSaboia left13:56
Vampire0 _ikke_, hm, I do not have it set and `git merge` says up-to-date13:58
→ redtail joined13:58
→ govg joined13:58
_ikke_ Right, apparently since 2.1.0, it defaults to true13:59
Vampire0 hm, ok, great :-)13:59
← ekinmur left14:00
→ morenoh149 joined14:01
→ LeBlaaanc joined14:01
→ AaronMT joined14:01
← JeroenT left14:02
→ mr_sm1th joined14:02
taalas Vampire0: excellent. I did not know that option. Do you know if this will also work when merging as part of a rebase. Also sorry for my late replies...I am on and off the keyboard...14:03
Vampire0: Just checked and rebase has renormalization options as well...perfect14:05
→ notebox joined14:05
← vmiklos left14:05
← morenoh149 left14:05
→ c-alpha_ joined14:07
→ Murii joined14:07
boxrick Hello!14:07
← nethobo left14:08
boxrick I have a git branch of someone elses I am trying to merge back in.14:08
But they delete files I need, any workarounds?14:08
→ clmsy joined14:08
← Murii left14:11
← ecuanaso left14:12
→ Gurkenglas_ joined14:12
← belmoussaoui_ left14:14
→ belmoussaoui_ joined14:15
_ikke_ boxrick: Can you ask them to not remove those files from the branch?14:16
perlpilot boxrick: `git merge --no-commit` then reset those files?14:17
boxrick This is an ancient feature branch14:17
I ended up adding them back in on that branch then merging with master as a workaround14:18
_ikke_ boxrick: Can you modify the branch yourself to not do that?14:18
→ bambams joined14:18
← bambams left14:18
→ bambams joined14:18
boxrick But that --no-commit looks interesting14:18
← belmoussaoui_ left14:19
→ belmoussaoui_ joined14:20
← str left14:20
→ lb1c joined14:21
← duckydan left14:21
→ Es0teric joined14:22
→ Guma joined14:22
→ ruskie joined14:23
→ Feral_Cat joined14:23
→ imMute joined14:23
← imMute left14:23
→ imMute joined14:23
← c-alpha_ left14:24
← Cabanossi left14:24
← dec0n left14:25
→ Stath joined14:26
← fatihgenc_ left14:26
→ Soni joined14:26
→ g0d355__ joined14:26
→ fatihgenc_ joined14:27
→ Cabanossi joined14:27
← curiouser left14:27
← SerusWork left14:28
← Raging_Hog left14:29
→ lzybassist joined14:29
→ ox joined14:30
← fury_ left14:30
ox → oxymoron9314:31
→ nethobo joined14:31
← felipedvorak left14:31
← fatihgenc_ left14:32
→ fatihgenc_ joined14:32
← fatihgenc_ left14:33
← todd_dsm_ left14:34
→ str joined14:34
← star_prone left14:34
Borg- pasky: *ping*14:35
→ todd_dsm joined14:35
← Levex left14:36
→ Levex joined14:36
→ star_prone joined14:38
→ df0_ joined14:38
→ SerusWork joined14:39
← Guest51511 left14:39
→ ski4x7 joined14:40
← ski7777 left14:41
← star_prone left14:42
→ sammyo joined14:43
→ jstein_ joined14:45
→ dendazen joined14:45
jstein_ → jstein14:45
→ felipedvorak joined14:45
→ Rodya_ joined14:45
← ferr left14:46
→ iNCoNFuN joined14:46
→ agnki joined14:46
← belmoussaoui_ left14:46
→ crose joined14:48
← Rodya_ left14:50
→ tvl joined14:50
tvl → tobiasvl14:50
← indistylo left14:51
← Feral_Cat left14:51
→ jntme joined14:51
← jntme left14:52
→ qqx joined14:52
→ Guest51511 joined14:52
→ kculpis joined14:53
→ zivester joined14:54
← Silmarilion left14:54
← rscata left14:56
← Cabanossi left14:56
→ Cabanossi joined14:57
← spaceone left14:57
← mintmike left14:58
tcp_j → tcp_j^14:59
→ mintmike joined14:59
← seschwar left15:00
→ thiago joined15:01
← kufin left15:02
→ roelmonn_ joined15:02
← roelmonn_ left15:03
← MarioBranco left15:03
→ roelmonn_ joined15:03
← Anja left15:04
→ c-alpha_ joined15:04
← diogenese left15:05
→ duckydan joined15:05
← roelmonnens left15:06
→ diogenese joined15:06
← Jackneill left15:06
→ ShekharReddy joined15:07
← roelmonn_ left15:07
← inovas left15:08
→ Jackneill joined15:08
kadoban → mud15:08
← redtail left15:08
← PaulCapestany left15:09
→ PaulCapestany joined15:10
→ gusnan joined15:10
← gusnan left15:10
→ gusnan joined15:10
← cyberz left15:11
→ Ranhir joined15:12
← imack left15:12
← Ranhir left15:12
→ SwiftMatt joined15:13
→ Ranhir joined15:13
→ cyberz joined15:13
← fission6 left15:14
→ gargola joined15:14
← Disgeae left15:15
→ orbyt_ joined15:17
→ Anja joined15:17
← nethobo left15:17
→ Tobbi joined15:18
→ nowhere_man joined15:20
← clmsy left15:20
← DamienCassou left15:21
← Bercik left15:24
→ gitinfo joined15:25
ChanServ set mode: +o15:25
← Cabanossi left15:26
→ harmaahylje joined15:26
→ roelmonnens joined15:26
→ Cabanossi joined15:27
→ PioneerAxon_ joined15:27
← PioneerAxon left15:28
← Tobbi left15:30
← doev left15:30
→ cagomez joined15:30
← cojack left15:30
→ dreiss joined15:30
← roelmonnens left15:30
→ JanC joined15:31
← thiago left15:31
→ Bercik joined15:31
→ Gustavo6046 joined15:33
← Murr left15:33
→ Murr joined15:33
karstensrage i accidentally rebased 1 commit too far15:33
any way to get that back15:33
i havent pushed15:33
_ikke_ karstensrage: What do you mean, one commit too far?15:34
← zefferno left15:34
→ menip joined15:34
← cagomez left15:35
karstensrage like i did git rebase -i HEAD~8 and did fixup for all the commits15:35
and i should have done HEAD~715:35
_ikke_ ok15:35
→ cagomez joined15:35
→ jlewis joined15:35
→ ecuanaso joined15:35
_ikke_ git reset --hard <branch>@{1} should get you back to the state before the rebase15:35
karstensrage so git reset --hard devel@{1}15:37
_ikke_ right15:37
karstensrage gotcha, thanks15:37
← raulp left15:38
→ ixxie joined15:39
← tcorneli left15:40
→ raulp joined15:40
ixxie how come copying a tiny git repo to a usb stick can take a disproportionate amount of time?15:40
← opalepatrick left15:40
mud There can be a decent number of files, depending on the repo? Other than that ... at a guess because USB sticks tend to suck.15:40
→ Milijus joined15:41
→ brent__ joined15:41
→ bronson joined15:41
← Milijus left15:41
→ Milijus joined15:41
ixxie mud: 14 items totalling 20kb taking MINUTES to copy15:42
← Milijus left15:42
← akushner___ left15:42
ixxie I have used the stick before on many other files without a problem15:42
→ Milijus joined15:42
→ kurkale61 joined15:42
← Milijus left15:42
mud Really doubt it's git-specific then. There's nothing there but plain files.15:42
→ MacWinner joined15:43
→ Murii joined15:43
→ jhasse joined15:44
→ tureba joined15:45
← kurkale6ka left15:45
→ belmoussaoui_ joined15:45
→ markus-k joined15:46
→ arnoldoree joined15:46
→ Rodya_ joined15:46
→ m712 joined15:46
← bronson left15:46
m712 hello, i want to do something like this: i want a "private" branch of my repository that is not merged into upstream, and I want to "copy" commits there to master and push it every now and then. is this possible?15:47
← markus-k left15:47
m712 like a "trademarked assets" branch that is not pushed to master but stays up-to-date with master otherwise15:47
← scottjl left15:47
m712 it's not actually trademarked assets, just giving an example15:48
← orbyt_ left15:48
← nuked0ne left15:48
→ al-damiri joined15:48
HedgeMage m712: Yes, you don't have to push a branch anywhere if you don't want to. Just create it locally and rebase as needed, or merge stuff off of master if you prefer.15:48
→ markus-k joined15:48
m712 rebase is the keyword?15:49
← jceb left15:49
HedgeMage The things you'll want to learn about are probably: !branch !merge !rebase !cherry-pick15:49
gitinfo A branch and a tag are just convenient ways of spelling the name of a particular commit. A commit represents a specific set of files and the history of all commits which came before it, and the SHA-1 hash tag official name provides cryptographic assurance of the lineage of a particular commit (and thus branch or tag). A branch's reference may change. A tag usually doesn't.15:49
'git merge' takes two diverged lines of history (series of commits, e.g. on different branches), and recombines them with a "merge commit" on top. This creates an explicit record of you doing the merge, unless there were no local changes (which does a !fast_forward merge instead). If you don't need to keep a record like that, !rebase may produce easier-to-read history, but the two don't always mix well... see also !merge_vs_r15:49
'git rebase' takes away your local commits, updates your branch with new stuff from <upstream> (argument), then re-applies your local commits on top. This makes it look like your commits were created "after" the new stuff, and it can look cleaner than doing a !merge. Beware of !rewriting_public_history, though. Not to be confused with !interactive_rebase.15:49
HedgeMage !cherrypick15:49
HedgeMage pokes the bot and gives up on cherry picking15:50
← Rodya_ left15:50
m712 looks like rebase is what i need. thanks.15:50
oxymoron93 !rebel15:50
← ecuanaso left15:51
← dreiss left15:51
ixxie thanks mud15:52
m712 !merge_vs_r15:52
gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html15:52
mud ixxie: That is a weird one though, good luck :-/15:53
← thblt left15:54
→ kurkale6ka joined15:55
← nowhere_man left15:55
→ indistylo joined15:56
← mintmike left15:56
→ thiago joined15:56
← cqi left15:57
→ Persondude joined15:57
← kurkale61 left15:58
← SwiftMatt left15:58
→ maxb joined15:59
← Gustavo6046 left15:59
← njs126 left15:59
← jwest left16:01
→ morenoh149 joined16:02
→ jwest joined16:02
→ madewokherd joined16:02
← thiago left16:03
→ EY joined16:03
→ nuked0ne joined16:03
→ SwiftMatt joined16:04
← konsolebox left16:04
← SwiftMatt left16:06
← morenoh149 left16:06
→ thiago joined16:06
← Gurkenglas_ left16:07
← lzybassist left16:07
← mr_sm1th left16:08
→ natechan joined16:08
→ kurkale61 joined16:09
→ konsolebox joined16:10
→ scottjl joined16:10
← Cabanossi left16:10
← kurkale6ka left16:11
← c-alpha_ left16:12
→ Cabanossi joined16:12
→ khisanth_ joined16:12
→ kurkale6ka joined16:12
→ MyTalles_ joined16:14
← MyTalles_ left16:14
← notebox left16:14
← kurkale61 left16:15
→ notebox joined16:15
← Guest51511 left16:16
→ MyTalles_ joined16:16
← kfoonamalik left16:16
← hehehe left16:16
→ Ricaz joined16:16
← Improvotter left16:17
→ czart_ joined16:18
→ blinkingprompt joined16:19
← czart left16:19
→ SwiftMatt joined16:20
→ nkuttler joined16:20
→ howdoi joined16:21
→ orbyt_ joined16:25
← causa_sui left16:25
→ causasui joined16:25
← belmoussaoui_ left16:25
→ belmoussaoui joined16:27
MyTalles_ → MyTallest16:27
→ peacememories joined16:28
→ Feral_Cat joined16:28
MyTallest I'm using git rev-list HEAD --count to set the build number of my app. I would like a command that give that number I could get the SHA.16:29
← kurkale6ka left16:30
← mikecmpbll left16:30
osse MyTallest: git describe is meant for this purpose16:30
To get the sha you can use rev-parse HEAD16:31
← Stath left16:33
← SwiftMatt left16:36
MyTallest I thought I could use --max-count=1 and --skip=<commit count> but the skip starts from the last commit and works backwards I need to skip from the first commit.16:36
→ InfoTest joined16:37
→ SwiftMatt joined16:37
→ morenoh149 joined16:38
osse MyTallest: I don't follow. Can you explain in different terms what you want?16:38
→ svm_invictvs joined16:39
→ imack joined16:40
MyTallest I use "git rev-list HEAD --count" to get a number to use as in the version string of my app like 842. So I'm looking to get he SHA for the 842nd commit.16:40
→ npgm joined16:41
← Cabanossi left16:41
osse rev-parse HEAD, like I said16:42
→ Cabanossi joined16:42
← theoceaniscool left16:42
Borg- or.. maybe: git log -1 --pretty=%h16:42
← SwiftMatt left16:44
→ akushner___ joined16:45
← rebrec left16:45
→ ciscobandit joined16:45
→ Disgeae joined16:46
← imack left16:46
→ rebrec joined16:46
← iNCoNFuN left16:47
→ Rodya_ joined16:47
tang → tang^16:47
→ test123456 joined16:48
← TomyWork left16:51
← Feral_Cat left16:51
← Rodya_ left16:51
← Kaisyu left16:52
→ marioxcc joined16:54
← Guest25410 left16:54
marioxcc Hello.16:54
→ _Patrick_ joined16:55
marioxcc What is the format for the “delta data” that Documentation/technical/pack-format.txt refers to?16:55
← cagomez left16:56
→ guampa joined16:57
mud marioxcc: Not that much git dev goes on here, just to warn you. This is mostly user support.16:57
→ jason237 joined16:58
→ blunaxela joined16:58
→ Feral_Cat joined16:58
marioxcc mud: I see, but I would still expect some advanced user to know the answer. :)16:59
It looks like I will have to look into the source code.16:59
← Feral_Cat left17:00
→ agowa338 joined17:00
← orbyt_ left17:01
← guampa left17:02
MyTallest osse: Sorry I'm not seeing how to do this with rev-parse. I don't do command line git very often. :)17:03
← Floflobel left17:03
osse MyTallest: git rev-parse HEAD. that's it17:03
← ciscobandit left17:03
→ ciscobandit joined17:04
osse marioxcc: There is a house in New Orleans they call #git-devel17:04
← Disgeae left17:04
osse Haven't been there in a while, do I'm not sure how active it is17:04
← cyberz left17:05
← chll_ left17:05
→ SteffanW joined17:06
→ nobso joined17:07
→ cagomez joined17:07
← InfoTest left17:08
← nobso left17:08
→ nobso joined17:08
← cagomez left17:09
MyTallest osse: Let me try this again. Given that "git rev-list HEAD --count" returns 900 how do I get the 842nd commit? git rev-parse HEAD gives me the current head which in this example would be the 900th commit.17:09
→ cagomez joined17:09
→ orbyt_ joined17:09
→ Disgeae joined17:10
osse MyTallest: git rev-parse HEAD~817:10
→ cyberz joined17:11
← mpeter left17:11
← cagomez left17:12
→ cagomez joined17:12
← gxt left17:15
→ RyanDavies joined17:16
← Ricaz left17:17
← svm_invictvs left17:18
→ PettanShoutaKun joined17:19
PettanShoutaKun Is it normally necessary to provide credentials when merging origin master?17:19
← natechan left17:19
PettanShoutaKun git keeps telling me to tell it who I am17:19
thiago merge does not require credentials17:20
→ xaa__ joined17:20
thiago pull does download, so that may require credetials17:21
→ TomyLobo joined17:21
PettanShoutaKun I'm trying to do this in conjunction with jenkins17:22
→ cagedwisdom joined17:22
PettanShoutaKun so it does an SCM checkout without issue17:22
← manuelschneid3r left17:22
PettanShoutaKun but it seems to get super mad when I do merge origin/master17:22
but it doesn't happen consistently17:22
→ styler2go joined17:23
← MaekSo left17:23
← wandering_vagran left17:25
← StephenS left17:25
→ lkolstad joined17:25
→ roelmonnens joined17:26
← cbonobo left17:27
← Borg- left17:27
→ cbonobo joined17:27
→ StephenS joined17:28
tang^ merge is going to require credentials because it creates a commit17:29
so your jenkins agent will need to know who it's doing the merge as17:30
thiago oh, *those* credentials17:31
yes, a merge commit requires name and email17:32
← cbonobo left17:32
← Murr left17:32
→ Murr joined17:33
→ star_prone joined17:34
RyanDavies So, I have one box on an internal network with a gitlab repo for a project. This is a fork of a github repo with its own changes, but this network can't access github. The only way to transfer files to it is via zips/tarballs. But I want to be able to merge the commits made into the main repo automatically without overwriting the changes made on the gitlab-hosted repo. Best way to do this?17:34
→ ai7council joined17:35
tang^ can you connect a device to both networks (not simultaneously)?17:37
← roelmonnens left17:38
tang^ add both as remotes, connect to public network, fetch github data, connect to private network, fetch gitlab data, merge/rebase/whatever, push to gitlab17:38
→ roelmonnens joined17:38
← star_prone left17:39
← SReject left17:39
← roelmonnens left17:40
→ roelmonnens joined17:41
→ bladdezz joined17:41
← roelmonnens left17:41
→ bronson joined17:42
→ mikecmpbll joined17:43
RyanDavies I cannot.17:43
Not hyperbolic when I discuss the only means of xferring files between the networks.17:44
→ dreiss joined17:45
← quackgyver left17:45
← gargola left17:45
← ai7council left17:46
tang^ that's why I asked17:46
→ gargola joined17:46
← beerdrop left17:46
tang^ but how are you getting the zip/tarball between networks?17:47
← bronson left17:47
→ Rodya_ joined17:47
← Disgeae left17:48
→ manuelschneid3r joined17:48
→ ecuanaso joined17:49
RyanDavies removable media17:49
→ boombatower joined17:49
← str left17:49
RyanDavies (Yes, I'm aware of how silly this is, changing that is a non-option)17:50
tang^ clone to removable media then17:50
→ sathed joined17:50
tang^ with both remotes in the clone17:50
(and yes, I understand that some networks do require the air gap)17:51
→ Disgeae joined17:51
← gargola left17:51
← Rodya_ left17:52
← agowa338 left17:53
RyanDavies is there no way to preserve commit info in a zip?17:53
(or other compressed format)?17:53
tang^ maybe with man git-archive17:53
gitinfo the git-archive manpage is available at https://gitirc.eu/git-archive.html17:53
← sathed left17:55
← StephenS left17:55
→ StephenS joined17:55
← orbyt_ left17:57
← MyTallest left17:58
← morenoh149 left17:59
← tkore left17:59
→ beerdrop joined17:59
→ cdown joined18:01
→ orbyt_ joined18:02
→ Sasazuka joined18:02
→ cbonobo joined18:05
→ imack joined18:06
→ natechan joined18:06
→ raynold joined18:08
→ sz0 joined18:10
→ fission6 joined18:10
m712 holy duley18:12
wrong channel18:12
→ Brain joined18:15
→ einnjo joined18:15
→ energizer joined18:16
← exotime left18:16
→ wizardedit joined18:17
← wizardedit left18:17
→ wizardedit joined18:17
→ exotime joined18:17
→ TheMontyChrist joined18:18
TheMontyChrist when I "git mergetool"18:19
w/ kdiff 3 I get 3 panes on the upper half and 1 in th elower18:19
can someone tell me what they mean?18:19
top left "base"18:19
middle top "local"18:19
right top "remote"18:19
bottom - looks like current - after an attempt to merge18:19
tang^ three way merge?18:20
TheMontyChrist looks like it. I"m not terribly famliar w/ merging18:20
I'm going to bite the bullet and learn how to do it.18:20
base/local/remote18:20
← cdown left18:21
tang^ I've never seen that view in kdiff18:21
TheMontyChrist I'm thinkin "local" was what I had before the merge18:21
tang^ but I've also never triggered a three way merge18:21
← ecuanaso left18:22
→ cdown joined18:24
← peacememories left18:24
← arnoldoree left18:24
TheMontyChrist I see base is the common ancestor18:24
→ MattMaker joined18:25
TheMontyChrist local is mine18:25
remote is theirs18:25
and the bottom pane is git's best guess18:25
← dviola left18:26
→ agowa338 joined18:26
→ Guest36531 joined18:27
→ MaekSo joined18:27
→ janny joined18:28
TheMontyChrist what does git diff do?18:29
→ paul424 joined18:29
TheMontyChrist I thought "git diff branch1 branch2" would diff 2 branches18:29
however, I get something when I don't specify anything18:29
← nuked0ne left18:30
← belmoussaoui left18:30
← Bock left18:30
TheMontyChrist I see, they're local changes18:30
so what's a?18:30
→ dviola joined18:31
TheMontyChrist the one in the repo?18:31
and what's b? local?18:31
← dviola left18:31
→ dviola joined18:31
→ agowa339 joined18:32
TheMontyChrist I'ld like to diff a single file with a different branch18:32
git diff my_file branch_develop18:32
how to?18:32
← xcm left18:33
← netj left18:33
← agowa338 left18:33
→ netj joined18:34
← Gianormagantrous left18:35
oxymoron93 git diff <branch> -- <file_path> TheMontyChrist does this work?18:35
→ Gianormagantrous joined18:36
→ begginer29 joined18:36
→ cdg joined18:36
→ xcm joined18:37
oxymoron93 imo, manual pages are written great, so you should give them a look any time you need something :D18:38
→ ecuanaso joined18:39
← cdg_ left18:39
← \drew left18:39
← cdg left18:41
PettanShoutaKun that makes sense... actually18:42
technically it did a checkout scm with credentials though18:43
so I wonder why it can't just recycle those :/18:43
TheMontyChrist I agree. but git, unlike mercurial, is like a swiss army knife with tons of options. so I have to balance groking a man file w/ getting stuff done18:43
← cdown left18:43
← agowa339 left18:44
← tunekey left18:45
← TheMontyChrist left18:47
→ oprypin joined18:48
← MattMaker left18:48
→ Rodya_ joined18:48
← hahuang65 left18:50
→ hahuang65 joined18:50
← jakogut left18:50
→ Feral_Cat joined18:51
→ Tobbi joined18:51
→ jakogut joined18:52
→ mintmike joined18:52
→ str joined18:52
← paul424 left18:52
← Rodya_ left18:52
→ MattMaker joined18:54
→ MarioBranco joined18:54
→ MattMake_ joined18:55
marioxcc > I agree. but git, unlike mercurial, is like a swiss army knife with tons of options. so I have to balance groking a man file w/ getting stuff done18:55
→ ubuntu joined18:55
ubuntu → wilornel18:55
marioxcc The man pages of Mercurial convey all the required information. They're shorter and more clear because Mercurial interface is better designed than that of git.18:56
← jakogut left18:56
marioxcc Take "git reset" as an example. It does a lot of things with little relation to each other.18:56
→ blinking1 joined18:56
← blinkingprompt left18:56
→ jakogut joined18:56
← mintmike left18:57
wilornel Hi #git! How do you work with a feature that you want to send out for review in chunks? I am thinking to create a branch for every PR I will send, where every change will have to be a branch off of a previous one. So, it would basically look like *master -- *part1 -- *part2 -- part3*. I was wondering if that makes sense, and how do you deal with having to rebase all of part2, part3, etc... if you update part 1 ?18:57
→ blinkingprompt joined18:57
thiago wilornel: if they can be accepted indepndently, then create separate PRs18:58
← MattMaker left18:59
← ShekharReddy left18:59
← stoopkid_ left19:00
wilornel thiago: part1, part2, part3 will be sepaarate PRs. However, part2 depends on part1, part3 depends on part1 and part2, etc..19:00
meaning that they branch off of previous parts19:00
thiago yep19:00
that sounds right19:00
wilornel so if I need to update part1, I need to rebase all of the other parts19:00
is there a tool that could help with this?19:00
thiago eventually, yes19:00
← blinking1 left19:00
thiago but you don't need to do it immediately19:00
wilornel If I work in parallel on part1 and part3, for example?19:01
thiago if you need to rebase part3, then you need to rebase part219:01
wilornel then updating part1 would require me to update part2 and part3? (Or only rebase part3? But then the structure would become confusing)19:01
thiago my point is that a change in part1 does not imply ou need to immediately rebase part219:01
let reviewers review. When you are ready to act on their feedback, rebase19:01
← imack left19:01
← ecuanaso left19:02
← cagomez left19:02
→ stoopkid_ joined19:02
→ SwiftMatt joined19:04
→ teadrop_ joined19:05
wilornel but if I need to develop on part3 while they review part1, then I need to rebase part2 and part319:05
s/but//19:06
← robotroll left19:06
→ nuked0ne joined19:06
thiago when you are going to make changes, you should rebase19:07
you have to rebase before it can be merged19:07
but in-between, during the discussion, you don't have to19:07
wilornel exactly, but to do the development on part3, since it depends on part1 and its latest updates, I need to rebase part2 and part319:07
→ \drew joined19:08
← MarioBranco left19:08
oxymoron93 no you don't, unless you are told to include what is in part1, I guess19:09
wilornel I think I'm confused19:09
→ MarioBranco joined19:09
thiago you need to rebase before it can be merged19:09
← MattMake_ left19:09
wilornel yes, agreed19:09
thiago but you don't need to rebase part3 until you need to change it19:09
wilornel what about during development?19:09
thiago locally, on your machine, it's all one branch anyway19:10
wilornel yes, so I send out part1 for review, and start working on part319:10
thiago there's no rebasing. There's only part 319:10
wilornel and then I decide to update part119:10
witha a new commit19:10
and then go work on part319:10
thiago are you talking about the PR or are you talking about your local machine?19:10
wilornel local19:10
thiago then you rebase19:10
but you don't have a part1 branch19:10
wilornel then I need to rebase part2 and part319:10
thiago you only have part319:10
← Cabanossi left19:11
→ abyx joined19:11
wilornel huh? I thought I had 3 branches (and eventually 3 PRs): part1, part2, part319:11
thiago you only need one19:11
wilornel but we want to merge them individually19:11
thiago yes19:11
← janny left19:11
wilornel so we have 3 PRs19:11
thiago yes19:11
wilornel so I have 3 branches19:11
thiago no19:11
wilornel why?19:11
→ Cabanossi joined19:12
thiago you have one branch, with commits: A1-B1-C1-A2-B2-A3-B3-C3-D319:12
you push C1 to part1, B2 to part2, D3 to part319:12
but locally it's all one branch19:12
when you develop, it's all consistent19:12
← AKPWD left19:13
→ AKPWD joined19:13
wilornel I usaully do `git push origin me/part1` where me/part1 is the branch name. should I do `git push origin C1` where C1 is the commit's SHA?19:13
thiago git push origin C1:me/part119:13
wilornel ah!!19:13
thiago yes19:13
→ MattMaker joined19:14
→ stevenbenner joined19:14
wilornel great, great, great!19:14
thiago you're only creating part1 because it can be merged by upstream before the rest is finished19:14
otherwise, it would be one very big PR19:14
wilornel and I only have to rebase the very end of it, me/full_feature, which points at D319:14
thiago you have to rebase when part1 is merged19:15
wilornel no no but if I add D1 for example19:15
thiago actually, it depends on the project19:15
if they require fast-forwards or if they cherry-pick (rebase) your commits, then you have to rebase part2-3 when part1 is accepted19:15
← energizer left19:16
thiago if you add D1 in the middle, you push part1 again (now as D1:me/part1)19:16
wilornel I think that they do not fast-forward, they do merges with a single commit19:16
thiago but you don't have to change part2 or 3 until you have to make updates to them anyway19:16
a squash merge?19:16
wilornel and then after pushing D1:me/part1, you need to rebase from me/full_feature (pointing at D3) to D1, right?19:16
yes I think that they squash merge19:16
and yes I would rebase me/full_feature onto D1 when I start working on them19:17
correct?19:17
→ energizer joined19:17
thiago if it's a squash merge, they won't accept C1 or D1. When will exist is a different commit. Hence the need to rebase once it's accepted.19:17
← schleppel left19:17
thiago if you insert commit D1, then you have inserted it locally19:17
← AKPWD left19:17
thiago you push B2:me/part when you have to update part219:17
→ AKPWD joined19:17
thiago once you do that, D1 will be included19:18
wilornel say I insert commit D1, push that to the PR, and then start working and developing on D3, then I need to rebase me/full_feature onto D1, right?19:18
thiago so if you work on D3 and D3 depends on D1, then when you push part3 you'll need to update part1 and 2 too19:19
wilornel I don't understand why an update on part3 will need to rebase part1 and part219:19
← marioxcc left19:19
wilornel will need to update* part1 and part219:19
thiago you can always update all parts at the same time. The point is to avoid doing it until necessary, so as to not disturb the review process.19:19
← fission6 left19:20
thiago you're right, you don't need to update part1 and 2 now for that D3 change.19:20
wilornel I am still confused about "say I insert commit D1, push that to the PR, and then start working and developing on D3, then I need to rebase me/full_feature onto D1, right?"19:20
thiago yes19:20
but "rebase full feature" == "insert D1"19:20
so you will have already done it19:20
wilornel I don't understanding in what way is it equal?19:21
thiago because the insertion of the commit *is* the erbase19:21
wilornel you mean, when I insert D1, I must rebase full feature if I want to develop on the rest?19:21
ohhh I see19:21
yes19:21
and then, as an aside, I was wondering if it's possible to send out a PR on top of a PR?19:21
thiago more to the point, you insert a commit here by way of git rebase -i19:21
wilornel yes, `git rebase -i`19:22
thiago that's a GitHub question, sorry. I don'tk now what it will show.19:22
wilornel I see, that's alright19:22
thiago you can always send multiple branches and create PRs19:22
thiago has to go19:22
wilornel THANK YOU SO MUCH thiago!19:22
this discussion clarified things for me19:23
→ fission6 joined19:24
← olivetree_ left19:24
→ ecuanaso joined19:25
→ mintmike joined19:25
→ Q| joined19:25
← thiago left19:25
Q| Regarding subcommands: To run them, you either need to be inside of your working tree or specify the parameters --git-dir and --work-tree. git clone and git init obviously don't need these conditions, for obvious reasons. How can I create a custom subcommand (.sh script) that doesn't need these conditions as well?19:28
← mintmike left19:30
← StephenS left19:31
→ wereHamster joined19:32
← wereHamster left19:32
→ StephenS joined19:32
← Murr left19:33
→ Murr joined19:33
← ams__ left19:33
← energizer left19:33
→ energizer joined19:34
← Cabanossi left19:40
← orbyt_ left19:40
→ cliluw joined19:40
→ olivetree_ joined19:41
→ Cabanossi joined19:42
← dreiss left19:42
→ bronson joined19:43
← olivetree_ left19:45
← fission6 left19:49
← bronson left19:49
→ olivetree_ joined19:51
← ecuanaso left19:51
→ cdg joined19:51
← chachasmooth left19:52
← mikecmpbll left19:52
→ ecuanaso joined19:53
→ theoceaniscool joined19:53
← notebox left19:54
← natechan left19:54
→ natechan joined19:54
→ chachasmooth joined19:55
← cdg left19:56
→ lucasem joined19:56
→ harry1 joined19:56
→ fission6 joined19:57
→ theoceaniscool_ joined19:58
← theoceaniscool left19:59
← harry1 left20:01
→ eset joined20:02
eset what's wrong with pages?20:02
_ikke_ pages?20:02
eset Your site is having problems building: Page build failed20:02
on github20:03
→ sq-one joined20:03
_ikke_ !github20:03
gitinfo Note that github != git. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)20:03
eset sorry20:03
← energizer left20:03
_ikke_ https://status.github.com/20:03
Nothing specific on there20:03
← nuked0ne left20:03
→ energizer joined20:04
→ thiago joined20:05
← test123456 left20:06
← ecuanaso left20:08
Q| Where can I propose a fix to documentation, in my specific case to the git-sh-setup man page / docs?20:08
→ cdg joined20:08
→ mentazoom joined20:08
→ puff` joined20:09
← df0_ left20:09
← ciscobandit left20:11
← tmz left20:11
→ Kevgeon joined20:11
→ cdg_ joined20:12
ukleinek Q|: create a patch and send it to the mailing list20:12
_ikke_ Q|: The best way is to send a patch to the !mailing-list20:12
!mailing20:12
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git20:12
_ikke_ But you can also just send a proposal there20:12
Q| _ikke_, is the documentation on kernel.org automatically generated from the docs inside of the main Git repository? If it makes sense what I'm trying to say20:14
→ ciscobandit joined20:14
→ cagomez joined20:14
→ ecuanaso joined20:14
_ikke_ Q|: You mean these?20:15
2~20:15
https://www.kernel.org/pub/software/scm/git/docs/20:15
Q| _ikke_, ye20:15
← cagomez left20:15
_ikke_ yup20:15
Q| aight, sweet.20:15
_ikke_ https://github.com/git/git/tree/master/Documentation20:15
← cdg left20:15
_ikke_ https://github.com/git/git/blob/master/Documentation/git-sh-setup.txt20:16
→ cagomez joined20:16
_ikke_ also read: https://github.com/git/git/blob/master/Documentation/SubmittingPatches20:16
Q| _ikke_, Ye, I stumbled accross that one already, thx. Thanks for the information so far, gonna dig through that on the weekend when I have some spare time. Thx :)20:17
→ Shawn joined20:17
_ikke_ Q|: I can recommend using git send-email for sending the actual patch20:18
→ nuked0ne joined20:18
→ kpengwin_ joined20:18
← juvenal left20:19
Q| _ikke_, allright, gonna take a look at that one as well, thx :)20:20
→ sathed joined20:20
← Darcidride left20:21
→ robotroll joined20:22
← cbonobo left20:22
→ cbonobo joined20:23
→ EvilPenguin joined20:24
→ ivan_on_trac joined20:25
← SteffanW left20:25
→ misosoup joined20:26
← ecuanaso left20:26
→ m0viefreak joined20:27
← rwb left20:27
← dendazen left20:27
→ troulouliou_div2 joined20:27
← cbonobo left20:28
← pbandark left20:28
→ ecuanaso joined20:31
← robotroll left20:32
← SwiftMatt left20:32
→ svm_invictvs joined20:34
→ orbyt_ joined20:34
→ tmz joined20:37
← EvilPenguin left20:37
→ Gurkenglas_ joined20:37
→ cdown joined20:37
→ King_Hual joined20:38
← Cabanossi left20:40
→ kfoonamalik joined20:40
→ edvb joined20:40
← ecuanaso left20:41
→ thblt joined20:41
← netj left20:41
← akushner___ left20:41
→ Cabanossi joined20:42
← tmz left20:42
thblt Hi! Is the output format of "git verify-commit --raw" documented somewhere? I'm trying to use the output from a program, and I'd rather not do something stupid.20:42
I guess it's from gnupg, but I can't find anything.20:42
→ SwiftMatt joined20:43
← ciscobandit left20:44
→ MineCoins joined20:45
→ Gustavo6046 joined20:47
→ netj joined20:48
← EY left20:49
← SwiftMatt left20:50
→ ciscobandit joined20:50
← dviola left20:50
→ salmon1 joined20:51
→ EvilPenguin joined20:51
← HardlySeen left20:52
→ paultreny joined20:52
← svm_invictvs left20:53
← orbyt_ left20:54
→ svm_invictvs joined20:54
→ vim_usr joined20:57
← aard left20:58
← fission6 left20:59
→ orbyt_ joined20:59
→ fission6 joined21:00
← salmon1 left21:02
→ nydel07 joined21:03
← Shawn left21:03
→ stefanpanait joined21:04
← MarioBranco left21:05
← tanuki left21:05
stefanpanait hi everyone, i am under the impression that git bundle command does not preserve git configs - am I missing something? if not - why is this the case? why wouldn't we want to preserve those configs when we bundle a repo?21:05
→ Sasazuka__ joined21:05
← begginer29 left21:05
→ MarioBranco joined21:05
_ikke_ Because that is not actually part of the repo21:06
stefanpanait: it would impose a security issue21:06
→ tanuki joined21:06
→ eroux joined21:06
← thiago left21:07
← Sasazuka left21:07
stefanpanait _ikke_: thanks for your reply - i think i understand what you mean. Is there a general argument for avoiding the use of configs on server side? Is it a bad idea to backup the configs separately? we're using gitlab and their backup/restore mechanism switched from tar to git bundle - i'm reluctant to add another manual step to that process but don't see any way around it21:08
→ salmon1 joined21:08
_ikke_ Well, you generally want to backup more the what bundle provides and the config21:09
You are also missing the reflog (so also stashes) for example21:09
stefanpanait: I'm not sure what you mean with using configs on the server side21:10
← salmon1 left21:10
stefanpanait i'm referring to backups on the server, not local clones21:10
_ikke_ right21:10
stefanpanait the remote21:10
← indistylo left21:10
stefanpanait i wouldn't expect stashes to exist there, but my git knowledge is limited21:10
_ikke_ usually a remote (bare) repo has very little config21:10
stefanpanait: no, you are right21:10
→ star_prone joined21:10
_ikke_ Usually if you want to change settings, it would most likely be for all repos21:11
so it would be a central config anyway21:11
→ tmz joined21:11
→ ecuanaso joined21:12
← Gustavo6046 left21:13
← Puffball left21:14
stefanpanait _ikke_: thanks for your time21:14
← star_prone left21:15
→ Puffball joined21:16
← ski4x7 left21:16
→ overlord_tm joined21:16
→ Lynxium joined21:16
→ ski7777 joined21:17
→ Gustavo6046 joined21:19
← crose left21:20
← ecuanaso left21:21
← xaa__ left21:22
← kpengwin_ left21:22
→ xaa joined21:22
→ monk12 joined21:24
monk12 hey all, quick git question... a coworker cloned a repo on a web server. and now i want to pull my updates onto the server.21:25
so im in the root diretory runnign git pull'21:25
but alas it asks for his pass.21:25
wilornel Is it possible to rebase a branch and all the subbranches in it? I am thinking about the situation where I have A1-B1-C1-A2-B2-A3-B3-C3-D3 , where C1 is the latest commit on PR part1, B2 is the latest commit on PR part2, and D3 is the latest commit on PR part321:25
preaction what's a subbranch?21:25
wilornel and part2 depends on part1 and part3 depeds on part1 and part221:26
so if I create a new commit on part1 like: D1, then I need to rebase part2 and part3 if I want to develop on tem21:26
Sasazuka__ → Sasazuka21:26
monk12 so i did a 'git pull https://myusername@git.ourcompany.com/repo_path/repo.git' and it seemed to work.21:26
← Disgeae left21:26
monk12 but my updated code isn't there for that branch.21:26
wilornel preaction: Does that make sense?21:26
preaction wilornel: still looking for an answer to my question21:26
← ahrs left21:27
monk12 'git status' reports that root folder is on that branch, so what am i doing wrong where it can't pull my latest code?21:27
preaction wilornel: it's a bad question and i should apologize: git doesn't know what a subbranch is, so you have to rebase them yourself21:27
wilornel Hm.. well, maybe the term subbranch is not correct. I was thinking of the situation where you have a branch off of the tip of another branch, and so on, creating a chain of different branches that depend on the previous ones21:28
so I would rebase each branch one by one21:28
→ ahrs joined21:28
preaction right, git can go find the branchpoint, but it doesn't know there's any ongoing relationship between the branches21:28
wilornel I see. Is there a tool that could facilitate this? Maybe I could write a simple script for this, but why try to solve the problem is this has already been solved before?21:29
preaction i don't think a tool can know this either. it sounds like automating would cause bad rebases and start destroying information21:30
but, to answer the question: i know of no tool21:30
→ SwiftMatt joined21:31
← dege left21:31
wilornel no such tool21:31
I see21:31
→ thiago joined21:31
wilornel this seems to me like it would be a common issue21:31
← gdh left21:31
→ gdh joined21:31
wilornel where you have a series of PRs where the latter ones depend on previous ones21:31
preaction it doesn't to me, because of all the issues i've already raised21:31
← howdoi left21:31
preaction having PRs depend on each other is already a bad position to be in21:31
thiago if you have a series of dependencies, you need a better tool than GitHub21:32
← Murr left21:32
→ Murr joined21:33
← gugah left21:34
← ciscobandit left21:35
LeelooMinai wilornel: I was researching this yesterday (I think). Is that a situation you are describing? : https://coderwall.com/p/xzsr9g/rebasing-dependent-branches-with-git21:35
← dersand left21:35
→ dmj` joined21:37
← abyx left21:37
← Es0teric left21:39
→ roelmonnens joined21:40
← Jak_o_Shadows left21:41
→ mintmike joined21:41
monk12 anyhoo for my issue, can i remove the coworkers username from the remote origin url (looks like this: remote.origin.url=https://coworkerusername@oursite.com/repo.git)?21:41
← MarioBranco left21:42
monk12 so hopefully it will just ask me on the simple 'git pull' command to enter my user/pass21:42
← LeBlaaanc left21:43
← sq-one left21:43
→ nd_ joined21:43
← ixxie left21:43
→ jnewt joined21:44
← roelmonnens left21:44
← nd left21:45
← mintmike left21:45
→ bronson joined21:45
→ Abbott joined21:46
jnewt $git version -> 2.14.1.windows.1 I can't manually edit hunks. I have recently updated git. $git add -p -> e (manually edit) -> terminal hang after some gibberish (looks like code fragments with lots of whitespace between them and wrapping through several lines). ctrl+C, :q, nothing gets me out of the terminal.21:47
→ Jak_o_Shadows joined21:47
→ nd joined21:47
← rtjure left21:47
→ spencer-p joined21:48
→ hehehe joined21:48
← nd_ left21:49
← todd_dsm left21:49
← bronson left21:49
jnewt a quick google search didn't come up with anything. i remember it working fine prior to the upgrade, but I had to reinstall due to a problem i was having with VS code (some ssh related file was missing).21:50
→ nd_ joined21:50
Abbott I just got done merging a branch, so I was going to delete the branch, but it tells me: http://dpaste.com/1X0DMMB21:50
→ todd_dsm joined21:51
→ rwb joined21:51
← jstein left21:51
← xcm left21:52
← nd left21:53
← madewokherd left21:53
→ nd joined21:53
→ bronson joined21:54
→ ToBeFree joined21:54
← MineCoins left21:55
→ xcm joined21:55
← ToBeFree left21:55
← zivester left21:55
← thiago left21:55
oxymoron93 Abbott message gives you the answer if you still want to delete the branch21:55
← nd_ left21:56
→ harry1 joined21:57
← thblt left21:58
← stefanpanait left21:59
← murr5y left21:59
→ ciscobandit joined21:59
← cdg_ left21:59
→ murr4y joined21:59
← Tobbi left21:59
← harry1 left22:02
→ cdg joined22:02
← AaronMT left22:03
← mud left22:04
→ mud joined22:04
← Murii left22:06
→ SkyPatrol_ joined22:08
← chachasmooth left22:09
← SkyPatrol left22:09
→ chachasmooth joined22:09
wilornel LeelooMinai: Thank you22:09
Thanks preaction and thiago22:09
← manuelschneid3r left22:10
← Guma left22:10
→ manuelschneid3r joined22:10
← jeffreylevesque left22:11
→ kadoban joined22:11
← ciscobandit left22:12
← mud left22:14
→ matsaman joined22:14
→ cdg_ joined22:16
← orbyt_ left22:16
→ orbyt_ joined22:17
← cagedwisdom left22:17
← traxo-xx left22:18
→ ciscobandit joined22:18
← cdg left22:19
← cdg_ left22:20
→ thiago joined22:21
← Brain left22:22
← tmz left22:24
→ edegaru joined22:25
→ ContessaTP joined22:26
→ edegaru78 joined22:28
← edegaru left22:30
← cdown left22:31
edegaru78 → edegaru22:31
→ tmz joined22:32
→ cdown joined22:36
→ robogoat joined22:36
← spencer-p left22:36
→ spencer-p joined22:37
→ denimsoft joined22:39
→ dendazen joined22:40
→ EY joined22:40
← King_Hual left22:40
PettanShoutaKun is there a way to grab the furthest forward tag on my current branch?22:41
← ssarah left22:41
PettanShoutaKun like if I'm one commit behind the head and I call tag, get the tag of the head commit if it exists22:41
← bronson left22:42
← tmz left22:43
rewt what you have checked out is head22:44
do you mean if you're one commit behind the branch?22:45
jnewt git checkout <branch name> will checkout (grab) the firthest forward tag (HEAD) of that branch PettanShoutaKun22:48
kadoban HEAD isn't a tag22:49
rewt HEAD is your currently checked out commit22:49
← dendazen left22:50
PettanShoutaKun so if I do a git pull and then grab the tag, that would grab the most recent one?22:50
← ciscobandit left22:50
rewt what do you mean by 'grab the tag'22:50
→ ws2k3 joined22:50
PettanShoutaKun git describe --tag22:50
jnewt checkout the branch. now you have your newest local commit. then if your remote is newer, you can fetch/merge or just pull to get the newer one from there22:51
→ dreiss joined22:52
→ tmz joined22:53
← chachasmooth left22:53
→ kadoban_ joined22:53
← kadoban left22:53
→ chachasmooth joined22:54
← sbasso left22:56
← misosoup left22:56
← str left22:57
← cdown left22:57
→ cdown_ joined22:57
cdown_ → cdown22:57
← Q| left22:58
← Oatmeal left22:58
→ agowa339 joined22:59
← db8093246 left22:59
→ dviola joined23:02
→ anuxivm joined23:04
← cagomez left23:04
→ Oatmeal joined23:05
← orbyt_ left23:08
→ str joined23:09
→ agowa338 joined23:11
→ Nevik joined23:12
← zerow left23:12
← dviola left23:12
→ diego1 joined23:12
← agowa339 left23:13
← diego1 left23:13
→ nowhere_man joined23:13
← leeN left23:15
→ orbyt_ joined23:15
← troulouliou_div2 left23:15
← ugjka left23:16
← volestorm left23:16
← str left23:16
← mentazoom left23:16
→ LeMike joined23:16
→ mr_sm1th joined23:17
← nowhere_man left23:17
→ volestorm joined23:18
→ nowhere_man joined23:18
→ ugjka joined23:18
← agowa338 left23:18
kadoban_ → kadoban23:19
→ Es0teric joined23:19
← nobso left23:19
→ zerow joined23:20
← dreiss left23:21
← matsaman left23:23
→ MarioBranco joined23:23
→ jeffreylevesque joined23:23
→ ciscobandit joined23:24
→ dreiss joined23:24
← Phylock left23:24
← edegaru left23:25
← linuxenko left23:25
acidjazz1 → acidjazz23:26
← TomyLobo left23:26
← MarioBranco left23:27
→ MarioBranco joined23:28
→ str joined23:29
← Es0teric left23:30
← npgm left23:30
← spencer-p left23:31
← \drew left23:31
← xaa left23:32
← Murr left23:33
→ Murr joined23:33
← fission6 left23:34
→ Es0teric joined23:34
→ Q| joined23:35
→ ensyde joined23:36
← chachasmooth left23:37
→ cagedwisdom joined23:38
← Oatmeal left23:38
→ JeffH joined23:38
→ chachasmooth joined23:39
← jameser left23:41
→ mintmike joined23:41
→ Rotaerk joined23:41
→ madewokherd joined23:42
← brent__ left23:42
← PettanShoutaKun left23:42
→ brent__ joined23:43
→ safe joined23:44
← brent__ left23:44
← Es0teric left23:44
→ brent__ joined23:44
← brent__ left23:45
← mintmike left23:46
← SwiftMatt left23:47
← orbyt_ left23:48
→ QualityAddict joined23:49
← MarioBranco left23:49
← JeffH left23:50
← Kevgeon left23:50
→ MarioBranco joined23:50
← cdown left23:50
→ Rodya_ joined23:51
→ reypm joined23:55
← ciscobandit left23:55
← MarioBranco left23:56
→ MarioBranco joined23:57
← dreiss left23:57
→ harry1 joined23:58
→ ciscobandit joined23:59

Logs Search ←Prev date Next date→ Channels Documentation