IRCloggy #git 2014-03-17

Provider of IRC logs since 2005.

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

	2014-03-17
	→ l0cust joined	00:00
	← bbloom left	00:00
	← Sonderblade left	00:00
	→ eletuchy joined	00:01
	← wrouesnel1 left	00:01
	→ hakunin joined	00:01
	→ ilmgb joined	00:01
	→ SocalNick joined	00:02
hakunin	given a specific merge conflict, is there a way to find a commit in "theirs" that introduced the conflict?	00:02
RichiH	hakunin: !blame	00:03
	!blame	00:03
Geo	ok, that got me connected	00:03
	RichiH scratches head	00:03
Geo	thanks milki	00:03
	→ neo1691 joined	00:04
	→ johnkevinmbasco joined	00:04
	offby1 rubs chin	00:04
RichiH	hakunin: man git blame	00:04
gitinfo	hakunin: the git-blame manpage is available at http://jk.gs/git-blame.html	00:04
hakunin	RichiH: i gotcha, i forgot that blame shows me the sha of both conflict sides	00:04
RichiH	hakunin: np	00:04
offby1	I've never run 'git blame' on a conflicted file.	00:04
	never occurred to me.	00:04
	← bwreilly left	00:04
RichiH	offby1: i never tried it myself	00:04
	but i am wondering if it works	00:05
	if not, hakunin can simply blame the remote branch	00:05
	→ tmcmahon joined	00:05
RichiH	hakunin: does it work?	00:05
hakunin	RichiH: checking	00:05
	← kyb3r_ left	00:05
	← eletuchy left	00:05
	→ kyb3r_ joined	00:06
	← ilmgb left	00:06
	← trewe left	00:06
hakunin	RichiH: yeah, looks legit, got the commit i was looking for	00:06
RichiH	good good	00:06
hakunin	RichiH: commit msg sucks though, but that's another story : )	00:06
RichiH	well, all the more reason to actually blame ;)	00:07
hakunin	indeed	00:07
	← tmcmahon left	00:07
	← codeFiend left	00:07
	← kcj left	00:08
	→ Exancillatus joined	00:08
	← kyb3r_ left	00:08
	→ laserbeam joined	00:09
	→ kyb3r_ joined	00:09
	← sgen left	00:10
	← noxd_ left	00:10
	→ sgen joined	00:11
	← Exancillatus left	00:13
	← johnkevinmbasco left	00:13
	← laserbeam left	00:13
	→ MattStra_ joined	00:13
	← mikepack left	00:14
	→ mikepack joined	00:15
	→ gordian joined	00:15
	← amcsi left	00:16
LeMike	how do i get the current working dir when I am within an alias?	00:17
milki	within an alias?	00:18
	→ sohail joined	00:18
	→ eletuchy_ joined	00:18
	→ Zifre joined	00:18
	xnrand → o-o	00:19
	← mikepack left	00:19
	← zajn left	00:19
	→ Kayra joined	00:21
	← lolmaus_ left	00:23
	← godgodgodgo left	00:24
	← rl_ left	00:25
	← Kayra left	00:26
	→ Goplat joined	00:26
	← o-o left	00:27
	→ xnrand joined	00:27
	→ MattMaker joined	00:27
	← MattStra_ left	00:29
	→ Gavrisimo joined	00:29
	← obert left	00:30
	← gordian left	00:31
	→ zajn joined	00:32
	← albioner left	00:32
	← kotopies left	00:33
	← Gavrisimo left	00:34
	→ rchavik joined	00:34
	→ pfg joined	00:36
	← mellernoia left	00:37
	→ mellernoia joined	00:38
	← blackmesa left	00:39
	→ WXZ joined	00:40
	← SHyx0rmZ left	00:40
	← glebihan left	00:40
	→ thalisson_ joined	00:43
	→ glebihan joined	00:44
	← simesy left	00:45
	← n-st left	00:45
	← eletuchy_ left	00:45
	← SocalNick left	00:45
	→ eletuchy joined	00:45
	← glebihan left	00:45
	→ simesy joined	00:46
	← Brando753 left	00:46
	→ glebihan joined	00:46
	→ codeFiend joined	00:46
	→ eletuchy_ joined	00:47
	← eletuchy left	00:47
	← eletuchy_ left	00:47
	← glebihan left	00:48
	← tomengland left	00:48
	→ Brando753 joined	00:48
	→ eletuchy joined	00:48
	← AccessibleWeb left	00:48
	→ glebihan joined	00:48
	→ tomengland joined	00:48
	← cads left	00:49
	→ lolmaus joined	00:50
	← l0cust left	00:50
	← boombatower left	00:51
	← arif-ali left	00:51
	← codeFiend left	00:51
	← tomengland left	00:53
	← glebihan left	00:53
	→ AccessibleWeb joined	00:54
	← yhager_ left	00:59
	→ Sabbath joined	01:01
	← hkj left	01:01
	→ ilmgb joined	01:02
	→ lasers joined	01:02
	→ codeFiend joined	01:02
	← dort left	01:06
	→ ni__ joined	01:06
	← ilmgb left	01:07
	← AccessibleWeb left	01:07
	→ hkj joined	01:07
	← neo1691 left	01:07
	→ ArcTanSusan joined	01:08
	← jrahmy left	01:08
	← harish left	01:09
	→ Exancillatus joined	01:09
	← robustus left	01:09
	→ laserbeam joined	01:09
	→ weiyang joined	01:09
	← Balliad left	01:09
	→ robustus joined	01:11
	← ni__ left	01:12
	→ jrahmy joined	01:13
	← anry left	01:13
	← Exancillatus left	01:13
	→ hyperair joined	01:13
	→ sdouglas joined	01:13
	← laserbeam left	01:14
	→ SocalNick joined	01:15
	→ Kayra joined	01:19
	→ Gooder joined	01:19
	→ lresende joined	01:20
	← lresende left	01:20
	← mellernoia left	01:20
	→ arif-ali joined	01:20
	← ArcTanSusan left	01:20
	← dog-food_ left	01:20
	→ mellernoia joined	01:21
	→ yhager joined	01:21
	→ gnugnu9 joined	01:21
	→ gnugnu9_ joined	01:21
	← gnugnu9_ left	01:21
	← kyb3r_ left	01:23
	→ kyb3r_ joined	01:23
	← Kayra left	01:24
	← veebers left	01:24
	→ veebers joined	01:24
	← kyb3r_ left	01:24
	← isbadawi left	01:25
	→ kyb3r_ joined	01:25
	→ dccc joined	01:25
	← kyb3r_ left	01:26
	→ kyb3r_ joined	01:27
	→ koell joined	01:27
	← sgen left	01:30
	→ Gavrisimo joined	01:30
	← kyb3r_ left	01:30
	→ kyb3r_ joined	01:30
	← kyb3r_ left	01:31
	← ecualombian left	01:31
	→ kyb3r_ joined	01:32
	← veebers left	01:32
	→ scarabx joined	01:32
	← akim_ left	01:33
	→ veebers joined	01:34
	→ ezekielnoob joined	01:34
	← Gavrisimo left	01:34
	← yhager left	01:35
	→ devoldmx joined	01:36
	→ AccessibleWeb joined	01:38
	→ mikepack joined	01:39
	← mikepack left	01:39
	→ mikepack joined	01:40
	← _iron left	01:42
	← Xiti left	01:42
	← AccessibleWeb left	01:42
	← herdingcat left	01:43
Foxhoundz	good god git is awesome	01:44
	← mikepack left	01:44
	← Geo left	01:44
	← Spyro left	01:44
	← bluesm left	01:45
	→ griotspeak joined	01:45
	→ francisfish joined	01:45
	→ Spyro joined	01:46
	← Spyro left	01:47
	← LeMike left	01:47
	→ Spyro joined	01:49
	→ tokik joined	01:49
	→ mizu_no_oto joined	01:50
	← francisfish left	01:50
	→ naught101 joined	01:50
	→ kruxoman joined	01:51
naught101	Is it possible to rebase, taking account of a parent directory rename in the branch you're rebasing onto?	01:51
kruxoman	I need some help related to git. I have some static images for my project but don't know where to place them. Any ideas?	01:51
naught101	kruxoman: what's the problem? Just put them where ever it makes sense...	01:52
	static images aren't any different to text files, if it's just a question of storage	01:52
	← sceox left	01:53
kruxoman	naught101: The problem is when someone else clones the project. There are a bunch of images missing. Should I include the in my repo?	01:53
naught101	kruxoman: of course, if you want them to be cloned with the rest of the repo.	01:54
	→ daito joined	01:54
	← scelis left	01:56
kruxoman	naught101: As I learnt I should try to only version control code. Is the rule to include everything that is needed for the project to "work" when cloned?	01:57
	← shruggar left	01:58
naught101	kruxoman: You shouldn't include any files (text or binary) that are generated by the project (because they're unneccesary, and make repo maintenance annoying). But there's no problem including images in general	01:59
	← mikecmpbll left	01:59
	← jday_ left	02:00
	→ lamont joined	02:00
	→ Xiti joined	02:00
	← WaReZ left	02:01
	← sohail left	02:02
	← tho left	02:02
	→ ilmgb joined	02:03
	→ mountHouli joined	02:04
	→ dvide joined	02:04
	← arif-ali left	02:04
	→ sceox joined	02:05
	→ Vampire0_ joined	02:05
	← ilmgb left	02:08
	← thalisson_ left	02:08
	← Vampire0 left	02:08
	← mountHouli left	02:09
	→ luc__ joined	02:09
	→ Exancillatus joined	02:10
	→ laserbeam joined	02:10
	→ woollyams joined	02:11
	← gnugnu9 left	02:12
	→ ArcTanSusan joined	02:12
	flazz_gone → flazz	02:12
	→ oojacoboo joined	02:13
	← Exancillatus left	02:14
	← laserbeam left	02:15
	→ purpleidea joined	02:17
	→ Kayra joined	02:19
	gitinfo set mode: +v	02:20
purpleidea	hi there, i'm trying to merge my rhs branch of https://github.com/purpleidea/puppet-gluster onto master... i'd like master to see each individual commit that's seen in the rhs branch. i'm getting stuck with what's correct. merge doesn't keep each commit separate, and rebasing the rhs branch isn't working. advice?	02:20
	→ MoogleCharm joined	02:21
skorgon	purpleidea: git checkout master && git merge rhs	02:21
purpleidea	skorgon: this glues it all together into one commit...	02:22
skorgon	purpleidea: even rebasing should keep all commits, unless a change is already present in master	02:22
	purpleidea: no it doesn't	02:22
purpleidea	skorgon: there is one change in master that the rhs branch doesn't have...	02:22
skorgon	unless you specify something like --squash with the merge	02:22
	→ TheMadMechanic joined	02:23
	→ diegoviola joined	02:23
purpleidea	skorgon: oh. wait	02:24
	← Kayra left	02:24
purpleidea	skorgon: i think i misunderstood something... the git merge rhs worked... what i don't understand is why it needed a new commit message "Merge branch 'rhs'" ?	02:24
	(or what is attached to that commit message?)	02:25
skorgon	because that is where the two branches come together.	02:25
purpleidea	skorgon: so it's a commit, but there are zero code changes associated with it? (the previous commits are the changes made by the branch...)	02:26
skorgon	well it merges the chagnes from both branches	02:26
	which can even conflict	02:26
	so there are likely some changes	02:27
purpleidea	skorgon: what would the command have been if i wanted it to look as if i was just coding on master all along, even though it was in rhs branch?	02:27
skorgon	you could have rebased rhs on top of master	02:27
	and then merge rhs, but after rebase it should simply fast-forward	02:27
purpleidea	skorgon: ! right... i tried this, and i couldn't get it to work ...	02:28
skorgon	or you could have cherry-picked the branches from rhs to master	02:28
purpleidea	^^ your comment is what i was trying to do, but i couldn't get the rebase to work...	02:28
	← Sabbath left	02:29
skorgon	unless you merged something, it should simply have been git checkout rhs && git rebase master	02:29
purpleidea	skorgon: what happens if you: git clone https://github.com/purpleidea/puppet-gluster && cd puppet-gluster && git checkout rhs && git rebase -i master ?	02:29
skorgon	i guess it'l rebase - interactively - onto master	02:30
	→ Gavrisimo joined	02:31
purpleidea	skorgon: nope: http://paste.fedoraproject.org/85951/02347313	02:31
	^^^ and i'd like to know how to solve this please	02:31
skorgon	well, the merge is conflicting, you have to resolve the conflict and move on afterwards	02:32
purpleidea	skorgon: :P if i knew how to do that i wouldn't be asking here...	02:32
	→ Sabbath joined	02:32
skorgon	run git status to see what is conflicting, edit/resolve the conflicts, git add the changes and to git rebase --continue	02:32
	→ sdouglas_ joined	02:32
skorgon	s/to/do	02:32
	← veebers left	02:32
purpleidea	skorgon: yes, normally i know how to do this, but its a conflict with the submodule :P	02:33
	→ veebers joined	02:33
	← sdouglas left	02:34
	→ mmoretti joined	02:35
	← Gavrisimo left	02:36
skorgon	well, i never had a submpodule conflicting, but i assume it shouldn't be much different than anything else	02:36
	do you want master's or rhs's or a completely different commit at the submodule?	02:37
	← MoogleCharm left	02:37
skorgon	most likely git checkout --theirs/--ours resolves it, you just have to figure out who's right about the submodule	02:37
	→ hobodave joined	02:37
purpleidea	skorgon: it doesn't look like a conflict to me!	02:38
	← hobodave left	02:38
	→ AccessibleWeb joined	02:39
skorgon	what is git diff saying?	02:39
	→ boombatower joined	02:39
purpleidea	skorgon: i posted the specific example so anyone could try and explain to me what's going on... if you have a sec to try it, that's great, i appreciate it, other nm thanks anyways	02:39
	← Noldorin left	02:40
	← zajn left	02:41
	← okias left	02:42
	→ talios joined	02:43
	← talios left	02:43
	→ talios joined	02:43
	← AccessibleWeb left	02:43
	← lindenle left	02:44
	→ yhager joined	02:44
	→ jenia joined	02:45
	← griotspeak left	02:46
	← Ziber left	02:46
jenia	hello	02:46
	← mamarley left	02:46
	← SamB left	02:46
	← danmackay left	02:46
jenia	how do i completly discard one file	02:46
	← lithiumjake left	02:46
jenia	its giving me problems in terms of conflicts	02:46
purpleidea	jenia: git rm <file> ?	02:47
	→ albioner joined	02:47
jenia	no. i want it to be replaced by the file in the db. so that the merge conflict be resolved	02:47
	purpleidea, @	02:47
purpleidea	jenia: git checkout <file> ?	02:47
jenia	thanks	02:47
	← CussBot left	02:48
purpleidea	jenia: my pleasure	02:48
	→ CussBot joined	02:48
	krkini → kini	02:48
	→ glebihan joined	02:49
	→ sohail joined	02:49
	← mmoretti left	02:50
	← CussBot left	02:52
	← amikiri left	02:53
	← phuh left	02:54
	→ phuh joined	02:54
	← kukks left	02:55
	← sdouglas_ left	02:55
	→ isbadawi joined	02:56
skorgon	purpleidea: interesting problem, and i don't know how this is supposed to work.	02:57
	i had expected that i could use git checkout --ours/theirs on the conflicting path, but that doesn't seem to do anything	02:57
	→ harish joined	02:58
	→ mamarley joined	02:59
	→ bbloom joined	02:59
purpleidea	skorgon: no worries. thanks anyways	02:59
	→ kukks joined	02:59
purpleidea	@fileabug	02:59
skorgon	purpleidea: ha, it works if you have the submodule initialized and updated	03:00
	← kukks left	03:00
	→ hwrdprkns joined	03:00
purpleidea	nope	03:00
	← isbadawi left	03:00
skorgon	it does here	03:00
purpleidea	i just updated the branches with a fix...	03:01
	← BJfreeman left	03:01
	← daito left	03:02
	← tureba left	03:03
	→ isbadawi joined	03:03
	→ HelloComputer15 joined	03:04
	← hwrdprkns left	03:05
	→ hwrdprkns joined	03:05
	← devoldmx left	03:05
	→ daito joined	03:06
	← jrahmy left	03:06
	← hwrdprkns left	03:06
	→ jrahmy joined	03:07
	→ moondoggy joined	03:08
	→ Exancillatus joined	03:10
	← yhager left	03:10
	→ laserbeam joined	03:11
	← CheckDavid left	03:12
	← thrakcat1ack left	03:12
	← thrakcattack left	03:13
	→ MoogleCharm joined	03:13
	→ amskah joined	03:13
	← scarabx left	03:14
	→ thrakcattack joined	03:14
	← Exancillatus left	03:15
	→ thrakcat1ack joined	03:15
	← laserbeam left	03:16
	← JerryT left	03:16
	→ SamB joined	03:16
	→ danmackay joined	03:18
	→ Kayra joined	03:19
	→ shingshang joined	03:19
	← Sabbath left	03:20
	→ Ziber joined	03:20
	→ njection joined	03:21
	← oojacoboo left	03:21
	→ sdouglas joined	03:22
	← jon-mac left	03:22
	→ Sabbath joined	03:23
	← Kayra left	03:24
	← mellernoia left	03:25
	→ nottombrown joined	03:25
	← madewokherd left	03:30
	→ Gavrisimo joined	03:31
Vinnie_win	If I issue 'git reset HEAD^' how can I re-commit after adding to the index with the same commit message but without having to re-enter it?	03:33
	← makubi_ left	03:33
	→ ilmgb joined	03:33
	← boombatower left	03:33
Cathy	Vinnie_win, you can use git commit -C and specify the hash of the commit you stripped off	03:35
	but that's not the best way to do this	03:35
	instead, don't use git reset HEAD^, and just make further changes to the index	03:35
	then use git commit --amend --no-edit	03:35
	→ lithiumjake joined	03:35
	← veebers left	03:35
	← reecefowell left	03:36
Vinnie_win	So here's my use case, I have a commit I want to edit and the change I want to make is to remove a file from the change set , amend the commit, and then recommit that file in the subsequence commit (i.e. split the file out)	03:36
	← Gavrisimo left	03:36
Cathy	so, use `git rm ...`, then `git commit --amend --no-edit`	03:36
	then commit the impugned file in the next commit	03:36
Vinnie_win	git rm only unstages it?	03:36
Cathy	there is a flag to it to only unstage it	03:37
	→ reecefowell joined	03:37
Vinnie_win	git rm is not something I use often ^_^	03:37
Cathy	`git rm --cached` apparently	03:37
Vinnie_win	yep, looking at it now	03:37
	→ makubi joined	03:37
Vinnie_win	what's the difference between --no-edit and -C HEAD	03:38
Cathy	there isn't one	03:38
	← ilmgb left	03:38
Vinnie_win	noice...thanks, this is going to tidy up what was previously a painful workflow.	03:38
	→ AccessibleWeb joined	03:40
	→ m0ltar joined	03:41
	→ yhager joined	03:41
	← TheMadMechanic left	03:43
	→ oojacoboo joined	03:44
	← AccessibleWeb left	03:44
	← [1]JPeterson left	03:45
	→ veebers joined	03:45
	→ francisfish joined	03:46
	← BeardlessOne left	03:47
	← snuffeluffegus left	03:47
	← veebers left	03:49
	→ dik_dak joined	03:49
	← Wulf left	03:49
	← mizu_no_oto left	03:50
	← francisfish left	03:51
	← Bass10 left	03:51
	→ Wulf joined	03:51
	← yhager left	03:52
	← lithiumjake left	03:55
	← oojacoboo left	03:55
	← albioner left	03:56
	→ boombatower joined	03:59
	← nottombrown left	03:59
	← bitkiller left	04:01
	← sohail left	04:06
	→ swollenmember joined	04:07
	← arand__ left	04:08
	→ Exancillatus joined	04:11
	→ kcj joined	04:11
	→ laserbeam joined	04:12
	← shoerain left	04:12
	→ oodavid joined	04:12
	Keridos → Keridos_off	04:13
	← CKyle left	04:13
	→ john2x joined	04:14
	← Exancillatus left	04:16
	← laserbeam left	04:16
	→ pheaver joined	04:17
	→ bitkiller joined	04:17
	→ dog-food joined	04:17
	← daito left	04:18
	← bartman`` left	04:19
	← Lunatrius left	04:20
	← koda left	04:20
	← jcvfen_ left	04:20
	← bitkiller left	04:22
	← Sabbath left	04:22
	→ Sabbath joined	04:23
	→ twb joined	04:23
	→ tomengland joined	04:23
twb	In ~/.gitconfig I have [interactive] \n singlekey = true	04:23
	And it works on my old ubuntu 10.04 VM but it isn't working in my current VMs.	04:24
	→ Chryyz joined	04:24
twb	The manpage suggests it'll silently turn off that feature if it decides it can't do it -- is that what's happening to me?	04:24
	"Note that this setting is silently ignored if portable keystroke input is not available."	04:25
	Is that a perl module I don't have or something?	04:25
	← dik_dak left	04:26
	→ luc___ joined	04:28
	← luc__ left	04:28
	← asakura0 left	04:28
	→ eletuchy_ joined	04:30
	← pfg left	04:31
	→ Gavrisimo joined	04:32
	→ pfg joined	04:33
	→ cads joined	04:33
	← talios left	04:33
	→ ilmgb joined	04:34
	← eletuchy left	04:34
	→ veebers joined	04:35
	← Gavrisimo left	04:37
	→ iamntz joined	04:37
	← ilmgb left	04:38
	→ kytwb joined	04:39
	← tomengland left	04:39
	→ hobodave joined	04:39
	← watabou left	04:40
	→ AccessibleWeb joined	04:40
	→ hahuang65 joined	04:41
	flazz → flazz_gone	04:44
	→ jab416171 joined	04:44
	← AccessibleWeb left	04:45
	→ watabou joined	04:45
	→ zumba_ad_ joined	04:46
	→ paolooo joined	04:49
	← zumba_addict left	04:49
	← Sabbath left	04:50
	← hahuang65 left	04:50
	← gerard0 left	04:50
	→ gerard0 joined	04:51
	→ pikaren joined	04:51
	← simesy left	04:52
	→ simesy joined	04:52
	→ saurabh joined	04:53
	saurabh → Guest13652	04:53
	→ eletuchy joined	04:56
	← eletuchy_ left	04:58
	← m0ltar left	04:59
	→ yacks joined	05:00
	← hobodave left	05:02
	← zumba_ad_ left	05:03
	→ yhager joined	05:03
	→ Tommy[D]_ joined	05:04
	→ Sabbath joined	05:04
	← Tommy[D] left	05:07
	→ dualmal joined	05:08
	→ zumba_addict joined	05:09
	← pfg left	05:09
	→ hwrdprkns joined	05:09
	← chris_th_ left	05:10
	← swollenmember left	05:10
	→ nottombrown joined	05:10
	← pheaver left	05:11
	← cilly left	05:12
	→ Exancillatus joined	05:12
	→ laserbeam joined	05:12
	→ zoso joined	05:13
	← hwrdprkns left	05:13
	← veebers left	05:13
	← naught101 left	05:14
	→ cilly joined	05:14
	← nottombrown left	05:14
	→ t-mart joined	05:15
	← Exancillatus left	05:16
	← laserbeam left	05:17
	← nfroidure left	05:19
	→ Kayra joined	05:19
	→ hwrdprkns joined	05:23
	← Kayra left	05:24
	→ daito joined	05:26
	→ tomengland joined	05:26
	← hwrdprkns left	05:26
	← _lynX left	05:30
	← dog-food left	05:30
	← nicedice left	05:32
	→ ehmatthes joined	05:33
	← isbadawi left	05:33
	→ Gavrisimo joined	05:33
	← ghostlines left	05:34
	→ ilmgb joined	05:34
	→ isbadawi joined	05:36
	→ Xethron joined	05:37
	← DrNick3 left	05:37
	← Gavrisimo left	05:38
	→ zajn joined	05:38
	← ilmgb left	05:39
	→ khmarbaise joined	05:39
	← hkj left	05:40
	← isbadawi left	05:40
	← khmarbaise left	05:40
	→ AccessibleWeb joined	05:41
	← hakunin left	05:42
	→ khmarbaise joined	05:43
	← john2x left	05:44
	← koell left	05:44
	→ john2x joined	05:44
	→ laserbeam joined	05:45
	→ dreiss joined	05:45
	← AccessibleWeb left	05:46
	→ SorenHolm joined	05:46
	→ illogik joined	05:47
	→ francisfish joined	05:47
	→ njection_ joined	05:48
	← khmarbaise left	05:48
	→ JerryT joined	05:48
	← torste left	05:48
	← JerryT left	05:49
	→ JerryT joined	05:49
	← mage_ left	05:49
	← SorenHolm left	05:50
	← njection left	05:50
	← MoogleCharm left	05:50
	→ deens joined	05:51
	→ DrNick3 joined	05:51
	← illogik left	05:51
	← francisfish left	05:52
	← dualmal left	05:52
	← kytwb left	05:52
	→ koell joined	05:53
	→ mage_ joined	05:53
	→ torste joined	05:54
	→ obert joined	05:57
pikaren	is there any handy tool to monitor the current git repostitory state in terminal	05:58
	→ hkj joined	05:58
	→ jusLookinAroun joined	05:58
	← jusLookinAroun left	05:59
	→ dtrott joined	06:01
	→ ferreum joined	06:03
	← ferreum left	06:03
	← deens left	06:03
	→ isbadawi joined	06:04
	← lavong left	06:05
	→ isbadawi1 joined	06:05
	← elighcash left	06:05
	← isbadawi left	06:06
twb	pikaren: put it in your shell prompt	06:07
	→ elighcash joined	06:07
pikaren	twb: mine shows the current branch	06:08
twb	So what is problem?	06:08
pikaren	but i want one that show the log and status in a split in a nice format	06:08
	im trying something like watch 'git status && git log'	06:08
	→ jstimm joined	06:09
twb	you could put it in postcommand	06:09
	Er, $PROMPT_COMMAND in bash	06:09
	← isbadawi1 left	06:10
	→ deens joined	06:10
	→ marthinal joined	06:11
	← el3ctron_ left	06:11
	← glebihan left	06:12
	→ glebihan joined	06:12
	← glebihan left	06:12
	→ wbill joined	06:13
	→ Exancillatus joined	06:13
	→ JPeterson joined	06:13
	→ glebihan joined	06:13
	← sdouglas left	06:13
	→ sdouglas joined	06:13
	← jalmeida left	06:15
	→ lifelike joined	06:16
	← Zifre left	06:16
	← Exancillatus left	06:17
	← glebihan left	06:17
	← sdouglas left	06:18
	→ glebihan joined	06:18
	→ lite_ joined	06:18
	← yacks left	06:18
	→ Kayra joined	06:19
	→ deens_ joined	06:20
	← deens left	06:22
	← Kayra left	06:24
	← glebm left	06:24
	→ freestyl3r joined	06:24
	← tpollard left	06:24
	→ takamichi joined	06:24
	→ snql\|bad_interne joined	06:25
mattcen	twb: sudo aptitude install libterm-readkey-perl	06:25
	→ glebm joined	06:25
	← koell left	06:25
twb	mattcen: thanks!	06:26
	→ el3ctron joined	06:26
	twb adds to magical reminder notes	06:26
	← thiago left	06:26
	→ jargon joined	06:27
	← BBBThunda left	06:27
	→ thiago joined	06:29
	→ prophile joined	06:29
	← glebm left	06:29
	← Joost left	06:29
	→ glebm joined	06:30
	→ Joost joined	06:32
	→ Gavrisimo joined	06:34
	→ jceb joined	06:34
	→ nnyk_ joined	06:34
	← dreiss left	06:35
	→ ilmgb joined	06:35
	→ ThomasLocke joined	06:37
	← Gavrisimo left	06:38
	→ Raging_Hog joined	06:38
	→ makotosasaki joined	06:39
	← elighcash left	06:39
	← ilmgb left	06:40
	→ zequence joined	06:40
	→ AccessibleWeb joined	06:42
	→ yacks joined	06:43
	← AccessibleWeb left	06:43
	→ AccessibleWeb joined	06:44
	← oodavid left	06:44
	→ raj__ joined	06:45
	→ i0nutzb joined	06:45
	→ darnir joined	06:46
	← iamntz left	06:46
	→ lindenle joined	06:46
	→ _tpavel joined	06:47
	← grumbel_ left	06:47
	→ BiggFREE joined	06:47
	← boombatower left	06:47
	← jrahmy left	06:48
	← Praise left	06:48
	← AccessibleWeb left	06:48
	→ kbart joined	06:49
	→ Praise joined	06:49
	→ oodavid joined	06:49
	→ jrahmy joined	06:50
	← darnir left	06:50
	→ darnir joined	06:50
	← dzho left	06:52
	← echolon left	06:53
	→ dzho joined	06:53
	→ pantsman joined	06:58
	← Xethron left	07:00
	← tomengland left	07:00
	→ tomengland joined	07:02
	→ Gavrisimo joined	07:03
	← jceb left	07:03
	→ ayaz joined	07:03
	→ jceb joined	07:03
	→ mikecmpbll joined	07:03
	→ nilg joined	07:04
	← bgerber left	07:04
	→ snql joined	07:05
	→ ilmgb joined	07:06
	→ isbadawi joined	07:06
	→ stodan joined	07:08
	← snql\|bad_interne left	07:08
	→ xlinkz0 joined	07:09
	→ arand__ joined	07:10
	← starkhalo left	07:10
	← isbadawi left	07:11
	→ asQuirreL joined	07:11
	← lindenle left	07:11
	← jefflyne left	07:13
	→ Exancillatus joined	07:13
	← mikecmpbll left	07:14
	→ jefflyne joined	07:14
	← hkj left	07:15
	← tomengland left	07:16
	← el3ctron left	07:17
	→ bgerber joined	07:17
	→ tomengland joined	07:17
	← Exancillatus left	07:18
	← deens_ left	07:18
	→ ghostlines joined	07:18
	← ghostlines left	07:19
	→ ghostlines joined	07:19
	→ Kayra joined	07:19
	← asQuirreL left	07:19
	→ godgodgodgo joined	07:20
	← thiago left	07:20
	→ fr33 joined	07:21
	← HelloShitty left	07:22
	← tomengland left	07:22
	← pantsman left	07:22
	← Goplat left	07:23
	→ roelmonnens joined	07:23
	← Kayra left	07:24
	→ xjiujiu joined	07:24
	→ freimatz joined	07:26
	← jceb left	07:30
	→ WaReZ joined	07:30
	→ jceb joined	07:30
	→ SorenHolm joined	07:32
	← ghostlines left	07:33
	→ mikecmpbll joined	07:33
	← Gavrisimo left	07:36
	→ naught101 joined	07:36
	→ Gavrisimo joined	07:37
	→ rob_w joined	07:40
	← Raging_Hog left	07:40
	→ Nizumzen joined	07:40
	→ Gizburdt joined	07:41
	→ Raging_Hog joined	07:41
	← kerrick left	07:42
	→ nilg` joined	07:43
	← mikecmpbll left	07:43
	← mishok13 left	07:43
	← oodavid left	07:44
	← ArcTanSusan left	07:44
	→ AccessibleWeb joined	07:45
	→ sdouglas joined	07:45
	← ehmatthes left	07:46
	→ shruggar joined	07:47
	← jceb left	07:48
	→ francisfish joined	07:48
	← fr33 left	07:48
	→ j0ran joined	07:48
	← nnyk_ left	07:48
	← jrahmy left	07:49
	→ HelperW joined	07:49
	← AccessibleWeb left	07:49
	→ jceb joined	07:49
	← sdouglas left	07:49
	← Gamecubic left	07:51
	→ jrahmy joined	07:51
	→ ghostlines joined	07:51
	← ghostlines left	07:51
	→ tomengland joined	07:51
	→ ghostlines joined	07:51
	→ rath joined	07:51
	← francisfish left	07:52
	← daito left	07:52
	→ daito joined	07:53
	→ andr3a joined	07:53
HelperW	are there people willing to help help out with this one? https://docs.google.com/forms/d/1VcD1Q8rD13BnlIQtN0FjVhrVEE9oOPH_9kCQurYUOl4/edit	07:54
	( Small poll with 6 questions about programming )	07:54
	← Samual_ left	07:55
_ikke_	built-in webserver...	07:55
HelperW	yes?	07:56
	← raj__ left	07:56
	← jceb left	07:56
	→ johnkevinmbasco joined	07:56
	→ infynyxx joined	07:56
	← johnkevinmbasco left	07:56
_ikke_	That's a bit unclear	07:56
	→ jceb joined	07:56
	← daito left	07:57
HelperW	Like the built-in PHP webserver from your computer as in php -S localhost:8000 ( So not using a package like mamp/lamp/,... )	07:57
_ikke_	No computers come with webservers built-in	07:57
HelperW	I mean using other apps for doing it than the CLI	07:57
	→ Gonzo89 joined	07:58
	→ deens joined	07:58
	← tomengland left	07:58
	→ tomengland joined	07:59
	← deens left	07:59
	→ blackmesa joined	07:59
twb	If you have PHP on your computer, you have bigger problems	08:00
	→ cff joined	08:00
	→ Xethron joined	08:00
	→ Misan joined	08:01
	← cyphase left	08:01
	← jceb left	08:01
HelperW	Why bigger problems?	08:02
	→ LeMike joined	08:02
_ikke_	"PHP webserver of your computer" does not really make sense to me	08:03
	You should probably rephrase that to get more accurate answers	08:03
	← tomengland left	08:03
	→ pduin joined	08:04
	← Sabbath left	08:05
HelperW	How would I make up my question more clear?	08:05
	← amskah left	08:05
	→ AccessibleWeb joined	08:06
	→ mikecmpbll joined	08:06
	→ jnavila joined	08:06
	→ mishok13 joined	08:07
	→ isbadawi joined	08:07
	→ deens joined	08:07
	→ daito joined	08:07
_ikke_	What is it that you actually want to know? Why are you asking this question?	08:07
	→ Sabbath joined	08:07
twb	And it sounds pretty offtopic here	08:08
	→ raj__ joined	08:08
	→ iwantoski joined	08:08
	← isbadawi left	08:08
	→ isbadawi joined	08:09
	← godgodgodgo left	08:10
	← AccessibleWeb left	08:10
	→ SilverBln joined	08:11
	→ z8z joined	08:11
	← deens left	08:12
	→ tomengland joined	08:12
	← isbadawi left	08:13
	→ rethus joined	08:13
	→ xificurC joined	08:13
	→ hkon_ joined	08:14
HelperW	Just curious. :)	08:14
	→ leakybuckit joined	08:14
HelperW	I would like to know if people are using a lot tools like mamp or wamp... the way they are developing locally	08:14
	→ glebm_ joined	08:14
	← glebm left	08:15
_ikke_	Mostly depends on the OS I guess	08:16
	Windows users would more use those packages, while OSX / Linux users would use packages provided by their os which installs apache / php directly	08:17
	← woollyams left	08:17
twb	Because those distros actually have, you know, packages. Unlike Windows.	08:18
	← blackmesa left	08:18
	→ t-mart_ joined	08:19
	← twb left	08:19
	← Leoneof left	08:19
	← bgerber left	08:19
	→ Kayra joined	08:19
	→ LemonyB joined	08:19
	→ mage__ joined	08:20
	→ hkon__ joined	08:20
	→ roelmonn_ joined	08:20
	→ obert_ joined	08:20
	← kermit left	08:20
	→ jefflyne_ joined	08:20
	→ cybersphinx joined	08:20
	→ zumba_ad_ joined	08:20
	→ njection joined	08:21
	→ TheFuzzb_ joined	08:21
	→ kermit joined	08:21
	→ cyphase joined	08:21
	→ woollyams joined	08:22
	← marthinal left	08:22
	→ michagogo\|cloud_ joined	08:22
	→ rue_XIV joined	08:22
	→ alorence joined	08:22
	→ bhldev_ joined	08:22
	← kaictl left	08:22
	← TheFuzzball left	08:22
	TheFuzzb_ → TheFuzzball	08:22
	← jrahmy left	08:23
	← lacrosse left	08:23
	← shealyw2 left	08:23
	→ eletuchy_ joined	08:23
	→ jceb joined	08:23
	→ laserbea_ joined	08:23
	→ nilg`` joined	08:23
	← roelmonnens left	08:23
	← jefflyne left	08:23
	← mage_ left	08:23
	← zumba_addict left	08:23
	← Chryyz left	08:23
	← m0viefreak left	08:23
	← ItSANg___ left	08:23
	← michagogo\|cloud left	08:23
	michagogo\|cloud_ → michagogo\|cloud	08:23
	→ jrahmy joined	08:24
	→ wcpan_ joined	08:24
	← Kayra left	08:24
	← hkon_ left	08:24
	← nilg` left	08:24
	← t-mart left	08:24
	← musicmatze left	08:24
	← Lemony left	08:24
	← bedouin_ left	08:24
	← arand__ left	08:24
	→ gdmfsob joined	08:25
	← shruggar left	08:25
	→ _5kg_ joined	08:25
	→ ammus____ joined	08:26
	→ lb1a joined	08:26
	→ optixx joined	08:27
	→ Neon1024 joined	08:28
	← obert left	08:28
	← d33tah left	08:28
	← relipse_ left	08:28
	← bhldev__ left	08:28
	← zackiv31 left	08:28
	← the_cybersphinx left	08:28
	← chriswk____ left	08:28
	← bandroidx left	08:28
	← rue left	08:28
	← wcpan left	08:28
	← laserbeam left	08:28
	← mishok13 left	08:28
	← eletuchy left	08:28
	← dccc left	08:28
	← _5kg left	08:28
	← p4tux left	08:28
	← glebihan left	08:28
	← torste left	08:28
	← njection_ left	08:28
	→ lopezt joined	08:28
	← ammus___ left	08:28
	← mikecmpbll left	08:28
	← alindeman left	08:28
	← einonm left	08:28
	← thrakcat1ack left	08:28
	← lopezt left	08:28
	→ alindeman joined	08:28
	→ p4tux joined	08:28
	→ shealyw2 joined	08:28
	→ bandroidx joined	08:28
	← alindeman left	08:28
	→ alindeman joined	08:28
	← shealyw2 left	08:28
	→ shealyw2 joined	08:28
	→ relipse__ joined	08:29
	→ zackiv31_ joined	08:29
	→ ItSANgo joined	08:29
	→ kaictl joined	08:29
	→ chriswk____ joined	08:29
	← bandroidx left	08:29
	→ bandroidx joined	08:29
	→ aarapov joined	08:29
	← emacer left	08:29
	→ bedouin_ joined	08:29
	→ arand__ joined	08:29
	→ d33tah joined	08:30
	→ emacer joined	08:30
	→ lacrosse joined	08:30
	← snql left	08:30
	→ glebihan joined	08:30
	→ dccc joined	08:30
	→ gua_ould joined	08:30
	→ thrakcat1ack joined	08:31
	→ torste joined	08:32
	→ danicampa901 joined	08:32
	← LeMike left	08:33
	→ PeterBooker joined	08:33
	→ einonm joined	08:33
	← simesy left	08:34
	← darnir left	08:34
	→ mikecmpbll joined	08:34
	← woollyams left	08:35
	→ Dreadnaught joined	08:35
	← Dreadnaught left	08:36
	→ Leoneof joined	08:37
	→ oodavid joined	08:37
	→ anry joined	08:38
	← sword left	08:38
	← laserbea_ left	08:38
	← codeFiend left	08:39
	→ LimeBlast joined	08:39
	← jrahmy left	08:40
	← BiggFREE left	08:41
	← aarapov left	08:41
	→ dort joined	08:42
	← gua_ould left	08:43
	→ jas4711 joined	08:44
	← raj__ left	08:44
	← mikecmpbll left	08:45
	← scalability-junk left	08:45
	→ Asenar joined	08:47
	→ GeertV joined	08:47
	Keridos_off → Keridos	08:48
	Keridos → Keridos_off	08:48
	→ harobed_ joined	08:49
	→ freestyler7 joined	08:49
	← HelloComputer15 left	08:50
	→ kotopies joined	08:50
	→ ifdm_ joined	08:51
	← ifdm_ left	08:51
	→ ifdm_ joined	08:51
	← freestyl3r left	08:51
	→ Sonderblade joined	08:51
	← Sonderblade left	08:52
	→ Sonderblade joined	08:52
	→ gua_ould joined	08:53
	← j416 left	08:53
	→ Balliad joined	08:54
	→ j416 joined	08:54
	← Nizumzen left	08:54
	→ W0rmDr1nk joined	08:55
	→ raj__ joined	08:56
	← watabou left	08:56
	→ asQuirreL joined	08:57
	→ Sleepy63 joined	08:57
	→ laserbeam joined	08:58
	→ YoungFrog joined	08:58
	← harobed_ left	08:58
	→ viscera joined	08:59
	→ marthinal joined	08:59
	→ cllamas joined	08:59
	← leakybuckit left	09:00
	← Sonderblade left	09:01
	← naught101 left	09:02
	→ harobed joined	09:02
	← harobed left	09:02
	→ harobed joined	09:03
	← raj__ left	09:03
	→ Kayra joined	09:03
	→ jasonroyle joined	09:04
	← eletuchy_ left	09:04
	→ Sonderblade joined	09:05
	← Sonderblade left	09:05
	← rchavik left	09:05
	→ mikecmpbll joined	09:05
	→ tvw joined	09:06
	→ bgerber joined	09:07
	→ lavong joined	09:07
	← tomengland left	09:08
	→ Orbitrix joined	09:08
	← Orbitrix left	09:08
	→ Orbitrix joined	09:09
	→ tomengland joined	09:09
	→ isbadawi joined	09:09
	→ jagob joined	09:13
	← tomengland left	09:13
	← isbadawi left	09:14
	→ m0ltar joined	09:14
	→ raj__ joined	09:15
	→ arif-ali joined	09:16
	→ jizanthapus-work joined	09:16
	→ nnyk_ joined	09:18
	→ welly joined	09:20
	→ mlechner joined	09:20
	← sceox left	09:22
	→ jackneill joined	09:22
	← jackneill left	09:22
	→ jackneill joined	09:22
	→ zeroknowledge joined	09:23
	→ _iron joined	09:27
	← luc___ left	09:28
	← makotosasaki left	09:28
	← Mindfart\|3 left	09:29
	→ Mindfart joined	09:29
	← sander^work left	09:29
	→ AccessibleWeb joined	09:30
	← infynyxx left	09:31
	← yhager left	09:32
	← zeroknowledge left	09:32
	→ amcsi_work joined	09:32
	← binnisb left	09:34
	→ sceox joined	09:34
	→ jnewt joined	09:37
	→ koell joined	09:37
jnewt	how can i find the most recent version of a file, regardless of which branch it was on?	09:38
	→ yhager joined	09:38
_ikke_	there is no easy built-in way for that	09:39
pcrd	git rev-list --all --max-count=1.	09:39
_ikke_	pcrd: That doesn't give what he wants	09:39
	→ carbon joined	09:39
jnewt	i guess i need something even more complicated now that i think about it. i need the most recent version of a file across all branches, that I committed.	09:40
pcrd	Provided the file is present in all commits' tree objects, given a file is in all, the most recent version of it would be in the most recent commit.	09:40
	→ lolmaus_ joined	09:41
	← lolmaus left	09:41
pcrd	jnewt: look at all your branches, and for each of them that has the file, find the most recent branch, which is the one with the most recent commit time.	09:41
jnewt	pcrd: i'm looking at the most recent commit time right now. I know this is an older version of this file. there's a newer one somewhere, i know, i fixed an issue in it, but can't figure out where it is so i can merge it	09:42
	→ Octalot joined	09:43
jnewt	we did a poor job of maintaining and merging changes.	09:44
pcrd	how can it be newer if it is older	09:45
tobiasvl	jnewt: what defines "newer" here?	09:45
	what pcrd said	09:45
	← carbon left	09:45
	→ dfanjul joined	09:46
	→ sdouglas joined	09:46
jnewt	newer = most recent commit where that specific file was changed. not the most recent commit (where other files were changed)	09:46
	→ binnisb joined	09:47
	→ simesy joined	09:47
jast	but that doesn't matter if all you want is the newest version, does it? if it was last changed three commits ago, the same version is in the most recent commit, too	09:47
pcrd	jnewt: that's different from what you said earlier though	09:47
jnewt	pcrd: i think not	09:47
	jast: only on a per-branch basis	09:47
pcrd	10:38 < jnewt:#git> how can i find the most recent version of a file	09:47
	→ EvilDMP joined	09:47
jnewt	pcrd: yeah, and?	09:48
	→ Chryyz joined	09:48
pcrd	Once a file is added, each commit contains the file until it's deleted.	09:48
	remember, git works in terms of snapshots.	09:48
_ikke_	If you change a file on one branch, and then create a new commit on another branch, that other branch has the latest commit, but not the latest version of the file	09:49
jast	git log --oneline --all -- <file>	09:49
	this might help	09:49
	← ilmgb left	09:50
	→ ilmgb_ joined	09:50
	← freestyler7 left	09:50
_ikke_	add a --date-order for good measure	09:50
	← sdouglas left	09:50
	← harish left	09:51
	← AccessibleWeb left	09:51
	← Xethron left	09:52
	→ freestyl3r joined	09:52
	← simesy left	09:52
	→ watabou joined	09:53
	← watabou left	09:53
	→ watabou joined	09:53
	← weiyang left	09:54
	→ ilmgb joined	09:55
	→ DanielHollands joined	09:55
	→ jnavila_ joined	09:55
	→ naught101 joined	09:56
	← jnavila left	09:56
	→ francisfish joined	09:56
	→ AccessibleWeb joined	09:57
	→ Ariadeno joined	09:57
	← watabou left	09:57
	← ilmgb_ left	09:57
	← ilmgb left	09:58
	→ ilmgb_ joined	09:58
	← LimeBlast left	09:59
	← Sabbath left	10:02
	← ilmgb_ left	10:03
	→ blackmesa joined	10:03
	← DanielHollands left	10:03
	→ ilmgb joined	10:04
	← kotopies left	10:05
	→ noxd joined	10:05
	← kyb3r_ left	10:05
	→ ValicekB joined	10:05
	→ grumbel_ joined	10:06
	→ Exancillatus joined	10:06
	← francisfish left	10:07
	← Exancillatus left	10:07
	← kcj left	10:08
	→ musicmatze joined	10:08
	← m0ltar left	10:09
	→ isbadawi joined	10:10
	→ kotopies joined	10:11
	← ELLIOTTCABLE__ left	10:12
	← chuckharmston_ left	10:12
	← ingu_cloud left	10:12
	← elijah_ left	10:12
	← jagob left	10:13
	→ emergion joined	10:13
	→ chuckharmston_ joined	10:13
	→ ingu_cloud joined	10:13
	→ ELLIOTTCABLE__ joined	10:13
	→ Sabbath joined	10:14
	→ elijah_ joined	10:14
	→ jagob joined	10:14
	→ Stygia joined	10:14
	← isbadawi left	10:15
	← dtrott left	10:15
	← kapowaz left	10:15
	← EvilDMP left	10:15
	→ LimeBlast joined	10:16
	← freestyl3r left	10:16
	→ kapowaz joined	10:16
	→ pfg joined	10:16
	→ Exancillatus joined	10:16
	← Exancillatus left	10:16
	← kotopies left	10:17
	→ Exancillatus joined	10:17
	→ freestyl3r joined	10:17
	→ hkj joined	10:18
	← hyperair left	10:19
	← daito left	10:19
	→ daito joined	10:20
	→ francisfish joined	10:20
	→ vtunka joined	10:20
	→ ChrisAnn joined	10:20
	← lite_ left	10:20
	← prophile left	10:21
	→ lite_ joined	10:21
	← Exancillatus left	10:21
	← optixx left	10:21
	← dort left	10:22
	→ kotopies joined	10:22
	← Asenar left	10:22
	→ daito_ joined	10:22
	→ optixx joined	10:22
	← daito left	10:23
	← optixx left	10:23
	→ WhereIsMySpoon joined	10:23
	← freestyl3r left	10:24
	→ conan joined	10:25
	→ Asenar joined	10:25
WhereIsMySpoon	Er...I just had a blue screen whilst switching branches and now git extensions wont start up but more importantly the branch that I'm working on doesn't seem to appear at all in egit in eclipse. When I do git status I get "error: bad signature fatal index file corrupt"	10:25
	what do i do? D:	10:25
	→ freestyl3r joined	10:26
grumbel_	WhereIsMySpoon: Check your harddisk / filesystem for corruption; check SMART status of your harddisk; make a backup if your work is important; check reflog to get your branch back	10:27
	→ woollyams joined	10:27
osse	hmm, might be that 'rm .git/index; git reset' fixes it	10:27
	← pfg left	10:27
WhereIsMySpoon	grumbel_: I dont have access to chkdsk	10:27
	← cagedwisdom left	10:28
	→ luc_ joined	10:29
WhereIsMySpoon	grumbel_: I have no idea how to use reflog - it appears that git got past the stage of switching branches (I was mid branch switch when it bluescreened) as I can't see some stuff that would be there if it hadn't switched branches	10:29
	so I cant backup	10:29
	← hkon__ left	10:29
WhereIsMySpoon	as it isnt there	10:29
	← sitaram left	10:29
	→ Lunatrius joined	10:29
osse	WhereIsMySpoon: try my thing	10:29
WhereIsMySpoon	osse: deleting things at this stage seems a bit drastic..	10:30
	→ bluesm joined	10:30
	→ Guest32487 joined	10:30
osse	the index is deletable without problems	10:30
	I just did it myself	10:30
	and the situation is drastic to begin with :p	10:31
WhereIsMySpoon	osse: sure but I dont want to delete anything unless I really have to	10:31
	→ cagedwisdom joined	10:31
grumbel_	WhereIsMySpoon: it's probably unlikely, but just _might_ be a HDD corruption; I was thinking of a backup of the whole repository, you can do that in any state	10:32
	→ Fang0716 joined	10:32
	→ merica joined	10:32
WhereIsMySpoon	grumbel_: you want me to literally copy the whole parent folder of my repo?	10:33
grumbel_	well, I would if it contains important, otherwise unsafed work; but then again, I'm a bit paranoid wen bluescreen appear while doing file operations	10:33
WhereIsMySpoon	grumbel_: ok doing that now	10:34
grumbel_	unsaved; when; *appears;	10:34
	← SorenHolm left	10:34
WhereIsMySpoon	ill try and get access to run a chkdsk	10:34
	← iwantoski left	10:34
WhereIsMySpoon	grumbel_: meanwhile is there a way to see my SMART status without installing stuff?	10:34
	→ SorenHolm joined	10:35
	→ prophile joined	10:35
	← luc_ left	10:36
	← Guest32487 left	10:36
	→ sitaram_ joined	10:37
	→ bvi joined	10:39
	← kotopies left	10:39
	→ iwantoski joined	10:39
	← Kayra left	10:39
WhereIsMySpoon	grumbel_?	10:40
	← Lunatrius left	10:40
grumbel_	WhereIsMySpoon: none I know of, sorry	10:40
	→ Kayra joined	10:40
	→ Lunatrius joined	10:40
WhereIsMySpoon	grumbel_: nothing bad returend by chkdsk	10:41
	← jstimm left	10:41
WhereIsMySpoon	which is even more weird	10:41
	← binnisb left	10:43
	→ gain joined	10:43
	← Fang0716 left	10:43
	→ cannonball joined	10:44
	→ Fang0716 joined	10:44
	← Kayra left	10:44
WhereIsMySpoon	grumbel_: http://pastie.org/8937510 does this help?	10:45
	← dvide left	10:45
	→ tonythomas joined	10:45
	← danicampa901 left	10:45
WhereIsMySpoon	SMART status is ok btw	10:46
	you can check it with wmic :)	10:46
	→ oal joined	10:46
cbreak	looks like your repo is corrupted	10:46
	← woollyams left	10:47
cbreak	do you or did you ever reach a disk full state?	10:47
	← Sabbath left	10:47
WhereIsMySpoon	cbreak: no	10:47
	cbreak: I had a bluescreen mid branch change	10:47
oal	I have a branch that's been pretty heavily modified, and want to get an overview of how it looks compared to master. Is there a good GUI for side by side comparisons of directory structure and file changes?	10:47
	← akiva left	10:47
WhereIsMySpoon	oal: git extensions	10:48
	→ plitzenberger joined	10:48
WhereIsMySpoon	oal: egit for eclipse is nice for comparison too	10:48
	→ lithiumjake joined	10:48
oal	WhereIsMySpoon, I'll check ut git extensions. I'm using Linux if that matters	10:48
	→ binnisb joined	10:48
WhereIsMySpoon	ah i dunno if it is on linux	10:49
	havent checked that out	10:49
	← iwantoski left	10:49
cbreak	oal: sourcetree	10:49
	→ hkon_ joined	10:49
cbreak	oal: or git gui, it's already there, since it's part of git	10:49
oal	cbreak, does sourcetree support Linux?	10:49
cbreak	hmm... I don't think so.	10:50
WhereIsMySpoon	looks like the best thing to do is re-clone and copy the uncorrupted object that is corrupted into the old repo's .git	10:50
cbreak	git gui does for sure	10:50
	oal: there's always !lol if you like the cli :)	10:50
gitinfo	oal: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:50
	→ m0ltar joined	10:50
cbreak	WhereIsMySpoon: or... clone fresh and throw away the old one? :)	10:50
WhereIsMySpoon	cbreak: I had unpushed committed changes	10:50
cbreak	maybe you can salvage history with git format-patch	10:51
	← jagob left	10:51
WhereIsMySpoon	cbreak: what does that do	10:51
cbreak	if it's just mild corrupton you might try to fix it, but I'd first make a backup, and then format-patch	10:51
WhereIsMySpoon	ive made a backup already :)	10:51
cbreak	it makes patch e-mail files from history	10:51
	you can later apply them with git am	10:51
	← tokik left	10:51
	→ korbelz joined	10:51
	← yhager left	10:52
WhereIsMySpoon	cbreak: "fatal: bad default revision 'HEAD'"	10:52
	O.o	10:52
	→ shruggar joined	10:53
cbreak	WhereIsMySpoon: open HEAD in a text editor	10:53
	what's inside?	10:54
	type git symbolic-ref HEAD master to set it to master	10:54
	← hkj left	10:54
	→ iwantoski joined	10:54
WhereIsMySpoon	cbreak: "ref: refs/heads/my_branch" where my_branch is the branch that git was on before I did the branch switch during which it bluescreened	10:54
	→ davividal joined	10:54
WhereIsMySpoon	which is the branmch that is not pushed	10:55
	→ molten_tar joined	10:55
cbreak	weird. why is that branch invalid	10:55
	does git log thatbranch give errors too?	10:55
	→ jagob joined	10:55
WhereIsMySpoon	cbreak: yes	10:56
	→ Kayra joined	10:56
WhereIsMySpoon	cbreak: http://pastie.org/8937521	10:56
cbreak	so that branch is broken...	10:56
	can you do git reflog my_branch?	10:57
WhereIsMySpoon	cbreak: what will that do	10:57
	← emergion left	10:57
	← m0ltar left	10:57
cbreak	it will show you the log or changes made to that ref... it's the ref log.	10:57
WhereIsMySpoon	cbreak: exact same errors	10:57
grumbel_	WhereIsMySpoon: maybe do a git fsck just to be sure your object storage isn't messed up	10:58
	→ stylus_Jack joined	10:58
WhereIsMySpoon	grumbel_: i did that earlier	10:58
	grumbel_: http://pastie.org/8937510	10:59
stylus_Jack	Hi, how do I merge a remote branch into my local working directory without committing anything to the remote repository?	10:59
	← Fang0716 left	10:59
WhereIsMySpoon	grumbel_: one of my objects is corrupted	10:59
tobiasvl	stylus_Jack: just pull and merge. you won't do anything with the remote repo unless you push	11:00
	→ neo1691 joined	11:00
WhereIsMySpoon	is there any way I can get my unpushed commits back?	11:00
cbreak	maybe	11:00
WhereIsMySpoon	o:	11:00
	would like that if you could please :)	11:00
stylus_Jack	tobiasvl, I get the message "*** Please tell me who you are."	11:00
	→ simesy joined	11:01
AndreasLutro	I just had an idea to make some sort of global log, where all my commit messages to all repos are stored, to track what I've been doing - is there a tool for this out there? is it possible to do with git alone?	11:01
	→ Exancillatus joined	11:01
	← laserbeam left	11:01
	← Exancillatus left	11:01
cbreak	WhereIsMySpoon: type git reflog HEAD	11:01
tobiasvl	stylus_Jack: http://git-scm.com/book/en/Getting-Started-First-Time-Git-Setup under "Your Identity"	11:01
WhereIsMySpoon	cbreak: fatal: ambiguous argument 'HEAD': unknown revision or path not in the working t ee.	11:02
	→ shinnya joined	11:02
WhereIsMySpoon	*tree	11:02
cbreak	did you do the symbolic ref command I gave you above?	11:02
	← simesy left	11:02
WhereIsMySpoon	ah..no	11:02
	→ wrouesnel1 joined	11:02
	← daito_ left	11:02
WhereIsMySpoon	ill do that	11:02
grumbel_	WhereIsMySpoon: can you cat .git/refs/heads/my_branch and tail .git/logs/refs/heads/my_branch	11:02
	→ daito joined	11:03
WhereIsMySpoon	cbreak: "fatal: refusing to point HEAD outside of refs/	11:03
stylus_Jack	tobiasvl, so even if I'm not committing anything, I have to identify?	11:03
WhereIsMySpoon	"	11:03
	← nnyk_ left	11:03
cbreak	WhereIsMySpoon: hmm. then tell it refs/heads/master instead of just master	11:03
	I hoped it'd automatically do that :)	11:03
	← plitzenberger left	11:03
WhereIsMySpoon	cbreak: ok that worked	11:03
tobiasvl	stylus_Jack: well you are commiting. you're commiting a merge	11:03
cbreak	does reflog on HEAD work now? If not, do what grumbel_ said.	11:03
	that'll give you the unformated reflog	11:04
	→ Hounddog joined	11:04
stylus_Jack	tobiasvl, I thought I was just merging locally?	11:04
	→ pfg joined	11:04
WhereIsMySpoon	cbreak: reflog works..but i already did grumbel_'s commands	11:04
	they return stuff too	11:04
	:)	11:04
tobiasvl	stylus_Jack: yes, a local commit. if you don't want to commit at all, you can look into this: http://stackoverflow.com/questions/9599411/git-merge-no-commit-squash-difference	11:05
cbreak	ok, pastebin the output	11:05
tobiasvl	stylus_Jack: but please note that a commit doesn't do anything remotely (like in cvs or svn), as it seems you believe	11:05
stylus_Jack	Thanks tobiasvl	11:05
cbreak	it should show your branch changes, commits and so on	11:05
	← Neon1024 left	11:05
WhereIsMySpoon	cbreak: i dont see my latest commit in there	11:06
	for my_branch	11:06
	if i do git reflog HEAD	11:06
cbreak	what do you see?	11:06
WhereIsMySpoon	cbreak: head{1} is "moving from my_branch to some_other_branch" and head{0} is "moving from some_other_branch to my_branch"	11:07
	← daito left	11:07
cbreak	hmm... alright	11:07
	then you'll have to look at the my_branch reflog	11:08
	first, git log my_branch doesn't work?	11:08
	if not, then you'll have to try to use hashes directly	11:08
WhereIsMySpoon	cbreak: correct	11:08
cbreak	use those from git reflog my_branch, or the equivalent cat	11:08
	(if you look at the file directly, the newest changes are at the bottom, in reflog they are at the top	11:09
WhereIsMySpoon	git reflog my_branch doesnt work either	11:09
	→ ArSn joined	11:09
	→ tomengland joined	11:09
WhereIsMySpoon	same errors as git log my_branch	11:09
	→ Fang0716 joined	11:09
	→ CussBot joined	11:10
	← sitaram_ left	11:10
	← iwantoski left	11:11
	→ pfFredd joined	11:11
	→ sitaram_ joined	11:11
	← sitaram_ left	11:11
	→ sitaram_ joined	11:11
	→ isbadawi joined	11:11
WhereIsMySpoon	cbreak?	11:11
	→ Neon1024 joined	11:12
	→ amikiri joined	11:13
WhereIsMySpoon	cbreak: if I open up .git/logs/refs/heads/my_branch it has commits up to a certain point then just 'NUL' characters if i look at it in notepad++	11:13
	and doesnt contain my latest commit	11:13
	← molten_tar left	11:13
grumbel_	WhereIsMySpoon: can you pastebin the commands I sent earlier?	11:13
WhereIsMySpoon	grumbel_: teh cat and tail?	11:14
	← tomengland left	11:14
grumbel_	yes	11:14
amcsi_work	how do I have git diff show me what line endings a file will have?	11:14
WhereIsMySpoon	grumbel_: the cat returns nothing and the tail has some info about commits I've done but doesnt contain the latest commit	11:15
	← hkon_ left	11:15
	→ daito joined	11:15
	→ cmpera joined	11:15
	← pfg left	11:15
	← Gizburdt left	11:15
	← isbadawi left	11:15
	→ jstimm joined	11:16
WhereIsMySpoon	grumbel_: if I open up .git/refs/heads/my_branch its just full of NUL chars	11:16
	← masak left	11:17
	← _ikke_ left	11:17
	← tvw left	11:17
	→ tvw joined	11:17
	← PerlJam left	11:17
grumbel_	WhereIsMySpoon: the last valid line in the tail should have a unix timestamp in it; you can convert that using e.g. http://www.unixtime.de/ to see how old that is	11:17
	→ aarapov joined	11:18
	← asQuirreL left	11:18
	← W0rmDr1nk left	11:18
	→ W0rmDr1nk joined	11:18
WhereIsMySpoon	grumbel_: 03.07.2014 - 11:31:54	11:19
grumbel_	WhereIsMySpoon: what is wired is that if your branch ref is gone, git fsck should show the branch's tip commit as dangling	11:19
	anyway, lunch time, back later	11:19
WhereIsMySpoon	ok	11:19
	← weltall left	11:20
WhereIsMySpoon	git fsck still shows the same as before with the "loose object" stuff	11:20
	→ diegovio1 joined	11:21
	→ laserbeam joined	11:21
	→ weltall joined	11:21
torste	I just did git commit -m "text", can I do git commit --amend -m "new text"?	11:21
grawity	sure	11:22
	← diegoviola left	11:22
torste	ok, thx	11:22
	← j0ran left	11:22
	→ DoniRS joined	11:22
	→ masak joined	11:22
	masak → Guest4534	11:23
	→ _ikke_ joined	11:23
	→ PerlJam joined	11:23
	→ Anony987 joined	11:23
	→ nkr joined	11:23
	← diegovio1 left	11:24
	← W0rmDr1nk left	11:25
	← koell left	11:25
	→ asQuirreL joined	11:25
cbreak	WhereIsMySpoon: if the reflog doesn't contain the commits you did, then you have a problem.	11:25
	→ ciampix joined	11:26
	← viscera left	11:26
cbreak	WhereIsMySpoon: what does the branch itself contain? You can cat it too, it's in .git/refs/heads/branchname	11:26
	← WormDrink left	11:26
grawity	sounds like the repo is simply missing data and there's not much to do	11:26
	→ viscera joined	11:26
cbreak	it does sound bad indeed	11:27
	a simple crash should not kill existing data unless the filesystem is garbage	11:27
	maybe something braindead like smb...	11:27
	← francisfish left	11:28
	→ iwantoski joined	11:29
	← asQuirreL left	11:29
	→ Gizburdt joined	11:30
	← ilmgb left	11:31
	→ francisfish joined	11:31
grawity	smb doesn't deal with storing things on disk >_>	11:32
cbreak	indeed... :)	11:33
	it's a remote file system. Causes problems to no end.	11:33
WhereIsMySpoon	cbreak: this is just a local filesystem	11:34
	cbreak: the branch itself contains lots of NULs	11:34
	thats it	11:35
cbreak	that's kind of bad	11:35
	looks like lots of things are seriously fucked up.	11:35
WhereIsMySpoon	:p	11:35
cbreak	chances are your commits are gone (if you don't find them in the reflog)	11:35
	you can try git fsck --lost-found	11:35
WhereIsMySpoon	cbreak: fsck doesnt work	11:35
	← SorenHolm left	11:35
	← andr3a left	11:35
cbreak	you tried it?	11:36
WhereIsMySpoon	just outputs the corrupt loose object thing	11:36
	yea just now	11:36
	→ fannye joined	11:36
	← Ariadeno left	11:36
cbreak	so it doesn't write lost & found info	11:36
	too bad	11:36
	I am out of ideas	11:36
	restore from backup :/	11:36
WhereIsMySpoon	i guess I will try to re clone and replace the corrupted objhect	11:36
cbreak	there's not just a corrupted object	11:36
	→ W0rmDr1nk joined	11:37
	→ j0ran joined	11:37
	← viscera left	11:37
cbreak	you also have a corrupted reflog, corrupted branches	11:37
	and so on	11:37
	→ delboy1978uk1 joined	11:37
cbreak	without the correct information in the branch, you can't reach your commits	11:37
WhereIsMySpoon	:<	11:37
cbreak	since lost-found didn't write anything, chances are you don't have them anymore	11:37
	→ WormDrink joined	11:38
	← WormDrink left	11:38
	→ WormDrink joined	11:38
tobiasvl	there are no clones of this repo?	11:38
cbreak	that won't help unpushed history	11:38
	→ viscera joined	11:38
tobiasvl	nope	11:38
osse	ooops.	11:38
cbreak	WhereIsMySpoon: if you find dangling commits, you can try to git show them	11:38
osse	I guess more than just the index was corrupt	11:38
WhereIsMySpoon	cbreak: how can I find dangling commits	11:39
	← iwantoski left	11:39
	→ bl4ckdu5t joined	11:39
cbreak	git fsck lists them	11:39
	→ CheckDavid joined	11:39
WhereIsMySpoon	then i guess i need to try and replace the corrupted objects	11:39
	so that fsck works	11:39
	→ SorenHolm joined	11:39
cbreak	chances are that object is new	11:39
WhereIsMySpoon	hm	11:39
	i can try cutting it	11:40
	→ m0ltar joined	11:40
bl4ckdu5t	I did 'git branch --track mybranch origin/my-branch' and I got an error	11:40
	fatal:Not a valid object name: 'origin/ui-branch'	11:40
	← gua_ould left	11:40
bl4ckdu5t	What's the reason for this?	11:40
osse	bl4ckdu5t: what does git show origin/ui-branch say ?	11:41
	→ WormDr1nk joined	11:42
	← W0rmDr1nk left	11:42
bl4ckdu5t	fatal: ambiguous argument 'origin/ui-branch': unknown revision or path not	11:43
	bl4ckdu5t@DA-VINCI:/var/www/│ in the working tree.	11:43
osse	bl4ckdu5t: sounds to me like that remote branch doesn't exist	11:43
	→ arietis joined	11:43
	← AccessibleWeb left	11:44
bl4ckdu5t	osse: fatal: ambiguous argument 'origin/ui-branch': unknow revision or path not in the working tree	11:44
	user '--' to separate paths from revisions	11:44
cbreak	bl4ckdu5t: git branch -a, pastebin	11:44
	→ griotspeak joined	11:44
	→ W0rmDr1nk joined	11:46
	→ kotopies joined	11:46
osse	bl4ckdu5t: that error reinforces my hypothesis	11:46
	it's nearly a theory by now	11:46
	→ henry_ joined	11:46
	→ AccessibleWeb joined	11:47
	← WormDr1nk left	11:47
	← WormDrink left	11:47
bl4ckdu5t	Her cbreak http://pastie.org/8937620	11:48
osse	"Her"? Interesting...	11:48
	→ sweetyReaper joined	11:48
	→ dragosf joined	11:48
_ikke_	bl4ckdu5t: case sensitive	11:48
cbreak	bl4ckdu5t: so, clearly you do not have a ui-branch	11:48
_ikke_	remotes/origin/UI-Branch	11:49
	→ Pullphinger joined	11:50
osse	hmm, how does .git/refs work on case-insensitive filesystems?	11:50
	→ iwantoski joined	11:50
grawity	poorly.	11:50
	← sceox left	11:51
bl4ckdu5t	It's been changed remotely to ui-branch	11:51
	← gabedain_ left	11:51
_ikke_	There is a topic on the mailing list about that	11:51
	← Gizburdt left	11:51
osse	bl4ckdu5t: then you need 'git fetch'	11:51
	git fetch --prune would be ebst	11:52
bl4ckdu5t	*best?	11:52
osse	yerah	11:52
	*yeah?	11:52
	yeah	11:52
bl4ckdu5t	Are you eating ham burger?	11:53
	← viscera left	11:53
bl4ckdu5t	I type like that only when I'm in that state :D	11:53
	← henry_ left	11:53
osse	no, but I am drinking coffee	11:53
	→ gua_ould joined	11:54
	→ ilmgb joined	11:54
	← mikecmpbll left	11:54
	→ WormDrink joined	11:54
bl4ckdu5t	so all I have to do is 'git fetch --prune ui-branch'?	11:55
osse	no	11:55
	git fetch --prune	11:55
	← stylus_Jack left	11:55
	→ kcj joined	11:55
	← john2x left	11:56
	← mage__ left	11:56
	→ mikecmpbll joined	11:56
	← Fang0716 left	11:56
	→ woozly joined	11:56
woozly	guys, help please to understand.	11:56
	→ john2x joined	11:56
	→ dog-food joined	11:56
	← neo1691 left	11:56
woozly	I've cloned some repo (from another than master branch).	11:57
	← griotspeak left	11:57
	← paolooo left	11:57
woozly	like: git clone -b staging https://..../some.git	11:57
	← tubaman left	11:57
woozly	but how I can do some changes and then pull this to repo?	11:57
	What I need to do?	11:58
	→ koell joined	11:58
osse	nothing in particular	11:59
	do you want to make changes to the master branch ?	11:59
	← Gavrisimo left	12:00
woozly	osse: no.. I have cloned 'staging' branch. And do some changes. And then pull request it.	12:00
	And question: I have private BitBucket repo... anyone can clone it if know https url of my .git file? :/	12:00
	→ dragoonis joined	12:00
	← amikiri left	12:00
	← EvoAlan left	12:01
tobiasvl	woozly: that's a better question for #bitbucket really	12:01
	← dragoonis left	12:01
	→ dragoonis joined	12:01
dragoonis	"git branch" - shows me about 100 branches that i've checked out once upon a time, how can I clean these out ?	12:01
woozly	tobiasvl: oh.. yeah.	12:01
osse	woozly: make your changes, push your midifing staging branch somewhere bitbucekt for example), then ask #bitbucket	12:01
	← jstimm left	12:01
	→ Gizburdt joined	12:01
osse	dragoonis: git branch -d foo bar baz rofl jesus	12:01
woozly	osse: okay. thank you	12:01
grawity	woozly: create a new branch; make the changes and commit them; push them to BitBucket; open the branch on BitBucket and look for "pull request"	12:01
dragoonis	osse, can't I just wipe the lot instead of manually specifying them	12:02
woozly	grawity: thank you!	12:02
	→ pmurias joined	12:02
	→ thiago joined	12:02
	→ nnyk_ joined	12:02
	→ Exancillatus joined	12:02
osse	dragoonis: you want everyone but the current I guess?	12:02
	← WormDrink left	12:03
	→ WormDrink joined	12:03
pmurias	how can I find by which .gitignore is a file ignored?	12:03
dragoonis	osse, yes.	12:03
	→ kpeta joined	12:03
grumbel_	WhereIsMySpoon: you got it to work?	12:03
dragoonis	osse, i'll switch to 'master' and then wipe the list	12:03
osse	dragoonis: if your branch names are relatively sane (no spaces, asterisks, question marks etc.) then this can work: git branch -d $(git branch \| grep -v '^\*')	12:04
	→ Gavrisim_ joined	12:04
	→ tubaman joined	12:04
	← dog-food left	12:05
	→ sceox joined	12:05
bl4ckdu5t	Thanks osse and thanks to your coffee	12:05
dragoonis	osse, thanks very much	12:06
	→ Gavrisimo joined	12:06
osse	bl4ckdu5t: it deserves some thanks. it's meget god.	12:06
dragoonis	osse, is there any way to fetch the list of branches from my 'origin' remote ?	12:07
	← Exancillatus left	12:07
osse	dragoonis: hacky way: git branch -a \| grep origin	12:08
	→ kotk joined	12:08
osse	but don't do that in a script	12:08
dragoonis	osse, nice, thanks.	12:08
	← Gavrisim_ left	12:10
	← kpeta left	12:10
osse	dragoonis: if you only have one remote then git branch -r is enough	12:10
	→ ferreum joined	12:11
dragoonis	osse, cool	12:11
	← HicksD left	12:11
	→ isbadawi joined	12:12
	← isbadawi left	12:12
	← ciampix left	12:12
	→ afuentes joined	12:12
	→ HicksD joined	12:12
	→ bitkiller joined	12:12
	→ isbadawi joined	12:12
	→ Gooder` joined	12:12
	← kcj left	12:13
	← m0ltar left	12:14
	← Gooder left	12:14
	→ asQuirreL joined	12:15
grumbel_	WhereIsMySpoon: After you did your backup, try to delete the broken references and the broken object; then try with git fsck again to find dangling commits	12:16
	← oodavid left	12:16
	→ LeMike joined	12:16
	← isbadawi left	12:16
	→ m0ltar joined	12:18
	← conan left	12:19
	→ montyboy joined	12:19
	← bremner left	12:21
	→ Anticom joined	12:21
	→ mellernoia joined	12:21
	← rfoust left	12:22
WhereIsMySpoon	grumbel_: yea i was in the middle of that just had a meeting..there's quite a few broken objects	12:23
	← AccessibleWeb left	12:23
_ikke_	WhereIsMySpoon: dangling objects are harmless	12:25
WhereIsMySpoon	grumbel_: http://pastie.org/8937688	12:25
	← rath left	12:25
	← merica left	12:25
WhereIsMySpoon	:<	12:25
_ikke_	Ok	12:25
	→ jpentland joined	12:26
grumbel_	WhereIsMySpoon: Delete refs/heads/my_branch; Delete index; retry	12:26
	→ rath joined	12:26
WhereIsMySpoon	grumbel_: and index.lock?	12:26
	→ oodavid joined	12:26
	← aarapov left	12:27
grumbel_	WhereIsMySpoon: never saw that, but yes	12:27
	gitinfo set mode: +v	12:27
jpentland	ok so I did a 'git stash pop' onto the wrong branch resulting in many merge conflictst, now I want to undo that so i can apply it to another branch, but it complaing about unmerged paths. Is there a git stash --abort or something?	12:27
	→ dglambert joined	12:27
	← thiago left	12:27
	→ mizu_no_oto joined	12:28
WhereIsMySpoon	grumbel_: http://pastie.org/8937694	12:29
	lots of dangling blobs and a dangling tree	12:29
	and the null sha1 warning again	12:29
	can i get back my commits from this?	12:29
grumbel_	WhereIsMySpoon: If it wasn't among the corrupt objects, yes; check the dangling tree, if it's the one from your commit	12:30
WhereIsMySpoon	grumbel_: how do I check whether the dangling tree is the one from my commit	12:30
	← cmpera left	12:30
grumbel_	there is no dangling commit, so it seems like that was corrupted	12:30
WhereIsMySpoon	ah	12:31
	← jekle left	12:31
grumbel_	WhereIsMySpoon: git commit-tree <<treeid>>	12:31
	then git branch recovery_branch	12:31
	← SocalNick left	12:31
grumbel_	err git branch recovery_branch <<sha of the commit>	12:32
WhereIsMySpoon	i dont have the sha of the commit	12:32
grumbel_	git commit-tree should give you one	12:32
WhereIsMySpoon	ah	12:32
	its taking a long time	12:32
	→ daedeloth joined	12:32
	→ andr3a joined	12:33
WhereIsMySpoon	grumbel_: how long should this commit-tree take	12:33
	roughly	12:33
grumbel_	roughly no time	12:33
	ah wait	12:33
WhereIsMySpoon	=/	12:33
grumbel_	it wants you to input a message	12:33
	← vtunka left	12:34
WhereIsMySpoon	O>o	12:34
	it could ask	12:34
	→ bremner joined	12:34
	← bremner left	12:34
	→ bremner joined	12:34
grumbel_	and press Ctrl+D when done	12:34
	→ AccessibleWeb joined	12:34
	→ diegoviola joined	12:34
	→ griotspeak joined	12:34
WhereIsMySpoon	put in some text and pressed ctrl-d	12:34
	grumbel_: I got a ^D	12:35
	← griotspeak left	12:35
grumbel_	hmm, try to put a message into a file and use git commit-tree <tree-sha1> < message.txt	12:35
WhereIsMySpoon	i cant seem to ctrl-c it >_>	12:35
grumbel_	the windows shell might be different	12:35
	WhereIsMySpoon closes mingw	12:36
WhereIsMySpoon	ah	12:36
	it came back	12:36
	← blackmesa left	12:36
	← asQuirreL left	12:36
grumbel_	with a sha1 of the commit?	12:36
WhereIsMySpoon	no	12:36
	i quit it	12:36
	aha	12:36
	i got a sha	12:36
	→ Irish` joined	12:37
	→ IrishPrime joined	12:37
	← IrishPrime left	12:37
grumbel_	great! Now do git branch recovery_branch <sha of the commit>	12:37
	→ cmpera joined	12:37
	Irish` → IrishPrime	12:37
WhereIsMySpoon	grumbel_: you sure this is the shah of the commit?	12:37
	it doesnt say what it is	12:37
	grumbel_: "fatal: not a valid object name: <the sha>"	12:38
	→ jdhawke joined	12:38
grumbel_	try git show <sha>	12:39
	← zumba_ad_ left	12:39
grumbel_	without < and > of course	12:39
WhereIsMySpoon	grumbel_: ambiguous argument <the sha> unknown revision or path not shown in working tree	12:39
	→ dog-food joined	12:40
	← dog-food left	12:40
	→ dog-food joined	12:40
WhereIsMySpoon	uh wait hang on	12:40
grumbel_	try to commit again, piping the message.txt file into commit-tree	12:40
WhereIsMySpoon	no i just pasted it wrong	12:40
	hang on	12:40
	→ thevishy joined	12:40
jdhawke	okay, I have a wierd situation, I have a co-worker (senior to me) who refuses to believe that it's a bad thing to put the IDE configuration folder into git for the project we're working on. We have different environments, so every time I pull or rebase I'm fighting conflicts and end up having to reconfigure parts of my IDE. Is there I can set up a local extension to .gitignore that will prevent those files from getting pulled/merged/comi	12:40
WhereIsMySpoon	it is a bad thing	12:41
	:S	12:41
grumbel_	jpentland: git stash pop does not remove the stash from the stack on conflicts; you can just use git reset --hard to reset your WD	12:41
	← montyboy left	12:41
osse	jdhawke: you could tell git to ignore changes to those files with git update-index --assume-unchanged path/to/files	12:41
WhereIsMySpoon	grumbel_: git branch worked	12:41
jdhawke	osse	12:41
osse	jdhawke: consider also kicking your boss in the nuts	12:41
	← bremner left	12:41
grumbel_	nice, now git checkout recovery_branch	12:41
tobiasvl	jdhawke: well I would just change the config to suit my needs and commit them	12:42
grumbel_	and check if this is the commit you wanted	12:42
cbreak	jdhawke: just commit your changes	12:42
tobiasvl	that'll show your boss why it's a bad idea	12:42
cbreak	jdhawke: yours are obviously correct.	12:42
jdhawke	osse: Oh I have, but I'm 500 miles from the office. Will that prevent them from coming down as well	12:42
	→ Kicer86 joined	12:42
jdhawke	or does that only prevent outgoing changes?	12:42
osse	MYTH::getMjolnirInstance().swing(jdhawke->getSenior().nuts))	12:42
	jdhawke: prevent outgoing.	12:43
WhereIsMySpoon	grumbel_: ok will do, sec	12:43
jdhawke	Also, another quick poll..... derivative items (such as CSS files compiled from SASS): do you version them or no?	12:43
	← oal left	12:43
	← m0ltar left	12:43
jdhawke	I say no, as the build process should be regenerating them, but again the boss says yess	12:43
	→ aarapov joined	12:43
osse	jdhawke: no.	12:43
WhereIsMySpoon	no..you deploy that stuff	12:44
	your boss is weird	12:44
jdhawke	this whole place is....	12:44
	→ Sicp joined	12:44
osse	jdhawke: if you have stuff that can be generated by stuff in your repo then you don't commit the generated stuff	12:44
grumbel_	WhereIsMySpoon: got to go soon; if it is not, your last chance is to go through the dangling blobs that git fsck reported, and do git cat-file -p <sha1> for each to see if it's one of your changed files	12:44
osse	jdhawke: because you can just generated it	12:44
	*generate	12:44
WhereIsMySpoon	grumbel_: ok, thanks	12:44
jdhawke	I'm just making the jump from LAMP to Java/JSF development here, but I cannot belive that they do all their builds in the IDE and not with tools like Maven or Ant	12:45
jast	--assume-unchanged is a poor solution for the first issue	12:45
	→ keller joined	12:45
jast	I recommend something based on sparse checkout	12:45
WhereIsMySpoon	jdhawke: same logic as for built files like .class files or a .exe	12:45
	→ hkon_ joined	12:45
WhereIsMySpoon	jdhawke: you dont commit those	12:45
	so	12:45
	→ simesy joined	12:45
WhereIsMySpoon	or at least i hope you dont...	12:45
	you shouldnt :)	12:45
	→ m0ltar joined	12:46
jdhawke	I try not to, but I'm fighting upstream here....	12:46
osse	import guns; def shoot(): \n guns.fire() \n map(shoot, jdhawke.boss.kneecaps)	12:46
	→ SidGBF joined	12:46
jast	isn't it dreadful having to include line breaks in a piece of code :}	12:46
cbreak	jdhawke: if they don't listen to reason, make them listen to pain.	12:46
	-> make them suffer from merge conflicts due to their stupidity	12:47
jast	yeah, I tend to concur	12:47
jdhawke	they dont see the pain though, they've been doing it so broken for so long....it's "just how it is"	12:47
	→ Dudi joined	12:47
osse	increase the dosage	12:47
jast	start making changes to the project files in every single commit	12:47
WhereIsMySpoon	^	12:47
osse	see also if you can find some flags that makes sass generate the CSS differently. preferably with fewer or more lines	12:47
	← anry left	12:48
jast	randomly breaking various aspects of the build that are hard to pin down :}	12:48
	← rath left	12:48
SidGBF	Im failing to clone a repository in bitbucket. I think the issue is related to ssh keys. How can I know WHAT key it is using? I have set up the config file for ssh but still the same error	12:48
jast	seriously, though, sparse checkout enables you to make this not your problem	12:48
cbreak	consider mailing them the whole commit diffs when asking a question	12:48
jdhawke	that I can do, I set up the pom file to autocompile on build, I'll have it generate :compressed	12:48
	→ rath joined	12:48
osse	jdhawke: what you need is basically guerrilla warfare. terrorism, esentially.	12:48
WhereIsMySpoon	xD	12:48
jast	SidGBF: ssh -vv user@host gives you a lot of ssh debug output	12:49
jdhawke	I'll look into the sparse checkout	12:49
jast	it's a bit hidden, so here's some pointers	12:49
jdhawke	well, I'm interviewing for a new position elsewhere, so I might go on a rampage if I get it.	12:49
jast	.git/info/sparse-checkout: works just like gitignore files, make it match all files you want checked out	12:49
	e.g. "*" and "!/evilpath/"	12:49
WhereIsMySpoon	jdhawke: lol	12:49
	:D	12:49
	grumbel_: checked out! :)	12:50
jast	also set core.sparseCheckout to true in config	12:50
osse	jdhawke: what are their reasons? Do they have any actual counter-arguments or do they just say "no" ?	12:50
WhereIsMySpoon	lets see	12:50
	← simesy left	12:50
jdhawke	no real reasons, the whole CSS thing was "well the developers need to be able to test and edit...."	12:50
osse	run sass before testing!	12:51
	jeebus	12:51
WhereIsMySpoon	O.o	12:51
jdhawke	but we're using IntelliJ which does the SASS compilation and file watching	12:51
SidGBF	jast: thanks... indeed it is ignoring completelly my config file :D	12:51
	→ drodger joined	12:51
jast	once you've done that, 'git reset' will unstage any changes you've made and, at the same time, add flags to the index to tell git to never look at your local files in those locations	12:51
jdhawke	osse: my response...	12:51
	jast, I'm going to look into that this afternoon....	12:51
jast	in fact man git-read-tree has a section on it that contains all the essentials	12:52
gitinfo	the git-read-tree manpage is available at http://jk.gs/git-read-tree.html	12:52
jdhawke	I'm assuming that it will be completely transparent to all the other devs?	12:52
jast	didn't know that was there	12:52
	yes	12:52
cbreak	jdhawke: or just fix it.	12:52
	git rm --cached all derived files	12:52
jast	all it does is stop your client from checking out those files	12:52
jdhawke	cbreak, I did that already, and on the next merge, there they were again	12:52
osse	while (!jdhawke.newJob()) jdhawke.search();	12:53
	→ watabou joined	12:53
jdhawke	anyone want to hire a remote Java/PHP webdev?	12:53
	→ tureba joined	12:53
	← tubaman left	12:54
WhereIsMySpoon	:D	12:54
jast	sorry, we're a Perl shop	12:54
	← koell left	12:54
jast	we shoot Java/PHP developers with lasers ;)	12:54
jdhawke	I'll learn how to read excutable line noise again if I have to	12:54
WhereIsMySpoon	jast: on behalf of everyone, sorry for you	12:54
	:)	12:54
osse	jdhawke: well at leat you're using git... sort of...	12:55
jpentland	grumbel_, didn't see the reply until now - seems to have worked, thanks	12:55
jast	hey, I happen to like Perl	12:55
jdhawke	I finally got them to all stop working on master....now convincing them to actually fork and pull is the next step	12:55
WhereIsMySpoon	jast: poor damaged person	12:56
	jdhawke: ?!	12:56
	who are these people	12:56
	and why are they employees	12:56
osse	jdhawke: well, technically whether they work on master or not doesn't really matter. they all have their own master.	12:57
WhereIsMySpoon	osse: :\|	12:57
	→ sohail joined	12:57
	← dragoonis left	12:57
	← watabou left	12:57
osse	but they whole "remote tracking branch" thing might create problems	12:58
	→ vtunka joined	12:58
	→ diegovio1 joined	12:58
	→ sam___ joined	12:58
jdhawke	WhereIsMySpoon	12:58
	I have no idea	12:58
	gitinfo set mode: +v	12:58
	gitinfo set mode: +v	12:58
jdhawke	I've been here 2 years....working the LAMP team until the last 6 months	12:58
	ChanServ set mode: +v	12:58
jast	an extra +v for free :)	12:58
WhereIsMySpoon	can i have one to?	12:58
jdhawke	the LAMP side is fubar enough, but the "enterprise" team is killing me	12:58
WhereIsMySpoon	too*	12:58
	:p	12:58
	jdhawke: is it full of dynamic and process-driver people?	12:59
	→ samsamm777 joined	12:59
WhereIsMySpoon	driven*	12:59
	→ fission6 joined	12:59
	WhereIsMySpoon throws up a little	12:59
	diegoviola → Guest17045	12:59
	diegovio1 → diegoviola	12:59
jdhawke	if you mean "more chiefs than indians" then yes	12:59
WhereIsMySpoon	jdhawke: sounds pretty crap :<	12:59
osse	Suicide is painless.	12:59
jdhawke	it's a paycheck, and I work by remote full time....so I deal	12:59
	← Guest17045 left	13:00
WhereIsMySpoon	@all - how do I see just the lines that changed with git cat-file ?	13:00
osse	WhereIsMySpoon: you can't	13:00
WhereIsMySpoon	jdhawke: guess it would be worse if you had to deal in person	13:00
	← naught101 left	13:00
WhereIsMySpoon	osse: is there a way to see line changes at all with just a sha?	13:00
	→ cmmagid joined	13:00
osse	WhereIsMySpoon: diff it against its parent	13:00
	WhereIsMySpoon: git diff sha~1 sha	13:00
WhereIsMySpoon	osse: i dont know what the parent sha is	13:01
	<_>	13:01
osse	WhereIsMySpoon: you don't need to. try what I wrote	13:01
	the ~1 thing was not a typo	13:01
WhereIsMySpoon	oh i see	13:01
	aha	13:01
	← fission6 left	13:01
WhereIsMySpoon	osse: theyre blobs	13:02
	so git diff doesnt work	13:02
	← ravigehlot_ left	13:02
osse	WhereIsMySpoon: diff <(git cat-file ... sha~1) <(git cat-file ... sha)	13:02
	→ fission6 joined	13:02
WhereIsMySpoon	ok	13:02
	→ chris_ joined	13:02
osse	ahh, if it's a blob sha that won't work	13:03
WhereIsMySpoon	it is	13:03
osse	sha~1 will fail	13:03
WhereIsMySpoon	ah	13:03
	→ rfoust joined	13:03
	→ repxl joined	13:03
osse	commits have parents; blobs don't	13:03
WhereIsMySpoon	i see	13:03
jdhawke	well thanks for validating my sanity folks, and jast thanks for the sparse checkout tip, that might make working with these repo-cowboys a little less annoying....time to start some real work for the morning.	13:04
WhereIsMySpoon	lol..cowboys	13:04
	:D	13:04
repxl	hello i want to make a git repo on my live server on linux to my root folder of my website so basically if someone "commit" a change it will be commited to the root website folder so we see changes on my website url	13:04
WhereIsMySpoon	jdhawke: be prepared for "your config changes arent as important as mine, stop checking them in"	13:04
	repxl: git is not a deployment tool	13:04
	← rob_w left	13:05
osse	jdhawke: the most important thing you do now is apply for other joba.	13:05
	jobs	13:05
	that, or guerrilla warfare	13:05
	→ asQuirreL joined	13:05
jdhawke	I'm expecting a phone call this week for a Tech interview, and I know the CTO there, worked with him prior...	13:05
repxl	WhereIsMySpoon hmm so i can't commit and code with my friends ? lul	13:05
jdhawke	just need to convince them to beat the pay	13:05
	→ gabedain joined	13:06
	← SidGBF left	13:06
WhereIsMySpoon	repxl: if its just a personal project i guess its fine..just make a git repo on your root website folder and add the remote	13:06
	→ livingstn joined	13:06
WhereIsMySpoon	same as you did for your local repo	13:06
	→ danicampa901 joined	13:06
osse	but the checked out files wonæt get updated automatically	13:07
	← joki left	13:07
jdhawke	repxl, look into using something like Jenkins to watch the repository, and pull code out to the document root when it detects a push to master, or some other branch	13:07
WhereIsMySpoon	no..so do git pull on your website folder	13:07
	otherwise if u want it auto then u need a build system	13:08
	like jd said	13:08
	→ bremner joined	13:08
	← bremner left	13:08
	→ bremner joined	13:08
jdhawke	that way you can add to the job in jenkins some sanity testing to avoid pushing broken code to a live site	13:08
WhereIsMySpoon	as i said..git is not a deployment system	13:08
repxl	WhereIsMySpoon hmm im confused now i was think its something like svn ...	13:08
	→ ni__ joined	13:08
WhereIsMySpoon	i know nothing about svn	13:09
	go to #svn	13:09
	← rjc left	13:09
	→ jcvfen joined	13:09
WhereIsMySpoon	hmm	13:09
	→ tomengland joined	13:09
WhereIsMySpoon	i dont think my commits are in these blobs	13:10
	← bitkiller left	13:10
osse	repxl: it's very unlike svn. What you typically do is have a repo on the server and then you write a little script so that whenver you push to that repo the server will generate a set of files and place them in /var/www or wherever	13:10
WhereIsMySpoon	grumbel_, cbreak	13:10
	→ arand joined	13:10
cbreak	WhereIsMySpoon: blobs don't contain commits	13:11
	they contain file contents	13:11
repxl	osse yes so it is like i was think ...	13:11
	← kotopies left	13:11
WhereIsMySpoon	cbreak: sorry thats what I meant..I cant see the changes I made in these blobs	13:11
	← mizu_no_oto left	13:11
	← LeMike left	13:12
WhereIsMySpoon	the changes which were in the commit that is lost	13:12
	← john2x left	13:12
repxl	when i use tortoiseGit i can commit to git repo look https://code.google.com/p/tortoisegit/	13:12
WhereIsMySpoon	repxl: good?	13:12
	i can commit too	13:12
	that doesnt help you get your code onto your live env	13:13
	→ gnugnu9 joined	13:13
repxl	when i do the repo on the live server it will don't it ?	13:13
	→ john2x joined	13:13
WhereIsMySpoon	repxl: what you want is for the workflow to be like this right?: you push to master -> it gets deployed to your web server -> you can see stuff on your website	13:13
	← tomengland left	13:14
WhereIsMySpoon	repxl: git can do only the first part	13:14
	for the rest you need to either call git manually and do git pull on your web server or use some build thing like jenkins	13:14
	→ HSaka joined	13:14
	← chris_ left	13:14
	→ griotspeak joined	13:15
cbreak	WhereIsMySpoon: so I guess they are lost :/	13:15
WhereIsMySpoon	cbreak: i think im gonna give this up as a bad job	13:15
	→ joki joined	13:15
WhereIsMySpoon	cbreak: yea looks like it	13:15
repxl	o.O ok so basically git is only a tire of a car	13:15
WhereIsMySpoon	thanks for trying anyway mate, really appreciate it	13:15
cbreak	you don't have backups like TimeMachine either?	13:15
	← bremner left	13:15
	← prophile left	13:15
cbreak	probably not :(	13:15
WhereIsMySpoon	cbreak: never heard of it	13:15
	← dsdeiz left	13:15
WhereIsMySpoon	cbreak: I really should have been pushing my changes tbh	13:15
	← MattMaker left	13:15
WhereIsMySpoon	rather than just committing	13:15
cbreak	WhereIsMySpoon: it's the apple backup solution. It makes a backup of your hard disk every hour	13:16
WhereIsMySpoon	im on windows	13:16
	:)	13:16
cbreak	git doesn't replace backups, it solves a different problem	13:16
	hmm...	13:16
	microsoft doesn't have something similar?	13:16
	→ chris_thomson joined	13:16
cbreak	volume shadow copy thingie?	13:16
WhereIsMySpoon	no idea but if it does we dont have it	13:16
cbreak	repxl: no. Git is an scm. It is unrelated to cars.	13:16
	→ Droolio joined	13:16
cbreak	repxl: git manages source code.	13:16
	← rath left	13:16
WhereIsMySpoon	repxl: if I google "git deployment" I get loads of results on the first page to help with that	13:17
	go and use them	13:17
	git is not a one click code push deployment system	13:17
	→ rath joined	13:17
WhereIsMySpoon	git is a code management system, like cb said	13:18
	→ msafi1 joined	13:18
WhereIsMySpoon	cbreak: guess it's time to nuke the repo	13:18
	seen as its still borked	13:18
repxl	you said push to master right that means push to git repo ?	13:19
WhereIsMySpoon	repxl: sure, usually a repository has a master branch where all the tested and validated code is merged into from sub branches	13:19
	→ renatow joined	13:19
WhereIsMySpoon	repxl: sounds like you need to read a guide on what git is for and how it works	13:19
	← msafi1 left	13:20
	→ msafi joined	13:20
	← rath left	13:20
WhereIsMySpoon	repxl: http://git-scm.com/book	13:20
	← griotspeak left	13:20
WhereIsMySpoon	free	13:20
	go read the intro stuff	13:20
	git does not do what you think it does	13:20
	:)	13:20
	← msafi left	13:21
cbreak	repxl: every git repository is complete. It contains the history of all branches it contains	13:21
	← danicampa901 left	13:21
	→ msafi joined	13:21
cbreak	it has remote tracking branches containing all history of the remotes it tracks	13:21
msafi	I have a file that, in develop branch, is located in a different directory. How can I merge the develop version with my current branch version? Do I use cherry picking?	13:21
	→ decotii joined	13:21
cbreak	you can push or fetch to transfer said history	13:21
moritz	msafi: git merge	13:21
	though that doesn't just merge one file	13:21
WhereIsMySpoon	msafi: if you merge them it will say you removed the file from one place and added it in another	13:21
	which is fine	13:21
msafi	moritz: I just want that file, though, nothing else…	13:22
	→ testIriumdev joined	13:22
sam___	let's say you have a (git) project with 1000 files, you add 1 file, you run commit . How many sha1 are computed? and at which stage did they get computed? during the "add", or during the "commit"?	13:22
cbreak	msafi: sounds like you fucked up history then :(	13:22
	msafi: you can git checkout thatbranch -- thatfile	13:22
	that'll give you that file, overwriting current state	13:22
moritz	msafi: then you need something like git show branch1:first/path > second/path	13:22
	→ rq60 joined	13:22
moritz	and then git add, git commit	13:22
cbreak	but it will not give you any history, which is why it's bad.	13:22
WhereIsMySpoon	ah i see..i misunderstood	13:22
cbreak	sam___: lots of SHA during add	13:23
_rgn	is there a straightforward way to add some of git log --oneline output in the git commit editor? so that I could autocomplete in vim based on earlier commit messages	13:23
cbreak	sam___: more during commit	13:23
_rgn	gst	13:23
	gitinfo set mode: +v	13:23
cbreak	_rgn: there's man githooks	13:23
gitinfo	_rgn: the githooks manpage is available at http://jk.gs/githooks.html	13:23
testIriumdev	hello everybody	13:23
gitinfo	testIriumdev: 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:23
	→ kotopies joined	13:23
cbreak	maybe the prepare commit message hook helps you?	13:23
WhereIsMySpoon	lol	13:23
arand	sam___: One for each blob (file) and one for each tree (subdirectory)... At least one for the final commit id at the commit stage...	13:24
cbreak	_rgn: you can also specify a commit to copy the message from when committing	13:24
testIriumdev	i had question about update git form 1.9 to 2.0 on windows it's a required updated ?	13:24
	← Neon1024 left	13:24
msafi	cbreak: I branched from develop. Moved files around. Then develop version got updated. Now I wanna get that develop version. Why do you think I fucked up my history?	13:24
cbreak	testIriumdev: git 2? Wait with that until it's released	13:24
	testIriumdev: 1.9 is still barely a month old I think	13:25
	→ koda joined	13:25
cbreak	msafi: because you don't want to merge	13:25
repxl	-------------------------------------------------------------------------------------	13:25
testIriumdev	still alpha 2.0?	13:25
repxl	I'm currently deploying PHP using Git. A simple git push production is all that's needed to update my production server with the latest copy from Git. It's easy and fast because Git's smart enough to only send the diffs and not the whole project over again. It also helps keep a redundant copy of the repository on the web server in case of hardware failure on my end (though I also push to GitHub to be safe).	13:25
cbreak	msafi: if your history would be good, you'd just rebase or merge and be done	13:25
WhereIsMySpoon	wtf	13:25
cbreak	repxl: no spamming please	13:25
WhereIsMySpoon	repxl: dont do that please	13:25
repxl	this sounds to easy however it isn't	13:25
WhereIsMySpoon	if everyone prefaced their question with spam this channel would get clogged up stupid fast	13:26
	← Dudi left	13:26
msafi	I'll try a merge and see what happens. It sounds like the most straightforward path.	13:26
tobiasvl	repxl: why isn't it easy? what exactly is your problem?	13:26
	where does it stop?	13:26
msafi	Is there a way to see what a merge would do without actually merging?	13:26
cbreak	msafi: just merge and if you don't like it, abort	13:26
WhereIsMySpoon	http://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option	13:26
cbreak	msafi: if you don't have uncommitted changes, then that's safe	13:26
testIriumdev	msafi why u dont GUI client ?	13:26
WhereIsMySpoon	git merge --no-commit --no-ff $BRANCH	13:26
	← chris_thomson left	13:27
testIriumdev	u will see live merge	13:27
WhereIsMySpoon	yea..git extensions is really nice :)	13:27
msafi	testIriumdev: like what GUI?	13:27
repxl	tobiasvl i want to use git with my friends to commit changes to server	13:27
	→ JeremyWei joined	13:27
_rgn	cbreak: i frequently use git commit -C yeah. i'll look into prepare commit message hook	13:27
testIriumdev	sourceTree for exemple is free from Stash	13:27
	→ echolon joined	13:28
msafi	testIriumdev: how can I see a merge live with SourceTree? Been merging with SourceTree for a couple of months now, never noticed a preview feature...	13:28
	→ tmcmahon joined	13:29
_ikke_	preview what?	13:29
tobiasvl	repxl: yes, but what's your actual problem? why can't you push your PHP repo to the production server?	13:29
	repxl: you want to update the production repo's working directory on all pushes, I guess?	13:29
msafi	_ikke_: of what a merge would do without actually merging...	13:29
tobiasvl	repxl: is this an accurate copy of your lackluster question? http://stackoverflow.com/questions/3728054/git-push-to-live-server	13:30
	msafi: there's no "preview". you actually do the merge. locally.	13:30
	why don't you want to merge?	13:31
repxl	tobiasvl ehh ye push stright to server	13:31
testIriumdev	of couse why not as well , you can do revert if you are not ready or are doing test	13:31
tobiasvl	repxl: yes, I understand that. what I don't understand is what you've tried so far, what your actual problem is and why you think it's hard to achieve.	13:32
repxl	tobiasvl i didn't started but my question is when i install git on my live server now and i will create a repo inside the "root folder of my website" can me and my friend download the code from live server and commit back updates ?	13:33
_ikke_	repxl: That's not a recommended workflow	13:34
tobiasvl	repxl: yes, absolutely. you can download the code (clone the repo) and push back updates.	13:34
	but as _ikke_ says it's not recommended.	13:34
	→ polyzen joined	13:34
	← JeremyWei left	13:34
_ikke_	And pushing to a non-bare repository is refused by default	13:34
	see also !bare	13:34
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	13:34
repxl	tobiasvl and how is it recommended like have the repo on a different folder not on the "root website" ? or even have a complete new server for git repo ...	13:34
tobiasvl	repxl: did you read the stackoverflow link I gave you? the answer there is pretty explanatory.	13:34
	← tmcmahon left	13:34
	← testIriumdev left	13:35
repxl	tobiasvl you mean Local developer, Master server, Web server ?	13:35
	← Raging_Hog left	13:35
tobiasvl	repxl: I don't _mean_ anything, I haven't said anything about the actual workflow (you haven't presented one)	13:36
	repxl: _ikke_ told you it wasn't recommended though, and I agree	13:36
	repxl: maybe you could read this too: http://toroid.org/ams/git-website-howto	13:37
	← _tpavel left	13:37
tobiasvl	that tells you how to achieve what you want	13:37
	smart or not	13:37
	→ dougsland joined	13:38
	→ banrahan joined	13:38
	← lite_ left	13:38
	→ el3ctron joined	13:38
	→ Neon1024 joined	13:38
	→ dik_dak joined	13:39
	→ Destos joined	13:39
	→ mizu_no_oto joined	13:39
repxl	tobiasvl thx i go read that	13:39
	→ faBimon joined	13:40
	→ akim_ joined	13:40
	← WhereIsMySpoon left	13:41
	→ Dougie187 joined	13:41
	→ diegovio1 joined	13:43
	→ jatt joined	13:43
	→ sctt joined	13:43
	← jatt left	13:43
	→ jatt joined	13:43
	← jgoss left	13:44
	→ blackmesa joined	13:44
	← binnisb left	13:45
	← diegoviola left	13:45
jdhawke	jast man I want to buy you a beer for that tip	13:46
	only one issue...a new file generated in a location that I'm excluding is showing up as untracked...	13:47
	→ sdouglas joined	13:48
	← el3ctron left	13:48
	← acharlieh left	13:48
	diegovio1 → diegoviola	13:49
	→ Exancillatus joined	13:49
	→ el3ctron_ joined	13:50
	← sctt left	13:50
	→ JSharpe joined	13:50
	← vtunka left	13:53
	→ watabou joined	13:53
	← Guest13652 left	13:53
	→ AaronMT joined	13:54
	→ dsdeiz joined	13:54
	→ boboc joined	13:55
	→ bremner joined	13:55
	← bremner left	13:55
	→ bremner joined	13:55
	← JerryT left	13:55
	← rfoust left	13:56
	→ rfoust joined	13:56
	← watabou left	13:58
jast	jdhawke: add those dirs to .git/info/exclude to have them ignored, too	13:58
	→ Silmarilion joined	13:58
	→ GT4066 joined	13:58
jdhawke	okay	13:58
	← shinnya left	13:58
jdhawke	is that again a local only item?	13:58
	→ hholtmann joined	13:59
	→ jgoss joined	14:00
jdhawke	jast: now I owe you two beers :)	14:00
cbreak	repxl: creating a repo in the root of a web server strikes me as idiotic. Why would you want to do such a thing? Don't you know how crappy dumb-http is?	14:01
	repxl: just use ssh, it's much easier to set up	14:01
	→ phantomtiger joined	14:01
cbreak	and it also supports pushing, unlike dumb http	14:01
	→ jonatasnona joined	14:01
	← cmpera left	14:02
repxl	cbreak i already gave up	14:02
_ikke_	cbreak: The reason is more likely that they expect a git push to update the files	14:02
cbreak	_ikke_: that sounds weird. As if they didn't read !deploy	14:02
gitinfo	_ikke_: 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	14:03
	← jatt left	14:04
	tshirtman tried some time ago to make a hook to checkout master after getting refs pushed, that didn't go well, i guess i'll need to read about a proper setup next time i want that :]	14:05
	→ Diemuzi joined	14:07
	gitinfo set mode: +v	14:07
	→ dc5ala joined	14:07
pikaren	git cherry-pick could only affects the file that had been staged into the picked commits, right?	14:07
	← echolon left	14:07
	→ Jellyk joined	14:07
pcrd	cherry-pick only affects the files that the diff shows (roughly)	14:08
	← boboc left	14:08
	→ conan joined	14:09
	→ echolon joined	14:09
	← keller left	14:09
	→ rob_w joined	14:10
	← samsamm777 left	14:10
	← stealthii left	14:10
	← asQuirreL left	14:10
	← kwmiebach____ left	14:10
	← iwantoski left	14:11
	← mizu_no_oto left	14:11
	→ el_fuego joined	14:11
	← aberrant left	14:11
	→ stealthii joined	14:12
	← BaconOverflow left	14:12
	→ kwmiebach____ joined	14:12
repxl	well by the way when git is not a deployment tool what is the main usage git without deployment would be unattractive don't u think ?	14:13
	→ BaconOverflow joined	14:13
pikaren	pcrd: diff with the picked commits?	14:13
	← daito left	14:13
_ikke_	repxl: No	14:13
	repxl: git is good at maintaining history	14:13
	repxl: And allow people collaborate.	14:14
	→ shawndumas joined	14:14
	→ ErKa joined	14:14
	← diegoviola left	14:14
_ikke_	repxl: for deployment there are other tools much more fit for the job	14:14
	→ daito joined	14:14
	→ iwantoski joined	14:14
repxl	_ikke_ can u give me a hint which tools i really want only to deploy with one other friend.	14:15
	← kotopies left	14:15
	← zackiv31_ left	14:15
	← CussBot left	14:15
	← mamarley left	14:15
	→ jatt joined	14:15
	→ CussBot joined	14:15
	→ mamarley joined	14:15
	← jatt left	14:15
	→ jatt joined	14:15
	← polyzen left	14:16
	→ JeremyWei joined	14:16
tobiasvl	repxl: what was wrong with http://toroid.org/ams/git-website-howto	14:17
	← el3ctron_ left	14:17
	← jnavila_ left	14:18
	← daito left	14:19
	← echolon left	14:19
	→ CKyle joined	14:19
	→ zackiv31 joined	14:19
	← nnyk_ left	14:19
	→ Exdaix joined	14:20
	→ asQuirreL joined	14:20
	← sceox left	14:21
	→ echolon joined	14:21
	→ cmpera joined	14:21
	← cmmagid left	14:22
	← gabedain left	14:24
	→ jnavila joined	14:24
	→ becks__ joined	14:24
	→ gabedain joined	14:24
	← gabedain left	14:24
	→ gabedain joined	14:25
	→ baustin joined	14:26
bremner	not as up to date as !deploy	14:26
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	14:26
	→ someperson joined	14:27
bremner	me reads backlog, too late.	14:27
someperson	how do i find which git commit a particular line of code got added, and when it got removed?	14:27
	some kind of git blame across all commits ?	14:28
	→ petey joined	14:28
tobiasvl	someperson: !bisect	14:29
	← echolon left	14:29
tobiasvl	someperson: !git-bisect ??	14:29
	ok, git bisect anyway	14:29
	← D4v33 left	14:29
	→ echolon joined	14:30
	→ ojacobson joined	14:30
_ikke_	git log -S	14:30
	git log -S shows when a certain line was either added or removed	14:31
	→ vtunka joined	14:31
	→ the-erm joined	14:31
	← zackiv31 left	14:32
	→ JerryT joined	14:32
	← hkon_ left	14:32
	→ jxpx777 joined	14:32
	← cmpera left	14:32
	→ zackiv31 joined	14:33
someperson	_ikke_: hmm? how does that work?	14:33
	lets say i know which file and roughly what the line should contain	14:34
	← dsdeiz left	14:34
someperson	tobiasvl: how do i use that by file, search for a line?	14:34
thegorn	someperson: git log -S"what to search for" -- file.c	14:34
	→ sceox joined	14:35
tobiasvl	someperson: you don't, I misunderstood you. sorry	14:35
	← Jellyk left	14:35
	→ hkon_ joined	14:36
	← nepochal_ left	14:36
	→ dsdeiz joined	14:36
	→ raininja joined	14:36
	→ nepochal joined	14:36
raininja	ok I need to git bisect the kernel	14:36
	→ thierryp joined	14:36
	→ JerryT_ joined	14:36
	→ rlb joined	14:37
	→ fr33 joined	14:38
	→ hyperair joined	14:38
	→ EminenceHC joined	14:39
someperson	thegorn: thanks	14:39
	← Silmarilion left	14:39
rlb	gitk has started truncating all the tag names here, i.e. no content any more -- they're all just "tag...". Is there an option to restore the names that I might have overlooked?	14:39
pikaren	someone on reddit said git is programmer's masturbation	14:39
	u write detail commit message but in reality seldom look back	14:40
ojacobson	pikaren: someone on reddit says a lot of things. Some of them are even true.	14:40
	→ conan_ joined	14:40
	← JerryT left	14:40
	← echolon left	14:40
ojacobson	Others are not.	14:40
	How about having an opinion of your own, if you're going to try to have an opinion discussion	14:40
pikaren	hmm	14:40
	im just tring to start flame war	14:40
	→ aberrant joined	14:41
ojacobson	Ah. Well, thanks for being up-front about it; now, if you don't mind, knock it off	14:41
	← aarapov left	14:41
someperson	pikaren: leaving a detailed commit message has a lot of value, even if indirectly	14:41
	← Gaga left	14:41
ojacobson	this channel gets enough acrimony without your help :)	14:41
	→ Juri_Agarin joined	14:41
	← m0ltar left	14:41
	→ Samual joined	14:42
	← conan left	14:42
	→ echolon joined	14:42
_ikke_	pikaren: If you want to be treated like a troll, we can arrange that for you	14:42
rlb	...and one other question -- the branch labels have changed to black-on-dark-green, which is fairly low-contrast on this display. I'd like to change that too, but didn't see an (obvious) option.	14:43
	→ bambams_ joined	14:43
	← Exancillatus left	14:44
	→ lite_ joined	14:44
	flazz_gone → flazz	14:44
	→ Exancillatus joined	14:44
	→ nottombrown joined	14:46
	→ bwreilly joined	14:46
	→ tubaman joined	14:46
	← xjiujiu left	14:46
	← bwreilly left	14:46
	← jagob left	14:47
	→ Zarthus joined	14:48
	→ Sabbath joined	14:48
	← neurodrone_ left	14:48
	← SorenHolm left	14:49
	← baustin left	14:50
	← Exancillatus left	14:50
	→ infynyxx joined	14:51
	← hyperair left	14:51
	→ bwreilly joined	14:51
	← Neon1024 left	14:52
	→ cmpera joined	14:52
	← dirt_t left	14:53
	← JeremyWei left	14:53
	→ cvanball joined	14:53
	← Sabbath left	14:53
	→ watabou joined	14:54
	→ Exancillatus joined	14:54
	← jnewt left	14:55
	← Juri_Agarin left	14:55
	→ dreiss joined	14:56
	← echolon left	14:56
	← CKyle left	14:57
	← john2x left	14:57
	→ merica joined	14:57
	→ lindenle joined	14:57
	→ Neon1024 joined	14:58
	← watabou left	14:58
	→ SocalNick joined	14:59
	← rq60 left	14:59
	← njsg__ left	14:59
	→ carbon joined	14:59
	← przemkovv left	14:59
rlb	...answering my own question: set headbgcolor in ~/.config/gitk	15:00
	← carbon left	15:00
	→ thedodd joined	15:01
	→ codeFiend joined	15:01
	→ JeremyWei joined	15:02
	← lavaman left	15:03
	← AccessibleWeb left	15:03
	→ nottombr_ joined	15:03
	→ AccessibleWeb joined	15:04
	← nottombr_ left	15:04
	→ nottombr_ joined	15:05
	← _5kg_ left	15:05
	← lindenle left	15:05
	→ przemkovv joined	15:05
	← dreiss left	15:06
	← Kayra left	15:06
	→ hwrdprkns joined	15:06
	← codeFiend left	15:06
	← nottombrown left	15:06
	→ starkhalo joined	15:06
	→ Kayra joined	15:06
	← tureba left	15:07
	← hkon_ left	15:07
	← ssj4mo left	15:07
	→ samsamm777 joined	15:07
	← sd1074 left	15:08
	← AccessibleWeb left	15:08
	← the-erm left	15:09
	→ acharlieh joined	15:10
	← hwrdprkns left	15:10
	→ mizu_no_oto joined	15:11
	← Entomo left	15:11
	← Kayra left	15:11
	→ jagob joined	15:13
	→ tureba joined	15:13
	→ treehug88 joined	15:14
	→ hwrdprkns joined	15:14
	← bluesm left	15:15
	← raj__ left	15:15
	← someperson left	15:15
	→ AccessibleWeb joined	15:15
	→ prophile joined	15:16
	← infynyxx left	15:16
	→ kballou joined	15:17
	← pmurias left	15:18
	← ilmgb left	15:19
	→ Leucaruth joined	15:19
	→ Noldorin joined	15:19
	← JeremyWei left	15:20
	← petey left	15:20
	← freimatz left	15:20
	→ Kayra joined	15:20
	→ Hounddog_ joined	15:20
	← korbelz left	15:21
	→ Gamecubic joined	15:21
	← Hounddog left	15:21
	→ goTAN joined	15:22
	→ el3ctron joined	15:22
	→ aarapov joined	15:22
	→ lavaman joined	15:23
	→ Entomo joined	15:24
	← sweetyReaper left	15:24
	→ harish_ joined	15:25
	→ hyperair joined	15:25
	← aarapov left	15:27
jast	jdhawke: yes it is. and I actually don't drink beer, so you're in luck ;)	15:28
	← dawkirst left	15:29
	← Gavrisimo left	15:29
	← Gamecubic left	15:29
	← ayaz left	15:30
	← cff left	15:30
	← AccessibleWeb left	15:30
	→ knuth joined	15:31
	← nottombr_ left	15:31
	← lite_ left	15:31
jdhawke	jast: lol, fair enough, this is going to save me so much pain. Thanks for the tip.	15:32
	→ rq60 joined	15:32
jast	you're welcome	15:32
	→ nottombrown joined	15:32
	→ Silmarilion joined	15:33
	← Sicp left	15:33
	→ mikemar10 joined	15:33
	← cmpera left	15:34
	→ WhereIsMySpoon joined	15:34
	→ infynyxx joined	15:34
	→ zumba_addict joined	15:34
	→ cmpera joined	15:34
	← GeertV left	15:34
	← aberrant left	15:35
	← ni__ left	15:35
	← noxd left	15:35
	→ jluc joined	15:36
	→ Kneferilis joined	15:36
	← gua_ould left	15:36
Kneferilis	hello, git by default doesn't treat a file where I added a whitespace, as changed file that I can commit?	15:37
jast	it does	15:38
	→ raj__ joined	15:38
	→ rainmanjam joined	15:38
	← wrouesnel1 left	15:39
	→ AccessibleWeb joined	15:39
	→ kotopies joined	15:39
jdhawke	Kneferilis I've run into that before, but the problem was my IDE was stripping out trailing whitespace so git never saw the changes.	15:40
Kneferilis	jdhawke, I see.	15:40
jast	that's what you get for not using a real editor ;)	15:41
tshirtman	i think diff algos can be told to ignore whitespace difference maybe a git config can produce that too	15:41
	,*	15:41
	← Kulrak left	15:41
Kneferilis	:)	15:41
	← cmpera left	15:41
	← sdouglas left	15:41
jdhawke	jast I used to use Emacs, until I wore out the ctrl and alt keys	15:41
	← dsdeiz left	15:41
	← ferreum left	15:41
jast	there'a always vim	15:41
	→ nb_bez_ joined	15:41
	← hyperair left	15:41
jdhawke	modal editors just dont make sense to my head	15:42
	→ rjc joined	15:42
jast	it's dead useful, just takes some getting used to	15:42
tshirtman	vim ftw	15:42
jdhawke	I can use it, and get around, but I just find the whole shifting modes thing to be an un-needed extra step	15:42
	→ w1zeman1p joined	15:42
	← infynyxx left	15:43
tshirtman	it gives you the same hundreds of shortcuts without breaking your ctrl and alt keys	15:43
	or your fingers, for that matters :)	15:43
jdhawke	I wont deny that Emacs contributes to carpal tunnel	15:43
	→ tokik joined	15:43
	← stodan left	15:44
	← nottombrown left	15:44
	→ infynyxx joined	15:44
	→ someperson joined	15:45
	→ nottombrown joined	15:45
	→ bluesm joined	15:45
	← kermit left	15:45
	→ dirt joined	15:45
	→ cmpera joined	15:45
	← Guest4534 left	15:46
	→ hyperair joined	15:46
	← AccessibleWeb left	15:46
	← tokik left	15:47
	← rjc left	15:47
	→ tokik joined	15:47
	→ chris____ joined	15:47
	← chris____ left	15:47
	→ AccessibleWeb joined	15:49
	→ pheaver joined	15:49
pikaren	try atom then	15:49
	→ _5kg_ joined	15:49
pikaren	if u have a mac and a invitation	15:49
	← seanwash left	15:49
	→ ilmgb joined	15:49
	← prophile left	15:50
tshirtman	it's mac only? i though it was web oO	15:50
	← j0ran left	15:50
	→ tokik_ joined	15:51
	→ nottombr_ joined	15:51
	← zoso left	15:51
	← dragosf left	15:52
	← tokik left	15:52
	← raj__ left	15:52
	← nilg`` left	15:52
	← bwreilly left	15:52
	→ masak joined	15:52
	← banrahan left	15:53
	→ GeertV joined	15:54
	← thierryp left	15:54
	→ CKyle joined	15:54
	← nottombrown left	15:54
	← makubi left	15:56
	← Misan left	15:57
	← vtunka left	15:57
	← mizu_no_oto left	15:57
	← Hounddog_ left	15:57
	← ilmgb left	15:58
	→ makubi joined	15:58
	→ wizard_A joined	15:58
	→ kermit joined	15:58
	→ Hounddog joined	15:58
	← cmpera left	15:59
	← Exancillatus left	15:59
	← nottombr_ left	16:00
	→ nottombrown joined	16:01
	← roelmonn_ left	16:01
	→ deens joined	16:02
	→ renatow_ joined	16:02
	→ matteo joined	16:03
	← renatow left	16:03
	→ mizu_no_oto joined	16:03
	← pheaver left	16:04
	← jargon left	16:04
	→ j0ran joined	16:04
	→ joelm joined	16:05
	← souther left	16:05
	← kotopies left	16:06
	→ imachuchu joined	16:07
	← deens left	16:07
	← CussBot left	16:07
	→ CussBot joined	16:08
	→ ilmgb joined	16:08
	← Hounddog left	16:09
	→ Hounddog joined	16:09
	← petersaints left	16:10
	→ el_fuego_ joined	16:11
	← j0ran left	16:11
	← jatt left	16:11
	← el_fuego left	16:11
	→ baustin joined	16:12
	→ mattt_ joined	16:12
	→ bwreilly joined	16:13
	→ ethlor joined	16:15
	→ dreiss joined	16:15
	← dirt left	16:15
mattt_	I recently had to pull a feature from branch 'dev' into its own branch. I did this by creating a branch just before the first feature commit, then cherry-picking each feature-related commit into the new branch. I then reverted each of those commits on dev and committed the revert as a whole. I wanted to then update the feature branch, so I rebased on dev - I was expecting that all the changes in the branch would be replayed overtop of the HEAD	16:15
	dev (which just so happens to be the big revert commit). But it seems after rebasing the feature branch, the feature is gone, that is, the big revert is now HEAD of the feature branch.	16:15
	→ kotopies joined	16:15
	→ dirt joined	16:16
	→ erikruthven joined	16:16
	→ codeFiend joined	16:16
	← WormDrink left	16:16
	→ clearing joined	16:16
	← rq60 left	16:16
	→ rq60 joined	16:17
	→ Gamecubic joined	16:17
	→ lynzt joined	16:17
	→ TomyWork joined	16:18
	→ ni__ joined	16:18
	← CKyle left	16:18
	← hwrdprkns left	16:18
	← Favoretti left	16:18
	→ aberrant joined	16:19
	← ErKa left	16:19
	← mlechner left	16:19
	← jceb left	16:20
	← cvanball left	16:20
	← iwantoski left	16:20
	← takamichi left	16:21
	→ delianides joined	16:21
	→ RichardJ joined	16:21
	→ gua_ould joined	16:21
	← maloik left	16:21
	← _richardJ left	16:21
	→ Streward joined	16:22
	→ takamichi joined	16:23
	→ maloik joined	16:23
	← ni__ left	16:23
	→ Favoretti joined	16:23
lov	Silly question. I've got branch foo, which I'm rebasing onto master. Branch foo contained one divergant commit. There was a merge error that was manually fixed, but I'm still skeptical. Is there a good way to diff the commits themselves, to ensure that I didn't leave aything out?	16:23
	← hyperair left	16:23
	← Gizburdt left	16:24
	→ yhager joined	16:24
	← someperson left	16:24
	← freestyl3r left	16:25
	← codeFiend left	16:25
	← shingshang left	16:25
	→ rjc joined	16:25
	← dirt left	16:26
	← ghostlines left	16:26
	→ dirt joined	16:27
ojacobson	lov: git diff <commit A> <commit B>	16:27
	← lb1a left	16:27
ojacobson	to get commit A you probably want the reflog syntax (foo@{number}); see man git-reflog and man gitrevisions for details	16:27
gitinfo	the git-reflog manpage is available at http://jk.gs/git-reflog.html	16:27
	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:27
	→ Gizburdt joined	16:28
lov	ojacobson: is that diffing per file?	16:28
mattt_	Hm, how can I rebase one branch onto another, ignoring the date on merge? I want the whole branch to start from 'dev' HEAD	16:29
	← ArSn left	16:29
lov	note that there's a ton of changes that happened in master after foo was originally created, so that's going to give me a ton of stuff I don't want	16:29
	→ Zebroid joined	16:29
lov	what I'm looking for is "What's the difference between the changes in these two commits"	16:29
	not "what's the difference between these two comits"	16:29
	*commits	16:29
	I want to diff the patches in those particular commits, not all things inbetween	16:29
	← pduin left	16:30
ojacobson	lov: ah, then 'diff <(git diff foo~ foo) <(git diff bar~ bar)'	16:30
	← ThomasLocke left	16:30
ojacobson	(note 'diff', not 'git diff')	16:30
	foo and bar being the commits of interest	16:30
	you probably want diff -U4	16:30
	→ lite_ joined	16:30
	→ koell joined	16:30
	→ j4quinn joined	16:31
	← gua_ould left	16:31
lov	ojacobson: perfect, thanks	16:31
	→ SorenHolm joined	16:32
ojacobson	diffs-of-diffs are one reason I stopped caring about quilt and mercurial queues, mind :)	16:32
	← arietis left	16:32
	← dirt left	16:33
	→ thierryp joined	16:33
	← elijah_ left	16:33
	→ dirt joined	16:33
	← cagedwisdom left	16:33
	→ elijah joined	16:34
	→ hochmeister joined	16:34
	→ el3ctron2 joined	16:34
	← Noldorin left	16:34
	→ watermel0n joined	16:34
	→ codeFiend joined	16:35
	← AccessibleWeb left	16:35
	← Chryyz left	16:36
	← HelperW left	16:36
	→ Bass10 joined	16:36
	← el3ctron left	16:37
	→ arietis joined	16:37
	← yhager left	16:38
	← el3ctron2 left	16:39
	→ el3ctron_ joined	16:39
	→ ni__ joined	16:39
	→ Zifre joined	16:40
	← xificurC left	16:40
	← rlb left	16:41
	← samsamm777 left	16:42
	← thevishy left	16:42
	← Zebroid left	16:42
	→ Exancillatus joined	16:42
	→ yhager joined	16:42
	← Exancillatus left	16:43
	→ Sample joined	16:43
	→ ngladitz joined	16:43
	← thierryp left	16:43
	← bvi left	16:43
	← JosephFerano left	16:44
	← sam___ left	16:44
	← Rylee left	16:44
	→ beyondcreed joined	16:45
	→ ErKa joined	16:45
	← Gonzo89 left	16:45
	← Gizburdt left	16:46
	← rob_w left	16:46
	← lolmaus_ left	16:46
	→ werlley joined	16:46
	→ lolmaus joined	16:47
	→ Rylee joined	16:47
cbreak	difference between two commits? git diff commit1 commitb	16:47
ojacobson	He really wanted difference between two changes	16:48
cbreak	cherry-pick one commit on the other, then git show?	16:48
ojacobson	(which I chose to parse as "diffs from a commit's first parent to the commit")	16:48
	mm, maybe	16:49
	diff-of-diff also works :)	16:49
kotopies	while reading Git project GSoC project propositions I stumbled upon this "@{upstream}" thing. what does it do?	16:49
	→ oojacoboo joined	16:49
	← zumba_addict left	16:49
	→ fjfish joined	16:49
	← mellernoia left	16:50
	← codeFiend left	16:50
	→ zumba_addict joined	16:50
cbreak	it refers to the branch the current branch tracks	16:50
	kotopies: git branch -vv also shows that	16:50
jrnieder	yeah, it's the thing that 'git pull' would pull from	16:50
cbreak	kotopies: it's also visible in git config -l of course	16:50
	→ MoogleCharm joined	16:50
jrnieder	man gitrevisions is probably the right place for it to be documented	16:51
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:51
jrnieder	the current explanation there is... uninspiring	16:51
	← lynzt left	16:51
	← sceox left	16:51
kotopies	cbreak jrnieder: thanks :)	16:51
	← tokik_ left	16:51
	← francisfish left	16:52
	→ prophile joined	16:52
j4quinn	Quick question. i keep receiving this message "warning: suboptimal pack - out of memory" when i try to clone or repack. how do i resolve this? I know it is a memory issue/	16:52
dalias	add more memory? ;-)	16:52
j4quinn	i have 4gs of memory	16:52
	← Stygia left	16:53
	→ malkomalko joined	16:53
	← SorenHolm left	16:53
	← gdmfsob left	16:53
	→ lindenle joined	16:53
	→ ArcTanSusan joined	16:53
jrnieder	it means creating delta index failed. How many objects does this repo have?	16:54
cbreak	j4quinn: the server's the problem.	16:54
	→ ben_xyzzy joined	16:54
cbreak	j4quinn: cloning requires the server to do the packing	16:54
jrnieder	git count-objects -v	16:54
jast	the thing is, if someone has created the pack in such a way that you need more RAM than you have to even fully unpack it, you can't repack it :}	16:54
	← MoogleCharm left	16:54
	→ watabou joined	16:55
	gitinfo set mode: +v	16:55
	← jonatasnona left	16:55
ben_xyzzy	How do I compare a working copy file with arbitrary previous commit?	16:55
	← ereslibre left	16:55
jast	git diff <commit>	16:55
j4quinn	so jast how do i approach this issue then?	16:55
jast	good question	16:55
	→ mellernoia joined	16:55
jast	borrow a powerful computer? ;)	16:55
	→ jadne joined	16:56
j4quinn	i dont understand this	16:56
	← lavong left	16:56
jrnieder	depends on the underlying cause	16:56
jadne	is there a way i can export just the current directory as its own repository?	16:56
	← baustin left	16:56
cbreak	jadne: no.	16:56
jadne	drat	16:56
cbreak	jadne: you can rewrite history though	16:56
milki	rsync	16:56
cbreak	or you can use something like git archive and make a new repo without history	16:56
jast	create a copy of repo. use git filter-branch with --subdirectory-filter.	16:56
cbreak	it depends on wether you want to keep history or not	16:56
jadne	i do want the history	16:57
	otherwise i'd just use tar	16:57
cbreak	then filter-branch is the way to go	16:57
jadne	ok	16:57
	→ craigp joined	16:57
cbreak	it'll cut away everything but the specified subdirectory and makes it the new root	16:57
	← arand left	16:57
	← Balliad left	16:57
jadne	great, thakn you	16:57
cbreak	specify --all to filter all branches, and a --tag-name-filter cat to rewrite tags too	16:57
	and as jast said, do it in a copy... :D	16:57
osse	jadne: the new repo you create will be incompatible, though.	16:58
	← craigp left	16:58
jadne	er	16:58
osse	you cannot update it easily from the original (larger) repo	16:58
jadne	incompatible with which	16:58
	← mh` left	16:58
jadne	oh i am not going to	16:58
	a developer at work wants to break out one subdirectory from a larger project and move it elsewhere	16:58
	→ mh`` joined	16:58
jadne	to become its own project	16:58
	← jnavila left	16:59
	← ArcTanSusan left	16:59
osse	that's the use case filter-branch with --subdirectory-filter is perfect for	16:59
jadne	k	16:59
	→ deens joined	16:59
jadne	muchas	16:59
	← watabou left	16:59
	→ pheaver joined	16:59
	→ thiago joined	16:59
	← Zaknefain left	16:59
j4quinn	jrnieder count:2090	17:00
	← jasonroyle left	17:00
	← Joost left	17:00
	→ jbalsano joined	17:01
	← ben_xyzzy left	17:01
	← Gamecubic left	17:01
	→ jceb joined	17:02
	→ treehug8_ joined	17:02
	→ Xethron joined	17:02
	← Xethron left	17:02
	→ Xethron joined	17:02
	← andr3a left	17:02
	→ Exancillatus joined	17:02
	← gain left	17:02
j4quinn	jrnieder: as well it is my server	17:02
	← Exancillatus left	17:02
	→ Joost joined	17:03
	→ Chryyz joined	17:03
	→ sceox joined	17:04
	← jcarouth left	17:05
	← treehug88 left	17:05
	← renatow_ left	17:06
	→ xerxas joined	17:07
	← GeertV left	17:07
	← WakiMiko__ left	17:07
	→ Raging_Hog joined	17:07
	→ WakiMiko joined	17:07
	← oodavid left	17:07
	→ Bosch[] joined	17:08
	→ Gizburdt joined	17:08
	→ samsamm777 joined	17:08
	→ maestrojed joined	17:08
	→ NaiveFrost joined	17:10
	← yhager left	17:10
	→ Exancillatus joined	17:12
	← shawndumas left	17:12
	← lindenle left	17:12
	← jceb left	17:13
	→ lindenle joined	17:13
	→ thevishy joined	17:14
	← harobed left	17:14
	→ Zaknefain joined	17:14
	→ takamich_ joined	17:15
	→ a-l-e joined	17:15
	→ Gamecubic joined	17:15
	→ tyreld joined	17:16
	← Xethron left	17:16
	→ afflicto joined	17:16
	→ AccessibleWeb joined	17:17
afflicto	So, I just pushed to my bitbucket remote repo. I forgot to add a few files to my .gitignore file. So I did that now, how do I make the remote repo remove those files I no longer want git to track?	17:17
	← takamichi left	17:17
skorgon	afflicto, !fixup	17:18
gitinfo	afflicto: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	17:18
	→ jonatasnona joined	17:20
	← Neon1024 left	17:20
	← alorence left	17:20
	← oojacoboo left	17:20
	← mizu_no_oto left	17:20
	← przemkovv left	17:20
	→ elighcash joined	17:21
WhereIsMySpoon	skorgon: that isnt necessary from his use case	17:21
afflicto	I found a solution: git rm --cached file.txt	17:21
WhereIsMySpoon	he just wants to remove the files	17:21
	just a git rm	17:21
afflicto	yea	17:21
WhereIsMySpoon	mmhm	17:22
	← mikemar10 left	17:22
skorgon	WhereIsMySpoon, well, depends on what remove means. just stop tracking, or forget that they have been ever tracked	17:22
	elijah → uncle_comcast	17:22
WhereIsMySpoon	i assumed the simpler option :)	17:22
bambams_	And the safer option since it is now published history.	17:22
skorgon	you may or may not be correct ;)	17:22
	→ oojacoboo joined	17:22
	→ njsg joined	17:23
skorgon	that's why I pointed to !fixup, that also tells about !rewrite. that should cover all options...	17:23
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	17:23
	Rewriting public history is not recommended. Everyone who has pulled the old history 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 -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	17:23
	← njsg left	17:23
	→ njsg joined	17:23
	uncle_comcast → uncle_duran	17:23
bambams_	Sure, but for all intents and purposes fixup/rewrite is the wrong option unless somebody explicitly asks for it. :)	17:23
WhereIsMySpoon	^	17:24
	→ phinfinity joined	17:24
	← Anticom left	17:24
skorgon	bambams, i haven't read the fixup site fully, but doesn't it cover revert and fixing things up without rewriting history?	17:24
	i thought one of the first branches in the fixup flow was published vs non-published	17:25
	← Exancillatus left	17:25
	← phinfinity left	17:25
	→ wizard_A_ joined	17:25
	uncle_duran → uncle_comcast	17:25
	← wizard_A left	17:26
	→ przemkovv joined	17:26
bambams_	skorgon: I haven't read through that link (because I already pretty much know what I'm doing). A quick browser search of that page doesn't match 'git rm'.	17:26
	uncle_comcast → elijah	17:26
	→ phinfinity joined	17:27
	→ mizu_no_oto joined	17:27
	← dfanjul left	17:27
	← ezrafree left	17:27
	← RagBal left	17:28
	← phinfinity left	17:28
	→ hyperair joined	17:29
	← lite_ left	17:29
	← Raging_Hog left	17:29
	← dserodio left	17:29
	→ lite_ joined	17:30
	← mikecmpbll left	17:30
	← northfurr left	17:31
	← elighcash left	17:32
	→ m0ltar joined	17:33
	→ shawndumas joined	17:33
	→ Mitchbones joined	17:33
	← lite_ left	17:34
	→ plitzenberger joined	17:35
	← wizard_A_ left	17:35
	← plitzenberger left	17:35
	→ wizard_A_ joined	17:35
	→ mmoretti joined	17:35
	← dfarler left	17:36
	→ CKyle joined	17:36
	→ thalisson_ joined	17:37
	→ hwrdprkns joined	17:38
	→ raj__ joined	17:39
	← ilmgb left	17:39
	→ pietro10 joined	17:40
	← ErKa left	17:40
pietro10	Hi. What'st he easiest way I can pull specific files form a specific previous commit into a working directory? Thanks.	17:41
	→ Raging_Hog joined	17:41
	← samsamm777 left	17:41
WhereIsMySpoon	pietro10: do a cherry pick and merge?	17:41
	→ baustin joined	17:42
pietro10	not interested in merging, just want to pull files from an old commit out into my working directory to test something real quick	17:42
	← arietis left	17:42
ojacobson	'git checkout <tree-ish> -- <paths...>'	17:43
	which will stage them, as well	17:43
	akim_ → akim	17:43
ojacobson	so don't do this if you have staged uncommitted changes :)	17:43
pietro10	ok, thanks	17:43
	right, my root is clean right now	17:43
	← rq60 left	17:43
	→ hobodave joined	17:44
	← cllamas left	17:44
pietro10	so	17:44
	git checkout ab4d286c78b4e240a82b2b191f0d9c8d43c7b44c -- files... ?	17:44
	← gerard0 left	17:44
ojacobson	or 'HEAD~30' or 'some-branch' or whatever, yes	17:45
pietro10	thanks	17:45
	→ gerard0 joined	17:45
	← kotopies left	17:45
	→ ErKa joined	17:46
	← thalisson_ left	17:47
	→ thalisson_ joined	17:48
	→ Noldorin joined	17:48
	← m0ltar left	17:48
	→ kotopies joined	17:48
	← packetGunner left	17:48
	← octaviordz left	17:49
	← fjfish left	17:49
	→ rq60 joined	17:49
	← tvw left	17:50
	→ jamieshepherd joined	17:51
jamieshepherd	Hey, I'm sure a really simple thing, how do I make git upload empty folders? (Or can't I do this?)	17:51
	← welly left	17:51
	→ Sonderblade joined	17:51
ohcibi	jamieshepherd: 1. you dont upload folders nor files. 2. no, you cannot track empty folders	17:51
jamieshepherd	Okey.. Little bit frustrating as without the folders despite them being empty netbeans throws an error when I clone the project anywhere :(	17:52
	← asQuirreL left	17:53
ohcibi	jamieshepherd: typical approach is to commit an empty file like .gitkeep (name is only convention) in the folder you need, if you want to commit a basic folder-structure	17:53
	→ hahuang65 joined	17:53
	← pietro10 left	17:53
jamieshepherd	Ah that's a good idea, thanks	17:53
ohcibi	np	17:54
	← hwrdprkns left	17:54
	→ dfarler joined	17:54
	← PeterBooker left	17:54
ojacobson	An empty .gitignore also works	17:55
	→ asQuirreL joined	17:55
	← mattt_ left	17:55
	← AccessibleWeb left	17:55
	→ Exancillatus joined	17:55
	→ Trudko joined	17:55
	← Exancillatus left	17:56
	→ bvi joined	17:56
	→ AccessibleWeb joined	17:56
jamieshepherd	Ok, cool :)	17:56
	← AccessibleWeb left	17:56
	→ scalability-junk joined	17:56
	→ AccessibleWeb joined	17:56
	→ codeFiend joined	17:57
ohcibi	jamieshepherd: _any_ empty (or even non-empty) file works, the point is that git only tracks files, not directories... an empty .gitignore still makes a lot of sense as this file is not totally useless like .gitkeep or "empty" or "dontdeleteme" would be	17:58
	→ PeterBooker joined	17:58
jamieshepherd	Yeah I got that, thanks again	17:58
	← bvi left	17:58
	← Raging_Hog left	17:59
	← kermit left	17:59
	← conan_ left	18:00
	← xlinkz0 left	18:00
	← WaReZ left	18:00
	→ pr0ton joined	18:00
	→ jstimm joined	18:01
	← AccessibleWeb left	18:01
	← Hounddog left	18:02
	→ kermit joined	18:03
	← watermel0n left	18:03
	← marshmn left	18:03
	← ChrisAnn left	18:04
	→ Snicers-Work joined	18:04
	← WhereIsMySpoon left	18:04
	→ teasherm joined	18:04
	← goTAN left	18:04
	→ JosephFerano joined	18:05
	← thiago left	18:05
	→ Vile joined	18:07
	→ thiago joined	18:07
	osse humbly suggest making whatever tool that needs these directories create them	18:08
ojacobson	netbeans is not even remotely that smart	18:08
	(arguably, the solution here is to use a better dev environment)	18:08
	(if you need to check in project changes to make one specific IDE work, it's a bad IDE.)	18:08
	→ cs02rm0 joined	18:08
osse	alias netbeans='mkdir -p foo; netbeans' :p	18:09
cs02rm0	does a git clone pull down remote branches? i.e. if i were to clone, then hop on an airplane could i find and work with a remote branch?	18:09
osse	cs02rm0: yes	18:10
cs02rm0	superb. thanks.	18:10
	→ yhager joined	18:10
	← hholtmann left	18:10
	→ hholtmann joined	18:10
	← thiago left	18:12
	← pr0ton left	18:12
	→ felipewm joined	18:13
	→ ehmatthes joined	18:13
	← arif-ali left	18:14
	→ nnyk_ joined	18:15
	← phantomtiger left	18:15
	→ HelperW joined	18:16
	← faBimon left	18:18
jdhawke	LOL	18:19
	← TomyWork left	18:19
	← runnyspot left	18:19
	→ anry joined	18:19
	← mizu_no_oto left	18:20
	← kotopies left	18:20
	← dc5ala left	18:20
jdhawke	osse: well after that discussion this morning about the people I'm dealing with who have unique ideas on how Git should be used, I just got off the phone from the interview, was offered the position with a 10% raise and am waiting for the formal offer letter to come through.	18:20
osse	jdhawke: allahu akbar!	18:21
	(if that's your thing)	18:21
	jdhawke: is it more of the same or a completely different area?	18:21
	→ nottombr_ joined	18:21
	→ harobed joined	18:21
	→ hwrdprkns joined	18:21
	← nottombr_ left	18:22
	→ noxd joined	18:22
jdhawke	I'll be moving to being a backend LAMP developer, Drupal/Symfony/Code Ignighter with the opportunity to still get some Java and Rails work as well	18:22
	→ codezomb joined	18:23
	← hobodave left	18:24
ojacobson	java, rails, and php, together at last? sign me the fuck up :-\	18:24
jdhawke	(and no, not my thing but the though is appreciated)	18:24
	→ hobodave joined	18:24
ojacobson	I'm glad you're excited because I would run the other direction in your position :)	18:24
	← bluesm left	18:25
jdhawke	ojacobson I've been doing LAMP dev for about 10 years now....it's comfortable. Java has been new on my plate, but I'm loving JSF/JPA(Hibernate)	18:25
	← nottombrown left	18:25
	→ treaki joined	18:25
jdhawke	now I know a project manager who is going to crap bricks when I tender the notice	18:25
osse	jdhawke: FSM maybe?	18:26
	→ nutron joined	18:26
lov	jdhawke: hail satan	18:26
jdhawke	lol, nah, I'm more of a Russel's Teapot kind of guy	18:26
	← CKyle left	18:27
	← ehmatthes left	18:28
	→ sdouglas joined	18:29
osse	jdhawke: 10% raise ain't bad. That means that after you start the new job the old one will pay 9.09% less !	18:29
	← kermit left	18:29
	→ kotopies joined	18:30
	→ jceb joined	18:30
osse	jdhawke: on a more serious note: Do you have any indication on how the other company does things day-to-day ?	18:30
	→ kermit joined	18:31
	→ Aleks3Y joined	18:31
jdhawke	some, I asked the questions, being more lamp, it's less idea of a formal build/deploy process, but they have a solid grasp of git, they prefer clone/pull to branching	18:32
	← cs02rm0 left	18:32
jdhawke	got to chat with the CTO and the lead dev	18:32
	and it sounds like they are much more open to innovation in the process if it saves time/work/money	18:33
	← rq60 left	18:33
	→ akiva joined	18:34
	← SocalNick left	18:34
	← baustin left	18:35
Aleks3Y	Hi guys, i know my question might sound stupid, but I need help with a workflow of managing my fork of another code. Currently I don't have fork, but copy of very old code in my repo with changes applied manually on top. I'd like to make my life easier and looking for a right workflow	18:35
	← repxl left	18:36
	← jceb left	18:37
	← codeFiend left	18:37
	← kotopies left	18:38
	→ kotopies joined	18:39
	→ jenhsun joined	18:40
canton7	depends whether you ever intend on submitting your changes upstream	18:40
	→ p8952 joined	18:40
	→ nicedice joined	18:40
	← sdouglas left	18:41
	← infynyxx left	18:41
	→ t0r joined	18:42
thegorn	Aleks3Y: does the original source use git?	18:42
	→ aard_ joined	18:42
	← jenhsun left	18:42
	→ kotopies_ joined	18:42
thegorn	because if so it is pretty easy, just clonse it, branch off the old release and add your changes	18:42
Aleks3Y	canton7: No, i don't. But in case I do, i'll do it usual way.	18:42
	thegorn: yes, they use github	18:43
	i'm using my own local repo	18:43
canton7	clone, add your changes to whatever branch you want (local master branch, local 'my stuff' branch, whatever), merge in their master whenever you need stuff that's in it	18:43
thegorn	Aleks3Y: did your local repo start as a clone?	18:43
	← thunderbolt_ left	18:44
canton7	if you want to integrate those existing changes you've made: clone their repo, identify what commit your branches were made on, and create a branch there. paste your changes into the branch, commit, then merge back into the latest master (or whatever)	18:44
Aleks3Y	thegorn: no, back in the days, they didn't had public repo, only archive was available. So with every new release, i'd just replace all files with new and then restore my changes	18:44
thegorn	Aleks3Y: does their repo go back to the old days?	18:44
osse	jdhawke: sounds awesome. Congratulations and good luck :)	18:44
	← rfoust left	18:45
Aleks3Y	thegorn: i think so, i think they migrated SVN to git and made it public	18:45
thegorn	Aleks3Y: ok, yea, i'd do kinda what canton7 is recommending, find the old release you most recently modified in the git history	18:45
	branch off of it, add your changes	18:45
	then you can merge in master periodically/etc..	18:46
	→ jrahmy joined	18:46
thegorn	sometimes I find it easier to merge one point release at a time, i.e. if you start on 0.2, i'd merge 0.3, 0.4, 0.5 and so on as separate steps	18:46
	← kotopies left	18:46
thegorn	because if you are really out of date on a big repo the merge conflicts can get pretty insane, seems to keep it in more manageable chunks	18:47
	→ srcerer joined	18:47
	→ pr0ton joined	18:47
	← pr0ton left	18:47
	← asQuirreL left	18:48
Aleks3Y	canton7: i'd like to push changes to my remote repo too. So should i branch from master to another branch like my_own_master. and then, just merge changes from real master?	18:48
	what i'm thinking to do. is just start from scratch	18:48
	and keep my old repo aside	18:48
	so i'd clone their current repo, branch their master to master_fork, apply my changes to master_fork and push to my own repo	18:49
	then i can pull master and merge changes to master_fork	18:49
	so all my development will me in master_fork branch. and master will be clean from original source	18:49
	← HelperW left	18:50
	→ rfoust joined	18:51
	→ HelperW joined	18:51
thegorn	Aleks3Y: you don't need to keep a master up to date	18:51
	in your current repo, you can just do git remote add upstream <url>	18:51
	git fetch upstream	18:51
	and do your merging/branching/etc.. off of upstream/master	18:51
	no reason to maintain the headache of a local branch	18:51
	← harobed left	18:53
	→ scottbuckel joined	18:53
xrq	is there a way to pull in changes from another branch as uncommitted changes that I can then view and modify before any actual changes happen to my branch?	18:54
	→ nfroidure joined	18:54
	→ infynyxx joined	18:54
milki	pull then soft reset	18:54
	← totokaka left	18:55
skorgon	xrq, just fetch the remote	18:55
	← raj__ left	18:55
skorgon	xrq, git cherry (don't know exact syntax) can list the commits that a are in one branch but not the other	18:55
scottbuckel	I have a very simple question--I have a test server and a development server. How should I be setting up my git repo? I don't plan to use github or bitbucket but rather host it locally (on both boxes)	18:55
	← HelperW left	18:55
Aleks3Y	thegorn: not sure what do you mean. Are you saying that I can add their upstream and checkout their master to a different branch on my own repo and then just merge changes to my master?	18:55
scottbuckel	I've always used github or bitbucket and never had to set up my own server	18:55
thegorn	Aleks3Y: when you add a remote (i.e. normally a clone autocreates origin)	18:57
	← kballou left	18:57
thegorn	it maintains a bunch of remote-tracking branches in origin/ or <remotename>/	18:57
	see git branch -r	18:57
skorgon	xrq, and in general, I'd recommend to not use !pull. running the steps manually gives greater control over things	18:57
gitinfo	xrq: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	18:57
thegorn	so rather than constantly do a git checkout master && git pull && git checkout master_fork && git merge master or whatever	18:58
	you'd just have git fetch upstream && git merge upstream/master	18:58
	→ kadoban_ joined	18:58
	← kotopies_ left	18:59
	← shawndumas left	18:59
	→ btree joined	18:59
thegorn	on a very related note to skorgon helping xrq, i hate pull, no other command contributes as much to misunderstanding git as that one	18:59
skorgon	agreed	19:00
	→ whitby joined	19:00
	→ thiago joined	19:00
	← btree left	19:01
	← malkomalko left	19:01
	→ BuSerD_ joined	19:02
Aleks3Y	thegorn: so currently I do have remotes/origin pointed with my own git server on my local network. I can add another remote called 'upstream' pointed to original script repo. and then, i'll just merge their changes to my code without really checking out upstream?	19:02
	→ howlymowly joined	19:02
Aleks3Y	and if they are using tags, i can just merge tags to my own master	19:02
	→ Gavrisimo joined	19:02
	← kadoban left	19:02
thegorn	Aleks3Y: well, you'll want to first put your changes against their history	19:03
	← kadoban_ left	19:03
	← Vile left	19:03
thegorn	there's a couple ways of doing that, but i'd still recommend making a new branch that is their old 0.2 or whatever version you are on, integrating your changes there, and then working with that branch	19:03
	→ kadoban joined	19:03
	→ LuxuryMode joined	19:03
thegorn	you can also get git to do a false merge if you want to go that route	19:04
	→ ghostlines joined	19:04
	← ghostlines left	19:04
	→ nottombrown joined	19:04
	← takamich_ left	19:04
	← bgerber left	19:04
thegorn	whereby you simply mark 0.2 or whatever as already "merged" into your branch	19:04
	then you don't even have to force push and all that stuff	19:04
	→ ghostlines joined	19:04
thegorn	it is up to you	19:04
	← prophile left	19:04
	→ kotopies joined	19:05
thegorn	i'd prefer the false merge to preserve the history of your own work and not ruin other people's clones, but probably some would disagree	19:05
jrnieder	thegorn: would 'git pull' defaulting to --ff-only by default improve your quality of life?	19:06
	→ oodavid joined	19:06
thegorn	jrnieder: no	19:06
	→ sgen joined	19:06
	← EminenceHC left	19:07
thegorn	because it still obfuscates what is happening, and now you have a bunch of newbs doing git pull && git push -f as a standard operation	19:07
	← jrahmy left	19:07
	← thevishy left	19:07
jrnieder	heh, ok	19:07
	→ raj__ joined	19:07
jrnieder	technically that would be fine since the '&&' would mean nothing happens ;-)	19:08
	← wizard_A_ left	19:08
thegorn	jrnieder: does git pull return an error code?	19:08
	← Mitchbones left	19:08
	jrnieder tries it	19:08
thegorn	because && means if it succeeded	19:08
	\|\| means if it failed	19:08
	but of course some things (like diff and grep) kinda tweak that meaning a little bit	19:09
cbreak	&& means and, \|\| means or	19:10
	short circuit evaluation ftw :)	19:10
jrnieder	"$ git pull --ff-only" says "fatal: Not possible to fast-forward, aborting." with status 128	19:10
thegorn	jrnieder: and what if there are changes that it can pull	19:10
	← sgen left	19:11
jrnieder	my example is from a non-fast-forward update (i.e., there are upstream changes)	19:11
	for a fast-forward update, pull --ff-only performs it and exits with status 0	19:12
	← kotopies left	19:12
jrnieder	though there can be other reasons to fail --- e.g., if your disk fills up you'll get nonzero status	19:12
	← nottombrown left	19:12
	→ Annak joined	19:13
	gitinfo set mode: +v	19:13
	← infynyxx left	19:13
	→ jrahmy joined	19:13
	← Diemuzi left	19:14
	→ infynyxx joined	19:15
	→ kriks joined	19:15
	→ matheus23 joined	19:15
	← Gavrisimo left	19:16
	Annak → Diemuzi	19:16
	→ Cleopatra joined	19:16
	← nullElise left	19:16
	← raj__ left	19:17
	← erikruthven left	19:17
	Keridos_off → Keridos	19:19
	→ ilmgb joined	19:19
	→ bgerber joined	19:20
	→ elighcash joined	19:20
	→ watermel0n joined	19:21
	→ nottombrown joined	19:22
	→ Balliad joined	19:22
	← HSaka left	19:22
	→ pantsman joined	19:22
	← jbalsano left	19:23
	← saorge left	19:24
	← amcsi_work left	19:24
	← rotta left	19:25
	ChanServ set mode: +o	19:25
	→ WaReZ joined	19:25
	← elighcash left	19:25
	Eugene changed the topic to: Welcome to #git, the place for git help and green beer \| Current stable version: 1.9.0 \| Start here: http://jk.gs/git \| Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| Happy Saint Gitty's Day!	19:25
	→ boombatower joined	19:26
	← blackmesa left	19:26
	← cjsarette left	19:26
	← howlymowly left	19:26
Snicers-Work	Ok, from the git community, what is the best way to deploy a code base from git to production?	19:27
	← oodavid left	19:27
	→ petey joined	19:28
	→ iriy joined	19:28
jrnieder	Snicers-Work: depends on details. !deploy has a nice overview	19:28
gitinfo	Snicers-Work: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	19:28
	→ saorge joined	19:28
	→ kotopies joined	19:28
	← Leoneof left	19:28
Snicers-Work	Thanks jrnieder.	19:29
jrnieder	sure thing	19:29
	→ pfg joined	19:29
	← LuxuryMode left	19:29
	← fission6 left	19:30
	→ raj__ joined	19:30
	→ totokaka- joined	19:30
	→ fission6 joined	19:31
	← Kayra left	19:31
	← ilmgb left	19:31
	→ Kayra joined	19:32
	← a-l-e left	19:32
	← thalisson_ left	19:32
	← thiago left	19:33
	← yacks left	19:33
	→ Leoneof joined	19:33
	← iriy left	19:34
	→ iriy joined	19:35
	→ DrShoggoth joined	19:35
	→ oskarkv2 joined	19:35
	→ veebers joined	19:35
	→ rq60 joined	19:35
	→ kotopies_ joined	19:36
	← oskarkv left	19:36
	← Kayra left	19:36
	← kotopies left	19:37
	← totokaka- left	19:38
	→ totokaka joined	19:38
	→ oodavid joined	19:38
	← jamieshepherd left	19:38
	→ jbalsano joined	19:38
	→ kotopies joined	19:38
	← Octalot left	19:39
	← kotopies_ left	19:40
d33tah	what was the saner way to perform something like git diff ..7fa4e6b4558fc4ac6c944f56dd64a7f0303c1fda \| patch -Np1 ?	19:40
	→ Juri_Agarin joined	19:40
	→ godgodgodgo joined	19:40
cbreak	d33tah: format-patch	19:41
	d33tah: or git cherry-pick?	19:41
	← Leoneof left	19:41
grawity	d33tah: git checkout 7fa4e6 -- .	19:41
	complete with the dot	19:41
d33tah	grawity: yeah, that's probably it. thanks.	19:41
	→ takamichi joined	19:41
	← takamichi left	19:41
	gitinfo set mode: +v	19:41
iriy	Hello, can somebody explain how can I send email to Git mailing list? I send email to [email@hidden.address] but it don't work	19:42
	← jbalsano left	19:42
	→ Leoneof joined	19:42
	→ takamichi joined	19:42
	← takamichi left	19:42
	→ descala joined	19:42
bremner	!doesntwork	19:42
gitinfo	Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...	19:42
	→ baustin joined	19:43
	→ LuxuryMode joined	19:43
	← Leoneof left	19:43
	← jas4711 left	19:43
	← rfoust left	19:43
	→ jbalsano joined	19:44
	→ takamichi joined	19:44
	→ jas4711 joined	19:44
	← jrahmy left	19:45
treehug8_	Snicers-Work: I've seen big companies that do deploy via git checkouts. I've also seen deploys via rsync, and via custom-built tarballs	19:46
	→ mgomezch joined	19:46
Snicers-Work	right, I thought about doing rsync as well. My problem is I want to deploy large video files as well so git is out for that.	19:47
jrnieder	iriy: http://vger.kernel.org/majordomo-info.html#taboo might be informative. Make sure your mail is sent as plain text and you should probably be ok	19:47
	iriy: also, when the mail server rejects mail, it usually sends a rejection notice back. Did you not get one?	19:47
treehug8_	Snicers-Work: you might want to think also about atomicity of the deploy. WHat if file A hits before file B? Vice versa?	19:47
	← Zaknefain left	19:47
	← jbalsano left	19:48
Snicers-Work	What do you mean treehug8_ ?	19:48
cbreak	Snicers-Work: use git archive \| untar to a new directory	19:48
	then copy the video files into it	19:48
	then rename it into place	19:48
jrnieder	wikimedia builds deb files for their deployment and uses puppet for configuration management iirc	19:49
	→ ilmgb joined	19:49
	← merica left	19:49
	→ kotopies_ joined	19:49
	→ rfoust joined	19:49
	← felipewm left	19:50
treehug8_	Snicers-Work: I mean, if file A depends on file B (like for a method or a function or a constant), and the files are dribbling in from a deploy while users are accessing the website, then what happens when half the files are deployed?	19:51
	gitinfo set mode: +v	19:51
Snicers-Work	For the most part with what I am doing that is not a concern.	19:52
treehug8_	Snicers-Work: rsync is probably the easist/fastest	19:52
	"easiest"	19:52
	← pikaren left	19:52
	← kotopies left	19:52
Snicers-Work	Yeah, just I have people on Windows systems as well.	19:52
	So that makes it a bit clunky.	19:52
treehug8_	seems like you should define "dev env", "deploy", and "production" :)	19:53
	← lithiumjake left	19:53
	← ilmgb left	19:53
	← watermel0n left	19:53
	← bgerber left	19:53
	→ ilmgb joined	19:53
	→ kukks\|2 joined	19:54
	→ CKyle joined	19:54
	← kukks\|2 left	19:55
	→ kukks joined	19:55
	← kukks left	19:55
	→ kukks joined	19:55
	← ilmgb left	19:56
	← infynyxx left	19:56
	→ ilmgb joined	19:57
	→ andrewwagner joined	19:57
	← ilmgb left	19:58
	← dog-food left	19:59
	→ user449 joined	19:59
	→ bluesm joined	19:59
	← Gooder` left	19:59
	→ nephyrin joined	20:00
	← matteo left	20:00
	→ plitzenberger joined	20:00
	→ EminenceHC joined	20:00
	← plitzenberger left	20:00
iriy	jrnieder: I send simple email with prefix [patch], and... nothing. My email does not appear in archives, and nobody responds	20:01
	← fannye left	20:01
	gitinfo set mode: +v	20:01
user449	Hi, I created a repo on github and uploaded a standard visual studio .gitignore file but somehow files slipped through such as .suo and so on. I have removed it now but I'm a bit confused as if I should remove the 'packages' folder and the solution file (.sln) any idea?	20:01
	→ mizu_no_oto joined	20:02
treehug8_	user449: that sounds more like a visual studio question	20:02
	→ lynzt joined	20:02
canton7	leave the .sln . if packages/ was created by nuget, delete that too	20:02
	← kotopies_ left	20:03
	→ jrahmy joined	20:03
canton7	you should be tracking the .csproj, .sln, packages.config, .nuget. ignore bin/, obj/, packages/, suo	20:03
cbreak	user449: just git rm -rf --cached blah	20:03
	→ bgerber joined	20:03
cbreak	in general, do not track derived files	20:03
	so if your visual studio stuff is derived (from cmake or so), then remove that stuff	20:04
	if it is primary (generated and maintained by the programmer), then keep it	20:04
	→ mishok13 joined	20:04
	→ isbadawi joined	20:04
	← IrishPrime left	20:05
	→ blackmesa joined	20:05
	→ lithiumjake joined	20:05
user449	okay thanks	20:05
	→ ezrafree joined	20:05
	← nnyk_ left	20:06
	→ khmarbaise joined	20:06
	→ infynyxx joined	20:06
	→ harobed_ joined	20:06
	→ erikruthven joined	20:07
	→ ilmgb joined	20:07
user449	just to be sure, you would delete this right? https://github.com/bahagiga/Crocus-Guillemot/tree/master/packages	20:07
	← rfoust left	20:07
	→ francisfish joined	20:07
canton7	yup	20:08
	→ kotopies joined	20:08
canton7	that's regenerated by VS when you build	20:08
user449	canton7: cheers:)	20:08
	← Balliad left	20:08
canton7	well	20:08
	→ kcj joined	20:09
canton7	you need to right-click your solution, 'enable nuget package restore', and track the .nuget folder which gets created	20:09
	← woozly left	20:09
canton7	user449 ^^	20:09
user449	canton7: ok, is that something i should do before I delete the packages folder? :P	20:09
canton7	do it at the same time	20:10
	→ Balliad joined	20:10
user449	when I say delete i simply mean stop tracking on github	20:10
	→ Joel joined	20:10
canton7	sure	20:10
user449	okay :)	20:10
canton7	doesn't matter if you delete packages/ as I say - VS re-creates it	20:10
Joel	given a git url, and a branch, is there a set of commands I can run to make sure I can do a pull and get no merge conflicts?	20:10
user449	canton7: thanks champ:)	20:10
Joel	basically, save me from rm -rf'ing it, and doing a clone.	20:10
	→ darnir_ joined	20:11
xrq	how do I add a framework to git? git seems to hang - maybe from following the recursive symlinks?	20:11
	← petey left	20:11
	← erikruthven left	20:11
	→ thiago joined	20:11
grawity	git does not follow symlinks	20:11
cbreak	git add framework	20:11
xrq	*cocoa framework	20:11
cbreak	but really, don't add build results to git	20:12
	→ petey joined	20:12
xrq	this isn't a build result	20:12
	← Chryyz left	20:12
	→ RagBal joined	20:13
	← zajn left	20:14
Joel	unless I'm missing something I don't think I would be adding cocoa framework to git.	20:14
	Looks like the result of a third party build.	20:14
xrq	lol	20:14
	← lynzt left	20:14
	→ lynzt_ joined	20:14
xrq	it could be many things from where you're sitting. from where I'm setting adding it is very important	20:15
	→ NimeshNeema joined	20:15
xrq	from where I'm sitting too	20:15
Joel	xrq, knock yourself out then.	20:15
	← sohail left	20:15
	← petey left	20:16
	→ JGarrido joined	20:16
	→ hydrajump joined	20:17
iriy	Please, can anybody explain why my email that I send to git mailing list does not appear? I simple send [patch]...	20:18
skorgon	iriy, is the list fully open or do you have to be subscribed? is it moderated for non-subsribers?	20:18
	← thrakcattack left	20:18
	→ SorenHolm joined	20:19
skorgon	iriy, how do you know that it's not on the list?	20:19
hydrajump	hi I created a pull request for an OSS project and apart from the changes I made, my editor has changed whitespace throughout the file. How do you stop this from happening as the project maintainer said it's bad practice?	20:19
cbreak	hydrajump: get a better editor?	20:19
skorgon	not using windows?	20:19
cbreak	hydrajump: or change the settings of your editor	20:19
	← salamanderrake left	20:19
hydrajump	Here's my pull request if it helps to see what I'm talking about: https://github.com/vyos/vyatta-cfg-system/pull/1/files	20:20
	→ shawndumas joined	20:20
hydrajump	cbreak I'm using Sublime Text	20:20
cbreak	looks like they had worthless whitespace	20:20
	make your editor not delete worthless whitespace even though it totally deserves being deleted.	20:20
hydrajump	cbreak true but I've been asked to not do that again for future pull requests.	20:21
	cbreak so it's an editor issue not git related?	20:21
	← jrahmy left	20:21
cbreak	yes.	20:21
	git doesn't change code unless told	20:21
	← rainmanjam left	20:21
cbreak	(i.e. by enabling line ending conversion)	20:21
	→ lynzt joined	20:21
xrq	yikes, you would think in 2014 editors would stop doing that	20:21
hydrajump	cbreak what's "line ending conversion"?	20:22
xrq	hydrajump: \r and \n (carriage return, linefeed) and mixtures of both	20:22
iriy	skorgon: I subscribed on this list and receive other emails, but nothing about my email, and my email does not appear in archives	20:23
	→ salamanderrake joined	20:23
	→ AccessibleWeb joined	20:23
	← Gizburdt left	20:24
skorgon	iriy, archives may take a while. they probably don't get updated constantly	20:24
	← lynzt_ left	20:25
	← lithiumjake left	20:25
	← RagBal left	20:25
	→ sohail joined	20:26
hydrajump	Is it possible to set whitespace settings in Sublime Text on a per project/ file basis or will I have to change it globally when working on this specific project?	20:26
	← mellernoia left	20:26
	→ kotopies_ joined	20:27
	→ polyzen joined	20:27
	← CKyle left	20:28
	← kotopies left	20:28
	→ sdouglas joined	20:28
hydrajump	Maybe this is what I want https://stackoverflow.com/questions/12297169/sublime-text-2-trim-trailing-white-space-on-demand	20:28
iriy	skorgon: ok, thank you, maybe you're right and I should wait for a while	20:29
	← francisfish left	20:29
	← salamanderrake left	20:30
	→ RagBal joined	20:31
	← pheaver left	20:31
	→ salamanderrake joined	20:31
	← kotopies_ left	20:31
	→ snql joined	20:32
	← ilmgb left	20:32
	→ Exancillatus joined	20:32
	← RagBal left	20:33
	← jackneill left	20:34
	← iriy left	20:35
	→ woollyams joined	20:35
	← deens left	20:37
	← BuSerD_ left	20:37
	← i0nutzb left	20:39
	← msafi left	20:39
	→ CreativeEmbassy joined	20:40
	← woollyams left	20:41
	→ eletuchy joined	20:41
	→ kotopies joined	20:41
	← blackmesa left	20:41
	→ dougsland_ joined	20:41
	← infynyxx left	20:42
	→ msafi joined	20:42
	← dougsland left	20:43
	← subleq left	20:43
	→ Zaknefain joined	20:43
	→ lithiumjake joined	20:43
	→ phantomtiger joined	20:44
	→ trewe joined	20:44
	→ ilmgb joined	20:46
	← davividal left	20:46
	→ kotopies_ joined	20:46
	→ jbalsano joined	20:46
	→ wrouesnel1 joined	20:47
	→ pheaver joined	20:47
	← kotopies left	20:47
	→ echolon joined	20:47
	→ Nevik_ joined	20:47
	← Zaknefain left	20:47
	← mjessome left	20:48
	← ilmgb left	20:49
	→ mjessome joined	20:49
	→ Sabbath joined	20:49
	→ Leoneof joined	20:50
	← dougsland_ left	20:50
	→ _lynX joined	20:50
	← salamanderrake left	20:50
	← kotopies_ left	20:51
	→ salamanderrake joined	20:51
	→ BuSerD_ joined	20:52
	← Gamecubic left	20:52
	→ ilmgb joined	20:52
hydrajump	If I've created a feature branch, created a pull request and it was merged into master. Can I continue to commit to that branch with relevant changes to that feature and then create a new pull request?	20:53
	← BuSerD_ left	20:53
hydrajump	Github is telling me that my branch can be deleted that's why I wonder.	20:53
cbreak	you can.	20:53
	hydrajump: in general, feature branches should only contain one feature	20:54
	← Sabbath left	20:54
cbreak	so if you have a new feature, make a new branch	20:54
	and since they are merged when the feature is complete, they would usually also be a good candidate for deletion.	20:54
	→ rivet joined	20:54
hydrajump	cbreak ok what if it's the same feature that was merged, but I have additional changes related to that feature?	20:54
	← kcj left	20:55
	← Luke-Jr left	20:55
cbreak	your decision.	20:55
	← salamanderrake left	20:55
hydrajump	cbreak it was merged by the maintainer before I could get to deleting other relevant lines of code	20:55
rivet	so if master is at A->B->C and then mybranch continued to D->E->F. I want to merge master and mybranch so master is A->B->C->D_>	20:55
	→ ilmgb_ joined	20:55
hydrajump	cbreak what would you do?	20:55
rivet	A->B->C->D->E->F I mean.	20:55
	→ salamanderrake joined	20:55
cbreak	hydrajump: nothing in git requires the deletion of said branch. If it fits, just use it.	20:55
	→ Luke-Jr joined	20:55
	← Nevik_ left	20:55
	→ Nevik joined	20:55
hydrajump	cbreak ok thank you.	20:55
	→ _2_joannac411 joined	20:56
	← isbadawi left	20:56
	→ isbadawi1 joined	20:56
	→ nicksloan joined	20:57
	← ilmgb_ left	20:57
	→ phuh_ joined	20:58
Eugene	_2_joannac411 - do not PM randomly	20:58
	→ mgomezch_ joined	20:58
	← jbalsano left	20:58
nicksloan	I had some unstaged changes when I needed to pull in commits from another branch. I did a `git stash`, followed by a `git rebase otherbranch` (which rebased with no conflicts) and `git stash pop`. After popping, I got some conflicts, and noticed that all of the original changes are now staged.	20:59
	what's the deal?	20:59
	← AccessibleWeb left	20:59
	← ilmgb left	20:59
	← mgomezch left	20:59
	→ nnyk_ joined	20:59
	→ jcarouth joined	20:59
nicksloan	(the conflicts aren't surprising... all of my unstaged changes being staged is though.	20:59
Nevik	nicksloan: conflict resolution works in the index	21:00
	← andrewwagner left	21:00
cbreak	nicksloan: git stash is like a temp commit	21:00
Nevik	s/like//	21:00
cbreak	nicksloan: your stash apply works like a cherry-pick, somewhat	21:00
	← _2_joannac411 left	21:00
cbreak	if you get a conflict, it has to be resolved like a normal conflict	21:00
	-> resolve the issue, git add to mark as resolved	21:00
	← phuh left	21:01
	← DoniRS left	21:02
	→ Gamecubic joined	21:02
	← Cleopatra left	21:02
	← isbadawi1 left	21:03
nicksloan	cbreak: yeah, I've done that. So I'm getting this weirdness because of the temporary commit created by the stash... seems like when I commit now, I shouldn't really identify it as a merge, but just as any other commit.	21:04
	← cannonball left	21:04
	← thiago left	21:04
	← koda left	21:05
	← raj__ left	21:05
	← CreativeEmbassy left	21:06
	→ infynyxx_ joined	21:06
	← infynyxx_ left	21:06
	← imachuchu left	21:06
	→ infynyxx_ joined	21:06
	→ infynyx__ joined	21:07
	← infynyx__ left	21:07
	→ jbalsano joined	21:07
	→ infynyxx joined	21:07
cbreak	it's not a merge	21:08
	← ni__ left	21:08
	→ Trudko_ joined	21:09
	← wrouesnel1 left	21:09
	→ AccessibleWeb joined	21:10
	← kukks left	21:10
	← Trudko left	21:10
	← delianides left	21:10
	← mizu_no_oto left	21:10
	← snql left	21:11
	← Luke-Jr left	21:11
	→ freestyl3r joined	21:11
	← infynyxx_ left	21:11
	→ Luke-Jr joined	21:11
	← livingstn left	21:12
	← knuth left	21:13
	→ knuth joined	21:13
	← takamichi left	21:14
	← user449 left	21:15
	← hwrdprkns left	21:15
	→ tpollard joined	21:15
	← sdouglas left	21:16
	→ BuSerD_ joined	21:17
	→ sdouglas joined	21:17
	→ nullElise joined	21:17
	← oodavid left	21:17
	BuSerD_ → BuSerD	21:17
	← osse left	21:18
	→ oriba joined	21:18
	← jxpx777 left	21:18
	← nullElise left	21:18
	→ jxpx777 joined	21:18
	→ nullElise joined	21:18
	→ jekle joined	21:18
	→ invinceable joined	21:19
	← AccessibleWeb left	21:20
	→ AccessibleWeb joined	21:20
	← ghostlines left	21:21
	→ infynyxx_ joined	21:21
	← infynyxx_ left	21:21
	← Trudko_ left	21:21
	← sdouglas left	21:21
	→ oodavid joined	21:21
	← Pullphinger left	21:21
	→ infynyxx_ joined	21:22
	← infynyxx_ left	21:22
	← dglambert left	21:22
	← Luke-Jr left	21:22
	→ infynyxx_ joined	21:22
	← infynyxx_ left	21:22
	→ infynyxx_ joined	21:23
	← infynyxx_ left	21:23
	→ infynyxx_ joined	21:23
	← infynyxx_ left	21:23
	← salamanderrake left	21:23
	← Droolio left	21:24
	← infynyxx left	21:24
	→ jnavila joined	21:24
	→ lekare joined	21:24
	← clearing left	21:24
	← jbalsano left	21:24
	→ infynyxx joined	21:24
	→ salamanderrake joined	21:24
	← nottombrown left	21:24
	→ nottombrown joined	21:25
	← nullElise left	21:25
	→ watermel0n joined	21:26
	← LuxuryMode left	21:27
	→ andrewwagner joined	21:27
	→ nullElise joined	21:28
	→ ilmgb joined	21:28
	← JerryT_ left	21:29
	← Leoneof left	21:30
	← marthinal left	21:30
	← el_fuego_ left	21:31
	← nilg left	21:31
	→ Leoneof joined	21:32
	← ilmgb left	21:33
	← Leoneof left	21:33
	→ thalisson_ joined	21:33
	→ Leoneof joined	21:33
	→ infynyxx_ joined	21:33
	← infynyxx_ left	21:33
	← lithiumjake left	21:34
	→ ehmatthes joined	21:34
	→ infynyxx_ joined	21:34
	← infynyxx_ left	21:34
	← Leoneof left	21:34
	→ Zagato joined	21:34
	← baustin left	21:34
j4quinn	any particular reason why pushing a local repo is so slow?	21:34
	250 KB/s	21:34
	→ infynyxx_ joined	21:34
	→ northfurr joined	21:35
	→ Leoneof joined	21:35
cbreak	j4quinn: slow connection, slow server or slow client.	21:35
	→ infynyx__ joined	21:35
	← infynyx__ left	21:35
	→ cagedwisdom joined	21:36
	→ infynyx__ joined	21:36
	← infynyx__ left	21:36
	← Leoneof left	21:36
	← infynyxx left	21:36
	→ User1291 joined	21:36
	→ infynyxx joined	21:36
	→ Leoneof joined	21:36
	→ Zaknefain joined	21:37
	← Leoneof left	21:37
	→ deens joined	21:38
	gitinfo set mode: +v	21:38
	→ Leoneof joined	21:38
	← thalisson_ left	21:38
User1291	hi all. anybody on I could bother for a moment?	21:38
	← Leoneof left	21:38
	→ JerryT joined	21:39
jast	!just_ask :)	21:39
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	21:39
	← infynyxx_ left	21:39
	→ Luke-Jr joined	21:39
	← pheaver left	21:40
	→ asQuirreL joined	21:40
User1291	I am having some trouble with eclipse. Any way I can actually push the commitments?	21:41
	← nullElise left	21:41
	→ nullElise joined	21:41
	→ mishunika joined	21:41
	← Zaknefain left	21:41
	→ dsdeiz joined	21:42
	← khmarbaise left	21:42
	← deens left	21:42
	← ehmatthes left	21:42
jast	most of us here don't use GUI tools for git, so we may not be able to help... and eclipse in particular doesn't even use the official git, they have their own re-implementation written in java. anyway, do you get any error message?	21:43
	← glebm_ left	21:43
	← Luke-Jr left	21:43
	← Kicer86 left	21:45
	→ CKyle joined	21:45
	← SorenHolm left	21:45
User1291	no ... I can "commit" just fine. For the changes to be reflected on github, though, I have to manually sync after that.	21:46
	← nullElise left	21:46
	→ khmarbaise joined	21:46
	→ nullElise joined	21:47
	→ thiago joined	21:47
arand__	User1291: yes..?	21:48
	→ baustin joined	21:48
	elijah → elijah\|out	21:50
User1291	...and that's it. I should like it to sync when "committing" ... that's the point of it, after all.	21:50
	← treehug8_ left	21:50
	← zumba_addict left	21:50
	→ Luke-Jr joined	21:51
	→ zumba_addict joined	21:51
arand__	User1291: In Git, that is not the point of it though, committing and pushing are distinctly separate actions, I guess you could script	21:52
	...that in somehow, but that's not something that's common (I hope).	21:52
	→ nottombr_ joined	21:53
	→ lithiumjake joined	21:53
	BuSerD → BuSerD_zzzz	21:54
	← Sample left	21:54
	→ Artpicre joined	21:54
	← lynzt left	21:54
	← BuSerD_zzzz left	21:54
	→ Leoneof joined	21:56
	← zumba_addict left	21:56
	→ BuSerD joined	21:56
	← nottombrown left	21:56
	→ diraol joined	21:56
	→ thalisson_ joined	21:58
	← whoosh_ left	21:58
	→ joelm_ joined	21:58
arand__	(I guess linguistically it's pretty bad terminology, seeing as how the whole point of Git is that you don't "commit" when you make a commit)	21:58
	→ Kayra joined	21:58
	→ Gavrisimo joined	21:59
	→ mizu_no_oto joined	21:59
cbreak	User1291: there's no need to sync, a simple git push should do it if your upstream is configured	21:59
User1291	should be, actually. any way to check that configuration?	22:00
dalias	just make a post-commit hook that does "git push"	22:00
	if you want that behavior	22:01
	← joelm left	22:01
	← Luke-Jr left	22:01
	→ pheaver joined	22:01
User1291	@arand: guess I'm mistaken on what "committing is supposed to do, then. pray do tell, what IS the point in committing (and not pushing at the same time)?	22:02
	← Dougie187 left	22:02
	→ deens joined	22:02
cbreak	User1291: a commit is a snapshot of the current state	22:02
	User1291: a push is trasferal of history (for example commit snapshots)	22:02
	← BuSerD left	22:03
cbreak	User1291: it's like making a picture and e-mailing that picture to someone.	22:03
	→ hwrdprkns joined	22:03
	← hwrdprkns left	22:03
	→ hwrdprkns joined	22:03
cbreak	different actions.	22:03
	→ plitzenberger joined	22:03
	← Balliad left	22:03
mishunika	Hello everyone! I have a problem when visualizing the commit graph.	22:03
	I am not sure if the git db gets corrupted or something else.	22:03
	Here is how it looks like when I issue “git log --oneline --graph --decorate --all”: https://www.dropbox.com/s/2bw8dmw5jkknekh/Screenshot%202014-03-17%2022.51.13.png	22:04
cbreak	having local commits is valuable for many situations, since it lets you decide what to push where, you can rewrite local history, you can remove it, and so on	22:04
mishunika	After deleting the users_management branch all the tree reverts to normal: https://www.dropbox.com/s/6w5cnk8c3fu3jgb/Screenshot%202014-03-17%2022.51.51.png	22:04
	Is this a expected behavoir?	22:04
cbreak	you can also save it up and push it when you're back from holidays.	22:04
	it allows completely detached working	22:04
	elijah\|out → elijah	22:04
	← ezekielnoob left	22:04
	← Orbitrix left	22:04
	← bbloom left	22:05
grawity	mishunika: Git repositories cannot get corrupted in that particular way	22:05
cbreak	mishunika: both look reasonable	22:05
grawity	mishunika: each commit's parents are recorded in that commit itself and nowhere else; if Git has a commit, it knows exactly what its history looks like	22:05
	mishunika: it's only `git log` that sometimes has troubles drawing complex history graphs	22:06
	mishunika: try `tig` or `gitk`	22:06
User1291	that does make a lot of sense.	22:06
	← deens left	22:06
mishunika	grawity: the exactly same "almost recursive" tree is drawn by SourceTree GUI	22:06
	← matheus23 left	22:06
	→ whoosh_ joined	22:06
User1291	so all I need to find is a push button in eclipse, then. you wouldn't happen to know where to find that?	22:07
	→ Hypoxia joined	22:07
grawity	hmm	22:07
	mishunika: maybe the users_management branch just has a lot of weird merges.	22:07
	mishunika: have you tried browsing that branch separately, instead of --all?	22:07
	← j4quinn left	22:07
	→ pr0ton joined	22:08
	→ osse joined	22:08
	← pr0ton left	22:08
	← thedodd left	22:08
cbreak	mishunika: have you considered setting LESSCHARSET=utf-8?	22:09
	→ pr0ton joined	22:09
	← hholtmann left	22:09
	→ ctp_ joined	22:09
	← jnavila left	22:09
grawity	mishunika: also, in the first screenshot, what branch does the green line lead to?	22:09
User1291	actually found what I was looking for.	22:10
	→ zajn joined	22:10
	← ctp left	22:10
mishunika	grawity: that's the thing the users_management branch has only three commits, nothing fancy.	22:10
User1291	thanks for adjusting my opinion on commits.	22:10
mishunika	grawity: the green line is the master branch	22:10
	→ bartman`` joined	22:11
	← diraol left	22:11
	→ subsonic joined	22:11
	→ treehug88 joined	22:12
grawity	shrug I guess it just manages to push the graph drawing algorithm into crazyness	22:12
	→ arif-ali joined	22:12
subsonic	how do I diff a file for a given tag vs the working tree?	22:12
osse	subsonic: git diff <tag> -- <path>	22:12
subsonic	git diff tag..HEAD -- file gives me an eeror	22:12
	hmm	22:12
mishunika	cbreak: oh, thank you for the lesscharset, I've recently migrated to clean .zshrc ; )	22:12
subsonic	osse: i get a "bad revision" on the tag name	22:13
	← pr0ton left	22:13
osse	subsonic: a..b doesn't really make sense for diff, but it allows it and interprets it as 'a b'	22:13
	→ Spockz joined	22:13
	→ Not_Whatever joined	22:13
	← kriks left	22:13
osse	subsonic: is it listed in git tag ?	22:13
	→ BuSerD joined	22:13
	← bambams_ left	22:13
	→ pr0ton joined	22:13
	← nullElise left	22:13
	← CKyle left	22:13
subsonic	osse: yeah, but I realize, I might not be on the correct branch. :)	22:13
	just a sec	22:13
osse	subsonic: that doesn't matter	22:13
mishunika	grawity: curious ;) Anyway thanks for your help, I will try to reproduce the issue into a dummy repo, and we'll see. Anyway, seems that only drawing of the tree is weird, the structure and the data is consistent, so I am safe now.	22:14
osse	subsonic: ehh, I mean: it makes a difference since your diffing against the working tree, but it has nothing to do with that error	22:14
	→ Sample joined	22:15
grawity	mishunika: the way Git repositories store data, very few inconsistencies can exist anyway (only actual data corruption)	22:15
	← thiago left	22:15
	← LemonyB left	22:15
	→ Luke-Jr joined	22:15
	← plitzenberger left	22:16
	← pr0ton left	22:16
	→ thiago joined	22:16
	→ ac_123 joined	22:17
	← aard_ left	22:19
	→ piem joined	22:19
piem	hi all. i'm trying to use git subtree split, with 1.9.0, but i'm hit by the "-n" bug. any known workaround?	22:20
	→ rue joined	22:22
	← lithiumjake left	22:25
	← Diemuzi left	22:25
	← kadoban left	22:25
	← rue_XIV left	22:25
	← mizu_no_oto left	22:25
	← ac_123 left	22:26
	← User1291 left	22:26
	← Hypoxia left	22:27
	→ kadoban joined	22:27
	→ simesy joined	22:27
	← lekare left	22:28
	← Sample left	22:29
	→ Sample joined	22:29
	← phantomtiger left	22:29
	← jonatasnona left	22:29
	← dsdeiz left	22:29
	→ diraol joined	22:30
	← diraol left	22:30
	← khmarbaise left	22:30
	→ chris_thomson joined	22:31
	← chris_thomson left	22:31
	→ Zaknefain joined	22:31
	← Aleks3Y left	22:32
	← Luke-Jr left	22:32
	← Destos left	22:33
	→ chris_thomson joined	22:34
	→ HassanCehef joined	22:34
	← NimeshNeema left	22:34
	← Zaknefain left	22:36
	→ Luke-Jr joined	22:36
	← ngladitz left	22:37
	← nkr left	22:37
	← mishok13 left	22:37
	← tonythomas left	22:37
	← caseydriscoll left	22:37
	← mishunika left	22:37
	← maestrojed left	22:38
	→ mishunika joined	22:38
	← mishunika left	22:38
	← Luke-Jr left	22:39
	← jas4711 left	22:39
	→ talios joined	22:40
	← dik_dak left	22:40
	← HassanCehef left	22:40
	← whitby left	22:41
	offby1 stares blankly	22:42
offby1	never even heard of "git subtree split"	22:42
	← watermel0n left	22:44
	→ Rastus_Vernon joined	22:44
	→ Freeman42 joined	22:45
	→ Luke-Jr joined	22:45
	← salamanderrake left	22:45
	← zajn left	22:46
	→ salamanderrake joined	22:46
	← Gamecubic left	22:46
	← oodavid left	22:46
	→ lithiumjake joined	22:47
	→ oodavid joined	22:48
	→ LeMike joined	22:48
	← infynyxx left	22:49
	← WaReZ left	22:50
	← salamanderrake left	22:51
	→ infynyxx joined	22:51
	→ dsdeiz joined	22:51
	→ salamanderrake joined	22:52
	← jluc left	22:52
subsonic	osse: Yeah, I think it was the branch I was on. Got it to work. Thanks!	22:52
	← subsonic left	22:52
	← baustin left	22:56
	→ Gamecubic joined	22:57
	← werlley left	22:57
	← rivet left	22:57
	← MacWinner left	22:58
	→ Mitchbones joined	22:58
	← ojacobson left	22:58
	← BuSerD left	23:00
	← salamanderrake left	23:00
	→ zajn joined	23:00
	→ salamanderrake joined	23:01
	→ baustin joined	23:01
	← Mitchbones left	23:02
	← decotii left	23:02
	← LeMike left	23:03
	→ deens joined	23:03
	← harobed_ left	23:03
	← shawndumas left	23:04
	← JGarrido left	23:04
	ketas- → ketas	23:05
	← deens left	23:08
	← Freeman42 left	23:08
	→ el_fuego joined	23:08
	← el3ctron_ left	23:08
	← rq60 left	23:09
	→ mikemar10 joined	23:10
	← jagob left	23:10
	← system64 left	23:10
	→ BuSerD joined	23:10
	← laserbeam left	23:10
	← lithiumjake left	23:11
	← baustin left	23:11
	→ rfoust joined	23:11
	← AccessibleWeb left	23:12
	→ laserbeam joined	23:13
	→ baustin joined	23:13
	← lavaman left	23:13
	← fr33 left	23:14
	← joelm_ left	23:14
	→ position88 joined	23:14
	← archana77 left	23:15
	← adam_____ left	23:15
	← shennyg__ left	23:15
	→ archana77 joined	23:16
	→ adam_____ joined	23:16
	← pantsman left	23:16
	→ shennyg__ joined	23:16
	← lifelike left	23:17
	flazz → flazz_gone	23:18
	→ azyr joined	23:18
	→ snuffeluffegus joined	23:18
	← SilverBln left	23:18
	← oodavid left	23:19
	→ tazle_ joined	23:20
	→ AccessibleWeb joined	23:21
	← Gavrisimo left	23:21
	← JerryT left	23:22
	→ CKyle joined	23:22
	← asQuirreL left	23:22
	← nottombr_ left	23:22
	← PeterBooker left	23:23
	→ nottombrown joined	23:23
	→ sluther joined	23:23
	→ gitme joined	23:24
	→ kcj joined	23:24
	→ asQuirreL joined	23:25
	→ mizu_no_oto joined	23:25
	→ Zaknefain joined	23:25
	← hobodave left	23:26
	← gitme left	23:27
	← TheFuzzball left	23:27
	← ctp_ left	23:28
	← Zaknefain left	23:30
	→ xxcoder_ joined	23:30
	← baustin left	23:31
	→ lithiumjake joined	23:32
	← lithiumjake left	23:32
	← Silmarilion left	23:33
	← ErKa left	23:33
	← fission6 left	23:33
	→ isbadawi joined	23:34
	→ tier joined	23:36
	← nfk left	23:36
	← Exancillatus left	23:37
	← ToBeFree left	23:37
	← daedeloth left	23:38
	→ angelsl joined	23:39
	→ lithiumjake joined	23:40
	← Sample left	23:41
	← weltall left	23:41
	← Sonderblade left	23:43
	← bluesm left	23:45
	→ ehmatthes joined	23:46
	← johntitor2036 left	23:47
	← kotk left	23:48
	← z8z left	23:48
	← BadProphet left	23:49
	← asQuirreL left	23:49
	→ kukks joined	23:50
	← kukks left	23:50
	→ kukks joined	23:50
	← el_fuego left	23:51
	→ ToBeFree joined	23:51
	→ Mitchbones joined	23:52
	→ livingstn joined	23:53
	→ Deseaus joined	23:53
	← sluther left	23:54
	→ johnkevinmbasco joined	23:54
	← johnkevinmbasco left	23:54
	← kcj left	23:55
	← cads left	23:56
	→ JerryT joined	23:56
	← Mitchbones left	23:57
	← mmoretti left	23:57
	→ joelm joined	23:57
	→ zumba_addict joined	23:58
	← AccessibleWeb left	23:59
	→ str joined	23:59
	← polyzen left	23:59

Logs Search ←Prev date Next date→

Channels Documentation