Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-10

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

All times shown according to UTC.

Time Nick Message
00:00 Sasazuka joined #git
00:07 hamster joined #git
00:11 moei joined #git
00:15 elsevero joined #git
00:18 romerocesar joined #git
00:21 YuGiOhJCJ joined #git
00:26 ejb joined #git
00:27 Zamyatin joined #git
00:27 bannakaffalatta joined #git
00:29 e14 joined #git
00:30 Poppa joined #git
00:31 pietv joined #git
00:34 pikajude joined #git
00:34 Sasazuka joined #git
00:36 stevenspasbo joined #git
00:37 rchavik joined #git
00:37 ueberall joined #git
00:37 ueberall joined #git
00:37 WakiMiko joined #git
00:37 stevenspasbo joined #git
00:39 thiago joined #git
00:40 ki0 joined #git
00:45 afuentes joined #git
00:50 e14 joined #git
00:54 guilherme joined #git
00:54 peeps[lappy] joined #git
00:54 endiruna joined #git
00:57 _nwkj86 joined #git
00:58 tdliydppsjornbvj joined #git
00:58 albel727 joined #git
01:05 brent___ joined #git
01:09 Sasazuka joined #git
01:10 guest_ joined #git
01:11 e14 joined #git
01:13 dodobrain joined #git
01:19 iseharglwijucnak joined #git
01:20 safe joined #git
01:21 dgarstang joined #git
01:22 e14 joined #git
01:24 aeontech joined #git
01:24 aeontech left #git
01:25 dsantiago joined #git
01:25 arescorpio joined #git
01:25 manuelschneid3r joined #git
01:27 e14 joined #git
01:32 SebastianFlyte joined #git
01:32 guest_ joined #git
01:32 UnnamedPlayer joined #git
01:34 guest____ joined #git
01:36 pikajude joined #git
01:39 Sasazuka joined #git
01:49 ruby joined #git
01:51 madewokherd joined #git
01:52 mizu_no_oto joined #git
01:55 Rapture joined #git
01:56 durham_ joined #git
01:56 aidalgol joined #git
01:58 Gloomy joined #git
01:58 Gloomy joined #git
01:59 Gloomy joined #git
02:00 Gloomy joined #git
02:01 Gloomy joined #git
02:02 Gloomy joined #git
02:02 Maple__ why does italy suck
02:03 UnnamedPlayer joined #git
02:03 Skipp_OSX joined #git
02:03 Skipp_OSX how do you fetch from all remotes?
02:04 Skipp_OSX in one command I mean, I've done it before but I forgot the command, it accepts --prune
02:06 stick-sh_ joined #git
02:08 jimklo_ joined #git
02:09 NeverDie Is it possible to have a single pull request that contains several different branches along with their changes?
02:11 Zamyatin joined #git
02:11 dgarstang joined #git
02:12 inflames joined #git
02:12 finalbeta joined #git
02:15 blackbird_ joined #git
02:16 e14 joined #git
02:25 tyreld joined #git
02:27 Skipp_OSX NeverDie, I mean to say fetch each remote one at a time, don't pull anything, just fetch
02:28 Skipp_OSX Workflow is I want to fetch origin/master and a branch/feature, pull origin/master, checkout feature, rebase onto master
02:29 Skipp_OSX there is a command that allows me to fetch from both origin and branch one-after-the-other, I've used it
02:29 Skipp_OSX but I can't remember what it was
02:30 rewt there's git fetch --multiple
02:33 hahuang61 joined #git
02:33 chosafine joined #git
02:33 chosafine joined #git
02:36 thiago joined #git
02:36 Gianormagantrous joined #git
02:36 Gianormagantrous joined #git
02:37 HanClinto joined #git
02:38 Vampire0 joined #git
02:39 aarobc joined #git
02:39 aw1 joined #git
02:40 NeverDie Skipp_OSX: Hmm, I see.
02:40 dreiss joined #git
02:40 LeBlaaanc joined #git
02:41 Skipp_OSX rewt: I don't think that's what I want
02:42 rewt it lets you fetch from multiple sources in 1 command
02:46 Skipp_OSX oh, maybe that could work then
02:46 rkazak joined #git
02:46 fatalhalt joined #git
02:46 Limes_ joined #git
02:46 d^sh joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:49 aeontech joined #git
02:52 pks joined #git
02:53 aavrug joined #git
02:54 Nilesh_ joined #git
02:56 fhackdro- left #git
02:56 Derperperd joined #git
02:56 jon-mac joined #git
02:57 madduck_ joined #git
02:58 farhaan joined #git
03:02 thierryp joined #git
03:02 a_thakur joined #git
03:03 madduck_ joined #git
03:04 chigang joined #git
03:11 finalbeta joined #git
03:12 itsnotv joined #git
03:12 Goplat joined #git
03:17 snowkidind joined #git
03:18 bernardio joined #git
03:18 treehug88 joined #git
03:19 tiger0 joined #git
03:19 rchavik joined #git
03:20 mahakal joined #git
03:20 chosafine joined #git
03:20 chosafine joined #git
03:20 rchavik joined #git
03:21 hexagoxel joined #git
03:21 anonymuse joined #git
03:22 VagabondAzulien joined #git
03:23 lektrik joined #git
03:24 guilherme joined #git
03:24 lektrik joined #git
03:26 SpeakerToMeat joined #git
03:27 rkazak joined #git
03:30 Vortex35 joined #git
03:31 lektrik joined #git
03:33 Algebr joined #git
03:33 Sriranganathan joined #git
03:33 Noldorin joined #git
03:33 madduck_ left #git
03:35 howitdo joined #git
03:35 howitdo joined #git
03:37 sunri5e joined #git
03:37 dreiss joined #git
03:38 madduck joined #git
03:38 madduck joined #git
03:41 ki0 joined #git
03:43 gfixler joined #git
03:43 Lyqyd joined #git
03:45 str joined #git
03:48 jimi_ joined #git
03:48 kristofferR joined #git
03:48 duderonomy joined #git
03:50 hahuang61 joined #git
03:51 hahuang65 joined #git
03:53 Ryanar joined #git
03:54 Ryanar joined #git
03:54 svm_invictvs joined #git
03:55 Ryanar joined #git
03:55 chachasmooth joined #git
03:56 Ryanar joined #git
03:56 fstd_ joined #git
03:59 Lyqyd_ joined #git
04:00 cqi joined #git
04:00 mizu_no_oto joined #git
04:02 Lyqyd joined #git
04:03 thierryp joined #git
04:06 ljc joined #git
04:08 ljc joined #git
04:08 FSadino joined #git
04:08 drbean joined #git
04:10 howdoi joined #git
04:13 mquin joined #git
04:18 anonymuse joined #git
04:19 a_thakur joined #git
04:20 bernardio joined #git
04:21 Noodlewitt joined #git
04:21 madduck joined #git
04:21 madduck joined #git
04:21 thiago joined #git
04:22 madduck joined #git
04:22 madduck joined #git
04:24 ToxicFrog joined #git
04:26 HandheldPenguin joined #git
04:26 mahakal joined #git
04:28 Dandelock joined #git
04:28 chosafine joined #git
04:29 robotroll joined #git
04:37 mehola joined #git
04:37 rchavik joined #git
04:42 chosafine joined #git
04:42 chosafine joined #git
04:43 Rodya_ joined #git
04:47 subhojit777 joined #git
04:47 aeontech joined #git
04:51 SantaClauze joined #git
04:54 svm_invictvs joined #git
04:58 mmattice joined #git
05:00 sparr joined #git
05:01 lindenle joined #git
05:02 Rodya_ joined #git
05:06 ianmethyst joined #git
05:07 ajt_ joined #git
05:13 a_thakur_ joined #git
05:15 neunon joined #git
05:15 dreiss joined #git
05:19 murgi0 joined #git
05:23 SwiftMatt joined #git
05:28 Thorn joined #git
05:29 romerocesar joined #git
05:30 elsevero joined #git
05:30 Gianormagantrous joined #git
05:30 frobnic joined #git
05:42 ki0 joined #git
05:43 hhee joined #git
05:47 Cabanossi joined #git
05:48 bernardio joined #git
05:50 Guest54781 joined #git
05:57 Rodya_ joined #git
05:59 sbulage joined #git
06:00 rscata joined #git
06:05 thierryp joined #git
06:06 freimatz3 joined #git
06:07 thiago joined #git
06:09 almy joined #git
06:13 Gloomy joined #git
06:14 anthony_P joined #git
06:15 asepulveda2009 joined #git
06:16 snowkidind joined #git
06:19 acetakwas joined #git
06:19 SantaClauze joined #git
06:20 Guest82 joined #git
06:21 bannakaf_ joined #git
06:25 atomi joined #git
06:27 hahuang65 joined #git
06:28 aidalgol joined #git
06:34 dreiss joined #git
06:34 hahuang65 joined #git
06:35 cyphase joined #git
06:40 Algebr` joined #git
06:42 Rodya_ joined #git
06:43 Algebr` joined #git
06:44 Rodya_ joined #git
06:44 danslo joined #git
06:51 Macaveli joined #git
06:51 ThomasLocke joined #git
06:56 zeroed joined #git
06:56 zeroed joined #git
06:56 quackgyver joined #git
06:56 Raging_Hog joined #git
06:57 Macaveli joined #git
06:59 chele joined #git
07:00 qt-x joined #git
07:01 dmc joined #git
07:01 raspado joined #git
07:05 cdown joined #git
07:06 EisNerd_ joined #git
07:06 brent__ joined #git
07:07 cdown_ joined #git
07:10 sbulage joined #git
07:10 tunafizz joined #git
07:10 cdown joined #git
07:13 zeroed joined #git
07:15 cust joined #git
07:15 Qilibrun joined #git
07:16 Guest54781 joined #git
07:20 sea-gull_ joined #git
07:22 Derperperd joined #git
07:23 Nerbrun joined #git
07:23 bernardio joined #git
07:24 cyan__ joined #git
07:27 sbulage joined #git
07:29 kadoban joined #git
07:30 SpeakerToMeat joined #git
07:33 oskarkv joined #git
07:34 thierryp joined #git
07:37 murgi0 left #git
07:37 modin joined #git
07:39 hahuang65 joined #git
07:39 Qilibrun joined #git
07:39 ihradek joined #git
07:40 elect joined #git
07:42 Junior joined #git
07:43 a_thakur joined #git
07:44 jnavila joined #git
07:48 eduardas_m joined #git
07:48 drbean_ joined #git
07:49 hhee2 joined #git
07:49 JeroenT joined #git
07:51 JeroenT joined #git
07:51 drbean joined #git
07:53 maroloccio joined #git
07:53 timvisher joined #git
07:53 maroloccio hi. how can i get the tree id from a dir path? e.g. a/b/c is a checked out dir.. in which (current) tree object is it tracked?
07:54 EisNerd joined #git
07:54 grawity checked out dirs are tracked by the index
07:55 grawity but, if the subdir's contents exactly match what would be in HEAD, you could use `git rev-parse HEAD:<path>`
07:56 grawity git is not like svn – you can't have one dir at revision X and another at revision Y; either it matches HEAD or it doesn't – so that simplifies things
07:56 madduck joined #git
07:56 madduck joined #git
07:56 Sceorem joined #git
07:57 Ryanar joined #git
07:58 drbean_ joined #git
07:59 maroloccio right, i was thinking of svn. and yes, git rev-parse HEAD:path did exactly what i wanted. thanks!
08:00 drbean- joined #git
08:02 drbean joined #git
08:03 kadoban joined #git
08:06 lordjancso joined #git
08:06 drbean_ joined #git
08:07 elsevero joined #git
08:08 xaa joined #git
08:09 drbean joined #git
08:09 Mogget joined #git
08:12 danslo joined #git
08:13 Snugglebash joined #git
08:13 drbean_ joined #git
08:14 csk157 joined #git
08:17 drbean joined #git
08:17 SpeakerToMeat joined #git
08:17 JeroenT joined #git
08:18 zefferno joined #git
08:18 tirej joined #git
08:18 drbean- joined #git
08:18 cdown joined #git
08:19 msonntag joined #git
08:24 drbean joined #git
08:25 armyriad joined #git
08:25 msonntag joined #git
08:26 JeroenT joined #git
08:28 hhee joined #git
08:28 TomyWork joined #git
08:29 MafiaInc joined #git
08:31 bocaneri joined #git
08:31 dimi1947 joined #git
08:31 dgarstang joined #git
08:31 overlord_tm joined #git
08:32 rominronin joined #git
08:36 Neon joined #git
08:36 Algebr` joined #git
08:37 Nerbrun joined #git
08:38 Neon I'm confused about a statement in the documentation on https://git-scm.com/docs/git-rebase. The second paragraph is about the upstream. As far as I know an upstream is a remote branch used if you push a branch. If I understand the docs correctly, git rebase won't work for branches without an upstream, thus cannot be used with local repos? That again cannot be true as I already used rebase locally, but I don't understand the
08:38 Neon docs there. Can you help me?
08:38 drbean_ joined #git
08:40 lindenle joined #git
08:41 tobiasvl Neon: as you have already experienced, you can use rebase locally. so not sure what your question is!
08:42 tobiasvl <upstream> is just a placeholder there for the branch that is "ahead" of <branch>. the default behavior if you do not specify it does assume a remote branch, like it says, but you can specify a local one
08:42 Neon I see. That was my issue. So just the name confused me.
08:42 mp4 joined #git
08:43 Balliad joined #git
08:45 tobiasvl it's mostly used with remotes, I guess
08:46 DaveTaboola joined #git
08:46 DaveTaboola joined #git
08:48 Neon Maybe. I mostly used it for re-rooting forked branches. I read much about git, yet I'm a total noob. My first big repo taught me a lot, but I have to fix all the newbie errors I did.
08:49 Neon I think my --graph log is capable of killing people. :)
08:50 FSadino joined #git
08:50 drbean joined #git
08:51 diget joined #git
08:52 drbean_ joined #git
08:52 zeroed joined #git
08:52 zeroed joined #git
08:53 eduardas_m joined #git
08:55 ayogi joined #git
08:55 drbean- joined #git
08:55 druonysus joined #git
08:56 ki0 joined #git
08:56 drbean joined #git
08:58 justanotheruser joined #git
08:58 troulouliou_div2 joined #git
08:59 kurkale6ka joined #git
08:59 ispn joined #git
09:01 bongjovi joined #git
09:01 ihradek joined #git
09:02 watmm1 joined #git
09:03 jknetl joined #git
09:04 SpeakerToMeat joined #git
09:04 theoceaniscool joined #git
09:04 drbean joined #git
09:05 Panacea joined #git
09:06 Xatenev joined #git
09:06 Xatenev Hi
09:06 Xatenev In my gitignore I wanna do "ignore everything in dir except following dir:"
09:07 jknetl joined #git
09:07 Xatenev I tried: /web !/web/uploads/
09:07 Xatenev It didnt work tho
09:07 Xatenev Maybe /web/* and !/web/uploads/?
09:07 garethdaine joined #git
09:09 apotry joined #git
09:09 Xatenev I think /web/* !/web/uploads is correct - how do I tell git to reindex those folders/files?
09:09 Xatenev (Because they have been git ignored inb4)
09:11 Xatenev I thought git rm -rf --cached should work. But changes are still not tracked
09:11 Xatenev Help would be cool >)
09:14 mgedmin what happens if you git add /web/uploads ?
09:14 Xatenev Nothing
09:14 Xatenev Those are not being tracked yet
09:14 Xatenev for some reason
09:15 drbean joined #git
09:16 Qilibrun joined #git
09:16 FilipNortic__ joined #git
09:16 mgedmin if they weren't being tracked, git add would complain about you trying to add an ignored file and suggest you use --force if you really meant it
09:16 Oatmeal joined #git
09:17 mgedmin if nothing happens, the it seems that git is already tracking those files and sees no changes
09:17 mgedmin am I missing something?
09:17 SwiftMatt joined #git
09:18 Xatenev mgedmin: I guess so - git add doesn't throw a warning when youre trying ot add an ignored file
09:18 mgedmin my usual mistake is echo '.*' > .gitignore; git add .gitignore --> oops, .gitignore is being gitgnored and I must use git add --force .gitignore instead
09:19 Xatenev Oh it does. my bad
09:19 Xatenev Now thats really weird.
09:20 Xatenev No idea, I will try to find a workaround to get around gitignoring
09:20 Xatenev it obv doesnt want to work
09:21 tobiasvl what doesn't work exactly
09:21 Xatenev Im unable to add a dir thats previously been gitignored
09:21 wrouesnel1 joined #git
09:21 Xatenev While git add doesn't even complain that that dir is still ignored.
09:22 brent__ joined #git
09:22 tobiasvl Xatenev: is what you pasted above the entire .gitignore file?
09:22 Xatenev No let me paste that quick
09:22 tobiasvl yeah, do it at gist.github.com or something
09:22 tobiasvl I have an inkling what could be wrong
09:23 Xatenev tobiasvl: https://bpaste.net/show/f3ce85e618ae
09:23 Xatenev Its that /web/uploads/tx_pageteaser thing
09:23 Xatenev that doesn't wanna work
09:23 Electrometro joined #git
09:24 ferr1 joined #git
09:24 _ADN_ joined #git
09:24 Disgeae joined #git
09:25 tobiasvl Xatenev: should that be !/web/uploads/tx_pageteaser or did I completely misunderstand you
09:25 tobiasvl what is it that you DON'T want to ignore?
09:25 maroloccio joined #git
09:25 Snugglebash joined #git
09:27 jagob joined #git
09:27 Xatenev Wow my bad
09:27 Xatenev Yea thats how it should be
09:27 Xatenev I changed that when I tried around...
09:28 Xatenev It doesn't work tho. :p
09:29 tobiasvl no, just wanted to be clear what you wanted
09:29 Xatenev Yea exactly
09:29 Xatenev Thats what I want to achieve
09:29 Xatenev :P
09:31 Duikb00t joined #git
09:31 tobiasvl so you at least need to add !/web/uploads there – you need to unignore the directory so git even checks inside it
09:32 tobiasvl see also http://stackoverflow.com/questions/8024924/gitig​nore-ignore-all-files-then-recursively-allow-foo
09:34 interrobangd joined #git
09:34 dodobrain joined #git
09:34 telephone joined #git
09:34 telephone joined #git
09:35 Bilge joined #git
09:35 nephyrin joined #git
09:35 Davey joined #git
09:35 Davey joined #git
09:36 MrC joined #git
09:36 bodie_ joined #git
09:37 dmc joined #git
09:37 Algebr` joined #git
09:37 dzho joined #git
09:37 Kuukunen joined #git
09:37 icedp joined #git
09:37 icedp joined #git
09:37 rxo joined #git
09:37 nellicus joined #git
09:37 suy joined #git
09:37 Werring` joined #git
09:37 nevyn joined #git
09:37 Knirch joined #git
09:37 dilfridge joined #git
09:37 msm joined #git
09:37 hecliunyx joined #git
09:37 ulkesh_ joined #git
09:37 Saturn812 joined #git
09:37 orzo joined #git
09:37 ekneuss joined #git
09:37 tomek joined #git
09:37 linuxdaemon_ joined #git
09:37 tomek joined #git
09:37 TyrfingMjolnir joined #git
09:37 __name__ joined #git
09:37 ghoti joined #git
09:37 tanuki joined #git
09:37 ericP joined #git
09:37 nitesh joined #git
09:37 plasticboy joined #git
09:37 Hogofwar joined #git
09:37 tabakhase joined #git
09:37 Zeedox joined #git
09:37 ahammond joined #git
09:37 jesk joined #git
09:37 warthog9 joined #git
09:37 Algorith- joined #git
09:37 unbalancedparen joined #git
09:37 Corosus joined #git
09:37 rts-sander joined #git
09:37 bathtub_shark joined #git
09:37 bluepixel joined #git
09:37 Vorisi joined #git
09:37 hue joined #git
09:38 HarryHallman joined #git
09:38 jwest joined #git
09:38 simon816 joined #git
09:38 Karazhan joined #git
09:38 Xandaros joined #git
09:38 Arguggi joined #git
09:38 musca joined #git
09:38 ujjain joined #git
09:38 EgS joined #git
09:38 ujjain joined #git
09:38 Jonno_FTW joined #git
09:38 dilfridge joined #git
09:38 larrybolt joined #git
09:38 larrybolt joined #git
09:38 ngladitz joined #git
09:38 ngladitz joined #git
09:39 bond joined #git
09:39 Slush- joined #git
09:39 gkatsev joined #git
09:39 Kaisyu joined #git
09:39 jab416171 joined #git
09:39 crater2150 joined #git
09:39 Nevik joined #git
09:39 moritz_ joined #git
09:39 fearless_man joined #git
09:39 dogmatic69 joined #git
09:39 zapb_ joined #git
09:39 cxreg2 joined #git
09:39 jbondhus joined #git
09:39 realz joined #git
09:39 hfp joined #git
09:39 maqr joined #git
09:39 Esya joined #git
09:39 PaulePanter joined #git
09:39 hendry joined #git
09:39 Takumo joined #git
09:39 Takumo joined #git
09:39 Nerbrun joined #git
09:39 drizbit joined #git
09:39 boshhead joined #git
09:39 GodEater joined #git
09:39 rvsjoen joined #git
09:39 Vaelatern joined #git
09:39 bttf joined #git
09:39 GodEater joined #git
09:39 rvsjoen joined #git
09:39 Silex joined #git
09:39 brewmaster joined #git
09:39 colona joined #git
09:39 ^7heo joined #git
09:39 tonyj joined #git
09:39 monty joined #git
09:39 Hello71 joined #git
09:39 rizonz joined #git
09:39 drawkula joined #git
09:39 kenansulayman joined #git
09:39 Pursuit joined #git
09:39 tier2villain_ joined #git
09:39 kfunk joined #git
09:39 Neico joined #git
09:39 wloncom joined #git
09:39 tilpner joined #git
09:39 boubou joined #git
09:39 salparadise joined #git
09:39 ntnn joined #git
09:39 coasterz joined #git
09:39 jailbox joined #git
09:39 rideh joined #git
09:39 quite joined #git
09:39 prg318 joined #git
09:40 pitastrudl joined #git
09:40 hahuang65 joined #git
09:40 the_cybersphinx joined #git
09:40 yonatankoren joined #git
09:40 Kulrak joined #git
09:40 Kulrak joined #git
09:40 nikow joined #git
09:40 Xatenev tobiasvl: Getting back to you in a second, sorry
09:40 Xatenev tobiasvl: I will try that in 5 minutes
09:40 Xatenev Thanks for the help
09:40 anonnumberanon joined #git
09:40 sonOfRa joined #git
09:41 rscata joined #git
09:41 cbreak joined #git
09:42 ninsei joined #git
09:42 uranellus joined #git
09:42 uranellus joined #git
09:42 blacksyke joined #git
09:42 druonysus joined #git
09:42 drbean joined #git
09:43 Bengi joined #git
09:43 [diecast] joined #git
09:43 ionelmc joined #git
09:43 graingert joined #git
09:43 zuck05 joined #git
09:43 ggherdov joined #git
09:43 EmeraldExplorer joined #git
09:44 howdoi joined #git
09:44 gnarf joined #git
09:44 cjohnson joined #git
09:44 jdelStrother joined #git
09:44 Cork joined #git
09:44 mehdi___ joined #git
09:44 MLM_ joined #git
09:44 elh9 joined #git
09:45 warthog9 joined #git
09:46 truckcrash joined #git
09:46 ToeSnacks joined #git
09:46 wizonesolutions joined #git
09:46 lebster joined #git
09:46 gajus joined #git
09:46 stealthii joined #git
09:47 pranay joined #git
09:48 ihradek joined #git
09:48 elh9 joined #git
09:48 ggherdov joined #git
09:48 jknetl joined #git
09:49 drbean_ joined #git
09:50 pranay I am on Windows and get this '-d was unexpected at this time.' when trying to commit. Can anyone please help?
09:50 tobiasvl pranay: what command are you running?
09:51 pranay git commit -am "Some message here
09:51 pranay git commit -am "Some message here"
09:52 pranay git status shows 2 staged files and no untracked files
09:52 ExeciN joined #git
09:52 tobiasvl do you have any hooks?
09:52 manuelschneid3r joined #git
09:52 Xatenev tobiasvl: It worked exactly as you suggested: https://bpaste.net/show/0d43ef4502d9
09:53 Xatenev thank you man :)
09:53 drbean joined #git
09:53 tobiasvl Xatenev: great, no problem!
09:53 justanotheruser joined #git
09:53 pranay None that I wrote myself, but my project comes from a generator called ignite, which does add a hook
09:53 pranay https://github.com/infinitered/ignite
09:54 drbean- joined #git
09:54 tobiasvl pranay: not familiar with ignite, but try running: GIT_TRACE=2 git commit -am "Some message here"
09:54 tobiasvl to see where it comes from
09:55 pranay Yes, there does seem to be a hook: run-command.c:336       trace: run_command: '.git/hooks/pre-commit'
09:56 vdl joined #git
09:57 drbean_ joined #git
09:59 overlord_tm joined #git
09:59 drbean joined #git
09:59 tobiasvl pranay: this looks like it then https://github.com/infinitered/ignite/issues/487
10:00 achadwick joined #git
10:00 Kamilion joined #git
10:00 Serpent7776 joined #git
10:01 dodobrain joined #git
10:05 acetakwas joined #git
10:09 quasar_71 joined #git
10:09 SpeakerToMeat joined #git
10:10 kulelu88 joined #git
10:10 NwS joined #git
10:15 drbean_ joined #git
10:15 g_zen joined #git
10:16 howitdo joined #git
10:16 howitdo joined #git
10:18 overlord_tm joined #git
10:18 Guest29284 joined #git
10:18 ohcibi hi i have a submodule in a project which was initially added from a gist. i.e. .git/modules/modules/path/to/module/config shows a gist-url, however the url in .gitmodules for that module is a normal github repository.. how can I synchronize the settings?
10:19 a_thakur joined #git
10:19 marchelly joined #git
10:19 Gloomy joined #git
10:22 SpeakerToMeat joined #git
10:23 Sonderblade joined #git
10:23 dersand joined #git
10:24 moritz_ left #git
10:24 moritz joined #git
10:24 marchelly Hi, I'm using git to auto deploy web site using post-receive hook. When someone push changes post-receive saves metastore file perms, checkout to web directory and applying back perms. Everything works just fine, but now I want to create dev and prod folders on server and make ability to push different branches to different folders so developer can push some changes to dev using some dev branch and if everything ok just push it to prod. Is thatgood idea or
10:24 marchelly I should use some other technique? my post-receive is bash script.
10:24 cbreak ohcibi: man git-submodule
10:24 gitinfo ohcibi: the git-submodule manpage is available at http://jk.gs/git-submodule.html
10:25 cbreak there should be a sync command
10:25 tobiasvl marchelly: I dunno but you could read !deploy
10:25 gitinfo marchelly: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
10:25 mischat joined #git
10:25 moritz marchelly: I've written a book on that, https://leanpub.com/deploy
10:26 moritz marchelly: what you really want is some kind of build artifact (tarball or .deb or .jar package or so)
10:26 moritz marchelly: test that in the test environment
10:26 moritz marchelly: and if that works, install it in prod
10:26 marchelly tobiasvl, moritz thank you, that's a good starting point for me now. ;)
10:27 dimi1947 joined #git
10:27 marchelly moritz, yes, as it's a web site project and I want to use only git to deploy so it's something like: developer coding, pushing to dev changes and if everything is ok this changes whuld be applyed on prod
10:27 moritz marchelly: well, git isn't the best tool for the job
10:28 moritz marchelly: chapter 4 discusses why
10:28 stick-shift joined #git
10:29 moritz (though you also find early versions of most chapters on my blog, should you not want to buy the book)
10:29 marchelly moritz, I know it, you think it's time to configure some sort of capistrano/webistrano? I'm not sure that the project is mature enough for this...
10:29 jozwior_ joined #git
10:29 moritz marchelly: projects don't need some magical minimal maturity for proper deployment tooling
10:30 Xatenev ^
10:30 moritz I personally tend to use https://gocd.io/
10:30 Xatenev It sounds like your deployment and workflow is bound to the project, which shouldn't be the case. Instead your project should fit into your workflow and deployment strat.
10:30 cbreak I like cmake.
10:31 marchelly moritz, actually is the time and skills for configuration of deploy system are higher/bigger than actually project is, I think the answer should be no?
10:31 bremner well, skills to deploy with git are non-trivial
10:31 bremner and kindof wasted if you replace with a different deployment system
10:32 nettoweb joined #git
10:32 Darcidride joined #git
10:32 dgarstang joined #git
10:33 moritz marchelly: that's why stuff like my book exists that teach you the skills in a very compact format, with recipies that you just need to apply
10:34 marchelly bremner, right, and as I actually have such a solution done (just git with post-receive script+ metastore) I was thinking to add some lines to it to be able to divide branches to different webroot folders )
10:34 moritz marchelly: also, the question isn't really "is it more effort than the project itself", but rather "do I save more time and effort than I invent"?
10:34 moritz marchelly: and you can reuse the tooling for other projects too
10:34 marchelly moritz, actually yes.
10:34 moritz it's hard to get out of the "just one more tweak here" mindset
10:34 marchelly heh
10:35 Darcidride joined #git
10:35 Xatenev moritz: What do you mean?
10:35 moritz but people whom I've shown our GoCD web interface, and which parts are automated, and where I need to click to deploy stuff to prod... those folks were generally convinced pretty quickly
10:35 moritz we deploy ~50 different software packages with that
10:35 moritz Xatenev: with what?
10:35 Xatenev (11:34:47) moritz: it's hard to get out of the "just one more tweak here" mindset
10:35 moritz Xatenev: ah
10:36 moritz Xatenev: so, people start to deploy software with a simple git hook
10:36 moritz Xatenev: and then they find that they need a testing environment, so they do kinda the same thing there too
10:36 moritz Xatenev: and then they find that they still have to manually install new dependencies, and then they build a workaround for that too
10:36 moritz Xatenev: and then they have multple servers, and struggle to keep them in sync
10:37 moritz Xatenev: and they never step back and ask "aren't there solutions for my problems out there that I could reuse?"
10:37 Xatenev Right
10:37 moritz it's a bigger step than each individual tweak, but in the long run, very benficial
10:37 moritz afk&
10:37 marchelly moritz, you know, okay here is another example. I've been happy startups cofounder with big ambitions and when you are thinking in way "build everything right from the very beginning" and when you configuring some DB replication, HA, and so on, and then your supa-dupa startup is not using this, it's just waste of time and resources, you know
10:38 Algebr` joined #git
10:38 davimore joined #git
10:38 Xatenev moritz: I don't think thats a "mindset" issue often though. Mostly just people don't think long-term enough.
10:40 a_thakur joined #git
10:40 madduck joined #git
10:40 madduck joined #git
10:40 Xatenev And that is more than often just an issue with their own abilities and/or experience.
10:41 marchelly so the best way I see is some refactoring, so now you build hooks, and then when you see everything is really growing, you just building all the deployment from the very beginning based on new tasks and needs.
10:41 Darcidride joined #git
10:41 nd joined #git
10:41 aw1 joined #git
10:42 Xatenev marchelly: You should get away from the "growing" aspect
10:42 Xatenev There are loads of working solutions out there. If you don't do anything special somebody probably already invented something good for your needs
10:42 chll_ joined #git
10:43 lindenle joined #git
10:43 marchelly that's right
10:46 drbean joined #git
10:48 a_thakur_ joined #git
10:49 xintron joined #git
10:49 rnsanchez joined #git
10:50 xintron The 'fixup!' directive, how does it find and match the commit it should do the fixup against? Is it checking the commit message or is there some sort of hidden reference to the actual commit hash?
10:50 polyrob joined #git
10:51 wrouesnel1 joined #git
10:52 danslo xintron: afaik it just takes the parent commit
10:52 canton7 xintron, it's the commit message
10:53 canton7 xintron, if it used the commit hash, it wouldn't be safe to things being rebased
10:53 xintron danslo, Doubt that as it did a fixup before parent
10:53 danslo then I'm wrong and canton7 is right :)
10:53 canton7 hmm, actually the question is ambiguous
10:53 xintron canton7, That's what I figured. How much of the commit message. Subject only or the full message?
10:53 canton7 the "fixup!" prefix to a commit message sets up rebase -i --autosquash using the commit message
10:54 danslo --autosquash, --no-autosquash
10:54 danslo When the commit log message begins with "squash! ..." (or "fixup! ..."), and there is a commit whose title begins with the same ...,
10:54 canton7 the 'fixup' *directive* in a rebase -i's todo list uses the previous commit in the todo list
10:54 danslo "begins with"
10:54 xintron Ah, only title
10:54 canton7 commit --fixup only copies the subject line, iirc
10:54 drbean joined #git
10:55 xintron So if you need to do a fixup and change the commit title you would first need to change the title, then fixup or betwer: do the fixup and in the interactive rebase mark the oldest commit for edit
10:55 xintron canton7, Might be, didn't check with a commit with more than a subject line
10:55 canton7 xintron, so you mean, change the commit message of the commit being fixed up?
10:55 xintron Yes.
10:55 canton7 (not sure what the "commit title" there is)
10:55 canton7 use a squash instead
10:55 canton7 rebase will stop to let you edit the commit message
10:56 drbean_ joined #git
10:56 xintron Yeah. But that would then be: squash A, fixup C, pick B.
10:56 xintron I have a pending fixup, want to use that one but also change the original subject line
10:56 Xatenev left #git
10:57 canton7 no, pick A, squash C, pick B
10:57 xintron In my example, the fixup was made against A, but yeah
10:57 canton7 that's what I meant by "use squash instead [of fixup]"
10:57 canton7 huh? let's start again - I think this has gotten confused
10:57 canton7 You've got A and B. You want to create C, then combine it into A, while changing the combined commit's message
10:58 canton7 to do that, squash C into A
10:58 xintron I do commit A, followed by commit B. Now I want to add more changes to commit A. I do a git commit --fixup=A followed by autosquash rebase
10:58 drbean- joined #git
10:58 canton7 ... if you want to change the resulting commit's message, for the 3rd time, use --squash=A
10:58 xintron Or I can just do a simple squash of C into A
10:59 xintron Oh, didn't think of the --squash flag. Thanks
11:00 xintron Thanks for clarifying. Especially what part of the commit is used to match 'squash!' and 'fixup!' commits with the original commit
11:00 Guest26521 joined #git
11:01 canton7 :)
11:01 Guest26521 joined #git
11:01 emporio joined #git
11:01 emporio hey
11:02 emporio I git cloned a repo
11:02 emporio Will git track my changes immediately or do I have to do a git init first?
11:02 drbean joined #git
11:02 emporio because Git diff is not showing the differences
11:02 Balliad joined #git
11:03 canton7 no, 'git clone' creates a new repository. No need to create it again with 'git init'
11:03 canton7 !repro
11:03 gitinfo [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
11:03 mischat_ joined #git
11:04 emporio canton7: then why git diff does not show changes?
11:04 canton7 emporio, I've no idea what you're doing. Please provide a transcript, as I asked for
11:05 phanimah1sh joined #git
11:09 WORMSS joined #git
11:10 Junior joined #git
11:11 WORMSS Hello, I was getting some warnings in eclipse about No DTD in my modules .gwt.xml files. So I added one, (2.8.0) but still getting the error. I am not sure if I am doing something wrong.
11:11 WORMSS <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.0//EN" "http://gwtproject.org/doctype/2.8.0/gwt-module.dtd">
11:11 bremner WORMSS: what makes you think this is related to git?
11:12 YuGiOhJCJ joined #git
11:12 drbean_ joined #git
11:12 WORMSS oh damn, I liked a link from the gwt webpage, and it some reason opened me up here
11:12 WORMSS I guess someone wrong the link wrong.
11:12 WORMSS clicked*
11:12 nettoweb joined #git
11:12 msonntag joined #git
11:13 WORMSS My bad for not reading the channel that opened..
11:13 WORMSS left #git
11:14 jast GWT--Git... probably a typo in that link
11:14 jast the keys are almost right next to each other ;)
11:15 Macaveli joined #git
11:15 theoceaniscool joined #git
11:15 bremner on a keyboard on a torus?
11:16 drbean joined #git
11:19 ElGrandeAmigo joined #git
11:21 Raed joined #git
11:22 qt-x joined #git
11:22 brent__ joined #git
11:25 hussam joined #git
11:25 goTAN joined #git
11:25 jameser joined #git
11:27 jameser_ joined #git
11:27 p53ud0nym joined #git
11:28 a_thakur joined #git
11:29 a_thakur_ joined #git
11:29 drbean_ joined #git
11:34 mehola joined #git
11:34 drbean joined #git
11:35 p53ud0nym Will a git rebase only rebase the commits made on a specific branch? I want to revert master to a previous point and then rebase the changes in another branch. Will that merge the changes made in master?
11:35 mehola joined #git
11:36 _ikke_ p53ud0nym: rebase only affects one branch at a time
11:37 drbean_ joined #git
11:38 Algebr` joined #git
11:39 maret joined #git
11:42 hahuang65 joined #git
11:42 joki joined #git
11:44 tvw joined #git
11:45 mikecmpbll joined #git
11:47 marchelly moritz, I'm thinking about gocd. looks like it shuld cover what I need right now.
11:49 emporio joined #git
11:51 davimore_ joined #git
11:51 ertesx joined #git
11:55 _rht joined #git
11:59 phanimahesh joined #git
11:59 dsdeiz joined #git
11:59 BSaboia joined #git
12:00 JeroenT joined #git
12:01 Zamerick joined #git
12:04 csk157 joined #git
12:07 guilherme joined #git
12:09 Derperperd joined #git
12:09 nettoweb1 joined #git
12:11 mischat joined #git
12:13 Snugglebash joined #git
12:14 jameser joined #git
12:14 mika joined #git
12:14 mika joined #git
12:16 theoceaniscool joined #git
12:18 djb-irc joined #git
12:18 _ikke_ achievement, I used git rebase -pi for the first time
12:18 maret joined #git
12:20 ^7heo _ikke_: too bad there's no -42 to git merge
12:20 osse there is to git log, luckily
12:21 ^7heo osse: how so?
12:22 osse -<number>, -n <number>, --max-count=<number>
12:22 osse Limit the number of commits to output.
12:23 WayToDoor joined #git
12:24 ^7heo osse: oh right :)
12:25 osse :3
12:26 Panacea joined #git
12:26 pepperingranivor joined #git
12:28 JeroenT joined #git
12:28 qswz joined #git
12:29 qswz should I use lightweight  or annotated tags? for very simple basic release versions
12:29 grawity I'd say rule #1 is be consistent
12:30 grawity if you've been using annotated tags so far, stick to it
12:30 grawity because that's what e.g. `git describe` wants
12:30 anonymuse joined #git
12:30 ^7heo grawity: `git describe` wants annotated tags, or consistency?
12:30 grawity the former
12:31 ^7heo ah ok
12:31 grawity sure you can add --tags to include all, but then every packager needs to do that, not to mention it might include garbage temporary tags
12:31 grawity overall, I'd go with annotated because you can attach release notes and stuff (as the name says), and you should pgp-sign tags anyway
12:31 grawity I think even github highlights them more so than lightweight ones
12:32 ^7heo yeah, but then you more easily confuse them with releases
12:32 ^7heo (github releases)
12:32 ^7heo which are a totally different thing entirely
12:33 ^7heo let's not start trolling about gh tho :P
12:34 dgarstang joined #git
12:35 _ikke_ lets not start trolling at all :p
12:36 maroloccio joined #git
12:37 ^7heo _ikke_: I didn't realize you were. :)
12:38 eihabarabia joined #git
12:39 Algebr` joined #git
12:40 CheckDavid joined #git
12:42 qswz Ok thanks
12:42 hahuang65 joined #git
12:43 qswz ideally, I'd trigger some CI stuff if there's a tag or not
12:43 msonntag joined #git
12:44 jameser joined #git
12:47 maret joined #git
12:50 masuberu joined #git
12:50 p53ud0nym Hi guys, I've made some changes to the linux kernel in a seperate branch taken from Linux 4.9. Now I want to test against a different kernel version i.e. 3.9. I have done a hard reset of master to v3.9 and rebased my branch against master. However there are conflicts in files I haven't edited. Why would this be the case and how achieve what I want?
12:55 acetakwas joined #git
12:56 qswz maybe 3.9 and
12:56 qswz 4.9 diverged
12:57 ojdo joined #git
12:57 mgedmin I would be tempted to git rebase --abort
12:58 mkoskar joined #git
12:58 mgedmin and then git rebase -i to see whether git correctly picks up only my commits to rebase
12:59 mischat_ joined #git
12:59 afuentes joined #git
13:08 clmsy joined #git
13:09 Tobbi joined #git
13:10 Derperperd joined #git
13:10 clmsy joined #git
13:13 a_thakur joined #git
13:13 denisMone joined #git
13:14 re1 joined #git
13:14 zivester joined #git
13:15 harrymoreno joined #git
13:16 King_Hual joined #git
13:18 quasar_71 joined #git
13:19 quasar_71 joined #git
13:21 str joined #git
13:22 mar77i_ joined #git
13:22 sdothum joined #git
13:23 maret joined #git
13:24 mazert_ joined #git
13:32 [0xAA] joined #git
13:35 mizu_no_oto joined #git
13:38 dimi1947 joined #git
13:38 brent__ joined #git
13:38 kexmex joined #git
13:40 Algebr` joined #git
13:41 mikecmpbll joined #git
13:42 JeroenT joined #git
13:42 Bizkit joined #git
13:43 hahuang65 joined #git
13:44 stick-sh_ joined #git
13:45 tvl joined #git
13:45 lindenle joined #git
13:48 HardlySeen joined #git
13:48 netj joined #git
13:52 LionsMane joined #git
13:53 Zamyatin joined #git
13:54 Murii joined #git
13:54 mvensky joined #git
13:54 aavrug joined #git
13:54 mvensky joined #git
13:55 Macaveli joined #git
13:57 jeffreylevesque joined #git
14:02 Derperperd joined #git
14:02 mischat joined #git
14:03 noecc joined #git
14:06 GodGinrai joined #git
14:06 GodGinrai joined #git
14:06 brent__ joined #git
14:09 theoceaniscool joined #git
14:09 wendelmineiro joined #git
14:10 cust joined #git
14:10 Balliad_ joined #git
14:11 rnsanchez joined #git
14:15 ExoUNX joined #git
14:15 Bizkit_ joined #git
14:19 cdg joined #git
14:21 cdg joined #git
14:22 whallz joined #git
14:22 whallz hello
14:22 phanimahesh !hello
14:22 gitinfo [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
14:22 whallz in a git status, how can i identify which files are "modified" per permissions/umask diff instead of actual text diff ?
14:23 phanimahesh git status shows them as mode changed, if i remembercorrectly.
14:23 phanimahesh brb, experimenting
14:23 Endarked joined #git
14:24 Gloomy joined #git
14:24 whallz they appear as modified: in my git status, i'd like to know if there's a way to separate between mode changes and actual content diffs
14:25 _ikke_ what about git diff --name-status
14:25 whallz _ikke_: same thing, they appear as M
14:25 whallz git version is 2.7.4
14:26 whallz or even better
14:26 _ikke_ I don't think that has changed recently
14:26 whallz if there's a way to perform a checkout on the files that only changed mode
14:26 whallz and not content
14:27 phanimahesh if you don't need automation git diff shows files that changed mode
14:28 whallz i think i need it
14:28 whallz its a large codebase
14:28 whallz and in this working copy
14:29 whallz i have lots of modified files
14:29 mischat joined #git
14:29 _ikke_ whallz: git diff --summary?
14:29 whallz i just dont care if the mode chaged
14:29 whallz dont want to commit mode changes
14:29 osse whallz: git config core.filemode false
14:30 whallz osse: nice, just disabling that
14:30 whallz that did it, now status is only listing actual content modifications
14:30 ShekharReddy joined #git
14:30 whallz thanks guys!
14:31 cdown joined #git
14:33 phanimahesh Cool. But make sure to revert that eventually, you usually want git tracking file mode.
14:33 jimi_ joined #git
14:36 newbie1 joined #git
14:37 gruetzkopf joined #git
14:37 kpease joined #git
14:38 Derperperd joined #git
14:39 Guest49652 joined #git
14:41 Algebr` joined #git
14:42 a_thakur joined #git
14:43 tvw joined #git
14:43 ianmethyst joined #git
14:45 kpease_ joined #git
14:45 maret joined #git
14:48 Remramm joined #git
14:48 Remramm joined #git
14:48 ikelso joined #git
14:50 chosafine joined #git
14:50 chosafine joined #git
14:50 mischat joined #git
14:53 AaronMT joined #git
14:53 mischat joined #git
14:53 BigWillie joined #git
14:54 ash_workz joined #git
14:54 Starky joined #git
14:55 Darcidride joined #git
14:58 zivester joined #git
14:58 hashpuppy joined #git
15:00 Zamyatin joined #git
15:00 bia joined #git
15:01 thiago joined #git
15:01 inflames joined #git
15:03 zero85 joined #git
15:03 snowkidind joined #git
15:05 nowhere_man joined #git
15:10 whallz phanimahesh: why?
15:11 whallz running "git config core.filemode false" just affects current repository, right? or is that a global git config for all repos ?
15:11 dsdeiz joined #git
15:11 dsdeiz joined #git
15:11 whallz is this repo in particular that i dont care about file modes
15:11 whallz not all of the repos in my system
15:12 canton7 'git config' will alter the config of the current repo, yes
15:12 canton7 'git config --global' alters the global config
15:15 tinti joined #git
15:15 zero85 joined #git
15:15 bannakaffalatta joined #git
15:16 al-damiri joined #git
15:16 osse furthermore it will only alter the config of the current copy of the repo
15:17 Ryanar joined #git
15:17 whallz right
15:17 whallz understood
15:17 Ryanar joined #git
15:17 whallz thank you guys
15:18 nickabbey joined #git
15:18 Tobbi joined #git
15:19 RxMcDona1d joined #git
15:22 dgarstang joined #git
15:22 Nilesh_ joined #git
15:22 raspado joined #git
15:24 nettoweb joined #git
15:24 AlineGomes joined #git
15:25 t0by joined #git
15:25 t0by joined #git
15:26 Es0teric joined #git
15:28 Balliad joined #git
15:29 a_thakur_ joined #git
15:30 DolphinDream joined #git
15:30 DolphinDream howdy
15:30 Tobbi joined #git
15:31 DolphinDream i have a rebase -i that failes due to "fatal: cherry-pick fail" the following untraked working tree files would be overitten by merge:... but when i check the status I don't see any changes to the file in question. any ideas how to continue the rebase ?
15:31 chosafine joined #git
15:33 mikecmpbll joined #git
15:36 jason237 joined #git
15:38 Derperperd joined #git
15:39 LeBlaaanc joined #git
15:41 Algebr` joined #git
15:42 Balliad joined #git
15:42 subhojit777 joined #git
15:44 hahuang65 joined #git
15:45 Cavallari joined #git
15:46 cjohnson well generally it's git rebase --continue to continue a rebase
15:46 cjohnson if status shows nothing, your cherry pick might have failed
15:47 sbulage joined #git
15:48 treia joined #git
15:48 crayon joined #git
15:49 smaudet joined #git
15:49 smaudet Halp - git won't add my file?
15:49 smaudet git version 1.9.3
15:49 Starky joined #git
15:50 smaudet I've tried with add -f
15:51 canton7 smaudet, !repro
15:51 gitinfo smaudet: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
15:52 Celelibi joined #git
15:53 tinti joined #git
15:55 ToxicFrog joined #git
15:55 str joined #git
15:55 Domhack joined #git
15:56 thiago smaudet: and consider upgrading
15:56 smaudet thiago would be nice but that might take some time
15:56 tang^ joined #git
15:58 anonymuse joined #git
16:01 thiago smaudet: how about the transcript that canton7 asked for?
16:01 Guest6_ joined #git
16:01 smaudet thiago welp add isn't doing anything...(at least not with that file
16:01 smaudet so there's not much to paste
16:02 smaudet I found the -i option and its thoroughly confused by my file apparently
16:02 thiago if git add prints nothing, then it finished with success
16:03 chosafine joined #git
16:03 chosafine joined #git
16:03 Eryn_1983_FL joined #git
16:03 thiago run this sequence of commands and pastebin the terminal: git status; git add <path to file goes here>; echo $?; git status
16:04 mischat_ joined #git
16:04 shgysk8zer0 joined #git
16:06 peeps[lappy] joined #git
16:06 shgysk8zer0 joined #git
16:06 glnz joined #git
16:07 Derperperd joined #git
16:07 mischat_ joined #git
16:08 shinnya joined #git
16:09 bsanford joined #git
16:10 re1 joined #git
16:11 marchelly joined #git
16:11 boombatower joined #git
16:12 jimklo joined #git
16:13 tirej joined #git
16:13 smaudet http://pastebin.com/f5skpzjs
16:13 ayogi joined #git
16:15 yan joined #git
16:16 yan i have a branch that is fairly diverged from master, and master has also moved on. can anyone advise on a strategy to start converging these two again?
16:16 brent__ joined #git
16:16 Mindi joined #git
16:18 a_thakur joined #git
16:19 nedbat yan: merge them?
16:19 rewt joined #git
16:20 mikecmpbll joined #git
16:20 smaudet thiago: figured it out - I'm force adding an ignored file and status doesn't show ignored files
16:21 mischat joined #git
16:22 canton7 pretty sure it does
16:22 theoceaniscool joined #git
16:22 smaudet canton7: nah there's something funny
16:22 canton7 you haven't given us any evidence of anything funny yet, so I'm afraid there's very little we can say
16:23 brent__ joined #git
16:24 smaudet canton7: for mv ep/js/jquery-validate-1.15​.1/jquery.validate.min.js ep/js/jquery-validate-1.15.​1/jquery.validate.min.js2; git st
16:24 mischat joined #git
16:25 smaudet canton7: http://pastebin.com/UrMDYHAR
16:25 canton7 nothing funny there
16:25 crose joined #git
16:25 madewokherd joined #git
16:25 Oebele joined #git
16:26 smaudet then I run mv ep/js/jquery-validate-1.15​.1/jquery.validate.min.js2 ep/js/jquery-validate-1.15​.1/jquery.validate.min.js
16:26 smaudet "nothing to commit, working directory clean"
16:26 canton7 yep, and it's right
16:26 smaudet do I have to force commit or something?
16:26 canton7 you turned the working copy back to how it was before you first mv, therefore the working copy is identical to the previous commit
16:27 canton7 I'm not sure what you're trying to commit: you made a change, then you undid it
16:27 canton7 ergo, nothing left to commit
16:27 smaudet ok, but I run git status; git add -f ep/js/jquery-validate-1.15​.1/jquery.validate.min.js; echo $?; git status
16:27 smaudet and get nothing to commit
16:27 smaudet I've tested its only this file that's wonky
16:27 canton7 sure, because that file hasn't changed since your last commit
16:27 Rodya_ joined #git
16:28 canton7 I don't get where the confusion is coming from. You change a file. Then you undo the change. There's now no change to commit
16:28 Guest54781 joined #git
16:28 rogerjv joined #git
16:28 canton7 what change do you expect git to record?
16:28 grilled-cheese joined #git
16:29 smaudet ...hmm...I could have sworn that file was not there earlier this morning
16:29 smaudet maybe I got confuzzled.
16:29 canton7 well you mv'd it to <stuff>.js2, so it presumably existed at the point you did the mv...
16:29 smaudet git ls-files ep/js/jquery-validate-1.15​.1/jquery.validate.min.js --error-unmatch; echo $?
16:29 smaudet shows 0
16:29 smaudet so I guess that means the file was already there?
16:30 canton7 you mean the ls-files prints 0, or the exit status was 0?
16:30 smaudet exit status
16:30 grilled-cheese does anyone know how to apply a git formatted patch from mercurial containing binary files and without a common ancestor changeset id?
16:30 canton7 right, that means that that file exists in the tree
16:30 kpease joined #git
16:30 smaudet canton7: well, thanks for helping me work through my confusion
16:30 smaudet :)
16:30 smaudet I think its all good now
16:31 qswz left #git
16:31 canton7 :)
16:31 grilled-cheese I can issue a regular `patch --binary -p1 -R < my.patch`, but it doesn't support git binary diffs
16:31 * smaudet adds that ls-files command to their toolbox
16:31 _ikke_ grilled-cheese: and what about git apply?
16:32 JeroenT joined #git
16:32 grilled-cheese I've been fidgeting with git apply and git am, but not had success
16:33 kulelu88 joined #git
16:34 grilled-cheese `git apply my.patch` returns several error messages indicating that the contents don't match
16:35 VagabondAzulien joined #git
16:35 grilled-cheese if I try `cat my.patch | git am` I get a sha1 information is lacking or useless error and could not build fake ancestor
16:36 _ikke_ git am is not meant for bare patches
16:36 Guest6_ joined #git
16:36 _ikke_ Though, it might accept them
16:38 mischat_ joined #git
16:39 dminuoso So we own a product, and the development team opened an issue for missing fonts. I now obtained the fonts, how would you pass this on? Would you just include the fonts in the issue tracker in a comment? Would you just send an email to the person who opened the issue?
16:40 grilled-cheese we just underwent a major repo conversion from starteam+svn+hg+git+TFS to a single unified git repo, but I've still got forked feature repos hanging out in hg I need to bring in
16:40 _ikke_ dminuoso: this is #git
16:40 dminuoso _ikke_: Oh. Mmm.
16:40 dminuoso Well, still curious I guess! :)
16:40 _ikke_ hehe
16:41 grilled-cheese which is part of why the changeset id are all different between both sides of the diff
16:42 grilled-cheese I'm using hg with the rdiff extension to effectively generate a git-formatted squash patch
16:42 Algebr` joined #git
16:44 Wulf joined #git
16:44 Wulf Hello
16:44 Wulf I made multiple changes to a file and I would like to have them in separate commits
16:45 nowhere_man joined #git
16:45 Wulf Is there any better way than creating a backup of the file, removing some of the changes, adding/committing and restoring the backup?
16:46 grilled-cheese Wulf, if you havn't already committed them, you can stage your changes a line at a time with most GUI tools
16:46 grilled-cheese or set of lines at a time that
16:46 grilled-cheese is
16:46 Wulf and without a gui tool?
16:46 _ikke_ Wulf: git add -p
16:47 _ikke_ (git add --patch)
16:47 _ikke_ It allows you to select per hunk if you want to stage it or not
16:47 nidr0x joined #git
16:47 chosafine joined #git
16:47 lindenle joined #git
16:49 tlaxkit joined #git
16:50 Wulf _ikke_: Excellent! Thanks
16:51 grilled-cheese hmm... I can do a git apply to the text file fine now with `git apply -R -p1 --binary --rej my.patch`, but it fails on the binaries with "error: cannot reverse-apply a binary patch without the reverse hunk to 'path.to.binary.png'"
16:54 jccn joined #git
16:55 a_thakur joined #git
16:55 Lunatrius joined #git
16:57 grilled-cheese ah ha! I can perform my initial patch with the --reverse argument and now the git apply can work cleanly
16:57 grilled-cheese instead of having to reverse things later on
16:57 kpease joined #git
16:57 grilled-cheese thanks _ikke_
16:57 _ikke_ grilled-cheese: nice
16:57 _ikke_ np
17:01 tyreld joined #git
17:01 Gloomy joined #git
17:01 durham joined #git
17:04 mischat joined #git
17:05 whallz joined #git
17:05 milki_ left #git
17:05 milki joined #git
17:07 Rapture joined #git
17:07 VagabondAzulien joined #git
17:07 Rapture left #git
17:09 cyan__ joined #git
17:10 hahuang65 joined #git
17:12 [0xAA] joined #git
17:12 pitastrudl joined #git
17:13 jagob joined #git
17:15 Uiviz joined #git
17:15 Learath2 joined #git
17:16 marshzor joined #git
17:16 kpease_ joined #git
17:16 marshzor If I have a git repo cloned with --depth=1, is it possible for me to check for upstream commits? I'm doing this in a script and I'm using linux/git v1.9.1
17:17 marshzor I'm currently using "git fetch --recurse-submodules >/dev/null 2>&1 && git rev-list HEAD...origin/master --count"
17:17 marshzor but that doesn't seem to be working
17:19 Endarked joined #git
17:20 Guest54781 joined #git
17:21 aea joined #git
17:21 Electrometro joined #git
17:21 re1_ joined #git
17:23 tinti joined #git
17:23 jarshvor joined #git
17:23 aea Quick question, I'm checking out a repository w/ submodules. The .gitmodules looks to be in the correct format, but any "git submodule ..." command I run has no output. No message, no error, no code, nothing, complete lack of output. I'm using git 2.10. Anything I can do to make this work?
17:25 svm_invictvs joined #git
17:26 kulelu88 joined #git
17:27 kexmex joined #git
17:27 OnBrokenWings joined #git
17:27 Rodya_ joined #git
17:28 chosafine joined #git
17:29 Domhack joined #git
17:30 cjohnson aea: git submodule update --recursive --init
17:30 cjohnson aea: if you don't init the submodules, the update command does nothing
17:30 netj joined #git
17:31 aea Thanks, I've done that, the output of that command is blank. The output of subsequent "git submodule status" commands is blank o_O
17:31 hasc joined #git
17:31 aea Contents of .gitmodules https://hastebin.com/aboyogozot.m
17:32 aarobc joined #git
17:32 _ikke_ aea: what about git ls-tree HEAD Alamofire
17:32 cbegin joined #git
17:32 aea Output is blank
17:32 _ikke_ That explains
17:32 refried_ joined #git
17:33 _ikke_ You can also try for the others, but that means the submodules have not been added to the repository
17:34 Es0teric joined #git
17:34 aea This repo has me extremely perplexed in general, apparently all of those libraries have been independently commited directly to another location so this exercise might have been unnecessary. Never had git-submodule just give me the silent treatment before though.
17:34 jeffreylevesque_ joined #git
17:34 _ikke_ It's not saying anything because it has nothing to do
17:35 aea Was under the impression that .gitsubmodules + git submodule init / update should do something though.
17:35 aea *.gitmodules
17:35 hasc_ joined #git
17:35 _ikke_ Nope
17:35 _ikke_ the .gitmodules file is just an extra file that git uses to find the submodule url
17:36 _ikke_ but there has to be a gitmodule entry in the tree
17:36 [0xAA] joined #git
17:37 e14 joined #git
17:37 aea Right so for my clarification, every guide I've found says checking out with "--recurisve" or running "git submodule init; git submodule update;" is how you get the submodules. What step was I missing?
17:37 Celelibi Can I mark a commit as unpushable?
17:38 _ikke_ nope
17:38 JanC_ joined #git
17:38 Celelibi Is there a way to avoid pushing a commit by mistake?
17:38 Celelibi Maybe with a hook?
17:39 jarshvor Hello all, pretty much total newbie here, but I think I had a slight f*Up which I hope should be reverseable. Did a commit and didn't push. (some files are ignored by .gitignore) Reverted that commit with git-revert. Now rep is back to the state before first mentioned commit (as reflected in master @github), but files that were ignored locally have now been deleted. Can I 'go back' to the state before the
17:39 jarshvor first mentioned commit (keeping all files as they were, even those ignored by the repo?). Is this done with git-checkout HEAD?
17:39 _ikke_ Celelibi: a pre-push hook
17:39 jarshvor (silly me... I forgot to add --cached to revert, even though I had just looked it up in the manpage :S)
17:39 Darcidride joined #git
17:39 mda1 joined #git
17:39 Rodya_ joined #git
17:40 Celelibi _ikke_: why not. I could make my own condition to reject a push.
17:40 j416 jarshvor: revert does not take --cached
17:40 _ikke_ Yes, you can createa a pre-push hook to prevent a push
17:40 LionsMane joined #git
17:41 _ikke_ the nope was to if you can mark a commit as not pushible
17:42 j416 jarshvor: what you want (unless you already pushed) is 'git reset HEAD~2'
17:42 jarshvor j416:ur right... sorrry. I had looked it up in rm. then used revert, and since I hadnt pushed last commit now Im unsure I to restore things to a sane state.
17:42 Celelibi _ikke_: I know I asked two different questions, that's why I asked two.
17:42 j416 jarshvor: assuming you have two commits you did not yet push
17:42 ulkesh_ joined #git
17:42 jarshvor j416: HEAD~2 undoes last two commits then?
17:42 _ikke_ right, and I gave 2 answers :-)
17:42 j416 jarshvor: yes.
17:43 j416 jarshvor: it'll make it look like you never did those commits, however it won't modify your work tree.
17:43 Algebr` joined #git
17:43 jarshvor j416: thanks... gonna give it a try. copied my local folder in case I screw it up further.
17:43 jarshvor j416: yeah.. I think thats what I wanted.. gonna try it.
17:43 j416 jarshvor: good. Your ignored files won't magically return, though. Git doesn't track those.
17:43 kulelu88 joined #git
17:44 j416 (there's a reason it's called ignore)
17:44 crose joined #git
17:45 doener joined #git
17:45 jarshvor j416: yeah.. still wrapping my head around it all. fortunately I can maybe get them back thanks to the .gitignore references. :/
17:45 SpeakerToMeat joined #git
17:45 Guest6_ joined #git
17:46 jarshvor j416: Is there not something that will place 'placeholder' files for BIG files I just dont want to upload to my github? but maybe still want referenced in some way?
17:46 j416 jarshvor: git-lfs
17:46 overlord_tm joined #git
17:46 chardan joined #git
17:46 j416 jarshvor: but I haven't had very good experience with it. Flaky. ymmv.
17:46 j416 it's supposed to work ok with github, but if you're using anything but github, I would avoid it.
17:47 jarshvor j416: hmmm thats a shame... looks like its totally what needed
17:47 j416 (I would avoid it either way, probably)
17:47 j416 how large are the files?
17:47 jarshvor j416: will have a look at it anyway. theyre video files and some big pdf files with images occasionally.
17:48 j416 yeah but how large?
17:48 jarshvor im not a programmer. just decided id organize my Thesis with git.
17:48 j416 sure
17:48 jrahmy joined #git
17:49 jarshvor j416: cant really tell u right this instant since they were deleted, but had used a script to ignore anything above 25M
17:49 leeN joined #git
17:49 jarshvor pdfs I recall being like 100-300M each something like that
17:49 jarshvor others 50M
17:49 jarshvor some big TIFF files
17:50 j416 while git is not well-suited to handle a lot of binary data, unless there's a ton of them, it shouldn't be a big problem
17:50 BSaboia joined #git
17:50 _ikke_ right, but github has a limit
17:50 j416 ah, didn't knwo that
17:50 jarshvor j416: problem would be id fill my github space tho
17:50 jarshvor ikelso: exacly
17:50 jason237 joined #git
17:50 j416 when I wrote my thesis I just kept that stuff outside
17:50 j416 I kept only the thesis itself in the repo
17:51 j416 because I wasn't modifying that other data anyway, it was only third-party stuff
17:51 aruns joined #git
17:51 jarshvor j416: Im trying to keep references to research material inside the repo. Even if some stuff is ignored.
17:51 j416 and if it was my data, I'd have a way of re-generating it anyway
17:51 aruns Hi, I am working on a Laravel repo with three main branches.
17:51 aruns Master, staging and live.
17:51 jarshvor but yeah.. maybe I need to organize it diffrently
17:51 _ikke_ there are also other solutions (!media)
17:51 gitinfo [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs
17:51 aruns Staging is for staging, and live is our production server.
17:52 j416 jarshvor: is your references section not good enough? :)
17:52 aruns Weird naming convention for second branch, I know.
17:52 str joined #git
17:52 aruns But I am running some PhantomJS test scripts on our repo and will be committing the test folder to master so that others can access the results.
17:52 aruns I want to be able to commit the test folder to master.
17:52 jarshvor _ikke_: have a note to look that one up, but I havnt really had time to check it out
17:53 aruns But to have Git ignore the test folder when master is merged into staging.
17:53 javaJake joined #git
17:53 aruns Would I be able to accomplish this all from .gitattributes?
17:53 j416 aruns: that sounds like a strange way of working
17:53 j416 aruns: don't commit things that you won't be merging
17:54 _ikke_ aruns: Not a nice workflow with git, git does not do partial merges
17:54 Ryanar joined #git
17:55 aruns j416: But others will need to be able to access the test results from the repo, that is why.
17:55 MuffinMedic joined #git
17:55 aruns I was wondering if something in https://git-scm.com/book/en/v2/Customiz​ing-Git-Git-Attributes#Merge-Strategies would be able to help me.
17:55 SpeakerToMeat joined #git
17:57 j416 aruns: either put them in a separate branch that you will never merge, or (better) make it easy for them to run the tests and generate those results for themselves
17:59 scarcry joined #git
17:59 sea-gull joined #git
18:00 bodie_ joined #git
18:02 aeontech joined #git
18:03 dreiss joined #git
18:03 jarshvor j416: you are maybe right. Gotta sit down and reasses my current organization scheme. :/ Right now it's somewhat 'organic'
18:04 jarshvor j416: damm... im doing something wrong. Im guessing I cant undo git checkout HEAD~2 ..?
18:05 mischat joined #git
18:06 Guest26 joined #git
18:06 thiago joined #git
18:07 aeontech joined #git
18:07 cjohnson git checkout changes the working copy to reflect the commit you point to
18:07 cjohnson you can of course git checkout another commit
18:07 cjohnson but if you blew away uncommited changes with git checkout you can't really get those back
18:07 mischat_ joined #git
18:08 leftriver06 joined #git
18:09 SpeakerToMeat joined #git
18:09 jarshvor cjohnson: so can I checkout to a commit in the future that hasnt been pushed?
18:09 vdv joined #git
18:09 cjohnson you have that commit locally?
18:09 cjohnson yes
18:10 jarshvor cjohnson: it showed up in git-log before i did checkout HEAD~2
18:10 jarshvor cjohnson: where is it now?
18:11 j416 jarshvor: git checkout -
18:12 j416 jarshvor: I'm guessing you were on a branch? If so, "git checkout thatbranch" also works
18:12 j416 jarshvor: "-" means "whatever was checked out before", and is a shorthand for @{-1}
18:12 adino joined #git
18:12 j416 jarshvor: more info man gitrevisions
18:12 gitinfo jarshvor: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
18:13 lindenle joined #git
18:13 jarshvor j416: no... im not using branches. (shame on me....) guess I should be doing that?
18:13 nickabbey joined #git
18:13 j416 jarshvor: yes. Or you'll likely end up losing work at some point or other.
18:13 j416 jarshvor: why aren't you using branches?
18:14 jarshvor j416: guess I having wrapped my head around it all yet. brances are like lateral versions of a repo right?
18:14 j416 jarshvor: if you check out a commit and you have nothing (such as a branch) referencing the last commit (directly or indirectly), that will be garbage collected.
18:15 j416 jarshvor: a branch is just a pointer to a commit
18:15 j416 jarshvor: I don't know what "lateral version" means
18:15 jarshvor im maybe naively basically just doing add, commit, and push.
18:15 _ikke_ jarshvor: !gcs
18:15 gitinfo jarshvor: [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
18:16 nickabbey joined #git
18:16 matsaman joined #git
18:16 moparisthebest joined #git
18:17 moparisthebest I'm trying to sign my tags with git, and I set git config --global user.signingkey to the signing key I want to use
18:17 moparisthebest but it's using my *other* signing key, any ideas?
18:17 moparisthebest they are both subkeys of the same key, one is rsa, the other ed25519, I want to use the rsa one
18:19 aea left #git
18:20 Cavallari joined #git
18:21 e14 joined #git
18:24 j416 moparisthebest: perhaps not related, but try spelling the config key right first user.signingKey
18:25 Guest6_ joined #git
18:26 ertes joined #git
18:27 doppo joined #git
18:28 phanimahesh joined #git
18:31 rogerjv joined #git
18:33 finalbeta joined #git
18:33 moparisthebest j416: nope that didn't change anything either
18:35 leftriver55 joined #git
18:36 leftriver55 I'm inheriting a project where other developers have been bypassing Git and editing directly on a production server. I need to get the state of our production server committed to a new branch. I used rsync to copy the contents of the production repo directory to my dev machine, committed these to a new branch and am pushing this to our origin remote for future development. Are there any big Git gotchas I might be missing?
18:38 leftriver55 For example, I noticed that the .git directory I copied from the production machine is enormous compared to the .git directory that came with the cloned repo.
18:39 duderonomy joined #git
18:41 thiago leftriver55: there are many reasons why that might have happened
18:41 thiago so it's not useful information and no useful advice we can give
18:41 aw1 joined #git
18:41 Algebr`` joined #git
18:42 leftriver55 do you think it's cause for concern?
18:43 Derperpe1 joined #git
18:44 Ragnor joined #git
18:44 whallz joined #git
18:44 mischat joined #git
18:45 thiago no
18:45 thiago big .git can be benign
18:46 leftriver55 thanks thiago
18:46 jost__ joined #git
18:47 Derperperd joined #git
18:47 madewokherd joined #git
18:51 ki0 joined #git
18:54 siddart joined #git
18:55 aeontech joined #git
18:55 jcqa joined #git
18:57 Es0teric joined #git
18:57 hhee2 joined #git
18:57 ResidentBiscuit joined #git
18:58 druonysus joined #git
19:00 TomyLobo joined #git
19:01 s2013 joined #git
19:01 GT4066 joined #git
19:04 satifant joined #git
19:06 adomas joined #git
19:07 tomaw joined #git
19:08 Limes_ joined #git
19:08 danimal2 joined #git
19:10 tirej_ joined #git
19:10 jimi_ joined #git
19:10 YuGiOhJCJ joined #git
19:11 Guest54781 joined #git
19:11 dsdeiz joined #git
19:14 anthonyP joined #git
19:14 anthonyP left #git
19:17 Algebr`` joined #git
19:18 crose joined #git
19:18 Algebr`` left #git
19:19 jnewt joined #git
19:20 romerocesar joined #git
19:21 refried_ joined #git
19:21 Rodya_ joined #git
19:22 BSaboia joined #git
19:22 xaa joined #git
19:23 j416 moparisthebest: then I have no idea. I don't use pgp. Sorry.
19:24 Derperpe1 joined #git
19:25 moparisthebest thanks for trying to help j416 , I'll just hang around and see if anyone else knows anything
19:25 j416 hope you figure it out o/
19:27 adomas joined #git
19:30 [0xAA] joined #git
19:31 imachuchu joined #git
19:32 anonymuse joined #git
19:34 mda1 joined #git
19:34 zivester joined #git
19:35 BSaboia joined #git
19:40 NimeshNeema joined #git
19:41 fatalhalt joined #git
19:46 nettoweb1 joined #git
19:46 _ADN_ joined #git
19:46 jnavila joined #git
19:47 Ankhers joined #git
19:48 SwiftMatt joined #git
19:48 Rodya_ joined #git
19:50 Gsham joined #git
19:51 PaulCapestany joined #git
19:54 bsanford_ joined #git
19:56 troulouliou_dev joined #git
19:57 rkazak joined #git
19:57 [0xAA] joined #git
19:59 jnewt_ joined #git
20:01 Rodya_ joined #git
20:05 hamster joined #git
20:05 nicksloan joined #git
20:06 concerti joined #git
20:07 ninsei joined #git
20:08 Rodya_ joined #git
20:11 safe joined #git
20:12 _nwkj86 joined #git
20:12 PioneerAxon joined #git
20:12 bsanford_ joined #git
20:13 nanga joined #git
20:13 nanga joined #git
20:13 askb joined #git
20:14 jnewt__ joined #git
20:14 jetpack_joe joined #git
20:19 cagmz joined #git
20:21 nwkj86 joined #git
20:21 Atm0spher1c joined #git
20:22 hamster joined #git
20:22 manuelschneid3r joined #git
20:23 spacelord_ joined #git
20:25 philipsd6 joined #git
20:25 konrad_ joined #git
20:25 emporio joined #git
20:26 govg joined #git
20:27 Derperpe1 joined #git
20:28 treehug88 joined #git
20:28 hamster joined #git
20:28 dermoth_ joined #git
20:28 noecc left #git
20:30 mischat joined #git
20:31 _ADN_ joined #git
20:31 Anja joined #git
20:32 Derperpe1 joined #git
20:36 Joanna2 joined #git
20:37 menip joined #git
20:40 dimi1947 joined #git
20:41 boombatower_ joined #git
20:43 unvv joined #git
20:45 fiete left #git
20:47 Zjkek joined #git
20:47 Dougie187 joined #git
20:48 BSAlb joined #git
20:51 aidalgol joined #git
20:52 hahuang65 joined #git
20:53 Jackneill_ joined #git
20:56 adomas joined #git
20:58 siddart_ joined #git
20:58 tdupu joined #git
20:59 jarshvor joined #git
20:59 cdg joined #git
20:59 tdupu_ joined #git
20:59 tdupu left #git
21:01 relrod_ joined #git
21:01 relrod_ joined #git
21:02 NeverTired joined #git
21:02 Tobbi joined #git
21:03 ResidentBiscuit joined #git
21:04 Rodya_ joined #git
21:04 ToBeCloud joined #git
21:05 creppe joined #git
21:05 Garen_ joined #git
21:05 Balliad joined #git
21:06 grekkos_ joined #git
21:06 kyle_ joined #git
21:07 tinanoo1 joined #git
21:07 janx_ joined #git
21:07 AlHafoudh_ joined #git
21:08 Mir4g3 joined #git
21:08 shakalaka_ joined #git
21:08 Zarthus_ joined #git
21:08 thejoecarroll joined #git
21:08 arand joined #git
21:08 thinkpad joined #git
21:09 m1dnight1 joined #git
21:09 Afforess_ joined #git
21:09 worrelsik left #git
21:09 moop joined #git
21:10 justinmrkva joined #git
21:10 brandonw joined #git
21:10 ki0_ joined #git
21:10 bejeb joined #git
21:11 UTAN_dev joined #git
21:11 matsaman joined #git
21:13 m0viefreak joined #git
21:13 polyrob_ joined #git
21:13 polyrob_ joined #git
21:13 Bizkit joined #git
21:15 jstimm joined #git
21:15 cyan__ joined #git
21:16 oaqh joined #git
21:17 LionsMane joined #git
21:17 WayToDoor joined #git
21:19 nicksloan joined #git
21:19 Rodya_ joined #git
21:19 kpease joined #git
21:20 Darren_ joined #git
21:21 Darren_ joined #git
21:22 qpdb joined #git
21:31 Rodya_ joined #git
21:32 whallz joined #git
21:33 nettoweb joined #git
21:37 dsdeiz joined #git
21:37 dsdeiz joined #git
21:37 nicksloan joined #git
21:38 bonks joined #git
21:40 bonks Can I use git-lfs as a dropbox replacement, for syncing large files by their deltas?
21:40 emporio joined #git
21:44 matsaman in a way, I suppose
21:44 matsaman but really you're just replacing dropbox with some other hosting solution
21:44 matsaman at which point you can use lots of different things other than dropbox
21:44 Vasistha joined #git
21:48 bonks matsaman: What appeals is full control and delta changes for remote uploading efficiency
21:48 Vasistha I'm looking for documentation of the gitattributes -merge flag
21:48 nicksloan joined #git
21:49 _ikke_ Vasistha: I gather you already looked at man gitattributes?
21:49 gitinfo Vasistha: the gitattributes manpage is available at http://jk.gs/gitattributes.html
21:51 Vasistha _ikke_: yes, I want to better documentation of these flags -- if that is even what they are called -- what is available, and what they do. I can see a mention of -merge in "defining macro attributes" but no other mention of "-merge"
21:51 nicksloan left #git
21:52 travix joined #git
21:52 _ikke_ Vasistha: First read the first section to understand how attributes are specified
21:52 matsaman bonks: sounds like a match
21:52 Vasistha _ikke_: yes... I did that... so, are you telling me that "-merge" in this context is an "attribute" ?
21:52 _ikke_ There is a section called "Performing a three-way merge"
21:53 _ikke_ Vasistha: Yes, to be more specific, you unset the merge attribute
21:54 Vasistha _ikke_: ok ... that's very helpful, I'm gonna keep reading now. Thanks for the hints
21:54 _ikke_ np
21:54 _ikke_ feel free to ask more questions if anything is unclear
21:54 SpeakerToMeat joined #git
22:02 Endarked joined #git
22:02 Vasistha I am looking to implement a particular behavior with git. One developer on our team, "John", is responsible for several data files in a particular directory. If other developers (unintentionally) modify those data files, and John pulls changes from them, John's data files should not be changed -- his should be the master files. And if other developers pull from John, their changes should be overwritten by his master data files. Is there a simple way to
22:02 Vasistha do this with git?
22:03 jstein_ joined #git
22:06 Noodlewitt joined #git
22:06 void187 joined #git
22:07 kadoban Vasistha: Do a server-side hook, and maybe client-side in addition that only lets John change anything in that directory.
22:07 DolphinDream how do you get the SHA of the commit a branch points to ? (just the sha)
22:08 kadoban git rev-parse --verify or something probably
22:08 DolphinDream aha.. gotit
22:08 DolphinDream thx
22:09 Vasistha kadoban: thank you! Anywhere in particular I should look for documentation of those things?
22:09 _ikke_ man githooks
22:09 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
22:09 Gloomy joined #git
22:09 kadoban 'git help hooks' would probably be the place to start. I'd start with the server-side, that's easier.
22:09 _ikke_ look for the pre-receive hook
22:09 Vasistha thanks :)
22:10 Gsham joined #git
22:10 kadoban On the client side you probably want uhm, pre-commit hooks most likely.
22:10 kadoban Those are a bit of a pain in the ass to get right.
22:10 Gloomy joined #git
22:11 _ikke_ And totaly optional
22:11 Gloomy joined #git
22:11 emg joined #git
22:11 _ikke_ ie, someone could clone the repo, and forget to setup the pre-commit hook
22:11 Vasistha so the pre-receive hook on the "Server" side -- i.e. John's workstation - is the critical element here?
22:11 kadoban Also that, yeah.
22:11 Gloomy joined #git
22:12 bonks Hmmmm is git-lfs client side only?
22:12 kadoban The central git repo that people use is on john's workstation?
22:12 _ikke_ Vasistha: server side would be a central server where both John and the other users would push to
22:12 nickabbey joined #git
22:12 Gloomy joined #git
22:13 anuxivm joined #git
22:13 Vasistha ah ok, thanks _ikke_ - so the idea is that the server would only accept commits from John for these data files? And optionally John's workstation could also not accept commits from anyone else for the same?
22:13 matsaman kadoban: central git repo?
22:13 matsaman sounds oxymoronical
22:13 matsaman =)
22:14 kadoban matsaman: It's not. Most workflows have one in practice.
22:14 _ikke_ matsaman: by convention, not by design
22:14 Jellyg00se joined #git
22:14 kadoban But yes it does sound a bit funny
22:14 matsaman pffft, your messages state that you understand the joke and choose not to laugh =P
22:15 kadoban Pretty much, ya ;)
22:15 matsaman robots ftw
22:16 Vasistha Seems like whenever I want to do something with git... it requires this very in-depth knowledge of the internals of how git works, in order to understand any particular manpage
22:16 matsaman maybe you're doing it wrong
22:16 matsaman or maybe git is the wrong tool
22:16 matsaman or both =)
22:16 jeffreylevesque joined #git
22:17 _ikke_ Vasistha: The man pages are mainly a reference
22:17 _ikke_ not a beginners guide
22:17 vdv joined #git
22:17 Vasistha ... but beginners' guides often don't get to the real machinery or nuances of particular elements of git
22:18 SwiftMatt joined #git
22:20 vdv i mounted a webdav volume and there is a bare git repo in it, i can clone from that repo and later push to it perfectly, but..
22:21 matsaman Vasistha: people want to use git a particular way, but it was only actually designed to be used in roughly one particular way =)
22:23 creppe joined #git
22:23 BSaboia joined #git
22:24 vdv if i'm tring to clone directly on the same webdav volume i get an error:  could not lock config file /webdav/mount/point/repo/.git/config: Permission denied
22:24 Vasistha vdv: might be a file permissions issue
22:25 vdv interesting, that this doesn't work only if i'm mounted webdav volume with mount.davfs
22:25 vdv on windows it does work perfectly
22:25 Gsham joined #git
22:25 vdv Vasistha, sure, it says permission denied
22:26 vdv Vasistha, but i've tried several mount options already
22:26 vdv nothing helped
22:26 Vasistha vdv: have you tried going into the directory and using "touch" without git
22:26 vdv Vasistha, also, looks like that i have write access
22:26 vdv Vasistha, mkdir works, touch works too
22:27 vdv looks like git process has permission problems
22:27 _ikke_ note that it's probably config.lock that it tries to create
22:27 vdv _ikke_, yes, i think so
22:28 vdv as i said there's already a clone on the volume which i did from windows env. before
22:28 vdv and if i try to change and commit in that clone (under linux) it fails with permission error too
22:29 Guest54781 joined #git
22:29 Tandy cGit only shows if tags are signed? not individual commits?
22:30 vdv git add .; git commit -m "test"  ---> fatal: Unable to create '/mount/point/repo/.git/index.lock': Permission denied
22:30 tdupu joined #git
22:31 vdv although touch /mount/point/repo/.git/index.lock works
22:31 vdv issued by the same user who invoked git commit
22:32 bonks Is there a way add/commit a file whose contents have changed, but attributes havent? git isn't detecting the changes
22:32 _ikke_ vdv: Is it perhaps a specif way it tried to create those files that is not allowed / supported?
22:32 cliluw joined #git
22:32 _ikke_ bonks: git update-index --refresh
22:32 _ikke_ although, that one might run in the same issue
22:32 vdv _ikke_, it can happen that git uses some specific system call to create those files
22:33 rorro joined #git
22:33 cliluw Where are stashed changes stored? Are they stored in the user's home directory?
22:33 _ikke_ vdv: right, especially for lock files, because it wants to do that atomically (and exclusive)
22:33 _ikke_ cliluw: In the repository itself
22:33 bonks _ikke_: That didnt work
22:34 vdv _ikke_, no much search results related to mount.davfs and git
22:34 vdv _ikke_, or fuse and git
22:34 cliluw _ikke_: Ok, thanks. My coworker lied to me and said the stash was in the home directory and that I could delete my working copy. :-(
22:34 _ikke_ bonks: simple way is to touch the file
22:34 _ikke_ cliluw: That's indeed not correct
22:35 anjen joined #git
22:35 dzho joined #git
22:36 Joanna2 joined #git
22:36 cebor joined #git
22:39 dzho joined #git
22:40 Noodlewitt joined #git
22:41 dzho joined #git
22:41 endiruna joined #git
22:42 bonks Hmm, testing git lfs and it is not savings only the delta changes of large files
22:45 grilled-cheese joined #git
22:45 Guest44 joined #git
22:50 jon-mac joined #git
22:52 Serious8 joined #git
22:53 jamick joined #git
22:53 polyrob_ joined #git
22:55 Dougie187 left #git
22:57 dviola joined #git
22:57 ki0 joined #git
22:59 krillr joined #git
23:00 nettoweb joined #git
23:00 done joined #git
23:00 zivester joined #git
23:01 fmeerkoetter joined #git
23:01 jimi_ joined #git
23:02 Serious8 joined #git
23:02 jarshvor joined #git
23:02 theoceaniscool joined #git
23:03 wrkrcoop joined #git
23:03 jarshvor j416: _ikke_: Thanks for the help and tips. Think I have a better grasp on git concepts now (will still have to do some testing and let things sink in). My thesis repo seems to be back to a working state now, albeit with a bit of a mess in the reflog. Thanks again. Took me a while but panic is over.
23:03 Noodlewitt joined #git
23:03 wrkrcoop what is the command to incrementally add files? i usually use git add .
23:04 wrkrcoop but i would like to have it show me the changes before i ok the add …
23:04 hahuang65 joined #git
23:04 Joanna2 joined #git
23:04 _ikke_ wrkrcoop: git add -p
23:05 wrkrcoop _ikke_: thanks :D and its asking ‘Stage this hunk?’ if i want to add it do i just hit y? not sure exactly what a hunk is
23:06 _ikke_ correct. A hunk is the diff it's currently showing you
23:06 _ikke_ (a hunk is a part of a diff)
23:06 wrkrcoop cool! thanks a ton :)
23:06 bonks Yea... git-lfs pushes the entire file even if all I changes was the timestamp and not the contents
23:07 bonks So it doesnt do deltas or I'm enabling it?
23:07 blackjid joined #git
23:09 Noodlewitt joined #git
23:10 ojacobson I'm not aware of any git asset managers that do delta-encoding of changes to assets.
23:10 ojacobson Generally, large-file assets diff badly anyways, so there's no point.
23:11 kevwil joined #git
23:12 bonks I dont think it even tried. The remote saved every copy uploaded. Cloning copies just the specified revision, then copies every revision you request
23:12 ojacobson Yup. Every git asset manager I've used follows that pattern.
23:12 Gsham joined #git
23:13 ojacobson Honestly, so does Git itself. lfs and friends are mostly useful if some users of the base repository will be able to do without the files; if the files are _necessary_ for all use cases, they should probably just be in git
23:13 ojacobson but that's just my opinion :)
23:15 bonks Fair enough. I just discovered LFS today and was wondering if I could apply it
23:16 ojacobson The other benefit is that when you clone, separately-tracked assets only have to be cloned for the versions you check out, rather than for the entire history
23:16 ojacobson if you store them in git, then you get all versions
23:16 belak Is there a way to get all files that a certain user has changes in?
23:17 _main_ joined #git
23:17 _ikke_ belak: something with git log --all --name-only --author "User Name
23:17 _ikke_ "
23:17 Noodlewitt joined #git
23:17 belak _ikke_: that's similar, but it shows commits for files that don't exist in the master branch as well
23:18 _ikke_ then leave out --all
23:18 rivarun joined #git
23:19 LBV_User joined #git
23:19 Joanna345 joined #git
23:20 Noodlewitt joined #git
23:20 dminuoso Mmm, is it sensible to hook vim into git in a way to immediately stage changes that you make?
23:20 __main__ joined #git
23:20 LBV_User dminuoso: maybe you want to hook git into vim...
23:21 _ikke_ Doesn't sound like a good plan to me
23:21 cjohnson dminuoso: I use my stage
23:21 cjohnson I wouldn't like to lose the stage
23:21 dminuoso _ikke_: Can you elaborate as to why?
23:21 _ikke_ Yeah, me too
23:21 _ikke_ dminuoso: I see staging as a perfect time to review what I'm going to commit
23:21 cjohnson Let's say I'm working on feature A and I come across a function that needs refactored
23:21 cjohnson I want to stage that refactor separately than the rest of my commit
23:21 cjohnson so it has its own history
23:21 _ikke_ cjohnson: agree
23:21 dminuoso Fair enough
23:22 LBV_User that's not what git add -i ?
23:22 _ikke_ git add -p
23:22 _ikke_ (I never use -i)
23:22 romerocesar joined #git
23:23 LBV_User never used -p...
23:23 _ikke_ -p can also be reached through -i, but I only use the -p (--patch) part
23:23 pikajude joined #git
23:24 LBV_User ohh, it is a short hand :D good to know
23:24 lolmac_ joined #git
23:24 pbrewczynski joined #git
23:24 dmj` joined #git
23:24 travix joined #git
23:24 llamapixel joined #git
23:25 shennyg joined #git
23:25 huhlig joined #git
23:25 moop joined #git
23:25 MLM_ joined #git
23:25 milkshoes joined #git
23:25 al-damiri joined #git
23:25 graingert joined #git
23:25 graingert joined #git
23:25 evanc joined #git
23:26 yena joined #git
23:26 janx joined #git
23:26 parliament joined #git
23:26 ionelmc joined #git
23:26 Noodlewitt joined #git
23:28 tyreld joined #git
23:28 tdupu joined #git
23:30 BSaboia joined #git
23:30 SpeakerToMeat joined #git
23:31 refried_ joined #git
23:32 cyan__ joined #git
23:33 vdv _ikke_, looks like FUSE doesn't support locking
23:33 vdv _ikke_, and davfs does use fuse
23:34 vdv _ikke_, i was able to reproduce previous issue with mercurial too
23:34 vdv for mercurial lock file is journal.dirstate
23:35 done joined #git
23:36 ELLIOTTCABLE joined #git
23:37 dsdeiz joined #git
23:37 dsdeiz joined #git
23:37 mellernoia joined #git
23:38 jarshvor im trying to remove some large files from repo history, but appaerently 'git commit --amend -CHEAD' isnt doing it. Taken from: https://help.github.com/articles/remov​ing-files-from-a-repository-s-history/
23:45 govg joined #git
23:48 whallz joined #git
23:49 anonymuse joined #git
23:50 Vasistha I think I'm making progress here. From within a githooks pre-commit script, is it possible to know whether the commit is the result of a pull or a merge, or not?
23:52 dave0x6d joined #git
23:55 NeverDie How do I add a git commit message from the command line with commentary in the commit body?
23:55 ojacobson git commit -m 'message', git commit -F file-or-fifo-containing-message, or git commit -C commitish
23:59 Lea2 joined #git

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