Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-05-04

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

All times shown according to UTC.

Time Nick Message
00:03 menip joined #git
00:07 mquin joined #git
00:11 masuberu joined #git
00:12 t-mart joined #git
00:17 aw1 joined #git
00:19 fission6 joined #git
00:20 onehrxn joined #git
00:20 nd_ joined #git
00:21 Iacobus joined #git
00:21 Awesomecase joined #git
00:22 cagomez joined #git
00:26 blunaxela joined #git
00:27 gopar joined #git
00:28 malide joined #git
00:28 fstd_ joined #git
00:29 cqi joined #git
00:29 durham_ joined #git
00:31 bitmod joined #git
00:32 bilal joined #git
00:36 brent__ joined #git
00:37 NeXTSUN joined #git
00:37 ahrs joined #git
00:38 lamont joined #git
00:39 spark` joined #git
00:41 ananteris joined #git
00:43 sunri5e joined #git
00:43 nick123 joined #git
00:47 Cabanossi joined #git
00:48 pbrewczynski_c joined #git
00:50 gugah joined #git
00:51 Gunni joined #git
00:51 kadoban joined #git
00:52 SantaClauze joined #git
00:58 PresidentBiscuit joined #git
00:58 kadoban joined #git
01:03 venmx joined #git
01:04 scoobertron joined #git
01:04 MattMake_ joined #git
01:05 xco left #git
01:05 PaulCape_ joined #git
01:05 duderonomy joined #git
01:07 PioneerAxon joined #git
01:09 neunon joined #git
01:09 MattMake_ joined #git
01:10 druonysus_ joined #git
01:11 jeffreylevesque joined #git
01:11 mel00010 joined #git
01:11 d^sh joined #git
01:14 moei joined #git
01:15 Stumbler joined #git
01:19 Goplat joined #git
01:20 finalbeta joined #git
01:21 rominronin joined #git
01:21 kadoban joined #git
01:22 PresidentBiscuit joined #git
01:23 roelmonnens joined #git
01:24 jaziz joined #git
01:25 a3Dman joined #git
01:29 phase2 joined #git
01:30 duderono_ joined #git
01:34 b0nn joined #git
01:35 b0nn so, I'm about lose a heap of work
01:35 b0nn can someone help?
01:35 b0nn I had some work, I stashed it, I was instructed to create a new branch at a different point, so I checked out the commit where I was to create a branch
01:36 b0nn I unstashed my changes and there were some messages about deleting files etc
01:37 b0nn so I panicced and did a git reset HEAD
01:37 b0nn and stopped there because I realised I was in danger of losing a heap of work
01:37 b0nn how do I get to a point where I'm not having to redo my work?
01:39 b0nn or is it already too late?
01:40 ssmall joined #git
01:40 dandaman1 joined #git
01:42 sunri5e joined #git
01:47 kadoban b0nn: A little unclear what work you're missing. The stashed work ? Something else?
01:47 b0nn kadoban: so the work that was stashed, then unstashed
01:47 texasmynsted joined #git
01:47 b0nn has that gone because I did a git reset HEAD
01:47 __kerwincsc__ joined #git
01:47 b0nn what happens if I do a git reset HEAD{1}
01:47 kadoban b0nn: Ah, you should be in luck then. Did you pop the stash, or just "apply" it? If you just applied it, it'll still be there. If you popped it, check in 'git reflog stash'
01:47 b0nn popped
01:50 ilbot3 joined #git
01:50 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:52 b0nn kadoban: what happens if I do git reset 'HEAD@{1}'
01:53 thebadshepperd joined #git
01:54 Serus joined #git
01:54 kadoban Too lazy to figure it out right this second, sorry.
01:55 dandaman joined #git
01:55 kadoban Oh wait, that should be 'git reset --mixed', so it'll change ... the index but not the working tree to match what your HEAD was one change ago
01:55 kadoban I don't think that'd cause you to lose work ever, unless you'd staged stuff, but not commited it
01:57 TbobbyZ joined #git
01:57 b0nn I ran git reset 'HEAD@{1}'
01:58 b0nn am doing a git diff to see what the damage is
01:58 kadoban Yeah, that should not have modified your working tree at all, in other words the files themselves should not in any way be modified by that.
02:00 b0nn I think the problem was caused by me going to a committ that was further back than the contents of the files, that is, there are changes that were made in between
02:00 bannakaffalatta joined #git
02:00 dermoth joined #git
02:01 kadoban If all you did is that reset, you will have lost absolutely no work (unless it was staged but not commited), your files will be unchanged. Even if you had staged content that is now missing, you sholud be able to recover that as well.
02:02 Vortex34 joined #git
02:04 ahrs joined #git
02:04 dreiss joined #git
02:07 PresidentBiscuit joined #git
02:09 tsdev joined #git
02:09 chachasmooth joined #git
02:14 jameser joined #git
02:15 bilal_ joined #git
02:18 a3Dman joined #git
02:19 bilal joined #git
02:22 Stumbler joined #git
02:24 bilal joined #git
02:25 menip joined #git
02:27 zacts joined #git
02:30 Burgerz joined #git
02:33 Ryanar joined #git
02:37 fish3485 joined #git
02:40 wcstok joined #git
02:42 MattMaker joined #git
02:43 hexagoxel joined #git
02:44 nick123 joined #git
02:44 preyalone joined #git
02:46 duderonomy joined #git
02:48 a3Dman joined #git
02:48 aw1 joined #git
02:50 dandaman joined #git
02:51 Stumbler joined #git
02:53 rominronin joined #git
02:54 lagothri1 joined #git
02:56 ddavidd joined #git
02:56 ddavidd joined #git
02:56 ddavidd joined #git
02:56 dandaman joined #git
02:58 a3Dman joined #git
02:59 Vortex35 joined #git
02:59 nixdork joined #git
03:00 dandaman1 joined #git
03:00 elsevero joined #git
03:01 aavrug joined #git
03:02 Lunatrius` joined #git
03:02 TikityTik joined #git
03:02 Cabanossi joined #git
03:02 fstd_ joined #git
03:02 finalbeta1 joined #git
03:03 Xenophon1 joined #git
03:03 mar77i_ joined #git
03:03 trobotham joined #git
03:04 Shakeel__ joined #git
03:04 ketas joined #git
03:04 krainboltgreene_ joined #git
03:04 rishi``` joined #git
03:04 raynold_ joined #git
03:05 venmx joined #git
03:05 preyalone_ joined #git
03:05 aboccia_ joined #git
03:05 altendky_ joined #git
03:05 kentnl joined #git
03:06 HurricaneHarry joined #git
03:06 pifon_ joined #git
03:06 DerpTruck joined #git
03:06 ec\_ joined #git
03:07 hvxgr_ joined #git
03:07 ErkiDerL1ony joined #git
03:07 DistantStar joined #git
03:07 thekingofbandit joined #git
03:08 Bombe joined #git
03:08 Cthalupa- joined #git
03:09 cmn joined #git
03:09 jakesyl_mobile joined #git
03:09 zivester joined #git
03:09 watersoul_ joined #git
03:09 dsdeiz joined #git
03:09 dsdeiz joined #git
03:09 ShapeShifter499 joined #git
03:10 zifnab| joined #git
03:10 bauruine_ joined #git
03:10 binary10101 joined #git
03:10 idmistir_ joined #git
03:10 Gunni^ joined #git
03:10 [sarri] joined #git
03:10 ablackack joined #git
03:10 linuxmodder joined #git
03:10 linuxmodder joined #git
03:11 justinmrkva_ joined #git
03:11 Kobazz joined #git
03:11 sunri5e_ joined #git
03:11 Me_ joined #git
03:11 roelmonnens joined #git
03:12 Me_ left #git
03:12 shakalaka joined #git
03:12 Nothing4You joined #git
03:12 frankkahle joined #git
03:12 wcstok joined #git
03:12 Chinorro joined #git
03:12 Matsv joined #git
03:13 kba joined #git
03:13 Karazhan joined #git
03:14 saidelike joined #git
03:15 g5pw joined #git
03:15 Hobbyboy joined #git
03:15 manitu joined #git
03:15 a_thakur joined #git
03:16 rchavik joined #git
03:16 Persikka joined #git
03:18 menip joined #git
03:18 aw1 joined #git
03:18 darkmist_ joined #git
03:18 dcpc007 joined #git
03:18 jmesmon joined #git
03:18 i7c joined #git
03:18 MattMaker joined #git
03:19 dfaught joined #git
03:19 jwest joined #git
03:19 roflin joined #git
03:19 bgerber joined #git
03:19 markmarkmark joined #git
03:20 justanotheruser joined #git
03:23 ojdo joined #git
03:31 Cabanossi joined #git
03:32 dreiss joined #git
03:34 jaziz joined #git
03:34 barteks2x joined #git
03:42 mel00010 joined #git
03:42 a_thakur joined #git
03:43 dave0x6d joined #git
03:44 nonconvergent joined #git
03:47 robotroll joined #git
03:48 Nkjo joined #git
03:48 whydoubt joined #git
03:50 cads joined #git
03:55 Nkjo Hi, can anyone help me with why a friend of mine can't pull from our repo? The error is like this:
03:56 Nkjo error: there are still refs under 'refs/remotes/origin/t_ngk',  From REPO [new branch]      t_ngk      -> origin/t_ngk  (unable to update local ref)
03:56 Wulf joined #git
03:57 Nkjo I have a feeling it has something to do with me deleting the remote branch but then creating another one with the same name.
04:01 Kulrak joined #git
04:01 Kulrak joined #git
04:02 zorbz joined #git
04:03 MattMaker joined #git
04:04 TbobbyZ joined #git
04:10 Nkjo Nvm resolved by just deleting the branch at remote again, how silly of me.
04:16 otiose joined #git
04:16 b0nn left #git
04:20 jaziz joined #git
04:24 rominronin joined #git
04:40 barbos joined #git
04:40 bongo joined #git
04:42 tarkus joined #git
04:45 nick123 joined #git
04:47 ayogi joined #git
04:49 rkazak joined #git
04:50 elsevero joined #git
04:53 muthafaka joined #git
04:54 nick123 joined #git
04:57 dedicated joined #git
04:59 roelmonnens joined #git
05:00 PtxDK joined #git
05:01 nonconvergent joined #git
05:01 freimatz joined #git
05:03 MattMaker joined #git
05:05 dec0n joined #git
05:05 PresidentBiscuit joined #git
05:07 dandaman joined #git
05:08 durham joined #git
05:08 AbleBacon_ joined #git
05:10 aw1 joined #git
05:11 kbeflo joined #git
05:13 nonconvergent joined #git
05:13 Iacobus joined #git
05:13 pks joined #git
05:14 miracle joined #git
05:14 mohabaks joined #git
05:18 durham joined #git
05:20 m4sk1n joined #git
05:22 Bock joined #git
05:24 nick123 joined #git
05:26 nick123_ joined #git
05:29 navidr joined #git
05:29 gamer joined #git
05:30 mda1 joined #git
05:31 Cabanossi joined #git
05:34 PaulCapestany joined #git
05:39 imack joined #git
05:40 ssmall joined #git
05:40 barbos joined #git
05:42 qt-x joined #git
05:43 Blendify joined #git
05:44 Blendify is there a version of 'svn info' but for git?
05:44 grawity I think `git log -1` plus `git remote -v`
05:45 grawity some of the information it shows just works differently in git
05:46 Blendify I guess a better question is in git how can I find if a file is versioned or not
05:47 grawity edit it and see if it shows up in `git status` / `git diff`? :D
05:48 grawity ah yeah, you could check `git ls-files <foo>` to check if it's in the index
05:49 grawity (which would mean it's either versioned, or will start being versioned as soon as you `git commit`)
05:49 jozwior joined #git
05:50 Raging_Hog joined #git
05:51 finalbeta joined #git
05:51 Blendify it would return null if it is not
05:51 gamer left #git
05:52 User458764 joined #git
05:53 User458764 joined #git
05:54 netj joined #git
05:56 rominronin joined #git
05:57 King_Hual joined #git
06:00 XenophonF joined #git
06:00 dermoth joined #git
06:00 venmx joined #git
06:03 karols146 joined #git
06:06 rscata joined #git
06:06 chele joined #git
06:06 TbobbyZ joined #git
06:07 lindenle joined #git
06:08 iamasamosa joined #git
06:11 schleppel joined #git
06:14 blackwind_123 joined #git
06:14 JeroenT joined #git
06:16 dreiss joined #git
06:17 JeroenT joined #git
06:20 chigang joined #git
06:22 mohabaks joined #git
06:22 zefferno joined #git
06:22 nickel_dime_look joined #git
06:22 miracle joined #git
06:23 acetakwas joined #git
06:24 roelmonnens joined #git
06:31 MaximB joined #git
06:31 Cabanossi joined #git
06:32 MaximB Hi, how can I remove a file from git, without deleting it? (the file located at the git init dir)
06:32 grawity `git rm --cached …`, then commit
06:32 rominronin joined #git
06:32 grawity note that it *will* be removed from everyone else's git dirs
06:35 MaximB cool, thanks
06:36 skre4 joined #git
06:38 freimatz joined #git
06:38 ogny joined #git
06:38 ogny joined #git
06:38 Silmarilion joined #git
06:40 ogny joined #git
06:40 ogny joined #git
06:40 ogny joined #git
06:42 kristofferR joined #git
06:42 amitava joined #git
06:46 rebrec joined #git
06:46 barbos joined #git
06:47 sbulage joined #git
06:49 iamashishkebab2 joined #git
06:50 zerow joined #git
06:51 User458764 joined #git
06:53 holodoc joined #git
06:53 mel00010 joined #git
06:56 zeroed joined #git
06:56 zeroed joined #git
06:57 borkr joined #git
06:57 lordjancso joined #git
06:59 Shock_ joined #git
06:59 bongo_ joined #git
07:00 iamashishkebab2 joined #git
07:01 Cabanossi joined #git
07:01 manuelschneid3r joined #git
07:02 xall joined #git
07:03 miracle joined #git
07:03 cdown joined #git
07:03 BlessJah I have "broken link from tree ABC to blob 123", how can I identify last valid commit?
07:03 armyriad joined #git
07:04 MattMaker joined #git
07:04 jas4711 joined #git
07:06 FilipNortic joined #git
07:07 AndreaACME joined #git
07:08 _Vi joined #git
07:09 _ADN_ joined #git
07:09 _ADN_ joined #git
07:09 BlessJah nvm, http://stackoverflow.com/a/41090798 git rev-list | while read ; do git ls-tree | grep
07:09 Industrial joined #git
07:11 achadwick joined #git
07:13 elect joined #git
07:16 flaviodesousa joined #git
07:16 whydoubt joined #git
07:18 modin joined #git
07:19 j416 BlessJah: that blob may exist in any commit, there is no "last valid commit"
07:20 j416 BlessJah: replace that blob with a proper one (you can use git-hash-object) and then run git fsck again
07:20 j416 BlessJah: to find which file the blob represents, what you suggest above should work indeed.
07:20 Xenophon1 joined #git
07:21 BlessJah that's bare repo, by last valid commit I mean any ancestor of damaged commit - the point that more than one commit may be damaged is valid though
07:21 tymczenko joined #git
07:23 DevAntoine joined #git
07:24 j416 BlessJah: an ancestor of the damaged commit may be just fine
07:24 tymczenko joined #git
07:24 j416 BlessJah: that data might have been subsequently removed
07:24 ertes joined #git
07:24 _Vi joined #git
07:25 j416 BlessJah: also, there are many possible ancestor paths; consider branches
07:25 j416 BlessJah: finding the ancestor of it is pointless
07:25 nonconvergent joined #git
07:25 whydoubt joined #git
07:26 dvaske joined #git
07:26 tymczenko joined #git
07:27 BlessJah damaged one actaully is merge, in GitLab's activity I can see that user pushed DEF on thursday, however branch is ABC (merge DEF and 321), ABC is missing blob
07:27 BlessJah the last valid commit is DEF, the one that user pushed, the one that makes git-fsck pass
07:29 j416 a merge is also a commit, no difference
07:30 mda1 joined #git
07:30 BlessJah two ancestors makes the difference, however "project activity" on GitLab allows me to identify "like it never happened" ancestor
07:30 j416 BlessJah: find the data that makes that blob (search your working directory or ask the person who created that commit in the first place)
07:30 lb1c joined #git
07:32 Murii joined #git
07:34 apotry joined #git
07:36 MineCoins joined #git
07:36 [pabu] joined #git
07:40 ssmall joined #git
07:41 filcab joined #git
07:42 cbreak it is possible to create any blob from any other blob
07:43 ertes-w joined #git
07:44 Shock_ joined #git
07:45 Industrial left #git
07:46 Cabanossi joined #git
07:49 JeroenT_ joined #git
07:50 * BlessJah have force-pushed previous commit and asked user to merge once again
07:50 skarm joined #git
07:52 iamasamosa joined #git
07:53 PresidentBiscuit joined #git
07:54 miracle joined #git
07:55 Tobbi joined #git
07:55 fatalhalt joined #git
07:56 cstratak joined #git
07:56 cstratak joined #git
07:56 iamashishkebab2 joined #git
07:57 morfin joined #git
07:57 morfin hello
07:57 morfin it's possible to extract some files from stash?
07:58 selckin did you try git checkout 'stash@{1}' -- file
07:58 selckin (not sure if that works, but that'd be how if you can)
08:00 sea-gull_ joined #git
08:00 sea-gull joined #git
08:01 sphalerite joined #git
08:01 kelvah joined #git
08:02 borkr joined #git
08:02 kurkale6ka joined #git
08:04 mikecmpbll joined #git
08:04 sphalerite Why are the speeds on "Receiving objects..." almost always lower than the speeds one gets for plain HTTPS downloads for instnace?
08:04 theoceaniscool joined #git
08:04 grawity because the server is likely compressing the packfile for you as it goes
08:05 grawity hmm no, on the second thought, that happens before
08:06 albel727 joined #git
08:07 phase2 joined #git
08:09 pbandark joined #git
08:10 chrysa joined #git
08:10 miracle joined #git
08:11 telephone joined #git
08:11 telephone joined #git
08:11 marcogmonteiro joined #git
08:13 Riviera joined #git
08:13 soc42 joined #git
08:13 clmsy joined #git
08:13 wandering_vagran joined #git
08:14 sphalerite yep. And if the compression had a net effect of slowing stuff down, I don't think it would be used :p
08:14 tymczenko joined #git
08:15 grawity it would, if the alternative is transferring 10 times the size worth of raw blobs
08:17 miracle_ joined #git
08:19 aielima joined #git
08:19 maroloccio joined #git
08:20 aax joined #git
08:20 external93848 joined #git
08:21 barbos joined #git
08:22 _flow_ joined #git
08:22 iamasamosa joined #git
08:23 Tobbi joined #git
08:23 external93848 Hey folks. I have a project which I want to publish. Some parts of it are open source and should be published, other parts have to kept in a closed source repository. Any Idea as how to best handle that with git? Maybe a main repository with a git submodule which refers to a closed source repository?
08:24 mquin joined #git
08:26 sphalerite If the open source one depends on the proprietary one then it's not much use publishing it...
08:26 sphalerite The other way round would probably be more useful — depending on how the two parts interact you may or may not want to use submodules
08:28 Snugglebash joined #git
08:28 external93848 I guess the question is: Is it a problem if a git repository has a sub module which it can not pull? Can I still work with the main repository without too much hassle?
08:29 netroxen joined #git
08:31 _ADN_ joined #git
08:31 Cabanossi joined #git
08:31 chll_ joined #git
08:32 sphalerite yes, but why have it at all? It will just confuse potential users/contributors.
08:35 external93848 Because the closed source sub-system needs to be a subdirectory of the main system since it has to use the same build system
08:35 external93848 "Build System"
08:36 selckin just bad project setup you're bandaiding with git
08:36 sphalerite perhaps symlinking it in might be better. I don't really know the specifics of what you're doing but to me it seems like submodules would just be fairly confusing in this case. They also tend to result in quite a lot of commit noise.
08:37 external93848 selckin: you are absolutely right. Sadly, that doesn't help me one bit.
08:37 external93848 sphalerite: yeah, symlinking could work too... good idea
08:37 selckin it means it won't ever be a proper solution like you're trying to get advice for
08:39 cbreak external93848: having a submodule that can not be cloned is 100% worthless
08:39 cbreak external93848: git clone --recursive will fail unrecoverably
08:40 Awesomecase joined #git
08:40 ssmall joined #git
08:40 sphalerite But yeah, the real solution here is to fix your project.
08:40 zivester joined #git
08:41 Levex joined #git
08:42 felixsanz joined #git
08:43 external93848 cbreak: "unrecoverably"? If you are cloning, you haven't done anything to recover to begin with, right? Which means "recovering" would just be: Delete the repository, clone anew without "--recursive". Am I missing something?
08:44 cbreak external93848: you won't get the submodule without --recursive
08:44 external93848 sphalerite: yeah, I know. :)
08:44 external93848 cbreak: yeah, which is fine, because it works without, its just missing the closed source part. Everyone who has access to the closed source part can use "--recursive"
08:45 external93848 It's just a temporary fix anyway. But sphalerite suggesting to use symlinking for the closed-source people is actually a nicer temporary approach. So thanks for that :)
08:47 Dro joined #git
08:47 Dro what does checkout do exactly ?
08:48 Dro how can I get all new files from remote git, without affecting my modified files ?
08:48 sphalerite Updates the working tree to match a particular commit, and updates HEAD to point to that commit
08:48 sphalerite git checkout will only destroy changes if you pass a path to it.
08:48 Dro sphalerite, it affect my local files ?
08:48 Dro hmmm ok
08:48 sphalerite Yes
08:49 seni joined #git
08:49 sphalerite But if it would overwrite your changes, it will complain and not work, unless you pass a path to it
08:49 Dro so my problem is following: I cloned a git yesterday, and I have made some changes on it
08:49 sphalerite git checkout master is safe, git checkout . is not
08:49 Dro now other dev updated that git
08:49 sphalerite Did you commit your changes?
08:49 Dro i want to get their update without getting my changes gone
08:49 Dro sphalerite, no
08:50 sphalerite Commit them, then pull.
08:50 morfin then he will have to merge
08:50 Dro sphalerite, I don't want to pull now, thats the problem :P
08:50 Dro I want to keep my files in local
08:50 morfin i mean there will be merge commit
08:50 Dro and at the same time get the changes of remote git
08:50 morfin stash pull
08:50 morfin i guess?
08:50 sphalerite Dro: yes, and if you commit them they'll be in the history so you'll be sure that they won't get lost
08:50 Levex joined #git
08:51 morfin or he can git stash changes, pull then git stash pop
08:51 sphalerite stashing is also an option, but it's less obvious what happens with that
08:51 Dro sphalerite, but commit & push will make them appear in remote branch
08:51 sphalerite Dro: yes, but I didn't say you should push
08:51 borkr joined #git
08:51 morfin heh
08:51 Dro hmmm
08:51 sphalerite committing the changes puts them in your local history, but doesn't publish them anywhere.
08:51 sphalerite Have you read Pro Git?
08:51 Dro sphalerite, so I commit, then I pull , then my new added files/changes will stay ?
08:52 sphalerite Yes.
08:52 morfin well, with stash there could be some issues as well... as example conflicts while merging
08:52 sphalerite ^
08:52 iamashishkebab2 joined #git
08:52 Dro no, just trying to learn it now :P
08:52 Gurkenglas_ joined #git
08:52 Dro sphalerite, by the way you said that git checkout master don't affect files.. so what does it do exactly ?
08:52 sphalerite Dro: http://git-scm.org/book excellent reading, chapters 1 and 2
08:53 sphalerite Dro: it does affect files.
08:53 Dro humm ok
08:53 sphalerite It just won't overwrite your changes.
08:53 Dro sphalerite, it will get new changes without overwriting my changes?
08:54 sphalerite No, checkout won't get new changes. Fetch gets new changes.
08:54 sphalerite Read Pro Git :p
08:54 sphalerite Not the whole book, because that covers way more than most users need to know. (unless you have lots of time on your hands in which case go for it!)
08:55 bilal_ joined #git
08:55 sphalerite But chapters 1 and 2, and ideally 3 as well. It explains stuff very well.
08:56 Dro hmm ok thanks sphalerite
08:56 Dro but just I hope I get an urgent answer for my current problem.. because i need it urgently
08:56 Dro than i'll read that book :P
08:58 sphalerite Again, commit your changes then pull.
08:59 Dro sphalerite, so just to confirm: this will commit my files locally, then get new files from remote branch
08:59 Dro and next time when I commit and push , the last commit is the one that will be applied and pushed to the remote branch?
09:00 bilal_ joined #git
09:00 external93848 All commits will be pushed to the remote branch, including the commit you made before pulling.
09:00 Kulrak joined #git
09:00 Kulrak joined #git
09:01 rscata joined #git
09:01 Dro external93848, and pull will not affect the commited changes?
09:03 external93848 Well, if you have changed files that are also changed in the remote, then it might prompt you to resolve conflicts. In which case you have to go through a merge and in the process of it decide which parts to keep from the remote and which parts to keep from your commit.
09:04 bilal joined #git
09:04 Dro external93848, thats ok, so no modification will happen without my confirmation ?
09:04 wizonesolutions joined #git
09:04 external93848 Dro: the important part is: If you commit your changes now, and something goes awry, you can always return to the point of before the pull.
09:05 Dro external93848, ok (Y)
09:05 MattMaker joined #git
09:06 aca20031 joined #git
09:07 external93848 If you do a commit, you may get some output like '[master 07cf569]'. That strange 07cf569 thingy is the commit id. If something goes wrong during the pull or after it, you can do `git reset --hard 07cf569` and it will restore the state it had right after your commit.
09:09 Stace joined #git
09:09 tocky joined #git
09:09 TbobbyZ joined #git
09:09 external93848 (You can also get the commit it by running `git log` after the commit)
09:09 Tobbi joined #git
09:12 Stace Hi all, if you want to find a file/folder in a repo that was previously deleted (ie: not in the top of the branch anymore) how do you search for it?
09:14 Stace I ask because I'm thinking of deleting a whole bunch of unused folders and I don't know how easy they will be to find in the history later if I actually need them
09:14 moritz Stace: you could do a 'git log --name-only --diff-filter=D'
09:14 moritz and search through that output
09:15 miczac joined #git
09:16 Stace Is it worth moving them to an "archive" folder for 6 months or so before deleting them?
09:17 ToeSnacks joined #git
09:17 Stace moritz: thanks I'll see how easy that is to do
09:24 sarri joined #git
09:24 sarri joined #git
09:26 a3Dman joined #git
09:26 a3Dman joined #git
09:28 twisted` joined #git
09:31 romank joined #git
09:36 nonconvergent joined #git
09:37 MrMojit0 joined #git
09:38 kelvah joined #git
09:38 JeroenT joined #git
09:39 theoceaniscool joined #git
09:40 CEnnis91 joined #git
09:41 angular_mike_ joined #git
09:41 JeroenT_ joined #git
09:41 a3Dman joined #git
09:41 cdown joined #git
09:41 seni joined #git
09:46 zeller joined #git
09:46 gour joined #git
09:46 gour morning
09:47 external93848 left #git
09:47 leeN joined #git
09:47 gour trying to clone some repo and i get: https://paste.fedoraproject.org/paste/zVi9y5cnoSFLyMl3Kub6OV5M1UNdIGYhyRLivL9gydE= tried increasing http.postBuffer as per http://stackoverflow.com/questions/38618885/error-rpc-failed-curl-transfer-closed-with-outstanding-read-data-remaining, but the problem persists. any hint?
09:48 gour git-2.9.3 (fedora f25)
09:49 ppang joined #git
09:51 ppang_ joined #git
09:53 digidog joined #git
09:56 xall joined #git
09:56 ferr joined #git
09:58 Iacobus joined #git
09:59 JeroenT joined #git
10:02 diogenese joined #git
10:02 Junior joined #git
10:02 venmx joined #git
10:03 a3Dman joined #git
10:04 xall joined #git
10:05 Arokh joined #git
10:05 Masber_080 joined #git
10:10 ronskisika joined #git
10:11 Tobbi joined #git
10:12 terabyte joined #git
10:13 terabyte hey, am I blind or, where is the .mobi version of the pro git book https://git-scm.com/book/en/v2
10:13 cads joined #git
10:14 terabyte ah, nm, it's an artifact in github
10:18 pix9 joined #git
10:19 pix9 is there any way to find  list of of commit hash associated with certain file?
10:19 xall joined #git
10:19 tobiasvl pix9: what do you mean? all commits that touch a file? git log -- file
10:19 chardan joined #git
10:20 pix9 let me check that tobiasvl
10:20 tobiasvl with cut(1) or some --format to remove anything but the hashes, if that's all you're interested in
10:21 tobiasvl pix9: no offense but I always wonder if people who say "hang on for a bit, let me test that thing that takes one second" work in phone support ;)
10:22 pix9 not really I was checking the out put
10:22 tobiasvl just kidding
10:22 tobiasvl you can change the output with --format
10:22 pix9 and I am wondering if what you said is really helping me, I am sorrry I should appreciate your help before testing it.
10:23 pix9 Thank you for help
10:23 pix9 I can manage text formatting.
10:23 pix9 I am actuly writing a bash script for developement box
10:23 Nilesh_ joined #git
10:24 tobiasvl this will just output the hashes (in full, use %h instead for abbreviated hash): git log --format=format:%H -- file
10:24 pix9 where I am handing over part of server configuration to devs
10:25 pix9 so script allow devs to pass hash and  deploy specific revision of config,
10:25 pix9 and I am trying to validate the hash entered by dev.
10:26 cust joined #git
10:26 tobiasvl cool
10:26 pix9 so if by mistake someone passes hash  prior to the config file was even added to repo should  result in failure of build
10:26 kurkale6ka joined #git
10:27 pix9 so I am able to validate config file name.
10:29 pix9 so far I was using "$(cd /repo/dir/ && git fetch --all && git cat-file -t $INPUT_HASH)" == "commit"
10:31 Cabanossi joined #git
10:32 pix9 but  realized that hash might be valid but hash vaild but may not be associated with file which needs to be updated, this proble m would typically occur when someone is trying to revert.
10:32 cspotcode joined #git
10:32 miracle joined #git
10:34 User458764 joined #git
10:35 User458764 joined #git
10:36 xall joined #git
10:36 dvaske joined #git
10:38 a3Dman joined #git
10:41 PresidentBiscuit joined #git
10:41 pix9 tobiasvl  git log --format=format:%H -- filename
10:41 pix9 that is working
10:41 xall joined #git
10:42 YuGiOhJCJ joined #git
10:42 pix9 if I add remote/origin  before -- filename  gives output for remote  branch
10:42 cads joined #git
10:43 Snugglebash joined #git
10:43 Achylles joined #git
10:44 omnigoat joined #git
10:47 richardlitt joined #git
10:51 osse pix9: git rev-parse --verify hash:path
10:52 teadrop_ joined #git
10:53 Tobbi joined #git
10:54 dosmachko joined #git
10:57 Darcidride joined #git
10:58 DaveTaboola joined #git
10:58 Stace left #git
10:58 pix9 lol osse
11:00 dsdeiz joined #git
11:00 dsdeiz joined #git
11:00 ppang_ joined #git
11:04 tvw joined #git
11:04 venmx joined #git
11:06 MattMaker joined #git
11:08 nonconvergent joined #git
11:09 mkoskar joined #git
11:10 p4trix joined #git
11:10 notebox joined #git
11:11 [pabu] joined #git
11:11 DaveTaboola joined #git
11:12 TbobbyZ joined #git
11:12 [pabu] joined #git
11:12 DomeMasterYolo13 joined #git
11:13 [pabu] joined #git
11:13 Snugglebash joined #git
11:14 kbeflo joined #git
11:15 [pabu] joined #git
11:16 [pabu] joined #git
11:16 dsdeiz joined #git
11:16 dsdeiz joined #git
11:18 otiose joined #git
11:18 basiclaser joined #git
11:21 farciarz84 joined #git
11:21 farciarz84 hi
11:22 farciarz84 can I cd to git submodule as it was a separate repo? Currenly it is in HEAD detached mode
11:23 grawity it *does* act like a separate repo
11:23 grawity `git checkout master` and do whatever
11:24 osse pix9: lol because it's so awesomely simple ?
11:24 fission6 joined #git
11:24 Vampire0 farciarz84, a submodule will almost always be in detached HEAD mode. You reference a specific commit (not branch) in the parent repository, so if you update the submodule to match what the parent expects, you will be in detached HEAD mode.
11:25 Vampire0 farciarz84, if you then want to do a change in the submodule you typically check out a branch, do your changes, make a commit and then reference this new commit in the parent repo, pushing both either together or the submodule repo first
11:26 Vampire0 farciarz84, !zombie
11:26 gitinfo farciarz84: Brainzz! More brainzzzz!  For information about detached heads, see !detached
11:26 pix9 osse well tested it and seems to return true for all the hash :|
11:26 pix9 perhaps it is simple.
11:27 osse seems to work here
11:27 farciarz84 Vampire0: I want a reference to a specific branch not commit
11:27 Vampire0 farciarz84, then submodules are not the way you want to go
11:27 grawity do you want that only so that you could commit to master, or do you want that so that *everyone* would get the current master?
11:28 Vampire0 farciarz84, a submodule is *always* referenced by specific commit, otherwise what you reference change with every change of the branch and that would be bad
11:28 Vampire0 farciarz84, !subr
11:28 gitinfo farciarz84: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
11:28 linuxmodder- joined #git
11:28 linuxmodder- joined #git
11:30 farciarz84 Vampire0: ok and how to update repo including submodule? git pull --recursive?
11:31 farciarz84 !gitslave
11:31 gitinfo gitslave ( http://gitslave.sf.net ) is useful to add subsidiary git repositories to a git superproject when you control and develop on the subprojects at more or less the same time as the superproject, and furthermore when you typically want to tag, branch, push, pull, etc. all repositories at the same time.
11:31 farciarz84 !subtree
11:31 gitinfo The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_subtree_merge for more info, see also !git-subtree and !git-stitch-repo.
11:31 _Vi joined #git
11:32 D4R5C0D3 joined #git
11:33 a3Dman joined #git
11:33 sphalerite left #git
11:36 sondr3 joined #git
11:36 Raging_Hog joined #git
11:41 dglambert joined #git
11:41 dglambert yo
11:42 jeffreylevesque joined #git
11:44 masuberu joined #git
11:45 DaveTaboola joined #git
11:45 neunon joined #git
11:47 albel727 joined #git
11:48 osse feel the flow
11:49 elect joined #git
11:49 JeroenT_ joined #git
11:49 gour left #git
11:54 Vampire0 farciarz84, I don't know, I don't like and never really used submodules, sorry
11:55 tlaxkit joined #git
11:56 xall joined #git
11:57 synthroid joined #git
11:57 kristofferR joined #git
11:59 blackwind_123 joined #git
12:00 synthroi_ joined #git
12:02 osse farciarz84: once you cd into a submodule, git won't know any better
12:02 Snugglebash joined #git
12:02 osse it's like that's the only repo
12:02 osse sort of like cd'ing into a repo somewhere else on your computer
12:03 Vampire0 osse, the question was how to update the submodule along with the parent when pulling in the parent
12:04 kurkale61 joined #git
12:04 xall joined #git
12:04 osse I see.
12:05 osse I just answered the first question he asked. I didn't an answer to it
12:07 MattMaker joined #git
12:07 kurkale6ka joined #git
12:07 Junior left #git
12:07 Junior joined #git
12:08 Vampire0 Yeah, just mentioning, so that he knows you answered a different question :-)
12:08 astrofog joined #git
12:08 Tobbi joined #git
12:08 seni joined #git
12:10 serialoverflow joined #git
12:13 Gurkenglas_ joined #git
12:14 kurkale61 joined #git
12:14 xall joined #git
12:19 kelvah joined #git
12:19 dandaman joined #git
12:20 bilal joined #git
12:26 lss8 joined #git
12:26 lss8 joined #git
12:26 dandaman1 joined #git
12:27 qt-x joined #git
12:27 Snugglebash joined #git
12:32 leah2 how can i checkout a directory of a given commit at the current working directory, under a different name?
12:33 _ikke_ leah2: not directly
12:33 leah2 yeah
12:33 leah2 ok, then i worked around it :)
12:33 osse git archive
12:33 lipsumar joined #git
12:33 leah2 + bsdtar -s ? ;)
12:34 osse not sure what -s means
12:34 leah2 sed s/// on filenames
12:34 osse i was about to write a command line but saw "i worked around it" so i just pressed enter :p
12:34 osse oh
12:34 osse no
12:35 leah2 then --strip-prefix?
12:35 osse git archive HEAD -- some/dir | tar -C other/name -cf -
12:35 leah2 that will still be called some/dir
12:35 leah2 but nice to know archive works on subdirectories
12:35 osse oh
12:35 osse git archive HEAD:some/dir | tar -C other/name -cf -
12:35 osse there
12:35 leah2 i used  git checkout OLDREV -- dir; mv dir newdir; git checkout HEA D-- dir
12:36 leah2 ah yes. nice
12:36 cbauer joined #git
12:36 lipsumar Greetings! I'm having a hard time figuring out the best way to work with git on a remote dev server. Here is the setup: i have no local instance, my dev instance is on the cloud. I need however to access my files. What's the preffered way to handle this ?
12:36 osse lipsumar: do you treat the dev server just as if it was your local computeR?
12:36 lipsumar exactly
12:37 osse thne I suggest you treat the git repo as if it was on your local computer too
12:37 osse ie. 'git clone ..' from where it's hosted, etc.
12:38 lipsumar but then i'd need to commit and push every single change i want to execute ?
12:38 dsdeiz joined #git
12:38 dsdeiz joined #git
12:38 osse you know that better than me
12:39 osse or: not have a "hosted" repo at all. just have the one you're working in and nothing else
12:39 peacememories joined #git
12:39 lipsumar i got something working with Fuse. I mounted the remote directory locally. It seems to work but then git will be executing locally. I'd rather have git execute remotely
12:40 lipsumar i'm afraid changing branches will be slow, because a lot of fs operations will have to happen
12:40 cbauer trying to define my gitignore, I would like to have everything ignored except specific filetypes/patterns in any subdir
12:41 lipsumar cbauer: try this: http://stackoverflow.com/questions/5241644/using-gitignore-to-ignore-everything-but-specific-directories
12:41 cbauer tried variations of this but it seemed to ever only cause inclusion of files in current dir: set +H; echo -e "*\n!**/*.ps1\n!**/*Dockerfile\n" > .gitignore
12:41 Stumbler joined #git
12:41 peacememories joined #git
12:41 cbauer lipsumar: doesn't help for my issue
12:42 fission6 joined #git
12:42 dandaman joined #git
12:42 cbauer I want to include files in any subdir, not in specific ones that containe some wildcards in the 'body' of the path
12:42 tQK1101 joined #git
12:43 miczac joined #git
12:43 kurkale6ka joined #git
12:44 farciarz94 joined #git
12:44 dxtr left #git
12:44 tQK1101 left #git
12:46 sondr3 joined #git
12:47 telephone joined #git
12:47 telephone joined #git
12:49 IRQ` joined #git
12:53 peacememories joined #git
12:53 ssmall joined #git
12:54 zxd what's the difference between ref and refname
12:56 zxd I am getting this: http://paste.debian.net/930743/
12:56 zxd what does it mean?
12:57 osse zxd: there is none
12:57 xall joined #git
12:57 _ikke_ zxd: it means you are trying to create a branchname which looks like a commit hash
12:58 Vampire0 zxd, a ref has a refname and points to something. The refname is how you reference the ref
12:59 _ikke_ Vampire0: a ref an a refname are the same
12:59 dvaske joined #git
12:59 xall joined #git
12:59 ExeciN joined #git
13:00 Vampire0 Oh, are they technically? They are often used interchangeably, but I'd call "foo" a refname and the logical concept of a name pointing to something the ref :-)
13:01 kaldoran joined #git
13:01 sim590 joined #git
13:02 cbauer anyone know how I include only specific file types?
13:02 _ikke_ Yeah, conceptually they're the same, technically you can make a difference
13:02 ppang joined #git
13:02 Vampire0 cbauer, include in what?
13:02 _ikke_ cbauer: only by extension
13:02 zxd symbolink ref
13:02 zxd "foo"
13:02 cbauer _ikke_:  well, by wildcard, not mime type if you mean that
13:02 cbauer Vampire0: into the repo
13:03 osse cbauer: you can type   git add file1 file2.  in the same manner you can do  git add *.txt
13:03 zxd what is the error I am getting?
13:03 cbauer all files that add in a specific stringh
13:03 osse oh
13:03 cbauer osse: via .gitiginore
13:03 _ikke_ zxd: what is the command you are executing?
13:03 cbauer .gitignore*
13:03 cbauer s/add/end/
13:03 zxd 'warning: refname '00cb8a0c2158d91457f9fa8da7383fbcf683b2fc' is ambiguous. ...'
13:03 osse .gitignore only works on file names, not content
13:04 cbauer I only care about file name
13:04 osse zxd: show us the code you're running
13:04 cbauer I tried '* \n **/*string' which seems to only inclode '*string' of root dir, not of subdirs
13:05 cbauer (\n not literally, in place of newline)
13:05 osse i think  *string*  alone works
13:05 _ikke_ zxd: again, what is the command you are executing?
13:05 cbauer you mean !*string ?
13:05 Vampire0 cbauer, do you want to exclude certain extensions or include certain extensions?
13:05 cbauer I want to _include_
13:05 osse !*string*
13:06 cbauer do I not need to use * on a line too to exclude all others
13:06 Vampire0 cbauer, I don't think this will work at all
13:06 rkazak joined #git
13:07 Vampire0 cbauer, * will exclude everything including folders, so Git does not even look into that folders and you cannot include in there
13:07 cbauer I've seen same principle work for other scenarios
13:07 Vampire0 cbauer, that's why you only get the file from the root directory
13:07 ertes joined #git
13:07 Vampire0 cbauer, if you have a maximium folder depth you can do it, but not arbitrary depth I think
13:08 zxd _ikke_: I have to figure out, it's a long script someone wrote
13:08 Vampire0 cbauer, !gitignore_whitedir basically
13:08 gitinfo cbauer: A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/*\n!/a/\n/a/*\n!/a/b/\n/a/b/*\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '*\n!*/\n!*.c' > .gitignore` (ignore everything but *.txt files) may do what you want.
13:09 cdown joined #git
13:10 cbauer 'ignore everything but *.txt files' you mean *.c files?
13:10 Vampire0 cbauer, I think `*\n!*/\n*/*\n!*/*/\n*/*/*n!*/*/*/\n*/*/*/*\n!*.java` should e. g. work for maximum 4 folders deep.
13:11 Vampire0 cbauer, yes, the trigger is wrong
13:11 Vampire0 cbauer, oh right, there the solution is already included
13:12 Vampire0 cbauer, I forgot about the leading slash
13:12 Vampire0 cbauer, so yes, the one from the trigger should work for you
13:12 cbauer echo -e '*\n!*/\n!*.c' does it only for depth=1?
13:13 Vampire0 cbauer, no, any depth. If the second lines would be prefixed with / it would probably only work on the first level
13:14 cbauer wouldn't that do then what I wanted?
13:14 Vampire0 !gitignore_whitedir
13:14 gitinfo A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/*\n!/a/\n/a/*\n!/a/b/\n/a/b/*\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '*\n!*/\n!*.txt' > .gitignore` (ignore everything but *.txt files) may do what you want.
13:14 Vampire0 cbauer, yes, I already said it will
13:15 cbauer with git on windows, do I have to use \ (backshlash) as path separator in my .gitignore?
13:15 Vampire0 cbauer, no
13:15 cbauer or is both interpreted equivalently (slash and backslash)
13:15 cbauer administratoradmin
13:15 Vampire0 cbauer, you must not actually I think
13:15 cbauer oops
13:16 cbauer but slash should work then, so I'll use that
13:16 Vampire0 yes
13:17 h12o joined #git
13:17 relipse joined #git
13:18 otiose joined #git
13:18 synthroid joined #git
13:18 apax joined #git
13:19 iamasamosa joined #git
13:20 nonconvergent joined #git
13:20 dsantiago joined #git
13:21 venmx joined #git
13:21 cbauer `git status` now seems to show folders on root that contain one of those files I want included, how do I know which files exactly it would add when I now use `git add ...`?
13:23 PresidentBiscuit joined #git
13:24 synthroi_ joined #git
13:24 sturner joined #git
13:24 MaximB left #git
13:25 D4R5C0D3 joined #git
13:25 JeroenT joined #git
13:26 AaronMT joined #git
13:26 cbauer Vampire0: thanks, git add -Anv . shows the correct files that would be added
13:27 zxd _ikke_:  git fetch --tags
13:27 zxd warning: refname '00cb8a0c2158d91457f9fa8da7383fbcf683b2fc' is ambiguous.
13:28 gugah joined #git
13:28 osse zxd: is it listed by 'git tag' ?
13:29 TheSimonator joined #git
13:29 zxd yes the first 00cb8a0c2158d91457f9fa8da7383fbcf683b2fc
13:29 zxd dunno why some named a tag that wy
13:29 zxd way
13:30 zxd but what is the error saying
13:30 Vampire0 zxd, so you created a tag with that name. Delete it or rename it to something else. Or is the tag also present in the remote?
13:30 zxd Vampire0: it's on remote
13:31 canton7 do you *want* it to be on the remote? :P
13:32 jameser joined #git
13:32 synthroid joined #git
13:33 gaucheph joined #git
13:33 AbleBacon_ joined #git
13:34 Vampire0 zxd, if you have a tag or branch named with 40 hex characters, you cannot reference it by its simple name. Because if you give 40 hex characters, it will always be interpreted as SHA value and not searched for a ref with that name
13:34 Vampire0 zxd, if you use refs/tags/00cb8a0c2158d91457f9fa8da7383fbcf683b2fc you can still reference it, but not just using 00cb8a0c2158d91457f9fa8da7383fbcf683b2fc
13:35 Vampire0 zxd, the message warns you about this
13:35 Vampire0 zxd, I'd recommend deleting or renaming that tag in the remote
13:35 zxd I see
13:36 caper joined #git
13:36 zxd thanks
13:36 dreiss joined #git
13:36 davidfetter_ge joined #git
13:36 ams__ joined #git
13:36 Vampire0 zxd, yw
13:36 gitinfo zxd: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
13:37 m4sk1n joined #git
13:37 Dougie187 joined #git
13:37 leah2 .karma leah2
13:37 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
13:38 synthroi_ joined #git
13:39 slidercrank joined #git
13:41 Renter thanks gitinfo
13:41 gitinfo Renter: you're welcome, but please note that I'm a bot. I'm not programmed to care.
13:42 planigan joined #git
13:42 thiago joined #git
13:44 otiose joined #git
13:44 Es0teric joined #git
13:45 LionsMane joined #git
13:45 notebox joined #git
13:46 dvaske joined #git
13:47 tarkus joined #git
13:47 kurkale61 joined #git
13:50 sturner joined #git
13:50 synthroid joined #git
13:51 tro joined #git
13:52 jagob joined #git
13:52 Spacew00t joined #git
13:54 Qilibrun joined #git
13:54 NeXTSUN joined #git
13:54 osse zxd: the warning is say that creating that tag might have been an accident/bug
13:54 osse *is saying
13:55 osse it's a warning, not an error.
13:58 theoceaniscool joined #git
14:00 jameser_ joined #git
14:02 h12o joined #git
14:02 kurkale6ka joined #git
14:03 cbauer left #git
14:03 cookra joined #git
14:08 MattMaker joined #git
14:09 netroxen joined #git
14:09 dvaske joined #git
14:10 TheSimonator joined #git
14:13 firef1y joined #git
14:13 lindenle joined #git
14:15 cdg joined #git
14:15 nonconvergent joined #git
14:15 NeXTSUN joined #git
14:15 synthroi_ joined #git
14:16 TbobbyZ joined #git
14:17 synthro__ joined #git
14:18 publio joined #git
14:18 rvgate joined #git
14:19 fission6 joined #git
14:19 Husky_Apocalypse joined #git
14:20 Spacew00t joined #git
14:20 NeXTSUN joined #git
14:23 sbasso joined #git
14:23 wcstok joined #git
14:24 lewix joined #git
14:28 xall joined #git
14:28 YuGiOhJCJ joined #git
14:28 LeBlaaanc joined #git
14:30 borkr joined #git
14:30 rmesta joined #git
14:31 rmesta1 joined #git
14:31 Cabanossi joined #git
14:31 ertes joined #git
14:32 D4R5C0D3 joined #git
14:33 kelvah joined #git
14:33 GT4066 joined #git
14:36 Snugglebash joined #git
14:36 synthroid joined #git
14:36 rmesta1 left #git
14:37 sturner joined #git
14:37 vuoto joined #git
14:39 Murii joined #git
14:42 unbalancedparen joined #git
14:42 mikecmpb_ joined #git
14:42 CEnnis91 joined #git
14:44 ddavidd left #git
14:45 Cesario__ joined #git
14:46 xall joined #git
14:46 kexmex joined #git
14:48 mostlybadfly joined #git
14:48 matsaman joined #git
14:48 d10n-work joined #git
14:49 Cesario_ joined #git
14:54 rvgate joined #git
14:55 boombatower joined #git
14:58 seni joined #git
15:02 sturner joined #git
15:03 finalbeta joined #git
15:03 al-damiri joined #git
15:04 roelmonn_ joined #git
15:04 joeco joined #git
15:04 roelmonn_ joined #git
15:05 TheSimonator joined #git
15:07 Khisanth joined #git
15:08 bilal joined #git
15:09 TbobbyZ joined #git
15:09 telephone joined #git
15:09 telephone joined #git
15:09 ertes-w joined #git
15:11 ayogi joined #git
15:11 NeXTSUN joined #git
15:11 mikecmpbll joined #git
15:11 firef1y joined #git
15:12 chubek_ joined #git
15:12 xall joined #git
15:14 tinanoo joined #git
15:14 moei joined #git
15:15 manuelschneid3r joined #git
15:16 User458764 joined #git
15:17 matsaman morning =)
15:19 gugah joined #git
15:20 bittyx joined #git
15:22 Achylles joined #git
15:24 PHPanos joined #git
15:24 dandaman joined #git
15:25 xall joined #git
15:26 Es0teric joined #git
15:26 Snugglebash joined #git
15:30 lindenle joined #git
15:31 yqt joined #git
15:32 zivester joined #git
15:34 xall joined #git
15:35 brent__ joined #git
15:38 Achylles joined #git
15:39 brent__ joined #git
15:41 brent__ joined #git
15:41 fission6 joined #git
15:41 p1k joined #git
15:41 owlbynight joined #git
15:42 p1k hey, I'm getting a warning when running git commands in a branch warning: refname 'HEAD' is ambiguous.
15:42 p1k does anyone know what causes this ?
15:42 moritz p1k: have you nammed a branch HEAD, maybe?
15:43 moritz run 'git branch' to check
15:43 kurkale61 joined #git
15:43 canton7 (it's easy to do by accident if you type the wrong thing)
15:44 canton7 (imo git should prevent that - and prevent a branch called 'origin' - but hey ho)
15:44 canton7 or better yet, a local branch called 'origin/master' - that bit me a few times as a newb
15:45 fission6 joined #git
15:46 a3Dman joined #git
15:46 notebox joined #git
15:47 kurkale6ka joined #git
15:48 King_Hual joined #git
15:48 King_Hual joined #git
15:48 plos joined #git
15:50 synthroid joined #git
15:51 xall joined #git
15:51 durham joined #git
15:52 thiago joined #git
15:53 cjohnson yeah but not everybody calls it origin, that's just the default behavior for clone
15:53 cjohnson which is admittedly the most common
15:53 cjohnson you can also have other remotes
15:53 cjohnson I prefer git's approach of letting you shoot yourself in the foot if you want
15:53 cjohnson :P
15:54 svm_invictvs joined #git
15:56 madewokherd joined #git
15:56 Marumarsu joined #git
15:56 Gustavo6046 joined #git
15:57 Husky_Apocalypse joined #git
15:57 dglambert hey, I have files in my working dir right now, but I am on the wrong branch, should I stash them, create a new branch then stash apply them in the new checkedout branch?
15:58 xall_ joined #git
15:58 dglambert the new branch will be based on the existing branch
15:58 rkazak joined #git
15:58 p1k moritz: I surely do not
15:59 matsaman cjohnson: I wish it'd let me more
15:59 cjohnson dglambert: yep that sounds fine
16:00 Husky_Apocalypse joined #git
16:00 cjohnson you started a change that you wanted to be in a new branch right?
16:00 cjohnson if so that's correct
16:00 a3Dman joined #git
16:01 Cabanossi joined #git
16:02 TheSimonator joined #git
16:03 TheSimonator joined #git
16:03 synthroi_ joined #git
16:03 Xenophon1 joined #git
16:03 mel00010 joined #git
16:04 albel727 joined #git
16:07 iffraff joined #git
16:08 johnflux joined #git
16:08 johnflux joined #git
16:09 MattMaker joined #git
16:09 exotime joined #git
16:10 ankit01ojha joined #git
16:10 freimatz joined #git
16:11 dglambert thanks cjohnson, I got it to work
16:11 dglambert I probably could have done it actually as all one command based on the docs
16:11 dglambert but I did it as a stash and checkout
16:12 dfs joined #git
16:12 Introoter joined #git
16:12 Vampire0 dglambert, you wouldn't have needed to do anything besides checking out the new branch. See !float
16:12 gitinfo dglambert: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
16:14 Starky joined #git
16:15 theoceaniscool joined #git
16:15 mohabaks joined #git
16:15 relipse joined #git
16:17 dglambert oh good info Vampire0
16:19 dfas joined #git
16:20 roelmonnens joined #git
16:20 seni joined #git
16:23 venmx joined #git
16:23 aax joined #git
16:23 prg3 joined #git
16:27 AndreasLutro joined #git
16:27 TheSimonator joined #git
16:28 ivo_ joined #git
16:28 bannakaffalatta joined #git
16:28 lafleurdubien joined #git
16:28 robotroll joined #git
16:28 cjohnson oh nice, I always forget about that and play it safe by stashing
16:29 tarkus joined #git
16:30 ribasushi joined #git
16:30 caper joined #git
16:31 Cabanossi joined #git
16:31 Murii joined #git
16:32 plos joined #git
16:33 nidr0x joined #git
16:35 dhollinger joined #git
16:36 thiago joined #git
16:36 jstimm joined #git
16:37 SteffanW joined #git
16:38 zzero1 joined #git
16:38 twisted` joined #git
16:39 nitric joined #git
16:39 daxorid joined #git
16:39 Iacobus joined #git
16:39 daxorid can anyone think of a reason that my git client would connect via ssh to the origin hosts *exactly* every three minutes?
16:40 cust joined #git
16:40 Vampire0 cjohnson, Git is inherently safe already. If a checkout would touch files you have modified it tells you so and advices to stash. So unless being told you can always simply switch the branch
16:40 daxorid or at least *something* on my development host is connecting to the git user on the origin host every 3 minutes
16:40 Vampire0 daxorid, because you have some cron-job running every 3 minutes?
16:41 Vampire0 daxorid, or some software that looks for changes in the remote?
16:41 wizonesolutions joined #git
16:41 Vampire0 daxorid, some "notify me with a bubble if there were commits" type of software for example
16:41 unbalancedparen joined #git
16:41 daxorid Vampire0: oh, duh, it's got to be vs.code then, thanks
16:41 zeller joined #git
16:41 Vampire0 daxorid, maybe I do not know that IDE
16:42 richardlitt joined #git
16:42 teadrop_ joined #git
16:42 Awesomecase joined #git
16:42 angular_mike_ joined #git
16:42 Vampire0 daxorid, you can also use "netstat -tulpen" (Linux) or "netstat -ano" (Windows) at the time the connection is established to get the PID of the program having open the connection and then look at the process list
16:43 ToeSnacks joined #git
16:43 omnigoat joined #git
16:44 zzero1 want to amend a committer's name and I get a merge conflict during interactive rebase
16:44 ZexaronS joined #git
16:45 j416 zzero1: use filter-branch to change only the name
16:45 j416 easier
16:45 Sythrik joined #git
16:45 _ikke_ j416: even if you want to change just one commit?'
16:45 j416 man git-filter-branch look for --env-filter
16:45 gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html
16:45 j416 _ikke_: if there are merges and whatnot; I'd use it
16:45 CEnnis91 joined #git
16:46 j416 also, git replace
16:46 cspotcode joined #git
16:46 j416 might be even easier than --env-filter for a single commit
16:46 j416 man git-replace look for --edit
16:46 gitinfo the git-replace manpage is available at https://gitirc.eu/git-replace.html
16:47 _ikke_ rite
16:50 sturner joined #git
16:51 User458764 joined #git
16:51 User458764 joined #git
16:52 cjohnson Vampire0: yeah that's what I mean. I hate seeing that message so to avoid it my workflow is just to always stash. I have ot baked into an alias
16:52 cjohnson I agree with your point though
16:53 lacrosse joined #git
16:58 Cassiopaya joined #git
17:01 LionsMane joined #git
17:03 rkazak joined #git
17:03 dreiss joined #git
17:04 Tobbi joined #git
17:07 rominronin joined #git
17:07 rominronin joined #git
17:08 kexmex joined #git
17:11 sbasso joined #git
17:11 smallfoot- joined #git
17:12 smallfoot- git shortlog hangs when the repo is empty
17:12 smallfoot- any way to prevent that?
17:12 smallfoot- it starts read from stdin
17:12 NeXTSUN joined #git
17:13 dandaman joined #git
17:13 lacrosse left #git
17:14 Jonuz_ left #git
17:14 Jonuz_ joined #git
17:15 Jonuz_ left #git
17:16 Cabanossi joined #git
17:17 Vampire0 smallfoot-, windows or linux?
17:17 dandaman1 joined #git
17:17 Vampire0 smallfoot-, git shortlog </dev/null
17:17 smallfoot- Linux
17:18 smallfoot- but that always shows nothing
17:18 Vampire0 Hm, then not. :-(
17:19 HurricaneHarry joined #git
17:21 smallfoot- I solved it by run 'git status' first, and if that fails (return code) then don't run git shortlog
17:22 Vampire0 Hm, then man page is wrong. It says it uses stdin if stdin is not a terminl or if there is no current branch, but that is wrong
17:23 bilal joined #git
17:24 bilal joined #git
17:24 sturner joined #git
17:25 Starky joined #git
17:26 Vampire0 smallfoot-, if you want to do it the plumbing way: `git rev-parse --verify -q HEAD &>/dev/null && git shortlog`
17:26 M6HZ joined #git
17:27 Es0teric joined #git
17:27 dandaman1 joined #git
17:28 s1scha joined #git
17:29 pbandark1 joined #git
17:31 nixjdm joined #git
17:31 TheSimonator joined #git
17:32 sbasso joined #git
17:33 sturner joined #git
17:34 lafleurdubien Can anybody assist me with setting up a git hook to automatically deploy changes that are commited to master to a directory hosting the live website files?
17:35 Vampire0 lafleurdubien, !deplo
17:35 gitinfo lafleurdubien: [!deploy] Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
17:36 cstratak joined #git
17:38 Atm0spher1c joined #git
17:39 TheSimonator joined #git
17:44 relipse joined #git
17:45 p4trix joined #git
17:46 iamashishkebab2 joined #git
17:49 TheSimonator joined #git
17:49 toothe joined #git
17:49 toothe I am trying to maintain a side branch that just re-bases.
17:49 toothe It basically just has changes to a settings file.
17:50 sbasso joined #git
17:51 Vampire0 toothe, have fun with it
17:51 NonParity joined #git
17:53 theoceaniscool joined #git
17:53 toothe I don't understand why I'm getting aditional messagse when I try to do a rebase.
17:53 toothe (sorry, my connection died)
17:54 toothe https://dpaste.de/5We6
17:54 toothe I don't understand this message
17:54 lafleurdubien I'm trying to set up a simple git hook (I think it should be a "post-receive" hook) that copies any changes pushed to the master repo to  a deployment directory, but my post-hook doesn't seem to be working
17:55 lafleurdubien I understand git is not a deployment tool. This is for testing on a staging server and will never see production or public internet
17:57 sea-gull joined #git
17:57 sea-gull_ joined #git
17:58 Sound joined #git
17:59 Sound_ joined #git
17:59 sathed joined #git
18:00 JrWebDev joined #git
18:00 JrWebDev is using git locally on the production server okay?
18:01 Cabanossi joined #git
18:01 lafleurdubien yeah thats no problem
18:01 JrWebDev just using git init; git add *; git commit -m "my commit"
18:01 JrWebDev you sure? no security issues?
18:01 lafleurdubien (if you're asking me with regards to my question)
18:01 apax joined #git
18:02 lafleurdubien JrWebDev: if you do that, you'll be putting the version control files right on your production server
18:02 ssmall_ joined #git
18:02 JrWebDev i see
18:03 dfaught_ joined #git
18:03 Sasazuka joined #git
18:03 JrWebDev thanks lafleurdubien
18:03 toothe i don't get whats being said here...
18:03 iamashishkebab2 joined #git
18:04 JrWebDev i wanna use version control on my production..straight from production my dev is a little differnt so i wanna use version control on the production..wondering if its okay to do that
18:04 lafleurdubien I think he was asking in general, but I thought he was responding directly to me
18:05 darkPassenger joined #git
18:05 darkPassenger if I have untracked files in my git local repository, will "git checkout -b newBranch" affect any of those untracked files ?
18:05 darkPassenger it's just a bunch of files i dont wanna lose, but i dont want to track them either
18:05 misosoup joined #git
18:06 toothe figured it out.
18:06 daxorid left #git
18:07 Sasazuka joined #git
18:07 lafleurdubien https://gist.github.com/myersg86/a05ed7c8f0fadacaa2506bf775a41f7e
18:08 lafleurdubien if I have that in my hooks directory, shouldn't I expect it to mirror the changes made in the project.git repo to the deploy-folder?
18:09 MattMaker joined #git
18:14 iamasamosa joined #git
18:15 lewix joined #git
18:15 rv joined #git
18:16 chubek_ joined #git
18:18 tarkus joined #git
18:19 User458764 joined #git
18:19 bilal joined #git
18:20 dglambert joined #git
18:20 dandaman1 joined #git
18:21 dersand joined #git
18:21 Tobbi joined #git
18:27 TheSimonator joined #git
18:27 CarlFK joined #git
18:28 Eugene darkPassenger - git will not munge untracked files unless you try really hard. checkout(swithcing branches) will be aborted if any conflicts would occur
18:29 CarlFK a typical cycle is code, test, find bug, repeat  - until the bug is fixed, then git commit
18:29 Eugene But also remember: if git doesn't know about a file, then git doesn't have it saved. Make sure your backups are good ;-)
18:29 nanga joined #git
18:30 CarlFK to test I need the files on a 2nd box.  I can't be the only one.  how do people mange the files when they need to test like this?
18:30 Sound_ joined #git
18:31 heroux joined #git
18:31 Cabanossi joined #git
18:32 iamashishkebab2 joined #git
18:33 davimore joined #git
18:34 iamashishkebab2 joined #git
18:34 _ikke_ CarlFK: rsync
18:36 misosoup joined #git
18:36 _ikke_ CarlFK: I have a small script that combines inotifywait and rysnc to sync files to remote server
18:36 lipsumar joined #git
18:37 sbasso joined #git
18:38 serialoverflow joined #git
18:39 srcerer joined #git
18:39 CarlFK _ikke_: so every time I save a change, rsync the whole dir tree... that sounds doable
18:40 CarlFK currently I run a web server over my dir and on the text box wget -r
18:40 CarlFK it works.. but bleck.
18:40 _ikke_ CarlFK: something like: while true; inotifywait <options>; rsync <options>; done
18:41 _ikke_ That in a script, and you don't have to manually run it
18:41 earnestly joined #git
18:41 ssmall joined #git
18:42 jaziz joined #git
18:42 cads joined #git
18:44 dreiss joined #git
18:44 duderonomy joined #git
18:47 nixjdm joined #git
18:48 PHPanos joined #git
18:50 CarlFK _ikke_: I know a little about inotify - can you dig up the options for me?
18:51 Eugene !deploy
18:51 gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
18:52 nidr0x joined #git
18:52 Acerific joined #git
18:52 Acerific joined #git
18:52 sbasso joined #git
18:56 _ikke_ CarlFK: Something like this: https://gist.github.com/Ikke/a9e2a356d7878f647249#file-watch_gst-sh-L7
18:56 tyreld joined #git
18:57 CarlFK _ikke_: thanks
18:57 _ikke_ CarlFK: But you might want to add --exclude .git
18:57 _ikke_ and instead of the redirection, you can also use -qq
18:59 CarlFK welp... that's another thing I am struggling with... I have a foo branch I want to test, then I learn that my tests need fixing, so I make a testing branch for that.  and keep forgetting to switch from testing to foo ...
18:59 CarlFK but I need all the git stuff.. maybe.
18:59 dvaske joined #git
19:00 CarlFK soon I'll have the testing stuff merged into master and be done with that problem
19:00 neunon joined #git
19:00 Acerific joined #git
19:00 a3Dman joined #git
19:01 PHPanos joined #git
19:03 MattMaker joined #git
19:05 JanC_ joined #git
19:06 neunon joined #git
19:08 robertparkerx joined #git
19:09 Altiare joined #git
19:09 venmx joined #git
19:09 theoceaniscool joined #git
19:09 rominronin joined #git
19:10 _Vi joined #git
19:11 nidr0x joined #git
19:13 caper joined #git
19:14 Zoxc joined #git
19:15 fluffystub joined #git
19:16 hanshenrik joined #git
19:17 hanshenrik is git data deduplication line based?
19:17 nanga joined #git
19:17 nanga joined #git
19:17 _ikke_ no
19:19 User458764 joined #git
19:20 Xenophon1 joined #git
19:20 User458764 joined #git
19:20 col joined #git
19:20 Sasazuka joined #git
19:21 hashpuppy joined #git
19:23 hanshenrik does git support adding completely empty commits, where no data was added/removed, just a commit message?
19:24 d^sh joined #git
19:24 arunc joined #git
19:24 _ikke_ yes
19:24 _ikke_ git commit --allow-empty
19:24 hjkatz joined #git
19:27 perlpilot joined #git
19:27 hjkatz I am unable to find a commit I'm looking for in a large repo. I have 2 tags, prep_v5.09 (the beginning of our build), and feature_v5.09_XERP-9143 (when we merged in a feature branch). When I run `git diff --name-status prep_v5.09..feature_v5.09_XERP-9143` I can clearly see that a certain file (called pdf/common/proc/get_pdf_settings.php) has been d
19:27 hjkatz eleted.
19:27 salamanderrake joined #git
19:27 hjkatz However, when I run `git log --full-history --name-status prep_v5.09..feature_v5.09_XERP-9143`. I cannot see any commit which deletes or renames the file
19:27 hjkatz even with `--follow`
19:28 hanshenrik _ikke_, awesome, thanks
19:28 hjkatz Thoughts? Where is my commit? How could I find it?
19:28 hjkatz I have narrowed it down to a specific range, but I'm lost from here. Even a `git bisect` turned up a poor set of commits which did not include the commit I'm looking for.
19:29 Dougie187 left #git
19:29 _ikke_ hjkatz: git log --diff-filter=D prep_v5.09..feature_v5.09_XERP-9143` ath/to/file ?
19:29 zeroed joined #git
19:29 zeroed joined #git
19:29 hjkatz returns nothin
19:29 _ikke_ smells like an evil merge
19:30 hjkatz yes, yes it does
19:30 peepsalot joined #git
19:30 hjkatz I even resorted to piping these ranges of commits to `git show --stat -m <commits>`
19:30 hjkatz but, no luck
19:30 _ikke_ try to add -c
19:31 aielima joined #git
19:31 hjkatz what's `-c`?
19:31 hjkatz I'll look through the commits, but I'm just curious
19:32 idr0p joined #git
19:32 _ikke_ Any diff-generating command can take the -c or --cc option to produce a combined diff when showing a merge.
19:32 hjkatz oh, run that for git diff, not git show
19:32 hjkatz ok
19:32 _ikke_ git log
19:32 toothe left #git
19:32 hjkatz `git log -c --diff-filter=D --full-history prep_v5.09..feature_v5.09_XERP-9143 -- pdf/common/proc/get_pdf_settings.php`
19:32 hjkatz no luck
19:33 hjkatz git log -c --diff-filter=D --full-history prep_v5.09..feature_v5.09_XERP-9143 -- pdf/
19:33 hjkatz finds stuff, let me look through that
19:33 hjkatz all merges too, hooray!
19:34 olbat joined #git
19:34 _ikke_ right
19:34 _ikke_ the problem is that git log / show diff against the first parent
19:34 hjkatz ah
19:35 hjkatz but it might be the second one (in fact that's most likely the case with how we merge branches)
19:35 _ikke_ right
19:35 hjkatz (makes everything more complicated :/)
19:35 Dougie187 joined #git
19:37 pbandark joined #git
19:39 hjkatz ok, so the diff created with the `-m` flag as in `git show -m` will generate 2 entries
19:39 hjkatz but, I don't understand the output
19:39 hjkatz First entry:
19:39 hjkatz commit 6296244398abca35f598e3df7476e96f1ffdcda2 (from 1fadcaf0c980971e2ea65f67b81165e677ed907b)
19:39 hjkatz Merge: 1fadcaf 3fd9242
19:39 hjkatz Second entry:
19:40 hjkatz commit 6296244398abca35f598e3df7476e96f1ffdcda2 (from 3fd9242fefad54b3da6e306567031a5c6dde1f1b)
19:40 hjkatz Merge: 1fadcaf 3fd9242
19:40 hjkatz This is showing the diff between each parent to the merge?
19:40 Es0teric joined #git
19:40 hjkatz Where the first is `git diff 629624^1` and the second is `^2`?
19:41 finalbeta joined #git
19:43 hjkatz Thank you so much for your help!
19:43 hjkatz I found the problem commit
19:43 hjkatz you rock man!
19:43 hjkatz thanks for teaching me about -c
19:43 hjkatz that's what did it :)
19:43 Es0teric joined #git
19:44 re1 joined #git
19:45 _ikke_ nice :-)
19:45 barbos joined #git
19:46 Doginal joined #git
19:47 nixjdm joined #git
19:48 a3Dman joined #git
19:48 a3Dman joined #git
19:49 ssmall_ joined #git
19:52 roelmonnens joined #git
19:53 theoceaniscool joined #git
19:55 dreiss joined #git
19:56 cagomez joined #git
19:56 lipsumar joined #git
20:01 justin3 joined #git
20:01 Husky_Apocalypse joined #git
20:01 mikecmpbll joined #git
20:02 a3Dman joined #git
20:03 otiose joined #git
20:03 sea-gull joined #git
20:03 sea-gull_ joined #git
20:07 fbiaq joined #git
20:07 ananteris joined #git
20:07 ananteris left #git
20:09 rominronin joined #git
20:10 nowhereman joined #git
20:11 venmx joined #git
20:14 cdown joined #git
20:16 Cabanossi joined #git
20:16 dandaman joined #git
20:17 finalbeta joined #git
20:17 m0viefreak joined #git
20:17 miczac joined #git
20:19 donught joined #git
20:19 Huxnh joined #git
20:19 donught joined #git
20:22 Maple__ joined #git
20:22 Maple__ joined #git
20:22 Maple__ joined #git
20:22 Soni can I add custom diff methods/file types to git?
20:22 Soni or do I need to serialize everything as text?
20:23 durham_ joined #git
20:24 aidalgol joined #git
20:24 h12o joined #git
20:24 oskarkv joined #git
20:25 _ikke_ You can
20:25 cdg joined #git
20:25 dvaske joined #git
20:25 _ikke_ man git config
20:25 gitinfo the git-config manpage is available at https://gitirc.eu/git-config.html
20:25 ericnoan joined #git
20:26 _ikke_ https://git-scm.com/docs/git-config#git-config-diffltdrivergtcommand
20:26 dandaman1 joined #git
20:28 manuelschneid3r joined #git
20:29 cseder joined #git
20:30 lafleurdubien Can anyone explain what is causing this error when I'm trying to push to master: "remote: fatal: Unable to create '/var/www/repo/testing.git//index.lock': Permission denied"
20:31 lafleurdubien I believe its related to my post-receive hook here: https://gist.github.com/myersg86/0e601e38d2149e24aa0e42e56b9f94a2
20:31 cseder joined #git
20:32 _ikke_ ls -l /var/www/repo/testing.git//index.lock
20:33 cseder lafleurdubien try rm -f ./.git/index.lock
20:33 cseder lafleurdubien with your directories offcourse
20:33 durham joined #git
20:34 zealsham_ joined #git
20:35 cseder lafleurdubien try rm -f /var/www/repo/testing.git//index.lock
20:35 cseder one search away with google
20:35 kegster joined #git
20:36 Bwsao joined #git
20:40 justin3 joined #git
20:42 lafleurdubien thats not doing the trick unfortunately
20:42 lafleurdubien I think its dealing with permissions
20:43 lafleurdubien Unable to create '/var/www/repo/datahostcustomers.git//index.lock': Permission denied
20:45 _ikke_ ls -l /var/www/repo/testing.git//index.lock
20:45 _ikke_ What does that return?
20:46 dreiss joined #git
20:46 Vampire0 lafleurdubien, I guess the user with which you connect does not have the permissions to access the repository and specifically to create the lock file
20:47 Vampire0 lafleurdubien, regarding Git as deployment tool, you can have a look at !deploy
20:47 gitinfo lafleurdubien: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
20:47 nixjdm joined #git
20:49 raynold joined #git
20:52 netj joined #git
20:52 sturner joined #git
20:53 h12o joined #git
20:53 lafleurdubien Vampire0 _ikke_ cseder THANK YOU!!
20:54 Gustavo6046 joined #git
20:54 cseder we're all angels
20:57 borkr joined #git
21:00 Hello71 joined #git
21:01 nevodka joined #git
21:01 matt|home is 'git push' to a remote the same thing as making a pull request ?
21:02 jeffreylevesque joined #git
21:02 kadoban matt|home: No, but they're a bit similar in some ways. A pull request is kind of a push that someone else has to approve, in a way. Either because you don't have the permissions to push, or want reviews or etc.
21:03 matt|home right
21:03 matt|home so theres a different command for pull request? i'll look that up
21:03 kadoban On github, one of the first steps of a pull request is to push to your own fork though, because that's where you have to make the pull request from.
21:04 matt|home oooh
21:04 marianina8 joined #git
21:04 matt|home so i have to upload or push it to my github first, and then from my github account to another?
21:04 kadoban There is a git command "request-pull", but it's not used as often as platform-specific ones like the one on github or whatever hosting thing you could be using.
21:04 matt|home i can't do it directly from my computer?
21:04 kadoban Not without github's specific CLI tool thing
21:04 matt|home fooey
21:04 kadoban Or whatever other tools they have, I don't really use those.
21:05 druonysus joined #git
21:06 matt|home thanks kadoban
21:06 kadoban Anytime
21:07 matt|home i have a small problem now.. hm
21:11 askb joined #git
21:11 cagomez joined #git
21:12 apax joined #git
21:12 matt|home okay so.. right now im having some minor authentication issues when i try to push changes to a remote repo. i know for a fact that my github account is able to make those changes however. how do i change the settings in git to switch between different accounts?
21:12 matt|home is that possible?
21:13 Hello71 joined #git
21:13 ssmall joined #git
21:13 kadoban I just use SSH for all of this, in which case you can do it with SSH aliases and etc.
21:14 h12o joined #git
21:14 serialoverflow joined #git
21:14 kadoban But I don't think you should need to have multpile github accounts, I don't really know how a lot of their stuff works though.
21:15 apax joined #git
21:16 planigan joined #git
21:16 telephone joined #git
21:16 telephone joined #git
21:17 dedicated joined #git
21:17 zeroed joined #git
21:17 matt|home kadoban - yeah me neither im having to learn all this for work
21:18 kadoban I try to avoid learning too much about github itself. I don't want to get tied to it.
21:19 ZyX-I joined #git
21:20 Kochergan joined #git
21:21 dansan joined #git
21:21 Marble68 joined #git
21:21 Marble68 o/ Hi all
21:22 romank joined #git
21:22 peterbecich joined #git
21:22 dansan Hello #git!  I was silly and didn't tag my branch when I submitted a patch set and have since made, comitted and rebase/squashed changes.  Now I want to compare exactly what changes I made. :(  What's the easiest way of figuring out what the base of my branch *was* when I submitted (via git-email) the patches?
21:22 clickjack joined #git
21:23 dansan maybe just reflog and try to find one that matches the correct date?
21:23 kadoban Can you view the email? It's been a while, but I thought it says somewhere in there the commit id it was based on. Or yeah the reflog will work if you can narrow down the timing enough.
21:24 dansan kadoban: thanks.  Yes I can view the email and I tried going gitk <value> with some of the hash values in the email, but didn't get anything.  I don't *think* I've done a git gc since then
21:24 dansan I'll link the email
21:24 ZyX-I joined #git
21:25 dansan This is the thread: https://gcc.gnu.org/ml/gcc-patches/2017-04/threads.html#01338
21:27 dsdeiz joined #git
21:27 dsdeiz joined #git
21:27 rwp dansan, If it were me I would take those patches and apply them to my own repository and recreate that patch branch that you submitted. Then you can diff locally between the submitted patches and what you have now.
21:28 dansan rwp: that's a good idea, thanks
21:28 salamanderrake joined #git
21:29 dandaman1 left #git
21:30 col left #git
21:31 Vampire0 dansan, what exactly did you gave to gitk?
21:32 Vampire0 dansan, I guess one of the values besides the dots in the line starting with "index"?
21:32 dansan Vampire0: the hash value right after the "diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c", the line starting with "index"
21:32 dansan yes :)
21:32 Vampire0 dansan, iirc, those are trees, not commits
21:32 dansan I was guessing not :)
21:33 ssmall joined #git
21:33 durham joined #git
21:34 Vampire0 dansan, ah bullshit, of course not tree ids, but blob ids
21:34 h12o joined #git
21:34 Vampire0 dansan, it is the blob before the change and the blob after the change
21:34 Vampire0 dansan, the commit id is nowhere mentioned because it is meaningless
21:35 kristofferR joined #git
21:35 Vampire0 dansan, whereever you apply those patches you will get a different commit id out
21:35 sturner joined #git
21:35 Vampire0 dansan, commiter name, commiter email, commit date and the commit you apply the patches to all influence the commit id that you get in the end
21:35 Vampire0 dansan, so having the commit id in there is not all too helpful
21:36 dansan Vampire0: OK.  I'm creeping back through the reglog and looking at the commits and I've almost found the correct commit date
21:36 dansan I just don't want to exlude any minor changes I made since my last patch, that I may have forgotten.
21:37 dansan whew, I found it. :)
21:38 durham_ joined #git
21:38 dansan I usually tag it and then create a "rebase for compare" branch out of them.
21:38 qbolt How do I ignore executable linux files?
21:39 dansan interesting, I didn't know you coudl
21:39 dansan *could
21:39 sonOfRa qbolt: if they have an extension, ignore *.extension. If you can enumerate the files you produce in your repository, enumerate them in your .gitignore.
21:39 qbolt They don't have an extension.
21:40 sonOfRa If they go into a folder like "target/" or "build/", ignore that folder
21:40 qbolt Well, It's a class - The repo is divided into "weeks". Each week has c files with their corresponding output files.
21:41 Dougie187 left #git
21:42 sonOfRa qbolt: if they go in week1/target/ week2/target, you can ignore **/target
21:42 kadoban qbolt: Ignore everything and then exclude all the real extensions you don't want ignored would work.
21:42 kadoban But is funky
21:42 qbolt They don't go into a target folder
21:42 qbolt I may have found a way though
21:42 sonOfRa Well, then you'll have to enumerate them
21:43 qbolt The files I want are '*.c'
21:43 qbolt So I just went into each week with c files and put a .gitignore file in each with '!/*.c' in it.
21:44 kadoban Just do uhm   *     !*/   !*.c   or something
21:44 sonOfRa You might want to add !/*.h
21:44 sonOfRa Because generally, where there's c files there's also h files
21:44 qbolt Oh ya
21:44 qbolt Thanks!
21:45 tymczenko joined #git
21:46 Vampire0 qbolt, you can do it in one .gitignore in the parent folder with `/*/*\n!/*/*.c\n!/*/*.h` which means "exclude everything in direct subfolders except c and h files in them"
21:46 qbolt Well, other 'week' folders may have other file extensions I don't want ignored - so then I'd have to go and remember to add them all
21:47 qbolt It's kind of a special case
21:47 nixjdm joined #git
21:47 Vampire0 dansan, at least that is the reason the commit id is not there by default. You can add the base commit with --base=... though according to man git format-patch
21:47 gitinfo dansan: the git-format-patch manpage is available at https://gitirc.eu/git-format-patch.html
21:48 Gustavo6046 joined #git
21:48 dansan Vampire0: Is there an option to do that with git-send-email as well?
21:48 cagomez is git reset HEAD~ the same as HEAD~1?
21:48 rv joined #git
21:48 cagomez also, is --soft implicit?
21:49 tvw joined #git
21:50 m0viefreak HEAD~ == HEAD~1
21:50 m0viefreak and no, --mixed is
21:52 tnecniv joined #git
21:53 sunri5e joined #git
21:54 h12o joined #git
21:55 mostlybadfly joined #git
21:59 Levex joined #git
21:59 dfaught joined #git
22:00 sparr joined #git
22:00 Soni _ikke_: can I use that with, say, github?
22:01 sparr joined #git
22:02 h12o joined #git
22:03 d-fence joined #git
22:04 Marble68 Hi everyone. I am trying to squash multiple commits using rebase.  Basically - the funcationality I’m after is I am working in a dev branch that’ve commit multiple times to over the past several days. I branched from master - made multiple commits and synced, fixing the same files multiple times.  Now - I want to squash them all into a single, new branch for merging (calling it ToMerge) - and commit this new ToMerge bra
22:04 Marble68 This new ToMerge branch will then handed off for code review. Is the process I have tried is to  branch off master again as my “ToMerge” branch, then rebase the ToMerge branch off of my dev branch. My goal is a clean branch where the current state of the Dev branch will appear as changes to my ToMerge branch. I believe rebase HEAD and SQUASH (vs pick) are part of process - but I can’t get it work
22:04 brent__ joined #git
22:05 Sound joined #git
22:05 Vampire0 dansan, yes, send-email uses format-patch under the hood and forwards the argument, I just tried
22:06 Marble68 the goal is the ToMerge won’t have the interim commits in its history - so when i hand off to dev lead, we can review *just the changes* for code review, and he merge ToMerge into a branch I don’t have access to
22:06 Sound_ joined #git
22:06 Levex joined #git
22:06 Vampire0 dansan, you also can see this if you set GIT_TRACE to 1 before doing the send-email command
22:07 Marble68 (we have this huge, legacy architecture, and sometimes it take multiple attempts to bug fix things - so I can commit something, we push it to a test server, design and QA might kick it back, and I have to try and fix it a different way)
22:07 Marble68 any directions or links would be most appreciated.
22:09 sparr joined #git
22:09 sparr joined #git
22:09 bronson joined #git
22:09 Dyu joined #git
22:11 Vampire0 Soni, of course you can, because the diff driver is just a displaying thing. You just configure which program will be used to show you a diff of two blobs of this type. You do not influence how the data is stored in the repository. So by doing that config you do not ensure efficient storage of binary files!
22:12 ertes joined #git
22:12 Soni Vampire0: so it's basically useless?
22:12 Soni so I need to write my own VCS because git is too lazy to have useful hooks >.>
22:12 h12o joined #git
22:13 Vampire0 Soni, no, otherwise it would not be there. It is very useful if you e. g. have a program that can show nice diffs for PNGs and you use diff, you can see your changes except of only the message "binary file x.png was modified"
22:13 romank joined #git
22:14 Vampire0 Soni, if you think such a feature would be useful, write to the mailing list. That is the place for such discussions.
22:14 Soni I thought the point of git was to be the ultimate VCS but it can't even handle voxel data?
22:14 matt|home okay, i've been at this for 30 minutes and nobody in #github is online or able to help apparently.. does anyone here use github? i have no idea what im doing at this point
22:15 Vampire0 Soni, it is the ultimate VCS to version sourcecode. Like most VCS it is target to sourcecode and thus highly optimized for textual files.
22:15 Soni Vampire0: my source code *is* voxel data
22:15 Vampire0 Soni, it can store binary files just fine, it is just not that efficient for them
22:15 Vampire0 Soni, I don't know voxel data
22:16 Soni Vampire0: source code comes in all shapes and sizes, here's an example of pixel data source code http://esolangs.org/wiki/Piet
22:16 kadoban matt|home: You can ask, super-github-specific questions don't get answered very well here though in general
22:17 diogenese joined #git
22:17 tnecniv joined #git
22:17 exotime joined #git
22:17 Vampire0 Soni, that is why I said textual data
22:18 matt|home okay. i've run "git clone" on a remote repo and downloaded it onto my computer yeah? i changed some files around, made some modifications, ran git add then git commit. after that, i changed the 'remote' repo from the one i downloaded it from to -my- github account
22:18 Soni Vampire0: I need a general-purpose VCS that isn't limited to textual data
22:18 Vampire0 Soni, Git is in no way limited to textual data
22:18 matt|home i then ran 'git push' , which apparently only pushes the current branch i am in, one branch at a time, to github. what i need to know is how to send just the branch im working on as a pull request to the other github account from mine
22:18 Soni no but it doesn't handle binaries very well
22:18 Vampire0 Soni, as I said, you can stuff binary data just fine in Git. It is just not as efficient with binary data that often changes than it is with textual data
22:19 matt|home and i'd like to know if that's the correct order im doing things in
22:19 Soni you can't git a photoshop file, a .doc (not sure if that applies to .docx), etc
22:19 ssmall joined #git
22:20 * Hello71 smells troll
22:20 Vampire0 Soni, as I said before, write to the mailing list and make the core developers think it is a good idea to better support binary data in such a way and maybe contribute the code for it. ;-)
22:20 Soni Vampire0: I want a hook to make binary data efficient
22:20 Vampire0 Soni, and yes of course you can add a photoshop file doc file and docx file to Git
22:20 kadoban matt|home: How 'git push' works depends on your push.default setting, by the way, you can change it if you really want. But ya that sounds fine. Then you create the PR using the web UI
22:20 Soni even if both the sending and receiving ends need it
22:20 matt|home okay. so im messing up on the web UI stuff then. thanks kadoban
22:20 Vampire0 Soni, one last time, then I ignore you. Go to the !mailinglist and discuss it there
22:21 Vampire0 Soni, !list
22:21 gitinfo Soni: [!mailing_list] The mailing list can be reached via git@vger.kernel.org. You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git
22:21 * Vampire0 pushes the troll to Hello71
22:21 Vampire0 Hello71, yours, no push-back
22:21 kadoban matt|home: Though usually I create a specific branch for my PR, which it doesn't sound like you did. But you don't have to worry about that for now.
22:22 kadoban matt|home: So then you should be able to ... I think you just go to your repo/fork/whatever on the github website and it'll have a button for "make a PR from this" or some crap, I forget the wording
22:22 matt|home yeah.. forking still confuses me
22:22 tnecniv joined #git
22:23 Vampire0 matt|home, the important part is, that you didn't just create the repo for your user, but that you pushed the "Fork" button on the upstream repo
22:23 Vampire0 matt|home, you can only make pull request within the same family of repos
22:23 matt|home i have not done that yet
22:23 Vampire0 matt|home, if you didn't do this yet, then how did you push?
22:24 matt|home so i have to create a fork of the repo first before i can make pull requests to it?
22:24 matt|home to my brb
22:24 Vampire0 brb?
22:24 Levex joined #git
22:24 matt|home sorry
22:25 h12o joined #git
22:25 matt|home Vampire0 : okay i may have made a serious miscalculation. here's what i did:
22:25 Vampire0 matt|home, yes, as I said, you can only create GitHub pull requests between related repositories. Related in this case means somehow you can get from one to the other by following parent-fork relations
22:25 matt|home 1) 'git clone https://some-remote-repo-i-have-not-forked-yet'
22:25 matt|home onto my local computer
22:25 matt|home i then manually edited the conf.py file to change the 'remote origin' to -my- github account, and pushed the changes onto a newly-created repo
22:26 matt|home was i not supposed to do that?
22:26 Vampire0 matt|home, btw. you can also create forks and pull-requests and many other stuff from the commandline if you use a tool that speaks to the API of the site. !git-spindle is my favorite to date
22:26 gitinfo matt|home: https://github.com/seveas/git-spindle is a handy tool to use the features of GitHub (and GH Enterprise), GitLab, BitBucket and possibly more from the command line.
22:26 matt|home mkay i'll take a look at it
22:26 Vampire0 matt|home, conf.py?
22:26 matt|home the config file or whatever
22:26 matt|home .git/config
22:26 Vampire0 matt|home, nope, that was wrong, but not tragic
22:27 matt|home im sorry :<
22:27 lipsumar joined #git
22:28 Vampire0 matt|home, just (optionally) delete your manually created repo on GitHub, go to the upstream repo, press the Fork button, then push to the newly created fork and you will be able to open a pull requests in the web ui or from the commandline if you use a tool that can do it
22:28 matt|home ah okay
22:28 matt|home it's a little roundabout but i can do that
22:28 matt|home thank you Vampire0 <3
22:28 Vampire0 matt|home, btw. in most cases it is a good idea to not edit the config file directly, but to use the appropriate commands for it
22:29 matt|home ah yeah, remote set origin or something?
22:29 dirtyroshi joined #git
22:29 matt|home with uh, git config right?
22:29 Vampire0 matt|home, remote set-url iirc man git remote
22:29 gitinfo matt|home: the git-remote manpage is available at https://gitirc.eu/git-remote.html
22:29 matt|home right
22:29 matt|home thank you <3
22:30 Vampire0 matt|home, you could use git config, but you should use git remote here
22:30 Vampire0 you're welcome, thanks for the tits with hat :-D
22:30 gitinfo matt|home: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
22:31 Cabanossi joined #git
22:32 robattila256 joined #git
22:32 Levex joined #git
22:35 XenophonF joined #git
22:35 Uemk joined #git
22:35 TikityTik joined #git
22:36 roelmonnens joined #git
22:36 _ADN_ joined #git
22:36 _ADN_ joined #git
22:37 rdswift joined #git
22:38 sparr I want to add a pre-commit hook that checks for changes to my "source" files and builds new "object" files to be committed at the same time. Are there guidelines or best practices for how to accomplish this?
22:40 justanotheruser joined #git
22:40 idlemind joined #git
22:41 TbobbyZ joined #git
22:42 kadoban sparr: Sounds bad. Don't track generated content, in general.
22:43 jaziz joined #git
22:44 anuxivm joined #git
22:44 YuGiOhJCJ joined #git
22:45 Oatmeal joined #git
22:45 h12o joined #git
22:45 idlemind_ joined #git
22:46 pietv joined #git
22:48 telephone joined #git
22:48 telephone joined #git
22:48 sparr I know. This isn't general.
22:50 roar joined #git
22:51 kadoban I would try very hard to avoid that, it's going to be gross, kind of annoying, and sounds like it'd break some of the better parts of git. Now you can't use the index very well, commiting will probably be annoyingly delayed, merges are suddenly obnoxious, etc.
22:52 ssmall joined #git
22:52 raijin joined #git
22:55 iamashishkebab2 joined #git
22:56 richardm1 joined #git
22:56 gugah joined #git
22:58 romank joined #git
22:58 phase2 joined #git
22:59 TbobbyZ joined #git
22:59 yohnnyjoe joined #git
23:01 ssmall joined #git
23:02 maroloccio joined #git
23:03 Levex joined #git
23:03 arunc_ joined #git
23:05 Reiner joined #git
23:05 h12o joined #git
23:05 a3Dman joined #git
23:06 _Vi joined #git
23:09 NeXTSUN joined #git
23:09 matt|home minor question, how come each time i modify a file in a repo on my local computer, i have to run 'git add filename' again? i thought once you ran git add it kept track of revisions til you ran git rm ?
23:09 filthy_peasant joined #git
23:11 kadoban matt|home: Naw, you have to choose what things you want to "stage" before you commit. If you really want to, there's an invocation of 'git commit' that lets you skip that, but it's not a good habit, the staging thing is actually quite useful.
23:12 matt|home mkay. so i have to stage each time. no worries. thanks kadoban
23:12 matt|home man you have been ridiculously helpful today ;P
23:12 kadoban :) I try
23:12 _Vi joined #git
23:13 shgysk8zer0 joined #git
23:13 raijin joined #git
23:13 roar joined #git
23:14 sparr kadoban: the build step will take fractions of a second, even with hundreds of files changed. and the object files will be much smaller than the source files.
23:15 gaucheph joined #git
23:15 madewokherd joined #git
23:15 kadoban sparr: Then commiting won't be that annoying. The rest of the problems still apply though.
23:15 sparr the purpose of this repository is for people to get the object files from
23:15 sparr it will probably eventually be a web page hosted via github.io
23:16 kadoban Git isn't a software distribution mechanism, and trying to make it one has more drawbacks than I'm personally comfortable with. It ruins kind of all of the best parts of git.
23:16 sparr my object files are not software
23:16 sparr (neither are my source files)
23:17 kadoban Then replace the word software with whatever applies in the above, doesn't really change anything.
23:17 ssmall joined #git
23:17 sparr ok, let me describe my use case, and you might recommend a different approach entirely
23:18 sparr the context is the game Factorio. this is a factory simulation game, with conveyor belts and machines and robotic arms that move things around.
23:18 sparr the game allows you to "blueprint" a piece of your factory, so you can stamp down a copy of that piece, elsewhere or in another instance of the game. it also allows you to share these blueprints with other players by exporting them as a dense "exchange string"
23:19 sparr an exchange string is a json blob that has been gzip'd then base64 encoded
23:19 sparr I want to maintain a version-controlled diffable repository of those json blobs, so people can contribute improvements to crowd-sourced "best" designs.
23:20 sparr and I want to distribute exchange string versions of every json blob in the repository, so that people can use the designs in their game.
23:20 Marumarsu joined #git
23:20 sparr that's the gist of it (no pun intended)
23:21 PettanShoutaKun_ joined #git
23:21 PettanShoutaKun_ how do I undo a merge commit?
23:21 kadoban Use git for the source code part, and write a script that "builds" the things and publishes them wherever is appropriate
23:21 PettanShoutaKun_ I merged a pull request into master... and it seems to have broken everything
23:21 PettanShoutaKun_ I'd like to pull it out for the time being
23:21 sparr "wherever is appropriate" was going to be on github.io, from the same repository.
23:21 sparr I want to reduce the number of steps required to contribute to this repository.
23:22 a3Dman joined #git
23:22 sparr and the number of separate systems I have to maintain to keep the repository working
23:22 kadoban Is that the pages thing? You can do that if you want, but conceptually it should be separate from the part that is used for development. It's just a way to publish sites that for some reason uses git.
23:22 sparr yes, github.io is where github pages show up
23:22 sparr however, the pages part comes later
23:23 sparr for starters, I just want a plain directory listing of text files containing exchange strings
23:23 Uneliasmarsu joined #git
23:23 sparr however many steps it takes someone to get a json modificatio into the repository, I want there to be zero extra steps for the equivalent change to become available to players in the form of an updated exchange string
23:23 Marumarsu joined #git
23:23 sparr so far, a precommit hook to build the new string, the including the new string in the commit, is the least overhead solution I've come up with
23:24 filthy_peasant left #git
23:28 arunc__ joined #git
23:30 _Vi joined #git
23:31 Cabanossi joined #git
23:34 Stumbler joined #git
23:36 ssmall joined #git
23:36 Xenophon1 joined #git
23:36 h12o joined #git
23:39 bilal joined #git
23:41 JUSY joined #git
23:46 h12o joined #git
23:46 _Vi joined #git
23:48 duderono_ joined #git
23:49 VladGh joined #git
23:51 VladGh joined #git
23:53 njbair joined #git
23:54 thiago joined #git
23:54 johnflux joined #git
23:54 johnflux joined #git
23:56 VladGh joined #git
23:57 jnewt joined #git
23:57 mel00010 joined #git
23:57 h12o joined #git
23:58 njbair joined #git
23:58 bongo joined #git

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