IRCloggy #git 2015-08-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.

	2015-08-06
	← sergeii left	00:00
	← Bootinbull left	00:00
milki	tang^: i have issues because i cant use jenkins native polling due to restricted access to the git server	00:00
	→ fstd joined	00:00
	← eVRiAL left	00:00
milki	tang^: so i can manually poll, but miss all the nice native things like caching seen commits and branches and whatever other magic jenkins has	00:01
	→ devoldmx joined	00:01
tang^	milki: I don't poll	00:02
	→ dadamssg joined	00:02
	← coderMe left	00:02
tang^	I rely exclusively on post-receive pushing notices to jenkins	00:02
	← ascarter left	00:02
milki	tang^: er, thats what im trying to do with my hook now	00:02
	← imachuchu left	00:02
milki	tang^: but i need to know the refname	00:03
CareBear\	there isn't always one	00:03
	← cbonobo left	00:03
milki	?	00:03
CareBear\	the hook should iterate over all new commits and tell jenkins to test each one	00:03
	← chitopunk left	00:03
	← skyres left	00:03
CareBear\	jenkins should only ever deal with one commit at a time	00:03
	← Nikhil_D left	00:03
CareBear\	and commits have no refname	00:03
	→ dangranos joined	00:04
	→ acetakwas_ joined	00:04
	→ Nikhil_D joined	00:04
tang^	milki: this is in my post-receive: curl -s http://jenkins/git/notifyCommit?url=git@git:${GL_REPO}	00:05
	→ skyres joined	00:05
milki	that triggers polling on jenkins	00:05
tang^	and you can't do polling at all?	00:05
	→ ilmgb joined	00:05
	← Gizburdt left	00:05
	→ cdown joined	00:05
milki	we do now and we have issues with it. so we are moving to a push based trigger with parameterized jobs	00:05
	← Dzejmskrokan left	00:06
	← devoldmx left	00:06
tang^	might want to ask in #jenkins about extra functionality in the git plugins then	00:06
CareBear\	there are no valid refnames	00:06
	refnames are a human thing	00:06
	← dadamssg left	00:06
CareBear\	jenkins just needs to know about the commit	00:06
	→ Lyqyd joined	00:06
milki	CareBear\: wouldnt it be nice if humans didnt care about logs and commit messages	00:06
	← CKyle left	00:06
CareBear\	?	00:07
	when jenkins is processing a particular commit, only that commit hash matters	00:07
	nothing else	00:07
	and nothing else is useful in a log or in a commit message	00:07
tang^	milki: this is with gitolite, yes?	00:07
milki	yes, the required operations dont require refnames	00:07
CareBear\	by the time someone reads that email who knows what that refname is pointing to...	00:07
milki	tang^: yes, the hook is run on a repo in gitolite	00:07
	← acetakwas left	00:08
milki	CareBear\: that doesnt mean its not important	00:08
tang^	milki: must be a big environment if polling is iffy	00:08
milki	tang^: mostly security restricted	00:08
CareBear\	milki : the commit hash is the only important thing	00:08
tang^	milki: ah... yes, I have a jenkins set up as a special read-only user in all repos	00:09
CareBear\	milki : with that, you can easily git branch --contains $hash	00:09
	← acetakwas_ left	00:09
milki	tang^: specifically, the git server is accessible to localhost onlyh	00:09
	← skyres left	00:09
	← crayon left	00:09
tang^	milki: not even through ssh?	00:10
milki	tang^: yeah... jenkins isnt really notable for quick responses and customer support	00:10
	← ilmgb left	00:10
tang^	milki: I'm using jenkins with gitolite via ssh	00:10
milki	tang^: i need to do a double ssh. ssh to gitolite server, then ssh to get to the repo	00:10
	→ theCole joined	00:10
tang^	I ... uhh	00:11
milki	its stuuupid	00:11
	← FernandoBasso left	00:11
	→ skyres joined	00:11
tang^	that's a setup I'm not familiar with	00:11
milki	hehe	00:11
CareBear\	man ssh_config look for ProxyCommand	00:11
milki	localhost only :P	00:11
	→ crayon joined	00:11
	→ SocialBlunder joined	00:11
	← cdown left	00:11
milki	CareBear\: o	00:11
	CareBear\: HMMMMM	00:11
	qpdb_ → qpdb	00:11
milki	CareBear\: now thats an idea	00:12
tang^	isn't that what gitolite is using already?	00:12
CareBear\	no	00:12
milki	tang^: no? theres nothing special needed for gitolite	00:12
tang^	no, it's using command	00:13
	tang^ reads up on ProxyCommand	00:13
	→ fef joined	00:13
	← fef left	00:13
milki	tang^: to get ssh acess to a server, run this command first. essentially	00:13
	→ otter768 joined	00:14
tang^	neat	00:14
milki	i didnt think about this	00:15
	i wonder if i can poll without checking out the branch though...	00:15
	thats probably something i cant do -.-	00:15
	itll clone the repo	00:15
CareBear\	ssh -o 'hostkeyalias git' -o'proxycommand ssh -W bastion:%p 127.0.0.1' git@git	00:15
milki	theres probably no noclone option or polling only option	00:16
	→ clarkpan joined	00:16
	← SocialBlunder left	00:16
	→ Strat joined	00:16
	→ faux___ joined	00:16
	← skyres left	00:16
	← tristanseifert left	00:18
	← otter768 left	00:19
	→ skyres joined	00:19
	→ corey84__ joined	00:20
	← faux___ left	00:21
	← hyperair left	00:21
	→ astockton joined	00:22
osse	milki: You could make it fetch	00:23
	← skyres left	00:23
	← Corey84 left	00:23
	← astockton left	00:24
	← tang^ left	00:24
	← clarkpan left	00:25
	→ skyres joined	00:25
	← Muhannad left	00:26
	→ Phoenixz joined	00:27
	→ clarkpan joined	00:27
	→ aretecode joined	00:28
	← hexagoxel left	00:29
	→ Muhannad joined	00:29
	← skyres left	00:29
	→ ihec joined	00:30
	← ihec left	00:30
	→ skyres joined	00:31
	← yoh left	00:31
	→ omegamike joined	00:32
	→ macabre joined	00:32
	← bitkiller left	00:34
	← reverse_light left	00:34
	← theCole left	00:36
	← skyres left	00:36
	→ yoh joined	00:36
	→ bapalm joined	00:37
	→ Maoy joined	00:37
	← Nizumzen left	00:38
	← nofxx left	00:38
	← ahr3n left	00:38
	← omegamike left	00:38
	← michaeljdennis left	00:38
	→ skyres joined	00:39
	→ reverse_light joined	00:39
	← Maoy left	00:39
	← govg left	00:39
	← crayon left	00:39
	← bapalm left	00:39
	→ govg joined	00:40
	← Muhannad left	00:40
	→ axeq joined	00:40
	← axeq left	00:40
	← Pookz left	00:40
	→ faux___ joined	00:41
	→ uadk joined	00:41
	→ Muhannad joined	00:41
	← uadk left	00:41
	← skyres left	00:43
	→ OnkelTem joined	00:44
	→ drollwit joined	00:44
	→ ascarter joined	00:46
	→ cbonobo joined	00:46
	→ skyres joined	00:46
	← faux___ left	00:47
	← drollwit left	00:49
	← clarkpan left	00:49
	← cbonobo left	00:50
	→ clarkpan joined	00:51
	→ faux___ joined	00:51
	← skyres left	00:52
	→ txc joined	00:53
	← txc left	00:53
	← Sasazuka left	00:53
	→ skyres joined	00:55
	← faux___ left	00:55
	← fluter left	00:56
	→ fluter joined	00:56
	→ blueyed joined	00:57
	← ascarter left	00:58
	→ cerkauskas joined	00:58
	← skyres left	00:59
	→ skyres joined	01:01
	→ faux___ joined	01:01
	→ refried_ joined	01:01
	→ usoeo joined	01:01
	← usoeo left	01:02
	→ ahr3n joined	01:04
	→ smw_ joined	01:05
	← skyres left	01:06
	← snthsnth left	01:06
	← MattMaker left	01:06
	← faux___ left	01:07
	→ MattMaker joined	01:08
	← hazelux left	01:08
	→ skyres joined	01:09
	← dreiss left	01:10
	→ chuchunaku joined	01:11
	→ CKyle joined	01:11
	corey84__ → Corey84	01:11
	→ hazelux joined	01:11
	→ SocialBlunder joined	01:12
	← skyres left	01:13
	→ hyperair joined	01:14
	→ skyres joined	01:15
	← SocialBlunder left	01:17
	← govg left	01:18
	← aretecode left	01:18
	→ mizu_no_oto joined	01:18
	→ rgrmex joined	01:19
	← skyres left	01:19
	← phantombeta left	01:20
	← kadoban left	01:20
	→ keroro520 joined	01:20
	← Muhannad left	01:20
	← clarkpan left	01:21
	→ skyres joined	01:21
	→ cbonobo joined	01:21
	← chuchunaku left	01:22
	← rgrmex left	01:23
	→ snthsnth joined	01:23
	← harish left	01:23
	→ Dougie187 joined	01:24
	← skyres left	01:25
	→ Neozonz joined	01:26
	← Neozonz left	01:26
	→ Neozonz joined	01:26
	→ skyres joined	01:27
	→ faux___ joined	01:27
	→ Maple__ joined	01:29
	← jeffmjack left	01:29
	→ gopar joined	01:30
	→ ap3r7ur3 joined	01:31
	→ thiago joined	01:31
	← faux___ left	01:31
	→ k03ll joined	01:32
	← Maple__ left	01:32
	← skyres left	01:32
	← knownasilya left	01:35
	→ xudongz joined	01:35
	→ skyres joined	01:35
	→ drollwit joined	01:38
	← SimonNa left	01:40
	← mizu_no_oto left	01:40
	← skyres left	01:40
	→ skyres joined	01:41
	← s00pcan left	01:43
	← drollwit left	01:43
	→ s00pcan joined	01:45
	→ xk_id joined	01:45
	→ theskillwithin joined	01:46
	← skyres left	01:46
	→ faux___ joined	01:47
	→ skyres joined	01:47
	← MattMaker left	01:48
	← beckyconning_ left	01:49
	← Lyqyd left	01:49
	→ hexagoxel joined	01:49
	→ NeverDie joined	01:50
	← yoh left	01:51
	← pks left	01:51
	← geoid left	01:52
	← skyres left	01:52
	→ pks joined	01:53
	→ dr3w joined	01:53
	→ yoh joined	01:54
	← mellernoia-work left	01:54
	→ ilmgb joined	01:54
	→ tristanseifert joined	01:54
	← dr3w left	01:55
	Eugene throws a tennis ball	01:55
	→ dr3w joined	01:55
	→ skyres joined	01:55
	← N4tr0n_ left	01:57
	→ Vampire0 joined	01:57
	← yoh left	01:58
	← Corey84 left	01:58
	← daivyk left	01:58
	← ilmgb left	01:59
	← tristanseifert left	01:59
	← looper left	01:59
	→ Bearcat_ joined	01:59
	→ MattMaker joined	01:59
	← Noldorin left	01:59
	← Vampire0_ left	01:59
	→ yoh joined	01:59
	→ diegoviola joined	02:00
	← skyres left	02:00
	→ tristanseifert joined	02:00
	→ looper joined	02:01
	← cbonobo left	02:02
	→ devoldmx joined	02:02
	→ cbonobo joined	02:03
	→ dadamssg joined	02:03
	← MattMaker left	02:03
	→ skyres joined	02:03
	→ Goplat joined	02:03
	→ jantje joined	02:04
	← pheaver left	02:04
	← CKyle left	02:06
	← Neozonz left	02:06
	→ CKyle joined	02:07
	← devoldmx left	02:07
	← dadamssg left	02:08
	← skyres left	02:09
	→ phantombeta joined	02:10
	← ahr3n left	02:10
	← Phoenixz left	02:11
milki	Eugene: i guess we dont have a dog around to fetch the ball	02:11
	→ Corosus__ joined	02:11
	→ skyres joined	02:11
	← dogmatic69 left	02:11
	→ Agen_Terminator1 joined	02:12
	→ SocialBlunder joined	02:13
	Eugene rolls over and paws the air	02:14
	← Corosauce left	02:14
	← Agen_Terminator left	02:14
	→ amikiri joined	02:15
	→ otter768 joined	02:15
	← skyres left	02:15
	→ Phoenixz joined	02:15
	← dr3w left	02:16
	← SocialBlunder left	02:17
	→ reverse_1ight joined	02:18
	← cerkauskas left	02:19
	→ skyres joined	02:19
	← otter768 left	02:19
	→ omegamike joined	02:20
	← reverse_light left	02:21
	← amikiri left	02:22
	← skyres left	02:23
	← jpnurmi left	02:23
	→ devoldmx joined	02:24
	← omegamike left	02:25
	← haaja left	02:25
	→ jpnurmi joined	02:26
	→ dreiss joined	02:26
	→ haaja joined	02:26
	→ skyres joined	02:26
	← yqt left	02:26
	← jantje left	02:29
	← devoldmx left	02:29
	← synchronous left	02:29
	→ arescorpio joined	02:29
	→ devoldmx joined	02:29
	offby1 tosses a bone	02:29
	← skyres left	02:30
	← faux___ left	02:31
	→ drollwit joined	02:33
	→ Lyqyd joined	02:33
	→ skyres joined	02:33
	→ Nizumzen joined	02:33
	← s00pcan left	02:33
	← Nizumzen left	02:34
	→ Dragooon joined	02:34
	→ ahr3n joined	02:34
	→ jantje joined	02:35
	→ s00pcan joined	02:35
	→ faux___ joined	02:36
	→ Nizumzen joined	02:37
	← drollwit left	02:37
	← skyres left	02:38
	→ Error404NotFound joined	02:38
	→ tarkus joined	02:38
	← ap3r7ur3 left	02:39
	← sgen left	02:40
	→ skyres joined	02:41
	→ N4tr0n_ joined	02:41
	→ synchronous joined	02:42
	→ harish joined	02:42
	← faux___ left	02:42
	← hazelux left	02:43
	→ franl joined	02:44
	← Dragooon left	02:45
	← skyres left	02:45
	→ MattMaker joined	02:45
	→ johnkevinmbasco joined	02:46
	→ tdub joined	02:46
	→ skyres joined	02:48
	→ hazelux joined	02:49
	→ ascarter joined	02:50
	← znabavi left	02:50
	→ slixpk joined	02:50
	→ DolpheenDream joined	02:52
	→ gfixler joined	02:52
	← skyres left	02:53
	← slixpk left	02:53
	← durham left	02:53
	→ faux___ joined	02:53
	← franl left	02:54
	→ skyres joined	02:55
	→ d2dchat joined	02:56
	← nfk left	02:56
	← tdub left	02:56
	→ geoid joined	02:57
	← Gamecubic left	02:57
	→ slixpk joined	02:58
	→ znabavi joined	02:58
	← drbean left	02:59
	→ drbean joined	03:00
	→ elsevero joined	03:00
	→ kadoban joined	03:00
	← skyres left	03:00
	→ franl joined	03:01
	→ CorySimmons joined	03:02
	→ skyres joined	03:03
	← happy-dude left	03:03
	← Error404NotFound left	03:04
	← ascarter left	03:05
	← slixpk left	03:06
	← kpease left	03:06
	← skyres left	03:07
	← hazelux left	03:07
	→ geoid_ joined	03:08
	← dreiss left	03:08
	← gabriela_ left	03:09
	→ slixpk joined	03:09
	→ clarkpan joined	03:10
	← darkbasic_ left	03:10
	→ skyres joined	03:10
	→ darkbasic joined	03:10
	→ astockton joined	03:10
	→ stantonk joined	03:11
	← whomp left	03:11
	← geoid left	03:11
	← elsevero left	03:11
	← CorySimmons left	03:12
	→ dopie joined	03:12
	→ SocialBlunder joined	03:14
	← skyres left	03:14
	→ fedexo joined	03:15
	→ mehola joined	03:16
	→ skyres joined	03:17
	← SocialBlunder left	03:18
	← faux___ left	03:19
	← devoldmx left	03:19
	→ d0lph1n98 joined	03:19
	← CKyle left	03:20
	→ variable joined	03:20
	← toothrot left	03:21
	← skyres left	03:21
	← d0lph1n98 left	03:21
	← Dougie187 left	03:22
	→ declanqian joined	03:22
	← jadew left	03:23
	→ skyres joined	03:24
	→ faux___ joined	03:24
	→ devoldmx joined	03:25
	← armyriad left	03:25
	→ armyriad joined	03:25
	← franl left	03:26
	← fedexo left	03:26
	→ drollwit joined	03:27
	← johtso left	03:27
	→ diego1 joined	03:27
	→ durham joined	03:29
	← skyres left	03:29
	← Phoenixz left	03:29
	→ johtso joined	03:29
	← devoldmx left	03:29
	← diegoviola left	03:30
	→ devoldmx joined	03:30
	→ skyres joined	03:31
	← drollwit left	03:31
	← durham left	03:32
	→ durham joined	03:33
	← devoldmx left	03:34
	← sdothum left	03:35
	← foolstack left	03:35
	← skyres left	03:35
	→ Sasazuka joined	03:36
	→ skyres joined	03:38
	← faux___ left	03:39
	← diminoten left	03:39
	→ rchavik joined	03:39
	→ diminoten joined	03:39
	← astockton left	03:40
	← jleclanche left	03:40
	→ astockton joined	03:40
	→ nofxx joined	03:42
	← nofxx left	03:42
	→ nofxx joined	03:42
	← Sasazuka left	03:42
	→ iamnotarobot joined	03:42
	← skyres left	03:42
	→ ilmgb joined	03:43
	← diminoten left	03:43
	→ diminoten joined	03:43
	← diminoten left	03:44
	← reverse_1ight left	03:44
	→ diminoten joined	03:44
	→ reverse_light joined	03:45
	→ skyres joined	03:46
	← diminoten left	03:46
	→ faux___ joined	03:46
	→ diminoten joined	03:46
	← ilmgb left	03:47
	← macabre left	03:48
	← diminoten left	03:50
	← skyres left	03:50
	← clarkpan left	03:51
	→ fedexo joined	03:51
	→ neunon joined	03:52
	→ diminoten joined	03:53
	→ skyres joined	03:53
	→ clarkpan joined	03:53
	← iamnotarobot left	03:54
	← clarkpan left	03:55
	← diminoten left	03:56
	→ clarkpan joined	03:57
	→ diminoten joined	03:57
	← skyres left	03:57
	← madewokherd left	03:58
	← clarkpan left	03:58
	← stantonk left	03:58
	← michael_mbp left	03:58
	← fedexo left	03:59
	→ michael_mbp joined	03:59
	→ clarkpan joined	04:00
	→ pheaver joined	04:01
	→ skyres joined	04:01
	← d2dchat left	04:03
	→ dadamssg joined	04:04
	← tristanseifert left	04:04
	→ tristanseifert joined	04:04
	← skyres left	04:05
	→ fedexo joined	04:06
	← faux___ left	04:07
	→ mutbuerger joined	04:08
	→ omegamike joined	04:08
	→ skyres joined	04:08
	← dadamssg left	04:08
	← znabavi left	04:09
	→ faux___ joined	04:09
	← skyres left	04:13
	→ Raging_Hog joined	04:13
	← diego1 left	04:13
	→ diego1 joined	04:13
	diego1 → diegoviola	04:13
	← ronskisika left	04:13
	← omegamike left	04:14
	→ SocialBlunder joined	04:14
	→ acetakwas joined	04:15
	← escii left	04:15
	→ skyres joined	04:16
	→ otter768 joined	04:16
	← israel_pattison left	04:16
	← dustinm left	04:16
	← dopie left	04:17
	→ dustinm joined	04:18
	← smw_ left	04:18
	← cbonobo left	04:19
	← SocialBlunder left	04:19
	← declanqian left	04:19
	← faux___ left	04:19
	← skyres left	04:20
	→ escii joined	04:20
	→ drollwit joined	04:21
	← otter768 left	04:21
	← acetakwas left	04:21
	→ declanqian joined	04:21
	→ skyres joined	04:23
	← bb010g left	04:23
	← frem left	04:23
	← snthsnth left	04:24
	← terminal_echo left	04:24
	← drollwit left	04:25
	→ leeN joined	04:26
	← skyres left	04:27
	→ skyres joined	04:29
	→ snthsnth joined	04:30
	→ faux___ joined	04:31
	← mehola left	04:31
	← astockton left	04:32
	→ mehola joined	04:33
	→ pokergod joined	04:33
	← skyres left	04:34
	← mehola left	04:34
	← irqq left	04:35
	→ skyres joined	04:35
	→ mehola joined	04:37
	→ stangeland joined	04:37
pokergod	i have a bunch of edits, some related, most unrelated. Can I do; git diff, see what the change addressed and then ... git add file, git commit it, and do it until no commits are left?	04:38
thiago	yes	04:38
	also, git add -p	04:39
stangeland	hi, from the git-pull man-page: "git pull runs git fetch with the given parameters and calls git merge to merge the retrieved branch heads into the current branch" Is there i way i can just fetch the current branch and merge in updates on that same branch? ie i dont want to merge together any branches, only update existing branches	04:39
thiago	stangeland: you've described git pull	04:40
	← fedexo left	04:40
	← skyres left	04:40
stangeland	thiago, but git pull merges all fetched branches into current branch. i dont want that	04:40
	→ watabou joined	04:41
	→ skyres joined	04:42
pokergod	thiago, was that git add -p for me?	04:42
	← faux___ left	04:42
stangeland	branch local/a should only get updated with changes from branch remote/a, while branch local/b should only get updated with changes from branch remote/b, same for c etc.	04:42
	thiago, ^	04:42
thiago	pokergod: yes	04:42
	stangeland: if you want to merge only one, give it only one	04:42
	→ ayaz joined	04:42
thiago	stangeland: why would you do "git pull repo branch1 branch2 branch3" if you only want to merge branch1?	04:42
	→ fedexo joined	04:43
	→ faux___ joined	04:43
stangeland	thiago, maybe what i want is (while on branch a) git fetch && git merge a	04:44
thiago	stangeland: right. That's "git pull"	04:44
stangeland	thiago, isnt git pull == (while on branch a) git fetch && git merge a,b,c ?	04:44
thiago	stangeland: nope	04:45
	stangeland: it's what you described first	04:45
	stangeland: git fetch && git merge @{u}	04:45
stangeland	ahh ok... then i just find the desc in the man page very confusing	04:45
thiago	yeah, I get it	04:45
	I've never seen anymore pull more than one branch, but it's possible	04:46
	← ryouma left	04:46
	← skyres left	04:46
	← fedexo left	04:47
	→ elxi joined	04:48
	← elxi left	04:48
	→ Qantourisc joined	04:49
	← Peuc left	04:49
	→ skyres joined	04:49
	→ Phoenixz joined	04:51
	→ tomog999_ joined	04:51
	→ frem joined	04:52
	→ jceb joined	04:52
	← millerti left	04:53
	← dougsland left	04:53
	← xudongz left	04:53
	→ Peuc joined	04:54
	← tomog999 left	04:54
	← skyres left	04:54
	→ sparetire_ joined	04:55
	→ skyres joined	04:56
	← faux___ left	04:57
	→ znabavi joined	04:58
	→ faux___ joined	04:58
	→ fedexo joined	04:58
	← tristanp_ left	04:58
	← skyres left	05:01
	→ znabavi_ joined	05:03
	← faux___ left	05:03
	→ tristanp joined	05:03
	→ skyres joined	05:03
	← {0xc6} left	05:04
	→ MechtiIde joined	05:04
	← znabavi left	05:04
	→ {0xc6} joined	05:04
pokergod	how do i include 2 more files in the previous commit?	05:05
	← Wetmelon left	05:05
	→ a_reknowned_gues joined	05:05
	← oojacoboo left	05:05
	← a_reknowned_gues left	05:06
	→ Wetmelon joined	05:07
	← tristanp left	05:08
	← skyres left	05:08
	→ stantonk joined	05:08
	→ faux___ joined	05:09
	← faux___ left	05:09
	→ terminal_echo joined	05:10
thiago	pokergod: git commit --amend	05:11
	→ skyres joined	05:11
pokergod	do i do; git add <files> and then git commit --amend?	05:11
	← refried_ left	05:12
thiago	yep	05:12
	← bet0x left	05:13
	← arescorpio left	05:13
	← Wetmelon left	05:13
	→ drollwit joined	05:15
	← jceb left	05:15
	→ SocialBlunder joined	05:15
	← stantonk left	05:16
	→ israel_pattison joined	05:16
	← skyres left	05:17
	← bronson_ left	05:19
	← CEnnis91 left	05:19
pokergod	thanks thiago	05:19
	→ skyres joined	05:19
	← SocialBlunder left	05:20
thiago	you're welcome	05:20
	← drollwit left	05:20
	→ faux___ joined	05:21
	variable → constant	05:22
	← skyres left	05:23
	→ skyres joined	05:24
	→ dualbus joined	05:25
	→ ckruczek joined	05:26
	← faux___ left	05:26
	← declanqian left	05:28
	→ MattMake_ joined	05:28
	→ declanqian joined	05:29
	← skyres left	05:29
	← MattMaker left	05:30
	→ skyres joined	05:30
	→ cromero joined	05:31
	→ devoldmx joined	05:31
	→ versatile_ joined	05:31
	→ ilmgb joined	05:32
	← watabou left	05:32
	← DolpheenDream left	05:32
	← versatile left	05:34
	← skyres left	05:35
	→ devoldmx_ joined	05:35
	← devoldmx left	05:35
	← versatile_ left	05:36
	→ clarkpan_ joined	05:36
	← ilmgb left	05:36
	→ skyres joined	05:38
	← shinnya left	05:38
	← clarkpan left	05:40
	← devoldmx_ left	05:40
	→ Wetmelon joined	05:40
	← blackwind_123 left	05:40
	→ devoldmx joined	05:41
	→ versatile joined	05:42
	← skyres left	05:43
	→ nour joined	05:45
	→ skyres joined	05:46
	→ ferhaty joined	05:48
	← Qantourisc left	05:49
	← N4tr0n_ left	05:51
	← skyres left	05:51
	← MrC left	05:53
	→ skyres joined	05:54
	← Xiti left	05:56
	→ dreiss joined	05:56
	→ n1x joined	05:56
	→ Xiti joined	05:57
	← diogenese left	05:57
	→ diogenese joined	05:57
	← Phoenixz left	05:58
	→ Saturn812 joined	05:58
	→ skorgon joined	05:58
	← durham left	05:59
	← cromero left	05:59
	← pm90_ left	05:59
	← skyres left	05:59
	→ refried_ joined	06:00
	← MechtiIde left	06:01
	→ pm90_ joined	06:01
	→ skyres joined	06:01
	← znabavi_ left	06:03
	→ acetakwas joined	06:03
	→ MrC joined	06:03
	← refried_ left	06:03
	→ barduck joined	06:03
	→ cdown_ joined	06:04
	→ Silmarilion joined	06:04
	cdown_ → cdown	06:04
	→ dadamssg joined	06:04
	← fedexo left	06:05
	← skyres left	06:06
	← pm90_ left	06:06
	→ skyres joined	06:07
	← genbattle left	06:09
	→ jceb joined	06:09
	→ drollwit joined	06:09
	← dadamssg left	06:09
	→ lb1a joined	06:09
	→ petersr joined	06:09
	→ ShooterM_ joined	06:10
	← ShooterMG left	06:11
	← skyres left	06:11
	→ znabavi joined	06:12
	← dreiss left	06:12
	→ skyres joined	06:13
	→ freimatz joined	06:13
	← drollwit left	06:14
	← Raging_Hog left	06:15
	← skorgon left	06:15
	→ SocialBlunder joined	06:16
	→ otter768 joined	06:17
	← skyres left	06:17
	← geoid_ left	06:17
	← Lyqyd left	06:18
	→ acetakwas_ joined	06:18
	→ blackwind_123 joined	06:18
	→ faux___ joined	06:18
	→ skyres joined	06:18
	→ bronson joined	06:19
	← acetakwas left	06:20
	→ TomyLobo joined	06:20
	← SocialBlunder left	06:21
	← otter768 left	06:21
	← acetakwas_ left	06:22
	← skyres left	06:23
	← diegoviola left	06:23
	→ acolson joined	06:23
	← faux___ left	06:23
	← bronson left	06:24
	→ skyres joined	06:24
	← znabavi left	06:25
	→ Kelzier joined	06:26
	→ Brain joined	06:26
	← stangeland left	06:27
	← gopar left	06:27
	→ nerd joined	06:27
	← terminal_echo left	06:28
	→ znabavi joined	06:28
	← skyres left	06:28
	→ PCatinean joined	06:28
	→ skyres joined	06:29
	→ STFUn00b joined	06:30
	→ ilmgb joined	06:31
	→ terminal_echo joined	06:32
	← lindenle left	06:32
	→ faux___ joined	06:33
	← n1x left	06:34
	← michael_mbp left	06:34
	→ stangeland joined	06:35
	← skyres left	06:35
	← EvanDotPro left	06:36
	→ EvanDotPro joined	06:37
	← faux___ left	06:37
	→ skyres joined	06:38
	→ michael_mbp joined	06:39
	→ elsevero joined	06:40
	→ faux___ joined	06:40
	← nour left	06:41
	← EvanDotPro left	06:41
	← TomyLobo left	06:42
	→ EvanDotPro joined	06:42
	← skyres left	06:42
	← MattMake_ left	06:42
	→ MattMaker joined	06:43
	→ skyres joined	06:44
	→ malacostraca joined	06:44
	← constant left	06:44
	→ variable joined	06:45
j416	is rerere forget broken or am I using it wrong? I wrongly resolved a merge conflict, undid it (reset HEAD^), then git rerere forget <path/to/file>; but the next time I try to merge the same thing, rerere auto-fixed my conflict	06:46
	how can I get it to forget about that conflict resolution?	06:46
	I resorted to manually digging up the right conflict resolution out of .git/rr-cache and deleted that	06:47
	but it's a cumbersome way	06:47
	→ devoldmx3 joined	06:48
	← skyres left	06:49
	← variable left	06:50
	→ skyres joined	06:50
	→ variable joined	06:50
	→ n1x joined	06:51
	← znabavi left	06:51
	← tristanseifert left	06:53
	← skyres left	06:54
	→ skyres joined	06:56
	← johnkevinmbasco left	06:56
	→ mase-tech joined	06:56
	← stangeland left	06:56
	→ bvi joined	06:58
	→ tjm_jimmy joined	06:59
	← Vampire0 left	06:59
	← skyres left	07:00
	→ nixie joined	07:00
	→ skyres joined	07:02
	→ TomyWork joined	07:02
	← tanath left	07:02
	→ drollwit joined	07:03
	→ jagob joined	07:03
	← frem left	07:03
	← faux___ left	07:04
	→ Qantourisc joined	07:05
	← bvi left	07:06
	← skyres left	07:07
	← akiva left	07:07
	→ frem joined	07:07
	← joo-_ left	07:08
	← drollwit left	07:08
	← andschwa left	07:08
	→ skyres joined	07:08
	→ vrishab joined	07:08
	→ tumulte joined	07:09
	→ andschwa joined	07:10
	← mutbuerger left	07:12
	← skyres left	07:13
	← vrishab left	07:13
	→ skyres joined	07:14
	→ refried_ joined	07:14
	← bgerber left	07:14
	→ Sasazuka joined	07:15
	→ Sceorem joined	07:15
	→ bgerber joined	07:15
	→ faux___ joined	07:16
	← thiago left	07:17
	← skyres left	07:18
	← n1x left	07:20
	→ skyres joined	07:20
	← faux___ left	07:20
	→ faux___ joined	07:23
	← Sasazuka left	07:25
	← skyres left	07:25
	→ bonswouar joined	07:25
	← bonswouar left	07:25
	→ skyres joined	07:27
	→ Balliad joined	07:29
	← faux___ left	07:29
	← diogenese left	07:31
	← harish left	07:31
	← skyres left	07:31
	→ bonswouar joined	07:32
	→ ki0 joined	07:32
	→ diogenese joined	07:32
	→ faux___ joined	07:33
	→ lindenle joined	07:33
	← refried_ left	07:33
	→ skyres joined	07:33
	← maxorator left	07:35
	← terminal_echo left	07:35
ecraven	is there a way to update my local copies of all branches from remote without checking out and pulling each one?	07:35
	← tyreld left	07:36
osse	not built into git itself	07:36
	→ maxorator joined	07:37
osse	if it's a fast-forward you can hack around it	07:37
	→ mutbuerger joined	07:37
ecraven	yes, they are all fast-forwards	07:37
osse	https://github.com/aanand/git-up	07:37
ecraven	this is just pre-deployment, to make sure I get the correct versions	07:37
	← lindenle left	07:37
	→ nnyk_ joined	07:37
osse	I have my own small script	07:37
	← skyres left	07:37
	← variable left	07:38
osse	https://github.com/Osse/git-scripts/blob/master/git-fflocals	07:38
	→ vrishab joined	07:39
	→ zoso joined	07:39
	→ skyres joined	07:39
ecraven	thanks!	07:40
osse	ecraven: and it helps to no have local copies of branches if you don't need them	07:41
	← mutbuerger left	07:42
	← Nizumzen left	07:42
	← malacostraca left	07:42
	← vrishab left	07:42
	← NeverDie left	07:43
	→ mutbuerger joined	07:44
	← skyres left	07:44
	→ exo1 joined	07:44
	→ stoogenmeyer__ joined	07:45
	→ skyres joined	07:46
	→ omegamike joined	07:46
	→ Polyatomic joined	07:46
	← clarkpan_ left	07:47
	→ sword`` joined	07:47
	← Polyatomic left	07:47
	← mutbuerger left	07:48
	← michael_mbp left	07:48
	← sword` left	07:48
	← wagle left	07:48
	→ cxz joined	07:49
	→ tristanseifert joined	07:49
	→ vrishab joined	07:49
	→ encod3 joined	07:50
	→ salparadise joined	07:50
	→ mutbuerger joined	07:50
	← skyres left	07:50
	→ michael_mbp joined	07:51
	→ acetakwas joined	07:51
	→ Guest30 joined	07:51
	→ wagle joined	07:51
	→ skyres joined	07:52
	← Guest30 left	07:52
	← omegamike left	07:52
	→ jadew joined	07:53
	← tristanseifert left	07:54
	→ vurma joined	07:56
	← mingwandroid_ left	07:56
	← skyres left	07:56
	→ skyres joined	07:57
	→ drollwit joined	07:57
	→ turtleding joined	07:59
	→ mikecmpbll joined	08:01
	← drollwit left	08:02
	→ pm90_ joined	08:02
	← mutbuerger left	08:02
	← skyres left	08:02
	→ skyres joined	08:03
	← pheaver left	08:03
	→ wicope joined	08:03
	← devoldmx left	08:05
	→ dadamssg joined	08:05
	← ghoti left	08:06
	← mase-tech left	08:07
	→ mutbuerger joined	08:07
	← pm90_ left	08:07
	← skyres left	08:07
	← faux___ left	08:08
	→ skyres joined	08:08
	→ psoo joined	08:09
	→ marcogmonteiro joined	08:09
	→ acetakwas_ joined	08:09
	← acetakwas left	08:09
	→ Zariel joined	08:10
	← dadamssg left	08:10
	← vrishab left	08:11
	← declanqian left	08:12
	← skyres left	08:13
	→ skyres joined	08:14
	→ faux___ joined	08:15
	← nerd left	08:15
	← mutbuerger left	08:15
	→ pantsman- joined	08:16
	← snthsnth left	08:17
	→ SocialBlunder joined	08:17
	→ otter768 joined	08:18
	← zoso left	08:18
	→ Dzejmskrokan joined	08:18
	← skyres left	08:18
	← faux___ left	08:19
	→ cdown_ joined	08:19
	← psoo left	08:19
	← cdown left	08:19
	cdown_ → cdown	08:19
	→ psoo joined	08:19
	→ skyres joined	08:19
	→ declanqian joined	08:20
	← nnyk_ left	08:20
	→ VictorCL joined	08:21
	→ yazdmich joined	08:22
	→ kurkale6ka joined	08:22
	← SocialBlunder left	08:22
	← otter768 left	08:23
	→ h3xc0d3r joined	08:23
	← tomdavidson left	08:23
	→ tomdavidson joined	08:23
	← skyres left	08:24
	→ Davey joined	08:24
	→ baloney joined	08:24
	← acetakwas_ left	08:24
	→ faux___ joined	08:24
	→ Gama11 joined	08:24
	→ skyres joined	08:25
	→ irqq joined	08:25
	→ SimonNa joined	08:26
	→ jost joined	08:27
	← h3xc0d3r left	08:28
	← j` left	08:28
	→ h3xc0d3r joined	08:28
	← Bearcat_ left	08:28
	→ apfeluser joined	08:28
	← Goplat left	08:28
	→ Bearcat_ joined	08:29
	← skyres left	08:29
	→ mutbuerger joined	08:30
	→ skyres joined	08:30
	→ inamoriti joined	08:31
	← h3xc0d3r left	08:32
	→ h3xc0d3r joined	08:33
	→ acetakwas joined	08:34
	→ zoso joined	08:34
	← zoso left	08:35
	→ snthsnth joined	08:35
	← skyres left	08:35
	→ zoso joined	08:35
	← h3xc0d3r left	08:37
	→ creppe joined	08:37
	→ skullcrasher joined	08:37
	→ harish joined	08:38
	→ skyres joined	08:38
	← Bearcat_ left	08:39
	→ Alienpruts joined	08:40
	← skyres left	08:43
	← snthsnth left	08:43
	→ Oebele joined	08:44
	→ skyres joined	08:44
	→ CustosLimen joined	08:45
	→ potteratt joined	08:46
	← cdown left	08:47
	→ wepwawethoth joined	08:47
	← Xack left	08:48
	→ howlymowly joined	08:48
	→ Matrixiumn joined	08:48
	→ zheng joined	08:49
	→ cdown joined	08:49
	→ sanketdg joined	08:49
	← skyres left	08:49
	→ tristanseifert joined	08:50
	← cdown left	08:50
	→ cdown joined	08:51
	→ Guest33674 joined	08:51
	→ drollwit joined	08:52
	→ kraplax joined	08:52
	← {0xc6} left	08:52
	← wepwawethoth left	08:52
	← acetakwas left	08:52
	→ skyres joined	08:52
	→ joo-_ joined	08:52
	→ Gizburdt joined	08:54
	→ {0xc6} joined	08:54
	→ dharrigan joined	08:55
	← tristanseifert left	08:55
	← Gizburdt left	08:55
	← drollwit left	08:56
	← skyres left	08:57
	→ arup_r joined	08:57
	→ Raging_Hog joined	08:58
	→ aard joined	08:59
	← UmbraMalison left	09:00
	→ skyres joined	09:00
	← zheng left	09:00
	← ferhaty left	09:01
	← jagob left	09:02
	→ p4trix joined	09:03
	→ UmbraMalison joined	09:04
	← skyres left	09:04
	→ skyres joined	09:06
	→ devoldmx joined	09:06
	→ Gizburdt joined	09:06
	→ vrishab joined	09:06
	← vrishab left	09:07
	← {0xc6} left	09:08
	→ jagob joined	09:08
	→ nour joined	09:09
	← declanqian left	09:09
	→ ghoti joined	09:10
	← devoldmx left	09:10
	← skyres left	09:11
	→ soc42 joined	09:12
	→ skyres joined	09:14
	← ghoti left	09:15
	→ cerkauskas joined	09:16
	← martinium left	09:16
	← johtso left	09:17
	→ johtso joined	09:17
	→ ghoti joined	09:17
	→ SocialBlunder joined	09:18
	→ eddd_ joined	09:18
	← eddd_ left	09:19
	← cdown left	09:19
	→ eddd_ joined	09:19
	← skyres left	09:20
	→ Darcidride joined	09:20
	← mehola left	09:21
	→ cdown joined	09:21
	→ Hounddog joined	09:22
	→ skyres joined	09:22
	→ mehola joined	09:22
	← ghoti left	09:22
	→ elementalest_ joined	09:22
	← SocialBlunder left	09:22
	← elementalest left	09:23
	→ ghoti joined	09:25
	← arup_r left	09:26
	← mehola left	09:26
	← skyres left	09:26
	→ arup_r joined	09:27
	→ skyres joined	09:28
	← Dzejmskrokan left	09:28
	→ Dzejmskr_ joined	09:28
	← pilif left	09:28
	← kraplax left	09:29
	→ kraplax joined	09:29
	← CustosLimen left	09:29
	→ mehola joined	09:30
	→ wistler42 joined	09:30
	← arup_r left	09:30
	← skyres left	09:33
	← Gizburdt left	09:34
	← faux___ left	09:35
	→ pilif joined	09:35
	← rasto left	09:35
	→ oll3 joined	09:35
	→ Gizburdt joined	09:36
	→ skyres joined	09:36
	→ nnyk_ joined	09:37
	← Gizburdt left	09:39
	→ Gizburdt joined	09:39
	← skyres left	09:40
	← reveredge left	09:40
	← nydew07 left	09:41
	→ bernardio joined	09:41
	→ skyres joined	09:42
	→ linuxmint2 joined	09:42
	→ turtledi1 joined	09:42
	→ SimonNaa joined	09:43
	→ faux___ joined	09:43
	← turtleding left	09:44
	→ CustosLimen joined	09:46
	→ drollwit joined	09:46
	← SimonNa left	09:47
	← skyres left	09:47
	← mquin left	09:47
	→ ferhaty joined	09:48
	→ skyres joined	09:50
	← drollwit left	09:51
	← harish left	09:51
	→ Amandil joined	09:52
	← bernardio left	09:53
	→ eVRiAL joined	09:53
	→ bernardio joined	09:54
	← skyres left	09:54
	← ghoti left	09:54
	→ skyres joined	09:55
	← Guest33674 left	09:56
	matthiaskrgr_ → matthiaskrgr	09:56
	← maxorator left	09:56
	→ maxorator joined	09:57
	← Gizburdt left	09:57
	→ vrishab joined	09:58
	← Amandil left	09:58
	← vrishab left	09:58
	→ circ-user-6TzUd joined	09:59
	→ Gizburdt joined	09:59
	→ PeterBooker joined	10:00
	← skyres left	10:00
	→ ki0_ joined	10:00
	← cerkauskas left	10:00
	→ skyres joined	10:01
	← vstoniest left	10:01
	→ nettoweb joined	10:01
	← bernardio left	10:02
	← aard left	10:02
	← ki0_ left	10:02
	→ ki0_ joined	10:02
	→ vstoniest joined	10:02
	→ arup_r joined	10:02
	← p4trix left	10:02
	→ pm90_ joined	10:03
	← ki0 left	10:04
	→ sdothum joined	10:04
	← versatile left	10:04
	→ ProT-0-TypE joined	10:05
	→ bernardio joined	10:05
	→ astrofog joined	10:06
	→ d3fault joined	10:06
	← skyres left	10:06
	← faux___ left	10:06
meteorhead	hello	10:06
ckruczek	hi	10:06
	→ dadamssg joined	10:06
	→ skyres joined	10:06
	← Dzejmskr_ left	10:07
meteorhead	I've made a push -u to my remote but decided to revert to a particular commit on my local, is there a way to bring back the remote to that commit too ?	10:07
	→ Dzejmskrokan joined	10:07
meteorhead	because now I get Updates were rejected because the tip of your current branch is behind	10:07
	← howlymowly left	10:07
ckruczek	yes, but this will result in a history rewrite at remote, which you might not want	10:07
	→ gisli joined	10:08
	← pm90_ left	10:08
meteorhead	ckruczek: ouch, so what do you suggest ?	10:08
	← d3fault left	10:08
	→ schlumpi joined	10:09
ckruczek	Ah I am sorry, I missread your question.	10:09
	→ d3fault_ joined	10:09
ckruczek	so you want to revert a commit or want to reset to a particular point?	10:09
d3fault_	do commit gpg signatures get factored into the resulting git commit-id (sha1), or are they stored "off to the side" in the repo? the first first way makes more sense to me, but I couldn't find any info on it	10:09
	← wrouesnel1 left	10:09
	→ howlymowly joined	10:09
meteorhead	ckruczek: haha no problem, thanks for your patience; actually I've committed on local, pushed to remote, but then I reverted on local to a particular commit ( n - 2)	10:10
	I'd like to reflect this on remote too ( bring it back two commits)	10:10
ckruczek	so you really did a git revert?	10:10
meteorhead	but git push fails because remote's tip is ahead of my local one	10:10
	→ clobrano joined	10:10
ckruczek	because you can't revert to one particular commit, you just can reset to a particular commit	10:10
	→ wwwald joined	10:10
ckruczek	we have to clearify the wording here :)	10:11
	← dadamssg left	10:11
meteorhead	ckruczek: yes actually on my local git reset hard to a commit ( nothing really important anyway on the latest commits)	10:11
	→ rruban joined	10:11
	← skyres left	10:12
osse	meteorhead: you have to push --force	10:12
meteorhead	ckruczek: ah yes, so forgive me my poor choice of words	10:12
ckruczek	Ok then you are in a situation we just can git push force to remote, but this will result in a history rewrite meteorhead	10:12
meteorhead	you're right, reset != revert	10:12
	← eVRiAL left	10:12
ckruczek	a idea to solve this problem would be to reset back to n + 2 and do a git revert of those n - 2 commits and push this.	10:12
	→ GT4066 joined	10:12
	→ eVRiAL joined	10:13
meteorhead	I'm gonna try push force hope they didn't deactivate this option lol and if it's the case do as you suggested :)	10:13
	← ki0_ left	10:14
ckruczek	keep in mind that this will cause tremendous troubles for your contributer	10:14
	← clobrano left	10:14
	→ skyres joined	10:15
	→ p4trix joined	10:15
	← eVRiAL left	10:15
meteorhead	ckruczek: would you please mind explaining this? because the pushed change now is on a remote fork> I'll still have to make a pull request for it being merged in the main repo	10:15
	← bernardio left	10:15
meteorhead	so I guess it's "safe" ?	10:16
	→ ghoti joined	10:16
osse	meteorhead: push force is something you need to be careful with if other people work on the same repo and regularly pull stuff	10:16
	meteorhead: if it's your own "side-repo" then in practice it's safe but it's not a good habit	10:16
meteorhead	osse: ahh now I understand :)	10:16
OnkelTem	This is sorta unrelated, how to compare two patch files to get pretty looking interdiff with two columns? I tried diff -y, but it shows not-changed lines two	10:16
	→ clobrano joined	10:16
	→ ki0 joined	10:16
meteorhead	osse: thank you very much for your help	10:16
	→ eVRiAL joined	10:17
meteorhead	ckruczek: thank you very much!	10:17
OnkelTem	I couldn't use git for that, as one of the patch files could not be applied so I couldn't make a branch from it	10:17
	(or commit)	10:17
ckruczek	meteorhead, Yes ofcourse, Ill explain. Reseting in git is a operation which rewrites commit history. And imagine you pushed something and reset 2 commits. The history of your local is now diverging from the remote one. so a rewrite on remote will cause that all 'puller' have merge the changes back in their system.	10:18
	← sarri left	10:18
	→ eme joined	10:18
	→ otter768 joined	10:18
	→ jds joined	10:18
	← Zariel left	10:19
	← skyres left	10:19
	← xk_id left	10:20
	→ skyres joined	10:20
	→ sarri joined	10:21
jds	Heya	10:21
ckruczek	heyjjaaaaa	10:21
osse	heeee ya	10:21
	♫ ♪ shake it like a polaroid picture ♪	10:21
ckruczek	haha	10:22
	i literaly hear the melody osse	10:22
osse	shake it, sha-shake it	10:22
	← otter768 left	10:23
	→ WizJin joined	10:23
	← eme left	10:23
meteorhead	ckruczek: I understand now, because rewriting history needs the changes to be propagated everywhere, thus its annoying and dangerous. Much appreciated sir!	10:24
	My company will pay me a git training but you guys are the real mentors lol	10:24
ckruczek	welcome !next	10:24
gitinfo	Another satisfied customer. NEXT!	10:24
osse	meteorhead: can you get the money from the company and then you can transfer it to us?	10:24
ckruczek	haha good plan osse	10:25
	← darkbasic left	10:25
	← skyres left	10:25
meteorhead	osse: wish I could haha, of course !	10:25
	→ darkbasic joined	10:25
	→ skyres joined	10:26
	← p4trix left	10:26
	← ferhaty left	10:27
	← KnightsOfNi left	10:27
	→ mase-tech joined	10:27
	→ ferhaty joined	10:27
	← Dzejmskrokan left	10:29
	→ tristanp joined	10:29
	← skyres left	10:30
	← d3fault_ left	10:31
	→ skyres joined	10:32
	→ mizu_no_oto joined	10:33
	→ bernardio joined	10:33
	→ stamina joined	10:34
	→ clockworkfrog joined	10:34
	← tristanp left	10:34
	← Oebele left	10:34
	→ Oebele joined	10:35
	→ Errorical joined	10:35
	→ Amandil joined	10:35
	→ lindenle joined	10:35
	← mizu_no_oto left	10:36
	← ki0 left	10:36
	← skyres left	10:37
	→ tristanseifert joined	10:38
	← Saturn812 left	10:39
	→ skyres joined	10:40
	→ drollwit joined	10:40
	← lindenle left	10:40
	← ayaz left	10:40
	→ ki0 joined	10:41
	← bernardio left	10:42
	→ bernardio joined	10:42
	→ mquin joined	10:43
	← tristanseifert left	10:43
	← ki0 left	10:43
	→ ki0 joined	10:43
	→ n1x joined	10:44
	← hyperair left	10:44
	← skyres left	10:44
	→ Dragooon joined	10:45
	← drollwit left	10:45
	→ skyres joined	10:46
	← MattMaker left	10:47
	← ki0 left	10:47
	← zoso left	10:50
	→ omegamike joined	10:50
	→ ki0 joined	10:51
	← skyres left	10:51
	→ Mine joined	10:51
	→ cerkauskas joined	10:53
	→ rasto joined	10:53
	← Darcidride left	10:54
	→ skyres joined	10:54
	← rasto left	10:54
	→ rasto joined	10:54
	→ youser joined	10:56
	← omegamike left	10:56
	gitinfo set mode: +v	10:57
	→ gabriela_ joined	10:58
	← skyres left	10:58
	← Alienpruts left	10:58
	→ skyres joined	11:00
	→ vrishab joined	11:00
	← vrishab left	11:01
	→ absk007 joined	11:01
	← absk007 left	11:02
	← CustosLimen left	11:03
	← keroro520 left	11:04
	← skyres left	11:04
	→ skyres joined	11:06
	→ devoldmx joined	11:06
	→ jantje_ joined	11:09
	→ declanqian joined	11:09
	→ beckyconning_ joined	11:09
	← ferhaty left	11:10
	← skyres left	11:10
circ-user-6TzUd	how do I migrate a file edit from one commit to a previous one?	11:10
	→ ferhaty joined	11:11
osse	circ-user-6TzUd: do an interactive rebase. mark the previous commit for editing and add the change.	11:11
	→ skyres joined	11:11
ckruczek	way too fast this osse!	11:11
	→ Zariel joined	11:11
circ-user-6TzUd	but change is only in the next commit	11:11
	→ Saturn812 joined	11:12
	← jantje left	11:12
	← nilg left	11:12
osse	yes	11:12
ckruczek	keep in mind, if the commit is already pushed this will result in a history rewrite!	11:13
osse	if the change is to big to repeat by hand you can use git checkout -p {sha of next commit} -- {file}	11:13
	→ achadwick joined	11:14
	← Amandil left	11:17
	← skyres left	11:17
circ-user-6TzUd	Do you mean that I first should checkout the file from commit B, copy in a separate place and then rebase-edit commit A and paste the file?	11:18
osse	nö́	11:19
	→ absk007 joined	11:19
tobiasvl	nice umlaut	11:19
	→ SocialBlunder joined	11:20
	→ skyres joined	11:20
osse	I mean that you should use git checkout while in the middle of the rebase to retrieve the correct version of the file	11:20
	← absk007 left	11:20
	← bernardio left	11:21
	→ bronson joined	11:21
	→ bernardio joined	11:22
	← WizJin left	11:24
	← SocialBlunder left	11:24
	← skyres left	11:24
	→ CustosLimen joined	11:25
	→ skyres joined	11:26
	← bronson left	11:26
	→ rnsanchez joined	11:27
	← nnyk_ left	11:27
	→ goTAN joined	11:27
	← zequence left	11:27
	← n1x left	11:27
	← ki0 left	11:27
	→ ki0 joined	11:28
	→ eme joined	11:29
	← SimonNaa left	11:30
	← skyres left	11:30
	→ dgutierrez1287 joined	11:30
	→ absk007 joined	11:31
	← absk007 left	11:31
	→ skyres joined	11:32
	→ drollwit joined	11:34
	→ Lunatrius` joined	11:34
	→ govg joined	11:35
	← pantsman- left	11:35
	→ CheckDavid joined	11:36
	→ lindenle joined	11:36
	← skyres left	11:37
	← govg left	11:37
	→ nnyk_ joined	11:37
	← Lunatrius left	11:37
	Lunatrius` → Lunatrius	11:37
	→ govg joined	11:37
	→ harish joined	11:37
	→ stoogenmeyer_ joined	11:38
	← drollwit left	11:39
	→ skyres joined	11:39
	← stoogenmeyer__ left	11:39
	← bernardio left	11:40
	← lindenle left	11:40
	← devoldmx left	11:41
	→ DolpheenDream joined	11:41
	← cagedwisdom left	11:43
	← joo-_ left	11:44
	← Dragooon left	11:44
	→ absk007 joined	11:44
	← absk007 left	11:44
	← skyres left	11:44
	← OchoZero9 left	11:45
	→ LBV_User joined	11:45
	→ mizu_no_oto joined	11:46
	← soc42 left	11:46
	→ MattMaker joined	11:48
	→ skyres joined	11:48
	→ s8321414 joined	11:49
	yazdmich → BytesAndCoffee	11:49
	→ Amandil joined	11:50
	← MattMaker left	11:52
	→ absk007 joined	11:52
	→ hyperair joined	11:53
	← skyres left	11:53
	→ gua_ould joined	11:54
	→ sixtyten joined	11:55
	← mizu_no_oto left	11:56
	→ skyres joined	11:57
	← elementalest_ left	11:57
	← fstd left	11:59
	→ joo-_ joined	11:59
	→ fstd joined	11:59
	→ tristanseifert joined	12:00
	← DolpheenDream left	12:02
	← skyres left	12:02
	→ elementalest joined	12:02
	→ skyres joined	12:03
	→ keroro520 joined	12:04
	← sword`` left	12:04
	← ckruczek left	12:04
	→ pm90_ joined	12:04
	→ djam90 joined	12:05
djam90	I have a repo in BitBucket. I want an exact copy of the repo but in another repo. What should I do?	12:05
canton7	clone from bitbucket, push elsewhere	12:06
	← apfeluser left	12:06
grawity	clone --mirror, maybe	12:06
	→ tvw joined	12:06
	→ daivyk joined	12:07
djam90	canton7, should I make an empty repo in bitbucket to push the cloned one to?	12:07
grawity	yes	12:07
	→ dadamssg joined	12:07
djam90	oh well that's easy	12:07
	← skyres left	12:07
	→ zequence joined	12:08
grawity	git clone --mirror <url1>, git push --mirror <url2>	12:08
	that should be exact-est	12:09
	← pm90_ left	12:09
	→ skyres joined	12:09
djam90	ok i am gonna go read what --mirror does	12:09
	← Amandil left	12:10
djam90	thats awesome	12:10
	→ Dorf joined	12:10
	← dadamssg left	12:12
	← skyres left	12:13
	→ Amandil joined	12:14
	→ Gizburdt_ joined	12:14
	← mehola left	12:14
	← govg left	12:14
	→ skyres joined	12:15
	← Zariel left	12:17
	← Gizburdt left	12:17
	→ d2dchat joined	12:17
	→ ljt joined	12:19
	→ otter768 joined	12:19
	← skyres left	12:20
	→ SocialBlunder joined	12:20
	→ skyres joined	12:21
	← Vgr left	12:21
	→ millerti joined	12:22
	→ Vgr joined	12:23
	→ bernardio joined	12:24
	← ixian left	12:24
	← otter768 left	12:24
	→ phantombeta_ joined	12:24
	← SocialBlunder left	12:25
	← skyres left	12:25
	← phantombeta left	12:26
	→ skyres joined	12:27
	→ drollwit joined	12:28
	← mase-tech left	12:29
	→ pm90_ joined	12:29
	← skyres left	12:31
	→ Liam` joined	12:31
	← m0viefreak left	12:32
	→ leatherface416 joined	12:32
	→ skyres joined	12:33
	→ boba joined	12:33
	→ reveredge joined	12:33
	← drollwit left	12:34
	→ zadock joined	12:34
	← bernardio left	12:35
	→ sgambino joined	12:35
	→ ag4ve joined	12:36
	→ MarkyC joined	12:36
	← skyres left	12:37
	→ lindenle joined	12:37
	→ devoldmx joined	12:37
	→ CEnnis91 joined	12:37
	→ skyres joined	12:38
	→ omegamike joined	12:39
	→ Texan joined	12:39
	→ Zariel joined	12:39
	gitinfo set mode: +v	12:39
	← nour left	12:39
boba	Hello, I use git-svn with a subversion server which requires each file to have svn:mime-type set. Now I have a file, whose mime-type can not be guessed by the file extension and I am not able to commit my changes to the subversion. Is there a way to set the svn:mime-type or configure git to set the mime-type for this specific file on commit?	12:39
	→ IrishPrime joined	12:40
	← lindenle left	12:41
	→ bernardio joined	12:42
	→ Dzejmskrokan joined	12:42
	← skyres left	12:43
	← gbit86 left	12:43
	→ Corey84 joined	12:43
	→ bapalm joined	12:44
	← bernardio left	12:44
	→ skyres joined	12:44
	→ gbit86 joined	12:44
	→ victortyau joined	12:44
	← Liam` left	12:44
circ-user-6TzUd	Do you compare different versions, for performance, for instance? Do you do that having the same test suit in both commits?	12:45
	← Corey84 left	12:45
	← joo-_ left	12:45
	← s8321414 left	12:45
	→ bernardio joined	12:46
	→ Nick-S joined	12:46
	→ Liam` joined	12:46
	→ skione joined	12:46
	→ Corey84 joined	12:47
skione	hi, this may or may not be the right place to ask this but: I am having an issue with git over ssh. I changed the hostname of the git server and now I get this error whenever I try to pull/fetch: reverse mapping checking getaddrinfo for git.brimardev.local [192.168.14.12] failed - POSSIBLE BREAK-IN ATTEMPT!	12:47
	the hostname there is the old hostname but the git server is reporting that the new hostname is in use	12:47
tobiasvl	skione: change the reverse lookup?	12:48
grawity	make sure /etc/hosts doesn't have stale information	12:48
	← skyres left	12:48
	→ mbrzuzy joined	12:50
	→ skyres joined	12:50
skione	I did check the hosts on both the client and git machines and both are correct, the hostname was in a zone that was deleted, wouldn't that delete the reverse ptr?	12:50
grawity	no	12:50
skione	we changed from brimardev.local to brimardev.com	12:50
	← zadock left	12:51
skione	if I specify the record in the host file, would it skip looking up the ptr in dns?	12:51
	← bernardio left	12:51
	← Liam` left	12:52
grawity	yes	12:52
	the ptrs are on a separate zone, on some systems they're slightly linked (e.g. Windows Server), but deleting one usually still doesn't do anything to the other	12:52
	gitinfo set mode: +v	12:53
rruban	hi , anyone know how this error can occur http://pastebin.com/KF3wjzEt	12:53
	remote: fatal: pack has 40 unresolved deltas	12:53
	← astrofog left	12:54
	→ macabre joined	12:54
	→ dstarh joined	12:54
skione	grawity: thanks, that did it, I have to get IT to delete th ptr records but they take forever	12:54
	← skyres left	12:55
	← s00pcan left	12:56
	→ skyres joined	12:56
	→ CKyle joined	12:56
	→ lokapujya joined	12:57
	→ dadamssg joined	12:57
	→ mizu_no_oto joined	12:58
	← eddd_ left	12:58
	→ s00pcan joined	12:58
	← skione left	12:59
	→ adgtl joined	12:59
	← Kgirthofer left	12:59
	→ Gamecubic joined	13:00
	← lokapujya left	13:01
	← skyres left	13:01
	← CKyle left	13:02
	← nofxx left	13:02
	← Corey84 left	13:03
	← ki0 left	13:04
	→ devoldmx27 joined	13:04
	→ skyres joined	13:04
	← Raging_Hog left	13:05
	→ ki0 joined	13:05
	← tristanseifert left	13:05
	← dgutierrez1287 left	13:06
	→ Tomdarkness joined	13:06
	→ Liam` joined	13:06
	→ skorgon joined	13:06
	← skorgon left	13:06
	→ skorgon joined	13:06
	← devoldmx3 left	13:07
	← tjm_jimmy left	13:07
	← nnyk_ left	13:07
	→ devoldmx3 joined	13:07
	← stamina left	13:08
	→ skunkz joined	13:09
	← skyres left	13:09
	← devoldmx27 left	13:09
skunkz	Hi everyone, I have an 'experiment' branch on which I have worked a lot and it's now ready to be merged in master, however I'm not sure whether I should merge the branch into master or rebase master on this branch, can you help me ?	13:09
osse	skunkz: the latter is a bad idea. but you could rebase this branch on master	13:10
	!merge_vs_rebase	13:10
gitinfo	[!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	13:10
	← Hounddog left	13:10
	← devoldmx left	13:11
	→ mellernoia joined	13:11
	→ mellernoia-work joined	13:11
	→ skyres joined	13:11
	→ bernardio joined	13:12
	→ Hounddog joined	13:12
	← mellernoia left	13:13
	← mellernoia-work left	13:13
	→ nnyk_ joined	13:14
	→ Kgirthofer joined	13:14
skunkz	osse: thanks for the link, can you elaborate on why it's bad ? In my mind I would like to start master where experiment currently is	13:15
	← skyres left	13:15
	→ rubyonrailed joined	13:16
	→ maply joined	13:16
	← maply left	13:16
	← sharkz left	13:16
	← Texan left	13:16
	→ sharkz joined	13:17
	← exo1 left	13:17
	→ Texan joined	13:17
	→ skyres joined	13:17
	→ AirOnSkin joined	13:19
	← eme left	13:19
	gitinfo set mode: +v	13:19
	← bernardio left	13:20
AirOnSkin	Heya all. I'm fairly new to GIT and I was wondering If someone might be willing help me clear up some things...	13:20
bremner	!ask	13:21
gitinfo	Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.	13:21
	→ SocialBlunder joined	13:21
tobiasvl	!GIT ;)	13:21
gitinfo	Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e741408	13:21
	← skyres left	13:21
	→ dougsland joined	13:21
	→ wrouesnel1 joined	13:22
	→ drollwit joined	13:23
	→ eddd_ joined	13:23
	← devoldmx3 left	13:23
	← psoo left	13:23
	→ skyres joined	13:23
AirOnSkin	Yeah, I expected that ;) So, regarding my 'unclearness'. I would like to setup a repo that has a set of files and two branches (dev & test) with the same files. My file structure would look accordingly: /srv/salt/{dev,test,prod} (prod would be the master branch) ...	13:24
	s/GIT/Git/g	13:24
	← Liam` left	13:24
AirOnSkin	(sorry about that ;D )	13:24
	The files are already there, but I'm not sure about how to create the branches...	13:25
	← SocialBlunder left	13:25
AirOnSkin	Especially because the files for the dev or test branch reside in another directory	13:26
	→ mase-tech joined	13:26
	← drollwit left	13:28
	← skyres left	13:28
_ikke_	AirOnSkin: This is not how branches normally work in git	13:29
kadoban	AirOnSkin: Hard to tell what's going on there … Are you under the impression that separate directories are necessary for branches, or is that some deployment thing, or?	13:29
	→ skyres joined	13:29
_ikke_	AirOnSkin: Though, it's possible with the new (and still changing) new-worktree function	13:30
	→ bernardio joined	13:30
	← fstd left	13:31
	→ fstd joined	13:31
	→ sxaug joined	13:32
osse	skunkz: I just assumed that master was a public shared branch and that you had to force push and all that jazz.	13:32
	← nnyk_ left	13:32
osse	skunkz: but is it the case that it's just behind experiment by a number of commits?	13:32
	→ devoldmx joined	13:32
	← sxaug left	13:33
	→ Corey84 joined	13:33
skunkz	Yeah master is indeed behind experiment by many commits	13:33
	← millerti left	13:33
	← skyres left	13:34
skunkz	and I did rebase experiment on master multiples times after fixing some bugs on master	13:34
osse	skunkz: ah	13:34
_ikke_	skunkz: does master have commits that experiment doesn't have?	13:34
	→ jmckind joined	13:34
skunkz	_ikke_: pretty sure that yes	13:34
_ikke_	And you want to keep those commits?	13:34
	You can see: git log experiment..master	13:35
	→ Muhannad joined	13:35
	→ skyres joined	13:36
skunkz	7 commits are showing up	13:37
	→ troulouliou_div2 joined	13:37
	← devoldmx left	13:37
	← Gizburdt_ left	13:37
skunkz	To be fair I don't need any thing in master right now since the new version is on experiment and cold fully replace master	13:37
_ikke_	then git branch -f master experiment	13:38
	→ Jsoei joined	13:38
osse	skunkz: if any of those seven commits are pushed you will have to force push now.	13:38
	→ nnyk_ joined	13:38
	→ devoldmx joined	13:38
skunkz	yeah they are all pushed	13:38
	← Jsoei left	13:38
	← CheckDavid left	13:39
skunkz	git branch -f master experiment ??	13:39
	← bernardio left	13:39
_ikke_	reset branch master to experiment	13:39
	(ie, force create branch master, pointing it to the same commit as experiment)	13:40
	← skyres left	13:40
skunkz	_ikke_: I see thanks for the tip	13:40
_ikke_	you can also use git checkout -B master experiment if you want to immediately check the branch out	13:40
skunkz	but what's the problem if I do git rebase experiment from master ?	13:40
_ikke_	potential conflicts	13:41
	→ ley joined	13:41
_ikke_	but otherwise it's the same (you have to force push)	13:41
	→ AaronMT joined	13:41
osse	and you get to keep the seven commits you said you didn't want	13:41
	→ skyres joined	13:42
skunkz	ok thanks that's what I thought !	13:42
	← ley left	13:42
	→ Liam` joined	13:42
osse	skunkz: assusing the master branch is the "main branch" for some human definition of "main branch" and "side branch" then rebase experiment on master makes the most sense	13:43
	that's also what you've already been doing	13:43
_ikke_	I agree	13:44
skunkz	yeah indeed	13:44
	but I was wondering if that was possible	13:44
_ikke_	and then you can merge experiment in master (wich will fast forward) to make them the same	13:44
osse	skunkz: sure. you can merge and rebase from anywhere to anywhere. Git doesn't care.	13:44
	→ cbonobo joined	13:44
	→ pui joined	13:44
osse	it's us stupid humans that ruin it	13:44
skunkz	that's how I've done until now but wondered if it was possible to rebase a branch on a "child" branch	13:45
osse	there's you have it. you hit the nail on the head	13:45
_ikke_	sure, there is not really such a relation	13:45
	← pui left	13:45
osse	skunkz: the "child" thing is the human element. To Git it's all the same	13:45
	→ xk_id joined	13:46
	→ jerius joined	13:46
_ikke_	logically, branches are peers	13:46
osse	the only significance 'master' has compared to any other is that it's the default branch name after you 'git init'	13:46
	← linuxmint2 left	13:46
	→ gey joined	13:46
	← skyres left	13:46
osse	technically speaking, I mean	13:46
	← absk007 left	13:47
	← devoldmx left	13:47
	→ lokapujya joined	13:47
skunkz	well thanks for all the infos	13:47
osse	de (nada\|rien)	13:47
	← gey left	13:47
	→ sfeinste joined	13:47
	← arup_r left	13:48
	→ skyres joined	13:48
_ikke_	?	13:49
	→ rubyonra_ joined	13:50
	→ devoldmx joined	13:50
osse	What?	13:50
	← d2dchat left	13:51
	← skyres left	13:52
	← STFUn00b left	13:53
	Matrixiumn → Xack	13:53
	← rubyonrailed left	13:53
	→ KnightsOfNi joined	13:54
	→ bernardio joined	13:54
	→ skyres joined	13:54
	→ yqt joined	13:54
	→ Epqg joined	13:55
	← Epqg left	13:55
	→ Twi joined	13:56
	← Twi left	13:56
	← bernardio left	13:56
	← Texan left	13:57
	→ Texan joined	13:57
	→ danzilio joined	13:58
	← youser left	13:58
	← danzilio left	13:58
	→ bitkiller joined	13:58
	← skyres left	13:58
	→ denver joined	13:58
	→ icuhc joined	13:58
	→ tristanp joined	13:59
	→ danzilio joined	13:59
	← icuhc left	13:59
	← danzilio left	13:59
	← Kelzier left	13:59
	→ CKyle joined	14:00
	→ danzilio joined	14:00
	→ skyres joined	14:00
	→ scarabx joined	14:01
	→ tristanseifert joined	14:01
	← adgtl left	14:02
	→ marc_v92 joined	14:02
	→ d2dchat joined	14:03
	← scarabx left	14:04
	→ govg joined	14:04
	→ bernardio joined	14:04
	→ scarabx joined	14:04
	← theskillwithin left	14:05
	← jmckind left	14:05
	← bitkiller left	14:05
	← skyres left	14:06
	← tristanseifert left	14:06
	← Zariel left	14:07
	← howlymowly left	14:07
	→ jmckind joined	14:08
	← [cust] left	14:08
	→ Dzejmskr_ joined	14:08
	→ Zariel joined	14:09
	← bernardio left	14:09
	→ Dougie187 joined	14:09
	→ skyres joined	14:10
	← sfeinste left	14:11
	← Dzejmskrokan left	14:11
	← jceb left	14:13
	→ bernardio joined	14:13
	← Amandil left	14:13
	← skyres left	14:14
	→ chitopunk joined	14:15
	← goTAN left	14:15
	← chitopunk left	14:16
	→ hahuang61 joined	14:16
	→ chitopunk joined	14:16
	→ drollwit joined	14:16
	→ skyres joined	14:16
	← boba left	14:18
	← hahuang65 left	14:18
	← ljt left	14:19
	→ nerd joined	14:19
	← cyphase left	14:19
	→ ljt joined	14:19
	→ SylvieLorxu joined	14:19
	→ otter768 joined	14:20
SylvieLorxu	I just created a new repository, but immediately messed up my first commit. How do I undo the commit without losing files? I haven't defined an upstream yet or pushed ever, and "git reset" somehow doesn't seem to work, I'm probably making a very simple yet stupid mistake again	14:20
	→ guampa joined	14:21
	← skyres left	14:21
	← drollwit left	14:21
osse	SylvieLorxu: you can fix it directly and then do git commit --amend	14:21
	→ jbudz joined	14:21
	← govg left	14:22
	← bernardio left	14:22
	→ SocialBlunder joined	14:22
	→ govg joined	14:22
	→ Iupq joined	14:22
	← Iupq left	14:22
SylvieLorxu	osse: Heh, of course. Thanks	14:23
	→ dr3w joined	14:23
	→ voltagex joined	14:24
	→ joo-_ joined	14:24
	→ Spacew00t joined	14:24
	← nettoweb left	14:24
	→ Ujen joined	14:24
	← otter768 left	14:25
	← Ujen left	14:25
	→ skyres joined	14:25
	→ bernardio joined	14:25
	← SocialBlunder left	14:26
	→ cyphase joined	14:27
	→ GoddeR joined	14:27
	← jbudz left	14:27
	→ tehtraveler joined	14:28
	→ madewokherd joined	14:29
	← bernardio left	14:29
	← lokapujya left	14:30
	← skyres left	14:30
	→ dopie joined	14:30
	← darkbasic left	14:30
	→ creep_ joined	14:31
	→ darkbasic joined	14:31
	→ bernardio joined	14:32
	← ferhaty left	14:33
	← bsanford left	14:33
	← dr3w left	14:34
	← mase-tech left	14:34
	→ idtt joined	14:34
	← idtt left	14:34
	→ skyres joined	14:34
	→ Uhgt joined	14:35
	← Uhgt left	14:35
	→ lokapujya joined	14:36
	→ Junior joined	14:36
	→ while1pass joined	14:36
	→ ripper1 joined	14:37
	→ devoldmx_ joined	14:37
	→ MattMaker joined	14:37
	→ mp4 joined	14:38
	← lb1a left	14:38
	← skorgon left	14:39
	← acolson left	14:39
	← skyres left	14:39
	→ aretecode joined	14:39
	→ hjcek joined	14:39
	→ gamename joined	14:39
	← hjcek left	14:40
	→ dr3w joined	14:40
	→ Noldorin joined	14:40
	← djam90 left	14:41
	→ Uaoa joined	14:41
	→ livingstn joined	14:41
	← govg left	14:42
	← MattMaker left	14:42
	← eddd_ left	14:42
	← elsevero left	14:42
	→ EnderMB joined	14:42
	← Uaoa left	14:43
	→ crose joined	14:43
	→ Es0teric joined	14:43
	→ eddd_ joined	14:43
	→ skyres joined	14:44
EnderMB	Hey all. Let's say I have a conflict when merging two branches in a pull request (i.e. merging "feature" into "master"). Instead of fixing the conflicts, is there a way to fix the conflicts, but to apply this fix as a patch and add it to the feature branch, allowing the person merging the pull request to cleanly do it?	14:44
	← AlexDSX left	14:45
	← tristanp left	14:45
ojacobson	EnderMB: do the merge the other direction, first, in that case.	14:45
	Minor zipper merges like that are a tiny bit ugly, but handle this well	14:45
	→ tristanp joined	14:45
ojacobson	alternately, if your workflow is rewrite-friendly, have the pull request author rebase and force-push the branch	14:45
	→ YoungFrog joined	14:46
	→ mellernoia joined	14:47
EnderMB	ojacobson: I'd typically recommend to do that first, but this project has a branching system where a feature has to be merged into a dev branch (for a dev environment), a staging branch (for a staged env), and master (for live). A feature could go into dev fine, but could conflict on the staging branch.	14:47
	← clockworkfrog left	14:47
EnderMB	Naturally, there's a process in place where a branch needs to be merged into dev first, and then into staging. If the feature is updated, it needs to go back to dev again.	14:48
	→ Egin joined	14:48
	← Egin left	14:48
	→ clockworkfrog joined	14:48
	← Hounddog left	14:48
YoungFrog	How do I find the sha1 of the tree object recorded in the index ? if I have a commit I do "git log -1 --pretty=tformat:%T <commit>" but I don't a priori have a commit.	14:49
EnderMB	Ideally, if there was a way to do a soft "merge" and add the contents of said merge into the feature branch, allowing the dev doing the pull request to cleanly merge from the UI, this would resolve this issue	14:49
	← skyres left	14:49
	→ Bootinbull joined	14:49
ojacobson	YoungFrog: the index is not a tree object	14:50
	you can turn it into one, but it's not stored that way	14:50
	!xy	14:50
gitinfo	Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	14:50
	→ ripper2 joined	14:50
	← marcogmonteiro left	14:50
YoungFrog	ojacobson: oh ! hm. Ok so let's avoid the xy problem then :) I want to know which commit is checked out at the moment.	14:51
ojacobson	git rev-parse HEAD	14:51
	or git-describe, if you want something more human-friendly	14:51
	← macabre left	14:51
	→ jokester joined	14:52
	→ knownasilya joined	14:52
	→ gambl0re joined	14:52
YoungFrog	ojacobson: hm no sorry I didn't explain well. I'm in a state where the index doesn't match HEAD (probably because of me not using git-new-workdir correctly) and I want to know to what commit this index correponds. I hope that's more clear.	14:52
ojacobson	Then you're going to want the graphwize-closest commits whose diffs are minimal	14:53
	the index doesn't record which commit it was based on	14:53
	← dr3w left	14:54
	→ skyres joined	14:54
	← ripper1 left	14:54
	→ dr3w joined	14:54
YoungFrog	if I just commit what I have, that'll make a tree object which I can compare to other commits, will that work ? (I'll tias in a minute if you don't say "obviously not, you silly")	14:54
	→ notebox joined	14:54
ojacobson	Sure, but you don't really need one (i.e. having one barely helps)	14:54
	you can compare the index to arbitrary commits with `git diff --staged <tree-ish>`	14:54
	→ wrouesnel4 joined	14:55
	← keroro520 left	14:55
YoungFrog	ok I'll do that	14:55
	← jseplae left	14:55
	← lokapujya left	14:55
ojacobson	you can also create a tree object directly, without running git-commit, if you're willing to work with git's internals a bit	14:56
	(man git-write-tree)	14:56
gitinfo	the git-write-tree manpage is available at http://jk.gs/git-write-tree.html	14:56
	→ Oee joined	14:56
	← Oee left	14:57
ojacobson	git-commit is a wrapper around $EDITOR, git-write-tree, git-commit-tree, and some other glue	14:57
	→ dreiss joined	14:58
	→ Eugene joined	14:58
	← skyres left	14:58
	← ljt left	14:59
	→ keroro520 joined	14:59
	← marc_v92 left	14:59
YoungFrog	ojacobson: oh, git write-tree was pretty straightforward !	14:59
	← Saturn812 left	14:59
	ChanServ set mode: +o	14:59
	→ Guest90392 joined	14:59
	→ lokapujya1 joined	14:59
	→ bapalm_ joined	15:00
	← lokapujya1 left	15:00
	← eddd_ left	15:00
	→ m1h4 joined	15:00
	← bonswouar left	15:01
YoungFrog	FWIW I did: git log --all --pretty=tformat:"%H %T" \| grep -m1 $(git write-tree)'$'	15:01
	→ skyres joined	15:01
	← bapalm left	15:01
	Eugene changed the topic to: Welcome to #git, the place for git help and a short musical number \| Current stable version: 2.5.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| This is not the greatest commit in the world, this is just a tribute.	15:01
	← Silmarilion left	15:01
	Eugene set mode: -o	15:01
_ikke_	hai EnderMB	15:01
	Eugene: *	15:02
	← dreiss left	15:02
	← Sceorem left	15:02
	→ astockton joined	15:02
	← m1h4 left	15:02
EnderMB	_ikke_: Hey	15:03
	← rchavik left	15:03
	→ m1h4 joined	15:03
SylvieLorxu	Damn, I missed bingo	15:04
	→ rwb joined	15:04
	→ yosito joined	15:04
	← livingstn left	15:04
	← CustosLimen left	15:05
	← Guest90392 left	15:05
	← m1h4 left	15:05
	← skyres left	15:05
	← tristanp left	15:06
	← yosito left	15:06
	→ skyres joined	15:07
	← scarabx left	15:07
	→ blimpse joined	15:07
	→ ssarah joined	15:07
	→ tristanp joined	15:08
	← gua_ould left	15:08
	→ m1h4 joined	15:09
	← wwwald left	15:09
	← Zariel left	15:10
	→ p4trix joined	15:10
	← nnyk_ left	15:10
	← troulouliou_div2 left	15:10
	← m1h4 left	15:10
	← devoldmx_ left	15:10
	→ drollwit joined	15:11
	→ zadock joined	15:11
	← skyres left	15:11
	→ sfeinste joined	15:12
	→ acv joined	15:12
	← acv left	15:12
	← bernardio left	15:12
	← vurma left	15:12
	→ skyres joined	15:13
	→ Zariel joined	15:13
	← Zariel left	15:13
	→ Zariel joined	15:13
	← rruban left	15:14
	→ bernardio joined	15:14
	← tumulte left	15:14
	← ripper2 left	15:14
	→ eddd_ joined	15:15
	← dadamssg left	15:15
	→ dadamssg joined	15:15
	← drollwit left	15:16
	→ faux___ joined	15:16
	← astockton left	15:17
	→ Uzt joined	15:17
	← Uzt left	15:17
	→ dgutierrez1287 joined	15:18
	→ stantonk joined	15:18
	← denver left	15:18
	← skyres left	15:18
	→ Technocrat7 joined	15:19
	→ skyres joined	15:19
	→ h4ckurate joined	15:20
	← nixie left	15:20
	← stantonk left	15:20
	← faux___ left	15:20
	→ akiva joined	15:21
	← tarkus left	15:21
	← clobrano left	15:21
	→ Dave666 joined	15:21
	→ adgtl joined	15:21
	→ CustosLimen joined	15:22
	← PeterBooker left	15:22
	→ stantonk joined	15:22
	← dgutierrez1287 left	15:22
Dave666	Hi, does anyone use Bitbucket here? I'm on a server where it's stored someone elses login to a repo. I have been given write access to the repo, but cannot push changes when I supply my login on the command line	15:22
	→ astockton joined	15:22
	← adgtl left	15:23
	→ kpease joined	15:23
	→ jceb joined	15:23
	← skyres left	15:23
Dave666	Trying with: git push origin master https://MyLogin@bitbucket.org/RepoOwnerAccount/repo.git/ (obviously I replaced sensitive info here :) )	15:24
	← sophos left	15:24
	→ franl joined	15:24
Dave666	git is failing with: fatal: remote part of refspec is not a valid name in https://....	15:25
	← Brain left	15:25
	← franl left	15:25
	→ skyres joined	15:25
bremner	what exactly is failing with that message?	15:25
	!www	15:25
gitinfo	What did you do (which commands?), what happened as a result (any messages?), and what was the result you expected instead?	15:25
	← kpease left	15:26
ojacobson	Dave666: 'git push <remote name> <branch> ...<branches>...'	15:26
	if you tack a URL onto the end of 'git push origin master', you don't get a useful command	15:26
	→ kpease joined	15:26
	→ govg joined	15:27
Dave666	I need to specify my username for bitbucket, so I can push into the origin, overriding the login details stored on the server	15:27
	→ N4tr0n_ joined	15:27
	→ zia joined	15:28
	← zia left	15:28
Dave666	I guess what I need to research is if git allows overriding stored details, or if I need to edit a config file...	15:28
	← govg left	15:29
	← GT4066 left	15:29
	← gambl0re left	15:29
	→ govg joined	15:30
	→ gambl0re joined	15:30
	← skyres left	15:31
	← jagob left	15:31
	← pm90_ left	15:31
	← tehtraveler left	15:32
	→ skyres joined	15:32
	← EnderMB left	15:34
	→ ufuuu joined	15:34
	← ufuuu left	15:34
	← govg left	15:35
	← skyres left	15:36
	→ Tmq joined	15:36
	← ShooterM_ left	15:36
	← h4ckurate left	15:36
	→ Saturn812 joined	15:36
	→ thiago joined	15:36
	→ lindenle joined	15:37
	→ nonconvergent joined	15:37
	← yqt left	15:37
	← Tmq left	15:37
	→ afs joined	15:37
	→ pheaver joined	15:38
	← danzilio left	15:38
	→ skyres joined	15:38
	← Technocrat7 left	15:38
	← jost left	15:39
	→ govg joined	15:39
	→ nnyk_ joined	15:40
nonconvergent	Okay, we maintain two branches, master and release, and we usually dev on master, merge it to release, then push release out to production. But we also develop on release between cycles, for hotfixing and the like, and we increment versions there in the pom.xmls. When we do that, we merge release to master, but we need to exclude the changes to the pom.xml.	15:40
	We need to make sure we don't change the pom.xmls when merging release into master, but we do want to change them merging master into release.	15:40
	We've got pom.xml merge=ours in a .gitattribute file, but do we need that file in every folder that has a pom.xml?	15:42
	← Balliad left	15:42
	→ t-mart_ joined	15:42
	→ Balliad joined	15:43
	← skyres left	15:43
	← gambl0re left	15:43
	→ caulagi joined	15:43
	← t-mart left	15:43
	→ Uvci joined	15:43
	← pheaver left	15:43
	← xk_id left	15:43
caulagi	hello - can I merge a remote branch locally without having a local copy?	15:44
	← Balliad left	15:44
caulagi	I just want to merge it and push	15:44
	← Uvci left	15:44
	← phantombeta_ left	15:44
qsuscs	caulagi: how do you want to merge something you don't have?	15:44
	→ gambl0re joined	15:44
qsuscs	caulagi: you can `git fetch remote ref` and `git merge FETCH_HEAD` though	15:44
	→ ShooterMG joined	15:44
	→ tang^ joined	15:44
	→ Balliad joined	15:45
Dave666	Ah right, I need to checkout a new copy with my username, then I can push it back. They should add a --username switch like we have in subversion	15:45
qsuscs	wat.	15:45
	→ skyres joined	15:45
qsuscs	Dave666: step one: checkout is NOT clone. the latter involves the former.	15:45
caulagi	qsuscs: ref is the branch name?	15:45
	← Dzejmskr_ left	15:46
qsuscs	Dave666: step two: git remote set-url origin https://yourmother@bitbucket.org/...	15:46
	alternatively, git remote add blahblah https://...	15:46
	→ ouqi joined	15:46
qsuscs	caulagi: a branch is a ref, yes	15:46
	← ouqi left	15:47
Dave666	It's already been checked out/cloned by another user. I needed to push changes from my account, but the original user's details are always used. So I can't push the changes back. I'm going to get around it by just cloning again, copying the changes across and pushing them back	15:47
	→ Dzejmskrokan joined	15:47
Dave666	With subversion (for example) the username/password can be changed when pushing/commiting.	15:47
qsuscs	so you can with git	15:47
	i don't see the problem	15:48
	→ ehmatthes joined	15:48
tang^	Dave666: like with git config --local user.name "not other user" ?	15:48
	→ ascarter joined	15:48
qsuscs	also, users shouldn't share users	15:48
	*repos	15:48
Dave666	tank^: Tried that yeah, doesn't work unfortunately	15:48
	→ qikg joined	15:48
qsuscs	because that's the committer/author information	15:48
	which has nothing to do with remote credentials	15:48
	← nerd left	15:49
	← qikg left	15:49
tang^	oh, uhh, nm me	15:49
	→ tristanseifert joined	15:49
tang^	missed the start of the conversation	15:50
	← skyres left	15:50
Dave666	I didn't realise it was a limitation till now. It's unusual that I'd have to push changes for another developer from a dev box.	15:50
qsuscs	Dave666: generally, !unlearn. if you want to start a sentence with "but in subversion ...", stop right there. git is NOT subversion, and thinking like "so this equals that in svn" will only get you pain	15:50
gitinfo	Dave666: Users of centralized VCSes will need to unlearn a number of habits in order to learn git. Many commands, such as "checkout" and "revert" bear little in common to those holding the same name in other systems.	15:50
tang^	you shouldn't have to... they should be pushing their own changes	15:50
	← caulagi left	15:50
	← gambl0re left	15:51
Dave666	They're on holiday, changes need to be pushed. I know I shouldn't have to :)	15:51
	→ gambl0re joined	15:51
qsuscs	btw, you can also specify a remote directly	15:51
	→ maestrojed joined	15:51
qsuscs	like git push https://Dave666@bitbucket.org/...	15:51
	→ skyres joined	15:51
	→ awkwardusername joined	15:52
	← awkwardusername left	15:52
Dave666	I did try that. It doesn't allow it (that was from my comment way above)	15:52
	← harish left	15:52
tang^	should really use SSH instead of https	15:52
	then when you push, it's logging in as you	15:52
	← Dzejmskrokan left	15:52
	→ harish joined	15:52
qsuscs	!doesn_t work	15:53
	... !doesnt_work	15:53
	FFS	15:53
	!triggers	15:53
gitinfo	Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	15:53
canton7	!doesntwork	15:53
gitinfo	Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...	15:53
canton7	.trigger_edit doesnt_work @!doesntwork	15:53
gitinfo	canton7: Okay.	15:53
qsuscs	thx	15:53
	← Dorf left	15:53
	→ ugibx joined	15:54
	→ AaronMT_ joined	15:54
	← declanqian left	15:54
	← keroro520 left	15:54
qsuscs	(ah, jast is responsible for the unicorn)	15:54
tang^	heh	15:54
	← ugibx left	15:54
	← tristanseifert left	15:55
	← Balliad left	15:55
	← skyres left	15:56
	→ bsanford joined	15:56
	→ Namd joined	15:56
	← Namd left	15:56
	← AaronMT left	15:57
	→ ferhaty joined	15:57
	→ crayon joined	15:57
	← astockton left	15:58
	→ skyres joined	15:58
	← crayon left	15:58
	→ liamonade joined	15:58
	→ cromero joined	15:59
	← ferhaty left	15:59
	→ crayon joined	15:59
	← stantonk left	15:59
	→ Mogud joined	16:00
	→ Balliad joined	16:01
	→ phantombeta joined	16:01
	← Mogud left	16:01
	← freimatz left	16:01
	→ bobmarchman joined	16:01
	← Balliad left	16:01
	→ teran joined	16:02
	← govg left	16:02
	← skyres left	16:02
	→ Technocrat7 joined	16:02
	→ govg joined	16:03
	← nonconvergent left	16:03
	← d2dchat left	16:03
Dave666	Fixed, got the other dev's login details. He did suggest what I was already doing, but that doesn't work. Any attempt to push with another username throws the error "error: src refspec origin does not match any." - so apparently git can't find the origin :))	16:03
	← Mine left	16:03
	→ skyres joined	16:04
qsuscs	err, no.	16:04
	what was the command you issued?	16:04
	← Sleepy63 left	16:05
	→ drollwit joined	16:05
	→ stantonk joined	16:05
	→ astockton joined	16:05
kadoban	Dave666: … that sounds like you just threw a URL at the beginning and otherwise didn't fix the command.	16:05
	→ MattMaker joined	16:06
	← devoldmx left	16:06
	← multi_io left	16:06
	← N4tr0n_ left	16:07
	→ aktx joined	16:07
	← ki0 left	16:07
	→ qoun joined	16:08
	← skyres left	16:08
	→ multi_io joined	16:08
	← creep_ left	16:08
	← qoun left	16:09
	← beckyconning_ left	16:09
Dave666	Meh, don't know why it failed really. As you probably guessed I normally use another VCS, and the guy who uses git just told me what should have worked. I know my account works, and should have write access, but there's some issue with the command-line options.	16:09
	→ ril joined	16:09
tang^	well, if you share the sanitized version, we can help correct it and you'll learn a bit in the process	16:09
Dave666	(I could clone and push ok, but just not with the copy that had been cloned from the other account)	16:09
	→ devoldmx joined	16:09
	→ tristanseifert joined	16:09
	→ skyres joined	16:10
	← drollwit left	16:10
qsuscs	Dave666: just tell us the commands you did, is that so hard?	16:10
	then we can tell you why it's wrong	16:10
	→ Ieoj joined	16:10
	← bobmarchman left	16:10
Dave666	hang on, I'll log back in and get the command that failed...	16:11
	← Ieoj left	16:11
	→ Gizburdt joined	16:11
	← tristanp left	16:11
Dave666	git push https://MyUserName@bitbucket.org/repoOwner/repo.name.git/ origin master	16:12
	→ qvou joined	16:12
	← stantonk left	16:12
qsuscs	see. take out the "origin"	16:12
	← MattMaker left	16:12
qsuscs	origin is a so-called remote, a shorthand or bookmark for a repo URL	16:12
	→ MechtiIde joined	16:13
	← qvou left	16:13
Dave666	Right ok thanks. It's done now (using the other guy's login), so all good!	16:13
	← ehmatthes left	16:13
	→ imachuchu joined	16:13
	← skunkz left	16:14
	← skyres left	16:14
	→ macabre joined	16:14
	→ tristanp joined	16:14
	← sixtyten left	16:15
	← Gama11 left	16:15
	← bernardio left	16:15
	→ Nmlj joined	16:15
	← ag4ve left	16:15
	→ skyres joined	16:16
	→ absk007 joined	16:16
	← govg left	16:16
	→ kfoonamalik joined	16:16
	← Nmlj left	16:16
	← CustosLimen left	16:17
	→ Guest82048 joined	16:17
	→ MattMaker joined	16:17
	← achadwick left	16:17
	→ bernardio joined	16:17
	← zadock left	16:17
	→ skunkz joined	16:18
	→ stantonk joined	16:18
	→ arand_ joined	16:19
	→ zoso joined	16:19
	→ Oby joined	16:19
	← Oby left	16:19
skunkz	hi, I've used the git branch -f master experiment that you recommended me but the problem is now origin/master is far behind origin and when I try to push I'm told that the tip of my branch is behind its remote counterpart	16:20
	← Guest82048 left	16:20
	← skyres left	16:20
	→ N4tr0n_ joined	16:20
	→ layu joined	16:20
	→ Gama11_ joined	16:21
	← irqq left	16:21
	← Technocrat7 left	16:21
	→ otter768 joined	16:21
	← layu left	16:21
	→ danzilio joined	16:22
	→ hoik joined	16:22
	→ skyres joined	16:23
	← arand_ left	16:23
	← hoik left	16:23
	→ SocialBlunder joined	16:23
	← Zariel left	16:24
	→ ugun joined	16:24
	→ Zariel joined	16:24
	← eddd_ left	16:25
	← ugun left	16:25
	← otter768 left	16:26
	→ _Atom_ joined	16:26
	→ Rfu joined	16:26
	← Zariel left	16:26
	→ Dragooon joined	16:27
	← Rfu left	16:27
	← skyres left	16:27
	← SocialBlunder left	16:28
	← rubyonra_ left	16:28
skunkz	git push'ed -f	16:28
	→ durham joined	16:28
	← skunkz left	16:28
	→ CustosLimen joined	16:28
	← tristanp left	16:29
	→ bupz joined	16:30
	← bupz left	16:30
	→ zadock joined	16:30
	→ tristanp joined	16:31
	← mikecmpbll left	16:31
	→ arvind_k joined	16:31
	→ troulouliou_div2 joined	16:31
	→ skyres joined	16:31
	→ eddd_ joined	16:31
	← arvind_k left	16:31
	→ nettoweb joined	16:32
	→ iuq joined	16:32
	← zoso left	16:32
	→ AaronMT joined	16:32
	→ pm90_ joined	16:32
	← iuq left	16:32
	← AaronMT left	16:33
	← inamoriti left	16:33
	→ locksmith2 joined	16:34
	→ Kcbc joined	16:34
	← michael_mbp left	16:34
	← Kgirthofer left	16:34
	← AaronMT_ left	16:35
	← phantombeta left	16:35
bernardio	hii	16:35
	← nnyk_ left	16:35
	← Kcbc left	16:35
bernardio	I really need help understand the git rebase workflow	16:35
	→ michael_mbp joined	16:35
	← skyres left	16:35
	→ Dzejmskrokan joined	16:36
	← Dave666 left	16:36
	→ gopar joined	16:36
	← pm90_ left	16:36
	→ phantombeta joined	16:37
	→ AaronMT joined	16:37
	→ devoldmx_ joined	16:37
	→ skyres joined	16:37
	← kurkale6ka left	16:38
	→ nnyk_ joined	16:38
	← eddd_ left	16:38
	← VictorCL left	16:38
	→ ehdx joined	16:39
	→ whomp joined	16:39
	← ehdx left	16:39
	← jmckind left	16:39
	→ snthsnth joined	16:40
	→ govg joined	16:40
	← ascarter left	16:42
	← skyres left	16:42
	→ stantonk_ joined	16:42
	→ ugrp joined	16:43
	→ iamjarvo joined	16:43
	→ skyres joined	16:44
	← ugrp left	16:44
	← stantonk left	16:46
	→ Laub joined	16:46
	→ malacostraca joined	16:46
	← malacostraca left	16:46
	← Gizburdt left	16:46
	← ssarah left	16:46
	← liamonade left	16:47
	← Laub left	16:47
	← Nick-S left	16:47
	← bernardio left	16:47
	← jerius left	16:48
	→ dgutierrez1287 joined	16:48
	→ mikecmpbll joined	16:48
	← dopie left	16:48
	← thiago left	16:48
	← skyres left	16:48
	→ orqki joined	16:48
	← orqki left	16:49
	→ dopie joined	16:50
	→ skyres joined	16:51
	→ cvuq joined	16:52
	← cvuq left	16:52
	→ theCole joined	16:52
	→ malacostraca joined	16:53
	← Dougie187 left	16:54
CareBear\	bernardio : the point is to take some number of commits and apply them onto a different base than where they are currently applied	16:54
	→ MattMake_ joined	16:54
	← jargan left	16:54
	← AaronMT left	16:55
	← skyres left	16:55
	→ Gizburdt joined	16:55
	→ AaronMT joined	16:55
	→ jast joined	16:55
	← Gizburdt left	16:56
	← iamjarvo left	16:56
	→ Etuj joined	16:56
	→ Gizburdt joined	16:56
	← Etuj left	16:57
	→ skyres joined	16:57
	← MattMaker left	16:57
	→ bernardio joined	16:57
	← mellernoia left	16:57
	→ MinetestForFun joined	16:57
	← MinetestForFun left	16:57
	→ MinetestForFun joined	16:58
	← stantonk_ left	16:58
	→ drollwit joined	16:59
	← bapalm_ left	17:01
	→ pheaver joined	17:01
	← MinetestForFun left	17:02
	→ Iagg joined	17:02
	← skyres left	17:02
	← Iagg left	17:02
	→ bearcat_ joined	17:02
	→ Kgirthofer joined	17:03
	← theCole left	17:04
	← drollwit left	17:04
	← netj left	17:04
	→ millerti joined	17:04
	→ netj joined	17:05
	← AaronMT left	17:05
	→ skyres joined	17:05
	← crayon left	17:05
	→ AaronMT joined	17:06
	← skullcrasher left	17:06
	→ saharanNomad joined	17:06
	→ cavallari joined	17:06
	→ ats joined	17:07
	← ats left	17:07
	gitinfo set mode: +v	17:08
saharanNomad	is there anyone here who could help me understand the Git structure? I am pretty much a nube	17:08
	→ ivan_on_trac joined	17:09
saharanNomad	I set up a local repo	17:10
ivan_on_trac	because this command does't work? git rev-parse --resolve-git-dir /home/iv4n/dbatez	17:10
	← kraplax left	17:10
	→ b00n joined	17:10
ivan_on_trac	return -> fatal: Not a git repository (or any of the parent directories): .git	17:10
		17:10
	← devoldmx_ left	17:10
saharanNomad	ivan_on_trac you are asking a question?	17:11
	← skyres left	17:11
ivan_on_trac	But this directory has a git repo.	17:11
	saharanNomad: but the repository exists. :(	17:11
	→ nour joined	17:12
	→ d2dchat joined	17:12
	→ jerius joined	17:12
	← nettoweb left	17:13
	→ SocialBlunder joined	17:13
	→ TomyLobo joined	17:14
	→ skyres joined	17:14
	← upene left	17:14
	→ upene joined	17:15
	← Muhannad left	17:15
	← reveredge left	17:15
	→ Technocrat7 joined	17:15
	← CustosLimen left	17:16
	← Tomdarkness left	17:17
	← barduck left	17:17
	← malacostraca left	17:17
	→ malacostraca joined	17:18
	← malacostraca left	17:18
	→ iamjarvo joined	17:18
	→ lolmac joined	17:18
	→ malacostraca joined	17:18
	← malacostraca left	17:18
	→ malacostraca joined	17:18
	← malacostraca left	17:18
	← skyres left	17:19
	→ ascarter joined	17:19
	→ malacostraca joined	17:19
	← malacostraca left	17:19
Exagone313	Hello, how to allow to clone new repository on gitolite for a specific user? By new I mean non-existant, and clone creates the repo.	17:19
	→ theCole joined	17:19
Exagone313	I added a configuration for repo * but * is not valid	17:20
cbreak	Exagone313: wild repo? :)	17:20
	should be in the docs	17:20
	→ Sasazuka joined	17:20
Exagone313	I don't find it	17:20
BtbN	I don't think that's possible, as pushing the config with the repo in it creates it	17:20
	→ malacostraca joined	17:20
	← malacostraca left	17:20
	→ skyres joined	17:20
Exagone313	yes it is, I use another repo that uses gitolite, and I clone to create repo	17:21
	but he does not want to share the config	17:21
	because he wants me and others to use its server and do not want	17:22
	I*	17:22
BtbN	Maybe he just wrote a custom script?	17:23
	→ Jackneill joined	17:23
BtbN	http://gitolite.com/gitolite/wild.html is the first google hit i get, and it looks exactly like what you are looking for.	17:23
	→ bronson joined	17:23
Exagone313	i red that i didnt find ^^	17:24
	← theCole left	17:24
Exagone313	maybe with a regexp ok	17:24
	← skyres left	17:25
	← cromero left	17:26
	← crose left	17:26
	→ skyres joined	17:26
	← Technocrat7 left	17:27
Exagone313	this does not work why? repo [a-zA-Z0-9]+/[a-zA-Z0-9]+	17:27
	→ cromero joined	17:28
	← iamjarvo left	17:28
ldlework	If we have two mainline branches, master and 2.0 that don't share a common ancestry, and I was on a 2.0 and I just did "git pull origin master" and now I have a very bad situation of conflicts (obviously) how can I undo the command?	17:28
	plz halp	17:30
	← skyres left	17:31
Exagone313	here is what I tried to add in my config: http://pastie.org/10333954 and it does not work, I can't clone a new repo	17:31
ldlework	git reset --hard HEAD	17:31
	Okay new question	17:32
Exagone313	(DENIED by fallthru)	17:32
ldlework	If I made some commits directly on 2.0, and the origin is ahead of my 2.0 branch, how can I rebase my last few commits ontop of the remote 2.0?	17:32
	→ eme joined	17:33
	→ skyres joined	17:33
Exagone313	ok sorry it works	17:33
	i missed a char in my regex	17:34
	thanks	17:34
	→ theCole joined	17:34
	→ pantsman- joined	17:34
	→ NeverDie joined	17:35
	→ thiago joined	17:36
	→ aboccia joined	17:37
	→ crose joined	17:37
	← skyres left	17:37
	← NeverDie left	17:37
	→ stantonk joined	17:37
	← cromero left	17:38
cbreak	Exagone313: http://gitolite.com/gitolite/wild.html	17:39
	→ skyres joined	17:39
cbreak	Exagone313: that's the documentation	17:39
	← kristjansson left	17:39
	← eme left	17:39
	→ kristjansson joined	17:39
	← astockton left	17:39
	→ astockton joined	17:39
	← sfeinste left	17:40
	← aboccia left	17:42
	← PlasmaSU left	17:42
	← skyres left	17:43
	← bket left	17:44
	→ str8uplinux joined	17:44
	→ flashpoint9 joined	17:44
	→ bket joined	17:44
	→ skyres joined	17:44
	→ xvilka2 joined	17:45
	→ sasha joined	17:45
	→ drathir joined	17:45
sasha	Hai	17:45
	← Kgirthofer left	17:45
sasha	What would be the recommended way of install git on mac? Through brew? The Github for Mac package? something else?	17:45
	→ tarkus joined	17:45
	→ Kgirthofer joined	17:45
	← ProT-0-TypE left	17:45
	gitinfo set mode: +v	17:46
xvilka2	hi! I had some file in git, someone changed encoding of that file, so now git thinks that whole file was changed. Is there any ways to ignore that encoding change or change it back ?	17:46
	← tvw left	17:46
kadoban	xvilka2: Define what that means, that they "changed the encoding"?	17:47
	→ Muhannad joined	17:47
	← flashpoint9 left	17:48
	← StuartMI left	17:48
	→ flashpoint9 joined	17:48
xvilka2	kadoban: it was containing non-english characters, probably it was utf-8, then they opened it in some windows editor, which automatically changed it to cp1251	17:48
	→ StuartMI joined	17:48
cbreak	xvilka2: git checkout	17:49
kadoban	xvilka2: Then the while file /is/ changed, most likely. You want to roll back the file to how it was?	17:49
xvilka2	and I've made some valuable changes to it, was going to use 'git add -p' to split the file	17:49
Nugget	sasha: Installing Xcode will install git also. I prefer homebrew, though, to have more frequent updates	17:49
	← skyres left	17:49
	← lolmac left	17:49
sasha	K thanks for the advice Nugget	17:49
xvilka2	kadoban: i was thinking if there is a way to split encoding changes from the actual text changes?	17:49
cbreak	xvilka2: you can split changes how ever you want.	17:50
	→ aboccia joined	17:50
cbreak	but what's cp1515?	17:50
kadoban	xvilka2: Probably depends on the encoding. If it were me, first I'd obviously take a backup of its current state. Then I'd try to change the encoding back to what it was. Then I'd hope it was close enough that the only thing that remained was the actual changes.	17:50
	→ skyres joined	17:50
cbreak	just convert it back to proper unicode	17:50
	→ CustosLimen joined	17:50
str8uplinux	I have a development team of 4. I set up git on a windows share as a central hub using this tutorial: http://justinchmura.com/2014/07/18/local-git-repository-windows-server/ so we can collaborate our projects. The problem I am having is wrapping my head around push/pull/merge. And getting errors when trying to push changes. Should we all have our own branch or can we simply push when we want to make changes?	17:51
xvilka2	cbreak: didn't work, already checked, git checkout to the old version is the only way, looks like	17:51
str8uplinux	Sorry for my ignorance, very new to git	17:51
cbreak	str8uplinux: you can push when ever you want.	17:51
	xvilka2: you don't know how to convert it back?	17:51
xvilka2	cbreak: windows-specific russian 7bit encoding	17:52
cbreak	weird.	17:52
	← joki left	17:52
	← Gizburdt left	17:52
cbreak	xvilka2: I'd just check out the original branch, convert the file back, commit it	17:52
xvilka2	cbreak: i've tried to convert it using vim, it converted, but probably different from the original state	17:52
cbreak	and then merge/rebase my changes onto that	17:52
	xvilka2: checkout is bad	17:52
xvilka2	cbreak: will do, I just thought there is a simpler way	17:52
cbreak	you might lose changes they mixed in along with the encoding change	17:53
	← absk007 left	17:53
	← troulouliou_div2 left	17:53
	← aboccia left	17:53
	→ drollwit joined	17:53
	→ dj3000 joined	17:53
str8uplinux	cbreak: i get a bunch of different errors. Such as master.lock file (already checked out), merge conflicts.... all sorts of stuff.	17:53
	→ oojacoboo joined	17:54
str8uplinux	I guess I just really don't under stand the procedure.	17:54
	→ aboccia joined	17:54
	← AaronMT left	17:54
xvilka2	cbreak: kadoban: thx!	17:54
	← skyres left	17:55
cbreak	str8uplinux: you sure the server repo is bare?	17:55
	there shouldn't be any merge conflicts because there's no merging	17:55
	pushing is always either fast forward, forced, or fails	17:55
	← wrouesnel4 left	17:56
	→ hahuang65 joined	17:56
	→ skyres joined	17:56
str8uplinux	cbreak: i used --bare --shared on the shared directory.	17:57
cbreak	:O	17:57
	--shared?!?!	17:57
	→ joki joined	17:57
str8uplinux	cbreak: no merging? So if i am making changes in the same file as someone else at the same time, don't i get the option to see the changes first	17:57
	cbreak: is shared bad?	17:57
cbreak	it works via unix permissions.	17:58
	← dj3000 left	17:58
cbreak	do you have unix permissions? :)	17:58
	no merging means that push doesn't merge	17:58
str8uplinux	ahhhh, maybe that is it	17:58
	← notebox left	17:58
	← ghoti left	17:58
cbreak	if your changes aren't direct descendents of remote history you simply can't push	17:58
	← drollwit left	17:58
cbreak	(without forcing)	17:58
	merging only happens if you tell git to merge (i.e. via git merge or git pull)	17:58
str8uplinux	so if i do a push it will overwrite whatever is out there?	17:59
	← sasha left	17:59
str8uplinux	then if someone else pushes, it will overwrite mine with their copy? Isn't that bad?	17:59
	I'm guessing i just need to read more.	18:00
	haha	18:00
	→ ghoti joined	18:00
cbreak	str8uplinux: if you force push: yes	18:01
	that's the whole point of force pushing: to kill remote history	18:01
	← skyres left	18:01
	→ liamonade joined	18:02
	→ skyres joined	18:02
	← encod3 left	18:03
	→ Gizburdt joined	18:03
	← stantonk left	18:03
	← ilmgb left	18:03
	← Gizburdt left	18:04
str8uplinux	cbreak: so what is the steps my team should be taking? Clone repo > make changes to file(s) > Then merge? (to make sure we aren't overwriting eachother)	18:04
	→ bapalm joined	18:04
	→ ilmgb joined	18:04
cbreak	get a proper server	18:04
	← ntio left	18:04
	→ Phoenixz joined	18:04
cbreak	then clone the repo, work on it, commit, work, commit, and so on	18:04
	then pull and push as you see fit	18:04
	ril → ril[away]	18:04
cbreak	you can have a more structured workflow too like the git-flow thing	18:05
	→ Dynetrekk joined	18:05
str8uplinux	creak: but doesn't the commit only save it to your local working copy?	18:05
cbreak	sure.	18:05
	you don't need to push if you don't want to	18:05
	→ Gizburdt joined	18:05
str8uplinux	what if we are all working on it and want to merge our progress?	18:05
cbreak	then pull and push	18:05
	or pull --rebase and push	18:05
	or what ever else you want	18:05
str8uplinux	so when should i be using the merge command?	18:06
Dynetrekk	str8uplinux: my favorite: git pull --ff-only; then merge/rebase if necessary	18:06
	← skyres left	18:07
	→ Pookz joined	18:07
	→ bitkiller joined	18:07
	→ ErkiDerLoony joined	18:07
Dynetrekk	my question: does git have a " dry run" mode?	18:07
	→ Dzejmskr_ joined	18:07
	← stoogenmeyer_ left	18:08
BtbN	yes, use --dry-run	18:08
	→ skyres joined	18:08
	← ilmgb left	18:08
	← martinklepsch left	18:09
	← theCole left	18:09
	← Dzejmskrokan left	18:10
	← bernardio left	18:11
	← dgutierrez1287 left	18:11
	→ theCole joined	18:11
	← drathir left	18:11
	→ nettoweb joined	18:12
	← astockton left	18:12
	→ drathir joined	18:12
	→ mingwandroid joined	18:12
Dynetrekk	BtbN: I should have guessed...	18:12
	→ ag4ve joined	18:12
	← skyres left	18:13
	← ErkiDerLoony left	18:13
	← Gizburdt left	18:14
	→ skyres joined	18:14
	→ astockton joined	18:14
str8uplinux	cbreak: So I just recreated my repo on the server using git init --bare I created my own local repo with git init and created my remote origin pointed to shared drive. I created a readme file and commited and pushed it to the server. I then had one of my team members clone the repo from the server. Make a change to readme file and try to push it. And he gets the following error: http://pastebin.com/CVhNZ3YZ	18:14
	Dynetrekk: ^ just incase you have any ideas as well	18:15
cbreak	str8uplinux: I STRONGLY recommend not putting git repos onto shares	18:15
str8uplinux	cbreak: what do you recommend then?	18:16
cbreak	just don't do it	18:16
	← CustosLimen left	18:16
Dynetrekk	cbreak: it's worked for me...	18:16
cbreak	put them onto a proper filesystem	18:16
	→ martinklepsch joined	18:16
Dynetrekk	cbreak: what's so bad about it?	18:16
	cbreak: if you're on windows you're fucked wrt FS anyway	18:16
cbreak	it's slow and can bug out in weird ways	18:16
	ntfs isn't too bad	18:16
str8uplinux	We don't feel like it is necessary to store our code out on bitbucket	18:16
Dynetrekk	it's better than shares, yes	18:16
Eugene	!dropbox applies here	18:17
gitinfo	Storing git repositories on DropBox is a Very Bad Idea™. Use a free hosting service (such as Bitbucket or GitHub), or read !dropbox_why if you insist upon having your repo corrupted.	18:17
Dynetrekk	str8uplinux: bitbucket is nicer than most options, if the model fits your use case	18:17
cbreak	str8uplinux: just get yourself a small server	18:17
	str8uplinux: bitbucket is a cheap way, but you can get a real computer with gitolite, gitlab or what ever too	18:17
	if you prefer self-hosting	18:17
Dynetrekk	str8uplinux: in my experience, trying the command multiple times works at some point	18:17
qsuscs	Eugene: it applies to CIFS shares in windows?	18:18
Eugene	!dropbox_why	18:18
gitinfo	git uses a lot of frequently-changed small files, which dropbox's synchronization algorithms barf on. Use of multiple dropbox clients compounds this, with hilarious results	18:18
cbreak	I've had problems with CIFS shares and git on OS X	18:18
Eugene	CIFS hates you ;-)	18:18
cbreak	but I bet you have similar issues with windows	18:18
	→ Gizburdt joined	18:19
Eugene	It's not a question of if it will vomit on your shoes, it's when	18:19
qsuscs	hm	18:19
	diminoten → Laaw	18:19
qsuscs	will it if i am the only one accessing it and only using it as a remote?	18:19
offby1	I've never met a networked file system that I trusted	18:19
	← skyres left	18:19
	→ cromero joined	18:20
	→ encod3 joined	18:20
Dynetrekk	cbreak: you're right wrt CIFS but what can you do when you don't have a real OS?	18:20
qsuscs	wat	18:20
cbreak	Dynetrekk: get one? :)	18:21
	linux and freebsd is free	18:21
	→ _0xc6_ joined	18:21
qsuscs	Dynetrekk: you can install "git server software" on windows if you mean that	18:21
	← phantombeta left	18:21
	← Phoenixz left	18:21
	→ tvw joined	18:21
qsuscs	microsoft team foundation server supports git as of version 2013, for example.	18:21
	→ averell joined	18:21
Dynetrekk	cbreak: IT gnome at work won't let me linuxify his server	18:21
	_0xc6_ → {0xc6}	18:21
	→ nerd joined	18:21
	→ Dorf joined	18:21
Dynetrekk	it's actually a multi-MS-gnome system, too	18:22
cbreak	Dynetrekk: then tell him to install gitolite or gitlab	18:22
	Dynetrekk: then it's his problem.	18:22
Dynetrekk	cbreak we've finally gotten stash	18:22
qsuscs	gitolite on windows however sounds painful	18:22
Dynetrekk	cbreak: but sometimes it's nice to use git for non-programming stuff	18:22
qsuscs	(well, perl anywhere _is_ painful.)	18:22
	→ otter768 joined	18:22
offby1	now now	18:22
	← afs left	18:22
Dynetrekk	perl is the gaelic spelling of pain	18:22
	→ skyres joined	18:23
qsuscs	offby1: i'd rather do COM in C++ than perl.	18:23
	← bket left	18:23
	→ phantombeta joined	18:23
	← crose left	18:23
	← sanketdg left	18:24
	← drathir left	18:24
	← ril[away] left	18:24
	→ sanketdg joined	18:24
	→ bizportal joined	18:25
	← dopie left	18:25
	→ Phoenixz joined	18:25
	→ bket joined	18:25
	← aboccia left	18:25
	→ drathir joined	18:26
	→ NeverDie joined	18:26
	← nettoweb left	18:26
	→ ProT-0-TypE joined	18:26
	← otter768 left	18:27
	← skyres left	18:27
	← theCole left	18:28
	→ skyres joined	18:29
	← ProT-0-TypE left	18:29
	← p4trix left	18:30
	← cdown left	18:30
	→ bernardio joined	18:31
	← cromero left	18:31
	→ tehtraveler joined	18:32
	→ p4trix joined	18:33
	← skyres left	18:33
	→ pm90_ joined	18:34
	→ skyres joined	18:35
	→ CustosLimen joined	18:35
	→ Dougie187 joined	18:35
	← Dzejmskr_ left	18:35
	→ ntio joined	18:36
	→ jgardella joined	18:36
	→ Brain joined	18:36
	← irc-5225225 left	18:39
	← pm90_ left	18:39
	→ irc-5225225 joined	18:39
	← skyres left	18:39
	← irc-5225225 left	18:40
	→ Walex joined	18:40
	→ irc-5225225 joined	18:40
	→ skyres joined	18:41
	← tvw left	18:41
	← Walex left	18:41
	→ eddd_ joined	18:41
	← hahuang65 left	18:42
	← tristanseifert left	18:45
	→ Walex joined	18:45
	→ ap3r7ur3 joined	18:45
	← drathir left	18:45
	← blimpse left	18:45
	→ iamjarvo joined	18:46
	← skyres left	18:46
	← iamjarvo left	18:46
	← ap3r7ur3 left	18:46
	→ iamjarvo joined	18:46
	→ ap3r7ur3 joined	18:47
	→ voiter joined	18:47
	→ drollwit joined	18:47
	→ aboccia joined	18:47
voiter	how can i reduce the size of origin (i.e. get rid of old commits no one is interested anymore)	18:47
	← bearcat_ left	18:48
	← aboccia left	18:48
voiter	*in	18:48
	← macabre left	18:49
	→ skyres joined	18:49
	→ livingstn joined	18:49
	← SocialBlunder left	18:49
	→ n00bdev joined	18:50
	← voiter left	18:50
cbreak	rewrite history	18:50
	then force push	18:51
	then gc	18:51
	but that will cause trouble for everyone else that cloned	18:51
	→ versatile joined	18:51
qsuscs	cbreak: 20:50 <-- voiter (~voiter@pub082136127226.dh-hfc.datazug.ch) hat den IRC verlassen (Client Quit)	18:51
cbreak	after 2 mins?!	18:51
	→ Balliad joined	18:52
qsuscs	shrug	18:52
	→ bearcat_ joined	18:52
	← drollwit left	18:52
	→ jmckind joined	18:53
	← dr3w left	18:54
	→ Dzejmskrokan joined	18:54
	→ dr3w joined	18:54
	← bernardio left	18:54
	← Dragooon left	18:55
	← skyres left	18:55
	← nerd left	18:56
	→ mquin_ joined	18:58
	→ bernardio joined	18:58
	← mquin_ left	18:58
	→ cromero joined	18:58
	→ skyres joined	18:58
	← tarkus left	19:00
	→ mquin_ joined	19:01
	← Texan left	19:01
	→ Texan joined	19:01
	→ tarkus joined	19:02
	→ macabre joined	19:03
	← skyres left	19:03
	→ ril joined	19:03
	← hahuang61 left	19:03
	← cromero left	19:04
	← iamjarvo left	19:04
	→ ilmgb joined	19:04
	→ skyres joined	19:05
	→ sheilong joined	19:05
	mquin → Guest32944	19:06
	mquin_ → mquin	19:06
	← Guest32944 left	19:06
	→ devoldmx_ joined	19:07
	→ cromero joined	19:09
	→ editshare-ericf joined	19:09
	← Muhannad left	19:09
	← skyres left	19:09
	→ stoogenmeyer_ joined	19:11
	→ skyres joined	19:11
	← Soni left	19:11
	← PaulCapestany left	19:11
	← LBV_User left	19:11
	→ Soni joined	19:13
	← teran left	19:13
	← ItSAN____ left	19:14
	← ilmgb left	19:14
	← leatherface416 left	19:14
	← cromero left	19:15
	← skyres left	19:15
	→ iamjarvo joined	19:15
	← bernardio left	19:15
	→ SmashingX2 joined	19:15
SmashingX2	is there any command in git where I don’t have to stash all my changes before doing a pull?	19:16
	← guampa left	19:16
SmashingX2	I mean everytime I have to get the lastest changes I have to stash my changes and then pull and then pop my stash	19:16
	→ Ajacmac joined	19:16
SmashingX2	is there any command that does that automatically, I mean that puts all my changes on top of pull?	19:17
	← b00n left	19:17
	← jgardella left	19:17
	→ skyres joined	19:17
	→ cromero joined	19:17
	← MechtiIde left	19:17
	← GoddeR left	19:17
	→ diegoviola joined	19:17
grawity	"legit sync"	19:18
	← cromero left	19:18
	← kadoban left	19:18
grawity	http://www.git-legit.org/	19:18
Ajacmac	so I have a private repo on bitbucket for my brother and I and every time one of us goes to make a push my account password is needed. how can I change that?	19:18
	← sarri left	19:18
grawity	Ajacmac: either set up a credential helper (man git credential-cache) or use SSH instead of HTTPS	19:18
gitinfo	Ajacmac: the git-credential-cache manpage is available at http://jk.gs/git-credential-cache.html	19:18
Ajacmac	thanks!	19:19
	← shurnormal left	19:19
	→ sarri joined	19:20
grawity	ssh supports pubkey auth instead of passwords	19:20
	in fact, bitbucket even requires that	19:20
	← Kulrak left	19:21
	← CustosLimen left	19:21
	→ Nick-S joined	19:22
tang^	SmashingX2: what tools are you using?	19:22
Ajacmac	I haven't actually used SSH before, but I've heard enough talk about it to know it's pretty ubiquitous. How would I switch to using SSH? Would using git from cmd/terminal still work the same way?	19:22
	← skyres left	19:22
grawity	well do you remember `git clone https://...`	19:22
tang^	IntelliJ IDEA can autostash your work and restore it if you do a pull/rebase	19:22
Ajacmac	grawity: yes	19:23
grawity	you wouldn't work with / over SSH yourself, you'd just tell Git to talk to bitbucket over SSH instead of HTTPS	19:23
	using an address like `git@bitbucket.com:foo/bar` or `ssh://git@bitbucket.com/foo/bar`	19:23
	you can change it with `git remote set-url`	19:23
	→ skyres joined	19:24
Ajacmac	grawity: ah, I figured it was something like that. thank you for all the help!	19:24
grawity	in bitbucket, when you click "Clone", it shows you URLs for both protocols	19:24
	as for setting up SSH keys	19:24
	github help has an article about it, bitbucket help has an article about it, and so on	19:24
	might be harder than git-credential-cache, might be easier	19:25
	← dr3w left	19:25
	← eddd_ left	19:25
	→ veae joined	19:25
	← veae left	19:26
	← IrishPrime left	19:26
	→ jimmy51v_ joined	19:27
	← skyres left	19:28
	→ Muhannad joined	19:29
	← Jackneill left	19:29
	← locksmith2 left	19:29
	→ Jackneill joined	19:30
	→ skyres joined	19:30
	← Jackneill left	19:30
	→ [cust] joined	19:32
	← w00die left	19:32
	→ Vctc joined	19:32
	← Vctc left	19:32
	→ Jackneill joined	19:32
	← Jackneill left	19:32
	→ guampa joined	19:32
	→ ayeg joined	19:33
	→ Jackneill joined	19:33
	← Jackneill left	19:33
	→ eme joined	19:33
	← ayeg left	19:34
	← skyres left	19:34
	← Walex left	19:34
	→ Uuepo joined	19:35
	← Uuepo left	19:35
	→ Jackneill joined	19:35
	← Jackneill left	19:36
	→ Kulrak joined	19:36
	← Kulrak left	19:36
	→ Kulrak joined	19:36
	← gambl0re left	19:36
Ajacmac	I ran through a tutorial before where the code was already typed for each stage and you simply used checkout v0.X to switch between stages of completeness for the tutorial...what was going on there? Was it just a set of different branches for each version?	19:37
	→ skyres joined	19:37
	→ gambl0re joined	19:37
	→ Dfmc joined	19:37
	← Dfmc left	19:37
	bearcat_ → suyan	19:38
	← ap3r7ur3 left	19:38
	← astockton left	19:38
	← PCatinean left	19:38
	← gopar left	19:38
madewokherd	they're probably tags	19:39
	→ astockton joined	19:39
	← sanketdg left	19:39
	→ gopar joined	19:39
	→ Walex joined	19:40
str8uplinux	anyone use Bonobo on Server 2012?	19:40
	← devoldmx_ left	19:41
	← suyan left	19:41
SmashingX2	tang^: Im using git, github and gitup	19:41
	← Nick-S left	19:41
	← skyres left	19:41
	→ bearcat_ joined	19:41
	→ drollwit joined	19:41
	← Gizburdt left	19:42
	← bearcat_ left	19:42
	← sarri left	19:42
	→ oxng joined	19:43
	→ suyan joined	19:43
	← oxng left	19:43
	→ shpoont joined	19:43
	→ skyres joined	19:43
	← upene left	19:44
	← iamjarvo left	19:44
	← shpoont left	19:44
	→ upene joined	19:44
	→ Ryiga joined	19:46
	→ m0viefreak joined	19:46
	← eme left	19:46
	← drollwit left	19:46
	← Ryiga left	19:46
	← gambl0re left	19:46
	← skyres left	19:47
	→ Bnt joined	19:47
	← Bnt left	19:47
	→ YaM2 joined	19:48
	→ dfaught joined	19:48
	→ gambl0re joined	19:49
	→ Oiaf joined	19:49
	ril → ril[away]	19:49
	← Oiaf left	19:49
	ril[away] → ril	19:49
	→ skyres joined	19:49
	→ Xivve joined	19:50
	← Xivve left	19:51
	→ cromero joined	19:51
	← gambl0re left	19:52
	→ SocialBlunder joined	19:52
	→ ValicekB joined	19:52
	→ bernardio joined	19:53
	→ eddd joined	19:53
	→ Djaly joined	19:53
	← cromero left	19:53
	→ cdown joined	19:53
	← Djaly left	19:53
	← skyres left	19:54
	→ genbattle joined	19:54
	→ koup joined	19:55
	← koup left	19:55
	→ skyres joined	19:56
	→ cromero joined	19:56
	→ hrea joined	19:56
	← SocialBlunder left	19:56
	← jceb left	19:56
	← hrea left	19:56
	→ Gizburdt joined	19:57
	→ mazpe joined	19:57
mazpe	ok.. so created a local branch git checkout -b lester/fix123	19:57
	how do i push this fix to my github? as branch as lester/fix123	19:58
	← cdown left	19:58
	→ pmje joined	19:58
	→ gambl0re joined	19:58
	← pmje left	19:59
	← skyres left	20:00
	ril → ril[away]	20:00
	→ Atikv joined	20:01
	ril[away] → ril	20:01
	← Walex left	20:01
	← Atikv left	20:01
	← NeverDie left	20:02
	← ag4ve left	20:03
	→ skyres joined	20:03
	ril → ril[away]	20:03
	← cromero left	20:05
	← zadock left	20:05
	→ darkbasic_ joined	20:05
mazpe	git push origin lester/message:lester/message ?? or something like that	20:06
	← darkbasic left	20:06
	← Gizburdt left	20:06
qsuscs	!refspec	20:07
gitinfo	[!refspecs] Refspecs are used by fetch/push to specify which refs to transmit where. They have the form "source:destination". They can be prefixed with a "+" to force the update, possibly displacing existing history. More info: http://jk.gs/git-fetch.html or http://i.qkme.me/3tke7r.jpg	20:07
qsuscs	git push origin lester/fix123 should do	20:07
	← duderonomy left	20:07
	← danzilio left	20:07
	← skyres left	20:07
	→ ItSANgo joined	20:08
	→ Totkv joined	20:08
	← Totkv left	20:08
	← gambl0re left	20:08
	→ mar joined	20:09
	← tehtraveler left	20:09
	← nnyk_ left	20:09
	← mar left	20:09
	→ d2dchat_ joined	20:09
	→ editshare-ericf_ joined	20:10
	← wistler42 left	20:10
	← p4trix left	20:10
	← editshare-ericf left	20:10
	← xvilka2 left	20:10
	→ gambl0re joined	20:10
	→ skyres joined	20:11
	→ faux___ joined	20:11
	→ aboccia joined	20:11
	← pantsman- left	20:11
	← joki left	20:11
	← ItSANgo left	20:11
	→ Walex joined	20:11
	← Muhannad left	20:11
	← bernardio left	20:12
	→ joki- joined	20:12
	← d2dchat left	20:12
	← suyan left	20:12
	← Saturn812 left	20:12
	← dstarh left	20:12
	→ danzilio joined	20:12
	← govg left	20:12
	→ bernardio joined	20:12
	→ govg joined	20:12
	← sparetire_ left	20:13
	→ Niuu joined	20:13
	← Niuu left	20:13
	← aboccia left	20:13
	← CEnnis91 left	20:14
	→ aboccia joined	20:14
	← mquin left	20:14
	← Kulrak left	20:14
	→ mquin_ joined	20:15
	← faux___ left	20:15
	← creppe left	20:15
	← skyres left	20:15
	→ iamjarvo joined	20:16
	→ CEnnis91 joined	20:16
	→ creppe joined	20:16
	→ bb0x joined	20:16
	→ Gfyy joined	20:18
	← Gfyy left	20:18
	← tortal left	20:18
	→ skyres joined	20:18
	→ Texan_ joined	20:18
	→ Gizburdt joined	20:19
	→ yliw joined	20:20
	← yliw left	20:20
	← qpdb left	20:21
	ril[away] → ril	20:21
	← Gizburdt left	20:21
	→ qpdb_ joined	20:21
	← Texan left	20:21
	→ Gizburdt joined	20:21
	→ dr3w joined	20:22
	→ shinnya joined	20:22
	← saharanNomad left	20:22
	← skyres left	20:23
	→ otter768 joined	20:23
	→ ItSANgo joined	20:23
	→ dgutierrez1287 joined	20:23
	← bb0x left	20:23
	→ tortal joined	20:24
	→ efw joined	20:24
	← efw left	20:24
	→ Ebjz joined	20:25
	← Ebjz left	20:26
	→ skyres joined	20:26
	← gambl0re left	20:26
	← Gizburdt left	20:26
	← sgambino left	20:26
	→ Uqcf joined	20:27
	← bizportal left	20:27
	← dr3w left	20:27
	← Uqcf left	20:27
	← otter768 left	20:27
	← dgutierrez1287 left	20:27
	← rwb left	20:27
	→ Walex2 joined	20:28
	→ jmckind_ joined	20:28
	← jds left	20:28
	→ fcwi joined	20:29
	← astockton left	20:29
	← fcwi left	20:29
	→ Muhannad joined	20:29
	→ Kulrak joined	20:29
	← Kulrak left	20:29
	→ Kulrak joined	20:29
	→ bb0x joined	20:29
	← Dzejmskrokan left	20:30
	→ Ypgg joined	20:30
	→ gambl0re joined	20:30
	← Ypgg left	20:30
	← skyres left	20:31
	→ astockton joined	20:31
	← Walex left	20:31
	← Walex2 left	20:31
	→ elsevero joined	20:31
	→ aait joined	20:32
	← jmckind left	20:32
	→ nettoweb joined	20:32
	← aait left	20:32
	→ Walex joined	20:33
	→ w00die joined	20:33
	→ skyres joined	20:33
	→ Aqw joined	20:33
	← jmckind_ left	20:33
	← Aqw left	20:34
	→ michaeljdennis joined	20:34
	→ GoddeR joined	20:34
	← michaeljdennis left	20:34
	→ michaeljdennis joined	20:35
	← Corey84 left	20:35
	→ drollwit joined	20:36
	→ IWishIKnew joined	20:36
	← mutbuerger left	20:36
	← skyres left	20:37
	→ cdown joined	20:38
	→ sdbor joined	20:38
	← sdbor left	20:38
	→ jmckind joined	20:38
	→ hahuang61 joined	20:39
	← drollwit left	20:40
	→ skyres joined	20:40
	→ ibre joined	20:40
	← ibre left	20:41
	→ Gizburdt joined	20:41
	← synthmeat left	20:41
	→ Resc joined	20:42
	← Resc left	20:42
	→ gutocarvalho joined	20:43
	← genbattle left	20:43
	→ crose joined	20:43
	← astockton left	20:44
	← GoddeR left	20:44
	→ keer joined	20:44
	→ astockton joined	20:44
	← mbrzuzy left	20:44
	→ GoddeR joined	20:44
	← keer left	20:44
	← cdown left	20:44
	← skyres left	20:45
	→ ieho joined	20:45
	← ieho left	20:46
	→ eka joined	20:46
	← thiago left	20:47
	← Walex left	20:47
	← str8uplinux left	20:47
	→ skyres joined	20:47
	→ beckyconning_ joined	20:47
	→ nnyk_ joined	20:48
	← Qantourisc left	20:50
	← bapalm left	20:50
	→ X67r joined	20:50
	→ dr3w joined	20:51
	← nour left	20:51
	← bernardio left	20:52
	→ Corey84 joined	20:52
	→ lukequaint joined	20:52
	→ Qantourisc joined	20:52
	← skyres left	20:52
	→ SocialBlunder joined	20:52
	← flashpoint9 left	20:53
	← jadew left	20:53
	→ skyres joined	20:54
	← jimmy51v_ left	20:54
	→ Asylm joined	20:55
	← cavallari left	20:55
	→ thiago_ joined	20:56
	← Asylm left	20:56
	← rnsanchez left	20:57
	← SocialBlunder left	20:57
	← Texan_ left	20:58
	→ SimonNa joined	20:58
	→ vpnpu joined	20:58
	← vpnpu left	20:58
	← skyres left	20:59
	← Muhannad left	20:59
	→ Walex joined	20:59
	← Balliad left	21:00
	→ Ozmii joined	21:00
	→ jadew joined	21:00
	→ Balliad joined	21:00
	← Ozmii left	21:00
	→ skyres joined	21:01
	← livingstn left	21:01
	→ ThinThread joined	21:02
ThinThread	i accidently commited to a detached branch then git checkout master. did i lose my change?	21:02
	← michaeljdennis left	21:03
	← Kulrak left	21:03
cbreak	ThinThread: no	21:03
	→ Bombe joined	21:03
cbreak	ThinThread: you can do a git branch lost @{1}	21:04
	→ irqq joined	21:04
cbreak	ThinThread: and then !lol	21:04
gitinfo	ThinThread: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	21:04
cbreak	the new lost branch should point at what you left behind	21:04
	→ cspm joined	21:04
cbreak	you can merge it, check it out and rebase, cherry-pick commits, what ever you want	21:04
	← cspm left	21:04
	← skyres left	21:05
	← gambl0re left	21:05
ThinThread	hm dont see in list	21:06
	← nettoweb left	21:06
	← sheilong left	21:06
	→ gambl0re joined	21:06
ThinThread	maybe cuz of other ways i tried to fix	21:06
cbreak	oh, you did other things?	21:06
	ThinThread: then look at git reflog	21:06
	← astockton left	21:06
cbreak	it lists all the past reflog steps	21:06
	@{1} is just the previous one	21:06
ThinThread	ah yeah i see it in git reflog nice	21:06
	→ skyres joined	21:07
cbreak	just use that number instead of @{1}	21:07
	← jadew left	21:07
cbreak	(you can also merge it directly or so)	21:07
	→ devoldmx_ joined	21:07
	← elsevero left	21:08
	→ uhuzl joined	21:08
	→ sheilong joined	21:08
ThinThread	ok nice got them in lost branch. now i just checkout master. and git merge lost. worked!	21:08
	← uhuzl left	21:08
ThinThread	thanks a lot cbreak!	21:08
	→ Zariel joined	21:09
	→ elsevero joined	21:09
	→ Walex2 joined	21:09
qsuscs	git:kernel:git/git::Documentation	21:09
gitinfo	Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation?h=HEAD	21:09
	← SmashingX2 left	21:10
	→ diego2 joined	21:10
	← skyres left	21:11
	→ tvw joined	21:11
	← Gama11_ left	21:11
	→ caen joined	21:12
	→ jadew joined	21:12
	← X67r left	21:12
	← caen left	21:12
	← diego2 left	21:12
	← Walex left	21:12
	→ X67r joined	21:12
	→ astockton joined	21:12
	← diegoviola left	21:12
	← ziemniako left	21:13
	→ skyres joined	21:13
	→ Ele joined	21:13
	← Ele left	21:13
	→ nettoweb joined	21:14
	→ maletor joined	21:14
	→ Nuuj joined	21:14
	→ Muhannad joined	21:15
	← Nuuj left	21:15
	← nettoweb left	21:15
	→ ayee joined	21:15
	← crose left	21:15
	→ qoo joined	21:16
	gitinfo set mode: +v	21:16
	← qoo left	21:16
ayee	Why does git consider an authorized_keys file as binary?	21:16
	index 350af11..c3b501c 100644	21:16
	Binary files a/authorized_keys and b/authorized_keys differ	21:16
	← Zariel left	21:16
	→ nofxx joined	21:16
	→ tjm_jimmy joined	21:16
ayee	If I do `file authorized_keys`, file says it's ascii	21:16
	I'm confused	21:16
	→ Kulrak joined	21:17
	← Kulrak left	21:17
	→ Kulrak joined	21:17
	← axl_ left	21:17
	→ aozuc joined	21:18
	← aozuc left	21:18
	← iamjarvo left	21:18
	← skyres left	21:18
	← jmckind left	21:19
ojacobson	ayee: the default detection behaviour is a heuristic	21:20
	→ zjpd joined	21:20
	← zjpd left	21:20
	← eka left	21:20
ojacobson	when it's wrong, set the type explicitly using .gitattributes, if it ends up mattering (eg. for merges, diffs)	21:20
	→ pm90_ joined	21:21
ayee	ok, I made a .gitattributes with authorized_keys text and that worked	21:21
	ojacobson: Is there a way for me to make a script that says, only wget a raw file from github if it's changed from my current file?	21:21
	→ skyres joined	21:21
ayee	say by only downloading the hash, and not the full file.	21:21
ojacobson	ayee: use git, instead	21:22
	→ qmle joined	21:22
	← qmle left	21:22
ojacobson	that's more or less what git-fetch does, and then git-reset or git-checkout can extract working files from git	21:22
	← petersr left	21:22
	← kpease left	21:23
ayee	ojacobson: hmm, ok. I guess I could make .ssh the git repo.	21:23
	→ lokapujya joined	21:23
	→ variable joined	21:25
	→ cagedwisdom joined	21:25
	→ TylerDurden joined	21:26
	← pm90_ left	21:26
ayee	ojacobson: Is there a way I can make it so conflicts never happen and I ignore any local changes?	21:26
	→ beastd joined	21:26
ojacobson	You sound like you're working your way through the advice in !deploy, so I'll link to that	21:26
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	21:26
	← skyres left	21:26
ayee	I guess `cd /home/centos/.ssh; git checkout master; git reset --hard; git fetch origin master:master;` ?	21:26
	or actually, perhaps another reset before the checkout. in case someone changed the branch and didn't commit.	21:27
	← sheilong left	21:27
	← IWishIKnew left	21:27
	→ skyres joined	21:28
	→ Efvk joined	21:29
	← Efvk left	21:29
	→ fission6 joined	21:30
	→ drollwit joined	21:30
fission6	is there a way to symlink a folder into my repo and have the files included and pushed upstream	21:30
ayee	fission6: git submodules?	21:31
	→ CustosLimen joined	21:31
	→ sergeii joined	21:31
	← TylerDurden left	21:31
cbreak	fission6: git recognizes symlinks... so no.	21:32
	just put the real files into the repo and commit them	21:32
	→ Ekdu joined	21:32
cbreak	and put the symlinks outside	21:32
	← skyres left	21:32
	← Ekdu left	21:32
fission6	i dont follow	21:33
	→ dbxde joined	21:34
	→ yqt joined	21:34
	→ skyres joined	21:34
	← dbxde left	21:34
Ajacmac	ok, so I made the first push in a new repo, added a readme on the bitbucket site and then tried to add a tag for the commit with the readme...but I'm getting a fatal error saying it failed to resolve that commit as a valid ref. What do I do to get the tag to work?	21:34
	← drollwit left	21:35
	← CKyle left	21:35
	→ oetp joined	21:35
	← oetp left	21:35
cbreak	Ajacmac: pastebin a transcript of what you did	21:36
	← Balliad left	21:36
	← upene left	21:36
	← madewokherd left	21:36
	← n00bdev left	21:36
	→ TylerDurden joined	21:36
	→ Fiqd joined	21:36
	← Fiqd left	21:37
	→ iota_pi joined	21:37
	→ gutoccarvalho joined	21:38
	→ Jackneill joined	21:38
	← gutocarvalho left	21:38
	← yqt left	21:39
	← ThinThread left	21:39
	← skyres left	21:39
	← armyriad left	21:39
iota_pi	I must be dim. Can anyone explain why I keep getting "modified: puppet-vagrant.conf" in my 'git status' output even though my .gitignore looks like this: http://pastebin.com/CZGYWpbQ	21:39
	→ upene joined	21:40
qsuscs	iota_pi: !ignore_untracked	21:40
gitinfo	iota_pi: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	21:40
	← omegamike left	21:40
qsuscs	iota_pi: sounds like !config	21:40
gitinfo	iota_pi: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	21:40
	→ skyres joined	21:40
iota_pi	Okay well at least that explains this.	21:41
	I'll have to reconsider how I want that file managed. Thanks for clearing it up.	21:41
	→ Hdec joined	21:41
	← devoldmx_ left	21:41
cbreak	iota_pi: just delete the file	21:41
	← Hdec left	21:42
cbreak	git will ignore it if you stop tracking it	21:42
	config files don't belong into git anyway, an application should create it if it's missing :	21:42
	← jerius left	21:42
Ajacmac	cbreak: https://bpaste.net/show/0eb04a488eea	21:43
iota_pi	Well for right now I still want users to get it when they first clone the repo. I think I'll replace it with a script that generates the proper config, and then I can untrack-and-ignore it.	21:43
	similar to ./configure	21:43
	→ n00bdev joined	21:43
cbreak	iota_pi: or rename it to foo.conf.template	21:43
	Ajacmac: a proper transcript	21:43
	Ajacmac: just copy &paste what you typed on the command line	21:44
	← irqq left	21:44
iota_pi	Yeah that would work too.	21:44
	→ sheilong joined	21:44
	← TylerDurden left	21:44
cbreak	Ajacmac: also, if you want to change a tag... why not use -f or delete the old one?	21:44
	← skyres left	21:45
	→ cromero joined	21:45
	mquin_ → mquin	21:45
Ajacmac	cbreak: there's a lot of additional stuff (I accidentally included my virtualenv so there are a LOT of files) what more do you need beyond what's there?	21:45
cbreak	Ajacmac: what you type, what the error message is	21:46
Ajacmac	cbreak: I'm unfamiliar with -f, I haven't used tags before aside from checking out with them once before so I really don't know how they're supposed to work.	21:46
cbreak	a tag is a label for a commit	21:46
	→ skyres joined	21:46
cbreak	tags are usually considered immutable, but otherwise just like branches	21:46
	→ ziemniako joined	21:47
cbreak	annotated tags (-a) are a bit different	21:47
	you want to make a tag twice, that's obviously not possible	21:47
	so force overwrite it, or delete it	21:47
ojacobson	Ajacmac: why are you creating a tab and then attempting to create it a second time?	21:47
	← elsevero left	21:48
	← cromero left	21:48
Ajacmac	ojacobson: the instructions I was following didn't make clear what exactly was happening when I created the tag, there was no mention that I caught explaining how it worked	21:48
ojacobson	Ajacmac: `git tag <name>` will create a tag pointing to the checked-out commit	21:49
	it's exactly equivalent to `git tag <name> HEAD` (as HEAD is the name for the checked-out commit)	21:49
Ajacmac	I saw an explicit way of assigning the tag to a commit and another that didn't have an explicitly given commit, but it didn't say that the tag was being applied to something. the language of the article used words like "available tags" that made it sound like they were mutable, etc.	21:50
cbreak	they are.	21:50
	→ Nick-S joined	21:50
cbreak	if you force it	21:50
ojacobson	Almost nothing in git is truly immutable	21:50
	git's more like a bag of machines for operating on a history-shaped labelled graph than it is a source control system in its own right	21:50
	→ osum4est joined	21:51
	← skyres left	21:51
	← jadew left	21:51
	→ jadew joined	21:51
	→ haroo joined	21:51
	← draigu left	21:51
osum4est	hello, i work on two different computers. can i use git to copy my project from one computer to another, without creating a perminant commit?	21:51
	← haroo left	21:51
	← macabre left	21:51
osum4est	* in case im right in the middle of adding a feature	21:52
bremner	use a temporary branch	21:52
	→ skyres joined	21:52
	→ ssarah joined	21:53
	← gutoccarvalho left	21:53
	← osum4est left	21:53
	→ tanath joined	21:53
	← bb0x left	21:54
	← sheilong left	21:54
	← Jackneill left	21:54
qsuscs	.oO( git push blah refs/stash )	21:55
ojacobson	qsuscs: good luck making sure the reflog ends up in a state stash can work with	21:55
qsuscs	ah, that	21:56
	i knew i missed something	21:56
	→ cdown joined	21:56
	→ sheilong joined	21:57
	← snthsnth left	21:57
	← skyres left	21:58
	→ yqt joined	21:58
	→ Akfi joined	21:58
	← Akfi left	21:59
	← maletor left	21:59
	← Nick-S left	22:00
	← dadamssg left	22:00
	← Dougie187 left	22:00
	→ shpoont joined	22:00
	← victortyau left	22:01
	← a3Dman left	22:01
	→ snthsnth joined	22:01
	→ skyres joined	22:01
	← ssarah left	22:01
	→ FernandoBasso joined	22:01
	→ Amandil joined	22:01
	→ irqq joined	22:04
	→ a3Dman joined	22:04
	→ armyriad joined	22:05
	← ayee left	22:05
	→ Cydrobolt joined	22:05
	← Cydrobolt left	22:05
	→ Cydrobolt joined	22:05
	← dfaught left	22:05
	← skyres left	22:06
	→ VictorCL joined	22:06
	→ madewokherd joined	22:07
	→ TylerDurden joined	22:08
	← circ-user-6TzUd left	22:08
	← sheilong left	22:09
	→ WaReZ joined	22:09
	→ skyres joined	22:09
	→ ag4ve joined	22:10
	→ sheilong joined	22:10
	← hahuang61 left	22:10
	← Kulrak left	22:11
	← s00pcan left	22:12
	→ diegoviola joined	22:12
	→ s00pcan joined	22:12
	→ Lzfo joined	22:13
	→ Balliad joined	22:13
	← Lzfo left	22:13
	← WaReZ left	22:13
	← TylerDurden left	22:13
	← skyres left	22:14
	→ WaReZ joined	22:14
	← Kicer86 left	22:14
	→ teran joined	22:14
	→ znabavi joined	22:15
	→ skyres joined	22:15
	→ Ukioq joined	22:16
	← Ukioq left	22:16
	← Gizburdt left	22:19
	← skyres left	22:19
	→ skyres joined	22:21
	→ Gipxj joined	22:21
	← Gipxj left	22:21
	← Amandil left	22:21
	→ xk_id joined	22:22
	→ hahuang61 joined	22:22
	→ v0n joined	22:22
	← Balliad left	22:23
	→ otter768 joined	22:24
	→ drollwit joined	22:24
	→ jwhisnant joined	22:24
	← jwhisnant left	22:24
	→ Kulrak joined	22:25
	← Kulrak left	22:25
	→ Kulrak joined	22:25
	→ suyan joined	22:25
	→ Tuke joined	22:25
	← Tuke left	22:25
	← gambl0re left	22:26
	← editshare-ericf_ left	22:26
	← skyres left	22:26
	← dsantiago left	22:28
	← otter768 left	22:28
	← eggoez left	22:28
	← drollwit left	22:29
	← wrouesnel1 left	22:29
	→ skyres joined	22:29
	← Liam` left	22:29
	→ eui joined	22:32
	← eui left	22:32
	→ eggoez joined	22:33
	← skyres left	22:34
	← cbonobo left	22:35
	→ cbonobo joined	22:35
	→ Vvo joined	22:36
	← Vvo left	22:37
	→ skyres joined	22:37
	→ devoldmx_ joined	22:38
	→ kadoban joined	22:39
	→ smw_ joined	22:39
	← cbonobo left	22:40
	← s00pcan left	22:40
	→ asywo joined	22:41
	← asywo left	22:41
	→ s00pcan joined	22:41
	→ agzi joined	22:42
	← agzi left	22:42
	← skyres left	22:43
	← eddd left	22:43
	→ skyres joined	22:43
	← turtledi1 left	22:44
	→ ixian joined	22:44
	→ yoia joined	22:45
	← yoia left	22:45
	→ Liam` joined	22:46
	← danzilio left	22:46
	→ ilmgb joined	22:47
	→ xeeht joined	22:47
	← xeeht left	22:47
	← D-Boy left	22:47
	← skyres left	22:48
	→ iamjarvo joined	22:48
	→ skyres joined	22:49
	← FreezingCold left	22:50
	→ pm90_ joined	22:51
	→ Wxfe joined	22:51
	← ilmgb left	22:52
	← Wxfe left	22:52
	← skyres left	22:53
	→ dgutierrez1287 joined	22:53
	← tjm_jimmy left	22:54
	→ toothrot joined	22:54
	→ skyres joined	22:54
	← pm90_ left	22:56
	← dgutierrez1287 left	22:57
	→ aacl joined	22:57
	← aacl left	22:57
	→ dreiss joined	22:58
	→ michaeljdennis joined	22:58
	← lindenle left	22:58
	← TomyLobo left	22:58
	→ dsantiago joined	23:00
	← skyres left	23:00
	← WaReZ left	23:00
	→ tristanseifert joined	23:01
	→ Obiss joined	23:01
	← Obiss left	23:02
	← suyan left	23:03
	← Dorf left	23:03
	→ crayon joined	23:03
	→ skyres joined	23:03
	→ Dorf joined	23:03
	→ D-Boy joined	23:03
	→ zheng joined	23:04
	→ Wlime joined	23:05
	← Wlime left	23:05
	← Spacew00t left	23:06
	← wicope left	23:06
	→ vF3hNGxc47h5 joined	23:07
	→ tristans1 joined	23:07
	← skyres left	23:07
	← lokapujya left	23:07
	→ kermit joined	23:07
	← tristanseifert left	23:08
	→ skyres joined	23:09
	← {0xc6} left	23:09
	→ jerius joined	23:09
	→ nonconvergent joined	23:10
	← crayon left	23:10
nonconvergent	So having some git headaches. How can I see what actions a commit performed?	23:11
	← devoldmx_ left	23:11
soerenb	git show <commit>	23:11
	→ abreu joined	23:12
nonconvergent	Do reverts show up as commits?	23:12
soerenb	git revert creates a commit that is the inverse of the commit you pass to revert, yes	23:12
	→ Axtm joined	23:13
	← Axtm left	23:13
	← skyres left	23:13
	→ skyres joined	23:14
	← ShooterMG left	23:14
	→ clarkpan joined	23:15
nonconvergent	Okay, so if I have a file, and I want to see the history of that file by commits, that's git log <branch> -p <file> ?	23:15
	← vF3hNGxc47h5 left	23:16
	← chitopunk left	23:17
	→ vF3hNGxc47h5 joined	23:17
	← Es0teric left	23:17
	← Corey84 left	23:17
osse	yes	23:17
	Usually one puts -p at the beginning but it doesn't matter	23:18
	→ drollwit joined	23:18
	← jerius left	23:18
	← Qantourisc left	23:18
	← skyres left	23:18
nonconvergent	So here's the weird thing. I know that a more recent commit touched this file. That e6b8687 (which shows up in my IDEA git changelog of the file) updated it on 8/5. But when I go to git log -p pom.xml, the most recent commit, ec234e45, occured on 8/3	23:18
	← mizu_no_oto left	23:19
	← Dorf left	23:19
osse	nonconvergent: try git log --all file	23:19
	← versatile left	23:20
nonconvergent	osse: I still don't see it.	23:20
	→ skyres joined	23:20
	→ DolpheenDream joined	23:20
	← JanC left	23:21
osse	hmm, not sure then	23:21
nonconvergent	O	23:21
	→ Dorf joined	23:21
nonconvergent	What does all do?	23:21
	abreu → _Rabr3u_	23:21
nonconvergent	I'm seriously wondering is something messed up with our remote.	23:21
	← clarkpan left	23:22
	→ clarkpan joined	23:22
	← _Rabr3u_ left	23:22
	→ _Rabr3u_ joined	23:23
nonconvergent	We have these pom.xml files and two different branches. We merge them both ways, but because master has versions in the pom one release ahead, we don't want to downgrade the poms when we merge release into master.	23:23
	← drollwit left	23:23
nonconvergent	We did a release where we merged master into release then incremented the versions on our master poms.	23:23
	← phupp left	23:24
	← zheng left	23:24
nonconvergent	And we have a .gitattributes file that says 'pom.xml merge=ours'	23:24
	← tvw left	23:24
	→ NeverDie joined	23:24
	← skyres left	23:25
	← tobyx_ left	23:25
nonconvergent	Wait...we have that gitattributes in both branches...should we only have it in master to keep the behavior I'm talking about?	23:25
	→ tobyx joined	23:25
	→ BennyPlayboy joined	23:26
	→ skyres joined	23:26
	→ Olipro joined	23:26
	→ omegamike joined	23:26
	→ phupp joined	23:27
	← s00pcan left	23:27
	← diegoviola left	23:27
nonconvergent	osse: ?	23:28
	← tchan left	23:28
	→ Nevik joined	23:28
	← tristans1 left	23:29
	← ril left	23:29
	← cdown left	23:30
nonconvergent	The .gitattributes is present in both branches, shouldn't it only be on master if I want master's pom.xml files to clobber release's, but not the other way around?	23:31
	Also, is 'pom.xml merge=ours' recursive?	23:32
	← skyres left	23:32
	→ suyan joined	23:32
nonconvergent	IE there's a lot of poms in a lot of folders. Will it cover all of them? Or does each pom.xml get one?	23:32
	← omegamike left	23:32
	→ jerius joined	23:33
	← astockton left	23:34
	← _Rabr3u_ left	23:34
	→ skyres joined	23:34
	← clarkpan left	23:35
	← VictorCL left	23:35
	→ clarkpan joined	23:36
	← tang^ left	23:37
	← clockworkfrog left	23:38
	→ sgambino joined	23:38
	→ clockworkfrog joined	23:38
	← skyres left	23:39
	← suyan left	23:39
	→ JanC joined	23:39
	→ Corey84 joined	23:40
	→ skyres joined	23:40
	← mikecmpbll left	23:40
	← X67r left	23:41
	→ Nizumzen joined	23:42
	← michaeljdennis left	23:43
	← vF3hNGxc47h5 left	23:44
	variable → trout	23:45
	← hexagoxel left	23:45
	→ hexagoxel_ joined	23:45
	← skyres left	23:45
	← nonconvergent left	23:46
	hexagoxel_ → hexagoxel	23:46
	← shpoont left	23:46
	← gbit86 left	23:47
	← iamjarvo left	23:47
	← jerius left	23:47
	→ skyres joined	23:48
	→ CKyle joined	23:49
	← clarkpan left	23:49
	→ Gcoia joined	23:49
	← Gcoia left	23:50
	← dreiss left	23:50
	→ clarkpan_ joined	23:50
	→ gbit86 joined	23:52
	← skyres left	23:53
	→ cbonobo joined	23:53
	← clarkpan_ left	23:54
	→ skyres joined	23:54
	← nnyk_ left	23:54
	← cbonobo left	23:54
	→ lindenle joined	23:59
	← skyres left	23:59
	← fstd left	23:59
	← MattMake_ left	23:59
	→ fstd joined	23:59
	← imachuchu left	23:59

Logs Search ←Prev date Next date→

Channels Documentation