IRCloggy #git 2017-10-06

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-10-06
Enphuego	I considered it, but it seemed a lot easier to explain if the code stays on site.	00:00
	← Oatmeal left	00:00
	← cliluw left	00:00
Enphuego	From what I read, git was kinda designed to have a bunch of copies in a bunch of different spots. I can build a couple of VMs at different sites if needed, it's really no problem.	00:01
	→ Jin23Lee joined	00:02
	→ elfuego joined	00:02
	→ cdg joined	00:02
	← Jin23Lee left	00:03
	← bronson left	00:04
Enphuego	ok so my next steps are going to be build a second VM with ansible and git installed, remove ansible control over the ansible machine, clone the code base into different working directories and then use git pull and merge to push in the everyday workflow. Plus read through that book and get ansible logging to Splunk.	00:05
	← lafleurdubien left	00:05
	→ roygbiv joined	00:06
	← _ADN_ left	00:06
	← cdg left	00:07
	← piraye left	00:07
Enphuego	sorry if all of that was difficult... I'm a bit over my head here and the concepts can be confusing	00:09
nedbat	Enphuego: no worries, we had a good discussion, and it sounds like you have some good next steps	00:09
	← elfuego left	00:10
	→ cliluw joined	00:12
	← jameser left	00:13
	← Orbitrix left	00:15
	→ gokmen joined	00:15
	← cstratak left	00:15
	→ thiago joined	00:18
	← m0viefreak left	00:18
Enphuego	so I just cloned my repo into a new working directory, but it raises a few issues. Is there some way to restrict who can push to the original repo?	00:18
	← cagomez left	00:19
	← drodger left	00:19
	→ cagomez joined	00:19
	← cagomez left	00:19
	← AfroThundr left	00:19
	→ cagomez joined	00:20
Enphuego	well you know the security can't be any worse than it was so I'll figure out how to solve that later	00:21
	→ jeffreylevesque joined	00:22
	→ fmcgeough joined	00:22
	→ bronson joined	00:24
	← cagomez left	00:24
	→ AfroThundr joined	00:24
	→ orbyt_ joined	00:25
	← Guma left	00:25
	→ drodger joined	00:25
	→ jameser joined	00:26
	→ stutter joined	00:26
	← nicolai86 left	00:28
Enphuego	ok, a little lost here. I cloned, then I modified something, then it wouldn't let me push because the branch I was on was checked out	00:29
	so I went back to the original repo, switched branches, went back to the new repo then pushed again and it worked	00:29
	so in my workflow, am I supposed to make a new branch and then pull that remotely?	00:29
	→ justAllgood joined	00:32
Toba	you don't have to make the branch remotely, you can make it on your local machine and push it up.	00:33
	the "server" you shouldn't be checking things out on it, if you're going to have one central repo that everyone pushes/pulls from.	00:34
Enphuego	ok, that's making more sense.	00:37
	← jameser left	00:37
	← Enphuego left	00:41
	→ DolpheenDream joined	00:41
	→ Oatmeal joined	00:43
	← justanotheruser left	00:43
	← fmcgeough left	00:44
	→ cdg joined	00:45
	→ jameser joined	00:45
	← rorro left	00:45
	← juvenal left	00:46
	← blackmesa left	00:47
	→ fmcgeough joined	00:47
	← jameser left	00:47
	← cdg left	00:50
	← fmcgeough left	00:51
	← manuelschneid3r left	00:52
	→ dviola joined	00:52
	→ nicolai86 joined	00:55
	← bronson left	00:56
	→ rocktop joined	00:57
	→ justanotheruser joined	01:00
	← bergice_ left	01:00
	← kfoonamalik left	01:01
	← sunri5e left	01:04
	→ cbonobo joined	01:06
	→ jceb joined	01:07
	→ sunri5e joined	01:07
	← roygbiv left	01:08
	← guccimeow left	01:08
	→ cryptic joined	01:09
	← greenbagels left	01:09
	← cryptic left	01:09
	→ cryptic joined	01:09
	← cryptic left	01:10
	→ cryptic joined	01:10
	← cbonobo left	01:11
	← cryptic left	01:11
	→ cryptic joined	01:11
	← cryptic left	01:12
	→ cryptic joined	01:12
	← cryptic left	01:12
	→ jameser joined	01:15
	→ cdg joined	01:17
	← tnecniv left	01:17
	→ roelmonnens joined	01:19
	← Mattiaslndstrm left	01:21
	→ ozcanesen joined	01:22
	→ jameser_ joined	01:23
	← roelmonnens left	01:23
	← jameser left	01:23
	→ greenbagels joined	01:23
	← xcm left	01:24
	→ xcm joined	01:24
	→ ArcaTech joined	01:24
	← byte512 left	01:25
	→ finalbeta joined	01:25
	← Persikka left	01:25
	→ irqq_ joined	01:25
	← muep left	01:25
	← cyberz left	01:26
	← irqq left	01:26
	→ Irfan joined	01:26
	← Cabanossi left	01:26
	Irfan → Guest68870	01:26
	← cybrNaut left	01:26
	→ muep joined	01:27
	← autrilla left	01:27
	→ autrilla_ joined	01:27
	← ti2 left	01:27
	← tec___ left	01:27
	→ Cabanossi joined	01:27
	→ tec__ joined	01:27
	← austin987 left	01:27
	→ byte512 joined	01:27
	→ Persikka joined	01:27
	→ cyberz joined	01:27
	← luckman212 left	01:28
	→ ti2 joined	01:28
	autrilla_ → autrilla	01:28
	→ Hello71_ joined	01:29
	← orbyt_ left	01:29
	→ cybrNaut joined	01:29
	← cybrNaut left	01:29
	← Hello71 left	01:29
	→ tnecniv joined	01:30
	→ cybrNaut joined	01:30
	← KnoP left	01:32
	→ luckman212 joined	01:34
	← tvw left	01:36
	→ sasheto joined	01:39
	→ d^sh_ joined	01:43
	← DolpheenDream left	01:43
	← shinnya left	01:45
	← ilbot3 left	01:45
	← d^sh left	01:46
	→ GODDOG joined	01:47
	← ArcaTech left	01:47
	← Guest68870 left	01:49
	→ Gencade joined	01:50
	← Bishop_Bautista left	01:52
	← jceb left	01:54
	→ ilbot3 joined	01:56
	← jameser_ left	01:58
	→ dreiss joined	01:59
	← tsia left	02:00
	→ tsia joined	02:01
	← kriskropd left	02:01
	← Anja__ left	02:02
	← surfist left	02:02
	→ GunArm1 joined	02:03
	← greenbagels left	02:04
	← altendky left	02:04
	← zapb__ left	02:04
	← todder left	02:04
	← joel135 left	02:04
	← gyre007 left	02:04
	← chamunks left	02:04
	→ zapb_ joined	02:04
	← maqr left	02:04
	← n-st left	02:04
	← tcpdump left	02:04
	→ chamunks joined	02:05
	← SegFaultAX left	02:05
	← ^MillerBoss left	02:05
	← kirb left	02:05
	→ surfist joined	02:05
	← GunArm left	02:05
	← fearless_man left	02:05
	← ExeciN left	02:05
	← no_maam left	02:05
	← ggherdov left	02:05
	← thekingofbandit left	02:05
	← KevinMGranger left	02:05
	← jscob left	02:05
	← lebster left	02:05
	← oskie left	02:05
	← timwis left	02:05
	← Peng left	02:05
	→ greenbagels joined	02:06
	← eblip left	02:06
	← javaJake left	02:06
	← snsapiens left	02:06
	← lus left	02:06
	← yoh left	02:06
	← synchronous left	02:06
	← reactormonk[m] left	02:06
	← primeos[m] left	02:06
	← CustosLimen left	02:06
	← sparr left	02:06
	← yena left	02:06
	← veremitz left	02:06
	← aspiers[m] left	02:06
	← POQDavid_ZNC left	02:06
	← lupine left	02:06
	→ finalbeta1 joined	02:06
	→ joel135 joined	02:07
	→ tcpdump joined	02:07
	← Technodrome left	02:07
	→ altendky joined	02:07
	→ fearless_man joined	02:07
	→ lupine joined	02:07
	← ELLIOTTCABLE left	02:08
	← d-k left	02:08
	← adamus1red left	02:08
	← tohuw left	02:08
	← cust left	02:08
	→ n-st joined	02:08
	← neunon left	02:08
	← Xarodon left	02:08
	← steven left	02:08
	← Ricaz left	02:08
	→ Peng joined	02:08
	← sunri5e left	02:09
	→ bitonic_ joined	02:09
	→ Giant81_ joined	02:09
	→ yena joined	02:09
	→ iota_pi_ joined	02:09
	→ Guest42469_ joined	02:09
	→ ReenignE- joined	02:09
	← ReenignE- left	02:09
	→ ReenignE- joined	02:09
	→ bbhoss_ joined	02:09
	← chadi left	02:09
	← cbreak left	02:09
	→ timwis joined	02:09
	→ graingert_ joined	02:09
	→ [diecast]_ joined	02:09
	→ ELLIOTTCABLE joined	02:10
	→ prosody_ joined	02:10
	→ neunon joined	02:10
	→ sns joined	02:10
	→ lebster joined	02:10
	→ cttttt_ joined	02:10
	→ tohuw joined	02:10
	→ Ricaz joined	02:10
	→ heftig_ joined	02:10
	tohuw → Guest49971	02:10
	→ cbreak joined	02:10
	→ steven joined	02:10
	→ Xarodon joined	02:10
	→ todder joined	02:11
	← tsia left	02:11
	→ synchronous joined	02:11
	→ javaJake joined	02:11
	← cdg left	02:11
	→ ^MillerBoss joined	02:11
	→ POQDavid joined	02:11
	→ maqr joined	02:11
	→ SegFaultAX joined	02:11
	→ scarcry_ joined	02:11
	→ CustosLimen joined	02:11
	→ tsia joined	02:12
	→ gruetzko- joined	02:12
	→ adamus1red joined	02:12
	→ kirb joined	02:12
	← kirb left	02:12
	→ kirb joined	02:12
	→ Mattiaslndstrm joined	02:12
	→ theskillwithin_ joined	02:12
	→ oskie joined	02:12
	→ troyt_ joined	02:12
	← Virox left	02:12
	← Guest42469 left	02:12
	← ReenignE left	02:12
	← bitonic left	02:12
	← graingert left	02:12
	← cttttt left	02:12
	← iota_pi left	02:12
	← [diecast] left	02:12
	← bbhoss left	02:12
	← Giant81 left	02:12
	← prosody left	02:12
	← Bombe left	02:12
	← telephone left	02:12
	← meZee left	02:12
	← ePirat left	02:12
	← moop left	02:12
	← bailon left	02:12
	← heftig left	02:12
	← finalbeta left	02:12
	← troyt left	02:12
	← BytesBacon left	02:12
	← ariver left	02:12
	← theskillwithin left	02:12
	← mulvane left	02:12
	← dminuoso left	02:12
	← BlackPanx left	02:12
	← DelTree left	02:12
	← scarcry left	02:12
	← msonntag left	02:12
	← Rubin left	02:12
	← _ikke_ left	02:12
	← Arkaniad left	02:12
	← Hogofwar left	02:12
	← cmn left	02:12
	← Zoxc left	02:12
	← gruetzkopf left	02:12
	← Raed left	02:12
	← themill left	02:12
	← rodarmor left	02:12
	← terrorjack left	02:12
	← Chinorro left	02:12
	← SirCmpwn left	02:12
	← markus-k left	02:12
	← Willis left	02:12
	← dogmatic69 left	02:12
	→ yoh joined	02:12
	← pelegreno left	02:12
	→ sunri5e joined	02:12
	cttttt_ → cttttt	02:12
	bbhoss_ → bbhoss	02:12
	→ bailon joined	02:12
	Giant81_ → Giant81	02:12
	bitonic_ → bitonic	02:12
	iota_pi_ → iota_pi	02:12
	prosody_ → prosody	02:12
	→ thekingofbandit joined	02:12
	[diecast]_ → [diecast]	02:12
	→ lus joined	02:12
	graingert_ → graingert	02:12
	→ Virox joined	02:12
	→ BytesBacon joined	02:12
	→ Bombe joined	02:12
	→ ePirat joined	02:13
	→ mulvane joined	02:13
	→ no_maam joined	02:13
	← mulvane left	02:13
	→ mulvane joined	02:13
	theskillwithin_ → theskillwithin	02:13
	→ chadi joined	02:13
	← chadi left	02:13
	→ chadi joined	02:13
	→ Willis joined	02:13
	→ markus-k joined	02:13
	→ _ikke_ joined	02:13
	→ Rubin joined	02:13
	→ veremitz joined	02:13
	→ Arkaniad joined	02:13
	← chu left	02:13
	→ Hogofwar joined	02:13
	→ BlackPanx joined	02:13
	→ Raed joined	02:13
	→ themill joined	02:13
	→ dogmatic69 joined	02:13
	→ rodarmor joined	02:13
	→ meZee joined	02:13
	→ ariver joined	02:13
	← safe left	02:14
	→ sparr joined	02:14
	ariver → Guest20218	02:14
	→ terrorjack joined	02:14
	→ pelegreno_ joined	02:14
	→ gyre007 joined	02:14
	→ telephone joined	02:14
	← telephone left	02:14
	→ telephone joined	02:14
	→ Chinorro joined	02:14
	→ cmn joined	02:14
	→ dminuoso joined	02:14
	← rewt left	02:14
	← cbreak left	02:15
	← luckman212 left	02:15
	← kaldoran left	02:15
	→ msonntag joined	02:15
	← catern left	02:15
	← naf left	02:15
	→ Anja__ joined	02:15
	← sweatsuit left	02:15
	← thesquib left	02:15
	→ eblip joined	02:15
	→ KevinMGranger joined	02:15
	← Ricaz left	02:15
	→ Zoxc joined	02:15
	← SCHAPiE left	02:16
	← Nizumzen left	02:16
	← andai left	02:16
	← TomyLobo left	02:16
	→ DelTree joined	02:16
	→ aspiers[m] joined	02:16
	→ reactormonk[m] joined	02:16
	→ primeos[m] joined	02:17
	→ naf joined	02:17
	→ SirCmpwn joined	02:17
	→ luckman212 joined	02:17
	→ cbreak joined	02:17
	→ catern joined	02:17
	→ Ricaz joined	02:17
	→ kaldoran joined	02:17
	→ sweatsuit joined	02:17
	→ Nizumzen joined	02:18
	→ andai joined	02:18
	→ thesquib joined	02:18
	← GrailKn1ght left	02:18
	→ rewt joined	02:18
	← Peetz0r left	02:19
	→ SCHAPiE joined	02:19
	→ Peetz0r joined	02:20
	← jeffreylevesque left	02:21
	← McKraken_zzzzz left	02:22
	← petemoore left	02:22
	→ lagothri1 joined	02:23
	← igemnace left	02:23
	← arooni left	02:24
	→ McKraken_zzzzz joined	02:24
	McKraken_zzzzz → McKraken	02:24
	← Cabanossi left	02:25
	← fcrick left	02:25
	→ arooni joined	02:25
	→ fcrick joined	02:25
	→ ExeciN joined	02:25
	← lagothrix left	02:26
	← matoro left	02:27
	→ Cabanossi joined	02:27
	→ matoro joined	02:28
	→ petemoore joined	02:29
	← sunri5e left	02:30
	← ozcanesen left	02:31
	← Gustavo6046 left	02:31
	→ xaxxon joined	02:32
	← snowkidind left	02:32
	→ tureba_ joined	02:32
	→ Peetz1r joined	02:32
	→ LeMike_ joined	02:32
	→ OMGOMG_ joined	02:33
	→ qaz_ joined	02:33
	→ jscob joined	02:33
	→ Slush-_ joined	02:33
	← GODDOG left	02:35
	→ sunri5e joined	02:35
	← biancat left	02:35
	← groundnuty left	02:35
	← Kiruwa left	02:35
	← tureba left	02:35
	← jrahmy left	02:35
	← qaz left	02:35
	← jaeckel left	02:35
	← permalac left	02:35
	← Aichan left	02:35
	← __main__ left	02:35
	← LeMike left	02:35
	← OMGOMG left	02:35
	← Peetz0r left	02:35
	← Slush- left	02:35
	← Cork left	02:35
	→ _main_ joined	02:36
	→ Aichan joined	02:36
	→ groundnuty joined	02:36
	→ biancat joined	02:37
	→ salamanderrake joined	02:37
	biancat → Guest72950	02:37
	← naf left	02:37
	→ naf joined	02:37
	→ jrahmy joined	02:37
	→ permalac joined	02:38
	→ Cork joined	02:38
	← SCHAPiE left	02:38
	← bibek22 left	02:38
	← vrc414 left	02:38
	_main_ → __main__	02:39
	← sweatsuit left	02:39
	← cbreak left	02:39
	→ GODDOG joined	02:39
	→ chachasmooth_ joined	02:39
	→ Kiruwa joined	02:39
	← chachasmooth left	02:40
	→ vrc414 joined	02:40
	→ cbreak joined	02:40
	→ sweatsuit joined	02:41
	→ chu joined	02:41
	→ venmx joined	02:42
	→ SCHAPiE joined	02:42
	← catern left	02:43
	← pelegreno_ left	02:43
	← lb1c left	02:44
	→ lb1c joined	02:44
	→ Technodrome joined	02:44
	→ pelegreno_ joined	02:45
	→ catern joined	02:47
	→ ozcanesen joined	02:48
	← stutter left	02:48
	→ nd_ joined	02:51
	→ jaeckel joined	02:51
	← cagedwisdom left	02:52
	→ upperdeck_ joined	02:53
	← nd left	02:54
	→ bibek22 joined	02:55
	→ upperdec- joined	02:55
	← upperdeck left	02:56
	→ bronson joined	02:57
	← salamanderrake left	02:57
	← upperdeck_ left	02:58
	→ fstd_ joined	02:58
	← Mattiaslndstrm left	03:00
	→ Mattiaslndstrm joined	03:01
	MuffinMedic → Evan	03:01
	← fstd left	03:02
	fstd_ → fstd	03:02
	← bronson left	03:02
	Evan → StudMuffin	03:02
	StudMuffin → MuffinMedic	03:03
	→ juvenal joined	03:04
	← GODDOG left	03:05
	→ cagedwisdom joined	03:05
	→ menip joined	03:06
	→ GODDOG joined	03:07
	→ roelmonnens joined	03:07
	← venmx left	03:08
	← rewt left	03:10
	← roelmonnens left	03:12
	→ dsdeiz joined	03:14
	← dsdeiz left	03:14
	→ dsdeiz joined	03:14
	← Mattiaslndstrm left	03:19
	← dsdeiz left	03:23
	← gugah left	03:23
	→ dsdeiz joined	03:24
	← Murr left	03:24
	→ Murr joined	03:24
	← SlizardWizard left	03:26
	← energizer left	03:26
	→ energizer joined	03:26
	← GODDOG left	03:28
	← tnecniv left	03:29
	← dsdeiz left	03:29
	→ GODDOG joined	03:30
	→ dsdeiz joined	03:30
	← dsdeiz left	03:30
	→ dsdeiz joined	03:30
	← greenbagels left	03:31
	→ SlizardWizard joined	03:32
	→ greenbagels joined	03:32
	→ orbyt_ joined	03:33
	← GODDOG left	03:35
	→ rewt joined	03:35
	← dsdeiz left	03:35
	→ dsdeiz joined	03:37
	← dsdeiz left	03:37
	→ dsdeiz joined	03:37
	→ tnecniv joined	03:37
	← tnecniv left	03:39
	← MACscr left	03:40
	← justAllgood left	03:42
	→ albel727 joined	03:42
	← dsdeiz left	03:43
	→ dsdeiz joined	03:43
	← dsdeiz left	03:43
	→ dsdeiz joined	03:43
	→ fstd_ joined	03:46
	← greenbagels left	03:46
	← fstd left	03:46
	fstd_ → fstd	03:46
	→ greenbagels joined	03:47
	← Gencade left	03:48
	← orbyt_ left	03:49
	← netj left	03:49
	← dsdeiz left	03:49
	→ netj joined	03:49
	→ dsdeiz joined	03:50
	← dsdeiz left	03:50
	→ dsdeiz joined	03:50
	→ aw1 joined	03:51
	→ GODDOG joined	03:53
	← Cabanossi left	03:54
	→ Cabanossi joined	03:56
	← dsdeiz left	03:56
	→ dsdeiz joined	03:57
	← dsdeiz left	03:57
	→ dsdeiz joined	03:57
	→ bronson joined	03:57
	→ diqidoq joined	04:00
	← bronson left	04:02
	→ Lyqyd joined	04:03
	← dsdeiz left	04:06
	→ moop joined	04:06
	→ robotroll joined	04:06
	→ dsdeiz joined	04:06
	← dsdeiz left	04:06
	→ dsdeiz joined	04:06
	→ ggherdov joined	04:07
	← ahrs left	04:09
	← dviola left	04:09
	→ Sasazuka joined	04:10
	→ ahrs joined	04:10
	← Sasazuka left	04:10
	→ ArcaTech joined	04:11
	← GODDOG left	04:11
	→ cdg joined	04:12
	→ qdai joined	04:12
	← qdai left	04:14
	← netj left	04:15
	→ qdai joined	04:15
	→ netj joined	04:15
	← cdg left	04:16
	← bket left	04:17
	→ bket joined	04:22
	← boombatower left	04:22
	→ Gencade joined	04:24
	→ OlympicX joined	04:24
	→ ShekharReddy joined	04:24
	← n4n0` left	04:30
	← xaxxon left	04:31
	→ xaxxon joined	04:33
	← justanotheruser left	04:38
	→ Solvaring joined	04:39
	→ justanotheruser joined	04:41
	← justanotheruser left	04:41
	→ justanotheruser joined	04:42
	← irqq_ left	04:43
	← glebihan_ left	04:43
	← Naros left	04:45
	→ rkta_ joined	04:48
	← ozcanesen left	04:49
	← rkta left	04:51
	rkta_ → rkta	04:51
	← fstd left	04:53
	→ fstd joined	04:54
	→ Foxboron joined	04:55
	← diqidoq left	04:55
	→ roelmonnens joined	04:56
	→ fstd_ joined	04:57
	← menip left	04:59
	← fstd left	04:59
	fstd_ → fstd	04:59
	→ peoliye joined	04:59
	← surfist left	04:59
	← roelmonnens left	05:00
	← gokmen left	05:02
	← Sleepy63 left	05:02
	→ gokmen joined	05:02
	→ govg joined	05:03
	← rwb left	05:04
	→ rchavik joined	05:04
	→ rwb joined	05:05
	← ArcaTech left	05:05
	← fstd left	05:07
	→ fstd joined	05:08
	← in1t3r left	05:09
	← juvenal left	05:11
	← al-damiri left	05:12
	→ surfist joined	05:14
	← fstd left	05:15
	→ elfuego joined	05:15
	→ lss8_ joined	05:15
	→ venmx joined	05:16
	← elfuego left	05:16
	→ fstd joined	05:16
	→ elfuego joined	05:17
	← lss8 left	05:19
	→ fstd_ joined	05:21
	→ dave0x6d joined	05:21
	← venmx left	05:21
	→ fatihgenc joined	05:22
	← fstd left	05:23
	fstd_ → fstd	05:23
	→ ArcaTech joined	05:23
	← Murr left	05:24
	→ Murr joined	05:24
	← rkta left	05:26
	→ in1t3r joined	05:26
	← madewokherd left	05:27
	← drodger left	05:30
	← mooasaurus left	05:30
	→ mooasaurus joined	05:31
	→ safe joined	05:31
	→ drodger joined	05:32
	→ diqidoq joined	05:36
	→ ezdame joined	05:40
	→ dminuoso_ joined	05:40
	→ cryptic joined	05:41
	gitinfo set mode: +v	05:44
ezdame	hi?	05:44
gitinfo	ezdame: 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.	05:44
ezdame	alguien español?	05:45
	Hello?	05:46
	← porfiriopaiz left	05:48
	← qdai left	05:49
	→ Brski joined	05:49
	→ Silmarilion joined	05:52
	→ Bock joined	05:52
ezdame	Bueno, nose si alguien habla español pero en fin, primera vez usando git. Tengo un problema.. Usando una Mac, en terminal en vez de cargar la carpeta correcta, aparentemente hice que git tomase TODOS los archivos de la mac y ahora no se como revertir dicha accion. El asunto es que estoy usando Visual Code Studio, y en los cambios me figuran todos los archivos que me cargo Git y ahora no se como hacer para quitar eso y que quede "normal"	05:52
	→ ThomasLocke joined	05:57
	→ bronson joined	05:58
	← bronson left	06:02
	Peetz1r → Peetz0r	06:05
	→ rscata joined	06:07
	← rscata left	06:07
	→ rscata joined	06:07
	← ezdame left	06:07
	← Cabanossi left	06:09
	← scarcry_ left	06:09
	→ scarcry joined	06:10
	→ JeroenT joined	06:10
	→ dec0n joined	06:11
	→ Cabanossi joined	06:11
	→ mofs joined	06:11
mofs	hey, i need to backtrack in my file history to a previous commit... how do I do that?	06:11
mooasaurus	git reset	06:13
	← aw1 left	06:14
mofs	wont that just unstage	06:14
mooasaurus	might be wrong, wait for someone else	06:15
	← xaxxon left	06:15
	→ flobin joined	06:17
	→ roelmonnens joined	06:19
_ikke_	mofs: Do you just want the history of that file?	06:20
	git log -p <file>	06:20
	add --all if you want to see it from all refs	06:20
	← cryptic left	06:22
	← Nizumzen left	06:23
mofs	okay, now if I wanted to set the files back to a history point (commit)	06:23
	← elfuego left	06:23
_ikke_	git checkout <commit> <files>	06:23
	→ guccimeow joined	06:23
_ikke_	(this will overwrite uncomitted changes)	06:23
	← guccimeow left	06:24
	→ guccimeow joined	06:24
	→ MACscr joined	06:25
	→ elfuego joined	06:27
	→ chele joined	06:28
	→ King_Hual joined	06:28
	→ ogny joined	06:29
	← ogny left	06:29
	→ ogny joined	06:29
	← mofs left	06:31
	← flobin left	06:34
	← ArcaTech left	06:34
	← guccimeow left	06:35
	→ guccimeow joined	06:36
	← HurricaneHarry left	06:36
	← ertes left	06:37
	→ ZyX-I joined	06:39
	← diqidoq left	06:39
	← elfuego left	06:39
	→ elfuego joined	06:40
	← guccimeow left	06:40
	← elfuego left	06:42
	→ xaxxon joined	06:42
	← peoliye left	06:42
	→ doev joined	06:42
	→ elfuego joined	06:43
	→ ArcaTech joined	06:45
	← tzica left	06:45
	← gokmen left	06:47
	→ fstd_ joined	06:47
	→ guccimeow joined	06:48
	← fstd left	06:49
	fstd_ → fstd	06:49
	→ jakogut joined	06:50
	→ austin987 joined	06:51
	→ qwedfg joined	06:52
	← jakogut left	06:52
	→ jakogut joined	06:53
	← elfuego left	06:54
	→ elfuego joined	06:54
	→ opalepatrick joined	06:54
	← Guest21598 left	06:55
	← Lyqyd left	06:56
	← dminuoso_ left	06:57
	← safe left	06:57
	← dreiss left	07:00
	→ piraye joined	07:01
	← drodger left	07:02
	→ giraffe joined	07:03
	→ ertes-w joined	07:03
	→ lordjancso joined	07:03
	giraffe → Guest43993	07:03
	← elfuego left	07:04
	← thiago left	07:05
	→ smuten joined	07:05
	→ elfuego joined	07:05
	→ drodger joined	07:07
	→ cdown joined	07:07
	→ theoceaniscool_ joined	07:09
	← ArcaTech left	07:09
	→ fstd_ joined	07:10
	← fstd left	07:10
	fstd_ → fstd	07:10
	← nick123 left	07:12
	→ fstd_ joined	07:14
	→ j08nY joined	07:15
	heftig_ → heftig	07:16
	← fstd left	07:17
	← xPucTu4 left	07:18
	→ fstd joined	07:19
	← fstd left	07:19
	→ fstd joined	07:19
	← fstd_ left	07:20
	← guccimeow left	07:21
	→ guccimeow joined	07:22
	→ nick123 joined	07:22
	→ sz0 joined	07:22
	← mquin left	07:23
	→ fstd_ joined	07:23
	← Murr left	07:24
	→ Murr joined	07:24
	← fstd left	07:26
	→ fstd joined	07:26
	← guccimeow left	07:26
	← fstd_ left	07:28
	→ troulouliou_div2 joined	07:29
	← dave0x6d left	07:29
	← nick123 left	07:30
	→ fstd_ joined	07:30
	→ ArcaTech joined	07:31
	← fstd left	07:32
	fstd_ → fstd	07:32
	→ nick123 joined	07:32
	→ nedman joined	07:35
	← nydel09 left	07:36
	← Fissure left	07:36
	← Cabanossi left	07:38
	← OlympicX left	07:38
	→ gfurlan joined	07:38
	→ Fissure joined	07:39
	← ZyX-I left	07:41
	→ Cabanossi joined	07:41
	→ pbandark joined	07:42
	← theoceaniscool_ left	07:42
	→ flobin joined	07:42
	← JeroenT left	07:43
	→ JeroenT joined	07:43
	← JeroenT left	07:45
	→ JeroenT joined	07:45
	→ dege joined	07:46
	→ overlord_tm joined	07:47
	← j08nY left	07:47
	→ fstd_ joined	07:48
	→ bybb joined	07:50
	→ murii joined	07:50
	← fstd left	07:50
	fstd_ → fstd	07:50
	← overlord_tm left	07:51
	← Slush-_ left	07:52
	→ Slush- joined	07:53
	← gfurlan left	07:53
	→ cstratak joined	07:57
	→ ki0 joined	07:58
	→ bronson joined	07:59
	← Atro left	08:00
	← ki0 left	08:01
	→ ki0 joined	08:01
	← mikecmpbll left	08:01
	→ gfurlan joined	08:02
	→ fstd_ joined	08:02
	→ Tobbi joined	08:02
	← felixsanz left	08:03
	← jakogut left	08:03
	← bronson left	08:03
	← rasto left	08:03
	→ jakogut joined	08:03
	← JeroenT left	08:04
	← fstd left	08:04
	fstd_ → fstd	08:04
	→ mquin joined	08:06
	→ JeroenT joined	08:06
	→ blackmesa joined	08:07
	← jakogut left	08:07
	→ peacememories joined	08:08
	→ jakogut joined	08:08
	← Cabanossi left	08:08
	→ kurkale6ka joined	08:08
	→ joe3 joined	08:09
	→ mikecmpbll joined	08:09
	← MACscr left	08:10
	→ Cabanossi joined	08:11
	→ felixsanz joined	08:11
	→ MACscr joined	08:12
	← kurkale6ka left	08:13
	← ArcaTech left	08:16
	→ kurkale6ka joined	08:16
	→ kurkale61 joined	08:17
	← [Kid] left	08:18
	→ [Kid] joined	08:18
	← kurkale6ka left	08:21
	← gxt left	08:21
	→ fstd_ joined	08:22
	← fstd left	08:24
	fstd_ → fstd	08:24
	→ venmx joined	08:25
	→ bergice_ joined	08:26
	→ jsears joined	08:27
	← xcm left	08:30
	← Tobbi left	08:30
	→ xcm joined	08:31
	← mikecmpbll left	08:32
	→ mikecmpbll joined	08:33
	→ overlord_tm joined	08:35
	→ silenc3r joined	08:35
	→ markzen joined	08:35
	→ BeerLover joined	08:37
	← greenbagels left	08:38
	← kurkale61 left	08:38
markzen	how do i find what commit removed a file from a given dir?	08:39
	→ greenbagels joined	08:39
	→ kurkale6ka joined	08:39
	→ fstd_ joined	08:39
	→ rkta joined	08:39
markzen	checking out a few 'master@{some time ago]', but there must be a better way	08:39
	→ theoceaniscool_ joined	08:40
	← Cabanossi left	08:40
_ikke_	git log --diff-filter=D --all <file>	08:41
	→ aard_ joined	08:41
	→ manuelschneid3r joined	08:41
	→ Cabanossi joined	08:41
	← scarcry left	08:41
	← fstd left	08:41
	fstd_ → fstd	08:41
	← peacememories left	08:42
markzen	thanks, but it doesn't find it	08:42
	→ peacememories joined	08:43
markzen	tried with =R, no luck	08:44
	← greenbagels left	08:44
	← cbreak left	08:44
	→ Tobbi joined	08:47
AndreasLutro	try with --follow maybe	08:47
	and double check that you have the right filename	08:47
	→ fstd_ joined	08:47
	← cdown left	08:48
	← blackmesa left	08:48
	← doev left	08:48
	← venmx left	08:49
_ikke_	and --full-history	08:49
markzen	filename is good (copy-pasted)	08:49
	--follow doesn't change results	08:49
	← fstd left	08:49
	fstd_ → fstd	08:49
	→ schleppel joined	08:49
	→ cbreak joined	08:50
markzen	tried 'git log --diff-filter=D --all --full-history --follow -- <file>', same result	08:50
AndreasLutro	hm. maybe try without the filter and see what the last commit looks like	08:51
	→ chll_ joined	08:51
_ikke_	Might be an evil merge	08:51
osse	add --cc	08:51
	← elfuego left	08:52
	← Tobbi left	08:52
	← bybb left	08:53
	→ tvw joined	08:53
markzen	with --cc, a lot of merge commits are now returned	08:53
	→ bybb joined	08:53
	← energizer left	08:56
	→ scarcry joined	08:56
	→ kurkale61 joined	08:56
	→ FernandoBasso joined	08:57
	→ greenbagels joined	08:58
	← bybb left	08:58
	← kurkale6ka left	08:59
	→ bybb joined	08:59
	→ blackmesa joined	09:01
	→ _ADN_ joined	09:02
osse	markzen: try -m instead of --cc	09:05
	→ kurkale6ka joined	09:05
	← BeerLover left	09:05
	→ riemann joined	09:06
	→ SteffanW joined	09:06
	← xaxxon left	09:06
	→ SkyPatrol joined	09:06
	← Solvaring left	09:07
	← kurkale61 left	09:08
markzen	osse: much fewer results	09:08
osse	markzen: if the history is messy it's possible that several commits removes the file	09:09
	← mda1 left	09:09
osse	i'd inspect each merge by doing git diff merge^1 merge and git merge^2 merge	09:10
markzen	devs are former svn users who switched to git last month	09:10
	so history is ugly af	09:11
	but they don't know how to make fancy stuff	09:11
	→ doev joined	09:12
	← JeroenT left	09:12
	→ JeroenT joined	09:12
markzen	osse: was using 'git show --name-status'	09:13
	no good?	09:13
	→ Acerific joined	09:13
	← Acerific left	09:13
	→ Acerific joined	09:13
	→ achadwick joined	09:14
markzen	on <commit>	09:14
osse	won't do much of merge commits	09:14
	*on	09:14
markzen	indeed, only one sha1 showed some files	09:15
_ikke_	A merge has 2 parents, by default, you'll see the diff against the first parent, but you'll want to see the diff against the 2nd parent too	09:15
	← troulouliou_div2 left	09:16
markzen	_ikke_: makes sens, thanks for the explanation	09:16
	← trondth left	09:16
	→ cdown joined	09:19
	← gfixler left	09:21
	← Murr left	09:24
	← silenc3r left	09:24
	← blackmesa left	09:24
	← Cabanossi left	09:24
	→ Murr joined	09:24
	← cdown left	09:25
	→ Cabanossi joined	09:26
	→ GODDOG joined	09:26
markzen	"git diff --name-status merge^1 merge" found a good candidate, on the first commit of the previous resultset	09:27
	→ venmx joined	09:27
	→ Viewtiful joined	09:31
	→ gxt joined	09:32
	← Viewtiful left	09:32
	→ cdown joined	09:32
	← doev left	09:32
	→ cdg joined	09:33
	→ doev joined	09:33
	← SteffanW left	09:34
	→ irqq joined	09:34
	→ ferr joined	09:36
markzen	ok, found the guy	09:37
	thanks osse _ikke_	09:37
_ikke_	\0/	09:37
	← cdg left	09:38
markzen	out of curiosity, isn't there some alternative to git diff merge^1 merge and merge^2 merge ?	09:38
	→ clmsy joined	09:39
	→ jungsubk joined	09:40
markzen	ie. to anwser the question 'so what is this merge commit doing'	09:40
	← FernandoBasso left	09:42
	→ rasto joined	09:42
	→ mrgrj joined	09:44
	← nedman left	09:44
	← gfurlan left	09:44
	→ gfurlan joined	09:44
mrgrj	Hello! Small question: I've created a new branch from the master branch: `git checkout -b new_branch master` on my local machine. Then I've made some modifications to the new branch, added, commited, and pushed the changes. In the mean time, the master branch has been modified. It's okay to checkout to master branch on local machine, pull the changes, then merge with the new branch?	09:46
_ikke_	mrgrj: that	09:47
mrgrj	_ikke_: that?	09:48
_ikke_	mrgrj: premature enter	09:48
	mrgrj: That's certainly possible. Another workflow would be to rebase your branch on the new master	09:48
	← gfurlan left	09:48
mrgrj	_ikke_: how can I do that ? :p	09:49
	→ gfurlan joined	09:49
_ikke_	git fetch && git rebase upstream/master <branch>	09:49
mrgrj	and this should be run while I'm on master ? or on my new_branch?	09:50
	→ dre_ joined	09:52
	→ Silenced joined	09:53
	← doev left	09:54
	← royiv left	09:54
	→ rorro joined	09:55
	← theoceaniscool_ left	09:56
	→ fatihgenc_ joined	09:56
	→ afuentes joined	09:56
peacememories	hmm, my subrepo clone command is stuck without any output	09:56
	← fatihgenc left	09:57
	→ duckduckuser joined	09:57
_ikke_	mrgrj: the rebase command checks out <branch> automatically	09:59
	→ bronson joined	10:00
	→ theoceaniscool joined	10:00
	→ Darcidride joined	10:01
peacememories	okay, the verbose output shows that it's stuck fetching the subrepo. this doesn't take any time at all when using git clone, though, so i'm a bit confused	10:02
	→ sceptiQ joined	10:02
	← GODDOG left	10:03
	← qwedfg left	10:03
	← bronson left	10:05
	← JeroenT left	10:07
	← zeks left	10:09
	← fatihgenc_ left	10:09
	← Cabanossi left	10:10
	→ BeerLover joined	10:10
	→ Cabanossi joined	10:11
	← Gencade left	10:12
	← raynold left	10:14
mrgrj	_ikke_: awesome, thanks	10:16
	← robotroll left	10:18
	→ GODDOG joined	10:18
	→ robotroll joined	10:19
	← duckduckuser left	10:22
osse	mrgrj: git show -m / -c / --cc	10:22
	markzen: ^^	10:22
	→ diqidoq joined	10:26
	← calvin-coolidge1 left	10:29
	← peacememories left	10:30
	← overlord_tm left	10:30
	← Silenced left	10:31
	← [worksti] left	10:33
	→ trondth joined	10:33
	← ephemer0l_ left	10:33
	→ JeroenT joined	10:34
	→ rafasc joined	10:34
	→ kurkale61 joined	10:36
	← piraye left	10:36
	→ athaher joined	10:36
	← cdown left	10:38
	← kurkale6ka left	10:39
	← JeroenT left	10:39
	← enkrypt left	10:40
	← Acerific left	10:42
	← quite left	10:42
	→ mohabaks joined	10:42
	← pks left	10:42
	→ overlord_tm joined	10:43
	→ pks joined	10:43
	→ salamanderrake joined	10:43
	← athaher left	10:45
	← overlord_tm left	10:48
	→ kurkale6ka joined	10:48
	← kurkale61 left	10:50
	→ fatihgenc joined	10:50
	→ d1b joined	10:51
	→ cdown joined	10:52
	→ enkrypt joined	10:52
	← diqidoq left	10:53
markzen	osse: tyvm	10:53
	← nod left	10:53
	→ diqidoq joined	10:54
	→ JeroenT joined	10:54
	→ oxymoron93 joined	10:55
	← salamanderrake left	10:57
	← jungsubk left	11:01
ashnur	hi, how can i find out about a tag who created it? i tried to list with ` git tag -l --format '%(refname) %09 %(taggerdate) %(subject) %(taggeremail)' ` but i do not have the tag locally and git fetch --all didn't download it	11:02
	→ overlord_tm joined	11:02
	→ nod joined	11:02
selckin	fetch --tags?	11:03
	→ juvenal joined	11:04
ashnur	tried that too, there was 1 more tag that it downloaded with that but not the latest one that i am trying to find out about	11:05
	← bybb left	11:05
	→ bybb joined	11:06
	← juvenal left	11:06
	→ juvenal joined	11:08
	→ Sornaensis joined	11:09
	← juvenal left	11:10
	← nowhereman left	11:10
	← bybb left	11:10
	← theoceaniscool left	11:12
	→ mintux joined	11:12
	→ Cavallari joined	11:12
mintux	i want to clone a repository and pull only is there any way to ignore one file to pull from server ?	11:13
	→ quite joined	11:13
	← cagedwisdom left	11:15
	tureba_ → tureba	11:15
	← finalbeta1 left	11:16
	→ finalbeta joined	11:16
mintux	i want to ignore a file in pull don't change my file	11:16
osse	that's not possible	11:16
	← diqidoq left	11:17
	← marvi left	11:17
mintux	:-(	11:18
	→ juvenal joined	11:18
mintux	what is .git/info/exclude ?	11:18
rafasc	mintux: it's essentially a .gitingore	11:19
	→ marvi joined	11:19
mintux	i want a file skip in pull a config file	11:19
rafasc	useful when you want to ignore things locally but your team has the .gitignore in the repo.	11:20
	← in1t3r left	11:20
oxymoron93	is there any reason why config files are put inside repo?	11:20
	→ in1t3r joined	11:21
	polyzen → namcap	11:21
rafasc	git update-index --skip-worktree will kind of ignore the file	11:22
	← in1t3r left	11:22
rafasc	but you will get a conflict on pull if the remote changes	11:23
	← Arahael left	11:23
	→ in1t3r joined	11:23
	← in1t3r left	11:23
	→ marinin joined	11:23
	→ in1t3r joined	11:24
rafasc	mintux: check "sparse checkout" too	11:25
	→ justAllgood joined	11:25
	→ SilverBe joined	11:25
	← GODDOG left	11:26
	→ shinnya joined	11:27
mintux	thanks	11:28
	← mintux left	11:28
	→ GODDOG joined	11:29
	← rkta left	11:30
ashnur	so, i don't understand why git fetch --all doesn't download all the branches	11:30
	← jsears left	11:31
	← odamn left	11:31
	→ odamn joined	11:31
	← juvenal left	11:32
	→ jungsubk joined	11:33
	→ juvenal joined	11:34
	← marinin left	11:36
	← aard_ left	11:36
	← GODDOG left	11:36
osse	ashnur: what does 'git config remote.origin.fetch' print ?	11:36
ashnur	+refs/heads/:refs/remotes/origin/	11:38
osse	then it does download all the branches	11:38
	!remote_tr	11:38
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote>/<branch>'	11:38
	→ balance joined	11:38
ashnur	i am talking about tags though	11:38
	i have all the branches, i am missing tags	11:39
osse	ok, but you were talking about branches :P	11:39
	git fetch --tags	11:39
	→ jameser joined	11:39
	← jameser left	11:40
	← Cabanossi left	11:40
ashnur	i am sorry, you are right, i did misspoke	11:40
	git fetch --tags also do not fetch all the tags, that's why i came here, i googled the issue and i saw the suggestion to use git fetch --tags	11:40
	← jstimm left	11:41
	→ Cabanossi joined	11:41
	← rorro left	11:42
	→ GODDOG joined	11:42
	← juvenal left	11:42
	← jungsubk left	11:43
	→ kurkale61 joined	11:44
	eb0t → def_jam	11:44
	eblip → eb0t	11:44
	→ juvenal joined	11:44
	← luckman212 left	11:45
	← juvenal left	11:46
	← kurkale6ka left	11:46
	← xcm left	11:46
	→ xcm joined	11:47
	→ gareppa joined	11:47
osse	ashnur: what tags are you trying to fetch?	11:48
	where are they? how do you know they exist?	11:48
	→ fmcgeough joined	11:48
osse	try 'git fetch origin tagname'	11:48
balance	when having a new symfony installation I have AppBundle - how can I get rid of it easily?	11:48
ashnur	i see them on a gitlab interface	11:48
balance	wrong chat	11:48
ashnur	self hosted	11:48
	→ Gencade joined	11:49
	→ kristofferR joined	11:49
	← fmcgeough left	11:49
ashnur	osse, thanks fetching by name seems to work	11:50
	→ juvenal joined	11:50
	→ bybb joined	11:50
osse	then i don't know why git fetch --tags doesn't work	11:50
	→ TomyLobo joined	11:51
	← juvenal left	11:51
ashnur	maybe it works i just can't list it properly from this branch.	11:51
	→ luckman212 joined	11:52
	→ juvenal joined	11:52
	← xcm left	11:54
	→ xcm joined	11:55
	← kurkale61 left	11:57
	← greenbagels left	11:59
	→ greenbagels joined	12:00
	→ bronson joined	12:01
	→ doev joined	12:03
	← bronson left	12:06
crater2150	I updated git to 2.14.2, now "git add --patch" doesn't work anymore, it just creates the same output as "git diff" (but without using a pager) and never shows any prompt. Any idea what could cause this?	12:06
	just downgraded to 2.14.1, that version doesn't have the problem	12:07
	→ rnsanchez joined	12:10
	→ in1t3r_ joined	12:11
rafasc	crater2150: I have 2.14.2 and git add -p works just fine	12:11
	← in1t3r left	12:14
rafasc	what happens when you do `git add --interactive`?	12:14
	and chose 5 or p option?	12:14
	→ kurkale61 joined	12:14
crater2150	rafasc: That works. strange...	12:15
	→ dimi1947 joined	12:16
	← finalbeta left	12:16
rafasc	weird indeed	12:16
	→ finalbeta joined	12:17
	→ rorro joined	12:17
	← mohabaks left	12:17
rafasc	crater2150: you should probably hit the mailing list	12:19
crater2150	wait, no, it doesn't. it also shows the diff, then returns to the main prompt, without asking if i want to stage the junks	12:19
rafasc	not sure how to debug that	12:19
	← in1t3r_ left	12:20
	← murii left	12:21
crater2150	I also had problems with a previous update, that caused --patch to throw perl errors. Probably something broken in my perl install. But I have no idea, where to look for the problems, never used perl myself.	12:21
	← doev left	12:22
rafasc	what os are you using?	12:22
crater2150	Huh. "env - git add --patch" works	12:22
	← hs366 left	12:23
osse	crater2150: env \| grep GIT	12:23
	← Cabanossi left	12:24
crater2150	osse: no output. I'll try unsetting vars one by one	12:24
rafasc	we need a env bisect	12:24
	← alkino left	12:24
	→ xaxxon joined	12:25
rafasc	env \| grep perl	12:25
	if you were having issues with perl, maybe it's something related with perl path	12:25
	→ Cabanossi joined	12:26
crater2150	no results. I'll write a little env bisect script	12:26
	← BeerLover left	12:27
	→ jsears joined	12:29
	→ marinin joined	12:33
	← rwb left	12:34
crater2150	ok, the environment did not have to do anything with it directly, env - just caused git to ignore its config file	12:35
	→ in1t3r joined	12:35
crater2150	it seems, the setting "color.ui = always" broke it. Looking at the manpage, that does not seem right	12:36
	→ denisMone joined	12:37
	→ iNCoNFuN joined	12:37
	→ jeffreylevesque joined	12:38
rafasc	any reason you have it set to always instead of auto?	12:39
	→ igemnace joined	12:39
crater2150	nope, I can't remember setting it and have already changed it.	12:40
	← tunekey left	12:40
crater2150	still, seems to be a bug, as that option should not have an effect on --patch showing a prompt or not	12:40
rafasc	you can remove it. it's on auto by default	12:40
	yea, I can confirm	12:40
crater2150	I'll write a report to the mailing list	12:41
rafasc	setting color.ui to always breaks add -p	12:41
	→ rkta joined	12:41
	→ jstimm joined	12:42
	← juvenal left	12:43
	→ ShalokShalom_ joined	12:44
	← greenbagels left	12:45
	→ juvenal joined	12:45
	← dbacc left	12:45
	→ greenbagels joined	12:46
	← igemnace left	12:46
	← kristofferR left	12:47
	← ShalokShalom left	12:47
rafasc	crater2150: https://stackoverflow.com/questions/46522475/git-add-patch-stopped-prompting-for-my-user	12:47
	→ elfuego joined	12:47
rafasc	is this you?	12:48
	→ fmcgeough joined	12:49
crater2150	no, I hadn't found that entry. Looks like I have just sent a duplicate bug report :-/	12:49
	→ fstd_ joined	12:49
	← elfuego left	12:50
	← jstimm left	12:51
	← mooasaurus left	12:51
rafasc	https://github.com/git/git/commit/136c8c8b8fa39f1315713248473dececf20f8fe7	12:52
	→ elfuego joined	12:52
rafasc	the commit explains why	12:52
	→ mooasaurus joined	12:52
	← fstd left	12:52
	← mrgrj left	12:52
	→ fstd joined	12:53
	← elfuego left	12:54
crater2150	makes sense. I'm still not sure, why I even had it set.	12:55
	← fstd_ left	12:55
	→ jeffreylevesque_ joined	12:55
	→ johnlage_ joined	12:55
	← johnlage left	12:55
	johnlage_ → johnlage	12:56
	← jeffreylevesque left	12:56
	→ stutter joined	12:57
	← rchavik left	12:58
	→ Gustavo6046 joined	12:58
	← in1t3r left	12:59
dcpc007	hi, in git add -p, is it possible to split between 2 lines ?	13:01
	i made a tet on separate blocks, easy, but here, i have a block where the last line should not be include in this commit	13:02
	← stutter left	13:02
	→ BeerLover joined	13:03
osse	dcpc007: If 's' won't split it even further then you must 'e' to edit	13:03
	Remove the line you don't want	13:04
	→ ephemer0l joined	13:04
dcpc007	ha ok, never used the edit mode of git add -p	13:04
	← Gencade left	13:05
	→ dreiss joined	13:05
	← iNCoNFuN left	13:05
osse	Now is the time to level up	13:05
dcpc007	another question, i want install/buy a repo manager for the enterprise. think it will be gitlab vs bitbucket	13:06
	but hard to compare or choose	13:06
rafasc	osse: heads up read the hints at the end.	13:06
dcpc007	some main objectives : web UI, user access, link commit to issues	13:06
	→ cdg joined	13:07
rafasc	because depending if you're doing checkout -p \| add -p \| reset -p the syntax changes	13:07
dcpc007	we already have jira, then i think bitbucket the more logical, but atlassian paid pack terrible :-( and i start to have better feedback for new gitlab users ...	13:07
rafasc	sometimes you delete + lines and convert - to context and vice versa	13:07
	← cdg left	13:08
	→ elfuego joined	13:09
dcpc007	(hey see that's there's a git add -i ? )	13:09
	Hello71_ → Hello71	13:09
	→ cdg joined	13:09
	→ cdg_ joined	13:10
rafasc	add -i is not new	13:11
	← elfuego left	13:11
dcpc007	never used, i put git for new users groups here, but me i'm sysadmin then limited use :)	13:11
	i manage many repos, but only shels scripts or configs	13:12
	and mainly alone ... then, many git usages i don't use	13:12
	← robotroll left	13:12
	← GODDOG left	13:13
dcpc007	https://nuclearsquid.com/writings/git-add/ nice doc	13:13
	← greenbagels left	13:14
	← cdg left	13:14
	← ephemer0l left	13:14
	→ ephemer0l joined	13:15
	→ greenbagels joined	13:17
	→ eduardas_m joined	13:18
	← ephemer0l left	13:18
	→ ephemer0l joined	13:19
	→ phluks joined	13:19
dcpc007	wow not so easy :)	13:20
	← dre_ left	13:20
dcpc007	got many hunk does not apply before make only chirurgical modif	13:20
	→ dre_ joined	13:21
	← dre_ left	13:21
	→ nowhereman joined	13:21
	→ relipse___ joined	13:22
	→ elfuego joined	13:22
	← nowhereman left	13:23
	→ nowhere_man joined	13:23
	← Murr left	13:24
	→ rwb joined	13:24
	→ Murr joined	13:24
	← elfuego left	13:24
	← Ardethian\ left	13:24
	← relipse__ left	13:24
	→ lukasdboer joined	13:25
	→ Ardethian\ joined	13:26
	← mdbk left	13:26
rafasc	dcpc007: when you change lines to context, you need to add a space to replace the symbol you deleted.	13:27
	← BeerLover left	13:27
dcpc007	i mainly delete all but the line modified (keep a - and + line)	13:28
	it works at end, add -p re-ask me the part not managed after,	13:29
	← juvenal left	13:29
	← ResidentBiscuit left	13:29
	← enckse left	13:30
rafasc	on git add -p you can only delete +lines	13:30
dcpc007	i'll not use it often. and not sure my user will .. (most don't want to see the command line), and since a make a basic presentation of git and some best practice, no feed back, they do waht they want alone without discussion ...	13:30
	rafasc: ha ok, taht was that :;)	13:30
	thx	13:30
rafasc	to remove - lines	13:31
	← Hello71 left	13:31
rafasc	you delete the - and add a space in its place	13:31
	to keep the diff aligned	13:31
dcpc007	i think they even goes to submodules or somethng like that without really knowing it and alternatives ...	13:31
	ok	13:31
	missread the inline help then	13:31
	hop history cleaned :)	13:31
	→ Hello71 joined	13:32
	→ enckse joined	13:32
dcpc007	functionnal code and outputs improved separated now ... haaaaaa i love git !	13:32
	→ relipse__ joined	13:32
	→ juvenal joined	13:33
dcpc007	when i see history of tomcat/java dev on svn .... :'(	13:33
	→ dorian__ joined	13:33
dcpc007	we again lost 3 hours to try find and understand what a precedent dev do for a specific task on an internal code.....	13:33
	← relipse___ left	13:34
	→ gugah joined	13:34
	← gugah left	13:34
	→ inovas joined	13:34
dcpc007	and as it's svn, now i even can't try to correct the history for next times ... we only do a bunch of commit to move/organize code, and add what was missing	13:34
	→ gugah joined	13:35
dcpc007	i don't know how i was doing when working on svn ... can't imagine goes back	13:35
	going	13:35
	→ igemnace joined	13:35
	→ stutter joined	13:35
	→ wxg joined	13:35
	→ fission6 joined	13:35
dorian__	Hey there. I set up a bare git repo on a server which is used as a cache for other dev. That means: instead of having the other devs doing git pull/git clone from the original repository from the Internet, they do it from the local git bare repo.	13:36
	← ephemer0l left	13:36
dorian__	But when I do git fetch on the bare repo, to get the new objets from the remote server, I get the "* branch master -> FETCH_HEAD" message	13:36
	and the HEAD of the repo is not updated	13:36
	→ ephemer0l joined	13:36
	→ elfuego joined	13:37
	← greenbagels left	13:37
dorian__	What should I do so my repo's HEAD matches the one from the remote server ?	13:37
	← Cabanossi left	13:38
cbreak	dorian__: check out the same thing	13:39
	dorian__: git ls-remote will show you the refs on a remote repo	13:40
	→ greenbagels joined	13:40
cbreak	you can check out that exact hash if you want to	13:40
dorian__	cbreak, I don't think I can do "git checkout" on a bare repo	13:40
	← stutter left	13:40
dorian__	I get the following message "fatal: This operation must be run in a work tree"	13:40
	→ Cabanossi joined	13:41
rafasc	did you add your bare repo as a remote?	13:41
dorian__	Well, my question is how to update the bare repo.	13:42
rafasc	you add it as a remove on your local repo and push to it.	13:42
	→ boombatower joined	13:42
tobiasvl	you can also use man git update-ref	13:43
gitinfo	the git-update-ref manpage is available at https://gitirc.eu/git-update-ref.html	13:43
	← nckpz left	13:43
tobiasvl	but yes, in most workflows you'd push to it, not update the ref locally	13:43
dorian__	I didn't not make myself clear. I AM on the bare repo (the one used as a cache for another repo on another network)	13:44
cbreak	dorian__: bare repos have a HEAD ref you can change with git update-ref	13:44
	but ... careful with that	13:44
	→ stutter joined	13:44
cbreak	normally you'd use git symbolic-ref for it	13:44
	→ clickjack joined	13:44
dorian__	I don't want to push anything to the bare repo. I want to update it hourly using cron. So I added a git fetch line to the crontab	13:45
cbreak	dorian__: don't use git fetch	13:45
	you probably can't use it properly	13:45
	instead, use git remote update	13:45
dorian__	But "git fetch" only updates a "FETCH_HEAD" file, which is not really helpful	13:45
	Ok, i'll try that, thanks	13:46
cbreak	dorian__: user error	13:46
tobiasvl	dorian__: it is helpful, you just have to update-ref to FETCH_HEAD	13:46
cbreak	nah	13:46
tobiasvl	or symbolic-ref	13:46
cbreak	I'd strongly recommend not making HEAD a non-symbolic ref	13:46
tobiasvl	true	13:46
rafasc	I'd strongly recommend not messing inside bare repos unless you really know what you're doing.	13:47
	← Gustavo6046 left	13:47
dorian__	all right, all right, I just want a cache repo. I thought a bare repo was meant for that.	13:47
	So I just use a regular working repo instead ?	13:47
	→ bumblebeer joined	13:47
cbreak	dorian__: normally you'd have a mirror repo for that	13:47
tobiasvl	what's a cache repo?	13:47
cbreak	git clone --mirror	13:47
rafasc	you can still push to it via crontab	13:47
cbreak	as long as you don't push to it ;)	13:48
dorian__	cbreak, that sounds more like it, i'm gonna try that	13:48
cbreak	after the clone, you get a bare repo	13:48
	but it has special ref specs	13:48
	git remote update will update them I think	13:48
	→ orbyt_ joined	13:48
	→ jstimm joined	13:49
	← orbyt_ left	13:51
	← sat-aton__ left	13:51
dorian__	Alright, I downloaded the mirror one. So putting "git remote update" in my crontab should do the trick ?	13:52
	→ sat-aton joined	13:52
	→ chekbo joined	13:53
	← chekbo left	13:56
	← oxymoron93 left	13:56
	→ chekbo joined	13:56
	← sbeyer left	13:57
	→ seebyr joined	13:57
	→ Gustavo6046 joined	13:59
	← marinin left	14:01
	→ bronson joined	14:02
cbreak	dorian__: yes	14:02
	it will do a git fetch on all remotes	14:02
	NOT a git fetch remote branch (which is what you did incorrectly)	14:02
	← rasto left	14:03
	← JeroenT left	14:04
	← fatihgenc left	14:05
	→ Argylelabcoat joined	14:05
	← seebyr left	14:05
	→ dave0x6d joined	14:05
	→ seebyr joined	14:05
	← prg318 left	14:06
	← overlord_tm left	14:06
	← jstimm left	14:06
	← bronson left	14:06
dorian__	Alright, thanks for your help	14:06
	→ prg318 joined	14:07
	← Argylelabcoat left	14:08
	→ Argylelabcoat joined	14:10
	← brokensyntax left	14:10
	→ jnewt joined	14:10
	← Cabanossi left	14:10
	→ Cabanossi joined	14:11
	→ orbyt_ joined	14:11
	→ jstimm joined	14:11
	→ brokensyntax joined	14:11
	← Cabanossi left	14:12
	→ Cabanossi joined	14:13
	← opalepatrick left	14:15
	← ThomasLocke left	14:15
	→ opalepatrick joined	14:16
	→ rasto joined	14:18
	→ ResidentBiscuit joined	14:19
	→ npgm joined	14:19
	→ ThomasLocke joined	14:19
	← ThomasLocke left	14:19
	→ ThomasLocke joined	14:19
	← justanotheruser left	14:20
	← Trel left	14:20
	→ mohit joined	14:23
	mohit → Guest63419	14:23
	← tinanoo left	14:24
	→ ejsf joined	14:24
	← clickjack left	14:24
	← Guest63419 left	14:24
	→ nicky111 joined	14:25
	← wxg left	14:25
	→ tinanoo joined	14:25
	← xaxxon left	14:25
rafasc	is there a setting to prevent adding whitespace erros to the index?	14:27
	← nicky111 left	14:27
rafasc	or even a warning like apply does.	14:27
	← juvenal left	14:28
rafasc	git diff --check is able to detect said errors.	14:28
	→ mohitrbhardwaj joined	14:29
	← mohitrbhardwaj left	14:29
	→ LeBlaaanc joined	14:30
	→ cbonobo joined	14:33
	→ r00twrh joined	14:34
	← Chinorro left	14:34
	← ogny left	14:34
	→ Trel joined	14:35
	→ Darren_ joined	14:36
	← xkr47 left	14:36
	← dimi1947 left	14:36
	← scarcry left	14:36
	→ scarcry joined	14:37
	→ xkr47 joined	14:37
	← tvw left	14:37
	→ Raed\|Laptop joined	14:37
	→ AaronMT joined	14:39
dcpc007	whitespace errors like trailing ?	14:39
	→ tnecniv joined	14:39
	kurkale61 → kurkale6ka	14:39
dcpc007	or other like a double space between two words	14:39
cbreak	dcpc007: like using spaces for indenting ... barbarians...	14:39
dcpc007	i remember of different cases	14:39
	→ justanotheruser joined	14:39
	→ Chinorro joined	14:39
	→ juvenal joined	14:40
dcpc007	looooooooool yes i had the problem yesterday, switching from vim to sublimetext ... whole files modified !	14:40
rafasc	looks like the default pre-commit hook does just that	14:41
	← juvenal left	14:41
	→ marinin joined	14:41
rafasc	git diff --check detects whatever your core.whitespace is set to detect	14:42
	← ThomasLocke left	14:42
dcpc007	https://stackoverflow.com/questions/33159394/ignore-all-whitespace-changes-with-git-diff-between-commits	14:42
	→ kurkale61 joined	14:42
dcpc007	look in solution the [core] whitespace = -trailing-space,-indent-with-non-tab,-tab-in-indent	14:42
	← sz0 left	14:42
dcpc007	never try or look	14:42
	← Nevik left	14:42
dcpc007	git diff -w too no ?	14:43
	← cbonobo left	14:43
rafasc	don't want to ignore the errors. I want to force commits to fail if they contain those errors	14:43
	→ cbonobo joined	14:43
rafasc	just needed to activate the pre-commit hook	14:44
	← kurkale6ka left	14:44
rafasc	was about to write a hook when I saw the same did exactly what I wanted	14:44
	s/same/sample	14:45
	→ kurkale6ka joined	14:46
	→ thiago joined	14:46
	← tnecniv left	14:46
	→ Phylock joined	14:47
	← cdg_ left	14:47
	→ juvenal joined	14:48
	→ roelmonn_ joined	14:48
	→ kpease joined	14:48
	← roelmonn_ left	14:48
	→ cdg joined	14:48
	← kurkale61 left	14:48
	→ royiv_ joined	14:49
	→ kpease_ joined	14:49
	← smuten left	14:50
	→ nckpz joined	14:51
	← roelmonnens left	14:51
	→ fatihgenc joined	14:52
	← juvenal left	14:52
	← govg left	14:52
	← kpease left	14:52
	← cdg left	14:53
	→ jost joined	14:53
	← jstimm left	14:54
	← rscata left	14:54
	← greenbagels left	14:55
	← dorian__ left	14:55
	→ wootehfoot joined	14:55
	← fatihgenc left	14:56
	← nowhere_man left	14:56
	→ fatihgenc joined	14:57
	← igemnace left	14:57
	→ CheckDavid joined	14:57
	→ matsaman joined	14:57
	← dec0n left	14:57
	→ FrostCandy joined	14:58
	← dreiss left	14:59
	← Silmarilion left	15:00
	← nisseni left	15:00
dcpc007	hum then if git diff -w works, try to detect if git diff and git diff -w are different and then block	15:01
	→ greenbagels joined	15:01
	→ jstimm joined	15:02
	← thiago left	15:03
	← greenbagels left	15:03
	← Cavallari left	15:03
rafasc	it's already done. It's the default pre-commit hook. All I needed to do was remove the .sample	15:04
dcpc007	ha ? :)	15:04
	→ greenbagels joined	15:04
dcpc007	never look those one	15:04
	← riemann left	15:06
	← gfurlan left	15:06
	→ juvenal joined	15:07
	← balance left	15:08
	← ertes-w left	15:08
	→ GrailKn1ght joined	15:09
	← King_Hual left	15:09
	→ koell joined	15:10
	→ Mattiaslndstrm joined	15:10
	→ Tobbi joined	15:11
	← bumblebeer left	15:11
	← lukasdboer left	15:11
	← Brski left	15:12
	← gareppa left	15:12
	→ Gencade joined	15:12
	← kaldoran left	15:13
	→ iNCoNFuN joined	15:14
	← sim590 left	15:14
	← flobin left	15:14
	→ cagomez joined	15:15
	→ kaldoran joined	15:16
	→ sim590 joined	15:17
	→ RandomUser4321 joined	15:17
	← eduardas_m left	15:18
	← lordjancso left	15:19
	← phluks left	15:19
	→ tnecniv joined	15:21
	← RandomUser4321 left	15:21
	← jstimm left	15:21
	→ TikityTik joined	15:21
	← Mattiaslndstrm left	15:22
	← Cabanossi left	15:23
	← Murr left	15:24
	→ Murr joined	15:24
	→ Cabanossi joined	15:26
calamari	rafasc: thank you for your help yesterday with untracked files	15:26
	← koell left	15:27
	→ ozcanesen joined	15:27
	→ al-damiri joined	15:27
	← chele left	15:28
rafasc	don't even remember what was the issue	15:30
	→ tang^ joined	15:30
rafasc	you're welcome anyways :D	15:31
	← tnecniv left	15:31
	→ tnecniv joined	15:32
	→ madewokherd joined	15:34
	→ bambams joined	15:34
bambams	It appears that a colleague has wiped out some changes during a merge. I'm nearly certain of it now. The only problem I'm having is getting 'git-log' or 'git-diff' to tell me so directly.	15:35
	→ YuGiOhJCJ joined	15:35
	← orbyt_ left	15:35
	← calamari left	15:35
_ikke_	bambams: look at -c --cc	15:36
	You need to check the merges against the 2nd parent	15:36
	← Hello71 left	15:39
	→ dimi1947 joined	15:39
	← ferr left	15:40
bambams	_ikke_: I figured. Just having trouble doing that. -c doesn't seem to help any.	15:40
	_ikke_: This seems to work though: git diff sha1^2..sha1	15:41
_ikke_	right	15:41
	→ Mattiaslndstrm joined	15:41
	← whitby left	15:42
	→ cdg joined	15:42
	→ whitby joined	15:42
	← YuGiOhJCJ left	15:42
	→ Nevik joined	15:46
	← cdg left	15:47
	← tnecniv left	15:48
	→ cdg joined	15:49
	← bybb left	15:50
	→ eroux joined	15:51
	→ ertes joined	15:52
	← TikityTik left	15:53
	← cdg left	15:54
	← marinin left	15:54
	→ blackmesa joined	15:55
	→ tnecniv joined	15:56
	→ mark_c joined	15:56
	→ dreiss joined	15:56
	← tnecniv left	15:59
	→ matt3o12_ joined	16:00
	→ clickjack joined	16:01
	← GunArm1 left	16:02
	gitinfo set mode: +v	16:02
	gitinfo set mode: +v	16:02
matt3o12_	Hey, what is the best way to get informed when a new git version is released? I'm looking for a mailing list or RSS feed but I couldn't find any.	16:02
	← matsaman left	16:03
	→ bronson joined	16:03
	→ bybb joined	16:03
	← Raed\|Laptop left	16:05
	← masuberu left	16:05
	← shinnya left	16:05
	← mikecmpbll left	16:05
	→ roelmonnens joined	16:06
	→ masuberu joined	16:07
	← bronson left	16:08
	→ matsaman joined	16:08
	← clmsy left	16:08
	← wootehfoot left	16:09
	← evie_hammond left	16:10
bambams	Damn. It seems nontrivial to redo the merge. I've reverted the changes to the "mainline" branch introduced by the merge. I then went back in history before the bad merge and repeated the merge correctly. Trying to merge that merge into the mainline doesn't seem to work... Most of the changes are skipped. I wonder if Git is being too smart here.	16:10
	← roelmonnens left	16:10
	→ ki0_ joined	16:10
	← jsears left	16:11
	→ orbyt_ joined	16:11
bambams	I wonder if I can specify a merge base or something. That might solve it.	16:11
	← rominronin left	16:11
	← boutcher left	16:12
	← opalepatrick left	16:12
	← fatihgenc left	16:13
	← ki0 left	16:14
	→ bumblebeer joined	16:14
bambams	There doesn't appear to be documentation shipped for it, but `git merge-recursive $(git merge-base $good_merge^1 $good_merge^2) -- $mainline $good_merge' appears to be doing it. Maybe.	16:15
	→ theoceaniscool joined	16:15
	← dave0x6d left	16:15
	← ki0_ left	16:15
	→ robotroll joined	16:16
	→ raynold joined	16:16
	← dreiss left	16:17
	→ chrysa joined	16:21
	← gxt left	16:21
	→ mikecmpbll joined	16:23
	← chrysa left	16:23
	→ chrysa joined	16:24
	← chrysa left	16:25
	→ chrysa joined	16:26
	← chrysa left	16:26
	→ jstimm joined	16:27
	← stutter left	16:27
	→ ArcaTech joined	16:27
	← Tobbi left	16:27
	→ chrysa joined	16:28
	← robotroll left	16:28
	→ baxx joined	16:29
	← chrysa left	16:32
	→ EvilPenguin joined	16:32
	← irqq left	16:33
bambams	_ikke_: Do you know of an incantation to make `git log' show both differences (I think -c, except where either parent changed the file, instead of only where both changed the file).	16:33
	← thinkpad left	16:34
	← blackmesa left	16:36
	← kurkale6ka left	16:36
	→ Tobbi joined	16:37
	→ wootehfoot joined	16:39
	← ArcaTech left	16:42
	← ozcanesen left	16:43
	← _ADN_ left	16:44
	← jgornick left	16:46
	→ stutter joined	16:47
	→ evie_hammond joined	16:48
	← Tobbi left	16:49
	← bumblebeer left	16:49
	→ bumblebeer joined	16:50
	← fmcgeough left	16:52
	→ fmcgeough joined	16:53
	→ jnavila joined	16:54
	← diogenese left	16:54
	→ diogenese joined	16:54
	← chll_ left	16:54
	← bybb left	16:57
	← Zoxc left	16:58
	→ cust joined	16:58
	→ dviola joined	16:58
	← jnewt left	16:59
	← joe3 left	16:59
	→ dreiss joined	17:00
	← achadwick left	17:01
	→ roelmonnens joined	17:01
	→ Zoxc joined	17:02
	← masuberu left	17:02
	→ marinin joined	17:02
	← fission6 left	17:03
	→ fission6 joined	17:06
	→ bybb joined	17:07
	← marinin left	17:07
	→ durham joined	17:07
	← bumblebeer left	17:11
	→ bumblebeer joined	17:11
	→ cdown_ joined	17:13
	→ sbeyer joined	17:13
	← cdown left	17:13
	cdown_ → cdown	17:13
	→ sarri joined	17:14
	← sarri left	17:14
	→ sarri joined	17:14
	← bumblebeer left	17:16
	→ bumblebeer joined	17:16
	→ marinin joined	17:19
	→ thiago joined	17:19
	→ blackmesa joined	17:19
	← jstimm left	17:23
	← Murr left	17:24
	→ Murr joined	17:24
	→ spacemeld joined	17:24
	← dreiss left	17:26
	← cdown left	17:27
	→ bronson joined	17:28
	→ dreiss joined	17:28
	→ Hello71 joined	17:30
	→ boutcher joined	17:30
	← brainproxy left	17:30
	→ robotroll joined	17:32
	← bybb left	17:32
	← roelmonnens left	17:33
	← elfuego left	17:33
	← Hello71 left	17:35
	← robotroll left	17:36
	← chekbo left	17:37
	→ neunon_ joined	17:38
	→ JanC_ joined	17:38
	← JanC left	17:39
	JanC_ → JanC	17:39
	← fission6 left	17:41
	← neunon left	17:41
	neunon_ → neunon	17:41
	→ salamanderrake joined	17:42
	← rafasc left	17:42
	→ koell joined	17:44
	→ ToBeCloud joined	17:44
	← marinin left	17:44
	gitinfo set mode: +v	17:44
	← kpease_ left	17:45
	← orbyt_ left	17:45
	→ mohabaks joined	17:45
	→ m0viefreak joined	17:47
	← cstratak left	17:48
	← manuelschneid3r left	17:49
	→ tvw joined	17:50
	→ fission6 joined	17:50
	← dimi1947 left	17:50
	← de-vri-es left	17:51
osse	matt3o12_: !list	17:51
gitinfo	matt3o12_: [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://public-inbox.org/git	17:51
	→ de-vri-es joined	17:51
	ShalokShalom_ → ShalokShalom	17:52
	→ elfuego joined	17:53
	← elfuego left	17:54
	→ manuelschneid3r joined	17:54
	→ elfuego joined	17:55
	→ BeerLover joined	17:56
	→ Nizumzen joined	17:56
	→ orbyt_ joined	18:02
	← matt3o12_ left	18:02
	← EvilPenguin left	18:03
	← theoceaniscool left	18:03
	→ Sasazuka joined	18:04
	→ Solvaring joined	18:04
	→ marinin joined	18:05
	← mostlybadfly left	18:05
	← juvenal left	18:06
	← jnavila left	18:07
	← de-vri-es left	18:07
	→ irqq joined	18:07
	→ de-vri-es joined	18:07
	→ EvilPenguin joined	18:07
	→ Acerific joined	18:10
	→ theoceaniscool joined	18:11
	→ cagedwisdom joined	18:14
	→ jstein_ joined	18:17
	jstein_ → jstein	18:18
	← felixsanz left	18:18
	→ jnavila joined	18:19
	← fearless_man left	18:19
	→ felixsanz joined	18:19
	→ dave0x6d joined	18:19
	← Acerific left	18:20
	← seebyr left	18:20
	→ seebyr joined	18:20
	← stutter left	18:21
	→ tnecniv joined	18:22
	→ joe3 joined	18:24
	→ Hello71 joined	18:25
	→ z1haze joined	18:25
z1haze	if I have several commits in a branch, and I want to pull out a commit that was several commits ago to test to see if that is what broke something, can I do that?	18:26
	→ energizer joined	18:27
	← BeerLover left	18:27
	← blackmesa left	18:27
	← Stravy left	18:27
	→ Ladus joined	18:27
osse	z1haze: what do you mean by pull out ?	18:28
	pretend it wasn't there?	18:28
	→ stutter joined	18:28
z1haze	yea	18:28
	like 10 commits ago, somethging happened that i suspect broke some stuff	18:28
osse	i would use 'git revert {commit}' and then nuke the changes when I	18:28
	'm done	18:28
	→ Stravy joined	18:28
	← Bock left	18:29
z1haze	does that revert all the way to that commit, or just that specific commit	18:29
osse	just that specific	18:29
	← Stravy left	18:29
osse	add --no-commit to make it easier to get rid of it	18:29
	→ ttl joined	18:30
	← tnecniv left	18:30
	← justAllgood left	18:30
	← Darcidride left	18:30
_ikke_	z1haze: also man git bisect	18:31
gitinfo	z1haze: the git-bisect manpage is available at https://gitirc.eu/git-bisect.html	18:31
	← jnavila left	18:31
	→ Stravy joined	18:31
	→ KnoP joined	18:36
	← joe3 left	18:38
	← Technodrome left	18:40
	→ brainproxy joined	18:40
	← dreiss left	18:41
	→ kpease joined	18:43
	← konsolebox left	18:43
	← r00twrh left	18:46
	← matsaman left	18:46
	→ tunekey joined	18:48
	← iNCoNFuN left	18:48
	← Stravy left	18:48
	→ tnecniv joined	18:48
	→ Stravy joined	18:48
	← Stravy left	18:50
	→ Stravy joined	18:50
	→ konsolebox joined	18:50
	→ flobin joined	18:50
	→ blackmesa joined	18:53
	→ rockstar_ joined	18:53
	← cybrNaut left	18:53
	→ cybrNaut joined	18:53
rockstar_	how do I get rid of conflicts in a file? Somebody commit/push before I could commit/push.	18:55
	← GrailKn1ght left	18:55
	← Stravy left	18:55
rockstar_	I tried deleting my file then pull. But then it still shows conflict.	18:55
	← orbyt_ left	18:55
	→ Stravy joined	18:55
	← markmarkmark left	18:56
	→ ArcaTech joined	18:56
	→ blackmesa1 joined	18:56
	← stutter left	18:57
	← Stravy left	18:57
	← blackmesa left	18:57
	→ Stravy joined	18:58
	→ cdown joined	18:58
	→ JanC_ joined	18:59
	→ blackmesa joined	19:00
	JanC → Guest38427	19:00
	← Guest38427 left	19:00
	JanC_ → JanC	19:00
	→ stutter joined	19:00
	← blackmesa1 left	19:02
	→ fstd_ joined	19:03
	← Stravy left	19:03
	→ Stravy joined	19:03
	← fstd left	19:04
	fstd_ → fstd	19:04
	← daynaskully left	19:06
	→ _ADN_ joined	19:06
	→ fstd_ joined	19:07
	→ markmarkmark joined	19:07
	← ertes left	19:08
_ikke_	rockstar_: !eek	19:08
gitinfo	rockstar_: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	19:08
	← tnecniv left	19:08
	← fstd left	19:10
	fstd_ → fstd	19:10
	→ DrtyOldMan joined	19:10
	→ daynaskully joined	19:10
	→ dreiss joined	19:11
	← DrtyOldMan left	19:12
	→ kfoonamalik joined	19:13
	← flobin left	19:13
	→ fstd_ joined	19:16
	← CheckDavid left	19:16
	← fstd left	19:16
	fstd_ → fstd	19:16
	← daynaskully left	19:17
	→ j08nY joined	19:18
	← tsia left	19:20
	← energizer left	19:20
	← cagomez left	19:21
	→ tsia joined	19:21
	→ cagomez joined	19:21
	→ daynaskully joined	19:22
	→ fstd_ joined	19:23
	← Murr left	19:24
	→ Murr joined	19:24
	← fstd left	19:25
	→ justAllgood joined	19:25
	← tsia left	19:26
	← cagomez left	19:26
	← blackmesa left	19:26
	← durham left	19:33
	→ durham joined	19:33
	→ Murii\|linux joined	19:33
	← durham left	19:34
	→ durham joined	19:34
	← durham left	19:34
	→ gopar joined	19:37
catern	> hey #git, is there a way to send a git repository on my local machine directly to a remote machine over ssh? i.e. not through some public HTTP or something	19:40
	→ cstratak joined	19:40
_ikke_	catern: and the remote does not have a repository yet?	19:40
	← ScalaWilliam left	19:40
catern	well, if the remote didn't have a repository, I could just copy it :)	19:40
	→ ScalaWilliam joined	19:40
catern	so presume that the remote does have a repository	19:41
selckin	that sounds like sending	19:41
	← puff left	19:41
selckin	you can also add it as a remote over ssh	19:41
catern	not sure what you mean by "sounds like sending"	19:42
	copying is substantially more costly than it needs to be, if the remote machine repo already has the commit that I want checked out	19:42
	→ BeerLover joined	19:42
_ikke_	catern: So you just want to push over ssh?	19:42
catern	precisely	19:42
	hmm	19:42
	wow I guess I can just push over ssh :)	19:42
_ikke_	catern: that 'just works'	19:42
catern	yeah that's very simple	19:42
	dunno how I forgot about that :)	19:43
	well, hmm.	19:43
selckin	git remote add other git+ssh://catern@host:/my/repo; git push other	19:43
catern	it would be convenient to do this in an adhoc way	19:43
_ikke_	git+ is not requried	19:43
	not sure if it's even supported	19:43
catern	i.e. without adding a remote	19:43
selckin	always done & seen it that way, wierd	19:44
catern	because, I am pushing to a large number of different machines, programmatically	19:44
selckin	catern: rsync?	19:44
_ikke_	selckin: Some systems (like archlinux) use it to specify it's a git repository (instead of just an http resource)	19:44
	catern: You can push directly to a remote url	19:44
catern	_ikke_: ah indeed, right, I can just do that	19:45
_ikke_	git push user@host:/path/to/repo.git <branchname>	19:45
catern	okay, so that's really quite straightforward	19:45
	I'll push to my remote repo, and then check out the commit I want	19:45
	← cstratak left	19:46
	← bronson left	19:47
	→ puff joined	19:47
	← qpdb left	19:48
	← bergice_ left	19:48
	→ Technodrome joined	19:50
catern	hmm, okay, this is good, will work well	19:50
	→ bronson joined	19:51
catern	one further question: concretely, what I want to do is push a specific commit to the remote repo and check out that commit. ideally I could do "git push user@host:/path/to/repo <commithash>" to send the blobs backing that commithash to remote repo	19:51
	→ Acerific joined	19:51
catern	but I can't actually do that because I need a destination ref, I guess	19:52
	any suggestions?	19:52
	→ fstd joined	19:52
catern	I guess I could just push it to master	19:52
_ikke_	<hash>:<name>	19:52
	You do need a ref to push, you cannot just push commits	19:52
catern	oh, yeah, if I push it to master, and then I detach my head by checking out the specific commit, there's no problem :)	19:52
	I was worried that I'd have the "can't push to checked-out branch" problem	19:53
_ikke_	yes, that is an actual problem if you haven't setup the remote repo for it	19:53
	← ToBeCloud left	19:54
	← fstd_ left	19:54
catern	but I think I'll just push like this: "git push user@host:/path/to/repo <commithash>:refs/heads/autopush"	19:54
	where autopush is just some random ref which I will never check out	19:55
	that way I can always push	19:55
	unless maybe there's some designated /dev/null ref? :)	19:55
	then I'd push to that	19:55
_ikke_	nope	19:55
catern	cool, thanks #git	19:57
	I'm kind of embarrassed that I forgot all this :)	19:57
	elementary stuff	19:57
	→ fstd_ joined	19:57
	← dreiss left	19:58
_ikke_	We're here to support :)	19:58
	← stux\|RC-only left	19:58
	→ mostlybadfly joined	19:58
	← fstd left	20:00
	fstd_ → fstd	20:00
	← skered left	20:02
	→ skered joined	20:03
	← prg318 left	20:03
	← fatalhalt left	20:04
	← Technodrome left	20:05
	→ ZyX-I joined	20:07
	← typikal left	20:08
	→ KV_ joined	20:08
	← puff left	20:08
	→ prg318 joined	20:08
	→ fatalhalt joined	20:08
	→ typikal joined	20:09
	→ orbyt_ joined	20:09
	← felixsanz left	20:09
	→ matsaman joined	20:09
	→ felixsanz joined	20:10
	→ jeffreylevesque joined	20:11
	← jeffreylevesque_ left	20:12
	← marinin left	20:13
	← mohabaks left	20:13
	→ puff joined	20:14
	← mattcen left	20:14
	ReenignE- → ReenignE	20:15
	→ DaringDart joined	20:16
	→ mkali joined	20:16
	→ vals_ joined	20:16
	← perlpilot left	20:16
	→ glebihan_ joined	20:16
	← tango_ left	20:16
	← DaringDart left	20:17
	→ chekbo joined	20:18
	← bronson left	20:18
	← ttl left	20:19
	← mkali left	20:19
	→ mattcen joined	20:20
	→ durham joined	20:21
	→ cagomez joined	20:24
	← ShekharReddy left	20:24
	← denisMone left	20:26
	← rwb left	20:27
	← ResidentBiscuit left	20:27
	→ dreiss joined	20:27
	← bumblebeer left	20:28
	→ sat-aton__ joined	20:29
	← drodger left	20:32
	← cagedwisdom left	20:32
	← dreiss left	20:33
	← LeBlaaanc left	20:33
	→ bumblebeer joined	20:33
	← sat-aton left	20:33
	← afuentes left	20:33
	→ dumnut joined	20:34
	→ drodger joined	20:34
	→ dreiss joined	20:35
	→ joe3 joined	20:35
	← theoceaniscool left	20:35
	→ gokmen joined	20:35
	← madewokherd left	20:36
	← cbonobo left	20:37
	→ cbonobo joined	20:37
	← gopar left	20:37
	→ troulouliou_div2 joined	20:38
	→ gopar joined	20:38
	← puff left	20:38
	← xcm left	20:41
	← cbonobo left	20:42
	← FrostCandy left	20:43
	→ puff joined	20:43
	→ xcm joined	20:46
	← diogenese left	20:47
	→ irqq_ joined	20:49
	← irqq left	20:49
	→ svm_invictvs joined	20:51
	← Cabanossi left	20:54
	→ bongozig joined	20:54
	→ kroete joined	20:54
	→ enginpost joined	20:55
	← jeffreylevesque left	20:55
	→ Cabanossi joined	20:56
	← matsaman left	20:56
	→ jungsubk joined	20:57
	← eroux left	20:57
	← AaronMT left	20:58
	→ john_hexis joined	20:58
	← jungsubk left	21:00
	→ tafa2 joined	21:02
	→ marinin joined	21:05
	← schleppel left	21:08
	← joe3 left	21:08
	← gugah left	21:08
	← svm_invictvs left	21:09
	→ schleppel joined	21:10
	← petersaints left	21:10
	← fission6 left	21:10
	→ petersaints joined	21:12
	→ iamtakingiteasy joined	21:12
	← sparr left	21:13
	→ sparr joined	21:13
	← drodger left	21:13
	→ rwb joined	21:14
	← gopar left	21:15
	→ Tobbi joined	21:15
	→ drodger joined	21:15
	→ gopar joined	21:15
	← dreiss left	21:17
	← gokmen left	21:19
tafa2	can anyone recommend a mac client?	21:19
	→ gokmen joined	21:20
	← gopar left	21:20
	→ ekh joined	21:22
	→ fstd_ joined	21:22
	← marinin left	21:23
	← JanC left	21:23
ekh	Is there a way to initialize folder as submodule, rather than just create it somewhere, and then add to the current project?	21:24
	← Cabanossi left	21:24
	← mattcen left	21:24
	→ fission6 joined	21:24
	← fstd left	21:25
	→ JanC joined	21:25
	→ fstd joined	21:25
	→ Cabanossi joined	21:26
	← Aelius left	21:26
	← fstd_ left	21:27
	← enginpost left	21:28
	← fmcgeough left	21:32
	← SilverBe left	21:33
	→ czart_ joined	21:34
	→ gopar joined	21:34
	← sorenb left	21:36
	← czart__ left	21:38
	→ dreiss joined	21:38
	← inovas left	21:38
	← gokmen left	21:39
	→ mattcen joined	21:40
	→ gokmen joined	21:40
	← luckman212 left	21:41
	→ zulutango joined	21:42
	→ marinin joined	21:44
	← dviola left	21:45
	→ Guma joined	21:46
	→ luckman212 joined	21:47
	← stutter left	21:49
	← relipse__ left	21:50
	→ relipse joined	21:50
	← boutcher left	21:50
relipse	I accidentally went to tag 2.8.3 now i have to rollback to 2.8.2, how do i make master 2.8.2 the latest?	21:51
	← Acerific left	21:51
	→ blackmesa joined	21:51
	← BeerLover left	21:54
	← fission6 left	21:54
	← marinin left	21:55
	→ fission6 joined	21:56
	← Mattiaslndstrm left	21:56
	← fission6 left	21:57
	← Tobbi left	21:57
	← rockstar_ left	21:57
	→ mel00010 joined	22:01
	← jstein left	22:01
	← KV_ left	22:02
	← SebastianFlyte left	22:02
	← nckpz left	22:02
	← dreiss left	22:03
	→ BSaboia joined	22:04
BSaboia	hello	22:04
	can a commit have more than one committer? what does that means?	22:04
	→ Mattiaslndstrm joined	22:04
	→ fission6 joined	22:04
	← fission6 left	22:05
	→ SebastianFlyte joined	22:05
	← Argylelabcoat left	22:06
	← Mattiaslndstrm left	22:06
	→ Sasazuka__ joined	22:06
	← Murii\|linux left	22:06
	→ cdown_ joined	22:06
	← cdown left	22:06
	cdown_ → cdown	22:07
	← Sasazuka left	22:07
	→ gxt joined	22:08
	→ energizer joined	22:09
	← kroete left	22:10
	← Cabanossi left	22:10
	← ahf left	22:10
	→ dreiss joined	22:11
	→ Cabanossi joined	22:11
	← rigid left	22:12
	→ rigid joined	22:12
	← rigid left	22:12
	→ rigid joined	22:12
	→ joe3 joined	22:13
	← bumblebeer left	22:17
	← kpease left	22:17
	→ jeffreylevesque joined	22:18
	→ cagedwisdom joined	22:18
	→ kasual joined	22:18
	→ Acerific joined	22:19
	← Acerific left	22:19
	→ Acerific joined	22:19
	← pbandark left	22:19
	→ bronson joined	22:19
	← chekbo left	22:19
	→ jstimm joined	22:20
	→ ahf joined	22:20
	← Zoxc left	22:21
	← ekh left	22:21
	← z1haze left	22:23
	→ Zoxc joined	22:23
	→ King_Hual joined	22:23
	← King_Hual left	22:23
	→ King_Hual joined	22:23
	← bronson left	22:25
	← sasheto left	22:26
	← gopar left	22:28
	← jeffreylevesque left	22:28
	→ gopar joined	22:29
	← cagedwisdom left	22:29
	→ jeffreylevesque joined	22:30
j416	BSaboia: it cannot.	22:32
	← troulouliou_div2 left	22:32
j416	BSaboia: a commit has an author and a committer. They can be the same or different people.	22:32
	tafa2: plain git	22:33
	← Darren_ left	22:34
	← jeffreylevesque left	22:34
	← sim590 left	22:34
	← kaldoran left	22:35
j416	someone should update that topic; 2.14.2 has been out for 2 weeks already :O	22:36
	→ kaldoran joined	22:37
	← wootehfoot left	22:38
	→ sim590 joined	22:38
	→ Git joined	22:39
	→ shinnya joined	22:39
	gitinfo set mode: +v	22:40
Git	Testing...first message in #git channel...got here through the Pro Git book	22:40
	← clickjack left	22:41
	→ blackmesa1 joined	22:42
	→ wxg joined	22:42
	→ fission6 joined	22:43
	← blackmesa left	22:44
	→ marinin joined	22:45
	← wxg left	22:46
Git	So can anyone see this message?	22:46
	→ theoceaniscool joined	22:47
	← koell left	22:47
	← fission6 left	22:47
	← Git left	22:48
	→ xaxxon joined	22:49
	→ mizu_no_oto joined	22:49
	← joe3 left	22:53
	← elfuego left	22:54
	← schleppel left	22:55
	← King_Hual left	22:55
	→ tnecniv joined	22:56
	← tnecniv left	22:56
	→ fstd_ joined	22:56
	→ Achylles joined	22:57
	← Paraxial left	22:57
	← fstd left	22:58
	fstd_ → fstd	22:58
	→ Paraxial joined	22:58
	← durham left	22:58
	← Acerific left	23:01
	← j08nY left	23:02
	→ diogenese joined	23:04
	← finalbeta left	23:04
	→ thinkpad joined	23:05
	→ Bobguy joined	23:08
	→ dre_ joined	23:08
	← Persondude left	23:11
	← dege left	23:11
	← Bobguy left	23:12
	→ safe joined	23:13
	← xcm left	23:15
	→ gugah joined	23:15
	← gugah left	23:15
	→ xcm joined	23:15
	← BSaboia left	23:19
	→ ecstaticmorse joined	23:19
	→ bronson joined	23:19
	← Achylles left	23:21
	← bronson left	23:24
	→ rocktop_ joined	23:24
	← Gustavo6046 left	23:25
	→ Gustavo6046 joined	23:26
	← orbyt_ left	23:26
	← dsdeiz left	23:27
	→ dsdeiz joined	23:27
	← rocktop left	23:27
	→ Achylles joined	23:28
	← xaxxon left	23:28
	← ArcaTech left	23:29
	← xcm left	23:30
	→ xcm joined	23:31
	← kasual left	23:31
	← Zialus left	23:32
	← Ladus left	23:33
	→ snowkidind joined	23:34
	→ bseyer joined	23:35
	→ elfuego joined	23:35
	← sbeyer left	23:38
	← Achylles left	23:39
	← elfuego left	23:40
	← dreiss left	23:42
	← dsdeiz left	23:42
	→ dsdeiz joined	23:42
	← dsdeiz left	23:42
	→ dsdeiz joined	23:42
	→ Goplat joined	23:42
	Sasazuka__ → Sasazuka	23:42
	← cdown left	23:45
tafa2	Git yeah	23:47
	← bseyer left	23:48
	→ marinin_ joined	23:50
	← marinin left	23:52
	→ orbyt_ joined	23:53
	→ wxg joined	23:54
	→ justan0theruser joined	23:54
	← justan0theruser left	23:54
	→ justan0theruser joined	23:55
	← justanotheruser left	23:55
	← wxg left	23:57
	→ guccimeow joined	23:57
	→ dviola joined	23:58
	← tang^ left	23:58
	← npgm left	23:59

Logs Search ←Prev date Next date→

Channels Documentation