IRCloggy #git 2015-12-11

Provider of IRC logs since 2005.

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

	2015-12-11
	← triad left	00:00
	← chitopunk left	00:01
	← konr left	00:02
	→ anli_ joined	00:03
	← devoldmx left	00:03
	→ tvw joined	00:04
	← dangerousdave left	00:05
	→ daito joined	00:06
	→ mizu_no_oto joined	00:06
daurnimator	warning: Not updating refs/heads/master (new tip 713426549a68367499745cd31fd6cb8703b63654 does not contain ca5f13ef73decca2667ff6b1c9415ead99d77b34)	00:07
	milki: so I'm having another go at this.... when I try and do the 2nd fast import, I get that warning ^^ and it exits with an exit code of 1.	00:08
milki	daurnimator: thats fine. it doesnt want you to overwrite the existing master branch	00:08
	daurnimator: you can create a new branch from that new tip to be like master-from-import-2	00:09
daurnimator	milki: is there some flag I can give it to suppress that warning or the bad exit code?	00:09
milki	daurnimator: fast-import has --quiet	00:09
	→ zumba_addict joined	00:09
	← anli_ left	00:09
milki	daurnimator: very short list of flags	00:09
	→ thiago joined	00:10
	← daito left	00:10
daurnimator	milki: you mean --force? --quiet doesn't stop the warning or exit code.	00:10
	← jost left	00:10
	→ jason237 joined	00:10
	→ jimi_ joined	00:10
	← LeBlaaanc left	00:11
	← fahadash left	00:11
	← staafl left	00:12
	→ cjmz joined	00:13
	→ faux___ joined	00:13
	→ pgimeno joined	00:13
	← zumba_addict left	00:14
	→ nettoweb joined	00:14
	← harish_ left	00:14
pgimeno	how do I find the revision of the current working directory? is there a better way than git branch -v \| grep '^\*' ? something like svn info or hg summary?	00:16
	← mischat left	00:16
milki	daurnimator: force will actually overrite master	00:16
	daurnimator: if its none of those options, then the answer is no	00:17
	→ gancl joined	00:17
ash_workz	if you ssh into a server can you view it's available repos?	00:18
	→ Poppa joined	00:18
	← kpease left	00:19
	→ meZee joined	00:19
daurnimator	milki: okay. so --force seems fine for now	00:19
	← mizu_no_oto left	00:19
daurnimator	now; how can I rebase an orphan branch onto another one?	00:19
	→ wxg joined	00:20
	← ixjlyons left	00:21
	→ Chill_Surf joined	00:21
	→ jetpackjoe joined	00:23
	→ mizu_no_oto joined	00:23
	← acetakwas left	00:23
	← kaiza left	00:23
	→ govg joined	00:24
daurnimator	I'm trying: git rebase --onto d1ca605 --root -X ours	00:25
	← nafg_ left	00:25
daurnimator	but I get: fatal: Could not parse object '6e6975be58093c20145afc872eda83df2ea8f0b4^' Unknown exit code (128) from command: git-merge-recursive 6e6975be58093c20145afc872eda83df2ea8f0b4^ -- HEAD 6e6975be58093c20145afc872eda83df2ea8f0b4	00:26
	← hackel left	00:27
daurnimator	where 6e6975be58093c20145afc872eda83df2ea8f0b4 is my orphan branch's initial commit	00:28
ash_workz	is the general process (1) pull from a --bare repo (2) do stuff locally (3) push upto repo (4) pull/push from repo to testing?	00:28
	← cjmz left	00:29
	← overcast left	00:29
	← wxg left	00:29
	← vF3hNGxc47h8 left	00:30
	→ toothrot joined	00:31
	← jetpackjoe left	00:31
	← mizu_no_oto left	00:32
	← s8321414 left	00:32
	← daedeloth left	00:32
	← rendar left	00:34
	← cryptsting left	00:36
	→ samw joined	00:40
	→ ncthom91 joined	00:43
milki	daurnimator: yeah, if its the intial commit, it has no parent	00:44
daurnimator	milki: nevermind that error. I realised I was passing '-X ours' instead of '-s ours'	00:44
	however, I still have the command line wrong.... it just says "already applied" for every commit	00:45
	← samw left	00:45
	→ bb010g joined	00:49
	gitinfo set mode: +v	00:49
	→ cryptsting joined	00:49
	← gancl left	00:49
	← thiago left	00:49
	← geri left	00:50
	→ hexagoxel_ joined	00:52
	← wnefal left	00:54
	→ MarkyC joined	00:54
	hexagoxel_ → hexagoxel	00:55
	→ tieTYT joined	00:56
	← daivyk left	00:56
	← jfran left	00:58
tieTYT	we’re using git on a maven project and to deploy our project we download it from the maven repository. This is working fine, but we’ve been asked to be able to deploy a hotfix to a previous release if necessary. When you do a release in maven, it updates a ton of files, which we would want to put our hotfix commit on top of, and then merge into master. But we don’t want to merge in the files that maven updates. Any suggestions?	00:58
	→ lykinsbd joined	00:58
	← fstd left	00:59
	← MarkyC left	00:59
	→ fstd joined	00:59
	← govg left	00:59
	→ lykinsbd_ joined	00:59
	→ MattMaker joined	01:01
	← jason237 left	01:02
daurnimator	it appears I can use cherry-pick to do this	01:03
	← lykinsbd left	01:04
daurnimator	btw, how can I move a branch head (e.g. master) to my current detached head?	01:04
	→ arescorpio joined	01:05
daurnimator	ah ha; git checkout -B	01:06
milki	daurnimator: git checkout -B master HEAD	01:06
	yeah	01:06
	← ncthom91 left	01:06
daurnimator	so sadly, it looks like although cherry-pick works in the basic sense; it's not suitable	01:06
	→ daito joined	01:07
daurnimator	(because it doesn't move across tags or track merges)	01:07
	→ ncthom91 joined	01:07
	→ qpdb joined	01:07
milki	nope	01:07
daurnimator	so..... I'm not sure what to do.	01:07
	← MattMaker left	01:07
	← astrofog left	01:08
daurnimator	when I try https://github.com/githubtraining/example-rebase-orphan-branch I get the merge conflicts	01:08
	if I try and provide a merge strategy, it fails with that error above (about how it can't find the parent of the initial commit on the orphan branch)	01:09
	→ italoacasas joined	01:09
quesker	how do I make some new guy's pushes subject to review?	01:09
daurnimator	quesker: ask your git repository management software.	01:10
	← italoacasas left	01:10
milki	quesker: git is a DVCS and not related to code review	01:10
	← imachuchu left	01:10
quesker	hmm	01:10
	I am slow	01:10
	we use git	01:10
milki	quesker: you probably have a workflow that involves reviewing at some point	01:10
quesker	git commit; git push	01:10
daurnimator	quesker: i.e. go ask in #gitano / #github / #gitolite / <your software>	01:10
	→ italoacasas joined	01:10
quesker	ah	01:10
milki	quesker: if you can explain that workflow, we might be able to help	01:10
quesker	ok let me see what we use	01:11
daurnimator	quesker: this is the policy that is implemented by where you are 'git push'-ing to.	01:11
	milki: any ideas for me?	01:11
	→ mehola joined	01:11
milki	daurnimator: do you expect merge conflicts?	01:11
quesker	gitlab	01:11
	→ nowhereman joined	01:12
	← daito left	01:12
	→ mizu_no_oto joined	01:12
milki	quesker: then you are talking about push requests	01:12
daurnimator	milki: yeah sort of. but I really just want the exact contents of the commits on the new/orphan branch.	01:12
quesker	I said pushes	01:12
	→ xtun joined	01:12
quesker	I guess I meant push requests	01:12
	→ MattMaker joined	01:12
quesker	we just have these offshore guys crapping all over the code tree	01:13
milki	daurnimator: is there a single commit thats conflicting, or all the commits after you've resolved them	01:13
	← mizu_no_oto left	01:13
quesker	I had to disable their access altogether	01:13
daurnimator	quesker: https://about.gitlab.com/2014/11/26/keeping-your-code-protected/ see protected branches	01:14
quesker	thanks	01:14
daurnimator	milki: I'm not sure. I haven't resolved the first conflict yet. (as I don't want to)	01:15
	← mehola left	01:16
milki	daurnimator: well, to solve that conflict, you can add an empty commit to the end of the first import that has an empty tree	01:19
	→ jimi_sanchez joined	01:19
milki	daurnimator: or add that commit between your first import and second import	01:19
	→ garples joined	01:20
daurnimator	milki: sorry, huh?	01:20
milki	daurnimator: pretend as if you deleted everything after your first import	01:20
daurnimator	milki: mind giving me some interactive help for a sec?	01:20
milki	then the second import cant possibly conflict with anything	01:20
	← jimi_ left	01:20
	← jimi_sanchez left	01:20
	→ jimi_sanchez joined	01:20
	jimi_sanchez → jimi_	01:20
milki	daurnimator: nah, its EOD. time to go home	01:20
daurnimator	:(	01:21
	← ncthom91 left	01:21
milki	its dark, scary, and raining outside	01:21
daurnimator	milki: I do actually want to do a merge here. just not within a file	01:21
	i.e. if a file has a merge conflict; I want it to be taken from branch2.	01:22
milki	then you need to solve the merge conflicts	01:22
daurnimator	yeah I'm trying now.... its in many commits	01:22
	is there a way to automate it?	01:23
	for each file with a merge conflict I'm just doing 'git checkout originalcommitbeingrebased -- $file'	01:23
milki	thats what the merge strategy is supposed to do	01:24
	→ hackel joined	01:24
daurnimator	milki: right. that's 'recursive theirs'?	01:24
milki	uh.. i forget which one is which	01:25
daurnimator	==> however I can't do that, as that tries to get the parent of my root commit. and fails (that was my error above)	01:25
	→ forbidden404 joined	01:25
milki	daurnimator: manually rebase 1 commit, then the rest	01:25
	← pgimeno left	01:26
	← tieTYT left	01:27
	→ Sleepy63 joined	01:28
	← gopar left	01:31
	→ AaronMT joined	01:31
	← nettoweb left	01:32
	→ nettoweb joined	01:33
daurnimator	milki: :( still tries to get the parent of the root commit	01:34
	← _cyril_ left	01:38
	→ ogelami joined	01:40
	→ _cyril_ joined	01:40
	→ samw joined	01:41
	→ daivyk joined	01:41
	← jonno11 left	01:41
	→ johnnyfive joined	01:41
	→ dorkmafia joined	01:42
	← frem left	01:42
	→ jonno11 joined	01:42
dorkmafia	how do I get git to pull remote tags automatically from a fork	01:42
	I'd like: git pull upstream master to update the tags	01:43
	is that possible?	01:43
	← nnyk left	01:44
	← ogelami left	01:45
	← samw left	01:46
	→ daito joined	01:48
	← dreiss left	01:48
	← tvw left	01:49
	← m0viefreak left	01:50
	→ harish_ joined	01:50
	← MrWoohoo2 left	01:50
	← MrWoohoo left	01:50
	← Goobbue left	01:51
	← SimonNa left	01:51
	← LaptopBrain left	01:52
	← neanderslob left	01:53
	→ abacuspowers joined	01:54
	→ MarkyC joined	01:55
	→ DavidDudson joined	01:57
	→ machbio joined	01:59
	← _cyril_ left	01:59
	→ devoldmx joined	01:59
	← abacuspowers left	01:59
	← MarkyC left	01:59
	→ noark9 joined	02:01
	→ rorro joined	02:02
	← mwhooker left	02:02
	← HelloAtMega left	02:03
	← beastd left	02:03
	← devoldmx left	02:03
	← cdg left	02:04
	← Chill_Surf left	02:04
	→ puff`` joined	02:05
	← phrozensilver left	02:05
	→ axisys joined	02:06
	← axisys left	02:06
	→ axisys joined	02:07
	← harish_ left	02:07
puff``	I want to send somebody a snapshot of the code I'm working on, without sending them the git repo. AFAIK I can just clone (or for that matter, "cp -a") my working directory, "rm -rf workingdir/.git" and send them that. Any reason not to, or is there a more "proper" way to do it?	02:07
	← diegoviola left	02:07
	puff`` → puff	02:07
	→ harish_ joined	02:08
	→ diegoviola joined	02:09
	← jonno11 left	02:09
	→ CKyle joined	02:10
	← lykinsbd_ left	02:11
	← puff left	02:13
	→ puff joined	02:13
	← harish_ left	02:13
	→ mokbu joined	02:13
	→ tieTYT joined	02:14
puff	I want to send somebody a snapshot of the code I'm working on, without sending them the git repo. AFAIK I can just clone (or for that matter, "cp -a") my working directory, "rm -rf workingdir/.git" and send them that. Any reason not to, or is there a more "proper" way to do it?	02:15
	← hyperair left	02:17
	→ nuck joined	02:17
	→ ncthom91 joined	02:18
	→ harish joined	02:18
	nuck → Guest65039	02:18
	→ govg joined	02:19
daurnimator	puff: see 'git archive'	02:20
	→ impliednude joined	02:20
impliednude	I setup a github account, transferred from another host to github and it did the intial transfer np. However, git is only updating locally and not to github at all. How can I correct this issue or provide you guys with more information to assist me?	02:21
	← ash_workz left	02:22
	← Guest65039 left	02:22
	→ Guest65039 joined	02:22
daurnimator	impliednude: git remote -v	02:22
	Guest65039 → nuck	02:22
daurnimator	impliednude: you'll need to use 'git remote set-url' to change your upstream	02:22
	← durham left	02:22
	→ ac3takwas joined	02:23
	← gfixler left	02:23
	← mellernoia left	02:23
	→ mablae_ joined	02:23
impliednude	says origin [email@hidden.address] (push) and (fetch)	02:23
daurnimator	impliednude: is that what you want?	02:24
impliednude	yes. I checked github and it shows no updates at all	02:24
	→ tyll joined	02:24
daurnimator	have you, uh, 'git push'd?	02:24
	← ac3takwas left	02:24
	→ funfunctor joined	02:25
impliednude	yes	02:25
	→ acetakwas joined	02:26
	← govg left	02:26
	← mablae left	02:27
	← CKyle left	02:28
impliednude	says You are not currently on a branch. To push the history leading to the current (detached HEAD) state now, use	02:28
daurnimator	git checkout master && git pull	02:29
	→ [Brain] joined	02:29
	→ Vampire0_ joined	02:30
impliednude	will that cause me any issues on my existing work done locally?	02:30
	→ abacuspowers joined	02:30
daurnimator	you can 'git stash' to make sure you don't loose any local work	02:31
impliednude	then what do I do after git stash to retrieve and send to remote?	02:31
daurnimator	git stash && git checkout master && git pull && git stash pop	02:31
	→ [0xBEAKER] joined	02:32
impliednude	and that shouldn't cause me any local issues?	02:32
daurnimator	it means if there are local issues we can get back :)	02:32
	→ The_Phoenix joined	02:34
	→ dsdeiz_ joined	02:36
	→ pks joined	02:37
	← dsdeiz left	02:37
	← harish left	02:38
	← bronson left	02:39
	→ igli joined	02:39
	← nvahalik left	02:39
igli	how do i move a tag, eg 0.14 to upstream-0.14 ?	02:39
	hmm: how do i get the commit id and date for an existing tag?	02:41
	← tieTYT left	02:43
	→ LaptopBrain joined	02:44
	→ mmlb joined	02:44
igli	ah: git describe --long 0.14	02:44
	← puff left	02:45
	← daivyk left	02:45
	→ otter768 joined	02:45
	← mDuff left	02:47
	← xtun left	02:47
	← ncthom91 left	02:48
	← fuchsi left	02:49
	← yqt left	02:50
	← [Brain] left	02:51
	← nettoweb left	02:51
	→ Goplat joined	02:51
	→ Hink joined	02:52
impliednude	git checkout master throws the following error	02:52
	error: pathspec 'master' did not match any file(s) known to git.	02:52
	← ncd\|leeN left	02:53
	← blackwind_123 left	02:53
igli	git branch -vv -a	02:53
	→ harish joined	02:54
impliednude	* (no branch, rebasing development) 9337f96 Local changes	02:54
	development c96e84d Local changes	02:54
	production 1594306 #fixed template	02:54
	remotes/origin/development c96e84d Local changes	02:54
	remotes/origin/production 1594306 #fixed template	02:54
	sorry. meant to pastebin it	02:55
	← funfunctor left	02:55
igli	so there's no 'master' branch to checkout	02:55
impliednude	http://pastebin.com/8J9vMBz8	02:55
	→ _cyril_ joined	02:55
impliednude	was going by daurnimator's fix	02:56
	→ MarkyC joined	02:56
impliednude	git stash && git checkout master && git pull && git stash pop	02:56
	→ radsy joined	02:56
impliednude	I am trying to send to remote my changes. the repository was already uploaded	02:56
	→ nettoweb joined	02:57
daurnimator	impliednude: swap 'master' fpr	02:57
	impliednude: swap 'master' for 'production'	02:57
impliednude	okay ^_^. thanks	02:57
	← harish left	02:57
	→ ixjlyons joined	02:58
	→ lykinsbd joined	02:58
impliednude	http://pastebin.com/6GavR9Jv	02:58
	Eugene pokes bremner with a stick	02:59
bremner	ow. wat!?!!?!!	02:59
	← MarkyC left	03:00
	← _cyril_ left	03:00
	← alanwill left	03:01
	→ blackwind_123 joined	03:01
igli	hey bremner :) ltns	03:01
daurnimator	whats the refspec for the first commit?	03:02
igli	ok, so how do i get the committer date for a tag? is it the same as the date on the commit it tags?	03:02
impliednude	daurnimator> please forgive me. huh?	03:02
	I am TOTAL noob with git	03:02
bremner	igli: try "git cat-file -p tag"	03:03
	there's probably a nicer way.	03:03
	← The_Phoenix left	03:04
igli	ah lovely. time_t	03:04
	thanks bremner	03:04
	hmm timestamp + tz. works for committer date	03:05
impliednude	and oh fuck	03:05
	← lykinsbd left	03:05
impliednude	local has been screwed up ENTIRELY. I tried to do git stash pop	03:05
	and it's saying conflicts and went back to massively old	03:06
	at this point what do I do?	03:06
	→ localuser- joined	03:06
impliednude	I did git stash as told /panics	03:06
igli	you can checkout development and stash apply there, if that's where you were	03:07
impliednude	then did git stash pop	03:07
	how do you do that?	03:07
	impliednude panics	03:07
igli	wait for daurnimator to confirm	03:07
	chill out. you haven't lost any commits	03:07
impliednude	I didn't do commit. I had just done git stash as told	03:08
daurnimator	impliednude: git reflog	03:08
	^^ paste output of that	03:08
igli	ok you haven't lost your stash then	03:08
impliednude	git stash && git checkout production && git pull && git stash pop - gave error. so I went to git stash pop to retrieve and it just said conflicts aplenty	03:09
	http://pastebin.com/6iVFY6Pc	03:10
daurnimator	impliednude: git checkout 9337f96 && git stash pop	03:10
	^^ will get you back to your starting position	03:10
impliednude	says needs merge	03:12
	→ Rodya_ joined	03:12
impliednude	what do I do?	03:12
daurnimator	that... doesn't make any sense	03:12
	sigh; can you just paste your whole terminal session so I can see wtf you've done?	03:13
	→ alanwill joined	03:13
impliednude	http://pastebin.com/n0CUQ7w4	03:13
	http://pastebin.com/hiwNTEyp	03:15
	→ Hink_ joined	03:15
impliednude	the second one is the whole screen copy	03:15
Eugene	bremner - nothing, just wanted to see how you responded to sticks	03:18
	← Hink left	03:18
daurnimator	impliednude: oh. I don't think git stash keeps your index.	03:20
impliednude	My boss is so going to kill me >.< I think I shouldn't be fucking with git if I can get out of this alive	03:20
	I have NO idea what that means besides I am guessing I am fucked?	03:20
daurnimator	impliednude: no. you're just in the middle of a rebase right now.	03:21
	impliednude: git rebase --abort	03:21
impliednude	then what do I need to do?	03:21
	← Sasazuka left	03:21
impliednude	okay then I do what?	03:22
daurnimator	infact, this whole time you've been in the middle of a rebase	03:22
	→ kzisme joined	03:22
impliednude	<=- has no idea what a rebase means	03:22
	okay. What do I need to do to get back to where I was towards the top	03:22
	I just want to ensure that my work goes back to being finished. I have a full days worth of work	03:22
daurnimator	impliednude: okay. so you're back on your development branch now?	03:23
	kzisme → kzisme[away]	03:23
impliednude	How do I tell?	03:23
	I just want to get back to my local copy	03:23
	kzisme[away] → kzisme	03:23
daurnimator	git status	03:23
impliednude	On branch development nothing to commit, working directory clean	03:24
daurnimator	okay. now try that 'git stash pop'	03:24
impliednude	TONS of conflicts	03:24
	→ sgambino joined	03:25
daurnimator	impliednude: what were you doing before you started here? looks like you were in the middle of a rebase?	03:25
impliednude	http://pastebin.com/crvqCcfS	03:25
	you see that section where I added all those files via git add	03:26
	← machbio left	03:26
impliednude	I have no idea why it started rebasing or what that even means	03:26
daurnimator	impliednude: someone left it in the middle of a rebase before you got there then; which is bad of them.	03:27
	impliednude: git checkout 9337f96	03:27
	← Dullin left	03:27
	← italoacasas left	03:28
daurnimator	git status	03:28
	and also pastebin 'git stash show -p'	03:28
impliednude	I did git checkout and it says the files I made needed to be merged	03:28
	→ funfunctor joined	03:29
daurnimator	that was before we aborted your rebase.	03:29
	→ Oog joined	03:30
igli	(might be autosetuprebase on a local)	03:30
	→ fuchsi joined	03:30
	← Hink_ left	03:30
impliednude	http://pastebin.com/LCRGfMyy	03:30
	→ xtun joined	03:30
impliednude	and I was editing directly on the server for local	03:31
igli	eh?	03:31
	← mokbu left	03:31
impliednude	The server sits in my house which has a dc3 on it	03:32
igli	always work in your own repo, on your own machine. that's the point of a dvcs. server-side should be bare repo only, as should staging on your side if you're doing complex stuff or working with (many) others	03:33
daurnimator	impliednude: so do you want e.g. the file: app/design/frontend/base/default/template/giftvoucher/product/media.phtml	03:33
impliednude	no others are working on it	03:33
	all of those yes	03:33
igli	then idk how someone else could have left it in the middle of a rebase.	03:34
impliednude	no idea	03:34
	around 4 months ago they had initial devs on it	03:34
	← JanC left	03:35
	← AaronMT left	03:35
impliednude	they had it on some funky server they hosted. they finished the project	03:35
	the repository that is	03:35
igli	"left in the middle of a rebase" implies a local working copy, afaik.	03:35
impliednude	I thank you for the education igli	03:36
	^_^	03:36
	← peoliye_ left	03:36
impliednude	All I know is if I had just left this on local and not tried to do something fancy	03:36
	like send to the remote git repository I wouldn't be in a whole world of shhh	03:37
	hehe	03:37
igli	well i'd sort out the server situation, as it must be bare if people are collaborating via it.	03:37
impliednude	I wont EVER try to send to remote again. At this point Igli, I am just trying to get it back to working	03:38
igli	and never work "directly on the server"	03:38
impliednude	igli. I will do better than that. I just wont use a git remote repository besides for backing up stuff	03:38
igli	yes we all know, you don't need to keep saying you just want it to work. surprise surprise that's pretty common	03:38
daurnimator	impliednude: no. don't do that.	03:38
igli	and we all know you want to keep your files.	03:38
daurnimator	impliednude: get a proper workdlow	03:38
igli	that ^	03:38
	impliednude pulls her hair out	03:38
daurnimator	develop locally; and push only production ready code to production.	03:38
igli	repos/clones are cheap	03:39
daurnimator	never work on the server.	03:39
	→ samw joined	03:39
impliednude	I apologize. I will read a book on this. but I need a fix in the meanwhile	03:39
	→ bronson joined	03:39
daurnimator	impliednude: so do you actually want app/design/frontend/coolbaby/default/template/checkout/onepage/review/1 ?	03:39
impliednude	yes	03:39
	← diegoviola left	03:40
impliednude	I want all of those files back	03:40
	→ rchavik joined	03:40
daurnimator	impliednude: I think your last paste was cut off?	03:40
	→ ogelami joined	03:40
impliednude	okay.	03:40
	→ scarabx joined	03:41
impliednude	http://pastebin.com/LCRGfMyy ln 17-38	03:41
daurnimator	impliednude: but I think you want: 'git checkout --hard 9337f96' then 'git stash pop'. just beware that this is the first command I've told you that can result in losing your work. perhaps backup the whole folder first :)	03:41
impliednude	okay if you read line 17 through 38	03:42
	← Poppa left	03:42
igli	backup++	03:42
impliednude	when I did what you told me it deleted those files on checkout production	03:42
daurnimator	impliednude: lines 17-38 appear to be the changes in your stash. so we can ignore them.	03:42
	← arescorpio left	03:42
impliednude	I need those files back. they are NO longer on the system at all	03:42
	→ diego1 joined	03:42
impliednude	the ones that say deleted by us	03:43
	→ zarubin joined	03:43
	→ CKyle joined	03:43
igli	the objects are still there; just backup the whole directory first.	03:43
impliednude	I thought this was essentially a backup /sighs	03:43
	how do I backup the whole file system?	03:44
	← samw left	03:44
impliednude	erm directory	03:44
igli	tmp copy of the git repo, not backup to regular backup archive.	03:44
	← bronson left	03:44
igli	sigh	03:44
daurnimator	sudo cp -r /var/www/html/magento ~/magneto.backup	03:44
impliednude	and the only reason why I was working on the production is the boss wants to see changes "yesterday"	03:45
igli	stop the meta-chat. there's so much of it.	03:46
	← ogelami left	03:46
impliednude	sorry igli	03:46
igli	k	03:46
	← sparetire_ left	03:47
impliednude	once I do that. What should I do next?	03:48
	← LaptopBrain left	03:48
	← zarubin left	03:48
	← diego1 left	03:49
	→ diego1 joined	03:49
	diego1 → diegoviola	03:49
	→ JanC joined	03:49
	→ ryxai joined	03:50
	← xtun left	03:50
	← waveclaw left	03:50
impliednude	should I do git checkout --hard 9337f96 then git stash pop?	03:51
	→ roygbiv joined	03:51
	← weox left	03:52
	← forbidden404 left	03:53
	← funfunctor left	03:53
	→ ash_workz joined	03:53
daurnimator	yep	03:53
	→ xtun joined	03:54
impliednude	and that will fix everything daurnimator?	03:55
daurnimator	I dunno. you started off in a very weird state	03:55
	← FireArrow133 left	03:56
	→ hyperair joined	03:56
	← nettoweb left	03:56
	→ MarkyC joined	03:57
	→ _cyril_ joined	03:57
	← Oog left	03:57
	→ funfunctor joined	03:57
impliednude	unknown option hard	03:58
	did git checkout --hard 9337f96	03:59
daurnimator	uh, I meant 'git reset --hard'	03:59
	then `git checkout 9337f96`	03:59
	→ devoldmx joined	04:00
impliednude	so git checkout 9337f96 gave it to a much earlier checkout (one I did yesterday)	04:01
	← _cyril_ left	04:01
	← MarkyC left	04:01
impliednude	yay!!! thank you guys!!!	04:02
	I am sorry if I was a total psycho. I know I should learn more. but I am just a developer who generally only uses git to ensure I can recover from screw ups so my knowledge is limited. Thanks again!	04:03
	→ gfixler joined	04:03
	← devoldmx left	04:04
	→ zumba_ad_ joined	04:06
	→ Oog joined	04:07
	→ z8z joined	04:09
	← mezod left	04:10
	← relipse left	04:10
	← garples left	04:12
	→ localuser joined	04:13
igli	!tias impliednude	04:14
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	04:14
igli	impliednude: once you have this work saved, do that ^^	04:14
	i highly recommend at the server-side.	04:15
	i highly recommend gitolite* at the server-side.	04:15
	→ DWestCoast joined	04:16
	← zacg left	04:17
	← localuser- left	04:17
	→ joki joined	04:18
	→ jteneyck joined	04:19
	← jteneyck left	04:19
	→ jteneyck joined	04:19
	→ waveclaw joined	04:19
	→ boombatower joined	04:19
	→ elisa87 joined	04:21
	← faux___ left	04:21
	← waveclaw left	04:24
elisa87	so I get this error http://pastebin.com/iLr7UWTK file is too large I deleted the file but still it insists that file is too large even though it does not exits. What is the solution?	04:24
	← funfunctor left	04:25
	→ MrWoohoo joined	04:25
	→ MrWoohoo2 joined	04:25
igli	looks like it's still in the commit or history	04:26
	→ waveclaw joined	04:26
elisa87	igli: how to remove it	04:26
	→ mehola joined	04:27
igli	is that on push?	04:28
	git status # how many commits ahead are you?	04:28
	i'd check the history to see where you added it	04:29
	i use gitview, but that's not always built	04:29
elisa87	igli: we are ahead by 4 commits	04:29
igli	so review the commits, however you usually do that, and see where the file gets added	04:30
	i'm sure there's a command like git-blame or sth, but idk exact form	04:30
	if the file is added on its own, in one commit, you can easily remove it	04:31
	→ peoliye joined	04:31
	→ funfunctor joined	04:31
	← DavidDudson left	04:32
	→ momo_codez joined	04:32
igli	[close editor] git stash. git rebase -i origin/master # if you're on master branch	04:32
	← mmlb left	04:32
igli	then you can delete the commit from the list	04:32
elisa87	igli yes we are on push momo_codez is my teammate and is going to provide you further details	04:34
igli	elisa87: i'm not an expert so wait for someone more knowledgeable to confirm things as well.	04:34
elisa87	igli: what ? we have a git-blame command?	04:34
igli	man git-blame	04:34
gitinfo	the git-blame manpage is available at http://jk.gs/git-blame.html	04:34
	→ diogenese joined	04:34
	→ ncthom91 joined	04:34
igli	elisa87: how do you normally review history?	04:34
	← diogenese left	04:35
	← rchavik left	04:35
momo_codez	ig	04:35
igli	git log # doesn't show the added files etc, unless i'm missing the options as per-usual	04:35
elisa87	I want to run this but I am not sure if this is correct can someone confirm that please git rebase -i origin/master momo_codez	04:35
	← aidalgol left	04:36
igli	you can always do it in a temp branch	04:36
elisa87	thanks igli git rebase worked	04:36
igli	yay :)	04:36
	← zumba_ad_ left	04:36
	→ rchavik joined	04:36
	→ zumba_ad_ joined	04:36
	← xtun left	04:37
	→ kaiza joined	04:37
igli	if you did: git stash # then: git stash pop # will restore any changes	04:37
	← CKyle left	04:37
igli	hmm might have to recommend: git stash -k # based on earlier	04:37
	→ irqq joined	04:37
daurnimator	-u is also good :)	04:38
	← DolpheenDream left	04:38
igli	ah nice	04:39
	← funfunctor left	04:39
igli	wouldn't checkout/rebase leave those alone?	04:40
momo_codez	igli: Hi, I am team mate trying to troubleshoot this error	04:41
	Looks like the file was added in a previous commit	04:41
igli	momo_codez: ok; daurnimator is more expert than I	04:41
momo_codez	After that we deleted it locally	04:41
	ok	04:41
igli	was anything else in that commit besides the new file?	04:41
momo_codez	daurnimator:	04:41
	← Rodya_ left	04:41
	→ bronson joined	04:41
momo_codez	yes	04:41
	there were other things	04:41
	which aren't deleted	04:42
	→ Rodya_ joined	04:42
	← DWestCoast left	04:42
momo_codez	what I guess I can do alternatively is delete the .git	04:42
igli	ok, i'm out then.	04:42
momo_codez	create a new repo on github	04:42
	and re add	04:42
	→ xtun joined	04:42
	← bronson left	04:42
momo_codez	daurnimator:	04:43
gfixler	what's the issue momo_codez?	04:43
	→ bronson joined	04:43
momo_codez	ok I'll retell	04:43
	remote: error: File workloads/tpc/hive-tpcds-tpch-workload.tar is 211.78 MB; this exceeds GitHub's file size limit of 100.00 MB	04:43
	This is the error	04:43
	But the file doesn't exist	04:43
gfixler	ah, okay	04:43
	so it's in an old commit?	04:44
momo_codez	I tried git rm on the file	04:44
daurnimator	momo_codez: 'git log -p' which commit did it arrive in?	04:44
momo_codez	yes most likely	04:44
	→ skorgon joined	04:44
	← skorgon left	04:44
	→ skorgon joined	04:44
	← bronson left	04:44
gfixler	momo_codez: is this a new repo you're trying to upload, or just some commits you're trying to push?	04:44
	→ Motoko joined	04:44
	← ncthom91 left	04:45
momo_codez	gfixler: old repo,commits I am trying to push	04:45
	→ bronson joined	04:45
igli	commit adding the file has other changes (not sure if edits or new files only)	04:45
	← otter768 left	04:46
momo_codez	so I did the log -p with grep on the file	04:46
	git log -p \| grep hive-tpcds-tpch-workload.tar	04:46
	diff --git a/workloads/tpc/hive-tpcds-tpch-workload.tar b/workloads/tpc/hive-tpcds-tpch-workload.tar	04:46
	Binary files a/workloads/tpc/hive-tpcds-tpch-workload.tar and /dev/null differ	04:46
	diff --git a/workloads/tpc/hive-tpcds-tpch-workload.tar b/workloads/tpc/hive-tpcds-tpch-workload.tar	04:46
	Binary files /dev/null and b/workloads/tpc/hive-tpcds-tpch-workload.tar differ	04:46
	← bronson left	04:46
	← roygbiv left	04:46
igli	ah log -p # nice	04:47
daurnimator	momo_codez: so you found the commit? :) is there anything else in that commit besides that change?	04:47
gfixler	momo_codez: you can just do an interactive rebase on the commit where it was added and remove it	04:47
momo_codez	This is the o/p I obtained. apologies for the verbose o/p	04:47
	http://pastebin.com/3Gh5gtXh - here's the summary	04:47
	→ bronson joined	04:47
	← toothrot left	04:47
momo_codez	No I don't believe I found the commit	04:47
daurnimator	momo_codez: I don't want the grep; I want the commit hashes those changes belong to.	04:47
momo_codez	I see, I will do that in a sec	04:48
ash_workz	is the general process (1) pull from a --bare repo (2) do stuff locally (3) push upto repo (4) pull/push from repo to testing?	04:48
	← bronson left	04:48
	← Oog left	04:49
	→ funfunctor joined	04:49
	→ bronson joined	04:49
	→ lubarch joined	04:49
	← lubarch left	04:49
	→ lubarch joined	04:49
momo_codez	daurnimator:	04:50
	I did, it what did you want to take a look at	04:50
daurnimator	momo_codez: this should work for you: git filter-branch --tree-filter 'rm -f workloads/tpc/hive-tpcds-tpch-workload.tar' HEAD	04:50
momo_codez	diff --git a/workloads/tpc/hive-tpcds-tpch-workload.tar b/workloads/tpc/hive-tpcds-tpch-workload.tar	04:50
	deleted file mode 100755	04:50
	index 7ff1fef..0000000	04:50
	ok will give it a shot daurnimator	04:50
	← bronson left	04:50
ash_workz	I mean, that seems to be the kind of case with https://git-scm.com/book/en/v2/book/05-distributed-git/images/managed-team-3.png	04:51
	cept (4) which is really what I'm getting at	04:51
	→ bronson joined	04:51
	→ garples joined	04:51
igli	eh? those look like branches	04:52
	→ jacksparrow007 joined	04:52
ash_workz	igli: you're right, that's not the right picture actually	04:52
momo_codez	ok, it did a bunch of rewrites	04:52
	12 of them	04:52
	← bronson left	04:53
momo_codez	I am going to see if it works now	04:53
	→ rubyonrailed joined	04:53
igli	it's up to you whether you use another testing repo; more likely deploy to a temp checkout and run tests. main thing is to tag, afaict.	04:53
	→ bronson joined	04:53
igli	pre-commit hooks at workstation to run tests, and post-commit at server to deploy/test, or simply push to test server	04:54
	!deployment iirc	04:54
gitinfo	[!deploy] 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	04:54
	← bronson left	04:55
	← chucky_z left	04:55
ash_workz	igli: but how is that typically done? ssh to the server; cd to the working dir and do git pull ?	04:55
	→ bronson joined	04:56
	← funfunctor left	04:56
	← sgambino left	04:57
igli	what precisely?	04:57
	← bronson left	04:57
	← rorro left	04:57
	→ MarkyC joined	04:57
igli	deployment as above for simple stuff. remember the server repo MUST be bare	04:57
	→ _cyril_ joined	04:57
igli	consider a bare repo at your end, for staging.	04:58
momo_codez	Thanks folks it worked beautifully :)	04:58
	→ bronson joined	04:58
ash_workz	igli: yeah, but a bare repo is not used for a live, or server testing site	04:58
momo_codez	daurnimator: igli: special thanks to you guys	04:58
igli	momo_codez: yw	04:58
	ash_workz: it's the core hub. if you don't have it bare, YDIW	04:58
	← Wetmelon left	04:59
ash_workz	igli: not what I meant	04:59
igli	i recommend gitolite on the server-side.	04:59
	shrug	04:59
	please stop pinging me.	04:59
ash_workz	sorry	04:59
	← bronson left	04:59
	← ahr3n left	04:59
igli	ok	04:59
	← jteneyck left	04:59
	→ bronson joined	05:00
ash_workz	atm; we don't have a deployment tool; I intend to get one up and running soon; but there are some other matters that require critical attention	05:00
	← axisys left	05:01
	← bronson left	05:01
ash_workz	so what I'd like to know is in lieu of that; what is the best way to deploy code? this doesn't need to be automated upon pushing; the fact that it's not will probably be ideal in some circumstances (atm) to give someone else the chance to fetch and review the code before merging	05:02
	← MarkyC left	05:02
	→ bronson joined	05:02
daurnimator	ash_workz: it very much depends what a deploy is for you	05:02
igli	there is no one method. it depends on what exactly the setup is.	05:02
	← _cyril_ left	05:02
	← momo_codez left	05:02
daurnimator	for a subset of setups, you can use git end to end	05:02
ash_workz	hmmm I see	05:03
daurnimator	though that is rare outside certain web development styles	05:03
ash_workz	daurnimator: the process here needs to be updated	05:03
	amongst other things	05:03
	← bronson left	05:03
igli	i'd just push to your bare repo, and let QA pull from it at their leisure.	05:03
	→ CheckDavid joined	05:03
	← presto left	05:04
daurnimator	ash_workz: there are two main styles: devs commit to master, and branch-style	05:04
	→ bronson joined	05:04
ash_workz	is there a git command that will show all the local repos on the machine? something that would give you results similar to `find . -type d -name .git` (or is _that_ the best way)	05:04
igli	lul	05:05
daurnimator	I prefer the former; but it doesn't work with large teams in the one repository. IMO you shouldn't have a large team in the first place; and should rather split up your project if it grows past ~4 devs	05:05
kadoban	ash_workz: There's no global registry or anything, git can't do that.	05:05
	igli wants a git command to write his code for him. is that there yet? ;)	05:05
kzisme	Anyone had tips or willing to share their .bashrc for OSX? Looking to improve mine	05:05
	← bronson left	05:05
	← peoliye left	05:05
	← tpollard left	05:06
daurnimator	kzisme: what do you want?? I just type out all my git commands	05:06
ash_workz	ot?	05:06
	oh	05:06
	nvm	05:06
kzisme	Better colors on ls, git stuff included, and a better non standard PS1	05:06
	More or less	05:06
	daurnimator:	05:06
	→ bronson joined	05:06
daurnimator	oh; I guess I have a PS1	05:06
	I made my own though	05:07
igli	there's this (not used it, but colleague does): https://github.com/arialdomartini/oh-my-git	05:07
kzisme	What is yours like	05:07
daurnimator	kzisme: https://gist.github.com/daurnimator/4484437	05:07
	← bronson left	05:07
kzisme	Looks good igli - but I dislike that status bar style	05:08
	→ bronson joined	05:08
igli	there's some sh aliases for git here: https://forums.gentoo.org/viewtopic-p-7587838.html#7587838	05:08
	shrug	05:09
	→ localuser- joined	05:09
	← _Vi left	05:09
	→ israelzuniga joined	05:09
	← bronson left	05:10
	→ bronson joined	05:10
	← bronson left	05:12
	← jacksparrow007 left	05:12
	→ bronson joined	05:13
	← localuser left	05:13
	← bronson left	05:14
	→ sfz- joined	05:14
	→ diogenese joined	05:14
	← hackel left	05:15
	← nikio_ left	05:15
	→ ig0r__ joined	05:15
	← lubarch left	05:15
	→ nikio_ joined	05:15
	→ joufflu joined	05:16
	← Gamecubic left	05:16
	← zumba_ad_ left	05:19
	← ig0r_ left	05:19
	→ psk17_ joined	05:19
	→ localuser joined	05:19
	→ zumba_ad_ joined	05:20
	→ ayaz joined	05:20
	← ig0r__ left	05:21
	← nilg left	05:22
	→ _Vi joined	05:22
	→ gopar joined	05:23
	← joufflu left	05:23
	← localuser- left	05:23
	← irqq left	05:27
	← dsdeiz_ left	05:28
	← nydel07 left	05:31
	← xtun left	05:35
	← acetakwas left	05:35
	→ Manikandan joined	05:36
	← zumba_ad_ left	05:38
	→ nydel07 joined	05:38
	← hahuang61 left	05:39
	→ dreiss joined	05:40
	→ DavidDudson joined	05:40
	→ roentgen joined	05:41
	← fuchsi left	05:41
	→ ogelami joined	05:42
	→ zarubin joined	05:43
	← DavidDudson left	05:44
	→ DavidDudson joined	05:45
	← Thor_ left	05:45
	← ogelami left	05:46
	← zarubin left	05:48
	← benzrf left	05:49
	← radsy left	05:52
	← diogenese left	05:56
	← [0xBEAKER] left	05:56
	← Rodya_ left	05:57
	← DavidDudson left	05:57
	→ jteneyck joined	05:57
	← jteneyck left	05:57
	→ jteneyck joined	05:57
	→ MarkyC joined	05:58
	→ diogenese joined	05:58
	← terminal_echo left	05:58
	→ DavidDudson joined	05:59
	→ _cyril_ joined	05:59
	→ thiago joined	06:00
	→ devoldmx joined	06:00
	← z8z left	06:02
	← MarkyC left	06:02
	→ nnyk joined	06:03
	← abacuspowers left	06:04
	← _cyril_ left	06:04
	← devoldmx left	06:05
	← happy-dude left	06:05
	→ nidr0x joined	06:07
	← nidr0x left	06:08
	→ nidr0x joined	06:08
	← nnyk left	06:09
	→ smithbone_ joined	06:10
	← sdothum left	06:10
	→ dsdeiz joined	06:10
	→ tieTYT joined	06:11
	→ xtun joined	06:12
	→ hmmwhatsthisdo joined	06:12
	→ rscata joined	06:13
hmmwhatsthisdo	Suppose I commited a change to my local master, but realized I done goofed and want to make that commit cease to exist. I haven't pushed to any remotes yet. What do I do?	06:13
	← nowhereman left	06:14
	→ nowhereman joined	06:14
	→ bronson joined	06:14
kadoban	hmmwhatsthisdo: https://sethrobertson.github.io/GitFixUm/fixup.html#remove_last should be what you want, one of those. Read carefully.	06:16
	→ MechtiIde joined	06:18
	← bronson left	06:20
	→ Kicer86 joined	06:21
	→ RTG` joined	06:21
	← boombatower left	06:21
	← tieTYT left	06:26
	← CheckDavid left	06:27
	→ pizzaops joined	06:27
	→ spr0tsuki joined	06:27
	→ yena joined	06:28
	→ lolmaus joined	06:34
	→ PCatinean joined	06:35
	→ CheckDavid joined	06:35
	← rubyonrailed left	06:35
	← ixjlyons left	06:36
	→ jceb joined	06:36
	→ ThomasLocke joined	06:37
	← skorgon left	06:37
	← lindenle left	06:38
	→ survi joined	06:40
	→ harish joined	06:42
	→ ogelami joined	06:43
	→ zarubin joined	06:43
	→ qwerty_ joined	06:44
qwerty_	Hello, I executed "git fetch; git checkout branchname" and files didn't change. How can I download files from another branch?	06:45
	← diogenese left	06:45
	← jceb left	06:46
	→ otter768 joined	06:47
	← ogelami left	06:47
	← zarubin left	06:48
	→ diogenese joined	06:49
	→ jceb joined	06:50
	← mehola left	06:50
	→ devoldmx joined	06:50
kadoban	qwerty_: git will make a lot more sense if you learn from the beginning. !book	06:50
gitinfo	qwerty_: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	06:50
	← gopar left	06:51
	← otter768 left	06:52
	← survi left	06:55
	→ User458764 joined	06:57
	→ survi joined	06:57
	← MechtiIde left	06:58
	→ Mixologic joined	06:59
	← qwerty_ left	07:00
	→ _cyril_ joined	07:00
	→ jetpackjoe joined	07:00
	→ lubarch joined	07:01
	← lubarch left	07:01
	→ lubarch joined	07:01
	→ peoliye joined	07:01
	← _cyril_ left	07:05
	→ the_rabbit joined	07:05
	← garples left	07:05
	← dreiss left	07:05
	→ ogelami joined	07:08
	→ lindenle joined	07:08
	← CheckDavid left	07:09
	→ dreiss joined	07:09
	→ KeelOfSteel joined	07:10
	← rchavik left	07:11
	→ sokolowitz joined	07:11
	→ freimatz joined	07:12
	← lindenle left	07:13
	→ jacksparrow007 joined	07:13
	← akkad left	07:14
	← survi left	07:15
	→ survi joined	07:15
	→ samw joined	07:16
	→ roelmonnens joined	07:16
	→ rchavik joined	07:16
	← jagob left	07:16
	← rchavik left	07:18
	← jacksparrow007 left	07:18
	→ Yeomra joined	07:19
	← dopesong left	07:20
	→ akkad joined	07:20
	← samw left	07:21
	→ localuser- joined	07:22
	→ acolson joined	07:23
	→ troulouliou_div2 joined	07:24
	← localuser left	07:27
	→ rorro joined	07:28
	→ anth0ny_ joined	07:29
	→ MeltedLux joined	07:30
	→ ig0r_ joined	07:32
	← hexagoxel left	07:32
	← User458764 left	07:35
	← DavidDudson left	07:36
	→ iLembus joined	07:38
	→ jay-m joined	07:38
	← diogenese left	07:40
	→ hexagoxel joined	07:40
	→ garples joined	07:41
	← cebor left	07:41
	→ DavidDudson joined	07:42
	→ cebor joined	07:42
	→ mkoskar joined	07:42
	← jetpackjoe left	07:43
	→ zarubin joined	07:43
	← ogelami left	07:43
	← Motoko left	07:44
	← blackwind_123 left	07:45
	→ mirton joined	07:45
	→ blackwind_123 joined	07:47
	← lubarch left	07:47
	← jteneyck left	07:47
	→ CausaMortis joined	07:47
	← DavidDudson left	07:48
	← zarubin left	07:48
	→ petaflot_ joined	07:48
	→ Lor_ joined	07:49
	→ eijk_ joined	07:49
	← mirton left	07:49
	→ AmayA-_ joined	07:49
	→ tvw joined	07:50
	→ mehola joined	07:52
	← petaflot left	07:52
	→ lubarch joined	07:52
	← lubarch left	07:52
	→ lubarch joined	07:52
	→ diogenese joined	07:52
	← AmayA-_ left	07:53
	→ DavidDudson joined	07:53
	→ Sceorem joined	07:54
	→ pantsman- joined	07:55
	← devoldmx left	07:56
	← mehola left	07:57
	← rorro left	07:57
	→ geomyidae joined	07:57
	← Goplat left	07:57
	← bb010g left	07:58
	← DavidDudson left	07:58
	← harish left	07:59
	→ ogelami joined	08:00
	→ abacuspowers joined	08:01
	→ _cyril_ joined	08:01
	→ gingitsune joined	08:02
	→ InfoTest joined	08:02
gingitsune	Does a remote repo need to be in name.git in order to push a new branch to it	08:02
	← ogelami left	08:02
	→ TomyWork joined	08:02
	← tfry left	08:03
gingitsune	http://hastebin.com/xatiziyuni.vbs	08:03
grawity	technically no	08:04
	it just needs to be a "bare" repo in order to push to its current branch	08:04
	and bare repos are usually named *.git	08:04
	when pushing a new branch it doesn't matter – like the error message says, you're hitting a protocol error there	08:05
	actually, maybe you're trying to push to a shallow repo? older versions do not allow that	08:05
	→ rorro joined	08:05
	← _cyril_ left	08:06
	← abacuspowers left	08:06
	Lor_ → Lor_hug	08:06
	← garples left	08:08
	→ devoldmx joined	08:09
	→ nnyk joined	08:09
	← ig0r_ left	08:11
	→ elsevero joined	08:12
	→ mwhooker joined	08:13
	→ Silox\| joined	08:13
	→ wxg joined	08:13
	→ adac joined	08:15
	→ garples joined	08:16
	← troulouliou_div2 left	08:18
	← devoldmx left	08:18
	→ ig0r_ joined	08:19
	← jimi_ left	08:19
	← fscala left	08:19
	→ dopesong joined	08:20
	→ fscala joined	08:20
	→ bonswouar joined	08:21
	← lolmaus left	08:25
	← kadoban left	08:26
	→ zeroed joined	08:26
	→ roxlu joined	08:27
	← thiago left	08:27
	← diogenese left	08:29
	→ BSaboia joined	08:29
	← dreiss left	08:32
	← waveclaw left	08:33
	→ josuebrunel joined	08:35
	← jceb left	08:35
	→ dreiss joined	08:36
	→ koltroll joined	08:37
	← JohnMaximilian_ left	08:38
	→ dvaske joined	08:38
	← elsevero left	08:39
	→ SimonNa joined	08:39
	← lubarch left	08:40
	→ lubarch joined	08:43
	← hmmwhatsthisdo left	08:43
	→ zarubin joined	08:43
	→ bronson joined	08:44
	← jay-m left	08:44
	→ jay-m joined	08:44
	← lubarch left	08:45
	→ lubarch joined	08:47
	→ lolmaus joined	08:48
	→ otter768 joined	08:48
	→ kurkale6ka joined	08:48
	← zarubin left	08:48
talin	hello. is there a way to see when a branch was made or what point it was branched from? i merged master into my branch and it fixed an issue, so i'm trying to figure out what commit fixed it	08:49
	← nnyk left	08:49
	→ eijk joined	08:51
	← eijk_ left	08:52
	← otter768 left	08:53
	← xtun left	08:53
	← ig0r_ left	08:53
	← dreiss left	08:55
	→ xtun joined	08:55
	→ devoldmx joined	08:55
	→ denirachmadi joined	08:56
	← oojacoboo left	08:56
	→ diogenese joined	08:56
	→ DavidDudson joined	08:57
	→ reim joined	08:58
	← lubarch left	08:58
	→ dvaske_ joined	08:59
	→ encod3 joined	08:59
	→ funfunctor joined	08:59
grawity	1) no; 2) sorta (using git merge-base --fork-point); 3) try using `git bisect` for that	09:00
	→ sazed joined	09:00
	← devoldmx left	09:00
	← dvaske left	09:01
	→ spykins joined	09:01
	← iLembus left	09:01
	→ elsevero joined	09:02
	→ _cyril_ joined	09:02
	→ abacuspowers joined	09:02
	← reim left	09:02
spykins	Hello everyone, does anyone have any idea how i can switch user account on git? i get The requested URL returned error: 403 when i try to push github	09:03
	← localuser- left	09:03
	→ aidalgol joined	09:03
	→ lubarch joined	09:03
	← rorro left	09:03
	← DavidDudson left	09:06
	← lubarch left	09:06
	← _cyril_ left	09:07
	← abacuspowers left	09:07
	→ lubarch joined	09:08
	→ DavidDudson joined	09:09
	→ harish joined	09:10
	← bronson left	09:10
	← diogenese left	09:11
	← mwhooker left	09:13
	→ reim joined	09:13
	→ User458764 joined	09:13
	→ jacksparrow007 joined	09:14
	← afuentes left	09:15
	← lubarch left	09:15
	→ irqq joined	09:17
	← DavidDudson left	09:17
	← israelzuniga left	09:18
	← dorkmafia left	09:19
	→ liamonade joined	09:19
	← jacksparrow007 left	09:19
	→ ig0r_ joined	09:19
	→ marcogmonteiro joined	09:19
	→ fuchsi joined	09:20
	← lolmaus left	09:20
	→ afuentes joined	09:21
	← elsevero left	09:22
	→ DavidDudson joined	09:22
	→ elsevero joined	09:22
	→ sigma__ joined	09:23
	→ rchavik joined	09:23
	← InfoTest left	09:23
	sigma__ → Guest73013	09:23
CustosLimen	hi	09:24
	so I want to clone guile's git repo - and make some changes - but still be able to fetch changes made by guile	09:24
	→ blr_ joined	09:24
CustosLimen	not sure how to do this	09:24
	and I want to clone it into gitlab.com	09:24
	is it: git clone --mirror http://git.savannah.gnu.org/cgit/guile.git mirror-guile.git	09:25
	then ( cd mirror-guile.git && git push --mirror [email@hidden.address] )	09:25
	but then I have mirror - but now I still need to set remote or something to fetch remote changes	09:25
	→ leeN joined	09:25
	← scarabx left	09:26
Seveas	if you want to make changes, you don't want a mirror or bare clone, just a normal one.	09:27
	← DavidDudson left	09:27
	→ Asenar joined	09:31
	→ DavidDudson joined	09:31
CustosLimen	Seveas, ok - but thing is - first i want to kinda get http://git.savannah.gnu.org/cgit/guile.git on gitlab so company team can edit it	09:32
	and then I want to get updates to gitlab copy from http://git.savannah.gnu.org/cgit/guile.git	09:32
moritz_s	CustosLimen: no need for --mirror there, just add the upstream guile repo as remote	09:33
Seveas	CustosLimen: so you've done that now :) Now create a normal clone of your gitlab'ed repo and add the savannah one as remote. Then you can just fetch, merge, rebase and push between them	09:33
	your mirror-guile.git can be deleted	09:33
CustosLimen	Seveas, ok	09:34
	← niax left	09:34
	→ clmsy joined	09:34
	→ Hounddog joined	09:35
	← DavidDudson left	09:35
	→ doener joined	09:35
CustosLimen	so I do 'git remote add upstream http://git.savannah.gnu.org/cgit/guile.git mirror-guile.git'	09:35
	→ niax joined	09:35
	→ DavidDudson joined	09:35
	→ Zariel joined	09:35
	← Zariel left	09:35
CustosLimen	and then git pull --all upstream	09:36
	→ Zariel joined	09:36
	← DavidDudson left	09:37
Seveas	no	09:38
	→ diogenese joined	09:38
	← diogenese left	09:38
Seveas	git clone [email@hidden.address]	09:38
	cd guile	09:38
	git remote add upstream http://git.savannah.gnu.org/cgit/guile.git	09:38
	git fetch	09:38
	git fetch upstream	09:38
	Lor_hug → Lor_	09:39
	← funfunctor left	09:39
	→ n00bdev joined	09:40
_rgn	Seveas: https://github.com/seveas/git-spindle/issues/96 how do I test this, I installed git-spindle with pip	09:40
	→ Alienpruts joined	09:41
	← ryxai left	09:41
	→ diogenese joined	09:42
CustosLimen	ok thanks Seveas	09:42
gingitsune	grawity: Indeed it was a shallow repo, thanks	09:42
	← alanwill left	09:43
	→ zarubin joined	09:43
	→ rchavik_ joined	09:44
	← rchavik_ left	09:44
	→ zotherstupidguy joined	09:45
Seveas	_rgn: pip install https://seveas.net/git-spindle-3.1.tar.gz	09:45
	← Zariel left	09:45
	← survi left	09:46
	← geomyidae left	09:46
CustosLimen	Seveas, so after git fetch upstream how do I get changes from upstream into origin ?	09:46
	← ig0r_ left	09:47
	← rchavik left	09:48
	← sazed left	09:48
	← zarubin left	09:48
	← denirachmadi left	09:48
	← peoliye left	09:49
_rgn	Seveas: http://ix.io/mKs this seems weird	09:51
	→ Dullin joined	09:51
_rgn	Seveas: if I add "myprivategitlab" in [gitlab], and use git lab --account myprivategitlab, it works	09:52
	Seveas: has this changed?	09:52
	→ mouserat joined	09:53
	← garples left	09:56
	→ devoldmx joined	09:56
	← n00bdev left	09:56
	→ reim_ joined	09:57
	← _nadim left	09:57
	← reim left	09:58
	→ _nadim joined	09:58
	→ _cyril_ joined	10:00
	← devoldmx left	10:01
	→ MarkyC joined	10:01
	→ yuhlw joined	10:02
	→ garples joined	10:03
	→ rnsanchez joined	10:04
	→ sparetire_ joined	10:05
	← MarkyC left	10:06
	← _cyril_ left	10:06
	← aidalgol left	10:07
	← dopesong left	10:07
	← diogenese left	10:08
	→ dopesong joined	10:09
	→ lindenle joined	10:10
	← jay-m left	10:11
	→ jay-m joined	10:11
	← rnsanchez left	10:13
	→ rendar joined	10:13
	← lindenle left	10:15
spykins	can someone please help me, my old github account is popping up and i get The requested URL returned error: 403 when i tried to push	10:16
jast	perhaps your repo is still referencing the old account... does the account name show up in the URL in this? git remote -v	10:18
	→ bronson joined	10:19
	→ ifra201 joined	10:19
	← mkoskar left	10:23
	→ loren joined	10:23
	← bronson left	10:24
spykins	it shows the username does not have permission	10:24
	how do i switch the account, can i sign out of my old account n sign in into my new account?	10:24
	→ alexander__b joined	10:25
	→ rnsanchez joined	10:25
	→ juril joined	10:26
	← daito left	10:26
	→ jceb joined	10:26
	→ mischat joined	10:27
	← mischat left	10:27
	→ nfk\|laptop joined	10:27
	← diegoviola left	10:28
	→ mischat joined	10:28
	← alexander__b left	10:28
	→ alexander__b joined	10:28
	alexander__b → bernalex	10:28
spykins	i have used git config user.name ___ and git config user.email ___ all to no avail	10:28
	→ King_Hual joined	10:29
	← King_Hual left	10:29
	→ King_Hual joined	10:29
	→ Haris joined	10:29
	← King_Hual left	10:29
spykins	it keeps popping my old account with The requested URL returned error: 403	10:29
	→ King_Hual joined	10:29
	← King_Hual left	10:29
	→ King_Hual joined	10:29
canton7	spykins, are you trying to push over https or ssh?	10:29
	→ codeman joined	10:30
spykins	https	10:30
	→ lubarch_ joined	10:30
canton7	the username is specified in the url you're pushing to	10:30
	(see 'git remote -v')	10:30
spykins	yes	10:30
	← lubarch_ left	10:30
canton7	so... does the url contain your old github username?	10:31
	→ jost joined	10:31
	← jceb left	10:31
	← garples left	10:32
	← mouserat left	10:32
	→ ZokkanUpdatingGi joined	10:32
Haris	hello all. I created a new repo like this (1) cd /home/gitrepo/projects/prodname (2) git init --bare --shared (3) git init (4) git update-server-info. Now, I cloned this repo. added a README file, with 2 lines. ran git add *. ran git commit -m "some comment - for initial commit". Then tries git push origin master. On push it says --> error: insufficient permission for adding an object to repository database ./objects	10:32
	<-- I checked the objects folder. It is --> drwxrwsr-x 4 git git 4096 Dec 11 15:21 objects/ <-- Are my dir permissions wrong ? do I need rwS or rwX rather than rws for it to work ?	10:32
	tried+	10:33
spykins	canton7: Permission to my_new_userName/repository_name.git denied to my_old_userName.	10:33
	fatal: unable to access 'https://github.com/my_new_userName/repository_name.git/': The requested URL returned error: 403	10:33
	→ mouserat joined	10:33
	← xtun left	10:33
	→ notebox joined	10:33
canton7	spykins, you didn't answer my question	10:33
	→ lubarch joined	10:34
	← lubarch left	10:34
	→ lubarch joined	10:34
spykins	No, it contains the new github username	10:34
canton7	can you pastebin the output of 'git remote -v' please?	10:34
	← User458764 left	10:34
	← lubarch left	10:34
Haris	need help	10:35
	→ lubarch joined	10:36
	← lubarch left	10:36
	→ lubarch joined	10:36
spykins	canton7: Thaks	10:36
	origin https://github.com/my_new_userName/repository_name.git (fetch)	10:36
	origin https://github.com/my_new_userName/repository_name.git (push)	10:36
jast	Haris: nah, so far, so good. is the user you're using to push a member of the git group?	10:36
	→ permalac joined	10:36
	→ xtun joined	10:37
jast	spykins: does push ask you for a username and/or password?	10:37
Haris	yes	10:37
	← lubarch left	10:37
spykins	No	10:37
canton7	spykins, oh, so I wasn't clear enough. 'git remote set-url origin https://my_new_userName@github.com/my_new_userName/repository_name.git'	10:37
	→ lubarch joined	10:37
	← lubarch left	10:37
	→ lubarch joined	10:37
	← jost left	10:37
	← lubarch left	10:37
jast	chances are you have your old account data saved somewhere, probably ~/.netrc	10:38
spykins	jast: I even used git config user.name “”	10:38
canton7	or maybe he's done the 'url.<name>.insteadOf' trick..	10:38
jast	spykins: that's entirely different, it just influences what name shows up in your commits. it's not used for authentication.	10:38
canton7	spykins, user.name has not bearing on what username is used when authenticating over https	10:38
	*has no	10:38
jast	well you don't set insteadOf by accident :)	10:38
canton7	yeah, but he might have been following SO a while ago, then forgotten :P	10:39
	→ courrier joined	10:39
spykins	canton7: i think it’s using my old account set up	10:39
canton7	spykins, yes, obviously	10:39
spykins	canton7: how do i overide it with the new account?	10:40
jast	Haris: do the permissions for everything in objects/ look correct, too? (no need to paste, I'll trust your word ;))	10:40
spykins	Any idea	10:40
canton7	spykins, I've already given you a solution	10:40
Haris	checking	10:40
	→ lubarch joined	10:41
	← lubarch left	10:41
	→ lubarch joined	10:41
jast	I don't see why they shouldn't but better make sure	10:41
canton7	<canton7> spykins, oh, so I wasn't clear enough. 'git remote set-url origin https://my_new_userName@github.com/my_new_userName/repository_name.git'	10:41
	← lubarch left	10:41
canton7	maybe I needed to be clearer about that. Try running 'git remote set-url origin https://my_new_userName@github.com/my_new_userName/repository_name.git' to add your username to the url	10:41
	→ jost joined	10:41
spykins	the https is using my new username	10:42
	but i am pushing with the old username config on my system	10:42
canton7	spykins, can you spot the difference between 'https://my_new_userName@github.com' and 'https://github.com'?	10:42
	→ geri joined	10:43
	← ZokkanUpdatingGi left	10:44
spykins	canton7: i don’t know really, i am new to github… but the git remote -v	10:44
	gave the that	10:44
canton7	spykins, do you realise that 'https://my_new_userName@github.com' has an extra 'my_new_userName@', which 'https://github.com' does not have?	10:45
	I'm not sure what else to say	10:45
	I'm telling you to change the URL you're pushing to. I'm telling you to change it to a URL which explicitly contains the username to push as	10:46
jast	your current setting is https://github.com/yourname/something. this doesn't tell git what username to use, even if it may seem like it does. there may be defaults stored elsewhere that git ends up using. to make sure those defaults are not used, you can change the URL to include your name twice, as suggested by canton7	10:46
canton7	Please do that. I can't make this any more clear	10:46
	→ t4nk231 joined	10:48
	← sokolowitz left	10:48
spykins	canton7: Thank you so much, i am still abit lost though with the url thingy	10:48
	→ sokolowitz joined	10:48
spykins	jast: Do you mean i should do this?	10:48
	→ otter768 joined	10:49
	← petaflot_ left	10:49
canton7	spykins, as jast just said, then url 'https://github.com/my_new_userName/repository.git' only tells git where to push to. It does not tell git which user to push as. Therefore it's falling back on some old record of which user to push as, which is out of date. You can tell git which user to push as by adding the username just before the 'github.com', as I showed you	10:49
	spykins, for the fourth time, please run 'git remote set-url origin https://my_new_userName@github.com/my_new_userName/repository_name.git'	10:50
	→ petaflot joined	10:50
spykins	canton7: thanks, i understand that now	10:50
	← Silox\| left	10:50
	→ PeterBooker joined	10:50
	→ samw joined	10:52
	← otter768 left	10:53
spykins	canton7: Thank you so much….. i have been on this for 6 hours …. i wish i could send you a chill beer	10:54
	canton7: i really appreciate man, i have pushed succesfully……	10:54
	← t4nk231 left	10:54
canton7	just promise me that, next time, if you don't understand an answer that you've been given, say that you don't understand it. Please don't just repeat the question	10:55
	Repeating the question means that we just end up going round and round in circles	10:55
	← samw left	10:57
	← ChoHag left	11:01
	→ diogenese joined	11:01
spykins	canton7: I promise and i am so sorry, the url thingy was so confusing.. I just went through the chat and i found out you have given me the answer. You even asked me the difference between the urls… My Attention to Details is 0 /100	11:01
	canton7: Thank you for your patience, you are well appreciated	11:02
canton7	:)	11:02
	→ _cyril_ joined	11:02
	→ Haris2 joined	11:03
	← Alienpruts left	11:03
	← xtun left	11:03
	→ abacuspowers joined	11:04
	→ Alienpruts joined	11:05
	← Haris left	11:05
	→ zmachine joined	11:05
	→ nettoweb joined	11:05
	← _cyril_ left	11:07
	→ ig0r_ joined	11:08
	← abacuspowers left	11:09
	→ troyt joined	11:09
	← reim_ left	11:11
	← loren left	11:14
	→ nnyk joined	11:15
	→ jacksparrow007 joined	11:15
	← Haris2 left	11:16
	← ayaz left	11:16
	→ funfunctor joined	11:17
	→ Anticom joined	11:18
	→ sdothum joined	11:18
	← noark9 left	11:19
	← jacksparrow007 left	11:19
	→ jds joined	11:20
	← funfunctor left	11:22
	← leeN left	11:23
	← cagedwisdom left	11:24
	→ daito joined	11:27
	→ stamina joined	11:27
	→ reim joined	11:27
	→ Dev0n joined	11:27
	← daito left	11:31
	→ funfunctor joined	11:32
	← Zenrium left	11:33
	← JanC left	11:35
	← reim left	11:36
	→ fees joined	11:38
	→ faux___ joined	11:39
	← fees left	11:40
	→ fees joined	11:40
	← King_Hual left	11:41
	→ xtun joined	11:43
	← faux___ left	11:44
	← BSaboia left	11:44
	← nettoweb left	11:45
	→ nettoweb joined	11:45
	← nettoweb left	11:46
	← _nadim left	11:46
	→ _nadim joined	11:46
	← ig0r_ left	11:46
	→ Haris joined	11:49
	← Haris left	11:49
	→ Haris joined	11:49
	→ JanC joined	11:49
	→ mellernoia joined	11:50
	← Lor_ left	11:51
	→ pkeuter joined	11:51
	→ reim joined	11:51
	→ skylite joined	11:51
	→ shiriru joined	11:52
	→ bollullera joined	11:54
	→ mehola joined	11:54
	← reim left	11:56
	→ jimi_ joined	11:56
	← ash_workz left	11:57
	→ devoldmx joined	11:57
	← mehola left	11:59
	← MattMaker left	11:59
	← funfunctor left	12:00
	← devoldmx left	12:01
	→ reim joined	12:01
	→ _cyril_ joined	12:03
	← dopesong left	12:03
	→ dopesong_ joined	12:03
	→ s8321414 joined	12:04
	→ nettoweb joined	12:04
	← dopesong_ left	12:05
	→ dopesong joined	12:06
	→ ldc joined	12:07
ldc	hello	12:07
gitinfo	ldc: 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.	12:07
ldc	one of my users is complaining that he gets no changes pushed to the server, as in, files are not changed	12:07
	← dopesong left	12:07
ldc	I see his commits in git log and in tig, and he's on master	12:07
	← _cyril_ left	12:08
	→ spykins_ joined	12:08
	← spykins left	12:09
	spykins_ → spykins	12:09
	→ dopesong joined	12:09
	← blackwind_123 left	12:09
	← wxg left	12:11
	→ bronson joined	12:11
	← dopesong left	12:12
	← reim left	12:13
	→ ig0r_ joined	12:14
	→ blackwind_123 joined	12:15
	← bronson left	12:16
	→ forbidden404 joined	12:17
	→ funfunctor joined	12:17
	→ Haris2 joined	12:18
	→ ItSANgo joined	12:18
	← Manikandan left	12:19
	← Haris left	12:19
	← acolson left	12:20
	→ yqt joined	12:22
	→ mkoskar joined	12:23
	← jay-m left	12:24
	← ig0r_ left	12:24
	→ jay-m joined	12:24
	→ settermjd joined	12:25
	← paulweb515 left	12:25
	← jstimm left	12:27
	→ BBBThunda joined	12:28
	→ Wetmelon joined	12:28
	→ dantix joined	12:30
	← fscala left	12:31
	← forbidden404 left	12:33
	→ fscala joined	12:33
	→ ffio joined	12:35
	← Sceorem left	12:37
	→ Manikandan joined	12:38
	→ acolson joined	12:40
	→ rnsanchez_ joined	12:40
	← rnsanchez left	12:40
	→ presto joined	12:43
	→ User458764 joined	12:43
	→ zarubin joined	12:43
	→ reim joined	12:43
	→ Sceorem joined	12:47
	← zarubin left	12:48
	→ Deakin joined	12:49
	→ jceb joined	12:49
	→ sgambino joined	12:49
	→ otter768 joined	12:50
	→ mizu_no_oto joined	12:50
	← rasto left	12:51
	→ strehi joined	12:51
	← geri left	12:51
	→ forbidden404 joined	12:54
	← otter768 left	12:54
	← Hounddog left	12:55
	→ rorro joined	12:55
	→ daivyk joined	12:57
	→ geri joined	12:58
	← fstd left	12:59
	→ fstd joined	12:59
	→ zacg joined	12:59
	← zacg left	12:59
	→ zacg joined	12:59
	← strehi left	12:59
	→ strehi joined	12:59
	← geri left	13:00
	→ geri joined	13:01
	→ X000X_ joined	13:01
X000X_	hi	13:01
gitinfo	X000X_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:01
	← strehi left	13:02
	← mizu_no_oto left	13:02
	← geri left	13:02
	← zeroed left	13:03
X000X_	I've created new git repo => git init	13:03
	added first file index	13:03
	→ rasto joined	13:03
X000X_	commited the file git commit -am "First test commit"	13:03
	then I've created branch experiment	13:03
	when I checkout back to the master branch... Master branch is automatically merged	13:04
	→ EduardoMartins joined	13:04
X000X_	Where can I set the config that I need to merge it myself	13:04
	→ _cyril_ joined	13:04
bremner	I don't think you're really seeing an automatic merge.	13:04
	what makes you think so?	13:05
X000X_	Because I don't need to run git merge experiment	13:05
	→ abacuspowers joined	13:06
	→ survi joined	13:06
	→ synthroid joined	13:07
	→ zeroed joined	13:07
	← X000X_ left	13:07
	← Ragnar left	13:08
	→ gancl joined	13:08
	← _cyril_ left	13:09
	← petaflot left	13:10
	← abacuspowers left	13:10
	← dvaske_ left	13:10
	→ ctburley joined	13:12
	→ dvaske joined	13:12
	← d0nn1e left	13:13
	→ cvanball joined	13:13
	→ rwb joined	13:13
	→ _rnsanchez_ joined	13:15
	← forbidden404 left	13:15
	→ d0nn1e joined	13:15
	← rnsanchez_ left	13:16
	→ acetakwas joined	13:16
	→ jacksparrow007 joined	13:16
	→ ig0r_ joined	13:16
	← acetakwas left	13:16
	→ fahadash joined	13:18
	← survi left	13:19
	→ kartikey0303 joined	13:19
	← jacksparrow007 left	13:20
	→ petaflot joined	13:21
Seveas	did you make any commits on the experiment branch?	13:24
bremner	left.	13:25
Seveas	meh	13:25
	what I get for ignoring join/part/quits :)	13:25
	← ig0r_ left	13:25
	← eijk left	13:26
	→ ash_workz joined	13:26
	→ CKyle joined	13:26
ash_workz	are you risking anything by only having a bare repo on your repo server?	13:26
	-a* repos*	13:27
	← Guest73013 left	13:27
	← s8321414 left	13:27
	→ mizu_no_oto joined	13:27
Seveas	you risk stomach ulcers. And fungal infections.	13:27
	← igli left	13:28
	→ igli_ joined	13:28
Seveas	(in other words: that question may need more context)	13:28
bremner	for example, what is a repo server in this context?	13:28
	← zotherstupidguy left	13:29
	← rorro left	13:29
ash_workz	bremner: a server whose purpose is to contain repos.... I maybe miss using the term "repo server"	13:29
	← Deakin left	13:29
Seveas	ash_workz: what else but bare repos would you put on there	13:30
ash_workz	Seveas: I appreciated your joke in conjunction with your clarification :)	13:30
	→ lindenle joined	13:30
ash_workz	Seveas: working directories apparently?	13:30
	Seveas: that's what's on there now... perhaps it used to be a live/testing server....	13:31
bremner	ash_workz: unfortunately google called a tool "repo" for which they will hopefully burn in hell	13:31
ash_workz	bremner: I don't entirely understand what that means	13:31
	bremner: oh	13:31
	bremner: I get it	13:31
	← notebox left	13:32
ash_workz	bremner: what tool did they do so for? or is this like the "he who shall not be named" situation? :P	13:32
bremner	!repo	13:32
gitinfo	Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html	13:32
Seveas	ash_workz: those working directories are not needed on a server that servers central repositories. I would even doscourage them.	13:33
ash_workz	bremner: I find that sad	13:33
Seveas	discourage	13:33
	→ acetakwas joined	13:34
ash_workz	Seveas: anyway, does a bare repo in anyway depend on tangent repos (and by that I mean any other repo with a working directory that has pulled from said bare repo)	13:34
	← acetakwas left	13:35
BtbN	you can't propperly push to non-bare repos, so for "server" repos you want it to be bare.	13:35
Seveas	ash_workz: no(*)	13:35
	→ DolpheenDream joined	13:35
ash_workz	because the files in the working directories will never be up to date with the files being pushed?	13:35
	→ acetakwas joined	13:35
	← clmsy left	13:36
Seveas	(*)the only thing a git repo can depend on are submodules, but that has nothing to do with it being bare or not	13:36
ash_workz	Seveas: dually noted	13:36
	dually?...	13:36
	← acetakwas left	13:36
ash_workz	duly*	13:36
	← nnyk left	13:38
ash_workz	I have incorrectly memorized the term duly as "dually" because context had suggested to me in my distant past that the meaning of the phrase "duly noted" was "doubly noted"	13:38
	is there anyway to get a local version of the graph generator thingy?	13:41
	→ jeffreylevesque joined	13:41
	← petaflot left	13:42
	→ kinokoio joined	13:43
	← akkad left	13:43
	→ jteneyck joined	13:43
	← jteneyck left	13:43
	→ jteneyck joined	13:43
	← mischat left	13:43
ash_workz	can you pull/push to a repo that isn't bare by doing user@server:parent_dir.git (where parent_dir contains a ".git" directory, but there is no parent_dir.git)	13:44
grawity	no	13:44
	if you have parent_dir.git, you use parent_dir.git	13:44
	if you have parent_dir/.git, you use parent_dir	13:44
	the ".git" suffix isn't magic, it's just a convention that people use in bare repo names	13:44
	but the rules remain the same	13:45
	← rasto left	13:45
grawity	if it's non-bare, you can push to all branches except the current one	13:45
	← kartikey0303 left	13:45
	→ rdnt joined	13:45
	→ Darcidride joined	13:47
	→ paulweb515 joined	13:47
Seveas	ash_workz: the graph generator thingy is just graphviz	13:47
	→ petaflot joined	13:47
	→ mischat joined	13:47
	→ Chill_Surf joined	13:48
	← mizu_no_oto left	13:48
Seveas	it's very flexible. I use it for generating DNS graphs: http://ip.seveas.net/dnsgraph/git-scm.com/A/	13:49
	→ dstarh joined	13:49
ash_workz	well, I was thinking it might help with internal documentation (for more than just git actually, seeing as how they have a pretty flushed out record system) but I would like it to literally be just like the graph generator thingy so that documentation can contain contain links to graphs	13:49
	→ Gamecubic joined	13:49
	→ roygbiv joined	13:49
	→ italoacasas joined	13:50
	← zacg left	13:50
	← ulkesh left	13:50
	← italoacasas left	13:51
ash_workz	Seveas: holy frijoles	13:51
	→ ulkesh joined	13:51
	→ akkad joined	13:51
	← fuchsi left	13:51
	→ chitopunk joined	13:51
	→ italoacasas joined	13:52
	← italoacasas left	13:53
	→ Dcannon joined	13:54
	→ acetakwas joined	13:55
	→ italoacasas joined	13:55
	→ nnyk joined	13:55
	→ rasto joined	13:57
	→ devoldmx joined	13:58
	→ rwb1 joined	13:58
	→ leeN joined	13:58
	← akshat left	13:58
	← Nikhil_D left	13:58
	→ daito joined	13:58
	← koltroll left	13:59
	→ Nikhil_D joined	13:59
	← italoacasas left	13:59
	← leeN left	13:59
	← bollullera left	14:00
	← jceb left	14:00
	← rwb left	14:01
	← devoldmx left	14:02
	← rwb1 left	14:02
	→ rwb joined	14:02
	← nfk\|laptop left	14:03
	← daito left	14:03
	→ leeN joined	14:03
	→ italoacasas joined	14:03
	→ Sofiaraj joined	14:04
	← italoacasas left	14:04
	→ krawchyk joined	14:04
	→ _cyril_ joined	14:05
	→ italoacasas joined	14:05
	← petaflot left	14:05
	← jay-m left	14:05
	← Sofiaraj left	14:05
	→ faux___ joined	14:05
	← nnyk left	14:05
	← italoacasas left	14:06
	← Haris2 left	14:07
	← jteneyck left	14:07
	→ zumba_addict joined	14:07
	→ jay-m joined	14:07
	← dvaske left	14:07
	→ italoacasas joined	14:07
	← jimi_ left	14:08
	→ cbonobo joined	14:08
	← italoacasas left	14:08
	→ espindola joined	14:08
	← Anticom left	14:09
	→ italoacasas joined	14:09
	→ ncthom91 joined	14:09
	← mkoskar left	14:09
	← _cyril_ left	14:09
	→ star_prone joined	14:10
	← faux___ left	14:10
	← kam270 left	14:10
	← jeffreylevesque left	14:11
	← jay-m left	14:12
	→ algae joined	14:13
	→ jay-m joined	14:14
	→ weox joined	14:14
	→ CheckDavid joined	14:15
	→ CKyle_ joined	14:15
	→ sazed joined	14:15
	→ Es0teric joined	14:16
	← nettoweb left	14:16
	→ koltroll joined	14:18
	→ faux___ joined	14:19
	→ Mr-label joined	14:19
	← Es0teric left	14:20
	→ nnyk joined	14:22
	→ wrouesnel1 joined	14:22
	← nnyk left	14:22
	→ nnyk joined	14:22
	← akkad left	14:24
	→ reim_ joined	14:26
	← star_prone left	14:27
	← acetakwas left	14:27
	← reim left	14:28
	← cryptsting left	14:29
	→ Goobbue joined	14:29
	→ AaronMT joined	14:29
	← ncthom91 left	14:30
	← faux___ left	14:31
	DolpheenDream → DolphinDream	14:32
	← ulkesh left	14:33
	← stamina left	14:33
	→ ulkesh joined	14:34
	→ donnib joined	14:35
donnib	hi	14:35
	i have a merge conflict where if i open the file there are no conflicts in it, is that possible ?	14:36
	→ mkoskar joined	14:36
donnib	there are no >>>>>>> or <<<<<<<	14:36
	is this a bug ?	14:36
	→ star_prone joined	14:37
	← reim_ left	14:37
	→ faux___ joined	14:37
	← User458764 left	14:38
	← nikio_ left	14:38
osse	donnib: not necessarily. what does git status say ?	14:38
donnib	both modified	14:39
osse	hmm	14:39
	← zeroed left	14:39
donnib	yup	14:39
	i hope there is a good explanation	14:39
	:P	14:39
	i kept telling devs that there is some explanation but i can’t find it :(	14:40
	→ rnsanchez_ joined	14:40
osse	i'd look at the diff between the merge base and the branch tips separately and see what they say	14:40
	maybe one branch modified the contents and the other did chmod +x or something like that	14:40
	→ marscher joined	14:40
	→ ig0r_ joined	14:41
	← faux___ left	14:42
donnib	oh i see something in the merge i have not seen before	14:42
	warning: Cannot merge binary files:	14:42
	and this file is not a binary file	14:42
	it’s a cs file	14:42
	→ acetakwas joined	14:42
	→ cvanball_ joined	14:42
	← cvanball left	14:42
	→ faux___ joined	14:42
	← _rnsanchez_ left	14:42
	→ Es0teric joined	14:43
	← ig0r_ left	14:43
	→ cryptsting joined	14:43
donnib	osse: could that be the case ?	14:43
	→ BSaboia joined	14:44
	→ jacksparrow007 joined	14:44
	→ rwb1 joined	14:45
	→ akshat joined	14:45
	→ User458764 joined	14:45
	→ mihaicris joined	14:45
	→ crose joined	14:46
	→ samw joined	14:46
	→ zeroed joined	14:46
	→ xaa joined	14:47
	← rwb left	14:47
	→ killa_kyle joined	14:48
	← zumba_addict left	14:48
	← Goobbue left	14:49
	← killa_kyle left	14:49
	→ zumba_addict joined	14:49
	← rwb1 left	14:49
osse	donnib: yes	14:49
	→ killa_kyle joined	14:49
	→ nettoweb joined	14:49
osse	donnib: if there is a merge conflict in a file that Git believes is binary then instead of creating conflict markers it will just put one of the versions (the current/HEAD one)in the working dir and give up	14:50
	→ petaflot joined	14:50
	← killa_kyle left	14:50
	← samw left	14:51
	→ otter768 joined	14:51
	← Es0teric left	14:52
	→ Dougie187 joined	14:52
	→ forbidden404 joined	14:52
donnib	osse: so yes that is the problem, now next problem is why is Git thinking this code file is binary	14:53
	i can see the encoding is ucs-2 le bom	14:53
	if that makes any difference	14:54
	is there a way for git to tell why it thinks it’s binary ?	14:54
	→ rwb joined	14:54
	→ King_Hual joined	14:54
	← King_Hual left	14:54
	→ King_Hual joined	14:54
	← petaflot left	14:54
	→ Es0teric joined	14:54
	← zumba_addict left	14:54
	← otter768 left	14:55
	← User458764 left	14:55
	← Es0teric left	14:56
	← igli_ left	14:57
	→ colli5ion joined	14:57
	← colli5ion left	14:58
	→ mezod joined	14:58
	← gancl left	14:58
	← rscata left	14:58
	← Mr-label left	14:58
	→ colli5ion joined	14:58
	→ Spacew00t joined	14:58
bremner	if ucs-2 is a 16bit encoding, then git thinks it's binary because it's not an 8bit text format. It has e.g. null characters in the middle of lines.	14:59
grawity	hmm I thought it could detect utf-16	14:59
	guess not	14:59
	← mihaicris left	14:59
	→ akkad joined	15:00
	← krawchyk left	15:00
Hello71	one, utf-16 sucks, don't use it (unless you really have to). two, you can set a separate diff tool for ".cs" files	15:00
	→ uri_ joined	15:00
	→ notebox joined	15:00
	→ mihaicris joined	15:00
grawity	or you can set the encoding manually in .gitattributes	15:00
	← mouserat left	15:01
grawity	"utf16" should be the right name	15:01
	→ dilfridge joined	15:01
	→ ig0r_ joined	15:01
	← akshat left	15:01
grawity	encoding=utf16 that is	15:02
	but I dunno if 'git diff' honors it actually	15:02
	→ kevwil joined	15:02
osse	bremner, donnib: if I remember correctly the binary detection thingy is as simple as checking for nulls in the first 8k so yeah that sounds likeleigh	15:02
	→ ncthom91 joined	15:02
donnib	i don’tuse it, somehow it has been set wrongly	15:02
	← ncthom91 left	15:03
donnib	i am trying to put a line in gitatributtes saying *.cs diff but still git detects the file as binary	15:03
	← jay-m left	15:03
	→ jay-m joined	15:03
	→ ncthom91 joined	15:03
	← colli5ion left	15:04
	→ krawchyk joined	15:04
	← AaronMT left	15:04
	← krawchyk left	15:05
	→ BlaXpirit joined	15:05
	→ Moistmelon joined	15:05
BlaXpirit	why is gitlab so unpopular compared to github?	15:05
	→ krawchyk joined	15:05
BlaXpirit	i mean, sure, the interface is trash in comparison, but still	15:05
	→ _cyril_ joined	15:05
grawity	also it's slow	15:06
	← ig0r_ left	15:06
grawity	it's like all of gitlab.com is running off a single box	15:06
	→ reim joined	15:06
bremner	BlaXpirit: it's much newer.	15:06
	← Darcidride left	15:07
	← phantombeta left	15:07
	→ fuchsi joined	15:07
bremner	I'd say plenty of people don't even understand that git exists independent from github :(	15:07
BlaXpirit	but you can install your own! isn't that a huge advantage?	15:07
	→ abacuspowers joined	15:07
	← acetakwas left	15:07
	← Wetmelon left	15:07
Seveas	BlaXpirit: if you're interested in that, yes. Most people don't care.	15:07
	→ Darcidride joined	15:07
donnib	grawity: any idea why git still thinks my file is binary when i specify *.cs diff in .gitattributes ?	15:07
Seveas	I find speed much more important, and gitlab.com is really damn slow	15:08
BlaXpirit	i wonder how viable it would be to use it for my projects and still be able to receive public contributions	15:08
Seveas	only one way to find out, try it! :)	15:08
bremner	donnib: at a guess, I'd say utf16 is just not well supported by git.	15:08
BlaXpirit	i have no real reason except for ideological	15:08
donnib	bremner: but should git not forget about the encoding if i specify it in the gitatributtes ?	15:08
Seveas	I've put one of my repos on there, mostly because I don't want people to equate git with github.	15:08
BlaXpirit	oh well, if I have inquiries about gitlab I shouldn't annoy people here about them	15:09
	← shiriru left	15:09
	→ victorga_ joined	15:10
	← Darcidride left	15:10
Seveas	you absolutely can, but #gitlab may be a better choice	15:10
	← _cyril_ left	15:10
	→ WetLemons joined	15:10
	→ wwwald joined	15:10
	→ nfk\|laptop joined	15:10
	→ monthy joined	15:10
	→ bronson joined	15:10
	→ cuebix-wk joined	15:10
	← Moistmelon left	15:12
	← juril left	15:12
	→ colli5ion joined	15:12
	→ juril joined	15:12
	← abacuspowers left	15:12
	→ jimi_ joined	15:14
	← sokolowitz left	15:14
	→ AaronMT joined	15:14
	→ acetakwas joined	15:15
	← bronson left	15:15
	→ petaflot joined	15:15
	→ colli5io_ joined	15:16
	← colli5ion left	15:17
	→ dorkmafia joined	15:17
	← sazed left	15:21
	← fahadash left	15:21
	← dorkmafia left	15:21
	← DolphinDream left	15:22
	← colli5io_ left	15:22
	← reim left	15:22
	← petaflot left	15:23
	→ Rodya_ joined	15:24
	← skylite left	15:25
	→ colli5ion joined	15:25
qsuscs	donnib: recent visual studio can use utf8 as well	15:25
	don’t ask me how recent.	15:25
	← diogenese left	15:26
	→ colli5io_ joined	15:27
	→ Stummi joined	15:27
	← _nadim left	15:28
Stummi	hey, a quick question. Lets say I made a commit by mistake on the wrong branch. After picking the commit to the correct one, I should be fine with "git reset --hard HEAD~1" on the wrong one, correct? So this branch won't have any information about the commit anymore when pushing?	15:28
	← rwb left	15:28
	→ reim joined	15:29
	→ User458764 joined	15:29
	← colli5ion left	15:30
	→ rwb joined	15:30
	← settermjd left	15:31
	← uri_ left	15:32
	← victorga_ left	15:32
	← NeverDie left	15:33
	→ petaflot joined	15:33
	→ pacbard joined	15:34
	→ uri_ joined	15:34
	← TomyWork left	15:35
	→ colli5ion joined	15:35
	← a3Dman left	15:35
	→ igli_ joined	15:35
	→ a3Dman joined	15:35
	← colli5io_ left	15:36
	← jds left	15:36
	igli_ → igli	15:36
	← krawchyk left	15:37
	→ victortyau joined	15:37
	→ yohnnyjoe joined	15:38
	→ mDuff joined	15:39
	→ krawchyk joined	15:39
	→ colli5io_ joined	15:39
	← spykins left	15:39
	← krawchyk left	15:40
	→ rubyonrailed joined	15:40
	→ krawchyk joined	15:41
	→ Corneliu joined	15:41
	← colli5ion left	15:41
	← ifra201 left	15:42
	← ThomasLocke left	15:42
	← EduardoMartins left	15:42
grawity	yes	15:43
	← jay-m left	15:43
	→ jay-m joined	15:44
	← Dcannon left	15:44
	→ mmlb joined	15:46
	→ sazed joined	15:47
	← petaflot left	15:47
	← acolson left	15:47
	← roelmonnens left	15:48
	→ roelmonnens joined	15:48
	→ Balliad joined	15:49
	← presto left	15:49
	→ geri joined	15:49
	→ BillCriswell joined	15:50
	→ presto joined	15:51
	← espindola left	15:51
	← elisa87 left	15:51
	← colli5io_ left	15:51
	→ inter joined	15:52
	← roelmonnens left	15:52
	← Alienpruts left	15:53
	← xtun left	15:53
	→ Gitzilla joined	15:54
	← krawchyk left	15:54
	← Corneliu left	15:55
	→ Ahmed90 joined	15:55
	→ localuser- joined	15:56
	→ diogenese joined	15:56
	← mkoskar left	15:57
	← wwwald left	15:57
	→ krawchyk joined	15:57
	← jacksparrow007 left	15:57
	→ petaflot joined	15:57
	← krawchyk left	15:57
	→ devoldmx joined	15:58
	→ daito joined	15:59
	→ cere joined	16:00
	← mmlb left	16:01
	→ krawchyk joined	16:02
	→ happy-dude joined	16:02
	→ jacksparrow007 joined	16:03
	← devoldmx left	16:03
	→ MarkyC joined	16:03
	← daito left	16:04
	→ kilo_bravo joined	16:04
	→ localuser joined	16:05
	← acetakwas left	16:06
	→ _cyril_ joined	16:06
	← jimi_ left	16:07
	→ victorga_ joined	16:08
	← localuser- left	16:09
	← victorga_ left	16:09
	→ victorga_ joined	16:10
	← irqq left	16:10
	→ TomyLobo joined	16:10
	→ fahadash joined	16:10
	← _cyril_ left	16:11
	← anth0ny_ left	16:11
	→ Sadeukko joined	16:11
	→ eijk joined	16:11
	← Sceorem left	16:12
	← krawchyk left	16:12
	→ thiago joined	16:12
	← timmu left	16:13
	→ NwS joined	16:13
	→ arup_r joined	16:15
	→ israelzuniga joined	16:16
	→ dvaske joined	16:17
	← diogenese left	16:17
	→ MechtiIde joined	16:17
	→ akshat joined	16:18
	→ diogenese joined	16:18
	← hyperair left	16:19
	← elsevero left	16:19
	← cere left	16:20
	→ nzst joined	16:20
	→ ig0r_ joined	16:21
nzst	Hi, is there a feature like sparse checkout that makes use of blacklisting instead of whitelisting? I'd like to clone a repository and have some specific files not get pulled down	16:21
	← localuser left	16:22
	← weox left	16:22
	→ krawchyk joined	16:23
	→ netcarver joined	16:23
	← krawchyk left	16:23
	→ EduardoMartins joined	16:23
	→ krawchyk joined	16:24
	← permalac left	16:24
	→ dreiss joined	16:24
	→ Dumle29 joined	16:25
	← bonswouar left	16:25
	← jay-m left	16:25
	← dvaske left	16:26
	← reim left	16:26
	← adac left	16:27
nzst	oh, i found it, there are negate patterns available, thanks	16:27
	→ bronson joined	16:27
	← zeroed left	16:28
	← geri left	16:28
	→ zeroed joined	16:28
	← synthroid left	16:29
	→ circ-user-aPkEg joined	16:29
	→ freenux joined	16:30
igli	nzst: what did your final cmd look like?	16:31
	← thiago left	16:31
circ-user-aPkEg	The answer to this question http://stackoverflow.com/questions/34189779 says that mystery has something to do with 3diff strategy. Can you explain it? Why A and B are completely different if they differ by a single line and why git starts to notice this fact if I further update a line in B?	16:32
	← jacksparrow007 left	16:33
	← Balliad left	16:33
	← freenux left	16:33
	→ t4nk075 joined	16:35
	→ jfran joined	16:36
	← King_Hual left	16:36
	← bronson left	16:37
	← AaronMT left	16:37
	← CausaMortis left	16:38
	← gingitsune left	16:39
	→ _cyril_ joined	16:39
	← Sadeukko left	16:39
	← noteness left	16:39
	→ dorkmafia joined	16:40
	← t4nk075 left	16:40
	→ Sadeukko joined	16:40
	→ cdg joined	16:41
	→ noteness joined	16:42
	→ mischat_ joined	16:42
	← nnyk left	16:43
	← netcarver left	16:43
	← Rodya_ left	16:44
	→ Rodya_ joined	16:45
	← User458764 left	16:45
	← mischat left	16:45
	← nfk\|laptop left	16:45
	→ editshare-ericf joined	16:46
	→ filisko joined	16:46
	→ AaronMT joined	16:46
	← mischat_ left	16:47
circ-user-aPkEg	The answer to this question http://stackoverflow.com/questions/34189779 says that mystery has something to do with 3diff strategy. Can you explain it? Why A and B are completely different if they differ by a single line and why git starts to notice this fact if I further update a line in B?	16:47
	→ kyle6197 joined	16:47
	← ig0r_ left	16:47
	← roxlu left	16:48
	← victortyau left	16:48
	← Asenar left	16:48
	← kyle6197 left	16:48
	→ t4nk085 joined	16:48
	← yqt left	16:49
	→ otter768 joined	16:51
	→ spykins joined	16:52
	← Manikandan left	16:53
	← star_prone left	16:53
igli	don't double-post your question. if no one can help, no one will answer, so wait for someone else to show up.	16:53
	"Remember: this is more like email than you imagine." ;)	16:53
	→ star_prone joined	16:55
	→ gopar joined	16:55
	→ geri joined	16:55
	→ Manikandan joined	16:55
	→ phrozensilver joined	16:56
	← otter768 left	16:57
	← star_prone left	16:58
	→ mkoskar joined	16:58
	→ star_prone joined	17:00
	← AaronMT left	17:01
	← spykins left	17:02
igli	hmm sorry for basic q: how do i show commit 1d6602bb8e70 alone? git log with id repeated seems a bit clunky, so wondering what i'm missing	17:02
	→ ESphynx joined	17:03
	→ mwhooker joined	17:03
	← Spacew00t left	17:04
	← star_prone left	17:04
preaction	igli: git show	17:06
	→ triad joined	17:06
	← faux___ left	17:06
igli	thanks preaction	17:07
	→ synthroid joined	17:07
	← nettoweb left	17:07
	→ samw joined	17:08
	← igli left	17:08
ESphynx	hey guys, does git somehow support rebasing changes that would have code move across files?	17:08
	→ abacuspowers joined	17:09
ESphynx	i.e. if I made some changes to code while it was in one file in commit A, another commit B moved that code to another file, and I want to rebase with commit A happening after commit B?	17:09
	← synthroid left	17:09
ESphynx	(My understanding is that it doesn't, but I want to verify :P)	17:09
	→ synthroid joined	17:10
	← d0nn1e left	17:11
	→ jimi_ joined	17:11
	→ nettoweb joined	17:11
	→ d0nn1e joined	17:12
	← Manikandan left	17:12
	→ faux___ joined	17:13
	→ durham joined	17:13
	← abacuspowers left	17:14
	← crose left	17:15
	→ tildes joined	17:15
	→ Spacew00t joined	17:16
	← faux___ left	17:17
	→ systmkor joined	17:18
	→ User458764 joined	17:18
	→ tieTYT joined	17:18
	← EduardoMartins left	17:19
	→ faux___ joined	17:19
	→ troulouliou_div2 joined	17:19
	→ Sigfrid joined	17:20
	← mkoskar left	17:21
	→ rath joined	17:22
	→ bb010g joined	17:22
	gitinfo set mode: +v	17:22
	← faux___ left	17:23
	← diogenese left	17:23
	← s00pcan left	17:25
	→ diogenese joined	17:25
	→ Goobbue joined	17:25
	→ lmatteis joined	17:25
lmatteis	guys simple question. i have created a branch off master. now i wanna send my commits back to master... but nothing has been changed ever since the branching	17:25
	how do i do this?	17:26
	with a rebase? but how?	17:26
	→ s00pcan joined	17:26
ESphynx	lmatteis: nothing has changed on master?	17:26
	→ thiago joined	17:26
	→ faux___ joined	17:26
lmatteis	ESphynx: no	17:26
ESphynx	lmatteis: you can probably checkout master and do a git merge --ff-only yourotherbranch	17:26
	→ imachuchu joined	17:26
	← diogenese left	17:27
lmatteis	what if i checkout master, and do git rebase other-branch?	17:27
	what does that do	17:27
ESphynx	lmatteis: you don't want to do that	17:27
	lmatteis: you want to bring in other changes to master	17:27
	lmatteis: i.e. master shouldn't change, merging in the other branch and saying -ff-only is saying you only want to do a fast-forward merge... then if that fails (that means changes actually happened on master already), then you rebase that other branch onto master	17:28
lmatteis	and how do i rebase/	17:28
ESphynx	lmatteis: you would stay on your current branch and do 'git rebase master'	17:29
lmatteis	and that sends my other branch commits to master?	17:29
	→ crunchers joined	17:29
ESphynx	git rebase -i master to have more control over how that happens :)	17:29
	← PCatinean left	17:29
ESphynx	no, that just rebases your current branch, once it is rebased onto master, then you check out master and you git merge --ff-only yourotherbranch	17:29
	← doener left	17:30
lmatteis	but i simply want other-branch to be master	17:30
	why wouldn't git rebase other-branch from master work?	17:30
ESphynx	why do you want one branch to be another?	17:30
lmatteis	i don't	17:30
preaction	rebase isn't how you do that. you want git merge --ff-only	17:30
lmatteis	i just want them to be equal	17:30
	→ QwertyDragon joined	17:30
	← ulkesh left	17:30
	← faux___ left	17:31
ESphynx	lmatteis: assuming you have an 'origin' repo that other people may be using	17:31
lmatteis	ok so git merge --ff-only from master?	17:31
preaction	fast-forward just updates the ref pointer, which makes them equal	17:31
	yes	17:31
	← Derega left	17:31
	→ Chunk2 joined	17:31
lmatteis	cool seemd to work	17:31
preaction	if master had moved, you'd rebase your branch onto master (git checkout yourbranch; git rebase master) and then do a ff merge (git checkout master; git merge --ff-only yourbranch)	17:32
	→ ulkesh joined	17:32
preaction	the rebase makes it appear that master hasn't moved since yourbranch was created	17:32
lmatteis	thanks guys	17:32
ESphynx	preaction: I wish git was more biased towards trunk-only masters :P	17:32
	→ Kulrak joined	17:32
	← Kulrak left	17:32
	→ Kulrak joined	17:32
	→ Derega joined	17:32
	→ faux___ joined	17:32
lmatteis	so git rebase master gets the changes from master onto my current branch?	17:32
ESphynx	lmatteis: yes it moves those changes before the things you changed since you last updated master	17:33
	updated from* master	17:33
	→ localuser- joined	17:33
preaction	it rewinds your current branch, updates from master, then replays the branch's contents	17:33
ESphynx	lmatteis: makes it as if you did your work after what happened to master	17:33
lmatteis	cool thanks	17:33
preaction	so it changes the "base" of your branch from the old version of master, to the new version of master	17:33
	← zeroed left	17:34
	← madewokherd left	17:34
	← liamonade left	17:34
	→ keldwud joined	17:35
	← keldwud left	17:35
	→ keldwud joined	17:35
	→ hyperair joined	17:35
	← monthy left	17:35
	← krawchyk left	17:36
	← faux___ left	17:37
	→ krawchyk joined	17:37
	→ bronson joined	17:37
	← mDuff left	17:38
	→ faux___ joined	17:39
	→ kadoban joined	17:40
	→ NaN joined	17:41
	← CKyle_ left	17:41
NaN	is it possible to change the git remote connection from http to ssh? where should I look in the docs?	17:41
	← dorkmafia left	17:42
	→ jnareb joined	17:42
	← kurkale6ka left	17:42
	← bronson left	17:42
qsuscs	NaN: yes; man git remote	17:43
gitinfo	NaN: the git-remote manpage is available at http://jk.gs/git-remote.html	17:43
	→ toogley joined	17:43
	← triad left	17:43
NaN	thanks qsuscs	17:43
	← faux___ left	17:44
	→ dorkmafia joined	17:44
	← ulkesh left	17:44
	← _cyril_ left	17:44
	← impliednude left	17:44
qsuscs	!next	17:44
gitinfo	Another satisfied customer. NEXT!	17:44
	→ _nadim joined	17:45
	→ faux___ joined	17:45
	→ abacuspowers joined	17:46
	→ Technocrat7 joined	17:46
	→ localuser joined	17:46
	← freimatz left	17:47
	← Technocrat7 left	17:47
	→ Technocrat7 joined	17:47
	→ dorkmafi1 joined	17:47
	→ jagob joined	17:47
	← dorkmafia left	17:48
	→ ulkesh joined	17:48
	→ reim joined	17:48
	← krawchyk left	17:48
	← paulweb515 left	17:49
	← faux___ left	17:50
	← localuser- left	17:50
	→ rorro joined	17:51
	→ faux___ joined	17:52
	→ The_Phoenix joined	17:52
	→ krawchyk joined	17:52
	← israelzuniga left	17:53
	→ _cyril_ joined	17:53
	← tieTYT left	17:54
	← JanC left	17:54
	→ NeverDie joined	17:55
	→ mDuff joined	17:55
	← mwhooker left	17:56
	← faux___ left	17:56
	→ fracting joined	17:56
	← fracting left	17:58
	→ faux___ joined	17:58
	← tildes left	17:58
	← gfixler left	17:59
	→ Jackneill joined	17:59
	→ devoldmx joined	17:59
	→ daito joined	18:00
	→ fracting joined	18:01
	← Spacew00t left	18:01
	← ncthom91 left	18:01
	→ tieTYT joined	18:01
	← samw left	18:01
	← tieTYT left	18:01
	→ madewokherd joined	18:01
	→ adac joined	18:01
	← notebox left	18:01
	→ star_prone joined	18:01
	→ Vikings joined	18:02
	← faux___ left	18:02
	→ localuser- joined	18:02
	← devoldmx left	18:03
	→ faux___ joined	18:04
	← krawchyk left	18:04
	← daito left	18:05
	← star_prone left	18:05
	→ mellernoia-work joined	18:06
	← localuser left	18:06
	→ relect joined	18:06
	← jnareb left	18:07
	← mellernoia left	18:07
	← User458764 left	18:08
	← victorga_ left	18:08
	← faux___ left	18:09
	→ diogenese joined	18:09
	→ samw joined	18:09
	→ JanC joined	18:10
	→ faux___ joined	18:10
	← petaflot left	18:12
	→ petaflot joined	18:12
	→ localuser joined	18:13
	← dorkmafi1 left	18:13
	→ tomog999_ joined	18:13
	← adac left	18:14
	← faux___ left	18:15
	→ jackburton joined	18:15
	→ cagedwisdom joined	18:16
	→ jason237 joined	18:16
	← tomog999 left	18:16
	→ gfixler joined	18:16
	→ AaronMT joined	18:16
	→ faux___ joined	18:17
	← faux___ left	18:17
	← localuser- left	18:17
	→ dorkmafi1 joined	18:18
	← relect left	18:18
	→ faux___ joined	18:20
	← Vikings left	18:21
	→ relect joined	18:21
	← _cyril_ left	18:21
	← fahadash left	18:21
	← reim left	18:21
	← gfixler left	18:21
	← troulouliou_div2 left	18:23
	← fracting left	18:23
	→ fracting joined	18:24
	→ peoliye joined	18:24
	→ hahuang65 joined	18:25
	→ Zariel_ joined	18:25
	→ Sasazuka joined	18:25
	← Zariel_ left	18:25
	→ chucky_z joined	18:26
	← abacuspowers left	18:26
	← arup_r left	18:26
	→ Technocrat786 joined	18:27
	→ zarubin joined	18:28
	← zarubin left	18:28
	→ roxlu joined	18:28
	→ zarubin joined	18:29
	← relect left	18:29
	← Technocrat7 left	18:30
	← cagedwisdom left	18:30
	← dreiss left	18:31
	← koltroll left	18:31
	← fracting left	18:31
	← sazed left	18:32
	→ paulweb515 joined	18:32
	→ sazed joined	18:32
	← zarubin left	18:33
	← localuser left	18:34
	→ bronson joined	18:35
	← encod3 left	18:37
	→ _rgn joined	18:37
	← _rgn left	18:37
	→ _rgn joined	18:37
	→ adac joined	18:38
	→ tfry joined	18:38
	→ User458764 joined	18:39
	→ phantombeta joined	18:39
	← User458764 left	18:39
	← mihaicris left	18:39
	→ User458764 joined	18:40
	→ t4nk239 joined	18:41
	→ cagedwisdom joined	18:42
	← _rgn left	18:42
	gitinfo set mode: +v	18:42
	t4nk239 slaps bb010g around a bit with a large fishbot	18:43
	→ colli5ion joined	18:44
Nevik	pls no	18:44
	← rorro left	18:45
	→ frem joined	18:45
	← dsdeiz left	18:45
ESphynx	anyones whether git somehow support rebasing changes that would have code move across files?	18:45
	← colli5ion left	18:45
	→ koltroll joined	18:46
	← phrozensilver left	18:46
	→ _rgn joined	18:46
	← _rgn left	18:46
	→ _rgn joined	18:46
Nevik	what?	18:47
preaction	ESphynx: try it and see. my guess is maybe	18:47
	← italoacasas left	18:47
	← CKyle left	18:47
ESphynx	preaction: well what experience from that generally is you see 'conflict' and 'deleted by us' and little else	18:47
	i.e. if I made some changes to code while it was in one file in commit A, another commit B moved that code to another file, and I want to rebase with commit A happening after commit B?	18:47
	← t4nk239 left	18:47
	→ phrozensilver joined	18:47
preaction	so you're saying you already know it definitely doesn't? then why ask?	18:48
ESphynx	preaction: I don't know it definitely doesn't. it didn't seem to work for me, but it's something I think vcs should definitely support :P	18:48
	and Git was always touting how it's file agnostic	18:49
	→ zumba_ad_ joined	18:49
Nevik	that's precisely why git doesnt know or care that your changes of adding X to file A and removing X from file B semantically means "move X" to you	18:51
	git just sees two changes, which it records	18:51
ESphynx	Nevik: are you saying it should be able to do the above?	18:51
	← diogenese left	18:52
Nevik	it only could do it properly if it knew that you are moving the content. otherwise you'd just expect the conflict like you say you got	18:52
	← MechtiIde left	18:52
Nevik	so, you'd have to get git's move detection heuristic in there, which i dont know if/how it is possible to do	18:52
	→ otter768 joined	18:52
ESphynx	Nevik: and how would it know that?	18:52
	→ texasmynsted joined	18:52
Nevik	either by you telling it or by a heuristic	18:53
	← _rgn left	18:53
Nevik	(there's no way for you to tell it though)	18:53
ESphynx	Nevik: a heuristic it already has implemented?	18:53
Nevik	yes, log can use it, as can some other sub commands	18:53
ESphynx	Nevik: well this why I'm asking these things. seems to be what git was made for, but in practice it's not working :P	18:53
	→ nfk\|laptop joined	18:53
Nevik	a quick glance at man git rebase shows no options to this effect, though	18:53
gitinfo	the git-rebase manpage is available at http://jk.gs/git-rebase.html	18:53
	→ marcelofr joined	18:53
texasmynsted	I am using a remote repo with 59 branches. I only need one.	18:53
	← marcelofr left	18:54
texasmynsted	http://stackoverflow.com/questions/16842426/can-git-permanently-ignore-a-remote-branch	18:54
	← zumba_ad_ left	18:54
texasmynsted	I saw the above in so	18:54
	→ settermjd joined	18:54
texasmynsted	Is there a simply way to tell pull, fetch, etc to pay attention only to the default branch?	18:55
Nevik	texasmynsted, why is this a problem for you?	18:55
	why?	18:55
texasmynsted	because it takes ages to clone	18:55
preaction	do a shallow clone	18:55
texasmynsted	explain	18:55
preaction	man git clone; look for --depth	18:56
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	18:56
texasmynsted	ok reading	18:56
preaction	there also appears to be --single-branch as well	18:56
	← rubyonrailed left	18:56
Nevik	--single-branch definitely exists :P	18:57
texasmynsted	Wow, —single-branch exactly what I need!	18:57
	Thank you	18:57
	← otter768 left	18:57
Nevik	i'm not so sure that will help as much as you think	18:57
	→ italoacasas joined	18:58
Nevik	(though it wont make it any worse, so go for it)	18:58
	← adac left	18:58
	→ dvaske_ joined	18:58
	→ mwhooker joined	18:59
	→ kfoonamalik joined	19:00
texasmynsted	so far still slow	19:00
	looks like it might still take 10min to clone	19:00
Nevik	just let the clone run over night?	19:00
	oh lol 10 mins	19:00
	just go have dinner or something :P	19:00
	← bronson left	19:00
texasmynsted	Its all relative	19:00
Nevik	you only clone once, so dont sweat it	19:01
Eugene	!beer	19:01
gitinfo	Beer! It's what's for dinner!	19:01
Nevik	truth	19:01
	← sdothum left	19:01
Eugene	Or lunch, or breakfast	19:01
	→ meLon joined	19:01
	← courrier left	19:01
Eugene	Or whatever, I won't judge	19:01
ESphynx	a single beer is only good enough for a single taco :\|	19:01
	← mwhooker left	19:01
	→ zarubin joined	19:01
Eugene	Where are you getting your tacos	19:01
texasmynsted	Well, for this project I have needed to clone more often	19:01
Nevik	but well, seven beers make a schnitzel and then you haven't even had anything to drink!	19:01
	texasmynsted, why?	19:01
ESphynx	Eugene: made them myself, complete with my own taco spice mix ground with my own mortar/pestle	19:02
	→ sdothum joined	19:02
Eugene	That sounds amazing	19:02
ESphynx	Eugene: I'd be happy to share my taco mix recipe :P	19:02
	→ mwhooker joined	19:02
Nevik	i think Eugene would prefer you making him tacos :P	19:02
ESphynx	of course also includes our own guacamole in there :)	19:02
Eugene	gitamole!	19:03
Nevik	git avocado --squash	19:03
ESphynx	lol	19:03
Nevik	git checkout taco && git merge guacamole	19:04
Eugene	git nom --omnom	19:04
texasmynsted	hmm. good point.	19:04
Eugene	Now I want tacos for lunch	19:04
Nevik	git clean --soft-napkin	19:04
	→ i3luefire joined	19:04
	→ HelloAtMega joined	19:04
	→ dsdeiz joined	19:05
	→ Spacew00t joined	19:06
	← zarubin left	19:06
	→ abacuspowers joined	19:07
	→ diogenese joined	19:07
	← AaronMT left	19:08
	→ notebox joined	19:09
	← Technocrat786 left	19:11
	← ash_workz left	19:11
	← dorkmafi1 left	19:12
	→ DolphinDream joined	19:12
	→ dorkmafi1 joined	19:13
	← settermjd left	19:13
	→ AaronMT joined	19:13
	→ dreiss joined	19:14
	→ jd_1 joined	19:14
	← Sadeukko left	19:15
	← BrianBlaze420 left	19:15
jd_1	is there a way to save the --to and -cc addresses in my git send-email/format-patch string as a group or something similar?	19:15
	← AaronMT left	19:17
	→ _cyril_ joined	19:17
	→ Sadeukko joined	19:17
	→ gfixler joined	19:18
	→ _rgn joined	19:18
	← _rgn left	19:18
	→ _rgn joined	19:18
	→ espindola joined	19:19
	← marscher left	19:19
	→ jaafar joined	19:19
	→ eijk_ joined	19:19
	→ BrianBlaze420 joined	19:19
CareBear\	git config	19:20
	jd_1 : but that may not be close enough to what you mean - you could only set one thing	19:20
	jd_1 : you might be able to tell git to use a script to look up recipients	19:21
	← _cyril_ left	19:22
jd_1	I thought about the script option. The git config idea seems ok too	19:22
	Thanks for the ideas	19:23
	← eijk left	19:23
	→ aartist joined	19:23
	→ MattMaker joined	19:24
	→ juggle joined	19:25
	← Goobbue left	19:25
	→ Goobbue joined	19:26
	→ Balliad joined	19:26
	← nettoweb left	19:26
	→ yashu-seth joined	19:26
	→ relect joined	19:28
	← relect left	19:29
	← Goobbue left	19:30
	→ weox joined	19:30
nzst	igli: I didn't set up anything, I just found these docs http://schacon.github.io/git/git-read-tree.html#_sparse_checkout	19:31
	→ rubyonrailed joined	19:35
	← kadoban left	19:35
	→ AndroidLoverInSF joined	19:35
	→ Ragnar joined	19:36
	→ rubyonra_ joined	19:36
	→ waveclaw joined	19:36
	← lmatteis left	19:37
	← hyperair left	19:38
	← _rgn left	19:38
	← daivyk left	19:38
	← rubyonrailed left	19:40
	← marcogmonteiro left	19:40
	← waveclaw left	19:41
	← Balliad left	19:42
	← dsdeiz left	19:42
	→ King_Hual joined	19:42
	← King_Hual left	19:42
	→ King_Hual joined	19:42
	← King_Hual left	19:43
	→ nvahalik joined	19:43
	→ nettoweb joined	19:43
	→ King_Hual joined	19:43
	← King_Hual left	19:43
	→ King_Hual joined	19:43
	→ marcogmonteiro joined	19:43
	← peoliye left	19:43
	→ marc_v92 joined	19:44
	← Spacew00t left	19:45
	← nvahalik left	19:47
	→ hackel joined	19:47
	→ waveclaw joined	19:47
	← abacuspowers left	19:50
	→ soerenb joined	19:50
	← NaN left	19:51
	→ _rgn joined	19:51
	← _rgn left	19:51
	→ _rgn joined	19:51
	← dvaske_ left	19:51
	← koltroll left	19:52
guardian	hello, is there a way to know git is operated from a GUI? I'm asking because I wondered whether I could prompt the user from my pre-commit hook	19:53
	← marcogmonteiro left	19:54
	← thiago left	19:55
	← noteness left	19:56
	→ micechal joined	19:56
Eugene	Not reliably	19:59
	→ noteness joined	19:59
Eugene	You can sniff environment variables for common GUIs, and change your hook's behaviour if any are found	19:59
	← nettoweb left	19:59
Eugene	Or check whether stdin/out/err are a TTY or a script	19:59
	← Sadeukko left	20:00
	→ devoldmx joined	20:00
	→ daito joined	20:00
	→ nnyk joined	20:01
	→ bronson joined	20:01
	← waveclaw left	20:02
	→ KtoTo joined	20:04
	← circ-user-aPkEg left	20:04
	← t4nk085 left	20:04
	← devoldmx left	20:05
	← daito left	20:05
	← bronson left	20:06
guardian	oh that last one I like it but don't know how to do it from bash	20:06
	well actually, with pre-push stdin is not a TTY already, even from a terminal	20:06
	thanks for the pointer Eugene I'll document myself about that	20:07
	→ CausaMortis joined	20:07
	← rath left	20:07
	← josuebrunel left	20:07
	→ relect joined	20:08
	→ circ-user-aPkEg joined	20:09
	← relect left	20:11
	→ damarusama joined	20:12
damarusama	I am new to git, I have a local repo, I want to put it on one of my server so someone else can clone it	20:12
	do I have to create something on the server first	20:12
	before I do a git remote add	20:12
	and git push	20:12
	→ nilg joined	20:13
CareBear\	damarusama : how will someone else access your server?	20:13
	← cuebix-wk left	20:13
damarusama	with a git clone ? it's a ssh server	20:13
CareBear\	damarusama : do you want it available to the public via e.g. http, or do you want to restrict access e.g. via ssh?	20:13
	→ zarubin joined	20:13
damarusama	only ssh	20:13
CareBear\	are you comfortable with unix permissions?	20:14
damarusama	sure, but we're using the same ssh user	20:14
CareBear\	ok	20:14
	on the server, run: git init --bare somefolder.git	20:14
damarusama	ha the git ini bare	20:14
	right	20:14
CareBear\	on your client, run: git remote add ssh://user@server/~/somefolder.git	20:15
	eh sorry	20:15
	on your client, run: git remote add server ssh://user@server/~/somefolder.git	20:15
	then, run: git push server master	20:15
	→ PaulCapestany joined	20:15
	→ NaN joined	20:15
	← NaN left	20:15
	→ NaN joined	20:15
	→ waveclaw joined	20:15
CareBear\	then someone else can run: git clone ssh://user@server/~/somefolder.git	20:15
damarusama	sweet thanks	20:16
	the init bare was missing ;)	20:16
	it's pushing now	20:16
	← micechal left	20:16
CareBear\	great	20:16
	you're welcome	20:17
damarusama	love the name ;) feel cared for now :D	20:17
	← NaN left	20:18
	← zarubin left	20:18
	→ _cyril_ joined	20:18
	→ nvahalik joined	20:18
damarusama	CareBear, let say the other computer what is to do a git clone, already have all the file downloaded	20:18
	r/what/that/	20:19
CareBear\	including the .git subdirectory?	20:19
damarusama	nope	20:19
	I see that would create a problem...	20:19
CareBear\	then you're out of luck	20:19
damarusama	right	20:19
CareBear\	the worktree with the actual source files is just a subset of what is stored in the .git dir	20:20
	← waveclaw left	20:20
	→ nettoweb joined	20:21
damarusama	ok, got to setup all my git ahead of time... the first push is quite long since I have a lot of image files in there	20:21
CareBear\	nod	20:22
	← _cyril_ left	20:24
circ-user-aPkEg	What if I have a feature per comit and realized in the end that they all need one change. I want to update them all incorporating some change into the all commits. Which strategy should I use?	20:24
	→ waveclaw joined	20:25
CareBear\	circ-user-aPkEg : are you comfortable with a !rewrite ?	20:25
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	20:25
	← pantsman- left	20:25
circ-user-aPkEg	that is mine local git	20:25
	→ Spacew00t joined	20:25
CareBear\	I disagree with infinitely better	20:25
	ok	20:25
	great	20:25
	use the git killer feature - interactive rebase	20:26
	← samw left	20:26
	← CausaMortis left	20:27
	← damarusama left	20:28
	→ samw joined	20:28
circ-user-aPkEg	I modified the root and picking the features. But, I do not understand the git logic: in one case it picks version of the current branch in the other it picks picked edit http://stackoverflow.com/questions/34187857	20:28
	→ alexruf joined	20:29
	→ anli_ joined	20:29
	← gfixler left	20:29
	← waveclaw left	20:29
	→ astrofog joined	20:32
texasmynsted	So I see this http://stackoverflow.com/questions/1753070/git-ignore-files-only-locally	20:32
	I want to ignore some files locally but do not want to put these in my global gitignore, nor do I want changes to these files to be over-written on a git reset —hard.	20:33
	How do I do that?	20:33
	← Spacew00t left	20:35
	→ bronson joined	20:35
CareBear\	circ-user-aPkEg : do you know the git data model? have a look at http://peter.stuge.se/git-data-model	20:36
	→ Laksh joined	20:36
	→ ig0r_ joined	20:37
	→ bigtoe joined	20:37
	← bigtoe left	20:37
	← rdnt left	20:37
CareBear\	circ-user-aPkEg : while a commit references the whole files, applying or picking a commit is not the act of "getting" that complete file - but rather the act of applying the patch corresponding to the picked commit	20:37
	→ Spacew00t joined	20:38
	→ krawchyk joined	20:38
	← bb010g left	20:38
CareBear\	circ-user-aPkEg : applying the diff between the picked commit's original parent and the picked commit	20:38
circ-user-aPkEg	ok, you are saying that cherry-pick does not look at accumulated changes since common root	20:39
CareBear\	sure	20:39
	a commit only exists in relation to its parent(s)	20:40
	please read the data model blog post	20:40
texasmynsted	I added an entry to .git/info/exclude	20:40
atrigent	texasmynsted: what's wrong with that stackoverflow answer?	20:40
texasmynsted	then modified a file that should have been excluded and it shows it has been modified	20:41
atrigent	oh, I don't think ignoring applies to files that are already tracked	20:41
CareBear\	correct	20:41
	→ FireArrow133 joined	20:41
texasmynsted	mmmk	20:42
	so you know what I want to do right?	20:42
	Some files are already tracked, that should not be, and I want to locally fix this.	20:43
	How do I do this?	20:43
CareBear\	texasmynsted : untrack them in the repo	20:43
	← rubyonra_ left	20:43
CareBear\	git rm	20:43
	then add them to .gitignore	20:43
	then celebrate success	20:43
atrigent	texasmynsted: you can't really do that only locally though	20:43
	unless you take care to not push that commit	20:43
texasmynsted	and then that change will be pushed to remote right?	20:43
	→ rubyonrailed joined	20:43
CareBear\	yes	20:43
texasmynsted	But I do not want to push that change to remote.	20:44
	→ biggertoe joined	20:44
texasmynsted	I want to fix this locally only	20:44
CareBear\	think about this: git can either track or not track files.	20:44
atrigent	texasmynsted: why do you not what this file tracked?	20:44
texasmynsted	There is no way to do this?	20:44
	→ waveclaw joined	20:44
CareBear\	no, git will either track a file or not track a file	20:44
	you can only have it one way	20:44
texasmynsted	Because it is an artifact of the IDE not a source file	20:44
atrigent	texasmynsted: that stackoverflow answer mentions --assume-unchanged, have you tried that?	20:45
CareBear\	if you don't need the file in the repo then git rm it	20:45
texasmynsted	I can not imagine why anybody would track the file but I do not want to "correct" this for all the users of the repo	20:45
CareBear\	so talk with them first, then	20:45
	maybe someone knows the IDE better than you and can say whether it's fine to rm+ignore it or not	20:45
atrigent	in general though, yes, if the file shouldn't be in version control, you should just remove it	20:45
	→ ash_mobile joined	20:46
ash_mobile	What do we all think of Beanstalk?	20:46
texasmynsted	That so article says "git-update-index --assume-unchanged was never meant to ignore changes to tracked files "	20:46
	→ Chill-Surf joined	20:47
ash_mobile	Actually, is there a better place to talk about deployment?	20:47
CareBear\	!deploy	20:47
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	20:47
	← biggertoe left	20:47
ash_mobile	CareBear\ no personal prefs?	20:48
atrigent	texasmynsted: that's probably true, but where do you see that? I don't see it in that post	20:48
	← sazed left	20:48
	→ Stace joined	20:49
	← alexruf left	20:49
Stace	dammit, I now know why re-writing history in git is a PITA	20:49
	→ alexruf joined	20:49
Stace	a coworker just did that and I had a commit waiting to be pushed and it screwed my repo over royally	20:49
	← Chill_Surf left	20:50
texasmynsted	Oh whooops it is in a link from that one here —> http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged	20:50
	→ fragMental joined	20:50
atrigent	texasmynsted: ok, it looks like you might actually want --skip-worktree then	20:51
	← Laksh left	20:51
	← alexruf left	20:51
atrigent	see here http://stackoverflow.com/questions/13630849/git-difference-between-assume-unchanged-and-skip-worktree?lq=1	20:51
	although you should figure out what the deal really is with this file	20:51
	→ CausaMortis joined	20:52
atrigent	oftentimes it is useful to track IDE files	20:52
	→ laksh joined	20:52
	→ abacuspowers joined	20:52
texasmynsted	oooh. Thank you	20:52
	→ zeroed joined	20:53
	→ otter768 joined	20:53
	← laksh left	20:53
CareBear\	ash_mobile : joemaller.com/990	20:53
atrigent	texasmynsted: which IDE and which file is it, if I may ask?	20:53
CareBear\	Stace : rewrites are not a problem if there is adequate communication	20:54
	Stace : but if there is no communication then they can be a lot of work to deal with	20:54
	← The_Phoenix left	20:55
texasmynsted	Intellij IDEA	20:55
	.idea/misc.xml	20:55
atrigent	it looks like that is supposed to be tracked	20:56
	→ gfixler joined	20:57
	← ash_mobile left	20:57
	← otter768 left	20:58
	← funfunctor left	20:58
	→ mehola joined	20:58
	← ESphynx left	20:58
	← samw left	20:59
	← faux___ left	21:00
	→ oojacoboo joined	21:00
	← kevwil left	21:00
	→ samw joined	21:00
	← samw left	21:00
	← bronson left	21:01
	← mehola left	21:02
	→ Sucks joined	21:03
	← jimi_ left	21:04
	→ mogli joined	21:04
	← Gamecubic left	21:05
	→ Gamecubic joined	21:05
	→ jonno11 joined	21:05
	→ faux___ joined	21:06
	→ zarubin joined	21:06
	→ kadoban joined	21:06
mogli	anyone knows how move .git folder to its parent folder without loosing the history?	21:07
milki	.git contains the history of the repo	21:07
	← forbidden404 left	21:07
	← Sigfrid left	21:08
milki	mogli: you can easily clone the repo and delete the original copy i suppose	21:08
mogli	can i move .git to its parent folder just cut & paste operation	21:08
Stace	CareBear\: yeah, had I been able to push the commit first it would have been fine.	21:08
milki	mogli: if you do that, you wont have a repo in the original location	21:09
	mogli: !xy	21:09
gitinfo	mogli: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...	21:09
	→ abra0 joined	21:09
mogli	here is my detail question http://stackoverflow.com/questions/34229645/how-to-move-git-folder-to-parent-folder-without-loosing-history	21:09
	← mwhooker left	21:09
	← nilg left	21:10
	→ samw joined	21:10
	← faux___ left	21:10
	← King_Hual left	21:10
mogli	im in the process of transfer TFS to git using git-tf or git-tfs tools..these tools creates .git folder under the project folder.	21:11
milki	mogli: mv reclone the repo in C:\ and then move/rename things as needed	21:11
	→ forbidden404 joined	21:12
	← phrozensilver left	21:12
mogli	I cut and pasted .git folder from “C:\MyRepo\MyProject\.git” to “C:\MyRepo”. Then from the command prompt “C:\MyRepo” i executed “git add *” and then “git commit” to commit changes locally. Then add new folders under “MyRepo” and executed add and commit again	21:12
	→ faux___ joined	21:12
mogli	would that work	21:12
	→ _cyril_ joined	21:12
milki	well, none of those commands will result in an error i suppose	21:13
	i dont think it will give you the end result you want	21:13
atrigent	I think you'd want to first do git add -u and then git add MyProject	21:14
	→ picachu joined	21:14
atrigent	to make sure the right things got removed	21:14
	→ bronson joined	21:14
	→ dvaske_ joined	21:14
	← nvahalik left	21:15
atrigent	and then git diff -M to make extra sure	21:15
	with --staged, of course	21:15
	→ ImuMotive joined	21:15
CareBear\	I smell filter-branch	21:15
milki	CareBear\: that would probably be ideal. but if we are starting from moving a .git folder, its probably too advanced	21:16
mogli	whats filter-branch	21:16
	← faux___ left	21:17
j416	mogli: man git-filter-branch	21:17
texasmynsted	why should that be tracked	21:17
gitinfo	mogli: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	21:17
	← dvaske_ left	21:17
	← marc_v92 left	21:17
	← FireArrow133 left	21:17
atrigent	oh yeah, if this is a new git repo then filter-branch would be good	21:17
texasmynsted	I mean why should .idea/misc.xml be tracked?	21:17
	← OnkelTem left	21:17
	← Sucks left	21:18
atrigent	texasmynsted: it seems that the official recommendation is to track it	21:18
	→ Sucks joined	21:18
atrigent	but I also see some people wanting not to track it for various reasons	21:18
	→ nvahalik joined	21:18
texasmynsted	where?	21:18
atrigent	so I don't really know	21:18
	→ faux___ joined	21:18
texasmynsted	where is this official recommendation	21:18
atrigent	texasmynsted: https://devnet.jetbrains.com/docs/DOC-1186	21:18
	→ OnkelTem joined	21:18
	→ daivyk joined	21:19
atrigent	I used my google-fu, which is a skill that I guard closely	21:19
	→ mrx-420 joined	21:19
mogli	has anyone used "git-tfs" tool to transfer TFS branch to git. I need to exclude certain folders from the TFS branch while transferring	21:21
s00pcan	mogli: I couldn't get it to work, because the repo I wanted was stupid large (80GB+) and required doing it all in one go, which never happened	21:22
texasmynsted	https://intellij-support.jetbrains.com/hc/en-us/articles/206827587-How-to-manage-projects-under-Version-Control-Systems	21:22
s00pcan	mogli: tfs is awful, you should find a new job	21:22
atrigent	texasmynsted: yes, I just noticed that link hah	21:22
	it seems to say the same thing though, roughly	21:22
mogli	s00pcan: thats why we are transfering to git	21:23
texasmynsted	except for .idea/misc.xml	21:23
	there are other people having problems with that being shared	21:23
	← User458764 left	21:23
atrigent	yes, I see that	21:23
	← faux___ left	21:23
s00pcan	mogli: great then. It's much easier if you just give up the history... but I'm assuming you don't want that	21:23
atrigent	texasmynsted: is the problem that you're having one of the ones mentioned there?	21:23
	→ nilg joined	21:23
mogli	ye thats the problem, we want the history	21:24
	← bronson left	21:24
s00pcan	well, the cli things that git-tfs uses are from microsoft, and they are pathetic	21:24
	→ phrozensilver joined	21:25
atrigent	in any case, I only know what I can find talked about on the internet	21:25
	← picachu left	21:26
	→ tomog999 joined	21:27
	← dreiss left	21:27
	← Rodya_ left	21:27
	← mogli left	21:27
	← algae left	21:28
	← AndroidLoverInSF left	21:28
	← _cyril_ left	21:28
	→ AndroidLoverInSF joined	21:29
	← tomog999_ left	21:29
	→ tgunr joined	21:29
	→ faux___ joined	21:31
	← Sucks left	21:31
	← MattMaker left	21:31
	→ israelzuniga joined	21:31
	→ ncthom91 joined	21:32
	→ MattMaker joined	21:32
	← leeN left	21:32
	← nvahalik left	21:35
	← faux___ left	21:35
	→ unreal joined	21:35
	← CausaMortis left	21:36
	→ MarkyC_ joined	21:37
	← rubyonrailed left	21:37
	← roygbiv left	21:37
	← ulkesh left	21:37
	← nettoweb left	21:38
	→ ulkesh joined	21:38
	→ nvahalik joined	21:38
	← MarkyC left	21:39
	← crunchers left	21:39
	→ bronson joined	21:41
	→ rubyonrailed joined	21:44
	← rwb left	21:45
	← Jackneill left	21:46
	→ tang^ joined	21:46
	→ faux___ joined	21:46
	← editshare-ericf left	21:46
	→ lmatteis joined	21:46
	← MattMaker left	21:46
	→ MattMaker joined	21:47
	← zarubin left	21:49
	← nvahalik left	21:49
	→ zarubin joined	21:50
	→ nvahalik joined	21:50
	→ finisherr joined	21:51
	← faux___ left	21:51
finisherr	Hello folks. I have a git repo problem where my remote, base, and local branches (is evidenced from vimdiif as a mergetool) for one file in my repo	21:51
	it keeps happening	21:52
	→ faux___ joined	21:52
finisherr	what exactly is base?	21:52
	← MarkyC_ left	21:52
CareBear\	probably the last commit common to your branch and the remote	21:53
	← Ahmed90 left	21:53
	← zarubin left	21:54
	← faux___ left	21:56
	← rnsanchez_ left	21:59
	← anth0ny left	21:59
	← bronson left	22:00
	→ devoldmx joined	22:01
	→ daito joined	22:01
	→ doener joined	22:02
	→ tesla_ joined	22:02
	← BSaboia left	22:03
	→ peoliye joined	22:04
	← finisherr left	22:04
	→ faux___ joined	22:04
	← devoldmx left	22:05
	→ ndim joined	22:05
	← akshat left	22:06
	← daito left	22:06
	→ yqt joined	22:08
	← nnyk left	22:08
	→ zarubin joined	22:08
	← yashu-seth left	22:08
	← faux___ left	22:09
	→ drawkula joined	22:09
	→ dreiss joined	22:09
	← zarubin left	22:10
	→ puff joined	22:10
	→ zarubin joined	22:10
	→ faux___ joined	22:10
	→ crunchers joined	22:12
	→ zarubin_ joined	22:13
	← zarubin left	22:13
	← crunchers left	22:13
	← jaafar left	22:14
	→ crunchers joined	22:14
	← mellernoia-work left	22:14
	← nilg left	22:14
	← faux___ left	22:14
	← astrofog left	22:14
	← toogley left	22:15
	→ toogley joined	22:17
	← dorkmafi1 left	22:18
	→ editshare-ericf joined	22:18
	← BBBThunda left	22:18
	← Spacew00t left	22:18
	→ boombatower joined	22:19
	← toogley left	22:22
	← rubyonrailed left	22:22
	← krawchyk left	22:23
	← DolphinDream left	22:24
	→ nettoweb joined	22:25
	← ImuMotive left	22:25
	→ _cyril_ joined	22:25
	→ Rodya_ joined	22:28
	→ AbigailBuccaneer joined	22:30
	→ Sendoushi joined	22:30
	← Rodya_ left	22:33
	→ Rodya_ joined	22:34
	← sgambino left	22:34
	← italoacasas left	22:34
	← uri_ left	22:35
	← noteness left	22:35
	→ kolobyte joined	22:36
	→ thiago joined	22:38
	→ mwhooker joined	22:38
	→ dorkmafi1 joined	22:38
	→ noteness joined	22:38
	← circ-user-aPkEg left	22:39
	→ Goobbue joined	22:40
	← petaflot left	22:40
	← Dougie187 left	22:40
	→ petaflot joined	22:40
	→ axl_ joined	22:41
	→ ska joined	22:42
	← cagedwisdom left	22:42
	→ finisherr joined	22:42
finisherr	Is there a way to update the base so that I can avoid merge conflicts?	22:42
	→ toothrot joined	22:42
finisherr	it seems like my base is out of step for this one repo	22:43
ska	I have a develop branch that was tagged for rlease at point a, but was not release, and has subsequent commits.. how can i release to develop from point a (that is tagged as a1) for exampel/?	22:43
	← cbonobo left	22:43
	← _cyril_ left	22:43
	→ kevwil joined	22:43
ska	sorry.. s/release to develop/release to master from develop at tag a1/	22:43
	← petaflot left	22:45
	→ Sucks joined	22:45
	→ petaflot joined	22:45
	← petaflot left	22:45
	→ krawchyk joined	22:47
	← krawchyk left	22:47
	← aartist left	22:47
	← mrx-420 left	22:50
	← gopar left	22:50
	→ petaflot joined	22:50
	→ Poppa joined	22:50
	← synthroid left	22:51
	→ Puhe joined	22:52
	→ nestor joined	22:54
	← kinokoio left	22:54
	→ kinokoio joined	22:54
	→ otter768 joined	22:54
	← kinokoio left	22:56
	← crunchers left	22:56
	← samw left	22:57
	← fscala left	22:57
	→ faux___ joined	22:58
	→ fscala joined	22:58
	← dstarh left	22:58
	← otter768 left	22:58
	← ncthom91 left	22:59
	→ bronson joined	23:00
	→ durham_ joined	23:02
	← faux___ left	23:02
	← tang^ left	23:05
	← durham left	23:05
	→ dstarh joined	23:05
	← bronson left	23:05
	← puff left	23:07
	→ jrnieder joined	23:07
	← BrianBlaze420 left	23:08
	→ samw joined	23:08
	← chitopunk left	23:09
	→ puff joined	23:09
	← diogenese left	23:09
	→ CKyle joined	23:10
	← editshare-ericf left	23:11
	← axl_ left	23:11
	→ roygbiv joined	23:13
	← espindola left	23:14
	← geri left	23:14
	→ justinmburrous joined	23:16
	← justinmburrous left	23:16
	← nvahalik left	23:16
	→ astronautlevel joined	23:17
	gitinfo set mode: +v	23:17
	← zarubin_ left	23:18
	→ MistahKurtz joined	23:19
	← codeman left	23:20
	← durham_ left	23:21
	← finisherr left	23:21
	→ durham joined	23:22
	→ rnsanchez joined	23:22
	← dstarh left	23:23
	→ geri joined	23:25
	→ BtbN joined	23:26
	→ sonOfRa joined	23:26
	→ crayon joined	23:28
	→ adamm joined	23:29
	← cvanball_ left	23:29
	← eijk_ left	23:31
	← kevwil left	23:31
	→ gopar joined	23:33
	← juggle left	23:35
	← ryoshu left	23:35
	← madewokherd left	23:36
	← tvw left	23:41
	← Kicer86 left	23:43
	← doener left	23:43
	→ woodruffw joined	23:43
	← jost left	23:44
	← samw left	23:44
	← MattMaker left	23:45
	← filisko left	23:46
	← roxlu left	23:46
wyoung	Should i use git or mercurial?	23:47
	→ leonarth joined	23:48
preaction	whichever one fits your project requirements	23:49
	← Goobbue left	23:49
	← jonno11 left	23:50
	→ mrx-420 joined	23:50
	← zeroed left	23:51
	→ Goobbue joined	23:51
	→ zeroed joined	23:52
	→ ome joined	23:53
	→ jonno11 joined	23:55
	→ diogenese joined	23:55
	→ samw joined	23:55
	→ _cyril_ joined	23:56
	← dreiss left	23:56
	← tfry left	23:58
	→ tfry joined	23:58
kadoban	wyoung: Yes.	23:58
	→ devoldmx joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation