IRCloggy #git 2017-05-25

Provider of IRC logs since 2005.

WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

	2017-05-25
	← aielima left	00:01
	→ MarioBranco joined	00:01
	← anuxivm left	00:01
	→ Rotaerk joined	00:04
	← duderonomy left	00:05
	← bvcosta left	00:05
	→ revinard joined	00:07
	→ cdown joined	00:07
	→ justan0theruser joined	00:08
	→ mizu_no_oto joined	00:09
	← antoine left	00:10
	← fahadash left	00:12
	← nitric left	00:13
	← EgS left	00:14
	← theskillwithin left	00:14
	← kadoban left	00:14
	→ kadoban_ joined	00:14
	→ theskillwithin joined	00:14
	← durham left	00:14
	→ EgS joined	00:15
	← orbyt_ left	00:16
	→ backnforth joined	00:17
	→ durham joined	00:23
	← re1 left	00:28
	← alesan left	00:30
	← cdown left	00:34
	→ cdown joined	00:35
	→ cam27 joined	00:35
	→ valhala_22 joined	00:36
	← unreal left	00:37
	→ fstd_ joined	00:38
	← fstd left	00:38
	fstd_ → fstd	00:38
	← Darren_ left	00:39
	→ unreal joined	00:39
	← al-damiri left	00:40
	← valhala_22 left	00:40
	← brent__ left	00:41
	→ acidvegas joined	00:41
acidvegas	<-	00:41
	← durham left	00:42
	← Achylles left	00:43
	→ mischat joined	00:48
	← TheFuzzball left	00:48
	← LeBlaaanc left	00:49
	← jt left	00:51
	← ZyX-I left	00:52
	→ thiago joined	00:52
	← mischat left	00:52
	← cdown left	00:53
	→ cdown joined	00:53
	→ antoine joined	00:53
	← mikecmpbll left	00:53
	→ ZyX-I joined	00:54
	→ mikecmpbll joined	00:54
	← meLon left	00:57
	← Zialus left	00:57
	→ dave0x6d joined	00:59
	→ TheFuzzball joined	00:59
	← dermoth left	01:00
	→ Zialus joined	01:00
	→ dermoth joined	01:00
	qpdb → Guest35013	01:00
	← Guest35013 left	01:00
	→ qpdb joined	01:01
	← Noodlewitt left	01:02
	→ frobnic joined	01:02
	← gopar_ left	01:03
	→ gopar joined	01:03
	← shgysk8zer0 left	01:04
	→ menip joined	01:05
	← mizu_no_oto left	01:06
	← gopar left	01:08
	← TheFuzzball left	01:08
	← dtrott left	01:09
	→ duderonomy joined	01:09
	← ZyX-I left	01:10
	← cqi left	01:11
	→ mizu_no_oto joined	01:11
	→ cqi joined	01:12
	← mizu_no_oto left	01:13
	← joshszep_ left	01:14
	→ joshszep joined	01:14
	← moei left	01:17
	← joshszep left	01:17
	← sunri5e left	01:17
	← m0viefreak left	01:18
	← j08nY left	01:19
	→ sunri5e joined	01:19
	→ Noodlewitt joined	01:20
	← Introoter left	01:21
	← thiago left	01:22
	← Gustavo6046 left	01:24
	← sbasso left	01:24
	← stevenbenner left	01:26
	← hahuang65 left	01:27
	← bruce_lee left	01:28
	→ bruce_lee joined	01:28
	← mikecmpbll left	01:28
	← Sasazuka left	01:31
	← MrMojit0 left	01:31
	→ m0viefreak joined	01:32
	→ mizu_no_oto joined	01:34
	→ freddieptf joined	01:34
	→ LTRand joined	01:35
	← mizu_no_oto left	01:35
	→ BSAlb joined	01:37
	← Naan left	01:38
	← freddieptf left	01:38
	← BSaboia left	01:39
	→ mizu_no_oto joined	01:41
	← texinwien left	01:41
	← phinxy left	01:43
	→ durham joined	01:43
	← d^sh left	01:45
	← cqi left	01:46
	→ d^sh joined	01:47
	→ brent__ joined	01:47
	← yoh left	01:47
	→ mischat joined	01:49
	← brent__ left	01:51
	← svm_invictvs left	01:52
	← LTRand left	01:52
	← antoine left	01:52
	→ Sxeil joined	01:52
	← jason237 left	01:52
	→ moei joined	01:52
	→ _W_ joined	01:53
	→ cdg joined	01:53
	← mischat left	01:53
	→ yoh joined	01:55
	→ dendazen joined	01:56
	→ pbandark joined	02:00
	→ gugah joined	02:01
	→ Vortex35 joined	02:02
	← jaziz left	02:02
	→ jameser joined	02:02
	← jameser left	02:03
	← justan0theruser left	02:04
	→ jason237 joined	02:05
	→ lagothri1 joined	02:05
	→ therealGent joined	02:06
	← aakz left	02:06
	← peterbec` left	02:06
	→ jt joined	02:06
	← Vortex34 left	02:06
	← pbandark left	02:07
	→ MNav joined	02:07
	→ jameser joined	02:08
	← lagothrix left	02:08
	→ Goplat joined	02:08
	← MNav left	02:10
	→ zuck05 joined	02:13
	→ Naan joined	02:15
	→ LeBlaaanc joined	02:18
	← ojdo left	02:19
	→ NeXTSUN joined	02:26
	→ ojdo joined	02:26
	→ jaziz joined	02:26
	→ LTRand joined	02:27
	→ Aeterne joined	02:29
	→ peacememories joined	02:30
	← leeN left	02:30
	← tedwing left	02:31
	→ nevodka joined	02:31
	← LTRand left	02:32
	← livingstn left	02:32
	→ ertes joined	02:33
	kadoban_ → kadoban	02:33
	← evie_hammond left	02:33
	→ notadeveloper joined	02:34
	← rivarun left	02:34
	→ rivarun joined	02:34
	← darkbit left	02:35
	→ evie_hammond joined	02:35
	→ ewitz joined	02:36
	→ derpster joined	02:36
	→ SwiftMatt joined	02:37
	→ valhala_22 joined	02:37
	← chachasmooth left	02:40
	← oskarkv left	02:41
	← Sxeil left	02:42
	← valhala_22 left	02:42
	← NeXTSUN left	02:43
	→ chachasmooth joined	02:43
	← hexagoxel left	02:45
	→ NeXTSUN joined	02:46
	→ aavrug joined	02:50
	→ mischat joined	02:50
	→ yandi joined	02:50
	← Cabanossi left	02:50
	← yandi left	02:51
	← prg3 left	02:51
	→ Cabanossi joined	02:52
	→ hexagoxel joined	02:52
	→ kyan joined	02:52
	→ justan0theruser joined	02:52
	← durham left	02:52
	← justan0theruser left	02:53
	→ justanotheruser joined	02:53
	← mischat left	02:54
	→ prg3 joined	02:55
	→ justrohu joined	02:55
	→ Darren_ joined	02:56
justrohu	Hello all, I am learning git... what is cherry pick .. can someone provide me an example	02:56
kadoban	It copies a commit, redoing the same changes the commit did and the commit message and etc., in a new context.	02:57
	It's a bit like rebase, except not.	02:57
	← kfoonamalik left	02:58
	← tunekey left	02:58
	← zuck05 left	02:58
	→ tunekey joined	02:58
	← mizu_no_oto left	02:59
rwp	A cherry pick is somewhat like taking a diff from one place and appyling it as if it were 'patch -p1 < difffile' to another branch.	02:59
	Somewhat.	02:59
	→ mizu_no_oto joined	03:00
	← bruce_lee left	03:01
	→ Emperor_Earth joined	03:02
justrohu	kadoban, rwp - thank you	03:03
	← MarioBranco left	03:03
aavrug	Hello everyone!	03:05
	How to add a commit after a old commit and keep the existing tree with that old commit.	03:06
	→ tmcmahon joined	03:07
rwp	Sorry but your question is not clear because that sounds like the default behavior of a normal "git commit".	03:07
	← dave0x6d left	03:07
	→ maroloccio joined	03:07
	→ zuck05 joined	03:09
aavrug	rwp, I have currently three commits commit1, commit2 and commit3. Now I need to change something just after commit1 so it will be a new commit lets say commit4. Now I want the sequence like commit1, commit4, commit2 and commit3.	03:10
	← beerdrop left	03:12
	→ a_thakur joined	03:12
	→ cqi joined	03:13
	← nunchuck left	03:14
	→ nunchuck joined	03:15
	← m0viefreak left	03:15
	← HoierM_ left	03:16
	← jt left	03:16
	← kyan left	03:18
	← Cabanossi left	03:20
	→ Cabanossi joined	03:21
rwp	aavrug, Have you pushed? Hopefully not. You want to rebase -i the ordering. man rebase	03:22
aavrug	rwp, ok thanks let me check.	03:23
rwp	aavrug, I failed to trigger the bot but let me try again. man git-rebase	03:24
gitinfo	aavrug: the git-rebase manpage is available at https://gitirc.eu/git-rebase.html	03:24
	→ ertesx joined	03:24
aavrug	rwp, ok no probs I am reading it.	03:25
	→ beerdrop joined	03:26
	← ertes left	03:27
	ertesx → ertes	03:27
	← bgerber left	03:28
	→ kyan joined	03:29
	→ bgerber joined	03:29
	← Aeterne left	03:29
	← nothingnew left	03:29
	→ navidr joined	03:30
	← tmcmahon left	03:31
	← aidalgol left	03:31
	→ mdbk joined	03:31
	← gugah left	03:35
	← SwiftMatt left	03:38
	→ valhala_22 joined	03:38
	← LeBlaaanc left	03:42
	← valhala_22 left	03:43
	→ LeBlaaanc joined	03:43
	→ rchavik joined	03:44
	← LeBlaaanc left	03:45
	→ LeBlaaanc joined	03:46
	→ mischat joined	03:51
	← sondr3 left	03:54
	← mischat left	03:56
	← mizu_no_oto left	03:57
	→ jnewt_ joined	03:57
	← str left	03:57
	← therealGent left	03:59
	→ Garen_ joined	04:00
	→ pxs joined	04:00
	← om_henners left	04:00
	→ Dragoe joined	04:01
	→ om_henners joined	04:02
	← Garen left	04:03
	← lafleurdubien left	04:04
	← reynierp left	04:07
	→ valhala_22 joined	04:09
	← mdbk left	04:11
	← peacememories left	04:11
	→ jesst joined	04:13
	← peepsalot left	04:14
	← rchavik left	04:14
	→ svm_invictvs joined	04:14
	← jesst left	04:15
	← Anja left	04:16
	← RBoreal_Frippery left	04:17
	→ therealGent joined	04:18
	← Cabanossi left	04:20
	← cdg left	04:20
	→ Cabanossi joined	04:21
	← therealGent left	04:28
	→ LTRand joined	04:28
	→ peepsalot joined	04:31
	← LTRand left	04:33
	← derpster left	04:36
	← holodoc left	04:42
	← Darren_ left	04:43
	← dendazen left	04:43
	→ holodoc joined	04:44
	→ MineCoins joined	04:44
	← prg3 left	04:45
	← jackrandom left	04:48
	← notadeveloper left	04:51
	→ mischat joined	04:52
	→ ayogi joined	04:53
	→ waveclaw joined	04:55
	→ fahadash joined	04:56
	← mischat left	04:57
	← armyriad left	04:59
	← waveclaw left	05:00
	← Noodlewitt left	05:00
	← skered left	05:00
	→ prg3 joined	05:00
	← NeXTSUN left	05:01
	→ prokbird joined	05:01
	→ overlord_tm joined	05:02
	→ armyriad joined	05:03
	→ NeXTSUN joined	05:04
	← iffraff left	05:05
	→ Noodlewitt joined	05:07
	→ rscata joined	05:12
	→ notadeveloper joined	05:14
	← Guest12304 left	05:14
	→ Bock joined	05:15
	→ dec0n joined	05:15
	← MineCoins left	05:16
	← holdsworth left	05:17
	← snowkidind left	05:18
	→ waveclaw joined	05:18
	→ holdsworth joined	05:19
	→ dave0x6d joined	05:20
	← fakenerd_ left	05:21
	→ fakenerd joined	05:21
	← notadeveloper left	05:22
	← robattila256 left	05:22
	→ notadeveloper joined	05:22
	← notadeveloper left	05:22
	← lindenle left	05:23
	← watersoul_ left	05:25
	← fakenerd left	05:26
	→ lordjancso joined	05:29
	← peterbecich left	05:29
	→ durham joined	05:31
	→ watersoul joined	05:32
	→ skered joined	05:32
	→ dege joined	05:33
	← durham left	05:33
	→ durham_ joined	05:33
	→ MineCoins joined	05:33
	← watersoul left	05:34
	← durham_ left	05:34
	→ watersoul joined	05:37
	→ Anja joined	05:38
	← prg3 left	05:38
	→ shgysk8zer0 joined	05:41
	← shgysk8zer0 left	05:42
	→ prg3 joined	05:42
	→ tvw joined	05:42
	← MineCoins left	05:44
	← Anja left	05:44
	← maroloccio left	05:45
	→ jagob joined	05:48
	← Cabanossi left	05:48
	→ Es0teric joined	05:50
	→ Cabanossi joined	05:51
	← TSS_ left	05:52
	← madewokherd left	05:53
	→ TSS_ joined	05:53
	→ thebope joined	05:53
	← armyriad left	05:54
	← ewitz left	05:55
	→ Anja joined	05:55
	← overlord_tm left	05:55
	← thebope_ left	05:56
	← valhala_22 left	05:57
	→ ewitz joined	05:57
	→ armyriad joined	05:58
	→ durham joined	05:58
	← pks left	05:58
	← durham left	05:59
	→ jstimm joined	06:00
	→ durham joined	06:00
	→ jknetl joined	06:01
	← LeBlaaanc left	06:02
	→ fakenerd joined	06:03
	→ pks joined	06:03
	→ thebardian joined	06:04
	← durham left	06:04
	→ austin987 joined	06:05
	→ Silmarilion joined	06:06
	← TSS_ left	06:07
	← thebardian left	06:07
	← Es0teric left	06:08
	→ MineCoins joined	06:09
	← govg left	06:09
	→ sbulage joined	06:13
	→ TSS_ joined	06:13
	← prg3 left	06:14
	→ SkyPatrol joined	06:16
	→ valhala_22 joined	06:16
	→ joshszep joined	06:18
	→ m4sk1n joined	06:19
	→ qt-x joined	06:22
	← zuck05 left	06:22
	→ zuck05 joined	06:22
	→ MattMake_ joined	06:22
	← menip left	06:23
	→ schleppel joined	06:23
	→ lindenle joined	06:24
	→ overlord_tm joined	06:24
	← MattMaker left	06:26
	← jnewt_ left	06:28
	← lindenle left	06:29
	→ gopar joined	06:29
	← gopar left	06:29
	→ LTRand joined	06:29
	← tunekey left	06:30
	← MattMake_ left	06:33
	← LTRand left	06:34
	← Cabanossi left	06:34
	→ Cabanossi joined	06:36
	→ Aaron1011 joined	06:37
	← Aaron1011 left	06:37
	→ Aaron1011 joined	06:37
	← cam27 left	06:38
	← Guest12483 left	06:42
	→ lindenle joined	06:43
	← lindenle left	06:48
	→ FuzzyWuzzyPanda joined	06:48
	← FuzzyWuzzyPanda left	06:49
	→ King_Hual joined	06:51
	← King_Hual left	06:51
	→ King_Hual joined	06:51
	← jstimm left	06:52
	→ govg joined	06:56
	← nd_ left	06:57
	→ rokups joined	06:57
	→ chat joined	06:58
	chat → Guest84509	06:58
	→ darkbit joined	06:59
	→ z8z joined	07:01
	← raatiniemi left	07:04
	← waveclaw left	07:04
	→ raatiniemi joined	07:05
	→ ShapeShifter499 joined	07:05
	→ senaps joined	07:05
	← senaps left	07:06
	→ senaps joined	07:06
senaps	hi, i have an error in my code i want to find out when that error has been made. i want to go back commit to commit and get the files and codes of that commit. is there a way?	07:07
	git reset just takes me back to that commit and i still have the codes commited after that.	07:07
	← mattp_ left	07:08
pookleblinky	https://git-scm.com/docs/git-bisect	07:08
	You mark the current code as bad, mark the last good commit, and then step through the binary search one commit at a time running tests until you find the commit that caused it	07:10
	← jagob left	07:11
	→ shgysk8zer0 joined	07:12
LovesTha	when I learnt of git bisect it was the biggest evidence that git is designed by people who use it.	07:13
senaps	can i pass commit hashes? i don't have any versions!	07:13
LovesTha	Yes, hashes work	07:13
	← valhala_22 left	07:15
	→ jstimm joined	07:16
senaps	+LovesTha: should i use a branch just to be safe or it's okay and safe?	07:16
	→ Es0teric joined	07:16
	→ waveclaw joined	07:16
	← APic left	07:17
LovesTha	It's safe	07:18
	In fact it really doesn't make much sense as a branch, as immediately you'll give it hashes that don't exist in your new branch.	07:18
	→ mattp_ joined	07:19
	← bgerber left	07:19
LovesTha	But you aren't going to edit anything in git bisect, you are going to find the change that breaks things. Then either you'll fix that on your more recent revision or your create a new branch from that point.	07:19
senaps	so, im at current last version of my branch, i hit git bisect start, git bisect bad.	07:20
pookleblinky	https://github.com/grayghostvisuals/practice-git This is a practice repo you can clone, mess up, and then practice such as bisect on	07:20
senaps	now i should throw a git bisect good "hash of the one who works?"	07:21
	right?	07:21
	→ valhala_22 joined	07:21
LovesTha	Follow the guide you were given	07:21
	As to be honest I've done it once or twice, so I can't remember exactly how it goes	07:22
	Okay that wasn't a guide, google for a git bisect guide	07:22
	← dsdeiz left	07:22
senaps	:) thanks alot.... i'll find my way around! :) thanks for the tip. i haven't heard of this bisect ...	07:22
	← valhala_22 left	07:23
LovesTha	Giving a point in the right direction is easy, holding someones hand through every little step isn't interesting. And people have published lots of things to do that anyway	07:23
	→ bgerber joined	07:24
LovesTha	Actually that doc page is not a bad tutorial anyway	07:24
	→ Acerific joined	07:26
	→ valhala_22 joined	07:26
pookleblinky	It's easy to mkdir gitscratch, init, cp over a file and make a few commits, then practice various things on it	07:26
	This way you can then look at your terminal history, and use that as documentation for next time you need to do it for real	07:27
	→ justan0theruser joined	07:28
	→ pbandark joined	07:29
	← justanotheruser left	07:31
	← pbandark left	07:32
	→ hhee joined	07:33
	→ Murii joined	07:34
	→ pbandark joined	07:34
	← Cabanossi left	07:34
	← Noldorin left	07:34
	→ Cabanossi joined	07:36
	→ grayjoc joined	07:37
	→ mikecmpbll joined	07:38
	→ roby10 joined	07:39
	← roby10 left	07:39
	← cqi left	07:40
	← Acerific left	07:41
	← tvw left	07:43
	← joshszep left	07:44
	→ kelvah joined	07:44
	→ joshszep joined	07:45
	← fahadash left	07:45
	→ cqi joined	07:45
	← fakenerd left	07:47
	→ fakenerd joined	07:47
	→ xaa joined	07:48
	← joshszep left	07:50
	→ amosbird joined	07:50
amosbird	hi	07:50
	why does push -force still leads to ! [rejected] master -> master (stale info) ?	07:50
	← senaps left	07:52
	→ dsdeiz joined	07:55
	← dsdeiz left	07:55
	→ dsdeiz joined	07:55
	→ thebope_ joined	07:55
	← thebope_ left	07:56
	→ xaxxon joined	07:56
	→ thebope_ joined	07:56
	← thebope left	07:57
	← shgysk8zer0 left	07:57
	← govg left	07:57
	← mikecmpbll left	07:59
amosbird	oh, force-with-lease fails	08:02
	but force works	08:02
	← jas4711 left	08:03
	→ kurkale6ka joined	08:03
	→ govg joined	08:04
	→ Introoter joined	08:06
	← a_thakur left	08:06
	→ a_thakur joined	08:06
	→ Quetzal joined	08:06
	← tourdownunder left	08:08
	→ RahulAN joined	08:08
RahulAN	Hi all	08:09
	→ _ng joined	08:09
RahulAN	I have 2 repos in my git config	08:09
	and i have submitted changes to one of it ..	08:09
	not i need to get the latest revision from the other one ? how can i ?	08:09
	→ mikecmpbll joined	08:09
	← a_thakur left	08:11
	← xaxxon left	08:11
	← svm_invictvs left	08:11
	→ marcogmonteiro joined	08:12
	← jstimm left	08:12
	→ Chuguniy joined	08:13
	← Noodlewitt left	08:13
	→ zulutango joined	08:14
	← dege left	08:15
	← intellix left	08:15
	← dave0x6d left	08:18
	→ a_thakur joined	08:18
	→ acetakwas joined	08:19
	← Guest84509 left	08:20
	→ antoine joined	08:20
	← prokbird left	08:21
RahulAN	any suggestion !!	08:22
	← zer0her0 left	08:22
	← User458764 left	08:22
	→ User458764 joined	08:23
	→ zer0her0 joined	08:23
	→ chat_ joined	08:25
	→ Tobbi joined	08:26
	→ APic joined	08:26
	← chat_ left	08:26
	← ilmari left	08:27
	← antoine left	08:28
	→ _ADN_ joined	08:28
	→ kurkale61 joined	08:30
	→ LTRand joined	08:30
	← valhala_22 left	08:30
	← kurkale6ka left	08:33
	← dsdeiz left	08:33
	← bwn left	08:33
	→ cstratak joined	08:34
	← govg left	08:35
	← Tobbi left	08:36
Quetzal	RahulAN: : you mean «git pull repoName master» ?	08:36
	← LTRand left	08:36
RahulAN	Quetzal: Yes i got it :)	08:37
	i have to merge and do it ..	08:37
Quetzal	good ! :)	08:37
RahulAN	Quetzal: How can i get revert my merge ? i want to get the one on that repo	08:37
Quetzal	„revert“ ? like roll back to your latest commit?	08:38
RahulAN	Quetzal: https://bpaste.net/show/f487b6945f25 this is my config file	08:39
	not to my latest commit but on there ..	08:39
	→ IRQ` joined	08:39
RahulAN	Quetzal: i did a push on my local repo , but i want the revision of remote haiku	08:40
Quetzal	Ok, so you pushed over to origin, and now haiku is behind, isn't it?	08:41
	→ mdbk joined	08:42
	→ govg joined	08:42
RahulAN	Quetzal: Yes	08:42
	→ kurkale6ka joined	08:42
RahulAN	I did revert now :)	08:43
	← kurkale61 left	08:44
	→ j`ey joined	08:44
	→ kurkale61 joined	08:44
	→ valhala_22 joined	08:44
	← j`ey left	08:45
Quetzal	Ah, ok, and now «git pull haiku master».	08:45
	I think I got what you meant :·)	08:46
	← kurkale6ka left	08:47
	→ rchavik joined	08:48
	← Cabanossi left	08:48
	→ Tobbi joined	08:50
	→ m0viefreak joined	08:50
	→ ExpiredDev joined	08:50
	→ Cabanossi joined	08:51
	→ bwn joined	08:54
	→ prokbird joined	08:56
	← marcogmonteiro left	08:58
	→ ij joined	08:59
	→ chat_ joined	08:59
	→ dhollin3 joined	09:01
	→ tourdownunder joined	09:01
	→ dimi1947 joined	09:03
	→ marcogmonteiro joined	09:03
	← SkyPatrol left	09:03
	← dhollinger left	09:03
	← NotreDev left	09:03
	→ Phylock joined	09:04
	← valhala_22 left	09:04
	→ SkyPatrol joined	09:05
	→ achadwick joined	09:06
	→ digidog joined	09:07
	→ Snugglebash joined	09:07
	→ mischat joined	09:08
	→ chichou joined	09:09
	→ j08nY joined	09:10
	← SkyPatrol left	09:10
	← govg left	09:12
	→ valhala_22 joined	09:13
	← aavrug left	09:15
	← valhala_22 left	09:16
	→ SkyPatrol joined	09:16
	→ romank joined	09:16
	→ valhala_22 joined	09:17
	← TzilTzal left	09:18
	→ dsdeiz joined	09:19
	← valhala_22 left	09:21
	→ jmd` joined	09:21
	→ Silenced joined	09:23
	→ aavrug joined	09:23
	← Es0teric left	09:23
	→ valhala_22 joined	09:24
	→ TheFuzzball joined	09:24
	← z8z left	09:24
	→ dersand joined	09:25
TomyLobo	https://en.internetwache.org/dont-publicly-expose-git-or-how-we-downloaded-your-websites-sourcecode-an-analysis-of-alexas-1m-28-07-2015/ i just found this article detailing how to download a .git repo from a web page	09:25
	i tried this a while ago to show a friend of mine why that's bad. the roadblock i hit was packs	09:25
	← TheFuzzball left	09:26
TomyLobo	they solve that by reading from .git/objects/info/packs	09:27
	but isn't that only generated if you run a certain command?	09:27
canton7	yes, that's only used if you enable a particular hook, which is only needed for "dumb http"	09:28
	it's incredibly unlikely to be generated these days, as almost everyone is using smart http	09:28
	and if the reason you've got a git repo in your web root is because you're doing deployment badly, there's no reason to use dumb http	09:28
	or smarthttp	09:28
	→ govg joined	09:29
TomyLobo	so basically they got lucky?	09:29
	→ peacememories joined	09:30
TomyLobo	july 2015... has the file historically been generated all the time?	09:30
	oh btw, how do i cat all versions of a file? the hard way?	09:31
	→ sbasso joined	09:32
canton7	yeah, I think so. No, I don't think it's ever historically been automatically generated	09:32
	you can find all commits which touch a file with 'git log -- path/to/file' (add some format flags to just get the sha1), then use those with 'git show commit:path/to/file'	09:32
	should be able to do it in a couple of lines of bash	09:32
	→ yinye_ joined	09:33
	← mdbk left	09:33
TomyLobo	or git rev-list for the first half	09:33
canton7	true	09:33
	← Goplat left	09:33
TomyLobo	i'm trying to do some statistics on a series of 200 thread dumps btw :)	09:34
	← Cabanossi left	09:34
TomyLobo	kinda trying to profile a java program (minecraft) without an open debug port	09:34
canton7	good luck :)	09:34
	← Tobbi left	09:35
	→ Cabanossi joined	09:36
	→ Levex joined	09:36
	← yinye_ left	09:37
	→ blr joined	09:37
TomyLobo	200 at com.dmurph.tracking.JGoogleAnalyticsTracker$2.run	09:38
	what the f	09:38
	→ P4nther joined	09:39
	← P4nther left	09:41
	← peacememories left	09:44
	→ antoine joined	09:46
	← kyan left	09:47
	→ mdbk joined	09:47
	← dimi1947 left	09:49
	→ safe joined	09:50
	← jameser left	09:51
	→ YuGiOhJCJ joined	09:54
	← Atm0spher1c left	09:54
	← mdbk left	09:55
	← Cerise left	09:55
	← cstratak left	09:56
	→ thebope joined	09:56
	← thebope left	09:57
	→ thebope joined	09:57
	→ Cerise joined	09:57
	← Cerise left	09:57
	→ Cerise joined	09:57
	→ cstratak joined	09:58
	← thebope_ left	09:59
	→ finalbeta joined	10:04
	← valhala_22 left	10:04
	→ PCatinean joined	10:05
PCatinean	hey guys	10:05
	I made multiple changes, staged something, then made some chages that are unstaged and I want to revert back to only the stages changes	10:05
	how to proceed?	10:06
ij	Although only tangentially related to git itself, does anyone happen to know adding deploy keys via bitbucket's API works right?	10:06
PCatinean	ij, you can try #bitbucket	10:06
ij	Oh, it exists?	10:07
	→ Memphis joined	10:07
PCatinean	yah, about 100 people but it's there	10:07
ij	That's significant.	10:07
	→ jaziz1 joined	10:08
	→ valhala_22 joined	10:08
	← miklcct left	10:09
	→ phinxy joined	10:10
	← phinxy left	10:10
	→ phinxy joined	10:11
	→ jost joined	10:11
	← jaziz left	10:11
	← cdown left	10:14
	→ cdown joined	10:14
	→ ferr joined	10:15
	→ SkyPatrol_ joined	10:19
	→ wandering_vagran joined	10:19
	← njbair left	10:20
	← SkyPatrol left	10:21
	← j08nY left	10:21
	→ UTAN_dev joined	10:22
	← phinxy left	10:22
	→ njbair joined	10:22
	← jamick left	10:23
	→ jamick joined	10:26
	→ bruce_lee joined	10:26
	← bruce_lee left	10:26
	→ bruce_lee joined	10:26
	← chichou left	10:26
	← fakenerd left	10:27
	→ fakenerd joined	10:28
	← King_Hual left	10:29
	→ dendazen joined	10:30
	→ Acerific joined	10:30
	→ yqt joined	10:31
	← ExpiredDev left	10:31
	← fakenerd left	10:32
	→ chichou joined	10:32
	← govg left	10:34
	← tourdownunder left	10:34
	← justrohu left	10:37
	← dendazen left	10:37
	→ bongjovi joined	10:38
	→ oskarkv joined	10:38
	→ mischat_ joined	10:39
	← Mang0es left	10:41
	← nevodka left	10:41
	← dsdeiz left	10:41
	← mischat left	10:42
	← yoh left	10:42
	← Acerific left	10:44
	→ lindenle joined	10:47
	→ borkr joined	10:48
	← Cabanossi left	10:50
	→ Cabanossi joined	10:51
	← lindenle left	10:51
	← kelvah left	10:53
	← Memphis left	10:54
	← zuck05 left	10:56
	← finalbeta left	10:58
	→ finalbeta joined	10:58
	← valhala_22 left	10:59
	→ ZyX-I joined	11:00
	← mischat_ left	11:01
	→ mischat joined	11:02
	→ reynierp joined	11:03
	← Keverw left	11:08
	→ masuberu joined	11:09
	← MineCoins left	11:11
	← caper left	11:12
	→ jstein_ joined	11:12
	← RahulAN left	11:13
	← wandering_vagran left	11:14
	jstein_ → jstein	11:14
	→ dsdeiz joined	11:15
	← dsdeiz left	11:15
	→ dsdeiz joined	11:15
	→ xaxxon joined	11:15
	← cqi left	11:19
	← rchavik left	11:20
	← jmd` left	11:22
	→ miklcct joined	11:23
	← smurfendrek123 left	11:23
	← njbair left	11:24
	← cdown left	11:25
	→ cdown joined	11:25
	← zulutango left	11:25
	→ njbair joined	11:26
ufk	git push --mirror pushes to new repository also remote branches or only the local branches that I have ?	11:27
	→ maroloccio joined	11:27
	← raynold left	11:28
	→ mischat_ joined	11:29
	→ rorro joined	11:30
	→ HoierM_ joined	11:30
	← jaziz1 left	11:31
	← mischat left	11:32
	→ str joined	11:32
	← mischat_ left	11:33
	→ mischat joined	11:34
	← Cabanossi left	11:35
	→ tourdownunder joined	11:36
	→ Cabanossi joined	11:36
	← wakd left	11:36
	← Chuguniy left	11:39
	→ D630 joined	11:42
	← HoierM_ left	11:42
	→ mdbk joined	11:44
	→ livingstn joined	11:47
	→ noob_on_rails joined	11:48
	→ wakd joined	11:49
noob_on_rails	Im working with a friend on a project/repo , we have the master branch(default) and then the stage branch which we update so it gets merged with the master , so we both branch from stage when we develop	11:49
	→ Chuguniy joined	11:49
noob_on_rails	now while i had branched from stage , my friend pushed a bug fix on stage branch	11:49
	how can i get the changes in my stage branch AND the branch im working on at the moment ?	11:50
	← prokbird left	11:51
	← str left	11:51
	← tourdownunder left	11:52
	→ prokbird joined	11:53
	← sarri left	11:53
	← xaxxon left	11:53
	→ zuck05 joined	11:53
	← scottjl left	11:55
	→ HoierM_ joined	11:56
	→ caper joined	11:59
	→ scottjl joined	11:59
	→ thebope_ joined	11:59
	← thebope left	11:59
	→ synthroid joined	12:00
	← sbasso left	12:00
	→ Noodlewitt joined	12:00
	→ sarri joined	12:01
	← sarri left	12:01
	→ sarri joined	12:01
	→ TheCycoONE joined	12:03
	→ synthroi_ joined	12:03
	← antoine left	12:05
	← TheCycoONE left	12:06
	← synthroid left	12:06
	← Levex left	12:06
	→ sbasso joined	12:07
	← prokbird left	12:08
	← Noodlewitt left	12:10
	← Snugglebash left	12:10
	→ kelvah joined	12:13
	→ cstratak_ joined	12:14
	← bongjovi left	12:15
	→ MineCoins joined	12:15
	← Cerise left	12:15
	← marcogmonteiro left	12:15
	← d^sh left	12:16
	→ Cerise joined	12:16
	← Cerise left	12:16
	→ Cerise joined	12:16
	← cdown left	12:16
	→ Noodlewitt joined	12:17
	← cstratak left	12:18
	← Cabanossi left	12:19
	← ayogi left	12:19
	→ prokbird joined	12:20
	→ Acerific joined	12:20
	← Acerific left	12:20
	→ Acerific joined	12:20
	→ dglambert joined	12:21
dglambert	yo	12:21
	→ Cabanossi joined	12:21
mac-	hey, when I execute 'git log --all' then all branches will be listed, right ?	12:22
	I mean commited changes in all branches	12:22
	→ Cavallari joined	12:22
	→ valhala_22 joined	12:23
	→ Masber_080 joined	12:24
	← mdbk left	12:26
	→ mdbk joined	12:27
	← masuberu left	12:28
osse	mac-: Yes	12:31
	Potentially even more	12:31
	← aavrug left	12:31
mac-	and my question is, how can I request that every record will show its branch name ?	12:31
	→ LTRand joined	12:32
	→ bongjovi joined	12:32
	← Noodlewitt left	12:32
osse	You can't because git doesn't know	12:32
	→ tsdev joined	12:33
mac-	I think it knows when git is able to give output for --graph flag	12:33
	→ EDAKIRI joined	12:34
	→ Snugglebash joined	12:34
osse	It knows the parents of commits and draws the graph that way, like a linked list	12:34
	But it doesn't know whether any branch was renamed or rebased, and after merges and rebases it doesn't know on which branch a commit came from	12:35
	→ d^sh joined	12:36
	→ Kaisyu joined	12:36
	→ dendazen joined	12:37
	← miklcct left	12:37
	→ Noodlewitt joined	12:38
mac-	yeah I noticed that after I had done 'merge commit' and was trying to revert it I had to show which linked commit of two is the master one	12:38
	← d^sh left	12:38
	← yqt left	12:38
	→ fakenerd joined	12:39
	← Noodlewitt left	12:39
	← mdbk left	12:40
	→ mdbk joined	12:40
	← safe left	12:41
	← mdbk left	12:41
	→ mdbk joined	12:41
	← mdbk left	12:42
	← sbasso left	12:42
	→ mdbk joined	12:43
	→ miklcct joined	12:43
	→ d^sh joined	12:43
	→ Levex joined	12:43
	→ jstimm joined	12:43
	← mdbk left	12:44
	→ mdbk joined	12:44
	← mdbk left	12:45
	→ mdbk joined	12:46
	→ smurfendrek123 joined	12:46
	← mdbk left	12:46
	→ mdbk joined	12:47
	← miklcct left	12:48
	→ wandering_vagran joined	12:48
	→ cdown joined	12:49
	← Cabanossi left	12:50
	→ miklcct joined	12:50
	→ Cabanossi joined	12:51
	→ marcogmonteiro joined	12:51
	← a_thakur left	12:51
	← ShapeShifter499 left	12:52
	→ zumba_addict joined	12:53
	← rokups left	12:53
	→ cdg joined	12:54
zumba_addict	I'm still why this happened yesterday. I did a git clone then I made some updates and pushed it successfully. I ran git pull then I got merge conflicts. I rm -rf it and did a git clone to get a clean copy. Why did that conflict happen?	12:55
	← tsdev left	12:55
zumba_addict	Ooops, I'm still wondering why^	12:55
	→ tunekey joined	12:55
	→ re1 joined	12:56
	→ Cassiopaya joined	12:57
	← Masber_080 left	12:57
	→ sbasso joined	12:58
	→ masuberu joined	12:58
	← zumba_addict left	12:59
	← mdbk left	13:00
	→ RBoreal_Frippery joined	13:00
	→ prg3 joined	13:00
	→ robattila256 joined	13:00
	→ a_thakur joined	13:01
	→ bahamas joined	13:01
	← a_thakur left	13:02
	→ a_thakur_ joined	13:02
	← jstimm left	13:03
	← caper left	13:03
	← livingstn left	13:04
	← miklcct left	13:04
	→ fission6 joined	13:04
	→ ExoUNX joined	13:05
	→ mizu_no_oto joined	13:05
	→ j08nY joined	13:05
	→ a_thakur joined	13:06
	→ caper joined	13:06
	← a_thakur_ left	13:07
	→ miklcct joined	13:07
	→ Vasya666 joined	13:10
	← ertes left	13:11
	← maroloccio left	13:14
	← NeXTSUN left	13:14
	→ dege joined	13:15
	→ kvaz joined	13:16
	→ btree joined	13:17
cjohnson	somebody else pushed some conflicting changes, or your local updates included rewritten history	13:17
	and you didn't force push the rewritten history	13:17
	← Cabanossi left	13:18
	→ Cabanossi joined	13:21
	→ GT4066 joined	13:23
	← pxs left	13:23
	← a_thakur left	13:23
	→ a_thakur joined	13:24
	← Cavallari left	13:24
	← sbulage left	13:25
	→ livingstn joined	13:26
	← absence left	13:26
	← jknetl left	13:27
	→ griffindy joined	13:28
	← cyphase left	13:28
	→ iffraff joined	13:28
	← bongjovi left	13:29
	← m0viefreak left	13:30
	← iffraff left	13:30
	→ iffraff joined	13:30
	→ geojunkieSCI joined	13:30
	→ ilyaigpetrov joined	13:31
	→ mischat_ joined	13:31
	→ Gustavo6046 joined	13:32
	→ cyphase joined	13:33
	← Snugglebash left	13:35
	← revinard left	13:35
	← ij left	13:35
	→ synthroid joined	13:35
	← mischat left	13:35
	← ufk left	13:35
	→ cev joined	13:36
	→ Snugglebash joined	13:36
	→ sondr3 joined	13:36
	→ revinard joined	13:37
	← revinard left	13:37
	→ NeXTSUN joined	13:37
	→ revinard joined	13:37
	→ sbulage joined	13:38
	→ Es0teric joined	13:38
	← synthroi_ left	13:38
	← SkyPatrol_ left	13:39
	← valhala_22 left	13:39
	← fission6 left	13:40
	→ SkyPatrol joined	13:40
	→ valhala_22 joined	13:40
	← thebope_ left	13:41
	← sondr3 left	13:42
	← valhala_22 left	13:42
	→ valhala_22 joined	13:43
	→ thebope joined	13:44
	← BSAlb left	13:44
	← Cabanossi left	13:49
	← sbulage left	13:49
	← synthmeat left	13:49
	→ synthmeat joined	13:50
	→ iota_pi joined	13:50
	→ BSaboia joined	13:50
	← revinard left	13:50
	← rscata left	13:51
	→ Cabanossi joined	13:51
	→ sim590_ joined	13:51
	→ fission6 joined	13:52
	→ BSAlb joined	13:52
	← kaldoran left	13:53
	← sim590 left	13:54
	sim590_ → sim590	13:54
	← Acerific left	13:54
	← robnester left	13:55
	→ robnester joined	13:55
	← BSaboia left	13:55
	→ kaldoran joined	13:55
	→ ResidentBiscuit joined	13:56
	← geojunkieSCI left	13:57
	← valhala_22 left	13:57
	→ jagob joined	13:57
	→ valhala_22 joined	13:57
	← Vasya666 left	13:58
	← Es0teric left	13:59
	→ geojunkieSCI joined	13:59
	→ dave0x6d joined	13:59
	→ sbulage joined	14:01
	→ AaronMT joined	14:02
	→ Sonderblade joined	14:02
	→ Es0teric joined	14:02
	← dsdeiz left	14:03
	← kelvah left	14:03
	← Cassiopaya left	14:03
	← Snugglebash left	14:04
	→ rchavik joined	14:04
	→ TbobbyZ joined	14:05
	← chachasmooth left	14:06
	← qt-x left	14:07
	→ chachasmooth joined	14:08
	→ ansimation joined	14:08
	→ maroloccio joined	14:09
	← dec0n left	14:10
	→ lindenle joined	14:11
	→ TheFuzzball joined	14:13
	← Levex left	14:15
	← bahamas left	14:15
	← lindenle left	14:17
	← strugee left	14:17
	← valhala_22 left	14:18
	→ strugee joined	14:20
	→ kelvah joined	14:21
	→ thebope_ joined	14:21
	→ valhala_22 joined	14:21
	← jwest left	14:22
	← thebope_ left	14:22
	→ jwest joined	14:22
	← thebope left	14:22
	→ rmesta joined	14:24
	→ thebope joined	14:24
	← rmesta left	14:24
	→ rmesta joined	14:24
	← aspiers left	14:24
	← om_henners left	14:25
	← rmesta left	14:25
	← LTRand left	14:26
	← Rotaerk left	14:26
	→ fahadash joined	14:27
	→ om_henners joined	14:27
	→ mtiernan joined	14:27
	→ LTRand joined	14:27
	← mtiernan left	14:28
	→ adiabatic joined	14:29
visual	hello gits	14:29
	attempting to rename a local branch (the remote branch has already been merge and is _non_ existant at this point)	14:29
	→ Echo6 joined	14:29
visual	is there anything i should be aware of? any complications that might arise? or a simple branch -m old new will work like a sexy thing?	14:30
	→ HardlySeen joined	14:30
matthiaskrgr	it should work yes	14:30
Echo6	We have a project with three different pieces (Web Application, Android App, iOS App). Given that we are using three different IDE's should these be in one Git repo or 3 Git repos?	14:31
	← cdg left	14:31
	← mikecmpbll left	14:31
visual	matthiaskrgr: you are correct, thanks for inspiring confidence!	14:31
matthiaskrgr	:D	14:32
	← CandyAngel left	14:32
matthiaskrgr	you can check with git branch -a if there is still some leftover branch (like origin/post-rename)	14:32
visual	Echo6: you can add the ide-specific files (.idea-config, .sublime-project, w/e...) to the git, and the repo can stay the same	14:32
	HOWEVER	14:32
	how are your files the same if you develop in both Android App AND iOS App? :I, i would recommend using 3 different repos for those	14:33
	← kvaz left	14:33
	→ kurkale6ka joined	14:33
	→ mikecmpbll joined	14:33
visual	supposing you want to revert android's app in leu of a new version /android/ version coming out which would allow you to replace a functionality thingy with something better, but you'd have to revert to do that..	14:34
	also branching would be weird with 3 repos at the same time	14:34
	FUCK	14:34
Echo6	They aren't the same, that was part of the debate. We could have one root folder call "ProjectName" and three child folders called "Web","Android","iOS" and check them into a single repo but that doesn't seem like a good idea.	14:34
visual	matthiaskrgr: that was all to you. and the ide-specific files should be added to .gitignore	14:34
matthiaskrgr	oO what	14:34
visual	i highlighted Echo6 instead of you matthiaskrgr at first, my bad	14:35
	yeah man, folders called "Web","Android","iOS" and check them into a single repo but that doesn't seem like a good idea.	14:35
	it really doesnt	14:35
matthiaskrgr	but I didnt say anything about different repos ??	14:35
	I'm confused	14:36
	← justan0theruser left	14:36
Echo6	Ok, thanks for the confirmation visual.	14:36
visual	oh wait fuck, that was Echo6	14:36
	→ freimatz joined	14:36
	← kurkale61 left	14:36
	← Echo6 left	14:36
visual	sorry man, 5:36Pm on a friday, and im out of it	14:36
	it's even thurdsay, jesus christ my brain is fried	14:36
	← shinnya left	14:37
	→ d10n-work joined	14:37
	← LTRand left	14:38
	→ justan0theruser joined	14:39
	→ mstenta joined	14:40
	→ thebope_ joined	14:41
mstenta	I have a question: I merged some sub-repos into a parent repo (because I'm going to maintain them all in one now instead of separately). I used these instructions: http://nuclearsquid.com/writings/subtree-merging-and-you	14:42
	Is there a way to view the history of a sub-folder (that used to be a separate repo) with git log? Currently it only shows up to the merge commit, but nothing before.	14:43
	→ cookra joined	14:43
	← gargola left	14:43
mstenta	I can view all the commits with a visualizer like gitk or gitg, but I'm wondering how to best view a single file's commit history, beyond the merge commit.	14:43
	Is it possible?	14:43
qqx	mstenta: `git log --follow <file>`	14:44
	← xaa left	14:44
	← prokbird left	14:45
mstenta	qqx: I tried that, but it doesn't seem to be working for some reason.	14:45
	qqx: Worth noting, I merged multiple repos into subdirectories all at once (with an octopus merge commit). Could that be why --follow isn't working?	14:46
	← sbulage left	14:46
	→ aspiers joined	14:46
	← Murii left	14:46
	← valhala_22 left	14:47
	← iffraff left	14:47
	dhollin3 → dhollinger	14:49
	← Cabanossi left	14:50
	→ Levex joined	14:50
	← Khisanth left	14:51
	→ Cabanossi joined	14:51
	→ valhala_22 joined	14:52
	← a_thakur left	14:53
mstenta	qqx: Hmm. I used the "ours" merge strategy when I performed the merge... I wonder if that's the cause? Maybe I should have used "-s octopus" instead.	14:54
	I will give that a try and see if it makes a difference... if it does then I will have learned yet another new thing about Git!	14:54
qqx	I wouldn't expect using an ocopus merge or the choice of strategy to make a difference.	14:54
	← mischat_ left	14:56
	→ yqt joined	14:56
	→ yehowyada joined	14:58
	← sunri5e left	14:59
	← duderonomy left	14:59
	← Silmarilion left	14:59
	← Es0teric left	14:59
	→ sunri5e joined	15:00
mstenta	qqx: hmm yea - looks like i can't even do an octopus strategy anyway: "Unable to find common commit with farm_log/7.x-1.x"	15:01
	→ mischat joined	15:02
	← mischat left	15:02
	→ mischat joined	15:03
	→ kurkale61 joined	15:03
	→ thiago joined	15:04
	→ Khisanth joined	15:05
	← Zarthus left	15:05
	Zarthus_ → Zarthus	15:05
	→ LionsMane joined	15:05
	← mizu_no_oto left	15:05
	← valhala_22 left	15:05
	← kurkale6ka left	15:05
	→ crose joined	15:05
	→ bathtub_shark joined	15:05
	← Zarthus left	15:08
	bathtub_shark → Zarthus	15:08
	→ Zarthus_ joined	15:08
	→ a_thakur joined	15:09
	→ lufei joined	15:09
	← LionsMane left	15:09
	→ jnavila joined	15:09
	← rorro left	15:09
	← cstratak_ left	15:10
	→ SkyPatrol_ joined	15:10
	← acetakwas left	15:10
	→ valhala_22 joined	15:10
	← adiabatic left	15:10
	← mikecmpbll left	15:10
	← overlord_tm left	15:10
	→ kurkale6ka joined	15:11
	→ leeN joined	15:11
	← sz0 left	15:12
	← geojunkieSCI left	15:12
	→ mikecmpbll joined	15:12
	← SkyPatrol left	15:12
	→ dsdeiz joined	15:13
	← dsdeiz left	15:13
	→ dsdeiz joined	15:13
	→ cam27 joined	15:13
mstenta	qqx: hmm i found this https://stackoverflow.com/questions/10918244/git-subtree-without-squash-view-log	15:13
	sounds like maybe it's a known limitation	15:13
	← kurkale61 left	15:14
	→ geojunkieSCI joined	15:14
mstenta	qqx: i'm going to try this instead: https://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/	15:15
	→ smurfendrek123_ joined	15:16
	← smurfendrek123 left	15:17
	← GT4066 left	15:18
	→ Snugglebash joined	15:19
	→ acetakwas joined	15:20
valhala_22	how can i push all the files as i also want to ignore some files declared in gitignore one .	15:21
	← caper left	15:21
	→ rorro joined	15:22
	← synthroid left	15:22
	→ caper joined	15:23
	← grayjoc left	15:23
	→ zivester joined	15:24
	→ levex_ joined	15:24
	→ grayjoc joined	15:26
	← valhala_22 left	15:26
	← Levex left	15:27
	→ LeBlaaanc joined	15:27
	levex_ → Levex	15:27
	← smurfendrek123_ left	15:28
	→ sq-one joined	15:28
	← ogny left	15:29
	← thiago left	15:30
	→ Darren_ joined	15:31
	← dsdeiz left	15:32
	→ onehrxn joined	15:32
	→ smurfendrek123_ joined	15:33
	← borkr left	15:33
	→ ghormoon joined	15:33
	← onehrxn_ left	15:34
	← onehrxn left	15:34
	← Levex left	15:34
	→ Levex joined	15:35
	← Cabanossi left	15:35
	→ Cabanossi joined	15:36
	← lufei left	15:36
	→ lufei joined	15:36
	← lufei left	15:37
	← Snugglebash left	15:38
	→ Sound joined	15:38
	← ghormoon left	15:39
	→ ghormoon joined	15:39
	→ Snugglebash joined	15:41
	→ jackrandom joined	15:41
	← sbasso left	15:43
	← inovas left	15:43
	← MineCoins left	15:43
	← joeytwiddle left	15:43
	→ sbasso joined	15:43
	→ valhala_22 joined	15:44
	→ joeytwiddle joined	15:44
	→ brent__ joined	15:45
	← AlgorithmWizard left	15:45
	→ inovas joined	15:46
	→ raynold joined	15:46
	→ madewokherd joined	15:46
	← valhala_22 left	15:47
	→ pelegreno___ joined	15:47
	← netj left	15:47
	→ netj joined	15:47
	← mstenta left	15:47
	→ borkr joined	15:47
	→ mstenta joined	15:48
	← sbasso left	15:48
	← smurfendrek123_ left	15:48
	→ smurfendrek123_ joined	15:49
	→ AlgorithmWizard joined	15:49
	→ LionsMane joined	15:51
	← alexandre9099 left	15:53
	→ alexandre9099 joined	15:53
	← thebope left	15:53
	← romank left	15:53
	← masuberu left	15:53
	← fakenerd left	15:54
mstenta	i have three repositories: A, B, and C. I want to merge B and C into A. They do not share a common ancestor, but they do not have any conflicting files.	15:54
	→ romank joined	15:54
mstenta	If I have A checked out, and B and C as local branches, and run "git merge A" - it works to merge A.	15:55
	And likewise, "git merge B" works to merge B	15:55
	→ MineCoins joined	15:55
mstenta	(oops, meant to say "merge B" and "merge C" in those last two...)	15:55
	→ govg joined	15:56
mstenta	But, if I try to merge B and C in the same commit, it fails ("git merge B C"): "Unable to find common commit with B"	15:56
	→ thebope joined	15:56
mstenta	Why would that be?	15:56
	None of them have common ancestor commits.	15:57
	← dendazen left	15:57
mstenta	So why would the merge work when it is just merging a single branch, but not when it's merging multiple branches?	15:57
	← mischat left	15:57
canton7	they are different merge algorithms	15:57
	← Snugglebash left	15:57
	← IRQ` left	15:58
	→ maarhart joined	15:58
canton7	the octopus merge (which can merge multiple heads in one commit) isn't as advanced (since it's very rarely used), and presumably can't handle the case of having no common history	15:58
	→ raspado joined	15:58
	← romank left	15:59
mstenta	canton7: ah ok... so it's just a current limitation of the octopus strategy, i see	16:00
	a feature request is in order?	16:00
	→ raspado_ joined	16:01
canton7	current and future most likely :P I'm not following the mailing list these days, but I'd be very surprised if there was any motivation to add support for this to octopus merge	16:01
	← raspado left	16:03
	← raspado_ left	16:04
	→ mischat joined	16:04
	→ royho joined	16:05
	← royho left	16:05
	→ mel00010 joined	16:06
	← maarhart left	16:06
	← lordjancso left	16:07
	→ orbyt_ joined	16:09
	← jab416171 left	16:10
	→ hobodave joined	16:10
	→ gargola joined	16:11
	← zuck05 left	16:12
	← d^sh left	16:15
	← wandering_vagran left	16:16
	→ fakenerd joined	16:17
	→ cstratak joined	16:17
	→ GT4066 joined	16:18
	← Cabanossi left	16:19
	→ wandering_vagran joined	16:19
	→ jab416171 joined	16:19
	→ kfoonamalik joined	16:20
	→ cdg joined	16:20
	← rorro left	16:20
	→ d^sh joined	16:21
	→ Cabanossi joined	16:21
	→ QwertyDragon joined	16:21
	QwertyDragon → Guest48204	16:22
	← d^sh left	16:22
	← Guest48204 left	16:22
	← mattcen left	16:23
	← Naan left	16:23
	→ d^sh joined	16:23
	→ QwertyDragon_ joined	16:24
	← QwertyDragon_ left	16:24
	→ synthroid joined	16:24
	→ webdev007 joined	16:24
	→ sbasso joined	16:25
	→ QwertyDragon_ joined	16:25
	← mischat left	16:25
	→ mattcen joined	16:25
	← Muzer left	16:28
	→ awc737 joined	16:29
	← kelvah left	16:30
	← mikecmpbll left	16:30
	← Chuguniy left	16:30
	← LionsMane left	16:32
	← cev left	16:33
	→ kvaz joined	16:33
	← a_thakur left	16:33
	← D630 left	16:34
	← kurkale6ka left	16:35
	→ rorro joined	16:36
	→ nitric joined	16:37
	← wandering_vagran left	16:38
	← winfli left	16:38
	→ winfli joined	16:39
	← robnester left	16:39
	→ robnester joined	16:40
fission6	i have not pushed upstream, how do i add a file to a commit which is the second to last commit i made	16:40
	kind of like --amend but for a commit thats a pinch further back	16:40
	→ tvm joined	16:40
	← chichou left	16:41
canton7	fission6, 'git commit --fixup commit_to_add_to', followed by 'git rebase -i --autosquash commit_to_add_to^' (that ^ is deliberate)	16:42
	if you've got some config set up (I forget whether it's set up by default, you can skip the --autosquash)	16:42
tvm	hi guys, i've been struggling with this: http://imgur.com/a/1BMHw - the problem is quite obvious from the screenshot. The repo is mounted over SMB (not ideal, i know), but why git on the Windows box sees the file as if it has changed permissions ?	16:42
	← sbasso left	16:43
fission6	canton7 wow way to complex, im just gonna add in a new commit	16:43
	→ sbasso joined	16:43
Eugene	tvm - Windows git is not good with permissions. `git config core.fileMode false` will make it ignore them	16:43
	← MineCoins left	16:43
canton7	fission6, yeah you add it to a new commit, then you rewrite history to combine that new commit with the one you want to modify	16:43
Eugene	tvm - git stores the UNIX execute bit(+x); Windows/NTFS has no direct equivalent, so yeah.... its dumb	16:43
canton7	if you want to you can skip the --fixup and --autosquash, and set up the fixup in the rebase -i editor window that comes up	16:44
tvm	Eugene, thanks! I'll try.	16:44
Eugene	tvm - also, I do not recommend using a repo over SMB. I have seen Samba locking behaviour "eat" a .git repository first-hand, its pretty annoying	16:45
tvm	Eugene, yeah, i've noticed that it's quirky :/	16:45
	→ svm_invictvs joined	16:45
tvm	but I wasn't able to come up with better solution	16:45
	it's windows host with vbox linux guest	16:46
Eugene	"just make another clone" usually works ;-)	16:46
	You can use push/fetch(over SSH) to move things between windows and linux just fine	16:46
tvm	well, the guest also runs apache/postgres and what not and i use it for testing as i go and before i commit	16:47
	core.filemode solved this though	16:47
Eugene	Or, and I am assuming that you are using Windows for an editor, you can just not run `git` from the Windows side.	16:47
	← awc737 left	16:48
tvm	yeah, that's also another option	16:48
	← sbasso left	16:48
tvm	but as it is now, it's good enough	16:48
Eugene	!next	16:48
gitinfo	Another satisfied customer. NEXT!	16:48
	← acetakwas left	16:48
	→ ac3takwas joined	16:48
	→ acetakwas joined	16:49
tvm	:D	16:49
	→ awc737 joined	16:49
	→ MineCoins joined	16:49
	← nanga left	16:50
	→ nanga joined	16:50
	← peepsalot left	16:50
	→ Stumbler joined	16:50
	→ scoobert1on joined	16:50
	← armyriad left	16:50
	→ bernd27 joined	16:50
	← storrgie left	16:51
	← enckse left	16:51
	← awc737 left	16:51
	→ sbasso joined	16:52
	← TheFuzzball left	16:52
	→ enckse joined	16:52
	← jackrandom left	16:53
	→ armyriad joined	16:53
	→ TbobbyZ_ joined	16:53
	→ storrgie joined	16:53
	← scoobertron left	16:55
	→ pxs joined	16:56
	← NeXTSUN left	16:56
	← acetakwas left	16:56
	← ac3takwas left	16:56
	← TbobbyZ left	16:57
	→ FuzzyWuzzyPanda joined	16:57
	→ tedwing joined	16:58
	→ acetakwas joined	16:58
	← TbobbyZ_ left	16:58
	→ peacememories joined	17:00
	→ Muzer joined	17:00
	→ mischat joined	17:00
	← mischat left	17:00
	← tedwing left	17:01
	← crose left	17:01
	→ duderonomy joined	17:01
	→ raspado joined	17:02
	← kaldoran left	17:02
	→ lafleurdubien joined	17:03
	← grayjoc left	17:03
	← sim590 left	17:03
	→ sim590 joined	17:03
	→ thiago joined	17:03
	→ kaldoran joined	17:05
	→ lindenle joined	17:05
	→ TbobbyZ joined	17:07
	← cdg left	17:07
	← Silenced left	17:08
	← lindenle left	17:09
	→ lindenle joined	17:09
	→ perrier-jouet joined	17:09
	→ cdg joined	17:10
	→ PMunch joined	17:11
	← rchavik left	17:12
	← cdown left	17:13
	← sq-one left	17:14
	← Kartagis left	17:15
	→ cdown joined	17:15
	← reynierp left	17:16
	← jnavila left	17:16
	← prg3 left	17:16
PMunch	Hi, I contributed a pull request to a GitHub repository and when I wanted to contribute with another one I managed to mess up. I created a new branch (but forgot to switch to it), I then fetched that branch to be up to date with the current devel branch and made my changes. I then added the file and pushed to GitHub. This obviously meant that my old pull request now has changes that doesn't belong there. How can I go back to the old commit for that branch so I	17:17
	can do that properly?	17:17
	← FuzzyWuzzyPanda left	17:17
	→ NeXTSUN joined	17:17
Eugene	PMunch - !fixup is a great place to start with this type of question	17:17
gitinfo	PMunch: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	17:17
Eugene	PMunch - the easiest thing to do is to close the existing PR on Github; leave a comment that you will open a new one so it isn't too embarassing.	17:18
	← navidr left	17:18
PMunch	Yeah I thought about that, but that would leave all the comments with the old PR..	17:19
Eugene	Fix up your branches(you may need to push -f; be careful not to lose any work), push, and start over	17:19
	← govg left	17:19
Eugene	That's OK, people are pretty smart. Just reference the old PR # in the description of the new one. They'll either figure it out, or you will get banninated from the community and in that case you probably don't want to contribute anyway ;-)	17:20
	← Cabanossi left	17:20
	← synthroid left	17:20
Eugene	It will be less confusing than if you try to push over a bad PR	17:20
	← Kaisyu left	17:20
PMunch	Haha, fair point	17:20
	→ steeze joined	17:20
steeze	is it possible to cherry pick a list of commits from another branch, but based on the output of a command?	17:21
	→ Cabanossi joined	17:21
steeze	not using the cherry pick range functionality, but im thinking i could write a script to loop over hashes from a filtered git log	17:21
	→ al-damiri joined	17:21
Eugene	Sure, cherry-pick doesn't care how/where the commits you feed it come from.	17:22
	← YuGiOhJCJ left	17:22
PMunch	Aah, thanks Eugene the link you provided helped :)	17:22
	← _ADN_ left	17:23
	→ govg joined	17:23
Eugene	steeze - you probably want to use a plumbing command like `git rev-list` instead of log(which is intended for humans)	17:23
steeze	ah thanks for that! yeah i was about to use awk haha	17:24
	→ LeBlaaan_ joined	17:24
steeze	so i was using this command `git log --first-parent --no-merges` but not sure how to do the same thing with rev-list	17:24
	im basically wanted all commits that were only to that branch and weren't merges	17:25
Eugene	Yeah, that's a recipe for pain heh. Also see the custom formats section in man git-log; you can have it spit out what you need instead of awk-ing it	17:25
gitinfo	the git-log manpage is available at https://gitirc.eu/git-log.html	17:25
steeze	awsome, thanks for the resources!	17:25
	← LeBlaaanc left	17:25
	← winfli left	17:26
	← perrier-jouet left	17:26
	→ perrier-jouet joined	17:27
	← EDAKIRI left	17:31
	→ Aeterne joined	17:31
	→ EDAKIRI joined	17:31
	← EDAKIRI left	17:32
	→ EDAKIRI joined	17:32
	→ Pseudocrat joined	17:33
	← Pseudocrat left	17:33
	→ Pseudocrat joined	17:33
	→ gopar joined	17:34
	← thiago left	17:35
	← j08nY left	17:36
	← peacememories left	17:36
	← d^sh left	17:37
	→ FuzzyWuzzyPanda joined	17:37
	→ synthroid joined	17:37
	← walafa left	17:39
	→ j08nY joined	17:39
	← NeXTSUN left	17:40
	→ mischat joined	17:43
	→ crose joined	17:44
	→ d^sh joined	17:46
	← pbandark left	17:47
	← RBoreal_Frippery left	17:47
	← strugee left	17:47
	← mischat left	17:47
	→ joshszep joined	17:48
	→ jaziz joined	17:49
	→ jnavila joined	17:49
	→ NeXTSUN joined	17:51
	← NeXTSUN left	17:51
	← kvaz left	17:51
	→ strugee joined	17:52
	← _ng left	17:54
	← orbyt_ left	17:56
	← itseris left	17:56
	→ itseris joined	17:58
	← thebope left	17:58
	→ prokbird joined	17:58
	→ orbyt_ joined	18:00
	← orbyt_ left	18:01
steeze	is it possible to cherry-pick and _always_ pick the new commit on merge conflicts?	18:01
	→ thebope joined	18:01
	→ prg3 joined	18:02
	← diogenese left	18:02
	← EDAKIRI left	18:04
	← jnavila left	18:04
	→ Sasazuka joined	18:05
	→ NotreDev joined	18:06
steeze	i guess this is a bash question now, but i would think this would work `${ output of command to grab hashes i want to merge} \| xargs -n 1 git cherry-pick --strategy=recurisve -X theirs $1`	18:07
	← Pseudocrat left	18:09
	← cdown left	18:09
	← crankslider left	18:09
	→ orbyt_ joined	18:10
	← prg3 left	18:13
	← jaziz left	18:15
	← orbyt_ left	18:17
	← mstenta left	18:17
	← Bock left	18:18
	← Cabanossi left	18:19
	← jagob left	18:19
	→ orbyt_ joined	18:19
	→ diogenese joined	18:20
	← orbyt_ left	18:20
	← achadwick left	18:20
	→ Cabanossi joined	18:21
	→ fu-fu joined	18:22
fu-fu	Grettings, I have found some fun!	18:22
	→ orbyt_ joined	18:23
	→ TbobbyZ_ joined	18:23
	← orbyt_ left	18:23
	→ Dougie187 joined	18:23
	← crose left	18:24
	← Emperor_Earth left	18:24
fu-fu	So, there's a branch of a project that... seems to have just started off by copying all the files, without actually making a git branch/reference... and I'm trying to re-attach it.	18:24
	→ Tobbi joined	18:24
	→ rmesta joined	18:26
	← TbobbyZ left	18:26
	← sbasso left	18:26
fu-fu	aand suddenly interrupted, be back later.	18:27
	← fu-fu left	18:27
	→ sbasso joined	18:27
	← TbobbyZ_ left	18:28
	← jstein left	18:28
	← FuzzyWuzzyPanda left	18:28
	→ Acerific joined	18:29
	← Acerific left	18:29
	→ Acerific joined	18:29
	← cdg left	18:30
	← brent__ left	18:30
	→ FuzzyWuzzyPanda joined	18:30
	→ orbyt_ joined	18:31
	→ zzz joined	18:31
	← zzz left	18:31
	← sbasso left	18:32
	→ TbobbyZ joined	18:32
	← Tobbi left	18:34
	→ peepsalot joined	18:34
	→ Achylles joined	18:37
	← marcogmonteiro left	18:40
	→ RBoreal_Frippery joined	18:40
	→ cis_admin joined	18:43
	→ relipse joined	18:45
relipse	I merged a branch foo into develop and pushed, is there a way to undo my merge?	18:45
oprypin	relipse, with the usual warnings about force pushing...	18:46
	find the commit id of what the `develop` branch used to be at before the merge	18:46
	← arecaceae left	18:47
	→ arecaceae joined	18:47
oprypin	git checkout develop && git reset --hard $THAT_COMMIT && git push --force-with-lease	18:47
relipse	That assumes no more have been committed after that	18:47
oprypin	yeah	18:48
relipse	Ok let me check	18:48
	thanks	18:48
	→ sbasso joined	18:48
	← ferr left	18:49
	→ overlord_tm joined	18:50
	← ZyX-I left	18:52
	← PMunch left	18:52
	→ pakus joined	18:52
pakus	Hiya! I need help with my git repository. I've lost a file between two merges and I want to recover it. Can you help me?	18:54
	← rmesta left	18:54
	→ regedit joined	18:54
	← blr left	18:57
	← watersoul left	18:57
	gitinfo set mode: +v	18:57
pakus	Hiya! I need help with my git repository. I've lost a file between two merges and I want to recover it. Can you help me?	18:57
	→ watersoul joined	18:58
	← cookra left	18:58
	← acetakwas left	18:58
	← rivarun left	18:58
	→ Atm0spher1c joined	18:58
	→ rivarun joined	18:58
	← orbyt_ left	19:00
pakus	Can anyone help me with a file disappeared bw merges?	19:00
	→ jnavila joined	19:01
	← TinkerTyper_ left	19:01
	→ TinkerTyper joined	19:02
	← sgen left	19:02
	→ TheWild joined	19:02
TheWild	hello	19:03
	I think I messed something up. git rev-list --all --parents... was that right command?	19:03
	in one repo this work. In another displays usage instead of bunch of hashes.	19:04
	→ gnarf joined	19:05
	→ bodie_ joined	19:05
	→ brent__ joined	19:05
	← ExeciN left	19:05
	→ tymczenko joined	19:06
	→ misosoup joined	19:07
	← Acerific left	19:07
	← jnavila left	19:10
	← iatkotep left	19:10
	← miklcct left	19:10
	← SkyPatrol_ left	19:11
Hello71	!undo	19:12
gitinfo	[!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	19:12
	→ SkyPatrol joined	19:12
pakus	!fixup_hints	19:12
gitinfo	Hints for fixing commits are: (1) NOT PUSHED/PUBLISHED: `git rebase -i $COMMIT^` or perhaps `git commit --amend` (or `git reset HEAD^`). (2) OTHERWISE, `git revert $COMMIT` to make a reverse commit. (3) If you have pushed and MUST remove it, use rebase or filter-branch and type !rewrite in IRC to learn about the implications.	19:12
	→ iatkotep joined	19:13
	← pakus left	19:13
	→ mikecmpbll joined	19:14
TheWild	experiment: I did `git init`, then `git fetch https://the-remote/repo.git`. Succeded but right now I don't have an access to remote repository.	19:14
	`branch -v` doesn't list anything	19:14
	Is there a way to bring this repository to usable state?	19:15
	→ Snugglebash joined	19:15
	← bluepixel left	19:15
grawity	`git fetch <url>` doesn't create any refs other than FETCH_HEAD	19:16
kadoban	TheWild: Typically you add that repository as a remote and then fetch. Then you checkout whichever branches/commits you want.	19:16
grawity	so normally you `git remote add <name> <url>` instead, and fetch that	19:16
TheWild	hmm... say I don't know the branches' names.	19:17
kadoban	If you just 'git remote add origin <theurl> && git checkout master' that'd usually give you pretty much what clone does	19:17
TheWild	git branch -v isn't helping	19:17
kadoban	TheWild: Once you add the remote and fetch normally it'll help	19:17
grawity	it isn't because you didn't tell it to download the branch names	19:17
kadoban	Actually it might be 'git remote -a', or maybe both work, I don't remember offhand.	19:17
	→ jrahmy joined	19:17
kadoban	'git branch -a', sorry.	19:17
	← strugee left	19:20
	→ Cavallari joined	19:22
	← ansimation left	19:24
	→ dviola joined	19:24
	→ cdown joined	19:25
	→ strugee joined	19:25
TheWild	`git branch -a` didn't show anything.	19:27
	The .git directory is 15 MB big, so there must be something!	19:27
grawity	well yes, there is	19:28
kadoban	TheWild: Did you add the remote and then fetch?	19:28
TheWild	Nooo. Okay, I'm doing it ;)	19:28
grawity	tbh I really don't enjoy repeating myself	19:28
	→ nicexe joined	19:32
	← MacWinner left	19:32
	→ ttoocs joined	19:33
ttoocs	Aaand back.	19:33
	→ DaGoaty joined	19:33
TheWild	`git fetch <url>` didn't work. `git remote add origin <url>; git fetch` worked. What the...?	19:34
grawity	22:16 (grawity) `git fetch <url>` doesn't create any refs other than FETCH_HEAD	19:35
ttoocs	So, I have a branch of a project, where the git history is missing, and (at some point) starts occuring again.. but without any prior referances to the main branch. (I have no idea where this branch initally took off from the main project either)	19:35
kadoban	TheWild: There's typically no reason to do 'git fetch <url>', at least in usual workflows.	19:35
TheWild	well, I was doing `git pull <url>`, `git push <url>` so I thought `git fetch` and `git fetch <url>` won't be much different.	19:36
ttoocs	What I did in a vain help it'd just magically work: Put the `branch` into a new git branch. But this seems to indicate it's not the same, as git diff master <file> shows every line as beeing different, while quite a few of them are identical.	19:37
	← GT4066 left	19:37
TheWild	works. grawity, kadoban. Thank you very much.	19:37
	← PCatinean left	19:37
ttoocs	So, is there a nice way to re-intigrate the orphan branch?	19:38
	← dave0x6d left	19:38
	← ePirat left	19:40
	→ zzz joined	19:41
	→ ShapeShifter499 joined	19:41
	← cdown left	19:42
	→ ZyX-I joined	19:42
	← zzz left	19:42
	→ ePirat joined	19:42
	→ xaa joined	19:43
	← sbasso left	19:43
	→ sbasso joined	19:44
	← danemacmillan left	19:44
dodobrain	hi all, can i do an interactive merge?	19:45
	→ mbrevda joined	19:45
dodobrain	like i do `git rebase -i`, i want to be able to drop certain commits	19:45
	← Sound left	19:46
	→ deadserf joined	19:46
	→ zzz joined	19:46
grawity	nope	19:47
	either you merge the entire history, or none of it	19:47
	← cis_admin left	19:47
	← zzz left	19:47
grawity	ttoocs: use `git replace --graft` to link the new branch's first commit to the old branch's last commit	19:47
	→ dsdeiz joined	19:48
	← dsdeiz left	19:48
	→ dsdeiz joined	19:48
dodobrain	umm, the reason i asked is because there are merge conflicts because some devs went crazy and cherry picked the commits in one branch onto the other one!	19:48
	← sbasso left	19:49
dodobrain	so merge is guaranteed to create conflicts (on many many commits) now and those 2 branches should really be merged	19:49
kadoban	cherry-picks don't typically cause that many conflicts that I've experienced	19:49
	→ mfilipe joined	19:51
mfilipe	do you know if it's possible to fetch branch of a remote git repo using directly git-fetch?	19:52
	or do I have to git clone, git fetch and git checkout?	19:52
	← HoierM_ left	19:52
grawity	git fetch <url> <remotebranch>:<localbranch>	19:52
	← dsdeiz left	19:53
grawity	or `git remote add ...`	19:53
	← zivester left	19:53
grawity	generally this is a "but why are you asking this" sort of question	19:53
kadoban	Generally you'd just add a remote and the fetch, because usually you're going to end up wanting either the same remote branch multiple times or multiple remote branches. But yes that does work.	19:54
	← uidzer0 left	19:55
	→ phinxy joined	19:55
	← phinxy left	19:56
	→ phinxy joined	19:56
	→ uidzer0 joined	19:56
	→ Antimachine joined	19:56
ttoocs	grawity: But I don't know where it brached off, there's no real "old branch", just at somepoint someone copyd all the files and made a new git of it, (probably after changes)	19:57
	→ danemacmillan joined	19:57
grawity	nearly the same, just fetch it into the old repo (or the other way around)	19:58
	and now you have a repo with two branches to be linked	19:58
	← deadserf left	19:59
	→ MattMaker joined	19:59
	→ thebope__ joined	19:59
	← ExoUNX left	20:00
	← thebope left	20:00
	→ orbyt_ joined	20:01
dodobrain	ummm, do tools like gitk or simply `git log --oneline --all` have a facility to display only 2 branches ?	20:02
	← caper left	20:02
grawity	git log --oneline branch1 branch2	20:02
dodobrain	oh cool, that is exactly what i want!	20:03
grawity	yes, that --all actually meant "display all branches"...	20:03
	← pxs left	20:03
grawity	you'll probably want --graph or gitk/tig with more than 1 branch though	20:03
dodobrain	yes, i know about all being all branches, didnt know you can specify branches separately	20:03
	thanks	20:03
	→ Acerific joined	20:04
	← ShapeShifter499 left	20:05
	← smurfendrek123_ left	20:07
	→ prg3 joined	20:08
	→ kpease joined	20:11
	→ cdg joined	20:15
	→ smurfendrek123 joined	20:16
	← fahadash left	20:16
	← cdg left	20:17
	→ cdg joined	20:17
	← Snugglebash left	20:17
	→ jstein_ joined	20:17
	← prg3 left	20:19
ttoocs	So, I did this, and I'm trying to understand what the result was...... I'm a little lost.	20:19
	jstein_ → jstein	20:20
	→ shinnya joined	20:20
	← schleppel left	20:22
	→ JanC_ joined	20:22
	← JanC left	20:23
	JanC_ → JanC	20:23
	→ thiago joined	20:24
	← jstein left	20:25
	→ Tobbi joined	20:26
	→ prg3 joined	20:28
	→ LocusAsaf joined	20:31
ttoocs	Yeah, i'm confused.	20:31
	← BSAlb left	20:31
LocusAsaf	I'm getting an non-fast-forward error when executing `git fetch origin refs/heads/mybranch:refs/heads/mybranch` , can anyone explain why or how to fix it?	20:32
	→ f3r70rr35f joined	20:32
LocusAsaf	I read online that you can possible override the error with a --force to the fetch but I don't know the implications there	20:32
	← digidog left	20:33
	← f3r70rr35f left	20:33
	→ f3r70rr35f joined	20:34
kadoban	LocusAsaf: That's not a very usual command, why are you doing that?	20:34
LocusAsaf	kadoban: sure let me explain	20:35
	for our development process we have special branches QA, DEV that represent the code deployed on particular servers	20:35
	during our CI process (gitlab) the tests are run against one or the other particular environment. So for feature branches I created a script to determine which of these environments you are branched from	20:37
	← f3r70rr35f left	20:37
ttoocs	from what understand of git graft, I'm just putting their historys togeather in some weird way.... (without changing the files somehow, isdk.).. I'm trying to merge these two weird branches tho.	20:38
LocusAsaf	the method to do so is to do `git merge-base feature QA`, `get merge-base feature DEV` and then I walk down `git rev-list HEAD` until I hit a SHA that matches the merge-base	20:38
	in order for the merge-base to work git has to know about the branches specified	20:39
	I came in here a week ago to figure out what git command I could use to let it "know" them	20:39
	I ended up with `git fetch origin refs/heads/mybranch:refs/heads/mybranch` on the recommendation of someone in the channel here	20:40
	← prg3 left	20:40
LocusAsaf	kadoban: make sense now?	20:40
ttoocs	So I guess, is there a nice way to merge a branch that was created by just stealing all the files, doing some stuff, at some point re-intigrating git, and kept doing stuff... back into the master branch?	20:40
kadoban	LocusAsaf: brb in a couple and I'll read if nobody else helps first	20:40
LocusAsaf	okay thanks	20:41
	→ f3r70rr35f joined	20:41
	← shinnya left	20:41
	→ Snugglebash joined	20:41
	← Stumbler left	20:41
LocusAsaf	from what I'm reading about git fetch --force in the documentation it says `When git fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of <lbranch>`	20:41
	← f3r70rr35f left	20:41
LocusAsaf	the command I'm executing is such that <rbranch> & <lbranch> are the same branch so I'm not sure why it stopped working all of a sudden	20:42
	it feels like the force would be okay but I want to be sure	20:42
	→ mmercer joined	20:43
mmercer	lo folks; when referring to origin/master and origin/dev, isnt the refhead always refs/heads/master and refs/heads/dev where dev and master are the respective branches on the origin ?	20:43
	or is it refs/heads/origin/{dev,master}	20:43
	← synthroid left	20:44
	→ prg3 joined	20:45
mmercer	nvm, found the answer	20:45
ttoocs	Alt: Is there a good way to find out where a bunch of copy'd files originate from in the git?	20:46
	← dviola left	20:46
ttoocs	AltAlt: Can I check git for a particular version of a file?	20:48
	→ miczac joined	20:49
	gitinfo set mode: +v	20:49
	FuzzyWuzzyPanda → Bishop_Bautista	20:50
	← SkyPatrol left	20:52
	→ ecuanaso joined	20:53
	→ SkyPatrol joined	20:53
	← d10n-work left	20:53
	← HardlySeen left	20:53
	→ Pseudocrat joined	20:55
	← Pseudocrat left	20:56
	→ Pseudocrat joined	20:56
	→ indonesia joined	20:56
	← indonesia left	20:58
	→ Naan joined	20:58
	→ aidalgol joined	20:58
	← mmercer left	20:58
	→ NeXTSUN joined	20:59
	← btree left	20:59
	← Tobbi left	20:59
	→ sbasso joined	21:00
	→ FBIWarning joined	21:03
	← brent__ left	21:03
	← LeBlaaan_ left	21:03
	← Antimachine left	21:05
	← FBIWarning left	21:06
LocusAsaf	kadoban: what do you think?	21:06
	← NeXTSUN left	21:06
	← beerdrop left	21:07
	← TheWild left	21:07
	← plasticle left	21:08
	→ Sound joined	21:09
	→ NeXTSUN joined	21:09
	← freimatz left	21:10
	← misosoup left	21:14
	→ ayogi joined	21:14
	→ mykespb joined	21:17
	← Orion3k left	21:18
	→ beerdrop joined	21:19
	← cstratak left	21:21
	→ _ng joined	21:25
	← madewokherd left	21:26
	← Bishop_Bautista left	21:26
	→ _ADN_ joined	21:27
	← thiago left	21:28
	→ mizu_no_oto joined	21:29
	← ecuanaso left	21:29
	← strugee left	21:30
	→ tvw joined	21:30
	← RBoreal_Frippery left	21:30
	← ilyaigpetrov left	21:30
	→ blr joined	21:33
	← Gustavo6046 left	21:33
	→ strugee joined	21:34
	← askb left	21:35
	→ ecuanaso joined	21:35
	← ttoocs left	21:36
	→ brent__ joined	21:36
	← orbyt_ left	21:36
	← dglambert left	21:37
	← jost left	21:37
	→ dsdeiz joined	21:37
	← Cavallari left	21:38
	← hobodave left	21:39
	→ dave0x6d joined	21:39
steeze	im having an issue where i try to checkout a different branch but it says i cannot because local changes would be overwrriten, but git status shows nothing	21:41
	i had done --skip-worktree on it though. i possibly did that after i had changed the file. is it because it was tracked but then i did skip worktree?	21:42
	(doing --no-skip-tree and manually reversing my edits to bring it back to same as remote worked, but curious what caused this to happen)	21:43
	→ HoierM_ joined	21:44
	← mizu_no_oto left	21:45
	← strugee left	21:46
	← chachasmooth left	21:46
	→ chachasmooth joined	21:48
	← Quetzal left	21:48
	← Cabanossi left	21:48
	→ Gustavo6046 joined	21:50
	→ m0viefreak joined	21:51
	→ Cabanossi joined	21:51
	← Snugglebash left	21:52
	→ strugee joined	21:52
	← _ng left	21:56
	→ askb joined	21:57
	→ Gustavo6046_ joined	21:57
	← bernd27 left	21:58
	← Gustavo6046 left	21:58
	→ RBoreal_Frippery joined	21:59
	← Dougie187 left	21:59
	→ Tobbi joined	22:01
	← xaa left	22:01
	← relipse left	22:01
	← thebope__ left	22:02
	Gustavo6046_ → Gustavo6046	22:02
	→ Cassiopaya joined	22:02
	→ jstein_ joined	22:03
	→ dabukalam joined	22:04
	← geojunkieSCI left	22:05
	jstein_ → jstein	22:06
	→ bvcosta joined	22:06
	→ kyan joined	22:07
	→ geojunkieSCI joined	22:07
jstein	Hi, I defined a [User] in ~/.gitconfig and have a repository in /usr/local/foo where I defined a [User] section with a different mail address. When I go in to the folder /usr/local/foo and type git config -l	22:08
	I get a list including both [User] definitions, but I expect, that the local definition overwrites that in my home folder. Did I miss a point?	22:08
	→ therealGent joined	22:08
	← yqt left	22:09
	→ orbyt_ joined	22:10
	← ecuanaso left	22:11
	← raspado left	22:11
	→ bluepixel joined	22:11
	← fission6 left	22:12
	← tvw left	22:12
	← Achylles left	22:13
	← therealGent left	22:14
	← holodoc left	22:14
Eugene	jstein - what does `git config user.email` say?	22:15
	--list is "all variables set in config files"; I'm unsure that actually reflects what is used at runtime. Eg, as you describe it, you should get the correct "override" behaviour. THat's exactly how its supposed to work ;-)	22:16
	→ thebope joined	22:17
	← gargola left	22:18
	→ holodoc joined	22:18
	← m4sk1n left	22:18
jstein	git config user.email shows the correct mail. Thank you. I understand not the --list has to be read top down and the last variable wins.	22:19
	→ cis_admin joined	22:19
Eugene	!next	22:19
gitinfo	Another satisfied customer. NEXT!	22:19
jstein	;-)	22:19
	← prg3 left	22:20
	→ tvw joined	22:20
	← alexandre9099 left	22:20
	→ alexandre9099 joined	22:21
	→ ecuanaso joined	22:22
	rivarun → Guest82562	22:25
	← Guest82562 left	22:25
	→ rivarun joined	22:25
	→ hagridaaron joined	22:28
	← griffindy left	22:29
	← QwertyDragon_ left	22:30
	← Zialus left	22:31
	→ theoceaniscool joined	22:32
	← Phylock left	22:33
	← dege left	22:33
	← Zarthus left	22:35
	Zarthus_ → Zarthus	22:35
	→ Zialus joined	22:35
	← smurfendrek123 left	22:36
	→ nevodka joined	22:37
	→ jaziz joined	22:38
	→ sythe joined	22:39
	← tvm left	22:42
	← d^sh left	22:43
	← strugee left	22:44
	→ bathtub_shark joined	22:44
	→ d^sh joined	22:45
	→ anuxivm joined	22:45
	← tvw left	22:45
	→ strugee joined	22:47
	← bvcosta left	22:48
	← hagridaaron left	22:49
	→ safe joined	22:50
	← geojunkieSCI left	22:50
	← cis_admin left	22:51
	← DaGoaty left	22:51
	→ DaGoaty joined	22:51
	→ cecilgol joined	22:51
	→ cdown joined	22:51
	← bathtub_shark left	22:52
	← DaGoaty left	22:52
	→ DaGoaty joined	22:52
	← DaGoaty left	22:52
	→ Zarth^s joined	22:52
cecilgol	Hello git - ridiculous question: has anyone here used git to backup a quickbooks DB, or know of any writeups? is that a totally stupid idea?	22:53
	→ DaGoaty joined	22:53
	← DaGoaty left	22:53
Eugene	cecilgol - terrible idea. QB files are !binary	22:53
gitinfo	cecilgol: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	22:53
	→ reynierpm joined	22:53
	→ DaGoaty joined	22:53
Eugene	Just use QB's built-in backups to an external drive or something; they default to creating dated files ;-)	22:54
cecilgol	Eugene: thank you!	22:54
	← DaGoaty left	22:54
	→ tourdownunder joined	22:54
	→ revinard joined	22:54
	← revinard left	22:54
	→ DaGoaty joined	22:54
	← DaGoaty left	22:55
	→ DaGoaty joined	22:55
	← DaGoaty left	22:56
	← Zarth^s left	22:56
	← anuxivm left	22:56
	→ bathtub_shark joined	22:57
	← finalbeta left	23:04
	← Cabanossi left	23:05
	→ caper joined	23:05
	← kpease left	23:06
	→ Cabanossi joined	23:06
	→ CDanU joined	23:07
CDanU	I know that I can decide which hunks I can stage with git add -p, is it possible to pre filter this process? I want to decide about hunks that have a certain word in them.	23:09
	← mel00010 left	23:09
	← ecuanaso left	23:10
	→ menip joined	23:10
cbreak	you can filter them on a file by file basis	23:12
	← tristanp left	23:13
	→ TbobbyZ_ joined	23:13
	→ MacWinner joined	23:13
	← thebope left	23:13
	← prokbird left	23:14
	→ thebope joined	23:14
	← sbasso left	23:14
	→ sbasso joined	23:15
	← TbobbyZ_ left	23:16
	→ TbobbyZ_ joined	23:16
	← TbobbyZ left	23:16
	← peepsalot left	23:17
	← Acerific left	23:18
	← thebope left	23:18
	← sbasso left	23:19
	← nevodka left	23:19
	→ miklcct joined	23:20
	→ Orion3k joined	23:20
	→ ecuanaso joined	23:20
	← MineCoins left	23:21
	← jstein left	23:21
	← AaronMT left	23:21
	→ thebope joined	23:22
	← re1 left	23:22
	← miczac left	23:23
	← mikecmpbll left	23:23
	← steeze left	23:26
	← RBoreal_Frippery left	23:28
	← strugee left	23:28
	← CussBot left	23:30
	← Tobbi left	23:30
	← theoceaniscool left	23:30
	→ CussBot joined	23:31
	← cdg left	23:32
	→ strugee joined	23:34
	→ ToBeCloud joined	23:35
	gitinfo set mode: +v	23:35
	→ Noodlewitt joined	23:37
	← mykespb left	23:38
	→ ertes joined	23:40
	← cam27 left	23:40
	← overlord_tm left	23:40
	← Random832 left	23:41
	← cdown left	23:41
	← TbobbyZ_ left	23:42
	← m0viefreak left	23:42
	→ fu-fu joined	23:42
	→ m0viefreak joined	23:42
	→ TbobbyZ joined	23:42
fu-fu	Hello, I'm aware of git log -S"foobar", but I'm wondering is there a nice way of making the foodbar be an entire file?	23:43
	→ jt joined	23:43
	→ jeffreylevesque joined	23:43
	← ahrs left	23:44
	← borkr left	23:45
	→ ahrs joined	23:45
	← duderonomy left	23:47
	→ thebope__ joined	23:47
	← thebope left	23:48
	← livingstn left	23:48
	→ mel00010 joined	23:48
	← TbobbyZ left	23:49
	→ livingstn joined	23:49
	← tymczenko left	23:49
	→ peepsalot joined	23:54
	← m0viefreak left	23:54
	← Hello71 left	23:54
	→ nidr0x joined	23:56
	← Sound left	23:57
	← bruce_lee left	23:59

Logs Search ←Prev date Next date→

Channels Documentation