IRCloggy #git 2014-02-16

Provider of IRC logs since 2005.

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

	2014-02-16
	← eletuchy left	00:00
	→ r0ok joined	00:00
	→ shingshang joined	00:00
	→ Mitchbones joined	00:01
	→ JEEB joined	00:02
	→ gnugnu5_ joined	00:03
	→ teran joined	00:03
	← sohail_ left	00:03
	← Not_Whatever left	00:03
	← t4nk770 left	00:04
	← gnugnu5 left	00:04
	→ simesy joined	00:09
	→ sohail_ joined	00:09
	← bwreilly left	00:10
	← RoryHughes left	00:10
	← simesy left	00:11
	→ WaReZ_ joined	00:11
	→ koda joined	00:11
	→ simesy joined	00:11
	← koell left	00:13
	→ theRealGentleman joined	00:13
	→ ilhami joined	00:13
ilhami	this git bash is really annoying me.	00:13
	← kotk1 left	00:16
ilhami	ok it works fine now :)	00:17
	→ fairuz joined	00:17
	← simesy left	00:17
	← Kaedenn left	00:18
	← mobai left	00:18
	← neophreak left	00:19
	← Malice left	00:19
	→ jatt joined	00:19
	← ilhami left	00:19
	→ mobai joined	00:19
	← fairuz left	00:20
	→ fairuz joined	00:20
	→ bwreilly joined	00:20
	→ srji_ joined	00:20
	← PLejeck left	00:20
	→ PLejeck joined	00:20
	← PLejeck left	00:21
	→ PLejeck joined	00:21
	→ john2x joined	00:22
	← srji left	00:23
	← imMute left	00:24
	→ imMute joined	00:24
	→ RoryHughes joined	00:25
	← Tommy[D] left	00:25
	← fairuz left	00:25
	→ fairuz joined	00:26
	← gelardi_ left	00:28
	← rgr left	00:31
	→ mikepack joined	00:32
	← fairuz left	00:33
	→ fairuz joined	00:33
	→ francisfish joined	00:33
	← beastd left	00:34
	→ Tommy[D] joined	00:34
	→ hahuang65 joined	00:36
	→ nettoweb joined	00:36
	← johnflux left	00:36
	← mikepack left	00:37
	→ polyzen joined	00:37
	← francisfish left	00:37
	→ Kayra joined	00:38
	← theRealGentleman left	00:38
	→ mikepack joined	00:39
	← nszceta left	00:40
	← nettoweb left	00:42
	← mobai left	00:42
	← Kayra left	00:42
	← MattStratton left	00:46
	→ evilbug joined	00:47
	← SorenHolm left	00:47
	→ dyng joined	00:48
	→ simesy joined	00:48
	← bwreilly left	00:49
	← heroux left	00:51
	← _iron left	00:52
	← jatt left	00:52
	→ eletuchy joined	00:56
	← simesy left	00:56
	← valgrind left	00:58
	← buddyq left	00:58
	← smsfail left	00:59
	→ Goplat joined	00:59
	← akurilin2 left	01:00
	← eletuchy left	01:00
	← oojacoboo left	01:01
	→ neophreak joined	01:01
	← lolmaus_ left	01:02
	→ mribeirodantas joined	01:02
	← WaReZ_ left	01:04
	→ lolmaus joined	01:04
	→ invinceable joined	01:05
	→ jatt joined	01:06
	← robustus left	01:06
	← ben_alman left	01:07
	→ robustus joined	01:08
	→ znDuff joined	01:10
	← teran left	01:10
	→ teran joined	01:10
znDuff	Can "git subtree split" be used incrementally in a way that isn't O(n) based on amount of total history (as opposed to n==number of new commits, which would be fine)?	01:10
	→ dancat joined	01:10
dancat	say I am on master branch and I want to commit, but I realize I want to commit on a new branch and leave master, what is the preferred means of resolving not switching to a new branch before dev	01:12
arand__	znDuff: I think that's what --rejoin if for.	01:12
	← mikepack left	01:13
	→ mikepack joined	01:13
	← asQuirreL left	01:13
	asQuirreL__ → asQuirreL	01:13
znDuff	arand__, ...ahh; so it is. Not completely sure I like the side effects, though.	01:14
	← trewe left	01:14
	znDuff looks at the --graft patch at https://gist.github.com/vi/5529807	01:15
	← teran left	01:15
arand__	dancat: I don't really understand the question but maybe !float is relevant?	01:15
gitinfo	dancat: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	01:15
	→ buddyq joined	01:15
	← Nizumzen left	01:16
	← RoryHughes left	01:16
dancat	thanks, that's what I'll do	01:17
	← mikepack left	01:17
dancat	can you define float?	01:17
arand__	~ "re-apply all non-committed modifications"?	01:18
dancat	sweet	01:19
arand__	Basically the equivalent of git stash, git checkout, git stash apply, but for very simple non-conflicting cases.	01:19
dancat	that's helpful	01:20
	marcjs__ → marcjs	01:20
	← Goplat left	01:20
arand__	Well, actaully "re-apply" might be a bad definition, since what you're actually doing is just keeping the modified file.	01:22
	← GT4066 left	01:22
	← ferreum left	01:22
	← sohail_ left	01:24
	← vkrest left	01:29
	← dougsland left	01:31
	← nnyk_ left	01:32
	← johnkevinmbasco left	01:32
	→ mobai joined	01:33
	→ dougsland joined	01:33
	← King_Hual left	01:34
	→ johnkevinmbasco joined	01:34
	→ sgambino joined	01:35
	← the8thbit left	01:38
	← conan_ left	01:39
	→ Nizumzen joined	01:40
	→ teran joined	01:41
	→ SocalNick joined	01:43
	← teran left	01:46
	← SHyx0rmZ left	01:47
	← lithiumjake left	01:48
	← ciampix left	01:49
	→ mateu joined	01:50
	→ lithiumjake joined	01:51
	← n-a-n left	01:53
	→ Goplat joined	01:54
	← jatt left	01:54
	← Nizumzen left	01:54
	← jalmeida left	01:56
	→ eletuchy joined	01:56
	→ lifelike joined	01:57
	← gnugnu5_ left	01:59
	→ diegoviola joined	02:01
	← eletuchy left	02:01
	→ conan joined	02:04
	← bgerber left	02:06
	→ FortySix2 joined	02:06
	← koda left	02:07
	NSFW → nsfw	02:08
	→ bgerber joined	02:09
	← LeMike left	02:10
	→ LeMike joined	02:12
	← danillonunes left	02:12
	← ezrafree left	02:12
	← FortySix2 left	02:14
	→ Balliad joined	02:15
	← vvetter left	02:17
	→ sohail_ joined	02:18
	← Vampire0_ left	02:19
	← knigitz left	02:23
	→ knigitz joined	02:23
	→ tmcmahon joined	02:28
	← tmcmahon left	02:30
	← pheaver left	02:31
	→ mikepack joined	02:31
	→ pr0ton joined	02:31
	→ Vampire0_ joined	02:32
	→ francisfish joined	02:34
	← Noldorin left	02:34
	← mellernoia left	02:36
	← mikepack left	02:36
	← salamanderrake left	02:37
	→ salamanderrake joined	02:37
	→ vkrest joined	02:37
	← jayallen left	02:38
	← dyng left	02:38
	← francisfish left	02:39
	→ dyng joined	02:39
	→ m104 joined	02:40
	← maroloccio left	02:41
	→ david_ joined	02:41
	→ tmcmahon joined	02:42
	← david_ left	02:42
	→ teran joined	02:43
	← dyng left	02:43
	← dort left	02:44
	→ david_ joined	02:45
	← n-st left	02:47
	← teran left	02:48
	→ emergion_ joined	02:49
	← buddyq left	02:50
	← mewm left	02:50
	← david_ left	02:50
	→ Davey joined	02:51
	← SocalNick left	02:52
	→ CheckDavid joined	02:53
	← kukks left	02:54
	← vipconsult left	02:57
	→ ErKa joined	02:57
	→ eletuchy joined	02:57
	← sgambino left	02:58
	← eletuchy left	03:02
	→ teran joined	03:03
	← elijah left	03:03
	→ elijah joined	03:03
	← teran left	03:08
	→ SocalNick joined	03:08
	→ el3ctron joined	03:08
	← jab416171_ left	03:09
	← BaconOverflow_ left	03:09
	← znDuff left	03:10
	→ znDuff joined	03:11
	← dytrivedi left	03:12
	← quackgyver left	03:12
	→ Noldorin joined	03:12
	→ dyng joined	03:13
	→ BaconOverflow_ joined	03:13
	← illbyte left	03:13
	← Noldorin left	03:13
	→ Noldorin joined	03:14
	← Noldorin left	03:14
	← damagna_ left	03:14
	← tmcmahon left	03:14
	← kapowaz left	03:14
	→ dytrivedi joined	03:14
	→ Noldorin joined	03:14
	→ illbyte joined	03:15
	← lacrosse left	03:15
	→ xsbeats joined	03:16
	← relipse left	03:16
	→ tmcmahon joined	03:16
	→ plut0n1um joined	03:16
	→ lacrosse joined	03:17
	→ jab416171_ joined	03:17
	← adam___ left	03:17
	→ kapowaz joined	03:18
	← ELLIOTTCABLE left	03:18
	→ adam___ joined	03:19
	← shruggar left	03:19
	→ quackgyver joined	03:20
Celelibi	Do you have an example of how to build a submodule with make and link against it?	03:20
	→ damagna_ joined	03:21
	← deuti left	03:21
	→ makubi_ joined	03:22
	→ ELLIOTTCABLE joined	03:23
	← Noldorin left	03:23
bremner	isn't a submodule just a directory from make's point of view?	03:23
	← sohail_ left	03:23
	← makubi left	03:26
	→ JEEBcz joined	03:26
	→ relipse joined	03:27
	← yargy left	03:28
	← robbyoconnor left	03:28
	→ robbyoconnor joined	03:28
	← JEEB left	03:29
	← tmcmahon left	03:30
	← el3ctron left	03:32
	← plut0n1um left	03:33
Celelibi	bremner: it is. Except that I don't have my hands on the code of the submodule.	03:33
	→ `Alberto joined	03:33
	← m104 left	03:34
	→ jKlaus joined	03:36
	← ORiON-- left	03:37
	→ dont-panic joined	03:37
jKlaus	Can anyone help me get git working?	03:38
	I have a git server setup that I can hit no problem from my other box	03:39
	but this is a new install and I'm sure I'm forgetting something	03:39
dont-panic	jKlaus: what's the problem?	03:39
jKlaus	by new install I mean new OS (and everything else)	03:39
	The problem seems to be with my git client but I figured someone in here may be able to tell me how to resolve it	03:40
	git command line seems to work fine	03:40
	→ ORiON-- joined	03:40
jKlaus	Client is Git Cola	03:40
	error is saying ssh_askpass: exec(None): No such file or directory	03:40
dont-panic	weird.. did you set up authorized_keys?	03:41
jKlaus	No, I wasn't going to on this box	03:41
	I have askpass installed though	03:41
	maybe try to remove it and reinstall?	03:42
	← JeanCarloMachado left	03:42
	→ mizu_no_oto joined	03:43
	← Balliad left	03:43
	← SocalNick left	03:44
	→ ben_alman joined	03:44
	→ kukks joined	03:44
dont-panic	no clue... I've only used auth keys	03:44
	← RaceCondition left	03:45
jKlaus	This is also a new version of git cola compared to what I was running on the prior OS install, and on my other machine	03:45
	→ RaceCondition joined	03:45
jKlaus	I have uninstalled askpass and am repulling the files	03:46
	if only we didn't have shitty DSL lol	03:46
	69mb arrives pretty slow at <3mbs	03:46
	→ blaenk joined	03:49
	← NBhosting left	03:49
blaenk	anyone know if it's possible to add a space after %d in a git log --format string, only if the %d ends up expanding to a non-empty string?	03:49
	in the manual I found that if I make it "% d", then it'll add a space _before_ the expansion if it ended up expanding to a non-empty string	03:50
	but I'd like the opposite. basically I want to have %d at the beginning of my format string, and if it ends up expanding (say for a merge commit), add a space after it so that the following item (sha) is correctly spaced	03:50
	← recycle left	03:51
	→ meanio joined	03:54
	← oriba left	03:56
	→ yargy joined	03:59
blaenk	eh not a big deal, just moved it some place else	03:59
	→ el3ctron_ joined	04:00
	← leeN left	04:00
	→ leeN joined	04:00
	← mribeirodantas left	04:00
	← jgoss left	04:02
	→ teran joined	04:04
	→ jgoss joined	04:07
	→ rbartos joined	04:08
	→ sluther joined	04:08
	← teran left	04:08
	← nfk left	04:09
	← rbartos left	04:09
	← sluther left	04:10
	← jnewt left	04:12
	→ jnewt joined	04:13
	→ michael_lee joined	04:15
	→ ArcTanSusan joined	04:16
	← whitby left	04:17
	→ simesy joined	04:17
	← mobai left	04:17
	→ h0bbit_ joined	04:18
	→ fragamus joined	04:18
	→ Lewix joined	04:19
Lewix	Hi,	04:19
	how to erase a commit log, the history of the commit and the changes that was made but keep the changes intact	04:19
	→ mikepack joined	04:19
	← el3ctron_ left	04:20
	← simesy left	04:22
	→ offby1 joined	04:23
	← offby1 left	04:23
	→ offby1 joined	04:23
	← mikepack left	04:24
	→ jason237 joined	04:25
	← leeN left	04:26
	← jagob left	04:26
	lazers → lusers	04:28
	→ psyl0n joined	04:28
	→ mobai joined	04:28
	→ bwreilly joined	04:31
	← stellarhopper left	04:31
	← blaenk left	04:32
	→ buddyq joined	04:32
	← Spyro left	04:33
	→ francisfish joined	04:35
	← jday_ left	04:35
	→ SocalNick joined	04:36
	→ Spyro joined	04:37
	Spyro → Guest85898	04:37
	→ darkmutt joined	04:38
	← francisfish left	04:39
darkmutt	hello to all the git masters, would someone be kind enough as to explain the appearance of this: ! [remote rejected] master -> master (branch is currently checked out)	04:39
	when obviously some new files have been inputted with an entirely new commit?	04:40
BtbN	you are pushing to the currently checkout out branch of a non-bare repository, that doesn't work.	04:40
	← jKlaus left	04:40
BtbN	*checked out	04:40
	← pekster left	04:41
	→ tastywads joined	04:42
Lewix	BtbN: ^^	04:42
	→ stellarhopper joined	04:42
	← lifelike left	04:43
	→ lifelike joined	04:44
offby1	!non-bare	04:44
	mmph	04:44
	!nonbare	04:44
	durn it	04:44
milki	!bare	04:44
	eeeeh	04:44
offby1	halp hap bot be daid	04:45
	gitinfo: sup homie	04:45
gitinfo	[!bare] an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	04:45
	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	04:45
offby1	slow but steady.	04:45
	darkmutt: read that ^^	04:45
Lewix	How to deletete a commit log	04:45
	or part of the history	04:45
	chillin	04:46
	← h0bbit_ left	04:47
	← meanio left	04:47
	← dyng left	04:47
	→ dyng joined	04:48
	← dancat left	04:48
	→ recycle joined	04:48
	→ meanio joined	04:49
	→ h0bbit_ joined	04:50
	← dyng left	04:52
	← ErKa left	04:53
	← dik_dak left	04:53
	← kukks left	04:53
	→ maroloccio joined	04:54
	← marcjs left	04:54
	← CareBear\ left	04:55
	← `Alberto left	04:56
offby1	not sure what you mean. You can "git rebase -i" which will let you (among other things) omit commits.	04:56
	→ marcjs joined	04:56
	← darkmutt left	04:57
	← neophreak left	04:58
	→ xaq joined	04:59
	← troyt left	05:00
	← marcjs left	05:00
	→ e^0 joined	05:00
wongon	do people commit .gitignore files in their projects?	05:01
fairuz	wongon: Yes	05:03
	→ dyng joined	05:03
offby1	do people commit crimes in their back yards?	05:03
	nuts, I should have said "in the projects"	05:03
w0ng	wongon: yes. see https://help.github.com/articles/ignoring-files for alternatives	05:04
wongon	what's the reason?	05:04
	→ teran joined	05:04
w0ng	wongon: it sets the rules for what files should be ignored... so if multiple people are working on the same project, the same files are ignored for everyone	05:05
	→ pekster joined	05:06
	→ dik_dak joined	05:07
	← mizu_no_oto left	05:08
	← psyl0n left	05:08
	← teran left	05:09
	← beyondcreed left	05:10
wongon	if I have a file I want to ignore, /dirA/toignore, should the .gitign ore file be in / with contents of /dirA/toignore, or be in /dirA with contents of to ignore?	05:10
	→ mizu_no_oto joined	05:11
	← cilly left	05:12
	→ cilly joined	05:14
	← Davey left	05:14
	← ehmatthes left	05:14
	← john2x left	05:15
	← dougsland left	05:15
	← johnkevinmbasco left	05:18
	→ johnkevinmbasco joined	05:19
	← Tuna-Fish left	05:19
	→ FortySix2 joined	05:20
	← fragamus left	05:20
	→ Tuna-Fish joined	05:20
	→ john2x joined	05:20
w0ng	see http://stackoverflow.com/questions/3305869/are-multiple-gitignores-frowned-on	05:20
	← bwreilly left	05:21
	← FortySix2 left	05:22
	← githogori left	05:22
	→ denis joined	05:22
	← Cerise left	05:23
	← Happzz left	05:23
	← wongon left	05:23
	← kcj left	05:24
	→ marcjs joined	05:24
	→ Happzz joined	05:24
	→ Cerise joined	05:25
	→ kcj joined	05:26
	← Goplat left	05:26
	→ marcjs_ joined	05:26
	← mobai left	05:26
	→ psyl0n joined	05:27
	← marcjs left	05:29
	← dyng left	05:29
	→ dyng joined	05:30
	← the_cybersphinx left	05:30
	← dmarr left	05:30
	← marcjs_ left	05:31
	← ELLIOTTCABLE left	05:33
	← dyng left	05:34
	← xerxas left	05:35
	→ githogori joined	05:36
	→ the8thbit joined	05:36
	→ ELLIOTTCABLE joined	05:36
	→ dyng joined	05:36
	→ dmarr joined	05:36
	← dmarr left	05:37
	← mnml left	05:37
	→ xerxas joined	05:37
	→ tessier joined	05:38
	← psyl0n left	05:38
	→ mnml joined	05:39
	← dyng left	05:41
	→ dyng joined	05:41
	← lithiumjake left	05:42
	← tastywads left	05:44
	← dyng left	05:45
	→ dyng joined	05:45
	→ marcjs_ joined	05:45
	← Khisanth left	05:46
	← dyng left	05:48
	→ Tommy[D]_ joined	05:48
	→ dyng joined	05:48
	← marcjs_ left	05:50
	← Tommy[D] left	05:52
	← dyng left	05:53
	← LucasKA left	05:53
	← stellarhopper left	05:55
	→ maestrojed joined	05:57
	← maestrojed left	05:57
	← CKyle left	05:59
	→ Khisanth joined	06:00
	← Arctico left	06:00
	→ maestrojed joined	06:01
	→ teran joined	06:05
	→ mikepack joined	06:07
	→ marcjs_ joined	06:08
	→ lithiumjake joined	06:08
	← teran left	06:10
	→ dyng joined	06:10
	→ marcjs__ joined	06:10
	→ stellarhopper joined	06:11
	→ xlinkz0 joined	06:12
	← mikepack left	06:12
	← marcjs_ left	06:13
	← marcjs__ left	06:15
	→ aberrant joined	06:15
	← RaceCondition left	06:16
	← fairuz left	06:17
	→ oojacoboo joined	06:17
	→ fairuz joined	06:18
	→ psyl0n joined	06:19
	← vkrest left	06:22
	← psyl0n left	06:22
	← karstensrage left	06:23
	← oracal left	06:28
	← SocalNick left	06:28
	→ Guest4122 joined	06:28
	→ [gmi] joined	06:30
	← pfg left	06:33
	→ francisfish joined	06:35
	→ nilg` joined	06:37
	← Hecter left	06:39
	← stellarhopper left	06:40
	← francisfish left	06:40
	→ akiress joined	06:42
	← Guest4122 left	06:42
	→ karstensrage joined	06:42
	← dyng left	06:43
	→ vkrest joined	06:43
	← scarabx left	06:43
	→ dyng joined	06:43
	→ LucasKA joined	06:45
	← meanio left	06:45
	← dyng left	06:46
	→ dyng joined	06:47
	→ meltdown joined	06:48
	← invinceable left	06:50
	→ pfg joined	06:51
	← dyng left	06:51
	← buddyq left	06:51
	→ stellarhopper joined	06:54
	← stellarhopper left	06:54
	→ stellarhopper joined	06:54
	→ Nizumzen joined	06:55
	→ rainbyte joined	06:57
	← xmj left	06:57
	← pr0ton left	06:57
	→ treehouse joined	06:58
	→ pantsman joined	06:58
	→ dyng joined	07:00
	→ theRealGentleman joined	07:01
	← mizu_no_oto left	07:01
	← bgerber left	07:01
	← dyng left	07:03
	→ dyng joined	07:03
	← Lewix left	07:04
	→ pheaver joined	07:04
	→ bgerber joined	07:05
	→ teran joined	07:06
	← el_fuego left	07:08
	← dyng left	07:08
	→ marcjs__ joined	07:08
	→ King_Hual joined	07:09
	← starkhalo left	07:09
	← lusers left	07:10
	← teran left	07:10
	→ eletuchy joined	07:10
	→ xmj joined	07:11
	← LucasKA left	07:11
	PLejeck → nuck	07:12
	← marcjs__ left	07:12
	← jimbo3918 left	07:12
	→ teran joined	07:13
	→ ehmatthes joined	07:14
	← eletuchy left	07:15
	← pantsman left	07:16
	→ jimbo3918 joined	07:18
	→ lolmaus_ joined	07:20
	← lolmaus left	07:21
	← thiago left	07:21
	← m0viefreak left	07:27
	→ dyng joined	07:29
	← maestrojed left	07:30
	→ nettoweb joined	07:31
	← aberrant left	07:31
	← timotei_ left	07:32
	→ sveltponce joined	07:34
	← sveltponce left	07:34
	→ max_ joined	07:35
	← dyng left	07:35
	→ sveltponce joined	07:35
	max_ → Synthead	07:35
	→ hoschi joined	07:35
	→ dyng joined	07:36
	→ dyng_ joined	07:37
	← dyng left	07:37
	→ fr33 joined	07:38
	← nettoweb left	07:40
	← johntitor2036 left	07:41
	→ simesy joined	07:41
	→ johntitor2036 joined	07:42
	← simesy left	07:43
	→ simesy joined	07:44
	← dyng_ left	07:47
	→ dyng joined	07:47
	→ dyng_ joined	07:48
	← dyng left	07:48
	← johnkevinmbasco left	07:49
	← dyng_ left	07:50
bluesm	Hey..	07:50
	"git rebase --onto master server client".	07:50
	← gerard0 left	07:50
	→ dyng joined	07:50
bluesm	Does it mean , take differences introduced by "client". Using common ancestor of "client and server" , and put those changes to master branch?	07:52
	→ zedsix joined	07:52
zedsix	Curious to know if there is a way of comparing files on a repo to the server, I believe my repo may be out of sync.	07:52
	→ draftqin joined	07:52
	← dyng left	07:53
	→ dyng joined	07:53
	← meltdown left	07:54
	← znDuff left	07:55
	→ mikepack joined	07:56
moritz	after a 'git fetch', you can say 'git diff @{u}' for example	07:56
	← dik_dak left	07:56
	→ znDuff joined	07:56
zedsix	What does the @{u} represent?	07:56
	← pfg left	07:56
moritz	the tracked remote branch	07:56
	→ eletuchy joined	07:56
zedsix	I see, so if I wanted to specify a specific branch I would use git diff master ?	07:57
	← recycle left	07:58
SamB	zedsix: if you want to compare against your master branch, yes	07:59
	← dyng left	07:59
zedsix	Thank you moritz & SamB < very much appreciated.	07:59
	→ dyng joined	08:00
	← mikepack left	08:00
	← Synthead left	08:00
	→ Hecter joined	08:01
	→ jefflyne joined	08:02
	→ Kicer86 joined	08:03
	← dyng left	08:04
	← polyzen left	08:04
	← h0bbit_ left	08:05
	→ jcvfen joined	08:05
	← Hecter left	08:06
	← dreiss left	08:07
	← jefflyne left	08:08
	→ marcjs__ joined	08:08
	→ hs` joined	08:08
	← theRealGentleman left	08:10
	← simesy left	08:10
	← Nizumzen left	08:10
	← joelrobichaud left	08:10
	← marcjs__ left	08:12
	→ dyng joined	08:13
	← yargy left	08:14
	→ Synthead joined	08:15
	← pheaver left	08:15
	← lithiumjake left	08:16
	→ Not_Whatever joined	08:18
	→ _iron joined	08:18
	→ Devastator joined	08:18
	← phantomcircuit left	08:18
	← eletuchy left	08:19
	← Devastatr left	08:20
	← xaq left	08:20
	→ phantomcircuit joined	08:20
bluesm	"A remote repository is generally a bare repository — a Git repository that has no working directory. Because the repository is only used as a collaboration point, there is no reason to have a snapshot checked out on disk; it’s just the Git data. In the simplest terms, a bare repository is the contents of your project’s .git directory and nothing	08:21
	else." What if I want to have checked out last commit of my "stable" branch , for my website ?	08:21
	→ Nizumzen joined	08:21
moritz	bluesm: then you clone the remote	08:22
	bluesm: or use a !deploy mechanism	08:22
gitinfo	bluesm: 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	08:22
moritz	having two copies of the repo on a server, one serving as a point to push to, and one for serving files from, is much less hassle than trying to do it with a single repo	08:23
	← dyng left	08:24
	→ dyng joined	08:25
	← luxgeek left	08:25
	→ sluther joined	08:26
	← dyng left	08:27
	→ dyng joined	08:28
	→ takamichi joined	08:28
	← sveltponce left	08:31
	← dyng left	08:31
	→ sveltponce joined	08:31
	← sveltponce left	08:31
	→ sveltponce joined	08:32
	← sveltponce left	08:32
	→ dyng joined	08:32
	← srji_ left	08:32
	→ jatt joined	08:32
	→ srji joined	08:33
	→ sveltponce joined	08:33
	← sveltponce left	08:33
	→ sveltponce joined	08:33
	→ h0bbit_ joined	08:35
	← dyng left	08:36
	→ francisfish joined	08:36
	← hs` left	08:40
	← francisfish left	08:41
	→ SorenHolm joined	08:42
	→ ewet joined	08:43
	← ewet left	08:44
	→ ewet joined	08:44
	→ shinnya joined	08:44
	← e^0 left	08:45
	← WXZ1 left	08:47
	← sveltponce left	08:50
	→ tvw joined	08:50
	← OnkelTem left	08:50
	← emergion_ left	08:51
	→ OnkelTem joined	08:51
	← Synthead left	08:51
	→ meltdown joined	08:52
	→ johnflux joined	08:52
	← johnflux left	08:52
	→ johnflux joined	08:52
	→ francisfish joined	08:54
	→ solker_ joined	08:56
	→ fluter joined	08:59
	→ xaq joined	08:59
fluter	hi	09:00
	I wanna tag my project in upstream, when I run git push --tags,	09:00
	it says ! [remote rejected] v0.3 -> v0.3 (prohibited by Gerrit)	09:00
	any ideas why?	09:00
	→ theRealGentleman joined	09:00
	→ vkrest_ joined	09:02
	← francisfish left	09:03
	← vkrest left	09:04
	→ el3ctron joined	09:04
	→ Synthead joined	09:05
	→ Harry_cheese joined	09:05
	← theRealGentleman left	09:07
dr_lepper	fluter: because Gerrit prohibits it?	09:07
	← draftqin left	09:07
fluter	dr_lepper, then how can I tag the project?	09:07
dr_lepper	(which has nothing to do with Git)	09:07
	→ francisfish joined	09:08
	→ marcjs__ joined	09:08
	← akim left	09:09
	→ emergion_ joined	09:11
	→ lolmaus joined	09:12
	← marcjs__ left	09:13
	← lolmaus_ left	09:14
	→ totem joined	09:17
	← SorenHolm left	09:18
	→ akim joined	09:19
	→ max_ joined	09:20
	→ SorenHolm joined	09:20
	→ akim_ joined	09:20
	→ simesy joined	09:20
	← teran left	09:22
	← Synthead left	09:22
	→ teran joined	09:22
	← takamichi left	09:23
	← akim left	09:24
	← Ivo left	09:24
	→ Ivo joined	09:24
	→ ngladitz joined	09:25
	→ draftqin joined	09:25
	← simesy left	09:25
	← max_ left	09:25
	→ jluc joined	09:27
	← teran left	09:27
	→ max_ joined	09:28
	← max_ left	09:28
	← evilbug left	09:28
	→ Synthead joined	09:28
	→ Malice joined	09:28
	→ pantsman joined	09:29
	→ dyng joined	09:29
	→ vince_prignano joined	09:29
	← el3ctron left	09:30
	← Ivo left	09:31
	→ Ivo joined	09:31
	← Ivo left	09:31
	→ Ivo joined	09:32
bluesm	moritz: OK... But clone remote will also have .git folder with history ,	09:33
	← draftqin left	09:34
	← emergion_ left	09:34
bluesm	moritz: so I would have two repos, one to which I push and pull, and one which I clone every so often , and check out stable branch ?	09:34
	← hyperair left	09:35
	→ emergion joined	09:35
	→ el3ctron joined	09:35
	← vince_prignano left	09:37
	→ vince_prignano joined	09:37
	→ dangerousdave joined	09:38
	← fairuz left	09:38
	→ fairuz joined	09:38
	← h0bbit_ left	09:39
	→ jnavila joined	09:39
	← akiress left	09:39
fairuz	fluter: You need permisison to tag a project (nothing to do with git)	09:39
fluter	fairuz, I can push commit to the project	09:40
	fairuz, do you mean push permission is not tag permission?	09:40
fairuz	fluter: It's different permission	09:40
fluter	ok	09:40
	how can I configure it?	09:40
	← Synthead left	09:40
	→ revele joined	09:41
	← jatt left	09:42
fairuz	fluter: I belive you need Create Reference permission on refs/tags/*	09:42
fluter	hmm	09:43
	ok	09:43
	thanks fairuz , I will contact the owner	09:43
	→ mikepack joined	09:44
	→ Synthead joined	09:45
	→ jatt joined	09:45
	← mikepack left	09:48
	← jatt left	09:51
xmj	How can I prepare a diff between my local branch and a remote branch ?	09:52
	← tango_ left	09:52
	← Synthead left	09:52
	→ andr3a joined	09:52
xmj	I'm trying to get 15'000 lines into the FreeBSD ports repository (github.com/freebsd/freebsd-ports/) and this needs to be done via email. . . . Now I'm looking for a way to get the changes I've made into a diff	09:53
	^^^ never mind	09:54
	← diegoviola left	09:55
	→ matheus23 joined	09:56
	← revele left	09:57
	← the8thbit left	09:58
	← dangerousdave left	09:59
	← znDuff left	09:59
	← SorenHolm left	09:59
	→ znDuff joined	09:59
	→ Synthead joined	10:00
	← el3ctron left	10:00
	← ArcTanSusan left	10:01
	→ specious joined	10:02
	← jnavila left	10:04
	→ dangerousdave joined	10:05
	← Synthead left	10:06
	→ marcjs__ joined	10:08
	← ewet left	10:08
	← dyng left	10:10
	→ dyng joined	10:11
	← marcjs__ left	10:12
	← dyng left	10:16
	→ chrisss404 joined	10:16
	← travisstaton left	10:17
	→ dyng joined	10:18
	→ Sound joined	10:18
	→ asQuirre_ joined	10:20
	← Harry_cheese left	10:21
	→ kaffeebohne joined	10:21
	→ Harry_cheese joined	10:22
	→ taijeen joined	10:23
	→ merica joined	10:23
	→ foeniks joined	10:23
	← dyng left	10:25
	→ dyng joined	10:25
	→ dyng_ joined	10:28
	← dyng left	10:28
cbreak	xmj: man git-format-patch	10:28
gitinfo	xmj: the git-format-patch manpage is available at http://jk.gs/git-format-patch.html	10:28
	← oojacoboo left	10:28
xmj	i did say never mind, right ? :-)	10:29
cbreak	xmj: it creates e-mail formated patches	10:29
foeniks	is there any git bugtracking system that can be integrated into git?	10:29
	I think there might be something that stores its data in the git database and can be synced with the repo.	10:29
xmj	I made my life extremely easy with git diff <commithash before I started doing changes> >> ~/ports.diff	10:29
foeniks	Of course I know there is redmine, track, etc. which are not especially heavy but require setting up a server etc	10:30
	← dyng_ left	10:30
cbreak	xmj: git diff is not meant to be applyable by any patch command	10:30
	→ dyng joined	10:30
xmj	cbreak: doesnt matter -- the developer who will commit this uses git anyway ;-)	10:30
cbreak	xmj: it's meant for human consumption primarily, if it actually applies depends on the settings	10:30
	xmj: not even with git.	10:30
xmj	uhm.	10:30
	well that sucks (tm)	10:31
cbreak	if you want something that can be applied, use format-patch	10:31
	→ doev joined	10:31
cbreak	or hand-pick your git diff options	10:31
xmj	i'll wait 'till he complains, and if he does do that :-)	10:31
cbreak	xmj: if you're lucky it works :)	10:31
	(at least for parts of the changes)	10:31
xmj	aye	10:32
	We'll see.	10:32
	cbreak: thanks for your help!	10:32
	→ zheng joined	10:32
	→ upene joined	10:34
	→ sevenup joined	10:35
sevenup	http://54.245.29.83:1337/public/index.html	10:35
	rules: http://jumbastic.com/magegorules.html	10:35
	→ simesy joined	10:35
	← dangerousdave left	10:36
	← sluther left	10:36
cbreak	no spamming please.	10:36
	← dyng left	10:39
	→ Davey joined	10:40
	→ ferreum joined	10:40
	← meltdown left	10:40
	→ danicampa901 joined	10:41
	→ tgkokk joined	10:42
	← tgkokk left	10:42
	→ tgkokk joined	10:42
	← Fandekasp left	10:44
	← kcj left	10:45
	→ halu joined	10:46
	→ fanno joined	10:46
	→ Kayra joined	10:49
	→ jatt joined	10:49
	← King_Hual left	10:50
	→ King_Hual joined	10:50
	→ freestyl3r joined	10:50
	← tgkokk left	10:51
	→ tgkokk joined	10:52
	← Kayra left	10:52
	← fanno left	10:54
	← tgkokk left	10:54
	→ fanno joined	10:54
	→ tgkokk joined	10:54
	← Nizumzen left	10:55
	→ gelardi_ joined	10:55
	← halu left	10:55
	→ Davey_ joined	10:57
	← fluter left	10:57
	← Harry_cheese left	10:58
	← Sound left	10:58
	→ sluther joined	11:00
	→ Kayra joined	11:00
	→ internal joined	11:02
	← tvw left	11:02
	→ zapb joined	11:03
	→ valgrind joined	11:04
	→ Egbert9e9 joined	11:06
	→ lopezt joined	11:06
Egbert9e9	is there a git way of doing pull requests which isn't only applicable to github?	11:07
	→ marcjs__ joined	11:08
	← Ivo left	11:10
	← internal left	11:11
	← Bosch[] left	11:12
	← jimbo3918 left	11:12
	→ Sound joined	11:12
	← marcjs__ left	11:13
	→ jackneill joined	11:13
	← dont-panic left	11:14
	→ rchavik joined	11:14
	→ oracal joined	11:17
	← vince_prignano left	11:17
	→ jimbo3918 joined	11:17
	→ koda joined	11:18
	← jimbo3918 left	11:18
	→ jottr joined	11:18
	→ jimbo3918 joined	11:18
	← solker_ left	11:19
moritz	Egbert9e9: well, publishing the repo somewhere and telling somebody per email (or whatever) to pull from it	11:20
	← LeMike left	11:22
	→ LeMike joined	11:22
	← cjsarette left	11:22
	→ j416_ joined	11:23
	← j416 left	11:23
	← upene left	11:23
	→ upene joined	11:23
	← sluther left	11:24
	→ mewm joined	11:24
	← qsuscs left	11:24
	→ dkpi joined	11:25
	← tgkokk left	11:25
	→ chiromante joined	11:26
	→ cjsarette joined	11:28
	→ qsuscs joined	11:28
	← upene left	11:28
	← JanC left	11:28
	→ tg joined	11:29
	← john2x left	11:30
	→ the_cybersphinx joined	11:31
	← totem left	11:31
	→ john2x joined	11:32
	→ mikepack joined	11:32
	← JEEBcz left	11:32
	→ JEEBcz joined	11:32
	JEEBcz → JEEB	11:32
	← chrisss404 left	11:32
	← srji left	11:33
	→ chrisss404 joined	11:34
	i7c → i7c_foxxx0	11:34
	← chrisss404 left	11:34
	→ srji joined	11:35
	kaffeebohne → hrnz	11:35
	← hrnz left	11:36
	→ kaffeebohne joined	11:36
	i7c_foxxx0 → i7c_foxxx0_Rasi_	11:36
	kaffeebohne → Guest54709	11:36
	→ chrisss404 joined	11:36
	← mikepack left	11:36
	→ poulson joined	11:37
	Guest54709 → kaffeebohne_	11:38
	kaffeebohne_ → kaffeeleiche	11:38
	i7c_foxxx0_Rasi_ → beadert	11:38
	← qsuscs left	11:39
	← danicampa901 left	11:39
	→ Balliad joined	11:40
	beadert → i7c	11:41
	→ scalability-junk joined	11:41
	→ rgr joined	11:42
	→ whitby joined	11:42
	→ solker_ joined	11:43
	← tg left	11:44
	→ JanC joined	11:44
	← dkpi left	11:45
	→ qsuscs joined	11:45
	→ tg joined	11:47
	→ dort joined	11:53
	← foeniks left	11:57
	← qsuscs left	11:58
	→ meltdown joined	11:58
	← Balliad left	12:00
	→ qsuscs joined	12:00
	→ Freeman42 joined	12:00
	← john2x left	12:01
	→ carbon1 joined	12:01
	← Cyb3r-Assassin left	12:02
	← carbon1 left	12:02
	→ Cyb3r-Assassin joined	12:03
	→ john2x joined	12:05
	→ JeanCarloMachado joined	12:05
	← vkrest_ left	12:07
	→ marcjs__ joined	12:08
	→ WaReZ_ joined	12:09
	→ shruggar joined	12:09
	← JeanCarloMachado left	12:10
	← Sound left	12:11
	→ Ozch joined	12:11
	← marcjs__ left	12:12
	→ johnkevinmbasco joined	12:14
	← Malice left	12:14
	→ vurma joined	12:15
	← shingshang left	12:17
	→ m joined	12:17
	→ xender joined	12:18
xender	Hi, is there any difference in terminology between "revision" and "commit-ish"?	12:18
	← denis left	12:19
	← m left	12:19
bremner	xender: see man gitglossary	12:21
gitinfo	xender: the gitglossary manpage is available at http://jk.gs/gitglossary.html	12:21
	→ shingshang joined	12:21
bremner	I'd say commit-ish is more general	12:22
	← emergion left	12:22
	→ jnavila joined	12:23
	→ leeN joined	12:24
	→ ewet joined	12:24
	← keller left	12:24
xender	Oh, revision==commit, ok...	12:24
	→ JeanCarloMachado joined	12:25
xender	So how are specs as HEAD@{1} or some-branch-name called?	12:25
	→ luxgeek joined	12:26
	← rgr left	12:26
	→ denis joined	12:28
	← lifelike left	12:28
	kaffeeleiche → kaffeebohne	12:28
bremner	I guess man git-rev-list calls that "extended SHA1 syntax"; not sure if there is a better name	12:29
gitinfo	the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	12:29
	← jnavila left	12:30
	← Kayra left	12:30
	← luxgeek left	12:31
	← rchavik left	12:31
	← denis left	12:32
	← valgrind left	12:32
	→ denis joined	12:32
	← john2x left	12:34
	← denis left	12:35
	→ denis joined	12:35
	→ john2x joined	12:35
	→ rgr joined	12:36
	← ewet left	12:36
	← xaq left	12:36
xender	Glossary for commit-ish says that everything recursively dereferencable to a commit is a commit-ish, but it only gives examples about tags for commits, and tags for tags for commits, which all are "immutable". Branch name points to a commit, but it is not fixed - so does it also count as a commit-ish?	12:36
	(sorry about my confusion)	12:37
	→ stodan joined	12:37
osse	xender: typically called refs	12:38
bremner	I'd say yes. Can you think of somewhere where passing a branch as a commit-ish doesn't make sense?	12:38
osse	(references)	12:38
	← denis left	12:38
	→ denis joined	12:39
	→ juliohm joined	12:40
xender	Ok, thank you everyone for answers :)	12:40
	→ zorbash joined	12:40
	← SJS left	12:43
	→ SJS joined	12:43
	→ SHyx0rmZ joined	12:44
	→ foeniks joined	12:46
	← shruggar left	12:46
	→ shruggar joined	12:47
	→ Sound joined	12:48
	→ danicampa901 joined	12:49
	→ oskarkv joined	12:51
xender	Oh, one more thing bothers me - can I have two working copies for the same repo? Won't symlinking /aaa/.git to /bbb/.git blow up anything?	12:52
	← ec_ left	12:53
	→ ec joined	12:53
osse	xender: I've done it before and it works just fine. But it's really confusing	12:54
	xender: if you do a change in one repo (and possibly commit) and run git status in the other then it'll look weird	12:54
	← SJS left	12:55
	→ SNEI joined	12:55
	→ xaq joined	12:57
xender	Will using a "gitfile" mentioned in glossary make it look better?	12:57
cbreak	xender: use the git worktree contrib script	12:59
	xender: or a normal git clone	12:59
	→ tgkokk joined	13:00
	← nuck left	13:00
	← _iron left	13:01
xender	A clone would mean pushing to other repo constantly, and I don't think I need that.	13:01
cbreak	no, fetching	13:02
	→ RaceCondition joined	13:02
cbreak	you should not push to repositories with a working dir	13:02
xender	Basically, I want to have my configs in a git repo, but with separate copy that all programs use, so failed mrge/rebase/sth won't break anything in system.	13:03
cbreak	then use the worktree contrib script	13:03
	← stodan left	13:03
xender	ok, thx	13:04
	→ vipconsult joined	13:04
	← john2x left	13:04
	→ PLejeck joined	13:05
	→ jonmasters joined	13:05
	→ john2x joined	13:05
	← fr33 left	13:05
	← simesy left	13:06
	→ Harry_cheese joined	13:06
	→ marcjs__ joined	13:08
	← xaq left	13:08
	→ Kayra joined	13:10
	← tgkokk left	13:10
	← jatt left	13:10
	→ tgkokk joined	13:10
	→ xaq joined	13:11
	← xaq left	13:12
	← marcjs__ left	13:13
osse	xender: whether you use a symlink or a "gitfile" doesn't matter	13:13
	← Kayra left	13:14
	← LeMike left	13:14
	→ svector joined	13:17
	→ shuaib joined	13:18
	→ Kayra joined	13:18
	→ takamichi joined	13:19
	→ goTAN joined	13:19
	→ mikepack joined	13:20
	← Harry_cheese left	13:23
	← mikepack left	13:25
	→ fluter joined	13:26
	← p8952 left	13:26
	→ lithiumjake joined	13:27
	← pinage404 left	13:28
	← cagedwisdom left	13:29
	→ pinage404 joined	13:29
	← pinage404 left	13:30
	→ tvw joined	13:33
	→ PeterBooker joined	13:34
	← michael_lee left	13:35
	→ gnugnu5 joined	13:36
	← foeniks left	13:37
	→ jatt joined	13:37
	→ gravion joined	13:38
	→ neophreak joined	13:41
	→ pinage404 joined	13:41
	← Ozch left	13:41
	← shinnya left	13:41
	→ m joined	13:42
	← m left	13:43
	← vipconsult left	13:44
	← cads left	13:44
	→ egilhh joined	13:48
	← SNEI left	13:48
	→ SNEI joined	13:49
	← goTAN left	13:51
	← tgkokk left	13:52
	→ teran joined	13:54
	← meltdown left	13:56
	→ n-a-n joined	13:58
	→ polyzen joined	13:58
	→ tgkokk joined	13:58
n-a-n	hi all	13:58
gitinfo	n-a-n: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:58
	← iamtakingiteasy left	13:59
	→ draftqin joined	14:01
	← gnugnu5 left	14:01
	→ gnugnu5 joined	14:02
	→ lifelike joined	14:02
	← fanno left	14:03
	→ iamtakingiteasy joined	14:03
	← teran left	14:04
	← lorenx left	14:04
	→ h0bbit_ joined	14:05
	→ GT4066 joined	14:06
	→ marcjs__ joined	14:08
	← sevenup left	14:08
	→ goTAN joined	14:10
	← gravion left	14:10
	→ CKyle joined	14:12
	→ LeMike joined	14:12
	← WaReZ_ left	14:12
	→ thelamest joined	14:14
	← johnkevinmbasco left	14:15
	→ johnkevinmbasco joined	14:16
	→ simesy joined	14:17
	→ johnkevi_ joined	14:17
	← taijeen left	14:17
	← Acidnerd left	14:18
	← denis left	14:18
	→ Noldorin joined	14:20
	← CKyle left	14:21
	← johnkevinmbasco left	14:21
	← simesy left	14:22
	→ tango_ joined	14:23
	→ CKyle joined	14:26
	← tango_ left	14:26
	← iamtakingiteasy left	14:27
	→ tango_ joined	14:27
	→ psyl0n joined	14:27
	← juliohm left	14:28
	→ nettoweb joined	14:28
	→ denis joined	14:30
	→ iamtakingiteasy joined	14:31
	← lifelike left	14:31
	→ lifelike joined	14:31
	→ nettoweb_ joined	14:34
	← koda left	14:34
	← Davey left	14:34
	Davey_ → Davey	14:34
	← nettoweb left	14:35
	nettoweb_ → nettoweb	14:35
	→ Davey- joined	14:35
	← bartman`` left	14:36
	← oskarkv left	14:38
	→ hyperair joined	14:38
	← nettoweb left	14:41
	→ WaReZ_ joined	14:42
	← Davey left	14:42
	→ gravion joined	14:43
	Davey- → Davey	14:43
	← Davey left	14:44
	→ Davey joined	14:44
	← john2x left	14:45
	← maroloccio left	14:45
	← jimbo3918 left	14:46
	freestyl3r → LouLakos	14:46
	LouLakos → freestyl3r	14:47
	← zheng left	14:47
	→ longbeach joined	14:49
	→ nnyk_ joined	14:53
	← PLejeck left	14:54
	→ PLejeck joined	14:55
xender	!backup	14:55
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	14:55
	→ revele joined	14:56
	→ jday_ joined	14:56
	← h0bbit_ left	14:56
	→ vince_prignano joined	14:56
	→ johnmilton joined	14:57
	→ Harry_cheese joined	14:57
	→ fanno joined	14:58
	→ keller joined	14:58
	→ Sly1986 joined	15:01
	← draftqin left	15:02
	qdii_ → qdii	15:04
	polyzen → poly	15:04
	→ kotk joined	15:05
	→ ilhami joined	15:05
	← shingshang left	15:06
	← ilhami left	15:06
	← Kayra left	15:06
	→ draftqin joined	15:07
	→ ciampix joined	15:08
	→ mikepack joined	15:08
	← psyl0n left	15:11
	→ Shusshu joined	15:13
	← mikepack left	15:13
	← Ragnor left	15:14
	← Shusshu left	15:14
	→ o9 joined	15:15
	← shuaib left	15:15
	→ User458764 joined	15:16
	→ cagedwisdom joined	15:18
	→ shingshang joined	15:21
	→ Ragnor joined	15:21
	→ ewet joined	15:21
	→ mellernoia joined	15:21
	← draftqin left	15:21
	→ Meistarin_ joined	15:21
	← Sound left	15:21
	→ ciaranm joined	15:23
	→ Sound joined	15:23
	← Meistarin_ left	15:24
	← shingshang left	15:26
	→ koell joined	15:26
	→ beastd joined	15:26
	← n-a-n left	15:27
	→ foeniks joined	15:30
	← fobban left	15:31
	→ draftqin joined	15:33
	← draftqin left	15:38
	← specious left	15:38
	→ JerryT joined	15:38
	→ nettoweb joined	15:39
	← chiromante left	15:40
	→ patapon joined	15:40
	→ oskarkv joined	15:41
	→ mads- joined	15:43
	← hyperair left	15:43
	→ dougsland joined	15:43
mads-	This might be a stupid question. If I have .class files in DIR/target/classes/ will they be exluced if I add ".class" to DIR/.gitignore where DIR is my working directory?	15:44
	→ NBhosting joined	15:44
_ikke_	yes	15:44
	← freestyl3r left	15:44
_ikke_	And it's not a stupid question :-)	15:44
	though, it's easy to try it out and see the result	15:45
mads-	_ikke_, indeed. But I feel that once they are committed I sometimes have a tough time removing them again :)	15:45
	So thanks :)	15:45
	← martianlobster left	15:46
mads-	I might have to find myself a good git-tutorial to read	15:46
	← jorisros left	15:46
	← goTAN left	15:46
cbreak	mads-: ignoring only applies to uncommitted files anyway.	15:47
	uncommitted -> untracked	15:47
	→ MisterMau joined	15:48
	→ meltdown joined	15:51
masak	mads-: you can make changes to .gitignore without commit, and they will take effect immediately.	15:51
	→ Nizumzen joined	15:51
xmj	i had .gitignore in .gitignore at one point	15:51
ewet	xmj: that's just inconvenient	15:52
	→ flebron joined	15:55
	→ tmcmahon joined	15:56
flebron	Hi, if I "git reset HEAD {somefile}", if this file was untracked before the git add, it'll stay in my working directory, just not added to the staging area, right?	15:56
	→ chiromante joined	15:56
osse	flebron: yes	15:56
flebron	Thanks :)	15:57
	→ cdleonard1 joined	15:57
	← fluter left	15:58
flebron	What if I haven't yet made an initial checkin? It seems I can't say "HEAD" in that case.	15:58
	← MisterMau left	15:58
flebron	(fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.)	15:58
	← cdleonard left	15:58
	← tmcmahon left	15:59
cbreak	commit something.	15:59
	flebron: also, read git status	15:59
	→ nfk joined	15:59
	← fairuz left	15:59
	→ SWakey joined	15:59
osse	flebron: in that case it's meaningless to use the git-reset command	16:00
flebron	Well, what I have is a directory whose files I added, and now I want to change that directory's name. I don't want to commit just to rename after, I'd like to get it right from the start :p	16:00
	← M00sL0gB0t left	16:01
xender	xmj: I also sometimes put .gitignore in .gitignore, but you may be loking for .git/info/exclude - AFAIK it's local-only file, and .gitignore is meant to be global for project (and commited)	16:01
	→ M00sL0gB0t joined	16:01
flebron	git rm --cached seems to be working	16:01
osse	flebron: you can commit --amend right after	16:01
	→ Sendoushi joined	16:02
jluc	interesting xender	16:03
xender	Could anyone hint a good starting point to writing a zsh completion for custom git command? (it takes <branch> and <revision>). I know, this is more zsh than git question, but no one answered it on #zsh...	16:04
xmj	xender: it was mostly a joke because i needed local variations and didnt want to commit upstream.	16:04
	→ Dougie187 joined	16:05
moritz	xender: I'd look at the existing completion code for commands such as checkout, push, branch -d etc.	16:06
	→ kukks joined	16:07
	← dilfridge left	16:07
	← cagedwisdom left	16:07
	→ MisterMau joined	16:08
	← rainbyte left	16:08
	→ daivyk joined	16:08
	← svector left	16:08
	← tgkokk left	16:09
	→ Ozch joined	16:09
	→ Kayra joined	16:10
	← Windfisch left	16:11
	← MisterMau left	16:12
	→ rainbyte joined	16:13
	→ Dreeass joined	16:13
	→ mizu_no_oto joined	16:14
	→ tgkokk joined	16:14
Dreeass	I'm finally gonna start using git on every project from now but since I just got a Mac, I am wondering what GUI client is the best way to go. Does anyone have experience with some of the GUI clients?	16:15
	← Kayra left	16:15
	→ valgrind joined	16:15
Dreeass	I'm looking at all of the clients on the Git website but pictures don't tell me much.	16:15
xmj	Dreeass: that's until you discover mercurial/hg, and the command line interface.	16:15
Dreeass	xmj, what do you mean?	16:16
xmj	nevermind me	16:16
bremner	Dreeass: you can guess the channels overall feelings about gui clients from what the bot says when I type !gui	16:16
gitinfo	Dreeass: Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.	16:16
bremner	but you might get recommendations anyway if you wait a bit.	16:16
Dreeass	@gitinfo, doesn't it make it easier for someone who hasn't been working with Git al that much?	16:17
	→ dkpi joined	16:18
	← denis left	16:18
bremner	Dreeass: it's bot, not a twitter account (i.e., in IRC we don't use @)	16:18
	→ denis joined	16:18
Dreeass	bremner, I could've guessed. Well can you answer my question?	16:19
	← SWakey left	16:20
bremner	Dreeass: I don't have any real experience with git guis. I use "gitk" and "git gui blame", but that's about it.	16:21
	→ evilbug joined	16:21
	→ sgambino joined	16:21
	← makubi_ left	16:21
Dreeass	bremner, how do you handle teamwork? I wouldn't be able to keep track of everything that's going on. It would take me so much time using the terminal.	16:22
	→ michael_lee joined	16:22
bremner	Dreeass: I don't see what using a terminal has to do with teamwork	16:22
Dreeass	bremner, I mean that when you're using git on a teamproject. Doesn't it get a little bit messy?	16:23
	→ makubi joined	16:23
Dreeass	And you can't keep up using the terminal, and it's easier to see the changes using a graphical representation?	16:23
	→ johnflux_ joined	16:24
bremner	like I said, I use gitk as a viewer	16:24
	→ MetalMatze joined	16:25
	→ Not_Whatever2 joined	16:25
ewet	Dreeass: 'seeing the changes' is a bit weird in git anyways since git doesn't persist branches. a lot of people go through great lengths to somehow magically 'keep the graph clean' which is a waste of time IMHO ... just respect that git only preserves snapshots. a gui doesn't help too much here, the log does though.	16:27
	← johnflux left	16:27
bremner	I'd have to disagree. The history is often quite interesting and useful.	16:28
	→ nszceta joined	16:28
	← mizu_no_oto left	16:29
Dreeass	Alright, thanks.	16:29
	← Dreeass left	16:29
	← sgambino left	16:29
	← chiromante left	16:29
	← angelsl left	16:29
ewet	bremner: which wouldn't be a disagreement :)	16:30
	→ ErKa joined	16:31
	→ sohail_ joined	16:32
	→ martianlobster1 joined	16:33
	← michael_lee left	16:34
	← gravion left	16:34
	→ gravion joined	16:34
	← lolmaus left	16:35
	← tgkokk left	16:36
	→ jluc_ joined	16:37
	→ Arctico joined	16:38
	→ mizu_no_oto joined	16:38
	→ michael_lee joined	16:39
	← como left	16:39
bluesm	Should I have standalone repos for Server Side	16:39
	and mobile app ?	16:39
	*Apps ?	16:39
	And Client Side ( Web client side) ?	16:40
	← kukks left	16:40
	← patapon left	16:40
	← jluc left	16:41
	← marcjs__ left	16:41
	← Harry_cheese left	16:41
	→ jceb joined	16:41
	→ tgkokk joined	16:43
	→ m0viefreak joined	16:43
	→ draftqin joined	16:43
	→ sgambino joined	16:43
znDuff	bluesm, things that are built and tested separately should typically be in their own repos.	16:44
	bluesm, ...so the best answer to that depends on your build process.	16:44
bluesm	Well. But every client side stuff depends on server side stuff...	16:44
	znDuff is referring to automated, rather than manual, testing above.	16:44
znDuff	bluesm, sure. But do you want every server-side change to cause your client to be recompiled?	16:45
bluesm	znDuff: No.	16:45
znDuff	Then there's your answer.	16:45
	→ chiromante joined	16:45
	→ dangerousdave joined	16:46
bluesm	znDuff: Ok :)	16:46
	← eagles0513875_ left	16:46
znDuff	With respect to tracking dependent API changes, I'd suggest handling that via versioning convention.	16:46
	→ thiago joined	16:46
	← o9 left	16:47
bluesm	znDuff: You mean that all commits with "v1.0" on every of those repos, should work with each other seamlessly (having compatible api) ?	16:47
	← poly left	16:48
	← Sly1986 left	16:48
znDuff	bluesm, that's a reasonable convention, yes. When your server-side changes in an incompatible way, you do that on a v1.1 branch, and likewise the clients to support it.	16:48
	← cian1500ww left	16:49
znDuff	bluesm, ...it's not the only convention, but ideally your company has a build engineer who knows the details of your workflow &c. and is better equipped to be making decisions about what's the right fit for y'all.	16:49
	→ mobai joined	16:49
	→ hyperair joined	16:50
	← sohail_ left	16:50
	← jatoben left	16:50
	← flexd left	16:51
xmj	gentlemen, how can I put a series of commits into one single patch using format-patch ?	16:51
	→ SWakey joined	16:52
rawtaz	i'd like to verify that two stashes contain the same changes. is there a nice way to do that?	16:52
xmj	preferably one that's applicable with SVN patch too?	16:52
	← flebron left	16:52
bluesm	znDuff: I suspect, big project have customized script written, to build their all apps and change api and so on..	16:53
	← johnkevi_ left	16:53
osse	xmj: git format-patch --stdout ... > allofthem.patch	16:53
znDuff	bluesm, no, big projects typically don't have one big build script. More typically, they have smaller builds that publish versioned artifacts, and a dependency management system that tracks which artifact any given thing is built against.	16:53
	← xsbeats left	16:53
znDuff	bluesm, ...there are exceptions, but they're just that, exceptions.	16:54
	→ recycle joined	16:54
	→ h0bbit_ joined	16:54
	← solker_ left	16:55
xmj	osse: tyvm	16:55
	→ koltroll joined	16:55
	← iamtakingiteasy left	16:55
	← ewet left	16:56
	→ dilfridge joined	16:56
	→ mikepack joined	16:56
	← Mez left	16:57
bluesm	znDuff: Ok. I think it is most reasonable to me, to just use this "version convention" you've suggested ;) Since it isn't huge project.	16:57
	→ n-st joined	16:58
	→ Mez joined	16:58
	→ patapon joined	16:58
	← dkpi left	16:58
	→ kcj joined	16:58
	← h0bbit_ left	16:59
	→ jnavila joined	16:59
xmj	osse: is there a way i can lob all the patches into one that ignores the git history?	16:59
	→ LucasKA joined	16:59
	→ pantsman- joined	16:59
	→ fairuz joined	16:59
	→ vince_pr_ joined	16:59
	→ Cromulent joined	17:00
	→ obert_ joined	17:00
bluesm	znDuff: Thank you very very much for your time an effort ;)	17:00
	→ wongon joined	17:00
	→ ben_alma_ joined	17:00
	→ mjuszcza1 joined	17:01
	← mikepack left	17:01
	→ Tuna-Fish2 joined	17:01
	→ tagava joined	17:01
	← SWakey left	17:02
osse	xmj: git diff foo bar	17:02
	→ JesseC-Work joined	17:02
	→ srcerer_ joined	17:02
osse	xmj: but that'll just produce the diff itself. No email headers and such	17:02
	→ nettoweb_ joined	17:02
	← thiago left	17:02
	→ nszceta_ joined	17:02
	← nszceta_ left	17:02
xmj	hmm, someone said it wasn't a good way to do a diff, as it wouldn't apply to other DVCS	17:03
	→ ciaranm_ joined	17:03
	→ unreal_ joined	17:03
	→ expr joined	17:04
	→ rblackwe_ joined	17:04
	← sgambino left	17:04
	→ tmz_ joined	17:04
	→ Corey_ joined	17:04
	→ przemkov1 joined	17:04
	→ amoe_ joined	17:04
	→ imMute^ joined	17:04
	→ babilen_ joined	17:04
	→ mancha_ joined	17:04
	→ asQuirr__ joined	17:04
	→ mDuff joined	17:04
osse	xmj: the default git-diff output works well with all version of patch I've ever used	17:04
	← mDuff left	17:04
	→ conan_ joined	17:04
	→ mDuff joined	17:05
	→ TheMoonMaster_ joined	17:05
	← mDuff left	17:05
	→ andr3a_ joined	17:05
	→ flexd joined	17:05
	← jnavila left	17:05
	→ mDuff joined	17:06
xmj	cool	17:06
	→ maqr_ joined	17:06
	→ msm joined	17:06
	→ guardian` joined	17:06
xmj	chances are someone will try to apply it with svn patch	17:06
	→ jokajak` joined	17:07
	→ graphitemaster_ joined	17:07
	→ chrisss404_ joined	17:07
	→ qsusxs joined	17:07
	→ alexwhitman_ joined	17:07
	→ nemesit\|- joined	17:07
	← tgkokk left	17:08
	← michael_lee left	17:08
	← nszceta left	17:08
	← daivyk left	17:08
	← Nizumzen left	17:08
	← NBhosting left	17:08
	← nettoweb left	17:08
	← Sound left	17:08
	← ciaranm left	17:08
	← vince_prignano left	17:08
	← neophreak left	17:08
	← pinage404 left	17:08
	← jonmasters left	17:08
	← danicampa901 left	17:08
	← qsuscs left	17:08
	← whitby left	17:08
	← chrisss404 left	17:08
	← asQuirre_ left	17:08
	← znDuff left	17:08
	← andr3a left	17:08
	← pantsman left	17:08
	← OnkelTem left	17:08
	← jcvfen left	17:08
	← Tuna-Fish left	17:08
	← ben_alman left	17:08
	← conan left	17:08
	← imMute left	17:08
	← durianshredder left	17:08
	← nemesit\|znc left	17:08
	← TheMoonMaster left	17:08
	← Leoneof left	17:08
	← guardian left	17:08
	← obert left	17:08
	← maqr left	17:08
	← kermit left	17:08
	← jokajak left	17:08
	← amoe left	17:08
	← przemkovv left	17:08
	← harish left	17:08
	← SicoWork left	17:08
	← graphitemaster left	17:08
	← JesseCW left	17:08
	← alexwhitman left	17:08
	← niax left	17:08
	← babilen left	17:08
	← Entomo left	17:08
	← sppadic left	17:08
	← tmz left	17:08
	← xiong left	17:08
	← mancha left	17:08
	← rblackwe left	17:08
	← Corey left	17:08
	← mjuszczak left	17:08
	← gmac left	17:08
	← epta left	17:08
	← tchan left	17:08
	← ska-fan left	17:08
	← unreal left	17:08
	← msm` left	17:08
	← jonn- left	17:08
	← srcerer left	17:08
	← juril left	17:08
	← linduxed left	17:08
	← tsunamie left	17:08
	← EToS left	17:08
	← Caius left	17:08
	nettoweb_ → nettoweb	17:08
	→ durianshredder joined	17:08
charon	xmj: 'svn patch' doesn't understand the patch format, so that's not an option. use plain patch.	17:08
	→ jonn- joined	17:09
	→ NBhosting joined	17:09
xmj	well, chances are someone will have to do that once they realize svn patch won't work.	17:09
	:]	17:09
	that someone is not me.	17:09
	→ tgkokk joined	17:09
	← jatt left	17:10
	← salamanderrake left	17:10
	→ Sound joined	17:10
	← graphitemaster_ left	17:10
	→ Kayra joined	17:10
	→ graphitemaster joined	17:11
	← Cromulent left	17:11
	← Samual left	17:11
	→ jonmasters_ joined	17:11
	→ marcjs__ joined	17:12
	→ pinpin404 joined	17:12
osse	xmj: you can use a different tool for generating the diff itself if you wish	17:12
	→ lithiumjake_ joined	17:12
	→ Samual joined	17:12
	← Samual left	17:12
	→ Samual joined	17:12
	→ teran joined	17:12
	→ whitby joined	17:12
	guardian` → guardian	17:14
	← lithiumjake left	17:14
xmj	I wouldn't know how, and the people who review my diff will know what they're doing :)	17:14
	← zapb left	17:14
	→ ska-fan joined	17:14
	→ sppadic joined	17:14
	→ juril joined	17:15
	→ harish joined	17:15
	← Kayra left	17:15
	→ epta joined	17:15
	→ Entomo joined	17:15
xmj	osse: I'm talking diff over 15000 lines and touching about 130 files, not sure even how to do that automatically without git diff <commit before I started>	17:15
	← Not_Whatever2 left	17:15
	→ gmac joined	17:15
	→ marcjs___ joined	17:16
	→ OnkelTem joined	17:16
	→ xiong joined	17:16
	← marcjs__ left	17:16
	→ tchan joined	17:16
	→ linduxed joined	17:16
	→ thiago joined	17:16
	← teran left	17:17
	→ kermit joined	17:17
	→ teran joined	17:18
lopezt	Hey someone of you familiar with server-side hooks in git?	17:19
	← martianlobster1 left	17:19
	← tagava left	17:19
lopezt	i would like to have a server-side hook which is capable to install a bunch of client side hook anytime someone is cloning a repo	17:19
osse	xmj: git-diff itself is probably fine. I just wanted to mention that you can use any diffing mechanism if you really need to.	17:19
	xmj nods	17:19
	→ tagava joined	17:20
xmj	osse: thanks :)	17:20
	→ freestyl3r joined	17:20
	→ salamanderrake joined	17:21
	← foeniks left	17:21
	→ michael_lee joined	17:21
	→ SWakey joined	17:22
	← JerryT left	17:23
	← Devastator left	17:23
	→ Devastator joined	17:23
	← jottr left	17:23
	← teran left	17:24
	→ scarabx joined	17:24
	← Sendoushi left	17:25
	→ Sendoushi joined	17:25
	ciaranm_ → ciaranm	17:25
	← michael_lee left	17:26
	→ simpleuser joined	17:26
Seveas	lopezt: that's not possible.	17:26
lopezt	Seveas: :(	17:26
Seveas	git clone is not allowed to have any side effects,it should always be safe to run.	17:26
	← SWakey left	17:26
	→ WXZ1 joined	17:27
WXZ1	this is what I don't like about squash	17:27
mDuff	lopezt, it'd be a rather major security bug if that kind of behavior were allowed.	17:28
	→ h0bbit_ joined	17:28
WXZ1	squash should be applied to the commit that's being squashed, but it's actually the commit above it that you apply it to	17:28
	→ zapb joined	17:28
	← mads- left	17:28
lopezt	mDuff: to bad, is there any other way i could populate client-side hooks when someone is cloning a repo?	17:28
	← salamanderrake left	17:28
mDuff	lopezt, if you want to ensure a given set of client-side hooks are installed, I'd suggest putting them into the build system.	17:28
	(or, rather, putting something that checks for and installs them into the build system).	17:29
	→ nszceta joined	17:29
mDuff	lopezt, think about it -- people clone from repositories maintained by other random folks they don't know on the Internet all the time.	17:29
	lopezt, you wouldn't want those to be able to execute arbitrary code.	17:30
	← Sendoushi left	17:30
	→ neophreak joined	17:30
mDuff	lopezt, ...whereas it's_expected_ that you only actually invoke a build system when you trust the people who've committed to it, there's a reasonable end-user expectation for cloning to be safe, just as downloading and unpacking a tarball but not running anything in it is safe.	17:30
	→ psyl0n joined	17:31
	← psyl0n left	17:31
	→ psyl0n joined	17:31
	→ michael_lee joined	17:31
	→ salamanderrake joined	17:31
osse	WXZ1: squashing needs at least two commits for it to make sense. Are you saying that marking a commit for squashing in rebase -i should squash that commit and the next, instead of that commit and the previous?	17:31
lopezt	mDuff: what do you mean exactly with build-system, something like putting the hooks into git-core/templates/hooks/?	17:31
	→ howlymowly joined	17:32
	→ ck`` joined	17:32
WXZ1	osse: that commit and the next	17:32
osse	lopezt: have a ''make hooks'' target or something that the developers can run	17:32
lopezt	osse: true, seems to be the most simple	17:33
osse	WXZ1: what if you want to squash the very last commit? :)	17:33
WXZ1	osse: it seems more intuitive, because squash means "make disappear/flatten" and the commit that's disappearing is the previous one. But that's not the one you apply squash to	17:33
	← simpleuser left	17:33
WXZ1	osse: you can't, that's just deleting it	17:33
osse	ahh, my bad	17:34
WXZ1	if this hypothetical situation were to be expanded	17:34
osse	WXZ1: I see your point. I for one don't have any strong opinions; both make sense to me.	17:34
	In fact, what I think make most sense is that you would have to mark both commits explicitly	17:34
	← marcjs___ left	17:35
	→ marcjs___ joined	17:35
	→ martianlobster joined	17:35
	→ David joined	17:36
WXZ1	osse: yeah, that'd probably be the safest option	17:36
	squash, squash, squash-with	17:36
	pinpin404 → pinage404	17:37
WXZ1	least ambiguous option	17:37
David	I'm having a little trouble here with squashing	17:37
	I was working on a feature branch on a cloned github repo, and then I tried to squash three of my commits, but it seems that some other commits were ahead of it. Did I break something?	17:38
	← marcjs___ left	17:38
	← nszceta left	17:38
	→ Kayra joined	17:38
	→ polyzen joined	17:39
	→ simpleuser joined	17:39
moritz	David: "but it seems that some other commits were ahead of it." -- what makes you think/say that?	17:40
	← meltdown left	17:40
simpleuser	Hi there. When i removed many files from my folder and that i can't commit because git is listing all the files i deleted... what should i do ? :)	17:40
moritz	simpleuser: what do you want to do?	17:40
mDuff	David, well, you can always undo what you did by going back to a prior state from the reflog.	17:40
moritz	simpleuser: do you want to remove the files in the commit?	17:40
	→ lolmaus joined	17:40
simpleuser	moritz, that git doesn't care about these old files that don't exist anymore	17:40
David	Well, here's the commit log:	17:40
simpleuser	moritz, yes	17:41
David	https://github.com/ddinh/homebrew-cask/commits/recordit	17:41
	I was trying to squash three of my commits into one	17:41
moritz	simpleuser: 'git rm' them	17:41
simpleuser	there's a lot of them	17:41
David	however, it seems the rebased gradded more than it should have...	17:41
	→ kukks joined	17:41
	→ Sendoushi joined	17:41
	→ marcos34 joined	17:41
	← marcos34 left	17:42
	← stfn left	17:42
simpleuser	moritz, so if i have a list of 100 files that i removed previously, i have to do the same now with git rm ?	17:42
moritz	simpleuser: yes	17:42
simpleuser	oh. Ok Thanks moritz	17:42
skorgon	you should have used git rm in the first place	17:42
	→ stfn joined	17:42
simpleuser	ok	17:42
moritz	simpleuser: and the next time, use 'git rm' in the first place	17:42
	→ teran joined	17:42
	← babilen_ left	17:42
moritz	though maybe there's a way with 'git add' to automatically track the deletion	17:42
	→ babilen joined	17:43
	← gravion left	17:43
David	mDuff: can you please tell me where to look? I haven't used many of git's more advanced features	17:43
simpleuser	mmm...	17:43
osse	moritz: git add -A .	17:43
	← tvw left	17:43
moritz	simpleuser: ^^	17:43
simpleuser	moritz, skorgon actually it's eleted because i added the folders into .gitignore	17:43
mDuff	David, http://gitready.com/intermediate/2009/02/09/reflog-your-safety-net.html	17:43
skorgon	? adding anything to gitignore doesn't delete anything	17:44
moritz	simpleuser: adding stuff to .gitignore doesn't delete any files	17:44
David	thanks	17:44
simpleuser	moritz, yeah, sure.	17:44
	← martianlobster left	17:44
simpleuser	moritz, but why git takes care of it ?	17:44
	of them*	17:44
	← xmj left	17:44
moritz	simpleuser: I have no idea what you did. !repro would help	17:45
gitinfo	simpleuser: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	17:45
	→ teran_ joined	17:45
simpleuser	moritz, https://dpaste.de/zqHy	17:45
moritz	simpleuser: that doesn't tell me how to reproduce your state	17:45
simpleuser	moritz, i didn't do anything, i just modified layout.html.twig	17:45
moritz	simpleuser: ie how you got there	17:45
	← merica left	17:46
simpleuser	moritz, and now it tells me i removed the other files	17:46
moritz	simpleuser: modifying one file doesn't delete others	17:46
	← Sendoushi left	17:46
simpleuser	moritz, absolutely	17:46
	^^	17:46
	So i don't understand.	17:47
	→ iamtakingiteasy joined	17:47
	→ invinceable joined	17:47
	→ Sendoushi joined	17:47
moritz	simpleuser: then likely something else is going on, maybe you currently don't even understand that it's relevant to the current situation	17:47
	← hobodave left	17:47
	← teran left	17:47
simpleuser	moritz, yep.	17:47
moritz	simpleuser: like, something in the background executes some of your files	17:47
	simpleuser: or there's an IDE open which does magic stuff	17:48
	→ sgambino joined	17:48
	→ starkhalo joined	17:48
moritz	or... something.	17:48
	→ gp5st joined	17:48
simpleuser	moritz, mmm	17:48
moritz	most likely not related to git	17:48
gp5st	hey. I'm sorry for being an idiot. I can't figure out how to doa cvs import for http://savannah.nongnu.org/cvs/?group=circle I've tried git cvsimport -d:pserver:anonymous@cvs.savannah.nongnu.org:/sources/circle . but all i get is an unknown error	17:49
simpleuser	moritz, but if a folder foo is in my .gitignore... Is it normal that git tells me that foo/bar/file.txt has been removed ?	17:49
moritz	simpleuser: if the file has been tracked before. yes	17:49
	simpleuser: gitignore only affects untracked files	17:49
thiago	gp5st: cvs2svn then svn2git	17:49
gp5st	thiago: ::cringe:: so cvsimport isn't a good option?	17:50
	→ Sendoush_ joined	17:50
	← nettoweb left	17:51
	← Sendoushi left	17:51
thiago	gp5st: cvs2svn is much better tested	17:51
	gp5st: and there are several svn-to-git solutions out there that are well tested too	17:51
	← Dougie187 left	17:52
simpleuser	oh ok	17:52
	thanks moritz	17:52
gp5st	thanks	17:52
	← h0bbit_ left	17:52
	← chiromante left	17:52
gp5st	i've never understood how to use cvs :(	17:52
milki	rcs!	17:53
	← dangerousdave left	17:54
	→ Caius joined	17:54
	→ SicoWork joined	17:54
	→ tsunamie joined	17:54
moritz	gp5st: "with patience"	17:54
	← tsunamie left	17:54
	→ EToS joined	17:54
	Caius → Guest62825	17:55
	← takamichi left	17:55
	→ tsunamie joined	17:55
	→ Dougie187 joined	17:55
	→ niax joined	17:56
	← Sendoush_ left	17:56
lopezt	moritz: :D	17:56
	← koell left	17:56
	→ h0bbit_ joined	17:56
	← oskarkv left	17:56
	→ pfg joined	17:57
	→ tgkokk_ joined	17:57
	→ Nizumzen joined	17:57
	← tgkokk left	17:57
	→ Leoneof joined	17:58
	← alexwhitman_ left	17:59
	unreal_ → unreal	18:00
	← gp5st left	18:00
	← kukks left	18:01
	→ alexwhitman joined	18:02
	← tgkokk_ left	18:02
	← mobai left	18:04
	← doev left	18:04
	→ dangerousdave joined	18:05
	→ koell joined	18:06
	← scottyob left	18:08
	← simpleuser left	18:08
	j416_ → j416	18:08
	→ gravion joined	18:08
	← recycle left	18:09
	→ jottr joined	18:09
	← CaveJohnson left	18:09
	← asQuirr__ left	18:09
	→ scottyob joined	18:10
	← LucasKA left	18:10
	← bbloom left	18:10
	→ ArcTanSusan joined	18:10
	→ luxgeek joined	18:10
	→ nafg_ joined	18:13
	← luxgeek left	18:14
	→ sluther joined	18:15
	← Noldorin left	18:16
	→ JerryT joined	18:17
	→ Matrixiumn joined	18:18
	→ buddyq joined	18:19
	← buddyq left	18:19
	→ takamichi joined	18:19
	→ buddyq joined	18:19
	← Leoneof left	18:20
	→ Sendoushi joined	18:20
	→ khmarbaise joined	18:21
	→ SWakey joined	18:22
	← j0ran left	18:23
	→ Balliad joined	18:24
	→ LucasKA joined	18:24
	← h0bbit_ left	18:25
	← gravion left	18:27
	← vince_pr_ left	18:27
	→ gravion joined	18:27
	← SWakey left	18:27
	← shruggar left	18:27
	→ chiromante joined	18:28
WXZ1	what would happen if you merged your master branch	18:29
	→ nszceta joined	18:29
WXZ1	with some other branch	18:29
	but then reset your master branch to before the merge occured	18:29
	← Sendoushi left	18:29
_ikke_	WXZ1: What would you expect to happen?	18:29
WXZ1	is that relevant?	18:29
_ikke_	yes	18:29
WXZ1	the master branch would be rest	18:30
	reset*	18:30
	→ Sendoushi joined	18:30
thiago	that's what happens	18:30
WXZ1	but the branch you merged with would continue as if it had merged	18:30
_ikke_	WXZ1: Nope	18:30
	oh\	18:30
	Well, if you merge the master branch in another branch, the master branch itself is not affected	18:30
thiago	if you erased the merge from history, the merge never happened	18:31
	→ shruggar joined	18:31
_ikke_	thiago: He resets the master branch, not the branch he merged into	18:31
	→ pheaver joined	18:31
thiago	that's not how I read it	18:31
	I read that he was on master and merged with something else, then reset master to before the merge	18:31
WXZ1	thiago's got it right	18:32
	→ kukks joined	18:32
	← kukks left	18:32
	→ kukks joined	18:32
thiago	so, you erased it from history	18:32
	the merge never happened	18:32
_ikke_	Then you described it incorrectly	18:32
	← teran_ left	18:32
_ikke_	If you merge your master branch in another branch, it means you have checked out the other branch, and the master branches gets merged in	18:32
WXZ1	what would happen if you merged your master branch with some other branch but then reset your master branch to before the merge occured	18:32
	with* another branch	18:33
	not in	18:33
_ikke_	It still implied the master branch being merged	18:33
	← Dougie187 left	18:33
_ikke_	implies	18:33
	→ Sendoush_ joined	18:33
_ikke_	Note that merges happen to one branch only	18:34
WXZ1	it's a bit ambiguous	18:34
thiago	yes, it's ambiguous	18:34
_ikke_	It's quite simpel	18:34
thiago	merging is transitive	18:34
	← Sendoushi left	18:34
thiago	if you merge A with B, B is merged with A too	18:34
	however, in Git, it isn't transitive	18:34
	← gravion left	18:34
_ikke_	Merging histories / trees is, merging branches not	18:34
thiago	if you're in A and do git merge B, then A is modified but B isn't	18:34
WXZ1	thiago: makes sense, but then how does git know that it was merged?	18:35
thiago	WXZ1: because it created a merge	18:35
	WXZ1: if you rease the merge, then it never happened	18:35
dr_lepper	you mean it isn't symmetric?	18:35
thiago	dr_lepper: the result is, but only the currently checked out branch is affected	18:35
	dr_lepper: the other isn't	18:35
WXZ1	dr_lepper: transitive is the math term	18:35
	← David left	18:35
_ikke_	dr_lepper: Branches are labels in git. When you merge two branches, only one of the labels points to the merge commit	18:35
WXZ1	an operation is transitive when A+B=B+A	18:35
	→ marcjs___ joined	18:36
thiago	WXZ1: that's actually commutative	18:36
	← dangerousdave left	18:36
dr_lepper	WXZ1: i know a bit of math, thank you	18:36
WXZ1	thiago: then what's transitive?	18:36
dr_lepper	_ikke_: i know a bit of git, thank you	18:36
_ikke_	dr_lepper: Just trying to explain it	18:36
	There are two things that should be seen seperated	18:37
dr_lepper	it's just "transitive" didn't sound like a right word for the phenomenon	18:37
thiago	it probably isn't	18:37
	anyway, the description is ambiguous	18:37
	what were the git commands you used?	18:37
_ikke_	transitive is (A+B)+C = A + (B+C) right?	18:38
	← mizu_no_oto left	18:38
dr_lepper	_ikke_: no, it's associative	18:38
_ikke_	ok	18:38
dr_lepper	transitive is about relations	18:39
	← draftqin left	18:39
dr_lepper	if a > b and b > c then a > c	18:39
_ikke_	ok	18:39
dr_lepper	and symmetric is if a = b then b = a	18:39
	that's why I thought "symmetric" would be a better word for what thiago has been explaining	18:39
_ikke_	Are there situations then where a = b, but b != a then?	18:40
WXZ1	_ikke_: no, that's breaking the laws of thought	18:40
thiago	you can implement that in computing langauges	18:40
Nevik	_ikke_: there are with relations in general, using = was a bad example	18:40
thiago	I can't think of anything in Math that does it	18:40
_ikke_	ok	18:40
	← marcjs___ left	18:40
	← pheaver left	18:40
dr_lepper	_ikke_: it's just properties of relations	18:40
Nevik	_ikke_: e.g. < is not symmetric	18:41
thiago	a bad operator==() in C++ can be that	18:41
_ikke_	yeah	18:41
dr_lepper	the relation '=' is symmetric, the relation '<' is antisymmetric	18:41
Nevik	if a < b then by defition b !< a	18:41
	→ Noldorin joined	18:41
_ikke_	dr_lepper: Ok, right	18:41
cbreak	NaN NaN NaN NaN NaN ... BATMAN!	18:41
_ikke_	Makes sense	18:41
Nevik	cbreak: watman	18:41
	→ pheaver joined	18:41
osse	watman!	18:41
WXZ1	yeah, then transitive was the wrong word	18:41
Nevik	xD	18:41
thiago	cbreak: that's a != a	18:41
dr_lepper	_ikke_: you can also have relations which are neither symmetric nor antisymmetric	18:41
	← chiromante left	18:41
_ikke_	example?	18:41
WXZ1	dr_lepper: how?	18:41
dr_lepper	for example, if you consider comparing to NULL in SQL	18:41
	→ martianlobster joined	18:42
WXZ1	go on...	18:42
Nevik	WXZ1: by defining it thus, in general	18:42
dr_lepper	WXZ1: do you speak c++?	18:42
Nevik	WXZ1: relations are arbitrary (only relations without certain properties arent usually very interesting)	18:42
WXZ1	dr_lepper: no, I don't	18:43
dr_lepper	okay	18:43
WXZ1	Nevik: but we're talking about types of relationships	18:43
_ikke_	We we're talking about merging :P	18:43
dr_lepper	well, if you consider a set of all the possible pairs of objects, then a relation is a subset of this set of pairs	18:43
WXZ1	symmetric relationships are ones where if a->b then b->a in all cases	18:43
Nevik	yeap	18:43
WXZ1	so either relations are either symmetrical, or assymetrical or undefined for some cases	18:44
dr_lepper	any subset of a set of pairs is a relation	18:44
	for example, relation '=' is a set of pairs of equal objects	18:44
	you can define your relation to be anything	18:44
WXZ1	such as where f(a) = b is defined, but f(b) is not defined	18:44
	I'd still call that assymetric though	18:45
Nevik	WXZ1: thats not quite the right way of looking at things. symmetry and asymmetry are properties of relations. any relations is either symmetry or not, and either asymmetric or not	18:45
	← jottr left	18:45
Nevik	WXZ1: asymmetric has a simple defintion (no element is related to itself)	18:46
	→ marcjs___ joined	18:46
_ikke_	so it can be both symmetric and assymetric at the same time?	18:46
dr_lepper	symmetric, asymmetric and antisymmetric are different things	18:46
WXZ1	Nevik: exactly, but dr_lepper said that it's sometimes neither symmetric or symmetric	18:46
	or asymmetric*	18:46
	← elasticdog left	18:46
	→ SWakey joined	18:46
Nevik	WXZ1: he possibly just expressed himself ambiguously	18:46
	← ErKa left	18:47
	→ jorisros joined	18:47
dr_lepper	no, I didn't mention asymmetric at all	18:47
	→ elasticdog joined	18:47
Nevik	as he just said, the three properties are different in the sense that they are different categories	18:47
dr_lepper	I don't think people talk of asymmetric relations	18:47
_ikke_	math, yeah!	18:47
	→ dkpi joined	18:47
Nevik	dr_lepper: strict orders? :P	18:47
dr_lepper	Nevik: antisymmetric	18:47
thiago	"asymmetric" means "not symmetric". Don't confuse it with "anti-symmetric"	18:47
Nevik	lots of people talk about those (which are asymmetric by definition)	18:47
	thiago: not quite right. there's an ambiguity about it. "not symmetric" and "asymmetric" can be different for relations	18:47
	"asymmetric" for relations is usually meant to mean "fully asymmetric" (i.e. no element is related to itself)	18:48
	→ cian1500ww joined	18:48
	→ dreiss joined	18:49
_ikke_	Look what i've caused :P	18:49
Nevik	haha	18:49
	← martianlobster left	18:49
	← MetalMatze left	18:49
thiago	but it actually means that there is one element that isn't related to itself	18:49
	← joki left	18:49
Nevik	_ikke_: your fault for sure	18:49
	thiago: nope. that's non-symmetric	18:49
	← mewm left	18:49
	→ draftqin joined	18:50
	→ Hecter joined	18:50
_ikke_	non-symmetric, asymettric, anti-symmetric	18:50
	← marcjs___ left	18:50
bremner	Nevik: dunno, I never heard this definition before, and I spend a fair amount of time reading this kind of thing. So it might be a local/specialist definition.	18:51
Nevik	bremner: i know. it depends a bit on who defines it. ive learned asymmetric for relations to usually mean "fully asymmetric"	18:51
bremner	shrug ok.	18:52
Nevik	that's why it's usually helpful to include a formula/definition when talking about it	18:52
	i agree that the existence of ambiguity itself is ample cause for confusions haha	18:52
bluesm	Where Should I put my ssh available repos ?	18:52
	← pheaver left	18:52
bremner	bluesm: whereever you like?	18:53
_ikke_	bluesm: Doesn't really matter. Homedirs are often used	18:53
bluesm	(I mean remote --bare repos, to push, and pull)	18:53
_ikke_	bluesm: Doesn't matter either	18:53
bluesm	Pro git book suggest "/opt/git/"	18:53
_ikke_	bluesm: It's fine	18:53
	← draftqin left	18:53
	→ draftqin joined	18:53
	→ martianlobster1 joined	18:54
	→ joki joined	18:54
_ikke_	bluesm: But you have to specify the full path everytime you want to refer to the repo	18:54
	← hyperair left	18:54
bluesm	_ikke_: Ok. I just ask, where is "logical" intuitive location :0	18:54
	:)	18:54
_ikke_	bluesm: In either your homedir, or the homedir of a special git user	18:55
	← LeMike left	18:55
bluesm	_ikke_: And then (with homedir location) I won't have to provide full path, since ~ is assumed as default ?	18:55
	← mehdi left	18:55
_ikke_	bluesm: correct	18:55
	foo@bar:repo.git	18:55
	→ zumba_addict_ joined	18:56
	← tfnico left	18:56
	→ hyperair joined	18:56
	→ tfnico joined	18:56
	← scalability-junk left	18:56
bluesm	_ikke_: I would collaborate, so it is nice to have "git" user :) git@bar:repo.git :) Right ?	18:56
_ikke_	bluesm: right	18:57
thiago	that means everyone with the password or an authorised key can write	18:57
	→ the8thbit joined	18:57
_ikke_	bluesm: If you want to make it yourself even easier, there is this tool called gitolite	18:57
thiago	and you can't log who it was	18:57
	→ mehdi joined	18:57
_ikke_	gitolite has logging though	18:58
	← zumba_addict left	18:58
	zumba_addict_ → zumba_addict	18:58
	→ aard_ joined	18:58
thiago	it's possible, it's just advanced ssh usage	18:58
_ikke_	gitolite has it by default	18:58
thiago	you can limit the key's usage to a specific command	18:58
	→ scalability-junk joined	18:59
thiago	I know	18:59
	but is he going to use gitolite?	18:59
_ikke_	I would if I was him	18:59
	But I'm not, so it's for him to decide	18:59
	Oh, aparently the logs don't contain user information	19:00
	→ kenavr joined	19:00
	← takamichi left	19:00
	→ Trudko joined	19:00
	← kukks left	19:01
Trudko	Guys if I have folder which is not staged for commit and I want to completely ignore it for ever and ever what should I do? adding it to gitignore didnt work not sure completely	19:02
	← bgerber left	19:02
	← buddyq left	19:02
	→ David joined	19:02
thiago	Trudko: Git doesn't track directories	19:02
	← draftqin left	19:03
thiago	Trudko: it does list them if they exist, aren't empty and aren't tracked	19:03
	← hyperair left	19:03
thiago	Trudko: is that your case?	19:03
	← bhldev left	19:03
	→ asQuirre_ joined	19:03
Trudko	there are files inside of them	19:03
	← francisfish left	19:06
	← Kayra left	19:06
	← David left	19:07
thiago	Trudko: so, ignore the dir	19:07
	← Nizumzen left	19:07
	← sluther left	19:07
	→ longst joined	19:13
	→ dik_dak joined	19:13
	→ fr33 joined	19:14
	→ xpe joined	19:14
	← jceb left	19:15
	← zapb left	19:15
	← longst left	19:15
	← fairuz left	19:15
	← kenavr left	19:15
	→ longst joined	19:15
	→ ewet joined	19:16
longst	a quick question regarding git config --global user.name and user.e-mail etc... when these parameters will be used please?	19:16
	→ ezrafree joined	19:17
	← lifelike left	19:17
	→ lifelike joined	19:18
bremner	longst: e.g. when you commit	19:18
	TheMoonMaster_ → TheMoonMaster	19:20
longst	hmm... I am very new in git... I used to use SVN. I could understand that user.name may be used for repository authentication. .. but is user name also required for repository in this case?	19:20
bremner	neither has anything to do with authentication	19:21
longst	hmmm... so are they just nice to have ?	19:22
	← King_Hual left	19:22
bremner	no, they are important for constructing commits, as I said	19:22
ewet	longst: in git you don't authenticate to a server on commit, you maintain your very own repository. this is a way to tell git about your identity. of course you could put anything in here but then everybody would probably hate you for doing that (and not take your pull requests).	19:24
	← kaffeebohne left	19:25
	→ oriba joined	19:27
	← ravigehlot left	19:27
	→ ls___ joined	19:28
	→ sq-one joined	19:28
	→ hyperair joined	19:28
	→ zapb joined	19:28
ls___	Mabye somone can give the command to view changes from last commit.	19:29
	← kcj left	19:29
skorgon	ls___: git show	19:29
Nevik	skorgon McQuicktype :D	19:30
	→ teran joined	19:30
	→ mribeirodantas joined	19:30
longst	Sorry I don't quick follow : "of course you could put anything in here but then everybody would probably hate you for doing that (and not take your pull requests)."	19:30
	→ el3ctron joined	19:30
bremner	longst: I suggest you enter something sensible, and start following a tutorial. You'll understand quick enough	19:31
longst	any beginning level tutorial suggested please?	19:32
ls___	Alright, and comparing to a individual files. Perhaps to the tracked one that have been added	19:33
	← invinceable left	19:33
ls___	I really enjoyed reading gitscm e-book	19:33
	→ chiromante joined	19:33
	← ck`` left	19:33
bremner	longst: see !book or man gittutorial	19:33
gitinfo	longst: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	19:33
	longst: the gittutorial manpage is available at http://jk.gs/gittutorial.html	19:33
	← beastd left	19:34
longst	nice, thanks	19:34
	→ bwreilly joined	19:34
	← Balliad left	19:34
	← teran left	19:34
	← khmarbaise left	19:35
	← Ozch left	19:35
ewet	longst: it's your responsibility what to use here and be consistent about it. if you put Linus Torvalds, torvalds(a)linux-foundation.org there, people will know ;)	19:39
	← ls___ left	19:39
	→ Kayra joined	19:40
	→ mizu_no_oto joined	19:42
	→ CareBear\ joined	19:42
	← Celelibi left	19:43
	→ David joined	19:45
	← Kayra left	19:45
	→ hobodave joined	19:45
thiago	longst: the email address is just saved as part of the commit	19:46
	longst: like others have said, it doesn't have to be an actual email address. Just something that looks like it.	19:47
	longst: it doesn't have to be an email address you have access to	19:47
	longst: it's just a convention that it is an email address you can be reached at. A good convention.	19:47
	← WXZ1 left	19:48
thiago	longst: and a convention that is enforced by most projects. Write something there that isn't your email address and your commits will be rejected by other people in the project.	19:48
longst	hmm... if I understand it correctly I should always use "longst" correct?	19:48
	→ Celelibi joined	19:48
	→ bartman`` joined	19:48
thiago	longst: something that looks like an email address	19:48
	longst: you know, @ and . required	19:48
	← dreiss left	19:48
thiago	longst: if you want to truly hide your identity, use root@localhost	19:48
	← David left	19:49
ewet	actually, there's an (actually two) RFC for that, but then again, I'm pedantic about this particular topic. so just ignore me ... scnr ...	19:49
	→ Gamecubic joined	19:49
	← JPohlmann left	19:49
longst	hmm. I could put my e-mail, longst.ct[at]gmail.com	19:50
thiago	which is what most people do	19:50
	→ ghostlines joined	19:50
	← User458764 left	19:50
longst	sorry, typo	19:51
	→ WireStif joined	19:51
longst	e-mail is longst.cn[at]gmail.com	19:51
thiago	doesn't matter to us	19:51
longst	sure	19:51
	ewet scribbles	19:52
	← fanno left	19:53
	← doener left	19:55
	→ SpNg joined	19:55
	→ axl_ joined	19:57
	← koltroll left	19:58
	→ dev__ joined	19:58
	→ dangerousdave joined	19:59
WireStif	Hi guys. I am trying to migrate a repository from SVN to git. I just cloned it to and after looking at the branches, I end up with some having the same name but with a suffix @revision number. Is the one without the revision number suffix the newest ?	19:59
	← scarabx left	20:00
	→ felipewm joined	20:02
	← nszceta left	20:05
	→ koltroll joined	20:05
	→ nszceta joined	20:05
	← nszceta left	20:06
	← ehmatthes left	20:06
	← WireStif left	20:06
	→ Nizumzen joined	20:07
	→ Dougie187 joined	20:09
	← lolmaus left	20:10
	→ Kayra joined	20:10
	← Nizumzen left	20:10
	→ lolmaus joined	20:10
	→ Gavrisimo joined	20:10
	← ArcTanSusan left	20:11
	← ghostlines left	20:12
	← RaceCondition left	20:12
cbreak	they are all different	20:13
	← MindfulMonk left	20:13
	→ theRealGentleman joined	20:14
	← Kayra left	20:15
	← martianlobster1 left	20:15
	→ MindfulMonk joined	20:15
	← MindfulMonk left	20:16
	→ diegovio1 joined	20:16
	→ David joined	20:16
	diegovio1 → diegoviola	20:17
	← tagava left	20:17
	→ pheaver joined	20:18
	→ MindfulMonk joined	20:18
	qsusxs → qsuscs	20:18
	→ sluther joined	20:18
	→ francisfish joined	20:19
	→ ErKa joined	20:19
	← MindfulMonk left	20:20
	→ Kayra joined	20:20
	← koltroll left	20:20
	→ MindfulMonk joined	20:21
	← David left	20:21
	← PeterBooker left	20:21
	→ ehmatthes joined	20:22
	← pheaver left	20:23
	← JeanCarloMachado left	20:23
	→ bgerber joined	20:24
	→ fanno joined	20:24
	← Dougie187 left	20:24
	→ jatt joined	20:25
	→ RaceCondition joined	20:25
	← Kayra left	20:25
	← ngladitz left	20:29
	→ teran joined	20:31
	← mizu_no_oto left	20:32
	→ SorenHolm joined	20:33
	→ Nizumzen joined	20:34
	→ mizu_no_oto joined	20:35
	→ draftqin joined	20:35
	← teran left	20:36
felipewm	Boa noite	20:36
	estou pesquisando algumas dúvidas no site da documentação do git	20:37
	← chiromante left	20:37
felipewm	mas ainda tenho algumas dúvidas	20:37
_ikke_	We don't speak portuguese here	20:37
felipewm	XD Ops	20:37
	Good night	20:37
_ikke_	I got that far	20:37
	← nilg` left	20:38
felipewm	Boa noite	20:38
	Estou pesquisando algumas dúvidas no site da documentação do git	20:38
	mas ainda tenho algumas dúvidas	20:38
	← Freeman42 left	20:38
felipewm	good night	20:39
_ikke_	Deja-vu	20:39
felipewm	I'm researching some doubts in the git documentation site	20:39
	but still have some questions	20:39
_ikke_	Ok, what are you unsure about?	20:39
	← poulson left	20:39
felipewm	Como eu faço para usar um repositório já existente?	20:39
	How do I use an existing repository?	20:39
_ikke_	IN what way, use?	20:39
moritz	git log, git commit, git diff etc.	20:39
	← mizu_no_oto left	20:40
cbreak	felipewm: git clone it.	20:40
felipewm	Using "git init" option creates a new repository, but I would like to select a specific	20:40
cbreak	felipewm: git clone it.	20:40
	← mDuff left	20:40
	→ mDuff joined	20:41
	→ buddyq joined	20:41
	← r0ok left	20:42
felipewm	Thanks guys =)	20:43
	← hoschi left	20:44
	→ Exancillatus joined	20:44
	→ Kayra joined	20:44
	← Exancillatus left	20:45
	← guyz left	20:49
	→ koda joined	20:53
	← dkpi left	20:54
	→ teran joined	20:55
	→ ntio joined	20:58
	→ martianlobster joined	21:00
	← teran left	21:01
	→ scarabx joined	21:01
	← JerryT left	21:02
	→ teran joined	21:04
	→ hephaestus_rg joined	21:06
	→ Ultraflash joined	21:06
	→ kukks joined	21:06
	← kukks left	21:06
	→ kukks joined	21:06
hephaestus_rg	i just made some big fixes to master, so now my feature branch is stale. is there some way to merge the changes made to master into my feature branch	21:07
	← vurma left	21:07
	← Ultraflash left	21:07
skorgon	hephaestus_rg: merge master into your feature branch, or rebase the feature branch on top of master	21:07
	← buddyq left	21:08
hephaestus_rg	are there specific cases where one is preferable to another?	21:08
	→ aspiers joined	21:08
cbreak	usually, private feature branches are rebased	21:08
	at least if they are short-lived	21:09
	→ tpollard joined	21:09
	→ richwestcoast joined	21:10
hephaestus_rg	so if i want to use the merge strategy, i should checkout the feature and then "git merge master" right?	21:10
	→ dkpi joined	21:11
	← theRealGentleman left	21:11
	← xlinkz0 left	21:11
	→ aberrant joined	21:12
	→ khmarbaise joined	21:12
_ikke_	!merge_vs_rebase	21:12
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	21:12
	← SWakey left	21:12
	← teran left	21:12
	→ pr0ton_ joined	21:12
	→ zumba_addict_ joined	21:12
	→ teran joined	21:13
	→ nszceta joined	21:14
	→ SWakey joined	21:14
	← zumba_addict left	21:14
	zumba_addict_ → zumba_addict	21:14
	← SWakey left	21:14
	→ cagedwisdom joined	21:15
	← aberrant left	21:16
	← jackneill left	21:16
	→ Xethron joined	21:16
	← Xethron left	21:16
	→ Xethron joined	21:16
	→ David joined	21:16
	← teran left	21:17
	→ ngladitz joined	21:18
hephaestus_rg	i just tried to rebase to master, and i'm having trouble finding the line that caused the merge conflict	21:19
	this is the git messages https://gist.github.com/hayksaakian/9040767	21:19
	← pr0ton_ left	21:19
hephaestus_rg	i'm looking at the patch file like it suggested	21:20
	← bgerber left	21:20
	← hephaestus_rg left	21:21
	← David left	21:21
	← ewet left	21:21
	→ hephaestus_rg joined	21:21
	→ LeMike joined	21:22
	→ harobed joined	21:23
	← treehouse left	21:23
	→ bgerber joined	21:25
	→ Xethron_ joined	21:25
	← Xethron left	21:25
	← axl_ left	21:25
	← sq-one left	21:26
osse	hephaestus_rg: look in the file itself	21:26
	hephaestus_rg: you should see <<<<<<< ======== >>>>>>>	21:26
	← matheus23 left	21:27
	→ dharrigan joined	21:28
	← dharrigan left	21:28
	→ dharrigan joined	21:28
	← Not_Whatever left	21:28
	← Kicer86 left	21:30
	← jizanthapus left	21:30
	→ johnflux__ joined	21:30
	← johnflux__ left	21:30
	→ johnflux__ joined	21:30
	← dev__ left	21:31
	← aspiers left	21:31
	← johnflux_ left	21:31
	← neophreak left	21:32
Celelibi	How do I deal with non-ff updates?	21:36
	I fetched and see the origin/master branch is not a descendant of my current master.	21:36
	← GT4066 left	21:36
Celelibi	screw this, I'll just update-ref.	21:37
	← ErKa left	21:38
skorgon	Celelibi: depending on your workflow, you probably want to rebase your branch on top of origin/master, or merge origin/master into your branch	21:38
Celelibi	I don't have local modification, but remote history has been modified.	21:39
	→ pwnz0r joined	21:39
Celelibi	I just want my local master to be the same as origin/master.	21:39
	← Gamecubic left	21:39
	← jatt left	21:40
skorgon	well, then why do you have a llocal branch at all?	21:40
	just checkout origin/master	21:40
	← rainbyte left	21:40
skorgon	anyway, git reset --hard origin/master will make your current branch the same as origin/master	21:40
Celelibi	I have a local branch master because it was the default.	21:40
skorgon	who says you cannot change defaults?	21:40
	→ jaf2k joined	21:40
Celelibi	I do all my changes in separate branches.	21:40
skorgon	so why having a local master that is nothing different than origin/master?	21:41
Celelibi	Because I base all my branches on top of master and not on top of origin/master.	21:41
moritz	because pushing from master to origin/master is so much more convenient	21:42
skorgon	for what reason? isn't origin/master what you actually want?	21:42
Celelibi	I don't push anything.	21:42
skorgon	moritz: just a matter of a few config options	21:42
Celelibi	skorgon: no, I want to move master on origin/master when I want.	21:43
	← Guest85898 left	21:44
skorgon	Celelibi: i don't see the point in doing that, but as mentioned above, reset --hard does that	21:44
	→ _W_ joined	21:44
	→ Naoe-Kanno joined	21:44
Celelibi	thanks	21:45
	→ danman joined	21:45
	← SHyx0rmZ left	21:45
	→ Goplat joined	21:45
	→ Spyro joined	21:45
	Spyro → Guest48035	21:45
	← diegoviola left	21:46
	← zapb left	21:47
	→ beastd joined	21:48
	→ buddyq joined	21:48
	← durianshredder left	21:50
	SamB wonders if there's a good word-based blame, for wikipedia articles or other mediawiki stuff ...	21:51
	→ Gamecubic joined	21:53
Celelibi	Is there a way to use rerere for rebase?	21:54
	← reim left	21:54
	← dkpi left	21:56
	→ SocalNick joined	21:57
	→ simesy joined	21:57
	przemkov1 → przemkovv	21:58
	→ krizzii joined	21:59
	← catsup left	21:59
	→ catsup joined	22:00
	→ fragamus joined	22:01
	← danman left	22:04
	← dangerousdave left	22:05
	← catsup left	22:05
	← jaf2k left	22:05
	→ bliker joined	22:06
	← bliker left	22:06
	→ catsup joined	22:06
	→ jnavila joined	22:06
	→ Fandekasp joined	22:08
	← kukks left	22:10
	← dsdeiz left	22:10
	← Kayra left	22:11
	← catsup left	22:11
	→ dsdeiz joined	22:12
	→ catsup joined	22:12
rawtaz	i have some WIP and would like to stash away the parts of it which i have not yes staged (or the other way around, doesnt matter). is there a way to do that? cant find one in the man page	22:13
	→ vince_prignano joined	22:13
	← jnavila left	22:13
	→ woollyams joined	22:13
	→ ArcTanSusan joined	22:13
	→ o9 joined	22:14
kpreid	rawtaz: sounds like you want 'git stash --keep-index' (or -p for more control)	22:14
	← Guest48035 left	22:14
rawtaz	kpreid: the problem with that is that it stashes all changes, the only difference is that it doesnt clear the index	22:15
kpreid	rawtaz: if you have multiple interesting changes, myself I would just commit them on a new branch (incrementally with add -p perhaps) and then rearrange the commits afterward	22:15
	→ ErKa joined	22:15
rawtaz	i want to retain the index, and put away the rest temporarily	22:15
	right	22:15
kpreid	that's what --keep-index says it does (I haven't used it myself)	22:15
	← draftqin left	22:15
rawtaz	kpreid: the stash will contain a copy of the index as well, it will not stash only the other changes	22:16
kpreid	ah	22:16
	→ jatt joined	22:16
kpreid	in general, stash is just a shortcut for committing on a special branch, so if stash isn't flexible enough then just commit	22:16
	→ David joined	22:16
rawtaz	i guess i will have to do that	22:16
	thanks	22:16
kpreid	git checkout -tb temp; git commit; git add -u; git commit; and so on	22:16
	→ Spyro_ joined	22:17
kpreid	then cherry-pick or whatever instead of stash pop	22:17
	Spyro_ → Guest88346	22:17
rawtaz	yeah	22:17
	← v0n left	22:17
rawtaz	hm was the -t just old habit or is there some specific use for it?	22:17
	← catsup left	22:17
	← ariscop left	22:18
	→ catsup joined	22:18
hephaestus_rg	thanks for the help osse	22:19
	→ nafg___ joined	22:19
	← graphitemaster left	22:19
	→ graphitemaster joined	22:19
	← bgerber left	22:19
	← nafg_ left	22:20
	← ArcTanSusan left	22:21
	← David left	22:21
	← psyl0n left	22:21
	← jatt left	22:22
	← catsup left	22:23
Celelibi	Isn't there a bug with git merge?	22:24
	→ catsup joined	22:24
Celelibi	When I try to merge 3 branches into the current one, and the second one is on HEAD, then another branch won't get merged.	22:24
	← khmarbaise left	22:26
	← revele left	22:27
	← fanno left	22:28
Eugene	Celelibi - "is on HEAD" doesn't make sense. Are you trying to say that it's at the same location as your current branch? Then yes, it's a no-op.	22:29
	← catsup left	22:30
Celelibi	Yes, should be. Let me write a simple test-case.	22:30
Eugene	A !repro would help here(including what git log --graph looks like), but I'm guessing it's interpreting your input as creating an octopus merge(more than two things being merged), which will only be allowed under certain circumstances: man git-merge	22:30
	→ catsup joined	22:30
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	22:30
	the git-merge manpage is available at http://jk.gs/git-merge.html	22:30
Eugene	So, no bug. ;-)	22:30
Celelibi	Yes, there is a bug definitely.	22:32
	→ bgerber joined	22:32
	→ cads joined	22:32
mDuff	Celelibi, ...well, if you're in a case where octopus merge is documented not to be supported, then that's not necessarily so definite.	22:32
	← Gamecubic left	22:32
	← ezrafree left	22:32
	→ David joined	22:32
	← Hecter left	22:33
	→ bwreilly_ joined	22:34
	← oracal left	22:34
	← bwreilly left	22:35
	← catsup left	22:36
	→ Sound_ joined	22:36
	→ catsup joined	22:36
	→ toobluesc joined	22:37
Celelibi	https://gist.github.com/Celelibi/9041664	22:38
	← dougsland left	22:38
Celelibi	See, it didn't merge foobranch.	22:38
	← Sound left	22:38
	Sound_ → Sound	22:38
Celelibi	Yes, it's an octopus merge, but there is absolutely no conflict at all.	22:38
	And this behavior depends on the order in which I put the branches on the command line.	22:39
	→ dougsland joined	22:39
	← sluther left	22:39
Celelibi	Actually, I guess merge try to skip this noop branch by doing "+1" to the list of branches to merge and skip foobranch instead of noopbranch.	22:40
	→ Gamecubic joined	22:40
	← MattMaker left	22:40
	← drodger_ left	22:40
	← ndim left	22:41
	→ drodger joined	22:41
	frobware → zz_frobware	22:41
	→ ndim joined	22:42
	→ MattMaker joined	22:43
Celelibi	Well, it's not that simple. The bug only happen when the noopbranch is the second branch on the command line.	22:44
	→ recycle joined	22:45
rawtaz	Celelibi: sorry for a n00b question, but how should the output look after the merge? maybe you can add an example of the expected result in the paste?	22:47
	→ JerryT joined	22:47
Celelibi	Wait a second, I'm writing a test script that reproduce the bug.	22:48
rawtaz	ok :)	22:48
	→ mikepack joined	22:48
	← francisfish left	22:48
rawtaz	you on a roll today!	22:48
	← fragamus left	22:48
Celelibi	on a roll?	22:48
rawtaz	uh, ahm, eeh..	22:49
	→ oojacoboo joined	22:50
	← hephaestus_rg left	22:50
	← longbeach left	22:50
Celelibi	Sorry, I'm a non-native english speaker. ^^	22:50
	← tirengarfio left	22:50
	← SocalNick left	22:50
	→ tirengarfio joined	22:51
rawtaz	me too, thats why that didn't come across well :P	22:51
	me neither*	22:51
	← Gamecubic left	22:51
	← zorbash left	22:52
	← freestyl3r left	22:53
	← Segfault_ left	22:53
	← aard_ left	22:53
	→ MachineX joined	22:53
	→ Nicholas_Rishel joined	22:53
	← Nicholas_Rishel left	22:54
	← boblee left	22:54
	← tirengarfio left	22:55
	← Sound left	22:55
	→ kcj joined	22:56
	→ boblee joined	22:56
	← martianlobster left	22:56
	← cwillu_at_work left	22:56
	← krizzii left	22:56
	→ tirengarfio joined	22:56
	→ bitri joined	22:56
	→ krizzii joined	22:57
	→ fullbit joined	22:57
Celelibi	Eugene, mDuff: If you want to test: https://gist.github.com/Celelibi/9041841	22:57
rawtaz	hm, could it be that `stash show` does not show untracked files that were included in the stash with `stash -u` ?	22:58
Eugene	Celelibi - if you think it's a bug, the mailing list is reallythe place to discuss it	22:58
fullbit	question, I submitted a pull request on someone's repository and they're telling me to 'rebase', what exactly do they want me to do?	22:58
rawtaz	i did stash with -u, but showing the stash doesnt list those files	22:58
Celelibi	Eugene: I prefer to look stupid on IRC than on a mailing list. That's why I'd like to have your opinion before I try to report a bug. :p	22:59
Eugene	I think octomerges are stupid, so.	22:59
rawtaz	found the answer.	22:59
	→ Gamecubic joined	22:59
	← lithiumjake_ left	22:59
Eugene	And trying to merge a no-op branch is similarly so. Surprise it breaks?	22:59
Celelibi	fullbit: maybe you based your branch on an older version of the upstream branch?	22:59
	→ looper joined	23:00
	← looper left	23:00
Celelibi	Eugene: why is octopus merge stupid?	23:00
fullbit	Celelibi: so just pull the upstream and fast-forward?	23:00
	→ cwillu_at_work joined	23:00
Eugene	Because you're doing a dozen things at once.	23:00
skorgon	fullbit: rather something like pull --rebase	23:00
Celelibi	Eugene: is that bad?	23:01
Eugene	I can see where it might be useful(the historical use-case and it's reason for existence is Linus Said So), but the fact that it's not really a merge limits its utility	23:01
skorgon	fullbit: with your local changes pull cannot fast-forward	23:01
	← Trudko left	23:01
	← oriba left	23:01
	← Sendoush_ left	23:02
Celelibi	Eugene: you mean I should perform a loop of merges?	23:02
	← patapon left	23:02
	← Xethron_ left	23:02
Celelibi	And I think I use it for what is was designed: to merge a topic-branch.	23:02
Eugene	No..... that's just a normal merge	23:03
	← krizzii left	23:03
	← rawtaz left	23:03
	← ferreum left	23:03
	→ noisewaterphd_ joined	23:03
fullbit	thanks for the help Eugene and Celelibi. got it to work. checked this out too https://stackoverflow.com/questions/17182624/contributing-to-project-on-github-how-to-rebase-my-pull-request-on-top-of-mast	23:04
	← asQuirre_ left	23:04
	→ maukkea joined	23:04
	← mepl left	23:06
	→ Dougie187 joined	23:06
	→ Segfault_ joined	23:07
	→ rawtaz joined	23:07
	← mamarley left	23:07
	← CussBot left	23:07
	← lifelike left	23:08
	→ CussBot joined	23:08
	→ mamarley joined	23:08
	← pfg left	23:08
	→ lifelike joined	23:08
	← ngladitz left	23:09
	→ jatt joined	23:10
	→ _iron joined	23:11
	→ bhldev joined	23:11
	→ shinnya joined	23:12
	← dougsland left	23:12
	← kpreid left	23:12
	← Arctico left	23:13
	→ becks__ joined	23:13
	← fullbit left	23:16
	→ fullbit joined	23:16
	→ aspiers joined	23:16
	← MindfulMonk left	23:18
	→ MindfulMonk joined	23:18
	← Lunatrius left	23:18
	→ dougsland joined	23:19
	→ Lunatrius joined	23:19
	→ jottr joined	23:19
	← jottr left	23:19
	← bgerber left	23:20
	← harobed left	23:21
	← jatt left	23:21
	← nnyk_ left	23:22
	→ Kayra joined	23:22
	→ boblee_ joined	23:22
	← boblee left	23:22
	← woollyams left	23:22
	→ woollyams joined	23:24
	← vince_prignano left	23:24
	→ teran joined	23:24
	← sgambino left	23:25
	→ alexlindenlevy joined	23:25
	→ daito joined	23:25
	← j416 left	23:26
	→ carbon joined	23:26
	← carbon left	23:26
	→ bgerber joined	23:26
	← Kayra left	23:27
	→ j416 joined	23:27
	← SorenHolm left	23:28
	← johnmilton left	23:29
	← WaReZ_ left	23:30
	→ WaReZ joined	23:30
	← _iron left	23:31
	← daito left	23:32
	→ becks___ joined	23:33
	← becks__ left	23:33
	← maqr_ left	23:34
	→ maqr joined	23:34
	← fullbit left	23:35
	← mikepack left	23:37
	→ mikepack joined	23:37
	← kirin` left	23:38
	→ kirin` joined	23:39
	→ SocalNick joined	23:39
	→ Arctico joined	23:40
	← Nizumzen left	23:40
	← causasui left	23:40
	→ mizu_no_oto joined	23:41
	← valgrind left	23:41
	← mikepack left	23:42
	→ ariscop joined	23:43
	→ v0n joined	23:43
	← mellernoia left	23:44
	→ SquareRoot joined	23:46
	← SquareRoot left	23:46
	← the8thbit left	23:48
	← beastd left	23:48
	→ wilson_balderram joined	23:49
wilson_balderram	hello	23:49
gitinfo	wilson_balderram: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	23:49
wilson_balderram	I have a question	23:49
	→ diegoviola joined	23:50
wilson_balderram	I have commit some changes to the repo of my team, so it happens to be that my changes are not ok, so should I reset the changes and the commit? or should I leave it as it is?	23:50
	← v0n left	23:51
	← howlymowly left	23:54
	← bitri left	23:54
	← fr33 left	23:55
xender	wilson_balderram: have you pushed it out already?	23:56
	← kotk left	23:57
	→ john2x joined	23:58
xender	If not - that's for version control is for. If you think you will need some of those commits in the future, you can create a second branch and reset --hard whatever branh you were on	23:58
	← pantsman- left	23:58
xender	However, if you pushed that changes out, then better reverse them in next commit	23:58

Logs Search ←Prev date Next date→

Channels Documentation