Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-13

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

All times shown according to UTC.

Time Nick Message
00:00 danslo joined #git
00:01 Ph_ joined #git
00:03 sagerdearia joined #git
00:04 nevodka joined #git
00:04 ToBeCloud joined #git
00:06 threenplusone joined #git
00:06 medeirosthiiago joined #git
00:06 EvilPenguin joined #git
00:06 snowkidind joined #git
00:07 harish joined #git
00:08 sagerdearia joined #git
00:10 rubie joined #git
00:11 johnmilton joined #git
00:12 sagerdearia joined #git
00:14 SwiftMatt joined #git
00:16 sagerdearia joined #git
00:16 neilthereildeil left #git
00:17 johnmilton joined #git
00:18 neunon joined #git
00:18 inflames joined #git
00:21 rgrinberg joined #git
00:21 sagerdearia joined #git
00:23 bluepixel joined #git
00:23 rbern joined #git
00:24 ekinmur joined #git
00:25 snthsnth joined #git
00:27 termina__ joined #git
00:27 Syn_Don joined #git
00:29 synnk joined #git
00:30 sonikspin joined #git
00:31 tesuji joined #git
00:31 crayon joined #git
00:31 crayon joined #git
00:31 stamina joined #git
00:32 Rodya_ joined #git
00:32 DolpheenDream joined #git
00:32 NeverDie joined #git
00:34 ekinmur joined #git
00:35 romerocesar joined #git
00:36 MattMaker joined #git
00:38 mycyber joined #git
00:38 rangergord joined #git
00:40 midnightmagic joined #git
00:43 prawnzy joined #git
00:43 Sako joined #git
00:44 rangergord Any idea why this doesn't work? alias gf='git log --follow -p --'  . "gf somefile" returns "git: command not found". But if I use the expanded command instead of the alias, it works.
00:44 yitz rangergord: what do you get when you run 'type git' ?
00:45 rangergord git is hashed (/usr/bin/git)
00:45 thiago technically speaking, that's not a Git quesiton, but one related to your shell
00:46 thiago that said, it works here.
00:46 rangergord thiago: you're right. I'll take it to #bash
00:46 thiago not using bash
00:47 nodd left #git
00:47 mingrammer joined #git
00:53 EvilPenguin joined #git
00:55 moei joined #git
00:56 mellernoia-away joined #git
00:56 shgysk8zer0 joined #git
01:04 dweelie joined #git
01:06 DolpheenDream joined #git
01:10 bluezone joined #git
01:11 midnightmagic joined #git
01:13 dweelie joined #git
01:14 Rodya_ joined #git
01:15 cqi joined #git
01:15 romerocesar joined #git
01:16 hahuang61 joined #git
01:16 JanC_ joined #git
01:16 pks joined #git
01:17 clemf joined #git
01:18 fguillot joined #git
01:20 Gurkenglas joined #git
01:22 dweelie joined #git
01:23 ochorocho__ joined #git
01:23 nettoweb Hello guys, My file was on gitignore, now I remote the file from gitignore but git never see the file after that.
01:23 nettoweb is it the default behavior?
01:24 DaddyEric joined #git
01:25 rewt you mean remove the file from .gitignore?
01:25 rewt then it should just show up as an untracked file in 'git status'
01:26 romerocesar joined #git
01:26 finalbeta joined #git
01:27 GT4066 joined #git
01:29 L-11 joined #git
01:32 sagerdearia joined #git
01:32 romerocesar joined #git
01:32 evanwang joined #git
01:32 ResidentBiscuit joined #git
01:36 e14 joined #git
01:39 L-11 joined #git
01:39 durham_ joined #git
01:39 d^sh joined #git
01:39 clemf joined #git
01:40 Vampire0_ joined #git
01:41 antipsychiatry joined #git
01:46 SpeakerToMeat joined #git
01:46 fguillot joined #git
01:46 kristian_on_linu joined #git
01:46 kristian_on_linu hi
01:46 kristian_on_linu okay, so this is 101 stuff ... I renamed a project at GitLab and now I can't push it from local
01:46 bremner git remote set-url thecorrectthing
01:47 bremner err. well, you know, with a remote name as well
01:48 harish joined #git
01:51 kristian_on_linu hi, bremner ... like this?  git remote set-url https://gitlab.com/kristiannordestgaard/mosura.git
01:51 kristian_on_linu output of git remote -v looks fine to me
01:52 bremner maybe: git remote set-url origin  https://gitlab.com/kristiannordestgaard/mosura.git
01:52 nonconvergent joined #git
01:53 cranndarach joined #git
01:53 kristian_on_linu ah, now it works! Thanks!
01:54 dodobrain joined #git
01:54 dodobrain joined #git
01:55 kaldoran joined #git
01:55 ResidentBiscuit joined #git
01:56 bremner welcome.
01:57 ayjay_t joined #git
02:00 HoierM joined #git
02:01 nonconvergent joined #git
02:02 danslo joined #git
02:02 mar77i_ joined #git
02:03 prawnzy joined #git
02:04 Goplat joined #git
02:05 boombatower joined #git
02:07 boombatower joined #git
02:07 dreiss joined #git
02:07 daynaskully joined #git
02:10 hexagoxel joined #git
02:10 msafi joined #git
02:10 fstd_ joined #git
02:10 sadmac left #git
02:11 msafi Folks, I have this PR that is showing inaccurate differences between the submitted code and the branch against which it wants to merge: https://github.com/text-mask/text-mask/pull/201/files
02:11 romerocesar joined #git
02:11 msafi For example, the first file which is angular2/README.md has this content in the PR https://raw.githubusercontent.com/billcolumbia/text-mask/ac2a2dcbebda3ea17e876e48295343cff0634dd6/angular2/README.md and on master it has this content https://raw.githubusercontent.com/text-mask/text-mask/master/angular2/README.md
02:12 msafi So the diff is showing things that are inaccurate. Does anyone know why?
02:12 mingrammer joined #git
02:14 guilherme joined #git
02:14 QwertyDragon joined #git
02:16 Salander27 joined #git
02:16 prawnzy joined #git
02:20 zivester joined #git
02:23 msafi joined #git
02:23 msafi Sorry got disconnected...
02:26 ojdo joined #git
02:26 msafi_ joined #git
02:28 Mottie joined #git
02:29 lagothri1 joined #git
02:30 Lyqyd joined #git
02:32 Dougie187 joined #git
02:38 Mottie would anyone be willing to help me figure out why my I can't sign my commits with gpg since I've updated to git 2.10.0?
02:43 nevodka joined #git
02:44 cdg joined #git
02:44 nonconvergent joined #git
02:45 ahr3n joined #git
02:47 kyan joined #git
02:48 GandalfTheWizard joined #git
02:49 mizu_no_oto joined #git
02:53 netj joined #git
02:53 clemf joined #git
02:55 Peuc joined #git
02:56 dreiss joined #git
02:58 azerus joined #git
03:00 dendazen joined #git
03:03 chachasmooth joined #git
03:04 hexagoxel joined #git
03:05 aavrug joined #git
03:06 aavrug joined #git
03:06 duderonomy joined #git
03:07 mingrammer joined #git
03:08 mizu_no_oto joined #git
03:11 azerus joined #git
03:15 Vortex34 joined #git
03:16 hahuang61 joined #git
03:17 e14 joined #git
03:18 ekinmur joined #git
03:18 robotroll joined #git
03:20 sadmac joined #git
03:21 dreiss joined #git
03:24 tgunr joined #git
03:25 ochorocho__ joined #git
03:26 energizer left #git
03:30 govg joined #git
03:30 rchavik joined #git
03:33 hahuang61 joined #git
03:34 the_cybersphinx joined #git
03:34 sadmac left #git
03:38 ksefchik joined #git
03:38 cyan__ joined #git
03:39 a_thakur joined #git
03:41 Dougie187 left #git
03:41 rafalcpp joined #git
03:45 ksefchik joined #git
03:46 ahr3n_ joined #git
03:51 raspado joined #git
03:55 ahr3n joined #git
04:00 dreiss joined #git
04:00 dermoth joined #git
04:01 dust_ joined #git
04:02 mehola joined #git
04:02 danslo joined #git
04:05 BlackPanx joined #git
04:06 nilg joined #git
04:08 Bl4ckpajamas joined #git
04:12 rscata joined #git
04:21 snthsnth joined #git
04:24 MCoola joined #git
04:27 Andrew_K joined #git
04:30 mingrammer joined #git
04:34 evanwang joined #git
04:35 Nik joined #git
04:38 brandonw joined #git
04:42 subhojit777 joined #git
04:43 overlord_tm joined #git
04:44 meloc joined #git
04:46 mingrammer joined #git
04:46 meloc joined #git
04:46 lolmac joined #git
04:46 dust_ joined #git
04:47 dreiss joined #git
04:48 meloc joined #git
04:51 DaddyEric joined #git
04:51 daey_ joined #git
04:51 DaddyEric_ joined #git
04:55 dreamyspell joined #git
04:56 greendo joined #git
04:57 shgysk8zer0 joined #git
05:01 Cabanossi joined #git
05:06 Salander27 joined #git
05:09 a3Dman joined #git
05:13 ahr3n_ joined #git
05:17 _ng joined #git
05:18 OdicforceSounds joined #git
05:20 newbiee joined #git
05:20 ahr3n joined #git
05:22 nevodka joined #git
05:22 _ng joined #git
05:25 ochorocho__ joined #git
05:30 theskillwithin joined #git
05:30 bocaneri joined #git
05:32 jceb joined #git
05:44 darkbit joined #git
05:46 jknetl joined #git
05:47 thekrynn_ joined #git
05:48 vuoto joined #git
05:48 ThomasLocke joined #git
05:48 ThomasLocke joined #git
05:52 Raging_Hog joined #git
05:52 eshlox joined #git
05:52 hwlog joined #git
05:55 snthsnth joined #git
05:59 mariuscc joined #git
06:01 sonikspin joined #git
06:02 zeroed joined #git
06:02 zeroed joined #git
06:03 Macaveli joined #git
06:03 danslo joined #git
06:07 evanwang joined #git
06:09 b1tchcakes joined #git
06:11 qt-x joined #git
06:12 mniip joined #git
06:13 thekrynn_ joined #git
06:13 chele joined #git
06:18 cqi joined #git
06:19 JeroenT joined #git
06:23 roxlu_ joined #git
06:24 finalbeta joined #git
06:25 roxlu_ joined #git
06:32 lidow joined #git
06:34 snufft joined #git
06:35 snufft hi guys! i've made a bit of a mess of my repo recently and I don't really know where to start to fix it.
06:36 snufft I cloned my repo after a format and thought I had checked out my dev branch, but instead have accidently created a new branch called dev and made a few commits to it. Now I can't push those commits (obviously) because that rbanch doesn't exist remotely
06:37 snufft I've since done a checkout of origin/develop, but now I'm not sure hwo to go about moving my commits from "dev" to "origin/develop"
06:37 Gloomy joined #git
06:37 snufft is this something that I can do? and if so, how? even just some commands that I could go away and google would be very much appreciated :)
06:39 lordjancso joined #git
06:40 kadoban snufft: I'd look at it in 'gitk --all' or !lol and see what commit the commits you made are on top of. Then you'll have to either rebase them so they're where you want, on top of origin/develop (check it out locally first most likely), or if they're already in the right place, just fast-forward merge them in.
06:40 gitinfo snufft: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
06:40 elect joined #git
06:41 prawnzy joined #git
06:43 t0by joined #git
06:43 ShekharReddy joined #git
06:44 MrWoohoo joined #git
06:44 snufft kadoban, gitinfo thanks very much :) I'll check out all those commands :D
06:44 gitinfo snufft: you're welcome, but please note that I'm a bot. I'm not programmed to care.
06:45 snufft #rightinthefeels
06:45 kadoban xD
06:45 psprint joined #git
06:45 kadoban At least I'm not a bot. Probably.
06:45 _ikke_ yes you are
06:45 _ikke_ I thought I disabled your self-awareness module
06:45 kadoban Nooo, I like that part.
06:46 kadoban At least I think I do.
06:46 psprint OMG a have a case where git diff shows me I've modified half of a function - added it, but it's already there from far away version. What to do? Minimal test case, how to get out of this to be able to commit?
06:47 snufft kadoban, https://en.wikipedia.org/wiki/Solipsism ;)
06:47 Sceorem joined #git
06:47 kadoban ;)
06:49 saedelaere joined #git
06:50 jknetl joined #git
06:50 psprint Here is the erroneous git diff behavior: https://asciinema.org/a/8ekxaphun7rbvy4xqiogdoh2f
06:51 unreal joined #git
06:52 kadoban Is that a portmanteau of ascii and enema? Can't say that's an inspiring URL.
06:53 psprint kadoban: it's ascii cinema
06:54 psprint but I also saw "nema" in this, my brother pointed me to the answer
06:55 psprint where to report errors in git?
06:56 cstratak joined #git
06:56 laumann joined #git
06:57 elect joined #git
06:57 submitnine joined #git
06:57 psprint going to https://github.com/git/git-scm.com/issues/new
06:58 kadoban psprint: I can't imagine that that is the correct place.
06:59 kadoban psprint: That is the code for the website. It's not a website issue, correct?
07:01 fees joined #git
07:01 danslo joined #git
07:02 psprint ah
07:02 smithbone joined #git
07:02 psprint too bad, already reported
07:02 t-mart joined #git
07:02 psprint https://github.com/git/git-scm.com/issues/840
07:04 psprint kadoban: great part about asciinema is - ability to select text - ability to resize with Ctrl-+/- as it's just webpage text and font can be resized
07:05 kadoban Bad part about asciinema: the domain name ... and requiring javascript to view some text (nope)
07:06 JeroenT_ joined #git
07:06 kadoban psprint: Did you try --minimal and/or --patience ?
07:07 grawity kadoban: how are you suggesting they should implement the replay, then
07:07 kadoban I kind of doubt that "it doesn't produce a perfectly optimal diff" is really considered a bug. All of the diffing algorithms I know of are known to have tradeoffs.
07:07 satya4ever joined #git
07:07 JeroenT__ joined #git
07:07 Darcidride_ joined #git
07:07 kadoban grawity: I'm suggesting it should be unnecessary to convey the information I'd need to see to understand the problem.
07:07 grawity I think most people would object to either JS, a downloadable viewer, or H.264
07:08 kadoban grawity: Which is ... approximately a diff.
07:10 osse ok so you have objections to how the bug was presented. don't blame asciinema for that :p
07:11 TomyWork joined #git
07:11 kadoban I was just being flip and copying the form of the text I was replying to. Though the domain name is terrible, they do have themselves to blame for that.
07:12 osse it's awesome
07:13 osse psprint: why do I see zc-rename in the context when you present the diff the first time? Do you have duplicated code?
07:13 Seveas it's supposed to mean ascii cinema, though I'll be refering to it as ascii enema from now on :)
07:13 kadoban Well, I can't unsee "ascii enema", which sounds approximately the opposite of awesome, hehe.
07:13 psprint osse: yes
07:13 psprint osse: I copied zc-rename to zc-take
07:15 psprint kadoban: --minimal and --patience produce the same effect
07:17 osse it used to be called asciicast
07:19 raijin joined #git
07:20 osse psprint: so what function are you editing? the original or the new one?
07:20 psprint osse: the video shows - original, zc-rename
07:21 cdown joined #git
07:21 eduardas_m joined #git
07:22 snthsnth joined #git
07:22 ksefchik joined #git
07:22 ochorocho__ joined #git
07:23 osse in that case I think this is a simple issue of a bad diff, but not an incorect one
07:24 cyan__ joined #git
07:24 skylite_ left #git
07:25 psprint hmm, indeed, the + lines that are out of nowhere would overlap with existing code
07:27 soreau joined #git
07:27 osse and then the identical lines further down probably don't have +
07:28 osse in any case. just commit it. Git stores states, not diffs. If the diff algorithm is improved in the future then this diff will be prettier too
07:28 Alienpruts joined #git
07:29 psprint I commited state for bug reporting, i.e. without the line that triggers stuff, maybe it will at least serve as a base for improving diff algo, if there's no bug
07:30 barduck joined #git
07:30 finalbeta joined #git
07:33 ferr joined #git
07:33 encod3 joined #git
07:34 overlord_tm joined #git
07:36 prawnzy joined #git
07:40 Emperor_Earth joined #git
07:42 FilipNortic__ joined #git
07:43 osse In Git for Windows I get 'Warning: Your console font probably doesn't support Unicode. If you experience strange characters in the output, consider switching to a TrueType font such as Consolas!' but I know for a fact that it supports unicode just fine. How can I supress it?
07:43 osse I can tell Git doesn't think so because it doesn't render names in git log properly
07:44 JeroenT joined #git
07:45 soreau I'm having trouble with a file that keeps giving ^M in git diff.. I tried setting crlf to true and input but I still can't seem to create a patch, reset and then am it. It says patch does not apply
07:45 cqi joined #git
07:46 soreau I tried dos2unix on it but that yielded some ^M's in the file too and I'm not sure how to get rid of them with a text editor
07:47 osse soreau: very annoylingly, if the old line also has ^M then Git won't show them. So it may look like you're changing line endings when you in fact aren't
07:47 soreau is there some way to convert the file?
07:49 _ikke_ turning off normalization and then adding it to the index fixed should work
07:50 gb soreau: you can run dos2unix with a -a from memory to rm them
07:50 gb depends on the version though
07:50 gb i think some versions just strip themn automagically without -a
07:51 _ikke_ -ascii
07:51 _ikke_ which is default
07:51 gb i know of no editor which converts ms to unix though
07:52 _ikke_ vim can do
07:52 gb maybe you could make a filter for git to strip them on the fly
07:52 _ikke_ gb: that's what line ending normalization does
07:52 soreau _ikke_: I don't understand what you mean. What's the way to turn off normalization and add (what?) to the index fixed? (file*?)
07:53 _ikke_ soreau: git config core.autocrlf off
07:53 _ikke_ and then check for .gitattribute files
07:53 soreau don't see one
07:53 gb i dunno i'm sill learning git but i do process a lot of rubbish from ms people
07:53 soreau called that in the root dir
07:54 _ikke_ now use dos2unix to make sure all lineendings are fixed in the working tree
07:54 Anticom joined #git
07:55 soreau ok..
07:55 _ikke_ then check if git status sees those files as modified
07:55 soreau _ikke_: at this point if I git diff, I can see + lines with ^M
07:55 gb i also found you can pipe files through lynx -dump to sanitise them if it's a txt file saved from word or similarly insane system which will help sanitise some things too
07:56 soreau _ikke_: git diff shows the entire file is completely rewritten
07:56 danslo joined #git
07:56 gb it should make a massive diff to filesize
07:57 _ikke_ soreau: You can also open it in vim, and then :set fileformat=unix
07:57 gb git repo shinks from 7gig to 7k :-)
07:57 gb hmm i might try that myself sometime
07:58 djb-irc joined #git
07:59 kurkale6ka joined #git
07:59 GavinMagnus joined #git
08:01 Balliad joined #git
08:01 soreau nope, same thing
08:01 aidalgol joined #git
08:01 soreau _ikke_: I made a patch after dos2unix, git reset and then git am and it fails
08:01 chll_ joined #git
08:02 gb how did you manage to contaminate the files?
08:03 gb so i know not to do that
08:04 marcogmonteiro joined #git
08:04 kyan joined #git
08:06 mohabaks joined #git
08:06 gnoel joined #git
08:06 ahmedelgabri joined #git
08:06 harish joined #git
08:06 JeroenT joined #git
08:06 soreau gb: it's someone elses code I'm maintaining
08:06 cdown joined #git
08:06 soreau I just ran across this when trying to push a simple commit
08:06 gb ahh ok
08:07 hwrdprkns joined #git
08:07 soreau but I'd like to fix it
08:07 soreau so far I haven't found any way
08:07 JeroenT joined #git
08:08 soreau I can commit changes locally but trying to push to github or create a patch and git am it fails hard
08:18 BadSnappa joined #git
08:18 thierryp joined #git
08:20 soreau can't figure it out
08:21 clmsy joined #git
08:26 mycyber joined #git
08:28 eihabarabia joined #git
08:29 Ryanar joined #git
08:32 eihabarabia joined #git
08:34 a_thakur joined #git
08:34 Segfault_ joined #git
08:35 heroux joined #git
08:37 Ezzy joined #git
08:39 earational joined #git
08:39 lidow joined #git
08:40 earational hey
08:42 berndl joined #git
08:55 blueyed joined #git
08:57 spriz joined #git
08:57 sagittarian joined #git
08:58 sagittarian does anyone know if there's a way to define an alias that is tracked by git, so that anyone who clones the repo will be able to use the alias?
08:58 _ikke_ nope, there is no way to do that
08:59 _ikke_ The user always has to set the alias himself
08:59 sagittarian how rude
08:59 _ikke_ How safe
08:59 sagittarian I guess I'll just have to switch to hg then
08:59 King_Hual joined #git
08:59 _ikke_ Would be fun if someone aliast git st or something to 'rm -rf /'
09:00 sagittarian sure would
09:00 _ikke_ aliases are a user preference, the repo should not interfere with that
09:02 canton7 you can 1) include a shell script that, when run, adds aliases to the user's config, or 2) include a partial config file, and instruct the user to include it in their config using 'include.path'
09:03 sagittarian or you could include a shell script that will do what you wanted to do with git alias
09:03 sagittarian i.e., rm -rf /
09:03 notebox joined #git
09:03 _ikke_ but the user has time to inspect it before installing it
09:04 tobiasvl don't forget --no-preserve-root
09:05 canton7 ... and it requires user action to actually become effective, rather than being applied automatically
09:05 Alienpruts joined #git
09:05 JeroenT joined #git
09:09 daynaskully joined #git
09:10 ksefchik joined #git
09:10 Maulik joined #git
09:12 mohabaks_ joined #git
09:14 irqq joined #git
09:19 sonOfRa joined #git
09:21 Ice_Strike joined #git
09:21 buzzLightBeer joined #git
09:22 JeroenT joined #git
09:23 ochorocho__ joined #git
09:27 Hounddog joined #git
09:27 Hounddog Morning, i have uploaded a commit and i want to revert this now to a commit before without the need to force push. i have forgotten how to do this
09:28 selckin git revert commit;
09:29 a_thakur joined #git
09:39 JeroenT joined #git
09:41 soreau I can't even create a git rm patch for the offending file that will successfully git am
09:41 soreau what is the deal
09:43 Doomb joined #git
09:46 Macaveli joined #git
09:47 uranellus hello, I have a repository with two remotes. how can I make sure that the history of upstream and origin are the same (for example: no other commits are in origin than in upstream). note that upstream and origin might not be on the same revision.
09:48 selckin merge?
09:54 stamina joined #git
09:54 Vgr_ joined #git
09:54 choki joined #git
09:54 uranellus selckin: well the merge might still work, if there was another commit on origin
09:54 selckin if there is something to merge they aren't in sync ?
09:56 mehola joined #git
09:59 jimi_ joined #git
10:02 Gloomy joined #git
10:04 Raging_Hog joined #git
10:08 fakenerd joined #git
10:12 Sceorem joined #git
10:15 lb1c joined #git
10:22 mingrammer joined #git
10:25 Sceorem_ joined #git
10:26 Sceorem__ joined #git
10:28 greendo joined #git
10:28 jceb joined #git
10:33 eftov joined #git
10:33 fakenerd joined #git
10:33 eftov left #git
10:41 nettoweb joined #git
10:42 leeN joined #git
10:48 paws_ joined #git
10:48 FilipNortic joined #git
10:50 dan2k3k4 joined #git
10:55 JeroenT joined #git
10:55 satya4ever joined #git
10:58 a_thakur joined #git
10:58 ksefchik joined #git
10:58 JeroenT joined #git
11:00 g105b joined #git
11:01 iskander_work joined #git
11:03 a_thakur joined #git
11:05 jorj joined #git
11:12 threenplusone joined #git
11:12 mizu_no_oto joined #git
11:14 dsdeiz joined #git
11:15 mehola joined #git
11:16 sevenfourk joined #git
11:16 chachasmooth joined #git
11:19 fakenerd joined #git
11:20 parecx joined #git
11:21 achadwick joined #git
11:22 CheckDavid joined #git
11:22 Anticom_ joined #git
11:23 ochorocho__ joined #git
11:26 ronskisika joined #git
11:28 Anticom joined #git
11:32 Gurkenglas joined #git
11:36 hanshenrik joined #git
11:38 hanshenrik i have a git repo. i wish to remove from history, every file matching the pattern blackdproxy_installer*.exe  .. some way i can do that?  the problem is that for years, every iteration of that damn installer has been added to the history, which makes the history, and thus, cloning it, very slow :/
11:38 hanshenrik (and use a lot of disk space)
11:43 atomi joined #git
11:43 MattMaker joined #git
11:46 darkbit joined #git
11:48 sdothum joined #git
11:48 rnsanchez joined #git
11:50 tobiasvl hanshenrik: man git filter-branch
11:50 gitinfo hanshenrik: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html
11:50 hanshenrik thanks
11:50 PioneerAxon joined #git
11:59 rahtgaz joined #git
11:59 prawnzy joined #git
12:02 Sceorem__ joined #git
12:03 hahuang61 joined #git
12:04 BadSnappa joined #git
12:07 dsantiago joined #git
12:07 mar77i joined #git
12:08 whitby joined #git
12:10 chimay joined #git
12:11 tlaxkit joined #git
12:13 d0nn1e joined #git
12:16 bruce_lee joined #git
12:17 kulyzu joined #git
12:18 kuly-zu joined #git
12:19 Raed|Mobile joined #git
12:20 kristian_on_linu joined #git
12:20 kristian_on_linu ih
12:20 kristian_on_linu *hi
12:20 ngladitz joined #git
12:20 ngladitz joined #git
12:20 geoid joined #git
12:21 kristian_on_linu another 101 question ... I renamed some stuff, and now git constantly asks for a password
12:21 earational joined #git
12:22 _ikke_ git remote -v
12:22 _ikke_ Are you using http or ssh?
12:24 Anticom joined #git
12:26 mingrammer joined #git
12:27 dsantiago joined #git
12:30 blackwind_123 joined #git
12:30 Cryp71c joined #git
12:34 Anticom joined #git
12:34 choki joined #git
12:35 Cryp71c coworker trying to rebase a branch onto its fork origin but the history seems really really different. He's getting conflicts on files that weren't touched on his side of things. Firstly: why is this happening? I thought rebase worked similar to cherry-picking commits? Secondly, is there an easy way to fix this so that the rebase works (without just saying "always prefer theirs")?
12:39 _ikke_ First step is to verify what history looks like
12:39 johnmilton joined #git
12:43 dsantiag_ joined #git
12:43 actinide joined #git
12:44 GodGinrai joined #git
12:46 rominronin joined #git
12:46 leprechau joined #git
12:47 albel727 joined #git
12:47 kristian_on_linu hi, _ikke_
12:47 kristian_on_linu https
12:47 jeffreylevesque joined #git
12:48 lidow joined #git
12:48 eroussel joined #git
12:49 eindoofus joined #git
12:50 dendazen joined #git
12:50 _ikke_ kristian_on_linu: Do you recall setting up a credential helper?
12:50 kristian_on_linu no, _ikke_
12:51 kristian_on_linu I don't remember what I did the last time I had this issue
12:51 _ikke_ git config -l
12:51 treehug88 joined #git
12:52 shgysk8zer0 joined #git
12:52 ayjay_t joined #git
12:53 zivester joined #git
12:54 kristian_on_linu what should I look for, _ikke_ ?
12:54 raijin joined #git
12:56 JeroenT_ joined #git
12:56 f3r70rr35f joined #git
12:56 _ikke_ kristian_on_linu: credential helper
12:57 kristian_on_linu ah ... there is none
12:57 _ikke_ ok
12:57 _ikke_ what about ~/.curlrc
13:01 synthroid joined #git
13:02 jnewt joined #git
13:02 fahadash joined #git
13:04 dersand joined #git
13:05 dersand I'm checking a diff for my current files, and i get this. What am i looking at? http://i.imgur.com/FcMlAOd.png
13:05 ekinmur joined #git
13:05 selckin \r
13:05 _ikke_ dersand: did you enable strikethrough for diffs?
13:06 selckin ^M is \r as in windwos line endings are \r\n, F6 etc probably some utf8 char
13:06 dersand _ikke_: I'm not sure? I have [diff] tool=vimdiff in my .gitconfig but other than that i'm not sure what i've done.
13:06 andlabs joined #git
13:07 kristian_on_linu _ikke_, I don't use curl much and don't have that file
13:07 _ikke_ kristian_on_linu: git uses curl
13:07 kristian_on_linu ok
13:07 Seveas dersand: LESS=-R$LESS git diff
13:07 ExoUNX joined #git
13:08 dersand Seveas: I executed and it's the same thing
13:08 _ikke_ utf-8 corruption perhaps?
13:09 selckin not corrupted
13:09 Seveas or not utf8 but latin1
13:09 dersand I'm running git bash(mingw8 or whatever it's called) through ssh to a debian system.
13:10 selckin you'll see the same if you open the file with vim -b
13:10 Seveas looks like utf8 thogh, E4 is ä, plausible letter in finnish :)
13:10 GavinMagnus left #git
13:10 cdg joined #git
13:10 dersand This is $ git add -p http://i.imgur.com/pvgU9Bq.png
13:10 fakenerd joined #git
13:11 Seveas dersand: that's normal, it's yelling at you for having trailing spaces
13:11 dersand Seveas: is it commitable?
13:11 Seveas yes
13:11 osse commitabru!!
13:12 Seveas git kick --force osse
13:12 osse was kicked by osse: --force
13:15 mar77i joined #git
13:16 m0viefreak joined #git
13:17 fmcgeough joined #git
13:17 mehola joined #git
13:18 GavinMagnus joined #git
13:19 lightstalker joined #git
13:21 jimi_ joined #git
13:21 bremner may the --force be with you
13:22 _ikke_ I wanted to add link to the git survey in the topic, but that would make the topic too long
13:23 sangy joined #git
13:23 D-Boy joined #git
13:24 selckin survey?
13:24 ochorocho__ joined #git
13:24 _ikke_ https://tinyurl.com/GitSurvey2016
13:24 pullphinger joined #git
13:25 _ikke_ The project regularly holds surveys, although the last one was a while ago
13:25 rgrinberg joined #git
13:25 osse joined #git
13:26 r4z joined #git
13:26 al-damiri joined #git
13:26 Zamerick joined #git
13:27 cdown damn son, that's a long survey.
13:27 _ikke_ Takes about 5 minutes
13:27 King_Hual` joined #git
13:28 pullphinger joined #git
13:28 selckin yeah, scrollbar is halfway
13:29 selckin 27-23
13:29 cdown took me about 10 minutes or so i think
13:29 _ikke_ Can I temporarily remove the public logs part?
13:29 qsx _ikke_: ask jast for a jk.gs link?
13:30 cdown You can probably remove the git-prune stuff i guess
13:30 _ikke_ That's Eugenes thing
13:30 Gsham joined #git
13:30 _ikke_ And I'd like it earlier in the topic
13:30 sin3t joined #git
13:31 Ezzy _ikke_:  "Current stable version" is mentioned twice btw.
13:32 _ikke_ Ezzy: good catch
13:33 griffindy joined #git
13:34 flaviodesousa joined #git
13:35 Topic for #git is now Welcome to #git, the place for git help and all your base | Public logs at http://goo.gl/BuUi5o | Please take this git survey: https://tinyurl.com/GitSurvey2016 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much bett
13:35 Hounddog joined #git
13:36 selckin took 11 min
13:36 selckin and nobody reads the topic :(
13:36 _ikke_ People do
13:36 _ikke_ But not everyone ofcourse
13:36 hanshenrik joined #git
13:36 FilipNortic joined #git
13:37 qsx _ikke_: it’s cut off now
13:37 _ikke_ yeah, I noticed
13:37 qsx BAD KID
13:38 _ikke_ What are you saying?
13:38 osse KICK HIM
13:38 qsx here’s your punishment https://www.youtube.com/watch?v=wzRHqOSg--s
13:38 Topic for #git is now Welcome to #git, the place for git help and all your base | Public logs at http://goo.gl/BuUi5o | git survey: https://tinyurl.com/GitSurvey2016 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
13:38 _ikke_ NOOOOO
13:39 qsx :D
13:40 qsx Seveas: ^
13:41 Seveas shalalie?
13:41 Dougie187 joined #git
13:42 osse And the wind did howl and the wind did blow
13:42 osse La la la la la
13:42 osse La la la la lee
13:42 osse A little bird lit down on Henry Lee
13:42 Seveas git kick --force --ban qsx
13:42 qsx het gaat niet uit mn kop!
13:42 qsx Seveas: Permission denied
13:43 rnsanchez joined #git
13:44 _ikke_ sudo kick --force --ban qsx
13:44 _ikke_ sudo git kick --force --ban qsx
13:45 King_Hual joined #git
13:45 qsx _ikke_: https://xkcd.com/838/
13:45 _ikke_ heh
13:46 _ikke_ I was more thinking about https://xkcd.com/149/
13:46 qsx alias simon_says=sudo
13:48 AaronMT joined #git
13:48 Seveas alias bitch,=sudo
13:48 fakenerd_ joined #git
13:48 _ikke_ printf '#!/bin/bash\nshift\nsudo $@' | sudo tee /usr/local/bin/simon
13:50 Seveas simon() { shift; sudo "$@"; }
13:51 dan2k3k4_ joined #git
13:51 _ikke_ right
13:56 thiago joined #git
13:56 shaggycat joined #git
13:57 jaafar joined #git
13:59 kadoban joined #git
13:59 hanshenrik_ joined #git
13:59 DelphicOkami joined #git
14:00 GavinMagnus left #git
14:00 prawnzy joined #git
14:01 JeroenT joined #git
14:04 robinsmidsrod joined #git
14:04 GavinMagnus joined #git
14:04 phaleth joined #git
14:06 JeroenT joined #git
14:06 grawity simon() { sudo "${@:2}"; }
14:06 crose joined #git
14:06 grawity or
14:06 grawity shopt -s extdebug; trap 'case $BASH_COMMAND in *" NOW") eval sudo ${BASH_COMMAND% *}; false; esac' DEBUG
14:06 fakenerd joined #git
14:07 osse I dunno
14:08 osse I think it should be a syntax error if $1 is not 'says'
14:09 qsx exec ksh
14:09 qsx go!
14:09 neque joined #git
14:10 barduck joined #git
14:11 robinsmidsrod joined #git
14:12 GavinMagnus joined #git
14:14 afuentes joined #git
14:15 _ikke_ echo "ERROR: not supported"
14:15 _ikke_ exit 1
14:15 armin joined #git
14:16 ResidentBiscuit joined #git
14:17 ShekharReddy joined #git
14:18 finalbeta joined #git
14:18 mehola joined #git
14:21 duarteper joined #git
14:21 Nugget heh
14:22 achadwick joined #git
14:22 Gsham joined #git
14:23 jceb joined #git
14:24 Topic for #git is now Welcome to #git, the place for git help and all your base | Public logs at http://goo.gl/BuUi5o | git survey: https://survs.com/survey/c6wjrerw87 | First visit? Read: http://jk.gs/gio.gl/BuUi5o | Current stable version: 2.10.0 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
14:24 perlpilot joined #git
14:25 garethdaine joined #git
14:26 fakenerd joined #git
14:27 deepy joined #git
14:28 overlord_tm joined #git
14:29 ash_workz joined #git
14:29 dviola joined #git
14:30 kfunk joined #git
14:30 sleezd joined #git
14:31 comps joined #git
14:32 jokke joined #git
14:32 jokke hello
14:32 _ikke_ hi
14:32 jokke i'm writing an update hook
14:33 jokke and i'm wondering how to check out the code that's being pushed?
14:34 sonOfRa joined #git
14:34 jokke i tried git clone $GIT_DIR but that seems to contain the previous ref
14:34 ksefchik joined #git
14:34 nd joined #git
14:35 _ikke_ Yeah, because it's executed before the refs are updated
14:35 thiago jokke: you have to unset GIT_DIR if you want to work on another repository
14:36 _ikke_ GIT_DIR=/path/to/checkout git checkout -f $3
14:36 jokke _ikke_: yeah i thought as much
14:36 _ikke_ something like that
14:36 jokke ooh
14:36 jokke _ikke_: what do you mean with path/to/checkout?
14:36 _ikke_ But note that you can also use things like git show $3:path/to/file to check a file
14:37 _ikke_ jokke: Where to put the files
14:37 jokke ok
14:37 Anupkumar joined #git
14:37 ShekharReddy joined #git
14:37 clemf joined #git
14:37 jokke i see so basically i could also just keep my clone code and then checkout $3
14:37 jokke ?
14:37 _ikke_ No need to clone
14:38 jokke i need a git repo
14:38 _ikke_ And it would not have the new commits anyway
14:38 jokke mmh
14:38 _ikke_ s/GIT_DIR/GIT_WORKTREE
14:38 _ikke_ If you keep GIT_DIR the same, and change GIT_WORKTREE, then you should still be able to use it as a repo
14:39 jokke ok i see
14:39 jokke i'll give it a shot
14:39 Gsham joined #git
14:39 cdown joined #git
14:40 May-meimei_ joined #git
14:42 Justin-chi joined #git
14:42 chibby0ne joined #git
14:42 jokke remote: fatal: This operation must be run in a work tree
14:43 _ikke_ sorry, it's GIT_WORK_TREE
14:43 dviola joined #git
14:44 jokke ah
14:44 Jusin-chi joined #git
14:44 clmsy joined #git
14:45 chibby0ne Hey guys, what does the --depth option do, when used in git clone:  according to the docs it says: Create a shallow clone with a history truncated to the specified number of revisions. What does it mean by revision? Is it the number of commits? Why if I choose depth 1, it shows me the last 2 commits in git log?
14:46 _ikke_ Yeah, rivisions should be commits
14:46 selckin we start counting at 0
14:46 matsaman joined #git
14:47 chibby0ne from 0? I thought at first you were joking but it makes sense
14:47 Salander27 joined #git
14:48 grawity it doesn't make sense for *length*, though
14:48 earational joined #git
14:48 _ikke_ nope
14:48 grawity especially since --depth=0 does not give you a 1-commit-long history
14:48 chigang joined #git
14:48 selckin sorry was joke/guess :)
14:48 chibby0ne hahaha ok :p
14:49 chibby0ne well then... why is it that --depth 1 leaves the last 2 commits?
14:51 selckin i suspect it has something to do with that the root commit is kinda special, and if it wants to give you 1 commit you can work with, its ncie if its not the root
14:52 satbyy joined #git
14:52 njbair joined #git
14:55 mrwat joined #git
14:55 actinide joined #git
14:55 jokke _ikke_: remote: fatal: Not a git repository: '.'
14:56 jokke https://p.jreinert.com/B6RJRK/
14:56 z8z joined #git
14:57 robotroll joined #git
14:58 ToBeCloud joined #git
14:58 crayon joined #git
14:58 crayon joined #git
14:58 stomplee joined #git
14:59 _ikke_ jokke: the cd $tempdir breaks it
14:59 _ikke_ If you do that, you need to change GIT_DIR to the repository dir
14:59 jokke oh ok
14:59 jokke ah GIT_DIR isn't absolute
14:59 _ikke_ It can be, but in the hook it's the current dir
15:00 jokke i see
15:00 Darcidride joined #git
15:01 Pontus joined #git
15:02 Opertus joined #git
15:02 InfoTest joined #git
15:02 hanthings joined #git
15:03 le_melomane joined #git
15:03 danslo joined #git
15:04 Rodya_ joined #git
15:04 bongjovi joined #git
15:05 f3r70rr35f joined #git
15:05 ochorocho__ joined #git
15:05 grift joined #git
15:05 actinide joined #git
15:06 happy-dude joined #git
15:07 actinide joined #git
15:07 jceb joined #git
15:08 ResidentBiscuit joined #git
15:08 timvishe` joined #git
15:08 Zamerick joined #git
15:09 Opertus joined #git
15:09 matsaman what's the best way to have git track a file right up until I want to push my changes, and then have it pretend it never existed?
15:10 dhollinger joined #git
15:10 grawity there isn't any
15:10 ochorocho__ joined #git
15:10 matsaman actually I put that badly, let me try again
15:10 matsaman I actually want to always track the file, but not ever push it
15:10 selckin impossible
15:10 grawity only possible if you maintain a separate branch in which that file doesn't exist
15:10 matsaman those aren't very satisfying responses =D
15:10 perlpilot matsaman: why do you want git to track it but never push it?
15:11 grawity e.g. by rewriting the regular branch, or some merge magic
15:11 matsaman perlpilot: because I want to keep track of it
15:11 grawity keep configs in a separate repo, and symlink stuff
15:11 matsaman grawity: with two separate gits, you mean?
15:11 tyreld joined #git
15:11 tm512 joined #git
15:11 ghoti joined #git
15:11 grawity with two separate git repositories, yes
15:11 matsaman hrmmm
15:12 grawity config is, after all, somewhat separate from the program's code
15:12 maqr joined #git
15:12 tonyyarusso joined #git
15:12 astaves joined #git
15:12 thesquib joined #git
15:12 hashpuppy joined #git
15:13 chovy_ joined #git
15:13 pelegreno_ joined #git
15:13 brendyn joined #git
15:13 asmacdo joined #git
15:13 matsaman mmm, it is and it isn't
15:13 nilg joined #git
15:13 MikeChernev joined #git
15:14 Matsv joined #git
15:14 chrisshattuck joined #git
15:14 kpease joined #git
15:15 matsaman so there's no way even to merge from one branch to another and exclude a file?
15:15 lohfu joined #git
15:16 osse matsaman: you can edit the merge commit to avoid touching that file
15:16 rubie joined #git
15:16 osse but don't do that
15:16 sagerdearia joined #git
15:16 matsaman because?
15:16 grawity a custom merge driver could do that, I suppose
15:16 jokajak joined #git
15:17 grawity or just `git merge --no-commit` + remove + commit
15:17 polyzen joined #git
15:17 shinnya joined #git
15:18 le_melomane joined #git
15:18 osse matsaman: hmm, on second thought I can't immediately tell why it's so bad
15:18 matsaman grawity: that sounds promising; wouldn't that basically accomplish my goal?
15:18 matsaman osse: hrmmm
15:18 grawity although, no.
15:18 aard_ joined #git
15:18 matsaman heh
15:18 grawity a merge imports the whole history, but the above hack only removes the file from the merge commit
15:18 grawity it still exists in the imported old history
15:19 matsaman I will be doing a rebase also
15:19 matsaman this is all just local development
15:19 throstur joined #git
15:19 grawity to actually forget a file, a history rewrite is required – `git filter-branch` or some weird rebase
15:20 throstur I have a git repository for my dotfiles, but on one specific machine my tmux.conf differs, how do I mark it as permanently stashed or something like that (or, more specifically, what the hell am I supposed to do to in this case)?
15:20 grawity don't symlink tmux.conf on that host
15:20 perlpilot throstur: use one of the many dotfile managers out there :)
15:20 grawity have a tiny local conf that calls 'source-file ~/dotfiles/tmux.conf'
15:20 grawity assuming it's a full superset, at least
15:21 matsaman okay, hrmm; could I just rsync the entire branch's additions outside of the repo, then make a new branch from master (from what the original dev branch was branched from), then rsync it all back in except the file in question, then commit?
15:21 grawity if it isn't, split it up into tmux-global.conf and tmux-not-quite-global.conf, and source just the former
15:21 edward left #git
15:21 matsaman kind of like a sloshy manual rebase
15:21 grawity matsaman: that sounds silly, use filter-branch
15:21 relipse joined #git
15:21 throstur none of those solutions are easy hacks :(
15:21 grawity throstur: sounds easy enough, I've done it with various configs
15:21 matsaman grawity: okay if you think it'll do it, I'll man upon it =)
15:22 grawity matsaman: both --tree-filter and --index-filter can be used to nuke a specific file
15:22 grawity matsaman: there are tutorials on Github ("removing private data") and elsewhere
15:22 throstur grawity: yeah but I mean, I was hoping for something like alias foo="mv tmux.conf foo.conf ; git pull ; mv foo.conf tmux.conf" style of hack
15:23 perlpilot throstur: have a branch just for that machine where tmux.con is different.
15:23 throstur but a *little* more sophisticated
15:23 throstur perlpilot: but then I need to manually merge master into that branch every time I change something right?
15:23 ghostlight joined #git
15:23 osse throstur: make a commit for it, then do pull --rebase
15:23 osse ez
15:23 osse just keep putting that change on top
15:23 fmcgeough joined #git
15:23 grawity throstur: well that's really no different from "git stash ; git pull; git stash pop"
15:23 matsaman grawity: okay thanks
15:24 throstur grawity: OK, well that for example is directly an answer to my original question
15:24 mangolisk joined #git
15:24 le_melomane joined #git
15:25 EvilPenguin joined #git
15:25 throstur osse: thanks man that was a pretty cool trick
15:25 lacrymology joined #git
15:25 fmcgeough_ joined #git
15:25 osse throstur: it's what i do. works like a charm
15:25 throstur sure does!!
15:26 osse throstur: master has a bunch of stuff, and on each computer I may have a local branch with some changes
15:26 raijin joined #git
15:26 throstur osse: that's exactly what I was looking for, just a generic time-saver that still allows me to differentiate between "all machines" and "not this machine"
15:27 matsaman grawity: maybe I'm overthinking this... could I not just stop tracking the file (git rm?), then rebase, then push, then re-track the file as I please? It's actually only the tracking _while_ I'm developing in a single particular branch that I care about
15:27 Remram The "first visit" still appears twice in the topic
15:27 Remram with DIFFERENT LINKS
15:27 Remram one of which 404
15:28 _ikke_ Ok, let me fix that
15:28 Darren_ joined #git
15:29 matsaman first seems to be a typo ofhttp://goo.gl/BuUi5o?
15:29 matsaman hey a typo in a msg about a typo =)
15:30 _ikke_ haha
15:30 crose joined #git
15:30 matsaman "when in rmoe", etc.
15:31 le_melomane joined #git
15:31 ksefchik joined #git
15:32 sonikspin joined #git
15:32 King_Hual` joined #git
15:33 _ikke_ That goo.gl link are the logs
15:33 sagerdearia joined #git
15:33 KindOne joined #git
15:35 stamina joined #git
15:36 KindOne left #git
15:36 RavinduL joined #git
15:37 tinanoo joined #git
15:37 Gitzilla joined #git
15:38 jguillen joined #git
15:38 liquidjamm joined #git
15:40 Topic for #git is now Welcome to #git, the place for git help and all your base | Please take the git survey: https://survs.com/survey/c6wjrerw87 | Public logs at http://goo.gl/BuUi5o | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
15:40 _ikke_ So, fixed again
15:40 ansimation joined #git
15:41 sonikspin joined #git
15:41 Remram Yay :)
15:42 _ikke_ Was a bad copy/paste of mine earlier that broke it
15:42 liquidjamm joined #git
15:42 ayjay_t joined #git
15:43 spudowiar joined #git
15:43 King_Hual joined #git
15:43 King_Hual joined #git
15:46 duga joined #git
15:46 earational joined #git
15:48 a_thakur joined #git
15:48 HappyLoaf_ joined #git
15:49 ahmedelgabri joined #git
15:49 thiago joined #git
15:49 synthroid joined #git
15:53 netj joined #git
15:53 GavinMagnus left #git
15:55 Phlogistique joined #git
15:56 chrisshattuck joined #git
15:56 RominRonin_Home joined #git
15:57 King_Hual` joined #git
16:00 Gloomy joined #git
16:00 subhojit777 joined #git
16:01 morenoh149 joined #git
16:01 dreiss joined #git
16:01 prawnzy joined #git
16:02 sr___ joined #git
16:03 DonRichie joined #git
16:04 madewokherd joined #git
16:06 Mottie joined #git
16:06 earational joined #git
16:06 DonRichie joined #git
16:06 Rodya_ joined #git
16:07 Mottie would anyone know why I can no longer sign my commits with gpg since I've updated to git 2.10.0?
16:08 thiago joined #git
16:09 MattMaker joined #git
16:10 JanC_ joined #git
16:10 Kobaz hey
16:10 Kobaz i'm having a problem with git stash pop
16:10 kristian_on_linu joined #git
16:10 Kobaz CONFLICT (content): Merge conflict in WEB/CallQueue/IntellaWebService.fcgi
16:11 Kobaz every time i git stash pop, i get that
16:11 thierryp joined #git
16:11 Kobaz i fix the merge, and then now there's no changes to commit, since i'm taking the changes from upstream
16:11 Kobaz and and then i git stash pop again, and keep getting the same conflict
16:11 Kobaz can't get past it
16:12 meejah if you resolved it to "no changes" i think you just want to drop it?
16:12 _ikke_ Mottie: What happens if you try?
16:13 Kobaz how do i see the diffs in the stash
16:13 Mottie _ikke_: I see "error: gpg failed to sign the data" "fatal: failed to write commit object"
16:13 Kobaz git stash show will show you the files
16:13 Kobaz but not the changes
16:13 armyriad joined #git
16:13 meejah Kobaz: git stash show -p stash...
16:14 emg joined #git
16:15 _ikke_ Mottie: What happens if you try to manually sign a file? gpg -b <file>
16:15 romerocesar joined #git
16:15 Kobaz okay yeah that worked
16:15 Kobaz i dont need that stash
16:15 meejah Kobaz: so "git stash drop stash..."
16:15 Kobaz yeah i dropped it
16:15 Kobaz and then the next stash is what i wanted, yeap
16:16 Mottie _ikke_: hmm, that seems to work
16:16 _ikke_ Mottie: Ok, now GIT_TRACE=1 git commit ...
16:17 lucianangelus joined #git
16:17 Mottie _ikke_ that worked too
16:17 _ikke_ Oh, you don't have signing enabled by default?
16:17 Mottie when I use git commit -S.. that's when it failes
16:18 _ikke_ right
16:18 Mottie I turned it off because I couldn't commit anything
16:18 _ikke_ makes sense
16:18 _ikke_ GIT_TRACE=1 git commit -S
16:19 le_melomane joined #git
16:19 jast you broke the topic
16:19 jast "First visit" is in there twice, once with a broken URL
16:19 mehola joined #git
16:19 jast never mind, it was just my terminal acting up
16:19 spudowiar joined #git
16:19 jast wonder how that happened
16:20 Mottie 11:19:15.553600 run-command.c:336       trace: run_command: 'gpg' '--status-fd=2' '-bsau' '#######' error: gpg failed to sign the data fatal: failed to write commit object
16:20 _ikke_ jast: It used to be broken, I fixed it later
16:20 zivester joined #git
16:20 jast I saw the last change as broken, too, for a moment
16:21 _ikke_ Right
16:21 chrisshattuck joined #git
16:22 Topic for #git is now Welcome to #git, the place for git help and all your base | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
16:22 jast more shiny
16:23 einnjo joined #git
16:23 _ikke_ hehe
16:25 jast btw we have a built-in URL shortener...
16:25 jast .shorten https://git-scm.com/
16:25 gitinfo jast: .shorten: out http://jk.gs/t/a0 in https://git-scm.com/
16:25 _ikke_ Mottie: Ok, can you try that command then? gpg -bsau '#######' <file>
16:26 jast the incrementing suffix is not case sensitive and omits ambiguous characters
16:27 Mottie _ikke_ works perfect
16:27 jast and it'll be a while before it starts getting longer :)
16:27 laumann joined #git
16:27 actinide joined #git
16:27 _ikke_ Mottie: Ok, and now try to add --status-fd=2
16:27 _ikke_ Too bad Kenya does not allow *.ke domains
16:28 Mottie _ikke_ including the -bsau?
16:28 jast _ikke_: ca? co? fa?
16:28 jast pu?
16:28 _ikke_ I'd like ik.ke then :P
16:28 jast unfortunately ja.st is invalid, too
16:28 LionsMane joined #git
16:29 jast I guess jk.gs is pretty good, though
16:29 Mottie gpg -bsau --status-fd=2 '#####' <file>  => gpg: skipped "--status-fd=2": secret key not available  gpg: signing failed: secret key not available
16:30 _ikke_ Mottie: You need to place it after the '####' or before the other options
16:30 _ikke_ now it's taken by -u (user)
16:30 Mottie oh ok
16:30 actinide joined #git
16:31 raspado joined #git
16:31 Mottie _ikke_ ok that worked
16:31 _ikke_ hmm
16:31 _ikke_ Then I'm at a loss. The !mailing_list can help you better.
16:31 gitinfo 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://j.mp/gitlist
16:31 tristanp joined #git
16:32 Remram No more logs?
16:32 Mottie aww well, thanks for trying!
16:32 Remram oh everything is shortened. nvm
16:33 Mottie _ikke_ I guess I can't really use any of what you shared since it appears to create a file.sig in the directory
16:35 hanshenrik joined #git
16:36 durham joined #git
16:37 danslo joined #git
16:40 PioneerAxon joined #git
16:40 zeroed joined #git
16:40 zeroed joined #git
16:40 saidi joined #git
16:41 Gsham joined #git
16:41 crayon joined #git
16:41 crayon joined #git
16:41 clemf joined #git
16:43 vassagus joined #git
16:44 Pontus joined #git
16:45 nydel07 joined #git
16:45 le_melomane joined #git
16:48 a_thakur joined #git
16:51 terminal_echo joined #git
16:52 eroussel joined #git
16:53 crayon joined #git
16:53 a_thakur joined #git
16:54 eshlox joined #git
16:56 InfoTest1 joined #git
16:57 newbiee joined #git
16:58 Kobaz since there's no git cp, if i add two identical files, is it smart and only stores it once?
16:58 duarteper joined #git
16:58 Kobaz i think that's what i remember reading
16:59 chris2 yes
17:02 Mobutils joined #git
17:02 EvilPenguin joined #git
17:03 nitric joined #git
17:03 QwertyDragon joined #git
17:04 drizztbsd joined #git
17:05 durham joined #git
17:06 sagerdearia joined #git
17:06 thiago_ joined #git
17:06 cdg joined #git
17:07 nitric joined #git
17:08 Rodya_ joined #git
17:08 nitric joined #git
17:08 earational joined #git
17:11 MattMake_ joined #git
17:12 Kopitaja joined #git
17:13 kyan joined #git
17:13 _ikke_ Kobaz: git stores the content of files by hash
17:13 Pseudocrat joined #git
17:13 _ikke_ so if the hash is identical, the same 'blob' is used
17:14 ad7 joined #git
17:16 flavius joined #git
17:16 Kopitaja joined #git
17:16 EvilPeng1 joined #git
17:18 Remram[m] joined #git
17:18 Remram[m] joined #git
17:24 f3r70rr35f joined #git
17:26 actinide joined #git
17:26 legumbre joined #git
17:28 SwiftMatt joined #git
17:31 dreiss joined #git
17:31 barduck joined #git
17:31 terminal_echo joined #git
17:33 Perspicaciosity Does anyone know a clean way to set a file's executable bit to false on commit?  I'm trying to make sure I don't commit executable python tests, since nosetests doesn't run them without a flag.
17:33 nettoweb joined #git
17:33 LionsMane joined #git
17:34 Perspicaciosity Not sure if git is the right layer to fix things at.
17:34 berndl joined #git
17:34 King_Hual joined #git
17:34 Vivekananda joined #git
17:34 _ikke_ Perspicaciosity: Not on committing
17:35 _ikke_ on adding to the index there is
17:35 InfoTest joined #git
17:35 Perspicaciosity "git update-index --chmod=+x myFile"
17:35 Perspicaciosity Right?
17:36 _ikke_ You want -x, right?
17:36 Perspicaciosity Yeah.
17:36 matsaman can't you just -x them before committing?
17:37 Perspicaciosity I'm trying to find a way to do it automatically, since something keeps changing them to executable.
17:37 _ikke_ Perspicaciosity: You could take a look at the pre-commit hook
17:37 matsaman I just noticed a 'git diff master CURRENTBRANCH' fail, presumably because there was also a dir named 'CURRENTBRACH' in my cwd -- is there syntax for git diff to specify that you want to diff a branch, explicitly?
17:37 matsaman Perspicaciosity: other devs' copies?
17:38 _ikke_ matsaman: it should default to interpret it as a branch
17:38 matsaman I had to cd into another dir before it worked
17:38 Perspicaciosity I haven't used git hooks before.
17:38 Perspicaciosity I'll do some reading.
17:39 matsaman I've been using 'git diff master otherbranch', should that be a '..' (or '...'?) instead of a space?
17:39 Perspicaciosity I think the problem has to do with the network share I'm using, the exe bit gets changed whenever I send code to it.
17:39 Perspicaciosity It's odd.
17:39 matsaman Perspicaciosity: oh I know that bug =)
17:39 matsaman you using like, cygwin on windows?
17:40 Perspicaciosity No, I'm working directly from a share that's accessible from both a Linux and Win box.
17:41 matsaman and the actual native FS is what?
17:41 Sasazuka joined #git
17:41 Perspicaciosity Windows, I believe.
17:41 matsaman k
17:42 Perspicaciosity I'm not absolutely sure though.
17:42 matsaman I had something like that, with a Windows share
17:42 matsaman although I conflated it with having used Cygwin
17:42 matsaman IIRC what worked for me to avoid it was to...
17:43 Perspicaciosity I'm just using git from terminal/powershell on either side.
17:43 matsaman I think it happened with shares that had remained from previous sessions
17:43 quetz joined #git
17:43 matsaman if I always remounted the shares each time I came in for work, it didn't happen
17:43 Perspicaciosity Huh.
17:43 matsaman some kind of stale share nonsense? :/
17:44 matsaman for me that time, anyway
17:44 matsaman and it wasn't always that way, either; the server guys must've changed something at some point
17:45 matsaman anyway, you might see if explicitly remounting your share any time you are about to start using one magically avoids the issue (albeit in a silly way)
17:46 Perspicaciosity I'll give that a shot.  Might help me understand what's going on.
17:46 Perspicaciosity Thanks for sharing.
17:46 BSAlb joined #git
17:47 matsaman _ikke_: yeah, if I have a dir in cwd that matches the branch name, it fails with git diff master branchname
17:47 matsaman git-2.9.2
17:47 Perspicaciosity ...and thanks for telling me about git hooks, +_ikke_.  They look like the sort of thing I was looking for.
17:47 Mottie joined #git
17:48 peepsalot if i have a local branch called "temp" and I never push it to origin, but i rebase some other branch onto it, then push that branch to origin, then origin will not know about temp ever existing, right?
17:48 _ikke_ Not about the name temp
17:48 _ikke_ But all the commits will be pushed
17:49 peepsalot ok cool
17:49 f3r70rr35f joined #git
17:50 blueyed I just had my machine lockup after "git stash --include-untracked", switched to another branch and back.  I think it might have locked with the "git stash pop" then.  But all the files that had been modified are empty now!
17:50 blueyed I could not find something in the reflog, or in the stash list.. :/
17:50 wget_ joined #git
17:52 peepsalot ok, another scenario, say I create a branch locally, and some other dev creates a branch of the same name which they push to my origin.  then what happens when i pull updates, are they treated as the same branch?
17:52 _ikke_ blueyed: does git rev-parse refs/stash work?
17:52 ShekharReddy joined #git
17:53 blueyed _ikke_: yes, it's the same I see with "git stash" - but it is not the one I've created..
17:53 _ikke_ peepsalot: No, git prefixes remote branches with the name of the remote (and in a remotes namespace)
17:53 guilherme joined #git
17:53 _ikke_ blueyed: Then I guess git fsck --lost-found
17:53 peepsalot ah ok
17:54 MasterBob joined #git
17:54 jimi_ joined #git
17:54 _nwkj86 joined #git
17:55 MasterBob Hello. Can I get a diff of all changes within a range of commits?
17:55 osse MasterBob: git diff <from> <to>
17:55 osse you can diff anything and everything
17:55 blueyed _ikke_: getting an error there: http://sprunge.us/AAaY
17:56 MasterBob osse: doesn
17:56 MasterBob t that just give you the changes in those two commits?
17:57 multi_io joined #git
17:57 osse MasterBob: no, all the changes *between* those commits
17:57 MasterBob ah k. osse++.
17:57 osse MasterBob: it answers the question "what patch would I need to apply to get from one to the other?"
17:57 MasterBob So then git diff <from>...<to> is just those two commits?
17:57 GT4066 joined #git
17:58 osse that's something else
17:58 osse I wrote a space, not three dots.
17:58 dan2k3k4 joined #git
17:58 MasterBob Yes you did. I was just asking.
17:58 osse MasterBob: "just those two commits", what does that mean?
17:59 osse you mean what each commit by itself does?
17:59 MasterBob yes
17:59 osse then you have to diff the parent of <from> with <from>, and the parent of <to> with <to>.
18:00 osse parent = the commit made previously to that one.
18:00 timvishe` left #git
18:00 osse git diff from~1 from and git diff to~1 to  (for example). for just human inpection you can do  git show <from> and git show <to>
18:00 timvisher joined #git
18:01 cdg joined #git
18:01 fling joined #git
18:01 EvilPenguin joined #git
18:02 nonconvergent joined #git
18:02 deadprez joined #git
18:02 prawnzy joined #git
18:02 nonconvergent Is there a way to see how two branches diverge?
18:02 ShekharReddy joined #git
18:03 grawity tig (gitk, git log --graph --oneline) branch1...branch2
18:03 babilen joined #git
18:03 Mottie The link to the archives in !mailing_list points to http://news.gmane.org/gmane.comp.version-control.git but the site can't be reached
18:03 gitinfo 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://j.mp/gitlist
18:03 osse MasterBob: this might be interesting https://raw.githubusercontent.com/Osse/git-stuff/master/dots.txt
18:04 MasterBob thank you for your help osse
18:04 osse de nada
18:05 ekinmur joined #git
18:05 _ikke_ Mottie: http://public-inbox.org/git
18:05 nonconvergent grawity: I'm not sure which branch is which when I look at that git log
18:05 Mottie thanks _ikke_
18:06 grawity nonconvergent: --decorate
18:06 _ikke_ .short http://public-inbox.org/git
18:06 duderonomy joined #git
18:06 _ikke_ .shorten http://public-inbox.org/git
18:06 gitinfo _ikke_: .shorten: out http://jk.gs/t/a2 in http://public-inbox.org/git
18:06 vdl joined #git
18:06 babilen joined #git
18:07 Mottie _ikke_ wouldn't this site be easier to use? http://git.661346.n2.nabble.com/ ... as least for a noob like me I think
18:08 Rodya_ joined #git
18:09 ochorocho__ joined #git
18:09 dan2k3k4 joined #git
18:09 _ikke_ Perhaps
18:09 Faylite joined #git
18:09 Mottie :P
18:11 jost joined #git
18:11 einnjo joined #git
18:12 bluwave joined #git
18:13 MattMaker joined #git
18:13 jungsubk joined #git
18:15 rjack2 joined #git
18:15 aswen joined #git
18:16 nonconvergent is there a way to see which commits would be applied by a merge?
18:17 grawity git log ..otherbranch
18:17 MasterBob left #git
18:20 MrWoohoo joined #git
18:23 mingrammer joined #git
18:24 saml git rebase --onto origin/master  foo bar;   gets me to detached mode. how can I set current commit to head of bar branch?
18:26 ahmedelgabri joined #git
18:28 bluwave joined #git
18:28 Lewix hi guys
18:29 _ikke_ Lewix: Hey
18:29 Lewix git submodule update --init --recursive, i ran this and i get could not read from remote repo. I'm confused I guess it's not doing what I expected
18:29 _ikke_ saml: What do you use for bar?
18:30 _ikke_ Lewix: check the .gitmodules file
18:30 _ikke_ Lewix: Looks like one of the repositories is not accessibly
18:30 Lewix _ikke_: what does it do exactly?
18:30 Lewix the command
18:31 _ikke_ Lewix: It initializes all submodules (clones the repositories in the paths they are recorded for), recursively (so submodules of submodules are also initialized)
18:32 Lewix _ikke_: as I thought, so how does one set it up initially so that you have submodules in the first place. I never had to use if before (an interesting approach)
18:32 durham joined #git
18:32 _ikke_ Lewix: git submodule add <path> <url> adds a new submodule
18:33 _ikke_ It records the path as a submodule, adds an entry in .gitmodules and clones the repository
18:33 unreal joined #git
18:34 deadprez joined #git
18:35 Lewix _ikke_: if it clones the repo why do whoever clone the main repo has to do git submodule update --init --recursive then?
18:36 durham joined #git
18:36 dermoth joined #git
18:36 _ikke_ Lewix: Because the repository is not comitted in the parent repository
18:37 _ikke_ So when they clone the repo, the will just get an empty dir
18:38 MattMaker joined #git
18:38 Lewix https://www.irccloud.com/pastebin/hfitghdS/
18:39 Lewix _ikke_: thanks it makes sense now , now i have to figure out why i dont have the access right
18:39 t0by joined #git
18:39 Dredge joined #git
18:39 Pontus joined #git
18:40 grawity joined #git
18:40 canton7 joined #git
18:40 Darcidride joined #git
18:40 EvilJStoker joined #git
18:41 CandyAngel joined #git
18:41 sagerdearia joined #git
18:47 Synthead joined #git
18:48 irqq joined #git
18:49 MattMaker joined #git
18:49 Mobutils joined #git
18:50 grawity joined #git
18:51 Pontus joined #git
18:52 canton7 joined #git
18:55 VoidFox joined #git
18:57 Darcidride joined #git
18:57 finalbeta joined #git
19:02 Gloomy joined #git
19:07 drizztbsd joined #git
19:09 Rodya_ joined #git
19:10 m0viefreak joined #git
19:10 daynaskully joined #git
19:11 saml _ikke_, i don't know.. i ended up doing  git checkout bar; git rebase --onto origin/master  sha1 HEAD;  (sha1 is merge-base that I know).   git branch -f bar;  git checkout bar;
19:12 _ikke_ saml: why are you specifying HEAD?
19:12 _ikke_ That will cause the detached HEAD
19:12 saml what is proper way?
19:13 saml i want to rebase commit range  onto origin/master  and want to update current branch
19:13 _ikke_ git rebase --onto <new-base> <base> <checkout>
19:13 _ikke_ git rebase --onto origin/master <hash>
19:13 _ikke_ that should work in that case
19:14 deanosaur joined #git
19:16 rj11 joined #git
19:16 emg joined #git
19:16 BinGOs_ joined #git
19:16 jgornick_ joined #git
19:16 sparr joined #git
19:17 nilez joined #git
19:17 DistantStar joined #git
19:17 axisys joined #git
19:17 trelane joined #git
19:17 nemesit|znc joined #git
19:17 Bilge joined #git
19:17 badloop joined #git
19:17 iob- joined #git
19:17 BinGOs_ left #git
19:17 unreal joined #git
19:17 SupaHam joined #git
19:17 pluc_pilou joined #git
19:17 Dyonisos joined #git
19:17 quite joined #git
19:17 Mekkis joined #git
19:17 habbasi joined #git
19:17 selckin joined #git
19:17 somaReverse joined #git
19:18 psprint joined #git
19:18 hexa- joined #git
19:18 Furai joined #git
19:18 lohfu joined #git
19:18 SpeakerToMeat joined #git
19:18 armin joined #git
19:18 Dredge joined #git
19:19 Nothing4You joined #git
19:19 constantinexvi joined #git
19:20 chamunks joined #git
19:21 Cathy joined #git
19:21 Seveas joined #git
19:21 lolmac joined #git
19:22 Tentacled joined #git
19:23 Smirnov joined #git
19:23 iveqy_ joined #git
19:23 Kronuz joined #git
19:23 diogenese joined #git
19:23 justinmrkva joined #git
19:23 Stummi joined #git
19:23 crater2150 joined #git
19:23 dcg joined #git
19:23 ilogger2 joined #git
19:23 sns joined #git
19:23 rawtaz joined #git
19:23 moritz joined #git
19:23 BooK joined #git
19:23 Fissure joined #git
19:23 flaguy48 joined #git
19:23 tokkee joined #git
19:23 antranigv joined #git
19:23 mattcen joined #git
19:23 ws2k3 joined #git
19:23 smithbone joined #git
19:23 tm512 joined #git
19:23 ghoti joined #git
19:23 MikeChernev joined #git
19:23 duga joined #git
19:23 synthroid joined #git
19:23 vassagus joined #git
19:23 Pseudocrat joined #git
19:23 timvisher joined #git
19:23 LionsMane joined #git
19:23 King_Hual joined #git
19:23 SirCmpwn joined #git
19:23 Ranhir joined #git
19:23 tyreld joined #git
19:23 nioncode joined #git
19:23 annoymouse4210 joined #git
19:23 bluepixel joined #git
19:23 Alenah joined #git
19:23 leprechau joined #git
19:23 DANtheBEASTman joined #git
19:23 BlaXpirit joined #git
19:23 tang joined #git
19:23 kyan joined #git
19:23 tomek joined #git
19:23 bathtub_shark joined #git
19:23 maxorator joined #git
19:23 rudi_s joined #git
19:23 Ineentho[m] joined #git
19:23 grumble joined #git
19:23 blackwind_123 joined #git
19:23 nellicus_ joined #git
19:23 ftoulemon joined #git
19:23 emptynine joined #git
19:23 Electrometro joined #git
19:23 Stravy joined #git
19:23 on1x joined #git
19:23 murr4y joined #git
19:23 plasticboy joined #git
19:23 Lorcatar joined #git
19:23 Moult joined #git
19:23 wspider joined #git
19:23 knittl joined #git
19:23 h264 joined #git
19:23 hplar joined #git
19:23 Roconda joined #git
19:23 gajus joined #git
19:23 hfp_work joined #git
19:23 Virox joined #git
19:23 fiete joined #git
19:23 GyrosGeier joined #git
19:23 kloeri joined #git
19:23 Peng joined #git
19:23 JyZyXEL joined #git
19:23 xai joined #git
19:23 berndj joined #git
19:23 MapMan joined #git
19:23 chernjie joined #git
19:23 andres joined #git
19:23 phroa joined #git
19:23 swalladge joined #git
19:23 Werring joined #git
19:23 dharrigan joined #git
19:23 d1b joined #git
19:23 suy joined #git
19:23 tapout joined #git
19:23 GodEater` joined #git
19:23 relgar joined #git
19:23 MarkusDBX joined #git
19:23 fiddlerwoaroof joined #git
19:23 clr joined #git
19:23 7F1AB6AQ4 joined #git
19:23 tribly joined #git
19:23 ajpiano joined #git
19:23 tax joined #git
19:23 Arguggi joined #git
19:23 yoh joined #git
19:23 sysanthrope joined #git
19:23 rossome joined #git
19:23 Mikaela joined #git
19:23 shock- joined #git
19:23 felixjet joined #git
19:23 larrybolt joined #git
19:23 pioiytr_ joined #git
19:23 Limes joined #git
19:23 jorj joined #git
19:23 chachasmooth joined #git
19:23 atomi joined #git
19:23 kulyzu joined #git
19:23 flaviodesousa joined #git
19:23 Zamerick joined #git
19:23 chovy_ joined #git
19:23 mangolisk joined #git
19:23 ochorocho__ joined #git
19:23 dan2k3k4 joined #git
19:23 MajorPayne joined #git
19:23 laumann joined #git
19:23 tazle_ joined #git
19:23 bambams joined #git
19:23 eycsigfy joined #git
19:23 M-ou-se joined #git
19:23 skalpin joined #git
19:23 zapb_ joined #git
19:23 ToxicFrog joined #git
19:23 optraz joined #git
19:23 parecx joined #git
19:23 AustinMatherne joined #git
19:23 tchan joined #git
19:23 tHEMtZ joined #git
19:23 stux|RC-only joined #git
19:23 soreau joined #git
19:23 ReenignE joined #git
19:23 alcohol joined #git
19:23 _flow_ joined #git
19:23 Zumochi joined #git
19:23 pelegreno_ joined #git
19:23 catsup joined #git
19:23 heroux joined #git
19:23 Neo_ joined #git
19:23 Bowel joined #git
19:23 Chunk2 joined #git
19:23 albel727 joined #git
19:23 mns joined #git
19:23 JCaesar joined #git
19:23 milki joined #git
19:23 osxi_ joined #git
19:23 rf__ joined #git
19:23 ujjain joined #git
19:23 hiroki joined #git
19:23 RichiH joined #git
19:23 cite joined #git
19:23 boz_v1 joined #git
19:23 tterrag joined #git
19:23 Vauff joined #git
19:23 Orphis joined #git
19:23 sumoruman joined #git
19:23 Korvin joined #git
19:23 mika joined #git
19:23 kanzure joined #git
19:23 Kobaz joined #git
19:23 Takumo joined #git
19:23 Bombe joined #git
19:23 ntnn joined #git
19:23 ffledgling joined #git
19:23 Ragnor joined #git
19:23 Pursuit joined #git
19:23 pasky joined #git
19:23 Guest24510 joined #git
19:23 simon816 joined #git
19:23 TSS_ joined #git
19:23 cbreak joined #git
19:23 kozie joined #git
19:23 nopf joined #git
19:23 bjoe2k4 joined #git
19:23 inodb joined #git
19:23 silverdust joined #git
19:23 omegak joined #git
19:23 Hogofwar joined #git
19:23 tomzx joined #git
19:23 RickyB98 joined #git
19:23 ^7heo joined #git
19:23 jaeckel joined #git
19:23 Atlantic777 joined #git
19:23 msm joined #git
19:23 bsanford_ joined #git
19:23 RiPer joined #git
19:23 _xor joined #git
19:23 ThunderChicken joined #git
19:23 ozymandias_ joined #git
19:23 bauruine joined #git
19:23 chid joined #git
19:23 jlebar joined #git
19:23 gsingh93 joined #git
19:23 fugiman joined #git
19:23 chandlerbing joined #git
19:23 uranellus joined #git
19:23 danmackay_ joined #git
19:23 KeelOfSteel joined #git
19:23 m1dnight_ joined #git
19:23 joko joined #git
19:23 Slush- joined #git
19:23 re1 joined #git
19:23 esc joined #git
19:23 liuzhen_ joined #git
19:23 anth0ny joined #git
19:23 guampa joined #git
19:23 ngladitz joined #git
19:23 D-Boy joined #git
19:23 r4z joined #git
19:23 kpease joined #git
19:23 HappyLoaf_ joined #git
19:23 einnjo joined #git
19:23 aswen joined #git
19:23 legumbre_ joined #git
19:23 CrazyBonz joined #git
19:23 hecliunyx joined #git
19:23 lukky513 joined #git
19:23 Timvde joined #git
19:23 relrod_ joined #git
19:23 ad7 joined #git
19:23 gnarf joined #git
19:23 matsaman joined #git
19:23 timewalker joined #git
19:23 avtobiff joined #git
19:23 lightstalker joined #git
19:23 NightMonkey joined #git
19:23 devster31 joined #git
19:23 PasiFist joined #git
19:23 adamm joined #git
19:23 Jupelius joined #git
19:23 varesa joined #git
19:23 pitastrudl joined #git
19:23 Cabanossi joined #git
19:23 hegge joined #git
19:23 filcab joined #git
19:23 mitzip joined #git
19:23 quizzi joined #git
19:23 mischief joined #git
19:23 jlewis joined #git
19:23 same_ol_geez joined #git
19:23 ResidentBiscuit joined #git
19:23 Shentino joined #git
19:23 Synthead joined #git
19:23 LiENUS joined #git
19:23 u1106 joined #git
19:23 tsunamie joined #git
19:23 azerus_ joined #git
19:23 leeN joined #git
19:23 robinsmidsrod joined #git
19:23 moneylotion joined #git
19:23 michael_mbp joined #git
19:23 the_cybersphinx joined #git
19:23 zyxep joined #git
19:23 Muzer joined #git
19:23 monty joined #git
19:23 Guest68452 joined #git
19:23 BlackMaria joined #git
19:23 drbean joined #git
19:23 daishan joined #git
19:23 jab416171 joined #git
19:23 Celelibi joined #git
19:23 blahdodo joined #git
19:23 sdothum joined #git
19:23 sapiens_vector joined #git
19:23 elementalest joined #git
19:23 JelmerD joined #git
19:23 zrts joined #git
19:23 Xe joined #git
19:23 7ITAAIUI0 joined #git
19:23 nyuszika7h joined #git
19:23 ribasushi joined #git
19:23 AndrewAlexMac joined #git
19:23 tanuki joined #git
19:23 swiftgeek1 joined #git
19:23 markovh joined #git
19:23 fullstack joined #git
19:23 mariuscc joined #git
19:23 Junior joined #git
19:23 Keridos joined #git
19:23 JanC joined #git
19:23 sigjuice joined #git
19:23 a3Dman joined #git
19:23 troyt joined #git
19:23 raven-au joined #git
19:23 j416 joined #git
19:23 Ravana joined #git
19:23 jeffl35 joined #git
19:23 IndigoTiger joined #git
19:23 Zoxc joined #git
19:23 AKPWD joined #git
19:23 g5pw joined #git
19:23 timothy joined #git
19:23 Furai joined #git
19:23 AaronMT joined #git
19:23 rahtgaz joined #git
19:23 QwertyDragon joined #git
19:23 justanotheruser joined #git
19:23 Guest12420 joined #git
19:23 M-mistake joined #git
19:23 ygeLN joined #git
19:23 joelsmith joined #git
19:23 Davey joined #git
19:23 Cork joined #git
19:23 lu_zero joined #git
19:23 ejnahc joined #git
19:23 spinningarrow joined #git
19:23 jrahmy joined #git
19:23 Sonderblade joined #git
19:23 Vaelatern joined #git
19:23 Infamous joined #git
19:23 andschwa joined #git
19:23 TooLmaN joined #git
19:23 holdsworth joined #git
19:23 Mixologic joined #git
19:23 jave_ joined #git
19:23 ninsei joined #git
19:23 sitaram joined #git
19:23 wloncom joined #git
19:23 callumacrae joined #git
19:23 dsop joined #git
19:23 wagle joined #git
19:23 varx joined #git
19:23 frobnic joined #git
19:23 APic joined #git
19:23 kisonecat joined #git
19:23 yonatankoren joined #git
19:23 aboccia joined #git
19:23 Ram-Z joined #git
19:23 felher joined #git
19:23 ldlework joined #git
19:23 belak joined #git
19:23 meLon joined #git
19:23 roger_raymond joined #git
19:23 ses1984 joined #git
19:23 cydrobolt joined #git
19:23 idmistir joined #git
19:23 Sc0rpius joined #git
19:23 LeMike joined #git
19:23 thekingofbandit joined #git
19:23 groundnuty joined #git
19:23 biotim joined #git
19:23 iokill joined #git
19:23 tilpner joined #git
19:23 Kamilion joined #git
19:23 __main__ joined #git
19:23 Hink joined #git
19:23 nullie joined #git
19:23 Catachan_ joined #git
19:23 nanga joined #git
19:23 poz3idon joined #git
19:23 wiggle joined #git
19:23 BenderRodriguez joined #git
19:23 saml joined #git
19:23 Puffball joined #git
19:23 dling joined #git
19:23 johntramp joined #git
19:23 utrack joined #git
19:23 VladGh joined #git
19:23 nidr0x joined #git
19:23 stasmakarov joined #git
19:23 davidosomething joined #git
19:23 M-meznak joined #git
19:23 robogoat joined #git
19:23 jwest joined #git
19:23 noctux joined #git
19:23 umbSublime joined #git
19:23 Perspicaciosity joined #git
19:23 jstimm joined #git
19:23 jason237 joined #git
19:23 Segfault_ joined #git
19:23 rnsanchez joined #git
19:23 DelphicOkami joined #git
19:23 perlpilot joined #git
19:23 kfunk joined #git
19:23 sleezd joined #git
19:23 z8z joined #git
19:23 hanthings joined #git
19:23 thesquib joined #git
19:23 lacrymology joined #git
19:23 armyriad joined #git
19:23 clemf joined #git
19:23 deadprez joined #git
19:23 Mobutils joined #git
19:23 jbondhus_ joined #git
19:23 Narwhaal joined #git
19:23 cxreg2 joined #git
19:23 ayjay_t joined #git
19:23 osse joined #git
19:23 likewhoa joined #git
19:23 bruce_lee joined #git
19:23 woodruffw joined #git
19:23 jgjorgji joined #git
19:23 fling joined #git
19:23 madewokherd joined #git
19:23 Kehet joined #git
19:23 dcpc007 joined #git
19:23 Guest67656 joined #git
19:23 Guest52996 joined #git
19:23 pkiller joined #git
19:23 howitdo joined #git
19:23 JrCs joined #git
19:23 dermoth joined #git
19:23 CentaurWarchief joined #git
19:23 raijin joined #git
19:23 moestevens joined #git
19:23 weltall joined #git
19:23 anonnumberanon joined #git
19:23 daynaskully joined #git
19:23 sparetire joined #git
19:23 themayor joined #git
19:23 DonRichie joined #git
19:23 thekrynn_ joined #git
19:23 grawity joined #git
19:23 Exagone313 joined #git
19:23 WebDawg joined #git
19:23 ybden joined #git
19:23 p1k joined #git
19:23 atrus joined #git
19:23 n-st joined #git
19:23 nchambers joined #git
19:23 liquidjamm joined #git
19:23 ploop joined #git
19:23 trobotham joined #git
19:23 MattMaker joined #git
19:23 cebor joined #git
19:23 dreamyspell joined #git
19:23 SleePy joined #git
19:23 sweatsuit joined #git
19:23 Tsutsukakushi joined #git
19:23 cYmen joined #git
19:23 Spydar007 joined #git
19:23 pks joined #git
19:23 seitensei joined #git
19:23 jerrcs joined #git
19:23 Gurkenglas joined #git
19:23 bejeb joined #git
19:23 Hello71 joined #git
19:23 Dev0n joined #git
19:23 boogibugs joined #git
19:23 tjbp joined #git
19:23 harv joined #git
19:23 brewmast1r joined #git
19:23 tmz joined #git
19:23 Nugget joined #git
19:23 BytesAndCoffee joined #git
19:23 SJr joined #git
19:23 przemoc joined #git
19:23 ColdKeyboard joined #git
19:23 jrnieder joined #git
19:23 MaddHatter joined #git
19:23 tfnico joined #git
19:23 DarkMukke joined #git
19:23 nebg joined #git
19:23 hwoarang joined #git
19:23 themill joined #git
19:23 e joined #git
19:23 vigilvindex joined #git
19:23 marvi joined #git
19:23 boshhead joined #git
19:23 VampiricPadraig_ joined #git
19:23 mafrasi2_ joined #git
19:23 ohcibi joined #git
19:23 SenpaiSilver joined #git
19:23 sea-gull joined #git
19:23 GingerGeek joined #git
19:23 Afforess joined #git
19:23 synchronous joined #git
19:23 Urbany joined #git
19:23 wizardedit joined #git
19:23 pR0Ps joined #git
19:23 SegFaultAX joined #git
19:23 chris2 joined #git
19:23 antispaceman joined #git
19:23 iveqy joined #git
19:23 Megaf joined #git
19:23 Guest39784 joined #git
19:23 vhost- joined #git
19:23 marienz joined #git
19:23 Ring0` joined #git
19:23 Dazzyp joined #git
19:23 bipolar joined #git
19:23 parliament joined #git
19:23 Boobuigi joined #git
19:23 Rikairchy joined #git
19:23 Surfer2010 joined #git
19:23 msonntag joined #git
19:23 Impaloo joined #git
19:23 qpdb joined #git
19:23 sostenuto joined #git
19:23 aspiers joined #git
19:23 UTAN_dev_ joined #git
19:23 DTekk joined #git
19:23 midnightmagic joined #git
19:23 BlackPanx joined #git
19:23 fees joined #git
19:23 buzzLightBeer joined #git
19:23 andlabs joined #git
19:23 FilipNortic joined #git
19:23 jaafar joined #git
19:23 afuentes joined #git
19:23 astaves joined #git
19:23 thiago_ joined #git
19:23 flavius joined #git
19:23 jungsubk joined #git
19:23 CandyAngel joined #git
19:23 canton7 joined #git
19:23 mukmuk joined #git
19:23 bluj joined #git
19:23 gkatsev joined #git
19:23 DolphinDream joined #git
19:23 Guest52727 joined #git
19:23 Gitzilla joined #git
19:23 mjacob joined #git
19:23 finalbeta joined #git
19:23 tubaman joined #git
19:23 cworth joined #git
19:23 gravitron joined #git
19:23 Fiouz joined #git
19:23 Guest78798 joined #git
19:23 obadz joined #git
19:23 Guest92408 joined #git
19:23 dinoocch joined #git
19:23 jamick joined #git
19:23 GGMethos joined #git
19:23 dwmw2 joined #git
19:23 martinklepsch joined #git
19:23 PalTale joined #git
19:23 Jonuz joined #git
19:23 doppo joined #git
19:23 sword joined #git
19:23 xkr47 joined #git
19:23 swift1 joined #git
19:23 MatthewAllan93 joined #git
19:23 BlessJah joined #git
19:23 arooni joined #git
19:23 kline joined #git
19:23 drawkula joined #git
19:23 spaceone joined #git
19:23 Neico joined #git
19:23 moop joined #git
19:23 timthowtdi joined #git
19:23 djh joined #git
19:23 lizzie joined #git
19:23 meZee joined #git
19:23 owlscientist joined #git
19:23 goezz joined #git
19:23 avar joined #git
19:23 tcsc joined #git
19:23 Ratler joined #git
19:23 SporkWitch joined #git
19:23 vmiklos joined #git
19:23 jas4711 joined #git
19:23 Vinnie_win joined #git
19:23 monoprotic joined #git
19:23 HalfEatenPie joined #git
19:23 PaulePanter joined #git
19:23 LukeLR joined #git
19:23 SirFunk joined #git
19:23 teadrop_ joined #git
19:23 Garen joined #git
19:23 rom1504 joined #git
19:23 daurnimator joined #git
19:23 up_the_irons joined #git
19:23 jhe_ joined #git
19:23 Guest68547 joined #git
19:23 ManiacTwister joined #git
19:23 nsh joined #git
19:23 runlevl4 joined #git
19:23 bttf joined #git
19:23 MacWinner joined #git
19:23 neunon joined #git
19:23 L-11 joined #git
19:23 sangy joined #git
19:23 pullphinger joined #git
19:23 dviola joined #git
19:23 bongjovi joined #git
19:23 tinanoo joined #git
19:23 tristanp joined #git
19:23 duarteper joined #git
19:23 barduck joined #git
19:23 Sasazuka joined #git
19:23 BSAlb joined #git
19:23 nonconvergent joined #git
19:23 Faylite joined #git
19:23 Moggets joined #git
19:23 Guest94911 joined #git
19:23 snits joined #git
19:23 Guest4224 joined #git
19:23 Mathiasdm joined #git
19:23 fus_ joined #git
19:23 Guest3860 joined #git
19:23 ilmari joined #git
19:23 tvl joined #git
19:23 ixian joined #git
19:23 biertie joined #git
19:23 XVar joined #git
19:23 Cyclohexane joined #git
19:23 jj- joined #git
19:23 Guest37623 joined #git
19:23 EvilPenguin joined #git
19:23 ix007 joined #git
19:23 plouescat joined #git
19:23 kennon joined #git
19:23 irqq joined #git
19:23 serialoverflow joined #git
19:23 bastelfreak joined #git
19:23 Guest69308 joined #git
19:23 tabakhase joined #git
19:23 hexagoxel joined #git
19:23 Raed joined #git
19:23 oxsyn joined #git
19:23 Guest46083 joined #git
19:23 tuor joined #git
19:23 monokrome joined #git
19:23 caffeinatedcode joined #git
19:23 roentgen joined #git
19:23 maqr joined #git
19:23 liefer joined #git
19:23 TheBrayn joined #git
19:23 Guest24955 joined #git
19:23 AlHafoudh joined #git
19:23 Maple__ joined #git
19:23 drupald joined #git
19:23 nickthetait joined #git
19:23 Guest20299 joined #git
19:23 buhocfoch joined #git
19:23 morenoh149 joined #git
19:23 yuhlw_ joined #git
19:23 7IZAAI96A joined #git
19:23 bailon joined #git
19:23 quetz joined #git
19:23 rzeka joined #git
19:23 benbergman joined #git
19:23 Guest21711 joined #git
19:23 CIAguy joined #git
19:23 HedgeMage_ joined #git
19:23 Grum joined #git
19:23 m0viefreak joined #git
19:23 jost joined #git
19:23 duderonomy joined #git
19:23 relipse joined #git
19:23 jokke joined #git
19:23 sin3t joined #git
19:23 dsdeiz joined #git
19:23 paws_ joined #git
19:23 sagittarian joined #git
19:23 t-mart joined #git
19:23 yac joined #git
19:23 preaction joined #git
19:23 MacGyver joined #git
19:23 roflin joined #git
19:23 AndreSomers joined #git
19:23 garyserj joined #git
19:23 rbr joined #git
19:23 miklcct joined #git
19:23 FritzLakritz joined #git
19:23 yitz joined #git
19:23 jon-mac joined #git
19:23 jumpman joined #git
19:23 rts-sander joined #git
19:23 batrick joined #git
19:23 lamont joined #git
19:23 Neal_ joined #git
19:23 nkhoit joined #git
19:23 Caelum joined #git
19:23 imMute joined #git
19:23 toydestroyer joined #git
19:23 autofly joined #git
19:23 Esya joined #git
19:23 errr joined #git
19:23 Chaser joined #git
19:23 dpower joined #git
19:23 chimeracoder joined #git
19:23 Sigma joined #git
19:23 davidstrauss joined #git
19:23 McKraken_zzzzz joined #git
19:23 Kulrak joined #git
19:23 nephyrin` joined #git
19:23 madduck joined #git
19:23 fk joined #git
19:23 topi` joined #git
19:23 fhackdroid joined #git
19:23 saidelike joined #git
19:23 zifnab joined #git
19:23 WakiMiko_ joined #git
19:23 tonyj joined #git
19:23 d3r1ck joined #git
19:23 chrysa joined #git
19:23 tctara joined #git
19:23 Xandaros joined #git
19:23 quadz joined #git
19:23 fold4 joined #git
19:23 rafalcpp joined #git
19:23 unbalancedparen joined #git
19:23 nd_ joined #git
19:23 Aaeriele joined #git
19:23 chibby0ne joined #git
19:23 Guest33724 joined #git
19:23 GodGinrai joined #git
19:23 deanosaur joined #git
19:23 Darcidride joined #git
19:23 MrWoohoo joined #git
19:23 babilen joined #git
19:23 crayon joined #git
19:23 thierryp joined #git
19:23 Phlogistique joined #git
19:23 netj joined #git
19:23 dhollinger joined #git
19:23 ash_workz joined #git
19:23 Hounddog joined #git
19:23 jnewt joined #git
19:23 spriz joined #git
19:23 moei joined #git
19:23 NeverDie joined #git
19:23 ItSANg___ joined #git
19:23 neanderslob joined #git
19:23 qws-user-1229 joined #git
19:23 MattE joined #git
19:23 mrpackethead joined #git
19:23 KnownSyntax joined #git
19:23 ringer1 joined #git
19:23 parasite_ joined #git
19:23 rwb joined #git
19:23 Thorn joined #git
19:23 Sna4x8 joined #git
19:23 adante joined #git
19:23 raz joined #git
19:23 meejah joined #git
19:23 HarryHallman joined #git
19:23 kugel joined #git
19:23 Lunatrius joined #git
19:23 BeerSerc joined #git
19:23 nitesh joined #git
19:23 rideh joined #git
19:23 dmarr joined #git
19:23 ndim joined #git
19:23 abh joined #git
19:23 AlgorithmWizard joined #git
19:23 Ekho joined #git
19:23 styx_ joined #git
19:23 neurodrone_ joined #git
19:23 ffualo joined #git
19:23 Juri_Agarin joined #git
19:23 azwieg103 joined #git
19:23 Kaisyu joined #git
19:23 Kuukunen joined #git
19:23 naf joined #git
19:23 taargus41 joined #git
19:23 greymalkin joined #git
19:23 snowinferno_ joined #git
19:23 nevyn joined #git
19:23 Yaiyan joined #git
19:23 rcn joined #git
19:23 harleyyyyymayes joined #git
19:23 Karunamon joined #git
19:23 m0ltar joined #git
19:23 maaarghk joined #git
19:23 colona joined #git
19:23 angseus joined #git
19:23 mattp_ joined #git
19:23 dzho joined #git
19:23 EvanDotPro joined #git
19:23 jasondotstar joined #git
19:23 JoshL joined #git
19:23 du joined #git
19:23 Vadtec joined #git
19:23 thejoecarroll joined #git
19:23 toogley1 joined #git
19:23 [cust] joined #git
19:23 aviraldg joined #git
19:23 de-vri-es joined #git
19:23 mar77i joined #git
19:23 musca joined #git
19:23 creppe joined #git
19:23 Vgr joined #git
19:23 c0ded joined #git
19:23 Mannn joined #git
19:23 durham joined #git
19:23 uidzer0 joined #git
19:23 go1111111 joined #git
19:23 Remram joined #git
19:23 rasto joined #git
19:23 cjbrambo joined #git
19:23 Guest93791 joined #git
19:23 jantje joined #git
19:23 multi_io_ joined #git
19:23 ahmedelgabri joined #git
19:23 rjack2 joined #git
19:23 vdl joined #git
19:23 dreiss joined #git
19:23 actinide joined #git
19:23 raspado joined #git
19:23 kristian_on_linu joined #git
19:23 asmacdo joined #git
19:23 brendyn joined #git
19:23 njbair joined #git
19:23 comps joined #git
19:23 kadoban joined #git
19:23 griffindy joined #git
19:23 rominronin joined #git
19:23 darkbit joined #git
19:23 Emperor_Earth joined #git
19:23 daey joined #git
19:23 lagothri1 joined #git
19:23 d^sh joined #git
19:23 zacts joined #git
19:23 dvl joined #git
19:23 karstensrage joined #git
19:23 Jon28 joined #git
19:23 sharkz_ joined #git
19:23 tjj joined #git
19:23 rastos2 joined #git
19:23 mmlb joined #git
19:23 Klumben joined #git
19:23 murph joined #git
19:23 m1dnight` joined #git
19:23 Eryn_1983_FL joined #git
19:23 PaulCapestany joined #git
19:23 realz joined #git
19:23 johtso joined #git
19:23 aca20031 joined #git
19:23 sbeller_ joined #git
19:23 synthmeat joined #git
19:23 McNozes joined #git
19:23 salparadise joined #git
19:23 dhanush joined #git
19:23 forrestv joined #git
19:23 MillerBoss joined #git
19:23 mquin joined #git
19:23 superteece joined #git
19:23 disi joined #git
19:23 peepsalot joined #git
19:23 evie_hammond joined #git
19:23 krillr joined #git
19:23 CussBot joined #git
19:23 r3c0d3x joined #git
19:23 shauna joined #git
19:23 thomas joined #git
19:23 devhoag joined #git
19:23 blackjid joined #git
19:23 POQDavid joined #git
19:23 cschneid joined #git
19:23 arand_ joined #git
19:23 SebastianFlyte joined #git
19:23 wcpan joined #git
19:23 Eugene joined #git
19:23 StatutoryApe joined #git
19:23 rewt joined #git
19:23 codebam joined #git
19:23 vktec joined #git
19:23 i7c joined #git
19:23 asd5a joined #git
19:23 me_and joined #git
19:23 geko joined #git
19:23 shymega joined #git
19:23 Peng_ joined #git
19:23 CustosLimen joined #git
19:23 souther joined #git
19:23 spb joined #git
19:23 armenzg joined #git
19:23 hfp joined #git
19:23 Rhonda joined #git
19:23 stfn joined #git
19:23 ojacobson joined #git
19:23 cjohnson joined #git
19:23 maxb joined #git
19:23 strugee joined #git
19:23 Spinkzeit joined #git
19:23 HelloAtMega joined #git
19:23 kossy_ joined #git
19:23 pdgwien joined #git
19:23 Guest53868 joined #git
19:23 rcz joined #git
19:23 EisNerd_ joined #git
19:23 jokester joined #git
19:23 bremner joined #git
19:23 KevinMGranger joined #git
19:23 tango_ joined #git
19:23 gmh joined #git
19:23 niax joined #git
19:23 sLite joined #git
19:23 rudycane joined #git
19:23 joshc joined #git
19:23 hide joined #git
19:23 slixpk joined #git
19:23 beagleGuy joined #git
19:23 MrC joined #git
19:23 cdesai joined #git
19:23 systmkor joined #git
19:23 malide joined #git
19:23 gigq joined #git
19:23 Mir4g3 joined #git
19:23 asdofindia joined #git
19:23 uebera|| joined #git
19:23 sunny256 joined #git
19:23 hagabaka joined #git
19:23 Mo0O joined #git
19:23 qsx joined #git
19:23 corebits joined #git
19:23 heinrich5991 joined #git
19:23 HedgeWork joined #git
19:23 gitinfo joined #git
19:23 h12o joined #git
19:23 wwalker joined #git
19:23 emilyrose joined #git
19:23 tier2villain_ joined #git
19:23 javaJake joined #git
19:23 Boniche joined #git
19:23 nedbat joined #git
19:23 qlkzy joined #git
19:23 Bigcheese joined #git
19:23 lmat joined #git
19:23 sfix joined #git
19:23 marcaddeo joined #git
19:23 Forkk joined #git
19:23 rancyd joined #git
19:23 weylin joined #git
19:23 Riviera joined #git
19:23 bodie_ joined #git
19:23 Zarthus joined #git
19:23 marlun joined #git
19:23 r4z3r joined #git
19:23 ashnur joined #git
19:23 gniourf joined #git
19:23 d0nn1e joined #git
19:23 mrBen2k2k2k joined #git
19:23 Cerise joined #git
19:23 rxo joined #git
19:23 tomaw joined #git
19:23 M-ou-se_ joined #git
19:23 watersoul joined #git
19:23 FabTG joined #git
19:23 corpsicle joined #git
19:23 mjacob joined #git
19:23 M-mistake joined #git
19:23 podbay joined #git
19:23 danemacmillan joined #git
19:23 vishal joined #git
19:23 aard_ joined #git
19:23 Defcronyke joined #git
19:23 wget joined #git
19:23 mutex joined #git
19:23 jimi_ joined #git
19:23 ozzloy_ joined #git
19:23 dalias_ joined #git
19:23 t0by joined #git
19:23 _nwkj86 joined #git
19:23 nitric joined #git
19:23 le_melomane joined #git
19:23 nydel07 joined #git
19:23 PioneerAxon joined #git
19:23 chrisshattuck joined #git
19:23 sonOfRa joined #git
19:23 Dougie187 joined #git
19:23 johnmilton joined #git
19:23 Cryp71c joined #git
19:23 threenplusone joined #git
19:23 blueyed joined #git
19:23 mniip joined #git
19:23 Vortex34 joined #git
19:23 _Patrick_ joined #git
19:23 Remram[m] joined #git
19:23 texasmynsted joined #git
19:23 wgrant joined #git
19:23 raatiniemi joined #git
19:23 BrianBlaze420 joined #git
19:23 dilfridge joined #git
19:23 markmarkmark joined #git
19:23 Derega joined #git
19:23 Curly060 joined #git
19:23 forgot joined #git
19:23 graft joined #git
19:23 Sleepy63 joined #git
19:23 thoros- joined #git
19:23 underpantz_ joined #git
19:23 iamtakingiteasy joined #git
19:23 Nevik joined #git
19:23 KnightsOfNi joined #git
19:23 traxo-xx joined #git
19:23 LHL_Jordan joined #git
19:23 deltab joined #git
19:23 mrkake joined #git
19:23 siprbaum joined #git
19:23 mwleeds joined #git
19:23 gruetzkopf joined #git
19:23 styler2go joined #git
19:23 jesk joined #git
19:23 EgS joined #git
19:23 jast joined #git
19:23 krabat joined #git
19:23 bond joined #git
19:23 gnoirzox joined #git
19:23 Soliton joined #git
19:23 pigeon joined #git
19:23 markovh joined #git
19:23 Smirnov joined #git
19:23 brandonw joined #git
19:23 akkad joined #git
19:23 Guest68452 joined #git
19:23 ec\ joined #git
19:23 yanope joined #git
19:23 rgrinberg joined #git
19:23 noodle joined #git
19:23 ad7 joined #git
19:23 tonyyarusso joined #git
19:23 heroux joined #git
19:23 AustinIncognito joined #git
19:23 ReenignE joined #git
19:23 ketas joined #git
19:23 parecx joined #git
19:23 Ineentho[m] joined #git
19:23 tHEMtZ- joined #git
19:23 johnny56_ joined #git
19:23 bcc joined #git
19:23 deepy joined #git
19:23 soreau_ joined #git
19:23 a_ joined #git
19:23 Ciblia joined #git
19:23 freekevin joined #git
19:23 eycsigfy_ joined #git
19:23 Dredge joined #git
19:23 Dyonisos joined #git
19:23 trelane joined #git
19:23 badloop joined #git
19:23 Zumochi joined #git
19:23 armin joined #git
19:23 tomek joined #git
19:23 marlinc joined #git
19:23 freekevin help im trying to update master branch
19:23 heftig joined #git
19:23 freekevin woh
19:23 Ankhers joined #git
19:23 synthroid joined #git
19:23 BadSnappa joined #git
19:23 jor joined #git
19:23 freekevin netsplit?
19:23 InfoTest joined #git
19:23 bittyx joined #git
19:23 kyan joined #git
19:24 iskander joined #git
19:24 unreal_ joined #git
19:24 iota_pi joined #git
19:24 Corosus joined #git
19:24 Anthaas joined #git
19:24 iota_pi joined #git
19:24 AlexanderS joined #git
19:24 ReenignE joined #git
19:24 VoidFox joined #git
19:24 aviraldg joined #git
19:24 aviraldg joined #git
19:24 tesuji joined #git
19:24 ahf joined #git
19:24 ozzloy joined #git
19:24 mkoskar joined #git
19:24 warthog9 joined #git
19:24 cyphase joined #git
19:24 wget joined #git
19:24 wget joined #git
19:24 nilez joined #git
19:24 le_melomane joined #git
19:24 relrod_ joined #git
19:24 EvilPenguin joined #git
19:24 Brando753-o_O_o joined #git
19:24 dtux joined #git
19:24 le_melomane joined #git
19:24 blackwind_123 joined #git
19:24 sagerdearia joined #git
19:24 holodoc joined #git
19:24 akkad joined #git
19:24 danemacmillan joined #git
19:25 unforgiven512 joined #git
19:25 kaldoran joined #git
19:25 freekevin help im trying to update master branch
19:25 bathtub_shark joined #git
19:25 quite joined #git
19:25 fspy joined #git
19:25 Guest86420 left #git
19:25 pelegreno__ joined #git
19:25 leonarth joined #git
19:25 artgoeshere joined #git
19:25 matthiaskrgr joined #git
19:25 BinGOs joined #git
19:25 grumble joined #git
19:25 blawiz joined #git
19:25 MarkusDBX joined #git
19:25 mischief joined #git
19:26 Siilwyn joined #git
19:26 chrisml joined #git
19:26 ExeciN joined #git
19:26 devhost joined #git
19:26 blawiz is it easy to upload a file from terminal/script and get its url to share via git?
19:26 GodGinrai joined #git
19:26 chachasmooth joined #git
19:26 Guest28768 joined #git
19:26 Guest28768 joined #git
19:26 M-shine joined #git
19:26 dustinm joined #git
19:26 sybariten joined #git
19:26 ojdo joined #git
19:26 grawity blawiz: https://gist.github.com/
19:27 jhasse joined #git
19:27 _ikke_ joined #git
19:27 finalbeta joined #git
19:27 kadoban blawiz: Sounds a lot like you're using git for something that doesn't make a lot of sense (direct answer: no, unless the remote supports that for some reason)
19:27 steven_ joined #git
19:27 ec\ joined #git
19:27 Guest89947 joined #git
19:27 flopsec joined #git
19:27 iamthad joined #git
19:27 grawity in other words, yes
19:27 ekinmur joined #git
19:27 polyzen joined #git
19:27 _ikke_ freekevin: In what sense are you trying to update the master branch?
19:27 blawiz kadoban: ahh, just my dropbox-it script starting to fail..
19:27 Guest7356 joined #git
19:28 blawiz someone suggested git
19:28 grawity git's definitely not meant for this purpose
19:28 _ikke_ Doesn't really make sense
19:28 Hobbyboy joined #git
19:28 freekevin _ikke_: I have a master branch and I cannot update to it for some reason
19:28 silverdust joined #git
19:28 _ikke_ freekevin: What did you try?
19:28 grawity there are git-based pastebins, with scripts for them, yes
19:28 freekevin is there a way to keep my changes and merge the master to my local ?
19:28 grawity but it's not a file-sharing app
19:29 dunk joined #git
19:29 freekevin git reset -hard
19:29 freekevin git pull
19:29 parsnip joined #git
19:29 _ikke_ git pull should work
19:29 GodGinrai blawiz: cat file_or_script | curl -F 'f:1=<-' ix.io
19:29 abra0 joined #git
19:29 kanyeezy joined #git
19:30 blawiz my dropit script worked like this: dropit /path/file, which moved it to Dropbox/Public and copied the url to clipboard
19:30 moestevens joined #git
19:30 pfg joined #git
19:30 rfv joined #git
19:30 kadoban blawiz: Fix it?
19:31 ToBeFree joined #git
19:31 blawiz kadoban: ja, maybe :/
19:31 _W_ joined #git
19:31 lebster joined #git
19:31 blawiz i think maybe the dropbox bin is broken
19:31 Seveas blawiz: install git-spindle and you can do "some command here | git hub gist -"
19:32 _ikke_ wb Seveas
19:32 Seveas or just do bla | nc termbin.com 9999
19:32 bket joined #git
19:32 blawiz Seveas: i want to share pics/files, not just text
19:32 da5id joined #git
19:32 Seveas blawiz: git hub gist filename :)
19:32 _ikke_ How did you manage to rename?
19:32 infernix joined #git
19:32 RickyB98 joined #git
19:32 grawity blawiz: why do you want to use git for that?
19:32 Hogofwar joined #git
19:32 Seveas _ikke_: dunno, didn't expect it to work
19:32 hiroki joined #git
19:32 hiroki joined #git
19:32 Seveas but gitinfo also wouldn't voice me
19:32 RickyB98 joined #git
19:32 cory_ joined #git
19:32 GodGinrai blawiz: sounds like you really should just fix your dropbox script, then
19:32 _ikke_ I got rejected for several chans
19:33 _ikke_ thought it would be easier to reconnect
19:33 blawiz grawity: i dunno, just asking if its good for that, since someone suggested it
19:33 pikajude joined #git
19:33 pikajude joined #git
19:33 Seveas so what was fucked on freenode today? :)
19:33 Seveas blawiz: it's not really what git is meant for, but hey, it can work.
19:33 grawity blawiz: no, it's not good for that.
19:33 grawity blawiz: I think it was mentioned a few times
19:33 grawity blawiz: it's not really a thing git does.
19:33 fcrick joined #git
19:34 stomplee joined #git
19:34 blawiz got it
19:34 RiPer joined #git
19:34 kuly-zu joined #git
19:34 kadoban Haha ... "We don't seem to be under attack". Well, I wasn't worried about that before, but now ...
19:34 MissionCritical joined #git
19:35 cloudcell_ joined #git
19:35 berndl joined #git
19:35 treehug88 joined #git
19:35 freekevin the cloth helps
19:35 _ikke_ "We've put a cloth over the self-destruct button so that nobody pushes it again."
19:35 Furai joined #git
19:36 satifant joined #git
19:36 lolmac joined #git
19:36 ec joined #git
19:36 GodGinrai _ikke_: someone flipped the "magic" switch on one of the servers, no doubt
19:36 _ikke_ GodGinrai: Must be
19:37 _ikke_ reference: http://catb.org/jargon/html/magic-story.html
19:37 Seveas https://www.youtube.com/watch?v=TlWrHG38ZLU
19:38 mehdi__ joined #git
19:38 beastd joined #git
19:38 sylario joined #git
19:38 _ikke_ Classic
19:38 vcoinminer joined #git
19:38 ochorocho__ joined #git
19:39 polyzen joined #git
19:39 rgrinberg joined #git
19:41 martin_g joined #git
19:41 henriquev joined #git
19:41 satbyy joined #git
19:42 kfpratt joined #git
19:42 blueyed _ikke_: I've removed the empty object files, but then the lost stash did not appear with "git fsck --no-reflog", of course.
19:42 rgrinberg joined #git
19:43 worstadmin joined #git
19:43 blueyed It looks like the "git stash pop" action is not atomic in this regard?
19:44 freekevin _ikke_:  git pull gives errors though http://pastebin.com/k6DYehWi
19:44 hecliunyx joined #git
19:44 cagedwisdom joined #git
19:44 rgrinberg joined #git
19:45 linuxmodder joined #git
19:45 _ikke_ freekevin: "Automatic merge failed; fix conflicts and then commit the result."
19:45 dsdeiz_ joined #git
19:45 _ikke_ freekevin: You have a merge conflict"
19:45 freekevin _ikke_:  git pull force merge?
19:46 freekevin yes I see theres a merge conflict
19:46 freekevin looking for what to do
19:46 _ikke_ !eek
19:46 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
19:46 prawnzy joined #git
19:47 nonconvergent Hmm, I tried to rebase -i instead of cherry-pick but I need to do more to get it commits from a another branch?
19:47 FizzyGalacticus joined #git
19:48 ealvarez___ joined #git
19:48 rgrinberg joined #git
19:49 tobie joined #git
19:49 NeverDie joined #git
19:49 _ikke_ nonconvergent: more in what regard?
19:49 bcardarella joined #git
19:49 _ikke_ Do you want to move or copy the commits?
19:50 emg joined #git
19:50 NeverDie joined #git
19:50 cdown_ joined #git
19:51 aendrew joined #git
19:51 minibar joined #git
19:52 pikajude joined #git
19:53 mohabaks joined #git
19:53 huhlig joined #git
19:54 EvilPenguin joined #git
19:54 eshlox joined #git
19:55 ulkesh joined #git
19:55 isysd joined #git
19:56 quetz^^ joined #git
19:57 cdown__ joined #git
19:57 JackMc joined #git
19:57 Perspicaciosity joined #git
19:57 [diecast] joined #git
19:58 XDS2010 joined #git
19:58 Someguy123 joined #git
19:58 braderhart joined #git
19:58 izak joined #git
19:58 zero7 joined #git
19:58 kutenai joined #git
19:59 flupke joined #git
19:59 addshore joined #git
19:59 pizzaops joined #git
19:59 paperziggurat joined #git
19:59 DannyFritz joined #git
19:59 boxrick1 joined #git
19:59 adambrenecki joined #git
20:00 Anupkumar joined #git
20:00 cdg joined #git
20:00 m0viefreak joined #git
20:00 elijah joined #git
20:00 DuncanT joined #git
20:00 ggherdov joined #git
20:01 contracode joined #git
20:01 madknight joined #git
20:01 joseph_arnstein joined #git
20:01 Tee_Pee joined #git
20:01 beckyconning_ joined #git
20:01 GameGamer43 joined #git
20:01 davisonio joined #git
20:01 daxroc joined #git
20:01 shennyg joined #git
20:01 epic joined #git
20:02 oncall-pokemon joined #git
20:02 spr0tsuki joined #git
20:02 NightStrike joined #git
20:02 harleypig joined #git
20:02 Lewix joined #git
20:02 Celelibi joined #git
20:02 ionelmc joined #git
20:02 discopatrick joined #git
20:02 FritzLakritz joined #git
20:02 barq joined #git
20:02 janx joined #git
20:02 Lowell joined #git
20:03 CheckDavid joined #git
20:03 snthsnth joined #git
20:03 mroth joined #git
20:03 imdsm_ joined #git
20:04 unholycrab joined #git
20:04 timwis joined #git
20:04 cstrahan joined #git
20:04 sebhoss joined #git
20:04 angelsl joined #git
20:04 etcinit joined #git
20:04 ExoUNX joined #git
20:04 ExoUNX joined #git
20:04 kwmiebach joined #git
20:04 johtso joined #git
20:04 evanc joined #git
20:04 iamdevnul joined #git
20:05 elastix joined #git
20:05 prosody joined #git
20:05 ivo_ joined #git
20:05 yoyoyo___ joined #git
20:05 sevenfourk joined #git
20:05 stealthii joined #git
20:05 theskillwithin joined #git
20:06 ToeSnacks joined #git
20:06 wizonesolutions joined #git
20:06 sdothum joined #git
20:06 CEnnis91 joined #git
20:06 sfan786_ joined #git
20:06 al-damiri joined #git
20:06 sr___ joined #git
20:06 MLM joined #git
20:07 cmosguy joined #git
20:07 annoymouse joined #git
20:07 Awesomecase joined #git
20:07 twisted` joined #git
20:07 bbhoss joined #git
20:07 theresajayne joined #git
20:09 richardlitt joined #git
20:09 ochorocho__ joined #git
20:10 Rodya_ joined #git
20:10 lucz joined #git
20:10 elmcrest joined #git
20:11 WillMoogle joined #git
20:11 yena joined #git
20:11 thecomedian joined #git
20:12 spudowiar joined #git
20:13 imanc joined #git
20:13 Guest3860 joined #git
20:14 felowe joined #git
20:15 ggherdov joined #git
20:15 zeller joined #git
20:15 Celelibi joined #git
20:18 trig-ger joined #git
20:18 mchelen2 joined #git
20:18 altendky joined #git
20:18 ams__ joined #git
20:18 jleclanche joined #git
20:18 parliament joined #git
20:19 arooni how do i add a directory without any of its contents ?
20:19 arooni cuz when i ran git add foo ; it adds all directory contents
20:19 _ikke_ arooni: git does not track directoriies
20:19 _ikke_ directories*
20:19 arooni ah ha; didnt know that
20:19 arooni so no way to do do that really
20:20 noahsussman joined #git
20:20 ahmedelgabri joined #git
20:20 _ikke_ Only way is to add a dummy file which you track
20:20 _ikke_ .gitkeep or .gitignore or someting like that
20:20 angular_mike_ joined #git
20:20 Seveas _ikke_: I've been wondering lately whether it could be done though. Nothing in tree objects really requires blobs
20:20 arooni ah create a file like that in the directory i want trackeD?  and ignore everything with a .gitignore file
20:20 arooni everything in that directory
20:21 Seveas arooni: yup. But this sounds like !xy
20:21 gitinfo arooni: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
20:21 Discovery joined #git
20:22 Vgr joined #git
20:22 Vgr joined #git
20:22 Vgr joined #git
20:22 Vgr joined #git
20:22 arooni ok ; so i use a separate git repo for every command line tool i use so i can replicate the enviornment i like.  i recently started using fisherman as a plugin system for fish shell.  it creates a
20:23 Seveas it creates a ... ?
20:23 arooni ~/.config/fisherman directory that all plugins are installed in ; i wanted to add just that directory ; then use the fisherman tool to install the plugins instead of commiting each to fish
20:23 Vgr joined #git
20:23 arooni err committing each plugin to git
20:23 Seveas can't fisherman create that directory?
20:23 chandlerbing joined #git
20:23 Seveas so you don't need to store it in git
20:23 arooni hmmm; it can ; i was just trying to avoid having to install fisherman separately on each server
20:24 IlNominePatre joined #git
20:24 Seveas how are you installing those plugins on each server then?
20:24 arooni well manually ; so i guess its a moot point
20:24 arooni i am wondering if the right approach is to commit the whole fisherman directory
20:25 Seveas are those plugins individual git repositories, or just files?
20:25 arooni i think they're individual git repos
20:26 Seveas have a look at vcsh then. It lets you have multiple git repos which look like they're rooted in your homedir
20:26 arooni i actually use vcsh :P
20:26 arooni i have a fish repo
20:27 arooni it gets a bit confusing when you install a tool; that has plugins that are in separate git repos too
20:27 Seveas true
20:31 arooni i think i'll try commiting just the fisherman tool; as its a file in my fish config directories ; and see if it can reconstruct the missing directories it needs
20:31 arooni sort of how i approach my tmuxt and vim plugins
20:31 Corosauce joined #git
20:34 Vortex35 joined #git
20:34 stealthii joined #git
20:34 dunk joined #git
20:34 Ice_Strike joined #git
20:34 Seveas I use git-subtree for my vim plugins
20:34 RominRonin_Home joined #git
20:35 lebster joined #git
20:35 arooni now you're talking above my git paygrade
20:35 huhlig joined #git
20:35 johtso joined #git
20:35 Seveas man git-subtree
20:35 Seveas jast: your bot is broken.
20:35 angular_mike_ joined #git
20:36 Seveas https://git.seveas.net/manpages/git-subtree.html
20:36 BlaXpirit joined #git
20:36 swiftgeek joined #git
20:37 Ice_Strike I have a private repo on GitHub. I don't want to give a developer to full access to everything on a repo. Only some dirs they can read/write. Is submodule solution for this?
20:38 xcyclist joined #git
20:38 perlpilot Ice_Strike: sounds like it might work.
20:38 preaction you could use submodules or subtrees to do this, sure. or you could just review their commits to make sure they aren't doing something you don't want
20:38 r4z joined #git
20:39 Ice_Strike preaction I don't want developer to have access other files.
20:39 perlpilot Ice_Strike: you can also put in a hook to reject commits that touch things you don't want
20:39 xcyclist I'm unable to get visual studio to successfully push to github, even though it is claiming to work.
20:39 xcyclist Anyone out there know visual studio community?
20:39 arooni thank you Seveas
20:40 Ice_Strike perlpilot Yea but I don't want developer to have access other files.
20:40 Seveas Ice_Strike: you can keep asking the same question, but the answer won't change...
20:40 dermoth joined #git
20:40 Ice_Strike perlpilot What about creating second mini-repo with only files/dirs they need?
20:40 Ice_Strike and then use submodules?
20:40 preaction Ice_Strike: that's what submodules/subtrees are, yes
20:41 * perlpilot is having some deja vu I think
20:41 perlpilot :)
20:41 Seveas It's like deja vu all over again
20:41 Ice_Strike preaction Can both repo do git pull to grab latest?
20:41 FilipNor1ic joined #git
20:42 preaction Ice_Strike: the inner repo is a repo, so yes
20:42 Ice_Strike Awesome
20:42 preaction the procedure differs if you choose submodules or subtrees
20:42 Ice_Strike I'll will look into it
20:42 Ice_Strike I need to read both submodules and subtrees
20:42 Ice_Strike Which is easier?
20:42 perlpilot Ice_Strike: If you can put up your own git server, you could run gitolite.  It has sophisticated permissions
20:43 Ice_Strike perlpilot I prefer github
20:43 Seveas perlpilot: only for pushing, everyone can still fetch everything.
20:43 ShekharReddy joined #git
20:44 fco joined #git
20:50 fco Hi everyone. I've made a mistake in the past and added a file of 60mb size several commits ago. I just want to delete this file from all commits/branches (all the history) in order to make the repo lighter (It takes up to 4 minutes for a clone). I couldn't find an answer on google/stackoverflow.
20:51 kadoban fco: Gotta use filter-branch or !bfg
20:51 gitinfo fco: A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
20:51 MattMaker joined #git
20:53 ciaranm joined #git
20:54 ciaranm is there something like a git revert -p , to undo half of a commit?
20:54 Seveas ciaranm: git revert -n + git reset -p
20:54 xcyclist I've done this like seven or more times now, literally, and visual studio claims it uploads successfully, but github has nothing.
20:55 ciaranm Seveas: ah, but that generates a horrible conflict :)
20:55 ciaranm really i want to ignore the half of the commit that doesn't apply any more
20:55 Seveas git diff commit-to-revert commit-to-revert^ | vipe | git apply
20:56 greendo joined #git
20:56 Seveas (as in: get patch, edit, apply patch. It's a bodge)
20:56 ciaranm ah, thanks
20:57 Seveas revert -p would make sense to have though
20:57 d4rklit3 joined #git
20:57 fco #Kadoban: Thanks !
20:57 fco gitingo: thanks!
20:59 _ikke_ !bot
20:59 gitinfo [!gitinfo] I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans.  Please see http://jk.gs/git/bot for more information about how to (ab)use me.
20:59 blueyed Where's the archive for git@vger.kernel.org?  The link on https://git-scm.com/community lists multiple..
21:00 _ikke_ blueyed: there is no official archive
21:00 al-damiri joined #git
21:00 smakarov_ joined #git
21:01 blueyed _ikke_: the community page links to http://dir.gmane.org/gmane.comp.version-control.git.
21:01 _ikke_ yeah. gmane stoped the http interface
21:01 Seveas it's back
21:01 Seveas though there's now also public-inbox.org in case gmane goes away again
21:02 _ikke_ blueyed: http://dir.gmane.org/gmane.comp.version-control.git.git
21:02 blueyed _ikke_: so I cannot search for bug reports?
21:02 _ikke_ add .git
21:02 _ikke_ http://public-inbox.org/git
21:02 blueyed _ikke_: ok, but search is broken apparently: http://search.gmane.org/?query=stash+pop&amp;group=gmane.comp.version-control.git.git
21:03 * blueyed gets "Server not found"
21:03 Seveas so gmain isn't completely back then :)
21:03 _ikke_ right, it's probably still being built
21:03 neque joined #git
21:03 d0nn1e joined #git
21:04 Seveas http://marc.info/?l=git is another alternative
21:04 boombatower joined #git
21:06 blueyed Thanks.  I would like to report the issue that "git stash pop" appears to be non-atomic: I've been left with a worktree where all the to-be-restored files were empty, and the objects are broken..
21:06 Seveas blueyed: do you have a way to reproduce that state?
21:07 blueyed Seveas: unfortunately it is probably hard to reproduce: it happened when my system locked up..
21:07 _ikke_ blueyed: I think it's hardly a surprise that such operations are non-atomic
21:07 Seveas that may not be a bug in git then. Smells like filesystem issues.
21:07 blueyed Seveas: I don't even have fsck logs.. :(
21:07 Seveas there's no such thing as an atomic operation over multiple files
21:07 _ikke_ right
21:08 lindenle joined #git
21:08 Seveas blueyed: you may be able to find your objects with git fsck
21:08 _ikke_ blueyed: If the filesystem had cached those changes, and the crash caused that cache to be gone, it's not gits fault you lost changes
21:08 _ikke_ Seveas: He already tried
21:08 Seveas you might also see that your filesystem is broken.
21:08 blueyed Well, the journal is in order.. so git could preserve a state that allows to restore it when it breaks inbetween?!
21:09 blueyed Seveas: ext4.. what do you recommend then?
21:09 NightMonkey joined #git
21:10 blueyed Seveas: the .git/objects folder contained 10+ empty files..
21:10 Seveas blueyed: posix file operations are per file. It is impossible to have an atomic operation on multiple files given those primitives.
21:10 Seveas git probably opened those 10 files for writing but didn't fsync the contents
21:10 Seveas and then your system hung
21:10 prawnzy joined #git
21:10 Seveas are they all new objects?
21:11 Rodya_ joined #git
21:11 whitby joined #git
21:11 blueyed But you could wrap some state around it, no?
21:11 Matsv joined #git
21:11 blueyed Not sure?!  Probably?!
21:11 Seveas you could wrap some bacon around it...
21:11 * blueyed is vegan.
21:11 Guest46083 left #git
21:12 Seveas wrap some lettuce around it :)
21:12 Joost joined #git
21:13 blueyed The question is: why is the stash gone?!  It appears to have been synced/written, before the other operation has been carried out successfully.
21:14 blueyed The more important question is also: why is my backup one week old already.. :/
21:14 aidalgol joined #git
21:16 Seveas murphy saw that and crashed your system to teach you a lesson
21:16 ciaranm left #git
21:16 Seveas hmm, mine is a month old. Stay out, murphy!
21:17 dvl left #git
21:18 Vivekananda joined #git
21:19 ahr3n joined #git
21:19 blueyed Seveas: but don't you agree that "git stash pop" should be smarter in that regard?  It might also be related to "--include-untracked" which I have used there.. and made things much worse.
21:19 blueyed (because also the untracked files are empty now)
21:20 Seveas blueyed: given that I don't know what failed here, I can't answer that.
21:20 _ikke_ blueyed: You can always ask on the mailing list to see if it's something expected or not
21:20 Seveas git stash is also just a crusty shellscript that abuses the reflog. I don't trust it to do sensible things.
21:20 fco left #git
21:21 Matsv joined #git
21:21 BlackMaria joined #git
21:22 blahdodo joined #git
21:22 daishan joined #git
21:22 chrisml joined #git
21:22 isysd joined #git
21:22 kyan joined #git
21:22 ResidentBiscuit joined #git
21:22 justinmrkva joined #git
21:22 dermoth joined #git
21:22 lightstalker joined #git
21:22 Hogofwar joined #git
21:22 ahr3n joined #git
21:23 polyzen joined #git
21:23 drbean joined #git
21:24 NightMonkey joined #git
21:24 GGMethos joined #git
21:24 Rodya__ joined #git
21:24 Matsv joined #git
21:24 WayToDoor joined #git
21:25 WizJin joined #git
21:25 flupke joined #git
21:26 kadoban Heh, is it pretty bad in general?
21:26 ketas joined #git
21:30 ilbot3 joined #git
21:30 Topic for #git is now Welcome to #git, the place for git help and all your base | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you
21:30 WayToDoor joined #git
21:30 grift joined #git
21:30 kpease joined #git
21:30 dunk joined #git
21:30 Peuc joined #git
21:30 Dredge joined #git
21:30 BinGOs joined #git
21:31 tobie joined #git
21:31 Someguy123 joined #git
21:32 stealthii joined #git
21:32 etcinit joined #git
21:32 thecomedian joined #git
21:32 Seveas depends on how 'not there' it is. Would need to poke at the repo.
21:33 axisys joined #git
21:34 Primer joined #git
21:34 zero7 joined #git
21:34 unforgiven512 joined #git
21:34 boxrick1 joined #git
21:34 Primer left #git
21:35 ams__ joined #git
21:35 discopatrick joined #git
21:35 izak joined #git
21:35 sevenfourk joined #git
21:35 kutenai joined #git
21:35 worstadmin joined #git
21:35 spr0tsuki joined #git
21:35 epic joined #git
21:36 berndl joined #git
21:36 XDS2010 joined #git
21:36 Guest52727 left #git
21:36 braderhart joined #git
21:36 psacrifice joined #git
21:37 HedgeMage joined #git
21:37 cmosguy joined #git
21:37 jab416171 joined #git
21:37 joseph_arnstein joined #git
21:37 ggherdov joined #git
21:37 elijah joined #git
21:38 annoymouse joined #git
21:38 JackMc joined #git
21:38 deadprez joined #git
21:38 yena joined #git
21:39 XDS2010 joined #git
21:39 ggherdov joined #git
21:39 angular_mike_ joined #git
21:41 daey_ joined #git
21:41 dreiss joined #git
21:42 Dougie187 left #git
21:45 blueyed Seveas: I can provide you the repo.. it's at https://codeprobe.de/spool/i/neomake-borken/.git/
21:45 RominRonin_Home joined #git
21:46 blueyed Seveas: the worktree is above.. should I tar it?
21:46 _ikke_ Is that the repo as you had it locally?
21:46 _ikke_ (ie, not pushed to somewhere)?
21:50 e14 joined #git
21:56 markovh joined #git
21:56 nemesit|znc joined #git
21:56 kba joined #git
21:57 Chinorro joined #git
21:57 markovh joined #git
21:57 AlexanderS joined #git
21:58 medeirosthiiago joined #git
21:59 EvilPenguin joined #git
22:00 ahr3n joined #git
22:01 moei joined #git
22:02 dreiss joined #git
22:02 Achylles joined #git
22:02 Arokh joined #git
22:03 mingrammer joined #git
22:04 diogenese joined #git
22:07 jraccoon joined #git
22:08 choki joined #git
22:09 jast Seveas: nah, it just doesn't know that manpage
22:09 jast .man_update
22:09 gitinfo jast: Manpage index updating. Please allow a few seconds before using again.
22:09 jast still doesn't. hum. now I have to figure out what kind of mess I set up for manpages
22:10 _ikke_ hehe
22:10 Sadeukko joined #git
22:10 WayToDoor joined #git
22:11 Noldorin joined #git
22:11 jast it's not in the repo I'm sourcing the manpages from
22:11 jast it's not here, either: https://github.com/git/git/tree/master/Documentation
22:12 jast so, as far as I'm concerned, the bot's behaviour is absolutely correct
22:12 kadoban subtree is from contrib, maybe that's why. It'd still be really useful to have if possible.
22:12 kadoban subtree gets discussed ... often
22:13 jast I'm using the pre-generated manpages from kernel.org -> git/git-htmldocs.git
22:13 jast git-scm.com doesn't have the subtree manpage, either...
22:13 rgrinberg joined #git
22:13 _ikke_ https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/git#n48
22:14 jast I'd hate to have to install the generators on this machine just for that one manpage
22:14 kadoban I guess we could just add a manual trigger for that and call it good enough, pointing to ... wherever on the internet actually has that manpage.
22:15 jast https://raw.githubusercontent.com/git/git/master/contrib/subtree/git-subtree.txt :)
22:15 jast !subtree
22:15 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.
22:15 jast !git-subtree
22:15 gitinfo git-subtree allows a subproject repository to be incorporated into a subdirectory of a main repository, and for the history of a subdirectory to be (re-)exported with reproducible results, making it possible to synchronise a repository with a subdirectory of another repo, see https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt for more info.
22:15 kadoban Hah, nice.
22:15 kadoban Ya, good enough.
22:15 jast issue closed, resolution: EALREADY
22:16 jgornick joined #git
22:16 cschneid joined #git
22:17 forrestv joined #git
22:17 jast whew, just saw this in the devel channel: https://github.com/GitGuild/gitguild_whitepaper/blob/master/whitepaper.md
22:18 jast we might need to ask dscho to relaunch UGFWIINI :}
22:18 fguillot joined #git
22:18 _ikke_ Yeah, was also discussed in the ledger chan
22:18 _ikke_ is it down?
22:18 jast down?
22:18 chrisshattuck joined #git
22:19 _ikke_ IGFWIINI
22:19 GGMethos joined #git
22:19 _ikke_ s/I/U/
22:19 jast well, he published results maybe once or twice
22:19 jast AFAIK
22:19 _ikke_ ah ok, more like a report
22:19 HoierM joined #git
22:20 jast it was a "best of" list
22:20 jast maybe !ugfwiini has a link
22:20 gitinfo [!UGFWIINI] You appear to be Using Git For What It Is Not Intended - https://www.google.com/search?q=UGFWIINI Are you sure git is the right tool for the job? See also !wrong
22:20 jast that's not helpful
22:20 jast http://marc.info/?l=git&amp;m=123488926400787&amp;w=1
22:21 Lunatrius` joined #git
22:22 moei joined #git
22:24 andlabs joined #git
22:24 _ikke_ right
22:25 jast heh, my own entry is still alive. kind of a surprise. my local instance of the old repo.or.cz codebase has a history of breaking often, so seeing it still work is a little unusual
22:25 minibar joined #git
22:26 _ikke_ #3, impressive
22:26 dsantiago joined #git
22:26 NightMonkey joined #git
22:27 isysd jast, nothing wrong with using things for what they're not intended, so long as it works. :p
22:27 meloc joined #git
22:28 meloc joined #git
22:28 jast I'll just say this much: there are different takes on what's elegant and what isn't :)
22:28 jast my blog thingy works, too
22:28 jast some people don't like that kind of thing, some people do
22:28 QwertyDragon joined #git
22:28 isysd sure, not saying it is elegant. works for some very specific use cases
22:29 jast oh you're actually using that? ;P
22:29 buzzLightBeer joined #git
22:29 isysd currently experimenting with it, but yes
22:30 isysd currently researching gitfs as a base to create an interface out of
22:31 jast I don't care for crypto currencies, so I can't really comment on it much
22:31 isysd I made it for devs to govern open source projects. Doesn't really require cryptocurrencies, unless you consider Experience Points (XP) a currency.
22:32 isysd if you want to issue a coin for your team, you can, though :)
22:32 nidr0x joined #git
22:32 jast personally I don't think currency makes for a great governing system
22:33 isysd you've got it backwards. currencies need governing systems
22:33 isysd so do projects
22:33 isysd votes to be counted and authenticated
22:33 isysd that sort of thing
22:33 jast I don't care for votes, either :)
22:34 isysd lol, a real open source collaborative guy, eh?
22:34 jast I like the "benevolent dictator" model
22:34 jast many of my favourite projects work like that
22:34 jast few of the others are truly outstanding in how effective their governing system is
22:35 isysd sure, ok. still, you should quantify the extent of dictatorship in proper governance
22:35 isysd wouldn't want the plebs to misunderstand
22:35 jast the plebs aren't invited ;)
22:36 matsaman joined #git
22:36 arescorpio joined #git
22:37 romerocesar joined #git
22:38 jast some really big projects may run into limitations with an extremely informal style, but I don't think it's a necessity, and anyway fortunately that's not a problem I have
22:38 Rodya_ joined #git
22:38 isysd what, you work for Google or Red Hat or someone?
22:39 jast nah, I work for a nobody
22:39 ochorocho__ joined #git
22:39 jast well that might sound a tad disrespectful, but truly if you've got 30 employees, you kind of fade into insignificance in the halo of the big ones
22:40 isysd in open source there are only two sizes
22:40 isysd micro (non-business) and massive, super competitive economies of scale
22:40 jast I was expecting a false dichotomy and that's what I got :P
22:40 isysd with low barrier to entry project management and business models, those micro businesses can compete
22:42 jast FWIW open source is one of our cornerstones
22:42 mizu_no_oto joined #git
22:42 batrick joined #git
22:42 jast and if you carve out the right niche, there is no competition, let alone "super competition"
22:45 isysd thanks :)
22:45 Peuc joined #git
22:45 DolpheenDream joined #git
22:45 osse joined #git
22:45 rgrinberg joined #git
22:47 nidr0x joined #git
22:47 lacrymology joined #git
22:49 nidr0x joined #git
22:49 ghostlight joined #git
22:50 deadprez joined #git
22:52 nidr0x joined #git
22:54 blackwind_123 joined #git
22:54 nidr0x joined #git
22:54 e14 joined #git
22:57 Hobbyboy joined #git
23:00 EvilPenguin joined #git
23:04 rgrinberg joined #git
23:05 quesker joined #git
23:11 Guest94911 left #git
23:13 deadprez joined #git
23:14 dsantiago joined #git
23:14 Sna4x8 left #git
23:17 gmunker joined #git
23:20 atomi joined #git
23:29 mycelium joined #git
23:30 cagedwisdom joined #git
23:33 dsdeiz joined #git
23:33 dsdeiz joined #git
23:34 gmunker Anyone around for some help?
23:34 _ikke_ !just_ask
23:34 gitinfo You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
23:35 e14 joined #git
23:36 gmunker I have been trying to install webpack via gitbash on my windows 10 computer. I am learning React an in the course they go through the steps to install git, node, etc and then webpack. I got it all to work ok on my laptop just fine (same windows 10) but on my pc i'm getting errors and it wont install
23:37 mizu_no_oto joined #git
23:37 fguillot joined #git
23:37 jast what kinds of errors?
23:38 gmunker would you like me to copy paste what i have ? or just some of the errors?
23:38 gmunker I am very new to git, and returning to the command line after 20yrs so basiclly new to both
23:39 jast !paste
23:39 gitinfo Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
23:39 jast more can't hurt ;)
23:40 vicatcu joined #git
23:40 ochorocho__ joined #git
23:40 tlaxkit joined #git
23:40 vicatcu can anyone tell me the .gitignore magic to git ignore everything in a folder except one file?
23:41 vicatcu I have build-* as a line in my .gitignore
23:41 vicatcu but i'd like build-final/what/ever/file to *not* be ignored
23:42 gmunker i'm sorry give me one sec, kid flipping out
23:42 vicatcu your kid is a ninja, and you dropped a spoon?
23:42 Lyqyd joined #git
23:47 _ikke_ vicatcu: what about git ad -f build-final/what/ever/file
23:47 _ikke_ Once tracked, git never ignores it
23:47 _ikke_ s/ad/add
23:47 vicatcu oh didn't know that
23:47 vicatcu cool
23:47 vicatcu ty
23:47 _ikke_ You can also unignore, but that's more complicated
23:48 inflames joined #git
23:49 sangy joined #git
23:49 prawnzy joined #git
23:49 dendazen joined #git
23:50 NeverDie joined #git
23:51 BSaboia joined #git
23:51 Rodya_ joined #git
23:51 mingrammer joined #git
23:54 gmunker Sorrry about that
23:54 gmunker so here is the errors
23:54 gmunker https://gist.github.com/Gmunker/feeaed443d21b3aff13de262243b7d4e
23:55 duderonomy joined #git
23:57 EvilPenguin joined #git
23:57 jast that actually looks as if it has nothing to do with git itself
23:57 gmunker o
23:57 jast but basically it's a permissions issue
23:58 jast or something similar
23:58 jast your lines are cut off so I can't see the full messages, but basically it tries to move files from X to Y and fails
23:59 jast your npm install is in c:\program files, write access is typically restricted to processes with admin rights
23:59 Lunatrius joined #git
23:59 gmunker i'll repost with all the lines didnt notice that
23:59 jast no need
23:59 e14 joined #git
23:59 jast if you trust the packages you're installing, you could try repeating this in a gitbash instance with "run as administrator"

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