Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-06-27

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

All times shown according to UTC.

Time Nick Message
00:00 digidog joined #git
00:01 Gitzilla joined #git
00:02 mmlb joined #git
00:04 rominronin joined #git
00:06 mingrammer_ joined #git
00:07 dopesong joined #git
00:07 Silenced joined #git
00:07 Silenced joined #git
00:10 Rodya_ joined #git
00:10 qpdb joined #git
00:10 Forkk joined #git
00:14 ntonjeta joined #git
00:14 tesuji_ joined #git
00:16 rsukla joined #git
00:17 kbs joined #git
00:18 clemf joined #git
00:19 tristanp joined #git
00:20 tristanp joined #git
00:21 adambrenecki joined #git
00:22 liquidjamm joined #git
00:23 cqi joined #git
00:26 xall_ joined #git
00:26 eletuchy joined #git
00:27 MattMaker joined #git
00:28 bin4ry joined #git
00:34 Literphor joined #git
00:38 tesuji joined #git
00:38 wxg joined #git
00:39 RandalSchwartz left #git
00:40 ki0 joined #git
00:40 romerocesar joined #git
00:45 jyjon joined #git
00:45 allcentury joined #git
00:46 cyphase joined #git
00:46 fstd_ joined #git
00:49 romerocesar joined #git
00:50 tjone270 joined #git
00:51 shgysk8zer0 joined #git
00:52 jyjon joined #git
00:53 ahmedelgabri joined #git
00:55 ccha5 joined #git
00:55 AfroThundr joined #git
00:59 stantonk joined #git
01:00 mingrammer_ joined #git
01:01 lindenle joined #git
01:01 nettoweb joined #git
01:02 ochorocho__ joined #git
01:05 rominronin joined #git
01:05 tristanp joined #git
01:05 clemf joined #git
01:05 fscala joined #git
01:06 batrick joined #git
01:06 tristanp joined #git
01:08 Sonicbit joined #git
01:08 nonconvergent joined #git
01:09 Guest55 joined #git
01:09 Tim-SEM joined #git
01:10 Tim-SEM left #git
01:16 BSaboia joined #git
01:18 eletuchy joined #git
01:23 allcentury joined #git
01:24 telephone joined #git
01:24 telephone joined #git
01:25 axiom_1 joined #git
01:34 tristanp joined #git
01:36 armyriad joined #git
01:40 LeBlaaanc joined #git
01:40 ki0 joined #git
01:40 dreiss joined #git
01:43 romerocesar joined #git
01:45 Rodya_ joined #git
01:45 HoierM joined #git
01:46 fahadash joined #git
01:47 pks joined #git
01:54 mingrammer_ joined #git
01:54 xall_ joined #git
01:55 watabou joined #git
01:56 LeBlaaanc joined #git
01:57 liuzhen_ joined #git
02:01 ahr3n joined #git
02:06 rominronin joined #git
02:06 dreiss joined #git
02:12 eletuchy joined #git
02:12 netj joined #git
02:14 GavinMagnus joined #git
02:21 Lyqyd joined #git
02:21 Yuri4_ joined #git
02:29 eletuchy joined #git
02:38 jaguarmagenta joined #git
02:39 zhiwliu joined #git
02:39 Goplat joined #git
02:39 hexagoxel joined #git
02:41 cqi joined #git
02:44 chachasmooth joined #git
02:44 romerocesar joined #git
02:48 eletuchy joined #git
02:48 mingrammer_ joined #git
02:49 zhiwliu left #git
02:49 cyphase joined #git
02:54 allcentury joined #git
02:54 arooni joined #git
02:55 ahmedelgabri joined #git
03:00 chuchunaku joined #git
03:03 stantonk joined #git
03:03 ochorocho__ joined #git
03:04 lindenle joined #git
03:05 zivester joined #git
03:05 aavrug joined #git
03:05 Electrometro joined #git
03:06 digidog_ joined #git
03:07 rominronin joined #git
03:07 Doginal joined #git
03:08 xall joined #git
03:08 dopesong joined #git
03:08 nettoweb joined #git
03:09 nonconvergent joined #git
03:15 inflames joined #git
03:20 k3rn31 joined #git
03:22 cyphase joined #git
03:22 robotroll joined #git
03:22 stonerfish joined #git
03:25 ktosiek joined #git
03:27 Marbug joined #git
03:27 jamick joined #git
03:27 kam270 joined #git
03:27 xall_ joined #git
03:27 DomeMaster joined #git
03:29 LeBlaaanc joined #git
03:29 fus joined #git
03:29 M-meznak joined #git
03:30 pierre365 joined #git
03:30 MikeChernev joined #git
03:30 Ram-Z joined #git
03:30 XVar joined #git
03:31 romerocesar joined #git
03:31 steve joined #git
03:32 tolland_ joined #git
03:33 saidelike joined #git
03:36 sanketdg joined #git
03:37 a_thakur joined #git
03:42 mingrammer_ joined #git
03:43 Andrew_K joined #git
03:43 eletuchy joined #git
03:45 nilg joined #git
03:50 zumba_ad_ joined #git
03:53 cagedwisdom joined #git
03:55 allcentury joined #git
03:56 SimonNa joined #git
04:00 hahuang61 joined #git
04:02 pierre365 joined #git
04:05 arahael personally i suggest setting the port number in the local ssh config.
04:08 rominronin joined #git
04:14 zumba_ad_ joined #git
04:15 romerocesar joined #git
04:15 muthu joined #git
04:15 italoacasas joined #git
04:18 zeemz joined #git
04:24 newlifer_ joined #git
04:29 akushner joined #git
04:29 SwiftMatt joined #git
04:30 nonconvergent joined #git
04:31 harish_ joined #git
04:37 mingrammer_ joined #git
04:37 Lvjasha joined #git
04:39 Lvjasha left #git
04:40 bb010g joined #git
04:41 k3rn31 joined #git
04:44 Codfection joined #git
04:44 thiago joined #git
04:46 davidbz joined #git
04:47 Literphor joined #git
04:48 xall joined #git
04:51 Raging_Hog joined #git
04:53 hahuang65 joined #git
04:53 hk238 joined #git
04:53 tristanp joined #git
04:56 rubyonrailed joined #git
04:56 ahmedelgabri joined #git
04:56 subhojit777 joined #git
04:58 lordjancso joined #git
05:00 allcentury joined #git
05:01 hahuang61 joined #git
05:03 Cabanossi joined #git
05:05 happy-dude joined #git
05:05 ochorocho__ joined #git
05:06 cyphase_eviltwin joined #git
05:08 Aces_Charles joined #git
05:09 romerocesar joined #git
05:09 rominronin joined #git
05:12 quetz joined #git
05:14 z8z joined #git
05:16 ManiacTwister joined #git
05:16 BSAlb joined #git
05:17 zumba_addict joined #git
05:17 z8z joined #git
05:20 Doginal joined #git
05:20 githogori joined #git
05:21 z8z joined #git
05:25 z8z joined #git
05:26 siprbaum joined #git
05:27 Literphor joined #git
05:28 Literphor joined #git
05:29 tristanp joined #git
05:29 romerocesar joined #git
05:30 siprbaum joined #git
05:30 kadoban joined #git
05:32 eletuchy joined #git
05:33 _ng joined #git
05:34 _ng joined #git
05:40 allcentury joined #git
05:40 _ng joined #git
05:41 a_thakur joined #git
05:41 leehambley joined #git
05:42 d4rklit3 joined #git
05:43 _ng joined #git
05:45 ki0 joined #git
05:45 kbs joined #git
05:46 Raging_Hog joined #git
05:48 hahuang65 joined #git
05:49 ThomasLocke_ joined #git
05:52 hahuang61 joined #git
05:54 xall joined #git
05:59 zumba_addict joined #git
06:00 zumba_addict joined #git
06:01 FrontPsych joined #git
06:03 Raging_Hog joined #git
06:04 stonerfish joined #git
06:04 qt-x joined #git
06:05 djb-irc joined #git
06:05 cdown joined #git
06:06 rubyonrailed joined #git
06:06 lindenle joined #git
06:06 JeroenT joined #git
06:07 rchavik joined #git
06:08 rscata joined #git
06:08 cyphase joined #git
06:09 Gitzilla joined #git
06:10 rominronin joined #git
06:11 siprbaum joined #git
06:12 nonconvergent joined #git
06:13 freimatz joined #git
06:13 cbreak I recommend using URL notation
06:14 PCatinean joined #git
06:14 cbreak the SCP notation is uncommon and not well thought out
06:15 romerocesar joined #git
06:16 Softeisbieger joined #git
06:18 Gitzilla joined #git
06:21 allcentury joined #git
06:22 cyan__ joined #git
06:24 stantonk joined #git
06:25 mingrammer_ joined #git
06:25 dopesong joined #git
06:25 ToBeCloud joined #git
06:26 eletuchy joined #git
06:28 zeroed joined #git
06:29 eijk_ joined #git
06:31 Orbitrix joined #git
06:31 scorphus joined #git
06:32 ki0 joined #git
06:32 Orbitrix joined #git
06:35 akushner joined #git
06:35 ahmedelgabri joined #git
06:36 Sceorem joined #git
06:37 cyphase joined #git
06:38 hk238 joined #git
06:39 Alienpruts joined #git
06:41 diogenese joined #git
06:42 isxek joined #git
06:44 mischat joined #git
06:45 MrMojito joined #git
06:45 mangolisk_ joined #git
06:45 _ikke_ I think the SCP syntax is quite often used
06:46 _ikke_ most git hosts supply the ssh transport using the scp syntax
06:47 djb-irc joined #git
06:48 wxg joined #git
06:48 cbreak _ikke_: yes, and it annoys me greatly.
06:48 rominronin joined #git
06:49 eletuchy joined #git
06:49 cbreak _ikke_: when I say uncommon I mean in general, not limited to git
06:49 cbreak URLs are used almost everywhere
06:49 cbreak only few weirdos like scp, windows unc and co use something else nowadays
06:50 _ikke_ TIL: I
06:50 _ikke_ TIL: I'm a weirdo :P
06:52 dhruva joined #git
06:55 UTAN_dev joined #git
06:58 aidalgol joined #git
06:59 xall joined #git
06:59 allcentury joined #git
07:01 * moritz too
07:01 moritz particularly when talking to non-techies :-)
07:04 piattino joined #git
07:06 Sceorem_ joined #git
07:06 ochorocho__ joined #git
07:06 zeroed joined #git
07:07 z8z joined #git
07:07 Sceorem__ joined #git
07:09 Martian joined #git
07:10 encod3 joined #git
07:10 JeroenT_ joined #git
07:10 zumba_addict joined #git
07:11 Codfection joined #git
07:12 ramsub07 joined #git
07:16 ahmedelgabri joined #git
07:19 mingrammer_ joined #git
07:19 romerocesar joined #git
07:21 danieli left #git
07:21 Kicer86 joined #git
07:22 eijk_ joined #git
07:22 fscala joined #git
07:24 pratima joined #git
07:24 pratima Hi there
07:26 cyphase joined #git
07:27 Martian joined #git
07:29 emPi joined #git
07:29 pratima I need help to find the difference between two branches Release/1.0 and develop
07:30 pratima git log Release..develop
07:30 pratima is not showing the commits which were in release that does not exist in develop branch
07:30 kedare joined #git
07:30 pratima could some one suggest an alternative
07:31 osse pratima: git log develop..Release
07:32 stantonk joined #git
07:32 voiter2 joined #git
07:35 cdown joined #git
07:35 nejvi joined #git
07:36 Codfection joined #git
07:36 Balliad joined #git
07:37 dminca joined #git
07:38 cyphase joined #git
07:38 ome joined #git
07:39 Douhan joined #git
07:39 zumba_ad_ joined #git
07:41 allcentury joined #git
07:42 a_thakur joined #git
07:44 _pix joined #git
07:47 multi_io joined #git
07:51 eletuchy joined #git
07:56 rubyonrailed joined #git
07:56 jaguarmagenta joined #git
07:58 _noblegas joined #git
07:59 dranve joined #git
08:00 romerocesar joined #git
08:02 d1b joined #git
08:06 Guest24 joined #git
08:07 mehola joined #git
08:07 kurkale6ka joined #git
08:08 xall joined #git
08:08 lindenle joined #git
08:08 davisonio joined #git
08:10 nnyk joined #git
08:12 acetakwas joined #git
08:13 mingrammer_ joined #git
08:14 khelkun joined #git
08:15 allcentury joined #git
08:16 eletuchy joined #git
08:17 a_thakur joined #git
08:17 Repox joined #git
08:19 marcogmonteiro joined #git
08:19 RedShift joined #git
08:20 romerocesar joined #git
08:22 encod3_ joined #git
08:23 nonconvergent joined #git
08:29 acetakwas joined #git
08:31 obiwahn hi
08:31 obiwahn is there a way to get a set of chunks form a commit? like in git add -p
08:31 cbreak obiwahn: sure
08:31 cbreak obiwahn: git checkout -p
08:31 obiwahn wow that is cool thank you!
08:32 cbreak -p works with reset too
08:32 obiwahn anywhere else?
08:32 cbreak commit... I think
08:33 cbreak wouldn't use that though
08:33 King_Hual joined #git
08:33 King_Hual joined #git
08:33 obiwahn thank you!
08:37 encod3 joined #git
08:39 cqi joined #git
08:41 eletuchy_ joined #git
08:41 notebox joined #git
08:42 acetakwas joined #git
08:43 WayToDoor joined #git
08:44 WayToDoor joined #git
08:45 JeroenT joined #git
08:45 jarray52 left #git
08:46 Fijit joined #git
08:46 hk238 joined #git
08:49 yuhlw_ joined #git
08:49 dopesong joined #git
08:49 eletuchy joined #git
08:50 davisonio joined #git
08:51 acetakwas joined #git
08:52 SimonNaa joined #git
08:52 JeroenT joined #git
08:54 Balliad joined #git
08:56 PCatinean joined #git
08:57 eijk_ joined #git
08:59 Ariadeno joined #git
09:00 HerrK joined #git
09:00 mdw joined #git
09:01 ki0_ joined #git
09:02 Literphor joined #git
09:03 acetakwas joined #git
09:03 dimi1947 joined #git
09:04 jknetl joined #git
09:07 ochorocho__ joined #git
09:08 romerocesar joined #git
09:08 ki0 joined #git
09:09 ki0 joined #git
09:09 acetakwas joined #git
09:10 Gonzo89 joined #git
09:10 ki0 joined #git
09:12 eek joined #git
09:13 mdw joined #git
09:14 eek joined #git
09:15 mikecmpbll joined #git
09:18 zeroed_ joined #git
09:20 sans_s3r1f joined #git
09:20 Orbitrix joined #git
09:21 Orbitrix joined #git
09:21 nnyk_ joined #git
09:24 xall joined #git
09:26 allcentury joined #git
09:27 xaa joined #git
09:27 binaryplease1 joined #git
09:29 Martian joined #git
09:31 sanketdg joined #git
09:32 netj joined #git
09:33 foetus joined #git
09:33 foetus left #git
09:34 acetakwas joined #git
09:34 ash_workz joined #git
09:37 demiro joined #git
09:37 nilg joined #git
09:38 eletuchy joined #git
09:41 mischat joined #git
09:45 rubyonrailed joined #git
09:52 mrkat joined #git
09:52 dsdeiz joined #git
09:52 dsdeiz joined #git
09:52 jost joined #git
09:57 jaguarmagenta joined #git
10:00 tuor joined #git
10:00 FeersumEndjinn joined #git
10:01 mingrammer_ joined #git
10:01 tuor joined #git
10:04 nnyk_ joined #git
10:05 afuentes joined #git
10:08 KettleWork joined #git
10:09 achadwick joined #git
10:10 robot joined #git
10:10 Ranhir joined #git
10:11 ozette joined #git
10:11 ozette hello hello
10:12 ozette i'm looking to install a vim theme from github with vim-plug
10:12 fracting joined #git
10:13 sapiens_vector joined #git
10:14 ozette i added a "call plug#begin(abc) .. call plug#end()" in my .vimrc
10:14 ozette then opened vim and did :PlugInstall
10:14 ozette it installed abc succesfully and now i'm trying to open vim and see my new theme
10:16 ozette but when i run vim, i get this error: http://paste.debian.net/763102/ is this error with the plugin or am i missing something?
10:16 ozette omg
10:17 ozette this is the wrong channel damnit
10:17 ozette sorry.
10:17 Seveas ozette: windows line endings...
10:18 eletuchy joined #git
10:18 Seveas try fromdos /home/magissa/.vim/plugged/vim-hybrid/colors/hybrid.vim
10:18 ozette Seveas: oh? how can you tell?
10:18 Seveas ^M
10:18 ozette alright
10:19 cdown joined #git
10:20 ozette Seveas: you're great!!! thanks it worked; i did the dos2unix command
10:20 ozette i can see my theme now :)
10:20 jast yay! :)
10:20 jast celebratory +v flags!
10:21 ozette hahha yay
10:22 duderonomy joined #git
10:25 cbreak for ... victory?
10:25 subhojit777 joined #git
10:25 ozette thanks so much i appreciate it, time to code!
10:26 _ikke_ "#git: fixing your problems so you have time to code"
10:26 _ikke_ :P
10:27 ozette lol
10:27 Seveas cbreak: or vermin
10:28 jast or vitamins
10:28 jast side note: I just learned about "vitamin B17". yikes.
10:28 jast (spoiler: not an actual vitamin, but metabolized to poison)
10:29 _ikke_ reading here it can kill cancer cells
10:30 jast that's what some people say
10:30 jast other people say it can kill all the other cells, too
10:30 jast unfortunately I'm not an expert on biochemistry and don't know which enzymes are how prevalent in which types of cells
10:31 artemisart joined #git
10:31 wxg joined #git
10:32 githogori joined #git
10:32 _ikke_ Me neither
10:33 _ikke_ mandelonitrile beta-D-gentiobioside
10:34 Seveas gesundheit
10:34 cdown joined #git
10:35 jast anyway, this is an example of an alternative treatment that is legitimately dangerous and still has a huge following
10:36 stantonk joined #git
10:36 jast and I like how they call it a vitamin even though it's not one
10:39 lb git rm 'Vitamin B17' && git add -a && git commit -m 'remove the poison' && git push production
10:40 jast last time I checked, 'git add' didn't have an '-a' flag
10:40 nettoweb joined #git
10:40 cbreak jast: lots of treatments are legitimately dangerous
10:41 allcentury joined #git
10:41 cbreak bot mainstream and how-the-hell-is-that-supposed-to-work?!? kind of treatments
10:41 jast but some of those are supported by clinical trials
10:42 subhojit777 joined #git
10:42 mingrammer_ joined #git
10:42 freimatz joined #git
10:42 sdothum joined #git
10:43 jast I mean, there's nothing wrong with trying questionable stuff if there's nothing to lose, but I see people talking about taking amygdalin "prophylactically"
10:43 JeroenT joined #git
10:43 jast or to, you know, boost their health, or sense of health
10:43 githogori joined #git
10:43 lb damn. git add --all then -.-
10:44 cbreak jast: sounds risky
10:45 jast what really bugs me is that this stuff is sold using the "organic food" angle, as if it was just a snack
10:45 mostlybadfly joined #git
10:45 jast (but eat a whole bag and you're dead! yay!)
10:46 cbreak organic food can be deadly. Although, probably it's not food then.
10:46 cbreak if you're not careful, mushroms can kill, for example
10:46 jast exactly my point :)
10:47 jast but they don't sell toadstool in "organic food, super healthy" packaging
10:48 jast they do sell apricot seeds like that
10:48 cbreak organic here means "no additional chemicals on top of what's already in the stuff on its own"
10:48 jast I meant the marketing angle, not the literal meaning
10:49 cbreak better for the environment, and better for farmers (because they earn more)
10:49 cbreak yeah, that's how it's marketed here.
10:49 jast in marketing it's pretty much equated with 'healthy'
10:49 cbreak weird.
10:49 jast (*and* environmentally friendly!)
10:49 cbreak maybe I should uninstall my add blockers
10:49 jast nah, that way lies madness
10:51 lordjancso joined #git
10:55 Noldorin joined #git
10:57 bluezone joined #git
10:58 cdown joined #git
11:00 JeroenT joined #git
11:00 a_thakur joined #git
11:02 ximvan joined #git
11:05 Guest24 joined #git
11:06 raijin joined #git
11:08 ochorocho__ joined #git
11:10 foox joined #git
11:10 lindenle joined #git
11:11 foox hey all :)
11:11 gitinfo foox: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
11:13 KettleWork When I check out a branch I'm working on, it immediately deletes some files and put them into the "Changes not staged for commit" section. I then have to do a "git reset --hard" to undelete these files. Any idea on how to solve that?
11:13 foox I have a question about git index. Unfortunately I have a file which doesn't seemed to be tracked anymore. Git status does not list it although it got changed / removed. If I try to checkout another branch, then it complains about uncommited changes, but still not in git status. I have to do a git rm --cached $file && git reset $file to get it into git status log and to be able to commit it. Does anybody have an advice how to get it perman
11:14 ojdo joined #git
11:15 cdown joined #git
11:16 cbreak foox: git ls-files, does it show the file?
11:16 cbreak if so, then it is tracked
11:17 foox cbreak: it does, yes. It also has a "history" (git log)
11:19 HoierM joined #git
11:20 yqt joined #git
11:25 eatsfoobars joined #git
11:25 leehambley joined #git
11:26 foox according to GIT_TRACE_EXCLUDE and git check-ignore the file isn't ignored
11:27 rnsanchez joined #git
11:29 eatsfoobars joined #git
11:30 cbreak foox: of course it's not
11:30 cbreak it is tracked
11:30 cbreak git will not ignore tracked files
11:31 cbreak foox: do you have stupid line ending conversion rules configured?
11:31 cbreak are you on windows?
11:31 foox cbreak: I'm on windows, using cygwin/git cli
11:31 fkm left #git
11:32 JeroenT joined #git
11:32 jast cygwin behaves like the native git on unixoid systems
11:32 foox the file is a MS access DB, so I guess lineendings shouldnt be a problem?
11:32 jast any editors you use may use windows line endings, though, so that can cause... misunderstandings
11:32 foox I'm wondering why git status does not show changes, but it complains on trying to switch a branch .
11:33 cbreak foox: git diff between the branches
11:33 cbreak foox: also check your git config for core.eol, core.autocrlf and so on
11:33 cbreak also check .gitattributes
11:33 JeroenT_ joined #git
11:33 jast but after reading the story so far, I don't see how this should have anything to do with line endings
11:34 foox cbreak: no diff available (at least as long as I didn't commit it by "git rm --cached $file && git reset $file" )
11:34 jast 'git reset $file' undoes the effect of 'git rm --cached $file'
11:35 foox jast: yes, after that, the file can be seen with git status and commited. After the commit the same error and I have to rm/reset again
11:35 cbreak foox: so git diff otherbranch -- file doesn't show anything?
11:35 jast (strictly speaking, it restores the version from HEAD into the index)
11:35 JeroenT_ joined #git
11:35 foox cbreak: right
11:36 jast you wouldn't happen to have the file tracked twice, with different uppercase/lowercase combinations in the filename?
11:36 foox cbreak: after rm/reset, diff shows up
11:36 jast windows doesn't distinguish files that differ only in case, but git generally does
11:36 foox jast: no, the same file name as before and no changes
11:37 Balliad joined #git
11:38 zarel joined #git
11:39 dimi1947 joined #git
11:41 HerrK joined #git
11:42 ntonjeta joined #git
11:46 nd joined #git
11:48 djb-irc joined #git
11:49 garethdaine joined #git
11:51 romerocesar joined #git
11:51 GavinMagnus joined #git
11:54 wwwald joined #git
11:55 aguimaraes1986 joined #git
11:56 d0nn1e joined #git
11:57 dopesong joined #git
11:58 jaguarmagenta joined #git
11:58 moxved joined #git
11:59 RedShift2 joined #git
12:01 foox It really does not seem to be a common issue, so I appreciate every thought! cbreak, jast, thank you for your suggestions
12:01 cdown joined #git
12:02 fornax joined #git
12:02 ShekharReddy joined #git
12:02 Sceorem__ joined #git
12:04 tomog999 joined #git
12:05 mahendra_ joined #git
12:06 zack_s_ joined #git
12:06 eletuchy joined #git
12:07 zack_s_ how can I check what line ending my files in my bare repository has?
12:07 kugel joined #git
12:09 nettoweb joined #git
12:10 jast zack_s_: for any given path: git show HEAD:$path | file
12:11 subhojit777 joined #git
12:11 TooLmaN joined #git
12:11 jeffreylevesque joined #git
12:11 davisonio joined #git
12:12 djb-irc joined #git
12:12 eletuchy joined #git
12:13 d1b joined #git
12:13 FeersumEndjinn joined #git
12:13 a_thakur_ joined #git
12:14 a_thakur joined #git
12:15 irco joined #git
12:15 mariuscc joined #git
12:15 FeersumEndjinn joined #git
12:15 GavinMagnus left #git
12:18 nnyk_ joined #git
12:18 mariuscc joined #git
12:19 dopesong joined #git
12:20 wrouesnel1 joined #git
12:20 rwb joined #git
12:23 rnsanchez joined #git
12:23 MutantMahesh joined #git
12:24 javster joined #git
12:24 mdw joined #git
12:25 boz_v1 joined #git
12:25 swati_27 joined #git
12:25 MutantMahesh joined #git
12:26 javster joined #git
12:26 hk238 joined #git
12:27 runlevl4 joined #git
12:27 doktori joined #git
12:28 jbitdrop joined #git
12:29 digidog joined #git
12:30 fmcgeough joined #git
12:30 liquidjamm joined #git
12:31 infra-red joined #git
12:32 Juzzika joined #git
12:32 markovh joined #git
12:34 NeverDie joined #git
12:34 allcentury joined #git
12:34 perlpilot joined #git
12:34 foox joined #git
12:38 stantonk joined #git
12:40 ManDay joined #git
12:40 ManDay Is there a way to l*really* undo a commit, i.e. delete it to the effect that it has never happened?
12:41 toogley joined #git
12:41 j416 ManDay: man git-reset
12:41 gitinfo ManDay: the git-reset manpage is available at http://jk.gs/git-reset.html
12:41 rgrinberg joined #git
12:42 ManDay j416: Can you be more particular?
12:43 eijk_ joined #git
12:43 j416 ManDay: only if you ask a more particular question
12:43 ManDay I don't see how Git reset by itsself would delete the data associated with a commit
12:43 j416 it won't
12:43 ManDay j416: I want to make it such that a commit has never happend
12:43 j416 it will remove the reference to the commit, and the commit will be garbage collected
12:43 ManDay (not undo the changes by another commit or so)
12:43 j416 git reset will do this.
12:44 j416 git rebase can also do it.
12:44 j416 git filter-branch can do it.
12:44 j416 there are many ways to achieve things, which is right depends on your use-case.
12:44 ManDay j416: I don't see how git-reset works in that way. master will still refer to the faulty commit, will it not? What "reset" arguments would I use?
12:44 lmatteis joined #git
12:44 j416 describe what you have and what you want
12:46 xlegoman joined #git
12:49 daGrevis joined #git
12:49 xpk joined #git
12:49 daGrevis left #git
12:52 ManDay j416: Not sure what you expect of me. I made a commit with git commit -a. I want to undo things to the effect that everything is as if I had never commited.
12:52 ManDay (There are no traces of the commit anywhere in the repository)
12:54 tobiasvl ManDay: git-reset works in that way, specifically git reset --hard will hard-reset master (if that is HEAD) to the commit you choose and make the working directory reflect that state.
12:54 tobiasvl ManDay: !revert
12:55 gitinfo ManDay: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?
12:55 sdothum joined #git
12:55 tobiasvl ManDay: e) is probably what you want.
12:55 foox joined #git
12:56 ManDay tobiasvl: Yes I guess so
12:56 ManDay I have to read git-reset again. Didn't know that git-reset moved references in that way
12:58 tobiasvl --soft and --hard does so. read the man page you got linked to earlier
12:58 APic joined #git
12:58 livingstn joined #git
12:58 tobiasvl (or --mixed and --merge and --keep)
12:58 axiom_1 joined #git
13:00 Meteorhead hello, I'm getting this message when typing git status "added by them:      ./"
13:00 Meteorhead how am I supposed to do this
13:00 jimi_ joined #git
13:00 Meteorhead like add the whole directory ?
13:02 ochorocho__ joined #git
13:02 allcentury joined #git
13:02 JeroenT joined #git
13:02 cbreak Meteorhead: looks like a conflict
13:02 cbreak resolve it
13:03 ToBeCloud joined #git
13:03 _ngz_ngzz joined #git
13:05 livingstn joined #git
13:06 ManDay tobiasvl: I don't see where it says in man git-reset that "master" would be moved such that the last commit becomes dangling
13:06 gitinfo tobiasvl: the git-reset manpage is available at http://jk.gs/git-reset.html
13:06 cdown joined #git
13:06 grawity not by default it wouldn't
13:06 mischat joined #git
13:06 grawity if one is on master and resets to HEAD^, however, it would
13:07 ManDay by what logic would that happen?
13:07 tobiasvl "In the third form, set the current branch head (HEAD) to <commit>, optionally modifying index and working tree to match."
13:08 githogori joined #git
13:08 tobiasvl "This form resets the current branch head to <commit> and possibly updates the index (resetting it to the tree of <commit>) and the working tree depending on <mode>."
13:08 tobiasvl the "current branch head" is what HEAD points to (unless HEAD is detached, of course)
13:08 tobiasvl so if HEAD is master, reset will move master.
13:08 SirFunk_ Hi there. I just split a repo into seperate repos using 'git filter-branch --prune-empty --tag-name-filter cat --subdirectory-filter subdir -- --all' and some 'git filter-branch -f --index-filter 'git rm -r --ignore-unmatch --cached bad folder' --tag-name-filter cat --prune-empty -- --all'. The resulting repo is abnormally large. It I do something like http://stackoverflow.com/a/20609719/907035 It shows large
13:08 SirFunk_ files that should no longer be in the repo. I've tried expiring the ref log and pruning. Any Idea how I can figure out what it going on?
13:09 zrts Your branch is ahead of 'origin/master' by 4 commits. => how can i see those specific commits with git log? it shows me everything
13:09 jimi_ joined #git
13:10 tobiasvl zrts: git log origin/master..HEAD
13:11 tobiasvl zrts: shows you all commits reachable from origin/master, but not HEAD (ie. "your branch")
13:11 zrts tobiasvl: <3
13:11 zrts ty
13:11 j416 zrts: or simply for short: git log @{u}..
13:11 j416 zrts: (same thing)
13:11 romerocesar joined #git
13:12 tobiasvl zrts: actually, the other way around, sorry
13:12 ash_workz joined #git
13:12 tobiasvl or j416's shorthand, but surely it's still git log ..@{u}
13:12 zrts @{u} as in upstream? like...
13:12 zrts oh
13:12 jimi_sanchez joined #git
13:12 zrts awesome
13:12 ManDay tobiasvl: Ah okay, I misunderstood that.
13:13 j416 tobiasvl: surely not :)
13:13 ManDay thanks
13:13 zrts no its @{u}..
13:13 tobiasvl oh right. I got confuzzled
13:13 zrts somehow it also works haha
13:13 zrts cool, thanks
13:13 zrts gitmagick
13:13 mischat_ joined #git
13:14 diegoviola joined #git
13:14 j416 zrts: shouldn't, odd.
13:14 j416 zrts: perhaps you were using three dots
13:15 zrts j416: it works just like git log origin/master..HEAD !
13:15 swati_27 left #git
13:15 j416 zrts: git log ..@{u} ≠ git log @{u}..
13:16 jaguarmagenta joined #git
13:16 zrts i know :)
13:16 j416 that is what I thought you meant
13:16 shinnya joined #git
13:18 Meteorhead cbreak: hey man! you know what the whole directory has been moved to another repository, checked this with git remote -v
13:18 barteks2x joined #git
13:20 italoacasas joined #git
13:21 garethdaine joined #git
13:23 rnsanchez_ joined #git
13:24 batrick joined #git
13:25 fuchstronaut joined #git
13:26 nonconvergent joined #git
13:27 eletuchy joined #git
13:29 hero616_ joined #git
13:31 garethdaine joined #git
13:31 gajus Using git rebase, How do I squash a specific commit into another commit if they are not one after another?
13:32 gajus can I change the order of commits when doing -i rebase?
13:32 Matrixiumn joined #git
13:32 madewokherd joined #git
13:32 j416 gajus: yes.
13:32 gajus oh.. thats cool.
13:32 j416 gajus: and yes.
13:33 DieguezZ joined #git
13:37 linx_ joined #git
13:39 AaronMT joined #git
13:39 linx_ joined #git
13:40 AaronMT joined #git
13:42 kbs` joined #git
13:42 efdetonator joined #git
13:44 jeffreylevesque_ joined #git
13:44 rbr joined #git
13:44 MutantMahesh joined #git
13:46 McNozes joined #git
13:48 eletuchy joined #git
13:49 rubyonrailed joined #git
13:50 jeffreylevesque joined #git
13:51 nnyk_ joined #git
13:53 diegoviola roughly 0 steps to end my git-bisect... yay, only took me the whole weekend
13:54 rolha joined #git
13:55 JeroenT joined #git
13:56 JeroenT joined #git
13:58 diegoviola joined #git
13:58 diegoviola ok so the git-bisect is over
13:58 diegoviola I did a git bisect good and git said:
13:58 diegoviola 266c73b77706f2d05b4a3e70a5bb702ed35431d6 is the first bad commit
13:58 diegoviola does that means I don't need to do anything else?
13:59 qsx that beans 266c73b introduced the bug
13:59 diegoviola ok
13:59 qsx means, even.
13:59 diegoviola I knew it
14:00 diegoviola thanks
14:00 GodGinrai joined #git
14:03 davisonio joined #git
14:03 jeffreylevesque_ joined #git
14:04 irco joined #git
14:06 ximvan_ joined #git
14:07 Juzzika joined #git
14:09 Duikb00t joined #git
14:09 Duikb00t o/
14:09 Duikb00t I just uploaded a local directory with GIT to online
14:09 renatosilva joined #git
14:10 Duikb00t error: HEAD: invalid sha1 pointer 2dd2a1ae47aed0d0df27fa35adc49f2820b3a578   error: refs/heads/master does not point to a valid object!   error: refs/remotes/origin/master does not point to a valid object!   notice: No default references
14:10 Duikb00t I never saw that messagebefore :D
14:10 Duikb00t But locally that repo is still working
14:12 lindenle joined #git
14:13 cqi joined #git
14:13 renatosilva left #git
14:14 D-Boy joined #git
14:15 scorphus joined #git
14:15 cbreak signs of corruption
14:16 diegoviola joined #git
14:16 Tim-SEM joined #git
14:17 Tim-SEM left #git
14:17 CheckDavid joined #git
14:18 _ngz_ngzz joined #git
14:18 cevrial joined #git
14:20 harish__ joined #git
14:20 Duikb00t :(
14:20 Kulrak joined #git
14:20 Kulrak joined #git
14:20 phaleth joined #git
14:22 ResidentBiscuit joined #git
14:23 cevrial joined #git
14:24 nnyk_ joined #git
14:26 TrikedOut69 joined #git
14:27 mischat joined #git
14:27 CalimeroTeknik joined #git
14:27 CalimeroTeknik this is still not silent! git commit --quiet --no-status --message=foobar
14:27 xpk_ joined #git
14:28 CalimeroTeknik how can I silence the output unless something goes really wrong? it says "On branch master\nnothing to commit, working directory clean"
14:28 Hanita joined #git
14:28 xpk__ joined #git
14:28 cbreak CalimeroTeknik: what for?
14:28 cbreak in some script?
14:29 CalimeroTeknik yes
14:29 cbreak maybe commit-tree is better for scripting
14:29 cbreak but you can of course also redirect std output in scripts
14:30 mahendra_ joined #git
14:30 CalimeroTeknik yes, I could silence git once and for all, but if some other error happens (permissions or other) I'd much rather get output
14:30 TrikedOut69 left #git
14:31 CalimeroTeknik my last resort is git commit -m foo | grep -v '^(On branch master\|nothing to commit, working directory clean)$'
14:34 cbreak CalimeroTeknik: those woulc be on std error
14:35 thiago joined #git
14:36 eijk joined #git
14:36 clemf joined #git
14:38 mahendra_ joined #git
14:41 CalimeroTeknik thanks, I'll just run git commit -m foo > /dev/null and hope it doesn't silence possible problems too much
14:41 LionsMane joined #git
14:41 stantonk joined #git
14:42 mischat_ joined #git
14:44 mmlb joined #git
14:45 CJKinni joined #git
14:45 sorenb_ joined #git
14:45 stantonk joined #git
14:46 rsukla joined #git
14:46 egis joined #git
14:47 nettoweb joined #git
14:48 egis Good morning. I must be missing something obvious, but how should I do following with git: clone repo (with all branches), change "remote url" (not sure if it's the right term), push repo to different remote?
14:48 GodGinrai egis: why do you need to "change" the remote url.  You could just add another remote.
14:48 fuchstronaut joined #git
14:49 perlpilot egis: why do you want to change the remote?  A repo can have multiple remotes and you can push to them individually
14:49 egis That's a good question. I don't know why. It's just how I did it before with mercurial.
14:49 praveen__ joined #git
14:50 a_thakur joined #git
14:50 egis Our company got a legacy project which is hosted on bitbucket, we need to "take ownership" of the repository. Which is basically cloning current repo and pushing it back to our bitbucket account.
14:51 jast where exactly are you struggling?
14:51 GodGinrai egis: wouldn't the correct process to take ownership be to get bitbucket to merge the accounts?
14:51 jast actually I can see a view issues, reading again
14:51 egis GodGinrai, other account belongs to other company :)
14:52 jast git clone --mirror, git remote set-url, git push --mirror
14:52 GodGinrai egis: so you acquired the project, but not the company?
14:52 egis Yes.
14:52 perlpilot egis: So ... what jast said  :)
14:53 GodGinrai egis: https://confluence.atlassian.com/bitbucket/change-or-transfer-repository-ownership-289964397.html
14:53 egis perlpilot and GodGinrai , thank you
14:53 jast you're welcome ;P
14:53 egis jast, thank you too
14:53 GodGinrai np
14:54 Ahmed90 joined #git
14:54 Ahmed-90 joined #git
14:54 KettleWork Is it normal that from a freshly cloned repo, switching between branch A, to B, back to A, (without doing anything in between) lands you with branch A with tons of files staged for removal?
14:55 KettleWork Having some serious trouble with this and wonder if this is a Git bug maybe
14:55 KettleWork I can only 'truly' get branch A again by either reset --hard when checked out, or by checking out with "checkout -f"
14:55 jast that Shouldn't Happen(tm)
14:55 KettleWork Otherwise I have tons of files staged for removal. These files have been deleted earlier and added later on again but with different letter casing on the directory names.
14:55 jast oh, yeah, that can cause issues on some filesystems, notably Windows's NTFS
14:55 jast I believe OSX has slightly unusual behaviour with filename casing, too
14:56 GodGinrai KettleWork: no.
14:56 KettleWork I'm on Windows so guilty as charged..
14:56 GodGinrai KettleWork: are you sure that your repo is clean of changes?
14:56 KettleWork But I wonder how to solve it though, if possible even. I would think that checking out a repo should do just that
14:56 mangolisk_ joined #git
14:56 KettleWork GodGinrai, yes, I have deleted my whole project folder with underlying .git folder
14:56 jast in your clone, can you check what .git/config says about core.ignoreCase?
14:57 KettleWork ignorecase = true
14:57 GodGinrai KettleWork: so from a clean clone, switching from A to B to A again with absolutely no other changes is causing this problem?
14:57 jast okay
14:57 KettleWork GodGinrai, Exactly so
14:57 mmmveggies joined #git
14:57 GodGinrai KettleWork: Using Cygwin or Git Bash?
14:57 KettleWork or sorry - i check them out from origin, and make them local
14:57 KettleWork but otherwise correct
14:57 jast ignorecase = true should be set automatically on windows and fixes some of these issues, but evidently not all of them
14:58 nnyk_ joined #git
14:58 GodGinrai I'm on Windows and never had this problem
14:58 GodGinrai but I've always used Cygwin
14:58 KettleWork so checkout origin/branchA and then branch -b branchA
14:58 KettleWork Git Bash
14:58 GodGinrai which has a different git
14:58 jast GodGinrai: do you often re-case directory names in commits, though? :)
14:58 mahendra_ joined #git
14:59 GodGinrai jast: KettleWork hasn't specifically stated that he re-cased a filename yet, has (s)he?
14:59 KettleWork git status gives me a list of tons of files that are contained in the problematic folders
14:59 PCatinean joined #git
14:59 jast 165526 < KettleWork> Otherwise I have tons of files staged for removal. These files have been deleted earlier and added later on again but with different letter casing  on the directory names.
14:59 jast :)
15:00 jast as a workaround you could try changing the case of the directory after switching
15:00 GodGinrai oh whoops
15:00 fuchstronaut joined #git
15:00 GodGinrai missed that line
15:00 jast not sure that will help, but can't really hurt :)
15:00 CJKinni` joined #git
15:00 GodGinrai KettleWork: is this an open repo?
15:01 GodGinrai KettleWork: or a closed one?
15:01 KettleWork all marked for deletion
15:01 KettleWork git reset --hard and it's all fixed again (or checkout -f when checking out)
15:01 Gitzilla joined #git
15:01 KettleWork but if I checkout branchB and then back to A, it's all marked for deletion again
15:01 dhollinger joined #git
15:01 KettleWork seriously considering renaming this library we're working on to avoid this issue.. :)
15:01 ramsub07 joined #git
15:01 KettleWork GodGinrai, it's a closed repo for a client of ours, so can't really be too open about the contents which really sucks for this situation
15:02 KettleWork I'm wondering if there's any sort of git cache somewhere I can try to empty?
15:02 GodGinrai KettleWork: I was afraid of that
15:02 b1tchcakes joined #git
15:02 KettleWork will try this on osx and see if there's the same issue
15:02 ochorocho__ joined #git
15:03 kpease joined #git
15:03 GodGinrai KettleWork: you can also try installing Cygwin or Babun and see if you get the same problem w/ Cygwin git
15:04 rbr joined #git
15:04 KettleWork I just tried on OSX, resulting in the same issue
15:04 KettleWork mighty strange
15:06 Ahmed90 joined #git
15:07 kitsu joined #git
15:08 tyreld joined #git
15:08 kitsu Hi, guys! If I add e.g 2 lines to the file and then want to commit only one. Can I do it in simple way (without copying -> stashing -> fixing etc)
15:08 BlessJah check out `git add -p`
15:09 cbreak does git ls-tree -r HEAD show something interesting?
15:09 cbreak KettleWork: how about you commit the rename?
15:09 BlessJah kitsu: it may be tricky (i.e. requiring to modify patch) if lines are next to each other
15:09 howdoi joined #git
15:09 GodGinrai kitsu: like BlessJah said, use the --patch directive.
15:09 madewokherd joined #git
15:09 kitsu ok, I see
15:10 kitsu that should work, thanks
15:10 KettleWork cbreak, how do you mean, commit the rename? the deletions you mean, that are staged?
15:10 arooni joined #git
15:10 cbreak KettleWork: if the same files are added again with a different name, then that's a rename
15:11 KettleWork cbreak, they're only deleted, in the staging area right now. should I from this scenario try to rename them? first reset --hard so I get them back, then rename? but rename to what?
15:12 KettleWork sorry for stupid questions, but it's a convoluted situation :)
15:12 zivester joined #git
15:12 KettleWork right now the files only have a single name, and they're either there, or deleted, depending on how I checkout
15:12 GodGinrai KettleWork: he meant to commit the part where you "added them back"
15:12 cbreak KettleWork: git add -A
15:13 bango2 joined #git
15:13 KettleWork ok now all the deletions are staged for commit
15:13 KettleWork so next step, undelete them you mean, and then commit that?
15:14 KettleWork after checkout the deletions are unstaged, now with git add -A they're staged
15:14 cbreak no
15:14 cbreak just commit the rename
15:14 z8z joined #git
15:14 fuchstronaut joined #git
15:14 KettleWork ok.. but I don't have a rename..?
15:14 KettleWork that's where I'm confused
15:14 cbreak the files are not there anymore?
15:14 cbreak they are not in the filesystem?
15:14 ochorocho__ joined #git
15:15 KettleWork no the files are deleted when I checkout
15:15 KettleWork and thus I have unstaged deletions
15:15 xpk joined #git
15:15 grawity how can something be unstaged if it was caused *by* a checkout...
15:15 KettleWork but if I reset --hard, the files reappear, and my branch is clean
15:15 KettleWork grawity, that is the question! :)
15:16 GodGinrai KettleWork: are the files missing in branch B or branch A?
15:16 KettleWork GodGinrai, in branch A
15:16 KettleWork if I check the repo on bitbucket, the files are all there perfectly fine
15:16 GodGinrai KettleWork: and you have the files staged in branch A or branch B?
15:16 kpease joined #git
15:16 KettleWork the bitbucket browser view represents what I see after a forced checkout /reset --hard
15:17 KettleWork the files exists in both branches
15:17 KettleWork it's just that when I checkout branch A, the files automatically gets deleted, but not staged for deletion
15:17 zivester joined #git
15:17 KettleWork I wonder if there's an easy livestreamer for my desktop out there.. I could maybe show you? :)
15:18 stuh84 joined #git
15:18 jaguarmagenta joined #git
15:18 Darcidride joined #git
15:20 GodGinrai KettleWork: so if you pull branch A from the server, it will have the files?
15:20 GodGinrai KettleWork: and same for branch B?
15:21 KettleWork GodGinrai, yes
15:21 sanketdg joined #git
15:21 GodGinrai hrm
15:22 LeBlaaanc joined #git
15:24 dmto joined #git
15:25 KettleWork GodGinrai, do you have teamviewer? Or does this work without teamviewer even?
15:25 KettleWork http://go.teamviewer.com/v10/m14657232 Meeting ID: m14-657-232
15:25 artemisart joined #git
15:26 GodGinrai KettleWork: it seems it installs TeamViewer if you don't have it
15:26 exarch joined #git
15:26 GodGinrai KettleWork: But since I'm at work, I'm not sure I have the bandwidth to do the Teamviewer stuff
15:26 dopesong joined #git
15:26 ShekharReddy joined #git
15:26 jeffreylevesque joined #git
15:26 KettleWork ah gotcha
15:26 GodGinrai sorry :\
15:26 KettleWork no problem at all
15:29 KettleWork I'm writing up a hastebin instead
15:30 constantinexvi joined #git
15:30 nnyk_ joined #git
15:31 phillly joined #git
15:31 ki0_ joined #git
15:32 pokergod joined #git
15:32 pokergod i'm on master, and did a git pull.   Running git branch -a, does not show branches that I know exist.  Why?
15:33 grawity did you literally do "git pull", rather than "git pull origin whatever"?
15:33 xpk_ joined #git
15:34 grawity does `git ls-remote origin` show those branches?
15:34 grawity what does `git config --get-all remote.origin.fetch` print?
15:34 KettleWork GodGinrai, is this followable? http://hastebin.com/kucosenefo.vhdl
15:35 KettleWork (got some weird syntax highlighting unfortunately)
15:36 grawity http://hastebin.com/kucosenefo.txt
15:36 grawity ftfy
15:36 pokergod yes it does show those branches
15:36 eletuchy joined #git
15:36 KettleWork grawity, ah thank you
15:37 pokergod +refs/heads/*:refs/remotes/origin/*
15:37 grawity in fact maybe http://hastebin.com/raw/kucosenefo would be preferrable
15:37 KettleWork there's my example of a checkout causing something to be unstaged btw
15:38 KettleWork these files have been deleted under a previous commit, but on a different casing on directory name. and then in commit after that, added back in
15:38 GodGinrai KettleWork: first of all, why are you using `checkout -b` from the remote branches instead of just using `git checkout branch_name`?
15:38 KettleWork so now they have the correct names and all, in the repo
15:38 jagob joined #git
15:39 KettleWork GodGinrai, it puts it in a detached head state, no?
15:39 KettleWork ok lemme try this again without that
15:39 KettleWork (rookie warning)
15:40 GodGinrai The detached head state only happens when you do work in the remote branches
15:41 GodGinrai rather than local copies
15:41 GodGinrai which is why there is little good to come out of checking out remote/branchname
15:41 sangy joined #git
15:42 skarm joined #git
15:42 ahmedelgabri joined #git
15:43 Electrometro joined #git
15:44 KettleWork GodGinrai, http://hastebin.com/raw/itocupejil same situation that way though
15:44 KettleWork (but good to know, thank you)
15:44 zivester joined #git
15:44 reim joined #git
15:46 GodGinrai KettleWork: neither pastebin that you showed me actually shows the files *within* the Components directory in each branch
15:46 dopesong joined #git
15:46 GodGinrai (and the Dataitems directory)
15:46 KettleWork +-
15:46 zack_s_ jast: it doesnt work
15:46 KettleWork sorry dropped icecream on keyboard
15:48 ericvw joined #git
15:48 fscala joined #git
15:50 KettleWork GodGinrai, You're on to something! Been at this for a while now and not sure how I could've missed this, but under CMS branch the Components folder is actually named components (small C)
15:50 KettleWork but it's not always cased that way.. hmm
15:51 zack_s_ it tells me  "does not exist in 'HEAD'"
15:51 ericvw joined #git
15:52 zack_s_ left #git
15:52 zumba_ad_ joined #git
15:54 loglaunch joined #git
15:54 KettleWork GodGinrai, https://ibin.co/2m7W8mryYF7j.png
15:54 KettleWork In my CMS branch on the repo I actually have two sets of folders, one for each casing.
15:55 GodGinrai KettleWork: weird.  in your first pastebin, the lowercase components folder was not in the ls output.
15:56 KettleWork GodGinrai, yeah that's what's trumping me up, it seems quite random which folders are and aren't capitalized
15:56 GodGinrai hrm
15:56 KettleWork will try on a linux machine now instead and see if I can see all folders there
15:56 GodGinrai alright
15:56 KettleWork in that case it should just be a matter of deleting the wrong ones and commit that, I hope
15:56 GodGinrai I'm heading off to lunch, but I'll try to help if you're still having trouble when I get back
15:56 GodGinrai indeed
15:57 KettleWork very helpful, thank you! I'll probably be on my way home then, already working over hours :D
15:57 GodGinrai np
15:58 ajf- joined #git
15:59 ki0 joined #git
15:59 KettleWork GodGinrai, SUCCESS!
15:59 lindenle joined #git
15:59 KettleWork Just did as planned, and now switching between branches is no trouble at all
16:00 KettleWork lesson learned: check your repo on web-gui or linux machine to be 100% sure of that's really in there
16:00 rafalcpp joined #git
16:00 * KettleWork heads home
16:01 cdown joined #git
16:02 diegoviola joined #git
16:03 romerocesar joined #git
16:03 xpk joined #git
16:04 sanketdg joined #git
16:05 TomyLobo joined #git
16:06 brandonw if i have a branch `topic1` branched from master, and another branch `topic2` branched from topic1, is there a way to rebase topic1 on master, then rebase topic2 on topic1, while not having to manually drop previous topic1 commits from topic2 merging topic1?
16:07 zeroed joined #git
16:07 zeroed joined #git
16:08 BlessJah brandonw: if you rebased topic2 on top of topic1 and then again on top of master, won't the result be the same (with topic1 left dangling)?
16:09 brandonw topic2 would have branched from topic1, and merged from it periodically
16:09 brandonw then once topic1 and topic2 are done, topic1 rebases master to get a cleaner history
16:09 ahmedelgabri joined #git
16:09 brandonw and topic2 rebases topic1 to get that same history
16:10 brandonw topic2 wouldn't rebase off master, because it'd get those commits from rebasign topic1
16:10 brandonw but my problem is that topic2 rebasing topic1 is seeing all of topic1's commits pre-rebase
16:10 brandonw so the rebased topic1 commits are conflicting with the previously merged (pre-rebase) topic1 commits
16:10 BlessJah sorry, I don't see that
16:10 dsdeiz joined #git
16:10 dsdeiz joined #git
16:10 raijin joined #git
16:11 pwnz0r joined #git
16:11 brandonw i'm gonna do some tests with a new repo and see if i did something weird
16:11 brandonw i thought it would automatically handle that as well
16:11 lindenle joined #git
16:11 gajus I have changes that I want to add to a specific commit
16:12 gajus is there a way to do that without creating a temporary commit and rebasing?
16:12 thiago joined #git
16:12 gajus oh, I am stupid. Never mind.
16:12 gajus (I can just pick the commit before making the changes)
16:14 diegoviola I did a git checkout v4.6 from Linus' Linux git tree
16:14 diegoviola how do I go back to master
16:14 grawity git checkout master
16:14 diegoviola thanks
16:14 nnyk_ joined #git
16:15 LeBlaaanc joined #git
16:16 JeremyM_ joined #git
16:18 gajus I am confused. Why when I do git rebase I am getting a merge conflict?
16:18 gajus *before* doing any changes
16:19 cdg joined #git
16:21 romerocesar joined #git
16:21 madewokherd gajus: what is your exact command and the output you're getting from it?
16:22 MistahKurtz joined #git
16:22 LeBlaaanc joined #git
16:22 narendraj9 joined #git
16:23 ozette joined #git
16:24 gajus I accidentally included a merge commit in rebase
16:24 sagerdearia joined #git
16:24 madewokherd I thought rebase ignored those
16:25 gajus :/
16:25 gajus no something is off
16:25 gajus I am rebasing and getting bunch of conflicts
16:26 robotroll joined #git
16:26 jhass sounds like it works :P
16:26 gajus but... the conflicts are in files that I made no changes to
16:27 jhass perhaps your rebase contains more than your changes
16:27 paul424 joined #git
16:27 subhojit777 joined #git
16:27 gajus what I am doing is `git rebase -i @~3`. All I do is add a missing character to one of the commits. But then I get bunch of unrelated conflicts for each subsequent commit.
16:27 vuoto joined #git
16:29 pwnz0r joined #git
16:30 jrnieder joined #git
16:30 eletuchy joined #git
16:30 madewokherd when you edit the commit list, does it show only the 3 commits you expect?
16:31 Terens joined #git
16:31 Terens hello
16:31 Terens if i do
16:31 Terens git checkout -b gorrilla
16:31 Terens then git push origin gorilla would be different than  git push -u origin gorilla ?
16:31 gajus madewokherd yup
16:32 gajus anyway, I have resolved the conflicts and rebase was successful
16:32 gajus still, odd that I had to resolve these conflicts
16:32 stantonk_ joined #git
16:32 zeroed joined #git
16:32 zeroed joined #git
16:33 theskillwithin joined #git
16:33 xall joined #git
16:34 DieguezZ joined #git
16:34 nettoweb joined #git
16:36 eletuchy joined #git
16:37 SirOliver joined #git
16:37 _nwkj86 joined #git
16:42 encod3 joined #git
16:43 samsonizzle joined #git
16:43 maestrojed joined #git
16:43 samsonite joined #git
16:45 dunpeal joined #git
16:46 hero616_ joined #git
16:46 dunpeal Hi. I'm doing a presentation on Git, and I just realized that the DAG is a tree, right?
16:46 dunpeal Because nobody seems to refer to it as a tree, yet it is...
16:46 nowhere_man joined #git
16:46 madewokherd it's not a tree
16:47 dunpeal y
16:47 madewokherd DAGs can have two lines pointing to one place, trees cannot
16:48 ki0 joined #git
16:48 dunpeal oh, right
16:48 dunpeal d'oh
16:48 quetz joined #git
16:52 ochorocho__ joined #git
16:53 davisonio joined #git
16:53 refried_ joined #git
16:54 ImJune joined #git
16:54 vuoto joined #git
16:55 vuoto joined #git
16:55 vuoto joined #git
16:57 aard_ joined #git
16:58 jaggz joined #git
16:58 BSaboia joined #git
16:58 jaggz how do you remove a submodule?  (a folder that had .git in it at the time I did git add)
16:58 irco joined #git
16:58 ochorocho__ joined #git
16:58 jaggz so I have /project  and /project/foo/   foo had .git/ in it and I'd like foo/ and foo/* (without foo/.git) to be a part of /project/
16:59 weckl joined #git
16:59 jaggz one big tree /project
16:59 jaggz I have not yet done the initial commit
16:59 Eugene !submodule_rm
16:59 gitinfo [!submodules_rm] To delete a submodule, do this in the superproject: Edit/delete .gitmodules to remove the submodule, and `git add .gitmodules`. Then `rm -rf submodulepath; git rm -f --cached submodulepath; git commit -am "Removed submodules!"`  Inspect .git/config for "submodule" entries to remove.  Inspect .git/modules for caches to remove.  Possible alternatives to submodules: "!gitslave" or "!subtree"
16:59 ahmedelgabri joined #git
17:00 jaggz I don't have a .gitmodules file anywhere
17:02 GodGinrai Eugene: why would you remove the directory and then `git add .gitmodules` instead of just using `git rm .gitmodules`?
17:02 Eugene I didn't write the factoid; patches welcome
17:02 GodGinrai lol
17:02 Eugene jaggz - if you haven't commited the addition of the submodule, then just `git reset`  it away.
17:02 Eugene rm foo/.git/ -rf; git add foo
17:03 jaggz Eugene, awesome.. thanks :)
17:03 jaggz I already removed its .git
17:03 jaggz git reset foo worked
17:04 anddam left #git
17:04 romerocesar joined #git
17:04 Chill_Surf joined #git
17:05 foo jaggz: Glad I could be of assistance.
17:05 jaggz lol
17:05 GodGinrai hehe
17:05 Terens hello
17:05 Terens if i do
17:05 Terens git checkout -b gorrilla
17:05 Terens then git push origin gorilla would be different than  git push -u origin gorilla ?
17:06 avtobiff joined #git
17:06 emPi joined #git
17:07 ilmari Terens: push -u sets the upstream reference for your local gorilla branch to origin/gorilla
17:08 ilmari Terens: so that next time you push or or pull on gorilla without arguments, it'll use origin/gorilla
17:08 rgrinberg joined #git
17:08 zarel joined #git
17:10 zumba_ad_ joined #git
17:12 nnyk_ joined #git
17:13 EvilPeng1 joined #git
17:13 jimi_sanchez joined #git
17:14 a3Dman joined #git
17:16 jimi_sanchez joined #git
17:16 arooni joined #git
17:17 jaggz okay.. I made my repo as root.. but I don't have nor want root logins
17:17 jaggz commits are sometimes done as root though
17:17 hahuang61 joined #git
17:17 jaggz the project files are a mix of users, including root
17:18 jaggz can I just chown -R gituser /path/repos/project.git ?
17:18 HedgeWork jaggz: Okay, it's easy enough to move it to another user's home directory and give that user ownership.  If you describe your team/workflow/use case, we may be able to suggest an "optimal" setup, but yes you can just recursively chown it.
17:18 jaggz it's just me
17:18 jaggz all alone
17:18 HedgeWork jaggz: I recommend chown -R gituser:somegroup though so you take away the root user's group as well
17:19 HedgeWork jaggz: ahh, gotcha
17:19 HedgeWork then yeah, just move somewhere convenient to you and chown.
17:19 _ikke_ jaggz: I also recommend setting core.sharedRepository to something appropiate
17:19 jaguarmagenta joined #git
17:19 garethdaine joined #git
17:19 jaggz but I sometimes edit source as root, because I have to keep doing make install (of libraries) and haven't felt like doing some workaround (like a suid install script)
17:20 SirOliver joined #git
17:22 _ng joined #git
17:22 jaggz _ikke_, I don't see that anywhere..
17:23 NeverDie joined #git
17:23 jaggz reading about it.. I think
17:24 mmlb joined #git
17:25 jaggz yay.. it's cloning
17:25 d4rklit3 joined #git
17:25 jaggz over ssh
17:25 nwkj86 joined #git
17:25 GodGinrai jaggz: why would you edit source as root?
17:25 NeverDie joined #git
17:25 jaggz switching from svn
17:25 jaggz I had my svn repository get corrupt
17:26 narendraj9 joined #git
17:26 romerocesar joined #git
17:26 GodGinrai and that gives reason to edit as root why?
17:26 jaggz GodGinrai, I said.. because in 15 years I haven't taken the time to get around my convenient vim :make that installs my libs
17:26 NeverDie joined #git
17:27 jaggz in 26 years of doing dev as my normal user and these projects as root, I've never had an issue [that I'm aware of]
17:27 GodGinrai jaggz: as root: `su <literally-any-user-that-is-not-root>` -> *make changes* -> `exit` -> `make install` (or `vim` -> `:make`)
17:27 makinen left #git
17:27 Electrom_ joined #git
17:28 jaggz just one time, when doing actual sysadmin work, I did rm -rf / path/to/delete
17:28 frogonwheels joined #git
17:28 jaggz ie. mistaken space after the / :)
17:28 GodGinrai jaggz: that should have been all it took to make you realize you shouldn't be doing things as root
17:28 narendraj9 joined #git
17:28 jaggz GodGinrai, and if I'm in vim and do :make, how does it have root access?
17:29 jaggz GodGinrai, that had to be done as root
17:29 GodGinrai jaggz: `exit` puts you back to root
17:29 GodGinrai jaggz: then you can do your make
17:29 jaggz I just said, actual sysadmin work, implying I was doing root-necessary work
17:30 jaggz GodGinrai, when I'm making hundreds of changes to my source, and dozens of make installs, I do not want to exit my shell to go back to root
17:30 GodGinrai jaggz: Yes, and I showed how you could do that root necessary work without doing other work that was not root-necessary
17:30 nwkj86 joined #git
17:30 jaggz I think a better solution would be what I proposed, some suid script that make called to do the actual installation of the libs
17:30 jaggz then all of it would be done as my regular user account
17:31 GodGinrai jaggz: well, you can also use `sudo` to run vim as another user, and then ctrl-Z to run your make commands
17:31 jaggz rm -rf / path/ was back in 1995 ..
17:31 narendraj9 joined #git
17:31 GodGinrai or hey, give your regular user sudoers access
17:31 GodGinrai and run sudo make install
17:31 GodGinrai after making changes
17:32 jaggz yeah it has sudo access.. I could do that
17:32 jaggz or in the makefile: sudo cp foo.so /lib/libfoo.so
17:32 jaggz that'd be simple enough
17:32 noraatepernos joined #git
17:33 GodGinrai sup
17:33 GodGinrai *yup
17:33 jaggz thanks
17:34 GodGinrai np
17:34 noraatepernos I need a git alias in bash like ‘gacp’ where I can type gacp ‘“fixed a bug” and have bash run “git add -A” “git commit -m “fixed a bug”” “git push origin”  Is this a terrible idea?  Sometimes I’m debugging a test deployment, saltstack, etc.
17:35 jaggz no you should use aliases and functions to your advantage
17:35 GodGinrai noraatepernos: doesn't sound like a git alias, but rather a bash function
17:35 jstein_ joined #git
17:35 circ-user-gIevh joined #git
17:35 jaggz gacp () { git add -A; git commit -m "$1"; git push origin; }
17:36 _ikke_ noraatepernos: I think it's a terrible idea :-)
17:36 noraatepernos _ikke_: heh I feel you.
17:37 eletuchy joined #git
17:37 vF3hNGxc47h8 joined #git
17:37 noraatepernos _ikke_: The day it bites me in the *ss I’ll come in here to laugh at myself haha.
17:37 GodGinrai noraatepernos: He might not like that.  You better stop touching him
17:37 jaggz (Side note: Bash's "type" command allows you to do "type cmd" to examine aliases, functions, executables in the path, ...
17:37 raijin joined #git
17:38 jaggz I hate not closing my parenthesis.)
17:38 _ikke_ https://xkcd.com/859/
17:39 BlaXpirit damn you _ikke_!
17:39 _ikke_ :D
17:39 GodGinrai lol
17:39 GodGinrai so true
17:39 GodGinrai also
17:39 GodGinrai that xkcd link appeared so fast
17:39 noraatepernos jaggz: Haha thanks for saving me the trouble of writing this.  I just used it.  Heaven.  Count-down to disasterous push begins.
17:39 GodGinrai <.<
17:40 _ikke_ google xkcd parenthesis
17:40 sondr3 joined #git
17:40 GodGinrai noraatepernos: disasterous push with vague commit message, you mean. :P
17:40 TSS_ joined #git
17:40 GodGinrai "fixed bug".  WHAT BUG?!
17:40 GodGinrai :P
17:41 ki0_ joined #git
17:41 noraatepernos GodGinrai: Hahaha.  Well I’m decent with commit messages, at least.  I was being brief in the interest of your time.
17:41 jhass the one created by "fixed stuff", obviously
17:41 sapiens_vector joined #git
17:41 GodGinrai jhass: which fixed problems caused by "fixed issues"
17:42 romerocesar joined #git
17:42 jhass those introduced by "I believe it's working now" or the ones from "derp"?
17:42 GodGinrai lol
17:43 jaggz gacp () { read -p "Are you sure you want to add, commit, and push (y/N)?" answer; if [[ "$answer" = y || "$answer" == yes ]]; then git add -A; git commit -m "$1"; git push origin; else echo "Aborting"; fi }
17:43 shgysk8zer0 joined #git
17:43 jaggz oops
17:43 GodGinrai alias gacpy="yes | gacp"
17:43 jaggz I guess [[ accepts = and == the same
17:43 GodGinrai I can see it now
17:43 jaggz lol
17:44 jaggz gacpyessir
17:44 Spacew00t joined #git
17:44 shgysk8zer0 joined #git
17:44 * jaggz yawns
17:44 Spacew00t joined #git
17:45 jaggz noraatepernos, honestly, making aliases and functions can save tons of time and frustration and help keep you focused on your work
17:45 jaggz it can also prevent you from making useful web interfaces, so nobody else can help you with your projects
17:45 _ikke_ It can also cause a lot of errors due to muscle memory command execution
17:45 * jaggz sadfaces
17:45 jaggz _ikke_, yeah sure
17:45 GodGinrai I'm all for aliases and functions
17:46 GodGinrai although I've never felt I needed them for git
17:46 Sasazuka__ joined #git
17:46 _ikke_ I have some basic ones
17:46 _ikke_ But most of the time I use full commands
17:46 kadoban joined #git
17:46 GodGinrai IMO, it helps to know the part and parcel of the process
17:46 jaggz I have tons of them for large project maintenance
17:46 jaggz but not for git
17:47 GodGinrai yea, exactly
17:47 dunpeal left #git
17:48 noraatepernos giggling like a child in corner of coffee shop at “gacpy”
17:48 jaggz gcm () { git commit -m "$@"; }
17:48 davisonio joined #git
17:49 arthurl joined #git
17:49 jaggz gcm this is the most recent version   # Works without quotes!
17:50 SirOliver joined #git
17:51 nickthetait joined #git
17:51 zumba_ad_ joined #git
17:54 yqt joined #git
17:56 adminisnotadmin joined #git
17:58 eletuchy joined #git
17:59 iLembus joined #git
18:01 Literphor joined #git
18:02 SirOliver joined #git
18:03 Gianormagantrous joined #git
18:03 Gianormagantrous joined #git
18:03 dsdeiz_ joined #git
18:04 zumba_addict joined #git
18:05 zumba_addict if I want to undo a commit with sha BAD123, i can do this right? git revert BAD123 && git push -u origin master
18:05 basiclaser joined #git
18:06 jhass sure
18:06 zumba_addict cool
18:06 zumba_addict thanks
18:06 cdown joined #git
18:06 _ikke_ Note that this will only create a new commit
18:09 arthurl joined #git
18:09 zumba_addict yup
18:09 zumba_addict from what I know, git doesn't really delete a commit. Correct?
18:10 rolha joined #git
18:10 _ikke_ Not without rewriting history
18:11 GodGinrai _ikke_: well, deleting a commit could not happen without rewriting history
18:11 GodGinrai in any system
18:13 shgysk8zer0 joined #git
18:13 Balliad joined #git
18:14 fornax joined #git
18:19 benwbooth joined #git
18:19 dreiss joined #git
18:19 tristanp joined #git
18:19 hahuang61 joined #git
18:20 rgrinberg joined #git
18:20 noraatepernos joined #git
18:20 NeverDie joined #git
18:20 rahtgaz joined #git
18:20 jost_ joined #git
18:24 eatsfoobars joined #git
18:25 zumba_addict was told not to push my revert. Glad they caught me
18:25 zumba_addict how do I undo git revert
18:25 zumba_addict git reset --hard?
18:25 zumba_addict i'm refering to my local copy
18:25 cdown joined #git
18:26 _ikke_ git reset --hard HEAD~
18:26 NeverDie joined #git
18:27 zumba_addict worked! :)
18:27 githogori joined #git
18:27 sangy joined #git
18:27 NeverDie joined #git
18:30 xpk joined #git
18:30 ahmedelgabri joined #git
18:31 NeverDie joined #git
18:32 Jason_ joined #git
18:32 linx_ joined #git
18:33 eletuchy joined #git
18:33 raijin joined #git
18:34 NeverDie joined #git
18:34 EvilPenguin joined #git
18:36 swati_27 joined #git
18:36 rsukla joined #git
18:36 swati_27 Hi. I switch to my "test" branch, made some changes and switched back to "master"
18:36 swati_27 Those were reflected in master branch...
18:37 swati_27 Could you help?
18:37 Raging_Hog joined #git
18:37 SirOliver joined #git
18:37 keltvek joined #git
18:38 osse !float > swati_27
18:38 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
18:39 linx_ joined #git
18:39 fornax joined #git
18:41 swati_27 Is it possible to make changes in "test" branch, then "git stash", "git checkout master" and could do "git stash apply" after days to get those changes back to "test" branch?
18:41 osse yes
18:42 swati_27 Okay.
18:42 swati_27 Thank you.
18:42 SirOliver joined #git
18:43 _ikke_ You could also just commit those changes in the test branch
18:43 swati_27 _ikke_: Okay!
18:46 GodGinrai swati_27: you should consider `pop` so as to not dirty your stash
18:47 meLon joined #git
18:47 davisonio joined #git
18:47 swati_27 pop?
18:47 jatin30 joined #git
18:47 swati_27 i know it works as a stack?
18:47 GodGinrai swati_27: `git stash pop`.  It's like apply, but it takes the stashed changes off of the stack
18:48 GodGinrai swati_27: if you just use apply, they remain on the stack
18:48 leehambley joined #git
18:49 diegoviola joined #git
18:49 swati_27 GodGinrai: Oh, okay...
18:49 esc joined #git
18:49 esc joined #git
18:49 swati_27 Thanks..
18:49 GodGinrai np
18:50 jatin30 I aborted my first cherry-pick. https://bpaste.net/show/97f9a8b5b476 in this paste the first four files like" core/java/android/app/Activity_BACKUP_2892.java " are the files I fetched for the cherry-pick which I aborted. now I dont need them anymore but Its still in my system it seems , maybe it has got to do something coz of the git fetch i performed how to get rid of it?
18:50 zumba_ad_ joined #git
18:51 LeBlaaanc joined #git
18:53 FunkyAss joined #git
18:54 _ikke_ Those are merge conflict files
18:54 _ikke_ Has nothing to do with fetch
18:55 _ikke_ They're untracked files, so you can just remove them from the filesystem
18:56 LeBlaaanc joined #git
18:58 noraatepernos joined #git
18:58 mischat joined #git
18:59 eijk joined #git
18:59 raijin joined #git
19:00 sanketdg joined #git
19:01 Literphor joined #git
19:01 SirOliver joined #git
19:02 HappyLoaf joined #git
19:02 hahuang65 joined #git
19:02 alexander__b joined #git
19:02 dmto joined #git
19:04 alexander__b left #git
19:04 mdw joined #git
19:05 refried_ joined #git
19:05 samson joined #git
19:09 NeverDie joined #git
19:12 xall joined #git
19:12 inflames joined #git
19:13 mwhooker joined #git
19:13 fornax joined #git
19:14 King_Hual joined #git
19:14 King_Hual joined #git
19:16 jstein_ joined #git
19:20 jaguarmagenta joined #git
19:20 hahuang61 joined #git
19:21 rolha joined #git
19:23 elastix joined #git
19:23 jatin30 I cant see my master branch when I run "git branch" It shows just the one branch that I created - "sample_kernel"
19:23 _ikke_ whatabout git branch -r?
19:24 jatin30 github/cm-13.0   m/cm-13.0 -> github/cm-13.0
19:24 jatin30 the output
19:24 boombatower joined #git
19:26 jatin30 Can I dm you _ikke_ ?
19:26 _ikke_ Is it necessary?
19:26 jatin30 no. If you are not okay I wont
19:27 GodGinrai dm?
19:27 _ikke_ direct message
19:27 GodGinrai ah
19:27 _ikke_ In here, more people can help
19:27 GodGinrai never seent hat term before
19:27 GodGinrai *that
19:27 _ikke_ Twitter uses it
19:28 GodGinrai ah
19:28 GodGinrai that explains it
19:29 swati_27 left #git
19:30 jatin30 _ikke_, https://bpaste.net/show/8644778313cc
19:30 _ikke_ So you apparently don't have a master branch
19:31 GodGinrai _ikke_: "we're so distributed, there isn't even a master codebase!"
19:31 _ikke_ master is just a name
19:31 _ikke_ nothing special about it
19:31 GodGinrai lol I know
19:32 GodGinrai it's just fun to make that joke
19:32 jatin30 I mean isn't It odd because I ran git init and I read master branch comes with it by default
19:32 stantonk joined #git
19:32 concerti joined #git
19:33 jatin30 I had no output when I ran "git branch" for the first time
19:33 ResidentBiscuit Master is an oppressive term anyway
19:33 ResidentBiscuit Implies everyone else is a slave
19:33 GodGinrai ResidentBiscuit: that depends on your semantic definition.
19:33 GodGinrai ResidentBiscuit: Master can also mean teacher
19:33 noraatepernos joined #git
19:34 jatin30 can anyone tell me why i dont have master?
19:34 jatin30 Is it because i cloned?
19:34 ResidentBiscuit You're a free man
19:34 ResidentBiscuit /j
19:34 ResidentBiscuit What does `git branch -a` show you?
19:34 ResidentBiscuit Clone should bring the master branch by default
19:34 ResidentBiscuit If your repo has one
19:35 GodGinrai jatin30: you're listing the remotes, not your local branches
19:35 _ikke_ GodGinrai: He already said git branch did not return it
19:35 _ikke_ GodGinrai: I was curious if the remote had it
19:35 ResidentBiscuit So there's just not a master branch
19:35 GodGinrai _ikke_: he might have said it, but he hasn't shown us a paste showing that output
19:35 jatin30 ResidentBiscuit, https://bpaste.net/show/0d24cab8ee5d
19:36 ResidentBiscuit Ask whoever maintains that repo what branch is the stable branch
19:36 GodGinrai jatin30: if you cloned, then yes, if the repo didn't have a master, you won't have one.
19:37 Literphor joined #git
19:37 dmto joined #git
19:37 ozette joined #git
19:37 _ikke_ looks like cyanogenmod
19:38 jatin30 GodGinrai, I guess than thats it . Actually I cloned the source code of cyanogenmod to build upon it further
19:38 Balliad joined #git
19:38 jatin30 _ikke_, yeah thats it
19:39 ynanm joined #git
19:39 jatin30 thanks guys
19:40 jatin30 GodGinrai, is your first name God?
19:42 DieguezZ joined #git
19:42 clemf joined #git
19:42 GodGinrai jatin30: nah, this is just my netnom. http://tfwiki.net/wiki/Ginrai
19:44 jatin30 cool
19:44 rahtgaz When I commit and git creates a new tree, will it store a full image of the tree or will it only update those blobs that have been staged?
19:45 _ikke_ staging already creates the blob
19:45 paul424 joined #git
19:45 LeBlaaanc joined #git
19:46 rahtgaz I'm trying to understand if a large file gets re-imaged on every commit, even when it hasn't been staged
19:47 noraatepernos joined #git
19:47 rahtgaz I have a large sql script that I would like to add to version control. But in reality it won't be changed much (or at all) past a certain point.
19:47 _ikke_ no
19:48 _ikke_ every file is hashed, and if that hash already exists, it does not get created twice
19:48 rahtgaz ok. thank you.
19:48 cdown joined #git
19:49 tgunr joined #git
19:51 raininja joined #git
19:52 UTAN_dev_ joined #git
19:53 ochorocho__ joined #git
19:53 _rnsanchez_ joined #git
19:54 UTAN_dev joined #git
19:57 stantonk joined #git
19:59 zeemz joined #git
20:00 iMiiTH joined #git
20:00 fscala joined #git
20:02 raijin joined #git
20:03 lindenle joined #git
20:04 _geoff joined #git
20:04 nnyk_ joined #git
20:05 _geoff on a scale of 1 - 10 how boned am i?  i have been working on this thing for like 10 hours.. i do a git init, git add .; realize i included like a million library files i didn't need and, like a retard did `git reset --hard` which gave me a nice empty directory
20:06 eijk joined #git
20:06 i7c You never committed once?
20:06 _geoff i never committed it once
20:06 _ikke_ 5
20:06 SwiftMatt joined #git
20:06 _ikke_ git add adds the files to the index
20:07 _ikke_ problem is, how to get the names back :P
20:07 i7c hehe
20:07 i7c So there are objects in .git floating around with the content that he wants but he wouldn't know which is which? ;)
20:07 _geoff 5 is barely bad
20:07 _ikke_ i7c: correct
20:07 pwnz0r joined #git
20:07 _geoff so i did this thing: git fsck –cache –no-reflogs –lost-found which founda bunnch of dangling blobs
20:08 _geoff but it did not write anything to lost and found
20:08 _geoff i think i can find the files i care about with some grepping
20:08 italoacasas joined #git
20:10 nnyk joined #git
20:11 xall joined #git
20:11 arthurl joined #git
20:11 iMiiTH joined #git
20:13 benwboot_ joined #git
20:15 vF3hNGxc47h8 joined #git
20:15 fornax joined #git
20:18 qasaur joined #git
20:19 _geoff so how i can i grep through the index?
20:19 _geoff under .git/objects i se a bunch of stuff
20:19 _geoff but it all appears to be compressed or binary data
20:19 benwbooth joined #git
20:19 _geoff i was able to save some of it from vim buffers
20:21 hahuang61 joined #git
20:21 Literphor joined #git
20:22 javster_ joined #git
20:23 mdw joined #git
20:23 clemf joined #git
20:23 iMiiTH joined #git
20:23 j416 _geoff: first thing: make a backup of .git before you screw it up too much
20:24 javster_ joined #git
20:25 xall joined #git
20:25 iMiiTH joined #git
20:26 noraatepernos joined #git
20:28 bl4ckpajamas joined #git
20:30 iMiiTH joined #git
20:30 zumba_ad_ joined #git
20:34 kappy joined #git
20:34 tgunr joined #git
20:35 matthiaskrgr hi, does git support COW?
20:35 preaction for what?
20:35 radsy joined #git
20:35 matthiaskrgr let's say I have a repository with files A and B and both files are identical
20:35 preaction then git stores only one copy
20:35 bash1235123 joined #git
20:35 matthiaskrgr when I checkout that repo, will it generate A and B seperately, or create A and then copy A to B ?
20:36 matthiaskrgr yes, internally, but I mean when checking out files in the reporitory
20:36 bash1235123 I have a repo with two folders which I would like to have in a server with auto pull master. I would like to do different tasks when one of the folders is updated. Is there anyway to do this ?
20:37 matthiaskrgr if it copied the files, it would be possible to take advantage of cow file systems such as btrfs
20:37 preaction matthiaskrgr: i suspect that both A and B will, in the working tree, point to different physical content, because filesystems are hard.
20:38 matthiaskrgr hrmm
20:38 ozette joined #git
20:38 mwhooker joined #git
20:38 bash1235123 git log folder --no-merges | head -n1
20:38 preaction but you could check the code to be sure. i would very much doubt it, as it would require you to know all the trees you're checking out (and if you checked out a new tree in only one part of the repo, what then?)
20:38 matthiaskrgr mmh
20:39 matthiaskrgr I mean, git already does have some kind of checksum of all files, right?
20:39 preaction if you want to know how git works, try !gcs
20:39 gitinfo [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html
20:40 matthiaskrgr so while checking out, we check  1)  does the current commit contain a file with the same hash as the one I want to check out?   if yes   2) check if the file is already checked out and unedited , if yes  3) cp old_file new_file
20:40 preaction but why do all that just because one filesystem on one OS treats this case differently?
20:41 preaction besides, it's most likely already: cp .git/objects/aa/aa/aaaaaaaa worktree/path/to/file
20:41 stantonk joined #git
20:41 matthiaskrgr btrfs and zfs both offer this functunality. apples new filesystem might have something similar as well
20:42 preaction 2. out of dozens or hundreds.
20:42 matthiaskrgr ok, asking the other way around, what would be the harm of copying instead of writing from scratch?
20:43 SwiftMatt joined #git
20:43 matthiaskrgr it would reduce the on-disk repo size as well as the checkout time
20:43 preaction answering again: if you want to know, check the source. my guess, having not looked at the source, is that git copies the content from the database into the working tree. isn't that going to do what you want?
20:45 nnyk_ joined #git
20:45 preaction bash1235123: from what i understand, the post-receive hook gets a list of refs being updated, so you can check that ref to see what's inside. also, the update hook
20:46 bash1235123 git log --no-merges --pretty=format:'%H' -n1 trunk
20:46 bash1235123 I'll save this for each folder and check if changed :)
20:47 bash1235123 dunno all those hooks stuff are a better solution. My script is going to run in cron so ..
20:47 ExoUNX joined #git
20:47 ExoUNX greetings
20:47 ExoUNX this is gonna be out of git support
20:48 ExoUNX but can I use git with tfs?
20:48 preaction what's tfs?
20:48 _ikke_ TEam foundation server
20:48 ExoUNX preaction Team Foundation Server
20:48 _ikke_ MS
20:48 ExoUNX it seems to be very similar
20:48 preaction typing "tfs git" into google seems to indicate, yes
20:48 qsx there’s git-tf from microsoft and git-tfs from somebody else
20:48 qsx ExoUNX: similar? lol. nope.
20:50 CameronShorter joined #git
20:50 ExoUNX I'll check out git-tf
20:50 aidalgol joined #git
20:52 mmlb joined #git
20:53 ochorocho__ joined #git
20:54 mmlb joined #git
20:57 _geoff j416: i have made a backup
20:58 j416 phew.
20:58 _geoff unfortunately i still don't know how to search through the compressed objects
20:59 fornax joined #git
20:59 stantonk joined #git
21:00 stantonk joined #git
21:01 italoacasas left #git
21:02 jeffreylevesque joined #git
21:03 liquidjamm joined #git
21:04 rolha joined #git
21:06 nardev_ joined #git
21:06 nick123 joined #git
21:07 CameronShorter left #git
21:07 clemf joined #git
21:08 apotry joined #git
21:09 diegoviola joined #git
21:10 st0opkid joined #git
21:12 Repox joined #git
21:13 ahmedelgabri joined #git
21:20 ToBeCloud joined #git
21:20 jaguarmagenta joined #git
21:21 KevinMGranger git grep?
21:22 hahuang61 joined #git
21:22 m0viefreak joined #git
21:23 GodGinrai KevinMGranger: *compressed* objects
21:24 Sonderblade joined #git
21:24 diegoviola joined #git
21:25 anth0ny joined #git
21:26 ramsub08 joined #git
21:26 paws_ joined #git
21:27 rnsanchez_ joined #git
21:27 ochorocho__ joined #git
21:29 keltvek joined #git
21:30 adamm joined #git
21:37 ozette joined #git
21:39 johnmilton joined #git
21:42 Literphor joined #git
21:44 cyphase joined #git
21:45 nnyk_ joined #git
21:45 euyy joined #git
21:48 diegoviola joined #git
21:50 gauf joined #git
21:54 MattMaker joined #git
21:55 pur3eval joined #git
21:55 Impaloo joined #git
21:56 editshare-ericf joined #git
21:57 madewokherd joined #git
21:57 mwhooker joined #git
21:58 johnmilton joined #git
21:58 joki joined #git
22:00 rahtgaz when using git-flow and wanting to branch out of a current feature to test a possible different development path for that feature, should I branch normally, or if I create a new feature while HEAD is on the feature branch it will branch from there?
22:00 rahtgaz hmmm.. not sure if my question is confusing
22:01 mdw_ joined #git
22:01 GodGinrai rahtgaz: very
22:01 rahtgaz What I mean is, if I need to branch out of a feature, should I use git branch, or can I use git flow feature start while HEAD is on the current feature?
22:02 Chill_Surf joined #git
22:02 GodGinrai git-flow is software?
22:02 GodGinrai I thought it was a paradigm
22:02 rahtgaz it's been implemented
22:03 GodGinrai I'm not sure, then
22:03 rahtgaz there's currently two implementations from what I know. git-flow and git-flow AVH
22:03 _August_ joined #git
22:04 _August_ joined #git
22:04 _August_ is there anyway to delete the last commit to a branch?
22:04 GodGinrai _August_: git reset --hard HEAD~1
22:05 _August_ thats not going to remove the branch or anything like that will it?
22:05 GodGinrai no, it points the branch pointer to the commit before the HEAD
22:05 annoymouse joined #git
22:05 eijk joined #git
22:06 _August_ well let me ask this before i run that
22:06 _August_ somehow i was trying to amend a commit because of a spelling error i made and i somehow made a merge branch
22:06 _August_ by running the reset is that going to remove it?
22:07 ahr3n joined #git
22:07 pur3eval joined #git
22:07 GodGinrai how did you "somehow" merge a branch? o.O
22:07 _August_ git push -f origin branchname
22:07 _August_ but the branch name was misspelled because of this damn terminal
22:08 GodGinrai push -f would obliterate whatever branch was already there
22:08 GodGinrai there should not be any merge
22:08 _August_ is it going to show in the commits tho?
22:09 GodGinrai is what going to show in the commits?
22:09 _August_ by pushing that
22:09 GodGinrai ok
22:09 _August_ im trying to not look like an idiot in the logs even tho at this point i am one =/
22:09 GodGinrai let's try this
22:10 GodGinrai say you have a set of commits
22:10 GodGinrai A -> B -> C
22:10 GodGinrai HEAD -> C
22:10 GodGinrai HEAD === the branch pointer
22:10 GodGinrai ok
22:10 GodGinrai if I do `git reset --hard HEAD~1`
22:10 GodGinrai the new history will look like this:
22:11 GodGinrai A -> B
22:11 GodGinrai HEAD -> B
22:11 _August_ ok
22:11 _August_ let me run it
22:11 _August_ fingers crossed...
22:12 _August_ well...
22:13 _August_ it fixed my spelling error but the merge commit is still there
22:13 WaReZ joined #git
22:13 GodGinrai then you didn't properly explain what you did.  I asked how you got a merge commit
22:13 GodGinrai when trying to fix a spelling error
22:14 _August_ you said pushing it will obliterate it right?
22:14 GodGinrai yes
22:14 GodGinrai but the history of whatever you pushed will still exist
22:15 _August_ screw it, it will have to say
22:15 rgrinberg joined #git
22:16 kitsu joined #git
22:20 rgrinberg joined #git
22:21 zeemz joined #git
22:22 hahuang61 joined #git
22:23 noraatepernos joined #git
22:24 eletuchy joined #git
22:27 nettoweb joined #git
22:30 eletuchy joined #git
22:30 kadoban joined #git
22:31 fuchstronaut joined #git
22:32 CameronShorter joined #git
22:35 sto0pkid joined #git
22:35 snowkidind joined #git
22:38 naf joined #git
22:38 ash_workz joined #git
22:38 ensyde__ joined #git
22:38 cyphase joined #git
22:39 mmlb joined #git
22:40 SirOliver joined #git
22:41 eletuchy joined #git
22:42 elastix joined #git
22:43 ShekharReddy joined #git
22:43 nidr0x joined #git
22:44 eletuchy_ joined #git
22:45 fuchstronaut joined #git
22:45 nettoweb joined #git
22:54 raven-au joined #git
22:56 netj joined #git
22:58 zumba_ad_ joined #git
22:59 jaggz joined #git
23:04 keltvek joined #git
23:05 cdg joined #git
23:05 SwiftMatt joined #git
23:05 ferr1 joined #git
23:08 ensyde joined #git
23:09 nnyk_ joined #git
23:14 benwbooth joined #git
23:15 eletuchy joined #git
23:16 ahmedelgabri joined #git
23:19 mablae_ joined #git
23:20 xall joined #git
23:20 Rodya_ joined #git
23:21 jaguarmagenta joined #git
23:23 BenderRodriguez joined #git
23:23 hahuang61 joined #git
23:25 weox joined #git
23:25 xlegoman joined #git
23:29 preyalone joined #git
23:33 cdg joined #git
23:33 efdetonator joined #git
23:34 NeverDie_ joined #git
23:38 mischief help, i am bad at git
23:39 Kaisyu joined #git
23:40 snowkidind i am also bad at git, but that wont get your problem solved. what’s your issue
23:41 ochorocho__ joined #git
23:41 mischief i have a branch, 1.0-stuff, and 1.0.1. i want to take commits from 1.0-stuff applied after 1.0 and put them on a branch off 1.0.1
23:41 mischief i tried to cherry-pick from 1.0..1.0-stuff, but it complains in the middle about a merge commit
23:42 mischief i need to drop a commit as well, since it was already applied in 1.0.1
23:42 snowkidind i was going to say isnt merge for that?
23:43 mischief i wish to delete a commit without a revert so that i have a linear history that can be exported with git-format patch afterward
23:43 snowkidind yea. thats out of my basic realm
23:45 mischief i suppose i can do some merge and rebase thing, but i'm sure there's an clean and more expert way.
23:45 stantonk joined #git
23:47 jeffreylevesque joined #git
23:49 xlegoman joined #git
23:54 _August_ joined #git
23:54 piattino joined #git
23:56 SwiftMatt joined #git
23:56 wxg joined #git

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