IRCloggy #git 2016-09-06

Provider of IRC logs since 2005.

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

	2016-09-06
SporkWitch	double quotes allow for variable expansion and things like newline; single quotes might treat \n as literals	00:00
	SporkWitch can never remember	00:00
	→ rominronin joined	00:00
	← chigang_ left	00:01
alexandrecvl	SporkWitch: I am just testing..	00:01
	← texasmynsted left	00:01
	→ quetz joined	00:02
	← deadprez left	00:02
alexandrecvl	SporkWitch: It did not work. bitbucket shows me exactly this: Testing paragraphs:\nparagraph1 \n paragraph2	00:02
	it prints \n as characters, not carriage return	00:03
	I am doing this in dos. would that be a problem?	00:03
SporkWitch	interesting...	00:03
	no idea, i use real operating systems	00:03
bremner	DOS is real mode.	00:04
alexandrecvl	I understand.	00:04
	→ durham joined	00:05
	← durham left	00:05
alexandrecvl	Would you suggest another approach?	00:05
	→ durham joined	00:05
	← rominronin left	00:06
	← qpdb left	00:07
	→ qpdb joined	00:07
	→ mingrammer joined	00:07
	→ shmuli joined	00:09
	← zacts left	00:10
chris2	use -F ?	00:10
	← ahr3n left	00:11
chris2	or multiple -m, one for each paragraph	00:11
	← paulh left	00:12
	← mingrammer left	00:12
	← Gsham left	00:12
	→ daurnimator joined	00:12
deltab	yeah, write the message to a file and use -F	00:12
	or pipe it in if that's convenient	00:13
	tanuki_ → tanuki	00:16
	← shmuli left	00:17
	← DieguezZ left	00:18
	← harish left	00:18
	→ mycelium joined	00:19
	← ruby_ left	00:20
	→ harish joined	00:20
	→ Gsham joined	00:23
	→ shmuli joined	00:23
	→ deadprez joined	00:25
	→ bmahe joined	00:27
	→ lolmac joined	00:28
	← deadprez left	00:29
	← thiago left	00:30
	← dsdeiz left	00:30
	← cyphase_eviltwin left	00:31
	→ dsdeiz joined	00:31
	→ vrishab joined	00:31
	← mellernoia left	00:31
	← shmuli left	00:31
	→ hahuang65 joined	00:32
	→ deadprez joined	00:33
	→ stamina joined	00:35
	→ cyphase joined	00:35
	← hahuang65 left	00:37
	← alexandrecvl left	00:39
	→ biotim joined	00:40
	← l4v2 left	00:41
	← catsup left	00:41
	← up_the_irons left	00:43
	→ carif joined	00:44
	← shinnya left	00:44
	→ up_the_irons joined	00:46
	→ Dispatch joined	00:48
	→ shmuli joined	00:48
	→ catsup joined	00:49
	← stamina left	00:49
	→ SwiftMatt joined	00:49
	← harish left	00:51
	→ Salander27 joined	00:54
	← sangy left	00:55
	← mns_ left	00:55
	→ dsantiago joined	00:55
	→ mns joined	00:58
	→ dodobrain joined	00:59
	→ sanscheese joined	01:00
	→ rominronin joined	01:02
	← lolmac left	01:02
	← rominronin left	01:07
	← biotim left	01:07
	→ sangy joined	01:08
	→ lolmac joined	01:09
	→ aidalgol joined	01:10
	← blackwind_123 left	01:13
	→ decimad_ joined	01:14
	← fahadash left	01:16
	← SwiftMatt left	01:17
	← decimad left	01:19
	← joki left	01:19
	→ arescorpio joined	01:21
	→ Opertus joined	01:22
	← ShapeShifter499 left	01:22
	← exarch left	01:23
	→ SwiftMatt joined	01:23
	← Noldorin left	01:23
	← Gsham left	01:24
	← pks left	01:26
	→ Goplat joined	01:26
	→ mingrammer joined	01:28
	→ pks joined	01:31
	→ rgrinberg joined	01:36
	← afuentes left	01:36
	← aax left	01:38
	← durham left	01:38
	→ kalkin- joined	01:38
kalkin-	hi	01:39
gitinfo	kalkin-: 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.	01:39
	← kalkin- left	01:39
	← mingrammer left	01:39
	← shmuli left	01:39
	→ kalkin- joined	01:39
kalkin-	I have a bare repo with a namespace foo on a server. when i connect for cloning with my client to the server the server executes GIT_NAMESPACE=foo git-upload my/dir.git	01:40
	On the client side the clone happens to work	01:40
	→ texasmynsted joined	01:40
kalkin-	but at the end you get an error remote HEAD refers to nonexistent ref, unable to checkout	01:41
	If i add -b master to git clone. I can circumvent this problem, but I want to fix it for real	01:41
	← mycelium left	01:42
kalkin-	Btw: the namespaced repo was created by cloning an existing repo from github, doing git init --barre namespaced_repo.git, added as remote and did GIT_NAMESPACE=foo git push origin --mirror	01:42
	→ d^sh_ joined	01:43
	← Salander27 left	01:44
	→ xocolatl joined	01:45
	← ilbot3 left	01:45
	→ mizu_no_oto joined	01:46
	← d^sh left	01:46
xocolatl	hey folks, I need some help. I did a git reset <hash> (I did NOT use --hard) and then to go back to how I was I did git checkout . but that didn't give me the commits I was expecting. please tell me I can recover them. this is a local-only repository so I can't just pull from a remote.	01:47
	→ fahadash joined	01:47
	← cagedwisdom left	01:47
	→ Vampire0 joined	01:48
	→ ilbot3 joined	01:48
	→ Gsham joined	01:49
	→ clemf joined	01:49
	→ Ks3_ joined	01:50
	→ dalias joined	01:50
	→ shmuli joined	01:50
	← Ks3_ left	01:51
	→ A5101 joined	01:51
	← Vampire0_ left	01:51
	→ ochorocho__ joined	01:51
	→ HoierM joined	01:51
	← clemf left	01:52
xocolatl	okay, I just learned about the reflog. whew!	01:52
	← Remram[m] left	01:53
	→ Remram[m] joined	01:53
	← Remram[m] left	01:53
	→ Remram[m] joined	01:53
	← decimad_ left	01:53
xocolatl	hmm. that got me my content back, but it's all uncommitted.	01:53
	→ Noldorin joined	01:54
	← andlabs left	01:54
	← ochorocho__ left	01:56
	← VagabondAzulien left	01:56
	← Noldorin left	01:57
	← kulelu88 left	01:57
	→ evanwang joined	01:58
	→ cagedwisdom joined	02:00
	→ clemf joined	02:02
	→ rominronin joined	02:03
	← dalias left	02:03
	← clemf left	02:03
	→ dalias joined	02:05
kalkin-	xocolatl: if you have a backup or nothing to loose you can just pick the right commit out of the reflog and do git reset --hard COMMIT	02:06
	← d^sh_ left	02:06
	← Dispatch left	02:06
	→ clemf joined	02:07
	← jfelchner left	02:08
	← rominronin left	02:08
	→ d^sh joined	02:08
	→ harish joined	02:08
	← hexagoxel left	02:11
	← Gsham left	02:11
	→ hexagoxel joined	02:14
	← mizu_no_oto left	02:14
	← clemf left	02:14
	→ jstimm joined	02:14
	→ mizu_no_oto joined	02:14
	← nydel07 left	02:15
	→ clemf joined	02:16
	→ ASOLAr_ joined	02:17
	← Gurkenglas left	02:17
	→ ahr3n joined	02:19
	← clemf left	02:20
	→ clemf joined	02:20
	← annoymouse4210 left	02:21
	← ASOLAr_ left	02:22
	← Hink left	02:22
	← lolmac left	02:22
	→ Hink joined	02:23
	→ fstd_ joined	02:24
	← clemf left	02:24
	→ andlabs joined	02:24
	→ kai_ joined	02:25
	← kai_ left	02:26
	→ mingrammer joined	02:26
	→ checkItOut joined	02:26
	← shmuli left	02:27
	→ ASOLAr joined	02:27
	← fstd left	02:28
	fstd_ → fstd	02:28
	→ Gsham joined	02:28
	→ rchavik joined	02:29
	→ dreiss joined	02:30
	← mingrammer left	02:30
	← ASOLAr left	02:31
	← Hink left	02:32
	→ hahuang65 joined	02:33
	← CheckDavid left	02:33
	→ Hink joined	02:34
	→ lolmac joined	02:34
	← zivester left	02:34
	→ zivester joined	02:34
	→ nydel07 joined	02:35
	→ clemf joined	02:37
	← hahuang65 left	02:37
	← harish left	02:38
	→ lagothrix joined	02:38
	→ romerocesar_ joined	02:39
	→ cqi joined	02:39
	← clemf left	02:39
	→ mycelium joined	02:40
	→ Blackpajamas joined	02:40
	← Blackpajamas left	02:41
	→ clemf joined	02:41
	← Gsham left	02:41
	← lagothri1 left	02:41
	→ Blackpajamas joined	02:41
	← Blackpajamas left	02:42
	← romerocesar left	02:42
	→ Blackpajamas joined	02:42
	→ clandestino joined	02:43
	← clemf left	02:43
	→ mingrammer joined	02:43
	← mizu_no_oto left	02:44
	← sleepee left	02:44
	← gravitron left	02:44
	→ gravitron joined	02:44
	→ clemf joined	02:44
	← raijin left	02:45
	← m0viefreak left	02:46
	← clemf left	02:46
	← HoierM left	02:47
	← mycelium left	02:47
	→ star_prone joined	02:47
	← rewt left	02:48
	→ clemf joined	02:48
	← mehola left	02:50
	← Blackpajamas left	02:50
	← clemf left	02:50
	→ Blackpajamas joined	02:52
	← ayjay left	02:52
	→ clemf joined	02:52
	← star_prone left	02:52
	← Dougie187 left	02:53
	← clemf left	02:57
	← chachasmooth left	02:57
	→ rewt joined	02:58
	→ clemf joined	03:00
	→ chachasmooth joined	03:00
	← clandestino left	03:01
	← clemf left	03:01
	→ thiago joined	03:02
	→ clemf joined	03:02
	→ aavrug joined	03:03
kalkin-	Back to my namespace problem. I solved it	03:04
	→ rominronin joined	03:04
kalkin-	git symbolic-ref refs/namespaces/foo/HEAD refs/namespaces/foo/refs/heads/master	03:04
	← clemf left	03:04
kalkin-	The above command will link a head in the proper namespace to the master branch in this namespaces	03:04
	this fixes git clone	03:05
	→ GT4066 joined	03:07
	→ scott_sd joined	03:07
	→ chrisshattuck joined	03:07
	→ raijin joined	03:08
	→ clemf joined	03:08
	← rominronin left	03:09
	→ bobtherealbob joined	03:09
	← cagmz left	03:11
	→ trimosier joined	03:11
	gitinfo set mode: +v	03:12
scott_sd	hi, is set git config --global core.autocrlf false,but it's warning: CRLF will be replaced by LF	03:12
	i check my config , it does well in other centos , not work in my ubunt	03:13
	→ Vortex35 joined	03:14
	← clemf left	03:14
	→ cagmz joined	03:15
	→ shmuli joined	03:15
	→ paulh joined	03:15
	→ clemf joined	03:15
	← Vortex34 left	03:16
	← realz left	03:17
	← clemf left	03:17
	→ realz joined	03:17
	→ mizu_no_oto joined	03:17
	→ zacts joined	03:18
	← shmuli left	03:20
	→ mehola joined	03:21
	← sangy left	03:21
	← sanscheese left	03:21
	← ToBeCloud left	03:25
	→ Andrew_K joined	03:27
	→ kadoban joined	03:28
	scott_sd → scottxu	03:28
	← mehola left	03:31
	→ ruby_ joined	03:31
scottxu	hi, i set git config --global core.autocrlf false,but it's warning: CRLF will be replaced by LF in my ubunto system, And other centos system is work ok	03:32
	← dreiss left	03:32
	→ _28_ria joined	03:32
	→ sangy joined	03:34
	← raijin left	03:35
	← Hink left	03:35
	← ruby_ left	03:35
	← Andrew_K left	03:36
	→ Andrew_K joined	03:36
	→ Hink joined	03:37
	← mizu_no_oto left	03:38
	← Hink left	03:38
	cqi → cqi\|lunch	03:39
	→ Hink joined	03:39
	→ rvaldes joined	03:39
	← bobtherealbob left	03:41
	← zivester left	03:42
	← RodrigoEduardo__ left	03:43
	→ raijin joined	03:47
	← chrisshattuck left	03:48
	→ clemf joined	03:48
	← raijin left	03:48
	← clemf left	03:50
	→ B_H joined	03:52
	← e14 left	03:52
	← shirty left	03:52
	← Bob8989 left	03:53
	→ ochorocho__ joined	03:54
	→ harish joined	03:54
	→ kn-928 joined	03:54
	← dodobrain left	03:56
	← B_H left	03:56
	→ dreiss joined	03:56
	← kn-928 left	03:56
	→ dodobrain joined	03:56
	← ochorocho__ left	03:58
	← harish left	03:59
	→ daey_ joined	04:01
	← nevodka left	04:02
	→ ayjay joined	04:03
	→ phanimahesh joined	04:04
	← daey left	04:05
	daey_ → daey	04:05
	→ rominronin joined	04:05
	→ sanscheese joined	04:05
	→ BenderRodriguez joined	04:07
	← sangy left	04:09
	→ blackwind_123 joined	04:09
	→ raijin joined	04:09
	← Cabanossi left	04:09
	← rominronin left	04:10
	← paulh left	04:10
	→ Cabanossi joined	04:12
	→ paulh joined	04:12
	→ navidr joined	04:12
	← hallamigo left	04:13
	← SebastianFlyte left	04:14
	→ vuoto joined	04:15
	← Blackpajamas left	04:19
	→ MattMaker joined	04:20
	← dviola left	04:21
	← Puffball left	04:21
	→ Puffball joined	04:22
	→ lvns joined	04:25
	→ mehola joined	04:26
	← vuoto left	04:28
	← snowkidind left	04:28
	← leeN left	04:28
	← rafalcpp_ left	04:29
	→ hahuang65 joined	04:33
_ikke_	scottxu: Is there a .gitattributes file present?	04:34
scottxu	_ikke_, I modify the ~/.gitconfig and .git/config	04:34
	1 * text=auto	04:35
	2 *.css linguist-vendored	04:35
	3 *.less linguist-vendored	04:35
	← ayjay left	04:35
_ikke_	Line 1	04:35
	← lolmac left	04:35
scottxu	_ikke_ :this is my .gitattributes content	04:35
_ikke_	that enables normalization for all files	04:35
scottxu	ok I fixed it to test	04:36
	← r4z left	04:36
scottxu	in other centos, the .gitattributes have same content	04:37
	how can i set * text a value	04:37
	← Andrew_K left	04:38
	← hahuang65 left	04:38
_ikke_	What do you mean?	04:38
	← ahr3n left	04:38
	→ star_prone joined	04:38
scottxu	-ikke- , only delete the first line. or how to fixed	04:39
	* text=auto => * -text ?	04:39
_ikke_	Yeah, that will specifically disable it for all files	04:40
	→ e14 joined	04:40
_ikke_	for everyone	04:40
scottxu	Ok, thank you, i am to try	04:40
	← deadprez left	04:41
	→ romerocesar joined	04:42
	→ deadprez joined	04:42
	→ ruby_ joined	04:42
	← aidalgol left	04:43
	← e14 left	04:44
	→ trelane joined	04:44
	← romerocesar_ left	04:45
	→ cagmz_ joined	04:47
	← deadprez left	04:47
	← cagmz left	04:49
	→ Darren_ joined	04:49
	← irqq left	04:50
	← kadoban left	04:51
	→ lolmac joined	04:54
	← star_prone left	04:56
	← boombatower left	04:57
	← cagmz_ left	04:58
	→ star_prone joined	04:59
	→ daey_ joined	04:59
	← fiddlerwoaroof left	05:00
	← byteflame left	05:00
	← quetz left	05:01
	→ byteflame joined	05:02
	→ Andrew_K joined	05:03
	← daey left	05:03
	daey_ → daey	05:03
	→ Aces_Charles joined	05:03
	← star_prone left	05:03
	→ fiddlerwoaroof joined	05:04
	→ star_prone joined	05:05
	→ subhojit777 joined	05:05
	→ laumann joined	05:06
	← fahadash left	05:06
	← A5101 left	05:06
	→ rominronin joined	05:06
	← star_prone left	05:06
	← dodobrain left	05:06
	← thiago left	05:08
	→ star_prone joined	05:08
	← star_prone left	05:09
	← trimosier left	05:09
	← rominronin left	05:11
	← foist left	05:13
	← xocolatl left	05:13
	← sdothum left	05:15
	← Puffball left	05:15
	← inflames left	05:16
	→ inflames joined	05:17
	→ syg_ joined	05:17
	→ syg__ joined	05:17
	← syg__ left	05:17
	→ Puffball joined	05:18
	→ syg__ joined	05:18
	← arescorpio left	05:21
	← ruby_ left	05:23
	→ SebastianFlyte joined	05:23
	→ ruby_ joined	05:23
	← spudowiar left	05:24
	← MattMaker left	05:24
	→ MattMaker joined	05:24
	← abyx left	05:24
	← ruby_ left	05:28
	← MattMaker left	05:28
	← jeffreylevesque left	05:28
	→ nevodka joined	05:28
	→ tvw joined	05:29
	→ stuh84 joined	05:29
	→ ShapeShifter499 joined	05:31
	→ MattMaker joined	05:33
	← MattMaker left	05:35
	← tvw left	05:37
	← lolmac left	05:38
	← diogenese left	05:43
	→ Raging_Hog joined	05:46
	→ hahuang65 joined	05:47
	← inflames left	05:48
	← syg__ left	05:48
	← syg_ left	05:48
	→ inflames joined	05:49
	→ lolmac joined	05:49
	← stuh84 left	05:49
	← laumann left	05:54
	→ ochorocho__ joined	05:54
	→ shmuli joined	05:56
	← shmuli left	05:56
	→ shmuli joined	05:56
	→ _ng joined	05:56
	← ochorocho__ left	05:59
	→ circ-user-OBsh3 joined	05:59
	→ zeroed joined	05:59
	← zeroed left	05:59
	→ zeroed joined	05:59
	→ mohabaks joined	06:00
	← shmuli left	06:01
	← holodoc left	06:01
	← nevodka left	06:01
	→ rscata joined	06:04
	→ JeroenT joined	06:05
	→ chele joined	06:06
	→ rominronin joined	06:08
	← zeroed left	06:08
	→ zeroed joined	06:08
	← zeroed left	06:08
	→ zeroed joined	06:08
	→ ljc joined	06:08
	← Darren_ left	06:08
	← madewokherd left	06:09
	← rominronin left	06:12
	→ eduardas_m joined	06:14
	→ Macaveli joined	06:17
	→ ASOLAr joined	06:17
	→ holodoc joined	06:18
	← rgrinberg left	06:18
	→ TheVoid joined	06:19
	→ Silenced joined	06:20
	← Silenced left	06:21
	→ Silenced joined	06:21
	← ASOLAr left	06:22
	→ jknetl joined	06:24
	← jknetl left	06:25
	→ satya4ever joined	06:26
	← Rodya_ left	06:28
	→ Rodya_ joined	06:28
	→ star_prone joined	06:29
	→ yuhlw_ joined	06:30
	→ diogenese joined	06:30
chele	hi guys i am checking this guide (https://www.git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git) out to migrate to git (from svn) and when it explains how to make remote branches to local git branches my refs/remotes/origin folder is empty, although the command git branch -r show the branches? What am i doing incorrect? Am I forced to recreate my branches to local git branches manually?	06:34
	← Rodya_ left	06:34
	← loopy left	06:38
_ikke_	chele: branches can also be packed	06:38
	if git branch -r shows them, you have them locally	06:38
	(as remote tracking branches)	06:38
	→ dtux joined	06:39
	← lolmac left	06:39
	← Ratler_ left	06:40
	→ Ratler joined	06:40
	→ fees joined	06:43
	→ danslo joined	06:43
	← SporkWitch left	06:45
	→ erguven joined	06:46
chele	_ikke_ so this means is still somehow bound to the svn. if i push now my git to a git server would the branches be pushed? or i have to clone this git project to another location and then push it to a git server ...	06:46
	← SwiftMatt left	06:46
	→ Sceorem joined	06:47
	→ lolmac joined	06:48
	← zeroed left	06:49
	→ submitnine joined	06:49
	→ zeroed joined	06:52
osse	chele: no, everything is normal	06:53
	chele: if git branch lists them, they are there no matter what goes on inside .git	06:53
	→ jceb joined	06:55
	← star_prone left	06:57
obiwahn	i	06:57
	hi - we want to do some code review and have trouble to find the right commands	06:57
	there is bob who was on his branch (B) did some work and merged devel (D) from time to time into his branch	06:58
	← ljc left	06:59
	← mohabaks left	06:59
obiwahn	Now what do we need to do to find out what changes bob did. compared to devel?	06:59
	→ jknetl joined	07:01
obiwahn	ok i was really wondering that git diff D...B was not working	07:01
	but now that my coworker used origin/D he can do the review:)	07:01
	→ amcsi joined	07:02
	← pR0Ps left	07:03
chele	osse so migration done when pushed to git server	07:04
	← rasto left	07:05
	← boushi left	07:06
	→ pR0Ps joined	07:06
	→ boushi joined	07:06
	→ rominronin joined	07:07
	← mangolisk_ left	07:09
	→ cyan__ joined	07:10
	→ rasto joined	07:11
	← Goplat left	07:11
	→ laumann joined	07:11
	← d0nn1e left	07:12
	← lvns left	07:12
	← JeroenT left	07:12
	→ d0nn1e joined	07:13
	heftig_ → heftig	07:15
	→ delboy1978uk joined	07:18
	→ Alienpruts joined	07:18
delboy1978uk	can i echo out a file on another branches contents without checking it out?	07:19
	or on a specific commit rather	07:19
	gr_wity → grawity	07:19
osse	delboy1978uk: git show commit:file	07:20
	→ JeroenT joined	07:20
	← Opertus left	07:21
	→ GavinMagnus joined	07:22
delboy1978uk	osse: i just found that, thanks a lot all the same! :-)	07:23
	← qt-x left	07:24
	→ shmuli joined	07:24
	← shmuli left	07:25
	← cyan__ left	07:26
	Thorn__ → Thorn	07:27
	← dreiss left	07:27
	→ quetz joined	07:28
	→ qt-x joined	07:28
	→ dreiss joined	07:30
	→ Balliad joined	07:30
	→ Rodya_ joined	07:31
	→ DieguezZ joined	07:31
	→ eizua joined	07:31
	← mrpackethead left	07:32
	→ lb1c joined	07:32
jast	_ikke_: thanks, fixed.	07:34
	→ mrpackethead joined	07:34
_ikke_	jast: np	07:35
	→ SporkWitch joined	07:35
	← Rodya_ left	07:35
	→ roelmonnens joined	07:35
jast	still haven't buckled down and added more automation to my let's encrypt thingy	07:36
_ikke_	Just a cron job should work	07:36
jast	and I refuse to install the convoluted mess that calls itself the official client	07:36
	← Lomex_ left	07:36
_ikke_	haha	07:36
	ok	07:36
	Yeah, that's what I use	07:36
	← hahuang65 left	07:37
_ikke_	But there are other lighter clients	07:37
jast	my own client could technically already be used in cronjobs, but it does not yet automatically renew hostname verifications	07:37
	so that would be a train wreck waiting to happen	07:37
	← delboy1978uk left	07:38
	→ Oebele joined	07:39
	→ shmuli joined	07:40
	← lolmac left	07:41
	→ vuoto joined	07:41
	→ Lomex joined	07:42
	→ star_prone joined	07:43
	← shmuli left	07:43
	← bmahe left	07:44
grawity	jast: don't like python, use acmetool	07:45
	← sanscheese left	07:46
	→ bschindler joined	07:46
jast	I've already written my own client, actually	07:46
_ikke_	I bet it's in perl	07:46
jast	back when there was quite a bit less of a choice	07:46
bschindler	Hey, I have a bit of issues understanding submodules... I have a submodule but I just realized that it should track another branch that master. I did that by using git config -f .gitmodules .... (is there an easier way?)	07:46
	If I go into the submodule, checkout the branch, git submodule update will still change back to the master branch... what command do I have to use so that the submodule revision is really changed to that latest branch commit?	07:47
	← star_prone left	07:47
	→ lolmac joined	07:48
_ikke_	bschindler: Note that git submodules are initially made to track commits, not branches	07:48
bschindler	jup, I know that... detached head state is fine	07:48
jast	_ikke_: of course it's in perl :)	07:49
lb1c	jast: who would have guessed that ....	07:50
	;)	07:50
jast	lb1c: careful, you'll be running out of nicknames if you keep that up	07:50
lb1c	jast: private/work ^	07:50
	< work	07:50
	jast: btw i already gave up, it was basically my age, but i didn't remembered that people really do age	07:53
	→ elect joined	07:53
	← navidr left	07:54
	→ ochorocho__ joined	07:55
	→ maroloccio joined	07:58
maroloccio	hi. need list of branches for script. found this on SO: git for-each-ref --shell --format='%(refname)' refs/heads. can i do this in a simpler way?	07:58
	→ ahmedelgabri joined	07:59
	← ochorocho__ left	08:00
	→ anonymuse joined	08:00
	← dreiss left	08:00
	→ encod3 joined	08:00
	→ ASOLAr joined	08:00
	→ erhnsd joined	08:01
lb1c	django docs: "Oh, and one more thing: making humans edit XML is sadistic!" i need a t-shirt with that ^	08:01
	← sin3t left	08:02
	→ danslo_ joined	08:02
	← mingrammer left	08:02
	→ shmoon_ joined	08:02
shmoon_	ok it seems like i understood this command incorrectly - git push origin master	08:03
	→ chll joined	08:03
jast	maroloccio: git show-ref	08:03
shmoon_	i always thought if i am on branch xyz and git push origin master will push xyz to origin/master (upstream)	08:03
	but seems like it doesn't, it actually pushes local master to remote master ,am i correct	08:03
maroloccio	jast: ?	08:03
	← anonymuse left	08:03
shmoon_	in order to push current checked out branch to maste ri have to do git push origin xyz:master	08:03
jast	shmoon_: yes	08:03
shmoon_	dam	08:03
jast	and yes again	08:03
maroloccio	jast: outputs more than just branch names?	08:04
	← ASOLAr left	08:04
shmoon_	i've been thinking that git push origin master will push current checked out branch to origin/master for the last few yrs :\|	08:04
	and probably messing up at times even	08:04
	by adding -f :	08:04
	:P	08:04
jast	maroloccio: I'm sure it's much easier to read only the second field of each line with that than what you already have	08:04
	shmoon_: whoops :)	08:04
	← vmiklos left	08:05
	← danslo left	08:05
maroloccio	jast: ok. true. but... why is it so hard to read a list of local branch names?	08:05
	→ shmuli joined	08:05
	→ ferr joined	08:05
	← danslo_ left	08:05
	→ danslo joined	08:06
shmoon_	thanks jast	08:06
danslo	maroloccio: why not just 'git branch'?	08:06
	→ anonymuse joined	08:07
danslo	shmoon_: I think that also depends on push.default (which also changed over some recent versions)	08:07
maroloccio	outputs magic. colours. and asterisks.	08:07
	← vrishab left	08:07
jast	danslo: push.default only affects 'git push' without refspec arguments	08:07
	→ marcogmonteiro joined	08:08
danslo	ah	08:08
osse	maroloccio: for-eah-ref is the scriptf riendly way	08:08
	← zeroed left	08:08
	→ aidalgol joined	08:08
	→ zeroed joined	08:08
jast	maroloccio: we can't really cover every single use case with a really short command. sometimes compromises have to be made.	08:08
	→ lordjancso joined	08:10
	→ rafalcpp joined	08:10
	→ p4trix joined	08:10
osse	and given that it's inside a script, why do you care+	08:10
	→ mizu_no_oto joined	08:10
	← cqi\|lunch left	08:11
maroloccio	osse: thank you. maybe there is an easier formulation of that invocation though? git for-each-ref --shell --format='%(refname)' refs/heads	08:11
	jast: why do you write "we"? are you a git core dev?	08:11
	→ star_prone joined	08:11
	← p4trix left	08:12
	→ vmiklos joined	08:12
	← JeroenT left	08:14
osse	maroloccio: how do you read the output?	08:14
	→ ljc joined	08:14
maroloccio	while read -r branch_name; do ...; done < <(dat-thang)	08:15
	→ JeroenT joined	08:15
osse	in that case you can remove --shell because that's wrong anyway	08:15
maroloccio	yes, i do not need the quotes, i figure it out after copying/pasting from SO. thank you anyway though	08:15
	← JeroenT left	08:16
	→ Anticom joined	08:16
	→ TomyWork joined	08:16
	→ aax joined	08:16
	→ bongjovi joined	08:16
	→ lucido-cwl joined	08:16
lucido-cwl	Hi, I did a git pull origin branchname which resulted in a merge	08:17
	→ apotry joined	08:17
osse	maroloccio: eval "branches=($(git for-each-ref --shell --format='%(refname)' refs/heads))"; for b in "${branches[@]}"	08:17
	BOOM	08:17
lucido-cwl	how can I view the changes introduced by the last merge?	08:17
	→ King_Hual joined	08:17
	← King_Hual left	08:17
	→ King_Hual joined	08:17
osse	lucido-cwl: git diff merge~1 merge	08:17
lucido-cwl	osse, fatal: ambiguous argument 'merge~1': unknown revision or path not in the working tree.	08:19
	I would like to see the changes introduced by the merge that was initiated by git pull origin branchname	08:20
osse	lucido-cwl: git diff abc1234~1 abc1234	08:20
	merge was a placeholder	08:20
	→ Repox joined	08:20
lucido-cwl	lol	08:20
	I'm a dumbo, a placeholder for?	08:21
	← daumie left	08:21
osse	the sha1	08:21
lucido-cwl	I have this in the git log: Merge: 26aa0cb 03c8857	08:21
osse	if you JSUT pulled then you can do git diff HEAD~ 1HEAD	08:21
	j416 gives osse new keyboard	08:22
lucido-cwl	osse, awesome, thanks	08:22
	← shmuli left	08:24
	→ shmuli_ joined	08:24
	← danslo left	08:24
	→ danslo joined	08:25
maroloccio	osse: are you sure that thing booms?	08:25
	← star_prone left	08:26
	→ harish joined	08:26
	→ stonercoder joined	08:27
	← Lomex left	08:29
bschindler	Hi - what is the proper way to make a submodule "track" a branch other than master? I know submodules are detached but if you do git submodule update --remote, it should go stay/switch/update to that branch...	08:29
	← erhnsd left	08:30
	→ star_prone joined	08:30
	→ ahmed_elgabri joined	08:31
	→ Rodya_ joined	08:31
	→ cdown_ joined	08:31
	→ lvns joined	08:32
	→ t0by joined	08:32
	→ hahuang65 joined	08:33
jast	maroloccio: I contribute occasionally, it's really just a very inclusive "we", though	08:33
maroloccio	jast: ok :) well, thanks for your work on git if you are a contributor	08:33
jast	and there is no official 'core dev' status, anyway, just people who contribute a lot and people who are lazy (like me :))	08:34
	← ahmedelgabri left	08:34
jast	which reminds me, I've still got a change to submit sitting in my local clone	08:34
	→ iveqy joined	08:36
osse	maroloccio: I am.	08:37
	→ qwvsma joined	08:37
osse	I use it myself	08:37
	https://github.com/Osse/git-scripts/blob/master/git-brv	08:37
	← Rodya_ left	08:37
maroloccio	osse: so, in your view BOOM means "works" rather than "leaves door open to exploits"? ok.	08:38
	← hahuang65 left	08:38
osse	maroloccio: It was just to show how --shell is meant to be used.	08:38
maroloccio	osse: gotcha. thanks for that	08:39
osse	I can't see how that's exploitable. Note that the string that is eval'ed does not contain $user_input.	08:39
	→ greendo joined	08:39
	← lvns left	08:40
maroloccio	osse: even if a malicious branch name was concocted, i would not see how to exploit either to be honest	08:42
	→ berndl joined	08:42
	← anonymuse left	08:42
	→ mieko joined	08:42
osse	eval is safe for grown-ups	08:43
	→ Lomex joined	08:43
osse	the idea behind --shell is that the command produces in effect code instead of just data.	08:43
	the the script above we use it to create a mapping between a branch and its upstream :)	08:43
	→ anonymus_ joined	08:44
	→ lvns joined	08:44
osse	But if you dont	08:45
	But if you don't need it then don't use it.	08:45
	← biertie left	08:45
	→ biertie joined	08:45
	biertie → bdesmet	08:45
	→ dodobrain joined	08:46
	→ JeroenT joined	08:47
	← Lomex left	08:48
	← lolmac left	08:48
	← TheVoid left	08:48
	← shmuli_ left	08:49
	→ mingrammer joined	08:51
	→ sin3t joined	08:52
	→ Ezzy joined	08:54
	← mingrammer left	08:55
	→ blip- joined	08:55
	← dodobrain left	08:56
blip-	hi all, I have a git repo (hosted on bitbucket server). Since I renamed things there - the https git url changed. So I did a git remote rm and git remote add to fix it	08:56
	but now when i want to push from my local repo - it want's to push ALL commits... rather than just the 1 it should	08:56
	the branch names havent changed	08:57
	any thoughts ?	08:57
osse	do a git fetch	08:57
berndl	blip-: check .git/config if the everything is OK.	08:58
	→ lolmac joined	08:58
blip-	osse, git fetch pulled in 3 branches. remotes/master, remotes/develop and remotes/test. i think that aint right	08:59
	berndl, the correct url shows up in .git/config	09:00
	→ PCatinean joined	09:01
	→ ronskisika joined	09:01
	← Raging_Hog left	09:02
osse	blip-: did you also give the new remote a new name?	09:02
	→ Raging_Hog joined	09:02
blip-	osse, no, same name origin	09:03
	→ achadwick joined	09:03
blip-	osse, git remote rm origin then git remote add origin <newurl>	09:03
osse	blip-: are thebr anches remotes/master, not remotes/origin/master?	09:03
blip-	osse, shall i now delete those "remotes/" branches from my local repo ?	09:03
	osse, sorry i mistyped. yes remotes/origin/xyz	09:04
osse	blip-: why is that not correct?	09:04
blip-	osse, in the past only 2 branches show up - no remote branches (as i recall)	09:05
	i just had master and develop. nothing else in my local repo	09:05
osse	blip-: master and origin/master are different thigns	09:05
	blip-: run 'git branch'	09:05
blip-	osse, im panicking lol. yeah git branch shows just develop and master	09:06
	osse, branch -av shows the remotes too	09:06
	i guess we're good, i'll try to push	09:06
osse	blip-: everything sounds fine	09:06
	← ronskisika left	09:06
blip-	works perfectly. awesome ! thanks osse	09:07
osse	!remote_tr > blip-	09:07
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	09:07
	← paulh left	09:07
osse	blip-: and next time, just use 'git remote set-url' :P	09:07
	→ decimad_ joined	09:08
	→ nwkj86 joined	09:09
	← circ-user-OBsh3 left	09:09
blip-	osse, ill write that down. ty :)	09:10
	→ dodobrain joined	09:11
	→ decimad joined	09:12
	← zeroed left	09:15
	→ Lomex joined	09:15
	← netj left	09:15
	← decimad_ left	09:16
	← star_prone left	09:17
	→ netj joined	09:17
	← stonercoder left	09:19
	← sin3t left	09:20
	← realz left	09:20
	→ kurkale6ka joined	09:21
	← mizu_no_oto left	09:21
	→ decimad_ joined	09:21
	→ Darcidride joined	09:21
	→ mikecmpbll joined	09:21
	→ star_prone joined	09:22
	→ milky joined	09:23
	← decimad left	09:24
	← ljc left	09:29
	→ notebox joined	09:30
	← star_prone left	09:30
maroloccio	osse: that script you linked.. edit: i=4; ((i >= 3)) && echo ok	09:30
	← harish left	09:30
	← mehola left	09:31
	→ star_prone joined	09:31
	→ zonality joined	09:32
	← lolmac left	09:33
	→ decimad joined	09:34
	← pijiu left	09:34
	← Sceorem left	09:34
	→ ljc joined	09:34
	← ljc left	09:35
	← star_prone left	09:36
	← dodobrain left	09:37
	← Moggets left	09:37
	→ liamonade joined	09:37
	→ Mogget joined	09:37
	← decimad_ left	09:38
	→ irqq joined	09:38
	→ afuentes joined	09:38
	→ stonercoder joined	09:39
	→ star_prone joined	09:40
	→ ljc joined	09:40
	→ chachan joined	09:40
	← shmoon_ left	09:41
	→ ^7heo joined	09:42
^7heo	hey, is it possible to set a submodule to track the head of the external repository?	09:42
chachan	hi. After some google search, I'm not sure how to proceed if I want to remove an entire and old branch from my history. Any suggestion?	09:42
	← amcsi left	09:42
	→ ams__ joined	09:42
_ikke_	chachan: Depends on what you exactly mean with branch? Do you mean a reference, or a set of commits (which might have been merged in)?	09:43
	→ lolmac joined	09:43
chachan	_ikke_: a set of commits	09:44
_ikke_	And have they been merged into another branch?	09:44
	→ decimad_ joined	09:45
chachan	_ikke_: checking, 1 sec	09:45
	→ mingrammer joined	09:45
_ikke_	git branch --merged <commit>	09:45
	jknetl → jknetl\|lunch	09:46
	→ irco joined	09:47
chachan	_ikke_: yes, but I want to remove them as well	09:48
	← decimad left	09:49
chachan	_ikke_: which <commit> is that?	09:49
	→ z8z joined	09:49
	← mingrammer left	09:50
	← zacts left	09:50
	← stonercoder left	09:51
chachan	oh it's HEAD, to check, thanks	09:51
	I don't use merge, I use rebase, does it affect?	09:51
	→ stonercoder joined	09:51
_ikke_	You have to use merge sometime	09:52
	even if it's a --no-ff merge	09:52
	But then you cannot really speak about branches anymore	09:52
	← sostenuto left	09:52
chachan	hm, just removed rebased commits I guess...	09:52
	remove*	09:53
	I will rebase and get rid of those	09:53
	→ ThomasLocke joined	09:53
	→ amcsi joined	09:54
	← rbr left	09:54
	→ mingrammer joined	09:54
	→ rbr joined	09:55
	← qwvsma left	09:55
	→ ochorocho__ joined	09:56
	→ JanC_ joined	09:57
	← JanC left	09:58
	JanC_ → JanC	09:58
	← ljc left	09:59
	→ throstur joined	09:59
	← Surfer2010_ left	10:00
throstur	I have a git repository for my config files, but now I want to 'freeze' a single file in time so that future changes between machines doesn't affect that one file (without removing the file), can I do that somehow or must I simply avoid committing that one file forever?	10:00
	← ochorocho__ left	10:00
	→ ljc joined	10:01
	→ decimad joined	10:01
	→ Surfer2010 joined	10:01
	← ljc left	10:02
jast	!configfile	10:05
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	10:05
	← decimad_ left	10:05
throstur	that's not very helpful	10:05
jast	the only option not covered there is using the sparse checkout feature to avoid updating that file locally, but it's a bit tricky to set up	10:07
	let's see, do we have a factoid for that?	10:07
	!sparse	10:08
gitinfo	[!sparse_checkout] Sparse checkout can be used to restrict which files/folders are updated with all checkout and status operations. It cannot change the tree the checkout is rooted from. See man git-read-tree	10:08
	← JeroenT left	10:08
	← ShapeShifter499 left	10:08
jast	I guess that technically covers it...	10:08
throstur	haha, I guess it odes	10:08
chachan	jast: https://12factor.net/config	10:08
jast	chachan: I'm aware of that philosophy and I don't subscribe to it	10:09
	→ ljc joined	10:09
chachan	throstur: ok, what about just adding that file to .gitignore?	10:10
jast	that's easy to answer: !ignoretracked	10:10
gitinfo	[!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	10:10
	← evanwang left	10:10
	→ stamina joined	10:10
throstur	nice, jast, that was a lot faster than what I was trying to write out	10:10
jast	the bot embodies the three virtues of a programmer, as posited by Larry Wall	10:12
throstur	!virtues	10:12
	!larry	10:12
	not letting me be lazy enough it seems	10:12
jast	we should totally add it	10:12
	← stonercoder left	10:12
	← ljc left	10:13
throstur	I agree	10:13
jast	(1) laziness: I don't want to type out the same response many times. (2) impatience: helping people takes so much longer if you have to write lots of things. (3) hubris: the factoids are actually maintained by all of us, and we're all experts. :}	10:13
	→ Sceorem joined	10:15
	→ ljc joined	10:15
jast	.trigger_edit threevirtues The three great virtues of a programmer, according to Larry Wall: laziness (write code that saves work, document so you don't have to explain over and over), impatience (make software anticipate what you need), hubris (make things nobody could want to criticize)	10:16
gitinfo	jast: Okay.	10:16
jast	that should do it	10:16
	→ dodobrain joined	10:16
jast	had to compress it a bit, though	10:17
	→ DevAntoine joined	10:18
DevAntoine	hi	10:18
	I'm starting a new blog. I've already got a repo for the existing one. Should I make a new repo are an empty branch on the existing one?	10:18
	← nd left	10:18
	→ stonercoder joined	10:18
	→ paulh joined	10:18
throstur	DevAntoine: sounds like it's up to you...	10:19
	← star_prone left	10:20
	← Alienpruts left	10:21
	← ljc left	10:22
	→ ljc joined	10:25
	← ljc left	10:25
	← qpdb left	10:26
	→ rorro joined	10:27
	← throstur left	10:27
	← lolmac left	10:32
	→ sin3t joined	10:33
	→ hahuang65 joined	10:33
	→ dec0n joined	10:34
	← netj left	10:35
	→ jeffreylevesque joined	10:36
	→ star_prone joined	10:37
	→ netj joined	10:37
	← hahuang65 left	10:38
	→ nd joined	10:38
	← chibbol left	10:39
	→ sqdxxx joined	10:39
	→ lolmac joined	10:43
	← johnmilton left	10:43
	← sqdxxx left	10:46
	→ spudowiar joined	10:47
	gitinfo set mode: +v	10:47
	← mingrammer left	10:47
	← milky left	10:47
	→ norpan joined	10:50
	→ Alienpruts joined	10:51
	← star_prone left	10:52
	→ rnsanchez joined	10:52
	← chachan left	10:53
	← aidalgol left	10:53
	← Junior left	10:55
	→ Junior joined	10:55
	→ sdothum joined	10:56
	→ johnmilton joined	10:57
	← GavinMagnus left	10:59
	→ GavinMagnus joined	10:59
	← Oebele left	11:00
	← paulh left	11:00
daurnimator	DevAntoine: one option you have is an orphan branch	11:01
	→ JeroenT_ joined	11:01
daurnimator	DevAntoine: but IMO, I'd just continue on from the existing branch if you are migrating posts across	11:02
	← vuoto left	11:02
	→ DJ_Spies joined	11:02
	→ shirty joined	11:03
	jknetl\|lunch → jknetl	11:03
	← lolmac left	11:03
	← JeroenT_ left	11:07
	← sin3t left	11:08
	← rorro left	11:11
	← ojdo left	11:13
	→ mingrammer joined	11:13
	← simon left	11:13
	← lvns left	11:14
	← maroloccio left	11:14
	← phanimahesh left	11:17
	→ lvns joined	11:17
	→ ojdo joined	11:20
	← checkItOut left	11:20
	← scottxu left	11:20
	→ JeroenT_ joined	11:21
	→ lolmac joined	11:22
	→ CandyAngel joined	11:24
	→ mohabaks joined	11:24
	← DevAntoine left	11:24
	← jeffreylevesque left	11:24
	← Megaf left	11:27
	← byteflame left	11:28
	→ leeN joined	11:31
	← sonOfRa left	11:31
	→ pijiu joined	11:31
	← GavinMagnus left	11:35
	→ harish joined	11:37
	← Sceorem left	11:39
	→ sonOfRa joined	11:39
	→ ash_workz joined	11:40
	← dodobrain left	11:41
	← nwkj86 left	11:42
	← a3Dman left	11:42
	→ nwkj86 joined	11:43
	→ jost__ joined	11:43
	→ phanimahesh joined	11:44
	→ ToBeCloud joined	11:44
	gitinfo set mode: +v	11:44
	→ jeffreylevesque joined	11:45
	← dsdeiz left	11:47
	← jost_ left	11:47
	← Jon28_ left	11:48
	→ Jon28_ joined	11:48
	← lvns left	11:49
	→ Sceorem joined	11:51
	→ decimad_ joined	11:52
	→ star_prone joined	11:52
	← liamonade left	11:52
	→ nilg` joined	11:53
	← VladGh left	11:53
	← mohabaks left	11:54
	← Silenced left	11:55
	← qws-user-1228 left	11:55
	← decimad left	11:55
	→ qws-user-1228 joined	11:56
	→ ochorocho__ joined	11:56
	← andlabs left	11:58
	← star_prone left	11:58
	← PCatinean left	11:58
	→ a3Dman joined	11:58
	→ Dispatch joined	11:59
	→ fahadash joined	11:59
	→ Megaf joined	11:59
	→ star_prone joined	12:00
	← ochorocho__ left	12:01
	← Andrew_K left	12:01
	→ JeroenT__ joined	12:02
	← JeroenT_ left	12:02
	→ Gurkenglas joined	12:03
	← _ng left	12:03
	← Puffball left	12:03
	→ arup_r joined	12:05
	→ VladGh joined	12:05
	← arup_r left	12:05
	→ Puffball joined	12:05
	← Ardethian\work left	12:06
	← stonercoder left	12:07
	gitinfo set mode: +v	12:08
CandyAngel	If I have a directory structure like $REPO/dir1/dir2/dir3, does changing the contents of dir3 cause a rehash of dir1?	12:08
j416	CandyAngel: if by rehash you mean that its hash changes, then yes	12:09
	← decimad_ left	12:09
_ikke_	It's a merkel tree	12:09
	So the has of dir2 is contained in dir1, and the hash of dir3 is contained in dir2	12:09
	s/has/hash	12:09
CandyAngel	So it may be worth flattening it out (putting dir3 under $REPO) if I have a lot of directories with a lot of files at dir3's depth?	12:09
_ikke_	That's how gits integrity works	12:09
	→ GavinMagnus joined	12:10
^7heo	Hmm CandyAngel...	12:10
	long time no see.	12:10
	← cagedwisdom left	12:10
	→ sballert joined	12:10
iveqy	CandyAngel: what problem are you trying to solve?	12:10
^7heo	How you're perl-fu?	12:10
	wow	12:10
CandyAngel	! Theo!	12:10
^7heo	that came out wrong	12:10
	← afuentes left	12:10
_ikke_	woa	12:10
^7heo	how's your perl-fu?	12:10
_ikke_	#alpine #ledger and #git comming together :P	12:10
^7heo	_ikke_: ledger?	12:10
	was ist das?	12:11
CandyAngel	^7heo: Well.. I'm currently coding a game engine in Perl. Does that count?	12:11
_ikke_	command line accounting tool	12:11
	→ Novitsh joined	12:11
^7heo	CandyAngel: are you a permanent resident here?	12:11
	← sballert left	12:11
^7heo	CandyAngel: So you really care about people not being able to bruteforce your game engine, don't you?	12:11
_ikke_	CandyAngel: To come back to your question. I think it's beneficial to have smaller somewhat deeper trees if I recall correctly	12:11
	→ synthroid joined	12:12
	→ BlackPanx joined	12:12
^7heo	oh wait yeah sorry, I interrupted a question.	12:12
CandyAngel	iveqy: I have very large git-annex, where I have directories like this: $REPO/unsorted/file/$source/$uuid, where each $uuid may have 8000 symlinks each	12:12
	I was wondering if making it $REPO/file_$uuid would speed git operations up	12:12
_ikke_	CandyAngel: depends on what the slow part is. Usually it's reading the working tree	12:13
	→ liamonade joined	12:14
	→ rgrinberg joined	12:15
	→ citizen-stig joined	12:16
	→ stonercoder joined	12:17
CandyAngel	add and commit are the slow operations. Hence looking into the tree storage	12:17
	← kalkin- left	12:17
CandyAngel	To be fair, I could make a bespoke solution, but I prefer the integrity that git/git-annex provides	12:18
	If the parent hash just uses the child hash, it probably isn't taken any considerable time	12:19
	← liamonade left	12:19
	← rgrinberg left	12:20
	→ rgrinberg joined	12:20
iveqy	CandyAngel: afaik the parent hash is calculated with the hash of the child, so it should be fairly fast even if it's probably better with a not that deep tree	12:23
	however, I'm wondering if it's disc seeks that kills your performance	12:23
	perhaps you can explore the options that make git not to look for which files has changed and instead tell git that manually	12:24
CandyAngel	Oh, I already do that	12:24
	← inflames left	12:25
CandyAngel	I don't think I do anything that causes git to traverse the working directory	12:25
	→ syg_ joined	12:25
	→ syg__ joined	12:25
	← syg_ left	12:25
	← syg__ left	12:25
	→ brunodlz joined	12:25
CandyAngel	The most frustrating thing is when it is doing 'git add'.. and there is no load (cpu and IO are idle). I can't tell what it is doing..	12:26
iveqy	CandyAngel: this is interesting. Perhaps you should send an email to the mail list?	12:27
	usually you get pretty good responses from there from people that really know this stuff	12:27
CandyAngel	Sure, I'll do that next time I get that situation	12:28
	→ inflames joined	12:28
_ikke_	Yeah, mailing list is recommended	12:28
CandyAngel	Other times I get CPU idle and really low IO (like.. 600Kb/s). Which could be seek lag I guess..	12:28
_ikke_	The response is pretty good there	12:28
	← brunodlz left	12:28
_ikke_	CandyAngel: yeah, lots of links don't result in a lot of throughput	12:28
CandyAngel	:P	12:29
	Also considered the idea of RAID1'ing .git with a ramdisk. What could possibly go wrong? :D	12:29
_ikke_	hehe	12:30
	← aavrug left	12:30
	→ andlabs joined	12:31
	← rgrinberg left	12:31
	← Puffball left	12:31
	← Balliad left	12:32
	→ rahtgaz joined	12:32
	← JeroenT__ left	12:32
	→ Balliad joined	12:32
	→ maroloccio joined	12:32
	→ JeroenT_ joined	12:32
	← kyan left	12:32
	→ Emperor_Earth_ joined	12:33
	← Jellyg00se left	12:34
	← Emperor_Earth left	12:36
	→ paws_ joined	12:36
	→ Puffball joined	12:38
	→ afuentes joined	12:39
	→ snowbound joined	12:40
	→ Ryanar joined	12:40
	← snowbound left	12:41
	→ quadgrande joined	12:42
	→ ayjay joined	12:43
	→ GodGinrai joined	12:44
	→ jimi_ joined	12:45
	→ rgrinberg joined	12:45
	→ cyan__ joined	12:46
osse	maroloccio: what do you mean?	12:46
	→ zrak joined	12:46
	→ wpumup joined	12:46
	→ fmcgeough joined	12:49
	→ altendky joined	12:49
	→ PCatinean joined	12:50
	→ crose joined	12:50
	→ Noldorin joined	12:50
	← GT4066 left	12:53
	→ bsanford joined	12:53
	← mingrammer left	12:53
	← nilg` left	12:54
	← Gitzilla_ left	12:54
	← iveqy left	12:55
	→ zivester joined	12:57
	← norpan left	12:57
	← Balliad left	12:58
	→ Balliad joined	13:00
	← jceb left	13:01
	→ mflow joined	13:02
	→ byteflame joined	13:02
	← Ryanar left	13:02
	→ ertes joined	13:03
ertes	hi… magit question: in the latest MELPA version of magit the "upstream" was split into upstream and push-default, which is great, except for one feature i really liked: the 'r l' key (rebase interactively all unpushed commits)	13:05
	→ marcelofr joined	13:05
ertes	is there a way to bring that back?	13:05
	← zonality left	13:05
	← notebox left	13:06
	→ al-damiri joined	13:06
	← star_prone left	13:08
j416	ertes: git rebase -i @{u}	13:08
	ertes: or make an alias so that you can just e.g. g ri @{u}	13:09
	← Repox left	13:09
ertes	yeah, that used to be built into magit, but it's gone =/	13:10
	← quadgrande left	13:10
j416	don't know what magit is, but that's a way to do it	13:11
	← Noldorin left	13:11
	→ kadoban joined	13:11
_ikke_	emacs git plugin	13:11
	→ thiago_ joined	13:11
j416	ah	13:11
ertes	j416: magit is the reason i started enjoying git =)	13:11
j416	pff :P	13:11
	→ Vinnie_win_z joined	13:13
	← brandonw left	13:14
	← Dredge left	13:15
	→ mingrammer joined	13:15
	← mingrammer left	13:15
	→ mingrammer joined	13:15
	→ brandonw joined	13:16
	→ jceb joined	13:16
	← Vinnie_win left	13:16
	← crose left	13:17
	→ cdg joined	13:18
	← cdg left	13:18
	→ cdg joined	13:18
	→ Dredge joined	13:19
	← greendo left	13:19
	→ zonality joined	13:20
	Vinnie_win_z → Vinnie_win	13:20
	→ shinnya joined	13:20
	← Aces_Charles left	13:20
	← zonality left	13:21
ertes	this does exactly what i need, but it's twice as much to type: r - i p	13:22
	← amcsi left	13:22
	→ sangy joined	13:23
	→ StatutoryApe joined	13:23
	→ star_prone joined	13:23
	← inflames left	13:24
	→ inflames joined	13:24
StatutoryApe	Either I haven't had enough tea this morning or Google is just failing me. I can 'git tag --points-at <hash>' but what if I want all tags on all commits that were merged in the most recent merge to master?	13:24
	← umbSublime left	13:26
	→ emmajane joined	13:26
ilmari	StatutoryApe: git tag --merged <commit>	13:28
	<commit> defaults to HEAD	13:28
osse	and subtract the list produced by git tag --merged <some earlier commit>	13:28
	→ BlackMaria_netsp joined	13:28
	← BlackMaria_netsp left	13:31
	← BlackMaria left	13:31
	→ quadgrande joined	13:32
	→ BlackMaria joined	13:32
	← Khisanth left	13:32
	← byteflame left	13:33
	→ notebox joined	13:33
	← quadgrande left	13:33
	← jknetl left	13:34
	→ deadprez joined	13:34
	→ amcsi joined	13:36
	→ ExoUNX joined	13:37
	→ quadgrande joined	13:37
	→ sin3t joined	13:37
	← wpumup left	13:38
maroloccio	osse: well, this version check could use that >= https://github.com/Osse/git-scripts/blob/master/git-brv#L4	13:38
	← guampa left	13:38
	← phanimahesh left	13:39
	→ griffindy joined	13:39
	← stonercoder left	13:40
	→ sanketdg joined	13:40
	← sanketdg left	13:40
	→ sanketdg joined	13:41
	← sanketdg left	13:41
	→ Ryanar joined	13:41
	→ sanketdg joined	13:42
osse	maroloccio: the requirement is 4.2, not 4.	13:42
	← sanketdg left	13:42
	← subhojit777 left	13:42
StatutoryApe	ilmari, osse: thanks, that gets me a lot closer!	13:42
	→ sanketdg joined	13:42
osse	StatutoryApe: I like your nick	13:42
	← sanketdg left	13:43
StatutoryApe	specifically 'git tag --merged $(git merge-base devel master)'	13:43
	→ sanketdg joined	13:43
	← Lomex left	13:44
	← zivester left	13:44
	→ Lomex joined	13:45
	→ stonercoder joined	13:45
	← rchavik left	13:45
	→ Khisanth joined	13:46
	← BlackPanx left	13:46
	→ kugel_ joined	13:47
	← kugel_ left	13:47
	→ kugel_ joined	13:47
maroloccio	osse: ok, you are right. i was wrong.	13:47
	← kugel left	13:48
	← Ryanar left	13:50
	← Lomex left	13:50
	→ Ryanar joined	13:50
	kugel_ → kugel	13:50
	→ BlackPanx joined	13:51
	→ Jellyg00se joined	13:52
	→ defrag joined	13:52
	← johnmilton left	13:52
	→ Endarked joined	13:52
	→ Gsham joined	13:53
	→ umbSublime joined	13:53
	→ Salander27 joined	13:54
	→ Xrayez joined	13:56
	→ AaronMT joined	13:56
	→ roelmonn_ joined	13:56
	← roelmonn_ left	13:57
	← AaronMT left	13:57
	→ roelmonn_ joined	13:57
	→ AaronMT joined	13:57
	→ ochorocho__ joined	13:57
	→ phaleth joined	13:58
	← jceb left	13:58
	← Macaveli left	13:58
	← ahmed_elgabri left	13:59
	→ jceb joined	13:59
	← roelmonnens left	14:00
	← roelmonn_ left	14:00
	→ Macaveli joined	14:00
	→ danslo_ joined	14:00
	→ roelmonnens joined	14:01
	anonymus_ → anonymuse	14:02
	← ochorocho__ left	14:02
	→ Lomex joined	14:02
	← Salander27 left	14:02
	← chele left	14:03
	← danslo left	14:03
	→ johnmilton joined	14:05
	← ToBeCloud left	14:05
	← fahadash left	14:06
	→ madewokherd joined	14:09
	← anonymuse left	14:10
	→ ResidentBiscuit joined	14:11
	→ e14 joined	14:11
	→ Pieplay joined	14:11
	→ anonymuse joined	14:11
	← marcelofr left	14:13
	→ akitada joined	14:13
	← quadgrande left	14:13
	← raijin left	14:13
	→ Salander27 joined	14:16
	→ ruby_ joined	14:16
	→ t4nkd joined	14:16
	← dec0n left	14:17
	→ CheckDavid joined	14:18
	→ kugel_ joined	14:18
	← afuentes left	14:18
	← Macaveli left	14:19
	gitinfo set mode: +v	14:19
	← kugel left	14:20
	→ Cassiopaya joined	14:21
	→ afuentes joined	14:21
	← Anticom left	14:22
	→ Dougie187 joined	14:22
	→ Anticom joined	14:23
	→ IlNominePatre joined	14:24
	→ marcelofr joined	14:24
	← chris2 left	14:27
	→ ahmed_elgabri joined	14:27
	→ liamonade joined	14:27
	→ quadgrande joined	14:27
	← Guest77074 left	14:28
	← Urbany left	14:28
	← lb1c left	14:29
	→ ahmedelgabri joined	14:29
	← ahmed_elgabri left	14:29
	← cyphase left	14:30
	← BrianBla- left	14:31
	→ BrianBlaze420 joined	14:32
	→ mikecmpb_ joined	14:32
	← dhollinger left	14:32
	→ morenoh149 joined	14:33
	→ chris2 joined	14:33
	→ abyx joined	14:33
	← WizJin left	14:33
	← mikecmpbll left	14:33
	← flopsec left	14:33
	→ dhollinger joined	14:34
	← abyx left	14:34
	→ abyx joined	14:34
	← sanketdg left	14:34
	→ sanketdg joined	14:34
	→ cyphase joined	14:34
	→ clemf joined	14:35
	→ ShekharReddy joined	14:35
	→ hahuang65 joined	14:35
	→ Repox joined	14:35
	→ VagabondAzulien joined	14:37
	→ Rodya_ joined	14:37
	← stonercoder left	14:38
	← star_prone left	14:38
masak	how come when I check out a new --orphan branch, all of my files from the old branch end up in the staging area? :)	14:39
	← thiago_ left	14:39
	→ pijiu2 joined	14:39
	→ star_prone joined	14:40
	← hahuang65 left	14:40
masak	(as opposed to, say, being untracked files)	14:40
nullie	your index is not changed	14:41
osse	probably because they where already there	14:41
	← jaeckel left	14:41
Ezzy	What can the option `core.autocrlf` (and its friends from gitattributes - `eol=lf` and `eol=crlf`) possibly affect? Am I right, that if any of them is enabled - git will convert file into LF upon commiting and convert them back on checkout (detecting separators using its config files)?	14:41
	Is there are a way to make `git show <revision>:<path>` return same content as `git checkout <revision> -- <path>` would set to the file? It looks like `git show` ignores crlf conversion rules (And, I assume, everyone else ignores them too).	14:41
	What would happen if .gitattributes were changed? Will git use local version or will try to read it from the affected revision?	14:41
	← pijiu left	14:41
	← Rodya_ left	14:42
	← ShekharReddy left	14:42
	← qt-x left	14:43
	→ satbyy joined	14:43
	← cyan__ left	14:43
	← drbean left	14:45
_ikke_	Ezzy: Yeah, it only affects when converting from the working tree to the index and reverse	14:46
	← e14 left	14:46
	→ fahadash joined	14:47
	→ e14 joined	14:50
	→ robotroll joined	14:50
	← e14 left	14:51
	→ e14 joined	14:52
	→ jaeckel joined	14:52
	← nanga left	14:52
	→ drbean joined	14:52
	← inflames left	14:52
	→ flopsec joined	14:54
	← JeroenT_ left	14:55
	→ tjone270_ joined	14:55
	← tjone270_ left	14:55
	→ dmto joined	14:55
	→ tjone270_ joined	14:56
	→ _ADN_ joined	14:57
	→ stonercoder joined	14:57
	← rscata left	14:57
	→ danslo joined	14:57
	← mflow left	14:57
	← tjone270 left	14:58
	→ Gitzilla_ joined	14:58
	← deadprez left	14:58
	→ zivester joined	14:59
	← danslo_ left	15:01
	→ WizJin joined	15:01
	→ vassagus joined	15:02
	← Salander27 left	15:02
	→ Salander27 joined	15:02
	← synchron- left	15:03
	→ subhojit777 joined	15:04
	→ synchronous joined	15:04
	→ chigang_ joined	15:04
	← cdg left	15:04
	← ruby_ left	15:05
	← star_prone left	15:05
	← liamonade left	15:05
	← ThomasLocke left	15:05
	← roelmonnens left	15:05
	→ ruby_ joined	15:05
	← Ryanar left	15:06
	← rominronin left	15:06
	→ eivarv joined	15:07
	→ liamonade joined	15:07
	← ahmedelgabri left	15:07
	→ ahmedelgabri joined	15:08
	← jceb left	15:08
	← t4nkd left	15:09
	→ perlpilot_ joined	15:09
	← ruby_ left	15:09
	← quadgrande left	15:10
	← Gsham left	15:11
	← Sceorem left	15:11
	← Raging_Hog left	15:11
	→ jeffreylevesque_ joined	15:11
	← jeffreylevesque_ left	15:12
	← laumann left	15:12
	← gfixler left	15:12
	← markelite left	15:12
	→ deadprez joined	15:12
	← Gurkenglas left	15:13
	→ Gsham joined	15:13
	← Dispatch left	15:13
	← ertes left	15:13
	← submitnine left	15:14
	→ ruby_ joined	15:14
	→ Urbany joined	15:15
	→ mikecmpbll joined	15:15
	← jwest left	15:15
	→ m0viefreak joined	15:15
	← elect left	15:17
	→ star_prone joined	15:17
	← mikecmpb_ left	15:17
	← synthroid left	15:19
	← PCatinean left	15:19
	→ vrishab joined	15:19
	→ crayon joined	15:19
	→ PCatinean joined	15:19
	→ d10n-work joined	15:20
	← Anticom left	15:20
	→ mjuszczak joined	15:20
	→ ash_workz_ joined	15:22
	→ asti joined	15:23
asti	hello	15:23
	← ash_workz left	15:23
asti	I deleted some fiels by accident and I want to revert	15:23
	← deadprez left	15:23
asti	what command do I use to revert to the HEAD position (to discard the delete that I did)	15:23
	→ settermjd joined	15:24
GodGinrai	asti: for just the particular file? Or for everything?	15:24
asti	everything	15:24
	:)	15:24
GodGinrai	`git reset --hard HEAD`	15:24
	← mjuszczak left	15:25
	← danslo left	15:25
	→ zyeoamn joined	15:25
	→ freimatz joined	15:26
	→ danslo joined	15:26
	← settermjd left	15:26
	← afuentes left	15:27
	→ quadgrande joined	15:27
	cdown_ → cdown	15:27
	← zyeoamn left	15:28
	← star_prone left	15:28
	→ tyreld joined	15:28
	→ afuentes joined	15:28
	← vassagus left	15:28
	→ deadprez joined	15:29
	← robotroll left	15:29
	→ robotroll joined	15:30
	→ vassagus joined	15:30
	← Alienpruts left	15:30
	← vassagus left	15:30
	→ r4z joined	15:31
	← crayon left	15:31
	← ruby_ left	15:31
	→ vassagus joined	15:31
	← danslo left	15:31
	← M-shine left	15:32
	← M-meznak left	15:32
	← M-mistake left	15:32
	← Remram[m] left	15:32
	← Ineentho[m] left	15:32
	→ ruby_ joined	15:32
	→ rubie joined	15:32
	→ InfoTest joined	15:34
	→ thiago joined	15:36
	← ruby_ left	15:37
	→ atis_ joined	15:37
	→ Rodya_ joined	15:38
	← bschindler left	15:39
	→ dreiss joined	15:40
	← Balliad left	15:41
	→ roelmonnens joined	15:41
	← roelmonnens left	15:41
	← watabou left	15:42
	→ roelmonnens joined	15:42
	← Rodya_ left	15:42
	← cyphase left	15:43
asti	GodGinrai: thanks a lot	15:43
	← Endarked left	15:44
	← fmcgeough left	15:44
	← tilpner left	15:44
	→ tilpner joined	15:45
	→ fmcgeough joined	15:45
	→ ShekharReddy joined	15:45
GodGinrai	asti: np	15:46
	ChanServ set mode: +o	15:46
	← roelmonnens left	15:46
	→ Gurkenglas joined	15:47
	Eugene changed the topic to: Welcome to #git, the place for git help and stomach cramps \| Public logs at http://goo.gl/BuUi5o \| Current stable version: 2.10.0 \| First visit? Read: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| git-clone has nothing to do with reproduction. So stop that.	15:47
	Eugene kicked Eugene (Eugene)	15:47
	→ Eugene joined	15:47
	→ cyphase joined	15:48
	→ TheVoid joined	15:48
	→ EvilPenguin joined	15:49
	→ Ryanar joined	15:49
	← Orion3k left	15:49
garyserj	what is the difference between git reset --hard HEAD, vs git reset --hard?	15:49
	← atis_ left	15:50
_ikke_	Nothing	15:50
^7heo	garyserj: the difference is that in the latter case, you don't have to type HEAD.	15:51
deadprez	if you wanted to reset to a diff commit you could specify some other commit code instead of HEAD	15:51
	← liamonade left	15:51
	← e14 left	15:51
	← davisonio left	15:51
	← quadgrande left	15:52
	← notebox left	15:52
	→ crayon joined	15:53
	← crayon left	15:53
	→ crayon joined	15:53
	← rubie left	15:53
	→ stuh84 joined	15:54
	← VagabondAzulien left	15:54
	→ notebox joined	15:54
	← crayon left	15:55
	← diogenese left	15:56
	→ M-shine joined	15:56
	→ diogenese joined	15:56
	← ahmedelgabri left	15:56
	← thiago left	15:57
	← rgrinberg left	15:57
	→ PabloR joined	15:57
	→ ochorocho__ joined	15:58
PabloR	After reinstalling Mavericks and bringing back my backed up stuff I started having issues with git. When running any git command a window popped up: `the git command requires the command line dev tools` with the options `Get Xcode` (from app store) or `Install`. I clicked on install and some git commands worked but it’s looking for the system config file in a different location.	15:58
	`git config --list --system` displays “fatal: unable to read config file '/Library/Developer/CommandLineTools/usr/etc/gitconfig': No such file or directory”. BUT the file was never there but at /usr/local/git/etc/gitconfig. So I copied the file to the location the computer is looking for and so far it works. Why is it looking in a different location? Was this the correct solution? OR should I change a PATH somewhere instead?	15:58
	→ quadgrande joined	15:59
Eugene	PabloR - /etc/gitconfig is the default location for the "system" level gitconfig file; the rest of that sounds like the prefix added by your (OS X?) install	16:00
	The lack of this file shouldn't(?) cause any errors during normal usage; what are you doing thats giving a problem?	16:01
	← satbyy left	16:01
Eugene	And can you provide a !transcript	16:01
gitinfo	Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see	16:01
PabloR	Eugene It may be but I don't know why it added the prefix	16:01
Eugene	Me neither; I'm not a Mac owner and just guessing ;-)	16:01
PabloR	I had some aliases I created that weren't working	16:02
	→ actinide joined	16:02
Eugene	bash or git aliases?	16:02
PabloR	Now it works, but I'm not sure what I did it's ok. Git aliases	16:02
	← ochorocho__ left	16:02
	→ Orion3k joined	16:02
	← stuh84 left	16:03
	← eduardas_m left	16:03
Eugene	Did you close and restart your terminal session?	16:03
	(after installing git)	16:03
	→ atis_ joined	16:04
	→ synthroid joined	16:04
PabloR	I believe I did. I'll do again since I just downloaded a new version to see if it fixed. Just a sec	16:04
	← synthroid left	16:05
	→ synthroid joined	16:05
	← Darcidride left	16:05
Eugene	Likely related. I reckon that Xcode(or something) is setting up the env vars that git needs to look for everything in the right place, since it isn't in /etc	16:05
PabloR	See, another issue is that git —version displays git version 1.9.5 (Apple Git-50.3) but I downloaded several git versions later including 2.6, 2.8 & 2.10.0 so I don’t know which version I’m actually using and how to get the latest to work	16:05
	→ Darren_ joined	16:05
Eugene	Generally you only have one installed	16:05
	→ thiago joined	16:06
	← cyphase left	16:06
Eugene	`which git` should tell you the path to the git binary, which might help a bit	16:06
PabloR	I just downloaded form https://git-scm.com/downloads	16:06
	→ rominronin joined	16:06
PabloR	which git displays /usr/bin/git	16:07
	→ guampa joined	16:07
	→ tvw joined	16:07
Eugene	I will need to defer to a Mac expert, should there be one around	16:07
	→ cdg joined	16:07
	← quadgrande left	16:07
PabloR	Ok. Thanks!	16:07
	← wcpan left	16:07
	→ markelite joined	16:08
	← TomyWork left	16:08
PabloR	Anybody Mac user that can help me?	16:08
	→ qpdb joined	16:09
	← Guest95226 left	16:09
	← notebox left	16:09
	← boushi left	16:10
	→ boushi joined	16:10
	→ LeBlaaanc joined	16:10
	→ cyphase joined	16:10
	→ Pyrogerg joined	16:11
	→ e14 joined	16:11
	→ notebox joined	16:11
	← rominronin left	16:11
berndl	PabloR: I'm a Mac user. What's up?	16:12
	→ lvns joined	16:12
	← perlpilot left	16:12
	← irqq left	16:12
	← e14 left	16:12
PabloR	Hi berndl. Having a couple of different issues with git	16:12
	← Orion3k left	16:12
	← eizua left	16:12
PabloR	git —version displays git version 1.9.5 (Apple Git-50.3) but I downloaded several git versions later including 2.6, 2.8 & 2.10.0 so I don’t know which version I’m actually using and how to get the latest to work	16:12
	→ e14 joined	16:12
PabloR	I don't recall how I downloaded git for the first time	16:13
	But I just downloaded form https://git-scm.com/downloads	16:13
_ikke_	(not a mac user) have you tried homebrew?	16:14
	← atis_ left	16:14
	← satya4ever left	16:14
	← stonercoder left	16:15
	→ laumann joined	16:15
PabloR	_ikke_ No, I don't think I did. I know there's discussion about what's the best methods. At some point somebody told me not to use it	16:15
	gitinfo set mode: +v	16:16
	perlpilot_ → perlpilot	16:16
_ikke_	ok	16:16
perlpilot	PabloR: if you have an older version of git, you can also clone the git repo from github and follow the instructions in there on how to build it and install it yourself (if you have a taste for adventure ;-)	16:16
	→ terminal_echo joined	16:17
PabloR	+perlpilot I don't have a taste for adventure. I don't know much about systems. And every time I touch something fixing it takes me lots of time	16:17
	So, question is why would I keep seeing old versions when I download new ones	16:18
	fhackdroid\|afk → fhackdroid	16:19
_ikke_	PabloR: Probably because they install it in a different location and the system version has precedence	16:19
	→ archaic joined	16:19
	→ crayon joined	16:19
	← crayon left	16:20
	→ crayon joined	16:20
	← duderonomy left	16:20
	← Emperor_Earth_ left	16:20
	archaic → Guest38311	16:20
	→ wwftvt joined	16:20
PabloR	_ikke_ Do you know how can I change the system to look for the new version instead?	16:20
_ikke_	PabloR: I recall something about the one apple provides is 'protected'	16:20
	→ zonality joined	16:21
_ikke_	What version of OSX do you have?	16:22
berndl	PabloR: just install from homebrew.	16:22
PabloR	mavericks	16:22
	← notebox left	16:22
	→ notebox joined	16:22
	← zonality left	16:23
	← cyphase left	16:23
PabloR	berndl I'm concern because some people have said they had some issues when using homebrew.	16:24
	and I'm not very knowledgeable at systems	16:24
	But anyway, currently git is working. My main issue is the one I wrote before that. I'll copy it below	16:25
	← e14 left	16:25
PabloR	<PabloR> After reinstalling Mavericks and bringing back my backed up stuff I started having issues with git. When running any git command a window popped up: `the git command requires the command line dev tools` with the options `Get Xcode` (from app store) or `Install`. I clicked on install and some git commands worked but it’s looking for the system config file in a different location.	16:26
	`git config --list --system` displays “fatal: unable to read config file '/Library/Developer/CommandLineTools/usr/etc/gitconfig': No such file or directory”. BUT the file was never there but at /usr/local/git/etc/gitconfig. So I copied the file to the location the computer is looking for and so far it works. Why is it looking in a different location? Was this the correct solution? OR should I change a PATH somewhere instead?	16:26
	→ Orion3k joined	16:26
	→ cyphase joined	16:27
	→ danslo joined	16:28
	← sdothum left	16:30
	→ e14 joined	16:30
	← dreiss left	16:30
	→ Silenced_v2 joined	16:30
	← Silenced_v2 left	16:30
	→ Silenced_v2 joined	16:30
	→ rgrinberg joined	16:31
	→ nitric joined	16:31
	→ sdothum joined	16:32
	→ kyan joined	16:32
	← maroloccio left	16:32
	← danslo left	16:33
	ndimitrij → ndim	16:34
	← wwftvt left	16:34
	→ ansimation joined	16:34
	→ mycelium joined	16:34
	→ dreiss joined	16:35
	→ Dispatch joined	16:35
	→ ksefchik joined	16:36
	← kurkale6ka left	16:36
	← mikecmpbll left	16:37
	→ clr joined	16:37
	→ Rodya_ joined	16:38
	← anth0ny_ left	16:39
	← marcelofr left	16:39
	→ durham joined	16:39
	← mingrammer left	16:40
	← aax left	16:40
	← ansimation left	16:41
	→ ruby_ joined	16:42
	← DieguezZ left	16:43
	← Rodya_ left	16:43
	→ SteffanW joined	16:43
	→ ochorocho__ joined	16:44
	← dmarr left	16:44
	← erguven left	16:44
	← ferr left	16:45
	← chll left	16:45
	← ruby_ left	16:46
	→ dmarr joined	16:46
	→ nidr0x joined	16:46
	→ ruby_ joined	16:47
	← ruby_ left	16:47
	← terminal_echo left	16:48
	→ anth0ny joined	16:48
	McKraken → McKraken_zzzzz	16:49
	→ circ-user-OBsh3 joined	16:50
	← dreiss left	16:52
	← sangy left	16:52
	← Lomex left	16:54
	← eivarv left	16:54
	← amcsi left	16:55
	← encod3 left	16:55
_ikke_	PabloR: Has to do with how that specific git version was built	16:55
	→ sangy joined	16:56
_ikke_	This one was built to not mess with system files	16:56
	← cyphase left	16:56
_ikke_	(everything is under /Library/Developer/CommandLineTools/)	16:56
	← deadprez left	16:57
	→ chrisshattuck joined	16:57
	→ wcpan joined	16:57
	→ Rodya_ joined	16:57
	→ eivarv joined	16:58
	← berndl left	16:59
	→ hahuang65 joined	16:59
	← notebox left	16:59
	← cdg left	16:59
PabloR	_ikke_ so copying my config file to the new location is ok then?	17:00
	→ notebox joined	17:00
	→ cyphase joined	17:01
PabloR	Instad of changing a path somewhere?	17:01
	← Rodya_ left	17:01
	→ matsaman joined	17:01
matsaman	does git add -A work the same regardless of location within git-tracked hierarchy?	17:02
	→ timvishe` joined	17:02
	← thiago left	17:03
	→ deadprez joined	17:03
	→ PaulCapestany joined	17:03
	→ Lomex joined	17:03
	→ mikecmpbll joined	17:03
	→ AnarchyAo joined	17:05
	→ Rodya_ joined	17:05
	← timvisher left	17:06
	← ahf left	17:06
	← clemf left	17:06
	← PaulCape_ left	17:07
	→ QwertyDragon joined	17:07
	→ rominronin joined	17:08
	← Lomex left	17:08
	→ clemf joined	17:08
	→ dviola joined	17:08
	→ sametsisartenep joined	17:09
	← bruce_lee left	17:09
sametsisartenep	Hi there	17:09
gitinfo	sametsisartenep: 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.	17:09
_ikke_	PabloR: Changing that path would require recompiling git, so yeah, moving it is the only option	17:09
	PabloR: Note that, if it's only for your user, ~/.gitconfig is a much better place to put these things	17:09
	→ ahmedelgabri joined	17:09
sametsisartenep	How could I disable gpg signing for a single repo?	17:10
	→ ProbabilityMoon joined	17:10
	← jimi_ left	17:10
_ikke_	matsaman: " If no <pathspec> is given when -A option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."	17:10
	→ ahf joined	17:11
_ikke_	sametsisartenep: git config commit.gpgSign false	17:11
	this will disable it for the current repo only	17:11
	← laumann left	17:11
_ikke_	matsaman: So, only from the current dir and deeper	17:11
	→ thiago joined	17:12
	→ mingrammer joined	17:12
sametsisartenep	Thanks _ikke_	17:12
	← ProbabilityMoon left	17:12
	← chrisshattuck left	17:12
_ikke_	matsaman: Just tested it, and it does seem to add all files	17:13
	← rominronin left	17:13
	← CheckDavid left	17:13
	→ chrisshattuck joined	17:14
PabloR	_ikke_ I have my global config file at /Users/pablo/.gitconfig and the system config file was at /usr/local/git/etc/gitconfig but now is at /Library/Developer/CommandLineTools/usr/etc/gitconfig. But I haven't chosen the paths. They were added by default	17:14
	← lordjancso left	17:15
sametsisartenep	jump	17:16
	← mingrammer left	17:16
sametsisartenep	^ Woops, sorry about that	17:16
_ikke_	PabloR: Like I said, that's choosen at compile time	17:16
	→ ProbabilityMoon joined	17:16
_ikke_	The system config location	17:17
	← cyphase left	17:17
	→ liamonade joined	17:17
PabloR	_ikke_ ok. Thanks	17:17
	← hahuang65 left	17:17
	← \|ifei5g00d left	17:18
	← chrisshattuck left	17:20
	← quackgyver left	17:20
	← akitada left	17:20
	→ Darcidride_ joined	17:21
	→ cdg joined	17:21
	→ cyphase joined	17:21
	→ Groscheri joined	17:22
	→ \|ifei5g00d joined	17:22
	← Groscheri left	17:22
	→ Groscheri joined	17:22
	→ raijin joined	17:24
	← anonymuse left	17:24
	← quetz left	17:24
	← robotroll left	17:25
	← Repox left	17:25
	← liamonade left	17:26
	ash_workz_ → ash_workz	17:26
	→ hahuang65 joined	17:26
	← e14 left	17:29
	→ _sjs joined	17:29
	← ProbabilityMoon left	17:30
	→ ProbabilityMoon joined	17:30
	→ dreiss joined	17:30
	← aspiers left	17:31
	← boushi left	17:31
	← ProbabilityMoon left	17:32
	→ Sasazuka joined	17:32
	→ pouet joined	17:32
	← cyphase left	17:32
	→ danimal2 joined	17:33
	← ahmedelgabri left	17:33
	← danimal2 left	17:33
	→ danimal2 joined	17:33
matsaman	_ikke_: from any location in hierarchy, you mean?	17:33
	→ zacts joined	17:34
	← Ryanar left	17:34
_ikke_	In recent versions of git, git add -A will include any file in the working tree, no matter where you are	17:34
matsaman	okay, groovy, thanks	17:34
	and I can test that with just git add -A and then... git diff --staged ?	17:34
	→ Ryanar joined	17:34
	← cdown left	17:34
_ikke_	git status	17:34
	← ShekharReddy left	17:35
	→ liamonade joined	17:35
matsaman	okay thanks again =)	17:36
	_ikke_: you wouldn't know the version that was added/changed, offhand?	17:36
	re: "In recent versions..."	17:36
	→ cyphase joined	17:36
	→ aax joined	17:38
_ikke_	matsaman: v2.0.0	17:38
matsaman	thanks thrice =)	17:39
	← _ADN_ left	17:42
	→ irqq joined	17:44
	← nidr0x left	17:45
	→ jceb joined	17:46
	← liamonade left	17:49
	← Gitzilla_ left	17:49
	← cyphase left	17:50
	← Ryanar left	17:50
	← multi_io left	17:54
	→ ahmedelgabri joined	17:55
	→ multi_io joined	17:56
	→ cyphase joined	17:56
	→ jwest joined	17:56
	← spudowiar left	17:57
	→ Ryanar joined	17:57
	← runlevl4 left	17:58
	→ Lomex joined	18:00
	→ e14 joined	18:01
	→ ansimation joined	18:01
	← BrianJ left	18:01
	→ govg joined	18:02
	→ kulelu88 joined	18:02
	→ rjack2 joined	18:02
	→ sssilver joined	18:03
	← PabloR left	18:04
	← qpdb left	18:04
	→ zarel joined	18:05
	→ terminal_echo joined	18:06
	→ chrisshattuck joined	18:06
	← notebox left	18:06
	→ mingrammer joined	18:06
	→ ShekharReddy joined	18:06
	→ rominronin joined	18:07
	← jwest left	18:08
	← shinnya left	18:09
	← marcogmonteiro left	18:09
	← cyphase left	18:10
	→ Balliad joined	18:10
	→ runlevl4 joined	18:11
	← mingrammer left	18:11
	← rominronin left	18:12
	← Salander27 left	18:12
	→ Salander27 joined	18:13
	→ Xizor joined	18:14
	← terminal_echo left	18:14
	→ sssilver_ joined	18:14
	→ cyphase joined	18:15
	← sssilver left	18:15
	← achadwick left	18:15
	→ stonercoder joined	18:17
	← Darren_ left	18:17
	← subhojit777 left	18:19
	→ jwest joined	18:20
	← ansimation left	18:20
	← chigang_ left	18:21
	→ Flaghacker joined	18:22
	← bocaneri left	18:22
	atomi_ → atomi	18:23
	← raijin left	18:24
	← stonercoder left	18:25
	← cyphase left	18:27
	→ cdown joined	18:28
	→ JanC_ joined	18:28
	← sametsisartenep left	18:28
	JanC → Guest18007	18:29
	JanC_ → JanC	18:29
	→ sametsisartenep joined	18:29
	→ Remram[m] joined	18:29
	← ahmedelgabri left	18:29
	→ Ineentho[m] joined	18:29
	→ M-mistake joined	18:29
	→ M-meznak joined	18:29
	← SpeakerToMeat left	18:30
	← Guest18007 left	18:30
	sametsisartenep → Guest3214	18:30
	→ cyphase joined	18:32
	← e14 left	18:32
	→ jimi_ joined	18:32
	← rgrinberg left	18:33
	← cdg left	18:33
	→ gumnos joined	18:36
	← chrisshattuck left	18:36
	→ e14 joined	18:36
	→ star_pro_ joined	18:36
	→ Koopz joined	18:36
	→ chrisshattuck joined	18:37
gumnos	Is there a way to do a git-reset on a branch other than HEAD? Based on my reading, it looks like git-reset always acts on HEAD and I'd like to move/repoint a branch label to an different commit. I can stash+checkout+reset+checkout+unstash but wondered if there was something obvious I was missing	18:37
_ikke_	If you have not checked out this branch, you can use git branch -f <name> <commit> to repoint a branch	18:38
	← zacts left	18:38
gumnos	_ikke_: sounds exactly like what I want to do. Thanks!	18:39
_ikke_	If you want to check out this branch at the same time, you can also use git checkout -B <name> <commit>	18:39
	← star_pro_ left	18:40
	← jceb left	18:41
	← Koopz left	18:41
gumnos	it was a "arg, I've been working on master and should have been working on $BRANCH, so I made $BRANCH and continued work there, but master (unpushed) now points into a WIP, so I want to move it back to where upstream points". The "branch -f" did just what I needed. Thanks again!	18:42
	→ mykespb joined	18:43
_ikke_	right	18:43
	← cyphase left	18:43
	← Flaghacker left	18:43
	→ ahmedelgabri joined	18:44
	→ bgerber joined	18:44
	← chrisshattuck left	18:46
	← jost__ left	18:46
	→ chrisshattuck joined	18:46
	→ liamonade joined	18:46
	→ yohnnyjoe joined	18:47
	← Balliad left	18:47
	← liamonade left	18:47
	→ cyphase joined	18:47
	← mrpackethead left	18:48
	→ Darren_ joined	18:48
	← gumnos left	18:49
	← Silenced_v2 left	18:51
	← InfoTest left	18:51
	→ AaronMT_ joined	18:51
	← Ezzy left	18:52
	← AaronMT left	18:53
	→ AaronMT__ joined	18:53
	→ SpeakerToMeat joined	18:53
	→ liamonade joined	18:54
	→ pungi-man joined	18:55
	← e14 left	18:56
	← AaronMT_ left	18:56
	→ ansimation joined	18:57
	→ e14 joined	18:57
	← Salander27 left	18:58
	← PCatinean left	18:58
	← ansimation left	18:59
	← phaleth left	18:59
	→ satbyy joined	18:59
	← satbyy left	19:00
	→ satbyy joined	19:00
	→ qpdb joined	19:00
	← texasmynsted left	19:01
	← crayon left	19:01
	← Rodya_ left	19:01
	→ texasmynsted joined	19:02
	→ LeBlaaan_ joined	19:02
	← LeBlaaanc left	19:02
	← rideh left	19:02
	→ rideh joined	19:02
rideh	I want to use cron job with a bare repo to poll for changes (git pull branch) and publish them to a remote work tree on that same host. seems my post-merge hook wont work as there is no head in bare. Any suggestions?	19:03
	← cyphase left	19:03
	→ Guest86 joined	19:04
	→ Spec-Chum joined	19:05
	← fahadash left	19:06
	← Ryanar left	19:06
	← LeBlaaan_ left	19:06
	→ cyphase joined	19:07
	→ rominronin joined	19:08
	← t0by left	19:08
	→ Rodya_ joined	19:08
	→ Pulp joined	19:11
_ikke_	there is a HEAD in a bare repo	19:12
	← Rodya_ left	19:12
	← rominronin left	19:12
	→ aidalgol joined	19:13
moritz	uhm, but can you merge in a bare repo?	19:13
_ikke_	But merging in hooks and cron-jobs is not advisable	19:13
	No, you cannot	19:13
	You need a working tree for that	19:13
moritz	then a post-merge hook is pointless	19:13
	→ cdown_ joined	19:13
	→ Ryanar joined	19:13
	→ mohabaks joined	19:14
moritz	in a bare repo, fetch should be enough, afaiu	19:14
_ikke_	Usually you push to a bare repository	19:14
	→ Balliad joined	19:15
	← cyphase left	19:16
	← cdown left	19:16
	cdown_ → cdown	19:16
	→ loopy joined	19:17
moritz	rideh: so you likely want a post-receive hook. Also !deploy	19:17
gitinfo	rideh: 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	19:17
	→ NeonSynth joined	19:17
	← e14 left	19:17
moritz	or post-update	19:17
	→ cyan__ joined	19:18
moritz	(post-receive if you want to be able to reject pushes, post-update if you don't)	19:18
	→ e14 joined	19:18
_ikke_	pre-receive if you want to reject them	19:18
	post-receive is too late	19:18
	→ Salander27 joined	19:19
	← asti left	19:19
	← e14 left	19:19
_ikke_	and the other one is just update	19:19
	→ e14 joined	19:19
_ikke_	sorry, post-update also exists	19:19
	→ biotim joined	19:20
	→ cyphase joined	19:20
	→ rgrinberg joined	19:20
	→ Silenced joined	19:21
	← deadprez left	19:23
	→ deadprez joined	19:25
	→ cagedwisdom joined	19:25
	→ byteflame joined	19:26
	← aidalgol left	19:27
	→ spudowiar joined	19:28
	gitinfo set mode: +v	19:28
	r4z → afk_r4z	19:29
	← cyphase left	19:29
	← Ryanar left	19:30
	→ danslo_ joined	19:30
	→ netcarver joined	19:30
	← mykespb left	19:31
	→ nights_ joined	19:32
	→ Gitzilla_ joined	19:32
	← nights left	19:32
	← johnmilton left	19:32
	→ cyphase joined	19:34
	→ byteflam1 joined	19:34
	← rgrinberg left	19:35
	← danslo_ left	19:35
	← byteflam1 left	19:35
	← byteflame left	19:35
	← Silenced left	19:35
	→ Silenced joined	19:35
	→ byteflame joined	19:35
	← texasmynsted left	19:35
	→ rgrinberg joined	19:36
	← sssilver_ left	19:36
	← Jon28_ left	19:37
	→ sssilver joined	19:37
	→ texasmynsted joined	19:37
	← _sjs left	19:37
	← rgrinberg left	19:38
	← netj left	19:38
	→ netj joined	19:38
	← Gurkenglas left	19:39
	← e14 left	19:39
	→ mingrammer joined	19:40
	→ vuoto joined	19:42
	← spudowiar left	19:42
	← cyphase left	19:43
	→ e14 joined	19:45
	← mingrammer left	19:45
	→ antranigv joined	19:46
antranigv	so, I should add *.swp in .git/info/exclude to ignore all vim swp files, aye?	19:47
	if it's a file, it should be the file path?, from the git root dir?	19:48
grawity	it would be more useful to add it to your global ~/.gitignore, but yes	19:48
antranigv	ah, didn't know about the global one, thanks grawity ! :))	19:48
	→ cyphase joined	19:48
grawity	well I suppose it's ~/.config/git/ignore these days	19:48
	→ johnmilton joined	19:49
	→ LeBlaaanc joined	19:49
_ikke_	Yeah, unless you set it manually	19:50
grawity	apparently there wasn't a global default before	19:50
	← dsantiago left	19:50
_ikke_	Nope, you had to set it	19:51
	← fmcgeough left	19:51
	← chrisshattuck left	19:51
	← SteffanW left	19:51
	← yohnnyjoe left	19:51
	← parallel21 left	19:51
	→ chrisshattuck joined	19:54
	→ crose joined	19:54
	→ rgrinberg joined	19:54
	→ cdg joined	19:55
	← texasmynsted left	19:55
	→ raijin joined	19:56
	→ boombatower joined	19:56
	← jeffreylevesque left	19:57
	→ stonercoder joined	19:57
	← circ-user-OBsh3 left	19:57
	→ texasmynsted joined	19:57
	→ l4v2 joined	19:57
	← AnarchyAo left	19:58
	← byteflame left	19:59
	→ Rodya_ joined	19:59
	← Darren_ left	20:00
	← Xizor left	20:00
	→ AnarchyAo joined	20:03
	← Balliad left	20:03
	← Rodya_ left	20:04
	→ Xizor joined	20:04
	→ FroMaster joined	20:05
	← cyphase left	20:06
	← cdown left	20:07
	← sanketdg left	20:07
	← raijin left	20:07
	→ shinnya joined	20:07
	→ rominronin joined	20:09
	→ cyphase joined	20:12
	← rominronin left	20:14
	→ duderonomy joined	20:14
	→ shpew12 joined	20:15
	→ Emperor_Earth joined	20:15
	← bongjovi left	20:16
	→ bongjovi joined	20:16
shpew12	I'm trying to set up git on an apache server, but whenever I try to pull from my local computer, it always times out with no messages of any errors. Does anyone know why this might be happening? This is the first time trying to set up this remote from the server.	20:17
antranigv	hmm, say I want to ignore mylove.txt, but I did git add it before, I also can see it now in git ls-files; how to remove it? :)	20:17
_ikke_	antranigv: git rm --cached mylove.txt	20:18
	← abyx left	20:18
_ikke_	shpew12: GIT_TRACE=1 git pull	20:18
antranigv	_ikke_: thankie! :)	20:19
	← dmto left	20:19
_ikke_	grazie	20:20
	→ cdown joined	20:20
	→ treehug88 joined	20:22
	← cyphase left	20:22
	← crose left	20:23
	← l4v2 left	20:25
	→ raijin joined	20:25
	← vdl left	20:25
	→ star_prone joined	20:25
	← eivarv left	20:26
	→ bluezone joined	20:26
	← Darcidride_ left	20:26
	← e14 left	20:26
	→ cyphase joined	20:27
	→ _leb joined	20:27
	→ Darren_ joined	20:28
	← star_prone left	20:30
	→ skylite_ joined	20:30
	← raijin left	20:30
	← grumble left	20:30
	← z8z left	20:31
	→ grumble joined	20:31
	→ eivarv joined	20:31
	→ mloy joined	20:31
	→ raijin joined	20:32
	→ e14 joined	20:32
	← skylite left	20:33
mloy	Hi, I forked a repo on github and now the repo I forked is a commit ahead on a development branch and I need to pull that commit. How can I update my forked repo?	20:34
shpew12	Thank you _ikki_. I'm so now I'm getting an 'unable to access' message, is there some type of configuration I need to address before fetching from my computer?	20:34
	← Xrayez left	20:34
mloy	Oh wait, I should set it to upstream	20:34
	← bongjovi left	20:35
	← Darren_ left	20:35
	← eivarv left	20:36
	→ Rodya_ joined	20:41
	← cyphase left	20:42
	← raijin left	20:43
	→ yohnnyjoe joined	20:43
	← synthroid left	20:44
	← bgerber left	20:45
	→ cyphase joined	20:46
	→ FuzzySockets joined	20:48
	← GavinMagnus left	20:50
	→ raijin joined	20:51
	→ denimsoft joined	20:53
	← vuoto left	20:55
	→ greendo joined	20:56
	← crelix left	20:56
	← raijin left	20:56
	→ anonymuse joined	20:57
	← QwertyDragon left	20:57
yoh	is there a gid command to discover the date of a last commit which modified for each file in a repository (efficiently, e.g. if I have a thousand files) or in current directory	20:58
	→ z8z joined	20:58
	← e14 left	20:58
	← cyphase left	20:59
	← jimi_ left	20:59
	→ e14 joined	20:59
	← chrisshattuck left	21:01
	← shpew12 left	21:01
	→ shpew12 joined	21:01
	→ aidalgol joined	21:01
kadoban	yoh: git log -- the_file would be a good start	21:02
i7c	git log --pretty=%cd -1 -- path/to/file	21:02
	← mohabaks left	21:02
i7c	Or --pretty=%ct if you want unix time stamps	21:02
yoh	that would be for 1 file... what if I have a thousand?	21:03
	→ dsdeiz joined	21:03
yoh	looping would be too long	21:03
kadoban	Are you looking for a thousand different answers, or which commit changed any of them, or?	21:03
yoh	the last commit which changed each file	21:03
	→ cyphase joined	21:04
yoh	pretty much -- I want to provide a view similar to github where it notes when each file (or directory by aggregation) was last changed	21:04
	← ash_workz left	21:04
yoh	like 'mtime', but since git doesn't record those -- would be date/time of the last commit which modified it	21:04
	indeed I could do it with git log per each file, or somehow traversing entire git log FILES until I find a record for each file, but both are inefficient	21:04
i7c	Well	21:05
	← ExoUNX left	21:05
kadoban	I don't think git can answer that efficiently on its own, you'd likely have to build up some db on top.	21:05
i7c	either you loop over files or you loop over commits in date order and collect the information that way.	21:05
	And what kadoban says.	21:05
peepsalot	i have a branch i've been working in, and right now i want to rebase mybranch onto master, does it matter if I already pushed a lot of changes on my branch to origin/mybranch before this rebase?	21:06
kadoban	peepsalot: It depends, is anyone else using that branch, or have a copy of it, or care about it?	21:06
yoh	i7c, kadoban: ok -- just thought to check if I am not missing some obvious to experts procelain command ;)	21:06
kadoban	Yep, AFAIK you're not.	21:07
i7c	!rewrite	21:07
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	21:07
	← z8z left	21:07
peepsalot	kadoban, not really, it just needs to be merged back into master after this	21:07
	well, and a code review before that	21:08
	so just needs to be used for a code review	21:08
kadoban	peepsalot: If it's only you it's likely okay, you'll have to do a push -f and if you have that branch on any other computers they'll have to be updated manually or whatever (don't do a pull)	21:08
	→ terminal_echo joined	21:08
	← andlabs left	21:09
	← loopy left	21:09
	← StuartMI left	21:09
	← hahuang65 left	21:10
	→ rominronin joined	21:10
	← clemf left	21:10
	← e14 left	21:12
	← BSaboia left	21:14
	← duderonomy left	21:14
	← deadprez left	21:15
	→ Balliad joined	21:15
	→ vdl joined	21:15
	← rominronin left	21:15
	← rgrinberg left	21:17
	← Silenced left	21:18
	← irco left	21:19
	→ rgrinberg joined	21:19
	→ l4v2 joined	21:19
	← Balliad left	21:19
	→ e14 joined	21:20
	← Salander27 left	21:21
	← d0nn1e left	21:22
	← rnsanchez left	21:22
	→ d0nn1e joined	21:23
	← lightstalker left	21:23
	→ SteffanW joined	21:24
	→ deadprez joined	21:25
	← deadprez left	21:25
	→ elastix joined	21:26
elastix	hi guys what does it mean that git is decentrlalized/?	21:27
	→ DomeMasterYolo joined	21:27
	gitinfo set mode: +v	21:27
	← sangy left	21:27
DomeMasterYolo	hello	21:27
gitinfo	DomeMasterYolo: 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.	21:27
	← Hink left	21:28
	← _leb left	21:28
	← e14 left	21:28
DomeMasterYolo	is there anyway I can run git archive but specify the directory of the repo	21:28
	→ nikivi joined	21:28
DomeMasterYolo	so I don't need to cd	21:28
	first	21:28
	ty	21:28
	← yohnnyjoe left	21:28
	→ Hink joined	21:29
	→ e14 joined	21:29
	← e14 left	21:30
	← Xizor left	21:30
	← rgrinberg left	21:30
	→ rgrinberg joined	21:31
	→ spudowiar joined	21:31
	gitinfo set mode: +v	21:31
	→ maroloccio joined	21:31
	← cyphase left	21:31
	← Hink left	21:32
	→ DieguezZ joined	21:32
	→ e14 joined	21:32
	← denimsoft left	21:32
	← nwkj86 left	21:32
	gitinfo set mode: +v	21:32
	← Rodya_ left	21:32
joshc	DomeMasterYolo: you can use git --git-dir=$path <command>	21:32
	→ Hink joined	21:33
DomeMasterYolo	thanks joshc	21:33
	← rahtgaz left	21:33
DomeMasterYolo	its weird joshc why is that not in the man page?	21:33
_ikke_	man git	21:33
gitinfo	the git manpage is available at http://jk.gs/git.html	21:33
_ikke_	It's in there	21:34
DomeMasterYolo	hrm ok not in git archive man	21:34
	but I'll read whole one :)	21:34
	← paws_ left	21:35
	→ mkopriva joined	21:35
_ikke_	DomeMasterYolo: Because it's a parameter that works for all commands	21:35
	→ dodobrain joined	21:35
	← tvw left	21:35
_ikke_	git <general_params> <subcmd> <subcmd_params>	21:35
	→ cyphase joined	21:36
	← e14 left	21:36
	← Puffball left	21:37
DomeMasterYolo	ok thanks	21:37
	← LeBlaaanc left	21:37
DomeMasterYolo	I'm doing: git --git-dir='./apps/device-manager/' archive master	21:37
	and its saying not a git repository	21:37
	it definitely is	21:37
	→ denimsoft joined	21:38
_ikke_	DomeMasterYolo: use -C, that will do both --git-dir and --work-tree	21:38
	← nikivi left	21:39
	→ chrisshattuck joined	21:39
DomeMasterYolo	tried already _ikke_	21:39
	git -C "$(pwd)/apps/device-manager/" archive master	21:39
	← SteffanW left	21:39
DomeMasterYolo	says unknown option "-C"	21:39
_ikke_	Then your version of git is too old	21:40
DomeMasterYolo	hrm	21:40
	I@ll just do it manually	21:40
	its quicker	21:40
	thanks for the help	21:40
	← Guest86 left	21:40
_ikke_	introduced in 1.8.5	21:41
	→ ansimation joined	21:41
_ikke_	We're at 2.10.0 now	21:41
	← ringer1 left	21:44
	← freimatz left	21:44
	← Pieplay left	21:44
	→ Ringer joined	21:45
	← fees left	21:45
	← Brando753-o_O_o left	21:45
	← hecliunyx left	21:46
	→ ahr3n joined	21:47
	← cyphase left	21:48
	→ hecliunyx joined	21:48
	→ clemf joined	21:48
	→ Brando753-o_O_o joined	21:48
	← denimsoft left	21:48
	← clemf left	21:50
	→ Rodya_ joined	21:50
	→ dsantiago joined	21:50
	→ Dispatch_ joined	21:50
	← dsantiago left	21:52
	← Gsham left	21:52
	→ cyphase joined	21:52
	← elastix left	21:52
	→ jrozner joined	21:52
	→ dsantiago joined	21:52
	← aax left	21:53
	→ inflames joined	21:54
jrozner	I've been working in a long living branch working on an new feature. I last rebased on master about a month ago and have finally gotten everything wrapped up. I squashed and went to rebase but in some of the files that are both modified I'm seeing only only the master version and not options to resolve. Is there a reason certain hunks wouldn't be presented as changed?	21:54
	→ Puffball joined	21:55
	← dsantiago left	21:55
	→ dsantiago joined	21:56
	← rgrinberg left	21:56
	→ _sjs joined	21:56
	← Groscheri left	21:56
	→ duderonomy joined	21:58
	← DomeMasterYolo left	21:59
	← zarel left	21:59
	→ e14 joined	21:59
	← e14 left	21:59
	← Dispatch_ left	22:00
	→ iokill joined	22:00
	→ DomeMasterYolo joined	22:01
	← _sjs left	22:01
	← atomi left	22:01
	← liamonade left	22:02
	→ _sjs joined	22:02
	→ copumpkin joined	22:03
	afk_r4z → r4z	22:03
copumpkin	is there a straightforward way to take an arbitrary directory (even outside of a git repo) and asking git to compute the tree hash that directory would have (recursively doing all the usual work) if it were stored in a git repo?	22:04
	I can do the various parts myself, but then I need to recursively traverse the folders, pay attention to .gitignores, and other intricacies that it seems like git is probably better at than I am	22:04
	← Dispatch left	22:04
	← ahf left	22:05
	← Dougie187 left	22:05
osse	copumpkin: I think the easiest way would be to yolo it by abusing --git-dir and --work-tree	22:05
copumpkin	osse: hmm, how would that work?	22:05
	→ _leb joined	22:05
	→ andlabs joined	22:05
osse	copumpkin: export GIT_DIR=$(mktempd -d); export GIT_WORK_TREE=thatdiryouwant; git init; git add .; git commit -mlolrofl; git rev-parse HEAD^{tree}	22:06
	something like that	22:06
	woops. mktempd -d	22:06
	← _sjs left	22:07
osse	woops again. mktemp -d	22:07
	← moei left	22:07
	→ endiruna joined	22:07
osse	(copumpkin: setting GIT_WORK_TREE and GIT_DIR is the same as using --git-dir and --work-tree)	22:07
	→ amdi_ joined	22:08
copumpkin	oh, cute :)	22:08
	that doesn't seem too painful, I'll give it a go, thanks!	22:08
	← ansimation left	22:08
	→ atomi joined	22:08
	← stamina left	22:08
	→ HoierM joined	22:09
osse	copumpkin: I've found several times that if I want to do something "as if it were a git repo" it's easier to actually create a repo :P	22:09
	you can quote me on that	22:10
	← zivester left	22:11
copumpkin	hah fair!	22:11
	→ rominronin joined	22:11
	→ Mission-Critical joined	22:11
	← d10n-work left	22:12
	← Puffball left	22:12
	← _leb left	22:12
	← unreal left	22:13
	→ jefcolbi joined	22:13
	← griffindy left	22:13
	← ahr3n left	22:13
	→ Gsham joined	22:13
	← ojdo left	22:14
	→ paulh_ joined	22:15
	→ jimi_ joined	22:15
	← jimi_ left	22:15
	→ jimi_ joined	22:15
	← anonymuse left	22:15
	← paulh_ left	22:15
	← rominronin left	22:16
	← DieguezZ left	22:16
	→ deadprez joined	22:17
	→ Noldorin joined	22:17
	← SebastianFlyte left	22:18
	→ MattMaker joined	22:18
	→ Ryanar joined	22:18
	← atomi left	22:19
	← MattMaker left	22:19
	→ SebastianFlyte joined	22:19
	→ MattMaker joined	22:20
	← Ryanar left	22:20
	→ Ryanar joined	22:21
	→ Puffball joined	22:23
	← DomeMasterYolo left	22:23
	→ ojdo joined	22:23
	→ tlaxkit joined	22:24
	← Puffball left	22:25
	→ DomeMasterYolo joined	22:25
	→ _sjs joined	22:26
	← Ryanar left	22:26
	McKraken_zzzzz → McKraken	22:26
	→ Mobutils joined	22:26
	→ sangy joined	22:27
	→ EvilPeng1 joined	22:29
	→ liamonade joined	22:30
	← _sjs left	22:30
	→ ahf joined	22:30
	← AaronMT__ left	22:30
	← maroloccio left	22:30
	→ atomi joined	22:31
	← EvilPenguin left	22:31
	← stonercoder left	22:35
	→ Puffball joined	22:37
osse	copumpkin: Sooo did it do the trick?	22:37
	→ zacts joined	22:37
	← flavius left	22:38
	← cyphase left	22:38
	← ksefchik left	22:39
	→ DieguezZ joined	22:40
	→ rgrinberg joined	22:42
	→ lightstalker joined	22:42
	→ cyphase joined	22:44
	→ Raed\|Mobile joined	22:44
	→ Gurkenglas joined	22:49
	→ byteflame joined	22:50
	copumpkin osse: sorry got pulled into something more pressing but will try it soon	22:50
copumpkin	hah not sure where the /me came from	22:50
	← DieguezZ left	22:51
	← thiago left	22:51
	← dsdeiz left	22:52
	← cyphase left	22:52
	→ NeonSynth_ joined	22:52
	← matsaman left	22:54
	← jefcolbi left	22:55
	→ shmuli joined	22:55
	← NeonSynth left	22:55
	← endiruna left	22:56
	→ cyphase joined	22:57
	← spudowiar left	22:57
	→ realz joined	22:58
	← bluezone left	22:58
ayjay	has anyone got git-http-backend authenticating from mysql?	22:59
	← disi left	22:59
	← cdown left	22:59
	← al-damiri left	23:01
	← IlNominePatre left	23:02
	← Cassiopaya left	23:02
	← ams__ left	23:04
	→ al-damiri joined	23:04
	← chrisshattuck left	23:05
	→ ksefchik joined	23:06
	← ksefchik left	23:07
	← King_Hual left	23:07
	→ disi joined	23:09
	→ thiago joined	23:09
	← Gsham left	23:09
	→ zivester joined	23:10
	← duderonomy left	23:11
	→ rominronin joined	23:12
	← greendo left	23:13
	→ ksefchik joined	23:13
	← ochorocho__ left	23:13
	→ _sjs joined	23:14
	← ksefchik left	23:15
	← Pulp left	23:15
	← rominronin left	23:17
	→ Pulp joined	23:17
	→ mrpackethead joined	23:18
	← _sjs left	23:18
ayjay	i'm finding it funny that i just git cloned git and then uninstalled git through apt-get so that i could make install git	23:19
	← vassagus left	23:20
ayjay	https://imgflip.com/i/1a5iqu	23:20
	← govg left	23:22
	← disi left	23:22
	→ disi joined	23:22
	→ govg joined	23:24
	← disi left	23:24
	→ disi joined	23:24
	← Emperor_Earth left	23:25
	← zacts left	23:26
	→ dsdeiz joined	23:26
	← mkopriva left	23:26
	← pouet left	23:27
	→ same_ol_geez joined	23:27
	→ Atlantic777 joined	23:28
	← Atlantic777 left	23:28
	→ Atlantic777 joined	23:28
	→ same_ol_1eez joined	23:28
	→ pouet joined	23:28
	← cyphase left	23:29
	→ nyuszika7h joined	23:29
	→ e14 joined	23:32
	← govg left	23:32
	← e14 left	23:33
	→ e14 joined	23:33
	→ govg joined	23:33
	→ cyphase joined	23:33
	← e14 left	23:34
	→ e14 joined	23:34
	← atomi left	23:34
	→ atomi joined	23:36
	← e14 left	23:36
	→ e14 joined	23:36
	← mikecmpbll left	23:36
	→ clemf joined	23:36
	→ mikecmpbll joined	23:37
	→ SwiftMatt joined	23:39
	← Impaloo left	23:39
	→ Impaloo joined	23:39
	← GodGinrai left	23:40
	→ ISmithers joined	23:40
	← mikecmpbll left	23:40
	→ UserOO7 joined	23:41
	← Guest3214 left	23:42
	→ zacts joined	23:44
	← amdi_ left	23:45
	← qws-user-1228 left	23:46
	→ qws-user-1228 joined	23:46
	← MattMaker left	23:47
	← terminal_echo left	23:48
	← qws-user-1228 left	23:48
	→ danmackay joined	23:48
	→ qws-user-1228 joined	23:48
	← qws-user-1228 left	23:48
	→ MattMaker joined	23:49
	→ Ryanar joined	23:49
	→ qws-user-1228 joined	23:51
	← tyreld left	23:51
	→ _sjs joined	23:51
	← zacts left	23:51
	← cyan__ left	23:51
	→ Gsham joined	23:51
	← Gsham left	23:51
	← justanotheruser left	23:51
	← dhollinger left	23:52
	→ Ryanar_ joined	23:53
	← shmuli left	23:53
	← ahmedelgabri left	23:54
	← Ryanar left	23:54
	← Puffball left	23:55
	← byteflame left	23:55
	← _sjs left	23:55
	← cyphase left	23:56
	← Impaloo left	23:56
	← UserOO7 left	23:56
	→ Impaloo joined	23:56
	→ byteflame joined	23:56
	← dsdeiz left	23:57
	← r4z left	23:57
	← Ryanar_ left	23:58
	→ r4z joined	23:58
	→ dsdeiz joined	23:58
	← netcarver left	23:58
	→ UserOO7 joined	23:59
	← afuentes left	23:59
	← r4z left	23:59
	→ tyreld joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation