Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-12

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

All times shown according to UTC.

Time Nick Message
00:00 nick123 joined #git
00:03 ariver joined #git
00:08 _28_ria joined #git
00:09 lb1c joined #git
00:12 carousel joined #git
00:14 star_prone joined #git
00:15 mda1 joined #git
00:16 madewokherd joined #git
00:17 futuristic joined #git
00:20 dermoth joined #git
00:21 thiago joined #git
00:22 phos1 joined #git
00:22 _28_ria joined #git
00:26 Rodya_ joined #git
00:30 tnecniv joined #git
00:35 blackwind_123 joined #git
00:40 Cabanossi joined #git
00:41 nuck joined #git
00:41 brent__ joined #git
00:43 jfelchner joined #git
00:44 drodger joined #git
00:46 duderono_ joined #git
00:48 anuxivm left #git
00:50 andrew710 joined #git
00:54 cam27 joined #git
00:58 marianina8 joined #git
01:01 nick123 joined #git
01:04 dstw joined #git
01:05 durham_ joined #git
01:06 fstd_ joined #git
01:07 ivo_ joined #git
01:16 jimi_ joined #git
01:20 pks joined #git
01:21 MattMaker joined #git
01:23 Kaisyu joined #git
01:24 telephone joined #git
01:24 telephone joined #git
01:25 TikityTik How can I search through a git history of a file for a keyword being removed?
01:25 lucido joined #git
01:27 kadoban TikityTik: Look for -S or -G or something in git log
01:27 kadoban Also note that you can restrict to a certain file, with or without the --follow options.   git log -- some_file   etc.
01:28 finalbeta joined #git
01:29 dirtyroshi joined #git
01:30 jstimm joined #git
01:31 dirtyroshi joined #git
01:31 cyberz joined #git
01:31 TikityTik kadoban: I mean in the actual code
01:32 kadoban I do as well.
01:32 kadoban What else would I even be talking about?
01:32 cqi joined #git
01:33 dodobrain joined #git
01:34 TikityTik how git able to store code of all lets say 3000 commits when searching through commit history code?
01:36 rchavik joined #git
01:36 kadoban I don't understand the question. It does essentially a linear search if that's what you're asking.
01:36 kadoban But storing it is kind of the entire point of git, if it couldn't do that, we wouldn't be here.
01:38 TikityTik I think I was just using it wrong
01:38 TikityTik because it's not giving me what I'm searching for
01:38 brent__ joined #git
01:38 TikityTik I do git log -S"grabbedby" and it doesn't give commits with that keyword in it
01:40 taoqy joined #git
01:41 TikityTik at least for the first commit
01:46 TikityTik thanks for the help
01:46 sunri5e joined #git
01:46 TikityTik but I still don't get how git is able to search through all that code through all the history
01:46 TikityTik that's just astonishing
01:48 Goplat joined #git
01:48 ToxicFrog -S seems to work for me; are you sure "grabbedby" is exactly what you want to search for? Note that it is case sensitive, so grabbedby and grabbedBy are different searches.
01:48 jameser joined #git
01:49 TikityTik i see, well i'm not sure, it works just that the first commit isn't really working
01:49 ToxicFrog How do you mean?
01:50 RandomName12345 joined #git
01:50 RandomName12345 test
01:51 RandomName12345 joined #git
01:51 TikityTik is there a way I can get a list of the additions and deletions with the git log -S?
01:53 ToxicFrog TikityTik: git log --stat will show you what files changed and how much; git log -p will show you the actual diff
01:53 gunnaro joined #git
01:54 TikityTik i really need to switch to linux, by github shell is giving me this: C:/Users/dj/AppData/Local/Temp//7ll4Ab_tanks.dot is not a Word Document.
01:54 ToxicFrog ....no it is not, why would it even be trying to open it in Word?
01:54 ToxicFrog (based on the extension it's a graphviz file)
01:56 Guest55 joined #git
02:01 _28_ria joined #git
02:02 star_prone joined #git
02:02 ertes joined #git
02:03 jason237 joined #git
02:06 dendazen joined #git
02:06 safe joined #git
02:07 diget joined #git
02:11 lagothrix joined #git
02:11 hexagoxel joined #git
02:13 theiostream joined #git
02:15 SCHAPiE joined #git
02:19 durham joined #git
02:24 Orion3k joined #git
02:25 nexemacs joined #git
02:26 ojdo joined #git
02:29 Rodya_ joined #git
02:30 Hello71 joined #git
02:31 dreiss joined #git
02:32 Lyqyd joined #git
02:34 dsdeiz joined #git
02:34 ayogi joined #git
02:35 drodger joined #git
02:37 iddt joined #git
02:37 iddt so this'll sound weird
02:37 iddt but i have a git repo where BranchA was really the main thing for a long time
02:38 iddt and the master branch was never really developed
02:38 iddt and now there's a BranchB which is very similar to BranchA but different
02:38 firebalrog joined #git
02:38 iddt and i want to make a master branch which is the common bits of BranchA/BranchB and to from then on be more normal about it
02:38 stef||grue left #git
02:38 iddt how do i create that master branch?
02:39 iddt is that even possible?
02:40 chachasmooth joined #git
02:40 drodger joined #git
02:41 oskarkv joined #git
02:42 orbyt_ joined #git
02:44 a3Dman joined #git
02:44 theiostream joined #git
02:44 aw1 joined #git
02:44 lb1c joined #git
02:45 andrew710 joined #git
02:46 jstimm joined #git
02:50 dvaske joined #git
02:51 ToBeCloud joined #git
02:52 Vortex35 joined #git
02:52 jeffreylevesque joined #git
02:55 raspado joined #git
02:56 Motoko joined #git
02:56 nevodka joined #git
02:57 orbyt_ joined #git
02:58 python903 joined #git
03:00 elsevero joined #git
03:00 dsdeiz joined #git
03:03 nick123 joined #git
03:07 aavrug joined #git
03:07 duderonomy joined #git
03:09 aavrug joined #git
03:09 SpeakerToMeat joined #git
03:10 aavrug joined #git
03:14 nacci joined #git
03:15 mostlybadfly joined #git
03:15 bkeys left #git
03:17 Spinkzeit joined #git
03:17 war_pigs joined #git
03:19 tmcmahon joined #git
03:19 UTAN_dev_ joined #git
03:19 acetakwas joined #git
03:20 darkbit joined #git
03:20 dsdeiz joined #git
03:20 dsdeiz joined #git
03:23 nexemacs joined #git
03:26 diogenese joined #git
03:29 UTAN_dev joined #git
03:29 ulfox joined #git
03:30 Rodya_ joined #git
03:31 ulfox hey
03:31 gitinfo ulfox: 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.
03:32 firebalrog joined #git
03:33 tmg joined #git
03:33 hfp_work joined #git
03:35 war_pigs joined #git
03:36 ulfox I need help with an issue I am having. I cloned a public project, then created a local branch and made some changes on it. Everything works fine, except git push master localbranch
03:36 raijin joined #git
03:37 ulfox I get an error fatal: remote error: access denied or repository not exported:
03:37 ulfox Can I fix this somehow?
03:40 Cabanossi joined #git
03:40 Andrew_K joined #git
03:41 cagomez joined #git
03:41 Bock joined #git
03:41 Bock joined #git
03:44 Bock joined #git
03:46 xall joined #git
03:47 earnestly joined #git
03:49 cqi joined #git
03:58 IndigoTiger joined #git
04:00 pks joined #git
04:00 Skuzzzy joined #git
04:01 Wayne_Shephard joined #git
04:04 bronson joined #git
04:04 marianina8 joined #git
04:04 marianina8 joined #git
04:05 Saint_Isadore joined #git
04:05 Saint_Isadore hello anyone here today
04:05 cagomez joined #git
04:07 Saint_Isadore getting an error Warning: Permanently added the RSA host key for IP address '' to the list of known hosts.
04:07 Saint_Isadore Permission denied (publickey).
04:08 mehola joined #git
04:08 mehola joined #git
04:09 svm_invictvs joined #git
04:18 netj joined #git
04:19 war_pigs joined #git
04:20 wagle joined #git
04:20 duderonomy joined #git
04:21 danimal2 joined #git
04:26 cagomez joined #git
04:29 z8z joined #git
04:31 Rodya_ joined #git
04:32 acetakwas joined #git
04:35 _ikke_ So the SSH key is not accepted
04:35 _ikke_ saidelike:
04:36 _ikke_ sorry, apparently Saint_Isadore is already gone
04:36 dvaske joined #git
04:39 nebodka joined #git
04:39 cqi joined #git
04:43 dhollinger joined #git
04:49 iBot joined #git
04:51 ayogi joined #git
04:51 xall joined #git
04:56 austin987 joined #git
05:02 bronson joined #git
05:03 iddt joined #git
05:04 nick123 joined #git
05:06 SwiftMatt joined #git
05:09 dec0n joined #git
05:10 firebalrog joined #git
05:15 cdown joined #git
05:15 kfoonamalik joined #git
05:17 Saint_Isadore joined #git
05:17 t-mart_ joined #git
05:22 xall joined #git
05:22 MineCoins joined #git
05:28 Gianormagantrous joined #git
05:31 overlord_tm joined #git
05:33 porfiriopaiz joined #git
05:38 danimal2 joined #git
05:39 govg joined #git
05:41 brent__ joined #git
05:41 bket joined #git
05:41 nexemacs joined #git
05:45 zerow joined #git
05:47 orbyt_ joined #git
05:48 cagomez joined #git
05:48 tmg joined #git
05:49 Raging_Hog joined #git
05:49 fakenerd joined #git
05:50 Mutter joined #git
05:50 qt-x joined #git
05:51 dersand joined #git
05:54 fakenerd joined #git
05:54 ThomasLocke joined #git
05:54 ThomasLocke joined #git
05:55 StuartMI joined #git
05:55 danimal2 joined #git
05:56 nick123 joined #git
05:57 Saint_Isadore joined #git
05:57 sea-gull joined #git
05:58 rokups joined #git
06:00 oghamb joined #git
06:01 zeroed joined #git
06:01 zeroed joined #git
06:01 MineCoins joined #git
06:04 Brski joined #git
06:06 star_prone joined #git
06:07 star_prone joined #git
06:09 Cabanossi joined #git
06:09 Silmarilion joined #git
06:09 cagomez joined #git
06:10 rscata joined #git
06:11 dreiss joined #git
06:13 zefferno joined #git
06:16 JeroenT joined #git
06:16 zerow_ joined #git
06:17 Tobbi joined #git
06:18 danimal2 joined #git
06:18 zeroed joined #git
06:18 orbyt_ joined #git
06:21 sbulage joined #git
06:23 dvaske joined #git
06:24 JeroenT joined #git
06:28 King_Hual joined #git
06:29 King_Hual joined #git
06:29 King_Hual joined #git
06:29 fakenerd joined #git
06:32 a_thakur joined #git
06:33 pifon joined #git
06:33 zerow joined #git
06:34 Rodya_ joined #git
06:35 jagob joined #git
06:36 JeroenT joined #git
06:39 Cabanossi joined #git
06:39 menip joined #git
06:39 finalbeta joined #git
06:44 manuelschneid3r joined #git
06:44 freimatz joined #git
06:51 drodger joined #git
06:52 rewt`` joined #git
06:52 Teny joined #git
06:54 jameser joined #git
06:54 Jackneillll joined #git
06:54 noteness_ joined #git
06:55 nick123_ joined #git
06:56 d-fence_ joined #git
06:56 bl0m1 joined #git
06:56 Peng_ joined #git
06:56 sitaram joined #git
06:56 sitaram joined #git
06:56 jamick joined #git
06:56 tijensse joined #git
06:56 rnsanchez joined #git
06:56 markovh joined #git
06:56 thallada joined #git
06:56 hide joined #git
06:57 angseus joined #git
06:57 grumbel_ joined #git
06:57 dmc joined #git
06:57 mika joined #git
06:57 mika joined #git
06:57 deltab joined #git
06:57 comps joined #git
06:57 gsingh93 joined #git
06:57 nikivi joined #git
06:57 Timvde joined #git
06:57 sunny256 joined #git
06:57 BeerSerc joined #git
06:57 Ram-Z joined #git
06:57 quite joined #git
06:57 alphor joined #git
06:57 hanthings_ joined #git
06:57 justinmrkva joined #git
06:58 kaosine joined #git
06:58 pkiller joined #git
06:58 hegge joined #git
06:58 catern joined #git
06:58 dogmatic69 joined #git
06:58 AbleBacon joined #git
06:59 Zarthus joined #git
06:59 cmalmber joined #git
06:59 chrisml joined #git
06:59 ThomasLocke joined #git
06:59 Tobbi joined #git
06:59 Davey joined #git
06:59 Davey joined #git
07:00 roger_raymond joined #git
07:00 Tee_Pee joined #git
07:00 Kobaz joined #git
07:00 rominronin joined #git
07:01 bgamari joined #git
07:01 lordjancso joined #git
07:01 bipolar joined #git
07:02 lamont joined #git
07:03 jave joined #git
07:03 archaic joined #git
07:04 nivag joined #git
07:04 danimal2 joined #git
07:05 Raging_Hog joined #git
07:07 pietv joined #git
07:08 JeroenT joined #git
07:09 finalbeta joined #git
07:10 rominronin joined #git
07:13 qvqidv joined #git
07:13 kegster joined #git
07:18 jozwior joined #git
07:19 Virox joined #git
07:20 qqx joined #git
07:20 c0ded joined #git
07:22 valkyr2e joined #git
07:23 queso joined #git
07:23 phase2 joined #git
07:24 tvw joined #git
07:24 justanotheruser joined #git
07:25 Acerific joined #git
07:28 griff joined #git
07:29 overlord_tm joined #git
07:30 star_prone joined #git
07:32 a_thakur joined #git
07:34 Sircle joined #git
07:34 Sircle Hi
07:34 Rodya_ joined #git
07:36 kadoban joined #git
07:39 elect_ joined #git
07:40 peterbecich joined #git
07:40 krs93 joined #git
07:41 Sircle If one has not committed his changes (work in progress), he cannot do PULL. A message appears that “please commit, else your changes will be overwritten”. Whats the solution/options?
07:43 ti2 Sircle: Some options: stash your changes (git stash); commit your changes (git commit; a later 'git pull' w/o '--rebase' will result in a merge); throw away your changes (git reset --hard HEAD)
07:44 Sircle hm
07:45 Sircle ti2:  Thanks! I would have to study stash and rebase.
07:45 GT4066 joined #git
07:45 oghamb joined #git
07:45 Sircle ti2: Scenario: 5 devs working on a single branch. Each doing commit, pull push all the day. At day end, each should make a merge request in master.  Issue: resource #1 had an issue and his merge request was rejected. Now also had the code of other 4 devs and they have to wait until #1 gets passed.  Blocks: All have to work on a single branch. No individual branch as it will create a lot of merging issues
07:47 aax joined #git
07:48 xaa__ joined #git
07:49 nemesit|znc joined #git
07:50 Sircle ti2: explaination: if 5 people are working on a same branch and only one wants to make a merge request to master, how can he do it (he cannot as other 4 has also commited, pushed code and at this point the merge request will have code of all others as well (which may or may not get approved))
07:51 ti2 Sircle: What about 'feature' branches; thus, every developer can push to her/his feature branch and finally someone attempts to integrate them into master as soon as the feature branches are ready for inclusion?
07:52 cyberz joined #git
07:53 Sircle ti2  thats the problem that in this case, all devs are in same branch and same feature. However, code review needs to be done on per dev basis
07:54 Sircle different branches will make other merging issues itself
07:54 Cabanossi joined #git
07:54 Silenced joined #git
07:54 afuentes joined #git
07:54 inflames joined #git
07:55 hoek joined #git
07:55 jast if everyone is working on the same branch, why do you need more than one merge request to master? it's all the same at the end, after all
07:55 finalbeta joined #git
07:56 jast you can't merge just some of the changes on a branch to master (except if you merge a subset by ancestry, but it usually doesn't work out that way in practice if multiple people keep pushing to the same branch)
07:59 schleppel joined #git
08:02 marcogmonteiro joined #git
08:03 netroxen joined #git
08:04 sbasso joined #git
08:07 armyriad joined #git
08:08 rominronin joined #git
08:09 elsevero joined #git
08:10 jozwior joined #git
08:11 elect joined #git
08:11 mikecmpbll joined #git
08:12 albel727 joined #git
08:13 RxMcDonald joined #git
08:13 Silmarilion joined #git
08:13 krs93_ joined #git
08:14 bongjovi joined #git
08:14 RxMcDonald Hello, I'm getting ".i* You are editing a file which is ignored" Which means git is not tracking it ? for the .gitignore file, where can I find this rule? git status shows the changes on the .gitignore correctly
08:15 _ikke_ git check-ignore .gitignore
08:15 RxMcDonald Found this rule in my retarded IDE git rm --cached --force .gitignore
08:15 _ikke_ .gitignore is meant to be tracked though
08:16 RxMcDonald .ignore plugin found some files that ar tracked with Git which are also listed in the .gitignore file
08:16 _ikke_ right
08:16 RxMcDonald is this the plugin fault or there is some untrack rules in my git repo?
08:17 RxMcDonald it keeps saying it's ignore dafuq
08:18 RxMcDonald git check-ignore .gitignore shows nothing
08:18 RxMcDonald .gitignore ignored, tracked with git, maybe it's an IDE only rule?
08:20 kadoban RxMcDonald: A file can both match a .gitignore rule and be tracked.
08:20 kadoban Ignore rules have no effect once a file is tracked.
08:21 djb-irc joined #git
08:22 acetakwas joined #git
08:22 xall joined #git
08:23 jameser_ joined #git
08:24 sea-gull joined #git
08:24 cqi joined #git
08:25 Cabanossi joined #git
08:27 Anja joined #git
08:27 masuberu joined #git
08:30 adamm left #git
08:31 peterR``_ joined #git
08:33 JeroenT joined #git
08:33 Milos joined #git
08:34 clmsy joined #git
08:34 peterR``_ If I do git commit --amend it brings up a text editor - how can I do it without an editor?
08:34 peterR``_ it being git :)
08:34 jameser joined #git
08:35 Rodya_ joined #git
08:36 kadoban peterR``_: Specify -m "the message" or use --no-edit I guess if you want to use the original one unchanged
08:36 notebox joined #git
08:36 peterR``_ thanks
08:36 chll_ joined #git
08:37 sbasso joined #git
08:38 notebox joined #git
08:38 jast there's also -C <commit> to re-use the commit message and author info from another commit, e.g. -C @ to use the one from HEAD
08:38 yoyo_ joined #git
08:39 ZyX-I joined #git
08:39 sbasso joined #git
08:42 eightg joined #git
08:44 drupol joined #git
08:44 drupol µh!
08:44 drupol hi all,
08:44 drupol I've got a quick question regarding Git and rebased repository.
08:45 drupol When I do a rebased in a branch, what commands my colleagues needs to run to be up to date? git fetch; git branch old origin/old ? or git fetch; git reset origin/branch --hard ?
08:46 yxadyx joined #git
08:46 drupol I guess they are the same, I just wanted to have a confirmation.
08:48 RxMcDonald How do you add current master changes to a different branch that already exists?
08:48 RxMcDonald without commiting to master
08:50 drupol RxMcDonald: git checkout branch; git rebase --onto master ?
08:50 drupol Oh but that would put the commit of your branch on the top. Maybe it's not the best option.
08:51 JeroenT joined #git
08:53 Milos joined #git
08:53 Ice_Strike joined #git
08:54 Cabanossi joined #git
08:55 krs93__ joined #git
08:55 sbasso joined #git
08:56 RxMcDonald drupol: i think i'll just delete the branch and git checkout -b
08:57 coasterz joined #git
08:57 drupol This is also a solution but you would lose local changes in that branch then.
08:57 drupol If you do a git fetch; git checkout branch; git rebase --onto master
08:57 drupol That would keep those changes.
08:58 jast are you sure you want to be using --onto in that?
08:59 dodobrain joined #git
08:59 jast drupol: regarding your question, that second option rather looks like your colleagues would destroy all of their own changes on the branch
08:59 drupol Indeed, sorry, the --onto is not needed I think.
08:59 drupol jast: what is the best option then ?
09:00 jast well, most of the time, if you do a rebase on the branch, have others do a rebase, too (against the new upstream version of the branch)
09:00 jast I suppose it's not impossible for that to become a little nasty but it should usually work out
09:01 dhollin3 joined #git
09:01 jast and generally if you can help it, don't rebase branches people already have a copy of :)
09:01 drupol jast: so: git fetch; git checkout branch; git rebase origin branch ?
09:01 jast yes, or git pull --rebase while on that branch
09:02 jast (actually it's "git rebase origin/branch", not "git rebase origin branch")
09:03 drupol sorry
09:03 drupol Okay, thanks for the heads up :-)
09:09 gunnaro joined #git
09:09 tango_ joined #git
09:10 nicoulaj joined #git
09:10 elsevero joined #git
09:11 telephone joined #git
09:11 telephone joined #git
09:11 nicoulaj joined #git
09:11 marcogmonteiro joined #git
09:13 usm4n joined #git
09:15 robattila256 joined #git
09:16 stef||grue joined #git
09:16 moei joined #git
09:16 reactormonk[m] joined #git
09:20 phase2 joined #git
09:21 Darcidride joined #git
09:22 xall joined #git
09:24 phase2 joined #git
09:24 tkore joined #git
09:24 tkore joined #git
09:26 phase2 joined #git
09:26 Murii joined #git
09:26 OOPMan joined #git
09:27 flaviodesousa joined #git
09:28 phase2 joined #git
09:29 Murii joined #git
09:30 Andrew_K|2 joined #git
09:32 User458764 joined #git
09:33 cqi joined #git
09:35 cqi joined #git
09:36 aviraldg joined #git
09:36 Elliott[m]1 joined #git
09:36 elwan7[m] joined #git
09:36 spinningarrow[m] joined #git
09:36 monomon[m] joined #git
09:36 am2on joined #git
09:36 KevinMGranger joined #git
09:36 heftig joined #git
09:36 flo[m] joined #git
09:36 saintaquinas[m] joined #git
09:36 Remramm joined #git
09:36 dikiaap joined #git
09:36 jascot[m] joined #git
09:36 anolir joined #git
09:36 musicmatze[m] joined #git
09:36 timlyo[m] joined #git
09:36 M-meznak joined #git
09:36 swalladge[m] joined #git
09:36 unclechu joined #git
09:36 dyce[m] joined #git
09:36 hiq[m] joined #git
09:36 logos[m] joined #git
09:36 patrickr[m] joined #git
09:36 Retropikzel[m] joined #git
09:36 UncleCJ joined #git
09:36 SpEcHiDe joined #git
09:36 oleksiyp joined #git
09:36 Rodya_ joined #git
09:36 Mysterious_Ligh1 joined #git
09:36 kexmex joined #git
09:38 ferr1 joined #git
09:39 roelmonnens joined #git
09:39 kegster joined #git
09:42 usm4n joined #git
09:42 brent__ joined #git
09:42 holodoc joined #git
09:43 _netroxen_ joined #git
09:43 Raging_Hog joined #git
09:45 theoceaniscool joined #git
09:46 elsevero joined #git
09:48 Introoter joined #git
09:50 bcc joined #git
09:50 bcc joined #git
09:51 tvw joined #git
09:52 achadwick joined #git
09:52 darkbit joined #git
09:55 acetakwas joined #git
09:56 usm4n joined #git
10:00 masuberu joined #git
10:01 freddy_ joined #git
10:04 imrg joined #git
10:06 Neomex joined #git
10:06 Neomex left #git
10:07 Neomex joined #git
10:07 Neomex what is git?
10:07 Neomex baby dont merge me
10:07 Neomex dont merge me
10:07 Neomex no more
10:10 finalbeta joined #git
10:11 Andrew_K|2 left #git
10:13 jost joined #git
10:13 _rgn joined #git
10:15 Anja_ joined #git
10:20 rts-sander is there a shorter way for --hard when reseting
10:21 bronson joined #git
10:22 rudi_s rts-sander: No, use an alias. But I like that you have to write that out fully to make mistakes harder. Personally I have very short aliases (like g lp for git log --patch) but not for dangerous operations.
10:27 howdoi joined #git
10:29 mehola joined #git
10:33 dendazen joined #git
10:34 frobnic joined #git
10:36 aspiers joined #git
10:37 Rodya_ joined #git
10:38 xall joined #git
10:44 Junior joined #git
10:47 Aeterne joined #git
10:48 digidog joined #git
10:48 Neomex_ joined #git
10:51 kegster joined #git
10:51 gnixev joined #git
10:55 rorro joined #git
10:57 marianina8 joined #git
10:57 navidr joined #git
10:58 argol joined #git
10:58 aspiers joined #git
10:58 JeroenT_ joined #git
10:59 aw1 joined #git
10:59 zeroed joined #git
10:59 zeroed joined #git
10:59 seni joined #git
11:01 cagomez joined #git
11:02 netj joined #git
11:04 mda1 joined #git
11:05 masuberu joined #git
11:05 roelmonn_ joined #git
11:07 d4rkl0rd joined #git
11:10 finalbeta1 joined #git
11:10 thinkpad joined #git
11:12 rorro joined #git
11:12 plexigras joined #git
11:13 plexigras how can i configure my repo so i always use word diff?
11:14 karols146 joined #git
11:14 plexigras when i add changes i want to use word diff
11:15 freddy___ joined #git
11:16 Tobbi joined #git
11:19 King_Hual joined #git
11:21 thinkpad joined #git
11:23 dsdeiz joined #git
11:24 Taikibansei joined #git
11:24 leaftor joined #git
11:24 marcogmonteiro joined #git
11:24 kexmex joined #git
11:26 thinkpad joined #git
11:26 eightg joined #git
11:28 askb joined #git
11:29 YuGiOhJCJ joined #git
11:31 finalbeta joined #git
11:31 phase2 joined #git
11:32 hoek_ left #git
11:32 hoek joined #git
11:32 SpeakerToMeat joined #git
11:32 cagomez joined #git
11:33 clickjack joined #git
11:34 MineCoins joined #git
11:37 Rodya_ joined #git
11:40 sbasso joined #git
11:41 DolpheenDream joined #git
11:43 JeroenT joined #git
11:44 anuxivm joined #git
11:44 Tarexan joined #git
11:45 Tarexan left #git
11:47 roelmonnens joined #git
11:49 Tarexan joined #git
11:50 Tarexan left #git
11:50 ZT joined #git
11:52 Tarexan joined #git
11:52 Tarexan left #git
11:52 iju joined #git
11:55 User458764 joined #git
11:57 Tarexan joined #git
11:57 Tarexan left #git
11:58 stef||grue left #git
11:58 iju hi, is that possible to filter branch and repointing the branches where they were before the new commit?
11:58 rafalcpp joined #git
11:59 treehug88 joined #git
12:01 treehug88 joined #git
12:01 boombatower joined #git
12:02 chardan joined #git
12:02 telephone joined #git
12:02 telephone joined #git
12:03 bgerber joined #git
12:03 seni joined #git
12:04 synthroid joined #git
12:06 thinkpad joined #git
12:10 Eryn_1983_FL joined #git
12:11 JeroenT joined #git
12:12 theiostream joined #git
12:14 finalbeta joined #git
12:17 ronator joined #git
12:17 dendazen joined #git
12:18 shinnya joined #git
12:19 bgerber joined #git
12:19 cagomez joined #git
12:25 theiostream joined #git
12:25 dsdeiz joined #git
12:25 dsdeiz joined #git
12:26 sbasso joined #git
12:26 thinkpad joined #git
12:26 sarri joined #git
12:26 sarri joined #git
12:27 rorro joined #git
12:27 Rodya_ joined #git
12:29 Mysterious_Light joined #git
12:31 mehola joined #git
12:33 gugah joined #git
12:35 cagomez joined #git
12:37 peacememories joined #git
12:40 Muzer joined #git
12:42 brent__ joined #git
12:42 Puffball joined #git
12:42 zt joined #git
12:43 bsanford joined #git
12:43 graff joined #git
12:45 JeroenT joined #git
12:45 leeN joined #git
12:47 pythdasch joined #git
12:48 pythdasch Hey
12:48 gitinfo pythdasch: 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.
12:49 pythdasch Does the git cherry-pick commit delete the commit from the branch I took it, or have I to delete it my self ?
12:49 freddy_ joined #git
12:49 hoek pythdasch:
12:50 hoek pythdasch: cherry-pick won't delete it, no
12:50 pythdasch ok, so can I delete the commit ?
12:50 pythdasch or I've to commit --amend and remove all of the files manually ?
12:50 pythdasch thanks (Hoek to have answered)
12:51 hoek have you pushed that commit somewhere already?
12:51 _ikke_ pythdasch: No, amending is not useful to 'delete' a commit
12:52 mika joined #git
12:52 pythdasch ha ok ...
12:52 pythdasch because I wrongly committed in this branch and I want to have this branch clean
12:53 _ikke_ pythdasch: You have to 'move' the branch pointer. git reset --keep can do that for example
12:53 _ikke_ pythdasch: is it the last commit on the branch?
12:53 mika joined #git
12:53 mika joined #git
12:53 pythdasch Yes _ikke_
12:53 _ikke_ git reset --keep HEAD~ (mind !rewrite)
12:53 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
12:54 mika joined #git
12:54 cccharles joined #git
12:54 cccharles left #git
12:55 pythdasch ok thanks _ikke_ I'll try this
12:55 pythdasch so I just do this commands and it's good ?
12:55 _ikke_ (you need to do that while on the branch)
12:55 pythdasch (of course) :) thanks
12:56 pythdasch It worked !
12:56 pythdasch but I don't understand why a --keep will delete my commit
12:57 _ikke_ pythdasch: --keep does not refer to whether or not to keep a commit
12:57 _ikke_ pythdasch: Normally people would advise to use --hard, but that option will also remove local changes
12:58 _ikke_ (uncomitted changes)
12:58 _ikke_ which might not be the intetnion
12:58 _ikke_ intention
12:58 Puffball joined #git
12:58 dreiss joined #git
13:00 jeffreylevesque joined #git
13:00 pythdasch ha ok _ikke_ --keep refers to the local changes
13:01 _ikke_ yes
13:01 pythdasch that's good to know
13:01 pythdasch ok got it :) thanks :)
13:01 pythdasch Last question
13:02 pythdasch as I pushed to my remote, should I push force ? He's saying me that the tip is behind
13:03 borkr joined #git
13:04 pythdasch I'll push force then
13:05 sbasso joined #git
13:07 _ikke_ right (--force-with-lease is recommended over just -f / --force)
13:07 clickjack joined #git
13:09 Tarexan joined #git
13:09 ij Is cherry-pick expressable in rebase terms or vice versa? Are they internally defined so?
13:09 Tarexan left #git
13:10 grawity I think it's more like the opposite – rebase is practically automated cherry-picking
13:11 PaulCapestany joined #git
13:14 bgerber joined #git
13:15 theiostream joined #git
13:15 kpease joined #git
13:16 freddy_ joined #git
13:17 blackbms joined #git
13:17 fredd____ joined #git
13:19 drodger joined #git
13:19 d4rkl0rd joined #git
13:19 fred_____ joined #git
13:20 ExoUNX joined #git
13:21 JeroenT joined #git
13:21 fakenerd joined #git
13:22 kpease joined #git
13:24 acetakwas joined #git
13:27 snowkidind joined #git
13:28 rosiu joined #git
13:30 earnestly joined #git
13:30 Wayne_Shephard joined #git
13:31 lewix joined #git
13:34 kpease joined #git
13:35 bsanford joined #git
13:36 netroxen joined #git
13:36 weakdan joined #git
13:37 bgamari joined #git
13:38 Tarexan joined #git
13:38 Tarexan left #git
13:38 achadwick joined #git
13:40 guampa joined #git
13:40 Cabanossi joined #git
13:40 dAnjou left #git
13:42 Starky joined #git
13:42 oleo joined #git
13:42 i7c You can mimic cherry-pick behaviour with rebase.
13:43 _ikke_ I think rather the other way around
13:43 i7c Well, except for the point of view.
13:43 _ikke_ it's hard to cherry-pick a single commit from one branch to another with rebase
13:43 spm_draget left #git
13:44 i7c You must have HEAD point to that commit, yeah
13:44 seni joined #git
13:44 i7c so it’s not very convinient
13:44 i7c convenient*
13:45 i7c But then rebase HEAD~ --onto=other/branch should do practically the same.
13:46 _ikke_ Then you still have to update other/branch
13:46 vmiklos joined #git
13:47 Endarked joined #git
13:47 i7c right
13:47 i7c Okay, probably more the other way round then :p
13:47 Es0teric joined #git
13:50 Dougie187 joined #git
13:52 Brando753-o_O_o joined #git
13:52 PasiFist joined #git
13:52 Wayne_Shephard joined #git
13:54 mehola joined #git
13:55 finalbeta joined #git
13:56 publio joined #git
13:57 Tarexan joined #git
13:57 Tarexan left #git
13:58 cyberz joined #git
13:58 war_pigs joined #git
13:59 eightg joined #git
14:00 cyberz joined #git
14:00 PioneerAxon joined #git
14:01 AaronMT joined #git
14:01 capuk joined #git
14:01 peacememories joined #git
14:03 capuk joined #git
14:04 CussBot joined #git
14:04 zivester joined #git
14:06 CussBot joined #git
14:06 war_pigs joined #git
14:09 tinanoo joined #git
14:10 jameser joined #git
14:11 finalbeta joined #git
14:11 User458764 joined #git
14:12 saboun joined #git
14:12 ResidentBiscuit joined #git
14:13 TheSimonator joined #git
14:14 orbyt_ joined #git
14:16 bronson joined #git
14:18 Murii joined #git
14:18 Es0teric joined #git
14:18 pbandark joined #git
14:19 drodger joined #git
14:19 war_pigs joined #git
14:19 pbandark I am trying to undo the commit. so i am trying with " git reset  --soft HEAD~". but it fails with an error:
14:19 pbandark fatal: ambiguous argument 'HEAD~': unknown revision or path not in the working tree.
14:19 pbandark Use '--' to separate paths from revisions, like this:
14:19 pbandark 'git <command> [<revision>...] -- [<file>...]'
14:20 PioneerAxon joined #git
14:21 ij left #git
14:21 PioneerAxon joined #git
14:22 NeverDie joined #git
14:22 Vampire0 pbandark, is this the first commit in the repository?
14:22 pbandark yes
14:22 notebox joined #git
14:23 ketas joined #git
14:23 Vampire0 thats the problem then, just use `commit --amend` to modify the commit
14:24 _ikke_ pbandark: The first commit in the repository has no parents, so HEAD~ cannot be resolved
14:25 pbandark checking
14:25 Nilesh_ joined #git
14:26 vamiry joined #git
14:27 dsdeiz joined #git
14:27 dsdeiz joined #git
14:29 vamiry_ joined #git
14:30 Puffball joined #git
14:30 PioneerAxon_ joined #git
14:30 Tarexan joined #git
14:31 Tarexan left #git
14:31 tsdev joined #git
14:32 rubyonrailed joined #git
14:32 sbasso joined #git
14:32 lavalamp joined #git
14:33 Tarexan joined #git
14:34 Tarexan left #git
14:35 saboun joined #git
14:35 blackbms1 joined #git
14:35 cyberz joined #git
14:35 buzzLightBeer joined #git
14:35 todd_dsm joined #git
14:36 leeN joined #git
14:38 sbasso joined #git
14:39 astrofog joined #git
14:39 peacememories joined #git
14:40 safe joined #git
14:40 AbleBacon joined #git
14:43 scoobertron joined #git
14:43 crose joined #git
14:44 TikityTik joined #git
14:45 jonno112 joined #git
14:46 Puffball joined #git
14:47 jonno112 Hey guys. I've got my master branch which I'd like to revert it's state back to a specific commit. I'm running `git revert <desired state hash>..HEAD` but if complains there's no -m option. When I supply `-m 1`, it complains that one of the commits is not a merge. How can I reset master back to a specific commit?
14:48 darkbit joined #git
14:48 nd joined #git
14:49 jonno112 (I would just use `git reset --hard ...` but master is published and protected)
14:50 darkbit joined #git
14:50 lewix joined #git
14:51 strull joined #git
14:51 Taikibansei joined #git
14:51 oleksiyp joined #git
14:52 andrew710 joined #git
14:53 re1 joined #git
14:53 cyberz joined #git
14:54 Tarexan joined #git
14:55 pythdasch jonno112, maybe this
14:55 pythdasch http://stackoverflow.com/questions/1463340/revert-multiple-git-commits
14:55 ToxicFrog jonno112: "git revert" is most useful for "there is a specific commit I want to revert, without throwing away other commits before or after it"
14:55 ToxicFrog jonno112: if you want to revert back to the *exact state* it had at some earlier commit, just:
14:55 ToxicFrog git checkout <earlier commit> -- .
14:55 ToxicFrog git commit -m "Reverted back to ... because ..."
14:55 jonno112 pythdasch: I had a read through that - but I'm still hitting the issue of reverting multiple mixed merge commits and normal commits
14:55 mehola joined #git
14:56 pythdasch ha y true
14:56 jonno112 ToxicFrog That's a good idea
14:56 ToxicFrog (double-check the state of things before the "git commit", you might need to do some "git rm"s or similar as well if files got added/removed)
14:56 ToxicFrog (but the basic idea is sound)
14:56 notebox joined #git
14:57 LeBlaaanc joined #git
14:57 jonno112 ToxicFrog Will there be an easy way of listing the files leftover?
14:57 jonno112 Or is it up to me to just ID
14:57 thebope joined #git
14:58 marianina8 joined #git
15:00 qqx jonno112: `git diff --cached <earlier commit>` should show nothing if it works properly.
15:02 jonno112 qqx: Perfect!
15:02 jonno112 Thanks so much guys
15:02 netroxen joined #git
15:03 pbandark thanks _ikke_ Vampire0
15:03 durham joined #git
15:04 cyberz joined #git
15:04 GT4066 joined #git
15:05 LionsMane joined #git
15:05 skre4 joined #git
15:05 notebox joined #git
15:06 Tobbi joined #git
15:06 roelmonn_ joined #git
15:06 ugenis joined #git
15:07 skre4 guys how can I push my local changes to the master branch?
15:07 marianina8 joined #git
15:07 skre4 when I push them with git push origin master it doesn't record the changes only the new files that I added.
15:09 jonno112 pythdasch + qqx: ahh how can I then re-apply the changes from my feature branch which was merged initially then reverted?
15:09 Vampire0 skre4, the command you stated pushes your local master branch. If you want to push your local branch foo to the remote master branch, do "foo:master" or configure "origin/master" as upstream branch for "foo" and then just do "git push" with "foo" checked out
15:10 pythdasch if the commits are still in the history you can either create a new branch and add them with git cherry-pick I guess
15:10 pythdasch but Vampire0 might be more pro than me :D
15:11 skirk joined #git
15:11 Oatmeal joined #git
15:11 diogenese joined #git
15:12 durham joined #git
15:12 cagomez joined #git
15:13 saboun joined #git
15:14 jonno112 I'll simplify it a bit - new_feature was merged into master with a bad conflict resolution. I want to undo and remove all the commits that were added by that merge, then re-merge `new_feature` into master.
15:15 jonno112 when I checked out my previous tag, committed the differences, then tried to merge `new_feature` into `master` it said it was up to date
15:15 thinkpad joined #git
15:16 skre4 Vampire0 ok thanks, but how do I know which branch is local or how can i create it :D
15:16 elsevero joined #git
15:18 pythdasch jonno112, when I had that I just had to revert the new_features merge
15:18 sarri joined #git
15:18 sarri joined #git
15:18 pythdasch going to new_features branch changing what was wrong and redo a PR to master
15:19 vmiklos joined #git
15:19 pythdasch basically revert the merge will undo all the changes
15:20 thinkpad joined #git
15:21 overlord_tm joined #git
15:22 eightg joined #git
15:22 f0rks joined #git
15:24 dave0x6d joined #git
15:24 theoceaniscool joined #git
15:24 vadi joined #git
15:25 vadi Is there an tool that can add my name to copyright comments intelligently - deduces which files I've contributed to and over what years from Git history?
15:25 BackEndCoder joined #git
15:30 fahadash joined #git
15:31 cdg joined #git
15:33 NeverDie joined #git
15:33 TbobbyZ joined #git
15:33 shgysk8zer0 joined #git
15:34 iateadonut joined #git
15:35 mrogne joined #git
15:35 gxrobbs joined #git
15:36 tyrese joined #git
15:36 tyrese hi git
15:36 tyrese how can I say "git, please delete the last commit because I messed up. But keep the local files the same, because I want to do the same commit with 1 change"
15:37 iateadonut gxrobbs, go to the directory your bitbucket repo is in.
15:37 gxrobbs Im trying to do a git pull request in command line, without having to go into my bitbucket at all
15:37 grawity tyrese: reset HEAD^
15:37 iateadonut and do this:  git remote -v  and tell me the output.  (just tell me the name of the remote that you pulled from originally
15:37 grawity tyrese: or just add the change and commit --amend instead
15:37 brent__ joined #git
15:37 tyrese it wont make a new commit if I do ammend?
15:38 brent__ joined #git
15:39 marksalot joined #git
15:40 gxrobbs i found  git request-pull  but when i tried my branch name it didnt do anything, it spat out usage: git request-pull [options] start url [end]
15:40 gxrobbs -p                    show patch text as well
15:40 whitby tyrese: it will
15:40 grawity `git request-pull` does not use bitbucket
15:40 grawity it's there for the email kind of pull requests
15:40 tyrese now it says it has to merge?
15:40 whitby tyrese: commit --amend creates a new commit
15:40 gxrobbs gotcha, so grawity im trying to do a pull request to my branch so that its ready to go into the testing branch, how would i do that in command line?
15:41 whitby tyrese: trying to push? Did you run git pull?
15:41 grawity gxrobbs: install git-spindle for Bitbucket operations
15:41 ojacobson gxrobbs: using a bitbucket-specific client
15:41 tyrese yeah i messed up
15:41 tyrese lol
15:41 gxrobbs so i cant do a pull request without something like source tree or going on the website?
15:41 ojacobson "pull requests" are not a git concept, as such, they're a workflow concept. git request-pull is for email-based workflows; third-party sites like bitbucket and github provide their own tools
15:41 whitby You shouldn't need to pull, you can force push (tyrese)
15:41 grawity gxrobbs: nope, it's a feature very specific to whatever website you're using
15:41 ojacobson I use hub (for github); spindle is similar
15:41 gxrobbs gotcha, thanks
15:42 grawity tyrese: keep in mind !rewrite
15:42 gitinfo tyrese: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
15:42 mrogne left #git
15:42 whitby Good to see that it recommend --f-w-l :)
15:42 whitby recommends*
15:42 tyrese project is over
15:43 tyrese just adding an APK but our other group mate didnt use git
15:43 tyrese so I want to put his name on the his edits so he gets credit
15:43 tyrese but .gitignore didnt include the apk
15:43 tyrese so I want to rewrite it
15:44 tyrese reset HEAD^ keeps edit files the same right?
15:44 whitby Yes
15:44 grawity while amending *technically* creates a new commit, that's unimportant in practice
15:44 andrew711 joined #git
15:44 grawity you can think of it as "editing" the latest commit
15:44 morenoh149 joined #git
15:44 morenoh149 is there a way to abort a git pull?
15:45 grawity Ctrl+C
15:45 grawity or, if you got merge conflicts, `git merge --abort`
15:45 ojacobson or, if you're mid-merge, `git merge --abort'
15:45 morenoh149 I force pushed to a branch and I don't care about my local version of it
15:45 kpease joined #git
15:45 whitby grawity: It's important enough to warrant a rewrite warning though :)
15:45 sbasso joined #git
15:45 morenoh149 git merge --abort did it. I'm surprised git status didn't explain to do that. most other git statuses do
15:46 nickel_dime_look joined #git
15:46 durham joined #git
15:47 cha18 joined #git
15:47 tnecniv joined #git
15:48 dreiss joined #git
15:51 madewokherd joined #git
15:52 skre4 Vampire0, thanks for the info before was helpful
15:52 aw1 joined #git
15:53 theiostream joined #git
15:53 Vampire0 skre4, if you ask like that, your branch is probably "master" actually, so your command **will** push all committed changes. If changes are missing, you didn't include them in your commit. To find out the current branch, just do `git branch` and look for the asterisk or `git status` and read the first line
15:53 tyrese got it to work
15:53 Vampire0 skre4, well, that answer was to your next-to-last line
15:53 tyrese thanks guys
15:54 gitinfo tyrese: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
15:54 tyrese ok thank you whitby and grawity
15:54 tyrese lol
15:55 jagob joined #git
15:55 vdl joined #git
15:56 Motoko joined #git
15:56 mehola joined #git
15:56 pandeiro joined #git
15:56 whitby Whoa, I didn't know it was a competition! News to me :)
15:57 thiago joined #git
15:57 whitby .topkarma
15:57 gitinfo top karmic beings of past 30 days ('all' arg to see totals): o‍sse: 3,  v‍ampire0: 3,  _‍ikke_: 2,  j‍ast: 2,  g‍rawity: 2
15:57 Acerific joined #git
15:57 synthroid joined #git
15:57 jast it's not _really_ a competition :)
15:58 jstimm joined #git
15:58 synthroi_ joined #git
16:01 finalbeta joined #git
16:01 tyrese joined #git
16:01 tyrese hey again
16:01 tyrese is it possible to edit the readme.md without making a commit?
16:02 whitby Nope, every change needs to be in some commit
16:02 tyrese ok
16:02 tyrese thank you
16:02 whitby np
16:02 finalbeta joined #git
16:03 Fallen0223 joined #git
16:04 nowhere_man joined #git
16:05 telephone joined #git
16:05 telephone joined #git
16:05 Gustavo6046 joined #git
16:06 jesst joined #git
16:07 blackbms joined #git
16:08 shgysk8zer0 joined #git
16:08 monq joined #git
16:09 war_pigs joined #git
16:10 wrouesnel1 joined #git
16:10 finalbeta joined #git
16:10 pietv joined #git
16:12 nexemacs joined #git
16:13 aw1 joined #git
16:16 justin2 joined #git
16:16 nitric joined #git
16:17 durham joined #git
16:18 jameser_ joined #git
16:19 graff left #git
16:19 TheSimonator joined #git
16:20 sbasso joined #git
16:20 Rodya_ joined #git
16:23 svm_invictvs joined #git
16:24 CussBot joined #git
16:24 Es0teric joined #git
16:25 oleksiyp joined #git
16:28 MistahKurtz joined #git
16:31 mmlb joined #git
16:32 freddy_ joined #git
16:32 gk_1wm_su joined #git
16:33 cagomez joined #git
16:33 gk_1wm_su left #git
16:34 notebox joined #git
16:34 Keverw joined #git
16:34 DarkPsydeLord joined #git
16:35 freddy___ joined #git
16:35 gk_1wm_su joined #git
16:35 Tarexan joined #git
16:37 thebope joined #git
16:37 gk_1wm_su left #git
16:38 prg318 joined #git
16:39 SpeakerToMeat joined #git
16:41 dnvenegas joined #git
16:42 freddy_ joined #git
16:42 miklcct joined #git
16:44 portal joined #git
16:45 cagomez joined #git
16:49 Karthick joined #git
16:50 jozwior joined #git
16:50 vmiklos joined #git
16:52 bronson joined #git
16:53 iateadonut left #git
16:55 Brski joined #git
16:56 plexigras joined #git
16:56 sea-gull joined #git
16:57 plexigras how can i checkout of a brnach wich has un commited changes and unadded files and have thm still when i go back to the branch
16:58 nexemacs joined #git
16:58 plexigras i basically want it to all stay in the branch
16:58 whitby Commit them?
16:59 kadoban plexigras: That's not how git works. You can commit them as a work-in-progress commit, or do a stash. Uncommited changes are part of no branch though, you can't trick git into thinking they are.
16:59 plexigras nah i just want to stash them
16:59 whitby commit -m 'WIP: I will come back to this' or (git add . && git stash)
16:59 kadoban git stash could be of interest to you then
16:59 Dev0n hey, so if you have x number of people working on a feature and one of them has finished their part, should this be merged to development branch or a branch that is midway between the feature branch and development?
17:00 dglambert joined #git
17:00 dglambert yo
17:00 Dev0n it feels wrong to commit this to development because technically it's not complete
17:00 whitby Dev0n: depends on the team and the product and whatnot. If that's easiest for the team then sure? Some people would use feature toggles or similar to have unfinished features turned off.
17:01 plexigras make a feature branch
17:01 freddy_ joined #git
17:01 Dev0n whitby, sorry, could you explain a bit about feature toggles? first hearing of that term
17:01 Starky joined #git
17:01 plexigras nd when the feature is fiished merge it into developmnt
17:01 Dev0n plexigras, they are feature branches
17:02 Dev0n but the main feature was broken into two different feature branches
17:02 Dev0n one on design and one on implementation
17:02 freddy_ joined #git
17:03 dreiss joined #git
17:03 vmiklos joined #git
17:03 whitby Dev0n: it's probably not super helpful other than to get an idea of how one _might_ go about it, but feature toggles built into the application would allow you to merge half of the feature into the main development branch in an "off" state and then merge the implementation later.
17:03 whitby e.g. https://martinfowler.com/articles/feature-toggles.html
17:04 Dev0n ah thanks whitby, will have a read
17:04 whitby But I don't know that it's a solution to your problem right now :)
17:04 Dev0n oh so this is really application level configuration
17:04 jrcharney joined #git
17:04 Dev0n rather than version control
17:04 dhollinger joined #git
17:04 whitby I would recommend, similar to plexigras, create a third branch that you can merge the two halves into
17:04 Dev0n whitby, that was the plan, wanted to double check if that's a sane method
17:05 Dev0n sounds like it is :)
17:05 whitby It is, yup
17:05 tnecniv joined #git
17:05 Dev0n great, thanks
17:05 clemf joined #git
17:05 blackbms joined #git
17:05 roelmonnens joined #git
17:06 jrcharney Well, I think it is safe to say that any question I have about using git wiht BitBcuekt needs to be asked at #git since #bitbucket is pretty much dead.
17:06 rubyonrailed joined #git
17:06 whitby But the problem is likely with Bitbucket :)
17:06 * whitby doesn't like Bitbucket
17:07 bremner jrcharney: what's your definition of dead? 10 minutes or 10 hours?
17:07 ugenis left #git
17:07 clemf I use bitbucket at work every day. It's ok, but it doesn't have repository search which makes me sad.
17:07 prg3 joined #git
17:07 jrcharney bremner: any time there's the sound of cricket
17:07 kadoban whitby: Why do you hate this walrus? You monster. https://raidenworks.files.wordpress.com/2013/06/walrus-i-has-a-bucket.jpg?w=750
17:08 jrcharney s/cricket/crickets/g
17:08 jrcharney kadoban: good point.  wy u hait mai bucket?
17:08 whitby jrcharney: ask away. We'll help if we can (or shoo you away back to #bitbucket)
17:09 salamanderrake joined #git
17:10 concerti joined #git
17:11 clemf Question: I'm trying to understand GitLab flow, and how to implement it on a project with 5 developers. We currently have multiple environments: dev, staging, and prod. I like the one-way flow deployment process described in GitLab flow, but I don't understand how to revert a release if there's a major problem.
17:11 clemf See: https://docs.gitlab.com/ee/workflow/gitlab_flow.html#environment-branches-with-gitlab-flow
17:11 blackbms joined #git
17:11 hfp joined #git
17:11 ethali joined #git
17:12 whitby clemf: roll forward?
17:12 hfp_work joined #git
17:12 clemf whitby: not sure what that means.
17:12 jrcharney OK, a few days ago I asked about trying to get bitbucket to push to our website whenever we used SourceTree.  Source tree would be the interface to do all the git stuff, Bitbucket would recieve a pushed commit.  The hope was that from there we couuld trigger something that would tell the repo to push from bigbucket to our website.  How do I set up my webhook to tell Bitbucket to push to my website when I sed a
17:12 jrcharney push to bit bucket?
17:12 whitby Er, don't revert a release but instead make a new release that fixes the things (clemf)
17:13 clemf whitby: But what if it's an emergency situation? Our project is being used by medical offices so it's kind of critical that it can't be broken during business hours.
17:14 tyreld joined #git
17:14 jrcharney clemf: is this project hippa compliant?
17:14 clemf jrcharney: yes
17:14 orbyt_ joined #git
17:14 acetakwas joined #git
17:15 vmiklos joined #git
17:17 clemf I was thinking to revert the merge on the pre-production environment, then merge that into prod. It just gets confusing how the integration/development branch gets synced back up.
17:18 peterbecich joined #git
17:18 clemf jrcharney: https://confluence.atlassian.com/bitbucket/manage-webhooks-735643732.html
17:18 jonno112 joined #git
17:18 clemf are you using bitbucket cloud?
17:19 jrcharney clemf: I already went to that page
17:21 tlaxkit joined #git
17:21 marianina8 joined #git
17:21 cagomez joined #git
17:22 clemf jrcharney: we use chef for that kind of stuff
17:22 clemf i.e. deployment scripts
17:22 govg joined #git
17:22 clemf what is your hosting setup?
17:23 jrcharney aws
17:23 clemf Do you have no ops guy?
17:23 jrcharney I am the ops guy
17:23 clemf heh
17:24 clemf Can't say I know enough to help you. You could check out Bamboo, that's atlassian's deployment product.
17:24 plexigras can i run a script when runing `git checkout` like `git checkout master && sh ./onCheckout.sh master` ?
17:25 telephone joined #git
17:25 telephone joined #git
17:26 jrcharney well...I guess that's it then.  (╯°□°)╯︵ ┻━┻
17:26 g105b joined #git
17:27 PCatinean joined #git
17:27 PCatinean hey guys, I have a buildout script that does git ls-remote origin master in a submodule and that changes the remote for the parent repository
17:27 clemf jrcharney: Maybe find a devops or AWS channel to ask in?
17:27 PCatinean Does anyone know how one can prevent this?
17:28 jrcharney Or maybe find a way to donate points to my stackexchange. We're spinning wheels here.
17:28 Arodrig joined #git
17:29 jrcharney I'd like to stick around and continue this conv, but I got a dozen other things to do right now
17:29 clemf jrcharney: I think narrowing the scope of your question might help. i.e. picking a deployment tool to use
17:29 gk_1wm_su joined #git
17:30 clemf jeez... the guy asks an incredibly unspecific question in the wrong channel then gets all chuffed about it
17:31 thebope joined #git
17:31 gk_1wm_su left #git
17:32 justin2 joined #git
17:34 cagomez joined #git
17:34 TheSimonator joined #git
17:35 TheSimonator joined #git
17:35 kadoban clemf: This channel isn't particularly picky about topic
17:35 Silenced joined #git
17:36 clemf kadoban: Yeah nothing wrong with asking the question, just strange to get an attitude about it
17:36 kadoban Didn't seem like they got that salty about it, but yeah, not exactly going to help things.
17:39 clemf I feel kind of bad for his company if he's devops and he doesn't even know what question to ask lol
17:39 plexigras found what i was loking for its called a hook
17:39 gk_1wm_su joined #git
17:41 boubou joined #git
17:42 gk_1wm_su left #git
17:45 boubou joined #git
17:46 jozwior joined #git
17:47 vuoto joined #git
17:47 jozwior joined #git
17:47 ti2_ joined #git
17:47 sea-gull joined #git
17:47 aw1 joined #git
17:49 ketas joined #git
17:50 davimore joined #git
17:51 plexigras can i have custom ref like stash but not stash itself?
17:52 MattMaker joined #git
17:54 ojacobson yes, honestly using a branch is probably the simplest way to do it
17:54 kpease joined #git
17:54 rubyonrailed joined #git
17:55 tnecniv joined #git
17:57 mehola joined #git
17:57 kristofferR joined #git
17:58 AbleBacon_ joined #git
17:58 Sasazuka joined #git
18:00 kristofferR joined #git
18:01 xaa joined #git
18:02 theiostream joined #git
18:02 guampa joined #git
18:03 theiostream joined #git
18:04 webstrand joined #git
18:04 mikecmpbll joined #git
18:04 phase2 joined #git
18:05 kfoonamalik joined #git
18:08 karols146 joined #git
18:09 unbalancedparen joined #git
18:10 Dougie187 joined #git
18:10 cagomez joined #git
18:11 ToBeCloud joined #git
18:12 ertesx joined #git
18:13 a3Dman_ joined #git
18:14 TomyLobo joined #git
18:17 govg_ joined #git
18:19 Es0teric joined #git
18:20 cdown joined #git
18:20 jonez joined #git
18:22 war_pigs joined #git
18:22 theiostream joined #git
18:23 cagomez joined #git
18:25 thebope joined #git
18:27 ethali joined #git
18:28 nowhere_man joined #git
18:28 karols146 joined #git
18:30 PioneerAxon joined #git
18:32 theiostream joined #git
18:32 diogenese joined #git
18:34 NeverDie joined #git
18:35 Cavallari joined #git
18:36 ShapeShifter499 joined #git
18:36 gk_1wm_su joined #git
18:37 roelmonnens joined #git
18:38 gk_1wm_su left #git
18:39 Random832 plexigras, copy refs/stash to another reference and then stash drop?
18:40 qqx joined #git
18:41 oleksiyp joined #git
18:41 theiostream joined #git
18:42 cdown_ joined #git
18:46 porfiriopaiz joined #git
18:46 Zialus joined #git
18:46 jesst joined #git
18:48 war_pigs joined #git
18:48 User458764 joined #git
18:51 plexigras i want to automatticaly stash efore checkout ad pop after checkout
18:52 weakdan joined #git
18:52 war_pigs joined #git
18:54 basteh joined #git
18:56 kyan joined #git
18:58 ayogi joined #git
18:59 cagomez joined #git
19:01 btree joined #git
19:01 tnecniv joined #git
19:01 qqx plexigras: git doesn't support that. You could write your own git command to do stash, checkout, pop.
19:01 govg joined #git
19:01 gk_1wm_su joined #git
19:03 plexigras yeah i thought about that but im just not good enough at this
19:03 gk_1wm_su left #git
19:04 plexigras i read this post that kinda lookslike what i want
19:05 plexigras http://stackoverflow.com/a/760092
19:05 plexigras but its quite complicated :(
19:06 bronson joined #git
19:06 carousel joined #git
19:07 kadoban plexigras: What do you want this for anyway?
19:07 qqx plexigras: A naive implementation would be to just put `git stash && git checkout "$1" && git stash pop` into a file named git-whatever somewhere in your $PATH, and make that executable.
19:09 kexmex joined #git
19:11 robotroll joined #git
19:11 cagomez joined #git
19:15 btree left #git
19:16 gugah joined #git
19:18 gugah joined #git
19:18 plexigras no i want to contain my progess in branch without having to commit it whan switching to another branch
19:18 chipotle joined #git
19:18 ziombelas joined #git
19:19 peterbecich joined #git
19:19 clemf joined #git
19:19 thebope joined #git
19:20 peterbecich joined #git
19:20 kadoban Just learn how git already works and do it manually. If you're doing that stuff very often, it probably means you're not commiting often enough anyway.
19:21 gugah joined #git
19:21 plexigras its because im doing to many things at once
19:23 chachasmooth joined #git
19:25 clemf joined #git
19:26 blackwind_123 joined #git
19:27 plexigras i will just commit it to the branch as wip before doing checkout and reset it using --soft
19:27 sz0 joined #git
19:28 Chicago joined #git
19:29 sea-gull joined #git
19:29 kadoban Sounds like a plan
19:30 bwn joined #git
19:31 ResidentBiscuit joined #git
19:31 Chicago Hello, I want to checkout a branch based on a tag from a GitHub repository.  The tag is v0.6.3c, https://github.com/litecoin-project/litecoin/releases/tag/v0.6.3c and the problem I'm having is that after fetching the remote and listing the tags; this particular tag is omitted yet it is still listed as a release on GitHub.  Is it possible there isn't a commit history for this tag and its just an archive?
19:32 acetakwas joined #git
19:33 ac3takwas joined #git
19:33 gugah_ joined #git
19:33 kadoban Chicago: Looks like a tag. Try 'git fetch --tags' ? I'm never clear when that's required.
19:33 Eugene Chicago - `git ls-remote git://github.com/litecoin-project/litecoin.git | grep v0.6.3c` shows that tag is present, and has hash af9b6da797a3392501d98621bc333f5b2ce073ce
19:34 Eugene `git fetch` does NOT bring in that tag, because it does not appear to exist on the 'master' branch
19:34 Eugene `git fetch --tags` does pull it down
19:34 guampa joined #git
19:34 Eugene git's default behaviour on fetch/clone is to fetch tags which are included on the branch that you are fetching, which defaults to master. If the tag is not "on" that branch, then it doesn't get fetched.
19:35 Chicago kadoban, Eugene thanks I see the tag now after fetching the rest of the tags.
19:36 Eugene !next
19:36 gitinfo Another satisfied customer. NEXT!
19:37 kadoban Huh, I didn't know that was how it worked. Makes some sense I suppose
19:38 Chicago I really appreciate the assist =)
19:39 finalbeta joined #git
19:42 chipotle joined #git
19:42 hahuang65 joined #git
19:43 mehola joined #git
19:45 bronson joined #git
19:47 [Brain] joined #git
19:48 recursion-ninja joined #git
19:49 chipotle joined #git
19:49 Starky joined #git
19:50 yqt joined #git
19:50 gnixev joined #git
19:52 esc joined #git
19:52 esc joined #git
19:55 Arodrig joined #git
19:56 plexigras so i wrote this http://ix.io/qr5
19:56 royal_screwup21 joined #git
19:57 royal_screwup21 How do I put up my Kaggle notebook (.ipynb file) on Github, including the graphs in it? I tried uploading it but the graph visualization didn't show up. Do I have to convert it to a specific format or something?
19:57 theiostream joined #git
19:58 qqx royal_screwup21: !github
19:58 gitinfo royal_screwup21: Note that git != github. Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)
19:58 Brski joined #git
20:00 kadoban plexigras: Kind of eww.
20:00 Mutter joined #git
20:00 LionsMane joined #git
20:01 plexigras kadoban, i need to have something like refs/autostash or something idk
20:01 preaction royal_screwup21: https://github.com/blog/1995-github-jupyter-notebooks-3
20:01 plexigras i just dont know how to git
20:02 dhollinger joined #git
20:04 peepsalot joined #git
20:05 plexigras kadoban, http://ix.io/qr5 this is all i can do :/ idk howto do it all fancy shmancy
20:06 kadoban plexigras: The entire idea just seems like a bad idea to me. floating changes is a useful thing
20:06 MineCoins joined #git
20:07 chipotle joined #git
20:07 plexigras what do you mean with floating changes?
20:07 kadoban !float
20:07 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.
20:07 portal joined #git
20:08 ResidentBiscuit joined #git
20:09 Cabanossi joined #git
20:09 plexigras kadoban, im not replacing git checkout
20:09 plexigras i can still do that
20:11 mentazoom joined #git
20:11 kadoban If you're not replacing git checkout, then you have to already know which branches have WIP changes for you to automatically do, otherwise this command doesn't so much work, at least that half of it.
20:12 hhee joined #git
20:12 plexigras yeah thats the problem which is why i dont like that i commiting to the mranch and would like to use a custom ref space
20:12 plexigras but i have no idea how i could do that
20:13 kadoban That didn't seem like it had much to do with what I'm talking about. But whatever, if it works for you, who am I to judge.
20:13 thebope joined #git
20:14 cdg joined #git
20:14 nowhere_man joined #git
20:19 m0viefreak joined #git
20:19 ZyX-I joined #git
20:23 CheckDavid joined #git
20:24 filcab joined #git
20:25 Atm0spher1c joined #git
20:26 roelmonnens joined #git
20:28 peepsalot is there a way to locally ignore local changes for a specific file that is in a git repo?
20:28 aidalgol joined #git
20:28 takwas joined #git
20:30 JimDungo joined #git
20:31 m0viefreak peepsalot: see !config
20:31 gitinfo peepsalot: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
20:31 awc737 joined #git
20:31 awc737 I just did "git stash -a" What have I done? it deleted my node_modules etc. How do I revert that command?
20:31 kadoban peepsalot: Not a tracked one, no. At least not in a useful way.
20:32 _28_ria joined #git
20:32 m0viefreak awc737: git stash pop
20:32 kristofferR joined #git
20:32 kadoban Yeah, a pop should do it. You stashed in a way that tells it to stack ignored/untracked files as well I believe.
20:32 awc737 oh i should not use -a
20:33 awc737 i just want to undo any changes i might have made since the last commit
20:34 m0viefreak !reset
20:34 gitinfo reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)
20:34 blr joined #git
20:34 awc737 "git reset" says there are unstaged changes after reset
20:35 m0viefreak you want reset --hard
20:35 kadoban awc737: Have you specified what you're actually trying to do?
20:35 kadoban I didn't see it.
20:35 awc737 thanks! thats it
20:36 netj joined #git
20:37 Atm0spher1c joined #git
20:37 User458764 joined #git
20:39 Cabanossi joined #git
20:40 m0j0 joined #git
20:43 sbasso joined #git
20:45 Atm0spher1c joined #git
20:47 shgysk8zer0 joined #git
20:48 Tfar joined #git
20:48 Acerific joined #git
20:48 StuartMI joined #git
20:49 switchnode_ joined #git
20:49 Tfar hi
20:49 gitinfo Tfar: 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.
20:51 switchnode_ How do I *manually* merge the current state of a branch with its state at a previous commit?
20:56 skirk joined #git
20:57 shgysk8zer0 joined #git
20:57 govg joined #git
20:58 capuk_ joined #git
20:58 JimDungo I'm kind of a beginner/intermediate at git. I just ordered Pro Git so I can grow my skills
20:58 JimDungo any other good resources I can use while waiting for the book to arrive?
20:59 kadoban The web version that's free on https://git-scm.com/book/en/v2
20:59 StuartMI joined #git
21:00 duderonomy joined #git
21:00 MineCoins joined #git
21:03 Tobbi joined #git
21:03 cagomez joined #git
21:03 a3Dman joined #git
21:03 tvw joined #git
21:04 JimDungo kadoban: Yes, I know, I'm just better with paper
21:04 JimDungo :)
21:04 kadoban Fair enough, hehe.
21:04 SpeakerToMeat joined #git
21:04 kadoban !book has some advice, most of which is online I think. I don't remember which are good though personally
21:04 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
21:05 bannakaffalatta joined #git
21:06 mage_ joined #git
21:07 thebope joined #git
21:08 jonez joined #git
21:11 lamont joined #git
21:12 _28_ria joined #git
21:17 lamont joined #git
21:17 brk_ joined #git
21:17 jost__ joined #git
21:18 Tfar joined #git
21:18 Rodya_ joined #git
21:18 cjohnson I really like !parable
21:18 gitinfo 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
21:18 cagomez joined #git
21:18 Tfar joined #git
21:20 utrack joined #git
21:20 Mindi joined #git
21:21 dreiss joined #git
21:21 lamont joined #git
21:22 TheSimonator joined #git
21:23 kadoban That one doesn't sound familiar, I'll have to read it sometime.
21:26 war_pigs joined #git
21:26 Mobutils joined #git
21:27 sunri5e joined #git
21:28 capuk_ joined #git
21:28 publio joined #git
21:29 jeffreylevesque joined #git
21:29 Darren___ joined #git
21:30 tchan joined #git
21:30 tchan joined #git
21:32 cyberz joined #git
21:32 askb joined #git
21:33 pandeiro joined #git
21:33 dsdeiz joined #git
21:33 dsdeiz joined #git
21:37 mmlb joined #git
21:37 re1_ joined #git
21:38 re1_ joined #git
21:39 Cabanossi joined #git
21:40 re1_ joined #git
21:41 griff joined #git
21:42 seveneve1 joined #git
21:44 mehola joined #git
21:46 zerow joined #git
21:50 Acerific joined #git
21:50 foo joined #git
21:50 foo git clone spider:/home/dev/spider - this is throwing various errors. Should it typically work if spider/ is a git repo?
21:50 tnecniv joined #git
21:52 kadoban foo: No. In that syntax, spider is a SSH alias or something probably
21:52 foo kadoban: ah, thank you. spider is defined in my ssh config.
21:53 foo kadoban: I basically have a repo on a server. I want to copy it locally... then push to remove server
21:53 foo I was thinking git clone would be the best way to do that
21:53 eightg joined #git
21:53 kadoban You should be able to clone from a repo like that, assuming you have SSH access, that the SSH alias is configured correctly, that the repo exists at that path, etc.
21:55 foo kadoban: thank you. In that case, this error is likely related to something else: https://bpaste.net/show/4d4db1c4c95e
21:57 kadoban Hm, not sure what that one means. Should be googleable I'd hope
21:58 bronson joined #git
21:58 kadoban "out of memory" sounds pretty bad. Maybe gc or something on the remote fixes it
21:58 foo kadoban: yeah, going to google. I could just blow away the remote repo git, git init ., git add ... if necessary
21:58 foo kadoban: it's a new server, relatively new repo. strange
21:58 elsevero joined #git
21:58 kadoban Hmm
21:59 foo kadoban: FYI, this fixed it: https://bpaste.net/show/8dd7d3eb9796 - thank you. I just did a successful clone
22:00 kadoban Weird, never seen those commands. Though glad it worked for you
22:00 foo kadoban: Heh, me neither. :)
22:01 thebope joined #git
22:03 Dougie187 left #git
22:04 FilipNortic_ joined #git
22:07 nick123 joined #git
22:07 Rodya_ joined #git
22:08 theiostream joined #git
22:09 Cabanossi joined #git
22:12 tinanoo joined #git
22:13 donught joined #git
22:13 war_pigs joined #git
22:14 roelmonnens joined #git
22:16 Acerific joined #git
22:16 m0viefreak joined #git
22:18 Hello71 pretty sure you are in fact out of memory.
22:19 foo Hello71: oh, out of memory, out of ram? Actually, that may be possible.
22:20 foo Hello71: hmm, seems ok now, but I can keep an eye on it. This system has 512MB (droplet at digital ocean) and I have a threading process with 150 threads. That may have something to do with this (although I don't see it swapping yet)
22:20 tinanoo joined #git
22:25 kegster joined #git
22:25 donught joined #git
22:31 AbleBacon_ joined #git
22:32 war_pigs joined #git
22:33 donught joined #git
22:40 netj joined #git
22:41 snowalpaca joined #git
22:43 dendazen joined #git
22:44 agusyc joined #git
22:46 Ploppz left #git
22:53 rubyonrailed joined #git
22:54 Cabanossi joined #git
22:55 futuristic joined #git
22:55 Ahmed90 joined #git
22:56 thebope joined #git
22:56 peepsalot joined #git
22:56 SpeakerToMeat joined #git
22:57 TheSimonator joined #git
22:59 cagedwisdom joined #git
23:00 Eugene foo - yup, definitely an OOM. Check your syslog to find where the `git-pack-objects` got killed, and then go resize upwards
23:01 Eugene As a rule of thumb, your available RAM needs to be at least twice as big as the biggest repo you have. More if you have users doing things in parallel
23:03 snowalpaca joined #git
23:03 TheSimonator joined #git
23:04 scoobert1on joined #git
23:05 Ranhir joined #git
23:08 nick123 joined #git
23:09 pietv joined #git
23:12 madewokherd joined #git
23:15 war_pigs joined #git
23:15 nevodka joined #git
23:16 nevodka joined #git
23:16 fakenerd_ joined #git
23:19 tanga joined #git
23:20 Aeterne joined #git
23:20 TbobbyZ_ joined #git
23:21 TbobbyZ_ joined #git
23:22 Bombe joined #git
23:25 FilipNortic joined #git
23:26 dviola joined #git
23:29 FilipNor1ic joined #git
23:33 cliluw joined #git
23:35 jonno112 joined #git
23:35 d4rkl0rd joined #git
23:35 adymitruk why do I get a .git folder in submodules?
23:35 adymitruk I thought that was deprecated
23:37 re1 joined #git
23:39 Cabanossi joined #git
23:39 digidog joined #git
23:42 tilpner joined #git
23:42 Werring joined #git
23:42 Arguggi joined #git
23:43 orbyt_ joined #git
23:44 mehola joined #git
23:44 iron_houzi joined #git
23:45 harv joined #git
23:47 sysanthrope joined #git
23:47 jstimm joined #git
23:49 thiago joined #git
23:50 thebope joined #git
23:55 sysanthrope joined #git
23:55 ToxicFrog submodules are themselves git repos
23:55 ToxicFrog So of course they have .git directories
23:55 ojacobson well
23:56 pitastrudl joined #git
23:56 ojacobson they have a repository
23:56 sbeller adymitruk: ToxicFrog: nowadays the submodule .git dir is inside the superprojects .git/modules/<name> dir
23:56 sbeller and in place they have a .git "link file"
23:56 theiostream joined #git
23:57 hahuang65 joined #git
23:57 sbeller adymitruk: it depends how you added the submodule. when using e.g. git clone --recurse-submodules, the git dir ought to be put in the new correct place. when using "git submodule add" of an existing repo, it is not absorbed yet IIRC
23:57 orbyt_ joined #git
23:57 sbeller (There is a new command "git submodule absorbgitdirs" to move the submodules git dir into the superprojects git dir
23:57 sbeller )

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