IRCloggy #git 2017-11-16

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-11-16
quesker	so the first "commit sdfhs98dfh9s8dhfs9" line is where I am at now, and if I want to go back to the previous way things were I look for the second commit hfd938h938he line and do git checkout hfd938h938he right? this is just temporary and then I want to put things back to current	00:01
	← overlord_tm left	00:01
	← orbyt_ left	00:03
	← pirocks left	00:04
	← finalbeta left	00:04
	← sz0 left	00:05
	← kadoban left	00:05
quesker	I guess I don't want to do that based on git log -- filename but based on git log	00:06
	→ maxb joined	00:08
quesker	hmm I did that checkout git checkout hfd938h938he -- somefile and git status says the file is modified but git diff shows nothing	00:08
	→ overlord_tm joined	00:08
	→ orbyt_ joined	00:09
	← dege left	00:10
	← hexamod left	00:11
	← mcmillhj_ left	00:11
	← tunekey left	00:11
	→ tunekey joined	00:12
	← InfoTest left	00:12
	→ cdg joined	00:13
	← bilb_ono left	00:14
	→ InfoTest1 joined	00:14
parsnip	quesker: there's working tree, index, and various commits. git status may be specific about between which two of those there are changes. git diff can be told to compare between two of those.	00:15
quesker	hmm ok	00:16
	I think it all worked out	00:17
	← cdg left	00:17
	← wxg left	00:18
	← orbyt_ left	00:18
	→ mcmillhj joined	00:19
	← diogenese left	00:22
	← rafasc left	00:22
	→ diogenese joined	00:23
	← mcmillhj left	00:24
	→ jstimm joined	00:24
	← PioneerAxon_ left	00:25
	→ damo22 joined	00:26
	← pks left	00:27
damo22	git is amazing... someone transferred a working tree over to migrate a server, and forgot to include the .git folder, so i thought we had lost the tracking of the version control ... so i just transferred the .git folder over to the new server and git diff just worked !!	00:27
	thats crazy good	00:27
	← robics left	00:28
	← InfoTest1 left	00:28
	← diogenese left	00:29
	→ Feral_Cat joined	00:31
	→ diogenese joined	00:32
	→ olalonde joined	00:33
	→ astrofog joined	00:33
	← overlord_tm left	00:34
	← Murr left	00:34
	→ mcmillhj joined	00:35
	→ Murr joined	00:35
ash_workz	when I do `git log --graph --all` I can follow a line straight down to a commit where a branch is at	00:35
	when I attempt to delete said branch it tells me it's not fully merged	00:35
	if I am on a branch that can go straight down to where that branch left off, that message shouldn't exist right?	00:35
	(rather, I should get that message)	00:35
	→ nowhere_man joined	00:36
damo22	its probably to save you accidently deleting a branch that is ahead of master?	00:36
	in case you wanted to merge it	00:36
	→ NiobiumVolant joined	00:36
ash_workz	hmm... this time when I tried it, it didn't give me that error	00:36
damo22	-d versus -D	00:37
	-D will force delete	00:37
ash_workz	oh	00:37
	I was being retarded	00:37
	I thought I was on a branch that I wasn't on	00:38
	← Acerific left	00:38
damo22	heh	00:38
	git is cool	00:38
	→ lexruee joined	00:38
	← mikecmpbll left	00:39
damo22	my favourite part of git would have to be git rebase -i	00:39
	→ jameser joined	00:39
	← lexruee left	00:39
	← mcmillhj left	00:39
	→ lexruee joined	00:40
	→ rewt joined	00:40
	← lexruee left	00:40
	← astrofog left	00:40
	← scientes left	00:41
damo22	its great to be able to do heaps of atomic commits and then reorder them without breakage... or squash them into a logical kind of change	00:41
	→ lexruee joined	00:41
	← butterthebuddha left	00:43
	← lexruee left	00:43
	← Hink left	00:43
	→ butterthebuddha joined	00:44
	→ lexruee joined	00:44
	← lexruee left	00:44
	→ lexruee joined	00:45
	← lexruee left	00:45
	→ pirocks joined	00:47
	→ mcmillhj joined	00:47
	→ overlord_tm joined	00:47
	← dre_ left	00:47
ash_workz	.a->b	00:47
	. a->b	00:47
	. a>b	00:47
	I forgot the syntax	00:47
	→ s73vm1lls joined	00:48
	← govg left	00:48
	→ nydel09 joined	00:48
ash_workz	.g a->b	00:50
	→ govg joined	00:50
ash_workz	damn	00:50
	← polyrob left	00:50
ash_workz	well, w/e; I have a commit history that looks something like this: http://g.jk.gs/EY.png	00:51
	← simonlin_ left	00:51
	← mcmillhj left	00:51
	← pirocks left	00:51
ash_workz	I suspect that the changes in B1 have made their way down to A5, is there a way to check that?	00:52
	← thebope left	00:52
	→ skypatrol joined	00:53
	→ scientes joined	00:53
	← scientes left	00:53
	→ scientes joined	00:53
	← Samian left	00:54
	→ fstd_ joined	00:54
ash_workz	maybe I can loop all files with changes on B1{^,} and `git diff`those files between commits.	00:54
	← govg left	00:54
	← diogenese left	00:55
	→ diogenese joined	00:55
	→ leprechau joined	00:56
	← leprechau left	00:56
	→ leprechau joined	00:57
	← fstd left	00:57
	fstd_ → fstd	00:57
damo22	ash_workz: how can changes be applied between B1 and A5 if they are on separate branches?	00:58
	your question doesnt make much sense	00:59
	← Gustavo6046 left	00:59
ash_workz	damo22: no I mean like the same changes were made on both branches inadvertently	00:59
	(at some point)	00:59
damo22	so then git lol	00:59
	ash_workz: put this in your .gitconfig:	01:00
	[alias]	01:00
	lol = log --graph --decorate --pretty=oneline --abbrev-commit --all	01:00
	→ mcmillhj joined	01:00
damo22	then just run "git lol"	01:00
	→ pirocks joined	01:00
	← jameser left	01:01
damo22	i dont know how people use git without it	01:01
	→ led_belly_ joined	01:03
	← mcmillhj left	01:05
	← pirocks left	01:05
	← akushner left	01:08
	← led_belly_ left	01:09
	→ bilb_ono joined	01:10
	→ gugah joined	01:10
	→ led_belly_ joined	01:10
	→ orbyt_ joined	01:14
	→ mcmillhj joined	01:14
	← bilb_ono left	01:15
	→ Ionic_ joined	01:17
	← tkore left	01:18
	← Ionic_ left	01:18
	← dsdeiz left	01:19
	→ maxb_ joined	01:21
	← Elon_Satoshi left	01:21
	← mcmillhj left	01:21
	→ Ionic_ joined	01:21
	← orbyt_ left	01:21
	← maxb left	01:21
	Ionic_ → 32NABA83T	01:21
	→ dsdeiz_ joined	01:21
	32NABA83T → Ionic	01:22
	← __main__ left	01:22
	← rorro left	01:22
	← rkta left	01:22
	← Someguy123 left	01:22
	← Mixologic left	01:22
	← a3Dman left	01:22
	← a--m left	01:22
	← pasky_ left	01:22
	← JrCs_ left	01:22
	← in1t3r_ left	01:22
	← Garen left	01:22
	← biertie left	01:22
	← solos left	01:22
	← traxo-xx left	01:22
	← LeMike_ left	01:22
	← rotaerk left	01:22
	→ Elon_Satoshi joined	01:22
	→ PioneerAxon joined	01:23
	→ nikow joined	01:23
	→ danemacmillan joined	01:23
	← ManiacTwister left	01:23
	← NightMonkey left	01:23
	← odamn left	01:24
	→ A\|TARIS joined	01:24
	→ kuchi joined	01:24
	→ thiago joined	01:24
	← om_henners left	01:24
	← cagomez left	01:25
	→ cagomez joined	01:25
	← cagomez left	01:25
	→ cagomez joined	01:25
	→ kriskropd joined	01:26
	← cagomez left	01:26
	→ om_henners joined	01:26
	→ ManiacTwister joined	01:27
	← tymczenko left	01:27
	→ NightMonkey joined	01:27
	→ madewokherd joined	01:28
	→ Yondering joined	01:28
	→ rotaerk joined	01:28
	→ __main__ joined	01:28
	→ rorro joined	01:28
	→ Someguy123 joined	01:28
	→ Mixologic joined	01:28
	→ a3Dman joined	01:28
	→ a--m joined	01:28
	→ pasky_ joined	01:28
	→ JrCs_ joined	01:28
	→ in1t3r_ joined	01:28
	→ Garen joined	01:28
	→ biertie joined	01:28
	→ evil-god joined	01:28
	→ Xarodon joined	01:28
	→ robattila256 joined	01:28
	→ suy joined	01:28
	→ Jackneilll joined	01:28
	→ nydel07 joined	01:28
	→ lukasdboer joined	01:28
	→ Stravy joined	01:28
	→ chamunks joined	01:28
	→ troyt joined	01:28
	→ Phlogistique joined	01:28
	→ bttf joined	01:28
	→ comps joined	01:28
	→ RiPer joined	01:28
	→ Hogofwar joined	01:28
	→ mrkake joined	01:28
	→ volestorm joined	01:28
	→ neunon joined	01:28
	→ planigan joined	01:28
	→ traxo-xx joined	01:28
	→ solos joined	01:28
	→ LeMike_ joined	01:28
	→ holodoc joined	01:28
	→ d1b_ joined	01:28
	→ catern joined	01:28
	→ HedgeMage joined	01:28
	→ zululee joined	01:28
	→ kevr joined	01:28
	→ blunaxela joined	01:28
	→ avar joined	01:28
	→ spriz joined	01:28
	→ Bubo joined	01:28
	→ liori joined	01:28
	tolkien.freenode.net set mode: +vvv	01:28
	→ capri joined	01:28
	→ imMute joined	01:28
	→ mac- joined	01:28
	→ thoros joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ nunchuck joined	01:28
	→ abec0 joined	01:28
	→ macskay joined	01:28
	→ AndreSomers joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ dsnow_ joined	01:28
	→ ianp joined	01:28
	→ fk joined	01:28
	→ Tykling joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ greenbagels joined	01:28
	→ atrus joined	01:28
	→ incredible_ joined	01:28
	→ blueyed joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ moritz joined	01:28
	→ crater2150 joined	01:28
	→ bs joined	01:28
	→ shakalaka joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ valkyr2e joined	01:28
	→ Celelibi joined	01:28
	→ chrisml joined	01:28
	→ Phanes joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ cmosguy joined	01:28
	→ HalfEatenPie joined	01:28
	→ fcanela joined	01:28
	→ adymitruk joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ cxreg joined	01:28
	→ Walex joined	01:28
	→ kanzure joined	01:28
	→ rudi_s joined	01:28
	tolkien.freenode.net set mode: +vvvv	01:28
	→ michael_mbp joined	01:28
	tolkien.freenode.net set mode: +v	01:28
	→ odamn joined	01:28
	→ CalimeroTeknik joined	01:28
	→ rkta joined	01:28
	← cmosguy left	01:28
	← greenbagels left	01:28
	← bs left	01:28
	← michael_mbp left	01:28
	← kevr left	01:28
	→ MarkusDBX joined	01:28
	→ bs joined	01:28
	→ simonlinj joined	01:28
	→ kevr joined	01:28
	→ mcmillhj joined	01:29
	→ cmosguy joined	01:29
	→ greenbagels joined	01:29
	← ZexaronS left	01:29
	→ michael_mbp joined	01:30
	← yohnnyjoe left	01:30
	→ biancat joined	01:32
	biancat → Guest59663	01:33
	← mcmillhj left	01:34
	← MarkusDBX left	01:34
	→ easzero_ joined	01:34
	→ MarkusDBX joined	01:34
	→ tmz joined	01:35
	→ Bishop_Bautista joined	01:35
	→ polyrob joined	01:36
	← polyrob left	01:36
	→ polyrob joined	01:36
	→ ArcaTech joined	01:37
	→ bilb_ono joined	01:37
	→ TikityTik joined	01:38
jameswine	anyone have any ideas about cause of this? https://pastebin.com/SwnYQwhg	01:38
	→ texinwien_ joined	01:38
	← MarkusDBX left	01:39
	← pbandark left	01:39
	→ MarkusDBX joined	01:41
	← aax left	01:41
	← texinwien left	01:41
	← overlord_tm left	01:41
	→ ZexaronS joined	01:41
parsnip	did you paste it right? that `ffatal` is suspicious	01:43
	jameswine: does `git fsck` reveal anything?	01:44
	← bilb_ono left	01:44
parsnip	does `git fetch` work? might want to contact github	01:46
	maybe try `ssh` protocol instead of `https` also	01:46
	← MarkusDBX left	01:46
	→ pabs3 joined	01:46
pabs3	when running git log -p, can I tell it to not print hunks to files in a directory, and hide any patches that only touch files in that directory?	01:47
	→ mcmillhj joined	01:47
parsnip	jameswine: might try various verbosity/debugging/logging settings in git	01:47
	→ pirocks joined	01:47
	→ koell joined	01:49
	→ aax joined	01:50
	→ sz0 joined	01:51
	← pirocks left	01:52
	← mcmillhj left	01:52
	→ MarkusDBX joined	01:53
	← swood left	01:54
	← gopar left	01:57
	→ wxg joined	01:57
	→ azerus joined	01:57
	→ lembron joined	01:58
	← MarkusDBX left	01:58
	→ mcmillhj joined	01:59
lembron	hello, given a branch that i had checkout locally before was rebased on the gitserver, can i "shorthand" alias that checkout somehow? -- as in "currently i run git checkout bla, then see the prompt its outdated, so git checkout master, git branch -D bla, git checkout bla, is needed...	01:59
	→ MarkusDBX joined	02:00
lembron	id like to shorten that for those branches where i "blindly trust the rebased thing" and not merge my local ((to checkout branches for review that is))	02:00
	→ FJB joined	02:00
	← jamiejackson left	02:01
	← Gurkenglas left	02:01
	→ finalbeta joined	02:03
	← rotaerk left	02:03
	← mcmillhj left	02:03
	→ Wulf4 joined	02:05
	→ dreiss joined	02:06
	← NiobiumVolant left	02:06
	→ DolpheenDream joined	02:06
	→ duckydan joined	02:06
	← wxg left	02:08
	← azerus left	02:08
	← fassl left	02:08
	← Wulf left	02:09
	Wulf4 → Wulf	02:09
	→ igemnace joined	02:10
	→ bilb_ono joined	02:11
	← svm_invictvs left	02:11
	← Arcaelyx left	02:12
	→ azerus joined	02:12
	← Sasazuka left	02:12
	→ Arcaelyx joined	02:13
	→ FJB_ joined	02:14
	→ sucks joined	02:14
	← salamanderrake left	02:14
	→ mcmillhj joined	02:16
	→ gopar joined	02:17
	← gopar left	02:17
	← FJB left	02:18
	← ArcaTech left	02:19
	← FJB_ left	02:19
	→ FJB joined	02:20
	← mcmillhj left	02:21
	→ Barrt joined	02:21
	← converge left	02:22
	← finalbeta left	02:22
	← FJB left	02:26
	→ FJB joined	02:27
	pabs3 → Guest86701	02:27
	→ pabs3 joined	02:27
	→ converge joined	02:28
damo22	lembron: thats not really a good idea because you might have a different tree to the server that you want to keep instead in case there was a mistake force pushed to the server	02:28
	← PioneerAxon left	02:28
lembron	hence 'for those branches where i "blindly trust the rebased thing"'	02:28
damo22	of course you could alias it	02:28
	bashrc to the rescue	02:29
	← FJB left	02:29
	← Guest86701 left	02:29
	→ FJB joined	02:29
	← koell left	02:29
	← FJB left	02:30
	→ oojacoboo joined	02:30
	← scientes left	02:30
lembron	ive got a git pullup for --ff-only, but seems strange one cant make a simple git pulldown with a "--force-reset" flag or so	02:30
	← njbair left	02:30
	← dviola left	02:31
	→ njbair joined	02:33
	← dsdeiz_ left	02:34
	← Murr left	02:34
	→ FJB joined	02:34
	→ dsdeiz joined	02:34
	← dsdeiz left	02:34
	→ dsdeiz joined	02:34
	→ rh10 joined	02:34
	→ Murr joined	02:35
	→ mcmillhj joined	02:35
	→ PioneerAxon joined	02:35
	← dreiss left	02:36
	← skypatrol left	02:37
	→ skypatrol joined	02:39
	← raynold left	02:39
	← mcmillhj left	02:39
	← rorro left	02:40
	← Feral_Cat left	02:40
	← Mattiaslndstrm left	02:41
	gitinfo set mode: +v	02:41
FJB	I am using Git on a Macbook pro with MacOS High Sierra version 10.13.1	02:41
	(17B48). I have been using it in a virtualenv with python 3. I have	02:41
	begun to get "Segmentation fault: 11" with every git command. I have	02:41
	been searching for a reason why this is occurring but have not been	02:42
	able to find a solution. I have reinstalled the operating system,	02:42
	uninstalled and reinstalled Git, and a variety of other attempts at	02:42
	finding a solution. Is this a know issue? Any suggestions would be	02:42
	appreciated.	02:42
	← pabs3 left	02:42
	→ scientes joined	02:42
	← scientes left	02:42
	→ scientes joined	02:42
	← Zamerick__ left	02:42
	← olalonde left	02:42
	← easzero_ left	02:43
	→ bobdobbs joined	02:45
	← ilbot3 left	02:45
	→ dreiss joined	02:46
	→ JoeCode joined	02:47
	← durham left	02:47
	← skypatrol left	02:50
	→ skypatrol joined	02:50
	← converge left	02:51
	← d^sh left	02:52
	→ Zamerick__ joined	02:52
	→ d^sh joined	02:54
	→ mcmillhj joined	02:54
	→ ilbot3 joined	02:56
	→ fassl joined	02:56
	→ pirocks joined	02:56
	← scientes left	02:59
	← mcmillhj left	02:59
	← pirocks left	03:01
	→ quamtumslash joined	03:02
	← Munt left	03:02
	← fassl left	03:02
	← luckman212 left	03:03
	← azerus left	03:04
	← JoeCode left	03:06
	← quamtumslash left	03:07
	→ nast joined	03:08
	→ luckman212 joined	03:09
	→ mcmillhj joined	03:09
	→ neil_cn joined	03:09
	← lacour left	03:10
	← dreiss left	03:10
	→ azerus joined	03:12
	← gugah left	03:12
	→ Anja joined	03:13
	← azerus left	03:14
	← mcmillhj left	03:14
	← TikityTik left	03:14
Barrt	hit people	03:15
	anyone here?	03:15
	→ govg joined	03:15
	→ lagothri1 joined	03:17
	← dsdeiz left	03:18
	→ azerus joined	03:19
	← NimeshNeema left	03:19
	← lagothrix left	03:20
	← pbrewczynski left	03:25
	→ cdg joined	03:26
	→ yohnnyjoe joined	03:27
	→ dsdeiz joined	03:28
	← dsdeiz left	03:28
	→ dsdeiz joined	03:28
	→ quamtumslash joined	03:28
	← cdg left	03:30
	← yohnnyjoe left	03:32
	← disi left	03:33
	→ scientes joined	03:35
	→ menip joined	03:36
	← nast left	03:36
	→ orbyt_ joined	03:37
	→ disi joined	03:37
	← robattila256 left	03:38
	→ cdg joined	03:38
	→ sucks_ joined	03:41
	→ robattila256 joined	03:41
	→ easzero joined	03:41
	→ bilb_ono_ joined	03:42
	→ dreiss joined	03:42
	← Yondering left	03:42
	← bilb_ono left	03:43
	bilb_ono_ → bilb_ono	03:43
	← sucks left	03:43
	← cdg left	03:45
	→ Arguggi joined	03:45
	→ cdg joined	03:45
	→ energizer joined	03:45
	← quamtumslash left	03:48
	→ yurinew joined	03:48
	→ chachasmooth_ joined	03:49
	← chachasmooth left	03:49
	← cdg left	03:50
	← quesker left	03:50
	→ Jooph joined	03:51
	← Jooph left	03:52
	→ sucks joined	03:54
	← sucks_ left	03:54
	← bilb_ono left	03:55
nedbat	Barrt: it works best to just jump in	03:55
	→ pirocks joined	03:55
	→ fassl joined	03:56
	→ raynold joined	03:56
	→ bilb_ono joined	03:58
	← dreiss left	03:59
	→ goweol1 joined	03:59
	← damo22 left	04:00
	→ pks joined	04:00
	← pirocks left	04:01
	← goweol left	04:01
	← fassl left	04:03
	← Cabanossi left	04:06
	→ watabou joined	04:06
	← m0viefreak left	04:07
	→ Cabanossi joined	04:07
	← sz0 left	04:09
	→ gugah joined	04:10
	← dave0x6d left	04:16
	→ bilb_ono_ joined	04:20
	← sucks left	04:20
	← bilb_ono left	04:20
	bilb_ono_ → bilb_ono	04:20
	→ dreiss joined	04:21
	← str left	04:22
	← tinanoo left	04:23
	← gugah left	04:24
	→ justan0theruser joined	04:26
	← justan0theruser left	04:26
	→ justan0theruser joined	04:26
	← justanotheruser left	04:27
	← goweol1 left	04:27
	← DolpheenDream left	04:28
	→ bilb_ono_ joined	04:28
	← bilb_ono left	04:29
	bilb_ono_ → bilb_ono	04:29
	→ boombatower joined	04:29
	→ goweol joined	04:29
	← Barrt left	04:31
	← dsdeiz left	04:33
	→ kadoban joined	04:33
	← goweol left	04:34
	→ dsdeiz joined	04:34
	← dsdeiz left	04:34
	→ dsdeiz joined	04:34
	→ Feral_Cat joined	04:35
	← FJB left	04:35
	→ podlech joined	04:37
	← Cabanossi left	04:37
	→ Cabanossi joined	04:37
	→ Andrew_K joined	04:40
	→ sucks joined	04:44
	← sucks left	04:44
	→ sucks joined	04:45
	→ clickjack joined	04:46
	→ fassl joined	04:46
	← lafleurdubien left	04:47
	← xaxxon left	04:48
	→ Barrt joined	04:48
	← fassl left	04:51
	← Cabanossi left	04:51
	← dreiss left	04:51
	→ Cabanoss- joined	04:51
	→ UTAN_dev joined	04:52
	Cabanoss- → Cabanossi	04:52
	← diqidoq left	04:53
	← Feral_Cat left	04:53
	→ thebope joined	04:53
	→ dreiss joined	04:53
	→ akushner joined	04:54
	← daynaskully left	04:54
	→ jceb joined	04:54
	→ AlynxZhou joined	04:57
	→ pirocks joined	04:57
	← thebope left	04:58
	← Arguggi left	04:58
	← akushner left	04:58
	← AlynxZhou left	04:59
	→ imack joined	05:00
	→ AlynxZhou joined	05:00
	→ daynaskully joined	05:00
	→ fguillot joined	05:01
	← pirocks left	05:02
	← bilb_ono left	05:04
	← dreiss left	05:07
	→ dre_ joined	05:09
	→ mcmillhj joined	05:09
	→ roelmonnens joined	05:10
	← orbyt_ left	05:11
	← podlech left	05:12
	← mcmillhj left	05:14
	← roelmonnens left	05:14
	← dsdeiz left	05:16
	← sucks left	05:16
	→ ArcaTech joined	05:18
	← skered left	05:20
	→ dsdeiz joined	05:21
	→ dave0x6d joined	05:23
	← fguillot left	05:24
	← Bishop_Bautista left	05:25
	← easzero left	05:26
	→ yohnnyjoe joined	05:28
	← simonlinj left	05:28
	← yohnnyjoe left	05:32
	← jceb left	05:33
	→ skered joined	05:35
	→ Kaisyu joined	05:35
	→ svm_invictvs joined	05:44
	← scientes left	05:48
	→ fassl joined	05:48
	← fassl left	05:54
	→ fassl joined	05:56
	← luckman212 left	06:00
	→ scientes joined	06:00
	← scientes left	06:00
	→ scientes joined	06:00
	← clickjack left	06:01
	← AlynxZhou left	06:02
	→ AlynxZhou joined	06:02
	← fassl left	06:02
	← Cabanossi left	06:04
	→ luckman212 joined	06:05
	← menip left	06:06
	← AlynxZhou left	06:06
	→ AlynxZhou joined	06:07
	→ Cabanossi joined	06:07
	← watabou left	06:08
	← jcarpenter2 left	06:09
	→ clickjack joined	06:09
	→ watabou joined	06:10
	kadoban → mud	06:13
	→ Matze202 joined	06:14
	→ LocaMocha joined	06:17
	→ fatalhalt joined	06:18
	← scientes left	06:18
	← watabou left	06:20
	← Arcaelyx left	06:24
	→ pifon joined	06:27
	→ tymczenko joined	06:27
	→ Ocoap joined	06:28
	← Ocoap left	06:28
	← yurinew left	06:28
	→ chaosruler joined	06:28
	→ scientes joined	06:32
	← scientes left	06:32
	→ scientes joined	06:32
	← rkta left	06:32
	← Murr left	06:34
	→ Murr joined	06:34
	→ easzero joined	06:38
	← easzero left	06:40
	→ goweol joined	06:43
	← goweol left	06:45
	→ goweol joined	06:45
	→ ZyX-I joined	06:46
	→ goweol1 joined	06:46
	→ Nizumzen joined	06:48
	→ asultramosesdili joined	06:49
	← goweol left	06:49
	← s73vm1lls left	06:50
	→ freimatz joined	06:52
	→ manuelschneid3r joined	06:53
	→ mic4ael joined	06:56
	← ArcaTech left	06:57
	← goweol1 left	06:58
	→ Raging_Hog joined	06:58
	→ EgS joined	07:01
	← neil_cn left	07:02
	→ ogny joined	07:04
	→ rscata joined	07:05
	→ mic4ael2 joined	07:06
	← scientes left	07:07
	→ watabou joined	07:07
	→ dec0n joined	07:10
	← njbair left	07:11
	→ olalonde joined	07:12
	→ dreiss joined	07:12
	→ njbair joined	07:12
	← dsdeiz left	07:15
	→ dsdeiz joined	07:15
	← dsdeiz left	07:15
	→ dsdeiz joined	07:15
	← watabou left	07:15
	→ dege joined	07:17
Kartagis	how do I see what commits haven't been pushed again?	07:21
	→ cspotcode joined	07:22
	→ roelmonnens joined	07:22
	→ abba joined	07:23
	← ZyX-I left	07:23
	← papanik left	07:23
	→ huhlig joined	07:23
igemnace	git log @{u}..@	07:26
	in general, git log <branch-name>@{u}..<branch-name>	07:27
	→ CheckDavid joined	07:27
	→ Silmarilion joined	07:27
selckin	whats the @{u} and why not something simpler like branch...origin/branch	07:27
	→ dmj` joined	07:27
	← mic4ael left	07:28
igemnace	@{u} means the upstream you set for that branch	07:28
	it's not all the time the upstream naming convention is origin/<branch-name>	07:29
	also isn't @{u} shorter?	07:29
	→ yohnnyjoe joined	07:29
themill	it's the face you have to pull to remember that particular rune	07:29
	← mic4ael2 left	07:29
igemnace	does quite well as a general-purpose alias because it's more general than origin/<branch-name>, although it helps knowing certain @{} incantations	07:30
	← abba left	07:30
	→ wandering_vagran joined	07:30
igemnace	git config alias.log-push 'log @{u}..@' for example	07:31
	→ tkore joined	07:31
	→ easzero joined	07:31
	← konsolebox_ left	07:32
	→ mic4ael2 joined	07:32
	→ tkore\work joined	07:33
	← tkore\work left	07:33
	→ tkore\work joined	07:33
	← yohnnyjoe left	07:33
	→ Mattiaslndstrm joined	07:34
	→ neil_cn joined	07:34
	→ konsolebox joined	07:34
	← mic4ael2 left	07:35
	→ ShekharReddy joined	07:36
	← tkore left	07:37
	→ mic4ael joined	07:38
	← Mattiaslndstrm left	07:38
	← manuelschneid3r left	07:38
	← konsolebox left	07:39
	← polyrob left	07:44
	→ konsolebox joined	07:46
	→ schleppel joined	07:46
	→ watabou joined	07:47
	→ chele joined	07:47
	← dre_ left	07:48
	→ tarkus joined	07:49
	← thiago left	07:49
	→ zefferno joined	07:49
	← svm_invictvs left	07:51
	→ re1 joined	07:51
	← konsolebox left	07:51
	→ konsolebox joined	07:53
	→ manuelschneid3r joined	07:54
	← AlynxZhou left	07:54
	→ AlynxZhou joined	07:55
	→ Murii joined	07:55
	← madewokherd left	07:55
	→ MrMojit0 joined	07:57
	→ jfelchner joined	08:00
	← konsolebox left	08:00
	← boombatower left	08:01
	→ konsolebox joined	08:01
	← tymczenko left	08:02
	→ Hi-Angel joined	08:03
Hi-Angel	I'm wondering, is there a way to "git clone" and set the repo being cloned as "upstream" in one command? E.g. maybe there's a switch… I'm cloning random repos on occasion a lot, and it would be nice to not go search where the upstream repo is for making "git pull"	08:05
	→ kharloss joined	08:05
	← watabou left	08:05
	← Cabanossi left	08:05
jast	Hi-Angel: you mean set the source repo as the upstream in the cloned repo? that's what happens by default.	08:05
	→ brillenfux joined	08:06
	← konsolebox left	08:06
	→ Cabanossi joined	08:07
Hi-Angel	jast: hmm it doesn't work for me. E.g. I just a moment ago did "git clone https://github.com/Hi-Angel/purple-facebook", and now "git pull upstream master" triggers "fatal: 'upstream' does not appear to be a git repository"	08:07
jast	well, that's because it's called origin, not upstream	08:07
	and you can just say 'git pull'	08:07
Hi-Angel	Ah, hmm	08:07
	Thank you!	08:07
	→ konsolebox joined	08:08
	← Matze202 left	08:08
	← chaosruler left	08:10
	→ tymczenko joined	08:10
	← re1 left	08:11
	→ gxt joined	08:12
	← konsolebox left	08:13
Kartagis	igemnace: tried a bunch of combinations, no luck	08:14
	→ konsolebox joined	08:14
	→ ertes-w joined	08:15
	→ seschwar joined	08:16
	→ King_Hual joined	08:16
	← King_Hual left	08:16
	→ King_Hual joined	08:16
igemnace	Kartagis: which one doesn't work? i use git log @{u}..@ all the time. maybe there arent commits that haven't been pushed?	08:16
	→ polydo_s joined	08:17
	→ TomyWork joined	08:17
Kartagis	git log @{u}..@	08:18
	fatal: no upstream configured for branch '7.x-1.x'	08:18
jast	right, you have to set it up once	08:18
Kartagis	and the previous attempt were showing nothing because of typos	08:19
igemnace	this is a branch you've never pushed before, i take it. in which case, you know all those commits are unpushed. problem solved \o/	08:19
	→ aboccia_ joined	08:19
TomyWork	i dont suppose there is a way to tell how much git push will transfer without immediately starting to transfer?	08:19
	git push -n doesn't show the transfer size	08:19
igemnace	unless the commits were pushed before...	08:19
	igemnace slowly takes it bakc	08:19
Kartagis	igemnace: I've pushed commits before	08:20
	← Codaraxis_ left	08:20
jim	I have a repo on a private machine, and it has a submodule on github... right now, that submodule would require a passphrase, it's a git@ sshurl... I'm looking at a pair of scenarios... is there a way to set up the submodule repo to be pulled either anonymously without credentials, or else with one of the public keys stored on github? if "no", is it possible to change the private repo so it pulls the submodule anonymously?	08:20
igemnace	Kartagis: i mean unless commits in your history have been pushed before, from pushing a different branch	08:20
	← sarri left	08:21
Kartagis	no, I've worked with only 1 branch	08:21
igemnace	Kartagis: oh. then you've never pushed before?	08:21
	→ Matze202 joined	08:21
Kartagis	I've pughed before	08:22
	→ sarri joined	08:22
	← sarri left	08:22
	→ sarri joined	08:22
jim	hilite me when you have a chance to respond, no hurry	08:22
Kartagis	pushed*	08:22
	igemnace: http://cgit.drupalcode.org/sandbox-Kartagis-2923259	08:22
igemnace	Kartagis: how come your upstream hasn't been configured yet. you push manually every time?	08:22
	just do git log <remote-tracking-branch>..<branch> in that case	08:23
Kartagis	igemnace: manually? there is another way idk about?	08:23
	→ czart joined	08:23
	→ sasheto joined	08:24
igemnace	sorry. manually, as in you manually specify the remote to push to every time. regardless, git log <foo>..<bar> in general will list commits between <foo> and <bar>, inclusive	08:24
	what git log @{u}..@ would have done was list those between the local branch and its upstream (where it pushes to). adjust accordingly	08:25
	→ BioSpider joined	08:25
	← BioSpider left	08:25
	→ BioSpider joined	08:25
	← BioSpider left	08:25
	→ overlord_tm joined	08:25
Kartagis	igemnace: what I'm looking for is something like commit 69406f716d73915b2c639d304ab530e338315f91 (HEAD -> master, origin/master, origin/HEAD output	08:25
igemnace	that's what git log does	08:26
	git log --oneline if you want terse output	08:26
Kartagis	macOS does this by default	08:26
	← konsolebox left	08:26
	→ BioSpider joined	08:27
	→ finalbeta joined	08:27
	→ konsolebox joined	08:28
	← sasheto left	08:28
	→ Xrayez joined	08:29
	→ Darcidride joined	08:29
	→ Andrew_K\|1 joined	08:30
	→ floppydh joined	08:32
	→ flaviodesousa joined	08:33
	← Andrew_K left	08:33
osse	git config log.decorate true	08:33
	→ ArcaTech joined	08:33
	← ArcaTech left	08:33
	← texinwien_ left	08:34
	← konsolebox left	08:34
	→ aoscott joined	08:34
	← Murr left	08:34
	→ texinwien_ joined	08:34
	→ Murr joined	08:34
	→ konsolebox joined	08:35
	← Andrew_K\|1 left	08:36
	→ Andrew_K\|1 joined	08:36
	→ fission6 joined	08:36
	→ watabou joined	08:36
	→ oxymoron93 joined	08:38
	→ pro_metedor joined	08:39
	→ hs367 joined	08:40
	← hs367 left	08:41
	→ peacememories joined	08:41
Kartagis	great, thanks osse	08:42
	← polydo_s left	08:42
	→ Andrew_K joined	08:42
	→ polydo_s joined	08:43
	← peacememories left	08:43
	→ peacememories joined	08:44
parsnip	oh, old git?	08:44
osse	does that default to true now?	08:44
	← Andrew_K\|1 left	08:45
	← watabou left	08:45
	← polydo_s left	08:47
	→ polydo_s joined	08:48
Kartagis	osse: I looked at git config log.decorate on macOS and no output	08:50
	← Murii left	08:53
	→ mikecmpbll joined	08:53
	← kharloss left	08:53
	→ QualityAddict joined	08:53
	← Raed left	08:53
	→ NimeshNeema joined	08:54
	← mel00010 left	08:55
	→ Raed joined	08:56
	← dreiss left	08:56
	← polydo_s left	08:56
	→ polydo_s joined	08:57
	← Someguy123 left	08:59
	← konsolebox left	09:02
	← mud left	09:02
	→ konsolebox joined	09:02
	← fission6 left	09:02
	→ SporkWitch joined	09:04
	→ Someguy123 joined	09:06
	← _ADN_ left	09:06
	→ goweol joined	09:07
	→ pirocks joined	09:08
	→ pbandark joined	09:09
	→ kurkale6ka joined	09:09
	← Someguy123 left	09:13
	→ TheWild joined	09:13
TheWild	hello	09:13
	wat just happened? https://kopy.io/N7XCo	09:13
_ikke_	TheWild: That's a 'bug' that has been fixed	09:14
	← kurkale6ka left	09:14
_ikke_	bash 4 starts to warn about this	09:14
TheWild	update git, okay. But what I stashed is intact, right?	09:15
_ikke_	yes	09:15
TheWild	fine. Thanks _ikke_	09:15
_ikke_	It's just a warning	09:15
	→ kurkale6ka joined	09:15
	← peacememories left	09:15
	→ Floflobel joined	09:15
	→ duderonomy joined	09:17
	→ watabou joined	09:17
	← asultramosesdili left	09:17
	→ GameGamer43 joined	09:18
	→ bongjovi joined	09:18
	→ daxroc joined	09:19
	→ Someguy123 joined	09:20
	→ _ADN_ joined	09:22
osse	Kartagis: try git config --global log.decorate	09:23
	and --system	09:23
	← polydo_s left	09:25
	← gxt left	09:25
_ikke_	add -l, right?	09:25
	(--list)	09:25
	→ polydo_s joined	09:25
	→ NiobiumVolant joined	09:28
	← energizer left	09:28
	→ peacememories joined	09:28
	← polydo_s left	09:30
	→ yohnnyjoe joined	09:30
	← peacememories left	09:30
	← NiobiumVolant left	09:30
	← freimatz left	09:30
	→ mel00010 joined	09:32
	← _ADN_ left	09:32
	→ srm joined	09:34
	← yohnnyjoe left	09:34
	← watabou left	09:35
	← goweol left	09:35
	← CheckDavid left	09:35
	→ polydo_s joined	09:35
	→ NiobiumVolant joined	09:36
	→ clmsy joined	09:37
	← Matze202 left	09:39
	← ZexaronS left	09:40
	→ ZexaronS joined	09:41
	→ Gonzo89 joined	09:47
	→ aielima joined	09:47
	→ _ADN_ joined	09:47
	→ Gurkenglas joined	09:48
	← enkrypt left	09:49
	→ gfurlan joined	09:49
	← dege left	09:49
	→ Tobbi joined	09:49
	→ dre_ joined	09:52
	← King_Hual left	09:53
	← devbaka_ left	09:54
	→ devbaka joined	09:54
	← NiobiumVolant left	09:55
	← devbaka left	09:55
	← Tobbi left	09:55
	→ Tobbi joined	09:56
	← Tobbi left	09:56
	→ devbaka joined	09:57
	← wandering_vagran left	09:58
	→ Silenced joined	09:59
	→ goweol joined	09:59
	→ devbaka_ joined	09:59
	→ NiobiumVolant joined	10:00
	← goweol left	10:00
	← zefferno left	10:01
	← Xrayez left	10:02
	← devbaka left	10:02
	→ goweol joined	10:02
	→ Xrayez joined	10:03
	← goweol left	10:03
	← Gurkenglas left	10:06
	← Hi-Angel left	10:06
	→ goweol joined	10:08
	→ enkrypt joined	10:08
	→ wandering_vagran joined	10:10
	→ ppang joined	10:10
	→ dege joined	10:12
	→ watabou joined	10:12
	→ gxt joined	10:13
	→ MarioBranco joined	10:15
	→ cstratak joined	10:17
	→ zefferno joined	10:17
	← Raging_Hog left	10:20
	← pifon left	10:20
Kartagis	osse: still nothing	10:22
	funny though	10:22
	← Andrew_K left	10:22
	→ YuGiOhJCJ joined	10:23
	→ Cavallari joined	10:23
	← MarioBranco left	10:25
	→ chll_ joined	10:25
osse	then perhaps the default changed	10:26
	yes it did	10:27
	← goweol left	10:28
	→ goweol joined	10:31
	→ MarioBranco joined	10:33
	→ rorro joined	10:34
	← ppang left	10:34
	← Murr left	10:34
	→ Raging_Hog joined	10:34
	→ Murr joined	10:34
	← Cabanossi left	10:36
	→ Cabanossi joined	10:36
	→ peacememories joined	10:37
	→ ferr joined	10:39
	← ferr left	10:39
	← NiobiumVolant left	10:40
	→ salamanderrake joined	10:40
	→ NiobiumVolant joined	10:42
	← watabou left	10:45
	← peacememories left	10:45
	← clmsy left	10:46
	→ peacememories joined	10:47
	← NiobiumVolant left	10:49
	← peacememories left	10:52
	← goweol left	10:53
	→ goweol joined	10:53
	→ peacememories joined	10:53
	→ Codaraxis joined	10:54
	→ watabou joined	10:54
	← Xrayez left	10:55
	← cstratak left	10:56
	← peacememories left	10:59
	ertes-w → supercynic	11:00
	→ cstratak joined	11:00
	← YuGiOhJCJ left	11:00
	→ YuGiOhJCJ joined	11:01
	→ freimatz joined	11:02
	← Someguy123 left	11:03
	→ peacememories joined	11:04
	→ eshlox joined	11:05
	→ Peetz0r joined	11:05
	← polydo_s left	11:07
	→ polydo_s joined	11:08
	→ SerusWor1 joined	11:10
	→ Tobbi joined	11:10
	→ NiobiumVolant joined	11:11
	← peacememories left	11:11
	← polydo_s left	11:12
	← SerusWork left	11:13
	→ jstein_ joined	11:13
	jstein_ → jstein	11:13
	→ kiuma joined	11:14
	→ peacememories joined	11:14
	← NiobiumVolant left	11:14
kiuma	hello, I'm starting to use git submodules in a new project	11:14
	→ cur8or joined	11:15
	← peacememories left	11:15
kiuma	If I correctly understand a submodule is meant only to be used in read mode because it's in a detached status and any change should be done inside its (original) git repo. Am I right ?	11:16
	→ NiobiumVolant joined	11:17
	← pirocks left	11:17
	← zefferno left	11:17
	→ TikityTik joined	11:18
osse	kiuma: yes	11:18
kiuma	thanks	11:18
osse	kiuma: that said, it is possible to work inside the submodule at the same at, but you gotta know what you're doing	11:18
	← NiobiumVolant left	11:18
	← texinwien_ left	11:19
	→ peacememories joined	11:19
	→ NiobiumVolant joined	11:19
kiuma	osse what you say could be translate as : = dangerous :)	11:19
	→ texinwien_ joined	11:19
kiuma	thanks for clarifying	11:19
	← ghost43 left	11:20
	→ ghost43 joined	11:20
	← peacememories left	11:21
avrdude	hey, im trying to pull from my repo, but it is saying "error, your local changes to the following files will be overwritten by merge:" ... "please commit your changes or stash them before you can merge"	11:23
	← freimatz left	11:23
avrdude	but i want to overwrite them.. i want to pull the new updated files from the repo	11:23
oxymoron93	well remove your local changes if you want that	11:24
	→ peacememories joined	11:24
avrdude	i just delete all my local files basically?	11:24
oxymoron93	basically git reset --hard	11:24
	→ freimatz joined	11:25
avrdude	that sounds dangerous. i'll just delete the files, atleast i know they'll be in the recycle bin	11:25
oxymoron93	ahah no	11:25
	delete sounds more dangerous	11:25
	→ Someguy123 joined	11:26
	→ kishmesh joined	11:26
	← AlynxZhou left	11:27
	→ ripero joined	11:27
	→ sleepingforest joined	11:27
	→ AlynxZhou joined	11:27
oxymoron93	avrdude https://stackoverflow.com/questions/1125968/how-do-i-force-git-pull-to-overwrite-local-files	11:27
kishmesh	"git diff --cached" visually marks whitespace at the end of the lines which I can remove. But I also see marker at the beginnging of some lines. What are those?	11:27
	← watabou left	11:28
kishmesh	in my case it is marked with a red "block"	11:28
	→ \|ifei5good joined	11:28
sphalerite	kishmesh: probably mixed tabs/spaces	11:28
	← \|ifei5g00d left	11:28
	→ qpdb joined	11:29
	→ yohnnyjoe joined	11:31
avrdude	this is actually rather annoying. basically, im working on two computers, so if i make changes on one computer, commit and push, then try to pull on the other computer i get these errors	11:31
kishmesh	sphalerite: where is set/documented what these marker represent?	11:31
ripero	what is the git command that produces the list of all the parents of a commit? Something like $ git rev-parse 790c942b^1 790c942b^2 but without needing to know the number of parents beforehand	11:31
	→ zefferno joined	11:31
	← AlynxZhou left	11:31
	← olalonde left	11:31
oxymoron93	you do get errors because you have changes that are not commited or stashed avrdude	11:31
kishmesh	sphalerite: reading "man git-diff"	11:31
gitinfo	sphalerite: the git-diff manpage is available at https://gitirc.eu/git-diff.html	11:31
	→ AlynxZhou joined	11:32
osse	kiuma: not dangerous in the sense that it will kill your dog. it's fine for testing code changes. but just might be confusing unless you're familiar with submodules already	11:32
	← peacememories left	11:32
kishmesh	sphalerite: git diff --cached --check is useful	11:33
ripero	I thought about $ git show 790c942b --format=raw \| grep parent \| awk ' { print $2 } ' , but that looks a bit like an overkill	11:33
sphalerite	kishmesh: "What are considered whitespace errors is controlled by core.whitespace configuration."	11:34
	→ watabou joined	11:34
sphalerite	kishmesh: have a look at man git-config to see the values for it	11:34
gitinfo	kishmesh: the git-config manpage is available at https://gitirc.eu/git-config.html	11:34
	→ theoceaniscool joined	11:34
kishmesh	sphalerite: thank you	11:35
	← yohnnyjoe left	11:35
	→ rafasc joined	11:37
	→ Murii joined	11:38
	← goweol left	11:40
	→ goweol joined	11:40
oxymoron93	ripero you can see parents hashes of a specific commit just with git log	11:41
	assuming you can get more parents just after merge?	11:43
ripero	oxymoron93: I want to produce a complete list of SHA-1's of the (immediate) parents of a commit	11:45
oxymoron93	git log --pretty=%p -1 HEAD	11:45
	→ alexx8 joined	11:46
ripero	oxymoron93: that's it, thank you	11:46
oxymoron93	with capital P you can get complete 40 hex digit hash	11:47
	← wandering_vagran left	11:48
	→ polydo_s joined	11:48
ripero	yep, thx	11:48
	gitinfo set mode: +v	11:49
alexx8	Hi. I just got my first pull request accepted on GitHub (yay!) but have a question. Locally, I created a branch "issue1234" for it, committed three times, then sent a pull request from my fork's branch issue1234 to their branch 'master'.	11:50
	← texinwien_ left	11:50
	→ str joined	11:51
alexx8	Now my local history shows the issue1234 branch merged into master, but on their "public" repository, it shows as a single commit inside the master branch, i.e. the issue1234 branch disappeared	11:51
	It seems the two repos' histories now diverged. Is that normal? I am a bit confused by this behaviour	11:51
	← BioSpider left	11:51
	→ texinwien_ joined	11:51
canton7	alexx8, it's hard to say exactly what happened. It may be a fast-forward merge (!ff), or it may be a rebase	11:51
gitinfo	alexx8: A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf	11:51
canton7	either way, it doesn't matter. Delete your local branch (and in your github repo), fetch their updated master branch	11:52
	→ BioSpider joined	11:52
canton7	branches in git are just labels which point to commits. You have an 'issue1234' label which points at the commit you made. They probably just merged that commit into their master branch, which updates their 'master' branch label to point to your commit	11:53
alexx8	canton7, why is it hard to say? Can repo owners specify how they integrate? Or does it depend on how my local history developed?	11:53
canton7	the repo owner can do whatever they want	11:53
	do could have done an ff merge, a non-ff merge, or a rebase	11:53
	→ Anticom joined	11:54
canton7	*they could have done...	11:54
alexx8	But my branch 'issue1234' had three commits (one of which was a revert), and in their history it shows as only one commit	11:54
canton7	right, you didn't say that :)	11:54
	← polydo_s left	11:54
canton7	they'll have rewritten your 3 commits into 1 single commit	11:54
alexx8	Was that a 'squash' then?	11:55
canton7	it could have been, or an interactive rebase	11:55
alexx8	Ah yes, I've heard of these too	11:55
	So, as an "external" developer of GitHub projects, are these all things I shouldn't worry/care about then?	11:55
	← Nizumzen left	11:56
canton7	correct	11:56
	throw away your branch (it's served its purpose), and fetch in what the upstream repo did	11:56
	their master branch is authoritative	11:56
alexx8	Ah, that's nice to hear. Something I don't have to dive in deeper :)	11:56
	→ nast joined	11:56
alexx8	good, I'm off to continue on my quest. Thanks for the help!	11:59
	← tymczenko left	11:59
	← alexx8 left	11:59
	→ Masber joined	12:00
	→ wandering_vagran joined	12:00
	← salamanderrake left	12:00
	→ f2k joined	12:03
	→ Gurkenglas joined	12:04
	← NiobiumVolant left	12:05
	→ polydo_s joined	12:05
	→ cstratak_ joined	12:06
	← cstratak left	12:06
	← watabou left	12:07
	→ NiobiumVolant joined	12:07
	→ Aichan joined	12:07
	← jstein left	12:10
	→ watabou joined	12:11
	→ chaosruler joined	12:13
	← jason237 left	12:19
	← chaosruler left	12:21
	← a3Dman left	12:34
	← Murr left	12:34
	→ Murr joined	12:35
	← rh10 left	12:39
	← raynold left	12:39
	→ nooooone joined	12:40
	← YuGiOhJCJ left	12:41
	← nast left	12:42
	→ chaosruler joined	12:43
	← watabou left	12:44
	← Silenced left	12:45
	→ a3Dman joined	12:45
	← tunekey left	12:45
	← goweol left	12:46
	→ voker57 joined	12:50
	← voker57 left	12:50
	→ voker57 joined	12:50
	← rorro left	12:51
	→ watabou joined	12:51
	→ FilipNortic joined	12:52
	→ Nizumzen joined	12:53
	← dre_ left	12:53
	→ Jackneillll joined	12:54
	← gfurlan left	12:54
	→ pbandark1 joined	12:54
	← pbandark left	12:54
	pbandark1 → pbandark	12:54
	← ripero left	12:55
	← surfist left	12:55
	→ surfist joined	12:55
	← NiobiumVolant left	12:56
	← Jackneilll left	12:57
	SerusWor1 → SerusWork	12:59
	→ NiobiumVolant joined	12:59
	→ PHPanos joined	13:00
	→ Silenced joined	13:01
	← str left	13:01
	← NiobiumVolant left	13:01
	→ NiobiumVolant joined	13:01
	← dvl left	13:03
	→ punkbit joined	13:03
	→ str joined	13:03
	← NiobiumVolant left	13:03
	→ goweol joined	13:05
	→ synthroid joined	13:06
punkbit	Q: I'd like to run the command `curl -X POST -d '{}' https://foobar/blablabla` when I push to a given `branchName`, let's say `preview`; in the `.git/hooks` directory there's a few hooks but not sure which one to place the command. Any hints? Thanks	13:06
	→ dvl joined	13:06
	← dvl left	13:06
	→ dvl joined	13:06
	← manuelschneid3r left	13:06
	→ manuelschneid3r joined	13:07
canton7	punkbit, man githooks has full descriptions	13:07
gitinfo	punkbit: the githooks manpage is available at https://gitirc.eu/githooks.html	13:07
jast	punkbit: post-receive or post-update, see man githooks for details. to be clear, these are run on the server, not on the client.	13:07
gitinfo	punkbit: the githooks manpage is available at https://gitirc.eu/githooks.html	13:07
canton7	it's not clear whether you want to run the hook from the server or the client	13:07
jast	hmm, seems like I haven't implemented dupe suppression for manpage links yet	13:07
punkbit	canton7: jast thanks for looking! I'm using Netlify, that connects to the repository, so I guess I can create it locally since the repo is shared, I believe?	13:08
jast	hooks aren't normally shared	13:08
	if you need to trigger the HTTP requiest it on the client, unfortunately there's no hook for that	13:09
canton7	pre-push?	13:09
jast	pre-push is designed to allow preventing pushes, I'm guessing the HTTP request here triggers something that assumes the new content is already in the repo	13:10
canton7	fiar point	13:10
	*fair	13:10
	← tombusby left	13:10
	← bongjovi left	13:10
	→ tombusby joined	13:10
punkbit	jast: Ok! Now wondering how does services like heroku and netlify work, when they connect to the repositories; I imagine it clones the repository, mirroring everything I'd have in my local, I guess?!	13:11
	→ rorro joined	13:11
	← irrgit left	13:11
	→ f2k- joined	13:11
	← polydo_s left	13:12
canton7	which part of heroku/netlify are you referring to?	13:12
	the bit where it deploys when you push to the remote repo?	13:12
punkbit	canton7: yes, that feature	13:13
canton7	heroku hosts a git repository, which you can fetch from and push to. There's a hook in the repo which they host (likely post-receive or post-update) which triggers a deployment if you push to a specific branch	13:13
	← goweol left	13:14
	← Gurkenglas left	13:14
	→ goweol joined	13:14
	← f2k left	13:14
	→ goweol1 joined	13:14
	→ alexx8 joined	13:15
	gitinfo set mode: +v	13:15
	→ bongjovi joined	13:15
	← govg left	13:15
jast	netlify will probably clone/fetch your repo, yes	13:15
	with many git hosting services, you can configure webhooks, i.e. notifications that are sent out when something is pushed to the git repo	13:16
	← theoceaniscool left	13:16
	→ Guest73 joined	13:17
	→ govg joined	13:17
	← goweol left	13:18
	→ polydo_s joined	13:18
punkbit	jast: right	13:19
	→ Xrayez joined	13:19
punkbit	ok, so if I create a post-receive hook in my local machine, how to push the hook to the repo, so that everyone who ever clone/fetch gets it?	13:20
	← texinwien_ left	13:20
	→ MajorGrub joined	13:20
MajorGrub	Hi all	13:20
gitinfo	MajorGrub: 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.	13:20
	← kurkale6ka left	13:20
	→ bZq82nURBDbrpRqg joined	13:21
jast	punkbit: it doesn't work that way. since hooks can contain arbitrary code, git hosting sites don't allow you to upload your own hooks.	13:21
canton7	punkbit, 1) post-receive hooks are for repositories which people push to. Having one in a local repository will do nothing. 2) You can't force someone to install one of your hooks: that would be a security hazard. You have to ask each person to manually install your hook	13:21
alexx8	!backup	13:21
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	13:21
MajorGrub	I'd like to disable sslVerify = false for a submodule of a repo, is it possible to configure this in the .gitmodules file ?	13:21
jast	post-receive isn't run by clients, so even if everyone copied it to their local repo it wouldn't do anything	13:21
MajorGrub	I'd like to set sslVerify to false*	13:21
	← watabou left	13:21
	← Puffball left	13:21
punkbit	Makes sense : )	13:21
jast	and git intentionally doesn't share hooks because of the risk from arbitrary code execution. best practice is to include the hook contents somewhere in the repo and maybe include a small script people can run to install them	13:22
	← Guest73 left	13:22
	→ tanuki joined	13:22
MajorGrub	I'd like to set sslVerify to false for a submodule of a repo, is t possible to configure this in the .gitmodules file ?	13:22
	← gusnan_ left	13:22
	→ gusnan joined	13:23
MajorGrub	Hmm kay	13:23
	→ rtjure joined	13:24
canton7	MajorGrub, there's no mention in man gitmodules, so I suspect not	13:25
gitinfo	MajorGrub: the gitmodules manpage is available at https://gitirc.eu/gitmodules.html	13:25
	→ cbonobo joined	13:25
	← dave0x6d left	13:26
	← cur8or left	13:27
	→ kurkale6ka joined	13:28
	→ sz0 joined	13:28
MajorGrub	canton7: do you know of any way to do this ?	13:29
	← cbonobo left	13:29
	← czart left	13:29
	→ cbonobo joined	13:29
canton7	I suspect there isn't: turning http verification off should probably be a conscious decision by each other, otherwise I suspect that might turn into an attack of some kind	13:30
	*by each user	13:30
MajorGrub	hmm :/	13:31
	→ irrgit joined	13:31
MajorGrub	Annoying	13:31
	→ dviola joined	13:31
	→ yohnnyjoe joined	13:31
	→ kurkale61 joined	13:32
	→ watabou joined	13:33
	← kurkale6ka left	13:33
	← Cabanossi left	13:35
	→ kristofferR joined	13:35
	← yohnnyjoe left	13:36
	→ Cabanossi joined	13:37
	← neil_cn left	13:40
	← goweol1 left	13:44
	→ shinnya joined	13:47
	← chaosruler left	13:47
	→ cdg joined	13:47
	→ Anthaas joined	13:48
	← Floflobel left	13:50
	→ theoceaniscool joined	13:50
	→ re1 joined	13:51
	← cdg left	13:51
	→ cdg joined	13:52
	← re1 left	13:53
	← Texan left	13:53
	→ re1 joined	13:53
	→ goweol joined	13:53
	→ Es0teric joined	13:57
	← igemnace left	13:58
	← TikityTik left	13:58
	← Darcidride left	13:58
	← PHPanos left	13:58
	→ TikityTik joined	13:59
	→ Darcidride joined	13:59
	← Cavallari left	14:00
	← PioneerAxon left	14:00
	→ Captain_Beezay joined	14:01
	→ koell joined	14:01
	→ PioneerAxon joined	14:04
	→ KieronWiltshire joined	14:04
	→ Floflobel joined	14:07
	→ jameser joined	14:08
	← TomyWork left	14:09
	← BioSpider left	14:11
	← watabou left	14:11
	→ whyme joined	14:11
	→ navidr joined	14:12
	← njbair left	14:12
	→ rorro_ joined	14:14
	→ gfurlan joined	14:14
	→ njbair joined	14:15
	← rorro_ left	14:16
	→ riemann joined	14:18
	← bZq82nURBDbrpRqg left	14:21
	← oxymoron93 left	14:21
	→ TomyWork joined	14:21
	← imack left	14:22
	← MrMojit0 left	14:23
	→ jamiejackson joined	14:24
	← TikityTik left	14:24
	← eshlox left	14:24
	→ Gustavo6046 joined	14:27
	→ phluks joined	14:27
	← koell left	14:27
	→ lb1c joined	14:27
	→ oxymoron93 joined	14:28
oxymoron93	this happens? https://prnt.sc/hb9bqz	14:28
	→ TikityTik joined	14:28
canton7	oxymoron93, what's your question?	14:29
	gitinfo set mode: +v	14:29
	← Gustavo6046 left	14:29
	→ Matze202 joined	14:30
oxymoron93	does banning happen regularly canton7?	14:31
	← cstratak_ left	14:31
rafasc	yeah, why wouldn't it?	14:31
	→ cstratak_ joined	14:31
jast	hard to tell, this stuff is done by freenode	14:31
canton7	being banned from individual channels is probably fairly rare, but I'd suspect people get k-lined relatively regularly: freenode is big	14:32
	→ tinanoo joined	14:32
	→ nakkht joined	14:32
canton7	you have to do quite a lot to get k-lined, but low probability * a large number of users...	14:32
oxymoron93	well, that is why I asked, I did nothing, but bang, harrasment	14:32
	→ RandomUser4321 joined	14:32
jast	possibly someone on the same address got banned	14:32
	in which case, tough luck, unfortunately :(	14:32
rafasc	oxymoron93: read http://freenode.net/	14:33
oxymoron93	nvm, just wanted to check if I didn't actually spammed the chat accidentally	14:33
canton7	curious that you're still here, from the same IP	14:33
	← TikityTik left	14:33
	← irrgit left	14:34
oxymoron93	I thought I couldn't come back, but on contrary I did	14:34
jast	either it was a very short-lived ban, or it was limited to one server	14:34
	or even an accident	14:34
rafasc	maybe something to do with that post?	14:35
jast	what post?	14:35
	← RandomUser4321 left	14:35
	← Cabanossi left	14:35
rafasc	frontpage of freenode is talking about shadowbans	14:35
canton7	a bunch of people in another channel were also k-lined, and have come back	14:35
	→ TikityTik joined	14:35
jast	the post is about channel bans, not network bans	14:36
	well, my guess is an operator set the k-line mask too broadly, and immediately removed it when they noticed	14:36
	→ Cabanossi joined	14:37
canton7	the other people I've seen were all using kiwiirc too	14:37
	← nakkht left	14:38
	→ nakkht joined	14:38
jast	so, probably an accident. case closed, yay! :)	14:38
	← nakkht left	14:38
	→ nakkht joined	14:39
	→ hhernane joined	14:39
	← TikityTik left	14:40
	→ watabou joined	14:41
	→ Dougie187 joined	14:41
	→ sleepingdeforest joined	14:42
	← rorro left	14:42
	← nakkht left	14:42
	← goweol left	14:42
	→ nakkht joined	14:42
	← nakkht left	14:42
	→ goweol joined	14:42
	→ nakkht joined	14:42
	→ TikityTik joined	14:43
	← nakkht left	14:43
	← polydo_s left	14:43
	→ PHPanos joined	14:44
	← Darcidride left	14:44
	→ Darcidride joined	14:45
	← infinite left	14:45
	← watabou left	14:45
	← sleepingforest left	14:45
	→ dfaught joined	14:46
	→ jameser_ joined	14:46
	→ sleepingforest joined	14:46
	→ watabou joined	14:47
	← cstratak_ left	14:47
	→ stutter joined	14:47
	← jameser left	14:48
	→ ripero joined	14:48
	→ cstratak joined	14:48
	← sleepingdeforest left	14:48
	→ infinite joined	14:48
	→ cstratak_ joined	14:48
	← kostur86 left	14:49
ripero	hi; is there an easy way to print all "topologically" relevant commits? that is, all commits that do NOT(have one parent and have one child)	14:49
	→ sleepingdeforest joined	14:49
	← sleepingdeforest left	14:49
	→ sleepingdeforest joined	14:50
osse	ripero: so basically all the "ends" of the graph =	14:50
	?	14:50
	→ polydo_s joined	14:50
ripero	osse: and merge points / commits with more than one child	14:51
	→ Onemorenickname joined	14:51
	← Raging_Hog left	14:51
Onemorenickname	hi	14:51
osse	ripero: rev-list --max-parents=0 and rev-list --min-parents=2 gets you half of what you want	14:52
	← cstratak left	14:52
	← TikityTik left	14:52
Onemorenickname	I have two branches, branch_a and branch_b. On branch_b, I have added files and so on. However, I messed up the indentation of some auxiliary files, and I want to fix that. How can I resync these files with branch_a ?	14:52
	← cstratak_ left	14:52
	← sleepingforest left	14:52
	→ zarzar joined	14:53
Onemorenickname	I have a "rough" solution, where I git clone branch_a somewhere else, copy-pasta and commit	14:53
	But I was wondering if there was a cleaner solution	14:53
_ikke_	git checkout branch_a -- <files>	14:53
	But can't you just undo the commits?	14:53
	on branch_b?	14:53
Onemorenickname	I'd have to modify them	14:53
	← goweol left	14:53
Onemorenickname	And track them	14:54
osse	ripero: as for the commits without children, that's all the commits in refs/heads	14:54
Onemorenickname	(I don't know at which point I changed those files. I didn't even expect to've done it, and saw it with a git diff)	14:54
rafasc	ripero: have you tried the History simplification options of git log? $git help log \| less -p '^ History Simplification'	14:54
osse	ripero: commits with more than one child: no clue, I think you have to walk the whole thing	14:54
	← gfurlan left	14:55
	← MajorGrub left	14:55
	→ cstratak joined	14:55
	→ goweol joined	14:55
Onemorenickname	_ikke_, thanks, i just gitman'd checkout, "--" does exactly what i wanted	14:57
	← polydo_s left	14:58
	← sim590 left	14:58
Onemorenickname	if I "git branch -m" the branch I'm on, I'll move too ?	14:58
	or weird things will happen ?	14:59
osse	what is gitman? :O	14:59
_ikke_	man git	14:59
gitinfo	the git manpage is available at https://gitirc.eu/git.html	14:59
Onemorenickname	osse, eh, githelp :(	14:59
	→ sim590 joined	14:59
osse	oh, I got the impression the command was 'gitman checkout'	14:59
	heh	14:59
ripero	osse,rafasc: thank you, I have not managed to come up with anything yet using history simplification	15:00
	→ AaronMT joined	15:00
Onemorenickname	"gitman is a tool developed by [X] to solve [marginal problem]. It does so using [some particular optimization] and [new tech]."	15:00
moritz	"it is hip, and will be unmaintained in 2 years".	15:01
Onemorenickname	:)	15:01
_ikke_	acquihired and discontinued	15:01
Onemorenickname	:D	15:01
	→ Argylelabcoat joined	15:01
HedgeMage	hehe	15:01
rafasc	Is this normal? https://bpaste.net/show/0ca616e7925d $git diff; showing up slightly misaligned	15:02
	→ mariobranco__ joined	15:02
Onemorenickname	( https://github.com/jacebrowning/gitman, not touched since 8 months. "GitMan is a language-agnostic "dependency manager" using Git. It aims to serve as a submodules replacement and provides advanced options for managing versions of nested Git repositories." )	15:02
oxymoron93	git branch -m does nothing Onemorenickname	15:03
	← jameser_ left	15:03
_ikke_	git branch -m oldname newname	15:03
Onemorenickname	oxymoron93, it's simply a renaming ?	15:03
oxymoron93	yes	15:03
	supercynic → ertes-w	15:03
oxymoron93	if old name isn't given it defaults to current branch	15:03
	just checked with my master	15:04
Onemorenickname	On SO, this command is used : "git push origin :old-name new-name"	15:04
	It says that it deletes old-name	15:04
	Is ":" after "git push" specifying deletion, is this some other rule, where can I find doc about this ?	15:04
	→ polyrob joined	15:04
	← polyrob left	15:04
	→ polyrob joined	15:04
	← MarioBranco left	15:05
_ikke_	git checkout -B newname oldname	15:05
	← hhernane left	15:06
	→ hhernane joined	15:06
osse	Onemorenickname: man git-push: "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository."	15:06
gitinfo	Onemorenickname: the git-push manpage is available at https://gitirc.eu/git-push.html	15:06
	← hhernane left	15:06
oxymoron93	you actually didn't give source branch to the git push, thus old-name branch on remote will be deleted	15:06
osse	Onemorenickname: because the full, general syntax is git push origin src:dst	15:07
	← ogny left	15:07
oxymoron93	don't know what new-name stands for	15:07
	← njbair left	15:07
	← ripero left	15:07
Onemorenickname	oh, i see, this is simply the "src:dst" syntax with "src" empty. and there are two pushes in parallel.	15:07
	i'm such a git noob '_'	15:07
	thx	15:07
	← Andr0id left	15:08
	→ tvw joined	15:08
	→ hhernane joined	15:08
osse	ur dumb. u must brain harder	15:08
	!!!111	15:08
oxymoron93	hm.. didn't know about parallelism	15:08
osse	Onemorenickname: well, it's no accident that they added the "--delete" flag so people wouldn't have to deal with it	15:09
	→ ajb-linaro joined	15:09
	← mentalita left	15:09
	→ njbair joined	15:09
Onemorenickname	osse, this is the actual reason and was done after the ":dst" syntax ?	15:09
ajb-linaro	anyone familiar enough with Git:parse_email? I'm trying to fix a regression	15:09
	with [email@hidden.address] (open list:for thing (foo/bar))	15:10
	s/parse_email/parse_mailboxes/	15:10
osse	Onemorenickname: yes	15:10
	→ chaosruler joined	15:10
osse	Onemorenickname: internally all it does is prefix the thing that comes after with with :	15:10
	→ Glorian joined	15:11
Onemorenickname	osse, this is gold	15:11
osse	Onemorenickname: https://github.com/git/git/commit/f517f1f2e9c9e3abe0fde1b3c9a7bb20fdb5ba55	15:11
	← tarkus left	15:11
Onemorenickname	where do you find this ?	15:12
osse	Onemorenickname: cd git; git log --grep=--delete; scroll down a up, scroll up a bit, there it is.	15:12
Onemorenickname	you're a good person	15:12
	← stutter left	15:13
osse	in your case you'd have to invoke push twice, though. since --delete means you want to delete all the listed things	15:13
	← jfelchner left	15:15
osse	also, thanks :3	15:16
	← Garen left	15:17
	← aboccia_ left	15:17
	→ thebope joined	15:18
	→ Garen joined	15:19
	→ senaps joined	15:20
	→ Andr0id joined	15:20
	← watabou left	15:20
	→ mentalita joined	15:21
	→ filcab joined	15:22
	← goweol left	15:22
	→ tkore joined	15:23
	← tkore left	15:23
	→ tkore joined	15:23
	← hhernane left	15:23
	← Andr0id left	15:24
	→ shpingrlde joined	15:24
	← shinnya left	15:25
	← oxymoron93 left	15:25
	← tkore\work left	15:25
	→ Sulla joined	15:26
	→ stutter joined	15:26
	→ goweol joined	15:26
	→ ok91 joined	15:26
	→ watabou joined	15:28
	← ok91 left	15:29
shpingrlde	I'm merging some files from upstream, and getting a lot of "conflicts". no actual code is in conflict, however - the software license requires each file to have a comment at the top which has the name of the most recent committer, and a datestamp. that's where the "conflict" is coming in. I can't safely just merge --theirs, though, because every now and then an actual conflict could come up.	15:30
	← brillenfux left	15:30
shpingrlde	the comments with the name/date are automatically handled by a post-commit hook, I should mention.	15:30
	← jstimm left	15:30
	→ mmlb joined	15:31
osse	shpingrlde: you can write your own merge driver to deal with that specific issue	15:31
shpingrlde	is there a way I can tell git to ignore conflicts (or apply "--theirs") only to the first 3 or 4 lines of each file? or to ignore conflicts when the only conflict is a comment?	15:31
	→ yohnnyjoe joined	15:32
_ikke_	git itself does not have anything specifically for that	15:33
perlpilot	you can fix it once and use git rerere if you need to do it again though	15:33
shpingrlde	alright, I'll look up Merge Driver; thanks!	15:33
	← mooasaurus left	15:33
_ikke_	what git does have is a clean/smudge filter system that can add the specific information when you check out	15:33
	→ mooasaurus joined	15:34
_ikke_	hmm, ident only supports the commit id apparently	15:34
	← watabou left	15:36
	→ imack joined	15:36
	→ Andr0id joined	15:37
	← yohnnyjoe left	15:37
	← goweol left	15:38
	→ goweol joined	15:38
	← mmlb left	15:38
	→ Gurkenglas joined	15:39
	← Random832 left	15:40
	→ TikityTik joined	15:40
senaps	i have changed some files, now i want to go back to where i was, git reset last commit didn't remove the changes since the last commit. what should i do?	15:40
	← Murii left	15:40
	← sleepingdeforest left	15:40
	→ mmlb joined	15:41
osse	git status tells you	15:41
	← Andr0id left	15:41
	← TikityTik left	15:42
	← PioneerAxon left	15:42
	→ TikityTik joined	15:42
	→ PioneerAxon joined	15:42
	← Sulla left	15:44
	← TikityTik left	15:44
senaps	i didn't commit any of the changes, git reset didn't do it, so i tried the git reset --hard i don't know what it did! but it looks like it did what i wanted(i removed new files, but changed files went back)	15:44
	← Darcidride left	15:45
	← stutter left	15:45
	→ Darcidride joined	15:46
	→ murii joined	15:46
	→ TikityTik joined	15:46
	← senaps left	15:47
	→ IrishPrime joined	15:47
	→ MarioBranco joined	15:48
	→ Puffball joined	15:49
	← njbair left	15:50
	← zefferno left	15:50
	IrishPrime → Irish	15:51
	← mariobranco__ left	15:52
	Irish → IrishPrime	15:52
	← Elon_Satoshi left	15:52
	→ aboccia joined	15:52
	← rscata left	15:52
	→ Andr0id joined	15:52
	→ njbair joined	15:53
	→ Random832 joined	15:53
	→ staafl joined	15:54
	← dec0n left	15:56
	← sunri5e left	15:56
	→ mikecmpb_ joined	15:56
	→ Elon_Satoshi joined	15:57
	→ thiago joined	15:57
	← Masber left	15:57
	← mikecmpbll left	15:57
	→ notu joined	15:58
	← Silmarilion left	16:00
	→ fassl joined	16:00
	→ sunri5e joined	16:01
	← pro_metedor left	16:01
	← manuelschneid3r left	16:01
	→ jason237 joined	16:01
	→ perlpilot_ joined	16:02
	→ kpease joined	16:03
	→ manuelschneid3r joined	16:03
	← seschwar left	16:03
	→ watabou joined	16:03
	→ pro_metedor joined	16:04
	← pro_metedor left	16:04
	→ kpease_ joined	16:04
	→ orbyt_ joined	16:05
	← chele left	16:05
	← perlpilot left	16:05
	→ cworth joined	16:05
	← notu left	16:06
	→ d10n-work joined	16:06
	← aoscott left	16:07
	← kristofferR left	16:07
	← kpease left	16:08
	→ B4S1L3 joined	16:08
	← pbandark left	16:08
	→ roelmonn_ joined	16:08
	← idlemind left	16:08
	→ scientes joined	16:08
	→ jstein_ joined	16:09
	jstein_ → jstein	16:09
	→ AaronMT_ joined	16:09
	← cbonobo left	16:09
alexx8	Does a default 'git pull' create a merge commit or a rebase on a local repository?	16:10
	← murii left	16:10
_ikke_	git pull == fetch + merge by default	16:10
B4S1L3	hi, after setup new system, i cant sign anymore w/ GPG: msg is "commit-tree failed , error gpg couldn sign..." and then...	16:10
	→ sleepingdeforest joined	16:11
	← roelmonnens left	16:11
B4S1L3	and then ... https://pastebin.com/THCGSfK7	16:11
	← nydel07 left	16:11
alexx8	but then the SHA-1 of my latest commit is different from, say, the latest commit of the origin repo, right?	16:11
	← AaronMT left	16:12
alexx8	i can't seem to grasp why that workflow works	16:12
B4S1L3	though the message might be caused by signing failure, so maybe not relevant	16:12
	← synthroid left	16:12
_ikke_	alexx8: if you do not have any local changes, that merge would fast-forward, meaning no extra commit is created	16:12
	← sunri5e left	16:12
	→ Tee_Pee joined	16:12
	← roelmonn_ left	16:13
_ikke_	alexx8: if you do have local changes, your local history would already be different. After the merge, you can push that merge back to origin, and then everyone can have the same history again	16:13
	→ nazza joined	16:14
	← cworth left	16:14
	← tkore left	16:14
alexx8	oh, true. i forgot about fast-forward merges	16:14
B4S1L3	my .gitconfig is copied from the old system and the GPG key is imported from the priv key as stored on keybase.io, so should be valid...	16:15
	→ fission6 joined	16:16
	→ z1haze joined	16:17
z1haze	is there an easy way to tell what branch another branch from started from?	16:18
	← Nizumzen left	16:18
	→ stutter joined	16:18
	→ rorro joined	16:18
	← nazza left	16:18
	← mikecmpb_ left	16:18
_ikke_	z1haze: only visually	16:18
	← Matze202 left	16:18
z1haze	what do you mean	16:19
B4S1L3	when it's merged otherwise it might be in the message "from ... to ..."	16:19
	→ mikecmpbll joined	16:20
z1haze	i just want to check if this release branch was actually started off master, or from another release	16:20
	← chll_ left	16:20
B4S1L3	the first derived commit has for parent a commit from the parent branch, so you can check for the SHA if you're not in a hurry	16:20
_ikke_	z1haze: git does not track the starting branch of another branch	16:21
	→ heym0e joined	16:21
z1haze	ah perfect B4S1L3	16:21
	← scientes left	16:21
z1haze	that helps	16:21
	← chaosruler left	16:22
B4S1L3	ahah	16:23
	Use gitk goddamnit	16:23
	→ sunri5e joined	16:23
	→ cworth joined	16:23
	→ introom joined	16:24
introom	is there a thing like gitweb but with user authentication?	16:24
	→ dsdeiz_ joined	16:24
selckin	gitlab	16:25
moritz	there's gitlab and gitblit	16:25
	→ chll_ joined	16:25
moritz	if you just need authentication and no authorization, a webserver like apache or nginx can do it for you too	16:26
	← floppydh left	16:26
rafasc	z1haze: can I ask you why do you want to know "where the branch started"?	16:26
z1haze	Just wanted to see how our releases start, if they start from master, or from the previous release, thats all	16:27
rafasc	In the past two weeks we got something like at least 3 different people asking for this.	16:27
z1haze	the guy who usually handles the releases branches is on vacation	16:27
	→ synthroid joined	16:27
	← overlord_tm left	16:27
	→ db8093246 joined	16:28
	← sleepingdeforest left	16:28
alexx8	rafasc, to be honest, i was looking for this feature as well. it would be nice to see, when the history starts diverging, how the two lines were called (i.e their branch names) at that moment	16:28
	if i scroll through a commit history, and see three long parallel lines, i never know which one was the main development line back then	16:28
introom	moritz: yes. just authen.	16:29
	→ Chaosruler joined	16:29
	← ruskie left	16:30
	← Chaosruler left	16:30
	→ Matze202 joined	16:31
	→ pro_metedor joined	16:31
	← str left	16:31
	← jason237 left	16:31
rafasc	You can check the common ancestor with $git merge-base	16:31
	← cstratak left	16:31
	→ Maestro joined	16:32
rafasc	or use $git branch --contains to see which branches contain that specific commit.	16:32
	kurkale61 → kurkale6ka	16:32
	→ roelmonnens joined	16:32
	→ scientes joined	16:33
	← Maestro left	16:33
	← thinkpad left	16:33
	← SuperLag left	16:34
rafasc	the best you can do is use $git branch --edit-description; and write it there.	16:34
alexx8	oh, that's a lot of new stuff again. i didn't know you can describe a branch	16:35
	→ durham joined	16:35
rafasc	In my opinion, when you create a branch, it doesn't start at the place you created. The branch is the whole history that is reachable from the tip of that branch.	16:36
alexx8	including previous divergences, you mean?	16:37
	as in, parallel developments?	16:37
	← Matze202 left	16:37
	← roelmonnens left	16:37
rafasc	branches are just pointers to commits, right? and commits refer only to their parents.	16:37
alexx8	true. that's what is hard to get into my head. i would like to think of branches as the complete lines starting at the point of divergence and ending at a merge	16:38
	← netj left	16:39
	→ netj joined	16:39
	← dsdeiz_ left	16:40
	← PHPanos left	16:40
	gitinfo set mode: +v	16:40
	perlpilot_ → perlpilot	16:40
_ikke_	right, but to get that from git, you have to know where it started, so that you know what to exclude	16:40
	→ ruskie joined	16:40
	→ Apogee joined	16:40
_ikke_	branching (as in diverging history) is not an explicitly action in git	16:41
	← Apogee left	16:41
alexx8	_ikke_, and knowing where it started is not possible, right?	16:41
	← Onemorenickname left	16:41
_ikke_	not trivially	16:42
alexx8	okay.. that clears things up then	16:42
	← goweol left	16:42
rafasc	there's nothing wrong with thinking that way, i guess.. and if you have two tips that diverged, you can check where they started to diverge with $git merge-base tip1 tip2	16:42
	→ Nizumzen joined	16:43
rafasc	but that only makes sense when you have two things two compare.	16:43
_ikke_	.digraph E -> D -> C -> B -> A	16:43
	→ murii joined	16:43
gitinfo	.digraph: http://g.jk.gs/EZ.png	16:43
	→ str joined	16:43
	→ nixjdm joined	16:43
_ikke_	alexx8: if you look at that diagram	16:44
	Can you see how many branches there are?	16:44
rafasc	hint: it's a trick question	16:44
	← Khisanth left	16:45
alexx8	i'd like to say one. but.. master could be C, and then new_feature could be A. and some other branch with no new history could be A too	16:45
rafasc	s/two compare/to compare/	16:45
	← mel00010 left	16:45
	← watabou left	16:45
	→ sleepingdeforest joined	16:45
	← cworth left	16:46
rafasc	and you could have, lets say, 2000 branches pointing to B.	16:46
	→ BrainDamage joined	16:47
alexx8	yep	16:47
	→ SuperLag joined	16:48
	→ pirocks joined	16:48
	← orbyt_ left	16:50
BrainDamage	hello, is there a program whom lists local branch that are remote tracking ( the --track flag when using git branch ) other than parsing the .git/config file?	16:50
_ikke_	if you just look at a single branch, and follow history back, everything looks just linear	16:50
	← Cabanossi left	16:50
	→ nydel07 joined	16:50
_ikke_	BrainDamage: git branch -vv	16:50
	← flaviodesousa left	16:50
rafasc	.digraph E -> D -> C -> B -> A; G -> F -> D	16:50
gitinfo	.digraph: http://g.jk.gs/E_.png	16:50
	→ flavius joined	16:51
BrainDamage	_ikke_: excellent, thanks	16:51
	→ beerdrop joined	16:51
	→ cworth joined	16:51
	→ Cabanossi joined	16:51
rafasc	alexx8: you might say that F G is a branch that starts at D right? But what happens if we delete commit E?	16:51
	it's not that clean anymore right?	16:51
	→ BSaboia joined	16:52
_ikke_	or better, what if master is at C	16:52
rafasc	if you use $git merge-base E G it will say that those two branches started to diverge at D.	16:52
	← nydel07 left	16:53
alexx8	oh, i think i read these graphs the wrong way. G or E is the newest commit, and A is the oldest?	16:53
rafasc	But each branch on their own doesn't have a "start"	16:53
	← fission6 left	16:53
_ikke_	.digraph E -> D -> C -> B -> A; G -> F -> D; node [shape=box] master -> C; branch_a -> G; branch_b -> E;	16:53
rafasc	yes	16:53
gitinfo	.digraph: http://g.jk.gs/E-.png	16:53
	→ nydel07 joined	16:54
_ikke_	alexx8: the arrows point backwards, because each commit points to it's parent	16:54
rafasc	where does branch_a starts? D or C?	16:54
	→ Tbase joined	16:54
alexx8	i can't say	16:55
rafasc	exactly.	16:55
_ikke_	It's not possible to tell	16:55
osse	rafasc: That is left as an interpretational exercise for the developer	16:55
alexx8	:D	16:55
	but the commit D was created either while branch_a or branch_b was checked out... so, theoretically, ....	16:55
osse	In git terms it starts at A.	16:55
alexx8	anyway, it's starting to all make sense	16:56
	← scientes left	16:56
_ikke_	alexx8: you can ask git what commits are unique to a branch by excluding all other branches	16:56
	(though there is no automatic way to specify 'all other')	16:56
	but from that point of view, D belongs to no branch	16:57
	← Tbase left	16:57
	→ Sound joined	16:57
	← f2k- left	16:58
osse	Patch idea! Because ive been wanting that for so long	16:59
_ikke_	osse: 'all other'?	16:59
osse	yes	16:59
	My unique log script iterates for each ref and bla blah.	16:59
	I want git log master --not --the-rest	17:00
_ikke_	but which 'the rest'	17:00
	→ cagomez joined	17:00
	→ UD98 joined	17:00
_ikke_	you need to be able to namespace it	17:00
	ie, --not --all-other-branches	17:01
	← UD98 left	17:01
osse	--not-other-branches --not-any	17:01
	→ mikecmpb_ joined	17:01
osse	Some thing like that	17:01
	← beerdrop left	17:01
	← mikecmpbll left	17:01
	← sleepingdeforest left	17:01
osse	Or maybe infer it from the type of positive ref	17:02
	→ ArcaTech joined	17:02
	← cagomez left	17:02
	→ cagomez joined	17:03
	← jameswine left	17:04
	→ Senecea joined	17:05
	→ Razor10 joined	17:05
	← ertes-w left	17:06
_ikke_	there is already --exlude	17:06
	← Razor10 left	17:06
	← Gurkenglas left	17:08
	← staafl left	17:09
	← manuelschneid3r left	17:09
	→ dreiss joined	17:09
	→ Khisanth joined	17:09
	← KieronWiltshire left	17:10
_ikke_	--exclude I mean	17:10
	← murii left	17:10
	→ svm_invictvs joined	17:10
	→ Yuu joined	17:11
	→ dsdeiz_ joined	17:12
	→ madewokherd joined	17:13
	→ manuelschneid3r joined	17:14
	← pro_metedor left	17:14
osse	not sure that solves the problem	17:15
	← ArcaTech left	17:15
	← manuelschneid3r left	17:15
	← Cabanossi left	17:15
	← riemann left	17:15
	→ beerdrop joined	17:15
	→ manuelschneid3r joined	17:15
	← fassl left	17:15
	→ watabou joined	17:16
	→ Gianormagantrous joined	17:16
	← Gianormagantrous left	17:16
	→ Gianormagantrous joined	17:16
rafasc	it doesn't	17:16
	← pirocks left	17:17
	← dsdeiz_ left	17:17
	→ Cabanossi joined	17:17
	← Es0teric left	17:18
	← B4S1L3 left	17:19
	→ oxymoron93 joined	17:19
	→ bwn joined	17:19
	← cagomez left	17:19
	→ mud joined	17:19
Guma	I was wondering how to you amend last pushed commit? As of right now it is only myself so I know no one did pull	17:19
osse	Guma: amend the usual way, then push --force[-with-lease]	17:20
	→ cagomez joined	17:20
	← Yuu left	17:20
	← Nizumzen left	17:22
	← chll_ left	17:23
	→ lacour joined	17:25
	← thiago left	17:25
rafasc	osse: git log --oneline `git for-each-ref 'refs/heads/' --format='%(if)%(HEAD)%(then)%(refname)%(else)^%(refname:lstrip=2)%(end)'`	17:26
	→ dsdeiz_ joined	17:26
	→ Calisto joined	17:26
	← cagomez left	17:26
rafasc	there's some unnecessary junk there that's not needed.	17:27
	→ cagomez joined	17:27
	→ bilb_ono joined	17:27
rafasc	it something like this the intended goal?	17:27
	← Calisto left	17:28
	← durham left	17:28
	→ roelmonnens joined	17:29
	→ pro_metedor joined	17:30
	← dsdeiz_ left	17:32
	← dreiss left	17:33
	→ yohnnyjoe joined	17:33
	← roelmonnens left	17:34
	← freimatz left	17:34
	→ dsdeiz_ joined	17:34
	← MarioBranco left	17:34
	← eino left	17:35
	→ paul424 joined	17:35
	← Cabanossi left	17:35
	→ MarioBranco joined	17:36
	← mikecmpb_ left	17:36
	← kurkale6ka left	17:36
	→ Cabanossi joined	17:36
	→ hardneighbor joined	17:37
	← yohnnyjoe left	17:38
	← hardneighbor left	17:38
	← pro_metedor left	17:38
osse	rafasc: nice	17:39
	osse updates unique-log script	17:39
rafasc	that works for HEAD only	17:39
	But I think you can update it for working with arbitrary refnames	17:39
osse	the :equals thing should do the trick	17:40
rafasc	using :equals	17:40
	exactly	17:40
	→ grk1 joined	17:41
	← grk1 left	17:41
rafasc	you can remove the lstrip=2 part too.	17:41
	← TheWild left	17:42
	→ chaosruler joined	17:44
	← chaosruler left	17:44
	← gxt left	17:44
	→ Man4boyinQc joined	17:44
	← Man4boyinQc left	17:44
	→ chaosruler joined	17:44
	→ dave0x6d joined	17:44
	→ nestharus joined	17:44
	→ blackmesa joined	17:45
	→ pro_metedor joined	17:45
	→ sleepingdeforest joined	17:46
	→ gxt joined	17:46
	→ Darcidride_ joined	17:47
	← dsdeiz_ left	17:47
	→ orbyt_ joined	17:47
	← watabou left	17:48
	→ Murii joined	17:48
	→ Gurkenglas joined	17:48
	← Darcidride_ left	17:49
	→ Darcidride_ joined	17:49
	→ dsdeiz_ joined	17:49
	← pro_metedor left	17:50
	→ fassl joined	17:51
	→ roelmonnens joined	17:52
	→ stennowork joined	17:53
stennowork	good day, when i do `git status`, it tells me that my working directory is clean, even though i have just changed a file	17:53
	what am i doing wrong?	17:53
	→ watabou joined	17:53
rafasc	is the file ignored?	17:54
stennowork	no	17:54
	→ kozy joined	17:54
	→ pirocks joined	17:54
stennowork	that was my first guess too	17:54
	→ cbonobo joined	17:54
	→ durham joined	17:55
	→ bybb joined	17:55
stennowork	is there a way to re-initialize the repo?	17:55
	without removing any existing branches?	17:55
rafasc	does it show on $git ls-files -v	17:56
osse	rafasc: https://github.com/Osse/git-scripts/commit/70e3097489196769b52d2080d3db232f0d43ccf4 :3	17:56
mud	stennowork: Before you get crazy with it, you're sure you actually saved the changes in your editor, right? I've managed to skip that step before.	17:57
rafasc	nice, credited and all. xD	17:57
mud	Reinitializing or whatever is likely not needed	17:57
stennowork	rafasc, duh! it was in another gitignore which was further down the file path	17:57
rafasc	!next	17:57
gitinfo	Another satisfied customer. NEXT!	17:57
mud	Ah, nice	17:57
stennowork	i didn't even know you could have nested .gitignores	17:57
osse	rafasc: hmm, what's the difference between your fork of jellybeans and the original ?	17:57
	rafasc: i use jellybeans myself	17:57
d10n-work	Is there a good way to prevent git commit -a when there are already staged changes?	17:57
stennowork	rafasc, your hint with the ls-files helped me to find the respective gitignore	17:58
rafasc	err not sure. probably nothing.	17:58
	← Senecea left	17:58
rafasc	osse: in the past I used fork as bookmarks	17:59
	← Puffball left	18:00
	← fassl left	18:00
	→ bybb_ joined	18:02
	← oxymoron93 left	18:03
	← njbair left	18:03
rafasc	other than that, I just changed the background color to black.	18:03
	← Kaisyu left	18:03
	← sz0 left	18:03
	← bybb left	18:03
rafasc	I don't like the bland gray..	18:03
	← chaosruler left	18:03
	← rominronin left	18:04
	← beerdrop left	18:04
	→ mel00010 joined	18:04
	→ PHPanos joined	18:05
	→ njbair joined	18:05
	← roelmonnens left	18:05
	→ rominronin joined	18:05
	→ hahuang65 joined	18:06
	→ roelmonnens joined	18:06
	→ Nicomp joined	18:06
	← Nicomp left	18:08
	→ draget joined	18:08
	← imack left	18:09
	→ mikecmpbll joined	18:10
	← roelmonnens left	18:10
	← sleepingdeforest left	18:11
	→ poppaboner joined	18:11
	→ _the_blackadder joined	18:11
	→ sleepingforest joined	18:12
	← NimeshNeema left	18:12
	→ freimatz joined	18:13
	← poppaboner left	18:13
	← srm left	18:13
	← blackmesa left	18:14
	← Floflobel left	18:14
	→ blackmesa joined	18:15
	→ thiago joined	18:15
	← thiago left	18:15
	← cbonobo left	18:16
	→ cbonobo joined	18:17
	← BrainDamage left	18:17
	→ beerdrop joined	18:17
	→ thiago joined	18:18
	← mostlybadfly left	18:18
	→ Es0teric joined	18:20
	→ Senecea joined	18:22
	← jamiejackson left	18:22
	→ roelmonnens joined	18:23
	→ Gustavo6046 joined	18:23
	→ invisbl joined	18:23
	→ Mattiaslndstrm joined	18:25
	→ Puffball joined	18:25
	→ adamf joined	18:25
	→ ResidentBiscuit joined	18:26
adamf	is this the right place to ask questions about customization of gitweb?	18:26
	→ cdown joined	18:26
thiago	we may be, but I don't remember ever seeing a question about it	18:27
	← watabou left	18:27
	← _ADN_ left	18:27
	→ mostlybadfly joined	18:28
adamf	eh, probably not a super huge deal. Just looking to bring my own stylesheet to the party...and I see how to do it when /usr/share/gitweb exists...but I was trying to do it on macOS and such a directory does not exist AND the system actively prevents creating it even with sudo	18:29
	I should just do this on my centos box, tbh....and stop barking up the wrong tree	18:29
	← Sound left	18:30
	← _the_blackadder left	18:30
	← Gurkenglas left	18:30
	→ Darren_ joined	18:31
rafasc	adamf: not the wrong tree at all. :)	18:31
adamf	do you have experience with doing this?	18:32
	ye olde google barely turned up anything when I went fishing around for customization instructions	18:32
	← Murr left	18:34
	→ Murr joined	18:34
	→ watabou joined	18:35
	← tvw left	18:36
	→ narendraj9 joined	18:37
	→ Phylock joined	18:37
	→ tarkus joined	18:37
	→ ferdereine joined	18:37
	← MarioBranco left	18:37
	→ salamanderrake joined	18:39
	← wandering_vagran left	18:41
	← narendraj9 left	18:43
	← ferdereine left	18:44
	← gxt left	18:44
	← bybb_ left	18:45
	→ schmotty joined	18:46
	→ Nizumzen joined	18:47
	→ Cavallari joined	18:48
	← schmotty left	18:48
	→ jaggz joined	18:48
	→ wootehfoot joined	18:49
Tee_Pee	Hey guys, I got a merge conflict in a binary file	18:49
	is there a way for me to resolve it with the file from the other branch?	18:49
	i.e. not keep the one I have locally	18:49
	→ gopar joined	18:49
	→ jason237 joined	18:49
jaggz	how do I clone this? http://git.dcmtk.org/	18:49
	oh.. got it	18:49
mud	Tee_Pee: You can usually resolve those with 'git checkout --theirs -- the-file' or --ours instead of theirs, depending on which side you want. With binaries, it's rarely possible to do much other than one of those two. (welcome to why having to merge binaries usually means you've done something wrong)	18:51
	← blackmesa left	18:51
rafasc	Tee_Pee: before the merge you can use $git merge -Xtheirs to resolve in their favour.	18:51
	otherwise what mud said	18:51
	→ scientes joined	18:52
Tee_Pee	Eh, I know it means something is wrong, but it's not my repo unfortunately, so I have to adapt	18:54
	Is there a way to lock down a binary files across all branches when someone's working on it?	18:54
	→ fassl joined	18:54
mud	Not really, git doesn't work that way. In some cases you could build something on top of git that would do that, like maybe a hook to enforce it, but getting it right and not annoying would be tricky.	18:55
	→ zivester joined	18:55
	← sbeller_ left	18:56
	← Darcidride left	18:56
	→ sbeller joined	18:56
	← sleepingforest left	18:57
	→ raynold joined	18:57
rafasc	Tee_Pee: you're in !lfs territory	18:57
gitinfo	Tee_Pee: [!annex] git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs	18:57
	← bongjovi left	18:57
	← dsdeiz_ left	18:57
	← theoceaniscool left	18:57
	← scientes left	18:58
	→ Gurkenglas joined	18:58
raynold	ahh it's a wonderful day	18:58
Tee_Pee	ah, lfs then	18:58
	→ Matze202 joined	18:58
Tee_Pee	To be perfectly honest, I only work with Git when absolutely forced to, so I don't know how some of the things in it work :p	18:58
mud	Does lfs and etc. actually provide a solution to this? The problem seems conceptual, not about where the actual binary is stored.	18:58
	→ blackpajamas joined	18:59
	← blackpajamas left	19:00
rafasc	I saw a talk on lfs where they were trying to tackle this. Not sure if it's implemented or not.	19:00
	→ madewokherd` joined	19:00
	← TomyWork left	19:00
mud	Maybe I'm missing it, I just don't see what implementing it would even mean. Like what semantics should it have? If you conceptually have 2 different threads of changes to a binary ... I mean you're already screwed. There's no merging those without understanding what the binaries mean (and in cases of executables and photos and etc., merging it will be impossible automatically even if you do know what they mean)	19:01
	← fassl left	19:01
rafasc	https://www.youtube.com/watch?v=iJ3hXuEVKAc	19:01
mud	In every case I've ever seen, you 1) take one side or the other 2) regenerate the binary from the source (in cases where you're tracking build products) 3) Manually merge the changes, like if it were a photo and you redo the changes from one side.	19:02
	← madewokherd left	19:02
	← konsolebox left	19:02
	→ jnavila joined	19:02
mud	None of those a computer can fundamentally do even if you told it you wanted to.	19:02
rafasc	yes, what they try to do is basically a system to tell: "hey this file is mine for now"	19:03
mud	Ah, the locking part. Fair enough, that could be possible.	19:03
rafasc	I gave you the wrong link	19:03
	https://youtu.be/p3Pse1UkEhI?t=1462	19:04
	→ Spydar007 joined	19:05
mud	Thanks	19:05
	← aielima left	19:05
	→ sonOfRa joined	19:07
	→ nd- joined	19:07
	→ rkta joined	19:07
	← watabou left	19:08
	→ konsolebox joined	19:09
	→ scientes joined	19:10
	← scientes left	19:10
	→ scientes joined	19:10
	← nd left	19:10
	→ barton joined	19:12
	→ VladGh joined	19:12
	→ dsdeiz_ joined	19:13
	← gopar left	19:13
	← Darcidride_ left	19:14
	→ gopar joined	19:14
	← barton left	19:14
	← VladGh left	19:15
	→ watabou joined	19:16
	← Gurkenglas left	19:16
	→ VladGh joined	19:17
	← roelmonnens left	19:17
	← dsdeiz_ left	19:17
mud	rafasc: That looks like an interesting model they're talking about. I like how after that though like ... well it doesn't work yet, just tell people you're working on something.	19:17
	→ sea-gull joined	19:18
	← gopar left	19:18
	← manuelschneid3r left	19:19
	→ jeffreylevesque joined	19:19
	← scientes left	19:19
	→ Sasazuka joined	19:20
rafasc	mud: yeah.. that was a year ago.	19:20
	← netj left	19:20
	→ manuelschneid3r joined	19:20
rafasc	"Git LFS v2.0.0 includes an early release of File Locking."	19:20
mud	Naw yeah I figured they've fixed that by now. I just thought it was funny.	19:20
	→ muelleme joined	19:21
rafasc	they're on v2.3.4, so I assume they already have it.	19:21
	→ netj joined	19:21
	← Silenced left	19:22
	→ goweol joined	19:24
	← LocaMocha left	19:27
	← orbyt_ left	19:27
	← Anticom left	19:28
	← re1 left	19:29
	→ jottr joined	19:29
	← cdg left	19:30
	→ cdg joined	19:30
	← Mattiaslndstrm left	19:30
	→ sathed joined	19:31
	← kishmesh left	19:31
	→ zivester2 joined	19:32
	→ orbyt_ joined	19:33
	→ dsdeiz_ joined	19:33
	← PHPanos left	19:33
	→ tymczenko joined	19:33
	→ stemid joined	19:33
	→ Mattiaslndstrm joined	19:34
	← zivester left	19:34
	← cdg left	19:34
	→ FJB joined	19:34
stemid	I've been making some local changes to a git repo and then manually reversing them. and I've been running into this a lot https://bpaste.net/show/8ddc6d7c8ac7 and I don't understand what has changed or how to revert it. I know there's probably a fancy git method to do this like stash or revert but I don't know it yet.	19:34
	fyi it doesn't help to put a newline at the end of file.	19:35
	that just gives me more changed lines.	19:35
mud	stemid: What about removing a newline at the end of the file?	19:36
	→ kishmesh joined	19:37
	← dsdeiz_ left	19:38
	→ durham_ joined	19:40
	→ allinonepker joined	19:40
	→ bongjovi joined	19:40
	← allinonepker left	19:40
	→ gxt joined	19:41
	← bttf left	19:41
	← mud left	19:42
	→ mud joined	19:42
	← durham left	19:42
stemid	huh that did it.	19:43
	did a printf %s "$(< tools/helpers.py)" and used that output	19:43
	thanks	19:43
	→ durham joined	19:44
	← phluks left	19:44
	→ zifnab joined	19:44
	← Gustavo6046 left	19:45
stemid	that's weird, vim displays the file the same. only cat reveals the missing newline.	19:45
	→ Sound joined	19:46
	← FJB left	19:47
	← durham_ left	19:47
	← bongjovi left	19:47
	→ FJB joined	19:47
	→ durham_ joined	19:48
	← durham left	19:48
	→ Gurkenglas joined	19:49
	← watabou left	19:49
	← Sound left	19:50
stemid	is there a way to merge the branch I currently have checked out into another branch that I have locally? I've been doing checkout on the other branch first and then merge. could save me a couple steps.	19:50
	← FJB left	19:50
	→ FJB joined	19:50
	→ Doginal joined	19:50
	→ fassl joined	19:51
tobiasvl	stemid: if the merge is a fast forward, you can push to the branch	19:51
	but otherwise you need to have checked out the branch you're merging into, to resolve conflicts	19:52
	this should work for the former case: git push . current_branch:other_branch	19:52
	→ watabou_ joined	19:52
	→ dsdeiz_ joined	19:52
stemid	hm ok, thanks but I'll have to read about what fast forward merge means to understand.	19:53
mud	I would just get used to checking out the branch you're modifying.	19:53
tobiasvl	stemid: !ff	19:53
gitinfo	stemid: A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf	19:53
raynold	ahh it's a wonderful day	19:54
stemid	"simply moved forward" I hope that means that branch2 gets the changes from branch1.	19:54
tobiasvl	stemid: yes. it means that if the only thing that's happened is that branch1 has gotten new commits after it branched off of branch2, then it can be merged as a fast-forward with no conflictts	19:55
	but if the branches have diverged by both branches having added commits, it's not a fast forward	19:55
	→ gopar joined	19:55
stemid	oh well then it sounds like I need to try this. thanks	19:55
tobiasvl	yeah, you can just try it. if it's not possible to fast-forward merge, the push will fail	19:56
stemid	and if I understand the pdf correctly I can also add --no-ff to have a commit created like it has been before.	19:56
	← dsdeiz_ left	19:57
	← mikeymop left	19:57
tobiasvl	stemid: well, no. you can't add a merge commit without merging locally. --no-ff means the merge is treated as a non-fast-forward	19:57
	← fassl left	19:57
	→ kasper^ joined	19:58
	← durham_ left	19:58
	→ durham joined	19:59
	→ fassl joined	19:59
	→ Gustavo6046 joined	20:01
	← bilb_ono left	20:01
	← Gustavo6046 left	20:01
	→ Gustavo6046 joined	20:02
	← Gustavo6046 left	20:02
	→ Gustavo6046 joined	20:03
	← goweol left	20:03
	← orbyt_ left	20:03
	← durham left	20:03
	← zivester2 left	20:04
	→ Floflobel joined	20:04
	→ zivester joined	20:04
	← fassl left	20:05
	← zivester left	20:05
	→ goweol joined	20:05
	→ nanga joined	20:05
	← nanga left	20:05
	→ nanga joined	20:05
	← BSaboia left	20:06
	← Gurkenglas left	20:07
	→ googe joined	20:08
	→ BSaboia joined	20:08
	← googe left	20:08
stemid	oh right I forgot to mention my branches are on different remotes.	20:11
	so git push remote branch1:branch2 didn't work immediately for me.	20:11
	→ mikeymop joined	20:11
stemid	maybe I can specify a full path to each branch including remote.	20:11
	→ RalphJr45 joined	20:11
	→ ZyX-I joined	20:12
	→ dsdeiz_ joined	20:12
	← goweol left	20:13
	→ Rainee joined	20:13
	← tarkus left	20:13
tobiasvl	stemid: huh? you said you had the branches locally	20:14
	you don't specify a remote in your push command. it's just a trick: you're pushing to your own repo	20:14
	the . stands in for the remote	20:15
	← cagomez left	20:15
stemid	well I may be confusing what local means but what I meant was that I had fetched everything from the remote to my computer. but I still have to push changes to the remotes. and there's one remote for each branch.	20:15
	→ goweol joined	20:16
stemid	because I'm deploying from one of the branches	20:16
	→ cagomez joined	20:16
stemid	so the deployment needs to access the remote branch	20:16
	→ wilbert joined	20:16
	← dsdeiz_ left	20:17
	← Rainee left	20:17
tobiasvl	OK, but then I don't understand what you want to do. if it's a fast-forward, you can just push TO the remote itself. that's what people do every day when they've done some local changes that they want the remote to hav	20:17
	have*	20:17
	← goweol left	20:18
	→ Akimb joined	20:18
	← Akimb left	20:18
	→ goweol joined	20:18
	← Cavallari left	20:19
	→ zivester joined	20:19
	→ _Vi joined	20:20
_Vi	Why --notes option of git-send-email is not documented? Is it intentional or just nobody cared to document it?	20:21
	← cagomez left	20:21
	← jnavila left	20:22
	→ jnavila joined	20:22
_Vi	Or is being documented for "git format-patch" means no need to document it for send-email?	20:24
	→ King_Hual joined	20:25
	← King_Hual left	20:25
	→ King_Hual joined	20:25
	← ResidentBiscuit left	20:25
	→ Scanty1 joined	20:25
tobiasvl	git: 'send-email' is not a git command. See 'git --help'.	20:25
	?	20:25
	← goweol left	20:25
	← watabou_ left	20:26
	→ goweol joined	20:26
	← Scanty1 left	20:28
	→ watabou_ joined	20:29
Eugene	_Vi - patches welcome ;-)	20:29
	← Floflobel left	20:29
Eugene	tobiasvl - some distributions(Ubuntu I know of) have git-core vs git-all packages	20:30
	→ _ADN_ joined	20:30
	→ dsdeiz_ joined	20:32
	→ dre_ joined	20:32
	← dre_ left	20:33
	← Murr left	20:34
	→ Murr joined	20:34
	→ dre_ joined	20:35
	→ prometh joined	20:35
prometh	can a pull/merge request git hook be limited to branches that stem from specific branches? such as release-1.0 -> feature	20:35
	am i limited to using tags?	20:35
	← punkbit left	20:36
	→ SteffanW joined	20:36
	← dsdeiz_ left	20:36
rafasc	send email is not from core :O	20:38
	→ m0viefreak joined	20:38
rafasc	?	20:38
_ikke_	prometh: are you referring to git(hub\|lab)\|bitbucket webhooks?	20:38
prometh	yes, and i'm using jenkins	20:38
mud	prometh: What hook exactly? That doesn't sound familiar. But you'll probably have to code whatever it is at a guess, assuming it provides the info you need.	20:38
	→ NiobiumVolant joined	20:38
stemid	tobiasvl: sorry for being confusing but my workflow is this. make changes to branch1. git commit in branch1, git push remote1 branch1. then I've always done git checkout branch2, git merge branch1, git push remote2 branch2. simplified, obviously the remotes are setup in .git/config so I only run git push in practice.	20:38
	→ staafl joined	20:39
prometh	origin/parent-branch/feature-branch	20:39
	i have two jobs in jenkins connected to the webhook	20:39
mud	webhook sounds a lot like a feature specific to some site. Are you talking about github?	20:39
prometh	hotfixes need to run a different build command than develop branches	20:39
	i'm talking about targeting branches with specific parent branches	20:40
	using some sort of git syntax	20:40
	https://i.imgur.com/qbTlW9R.png	20:41
	those appear to be my options	20:41
	some of its examples are a bit vague	20:41
	→ _3case_ joined	20:44
	← _3case_ left	20:44
	← sea-gull left	20:44
	← diogenese left	20:44
	→ orbyt_ joined	20:44
	← goweol left	20:45
	→ diogenese joined	20:46
	→ goweol joined	20:46
	→ Gurkenglas joined	20:47
	← jnavila left	20:47
	→ BigD53 joined	20:47
	← BigD53 left	20:47
	→ opal joined	20:48
	→ Acerific joined	20:49
	← Acerific left	20:49
	→ Acerific joined	20:49
	→ dsdeiz_ joined	20:52
	← zarzar left	20:52
	→ nokleby joined	20:52
	→ zarzar joined	20:52
	← nokleby left	20:53
binary106	does anyone know why git pull --rebase occasionally hangs seemingly forever? does it do a defrag/GC of some kind?	20:53
	← jrabe left	20:54
	→ jrabe joined	20:54
binary106	10k files in repo on ssd raid0	20:54
_ikke_	if it would do something like that, it would show output	20:54
	binary106: sounds more like a network issue	20:54
binary106	ooh, maybe MTU?	20:55
_ikke_	perhaps	20:55
	← NiobiumVolant left	20:55
	→ phluks joined	20:56
	← dsdeiz_ left	20:56
	← Nizumzen left	20:56
	→ fassl joined	20:57
	→ NiobiumVolant joined	20:57
	← SteffanW left	20:59
	← jeffreylevesque left	21:00
	→ beastd joined	21:00
	→ yohnnyjoe joined	21:00
	← goweol left	21:00
prometh	no one can help me?	21:00
	← beastd left	21:00
	← NiobiumVolant left	21:01
	→ snowkidind joined	21:02
	← watabou_ left	21:02
	← Matze202 left	21:02
	← nooooone left	21:03
	→ durham joined	21:03
	→ nooooone joined	21:04
	→ NiobiumVolant joined	21:04
mud	prometh: You kind of ignored the question of what tech you're talking about, so I wandered off. It doesn't sound like pure git.	21:04
	→ gildarts joined	21:04
prometh	i'm using jenkins	21:05
	it's asking for an expression to target my desired branches	21:05
rafasc	also, it's not very clear what you're trying to do.	21:05
prometh	git uses things like origin/head	21:05
	← Gurkenglas left	21:05
prometh	i want to run scriptA on pull requests that branch from branchA, and run scriptB on pull requests that branch from branchB	21:06
	← paul424 left	21:06
prometh	this is complex: https://stackoverflow.com/questions/3161204/find-the-parent-branch-of-a-git-branch	21:07
	→ theoceaniscool joined	21:08
rafasc	there's no such thing as a "parent branch of a Git branch"	21:09
	← MACscr left	21:09
prometh	i sort of knew that	21:09
rafasc	check the !logs	21:09
gitinfo	[!irclog] Public logs of #git are kept at: https://gitirc.eu/log or see stats for the last 30 days: https://itvends.com/irc/git.html or for all time (give or take): https://itvends.com/irc/git-all.html	21:09
	→ goweol joined	21:09
	← Senecea left	21:09
rafasc	we've talked about this today.	21:09
prometh	huh?	21:10
	i have to parse git logs?	21:10
_ikke_	that's this channel's logs	21:10
prometh	i can't do that with a regular expression in a jenkins sigline-line text field	21:11
	single	21:11
rafasc	no, I was asking you to check the irc logs, because we've talked earlier today how it doesn't really make sense talking about "branch parents"	21:11
	← NiobiumVolant left	21:11
_ikke_	you can check git branch --merged <branch> perhaps	21:11
	→ dsdeiz_ joined	21:11
_ikke_	But that doesn't apply to all situations	21:11
	→ NiobiumVolant joined	21:11
	← NiobiumVolant left	21:12
prometh	that sounds like it'd work for master branch, not a branch that merged into master	21:12
	← muelleme left	21:13
	← durham left	21:13
	← goweol left	21:13
	→ MACscr joined	21:13
prometh	<branch> can't be an expression, can it?	21:13
	→ durham joined	21:14
prometh	also, i don't seem to have access to bash for this	21:14
	→ Nizumzen joined	21:14
	→ joshy-RP joined	21:14
	→ Matze202 joined	21:15
	→ tunekey joined	21:16
	← dsdeiz_ left	21:16
	→ durham_ joined	21:16
	→ nachoman joined	21:16
	→ AlchemiA joined	21:16
	← AlchemiA left	21:16
	← joshy-RP left	21:17
	← db8093246 left	21:17
	→ jnavila joined	21:17
	← durham left	21:18
	← dviola left	21:18
	→ diego2 joined	21:19
	← diego2 left	21:19
	← FJB left	21:20
	→ FJB joined	21:20
prometh	can i check for a sha in history somehow?	21:20
	→ lafromboise joined	21:21
	← sathed left	21:21
_ikke_	What do you want to check exactly?	21:21
	→ kostur86 joined	21:21
prometh	if a commit exists in the current git history	21:21
	← navidr left	21:21
_ikke_	git merge-base --is-ancestor	21:21
	→ sathed joined	21:21
prometh	that just gave me a help screen	21:22
_ikke_	You have to provide it some details	21:22
	← rorro left	21:22
prometh	git merge-base --is-ancestor f308241c9a940ae16d672ad07323377d06a750b7	21:22
	← lafromboise left	21:22
	→ goweol joined	21:22
prometh	dunno why it shows <commit> <commit> in the help	21:23
_ikke_	You have provide it 2 comittish	21:23
	→ dviola joined	21:23
_ikke_	hmm	21:23
prometh	what two commits?	21:23
	i guess the current commit?	21:23
	current/latest	21:23
Eugene	!HEAD	21:23
gitinfo	HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	21:23
_ikke_	Eugene: it requires 2 commits	21:24
Eugene	And head would be the other one	21:24
_ikke_	prometh: git commit --is-ancestor <commit-to-check> <branch-to-check>	21:25
prometh	returns nothing	21:25
_ikke_	It returns an exit code	21:25
	echo $?	21:25
	← jnavila left	21:25
_ikke_	It's meant to be used in scripts	21:25
	→ watabou_ joined	21:25
prometh	ah, 0	21:26
	← durham_ left	21:26
_ikke_	that means it is an ancestor	21:26
	← FJB left	21:26
	→ FJB joined	21:26
	→ durham joined	21:26
_ikke_	prometh: git commit --is-ancestor <commit-to-check> <branch-to-check> && echo is-ancestor \|\| echo no-ancestor	21:26
prometh	not?: git merge-base --is-ancestor f308241c9a940ae16d672ad07323377d06a750b7 HEAD && echo $?	21:27
	oh, they're strings	21:27
_ikke_	that would not echo anything if it isn't an ancestor	21:27
prometh	i get it now	21:27
_ikke_	yeah	21:27
prometh	echo $? \|\| echo 1	21:28
	← average left	21:28
_ikke_	&& echo yes \|\| echo no	21:28
prometh	same shits :)	21:28
_ikke_	; echo $?	21:28
prometh	what's that one do?	21:29
_ikke_	That just echo's the exit code, regardless of what it is	21:29
prometh	ah, that's better	21:29
	thanks	21:29
_ikke_	the ; is just meant to seperate it from the first command	21:29
prometh	cool, makes sense	21:30
	← goweol left	21:30
	→ cdg joined	21:30
	← durham left	21:30
	→ goweol joined	21:31
	→ dsdeiz_ joined	21:31
	← Cabanossi left	21:32
	← sathed left	21:32
	→ sathed joined	21:32
	← cdg left	21:33
	→ cdg joined	21:33
	→ Cabanossi joined	21:34
	→ jnavila joined	21:35
	→ maroloccio joined	21:35
	→ j08nY joined	21:36
	← dsdeiz_ left	21:36
	← FJB left	21:37
	← Es0teric left	21:38
	→ FJB joined	21:38
	→ bilb_ono joined	21:39
	← PaulCapestany left	21:39
	← GeraldW left	21:40
	→ daurnimator joined	21:40
	← Doginal left	21:40
	← kfunk left	21:41
_ikke_	I'm just wondering how I can best provide feedback	21:42
	→ Es0teric joined	21:42
	← phluks left	21:43
	← goweol left	21:43
	→ durham joined	21:43
	← durham left	21:44
rafasc	what do you mean by that?	21:44
	→ jcarpenter2 joined	21:45
	← FJB left	21:45
	→ goweol joined	21:45
	→ FJB joined	21:45
_ikke_	with patches, it's easy to give inline feedback, but just commits, it's harder	21:46
	→ rorro joined	21:46
_ikke_	github would let me add inline comments on the code, but not on the commit message	21:46
	← watabou_ left	21:46
	→ UserOO7_ joined	21:47
	→ durham joined	21:48
	← durham left	21:49
	← UserOO7_ left	21:49
	→ durham joined	21:50
	→ dsdeiz_ joined	21:51
rafasc	maybe a squash/fixup commit?	21:51
	← dre_ left	21:51
	→ watabou_ joined	21:51
	← clickjack left	21:52
	→ PaulCapestany joined	21:54
_ikke_	That still does not take care of the commit message quite well	21:54
rafasc	is this about my branch my branch?	21:55
	← Xrayez left	21:55
_ikke_	?	21:55
	← goweol left	21:55
	→ goweol joined	21:55
	← dsdeiz_ left	21:55
	← RalphJr45 left	21:56
	← AaronMT_ left	21:56
	← mel00010 left	21:56
	→ jnewt joined	21:56
rafasc	was asking if this question regarding giving feedback is related to our patch. Because if it makes easier on you, I could still send it via email.	21:56
_ikke_	yes	21:57
	it was	21:57
	← heym0e left	21:57
	← goweol left	21:58
rafasc	do you want me to send it via email?	21:58
_ikke_	Yeah, I guess that's easiest	21:58
rafasc	Ok, I'll do it then.	21:59
	→ Gurkenglas joined	21:59
	→ cagomez joined	21:59
	← prometh left	22:00
	← synthroid left	22:00
	→ jeffreylevesque joined	22:00
	→ UserOO7 joined	22:01
	→ goweol joined	22:02
	→ uncut-66 joined	22:02
	← uncut-66 left	22:02
rafasc	go it?	22:03
	_ikke_: got it?	22:03
	→ dsdeiz_ joined	22:04
	← Matze202 left	22:04
	→ HornyVersRP joined	22:05
	← HornyVersRP left	22:05
	← UserOO7 left	22:05
	← fassl left	22:05
	← IrishPrime left	22:06
	← goweol left	22:06
	→ goweol joined	22:07
_ikke_	rafasc: yea	22:08
	→ deadlysin joined	22:08
	← deadlysin left	22:08
	→ deadlysin joined	22:08
	← jnavila left	22:09
	← dsdeiz_ left	22:09
	← goweol left	22:10
	→ goweol joined	22:10
	← Es0teric left	22:10
	→ UserOO7 joined	22:13
	← goweol left	22:13
	→ goweol joined	22:14
	← UserOO7 left	22:14
	→ UserOO7 joined	22:16
	← Gurkenglas left	22:18
	← FJB left	22:18
	→ Seiichiro joined	22:18
	→ FJB joined	22:19
	← Seiichiro left	22:19
	← stutter left	22:20
	→ GeraldW joined	22:23
	→ dsdeiz_ joined	22:24
	→ sucks joined	22:24
	← watabou_ left	22:25
	← orbyt_ left	22:26
	← UserOO7 left	22:26
	← Mattiaslndstrm left	22:27
	→ UserOO7 joined	22:27
	← Nugax__ left	22:27
	→ RalphJr45 joined	22:29
	→ orbyt_ joined	22:29
	← sucks left	22:29
	← dsdeiz_ left	22:29
	→ [Robert] joined	22:29
	← [Robert] left	22:30
	← UserOO7 left	22:31
	← orbyt_ left	22:32
	→ watabou_ joined	22:33
	← Murii left	22:34
	← Murr left	22:34
	← zivester left	22:34
	→ Murr joined	22:34
	← perlpilot left	22:36
	← ZyX-I left	22:36
	→ UserOO7 joined	22:36
	← UserOO7 left	22:37
	→ UserOO7 joined	22:38
	← mostlybadfly left	22:38
	← tinanoo left	22:40
	→ Darcidride joined	22:41
	← madewokherd` left	22:42
	← UserOO7 left	22:42
	← wilbert left	22:42
	→ jungsubk joined	22:43
d^-^b	Hey guys	22:44
	I need halp	22:44
_ikke_	!just_ask	22:44
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	22:44
	← goweol left	22:44
	→ goweol joined	22:44
d^-^b	So I want to commit a folder which contains more folders which contains… (You get the gist of it)	22:45
	It doesn't include the content of my folders in the commit	22:45
	→ boombatower joined	22:45
	← Darcidride left	22:45
d^-^b	I tried to add the folders but the content is still nowhere to be seen… Do I have to manually go to the folder then commit each one? :/	22:45
_ikke_	d^-^b: what does git status say/	22:46
d^-^b	Changes not staged for commit: modified: anewmed.cpp (modified content, untracked content) …	22:46
	I tried: git add . and git add anewmed.cpp/.	22:47
_ikke_	d^-^b: right, so that's a submodule	22:47
d^-^b	what's that	22:48
	← mikecmpbll left	22:48
_ikke_	!submodule	22:48
gitinfo	git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/book/en/Git-Tools-Submodules	22:48
_ikke_	anewmed.cpp contains a .git directory	22:48
	→ mostlybadfly joined	22:48
d^-^b	It does	22:48
	the other folder "hexToDec" does too but I created it today and haven't committed it yet on it's own	22:49
_ikke_	d^-^b: do you have a .gitmodules file?	22:49
	→ wilbert joined	22:49
_ikke_	in the top-most repo	22:49
d^-^b	erm	22:50
	in the .git folder?	22:50
_ikke_	no, in the root of your repository	22:50
	→ Gurkenglas joined	22:51
	→ Teremy joined	22:51
d^-^b	https://gyazo.com/9834b240f6147bc6265b2c223bed74a8	22:51
	That's the root of my repository… Well the local one	22:51
_ikke_	Right, so no .gitmodules file	22:51
d^-^b	no	22:52
	what even is that	22:52
_ikke_	So what s it that you want to achieve with this setup?	22:52
	a file that contains some data git needs for submodules	22:52
d^-^b	I just want everything you've just seen in that screen to be pushed to my repo	22:52
	← Dougie187 left	22:52
_ikke_	did you clone those other repositories from somewhere else?	22:53
d^-^b	No	22:53
_ikke_	did you intentionally created multiple repositories?	22:53
d^-^b	yes	22:53
	I wanted to combine them and then delete the lonely ones	22:54
	if that makes any sense	22:54
	← FJB left	22:54
	→ FJB joined	22:54
d^-^b	I'll just delete the git files in them	22:55
_ikke_	If you have multiple repositories, you need to commt in each of them	22:55
	← nachoman left	22:55
_ikke_	If you want to treat them as one repo, you should indeed remove (or move) those .git directories	22:55
	← Nizumzen left	22:56
	→ PaulCape_ joined	22:57
	← PaulCapestany left	22:58
d^-^b	um	22:58
	nothing to commit, working tree clean	22:59
	→ Enphuego joined	22:59
_ikke_	git rm --cached on both those directories	22:59
	to let git forget that they were submodules	23:00
	← maroloccio left	23:00
	← Argylelabcoat left	23:01
d^-^b	works great, thank you	23:01
	← led_belly_ left	23:01
	← Calinou left	23:02
	← wootehfoot left	23:03
	→ pro_metedor joined	23:03
	← dfaught left	23:04
	← thebope left	23:04
	→ orbyt_ joined	23:04
	← FJB left	23:04
	→ FJB joined	23:05
	→ thinkpad joined	23:05
	← watabou_ left	23:07
	← alexx8 left	23:07
	← cbonobo left	23:08
	→ cbonobo joined	23:08
Barrt	Hi people	23:08
	← cbonobo left	23:09
	→ cbonobo joined	23:09
	← goweol left	23:09
Barrt	is there anyone that can point me to a direction in how to setup an lab test environment to learn and practice git server configuration?	23:09
	← FJB left	23:09
	→ goweol joined	23:09
	← cbonobo left	23:10
	→ cbonobo joined	23:10
Barrt	I'm learning git in git-scm	23:10
	← Gurkenglas left	23:10
	← cbonobo left	23:10
Barrt	and my hardware setup is 2 laptops, one with linux and other with windows, where I can run hyper-v	23:11
	I also have an vm with windows 2012 R2 where I can use to setup a domain in active directory	23:11
	→ cbonobo joined	23:12
	← cbonobo left	23:12
	← luckman212 left	23:12
Barrt	or IIS	23:13
	→ jstimm joined	23:13
	→ scientes joined	23:13
Barrt	would it be best to use a linux server machine to host git?	23:13
	← goweol left	23:14
rafasc	git is decentralized, you don't need a server if you wan't to try git.	23:14
	→ watabou_ joined	23:14
	← z1haze left	23:15
rafasc	as long as the two machines can talk to each other, via ssh or by accessing a common file system... git should work just fine	23:15
	← wilbert left	23:15
rafasc	or even using $git daemon; man git-daemon	23:16
gitinfo	the git-daemon manpage is available at https://gitirc.eu/git-daemon.html	23:16
	← tymczenko left	23:16
	→ goweol joined	23:18
	→ luckman212 joined	23:19
rafasc	Barrt: what are you really trying to learn? Can you be more specific?	23:19
	→ \|ifei5g00d joined	23:20
	← jungsubk left	23:21
	← \|ifei5g00d left	23:21
rafasc	s/wan't/want/ <- I guess I need some sleep.	23:21
	← \|ifei5good left	23:21
	→ \|ifei5g00d joined	23:21
	← kpease_ left	23:22
	← TikityTik left	23:23
	→ TikityTik joined	23:23
	→ zarzar1 joined	23:23
	← zarzar left	23:23
	← easzero left	23:25
	→ Calinou joined	23:26
	← pro_metedor left	23:26
	← leeN left	23:27
	← goweol left	23:27
	→ goweol joined	23:28
	→ pro_metedor joined	23:28
	→ FJB joined	23:30
	← FJB left	23:32
	→ FJB joined	23:33
	→ dsdeiz_ joined	23:34
	→ adomas joined	23:34
	← jottr left	23:36
	← rafasc left	23:36
	← AlynxZhou left	23:37
	← thiago left	23:38
	← dsdeiz_ left	23:38
	← goweol left	23:38
	→ goweol joined	23:39
	← pro_metedor left	23:40
	→ Kaisyu joined	23:41
	← m0viefreak left	23:41
	← NwS left	23:42
	← netj left	23:42
Barrt	thanks rafasc	23:43
	→ netj joined	23:43
Barrt	in fact I want to learn to configure a git server, like it was for an organization	23:43
	← orbyt_ left	23:43
Barrt	for what i read on some posts on stack , it seems that there are some features of git that are not available on windows machine	23:44
	in server of course	23:45
	like gitlab for example	23:45
	but I'm a newbie	23:45
	so	23:45
mud	? gitlab isn't a feature of git, it's a separate project.	23:45
	→ orbyt_ joined	23:45
	← FJB left	23:46
Barrt	sorry mud like I said I'm a newbie, I've learned that github is also a project, maybe there are some key concepts that I'm missing	23:46
	← watabou_ left	23:47
	→ FJB joined	23:47
	→ jnewt_ joined	23:48
	← jnewt_ left	23:48
mud	git started as just one piece of software, the one you're seeing on git-scm. There's a bunch of other projects surrounding it now though, using the same underlying software or at least the same protocol. Examples of those are gitolite, gitlab, github, bitbucket, etc.	23:48
Barrt	mud and in production, or professionally witch is more suitable for organizations	23:49
	or found more often?	23:49
	if you had to guess	23:49
	← King_Hual left	23:49
mud	So, setting up a server for using git is mostly just a matter of picking which extra tool you want. You technically don't even need one, you can just use SSH for example, but it's not very friendly. gitolite is probably the minimal setup I'd actually use professionally. If that provides all of the features you'd need, you can stop there. Otherwise, I'd look at others.	23:49
	If you need more than gitolite provides, maybe look at using bitbucket or github directly. If the cost is too high or you really need it to be local, or something else, then I'd look at I don't know, whatever else.	23:50
	→ m0viefreak joined	23:50
	← dege left	23:50
Barrt	so in fact if I know git-scm, I will probably be able configure any of those tools right?	23:51
	→ olalonde joined	23:51
mud	They're as easy to set up as any other server things are, in general.	23:51
Barrt	but is it normal for organizations to use git on their production environment?	23:52
mud	Sure, git is extremely popular.	23:52
osse	depends on what kind of production we're talking about. probably yes. why not	23:52
Barrt	in general of course, so its widely used	23:52
	hey thanks :)	23:53
mud	Git pretty much won the VCS wars, as far as it's possible for one tech to win anything.	23:53
	→ aw1 joined	23:53
osse	Serious question: when developing a standard desktop app, what is meant by "in production" ?	23:53
	I've never really understood that term	23:53
	→ Gurkenglas joined	23:53
	→ Munt joined	23:54
	← goweol left	23:54
	→ goweol joined	23:55
Barrt	osse: I understand production by the workflow of the organization in question, even if you are developing a standard local App,	23:55
	→ kadoban joined	23:55
	← mud left	23:55
	kadoban → mud	23:55
mud	My connection to freenode today is just terrible, ugh.	23:55
osse	Barrt: then in my case git everywhere	23:56
Barrt	even if it is without collaboration, if git is on your workflow, probably you will much more organized	23:56
	→ AlynxZhou joined	23:57
Barrt	I htink I already understood the nuts and bolts of git in local env mode	23:57
	think	23:57
osse	Barrt: but I mean... you can reliably use git to produce a particular version of the code base. whether that is on a build server, web server, VM, whatever, you can rely on that. What you do with it afterwards (build it, host it) is out of the scope of git	23:57
	← frew left	23:57
	← goweol left	23:57
	← cdown left	23:58
osse	maybe you think git does more than it actually does :p	23:58
	→ up_the_irons joined	23:58
Barrt	I understand, so for example I have read that gitlab just for a bit and it seems a bit like anaconda or rvm 7	23:58
	an environment management app	23:59
	← jstein left	23:59
Barrt	osse: maybe I think that git is like an amazing tool for an unorganized fellow like me ahah	23:59
	← AlynxZhou left	23:59
Barrt	;)	23:59
	← dsdeiz left	23:59
	→ goweol joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation