Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-10-19

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 e14 joined #git
00:01 qws-user-1229 joined #git
00:01 BlueProtoman Okay, now what?
00:01 a3Dman joined #git
00:02 mizu_no_oto joined #git
00:03 nettoweb joined #git
00:03 EvilPenguin joined #git
00:04 ISmithers joined #git
00:06 swalladge joined #git
00:07 rbern joined #git
00:08 Gsham joined #git
00:08 lindenle joined #git
00:21 mlandoceansky joined #git
00:21 nettoweb joined #git
00:22 led_belly joined #git
00:24 HedgeMage Now we just configure your local machine to auth via ssh key instead of password
00:24 HedgeMage if you look in your local ~/.ssh/config you can probably figure out from your github example
00:25 HedgeMage if you can't ask around or I'll be back after I eat this pizza ;)
00:27 e14 joined #git
00:30 _cyril_ joined #git
00:31 dsdeiz joined #git
00:32 WhiskerBiscuit joined #git
00:32 jason237 joined #git
00:35 SwiftMatt joined #git
00:43 mlandoceansky joined #git
00:43 lindenle joined #git
00:43 davimore_ joined #git
00:43 jottr joined #git
00:44 diogenese joined #git
00:44 mizu_no_oto joined #git
00:45 nekooken left #git
00:46 dsdeiz joined #git
00:50 Ahmed90 joined #git
00:51 nettoweb joined #git
00:51 impermanence joined #git
00:54 fatalhalt joined #git
00:56 stevenspasbo joined #git
00:56 realz joined #git
00:58 harry1 joined #git
01:00 dsdeiz joined #git
01:00 dsdeiz joined #git
01:00 fstd_ joined #git
01:00 ResidentBiscuit joined #git
01:01 ResidentBiscuit joined #git
01:01 ResidentBiscuit joined #git
01:02 ResidentBiscuit joined #git
01:02 ResidentBiscuit joined #git
01:03 ResidentBiscuit joined #git
01:04 mischat joined #git
01:04 pks joined #git
01:05 Derperperd joined #git
01:06 raspado joined #git
01:07 sunri5e joined #git
01:08 ruby_ joined #git
01:09 stevenspasbo joined #git
01:10 metrixx joined #git
01:10 lindenle joined #git
01:12 LeBlaaanc joined #git
01:12 bluezone joined #git
01:13 d^sh joined #git
01:13 mizu_no_oto joined #git
01:14 stevenspasbo joined #git
01:14 finalbeta joined #git
01:18 twea joined #git
01:19 BlueProtoman HedgeMage: Oh, wait, I'm wrong, apparently I don't use SSH for GitHub.
01:19 BlueProtoman I do sign my commits, though, but apparently that's not related
01:19 Wulf4 joined #git
01:20 gniourf joined #git
01:21 dreiss joined #git
01:21 sysanthrope joined #git
01:21 rominronin-WORK joined #git
01:24 HedgeMage !ssh
01:24 gitinfo Please use SSH to talk to remote repos. http:// and git:// are  completely unsecured and http:// suffers from smart webservers trying to implement policy. You can try to do "smart" https://, but it can be  troublesome to configure if you do not know how (see !web_repos for simple instructions) unless your company implements a MITM attack and prevents end-to-end crypto.
01:24 HedgeMage darn, I was hoping that would have a link to a step-by-step
01:25 ruby_ joined #git
01:25 HedgeMage BlueProtoman: okay, let's try to do this quickly :)
01:25 HedgeMage BlueProtoman: on your LOCAL machine, run 'ssh-keygen' as your regular user (not root)
01:25 HedgeMage BlueProtoman: call the key whatever you like, but store it in ~/.ssh/
01:26 gniourf joined #git
01:26 BlueProtoman HedgeMage: Wait, forgot to mention, I *do* use ssh keys to talk to my home server (don't use it as a Git server though)
01:26 HedgeMage that's fine, you can use the same key pair
01:26 HedgeMage I usually do one key pair per device I'm SSH-ing *from*
01:27 HedgeMage That way, if a device is compromised, I can easily use one of the others to kick it out of everything
01:28 BlueProtoman I SSH to my home server from my laptop, phone, and tablet, but I use Git from my laptop, home server, and some virtual machines (at least for the purpose of the class I'm in)
01:28 alex1a joined #git
01:28 HedgeMage that's less safe, but still better than probably 90% of your professors.
01:29 BlueProtoman Less safe?  How so?
01:29 HedgeMage I'm still trying to get half of the world's university faculty to quit writing root passwords on whiteboards. :(
01:29 BlueProtoman (Note: I *do* use a key to SSH to my server, but I just use a password on my phone and tablet)
01:29 HedgeMage BlueProtoman: oh, sorry...I misread... I thought you were saying that the same private key lived on all those devices
01:30 BlueProtoman No, but it sounds like it shouldn't
01:30 HedgeMage It's all a matter of degrees.  Just by using key-based auth you are better than most.
01:31 vincentor joined #git
01:31 HedgeMage However, if you use the same private key from multiple devices, in the event of a compromise you probably won't know which device was compromised.
01:31 johnnyfive joined #git
01:31 johnnyfive joined #git
01:31 HedgeMage If you give each device its own key, and one is compromised, you know where it happened and can remediate.
01:31 BlueProtoman So how should I manage my private and public keys?  The two major types are SSH and GPG, right?
01:32 HedgeMage (also, having multiple keys means you can go around revoking the bad one quickly, and then replace after, because you already have a good key)
01:32 dgarr joined #git
01:33 HedgeMage Those are the two you seem to care about at the moment.  There are others just as common.
01:33 BlueProtoman Which are?
01:33 lindenle joined #git
01:34 shakalaka joined #git
01:34 HedgeMage SSL certificates are actually a type of public key, and have corresponding private keys.
01:34 HedgeMage X.509 certs are basically personal certificates like SSL with private keys
01:34 HedgeMage X.509 can be used to auth to web sites and such
01:34 re1 joined #git
01:36 HedgeMage S/MIME is an email encryption scheme common at big orgs (including many universities) that uses certificates
01:36 HedgeMage Those are the other things you are probably most likely to run into.
01:36 BlueProtoman So I know that SSL certs can be used to verify that communications between me and a server have not been tampered with or spied on...but how do I know that the server I'm talking to is who it says it is?  I mean, someone who wants to pretend to be Microsoft can theoretically get an SSL cert and try to fake me out, right?
01:36 HedgeMage If you start doing what I do...your world becomes significantly more complicated :)
01:37 dsdeiz joined #git
01:37 HedgeMage BlueProtoman: Well, the SSL cert is signed by an authority your browser trusts...except that SSL is a terribly written standard, and China can sign .gov domains, so the whole "trusted cert" thing is actually nearly useless
01:37 milki dont trust anyone!
01:37 HedgeMage BlueProtoman: there's no limit on which trusted CA can sign what...once you trust them, you trust them in all cases
01:38 milki stop interacting with the world!
01:38 BlueProtoman HedgeMage: So if I go to https://www.somewhere.com (and let's assume I don't get any warnings from my browser), what does the "https" promise me?
01:38 HedgeMage And, certificate revocation is unreliable, so if one of the private keys you are trusting was stolen you may not find out any time soon.
01:39 BlueProtoman milki: Sure, anything to not have to deal with you.  :P
01:39 HedgeMage BlueProtoman: It promises you that you aren't subject to a man-in-the-middle attack and only the "true owner" of www.somewhere.com is talking to you.  Except...how much do you trust that promise?  It's not down to "14yo kids routinely fool it" level, but it's trivial for state actors or anybody with $50k to burn to fake it.
01:40 HedgeMage BlueProtoman: In between (more skilled, but no $50k at hand) it's annoying and difficult but maybe do-able :)
01:41 e14 joined #git
01:41 HedgeMage There's also the issue of getting the traffic sent to you instead of the "real" destination, but meh depending on who your target is that might be easy.
01:41 rchavik joined #git
01:46 BlueProtoman $50k?  Hm...thankfully, no one on 4chan makes that much money
01:46 * HedgeMage chuckles
01:46 HedgeMage The short story is, trust SSL but not too much, and if you are American only use credit cards online NEVER debit.
01:46 BlueProtoman Um...
01:46 BlueProtoman Mind elaborating on that one?
01:46 HedgeMage US law limits the consumer's liability for credit card fraud to an absolute maximum of $50 regardless of circumstances.
01:46 HedgeMage There is NO LIMIT if it's a debit card.
01:46 HedgeMage It's totally up to bank policy/mood/etc. how much you get back if someone uses your debit card fraudulantly.
01:46 HedgeMage If it's a credit card, you at most lose $50 and the rest is the bank's problem.
01:46 Vampire0_ joined #git
01:46 BlueProtoman I'm not ready for a credit card yet...but that's another issue.
01:46 * HedgeMage nods
01:46 jaguarmagenta joined #git
01:47 BlueProtoman When I graduate and have a steady source of income, I'll think about credit cards.
01:47 BlueProtoman Anyway...
01:47 BlueProtoman Public keys.  The two kinds I care about are GPG and SSH, and technically X.509 (though not as actively because the browser does all of that).
01:48 HedgeMage If you even use them.
01:48 BlueProtoman What makes them different "kinds" anyway?  Don't they use more or less the same algorithms to generate keys/use them for (en|de)cryption?
01:48 HedgeMage They're becoming less common because most browsers handle X.509 badly.  One of my missions in taking over Open Science Grid security is to eliminate X.509 usage.
01:49 HedgeMage Different formats, key lengths, restrictions on what primes can be used, they are set up for use with different algorithms, and so on.
01:49 BlueProtoman Well, whatever is replacing X.509 is more or less still a keypair, right?
01:49 HedgeMage In our case, we want to move web interfaces to pw + 2nd factor, and stick to SSH keys for job submission or another pubkey scheme, yes
01:50 malcon joined #git
01:51 harish_ joined #git
01:53 BlueProtoman Okay.  So different algorithms and parameters for said algorithms, but practically all keypairs solve the same problem; let anyone encrypt a message, but only one person decrypt that message.  Right?
01:54 HedgeMage Yes, all key pairs do that.
01:54 HedgeMage Note that there's such a thing as symmetric encryption, in which one key does both jobs, but it's used for different stuff.
01:55 HedgeMage Also, don't feel like you have to learn all of this to use SSH...you happened to run into an infosec geek is all.  I over-explain. :)
01:55 BlueProtoman No, I totally gotcha, I'm the same way sometimes.
01:56 HedgeMage :)
01:56 BlueProtoman If I'm gonna be a half-decent dev, it'd be nice to know this stuff anyway.
01:56 HedgeMage yup
01:56 HedgeMage most don't
01:56 BlueProtoman Anyway...
01:56 BlueProtoman So if I'm communicating with a Web server, the server has a public key (the certificate) that the browser encrypts messages with.  So my messages can't be tampered with or spied upon.  How do I know that the browser's messages to me don't get spied upon/tampered with?
01:56 HedgeMage not exactly
01:56 BlueProtoman *the server's messages back to me don't get spied upon
01:56 HedgeMage the messages are encrypted with a symmetric session key
01:57 HedgeMage the public key is used to sign the session key
01:57 HedgeMage this is done so that if someone cracks one of your sessions, they don't also get the content of others
01:57 BlueProtoman And what is "signing", exactly?
01:58 HedgeMage Basically, I make a hash of the message, then I encrypt the hash with my secret key.  If decrypting it with my public key reveals the hash of the message you have, then the message hasn't been tampered with.
01:58 BlueProtoman Also, what if I'm visiting a static site that has no notion of sessions (e.g. some art project hosted on GitHub Pages, which serves all sites with HTTPS)
01:59 HedgeMage (there are usually timestamps and such in there, too, but I'm trying to keep it simple-ish)
01:59 brokensyntax joined #git
01:59 HedgeMage it still has sessions, they're just anonymous ones that are easily disposed of and replaced
01:59 HedgeMage The traffic is so cheap nowadays, nobody cares.
01:59 Peng BlueProtoman: The TLS layer has a notion of sessions by nature.
02:00 BlueProtoman Peng: Oh, okay.  Gotcha.  TLS session != HTTP(S) session
02:00 Peng Separate from HTTP
02:00 HedgeMage And HTTPS is actually faster than HTTP in many (most?) cases these days, for reasons you may not care about.
02:00 BlueProtoman HedgeMage: It's more stateful, right?
02:01 HedgeMage BlueProtoman: At the network layer, yes, but not neccessarily at the application layer.
02:02 CheckDavid joined #git
02:02 BlueProtoman HedgeMage: But HTTPS takes advantage of that statefulness to not have to send as much data on the application level, right?
02:03 PioneerAxon joined #git
02:04 HedgeMage BlueProtoman: No, the statefulness advantage happens mostly around routing, actually.  The rest of the advantage has a lot to do with code optimization that happened in the years when everyone was trying to compensate for crypto being slow, and then crypto got faster.
02:05 mischat joined #git
02:05 plos joined #git
02:06 BlueProtoman HedgeMage: Huh.  So HTTPS' speed is more an accident than a result of careful analysis and design?
02:06 HedgeMage BlueProtoman: A bit of both, but yeah, partially by accident.
02:06 BlueProtoman Neat.
02:06 HedgeMage A terrifying amount of the internet's infrastructure is held together with duct tape, bailing wire, and accidents.
02:06 * HedgeMage is the one teaching people to apply duct tape faster.
02:07 BlueProtoman Hopefully, if the apocalypse happens we'll still have all of these books and blog posts explaining that so we can do it right next time.
02:07 HedgeMage You're funny.
02:07 HedgeMage You think they documented it?
02:08 BlueProtoman They don't have to.  Complaints (like the ones you're making now) just have to survive.
02:09 HedgeMage yeah, but I'd like us to not have to re-invent it all from scratch
02:09 HedgeMage especially since we have too few devs competent to do so
02:09 HedgeMage But, I'm working on that.  Everyone here has heard the story about 45 times, but I'm happy to tell you if you want to join #newguard or pm me.
02:09 BlueProtoman Back up all of Freenode to a bunker in Siberia every six months
02:13 lagothrix joined #git
02:14 Peng BlueProtoman: Archaeologists of the future studying how to read Comic Sans emoticons off of dot matrix paper...
02:14 mangolisk joined #git
02:14 BlueProtoman Peng: Or worse, /b/
02:15 Peng For the sake of the future, please burn that room
02:16 justanotheruser joined #git
02:16 malcon joined #git
02:16 dreiss joined #git
02:18 mlandoceansky joined #git
02:21 leeN joined #git
02:22 sentriz joined #git
02:22 f3r70rr35f joined #git
02:23 Ryanar joined #git
02:25 luke-jr Is it possible to get git-apply to use diff3 format for conflicts?
02:27 phroa I've never done it myself but try setting the config option "merge.conflictStyle" to "diff3" as per `man git merge`
02:27 gitinfo the git-merge manpage is available at http://jk.gs/git-merge.html
02:28 cdg joined #git
02:29 liuzhen joined #git
02:30 evanwang joined #git
02:31 hexagoxel joined #git
02:32 Unnecro_ joined #git
02:32 Hello71 man git-apply
02:32 gitinfo the git-apply manpage is available at http://jk.gs/git-apply.html
02:33 Hello71 although it doesn't actually contain the string 'diff3'
02:35 dsdeiz joined #git
02:35 dsdeiz joined #git
02:37 ResidentBiscuit joined #git
02:40 gfixler joined #git
02:40 luke-jr phroa: it doesn't work for git-apply :/
02:42 f3r70rr35f joined #git
02:43 Hello71 have you tried reading the documentation for git-apply then
02:44 jottr joined #git
02:45 luke-jr yes
02:45 xameada joined #git
02:46 Hello71 what was wrong with git apply -3
02:47 harry1 joined #git
02:49 dodobrain joined #git
02:49 chachasmooth joined #git
02:50 dodobrain so when i do `git rebase blah other` when i am currently in blah branch and it shows up a file with "both modified", what does 'ours' and 'theirs' refer to when using along with checkout?
02:50 fedepad joined #git
02:50 dodobrain i almost always get confused
02:51 dodobrain usually have to try one and then realise i needed the otherone
02:52 buddyq joined #git
02:52 dodobrain nevermind, i read the man page again just now.
02:53 dodobrain it makes sense until i forget about it in the future :)
02:53 rominronin-WORK joined #git
02:54 ojacobson During a rebase, "ours" is the new branch you are constructing, and "theirs" is the commit currently being copied
02:54 ojacobson s/the new branch/the last commit created on the new branch/
02:55 mehola joined #git
02:56 SwiftMatt joined #git
02:57 dreiss joined #git
02:57 arescorpio joined #git
02:58 brokensyntax joined #git
02:59 xall joined #git
03:00 svm_invictvs joined #git
03:02 isysd joined #git
03:05 mischat joined #git
03:08 howdoi joined #git
03:08 yohnnyjoe joined #git
03:09 luke-jr Hello71: it doesn't do diff3 format for conflicts
03:09 Guest77662 joined #git
03:10 Hello71 oh, you mean the default diff3 format
03:11 LeBlaaanc joined #git
03:12 luke-jr II only know about one diff3 format
03:14 phroa Hello71: not the usual three-way conflict, but diff3 conflict markers
03:14 mizu_no_oto joined #git
03:14 phroa luke-jr: which, if I'm reading the code right, should _always_ be controlled by the merge.conflictStyle option.  not sure what to tell you
03:15 Vortex34 joined #git
03:15 luke-jr I have diff3 format working fine for merge/etc, it just doesn't seem to affect git-apply :/
03:16 Hello71 diff3 also outputs in "all changes" for lack of a better term, and ed format
03:16 mod joined #git
03:17 phroa luke-jr: be sure you're trying it with -3 option, ll_merge seems to be only called in three-way mode
03:17 diogenese joined #git
03:17 luke-jr I am
03:17 jstimm joined #git
03:19 Bigcheese joined #git
03:20 pwnz0r joined #git
03:21 gfixler joined #git
03:24 malcon joined #git
03:25 KnownSyntax joined #git
03:26 liuzhen_ joined #git
03:26 ertes joined #git
03:26 ertes hi…  is this channel appropriate for github-related questions?
03:26 ertes (in fact it's about *not* using github for a certain thing)
03:27 cyan__ joined #git
03:27 thiago no
03:27 ertes ok, thanks!
03:27 ertes left #git
03:28 diogenese joined #git
03:28 mlandoceansky joined #git
03:28 KnownSyntax joined #git
03:28 KnownSyntax joined #git
03:32 serialoverflow joined #git
03:34 durham joined #git
03:35 durham joined #git
03:42 Andrew_K joined #git
03:42 PioneerAxon joined #git
03:43 aavrug joined #git
03:44 a_thakur joined #git
03:45 evanwang_ joined #git
03:46 jorj joined #git
03:47 gniourf joined #git
03:49 mlandoceansky joined #git
03:50 malcon joined #git
03:54 gniourf joined #git
03:58 buzzLightBeer joined #git
03:59 Goplat joined #git
03:59 nowhere_man joined #git
04:00 Anja joined #git
04:01 sssilver joined #git
04:04 boombatower joined #git
04:05 phanimahesh joined #git
04:06 plos joined #git
04:06 mischat joined #git
04:07 Salander27 joined #git
04:07 Salander27_ joined #git
04:09 DJ_Spies joined #git
04:14 malcon joined #git
04:15 GT4066 joined #git
04:19 brillenfux joined #git
04:23 moei joined #git
04:25 rominronin-WORK joined #git
04:29 SwiftMatt joined #git
04:30 harleyyyyymayes joined #git
04:30 the_cybersphinx joined #git
04:31 Haliucinas joined #git
04:31 impermanence joined #git
04:32 svm_invictvs joined #git
04:33 rockstar_ joined #git
04:36 harry1 joined #git
04:37 ruby_ joined #git
04:38 Cabanossi joined #git
04:38 diogenese joined #git
04:39 rockstar__ joined #git
04:42 c0ded joined #git
04:45 jottr joined #git
04:46 daey_ joined #git
04:46 fedepad joined #git
04:47 subhojit777 joined #git
04:47 xameada joined #git
04:48 xall joined #git
04:52 nettoweb joined #git
04:52 impermanence joined #git
04:52 govg joined #git
04:54 Limes_ joined #git
04:54 ruby_ joined #git
04:57 GavinMagnus joined #git
04:59 bmahe joined #git
05:05 annoymouse joined #git
05:06 freimatz joined #git
05:07 mischat joined #git
05:10 SwiftMatt joined #git
05:12 plos joined #git
05:13 phanimahesh joined #git
05:13 impermanence joined #git
05:13 _28_ria joined #git
05:14 overlord_tm joined #git
05:16 cyan__ joined #git
05:20 raspado joined #git
05:20 dreiss joined #git
05:21 Corosus joined #git
05:24 ayogi joined #git
05:24 thierryp joined #git
05:26 sea-gull_ joined #git
05:28 sigjuice left #git
05:30 eivarv joined #git
05:31 govg joined #git
05:34 impermanence joined #git
05:35 liuzhen joined #git
05:35 impermanence joined #git
05:35 eizua joined #git
05:36 dalias joined #git
05:39 BSAlb joined #git
05:39 evanwang joined #git
05:41 xall joined #git
05:41 SwiftMatt joined #git
05:45 ThomasLocke joined #git
05:45 ThomasLocke joined #git
05:46 ShekharReddy joined #git
05:54 lindenle joined #git
05:56 impermanence joined #git
05:56 rominronin-WORK joined #git
05:59 Raging_Hog joined #git
05:59 rscata joined #git
06:02 bocaneri joined #git
06:04 Vampire0 joined #git
06:07 diogenese joined #git
06:07 lordjancso joined #git
06:08 mischat joined #git
06:08 zeroed joined #git
06:09 Eryn_1983_FL joined #git
06:11 GodEater` left #git
06:12 GodEater joined #git
06:13 PocketKiller joined #git
06:13 fedepad joined #git
06:14 fedepad_ joined #git
06:15 des_consolado hey if I just want to see the commit log of some branch of a public remote repository hosted on a site like github, e.g. https://github.com/bhauman/lein-figwheel.git, is there a way to do that?
06:15 Aces_Charles joined #git
06:15 des_consolado (without having to clone the whole repo locally, is what I mean)
06:16 _ikke_ No, that's not possible
06:16 _ikke_ You an look on the web interface
06:16 qt-x joined #git
06:16 des_consolado one must clone a repo before doing any kind of git operations on it?
06:16 _ikke_ but git does not allow you to get any more information than the branches it has
06:16 des_consolado aww
06:17 cdown joined #git
06:17 des_consolado is that just the way it is, a limitation, or is there good reason and it should never be that way?
06:17 impermanence joined #git
06:18 osse My guess would be it just is that way because no one has done the work
06:18 roelmonnens joined #git
06:19 liuzhen joined #git
06:20 osse Conceptually it shouldn't be that hard to extend the protocol to allow for sending commit objects without the content they refer to, which would get you a log.
06:20 freimatz joined #git
06:20 osse But then maybe you want log -p :P
06:20 lordjancso joined #git
06:24 jknetl joined #git
06:24 harry1 joined #git
06:25 _ikke_ There has been no reason to do it. What's currently possible is for the git protocol to work. The only extra thing is git archive, which lets you export a single tree
06:25 _ikke_ But the expectation is that you make a local clone of the repository
06:26 chele joined #git
06:26 khisanth__ joined #git
06:26 des_consolado it's just situations like say a project is like 100M and I've got a shitty connection and all I want to do is see how old a project is by checking the log for the first commit
06:27 des_consolado it's not really a significant issue anyway lol
06:27 des_consolado just seems like overkill cloning a repo to see how old it is
06:28 nidr0x joined #git
06:28 des_consolado but yeah, there are greater concerns I'm sure... there are people dying out there...
06:28 dan2k3k4 joined #git
06:28 osse It's not overkill if it's the only way to do it.
06:29 osse But there's a large repo out there, one you need to know the age of of, and there's no web interface?
06:30 des_consolado well look https://github.com/bhauman/l​ein-figwheel/commits/master you have to keep pressing 'older' and 'older' and 'older' until they all come up lol
06:32 ki0 joined #git
06:32 GavinMagnus left #git
06:34 zulutango joined #git
06:34 jnavila joined #git
06:34 ronskisika joined #git
06:36 star_prone joined #git
06:37 JeroenT joined #git
06:38 Corosus joined #git
06:38 impermanence joined #git
06:38 Sceorem joined #git
06:39 shaggycat joined #git
06:39 nwkj86 joined #git
06:40 star_prone joined #git
06:41 corsibu joined #git
06:41 mischat joined #git
06:42 Karazhan joined #git
06:44 thierryp joined #git
06:44 thierryp joined #git
06:45 rominronin-WORK joined #git
06:45 shock- joined #git
06:46 jottr joined #git
06:46 Haliucinas joined #git
06:47 rendar joined #git
06:48 dreiss joined #git
06:53 qpdb joined #git
06:55 grawity ask github support to add an 'oldest' link
06:55 Balliad joined #git
06:55 grawity or, https://github.com/bhauman/lein-figwheel/network
06:56 grawity press shift+h or shift+←
06:56 tgp_ joined #git
06:56 JeroenT joined #git
06:57 eduardas_m joined #git
06:58 corsibu joined #git
06:59 des_consolado aha! good shout
06:59 impermanence joined #git
07:01 omegak joined #git
07:03 Darcidride joined #git
07:04 fuchstronaut joined #git
07:04 Anja joined #git
07:05 MrWoohoo joined #git
07:08 TheBrayn joined #git
07:09 eduardas_ joined #git
07:10 danslo joined #git
07:12 eshlox joined #git
07:15 aax joined #git
07:17 TomyWork joined #git
07:18 lb1c joined #git
07:18 PioneerAxon joined #git
07:19 djb-irc joined #git
07:20 impermanence joined #git
07:20 serycjon joined #git
07:21 encod3 joined #git
07:21 shirty joined #git
07:21 kajnc joined #git
07:22 Anja joined #git
07:23 elect joined #git
07:25 thierryp joined #git
07:26 PioneerAxon joined #git
07:27 thierryp_ joined #git
07:27 ocbtec joined #git
07:27 fees joined #git
07:30 jozwior joined #git
07:32 GavinMagnus joined #git
07:33 neunon joined #git
07:34 pbrewczynski joined #git
07:34 Stummi joined #git
07:35 ahmedelgabri joined #git
07:37 pbrewczynski Do you know how to use pac (proxy auto-config) with git?
07:37 djb-irc joined #git
07:38 xall joined #git
07:39 Guest13801 left #git
07:39 Joost joined #git
07:39 Joost joined #git
07:39 jeffreylevesque_ joined #git
07:39 m1m3-50 joined #git
07:39 _ikke_ pbrewczynski: git relies on libcurl
07:39 cagedwisdom joined #git
07:39 _ikke_ for http
07:40 ftoulemon hello, how to ignore "Backup/" but not "src/Backup/" in my .gitignore ? I saw I could use the \! prefix. Any other/better solution ?
07:40 serycjon joined #git
07:40 _ikke_ No
07:40 ftoulemon ok, thanks
07:40 impermanence joined #git
07:41 grawity do you just want to ignore /Backup/ at the root, or Backup/ everywhere except under src/?
07:41 averagedan joined #git
07:41 _ikke_ if you just add /Backup in the gitignore, it should not ignore src/Backup
07:42 kajnc joined #git
07:42 pbrewczynski _ikke_: So I should configure lib curl?
07:42 _ikke_ pbrewczynski: right
07:43 fuchstronaut joined #git
07:44 ftoulemon thanks, "/Backup/" is what I was looking for
07:45 danslo joined #git
07:46 tmz joined #git
07:46 nd_ joined #git
07:48 Mimicize joined #git
07:51 jailbox joined #git
07:51 halbomin joined #git
07:54 PioneerAxon joined #git
07:55 ki0 joined #git
07:56 ki0 joined #git
07:56 djb-irc joined #git
07:58 corsibu joined #git
07:59 leeN joined #git
08:00 pouet joined #git
08:01 diogenese joined #git
08:01 impermanence joined #git
08:03 averagedan left #git
08:03 kurkale6ka joined #git
08:05 kenden joined #git
08:05 Karazhan joined #git
08:06 jozwior joined #git
08:08 lpapp joined #git
08:08 lpapp hi, is it expected that git show and git diff do not work for renamed files and directories?
08:08 _ikke_ both have options to follow renames
08:09 lpapp git log --follow my/file shows the "extended" history and I tried to show the changes in a commit before the rename.
08:09 xall joined #git
08:10 eizua joined #git
08:10 lpapp _ikke_: ah, okay, I was looking for a "--follow" option in the man page before, but I could not find one.
08:10 lpapp so it is either called differently or it is not in the man page.
08:11 _ikke_ -M
08:11 _ikke_ --find-renames
08:11 TinkerTyper joined #git
08:12 SwiftMatt joined #git
08:12 star_prone joined #git
08:12 marcogmonteiro joined #git
08:13 Macaveli joined #git
08:13 harry1 joined #git
08:15 JeroenT joined #git
08:16 lpapp _ikke_: ok, thank you. Unfortunately, that does not seem to work. I am doing git log --follow ../path/to/my/file and then I get back the extended history. After that, I do git show -M 25eae91d01a31fea132a43d2585a748d3fdc0f21 -- ../path/to/my/file and the output is empty. I have tried it with several commits. If I do it with git log ../path/to/my/file (without --follow) and pick up a commit hash from there,
08:16 lpapp that works with git show fine. My git version on this old debian is 1.7.10.4.
08:17 lpapp could it be that this feature was introduced after 1.7.10.4? Let me try with the latest git version on my Archlinux...
08:17 osse if you show an old commit you must use the old file name
08:17 sinelaw joined #git
08:17 lpapp oh, I see. Is there an easy way to get that rather than trusting my eyes to catch the right rename in a huge overall rename commit?
08:18 sinelaw hey, with git 1.8.3, git fetch -p leaves out some branches (doesn't prune all old remote branches) - is there a known bug?
08:18 lpapp actually, I think the root directory underneath was renamed rather than the file itself, but yeah, that is still a path change.
08:18 lpapp (so everything plus the kitchen sink was renamed)
08:18 gtristan joined #git
08:19 gtristan Seems the assumptions about git trees made the other day were incorrect
08:19 roelmonn_ joined #git
08:19 star_prone joined #git
08:19 sinelaw there is a branch which doesn't exist on the remote, but git fetch -p is not removing it from refs/remotes/origin/...
08:19 sinelaw I couldn't find online any reference to such a problem
08:19 osse lpapp: are you doing git show on the rename itself ?
08:19 gtristan but still ok for my own arguments... but still: git checkout -b test && git commit --amend (edit commit message)... results in the same tree sha on master and test branch
08:20 lpapp osse: ../path/to/my/file is what I am interested in.
08:20 lpapp osse: and ../old-path was renamed to ../path
08:20 gtristan so modifying the commit object does _not_ change the tree in fact, let me try with superficial added commit
08:20 lpapp just speaking in theory of course, this is not the concrete directory name, but that should not matter to understand the feature.
08:20 osse i'm not sure what you want to get out of the feature
08:21 quackgyver joined #git
08:21 lpapp osse: right, so I am trying to check certain changes to that file under which a directory name has changed.
08:21 gtristan hmmm, how can I test this: How do I add a commit that does not change anything ?
08:22 osse gtristan: commit --allow-empty
08:22 gtristan osse, thanks
08:22 impermanence joined #git
08:22 blahdodo joined #git
08:22 osse lpapp: that's why you do  git show 25eae91d01a31fea132a43d2585a748d3fdc0f21 ?
08:23 mikecmpbll joined #git
08:23 star_prone joined #git
08:23 gtristan interesting, so that *also* does not modify the tree
08:23 * gtristan should have actually tested before making wild assertions on the mailing list ;-)
08:23 osse the only way to modify the tree is to modify the tree :P
08:24 Guest64144 joined #git
08:24 j416 joined #git
08:24 ismaris joined #git
08:25 gtristan osse, right, the definition of the 'tree' here is what was confusing to me :)
08:26 gtristan osse, just yesterday I think it was, I walked in and asked about this, all seemed to agree that the tree sha would be modified by a changed date in a commit object or an additional superficial informational commit (such like gitlab adds after an FF merge)
08:26 gtristan anyway, now I know better
08:27 osse sounds strange. maybe there was confusion and they meant the commit sha
08:27 clmsy joined #git
08:27 sinelaw so...any idea how this can happen? (stale remote branches not being pruned)
08:27 gtristan possibly
08:28 Orbitrix joined #git
08:28 osse sinelaw: maybe fetch -p only removes branches it detects have been removed since the last fetch or something?
08:28 sinelaw I'll check the source
08:30 raspado joined #git
08:31 chll_ joined #git
08:32 jozwior joined #git
08:34 mischat joined #git
08:35 noidea joined #git
08:35 noidea joined #git
08:35 PioneerAxon joined #git
08:36 DevAntoine joined #git
08:36 DevAntoine hi
08:38 manuels joined #git
08:39 DevAntoine I've started a rebase, leading to conflict. Is there a way to know how many commit are left to be applied? Because if I have to fix 10 time these conflicts I'll just do a merge.
08:39 SwiftMatt joined #git
08:40 cyan__ joined #git
08:40 Knirch joined #git
08:40 averagedan joined #git
08:40 tofu00 joined #git
08:41 LeRieur joined #git
08:41 tofu00 joined #git
08:42 b100s joined #git
08:42 LeRieur joined #git
08:43 impermanence joined #git
08:44 LeRieur joined #git
08:44 tofu0000 joined #git
08:45 fuchstronaut joined #git
08:45 qpdb joined #git
08:45 _ikke_ DevAntoine: You might want to poke in .git/*rebase* folder, it contains the sequencer state
08:45 _ikke_ s/poke/peek
08:46 DevAntoine what about rerere? Is it a bad idea to enable it?
08:46 Karazhan joined #git
08:46 troyt joined #git
08:46 LeRieur joined #git
08:46 jottr joined #git
08:46 _ikke_ I think that only helps if you have the exact same conflict multiple times
08:47 DevAntoine _ikke_: I've got like 20 files in there, no one with a sequencer in its name
08:47 DevAntoine rebasing is clean, but having to fix over and over the same conflicts is such a pain
08:48 bongjovi joined #git
08:48 King_Hual joined #git
08:48 Serpent7776 joined #git
08:50 rominronin-WORK joined #git
08:50 ghostlight joined #git
08:50 vannorden joined #git
08:50 systemovich joined #git
08:52 rominron_ joined #git
08:52 DevAntoine what about pull --rebase? I've seen some people encourage to use it. But how does it work with the history? Because rebase change the history so you have to force push after
08:52 lordjancso joined #git
08:52 osse DevAntoine: pull = fetch && merge upstream.  pull --rebase = fetch && rebase upstream.
08:53 osse DevAntoine: you mgiht want to run 'git rerere' to enable that feature
08:53 _ikke_ DevAntoine: git pull --rebase only rebases your *local* changes on top of the newly fetched changes
08:53 osse and recent gits tell you the current rebase progress in git status
08:53 _ikke_ DevAntoine: so no force push required
08:55 courrier joined #git
08:57 selckin joined #git
08:58 DevAntoine what's the difference between "git rebase develop" and "git pull --rebase"?
08:58 tobiasvl DevAntoine: the pull also fetches, re: what osse said earlier
08:58 tobiasvl the difference is akin to the difference between "git merge develop" and "git pull"
08:59 unclechu joined #git
08:59 finalbeta joined #git
08:59 flaviodesousa joined #git
08:59 nivag joined #git
09:00 sinelaw found the problem (remote branches not being pruned):
09:01 sinelaw git config was missing 'remote.origin.fetch=...'
09:01 sinelaw not sure how that happened
09:01 sinelaw any ideas? :)
09:02 \du joined #git
09:02 osse sinelaw: you used -b or --single-branch or similar when you cloned
09:03 sdlnv joined #git
09:03 mattcen joined #git
09:04 impermanence joined #git
09:04 sdlnv_ joined #git
09:04 jottr joined #git
09:04 kikijiki[m] joined #git
09:04 saintaquinas[m] joined #git
09:04 hallogallo[m] joined #git
09:04 M-meznak joined #git
09:04 Remramm joined #git
09:04 M-mistake joined #git
09:04 aviraldg joined #git
09:04 M-shine joined #git
09:04 Ineentho[m] joined #git
09:04 alaeri[m] joined #git
09:05 kjsage[m] joined #git
09:05 cdown joined #git
09:10 Gonzo89 joined #git
09:10 achadwick joined #git
09:14 serycjon joined #git
09:17 PCatinean joined #git
09:17 rorro joined #git
09:17 star_prone joined #git
09:20 ahr3n joined #git
09:20 jottr joined #git
09:21 ronskisika joined #git
09:22 govg joined #git
09:23 jaguarmagenta joined #git
09:25 barteks2x joined #git
09:25 impermanence joined #git
09:25 kajnc joined #git
09:26 nedbat here (https://git-scm.com/book/en/v​2/Git-Internals-The-Refspec) it says that origin/master, remotes/origin/master, and refs/remotes/origin/master are all equivalent. How does git know they are equivalent?
09:28 canton7 nedbat, take a look at 'specifying revisions' in man gitrevisions
09:28 gitinfo nedbat: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
09:29 fedepad joined #git
09:29 canton7 the third item. When you give git something like 'origin/master', git goes looking to see what you might have meant. It checks whether refs/origin/master exists, then refs/tags/origin/master, then refs/heads/origin/master, then refs/remotes/origin/master
09:30 canton7 so if you type 'origin/master', git will eventually find refs/remotes/origin/master
09:30 nedbat canton7: great, thanks. i see in my .git directory the refs directory only has empty directories in it.
09:30 canton7 if there really is nothing in .git/refs, then you have no branches
09:30 canton7 (or tags)
09:31 nedbat canton7: oh, i see: i have files there, but also many many empty directories
09:31 canton7 that's unusual, but hey
09:31 canton7 only the files actually matter
09:33 nedbat canton7: if I have a branch, ned/foo, then i should have .git/refs/heads/ned/foo right?
09:33 canton7 yep
09:33 canton7 (assuming that it's called 'ned/foo', and, say, you don't have a remote called 'ned')
09:33 canton7 but, bear in mind that not all refs appear on the filesystem like that
09:33 nedbat canton7: ok, so where else could it be?
09:33 canton7 when fetching/pushing, git can put all refs into a single "packed refs" file
09:33 nedbat ok
09:34 nedbat i have 90k of that
09:34 canton7 the reliable way to see what branches you have is using 'git branch'
09:34 nedbat canton7: yes, i'm just trying to understand a little deeper, and refspecs for fetching
09:34 nedbat i know the directory structure is a bit of a distraction :)
09:35 israelzuniga joined #git
09:35 star_pro_ joined #git
09:35 Seveas [11:30] <     canton7> | if there really is nothing in .git/refs, then you have no branches
09:35 Seveas don't forget the packed refs
09:35 canton7 Seveas, read down
09:35 Seveas doh.
09:35 * Seveas cleans his glasses
09:35 jottr joined #git
09:35 corsibu joined #git
09:36 _ikke_ git gc also packs refs
09:36 Seveas nedbat: https://git.seveas.net/the-mea​ning-of-refs-and-refspecs.html may help you
09:36 tvw joined #git
09:37 _ikke_ And (not sure what the status is) in the future, refs may also be placed in a database
09:38 notebox joined #git
09:39 nedbat Seveas: this looks very helpful, thanks
09:39 nedbat (except for the coloring of the reflog....) :)
09:40 nedbat though, i learned i can use log options on reflog, which makes perfect sense, but never saw before
09:43 ahr3n joined #git
09:44 nettoweb joined #git
09:45 impermanence joined #git
09:47 nilg joined #git
09:49 dserodio joined #git
09:50 anbz joined #git
09:50 afuentes joined #git
09:51 kajnc joined #git
09:52 JeroenT joined #git
09:54 drizztbsd joined #git
09:54 aax joined #git
09:56 raspado joined #git
09:57 finalbeta joined #git
09:57 lindenle joined #git
09:58 kajnc joined #git
09:58 roelmonnens joined #git
10:02 corsibu joined #git
10:02 harry1 joined #git
10:06 impermanence joined #git
10:08 dodobrain joined #git
10:10 bruce_lee joined #git
10:11 rnsanchez joined #git
10:12 finalbeta joined #git
10:16 a_thakur joined #git
10:19 star_prone joined #git
10:21 irco joined #git
10:22 mage_ joined #git
10:22 mage_ hello
10:23 jozwior joined #git
10:23 mage_ what would be the easiest way to rename current branch (master) to another name (dev) and "start from scratch" in (new) master (while keeping the old master changes in dev) ?
10:24 _ikke_ mage_: What do you mean start from scratch
10:24 _ikke_ Would maste still be connected to dev somehow?
10:24 _ikke_ master
10:25 mage_ _ikke_: take the code from some/dir in production
10:25 timwis Good morning folks. A friend and I are collaborating on a project. I'm fixing about 3 different things this morning. I'd like to submit a pull request for each one, but after writing the code, if I commit it to its own branch and then go back to master to work on the other feature, I lose the fix I made. How do folks usually do this?
10:26 mage_ in other words: an old shitty project, the code in current master branch is bad and we know that the one in production is OK ... but we'd like to keep the history
10:26 _ikke_ timwis: do the other fixes rely on the previous fixes?
10:26 mage_ so yes they should be somewhat connected
10:26 star_prone joined #git
10:27 Macaveli joined #git
10:27 _ikke_ mage_: You can create an orphan branch, but that would have no connection to dev
10:27 timwis _ikke_: they're not always related
10:27 mage_ what is an orphan branch ?
10:27 impermanence joined #git
10:27 timwis for example, I just fixed a route in the server code, which got the app working again, but I'm a front-end guy so i may have done it wrong
10:28 nettoweb joined #git
10:28 timwis so I'd like that fix to be its own branch, submitted as a PR. i'd like to _use_ that fix while developing the other branch/features, but not base the other ones off of it
10:28 _ikke_ right\
10:28 timwis is this a common need? I'm sure it's _possible_, but really wondering whether this is an edge case or something I should know how to do
10:28 _ikke_ mage_: It's a branch that's not connected to the rest of the history.
10:29 _ikke_ mage_: ie, you cannot find any of the commits in dev by traversing the commits in that branch
10:29 nedbat timwis: this is a common need.  you can make a series of branches, each building from the last.
10:29 mage_ ah, perfect
10:29 mage_ sounds like it's what I want
10:29 nedbat timwis: you have to rebase branch2 once branch1 is merged to master
10:29 _ikke_ nedbat: right, but then the pull-request would include the changes from the first fix
10:29 nedbat timwis: and reviewing the pull requests should wait for the previous ones to merge, as _ikke_ points out.
10:30 ToxicFrog joined #git
10:30 timwis nedbat: so branch2 should be based off branch1?
10:30 _ikke_ yes, if branch2 relies on branch1
10:30 nedbat timwis: yes
10:30 timwis okay. then it wouldn't even require rebasing, would it?
10:31 _ikke_ Not necessarily, no
10:31 _ikke_ You just need to wait for the first branch to be merged
10:32 _ikke_ but it might be better to rebase the next branch on the merged commit
10:32 timwis okay. was hoping to keep them independent from one another but that's not so bad.
10:32 timwis thanks.
10:33 _ikke_ You can, but you have to manually include the fix to test branch 2 then
10:35 corsibu joined #git
10:36 jottr joined #git
10:39 jnhghy joined #git
10:41 nedbat Seveas: i'm very impressed by your cookbook.
10:41 impermanence joined #git
10:41 jnhghy new to git need help, I have a project on bitbucket that was shared with me, the code is on a server where another developer worked, now I want to push origin to master but it asks for the other developr's password even thou I added my name and email in the config, can anyone pls help?
10:43 nedbat Seveas: i'm trying to understand how the interactive graphs work :)
10:43 fuchstronaut joined #git
10:43 fuchstronaut joined #git
10:43 grawity jnhghy: your name and email are only stored on the commits
10:43 grawity jnhghy: they've absolutely nothing to do with server authentication
10:44 ieee joined #git
10:44 jnhghy grawity: ok, is anything in config that has to do with authentication? :)
10:44 mischat joined #git
10:44 grawity jnhghy: if you're doing this within a clone shared with another dev, check the remote URLs (`git remote -v`) if the other dev's username got stored in there
10:45 grawity in these situations it would be better to a) use ssh-agent for auth, or b) avoid pushing from shared repos in the first place
10:45 grawity (also, for the record, "git push origin master" doesn't push origin to master)
10:46 jnhghy grawity: thanks for the info... will have to jump in and see how things work it seems :)
10:46 corsibu joined #git
10:50 joki joined #git
10:53 nowhere_man joined #git
10:55 jiawh joined #git
10:56 jimi_ joined #git
10:57 PCatinean joined #git
10:57 JeroenT joined #git
10:58 corsibu joined #git
10:59 danslo joined #git
10:59 fuchstronaut joined #git
11:00 phanimahesh joined #git
11:01 ahmed_elgabri joined #git
11:01 corsibu joined #git
11:01 star_prone joined #git
11:02 JuliusN joined #git
11:02 impermanence joined #git
11:07 Seveas nedbat: click on commands with gears next to them to see what they do. Click the circular arrow on the graph to reset.
11:07 Seveas s/gears/play buttons/
11:07 a3Dman joined #git
11:07 nedbat Seveas: i see how to use them, i was trying to understand how you *made* them :)
11:07 Seveas magic :)
11:08 nedbat Seveas: never a satisfying answer :)
11:08 JuliusN after resolving merge conflicts but before committing, how do i exclude .orig files?
11:09 bremner don't add them
11:09 tobiasvl JuliusN: if you added them, !unstage
11:09 gitinfo JuliusN: To unstage a file from the index(in other words, to undo an accidental `git add foo/bar.txt`), use: git reset -- foo/bar.txt
11:10 mage_ left #git
11:10 nedbat Seveas: btw, I saw your "PAGER=" trick in the completion article, but when i try "PAGER= git fetch --help", I get a dozen lines of crazy shell errors.  PAGER=cat works though.
11:12 liuzhen joined #git
11:12 Seveas nedbat: PAGER= works for me, what are the errors?
11:12 nedbat Seveas: https://gist.github.com/nedbat/6​55e2671abc7f5cd5d09ee83e48b9795
11:13 JuliusN gitinfo: can i use some sort of filter with that command, like *.orig?
11:14 Seveas nedbat: your git/man setup is crazy and/or broken
11:14 nedbat Seveas: and/or brew :)  on ubuntu it work fine.  ¯\_(ツ)_/¯
11:14 Seveas meh. Stupid fruitmachines :P
11:16 BraveZA joined #git
11:16 anotheryou joined #git
11:17 pks_ joined #git
11:18 JuliusN gitinfo: that command unstaged almost everything
11:19 JuliusN i just wanted to unstage the .orig files
11:19 canton7 (gitinfo's a bot)
11:19 osse JuliusN: no it only unstages foo/bar.txt
11:20 hdon_ joined #git
11:21 osse git reset -- '*.orig' should work afaik
11:22 timvisher joined #git
11:22 JuliusN my exact command was git reset -- Podfile.lock.orig
11:23 JuliusN did it interrupt the merge?
11:23 osse that should only unstage that file
11:23 jaguarmagenta joined #git
11:24 impermanence joined #git
11:24 thebope joined #git
11:24 ExoUNX joined #git
11:25 kajnc joined #git
11:26 JuliusN so before that my git status listed hundreds of 'changes to be committed' files. after the reset it lists two.
11:26 star_pro_ joined #git
11:26 jozwior joined #git
11:29 phanimahesh joined #git
11:29 ojdo joined #git
11:30 JuliusN ok it was probably sourcetree that messed with the staging
11:31 Seveas !gui
11:31 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
11:31 Seveas and 4) gui's want to be smart, and fail at that.
11:32 qpdb joined #git
11:32 JuliusN i realize that
11:37 nuck joined #git
11:37 mizu_no_oto joined #git
11:37 qsx isn’t there a gui called smartgit?
11:37 eduardas_m joined #git
11:39 Macaveli joined #git
11:39 eduardas_m joined #git
11:40 ToBeCloud joined #git
11:41 BPL joined #git
11:41 sdothum joined #git
11:42 fub joined #git
11:42 BPL Hi, is it possible to update a local branch without checkout first?
11:42 tobiasvl BPL: what do you mean exactly? you can reset it
11:43 fub Hi. So I have a $Client and a $Server. Server is running a webserver which has a folder called /var/www/foo which contains a git repository I cloned. Now on Client I want to pull from this, so I added it with git remote add server https://user:pass@server.com/foo, but this always results in "repository '...' not found" - what am I doing wrong?
11:44 BPL tobiasvl: Imagine this scenario http://screencast.com/t/yTxjoZgy , in that case I'm working on the version_exclude_folders local branch, usually I'd stash my uncommited changes, checkout master and pull... My question is whether I can avoid the stash+checkout but still pull-out master
11:45 nowhereman joined #git
11:48 canton7 BPL, in order to pull, specifically, you need that branch checked out
11:49 tcorneli joined #git
11:49 canton7 BPL, this is because a pull involves a merge, and a merge might conflict, in which case your working copy is needed to resolve the merge
11:49 canton7 BPL, you can reset master to origin/master without checking it out first, though. But that won't do a merge.
11:50 a_thakur_ joined #git
11:50 BPL canton7: Ok, that's a clear explanation, I understand, thx
11:51 canton7 *to resolve the conflict, I should have said
11:51 harry1 joined #git
11:51 rasto joined #git
11:52 jimi_ joined #git
11:54 dances-with-cats joined #git
11:54 corsibu joined #git
11:55 HoierM joined #git
11:57 dk0r joined #git
11:58 tesrty joined #git
11:59 nowhereman joined #git
11:59 tesrty joined #git
12:00 impermanence joined #git
12:01 ferr joined #git
12:03 moo joined #git
12:04 plos joined #git
12:06 davimore joined #git
12:08 corsibu_ joined #git
12:09 talin__ left #git
12:12 harish_ joined #git
12:14 danslo joined #git
12:14 _ADN_ joined #git
12:14 rymurphy joined #git
12:15 fxer joined #git
12:16 synthroid joined #git
12:19 Murii joined #git
12:20 dsdeiz joined #git
12:20 Jameser joined #git
12:21 mure joined #git
12:22 absence left #git
12:23 phz_ joined #git
12:23 phz_ hi
12:25 Limes_ joined #git
12:25 mizu_no_oto joined #git
12:26 bejeb joined #git
12:27 bejeb How can I include all files in a subfolder in my repository, regardless of any .gitignore rules set in a .gitignore in a parent directory? e.g. my top-level .gitignore specifies *.foo, but in the foo_includes sub directory I actually want to include .foo files
12:28 ToxicFrog bejeb: make a foo_includes/.gitignore file that overrides the top-level one
12:28 ToxicFrog I think it just needs to contain "!*.foo" and you're good to go
12:28 plos joined #git
12:30 bejeb will !* make it include absolutely everything? Or do I need !*.foo, *.bar etc
12:30 bejeb ToxicFrog: thank you, and ^^
12:30 tgunr joined #git
12:31 serycjon joined #git
12:31 nedbat bejeb: i think you can also put that pattern in the top-level .gitignore if you want to keep it all in one place
12:31 ToxicFrog bejeb: !* will make it include everything, IIRC
12:31 ToxicFrog But I'm kind of rusty on .gitignore parsing
12:32 bejeb ToxicFrog: thank you
12:32 bejeb nedbat: as in !packages/*, or something like that?
12:32 nedbat bejeb: right
12:32 plos joined #git
12:32 nedbat bejeb: some people like one big .gitignore, some like spreading it around.
12:32 bejeb nedbat: thank you too
12:34 plos joined #git
12:34 tgunr left #git
12:34 jeffreylevesque joined #git
12:35 fmcgeough joined #git
12:35 King_Hual` joined #git
12:36 uebera|| joined #git
12:36 uebera|| joined #git
12:37 jottr joined #git
12:38 johnmilton joined #git
12:40 modlin joined #git
12:40 corsibu joined #git
12:41 fedepad_ joined #git
12:41 m1m3-50 joined #git
12:41 plos joined #git
12:43 jimi_ joined #git
12:43 sdothum joined #git
12:43 styx_ joined #git
12:43 plos joined #git
12:44 Dazzyo joined #git
12:44 Haliucinas joined #git
12:44 serialoverflow joined #git
12:44 johnny56 joined #git
12:45 j416 joined #git
12:45 DonVitoCorleone joined #git
12:46 Sonderblade joined #git
12:46 Zoxc joined #git
12:47 cdown joined #git
12:48 tesrty left #git
12:50 MrSwadge joined #git
12:52 danslo_ joined #git
12:52 danslo__ joined #git
12:53 zivester joined #git
12:53 impermanence joined #git
12:55 GenZai joined #git
12:55 eindoofus joined #git
12:55 mischat joined #git
12:56 plos joined #git
12:57 mmlb25 joined #git
12:57 jost joined #git
12:57 mmlb25 joined #git
12:57 JeroenT joined #git
12:59 gho5t joined #git
12:59 skunkz joined #git
13:01 lindenle joined #git
13:01 buddyq joined #git
13:04 IrishPrime joined #git
13:04 skunkz joined #git
13:05 e14 joined #git
13:06 shaggycat joined #git
13:07 Shentino joined #git
13:07 JeroenT joined #git
13:08 cdg joined #git
13:08 impermanence joined #git
13:10 CEnnis91 joined #git
13:11 jnavila_ joined #git
13:14 metabulation joined #git
13:17 markovh joined #git
13:18 JeroenT_ joined #git
13:24 jaguarmagenta joined #git
13:27 JeroenT joined #git
13:27 Rodya_ joined #git
13:27 danslo__ left #git
13:29 fuchstronaut joined #git
13:29 malcon joined #git
13:30 thebope joined #git
13:30 todd_dsm joined #git
13:31 berndl joined #git
13:32 ruby_ joined #git
13:32 berndl I'm trying to apply a patch using 'git am < the.patch' and I'm getting "fatal: empty ident name (for <>) not allowed"
13:32 sangy joined #git
13:32 grawity do you, as the committer, have user.name & user.email configured?
13:32 berndl I don't understand why it's saying empty ident name since I have my name set up in my global .gitconfig.
13:32 sebhoss joined #git
13:32 grawity ah
13:33 grawity does `git var -l` show it?
13:33 berndl Let me check.
13:33 grawity and does the patch itself have a "From:" line for the author's ident?
13:33 berndl Yes.
13:33 grawity since `git am` is only for full mbox patches; if it's a plain old diff you would use `git apply` (or just `patch`)
13:33 berndl Hmm.. I don't think the patch has that.
13:33 berndl Let me use git apply.
13:34 JeroenT joined #git
13:34 grawity basically `git am` consumes `git format-patch` output
13:34 berndl I see.
13:34 berndl Good to know. Thanks.
13:35 fmcgeough joined #git
13:36 danslo joined #git
13:36 EarthToAbigail joined #git
13:37 buddyq joined #git
13:37 grawity .o(might've made more sense to call them `git format-mbox` and `git apply-mbox`...)
13:38 JeroenT joined #git
13:39 flavius joined #git
13:40 harry1 joined #git
13:40 \du joined #git
13:43 griffindy joined #git
13:44 anonymuse joined #git
13:45 vincento joined #git
13:45 \du joined #git
13:45 \du joined #git
13:46 yohnnyjoe joined #git
13:46 boombatower joined #git
13:46 kadoban joined #git
13:47 fmcgeough joined #git
13:47 bernardio joined #git
13:50 brk_ joined #git
13:51 Learath2 joined #git
13:51 luke_penn joined #git
13:52 rnsanchez joined #git
13:52 Cyclohexane joined #git
13:52 jaguarmagenta joined #git
13:53 synthroid joined #git
13:54 modlin joined #git
13:54 mmlb_ joined #git
13:56 ruby_ joined #git
13:56 barteks2x joined #git
13:57 vuoto joined #git
13:58 bsanford joined #git
13:59 BinGOs joined #git
14:00 acetakwas joined #git
14:00 phaleth joined #git
14:01 jnavila_ joined #git
14:02 mischat joined #git
14:03 jaguarmagenta joined #git
14:06 skunkz_ joined #git
14:07 e14 joined #git
14:08 modlin_ joined #git
14:08 Learath2 joined #git
14:10 CheckDavid joined #git
14:12 lykinsbd joined #git
14:12 mmlb_ joined #git
14:13 sdlnv_ joined #git
14:13 ccapndave joined #git
14:13 govg joined #git
14:14 lykinsbd_ joined #git
14:14 ccapndave Hey, I'm not sure if this is the right place to ask, but I suspect that libgit2 is leaking memory (very possibly because of how I am using it through nodegit).  Does anyone know how I can check what references libgit2 is holding onto?
14:14 introx joined #git
14:14 ccapndave Please redirect me to another channel if this is the wrong place to ask :)
14:14 Noldorin joined #git
14:15 mischat joined #git
14:15 _ikke_ ccapndave: valgrind is the typical tool to see of memory is leaked
14:16 ShekharReddy joined #git
14:16 ccapndave Ok great
14:16 ccapndave I'm stepping into uncharted territory here :)
14:16 ccapndave Thanks
14:16 sonvh joined #git
14:17 ayjay_t joined #git
14:20 AaronMT joined #git
14:21 rivarun joined #git
14:23 star_prone joined #git
14:23 halbomin joined #git
14:24 yohnnyjoe joined #git
14:26 mischat_ joined #git
14:26 phanimahesh joined #git
14:26 Dougie187 joined #git
14:26 harry1 joined #git
14:26 introx joined #git
14:26 ResidentBiscuit joined #git
14:27 elect joined #git
14:27 ResidentBiscuit joined #git
14:27 Vmj joined #git
14:27 nilg joined #git
14:27 ResidentBiscuit joined #git
14:27 yohnnyjoe joined #git
14:29 matsaman joined #git
14:33 sssilver joined #git
14:33 madewokherd joined #git
14:35 jbeeze joined #git
14:37 jstimm joined #git
14:38 jottr joined #git
14:38 introx joined #git
14:38 JeroenT joined #git
14:38 introx_ joined #git
14:39 introx joined #git
14:39 sasori joined #git
14:40 raspado joined #git
14:41 sasori hi, i have a bad code in staging repo..now there are already other team mate how have pushed their own stories in staging, if I do a hard reset, all of the pushed codes on top of the tree will get wiped out. what's the best thing to do to remove my code in staging ?
14:41 Darren_ joined #git
14:41 harry1 left #git
14:41 twea joined #git
14:42 serycjon joined #git
14:42 ResidentBiscuit joined #git
14:42 bremner revert the commits
14:42 atomi joined #git
14:43 sasori you mean all the commits including the ones on top of my git hash? ..... or just `git revert my-own-git-hash` only ?
14:43 al-damiri joined #git
14:43 nopevms joined #git
14:43 yohnnyjoe joined #git
14:44 bremner just your commits.
14:44 bremner which ever ones introduced the bad code.
14:44 JeroenT joined #git
14:45 sasori ok, then what's gonna happen to the other git pushes above mine from the tree? are they gonna get affected ?
14:45 Andrew_K joined #git
14:45 _ikke_ no
14:45 JeroenT_ joined #git
14:45 bremner sasori: git revert makes new commits, which revert the changes. You then push them like any other commits
14:46 JeroenT joined #git
14:46 mischat joined #git
14:46 sasori ok, @bremner , so you mean to say, once i git revert my git hash, I can commit and push again like nothing happened earlier ?
14:47 eivarv joined #git
14:47 bremner more or less. you will have to deal with any conflicts when reverting.
14:48 bremner the bad code will stay in the history, but that's probably OK. it only affects people doing bisect.
14:49 sasori eh? ..it will still remain in the history, I thought once I revert, it's gone?
14:50 canton7 yep - <bremner> sasori: git revert makes new commits, which revert the changes
14:50 canton7 it's like you make a commit which adds the line "BAD LINE", then make another commit which removes that line again
14:51 sasori is my understanding correct ? =   I revert first, then commit/push to staging the new version of the bad code, and then ask others to pull it, ..is that the only way to clean it up?
14:53 dan2k3k4 joined #git
14:53 foist joined #git
14:54 markovh joined #git
14:54 yohnnyjoe joined #git
14:55 PCatinean_ joined #git
14:56 patarr joined #git
14:56 shinnya joined #git
14:56 ash_workz joined #git
14:57 frobnic joined #git
14:58 mrwat joined #git
15:00 malcon joined #git
15:00 roelmonn_ joined #git
15:01 gfixler joined #git
15:03 mischat_ joined #git
15:04 buddyq joined #git
15:04 GT4066 joined #git
15:04 mischat_ joined #git
15:04 patarr joined #git
15:07 buddyq joined #git
15:07 fmcgeough joined #git
15:07 a_thakur joined #git
15:08 dpower joined #git
15:08 moop joined #git
15:08 iota_pi joined #git
15:08 Endarked joined #git
15:11 aarobc joined #git
15:15 dreiss joined #git
15:16 chigang joined #git
15:16 Remramm joined #git
15:16 Remramm joined #git
15:17 nowhereman joined #git
15:18 skunkz joined #git
15:26 buddyq ive got a noobie question. How do I merge a branch with my master branch? Just locally and not with a remote repository?
15:26 HedgeMage !merge
15:26 gitinfo '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_r
15:26 buddyq ah. So not git pull
15:26 danslo_ joined #git
15:27 HedgeMage Right.
15:27 HedgeMage :)
15:27 Ryanar joined #git
15:30 israelzuniga_ joined #git
15:30 hashpuppy joined #git
15:30 joki joined #git
15:31 buddyq joined #git
15:31 buddyq okay. well, I got a crap ton of conflicts.
15:32 _ikke_ !eek :-)
15:32 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
15:32 buddyq how do I do a merge with theirs?
15:33 tyreld joined #git
15:33 buddyq how do I undo that merge attempt??
15:33 buddyq I want to do it again with -X theirs
15:33 ccapndave joined #git
15:33 overlord_tm joined #git
15:33 _ikke_ git merge --abort
15:34 ccapndave _ikke_: I used valgrind as you suggested and there is indeed a nasty memory leak in nodegit
15:34 ccapndave Thanks for the advice
15:34 _ikke_ np
15:34 _ikke_ Nice to see it helped
15:35 ccapndave I have another question if that's ok.  If I want to get the SHA of the current working copy from my node application, what would be the best way to do it?  I don't dare to use nodegit anymore :)  Should I run `git <something` as a process and get the output, or look at files in the .git directory or is there another way?
15:35 skift joined #git
15:36 parsnip joined #git
15:36 _ikke_ Best is to use the git command
15:36 fmcgeough joined #git
15:36 _ikke_ git rev-parse HEAD
15:36 ccapndave Ok, thanks again
15:36 _ikke_ That would give you the hash of the currently checked out commit
15:36 ccapndave That's what I want
15:37 buddyq automerging a bunch of files and then at the bottom it says: Automatic merge failed: fix conflicts and then commit the result. I thought thats what -X did?
15:37 ccapndave I'm about to implement a cache which needs to invalidate if the SHA has changed
15:37 ccapndave So I need to check it on every request (so it needs to be speedy)
15:37 sea-gull_ joined #git
15:37 einnjo joined #git
15:37 _ikke_ This should be quite fast
15:37 patarr joined #git
15:37 _ikke_ buddyq: what does git status say?
15:39 dlkd949fweijf joined #git
15:40 buddyq says up to date with origin/master and then lists a ton of files that are green that say modified: and some say deleted: and then has "Unmerged paths: and lists a few red files that say "deleted by them: <filename>"
15:40 soerenb_ joined #git
15:41 _ikke_ Right, that's a different kind of conflict
15:41 hfr joined #git
15:41 buddyq You have unmerged paths. (fix conflicts and run "git commit")
15:41 buddyq Is it safe to do a commit now??
15:41 netj joined #git
15:41 buddyq should I remove those 5 red files at the bottom with git rm --cached <filename>?
15:42 _ikke_ If you want them to be removed as a result, then yes
15:42 soerenb_ joined #git
15:42 buddyq also is there a way to do them all with one command? Wha if there were 40 files listed?
15:42 subhojit777 joined #git
15:42 danimal2 joined #git
15:42 _ikke_ combination of git ls-index and xargs git rm --cached
15:43 LeBlaaanc joined #git
15:43 thiago joined #git
15:43 buddyq it wont. IT says, needs merge. fatal: not removing '.' recursively without -r
15:44 davimore joined #git
15:45 jstimm joined #git
15:45 danimal2 left #git
15:47 buddyq fatal: Unable to create '/Applications/MAMP/htdocs/age​ntassets-sg/.git/index.lock': File exists.
15:47 soerenb_ joined #git
15:47 buddyq never got this before.... says probably means a git process crashed in this repositry earlier. Make sure no other git process is running...
15:49 govg joined #git
15:50 jstimm joined #git
15:51 buddyq it wont let me do anything to these files. It says "needs merge". What do I do?? I can't rm or rm --cached.
15:51 jast buddyq: yeah, it's a lock file. if you're sure no other git process is running, just delete index.lock and try again
15:51 buddyq i did that.
15:51 soerenb_ joined #git
15:51 jast and what's it saying now?
15:51 buddyq I got past that... but I cant do anything to these files. Says "needs merge".
15:51 jast oh, yeah
15:52 osse !eek
15:52 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-​2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
15:52 _ikke_ osse: It's a deleted by them conflict
15:52 dan2k3k4 joined #git
15:52 jast and you want it to stay deleted in your merge?
15:52 _ikke_ and I already showed that link
15:52 buddyq yes
15:53 jast if 'git rm' is giving you trouble, try 'git add' on the same file (counter-intuitively, I guess, but basically that says, "take the file as you see it" :))
15:53 ccapndave left #git
15:53 buddyq okay. Ill try that
15:53 fub joined #git
15:53 jast I think "git rm" ought to work in this situation, but meh
15:54 osse what does git rm say?
15:54 buddyq that seemd to work.
15:54 buddyq git rm said "needs merge
15:55 buddyq I added them all and then did a commit. Now it says working directory clean
15:55 roadrunneratwast joined #git
15:55 soerenb_ joined #git
15:58 dmarr I'm trying out git in a VM (ubuntu) and see this after a fresh install fatal: Unable to find remote helper for 'git+https'
15:58 israelzuniga joined #git
15:58 roadrunneratwast greetings git lovers.  I have not worked on this project in ages.  I am on BranchA and see that I am 43 commits ahead of master and 4 commits behind MASTER.  Something like that.  I would like to merge BranchA into Master but I would also like to see what those "4 commits behind master" are.  I remember I added some hot fixes to master and probably should add them to the final project.  What is the best wy to go about this?
15:58 dmarr I have libssl-dev and libcurl-openssl-dev installed before installing git
15:58 dmarr I have libssl-dev and libcurl4-openssl-dev installed before installing git
16:00 sorenb_ joined #git
16:01 sorenb_ joined #git
16:02 e14 joined #git
16:02 Ryanar joined #git
16:04 svm_invictvs joined #git
16:05 oskarkv joined #git
16:05 davimore joined #git
16:06 soerenb joined #git
16:07 ochorocho__ joined #git
16:10 _cyril_ joined #git
16:11 sammyo joined #git
16:13 nettoweb joined #git
16:14 rendar joined #git
16:14 neilthereildeil joined #git
16:14 moritz roadrunneratwast: git log master, the first four commits are the ones you're looking for
16:14 roadrunneratwast wow
16:14 roadrunneratwast udaman
16:14 roadrunneratwast thanks
16:15 neilthereildeil if i exported a bunch of remote patches using "git format-patch", how can i replay them into my local git repo preserving the commit messages and developers name etc?
16:15 moritz neilthereildeil: git am
16:15 neilthereildeil but i dont have a mailbox. its just .patch files in my folder
16:15 soerenb joined #git
16:17 cyan__ joined #git
16:17 synthroid joined #git
16:17 neilthereildeil moritz: i just ran git am with the .patches in my folder and it hangs...
16:18 moritz neilthereildeil: specify the names at the command line
16:18 steve joined #git
16:18 soerenb joined #git
16:18 synthroi_ joined #git
16:18 moritz neilthereildeil: git am 00*.patch for example
16:18 neilthereildeil ahh ok
16:18 EvilPenguin joined #git
16:18 jottr joined #git
16:18 neilthereildeil and this is the way that everyone in the Linux kernel mailing list keeps their local repos up to date with eachothers?
16:19 moritz neilthereildeil: uhm, I think they have some repos where they pull from each other too
16:19 sorenb joined #git
16:19 neilthereildeil i get an error Stray .git/rebase-apply directory found.
16:20 lindenle joined #git
16:20 ojacobson if you have loose patches, you want `git apply`, not `git am`
16:20 moritz neilthereildeil: maybe abort your previous rebase?
16:20 moritz git rebase --abort
16:20 ojacobson `am` is for ingesting mbox and maildir patches
16:20 moritz or delete the dir
16:20 neilthereildeil ojacobson: whats a "loose patch"?
16:21 ojacobson A file that begins with a patch chunk header, or with free text followed by a patch chunk header
16:21 moritz ojacobson: iirc this is about patches generated by git format-patch
16:21 GenZai joined #git
16:21 blackwind_123 joined #git
16:22 rbern joined #git
16:23 crayon joined #git
16:23 kyan joined #git
16:23 sorenb joined #git
16:23 mohabaks joined #git
16:24 a_thakur joined #git
16:24 NitroLux joined #git
16:24 mohabaks hello folks what's a good guide or ebook for understanding git
16:24 Ryanar joined #git
16:24 osse !book
16:24 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
16:24 sorenb joined #git
16:25 rgrinberg joined #git
16:25 neilthereildeil git apply --check 0001 passes with no error, but git am 0001 gives an error
16:25 neilthereildeil any ideas?
16:25 mohabaks osse: thanks
16:25 gtristan joined #git
16:25 neilthereildeil it says patch failed, does not apply
16:26 neilthereildeil when i do am
16:26 aard_ joined #git
16:26 israelzuniga joined #git
16:27 ruby_ joined #git
16:27 Ryanar joined #git
16:28 ruby_ joined #git
16:29 pumafied joined #git
16:30 publio joined #git
16:30 hanthings joined #git
16:30 vannorden joined #git
16:31 roentgen joined #git
16:32 thierryp joined #git
16:32 Balliad joined #git
16:34 tax joined #git
16:34 nitric joined #git
16:38 anotheryou joined #git
16:39 durham joined #git
16:39 mikecmpbll joined #git
16:40 akkad joined #git
16:42 cagedwisdom joined #git
16:42 fub joined #git
16:44 ruby_ joined #git
16:46 grayjoc joined #git
16:47 SteffanW joined #git
16:47 diogenese joined #git
16:48 Ryanar joined #git
16:49 durham joined #git
16:49 synthroid joined #git
16:50 durham_ joined #git
16:53 _cyril_ joined #git
16:54 patarr joined #git
16:54 vannorden joined #git
16:55 skunkz joined #git
16:57 DeltaHeavy joined #git
16:57 svm_invictvs joined #git
16:58 jstimm joined #git
16:59 xall joined #git
17:00 drizztbsd joined #git
17:03 gfixler joined #git
17:04 aswen joined #git
17:04 jstein_ joined #git
17:06 kpease joined #git
17:07 lmat joined #git
17:07 raijin joined #git
17:08 parsnip0 joined #git
17:10 peepsalot joined #git
17:10 mischat joined #git
17:11 Andrew_K joined #git
17:12 dreiss joined #git
17:13 SwiftMatt joined #git
17:14 Andrew_K joined #git
17:15 anotheryou joined #git
17:15 LionsMane joined #git
17:17 mischat joined #git
17:17 mischat joined #git
17:18 Oebele joined #git
17:19 DopeMeston joined #git
17:20 jbitdrop joined #git
17:27 fuchstronaut joined #git
17:28 mibr0_ joined #git
17:28 mibr0 joined #git
17:29 mibr0 joined #git
17:29 ocbtec joined #git
17:29 elastix joined #git
17:35 sssilver joined #git
17:36 dsantiago joined #git
17:36 EvilPenguin joined #git
17:39 parsnip0 joined #git
17:39 LionsMane joined #git
17:40 serycjon joined #git
17:41 markovh joined #git
17:41 JamesBaxter joined #git
17:41 patarr joined #git
17:44 bongjovi joined #git
17:47 fatalhalt joined #git
17:47 LeBlaaanc joined #git
17:50 joki joined #git
17:51 ldlework Hello. I had Branch A, and then Branch B from A. I worked a lot on B, but then had to attend to some work on A. So I stashed a bunch of changes on B. Did some work on A. I went back to B and rebased ontop of A. Then I tried to stash pop my changes back to B.
17:51 ldlework Now things are extremely broken, with git telling me that files are both modified and deleted.
17:51 ldlework And I don't know what's going on.
17:51 ldlework How can I get B to back before the rebase, with the stash preserved
17:51 ldlework So I can pop the stash, commit, then rebase ontop of A?
17:52 _ikke_ git log -g branch_b
17:52 peeps[lappy] joined #git
17:52 _ikke_ It should give you a log of where branch_b pointed to
17:53 ldlework _ikke_: yeah I see a relevant commit
17:53 ldlework do I just reset hard to that commit?
17:53 ldlework But isn't that commit been rebased ontop of A?
17:54 impermanence joined #git
17:55 DopeMeston joined #git
17:55 ldlework _ikke_: do you know?
17:55 impermanence If I'm making changes to several files in a directory, should I "git add" after each change or "git add" when I'm done with all of my changes?
17:56 SwiftMatt joined #git
17:57 xall joined #git
17:59 serycjon impermanence: whenever you want... Whenever you do git add, you add the current state of the file to be commited later. You can even git add and edit the file again and only the part before adding will be staged for commit
17:59 nedbat impermanence: when you git add doesn't really matter. What matters is when you commit.
17:59 impermanence okay, thanks.
18:00 markovh joined #git
18:00 Sasazuka joined #git
18:01 impermanence I know that after I commit my changes on the branch I'm working on, then I can push to that remote branch.  However, if I create a tag, to "freeze" that state in the branch, do I have to then push the tag to the remote as well?  Or will my tag be automatically pushed when I push my branch?
18:01 impermanence push the tag to the remote repo, that is.
18:02 impermanence if my question makes sense?  sorry.
18:03 nowhereman joined #git
18:03 ahmed_elgabri joined #git
18:05 anotheryou joined #git
18:06 IlNominePatre joined #git
18:06 vannorden joined #git
18:07 mohabaks joined #git
18:08 Derperperd joined #git
18:08 pumafied joined #git
18:08 pumafied joined #git
18:08 Fomina joined #git
18:09 Walex impermanence: tags are just symbolic links
18:10 Walex impermanence: sort-of... they are just names for commits.
18:10 joki joined #git
18:10 Walex impermanence: you can also push commit names/labels if you want.
18:11 impermanence Walex: okay, thanks.  So when I am done changing my branch and I take a "tag" of that branch, I need to push the both the branch changes AND the tag, right?
18:11 Walex impermanence: can't remember whether that is done automatically for you or not.
18:11 impermanence Walex: k.
18:11 Walex impermanence: IIRC it depends on the exact command and options that you use
18:11 impermanence Walex: ty.
18:12 impermanence Walex: k.
18:12 corsibu joined #git
18:12 corsibu joined #git
18:12 Walex impermanence: 'man git-push' has a title that says: "Update remote refs along with associated objects"
18:12 gitinfo impermanence: the git-push manpage is available at http://jk.gs/git-push.html
18:13 impermanence Walex: oh, yeah, so that probably includes tags, huh?
18:13 Walex those are the "refs"
18:14 pumafied joined #git
18:14 Walex impermanence: the '--mirror' option also says: "Instead of naming each ref to push, specifies that all refs under refs/"
18:14 sea-gull joined #git
18:14 impermanence Walex: so --mirror is a way to push everything at once?
18:14 Walex impermanence: also note the slightly differennt behaviour of '--tags' that pushes only the tag references.
18:15 Walex impermanence: perhaps you want to do '--follow-tags'
18:15 durham joined #git
18:16 impermanence Walex: hm, okay, I will look at --follow-tags.  I will review git push --help, too, I guess ;)
18:17 serycjon joined #git
18:18 sssilver joined #git
18:19 einnjo joined #git
18:23 impermanence Walex: If I git add file and then change that file again and then git add that file again...when I commit that file...both the changes will be present, right?
18:23 kadoban impermanence: Yes (also ... try it, you'll remember better)
18:24 impermanence kadoban: you're right.  I will be trying it momentarily.
18:25 Macaveli joined #git
18:28 hariel joined #git
18:28 idmistir_ joined #git
18:29 rbern joined #git
18:29 Wulf joined #git
18:30 idmistir joined #git
18:30 Uioa2 joined #git
18:30 jottr joined #git
18:30 serycjon joined #git
18:32 metrixx joined #git
18:33 dviola joined #git
18:34 parsnip0 joined #git
18:38 emg joined #git
18:39 peterR`` joined #git
18:40 jaguarmagenta joined #git
18:40 joki joined #git
18:41 WhiskerBiscuit joined #git
18:43 patarr joined #git
18:44 Rodya_ joined #git
18:46 Sasazuka joined #git
18:49 blackwind_123 joined #git
18:49 jjasinski joined #git
18:49 stomplee joined #git
18:52 fub joined #git
18:53 vuoto joined #git
18:54 sssilver joined #git
18:57 lykinsbd joined #git
18:57 pumafied joined #git
18:58 DopeMeston joined #git
18:58 durham joined #git
18:59 realz_ joined #git
18:59 Limes_ joined #git
19:04 jottr joined #git
19:05 LeBlaaanc joined #git
19:09 lungaro can I use git config as an arbitrary data store?
19:09 lungaro i mean for random crap like issue aliasing
19:09 kadoban issue aliasing?
19:10 _ADN_ joined #git
19:10 _ikke_ Git ignores keys it does not know about
19:10 joki joined #git
19:11 bremner but hard luck for you if it starts using some key
19:11 _ikke_ If you namespace it, the chance is small
19:11 grawity lungaro: sure, many apps do it
19:11 kadoban I'm not sure it's a great idea to add a *lot* of stuff there, or anything random since yeah, if it starts overlapping with something used ...
19:11 kadoban But otherwise, yeah should be fine.
19:11 realz joined #git
19:11 lungaro sweet
19:11 _ikke_ just use lungaro.myconfig and you'll be fine
19:11 TomyLobo joined #git
19:11 lungaro cool
19:11 _ikke_ or something similar
19:12 lungaro thanks. I thought so, it just kinda occured to me randomly
19:12 ShapeShifter499 joined #git
19:14 finalbeta joined #git
19:14 cagedwisdom joined #git
19:14 Hello71 joined #git
19:16 danlovesppipes joined #git
19:17 vannorden joined #git
19:18 e14 joined #git
19:19 jaguarmagenta joined #git
19:21 DeltaHeavy joined #git
19:21 sunri5e joined #git
19:22 johnmilton joined #git
19:23 Sasazuka joined #git
19:24 rudi_s joined #git
19:28 eshlox joined #git
19:33 dk0r joined #git
19:34 manuels joined #git
19:37 pR0Ps joined #git
19:37 lungaro can I unset and add in one shot?
19:37 lungaro i guess I can have two commands.
19:38 danlovesppipes joined #git
19:39 littleforest joined #git
19:40 joki joined #git
19:40 mischat joined #git
19:41 Spec-Chum joined #git
19:42 _cyril_ joined #git
19:49 tvw joined #git
19:50 b100s joined #git
19:50 mspo joined #git
19:50 mspo I am getting this from gitk on osx: Error in startup script: unknown color name "lime"
19:50 mspo I just did a s/lime/green and it works
19:50 mspo sorry if this is a known bug
19:51 fub left #git
19:52 sea-gull joined #git
19:54 eivarv joined #git
19:54 ash_workz anyone know what version graph generator thingy is
19:54 ash_workz ?
19:54 ash_workz what version of dot I mean
19:55 ash_workz graphviz* I guess
19:58 hahuang65 joined #git
19:59 SwiftMatt joined #git
19:59 dviola joined #git
19:59 crayon joined #git
19:59 fuchstronaut joined #git
19:59 _ikke_ ash_workz: where?
20:00 _ikke_ ash_workz: the one from jk.gs?
20:00 ash_workz yup[
20:00 _ikke_ You have to ask Jast
20:00 ash_workz jast: !
20:01 ash_workz jast: ^
20:01 solrize joined #git
20:03 nikivi joined #git
20:05 cdg joined #git
20:06 ash_workz I was hoping style="tapered" and that it's just my ignorance holding me back
20:08 ash_workz looks like I'll be able to mimic it :)
20:08 ash_workz .digraph a->b [arrowhead="inv" arrowsize="3"]
20:08 gitinfo .digraph: http://g.jk.gs/Au.png
20:09 sunri5e joined #git
20:09 osse That's the second worst arrow head I've ever seen
20:09 ash_workz not perfectly of course, but it gets the point across
20:09 ash_workz osse: really? I thought it was genius!
20:09 ash_workz :\
20:10 osse it was a joke :p
20:10 fedepad joined #git
20:10 osse but seriously it's way to large
20:10 ash_workz oh!
20:10 osse and too black (no offense)
20:10 ash_workz heh
20:10 ash_workz nice pun
20:10 joki joined #git
20:10 osse hahaha
20:10 ash_workz but it does mimic tapered, right?
20:11 patarr joined #git
20:13 DopeMeston joined #git
20:13 mspo left #git
20:13 ash_workz .digraph subgraph cluster_a{ component }; b [shape="record" label="this|{is|whats|inside}|that|component"]; a->b [arrowhead="inv" arrowsize="3"]
20:13 gitinfo .digraph: http://g.jk.gs/Av.png
20:14 ash_workz .digraph subgraph cluster_a{ component }; b [shape="record" label="this|{is|whats|inside}|that|component"]; component->b [arrowhead="inv" arrowsize="3"]
20:14 gitinfo .digraph: http://g.jk.gs/Aw.png
20:14 ash_workz .digraph subgraph cluster_a{ component; other; stuff }; b [shape="record" label="this|{is|whats|inside}|that|component"]; component->b [arrowhead="inv" arrowsize="3"]
20:14 gitinfo .digraph: http://g.jk.gs/Ax.png
20:14 ash_workz +1 for me
20:14 ash_workz :D
20:16 ash_workz for the record, I don't know why "component other stuff" was reversed in layout...
20:16 ash_workz ¯\_(ツ)_/¯
20:17 Sasazuka joined #git
20:17 Learath2 joined #git
20:21 e14 joined #git
20:32 impermanence Does git commit automatically add *all* of my adds...or...?
20:33 osse impermanence: none
20:33 impermanence In other words, I only have to commit once to catch all of my changes, right?
20:33 impermanence osse: Say I've made a bunch of adds.  I then only have to commit once, right?
20:33 osse yes
20:34 osse commit grabs whatever you've added up until now
20:34 hahuang61 joined #git
20:34 impermanence thank you.
20:34 impermanence osse: It's possible to roll a branch back from a tag, correct?
20:35 impermanence osse: roll a branch back to a particular tag is what I mean.
20:35 osse yes
20:35 ochorocho__ joined #git
20:36 star_prone joined #git
20:36 osse depends a bit on what you mean by "roll back". but both ways I imagine you mean are possible
20:40 joki joined #git
20:42 patarr joined #git
20:44 EvilPenguin joined #git
20:45 zeroed joined #git
20:45 mspo joined #git
20:45 mspo left #git
20:46 impermanence osse: I mean if I have a branch that I jack up but a tag with a previous known good state, I can use that tag to put my branch back to a known good state, yeah?
20:46 dmarr how would i update a gitmodule's url to a https:// url instead of git://
20:49 ahr3n joined #git
20:49 dodobrain joined #git
20:51 Vinnie_win joined #git
20:52 BlessJah joined #git
20:52 osse impermanence: yes
20:52 _ikke_ update it in .gitmodules and then run git submodule sync
20:52 mozzarel1 joined #git
20:53 osse impermanence: you can either nuke all future commits so that it's as if the tag was the latest thing that happened, or you can make a new commit that restores the branch to be equal to the tag
20:53 osse that's the two ways I had in mind
20:53 dodobrain joined #git
20:53 impermanence osse: okay.  So...is it possible to "checkout" a tag?
20:55 _ikke_ When you checkout a tag, you will checkout the commit pointed to by that tag
20:56 _ikke_ You can reset a branch back to a tag
20:56 _xor joined #git
20:56 EvilPenguin joined #git
20:56 impermanence +_ikke_: thank you.
20:56 impermanence I have to hop on a plane, but I appreciate the insights!
20:57 GavinMagnus left #git
20:59 jancoow joined #git
21:00 AaronMT joined #git
21:00 pumafied joined #git
21:01 jancoow Hi. For some reason there is a branch named "origin/refs/heads/Library-scanner" on my git / github. But i'm unable to delete this branch
21:01 jancoow nor through the github web interface and command line
21:01 danlovesppipes joined #git
21:01 jancoow error: unable to delete 'origin/refs/heads/Library-scanner': remote ref does not exist
21:01 isysd joined #git
21:02 jancoow how can i remove this branch
21:03 jancoow left #git
21:05 mountpoint joined #git
21:06 HoierM joined #git
21:08 jstimm joined #git
21:09 Tykling joined #git
21:09 nowhereman joined #git
21:10 _ikke_ git push --delete origin Library-scnaner
21:10 _ikke_ git push --delete origin Library-scanner
21:11 _ikke_ Oh, already left
21:11 Tykling so I have this github repo (A) where I added another repo (B) as a submodule, I have git clone'd repo A but not init'ed B, now I need to update the version of B I am pointing to in A, is that possible without init'ing the submodule?
21:12 cyan__ joined #git
21:12 _ikke_ Tykling: perhaps with git update-index
21:15 ayjay_t joined #git
21:16 _ikke_ Tykling: printf "160000 %s 0\t%s" <commit> <path> | git update-index --index-info
21:17 _ikke_ something like that
21:17 grayjoc joined #git
21:17 Tykling _ikke_: o.O
21:18 nettoweb joined #git
21:19 Remramm `git update-index --add --cacheinfo 100644 <commit> <path>`
21:19 Remramm is probably more readable
21:19 _ikke_ Remramm: It's about a submodule
21:20 _ikke_ not a file
21:20 Tykling why doesn't git submodule foreach ... just work like it normally does :P
21:20 Tykling apparently it only works with init'ed submodules
21:21 _ikke_ Tykling: I think it relies on the submodules listed in the config
21:21 Tykling but they are in .gitmodules
21:21 _ikke_ which are not present when the submodule is not inited
21:22 Remramm ikke: should work I think
21:22 Tykling all the needed information is present, I can hack this up in a shell script by parsing .gitmodules, but it wont be pretty
21:22 _ikke_ "Evaluates an arbitrary shell command in each checked out submodule."
21:22 _ikke_ Remramm: for one, you specified the wrong mode
21:22 anonymuse joined #git
21:22 _ikke_ 160000 for gitlinks
21:22 Remramm hmm yes
21:23 _ikke_ Remramm: And doesn't that expect there to be a file?
21:23 _ikke_ Tykling: git config could be used to parse .gitmodules
21:24 _ikke_ From the documentation, it looks like --cacheinfo want to read files into the index
21:24 _ikke_ not sure how it handles empty dirs which are paths for submodules
21:28 Tykling it easier to just init and download the 800 megs code to update it lol
21:29 _ikke_ You sure?
21:30 whitby joined #git
21:31 Tykling _ikke_: well I am already back to coding now instead of reading about git index files so yes
21:31 aidalgol joined #git
21:31 Tykling not optimal, but you gotta pick your fights :) I was just checking to see if I overlooked some option for git submodule that could do what I wanted
21:37 Balliad joined #git
21:37 anotheryou_ joined #git
21:39 gfixler joined #git
21:42 lykinsbd joined #git
21:42 grumble joined #git
21:43 anuxivm joined #git
21:45 Rodya_ joined #git
21:46 dax joined #git
21:46 anotheryou__ joined #git
21:48 e14 joined #git
21:51 mischat joined #git
21:51 anotheryou joined #git
21:52 patarr joined #git
21:54 nikivi joined #git
21:56 cdown_ joined #git
21:57 anonymuse joined #git
22:01 nowhereman joined #git
22:02 cdown_ joined #git
22:02 fatalhalt joined #git
22:02 fahadash joined #git
22:03 ahr3n joined #git
22:04 hdon_ left #git
22:04 GavinMagnus joined #git
22:05 xall joined #git
22:06 giovo joined #git
22:06 giovo left #git
22:07 impermanence joined #git
22:07 mischat joined #git
22:09 impermanence Is there a good command to commit branch changes and a tag at the same time?
22:09 netj joined #git
22:10 a3Dman joined #git
22:11 endiruna joined #git
22:18 GavinMagnus left #git
22:19 patarr joined #git
22:20 jottr joined #git
22:20 ISmithers joined #git
22:21 fxer joined #git
22:22 thiago joined #git
22:22 sangy joined #git
22:24 anotheryou_ joined #git
22:25 yohnnyjoe joined #git
22:26 thiago joined #git
22:26 osse no
22:26 osse there isn't a bad one either
22:26 osse but you can create one by writing a small script or make an alias
22:26 nidr0x joined #git
22:27 buddyq I updated my master from my branch and then I made a change on the master instead of the branch. So I committed the changes to master. Now I want to update my branch with the new master changes. How do I do that?
22:27 skyfaller joined #git
22:27 buddyq do I checkout my branch and then do a merge?
22:28 osse git checkout mybranch; git merge master
22:29 buddyq cool. worked.
22:29 buddyq So now I want to push this branch to my github. i'm not sure if github has this branch. What should I do?
22:29 osse whether it already has it or not doesn't affect how you use the push command
22:30 buddyq okay, it has the branch. I can see it on github
22:30 buddyq so, how do I push everything to github?
22:30 madewokherd joined #git
22:31 osse "everything" = all branches?
22:32 buddyq yes. And if there are conflicts I want mine to be used.
22:33 osse git push --all origin
22:33 osse replace origin with whatever is the name of the remote that points to github
22:33 Gsham joined #git
22:33 buddyq it is origin that points to github.... will this make sure conflicts are taking my changes?
22:33 osse nope
22:33 cdown joined #git
22:33 osse let's burn that bridge when we get to it
22:34 buddyq ok
22:34 osse when you push there is no conflict resolution. either the push is accepted or it isn't.
22:35 tchan joined #git
22:35 buddyq happened pretty fast....
22:35 buddyq Total 0 (delta 0), reused 0 (delta 0)
22:35 buddyq 5c7cffc..48e0eb6  Buddys_branch -> Buddys_branch
22:36 buddyq this right?
22:36 osse is there an equivalent line for master?
22:36 buddyq osse, no.
22:37 buddyq i see my new files on github though
22:37 buddyq weird.
22:37 buddyq i thought i would see both branches.
22:37 littleforest joined #git
22:37 osse run 'git branch'
22:37 osse what do you see
22:37 buddyq I have github desktop too and it shows 143 changes...
22:38 buddyq I see two branches. Buddys_branch and *master
22:39 osse did you use --all ?
22:39 buddyq yea
22:39 osse then I guess master was up to date
22:40 buddyq here's a question...
22:40 osse and since presumably Buddys_branch and master are now equal there is actually no need to push anything
22:40 osse just update the reference and done
22:40 buddyq when I git checkout Buddys_branch it says 'Your branch is ahead of host/Buddys_branch by 21 commits.
22:40 buddyq Host = my web server.
22:41 buddyq how can I change that to origin?
22:41 osse git branch -u origin/Buddys_branch
22:43 buddyq done.
22:46 thebope joined #git
22:47 Rodya_ joined #git
22:49 buddyq okay, so. baby steps! geez...
22:49 buddyq now, I have a webhook in my github that calls github.php in my directory when I push to github. I want this github.php to git pull the new changes to the site.
22:50 buddyq this is what I have in there right now: <?php 'git fetch; git reset --hard origin/master';
22:50 osse deja vu all over again
22:50 buddyq is this correct?
22:50 buddyq :)
22:52 buddyq doing git remote -v I named my remote "github" and not origin from my host side
22:53 nidr0x joined #git
22:53 alex1a joined #git
22:55 osse I don't know how github hooks work
22:55 osse but if it somehow makes the host thingy run 'git fetch; git reset --hard origin/master' in the correct directory it should be ok
22:58 osse buddyq: ahh, if you named it github then use reset --hard github/master
22:58 M64137[m] joined #git
22:58 buddyq ok
22:58 dyek joined #git
22:58 osse is that a php script? is that how you run external commands from php o_O
22:58 tjone270 joined #git
22:59 buddyq i guess
22:59 buddyq found it in a tutorial somewhere.
23:00 Skryll joined #git
23:01 tjone270 joined #git
23:01 dyek Hi! How can I get out of this issue with near minimal deletion of corrupted files, before git fetch from remote (local git repo is on a slow Flash-based disk)?: fatal: Unexpected tail checksum for .git/objects/pack/tmp_pack_... (disk corruption?) fatal: index-pack failed
23:02 Eugene dyek - that indicates on-disk corruption of the repo. man git-fsck
23:02 gitinfo dyek: the git-fsck manpage is available at http://jk.gs/git-fsck.html
23:02 Eugene You *may* be able to recover by rsync-ing the objects/ dir from a "good" clone, but if the disk is failing then you should toss the fucker out the window anyway
23:03 tvw joined #git
23:03 Eugene How much un-pushed work do you have? ;-)
23:03 dyek Eugene: git fsck and git gc is inadequate for this condition. I always needed to do "rm -rf .git/objects/*" before I could recover from it. I'm looking for a smaller delete that might resolve the issue.
23:04 buddyq okay, so git fetch github from my host asks for the password to the id_rsa key everytime.
23:04 dyek Eugene: No un-pushed work.
23:04 jstimm joined #git
23:04 Eugene Then you've already gotten through the process and are just as familiar with it as I am ;-)
23:05 dyek Eugene: I see. Thanks anyway!
23:05 Eugene Backing up a step, 1) why not get storage that doesn't corrupt? and 2) is re-cloning a non-trivial task? Do you accidentally have a 10GB repo somehow?
23:05 osse buddyq: either make a new key without a passphrase or use http which should be good enough
23:05 anuxivm joined #git
23:05 buddyq wont http ask for user/pass?
23:06 osse not if it's a bog-standard repo
23:06 dyek Eugene: It is an Android Phone mounted on a Linux PC. Git runs on Linux PC.
23:06 osse if it's a private one i suppose it will
23:06 buddyq what is that?
23:06 buddyq it's a private repo
23:07 Eugene dyek - ah, so you're crazy like me. I like it. Sorry, I don't have any better advice.... personally I just SSH to a "real" linux box that doesn't break weirdly
23:07 Eugene And avoid the issue entirely
23:07 Eugene What git client are you using on Android, anyway?
23:07 Eugene Last I saw nobody had made one that could commit so it was a bit useless
23:09 mischat joined #git
23:09 dyek Eugene: I'm not using git client on Android. Git runs on Linux PC. The disk storage is remote and thus slow, hence all the possible corruption. I think if git can be made to write to disk slower (rate control), I might be able to have less corruption.
23:09 Eugene Ah.
23:10 Eugene Well that's even crazier. There is no mechanism in git for write-limiting.... and I really think that you've built a house-of-cards here. But I must know more, so please continue.....
23:12 dyek Eugene: You must have a rooted Android phone, so you have "real" Linux phone. I don't, so Android git client that put repo in Data Dir is not as convenient for direct remote access. git commit on the small phone interface can be limiting. I didn't bother to actually try it out.
23:15 ochorocho__ joined #git
23:15 buddyq okay... doing the manual fetch that my github.php would do. I put in git fetch github and enter the password. It gives me the correct hash and says cool beans. Then I do the git reset --hard github/Buddys_branch and it then says HEAD is now at <hash> and the messsage. I can see those changes. However, I missed some changes from a few pushes ago where I added some files and code.
23:16 buddyq I don't know what the reset does but it seems like it only updates certain things?? Why did it miss some files?
23:17 rbern joined #git
23:23 osse buddyq: It doesn't update only certain things.
23:23 osse buddyq: The probability is about 1:56658128 in favor of you missing something rather than git
23:24 osse the reset makes the files on disk identical to the commit given, in this case github/master, which should be fully updated after the fetch
23:27 Eugene That's a very arbitrary number
23:28 osse It just looks that way.
23:28 ShapeShifter499 joined #git
23:28 osse But I can assure you I smeared my hand over the keyboard with high precision and elegant grace
23:29 Andrew_K joined #git
23:30 ResidentBiscuit joined #git
23:30 drmt joined #git
23:30 Gsham_ joined #git
23:33 e14 joined #git
23:34 netj joined #git
23:34 buddyq osse:  I'll be back. Changing locations.
23:37 pouet joined #git
23:38 SJr joined #git
23:40 dwmw2_gone joined #git
23:40 Sasazuka__ joined #git
23:40 tlab joined #git
23:41 Tfuo joined #git
23:43 jimi_ joined #git
23:43 arescorpio joined #git
23:46 dsdeiz joined #git
23:46 thebope joined #git
23:48 hashpuppy joined #git
23:48 howitdo joined #git
23:48 Rodya_ joined #git
23:50 barteks2x joined #git
23:50 Rodya__ joined #git
23:52 CEnnis91 joined #git
23:52 hahuang65 joined #git
23:54 nidr0x joined #git
23:59 buddyq joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary