IRCloggy #git 2015-02-13

Provider of IRC logs since 2005.

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

	2015-02-13
	← Literphor left	00:00
	→ kaiten02 joined	00:02
	← u1106 left	00:02
	→ u1106 joined	00:02
	→ hexagoxel_ joined	00:02
	→ Dragooon joined	00:02
	← Spacew00t left	00:03
	→ mizu_no_oto joined	00:04
	← zumba_addict left	00:04
	← CustosL1men left	00:04
	→ kadoban joined	00:05
	→ joki joined	00:05
	← hexagoxel left	00:06
	→ jagob joined	00:06
Steve_Jobs	we have submodule tree	00:06
	we would like to use our mirror repos instead of github in CI	00:06
	← tier left	00:07
Steve_Jobs	so recursively, it will by default hit github in the submodules	00:08
	← mizu_no_oto left	00:08
	← iuc left	00:08
	← PeterBooker left	00:08
	→ Dentych joined	00:08
	← Sasazuka left	00:09
	← daedeloth left	00:10
	← nnyk left	00:10
	← baweaver left	00:10
	→ Sasazuka joined	00:10
	← amcgee7 left	00:10
	→ mizu_no_oto joined	00:11
	← netcarver left	00:12
	→ joeyDB_ joined	00:12
	← Dragooon left	00:13
	→ AciD` joined	00:14
	← mmoretti left	00:15
	← tohuw left	00:15
	→ Literphor joined	00:15
AciD`	hi, let's say I commited C1, and did some work on my files. Now, I forgot to create a branch before doing this work, how can I create a new branch and commit my current files to it ?	00:15
	→ ErKa joined	00:15
	← kadoban left	00:15
	← zarubin left	00:17
	→ Dragooon joined	00:18
	→ SirRetnuh joined	00:18
	← Literphor left	00:19
	→ DolphinDream joined	00:20
	← Aleeious left	00:20
	→ ev_ joined	00:20
	→ multi_io_ joined	00:21
	← joeyDB_ left	00:21
	← CustosLimen left	00:22
	→ highcup joined	00:22
	→ zarubin joined	00:23
	← zarubin left	00:23
	← Brain left	00:23
	← bote left	00:23
	→ rns2 joined	00:24
	→ fytoy joined	00:24
	← multi_io left	00:24
	→ CustosLimen joined	00:24
	← fytoy left	00:24
	→ baweaver joined	00:24
	→ Udut joined	00:25
	Ragnar → ragnardubya	00:25
	→ cdown joined	00:26
Bleakwise	so erm, how does ssh/git work on windows?	00:26
	does git automatically look in /user/username/.ssh? or do i need to have puttygen pageant open?	00:27
	ragnardubya → Ragnar	00:27
	← highcup left	00:27
Bleakwise	or do i need to load my ssh keys into git somehow? strangly the process is undocumented	00:27
	← Zupoman left	00:29
	← cagedwisdom left	00:29
	← Udut left	00:29
Steve_Jobs	AciD`: git branch some-name	00:30
	Bleakwise: msysgit	00:30
	it will use your .ssh files	00:30
	← tarwich left	00:31
	← SirRetnuh left	00:32
	← Zamyatin left	00:33
	← jonmorehouse left	00:33
dodobrain	Bleakwise, https://confluence.atlassian.com/display/BITBUCKET/Set+up+SSH+for+Git could help you (i guess)	00:34
	→ lys1 joined	00:35
	→ otter768 joined	00:36
	← lys left	00:36
	HelloShitty → HelloEngine	00:37
	→ zumba_addict joined	00:37
	→ SirRetnuh joined	00:37
	→ kukks joined	00:39
	← kukks left	00:39
	→ kukks joined	00:39
	← liamkeily left	00:39
	← m0viefreak left	00:39
	← pm90_ left	00:40
	→ Milo- joined	00:41
	← otter768 left	00:41
	→ Jupelius joined	00:41
	← dougsland left	00:42
	← lys1 left	00:42
	← th3fallen left	00:45
	→ cagedwisdom joined	00:45
	← kaiten02 left	00:46
	→ m0viefreak joined	00:47
	→ jrahmy joined	00:47
	← akiva left	00:48
	→ dm7freek joined	00:48
	← Sasazuka left	00:49
	← nfk left	00:49
	→ Sasazuka joined	00:49
	→ FunkyELF joined	00:50
	→ mroach joined	00:50
	← DolphinDream left	00:50
	← zumba_addict left	00:51
	→ zumba_addict joined	00:51
	→ jonmorehouse joined	00:51
FunkyELF	if I have a tree object in my git repo is there a way to "check it out" onto my disk somewhere? I think git checkout requires a commit object, not a tree	00:52
AciD`	thanks	00:52
	→ apurcell joined	00:52
	← dm7freek left	00:53
	→ russt joined	00:53
	→ tristanp joined	00:53
	→ zarubin joined	00:53
	← m0ltar left	00:55
	← WaReZ left	00:55
	→ githogori joined	00:55
	← jagob left	00:55
	→ iron_houzi joined	00:56
	← Kicer86 left	00:56
	← u1106 left	00:56
	← apurcell left	00:57
	→ u1106 joined	00:57
	← harish left	00:57
iron_houzi	Can someone please help me recover some lost data? I had two feature branches that I merged to master? I have searched through all dangling blobs/commits from fsck --lost-found, but I never found the lost data. What are my options now?	00:58
	← tristanp left	00:58
	← zarubin left	00:58
FunkyELF	iron_houzi: you think the commit objects are still in the database?	00:59
	← imachuchu left	00:59
	→ hexagoxel__ joined	01:00
	→ DolphinDream joined	01:00
	→ fstd_ joined	01:00
	← baweaver left	01:00
	← fstd left	01:00
	← gargola left	01:00
	fstd_ → fstd	01:01
	← Sasazuka left	01:01
	← Bootinbull left	01:01
iron_houzi	FunkyELF: I'm not sure. What I do know is that I made the merge just hours ago and the work I lost was done on Tuesday. I also know that I've never run `git gc`	01:01
Bleakwise	so erm, https://github.com/Bleakwise/MyProject doesn't work	01:02
	"error: src refspec master does not match any"	01:02
	← jonmorehouse left	01:02
Bleakwise	evidently origin master does not exist	01:02
	so github is lying about what repo it created	01:03
	← hexagoxel_ left	01:03
FunkyELF	iron_houzi: do this in your repo directory ... "du -hs .git"	01:03
	← byaruhaf left	01:03
dodobrain	Bleakwise, you tried to push yes?	01:03
Bleakwise	yes	01:03
	→ BSaboia joined	01:04
Bleakwise	git push [email@hidden.address] master	01:04
	and [email@hidden.address] origin master	01:04
dodobrain	add -u	01:04
	also why do you need the full url?	01:04
Bleakwise	yes i tried that too	01:04
dodobrain	didn't you clone from github?	01:04
iron_houzi	FunkyELF: 2.1M .git	01:04
Bleakwise	no, i'm trying to upsh a local repo	01:05
	it was working fine yesterday	01:05
	git remote add origin [email@hidden.address]	01:05
	git push -u origin master	01:05
FunkyELF	iron_houzi: what kind of code is this?... are you okay putting that file up somewhere?	01:05
iron_houzi	FunkyELF: I am under strict regulation from my Uni to not share this with anybody outside the course. Unfortunately.	01:07
	FunkyELF: If my memory serves me correctly, I believe the work I lost was never commited before the merge. Is it possible to recover this if it was never commited?	01:07
FunkyELF	iron_houzi: you could try writing a script that goes through all your git commit objects in the database and sorts them by date or something	01:08
Bleakwise	mmm i think something was messed up on my local repo	01:08
FunkyELF	iron_houzi: if it was never commited then probably not... you'd be at the mercy of the underlying filesystem	01:08
Bleakwise	tinkered with it and it pushes now	01:08
	← mellernoia left	01:08
Bleakwise	git init -- not enough to push, needs commit first?	01:09
iron_houzi	FunkyELF: I thought git would stop me from merging if I had uncommited work.. it does that when I try to change brances at least..	01:09
dodobrain	Bleakwise, lets try this: (1) mkdir /tmp/dodo; cd /tmp/dodo; git init; echo "dummy" > dummy.txt; git add dummy.txt; git commit -a -m "added dummy" (2) create new repo on github called "mynewrepo" (3) cd /tmp/dodo; git remote add origin [email@hidden.address] git push -u origin master	01:09
	← hmsimha left	01:09
dodobrain	Bleakwise, well duh! if you don;t have anything commited, theres nothing to push!	01:09
Bleakwise	xD	01:09
	← cdown left	01:09
FunkyELF	iron_houzi: you're right... it probably should have stopped you from merging. Maybe you did something to get the merge to go through	01:10
	→ baweaver joined	01:10
iron_houzi	I'll check my history..	01:10
FunkyELF	iron_houzi: run "history \| grep git" to see what you did. Maybe you can find that merge command you ran and see what preceeds it	01:10
	← u1106 left	01:10
	→ u1106 joined	01:10
	→ ignas joined	01:11
	← Takle left	01:11
	← stantonk left	01:11
	→ weiyang joined	01:11
	← shpoont left	01:11
	← mizu_no_oto left	01:11
iron_houzi	FunkyELF: Plain merge commands..	01:11
	→ Takle joined	01:11
iron_houzi	No forcing of any kind or any other flags of any sort	01:11
	← EminenceHC left	01:12
FunkyELF	iron_houzi: any "checkout commands" before it? you can lose you work when you run checkout	01:12
	... like when you run "git checkout ."	01:12
	← Noldorin left	01:13
	← johntramp left	01:14
	→ johntramp joined	01:14
iron_houzi	FunkyELF: Wait you're right. I had checked out of that branch two days ago to work on another branch, so I couldn't have lost anything .. hmm this is strange.	01:14
FunkyELF	iron_houzi: you ever use gitk?	01:15
	mabe run "gitk --all"	01:15
	← andi4 left	01:15
iron_houzi	FunkyELF: No, is that the gui?	01:15
Steve_Jobs	you can use git log --all --graph --decorate instead	01:15
	← Takle left	01:16
Steve_Jobs	... stay on the command line	01:16
	← Milo- left	01:16
FunkyELF	Steve_Jobs: nice... thanks	01:16
	→ hyperair joined	01:17
	→ joeyDB_ joined	01:17
FunkyELF	Steve_Jobs: isn't there a curses based one too similar to gitk?	01:17
	tig or something?	01:17
Steve_Jobs	tig	01:17
	but try to stick to just git	01:17
FunkyELF	Steve_Jobs: worth learning?	01:17
Steve_Jobs	not for me	01:18
iron_houzi	FunkyELF: Thank you so much for your kind help. So nice of you to take your time to help me out.	01:18
FunkyELF	iron_houzi: no problem... I don't even know Git that well ;-)	01:18
	← HelloEngine left	01:18
	← devoldmx left	01:18
	→ Entomo joined	01:19
	← foist left	01:19
	→ kaiten02 joined	01:21
	→ diegoaguilar joined	01:21
	← joeyDB_ left	01:21
	← wodim left	01:24
	← HackeMate left	01:24
	← King_Hual` left	01:24
	→ Guin joined	01:26
	→ Milo- joined	01:27
	← leolrrj left	01:28
	→ mizu_no_oto joined	01:28
	→ nickSwe joined	01:28
	→ wodim joined	01:29
	→ jonmorehouse joined	01:29
	→ isifreek joined	01:29
	← zumba_addict left	01:30
	← mikecmpbll left	01:31
isifreek	I have a repo (foo) with clones on remote1 and remote2. How to I get a local checkout where "master" tracks remote1/master and "bar" tracks remote2/master?	01:31
	← t-mart__ left	01:31
	← baweaver left	01:32
	→ eletuchy joined	01:32
	→ baweaver joined	01:32
	← ska-fan left	01:34
	← baweaver left	01:34
	← BSaboia left	01:35
	→ mkoskar joined	01:36
	← seg left	01:36
	← eletuchy left	01:37
	→ paolooo joined	01:37
	→ daito_ joined	01:38
paolooo	hi guys, is it possible in git to delete certain commit? Example, (develop branch) ----> (commit #1) -----> (commit #2) ------> *(commit #3)	01:39
Vgr	paolooo: do you want to !rewrite history?	01:39
gitinfo	paolooo: 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	01:39
	← SirRetnuh left	01:39
paolooo	then, i'll delete commit#2 and it will automatically be wired to #3... Now commit will look like this (develop branch) ----> (commit #1) ------------------> (commit #3)	01:40
	→ devoldmx joined	01:40
paolooo	Vgr: yes	01:40
	→ seg joined	01:40
	← FreezingCold left	01:40
dodobrain	paolooo, has this branch been published?	01:40
Vgr	paolooo: you probably want to look into the man git-rebase page	01:40
gitinfo	paolooo: the git-rebase manpage is available at http://jk.gs/git-rebase.html	01:40
paolooo	ah yeah! :(	01:40
	i'm sorry dodobrain but what do you mean by published?	01:41
	→ SirRetnuh joined	01:41
dodobrain	have you pushed this branch elsewhere already?	01:41
	or is it sitting only in your repo on your local machine?	01:42
Vgr	(note that, while I suggested that, this may not be the best for what you're looking - however if you're merging two development histories together that'd be a good idea)	01:42
paolooo	no, I haven't yet.	01:42
	I want to delete commit #2 so that I can merge it to the master	01:42
dodobrain	you can git rebase -i, then change that commit to 'drop' iirc	01:42
paolooo	commit #2 is actually comes from a featureA branch	01:42
	featureA is not yet finish... that's why I want to delete it so that I can merge it to the master.	01:43
	← dangayle left	01:43
paolooo	*merge develop to master	01:44
	← rns2 left	01:44
paolooo	git rebase -i .. hmmm... Thanks dodobrain. I'll for docs of it.	01:45
	→ xnox joined	01:45
	← LucasTT_ left	01:45
paolooo	currently, looking at https://www.atlassian.com/git/tutorials/merging-vs-rebasing :)	01:47
	→ Lyqyd joined	01:48
	→ m0ltar joined	01:48
	← jonmorehouse left	01:49
	→ echo-area joined	01:49
	→ baweaver joined	01:50
	→ zivester joined	01:51
	→ Noldorin joined	01:53
	← \sky left	01:54
	← i_ron left	01:54
	← russt left	01:54
	← ws2k3_ left	01:54
	→ Zamyatin joined	01:54
	→ endiruna1 joined	01:54
isifreek	what does git pull do if no remote or branch is specified?	01:54
	← FabTG left	01:54
	← tyreld_ left	01:55
	→ rns2 joined	01:55
	← baweaver left	01:55
	→ jonmorehouse joined	01:55
	→ EminenceHC joined	01:57
	← endiruna left	01:57
	← kukks left	01:57
	← robustus left	01:58
majuscule	depends on your git version and config	01:59
	← hexagoxel__ left	01:59
isifreek	1.9, brand new branch never pulled or pushed	01:59
	← ulkesh left	02:00
	← jave left	02:00
isifreek	brand new remote2 (local is a clone of remote1)	02:00
	→ jeffmjack joined	02:00
	← jadne left	02:00
	→ robustus joined	02:01
	→ ulkesh joined	02:01
	→ ajustrun joined	02:02
	← devoldmx left	02:02
	← EminenceHC left	02:02
	← endiruna1 left	02:02
	← paolooo left	02:02
	← boombatower left	02:02
	→ devoldmx joined	02:02
	→ jerematic joined	02:02
	→ jave joined	02:03
	→ jadne joined	02:03
	→ baweaver joined	02:05
	→ fairuz joined	02:05
	→ nb_bez___ joined	02:06
	→ leolrrj joined	02:06
	→ uri joined	02:07
	← xaa left	02:07
	← uri left	02:08
	← leolrrj left	02:09
	← d10n-work left	02:09
	→ arbin_cn joined	02:10
	→ harish joined	02:10
	← arbin_cn left	02:10
	→ arbin_cn joined	02:11
	← arbin_cn left	02:11
	← a_le left	02:11
	→ arbin_cn joined	02:12
	→ a_le joined	02:12
	→ shpoont joined	02:12
	→ smccarthy joined	02:12
	← arbin_cn left	02:12
	→ arbin_cn joined	02:13
	→ denete joined	02:13
	← arbin_cn left	02:13
	→ jgardella joined	02:13
	→ arbin_cn joined	02:14
	← arbin_cn left	02:14
FunkyELF	if I have a git commit object sha1 how can I list the corresponding tree?	02:14
	← elbeardmorez left	02:14
	→ arbin_cn joined	02:14
	← rns2 left	02:15
	← arbin_cn left	02:15
	→ otter768 joined	02:15
	← joelm left	02:15
	→ arbin_cn joined	02:15
	← arbin_cn left	02:16
bremner	git cat-file -p ?	02:16
	→ arbin_cn joined	02:16
	→ zumba_addict joined	02:16
	← arbin_cn left	02:17
	← baweaver left	02:17
	← shpoont left	02:17
	→ arbin_cn joined	02:17
	← arbin_cn left	02:18
	→ joeyDB_ joined	02:18
	← zumba_addict left	02:18
	→ arbin_cn joined	02:18
	← arbin_cn left	02:18
	→ arbin_cn joined	02:19
	← arbin_cn left	02:19
	← kpease left	02:20
	→ arbin_cn joined	02:20
	← duderonomy left	02:20
	← arbin_cn left	02:21
	→ joelm joined	02:21
	← AndroidLoverInSF left	02:21
	→ arbin_cn joined	02:21
	← mezod left	02:21
	← arbin_cn left	02:21
	→ zumba_addict joined	02:21
	→ arbin_cn joined	02:22
	→ duderonomy joined	02:22
	→ stantonk joined	02:22
	← arbin_cn left	02:22
	← joeyDB_ left	02:22
	← pks left	02:22
	→ arbin_cn joined	02:23
	← arbin_cn left	02:23
	→ arbin_cn joined	02:24
	← githogori left	02:24
	← arbin_cn left	02:24
	→ Dougie187 joined	02:24
	→ netameta joined	02:24
	→ arbin_cn joined	02:24
	← duderonomy left	02:24
	← bitkiller left	02:24
	→ pks joined	02:25
	← arbin_cn left	02:25
	→ arbin_cn joined	02:25
	← arbin_cn left	02:25
	← mmitchell left	02:26
	← otter768 left	02:26
	← isifreek left	02:26
	→ arbin_cn joined	02:26
	→ githogori joined	02:26
	← netameta_ left	02:26
	← arbin_cn left	02:26
	→ arbin_cn joined	02:27
	← jackspar_ left	02:27
	← arbin_cn left	02:27
	→ arbin_cn joined	02:28
	← arbin_cn left	02:28
	→ arbin_cn joined	02:28
	← stantonk left	02:29
	← wmoran left	02:29
	→ willharrison joined	02:30
	→ Goplat joined	02:30
	← u1106 left	02:30
	→ u1106 joined	02:31
	← ajustrun left	02:32
	← DolphinDream left	02:32
	→ baweaver joined	02:34
	← shinnya left	02:34
	→ eletuchy joined	02:34
	← haptiK left	02:35
	← BuenGenio left	02:36
	→ dm7freek joined	02:37
	→ Vampire0_ joined	02:39
	→ s8321414 joined	02:40
	→ apurcell joined	02:41
	→ ashnur joined	02:41
	← dm7freek left	02:42
	→ DolphinDream joined	02:42
	← Vampire0 left	02:42
	← saurik left	02:43
	→ russt joined	02:44
	← baweaver left	02:44
	← apurcell left	02:45
	→ UKn0Me joined	02:48
	→ ajustrun joined	02:50
	← JDHawke left	02:50
Jordan_U	I'm trying to use git rebase -i for the purposes of rewriting history, i.e. I'm not trying to rebase off of a new branch with different changes. I'm using "git rebase -i HEAD~8" but even just "git rebase HEAD~8" fails with the following output: http://paste.debian.net/hidden/ccf12274/ . I'm clearly misunderstanding how git rebase works as I thought that "git rebase HEAD~8", without the -i, would simply replay the last 8 ...	02:51
	... commits exactly as they are, and thus would be essentially a no-op. What is actually going on here, and what command should I be using to edit some of the recent commits I've made?	02:51
	→ GT4066 joined	02:51
	→ sammy joined	02:53
	sammy → Guest48461	02:53
	→ saurik joined	02:54
	→ pm90_ joined	02:55
	← diegoaguilar left	02:56
	→ zarubin joined	02:57
	← adamben left	02:58
	→ runev joined	02:58
	→ pantsman- joined	03:00
	← whitby left	03:01
	→ EminenceHC joined	03:02
	← zarubin left	03:02
	→ hmsimha joined	03:03
	← Noldorin left	03:04
	← EminenceHC left	03:06
	→ IIT joined	03:06
	← clarkpan_ left	03:07
	← IIT left	03:07
	→ IIT joined	03:08
	→ uhhimhere joined	03:09
	← jonmorehouse left	03:09
	→ highcup joined	03:12
	→ binn_cn joined	03:12
	← binn_cn left	03:13
	← MattMaker left	03:13
	← runev left	03:13
	→ binn_cn joined	03:13
	→ clarkpan joined	03:14
	← pantsman- left	03:15
	← Milkweed left	03:15
	← arbin_cn left	03:15
	← denete left	03:16
	← devoldmx left	03:16
	← hmsimha left	03:16
	← highcup left	03:16
	← jerematic left	03:17
	→ johnny2600 joined	03:17
	→ devoldmx joined	03:17
	← adamellsworth left	03:19
	→ joeyDB_ joined	03:19
	← johnny2600 left	03:19
	← darkbasic left	03:19
	← ojacobson left	03:19
	→ thiago joined	03:20
	← pasky_ left	03:20
	→ pasky joined	03:20
	→ darkbasic joined	03:20
	← mizu_no_oto left	03:24
	← gsingh93 left	03:25
	→ ojacobson joined	03:25
	→ Gamecubic_ joined	03:26
	← devoldmx left	03:26
	← joeyDB_ left	03:26
	← marienz left	03:26
	← mnass left	03:26
	→ devoldmx joined	03:27
	→ rchavik joined	03:29
	← Gamecubic left	03:29
	→ zumba_ad_ joined	03:29
	← zacts left	03:31
	← TDJACR left	03:32
	→ jonmorehouse joined	03:32
	→ cbonobo joined	03:32
	→ shauna joined	03:33
	→ mtscout6 joined	03:33
	← zumba_addict left	03:33
	→ hmsimha joined	03:34
	→ hurley joined	03:34
	→ bnb joined	03:35
bnb	Hey there. Could someone help me with Git?	03:35
HedgeMage	bnb: That's why we're here, but we can't help you if you keep being vague.	03:36
bnb	HedgeMage: Just wanted to make sure someone was on the other end.	03:36
	Okay, I made a real mess of my repo.	03:37
HedgeMage	bnb: On IRC, the most-polite behavior is to show up and ask a specific question, NOT ask what the channel is for, if anyone is listening, etc. It may seem a little weird if you're new, but those things are actually kind of rude in irc-land because they make people give you responses before they know if they have anything for you.	03:37
Hello71	!help	03:37
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	03:37
bnb	Here's my repo: https://github.com/bnb/website How can I remove all the commits by myself except the most recent one?	03:37
	← IIT left	03:39
HedgeMage	bnb: all the commits except the most recent one, or surgically select and excise commits BY YOU, leaving others behind?	03:40
bnb	Surgically.	03:40
	→ APerson_ joined	03:41
bnb	Oh, and it's on the build/content-update branch	03:41
	← fragamus left	03:42
	→ linuxmint joined	03:42
	← APerson_ left	03:42
	← c74d3 left	03:43
	→ CKyle joined	03:43
	→ mnass joined	03:44
	← bnb left	03:44
	→ TDJACR joined	03:44
	→ c74d joined	03:45
	→ bnb joined	03:45
	← jgardella left	03:45
bnb	Sorry, d/ced	03:45
	← livingstn left	03:46
bnb	And all of my commits are the latest commits. I have no previous commits.	03:46
	← russt left	03:47
	← c74d left	03:47
	← jonmorehouse left	03:47
	→ livingstn joined	03:48
	→ duderonomy joined	03:48
	→ c74d joined	03:49
HedgeMage	Okay, so would reverting that branch to a previous point, then re-doing one commit suit your purpose?	03:49
bnb	Yes, that would be fine.	03:50
HedgeMage	Okay, and is it possible that anyone has pulled from the repo since you made the first of those commits?	03:51
bnb	Nope.	03:51
	← pheaver left	03:51
	← joelm left	03:52
HedgeMage	okay, good...if they had and you changed history, you'd basically make their copy unusable (unless they were more experienced than git beginners and knew how to find and fix the problem)	03:53
bnb	Okay, so what should I do?	03:54
	→ MrRoot joined	03:54
HedgeMage	sorry, I'm multitasking...just got out of an infosec drill, need to debrief, and also fixing a web site	03:55
bnb	No probelm.	03:55
HedgeMage	I'll be a bit high-latency :)	03:55
	→ dm7freek joined	03:55
	← Dorf left	03:55
bnb	I actually have to take care of some things right now. I'll be back in about 20-30 mins.	03:56
	Thank you for helping me so far, and I'll be back for more!	03:56
	→ boombatower joined	03:56
	← boombatower left	03:56
	→ boombatower joined	03:56
HedgeMage	bnb: First take a full backup of your git repo...I mean a FULL back-up. A slight typo in what I'm going to give you may nuke your repo. So could a difference between the assumptions I've made about your repo and the reality of your repo.	03:56
	→ intransi_ joined	03:57
	← hmsimha left	03:57
	← kaiten02 left	03:57
HedgeMage	bnb: Also, you'll need a copy of the commit you want to keep.	03:58
	bnb: do "git --reset hard FOO", replacing FOO with the commit ID of the most-recent commit you want to keep.	03:58
	→ jayeshsolanki joined	03:59
	← bnb left	04:00
	← intransit left	04:00
HedgeMage	nvm, he left	04:01
	← ErKa left	04:01
	← intransi_ left	04:01
	← ev_ left	04:02
	← willharrison left	04:03
	← jadne left	04:04
	→ EminenceHC joined	04:04
	→ skorgon joined	04:04
	← skorgon left	04:04
	→ skorgon joined	04:04
	← s8321414 left	04:06
	← Ragnar left	04:07
	→ jgardella joined	04:07
	← EminenceHC left	04:08
	← nb_bez___ left	04:09
	→ bnb joined	04:11
	→ myyst joined	04:12
bnb	HedgeMage: Done.	04:13
HedgeMage	bnb: oh, did you get the bit before you left, or do I have to repeat myself	04:13
bnb	I got the Full backup part.	04:14
	→ cromero joined	04:14
	← myst left	04:14
	← ajustrun left	04:15
HedgeMage	okay	04:17
	← smccarthy left	04:17
HedgeMage	I'm serious about that...if I made a wrong assumption about your repo this will cause you to lose data	04:17
	and it won't be my fault, it'll be yours for sucking at backups and sucking at taking good advice :P	04:17
	you can do "git --reset hard FOO" where "FOO" is the commit ID of the latest commit you want to keep, then push with '-f' for "force this even though it destroys public history, which is a douchey thing to do in 99% of circumstances"....after that you can add the changes from the one commit you care about and commit/push that as normal	04:18
bnb	It's fine. I made a backup. I won't blame you if something goes wrong.	04:18
	Okay.	04:18
HedgeMage	also, I'm sleep deprived so my polite words are almost gone, sorry	04:19
	:P	04:19
	I think I've slept ~4 hours in the last 48	04:19
bnb	No problem!	04:19
	It said it's an unknown command.	04:20
HedgeMage	what is?	04:20
	HedgeMage wonders if she gave you a typo	04:20
	← dik_dak left	04:20
HedgeMage	oh, crap, I did	04:20
	"git reset --hard FOO"	04:21
	NEVER commit while sleep-deprived. srsl	04:21
	crap, I can't even lolspeak right any more.	04:21
bnb	Nice.	04:21
HedgeMage	bnb: try what I said, no promises it won't explode, I'm going to find a bed to crawl into	04:21
bnb	Okay.	04:21
HedgeMage	night night!	04:21
bnb	Night.	04:21
HedgeMage	Eugene: I need chocolate! HALP!	04:21
	HedgeMage runs away.	04:22
Eugene	HedgeMage - consult the local baker	04:22
HedgeMage	Eugene: but...but...I'm trapped in Idaho, I don't think bakers are open after dark	04:22
	← daito_ left	04:23
	→ kyb3r_ joined	04:23
	→ daito joined	04:23
	→ drfoo joined	04:23
	← u1106 left	04:25
	→ u1106 joined	04:25
	→ otter768 joined	04:27
	← daito left	04:28
	← m0viefreak left	04:29
	→ apurcell joined	04:30
offby1	nerds! Prepare an Intercontinental Ballistic Choco-Missile strike on Idaho!	04:31
	→ fairuz1 joined	04:31
	← otter768 left	04:31
HedgeMage	<3	04:32
	← davispuh left	04:32
	← armyriad left	04:33
	← Dougie187 left	04:33
	← CKyle left	04:33
	← apurcell left	04:34
	← fairuz left	04:34
	→ Keramzcak joined	04:36
	gitinfo set mode: +v	04:37
	→ armyriad joined	04:38
Keramzcak	Hello	04:38
gitinfo	Keramzcak: 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.	04:38
	← tokik left	04:38
offby1	HedgeMage: http://www.npr.org/blogs/money/2015/02/04/383830776/episode-601-the-chocolate-curse	04:39
	← Keramzcak left	04:40
	← zumba_ad_ left	04:41
	← c74d left	04:41
	→ zumba_addict joined	04:42
	→ jstimm joined	04:42
	← ojacobson left	04:44
	← infernix left	04:45
	→ c74d joined	04:45
	← polyzen left	04:49
	← ToAruShiroiNeko left	04:49
	← drfoo left	04:50
	→ hmsimha joined	04:51
	← c74d left	04:51
	→ daito joined	04:52
	← toothrot left	04:54
	→ fairuz joined	04:54
	→ russt joined	04:54
	→ ToAruShiroiNeko joined	04:54
	← madewokherd left	04:56
	← fairuz1 left	04:56
	← SirRetnuh left	04:57
	→ pheaver joined	04:57
	← pm90_ left	04:58
	→ kaiten02 joined	04:59
	← zacg left	05:00
	→ SirRetnuh joined	05:00
	→ highcup joined	05:01
	→ shpoont joined	05:01
	← SirRetnuh left	05:02
	→ EminenceHC joined	05:05
	← shpoont left	05:05
	← highcup left	05:05
	← SumDude left	05:08
	→ watabou joined	05:08
	→ Tommy[D] joined	05:09
	→ drfoo joined	05:09
	← EminenceHC left	05:10
	→ jonmorehouse joined	05:11
	← Tommy[D]_ left	05:11
	← drfoo left	05:13
	→ Consuela joined	05:14
	← oojacoboo left	05:15
	→ zacts joined	05:16
	→ adamben joined	05:16
	← adamben left	05:16
	→ adamben joined	05:16
	← adamben left	05:16
	→ beautifulmind joined	05:17
	← u1106 left	05:19
	← m0ltar left	05:19
	→ u1106 joined	05:19
	→ reaverb joined	05:20
	← eletuchy left	05:22
	← pheaver left	05:23
	→ cwillu_at_work joined	05:23
	→ joeyDB_ joined	05:24
	← bket left	05:24
	← kermit left	05:24
	← livingstn left	05:24
	→ bket joined	05:25
	← Zamyatin left	05:25
	→ Polyatomic joined	05:25
	→ Zamyatin joined	05:25
	← fstd left	05:26
	← lindenle left	05:26
	← jgardella left	05:26
	← Zamyatin left	05:27
	← joeyDB_ left	05:28
	→ pm90_ joined	05:28
	→ tokik joined	05:28
	→ darnir joined	05:29
	← pm90_ left	05:33
	← tpollard left	05:34
	→ fstd joined	05:35
	→ ev_ joined	05:37
	← Bass10 left	05:37
	← knownasilya left	05:38
	→ dm7freek_ joined	05:39
	→ drfoo joined	05:40
	← bnb left	05:40
	→ lzx joined	05:40
	→ eletuchy joined	05:41
	← dm7freek left	05:41
	→ michaelrice joined	05:42
	→ c74d joined	05:42
	← beautifulmind left	05:42
	→ beautifulmind joined	05:43
	← bket left	05:44
	→ bket joined	05:44
	→ kermit joined	05:44
	← Consuela left	05:44
	← clarkpan left	05:45
	← bket left	05:45
	→ bket joined	05:45
	→ HoMM joined	05:46
	← Tuna-Fish left	05:46
	→ Tuna-Fish joined	05:46
	→ bb010g joined	05:46
	→ ZujkisNx joined	05:46
	← squentin left	05:47
	← ParsectiX left	05:48
	← netj left	05:48
	← bket left	05:48
	← Guest11712 left	05:48
	→ kukks joined	05:48
	→ saint_ joined	05:48
	← DolphinDream left	05:48
	← jstimm left	05:49
	→ bket joined	05:49
	← blahdodo left	05:49
	← SleePy left	05:49
	← blackjid left	05:49
	→ squentin joined	05:49
	→ ParsectiX joined	05:49
	← ntio left	05:50
	← ParsectiX left	05:50
	← megawac left	05:50
	← adamm left	05:50
	← Eugene left	05:50
	← tokik left	05:50
	← zivester left	05:50
	← bket left	05:50
	← binn_cn left	05:51
	→ adamm joined	05:51
	→ bket joined	05:51
	→ binn_cn joined	05:51
	← HoMM left	05:52
	← c74d left	05:52
	← drfoo left	05:54
	→ Eugene joined	05:54
	← Guin left	05:54
	→ blackjid joined	05:55
	→ c74d joined	05:55
	→ ParsectiX joined	05:55
	→ netj joined	05:55
	→ SleePy joined	05:56
	← SleePy left	05:56
	→ SleePy joined	05:56
	→ pheaver joined	05:56
	← SebastianFlyte left	05:56
	← saint_ left	05:57
	← nickSwe left	05:58
	← cbonobo left	06:00
	→ blahdodo joined	06:00
	→ cbonobo joined	06:00
	→ HoMM joined	06:00
	← reaverb left	06:01
	→ ntio joined	06:04
	← cbonobo left	06:04
	← HoMM left	06:04
linuxmint	Hello, can someone help me? I setup a website repository. I then setup a local git directory with $ git init. I need to push to the website repository, but $ git push, gave error: configure a remote repository using git remote add <name> <url>.	06:05
	I already setup a remote website repository? I think I need to change my process of setting up the local git repository from command $ git init, to maybe $ git remote add <name> <url>?	06:05
	← bket left	06:05
iveqy	linuxmint: what's remote website repository?	06:06
	← eletuchy left	06:06
	← watabou left	06:06
	→ bket joined	06:06
linuxmint	iveqy: a company that provides a remote repository like GitHub or BitBucket.	06:06
	→ eletuchy joined	06:06
dodobrain	linuxmint, you need to tell your local repo what is the location of your remote repo, thats all	06:07
	linuxmint, git remote add origin <url of the remote resository>	06:07
iveqy	linuxmint: okay. I was confused by the website part.	06:07
linuxmint	dodobrain: yes, I understand that, but I am trying to document the process for future work. I think I missed a setup step, which should be more than just $ git init.	06:07
	→ zarubin joined	06:08
iveqy	linuxmint: dodobrain is right, however the usual way to do this is to setup your remote repository and then clone it	06:08
linuxmint	dodobrain: yes, I am aware to do that command now, but I shouldn't have to if I setup the local repository correctly.	06:08
	→ Consuela joined	06:08
linuxmint	iveqy: ok, I think I did clone, but then I got confused and made and deleted several local git repositories.	06:08
	→ drfoo joined	06:08
iveqy	linuxmint: okay?	06:09
	→ EminenceHC joined	06:09
	← drfoo left	06:09
	← ParsectiX left	06:09
	← nikio__ left	06:09
	→ nikio_ joined	06:10
	← awb999 left	06:10
dodobrain	linuxmint, 2 possbilities: [[1]] you create remote repository first -> git clone <url of remote repository> -> play happily with your local repo yay!	06:10
	→ awb999 joined	06:11
	← eletuchy left	06:11
	→ SebastianFlyte joined	06:11
	← cagedwisdom left	06:11
	← D-Boy left	06:11
linuxmint	iveqy: so, I'm wondering if there's another way apart from using a remote repository setup with $ git clone. Sometimes I like to stay local and setup git with $ git init. Then if I think it can to to a remote repository, how to?	06:13
dodobrain	[[2]] you create a local repository with git init without cloning an existing remote repo -> you play around with your local repo yay! -> you create a remote repo -> you need to tell local repo of the remote: git remote add origin <url of the remote empty repository> -> when you are ready to push from local repo you might want to setup your branch to track remote as upstream: git push -u origin master	06:13
	→ tohuw joined	06:13
linuxmint	dodobrain: yes, I understand the remote setup. Can this be done locally first, although that might be a bad habit.	06:13
dodobrain	linuxmint, as you see [[2]] is slightly more complicated with setting up remote and then also setting up the remote branch as upstream, etc. so best to work with the workflow in [11]]	06:13
	← EminenceHC left	06:14
	→ MattMaker joined	06:14
dodobrain	linuxmint, did you read what i wrote in possibility [[2]] ?	06:14
	i hope you did, cos that answers your question	06:14
linuxmint	dodobrain: what's [[11]]?	06:14
dodobrain	[[1]]	06:14
	← jayeshsolanki left	06:14
dodobrain	grr.. too many square brackets for today	06:14
tohuw	Can I make a submodule consisting of a subdirectory from another repo? E.g., I want foo/bar in my project to derive from yum/zeke of another, but not any other directory.	06:15
linuxmint	dodobrain: yes, [[1]] looks best. I guess if I make just a local git repository and decide to add it remote later on, do $ git remote add <name> <url>	06:15
iveqy	tohuw: no	06:15
linuxmint	dodobrain: sorry, under the confusion, I wanted to be sure what the [[1]] was :)	06:15
dodobrain	yes, and don;t forget to set the upstream tracking with the -u option when you push a branch	06:15
	→ jceb joined	06:15
tohuw	iveqy: is there any way to achieve this sort of effect, or some practice to observe when one has such a need?	06:16
linuxmint	dodobrain: I don't know the -u. What does that do. I thought git took care of itself with me having to do even more coding?	06:16
dodobrain	linuxmint, if you clone it is setup automatically	06:16
	← GT4066 left	06:17
iveqy	linuxmint: man git push look for -u	06:17
gitinfo	linuxmint: the git-push manpage is available at http://jk.gs/git-push.html	06:17
	→ D-Boy joined	06:17
iveqy	linuxmint: and passing command line arguments to a program isn't coding ;)	06:17
dodobrain	essentially it says to setup this remote 'origin/master' as the upstream branch for local 'master' branch the	06:17
	← pheaver left	06:17
dodobrain	as said earlier, all this is not even worth thinking about if you clone a remote initially	06:18
linuxmint	dodobrain: good, so for setup [[2]], setup locally, when happy to push remotely, $ git remote add <name> <url>. Where does this -u go and why as I thought whatever tracking would happen automatically?	06:18
	← MattMaker left	06:18
iveqy	tohuw: no. It's simply not a good fit for the git model of handling data. You could always but a submodule in .foo/bar and then do a ln -s to .foo/bar/zeke	06:18
	→ drfoo joined	06:18
dodobrain	linuxmint, if you don't use -u to setup the upstream, the next time your colleague adds commits to origin/master i.e. the remote repo, pulling those changes to your local repo is not as simple as just git pull	06:19
linuxmint	iveqy: no to what bad model?	06:19
	dodobrain: ok, that's fair enough. So what is the command? $ git remote add <name> <url> -u?	06:19
dodobrain	linuxmint, in case you didn't see it, iveqy 's last statement was directed to the user who calls him/her self 'tohuw'	06:19
tohuw	iveqy: fair enough. I can submodule the whole thing in e.g. src, then adjust deployment as needed - I can make that work. Thanks for the input.	06:19
iveqy	linuxmint: the one I'm discussing with tohuw	06:19
	→ jontmorehouse joined	06:20
iveqy	tohuw: you're welcome, good luck	06:20
	→ i_ron joined	06:20
dodobrain	linuxmint, git remote ... to add/remove/etc. remote repo definitions/urls.. the -u you need to use when pushing and also only once if you have not cloned initially	06:21
	→ dreiss joined	06:21
linuxmint	dodobrain: yes, you explained that to me clearly. What's the command? $ git remote add <name> <url> -u?	06:22
	← jonmorehouse left	06:22
	→ haptiK joined	06:23
linuxmint	iveqy: sorry, mixed that up.	06:23
dodobrain	linuxmint, for setting up remote: git remote add origin <url of remote>	06:24
	for setting up the upstream when pushing: git push -u origin master	06:24
	→ cagedwisdom joined	06:24
	→ joeyDB_ joined	06:24
	← haptiK left	06:24
linuxmint	dodobrain: whoah...git tells me right now $git remote add <name> <url>. Why do I need $ git remote add origin <url>?	06:25
dodobrain	assuming ofcourse that you are pushing the local master branch and also assuming that it is really supposed to be downstream of the remote master branch: by this i mean origin/master is what everyone (your colleagues) will pull from	06:25
linuxmint	dodobrain: So, $ git push -u origin master is a once off? I prefer just $ git push	06:25
	dodobrain: $ git push is easier if it can be setup in that convenient way.	06:25
iveqy	linuxmint: origin is the usual/default name for the remote repository	06:26
	→ Noodlewitt joined	06:26
dodobrain	linuxmint, yup once off, but only if you setup the remote manually, meaning you didn't clone originally	06:26
iveqy	linuxmint: man git push read what -u does!	06:26
gitinfo	linuxmint: the git-push manpage is available at http://jk.gs/git-push.html	06:26
	→ nardev joined	06:26
	→ lindenle joined	06:27
linuxmint	iveqy: yes, will get into that depth once I get some basic understanding of the correct setup.	06:27
	→ otter768 joined	06:28
	→ KristofferDarj joined	06:28
	← zarubin left	06:28
linuxmint	dodobrain: ok, just tried $ git push -u origin master, and error: 'origin' does not appear to be a git repository.	06:28
dodobrain	linuxmint, for now hard and simple rule: you always create your remote repo first -> then clone from it on your computer(s)	06:29
iveqy	linuxmint: that dept is the basic understanding...	06:29
	← joeyDB_ left	06:29
linuxmint	dodobrain: I think this is because I setup the local repository and didn't clone, but not sure.	06:29
dodobrain	this way everything is setup automatically, your remote and the upstream master branch	06:29
	→ strehi_ joined	06:29
strehi_	hi guys	06:29
gitinfo	strehi_: 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.	06:29
	→ zadock joined	06:29
linuxmint	dodobrain: yes, but as a learning beginner, I want to keep my files private and understand things first, so I create a local git. Then once having some command, can figure out remote websites and who to trust.	06:30
strehi_	what webpage do you suggest to learn git?	06:30
iveqy	strehi_: !books !talks	06:30
gitinfo	strehi_: [!book] There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	06:30
	strehi_: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	06:30
	→ porcoesphino joined	06:31
	← lindenle left	06:31
	→ arup_r joined	06:32
	← zadock left	06:32
linuxmint	dodobrain: ok, so for now, I have a local and will use a local repository. So command $ git push -u origin master, didn't work. Should the -u be added to $ git remote add <name> <url> perhaps?	06:32
iveqy	linuxmint: you first need to add the remote with git remote add and then you can push with git push -u. You can't push to a remote before you've added a remote to git	06:33
	← otter768 left	06:33
linuxmint	iveqy: ahh, great, thanks. I think that's the clear process I can add to a local setup. Let me try and thank you.	06:33
	→ apurcell joined	06:34
	→ tokik joined	06:35
	← Gamecubic_ left	06:35
linuxmint	Just a quick lazy question, but what should the name be in $ git remote add <name> <url>? Not my name, but perhaps the name like the remote repository name or something else to avoid confusion?	06:35
	← cromero left	06:35
	→ ajustrun joined	06:37
dodobrain	linuxmint, use the hard and easy rule i gave you above! always create your remote repo first, then clone from it on your local machine(s)	06:37
	← ToAruShiroiNeko left	06:37
dodobrain	usually <name> would be 'origin'	06:37
	← apurcell left	06:38
	→ nnyk joined	06:38
	← ZujkisNx left	06:39
	→ irqq joined	06:39
	← KristofferDarj left	06:40
	← drfoo left	06:40
	← jontmorehouse left	06:41
	→ devoldmx3 joined	06:41
	← russt left	06:41
	→ ToAruShiroiNeko joined	06:41
	← ToAruShiroiNeko left	06:41
linuxmint	dodobrain: thanks. $ git remote add origin <url> worked, but $ git push -u origin master failed. Error: the remote has work that I don't have locally.	06:41
iveqy	linuxmint: you do realise that we have told you everything at least twice. For example, the <name> explanation I told you 20 minuts ago. Please let us know if there's something you don't understand when we explain something	06:41
	→ ToAruShiroiNeko joined	06:42
linuxmint	dodobrain: yes, I agree to setup remotely and clone. Perhaps then, I can just work locally and not push if wanting to stay private.	06:42
	iveqy: sorry, I'm a bit slow.	06:42
iveqy	linuxmint: do you understand why you can't push?	06:43
	→ zoso joined	06:43
	← hvxgr left	06:43
linuxmint	iveqy: I think because the remote and local have different files. I was hoping the remote would accept the push to a new directory spot.	06:43
	→ munke joined	06:44
	← devoldmx left	06:44
	→ mricon joined	06:45
	→ ThomasLocke joined	06:45
	mricon → Guest32888	06:46
	→ BuenGenio joined	06:46
	← eologolo left	06:48
	← awb999 left	06:48
	→ eologolo joined	06:49
	→ recycle_ joined	06:49
	→ wachterjohannes joined	06:50
iveqy	linuxmint: you can do a git push -f to force to remote to accept, but !force is usually a pretty bad idea. You should just do a git pull so that you get all changes locally and then you can do a git push	06:50
gitinfo	linuxmint: [!force_push] If you need to overwrite the history of a remote git repository (very bad idea, see !rewrite), you can do so with `git push -f`. Note the remote server may reject this. See man git-config and search for receive.denyNonFastForwards. Best practice is for upstream servers to denyNonFastForwards.	06:50
	← Lyqyd left	06:55
	← Raging_Hog left	06:57
	← ToAruShiroiNeko left	06:57
	← lzx left	06:58
	→ juril_laptop joined	06:58
	→ nilg joined	06:59
	→ danners joined	07:00
	→ Raging_Hog joined	07:01
	← devll left	07:02
	← skorgon left	07:02
	→ ToAruShiroiNeko joined	07:03
	← ToAruShiroiNeko left	07:03
	→ ToAruShiroiNeko joined	07:03
linuxmint	iveqy: k, thanks for the info. I think I'll pull (hopefully won't lose my local changes) for good habit. There's nothing to lose on the remote, but I'd like to test if the remote pull will wreck my local work.	07:03
	← nnyk left	07:04
	→ ehmatthes joined	07:04
	← danners left	07:05
	← Goplat left	07:06
	→ bulletmark joined	07:06
	← dreiss left	07:06
	→ Silmarilion joined	07:07
	→ KevinTS joined	07:07
	← KevinTS left	07:07
	→ KevinTS joined	07:08
	← munke left	07:08
	← arup_r left	07:10
	→ apurcell joined	07:11
	→ freimatz joined	07:12
	→ hvxgr joined	07:13
	← bulletmark left	07:15
	← dodobrain left	07:15
	← apurcell left	07:15
	→ snearch joined	07:17
	→ arup_r joined	07:18
	← phantombeta left	07:19
	→ nnyk joined	07:19
	→ roelmonnens joined	07:20
	← a_le left	07:21
	← jrahmy left	07:22
	→ acolson joined	07:22
	→ a_le joined	07:22
	→ settermjd joined	07:23
	← michaelrice left	07:24
	← jonalmeida left	07:24
	→ joeyDB_ joined	07:25
	← harish left	07:26
	← MLM left	07:27
	← juril_laptop left	07:28
	← joeyDB_ left	07:30
	→ diegoaguilar joined	07:30
	→ tjm_jimmy joined	07:30
	→ phantombeta joined	07:31
	← bgerber left	07:32
	→ zarubin joined	07:33
	→ bgerber joined	07:33
	→ EminenceHC joined	07:37
	→ eletuchy joined	07:37
	← zarubin left	07:37
	← eletuchy left	07:41
	→ Vadimus joined	07:41
	← EminenceHC left	07:41
stor	is there any better plumbing to get the tag name from a tag object than parsing 'git cat-file tag <tag>'?	07:43
	<tag> = <sha>	07:44
	← Noodlewitt left	07:44
stor	(i don't know the tag name :)	07:44
	→ cdown joined	07:44
stor	hm, name-rev maybe?	07:45
	→ shpoont joined	07:48
thiago	possibly, yeah	07:48
	that assumes the refs/tags/ exist for that tag	07:48
	← uhhimhere left	07:49
	→ joo--_ joined	07:50
	→ eletuchy joined	07:51
	← Vadimus left	07:52
	→ jontmorehouse joined	07:52
	← shpoont left	07:52
	← beautifulmind left	07:53
	→ jnavila joined	07:53
	→ stamina joined	07:54
	← ToAruShiroiNeko left	07:56
	→ KevinTS_ joined	07:56
	← diegoaguilar left	07:58
	→ voidDotClass joined	07:58
	→ oriba joined	07:59
voidDotClass	How can I revert to a previous commit and push that as the new current version?	07:59
	i.e in commit X everything was working, commit Y broke something, I'd like to revert to commit X and work from there on in future	07:59
	→ Trudko joined	07:59
voidDotClass	but without losing commit Y	07:59
thiago	just push commit X	07:59
voidDotClass	push commit <code> ?	08:00
thiago	git push <remotename> X:branchname	08:00
	dsdeiz_ → dsdeiz	08:00
	← dsdeiz left	08:00
	→ dsdeiz joined	08:00
	← KevinTS left	08:00
voidDotClass	but i've already pushed commit Y to remote	08:00
thiago	has anyone got it?	08:00
voidDotClass	i'm the solo dev	08:00
thiago	git push -f remotename X:branchname	08:00
	← ninsei left	08:01
voidDotClass	what is that going to do? i'm not specifying the commit anywhere	08:01
	all my commits are already pushed to remote	08:01
thiago	it's going to push X to branchname in remotename	08:01
	→ ToAruShiroiNeko joined	08:01
thiago	it's going to remove anything that happened after X from the remote	08:01
	→ d4ryus___ joined	08:01
voidDotClass	and then i need to checkout that branch?	08:01
thiago	no	08:02
	it changes the remote, only	08:02
	your local repository remains unchanged	08:02
voidDotClass	but i also need my local repo updated	08:02
thiago	to what?	08:02
voidDotClass	to X	08:02
thiago	you said you don't want to lose Y	08:02
	← boombatower left	08:02
	→ ninsei joined	08:02
voidDotClass	i meant it should stay in history	08:02
	so if i need to i can check it later	08:03
	i.e there are some methods that would remove it from head, i dont want that	08:03
thiago	create a new branch that points to Y or anything that happened later	08:03
	then git reset --hard X	08:03
	→ smithd_ joined	08:03
thiago	then push -f	08:03
	← zoso left	08:03
voidDotClass	is there no way to just revert to X commit, and have that become the new revision?	08:04
	within the same branch	08:04
	← d4ryus left	08:04
milki	voidDotClass: git read-tree X	08:04
	→ boombatower joined	08:05
	← boombatower left	08:05
	→ PeterBooker joined	08:05
	← RusAlex left	08:05
	→ nfk joined	08:06
	← smithd left	08:06
	← dcpc007 left	08:07
	→ sebhoss joined	08:07
	→ rath joined	08:07
thiago	milki: revert X or revert to X?	08:07
	← nardev left	08:08
thiago	sorry	08:08
	voidDotClass: ^^^^	08:08
	← lid_ left	08:09
milki	i see a to there	08:09
	→ dcpc007 joined	08:10
	← dcpc007 left	08:10
milki	meh	08:10
	too many ways to read that	08:10
	milki shrugs	08:10
voidDotClass	thiago: revert TO x	08:11
	milki: what will git read-tree do?	08:12
stor	how do i decide if a tag is on a given branch? i don't really like using 'git branch --list <thebranch> --contains <tag>' in a script...	08:12
thiago	voidDotClass: git checkout X .	08:12
milki	huh, i dunno. i wonder if there are resources that will tell me	08:12
thiago	voidDotClass: including the dot at the end	08:12
	stor: git branch --contains tagname	08:12
	stor: for a single branch and tag: git log branch..tag	08:12
	stor: if it prints nothing, the tag is in the branch	08:13
stor	thiago: i have a given branch already and i want to verify if the tag is on that	08:13
	and it should be machine-friendly	08:13
thiago	if [ -n "`git log -1 branch..tag`" ]	08:13
	→ adamellsworth joined	08:14
	→ metastableB joined	08:14
osse	if git merge-base --is-ancestor branch tag	08:15
	djeezus	08:15
	^_^	08:15
	→ seschwar joined	08:15
stor	heh i just found it too :) (was thinking using rev-list previously)	08:16
	← snearch left	08:16
	→ mlechner joined	08:16
	→ lindenle joined	08:16
	← ajustrun left	08:16
voidDotClass	thiago: if i checkout revision x, then make some changes and try to commit them, will that work?	08:16
	← daynaskully left	08:17
thiago	voidDotClass: define "work"	08:17
	voidDotClass: git will do it just fine	08:17
	voidDotClass: but I doubt the effects will be what you want	08:17
voidDotClass	then that's not what i want.	08:17
thiago	so try what I suggested	08:18
voidDotClass	you said to try checkout, and the effects of that wont be what i want as you said	08:18
thiago	I didn't say to checkout revision x	08:18
	I said "git checkout X ."	08:19
	the dot at the end makes a difference	08:19
voidDotClass	I see	08:19
	← joo--_ left	08:19
voidDotClass	so if i do that, and then make new commits, will they work as expected?	08:19
thiago	that checks X's content out, without checking out (switching to) that commit	08:19
	yes	08:19
voidDotClass	awesome	08:19
thiago	you need to make a commit first, marking the reversal	08:19
	→ TomyWork joined	08:19
voidDotClass	yeah	08:19
	that's perfect	08:19
osse	voidDotClass: is Y the only commit after X ?	08:20
	← lindenle left	08:21
	← darkbasic left	08:21
	← babilen left	08:21
	→ darkbasic joined	08:21
	← hahuang62 left	08:22
	→ PCatinean joined	08:22
	→ hahuang62 joined	08:23
voidDotClass	oys	08:24
	← kukks left	08:24
	→ snearch joined	08:24
voidDotClass	osse: yes*	08:24
	→ shpoont joined	08:24
osse	voidDotClass: then you could also have done 'git revert Y' and the result would be the same	08:24
	→ workerbeetwo joined	08:25
	→ mkaesz joined	08:25
voidDotClass	osse: but i dont want to lose y from the history	08:25
osse	if Y wasn't the only commit then in some cases that is still what's appropriate. but it depends on the situation, of michael kors	08:25
	you wouldn't have	08:25
voidDotClass	ah	08:26
osse	it creates a new commit that is the reverse of the commit(s) you specify	08:26
	→ joeyDB_ joined	08:26
	← guardian left	08:26
	← metastableB left	08:26
	→ runev joined	08:27
	→ wicope joined	08:28
	← jontmorehouse left	08:28
	→ otter768 joined	08:28
	→ petersr joined	08:29
	← ToAruShiroiNeko left	08:29
	← kaiten02 left	08:30
	→ kaiten02 joined	08:30
	← joeyDB_ left	08:30
	← otter768 left	08:33
	← cdown left	08:33
	← kyb3r_ left	08:34
	→ ToAruShiroiNeko joined	08:34
	→ endiruna1 joined	08:34
	→ ws2k3 joined	08:35
	→ Sasazuka joined	08:35
	→ kanuku joined	08:36
	← himikof left	08:36
	→ cehteh joined	08:36
	→ xaa joined	08:37
	→ ki0 joined	08:38
	← bb010g left	08:38
cehteh	how do i unpack a single object from a packfile? i need to repair a corrupted repo	08:38
	→ jagob joined	08:38
	→ zoso joined	08:38
	← zoso left	08:39
	← Sasazuka left	08:40
	→ zarubin joined	08:40
cehteh	ah remembered	08:40
	→ himikof joined	08:40
	← tokik left	08:40
	← voidDotClass left	08:40
	→ twoface88 joined	08:41
	← snearch left	08:44
	→ lqi joined	08:44
	→ snearch joined	08:44
	→ craigp joined	08:45
	→ fabio_p joined	08:46
	← hahuang65 left	08:46
	→ nour joined	08:47
	→ cdown joined	08:47
	← shpoont left	08:48
	← cannonball left	08:48
	→ dcpc007 joined	08:48
	→ Shusshu joined	08:49
	← twoface88 left	08:49
	→ babilen joined	08:50
	→ colli5ion joined	08:50
	← darkbasic left	08:52
	→ cannonball joined	08:52
cbreak	cehteh: git cat-file can do it, as can git unpack-file / git-unpack-objects	08:52
	← cdown left	08:52
cehteh	yes i forgot about the blob\|tree option	08:53
	→ snearch_ joined	08:53
	→ darkbasic joined	08:53
	→ psoo joined	08:53
	← psoo left	08:53
	→ doener joined	08:54
	← snearch left	08:54
	→ psoo joined	08:54
	← PeterBooker left	08:57
cehteh	mhm still problems	08:58
	fatal: loose object d0cdc0c31c46ccca2d35418a75c0b32d8951a1f5 (stored in .git/objects/d0/cdc0c31c46ccca2d35418a75c0b32d8951a1f5) is corrupt	08:58
	→ m8 joined	08:58
	← Shusshu left	08:58
cehteh	.. i just copied that object there, did i miss something?	08:58
	← tohuw left	08:58
Seveas	cehteh: looks like you copied it wrong	08:59
	→ bdash joined	08:59
	← bdash left	09:00
cbreak	look like it is corrupted	09:00
cehteh	the object itself looks a bit like garbage in a hexdump	09:00
Seveas	time to find a copy from another location	09:00
	← thiago left	09:00
cehteh	yeah	09:00
	← endiruna1 left	09:01
osse	cehteh: it looks like garbage because it is compressed	09:01
cehteh	are tree objects compressed?	09:01
	→ Bass10 joined	09:01
Seveas	yes, all objects are	09:01
cehteh	ok	09:01
	→ zumba_ad_ joined	09:02
cehteh	well git cat-file tree d0cdc0c31c46ccca2d35418a75c0b32d8951a1f; and on the other host: cp d0cdc0c31c46ccca2d35418a75c0b32d8951a1f5 >.git/objects/d0/cdc0c31c46ccca2d35418a75c0b32d8951a1f5	09:02
	should be right or?	09:02
	→ daedeloth joined	09:02
	→ elbeardmorez joined	09:03
Seveas	no	09:03
cehteh	or is there some other way to import a object?	09:03
Seveas	just cp over the object file	09:03
	← oskarkv left	09:03
Seveas	or if the object is only in a pack, copy the pack and run unpack-objects on it	09:03
	→ encod3 joined	09:03
	← colli5ion left	09:03
	← nmschulte left	09:03
cehteh	unpacking might be a bit bloating	09:04
	← chiemseesurfer left	09:04
	→ kurkale6ka joined	09:04
	← zumba_addict left	09:04
	→ Ragnar joined	09:04
Seveas	gc/repack will solve that again	09:04
	→ alekks joined	09:05
	→ zoso joined	09:05
	→ MasterPiece joined	09:05
	→ nmschulte joined	09:05
	→ ePax joined	09:05
cehteh	bah .. looks like its fucked up on one location, many broken trees/blobs	09:06
	→ ajustrun joined	09:07
	← BuenGenio left	09:08
cehteh	lets see how joeyhs git-repair works	09:09
	← alekks left	09:10
	→ ronskisika joined	09:10
	← Raging_Hog left	09:10
	← MasterPiece left	09:11
	→ zadock joined	09:11
	→ Gizburdt joined	09:12
	→ haptiK joined	09:12
	← nnyk left	09:13
	→ BuenGenio joined	09:14
	← haptiK left	09:14
	→ chemist69 joined	09:14
	← devoldmx3 left	09:15
	→ Takle joined	09:16
	← Gizburdt left	09:16
	→ gtristan joined	09:16
	← Tuna-Fish left	09:17
gtristan	I keep forgetting, is there a way to check what is the last commit since I pulled/pushed ?	09:17
	→ EdwardIII joined	09:17
gtristan	or view how many staged changes I have ahead of the remote ?	09:17
EdwardIII	hey	09:17
	→ tanuck joined	09:17
	← teran left	09:17
	→ Tuna-Fish joined	09:17
	→ Gizburdt joined	09:17
	← Gizburdt left	09:17
osse	gtristan: git log origin/master..master	09:18
EdwardIII	github's workflow for merging changes is "checkout remote branch, merge master into remote branch, test, then merge your local branch into master, then push back to github"	09:18
gtristan	osse, ah thanks a bunch :)	09:18
	→ Gizburdt joined	09:18
EdwardIII	but i tend to just tend to, on master, do git merge remote/branch, test, then push that up	09:18
	anything wrong with that workflow?	09:18
	← snearch_ left	09:18
EdwardIII	also i tend to always do --no-ff whenever i'm merging in changes from other people on master... too cautious?	09:19
	← Gizburdt left	09:19
	→ a-l-e joined	09:19
	→ EminenceHC joined	09:19
	→ atamanroman joined	09:21
	← mkaesz left	09:22
	→ mkaesz joined	09:22
	→ mezod joined	09:23
	← ehmatthes left	09:24
	← EminenceHC left	09:24
	→ Gizburdt joined	09:25
	→ snearch joined	09:26
	← dm7freek_ left	09:26
	→ netcarver joined	09:26
	→ vurma joined	09:26
	← mkaesz left	09:26
	→ joeyDB_ joined	09:27
	→ ideea joined	09:27
	→ The_Phoenix joined	09:28
	→ CustosL1men joined	09:28
De\|ta	I always merge dev / feature branches with --no-ff --no-commit	09:28
	← darkbasic left	09:29
	→ darkbasic joined	09:29
	← oriba left	09:30
	→ m0viefreak joined	09:30
	← mroach left	09:30
EdwardIII	De\|ta: and do you just do (from master): git merge origin/feature ?	09:30
	i guess doing it the way github say has the advantage that it's slightly easier to blow away the branch and start again	09:30
	→ marcogmonteiro joined	09:30
EdwardIII	rather than having to check the reflog and do git reset --hard	09:31
	← joeyDB_ left	09:31
	← arup_r left	09:32
	→ hroi joined	09:33
hroi	hi	09:33
	I have a folder	09:33
De\|ta	EdwardIII, from master I would do 'git merge --no-ff --no-commit foo/bar'	09:33
hroi	that is a bar repository ehm... --bare init	09:34
De\|ta	If I'm merging other people's work then I will have it locally as I would've reviewed / built it	09:34
	← petersr left	09:34
hroi	am I allowed to change the name of this folder?	09:34
	→ joo-_ joined	09:34
hroi	can it affect the integrity of the repository itself?	09:34
osse	hroi: yes. no.	09:35
hroi	I'm not worried about those that have checked or pulled out of it.	09:35
osse	hroi: but changing the name may make others have to change the URL that points to it	09:35
	← ideea left	09:35
hroi	osse, right... so it only affects the "origin" pointer	09:35
jast	correct	09:35
hroi	osse, for those working on it	09:35
	ok	09:35
	← joo-_ left	09:36
osse	hroi: it also affects the "poop" pointer for those who called it that instead of "origin"	09:36
	→ petersr joined	09:36
	→ twoface88 joined	09:36
	→ teran joined	09:36
	← petersr left	09:36
osse	(sorry for being childish=	09:38
	→ liamkeily joined	09:38
	→ arup_r joined	09:39
	← ePax left	09:39
	→ jayeshsolanki joined	09:39
	→ paperoga joined	09:40
paperoga	ciao	09:40
	← paperoga left	09:40
	← FunkyAss left	09:40
	← twoface88 left	09:40
	→ ePax joined	09:40
	→ cdown joined	09:41
	← arup_r left	09:41
	← teran left	09:41
	→ skylite_ joined	09:42
	← BuenGenio left	09:42
	← weiyang left	09:43
	← zarubin left	09:43
	→ ghostpl joined	09:44
	→ WaReZ joined	09:45
	→ puffy joined	09:46
	→ tokik joined	09:47
	← CustosL1men left	09:47
	→ jnavila_ joined	09:48
	← ajustrun left	09:49
	← adamellsworth left	09:49
	← sarri left	09:50
	← jnavila left	09:51
	← KevinTS_ left	09:51
	→ KevinTS joined	09:51
	→ sarri joined	09:52
	← snearch left	09:52
	→ cdown_ joined	09:53
	← wodim left	09:53
	← cdown left	09:54
	← cdown_ left	09:55
	→ rendar joined	09:57
	→ wodim joined	09:57
	→ mikecmpbll joined	09:58
	→ HelloShitty joined	09:58
	← jayeshsolanki left	09:59
	→ aswen joined	10:00
	→ RedShift joined	10:01
	← ePax left	10:01
	← hroi left	10:02
	← stamina left	10:02
	→ mkaesz joined	10:02
	← Tuna-Fish left	10:04
	→ zarubin joined	10:04
	→ jottr joined	10:04
	→ CustosL1men joined	10:04
	→ teran joined	10:05
	→ tokik_ joined	10:05
	← ev_ left	10:05
	← cagedwisdom left	10:06
	← Takle left	10:06
	→ Takle joined	10:06
	← tokik_ left	10:06
	→ xk_id joined	10:07
	→ nnyk joined	10:08
	← teran left	10:08
	→ teran joined	10:08
	→ Juzzika joined	10:09
	→ jayeshsolanki joined	10:09
	→ adamellsworth joined	10:09
	→ MasterPiece joined	10:09
	→ jost joined	10:09
	→ _0xAX joined	10:10
	← porcoesphino left	10:11
	→ snearch joined	10:11
	← Gizburdt left	10:12
	→ tokik_ joined	10:13
	→ Gizburdt joined	10:13
	← tokik_ left	10:13
	← Takle left	10:14
	← snearch left	10:14
	→ Tuna-Fish joined	10:15
	← tokik left	10:18
	→ roelmonn_ joined	10:19
	→ jnavila__ joined	10:19
	← CEnnis91 left	10:20
	← jnavila_ left	10:21
	→ Assault joined	10:21
Assault	hi, source tree users?	10:21
	→ autochthon joined	10:21
	→ EminenceHC joined	10:22
	← roelmonnens left	10:22
	→ snearch joined	10:22
	→ darkbasic_ joined	10:23
	← acolson left	10:23
Assault	this is pretty basic - I accidentally deleted a file (didnt commit the change)..how can I now revert the deletion in SourceTree to bring it back?	10:23
	→ Takle joined	10:23
	→ mroach joined	10:23
	← darkbasic left	10:23
jast	just so you know, most of us here use command line git	10:24
	and that's all I can tell you how to use	10:24
	in fact if you use 'git status' it'll tell you on its own how to do it	10:24
	← jnavila__ left	10:25
	→ jnavila joined	10:25
	→ okanck joined	10:25
Assault	yeah, i dont like commmand line tools, they belong to 20th century	10:25
	but I found it, its right click and "discard"	10:25
qsuscs	hah that one was funny	10:25
	you got more of such jokes?	10:25
	← daito left	10:25
	← Assault left	10:26
jast	oh, let's not even start	10:26
	there's no point	10:26
	→ sybariten joined	10:26
	→ daito joined	10:26
	← Gizburdt left	10:26
	← EminenceHC left	10:26
sybariten	i have to say its a funkin high treshold getting into git, or rather VCS, when you havent used it before	10:26
osse	I wonder how he left the channel. Did he right-click on the channel name or click the X, or did he type /part ?	10:27
	→ harish joined	10:27
jast	I wonder how he typed. typing into text fields belongs to the 20th century	10:27
osse	voice recognition	10:27
	→ joeyDB_ joined	10:27
linuxmint	Ok, I pulled the remote repository and I'm not sure if all files are pulled, so I can push all my modifications now?	10:28
	→ AAoK joined	10:28
	De\|ta goes back to work in https://github.com/Swordfish90/cool-retro-term GUIs are a fad anyway	10:29
	→ arup_r joined	10:29
	→ jost_ joined	10:29
	← ghostpl left	10:29
jast	linuxmint: once the pull is complete, pushing should Just Work(tm)	10:29
iveqy	sybariten: it is, and it should not be understated. Sometimes worse solutions is better because people understands them	10:29
	→ otter768 joined	10:29
jast	unless someone managed to sneak in more commits in the meantime	10:29
	→ Zoddo joined	10:29
sybariten	iveqy: i need to get the daily routines into my "backbone", as we say in my language	10:30
linuxmint	jast: Git says: http://dpaste.com/3G9Z5G8	10:30
sybariten	and then i'm only aiming to VCS some conf files... heh	10:30
	← daito left	10:30
iveqy	sybariten: I must recommend !talks, the one with Jesica Kerr. When you really understand that, git will go from beeing an obstacle to help you write code	10:31
gitinfo	sybariten: Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	10:31
	← Consuela left	10:31
	→ tomred_ joined	10:31
jast	linuxmint: are you on master branch? ('git branch' tells you)	10:31
linuxmint	$ git branch, says * master.	10:31
jast	so, yes :)	10:31
	do this: git branch -u origin/master	10:31
	then try pulling again	10:31
	this tells git which remote branch to associate with your local branch	10:31
sybariten	iveqy: thanks .... (and yes, i was on my way to writing a thanks to gitinfo there)	10:32
gitinfo	sybariten: you're welcome, but please note that I'm a bot. I'm not programmed to care.	10:32
	← jost left	10:32
	← joeyDB_ left	10:32
iveqy	sybariten: gitinfo thinks you did =)	10:32
jast	that's just a case of provident politeness	10:33
	→ ghostpl joined	10:34
iveqy	jast: don't get me wrong, I love gitinfo. She's very polite	10:34
	→ donmichelangelo joined	10:34
	← otter768 left	10:34
jast	she? where'd that come from?	10:34
sybariten	heh, yeah	10:34
iveqy	jast: he?	10:35
jast	I don't think gitinfo identifies with human constructs such as gender	10:35
linuxmint	jast: hmm, it did something.	10:35
	jast: says: create mode 100644	10:35
	→ acolson joined	10:36
	← kaiten02 left	10:36
linuxmint	jast: git doesn't confirm if my local repository with changed files has pulled the remote repository, to sync it up, so I can push my local changes?	10:36
Seveas	jast: it has enough binary problems to care about already, it doesn't want to care about a gender binary as well :)	10:36
iveqy	jast: do you know french? All things have a gender ;)	10:36
	linuxmint: if you push and there are not synced, you'll be told that	10:37
	linuxmint: actually there's no way to know if you're synced or not, because someone could have done a push right after you did the pull	10:37
	← michelangelo left	10:38
iveqy	(which is why git would never work as a centralized system with many users)	10:38
linuxmint	jast: ok, I tried $ git push -u origin master. Git says Writing objects.	10:38
	iveqy: oh, it's just me with no team :(	10:39
cbreak	hmm... since when does git pull update submodules automatically?	10:39
linuxmint	iveqy: I'm just practicing to see it if works and what are common useful things. Also handy to work on 1 website in a way that can be scaled up for a team later on one day maybe.	10:39
	← darkbasic_ left	10:40
	→ diegoviola joined	10:40
jast	definitely	10:40
	→ darkbasic joined	10:41
	→ mmitchell joined	10:42
	← jceb left	10:42
	← Tuna-Fish left	10:43
iveqy	cbreak: I'm not sure it's git pull, but rather git checkout. And I'm not sure when it happens, but I'm glad it did	10:43
	→ Tuna-Fish joined	10:43
iveqy	after fall 2011 at least	10:43
cbreak	yeah, it's nice.	10:44
iveqy	cbreak: however it won't work with (prior 2011) initialized submodules	10:46
cbreak	oh :(	10:46
	→ drfoo joined	10:46
iveqy	or I think it won't. Because a checkout should also be able to remove a submodule if you checkout a version prior to the submodule was added	10:46
	← mmitchell left	10:47
	← githogori left	10:47
	← drfoo left	10:47
iveqy	that means that the submodule repo cannot be in the submodule itself, but need to have a .git-file which puts the submodule repo inside the parents .git-dir	10:47
	→ beautifulmind joined	10:47
iveqy	I believe this can be a bit confusing	10:47
	→ doev joined	10:47
linuxmint	jast: ok, the $ git push -u origin master says, Branch master set up to track remote branch master from origin. Does this mean I need to do $ git push, to push my local files to remote now?	10:48
	→ drfoo joined	10:48
	→ nikio__ joined	10:48
jast	linuxmint: that command should have pushed already	10:49
	← drfoo left	10:49
linuxmint	jast: ok, I didn't see any confirmation. I guess I could log into the remote website. I hope I can just type $ git push, now to be easy.	10:50
jast	sure	10:50
	→ drfoo joined	10:50
jast	it'll say something like 'up-to-date' if there's nothing left to push	10:50
linuxmint	jast: well, thanks for your help then. I'll work on the website and see how the files go.	10:50
	→ Gizburdt joined	10:50
	→ King_Hual` joined	10:51
	← Juzzika left	10:51
	← arup_r left	10:51
Celelibi	Can I chose which commit I want to push?	10:51
	← cceleri left	10:51
	→ cceleri joined	10:51
	← ghostpl left	10:51
	→ skinkitten joined	10:52
Celelibi	I want to keep the 10 last commits on my computer.	10:52
	→ UmInAsHoE joined	10:52
	← nikio_ left	10:52
	→ ghostpl joined	10:52
Celelibi	I know, I should probably work on another branch, and merge into master when I'm ready to push.	10:52
iveqy	Celelibi: yes	10:52
Celelibi	But it's not the case.	10:53
	→ rns2 joined	10:53
	← saint-ron left	10:53
	← aswen left	10:53
Celelibi	And since I've almost finished my PhD, I won't do this now.	10:53
m0viefreak	git push remote master~10:master	10:53
	should do what you want	10:53
Celelibi	Thanks, I'll try.	10:53
	→ bote joined	10:55
	← cceleri left	10:56
	← wicope left	10:58
	→ h4ml3t joined	10:58
	→ devoldmx joined	10:59
	← rchavik left	11:01
	← ap0c left	11:02
	← xk_id left	11:03
	→ Pzq joined	11:03
linuxmint	Well, now I'm confused. I pulled the remote and now I have a directory called domain.com with the old website and public which is the directory I have been working in and is most recent. Can I just get rid of the domain.com directory that appeared?	11:03
	← Pzq left	11:04
	→ mskaesz joined	11:04
	← hyperair left	11:04
	← echo-area left	11:05
linuxmint	I guess just $ rm -rf domain.com, then maybe $ git push, to update the remote repository?	11:05
	→ Oxabp joined	11:06
	← mkaesz left	11:06
	→ xk_id joined	11:06
	← Tuna-Fish left	11:07
	← Oxabp left	11:07
	← k_sze[work] left	11:07
	→ byaruhaf joined	11:07
	← mkoskar left	11:07
	← KevinTS left	11:07
	← nnyk left	11:08
	→ Ybtb joined	11:08
	← paulweb515 left	11:08
	← Ybtb left	11:08
	→ daedeloth_ joined	11:09
	→ Mqizo joined	11:10
	← daedeloth left	11:12
	← Dragooon left	11:12
	→ nnyk joined	11:12
	← elbeardmorez left	11:13
	← adamellsworth left	11:14
	← UmInAsHoE left	11:14
	→ dm7freek joined	11:15
	← wachterjohannes left	11:15
	← puffy left	11:16
iveqy	linuxmint: you realise that it's almost impossible for us to advice you on which content you should have in your repository	11:17
	→ dougsland joined	11:17
	← lamppid left	11:18
	→ Tuna-Fish joined	11:18
	← nikio__ left	11:18
	→ groolot joined	11:18
linuxmint	iveqy: well, I tried to say I have worked in my local /public directory, but the $ git pull, added a directory named domain.com. So, I just $ rm -rf domain.com, and committed and pushed. I think it's fixed now.	11:18
	← roelmonn_ left	11:19
	← drfoo left	11:19
	← dm7freek left	11:19
	→ Error404NotFound joined	11:20
	← chrisgeorge left	11:20
	→ cdown joined	11:21
	→ lamppid joined	11:22
	→ gogu2 joined	11:23
	→ roelmonnens joined	11:23
	← cdown left	11:24
	← Gizburdt left	11:24
	← Y0sh1 left	11:26
	← Mqizo left	11:26
	→ cceleri joined	11:26
	← jost_ left	11:26
	→ jost joined	11:27
	← nilg left	11:27
	→ daa joined	11:27
	← roelmonnens left	11:28
	← groolot left	11:28
	← daa left	11:28
	← chemist69 left	11:28
	→ joeyDB_ joined	11:28
	→ chemist69 joined	11:28
	→ Frzd joined	11:30
	Guest40686 → RudWolf	11:30
	← Frzd left	11:30
	→ uuoxo joined	11:31
	← sebhoss left	11:32
	→ cagedwisdom joined	11:32
	← plasticle left	11:33
	← gtristan left	11:33
	→ plasticle joined	11:33
	← joeyDB_ left	11:33
	← rns2 left	11:34
	← cagedwisdom left	11:34
	→ fooforge joined	11:34
	→ dannymichel joined	11:35
sybariten	OK... so i hjave changed some files, in a program directory. They are in fact putty config files, under D:\portable\portaputty\....blabla	11:36
	i am standing in D:\portable and i know that i have a .git dir under there. If i do git status, i can see that a putty settings file has changed, so thats good	11:36
	→ snima joined	11:37
sybariten	now its git commit i will use to add this change to my versioning right? But that won't UL it to my own private git server will it?	11:37
_ikke_	sybariten: correct	11:37
	A commit just happens locally	11:37
	← kanuku left	11:37
	← albel727 left	11:38
	→ Juzzika joined	11:38
	← Gitzilla left	11:38
	→ cdown joined	11:38
	← cdown left	11:38
snima	can I switch back without doing branch? (I just did the commit)	11:39
	← cceleri left	11:39
iveqy	snima: switch branch?	11:39
qsuscs	!revert	11:39
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	11:39
	→ cceleri joined	11:40
	← jost left	11:40
	← snearch left	11:40
	→ jost joined	11:40
	→ cdown joined	11:41
	← cdown left	11:41
sybariten	_ikke_: alright,. but what about all those configurations... i have a vague memory of setting up something, so that not everything gets commited? Can i check what those settings actuially are?	11:41
	← dougsland left	11:41
	→ FunkyAss joined	11:41
	← _rgn left	11:42
iveqy	sybariten: that is probably in your .gitignore file	11:42
sybariten	i mean, i have lots of (program) dirs under D:\portable\ but in reality its maybe just putty and some other tools, that i want to send back and forth to git	11:42
	ok. hmmm i'll see if that's on disk	11:42
	→ roelmonnens joined	11:42
	→ cdown joined	11:42
	→ beckyconning_ joined	11:42
iveqy	sybariten: but you can use gitk (for example) to see what changes are made in your commits	11:43
sybariten	hm, nope, not under .git in this place. Maybe i didnt set that up after all, maybe i just dreamt it	11:43
	→ snearch joined	11:43
sybariten	whoa! i ran gitk and a client opened..	11:43
	← harish left	11:44
iveqy	I never said it was under .git it's just .gitignore	11:44
_ikke_	yeah, it's a graphical program	11:44
	→ cavallari joined	11:45
	← dsdeiz left	11:45
dachary	hi, how can I do something similar to diff -u <(git show 7b8e5c9) <(git show 1d9e4ac) but ignore the line number differences or commit message differences ? probably something like what git-patch-id does but I'm not sure how to get it.	11:45
sybariten	hm, yeah, as i read now i should put it anywhere in the project, ... but not in .git	11:45
	→ dougsland joined	11:46
	→ kanuku joined	11:46
	→ bitkiller joined	11:47
	← roelmonnens left	11:47
	→ s8321414 joined	11:47
	→ KevinTS joined	11:48
sybariten	OK, so as it turns out i actually had a gitignore. But it contained a * , a method i read about somewhere. But i noticed than when i changed a file under d:\portable\putty, git status was aware of that.. but when i changed a file under d:\portable\httrack , git status doesnt seem to learn that	11:49
	so is it possible that i have forced d:\portable\putty to be part of the watched files, and that that force is sticky?	11:49
	← ronskisika left	11:49
	← binn_cn left	11:51
	→ mroach_ joined	11:51
iveqy	sybariten: git won't ignore already tracked files, so using .gitignore with * means that git status only will tell you about files that you already track	11:51
	← mroach left	11:52
	mroach_ → mroach	11:52
	← kanuku left	11:53
tomred_	I have a repo in my home folder that I want to put into a shared directory and make a shared repo.	11:53
sybariten	iveqy: uh... im sorry, could you rephrase that	11:53
	→ lindenle joined	11:54
	→ roelmonnens joined	11:54
tomred_	Should I `git init --bare --shared` in the shared directory and copy the files in? Will I lose the history that way?	11:54
	← ignas left	11:54
	→ cvanball joined	11:54
iveqy	tomred_: you can't init an already initialized git repo.	11:54
	tomred_: !dropbox	11:54
gitinfo	tomred_: Storing git repositories on DropBox is a Very Bad Idea™. Use a free hosting service (such as Bitbucket or GitHub), or read !dropbox_why if you insist upon having your repo corrupted.	11:54
	← ToAruShiroiNeko left	11:54
iveqy	sybariten: with your settings you will ignore all files that git doesn't already know about	11:55
sybariten	iveqy:	11:55
tomred_	Not DropBox. moving the folder from $home to /usr/local/src/	11:55
	All on the same server	11:55
sybariten	iveqy: ok. But appearently it knows about D:\portable\putty ? i changed some files therein, and it reported that.	11:55
iveqy	dachary: since noone here seems to help you, the only advice I can give you right now is man git diff	11:55
gitinfo	dachary: the git-diff manpage is available at http://jk.gs/git-diff.html	11:55
	← Arsonide left	11:55
	→ ev_ joined	11:55
iveqy	tomred_: in that case, use git init --bare --shared, add that repo to your current repo with git remote add and then push to it	11:56
dachary	iveqy: I think http://www.linuxcommand.org/man_pages/interdiff1.html is what I need	11:56
	dachary trying	11:56
sybariten	lunch, brb	11:56
	→ jost_ joined	11:57
iveqy	sybariten: then you must have told git about those files previously. (or maybe your gitignore isn't applied recursively)	11:57
	← _0xAX left	11:57
tomred_	iveqy: thanks	11:57
	← strehi_ left	11:58
	← zoso left	11:58
	← lindenle left	11:58
	→ ToAruShiroiNeko joined	11:59
	← jost left	11:59
	← snearch left	12:00
	← cdown left	12:00
	← HelloShitty left	12:01
	→ kanuku joined	12:01
	← bitkiller left	12:01
	→ paul424 joined	12:01
	→ Gizburdt joined	12:02
	→ mikecmpb_ joined	12:02
	→ mizu_no_oto joined	12:02
	→ bitkiller joined	12:03
	← gogu2 left	12:03
	→ cdown joined	12:04
	→ wachterjohannes joined	12:04
	→ jost__ joined	12:05
	→ mikecmp__ joined	12:05
	← mikecmpbll left	12:05
	← kanuku left	12:06
	→ zhangyh26258 joined	12:07
	→ Raging_Hog joined	12:07
	← mikecmpb_ left	12:07
	← jost_ left	12:07
	← encod3 left	12:07
	→ snearch joined	12:08
	← zhangyh26258 left	12:08
tomred_	ivegy: That work...well.	12:09
	→ twoface88 joined	12:11
	→ Skapadapaduu joined	12:11
	← twoface88 left	12:11
	→ jceb_ joined	12:11
	← cdown left	12:11
cavallari	How can I merge the updates of a forked repository wich the commits are under my own commits?	12:14
	← Gizburdt left	12:15
	→ zhangyh26258 joined	12:15
	→ oriba joined	12:15
	← ghostpl left	12:15
	← liamkeily left	12:15
	→ rishiraj joined	12:16
	← zhangyh26258 left	12:16
	→ Gizburdt joined	12:16
	← dougsland left	12:16
	→ zhangyh26258 joined	12:17
	← mskaesz left	12:17
	→ kaiten02 joined	12:17
	→ monbro joined	12:19
tobiasvl	cavallari: what do you mean by that last part?	12:19
	→ dougsland joined	12:20
	← warthog9 left	12:21
	← Takle left	12:21
	myyst → myst	12:22
	→ freestyl3r joined	12:23
	← Raging_Hog left	12:23
	→ stamina joined	12:24
	← mezod left	12:24
	→ mkaesz joined	12:24
cavallari	tobiasvl: i´ve made a fork and made some changes	12:26
	then the source made some changes too	12:26
	now i´ve tried to merge those changes, but my changes are newer	12:26
	then an error shows me that cant be merged because my commits are newer than the upstream	12:27
	→ Not_Whatever joined	12:27
	← stamina left	12:27
tobiasvl	surely the error says they can't be merged automatically, and that you need to do it manually?	12:27
	!eek	12:27
gitinfo	[!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	12:27
	→ kanuku joined	12:28
	← snearch left	12:28
	→ joeyDB_ joined	12:29
	→ EminenceHC joined	12:30
cavallari	tobiasvl: the major problem is that the upstream heads didnt come updated, but it is	12:30
	→ otter768 joined	12:30
Seveas	cavallari: !repro please	12:31
gitinfo	cavallari: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	12:31
	← beautifulmind left	12:31
	→ jatt joined	12:31
osse	cavallari: do you have both your fork and the original repo as remotes?	12:31
	← jatt left	12:31
	→ jatt joined	12:31
cavallari	yes	12:32
osse	fetch from it	12:32
cavallari	i´ve done	12:32
osse	git fetch --all	12:32
	→ digifiv5e joined	12:32
osse	then git merge originalrepo/master	12:32
	or equiv	12:32
	← jost__ left	12:32
	digifiv5e → Guest79476	12:32
	→ mikecmpbll joined	12:33
cavallari	doesnt have a git force merge??	12:34
	← joeyDB_ left	12:34
osse	what would that do?	12:34
cavallari	force the upstream update	12:34
	→ jost joined	12:34
	← EminenceHC left	12:34
	→ rishiraj_ joined	12:34
osse	maybe it is updated	12:34
Seveas	-Xtheirs	12:34
osse	!repo	12:34
gitinfo	Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. http://source.android.com/source/version-control.html	12:34
osse	!llol	12:34
	← rishiraj left	12:35
osse	etc.	12:35
	!lol	12:35
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	12:35
	← otter768 left	12:35
	← mikecmp__ left	12:36
	→ sebhoss joined	12:36
	→ estan joined	12:37
	→ encod3 joined	12:37
	→ leolrrj joined	12:38
	→ jnavila_ joined	12:38
	← jnavila left	12:38
estan	hi folks. going to be doing some work at a place that is still on SVN. is it possible for me to start working with a local git repo, and then at a later point, link it with their SVN repo using git-svn and git svn dcommit all my commits?	12:39
	→ zacg joined	12:39
estan	(my question is really if it's possible to convert at a git repo to use git-svn at a later point)	12:39
Seveas	estan: down that road lies pain.	12:39
RichiH	estan: you should clone from their svn instead of starting with a new repo	12:39
Seveas	make them see the light and do a one-off conversion :)	12:40
estan	i know that. but at this point i don't have access to the SVN repo.	12:40
	i knew i'd get these suggestions here :) of course that is their long term plan.	12:40
	so.. a kind of post mortem git -> git-svn conversion is a bad idea (tm)?	12:40
osse	you could create a git-svn repo when the time comes, and then graft your own onto it	12:41
	→ skul joined	12:41
estan	i'd love to just get started with git now, locally, and then later replay my commits into their repo when i get access.	12:41
osse	I don't think it will be a big problem	12:42
Seveas	you could do that with format-patch and apply	12:42
estan	osse: yea. that's what i'd like to do. it's how that grafting would be done i'm unsure about.	12:42
	ah.	12:42
	okay. i'd just wanted some confirmation that it will be possible. then i'm happy.	12:42
osse	just note down which revision of the code from SVN repo you base your git repo on	12:42
estan	(as happy as i can be with the prospect of using SVN :) )	12:42
	← bitkiller left	12:43
	→ lsiv568 joined	12:43
	→ tvw joined	12:44
osse	estan: the grafting this goes something like this: you create a .git/grafts file that contain a bunch of SHA1 that basically says "Desptie of what it says in the database the parent commit of foo is bar". The nyou can use filter-branch to rewrite what needs rewriting to make that the truth. I can't remember the exact details, but it isn't hard.	12:44
estan	osse: ah. but for this project, i will start completely from scratch. that is, later on i will replay my work into a new directory in their SVN repo.	12:44
osse	that's even easier	12:44
estan	\o/	12:44
	→ mezod joined	12:45
osse	then I'd structure the git repo so that you don't have to move anything around when the time comes	12:45
	(but that's not impossible to fix at a later stage either)	12:45
	← jottr left	12:45
estan	hm, no i don't think i should need to move anything at all? i'm just interested in how i can use git-svn to take an existing git-only repo, and link it up with the SVN repo.	12:46
cavallari	to commit changes to a repository wich I dont have access... only via fork??	12:46
osse	yes	12:46
cbreak	cavallari: a clone is a fork	12:46
	→ EugenA joined	12:46
cbreak	you can commit to your local repository since you own it	12:46
	← c74d left	12:46
EugenA	i've done git checkout 8g7f66 .	12:46
estan	s/the SVN repo/a directory in the SVN repo/	12:47
EugenA	now git status says: your branch is ahead of 'origin/staging' by 7 commits	12:47
osse	estan: what I mean is that I recommend you create the subdir your code will eventually live in immediate, so that you don't have to fiddle with your git repo before crunching it into the git-svn repo	12:47
	→ cdown joined	12:47
cavallari	cbreak: i am fixing some codes at another repository	12:47
	not mine	12:47
EugenA	how can I undo my first command?	12:47
cbreak	cavallari: when you clone it, then it's yours	12:47
osse	EugenA: is that '.' part of the command you did ?	12:47
EugenA	yes	12:48
	← zadock left	12:48
osse	EugenA: git checkout HEAD .	12:48
cbreak	EugenA: checkout won't change how much ahead you are	12:48
	EugenA: it's unrelated.	12:48
cavallari	doesnt seems mine	12:48
	=(	12:48
osse	cavallari: !lol	12:48
gitinfo	cavallari: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	12:48
cbreak	cavallari: why not? :)	12:48
	→ bin joined	12:48
	← bin left	12:48
	→ bin joined	12:48
estan	osse: ah. i see. that's probably a good idea then yes. though i think i was planning on working only against a subdirectory in their SVN, not the full repo (they're of course not following the standard SVN layout, and have tons of crap in the repo which i'm not interested in).	12:48
osse	cbreak: you cannot push to where you cloned from if that is someone elses	12:48
	← bin left	12:48
cbreak	osse: irrelevant	12:48
osse	oops	12:48
	that was for cavallari	12:48
cavallari	hahaha	12:49
osse	cbreak: I know it's irrelevant, but I think that is the misunderstanding	12:49
cbreak	committing will work.	12:49
cavallari	so... i need to fork isnt?	12:49
	and create a pull request	12:49
cbreak	cavallari: just commit and send a patch	12:49
cavallari	how to send a patch?	12:49
cbreak	cavallari: or what ever else that team wants you to do to submit changes	12:49
	← ItSANgo left	12:49
cbreak	cavallari: open your e-mail program	12:49
	cavallari: and attach the git format-patch created file	12:50
	← fooforge left	12:50
	→ ItSANgo_ joined	12:50
cbreak	then send it to someone that wants the changes	12:50
osse	cavallari: the owner of the original repo will know how they prefer you to send your improvements, not us. If it's on github then it's most likely a pull request	12:50
	← ItSANgo_ left	12:50
	→ haptiK joined	12:50
	→ krv joined	12:50
	→ beautifulmind joined	12:50
	→ ItSANgo_ joined	12:51
iveqy	cavallari: it of course depends on how the one you're sending the patch to want to have it recieved	12:51
	if you're contributing to an open source project they usually have documentation about this.	12:51
	← rishi left	12:51
	→ rishi joined	12:52
cavallari	lol, too complicated to me	12:52
	← haptiK left	12:52
cavallari	i will give up those fixes for now	12:52
	→ c74d joined	12:52
iveqy	cavallari: to complicated to ask how the one you want accepting your patches want them?	12:52
EugenA	I want to revert last 7 commits. So, I should : git checkout 0d1d7fc32 . (from the root of repo?) and then git commit right?	12:53
	← cdown left	12:53
	← settermjd left	12:53
osse	yes	12:53
EugenA	after that git log will show reverted commits or not?	12:54
	→ settermjd joined	12:54
osse	it will	12:54
iveqy	osse: why not just do a git reset?	12:54
osse	why do you ask me?	12:55
iveqy	osse: because you recommended something else. I wanted to know your opinions	12:55
	→ bitkiller joined	12:55
osse	did I ? I just answered the question	12:55
	→ Dragooon joined	12:56
EugenA	git-reset - Reset current HEAD to the specified state. Sounds better for me	12:56
	← c74d left	12:57
	← Entomo left	12:57
	→ asturel_ joined	12:57
	← Junior left	12:57
	→ cdown joined	12:58
	→ jost_ joined	12:58
	→ nowhere_man joined	12:59
	→ hexagoxel joined	12:59
	← asturel left	12:59
	asturel_ → asturel	12:59
	← fstd left	13:00
	→ dythmhdao joined	13:00
	← rishi left	13:00
	→ rishi joined	13:00
	← rishi left	13:00
krv	Hi, I am KRV.I like to contribute to GIT project and I would like know whether there are mini projects like last year GSOC where I could learn a bit.	13:00
	→ fstd joined	13:00
	→ c74d joined	13:01
	← jost left	13:01
	← doev left	13:03
	→ rishi joined	13:03
	→ Gama11 joined	13:03
	→ dm7freek joined	13:04
	← rishi left	13:04
	← EugenA left	13:04
	osse just realizes he has no clue on how do find reported and unfixed bugs in Git. And that sucks.	13:06
	→ harish joined	13:06
	→ rishi joined	13:06
	← rishi left	13:06
	→ joo-_ joined	13:06
	← cdown left	13:06
	→ cagedwisdom joined	13:07
	→ rishi joined	13:07
	← leolrrj left	13:07
	← dm7freek left	13:08
osse	krv: there will be mini projects in GSoC this year it seems. And there was last year too	13:09
	but no idea on how to dig up that info except searching the mailing list	13:09
	→ snearch joined	13:10
	← rishi left	13:10
	→ Junior joined	13:10
	→ rishi joined	13:11
krv	thanks osse	13:12
	→ arup_r joined	13:12
	→ arup_r__ joined	13:13
	→ leolrrj joined	13:13
	→ cdown joined	13:14
	→ paulweb515 joined	13:15
sybariten	back	13:15
	→ ghostpl joined	13:15
sybariten	iveqy: any idea how i may have "told git about those files previously" ? I really cant remember	13:15
	← arup_r__ left	13:16
	← m8 left	13:16
	→ arup_r__ joined	13:16
	← arup_r__ left	13:16
	→ arup_r__ joined	13:17
	← arup_r left	13:17
	← arup_r__ left	13:17
osse	git-add	13:17
	→ mtakkman joined	13:17
sybariten	aaah	13:18
	and that doesnt stick in the ignore-file aftwerwards, but in some .git setting i suppose?	13:18
	→ arup_r joined	13:18
	← snearch left	13:19
	→ mmitchell joined	13:19
	← paulweb515 left	13:19
	→ endiruna joined	13:20
	→ warthog9 joined	13:20
	← ghostpl left	13:21
	→ jadne joined	13:21
osse	i don't understand the question	13:21
	!ignore_tra	13:21
gitinfo	[!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	13:21
	→ danzilio joined	13:22
	→ JohnBat26 joined	13:24
	← uuoxo left	13:24
	→ Nizumzen joined	13:24
	→ russt joined	13:25
	← russt left	13:25
	← warthog9 left	13:25
	→ basiclaser joined	13:25
	→ Cdvq joined	13:26
	← jayeshsolanki left	13:26
	→ snearch joined	13:26
	← Bleakwise left	13:27
	← Cdvq left	13:27
	← mtakkman left	13:27
	→ Yesu joined	13:28
	← monbro left	13:28
	→ Acidnerd joined	13:28
	← mezod left	13:29
	→ Takle joined	13:29
	← Guest79476 left	13:29
	→ Guest79476 joined	13:29
	→ m0ltar joined	13:29
	Guest79476 → daynaskully	13:29
	← Polyatomic left	13:30
	→ toothrot joined	13:30
	→ joeyDB_ joined	13:30
	→ JagaJaga joined	13:30
	→ Dorf joined	13:30
	← wachterjohannes left	13:31
qsuscs	krv: start with not calling it !GIT	13:31
gitinfo	krv: Git is not an acronym. Writing it in all caps is heresy and will be punished by Subversion or SCCS for more grievous offences. It's "git" or "Git". Thank you for your help in making the world a better place. 48a8c26c625a4d3631c4f614bceb38933e741408	13:31
	→ livingstn joined	13:32
bremner	wth is that hash, some easter egg?	13:33
jast	not exactly	13:33
Seveas	https://github.com/git/git/commit/48a8c26c625a4d3631c4f614bceb38933e741408	13:33
	→ paulweb515 joined	13:33
	→ ELFrederich joined	13:34
bremner	ah, so the that anti-GIT is some junio-come-lately-ism	13:34
	← lsiv568 left	13:34
bremner	fight the powah!	13:34
	ahem.	13:35
	← joeyDB_ left	13:35
	← jatt left	13:35
osse	GIT looks ugly	13:35
	← dannymichel left	13:35
	→ deuterium joined	13:35
	← Yesu left	13:35
Seveas	/slap bremner	13:35
	→ gbso joined	13:35
	→ rns2 joined	13:35
	→ wachterjohannes joined	13:35
	→ stamina joined	13:36
bremner	I accept that.	13:37
	→ bollullera joined	13:37
qsuscs	junio wasn’t even the author of that commit	13:37
	→ HoMM joined	13:38
	← HoMM left	13:38
	→ doev joined	13:38
	→ HoMM joined	13:38
	← HoMM left	13:38
bremner	thomas-come-lately is not as funny	13:38
	→ HoMM joined	13:38
	← HoMM left	13:38
Seveas	tommy-come-lately would be more appropriate	13:39
	→ HoMM joined	13:39
qsuscs	i do not come late :<	13:39
Seveas	qsuscs: TWSS	13:39
osse	nice guys finish last	13:39
	→ lindenle joined	13:39
qsuscs	Seveas: stop offending me!!11111!!!!oneleven	13:40
	Seveas feels a strong urge to feed qsuscs to the rabbits.	13:41
Seveas	https://www.youtube.com/watch?v=XcxKIJTb3Hg	13:41
	← Acidnerd left	13:42
qsuscs	i don’t need to put even more sarcasm markers there, do i?	13:42
	← rns2 left	13:42
Seveas	nope. But I take any chance to sneak in a monty python reference.	13:42
	← zacg left	13:42
	← Gizburdt left	13:43
	← atamanroman left	13:43
	→ warthog9 joined	13:44
	← lindenle left	13:44
	← jMyles left	13:44
	← FunkyAss left	13:45
	→ rns2 joined	13:45
	→ jatt joined	13:47
	← jatt left	13:47
	→ jatt joined	13:47
	← snearch left	13:47
	→ apurcell joined	13:47
	← CussBot left	13:47
	→ Consuela joined	13:48
	← Consuela left	13:48
	→ CussBot joined	13:48
	→ zenith__ joined	13:48
	→ Neozonz\|Disc joined	13:49
	← Neozonz\|Disc left	13:49
	→ Neozonz\|Disc joined	13:49
	→ tokik joined	13:49
	→ Gizburdt joined	13:50
	← sebhoss left	13:50
	→ lsiv568 joined	13:50
	← tokik left	13:50
	→ albel727 joined	13:51
	← freimatz left	13:52
	← apurcell left	13:52
	→ tokik joined	13:52
	← elementalest left	13:52
	→ Acidnerd joined	13:52
	← cvanball left	13:52
	→ elementalest joined	13:52
	← elementalest left	13:52
	→ elementalest joined	13:52
	→ hardenedapple joined	13:53
	← beckyconning_ left	13:53
	→ tier joined	13:54
	→ DolphinDream joined	13:54
	← DolphinDream left	13:54
	← intellix left	13:54
	→ bibi-23 joined	13:55
	→ obr7 joined	13:55
obr7	hi	13:55
gitinfo	obr7: 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:55
	gitinfo set mode: +v	13:55
	→ cvanball joined	13:55
	→ sebhoss joined	13:55
bibi-23	hello, "git branch" shows me 2 branches, but autocompletion for "git checkout" shows 3 branch	13:56
obr7	is it possible to "merge" two files? I mean give them the same content and delete one and git detects a renaming?	13:56
bibi-23	how can I delete it, "git branch -d branchname" doesn't work	13:56
	→ denete joined	13:56
	← seschwar left	13:56
	← denete left	13:56
	← sebhoss left	13:56
	← hvxgr left	13:57
	→ seschwar joined	13:57
	→ denete joined	13:57
	← Ragnar left	13:58
	← beautifulmind left	13:58
	→ wrouesnel joined	13:59
	← cavallari left	14:00
	← obr7 left	14:00
	→ obr7 joined	14:00
	→ snearch joined	14:01
	← snearch left	14:01
	← gbso left	14:01
	← zhangyh26258 left	14:01
	ben_alman_ → ben_alman	14:02
	← bollullera left	14:02
	← mizu_no_oto left	14:02
	→ mezod joined	14:02
	→ Iga joined	14:02
	→ fooforge joined	14:04
	→ hyperair joined	14:04
	→ shinnya joined	14:04
	← Iga left	14:04
	← bgerber left	14:04
	→ th3fallen joined	14:04
	← arup_r left	14:04
	→ hvxgr joined	14:04
	← doev left	14:04
	← zumba_ad_ left	14:05
	→ intransit joined	14:05
	← s8321414 left	14:05
	→ s8321414 joined	14:06
cbreak	bibi-23: git branch -a? :)	14:06
	obr7: that's not a problem	14:06
	git commits are all full snapshots anyway	14:06
	→ smccarthy joined	14:07
bibi-23	cbreak: yes but it's as a remote, "remotes/name/branch", I don't understand why this one is autocompleted and not the other remote branches	14:08
	← s8321414 left	14:08
	→ Xiijs joined	14:08
	→ ghostpl joined	14:08
	← Xiijs left	14:09
bibi-23	cbreak: my bad actually all the remotes are autocompleted	14:09
	← Juzzika left	14:10
	← paul424 left	14:10
	→ bgerber joined	14:10
	← moparisthebest left	14:10
	→ wopx joined	14:10
	→ ErKa joined	14:11
	← linuxmint left	14:11
	→ Juzzika joined	14:12
	← mezod left	14:12
	← ghostpl left	14:12
	→ jerius joined	14:12
	← toothrot left	14:13
	← zarubin left	14:13
	→ angliscwork joined	14:14
	← Vile left	14:14
	→ ghostpl joined	14:14
	← _Vi left	14:15
	← Dragooon left	14:15
	→ KevinTS_ joined	14:15
	→ studmuf joined	14:15
	← diegoviola left	14:16
	→ devoldmx3 joined	14:18
	← KevinTS left	14:18
	→ sburgess joined	14:18
ELFrederich	adding the tarball for Git 2.3.0 to a new Git repo takes me like 2.3 seconds. But when I run all the corresponding "git" commands to do the same via hash-object and mktree it takes like 8.5 seconds. http://paste.pound-python.org/show/i3Ps4VvhXj2NoYFSFJ0I/	14:19
	any idea how I can speed this up?	14:19
	→ CEnnis91 joined	14:20
	→ diegoviola joined	14:21
	← wopx left	14:21
	← devoldmx left	14:21
	→ maxvi joined	14:21
	→ FreezingCold joined	14:21
	→ zarubin joined	14:21
	→ moparisthebest joined	14:21
	← Gizburdt left	14:22
	← zarubin left	14:22
ELFrederich	what is "git add ." doing under the hood that is so much faster than running individual "git hash-object" and "git mktree" commands?	14:22
	← Takle left	14:23
	→ oztx joined	14:23
	← oztx left	14:24
	← stamina left	14:24
	← ghostpl left	14:24
	→ Gizburdt joined	14:24
	← skul left	14:24
osse	ELFrederich: calling hash_object() and mk_tree() instead of calling fork() and exec() over and over	14:24
	→ Rdt joined	14:25
	← Gizburdt left	14:25
	→ Vadimus joined	14:25
	← zenith__ left	14:25
	→ Gizburdt joined	14:25
	→ zenith__ joined	14:26
	→ hackvana joined	14:26
	← Gizburdt left	14:26
ELFrederich	osse, so with "git add ." is Git running anything in parallel?	14:26
	... or is it waiting for each forked process to finish before running the next?	14:27
	← zenith__ left	14:27
osse	ELFrederich: I don't know whether anything is in parallell, but my guess is there is zero forked processes	14:27
	→ zenith__ joined	14:27
	→ Ragnar joined	14:27
	← ToAruShiroiNeko left	14:27
	← Nizumzen left	14:28
	→ ToAruShiroiNeko joined	14:28
ELFrederich	osse, oh... you're saying my bash example is calling fork and exec over and over	14:28
osse	yes	14:28
	← ToAruShiroiNeko left	14:28
	→ IIT joined	14:29
	→ ToAruShiroiNeko joined	14:29
	← IIT left	14:29
ELFrederich	osse, ultimately I'm trying to do this from Python calling git through the "sh" module... I just put it into bash as an intermediate to see if it was slow in bash also	14:29
	→ mizu_no_oto joined	14:29
	← ToAruShiroiNeko left	14:29
ELFrederich	maybe I should look at mercurial since it is implemented in Python... or find an actual Git library in Python rather than using the sh module which just calls subprocesses	14:29
	→ ToAruShiroiNeko joined	14:29
osse	ELFrederich: if you're "shelling out" can't you run git add directly then?	14:29
	→ jmpp joined	14:29
	← jmpp left	14:29
	→ jmpp joined	14:29
osse	http://www.pygit2.org/	14:29
	← jmpp_ left	14:30
	← ToAruShiroiNeko left	14:30
	← krv left	14:30
	→ ToAruShiroiNeko joined	14:30
ELFrederich	osse, yes I can run git directly... but I'm not using the workspace. I'm just using Git as an object store for different directories.	14:30
	← kanuku left	14:30
	← ToAruShiroiNeko left	14:30
	→ phantomtiger joined	14:30
	← smithd_ left	14:30
	→ smithd_ joined	14:30
	← jatt left	14:31
	→ joeyDB_ joined	14:31
Seveas	ELFrederich: then you really don't want hg. It's not an object store at all :)	14:31
	→ ToAruShiroiNeko joined	14:31
	→ jatt joined	14:31
	→ EminenceHC joined	14:31
Seveas	but look at pygit2.	14:31
	← jatt left	14:31
	→ jatt joined	14:31
	← Rdt left	14:31
	→ otter768 joined	14:31
	→ AaronMT joined	14:31
ELFrederich	osse, for example... my Git directory is in /tmp/db (meaning I have /tmp/db/.git.... so is it possible to use a single "git add" command to add a directory that exists outside of the workspace /tmp/db ?	14:31
Seveas	you can't even use git add at all. You'll need to hash-object	14:32
osse	ELFrederich: yes. git --work-tree=/somewhere/outside --git-dir=/tmp/db/.git add foo	14:32
	→ heftig joined	14:32
	→ vitiy joined	14:32
ELFrederich	osse, HOORAY... I'll try it out	14:33
	← tjm_jimmy left	14:33
	→ kanuku joined	14:33
	→ zivester joined	14:33
ELFrederich	osse, can I use that --work-tree and --git-dir to checkout to a different directory as well?	14:33
osse	yes	14:33
	← devoldmx3 left	14:33
ELFrederich	osse, I asked here yesterday... maybe the wrong people were answering. Thanks. I'll try this out	14:34
	← vitiy left	14:34
	→ r0073r joined	14:34
osse	could also be that I misunderstood	14:34
	since Seveas disagrees	14:34
	→ Oyni joined	14:34
	← Oyni left	14:35
	← r0073r left	14:35
	← joeyDB_ left	14:35
	→ roelmonn_ joined	14:35
ELFrederich	osse, Seveas maybe I'm bad at explaining what I wanted to do	14:35
	→ Takle joined	14:35
	→ russt joined	14:35
	← EminenceHC left	14:36
	→ r0073r joined	14:36
ELFrederich	... makes this code useless http://paste.pound-python.org/show/xkfi2srsMzRqqhozVLMr/	14:36
	→ Ycv joined	14:36
	→ oriba_ joined	14:36
	← otter768 left	14:36
	→ OneEyedWill joined	14:36
ELFrederich	it manually traverses a tree calling hash-object and mktree	14:36
	← r0073r left	14:36
	→ IIT joined	14:36
ELFrederich	with this new knowledge... now I need to decide if I use a different .git dir for each object or store them all into one .git directory	14:37
	... probably a single .git directory since my items will be referencing each other	14:37
	→ diamonds joined	14:37
	← gunnaro_ left	14:37
	← Ycv left	14:37
	← studmuf left	14:37
diamonds	rebase worksflow vs. --no-ff workflow (???)	14:37
	I've always done rebase, new gig wants no-ff	14:38
	I don't totally get it	14:38
	← roelmonnens left	14:38
	→ hans_s joined	14:38
diamonds	does it group all commits regardless of the # of upstream commits, when they were, or whether you had to merge/rebase intermittently (to get some important new change in your feature branch)?	14:38
	→ ghostpl joined	14:39
	← joo-_ left	14:39
	← ErKa left	14:39
	← oriba left	14:39
	→ jerematic joined	14:40
	← JagaJaga left	14:40
	→ EminenceHC joined	14:40
	← ghostpl left	14:40
	← mnass left	14:41
	← OneEyedWill left	14:41
	→ studmuf joined	14:41
	← mostlybadfly left	14:42
	→ asoneth joined	14:43
	→ zumba_addict joined	14:43
	→ nikio_ joined	14:44
	→ mcrutchfield joined	14:44
	→ dannymichel joined	14:44
	← hahuang62 left	14:44
	← hardenedapple left	14:45
	← EminenceHC left	14:45
	→ cbonobo joined	14:46
	→ CKyle joined	14:46
	→ Gizburdt joined	14:47
	← Takle left	14:48
	→ interrobangd joined	14:48
	→ ghostpl joined	14:48
	→ d10n-work joined	14:49
	← cvanball left	14:49
	→ chitopunk joined	14:49
	→ Takle joined	14:50
	← Bass10 left	14:50
	→ Aune joined	14:50
	→ macabre joined	14:51
	← acolson left	14:52
	← elementalest left	14:52
	→ jatt` joined	14:52
	→ FreezingAlt joined	14:52
	→ elementalest joined	14:52
	← elementalest left	14:52
	→ elementalest joined	14:52
	→ dm7freek joined	14:52
	← ghostpl left	14:53
	→ zarubin joined	14:53
	← Kulrak left	14:55
	← zumba_addict left	14:55
	→ CarlFK joined	14:55
	→ zumba_addict joined	14:55
	← lqi left	14:55
	← FreezingCold left	14:55
	← macabre left	14:56
	oriba_ → oriba	14:56
	← kanuku left	14:56
	→ lqi joined	14:56
	→ JagaJaga joined	14:56
	← enterprisedc left	14:56
	→ dreiss joined	14:56
	← dannymichel left	14:56
	← dm7freek left	14:57
	← phantomtiger left	14:58
	← zarubin left	14:59
	← SFLimey left	14:59
	→ wahibdon joined	14:59
	← lsiv568 left	14:59
	← lqi left	15:00
	→ cjwilburn joined	15:00
	← cdown left	15:01
wahibdon	I a bit confused. I had a test server setup to hold bare repos and I named all the folders like project.repo. when I would clone these projects it would clone them without the .repo "extension" in the folder. Now on this new server when I clone the .repo is there when I clone. What did I miss in setting up this production server?	15:01
	← xaa left	15:02
	← AAoK left	15:02
	→ PeterBooker joined	15:03
	← irqq left	15:03
	→ FunkyAss joined	15:03
grawity	nothing, it's a client decision what to name the local directory.	15:04
	→ cdown joined	15:04
	→ OneEyedWill joined	15:04
	→ flavi0 joined	15:04
	→ irqq joined	15:04
	→ foist joined	15:05
	→ tristanp joined	15:05
th3fallen	Hey guys stupid question, if we have a submodule set to track a branch (master) will we need to update the subproject commit anymore? Or will it do it on its own?	15:06
	→ lsiv568 joined	15:06
	→ steele joined	15:06
	→ hardenedapple joined	15:06
	→ pheaver joined	15:06
	→ mezod joined	15:06
	← studmuf left	15:07
	← zumba_addict left	15:08
	→ zumba_addict joined	15:08
wahibdon	grawity, cool. thanks. I don't know what happened but I will dig into the source tree settings.	15:08
	← asoneth left	15:08
m0viefreak	th3fallen: you need to manually update it	15:08
	→ rap joined	15:08
moritz	th3fallen: it won't ever update magically	15:08
grawity	wahibdon: note that the usual extension for bare repos is '.git' (or none at all)	15:08
	→ Mzuz joined	15:09
	→ Kulrak joined	15:09
	← Kulrak left	15:09
	→ Kulrak joined	15:09
wahibdon	dangit!	15:09
	← Junior left	15:09
wahibdon	what a fool I am.	15:09
	→ macabre joined	15:09
grawity	the main git client will strip .git but doesn't care about other suffixes	15:09
th3fallen	Well damn...	15:09
	← netcarver left	15:09
th3fallen	Thanks m0viefreak and moritz	15:09
	← Mzuz left	15:09
	→ lsiv568_ joined	15:09
	← lsiv568 left	15:09
	← a_le left	15:10
hackvana	Hello folks. I let the branch named "master" fall behind - about 18 months behind. I'd like to move the name to a very recent commit, one named "prod-unittests". I've followed the instructions on this page to move the name "master" to point to the same commit as "prod-unittests". But I'm having trouble pushing this change to my origin server.	15:10
	→ kanuku joined	15:10
hackvana	How can I move the "master" branch pointer on my origin server?	15:10
	→ zee joined	15:10
	→ a_le joined	15:10
hackvana	http://www.linux-pages.com/2011/03/how-to-move-a-branch-in-git/	15:10
	← tokik left	15:11
hackvana	I followed "move just branch name"	15:11
	→ Spacew00t joined	15:11
	← jatt left	15:11
	← zee left	15:11
	← jatt` left	15:11
grawity	that's a weird way of doing it, but okay	15:11
	so now both `git log -1 master` and `git log -1 prod-unittests` show the same commit locally?	15:12
hackvana	I'll try.	15:12
grawity	`git push origin +master` should fix it on the server	15:12
hackvana	(I'm a git newbie btw)	15:12
	→ ghostpl joined	15:12
	→ tuooe joined	15:12
hackvana	I'll try that then. (I have the repo on the server backed up)	15:12
	← mizu_no_oto left	15:12
ELFrederich	osse, using "git --work-tree=/tmp/some_data --git-dir=/tmp/db/.git add ." How is it possible for me to find the top level tree object it created?	15:12
	← zumba_addict left	15:12
	→ enterprisedc joined	15:13
	← JagaJaga left	15:13
hackvana	I was trying "git push origin master". Seems the "+" makes all the difference!	15:13
	→ marscher joined	15:13
hackvana	Looks good now, thank you!	15:13
	(Where can I learn more about the "+"?)	15:13
osse	hackvana: that equivalent to push --force	15:13
	← OneEyedWill left	15:13
osse	ELFrederich: not sure	15:13
	← micechal left	15:14
	← seschwar left	15:14
	← MasterPiece left	15:14
osse	ELFrederich: git rev-parse :0:. I think	15:15
	← kanuku left	15:15
	→ zumba_addict joined	15:15
	→ MasterPiece joined	15:15
flavi0	hmm. if my local and origin master is two commits ahead and one behind upstream master, how would i proceed normally? do a local merge commit of the upstream changes, push to origin and issue pull request? that way afterwards there would be the superfluous merge commit in upstream history? is there a cleaner way of doing this?	15:15
	→ kanuku joined	15:15
	← zumba_addict left	15:15
	→ zumba_ad_ joined	15:15
flavi0	like pushing my 2 commits to a local branch first, then pulling upstream changes and rebasing on them?	15:15
osse	flavi0: rebase your commits	15:15
	flavi0: git rebase origin/master	15:16
	then you will be ahead	15:16
	no need to create a local branch first	15:16
hackvana	Ahh, git push origin +master is mentioned in the man page for git push. It says that the branch will then no longer have a symbolic name, and therefore will be deleted by a gc. Good thing I tagged it first :-)	15:16
flavi0	osse: ok but therefore i need to pull the changes into origin first right?	15:16
	the upstream changes	15:16
	← tuooe left	15:16
hackvana	grawity: Thank you.	15:16
ELFrederich	osse, hmm... doesn't seem to work	15:16
	→ studmuf joined	15:16
	← rishiraj_ left	15:17
	← ghostpl left	15:17
	→ achadwick joined	15:17
	→ chiemseesurfer_ joined	15:17
osse	flavi0: yes: git fetch	15:17
	→ iao joined	15:18
osse	ELFrederich: how so	15:18
	→ Gamecubic joined	15:18
	→ zumba_addict joined	15:18
ELFrederich	osse, maybe I should ask without the --work-tree and --git-dir	15:18
	→ zenith___ joined	15:19
	→ MLM joined	15:19
	← zivester left	15:19
	→ Kicer86 joined	15:19
	← iao left	15:19
ELFrederich	I just initialized a new repo and did "echo foo > bar && mkdir spam && echo hello > spam/eggs" from within the repo's directory... so nothing special there	15:19
	→ highcup joined	15:19
ELFrederich	osse, so when I do "git add ."... how would I retrieve the top level tree?	15:19
	← zumba_ad_ left	15:20
ELFrederich	git rev-parse :0:	15:20
	:0:	15:20
	fatal: Path '' does not exist (neither on disk nor in the index).	15:20
	→ Guest71892 joined	15:21
	→ ErKa joined	15:21
	→ zumba_ad_ joined	15:22
	→ jatt joined	15:22
	← zenith__ left	15:22
	→ Marcus_ joined	15:22
	← jatt left	15:22
	→ jatt joined	15:22
	← zumba_addict left	15:22
	→ jatt` joined	15:22
	Marcus_ → Guest71448	15:22
	← Guest71892 left	15:22
	← craigp left	15:23
ELFrederich	osse, I don't think the add even made any trees. I just run "git write-tree" and I get it.	15:23
	osse, thanks	15:23
	→ ams__ joined	15:24
osse	ELFrederich: you need the . after	15:24
ELFrederich	osse, even with the . I got Path '.' does not exist	15:24
osse	hm	15:25
	→ im8bit joined	15:25
osse	write-tree shouldn't be necessary because git-add already does hthat	15:25
ELFrederich	osse, I don't think so... I only see blob objects and no tree objects until I run write-tree	15:25
	← jatt` left	15:25
	← jatt left	15:26
	→ ngi joined	15:26
	← zumba_ad_ left	15:26
	← KevinTS_ left	15:26
osse	goddammit	15:26
ELFrederich	git init && mkdir -p one/two/three/four/five/six/seven/eight && touch one/two/three/four/five/six/seven/eight/foo && git add . && find .git/objects -type f	15:26
	← zenith___ left	15:27
ELFrederich	osse, I only see one file.. its a blob	15:27
osse	same	15:27
	← ngi left	15:27
ELFrederich	after a write-tree I see 10 objects	15:27
	→ cmo joined	15:28
	← hebz0rl left	15:28
	→ ghostpl joined	15:28
	→ lindenle joined	15:28
im8bit	indeed, you need the write-tree	15:28
	→ axl_ joined	15:29
	→ Dougie187 joined	15:29
	← cmo left	15:30
	← xk_id left	15:31
	→ joeyDB_ joined	15:31
	← ghostpl left	15:32
	→ AAoK joined	15:32
	→ wicope joined	15:32
dachary	does someone have a way to display how a cherry-pick conflict was resolved ? something simpler than http://dachary.org/?p=3546 hopefully ;-)	15:33
	← lindenle left	15:33
	← bitkiller left	15:33
	→ zumba_addict joined	15:33
	← dythmhdao left	15:33
	← bket left	15:33
	→ ghostpl joined	15:33
	→ sebhoss joined	15:34
	→ SirRetnuh joined	15:34
	→ bket joined	15:34
	→ OneEyedWill joined	15:35
	← zumba_addict left	15:35
	← SirRetnuh left	15:35
	→ gargola joined	15:35
	← Not_Whatever left	15:36
	→ zumba_addict joined	15:36
	← h4ml3t left	15:36
	← rath left	15:36
	← studmuf left	15:36
	→ apurcell joined	15:36
	← eletuchy left	15:36
	← zumba_addict left	15:37
	→ eletuchy joined	15:37
	→ stamina joined	15:37
	← interrobangd left	15:37
	→ MrJones joined	15:38
MrJones	hi	15:38
	→ zumba_addict joined	15:38
	→ lsiv568 joined	15:38
	← mlechner left	15:38
qsuscs	MrJones: !hi	15:39
gitinfo	MrJones: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	15:39
	→ _Vi joined	15:40
	→ netcarver joined	15:40
	← apurcell left	15:41
	← lsiv568_ left	15:41
	→ intellix joined	15:41
	← Trudko left	15:41
	← tanuck left	15:41
	→ paulweb5151 joined	15:42
	→ mnml joined	15:42
	← tgummerer left	15:42
	→ EminenceHC joined	15:42
	→ eagles0513875_ joined	15:42
	← eagles0513875_ left	15:42
	→ eagles0513875_ joined	15:43
chitopunk	!backups	15:43
gitinfo	[!backup] Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	15:43
	← paulweb515 left	15:44
	→ thiago joined	15:44
	→ zadock joined	15:44
	← zumba_addict left	15:45
	← pheaver left	15:45
	→ zumba_addict joined	15:45
	→ tgummerer joined	15:45
	← roelmonn_ left	15:45
	← zumba_addict left	15:46
	→ zumba_ad_ joined	15:46
	→ roelmonnens joined	15:46
	← roelmonnens left	15:46
	← EminenceHC left	15:47
	← MasterPiece left	15:48
	← zumba_ad_ left	15:48
	→ zenith__ joined	15:48
	→ zumba_addict joined	15:50
	← skylite_ left	15:50
	← zumba_addict left	15:51
	→ zumba_addict joined	15:51
	→ ojacobson joined	15:51
	← dsirijus left	15:51
	← kaiten02 left	15:51
	→ a_le_ joined	15:52
	← a_le left	15:52
	← zumba_addict left	15:52
	→ Err404NotFound joined	15:52
	← Error404NotFound left	15:52
	→ madtalentz joined	15:53
	→ SumDude joined	15:54
	← plasticle left	15:54
	→ EminenceHC joined	15:54
	← mkaesz left	15:54
	→ mkaesz joined	15:55
	→ abishek joined	15:55
	← jadne left	15:56
abishek	I need to get the list of all commits from the last `git pull` and want to store that on a bash script variable. Could somebody advice on how to do that?	15:56
	→ SirRetnuh joined	15:56
osse	abishek: bashscriptvariable=$(git rev-list ORIG_HEAD..HEAD)	15:57
	→ tens0r joined	15:57
	→ MasterPiece joined	15:57
	→ zei joined	15:59
	← mkaesz left	15:59
abishek	osse, that gives me only the list of git versions	15:59
	← dreiss left	15:59
	← Juzzika left	15:59
abishek	can I get the commit message as well	15:59
osse	log instead of rev-list	15:59
	but storing all of that in one variable sounds like a bad idea	16:00
	← zei left	16:00
	→ amcgee7 joined	16:00
	← mcrutchfield left	16:00
	→ Lvjq joined	16:01
abishek	osse, I just need to store and send that as a message to a webhook	16:02
	← Silmarilion left	16:02
	→ shift8 joined	16:03
	← OneEyedWill left	16:03
	→ pm90_ joined	16:03
	← FunkyAss left	16:03
	→ studmuf joined	16:04
shift8	hi all - i migrated an svn repository to git with history, but then needed to update the svn repository a number of times. is there some way to migrate the changes we made in svn to git?	16:04
	→ asoneth joined	16:04
EdwardIII	hrm i just did 'git pull' from master where someone else had made changes	16:05
	and git did a fast-forward	16:05
	is that going to cause problems?	16:05
	← zenith__ left	16:05
	← pm90_ left	16:05
	← sebhoss left	16:05
	→ pm90_ joined	16:06
	← chiemseesurfer_ left	16:06
	← CustosL1men left	16:06
	← aspiers left	16:06
grawity	no, why would it	16:06
	→ oojacoboo joined	16:06
	← jost_ left	16:06
	← endiruna left	16:06
	← hardenedapple left	16:07
	→ hardened1 joined	16:07
	→ d0nkeyBOB joined	16:07
	→ aspiers joined	16:07
EdwardIII	grawity: i don't know, i'm scared of FF because i'm primitive	16:07
	grawity: FF can rewrite history and cause problems when you do that and push back up sometimes, right?	16:07
grawity	no	16:07
EdwardIII	doesn't fast forward work kinda like a rebase?	16:08
grawity	no, it's almost like the opposite	16:08
	it's pretty much the least harmful pull you can get	16:08
	← netcarver left	16:08
	← runev left	16:08
	← jagob left	16:08
grawity	either you're mixing up FF and non-FF merges, or you're mixing up FF and something entirely different	16:08
osse	like for example a can of beans	16:09
	← asoneth left	16:09
	→ tang^ joined	16:09
	← sburgess left	16:09
	→ netcarver joined	16:10
EdwardIII	thing is, if that was work on someone elses's branch (rather than master) you'd normally do a --no-ff merge, right?	16:10
	← ToAruShiroiNeko left	16:10
grawity	if you were merging a feature branch to master, for example?	16:10
	→ bofh joined	16:10
grawity	--no-ff is common for that, but only because it nicely marks where the work on feature started and finished	16:11
bofh	Hello! I have branch "master", branch "develop", branch "bugfix" based on master, and branch "my-bugfix" based on develop. How do I put last 3 commits from my-bugfix to bugfix?	16:11
	← nour left	16:11
bofh	cherry-pick is the only option?	16:11
grawity	bofh: `git cherry-pick` them	16:11
	← JEEB left	16:11
	← marscher left	16:12
	→ sebhoss joined	16:12
	← Gizburdt left	16:13
	→ hardenedapple joined	16:13
	← stamina left	16:13
	→ micechal joined	16:14
	→ jagob joined	16:14
	← ThomasLocke left	16:14
	→ bb010g joined	16:14
	→ tyreld_ joined	16:15
	→ ToAruShiroiNeko joined	16:15
	← intellix left	16:15
	← hardened1 left	16:15
	← tchan left	16:15
	← ghostpl left	16:16
	→ liamkeily joined	16:16
	→ hebz0rl joined	16:16
	← obr7 left	16:17
	→ zumba_addict joined	16:17
	→ teufelChiCoder joined	16:18
	← encod3 left	16:19
	→ thedodd joined	16:20
	← MasterPiece left	16:20
	paulweb5151 → paulweb515	16:20
	← paulweb515 left	16:20
	→ paulweb515 joined	16:20
	← studmuf left	16:21
	← sebhoss left	16:23
	← Xiti left	16:23
	→ Xiti joined	16:23
	→ MasterPiece joined	16:24
	→ encod3 joined	16:24
	→ mkjackson joined	16:24
	→ studmuf joined	16:25
	→ zenith__ joined	16:25
	← thiago left	16:25
	← Lvjq left	16:25
	← Takle left	16:25
	→ endiruna joined	16:26
	→ mizu_no_oto joined	16:26
	→ ehmatthes joined	16:26
	→ FlipperPA joined	16:26
	→ haptiK joined	16:28
	→ Takle_ joined	16:29
	→ adamben joined	16:29
	← TomyWork left	16:29
	← haptiK left	16:30
	← JohnBat26 left	16:30
	→ marienz joined	16:30
	← Nikhil_D left	16:31
	→ sebhoss joined	16:31
	→ Nikhil_D joined	16:31
	→ cdown_ joined	16:32
	→ otter768 joined	16:32
	→ polyzen joined	16:32
	→ xk_id joined	16:32
	← kanuku left	16:32
	← mizu_no_oto left	16:33
	← cjwilburn left	16:33
mkjackson	hey folks, I'm using git svn fetch but I'm noticing that it isn't including a folder from the SVN update. the gitignore file doesn't include this directory and there is no response in 'git svn show-ignore'	16:33
	→ cjwilburn joined	16:33
mkjackson	well, no output	16:33
	→ petersr joined	16:33
	← bofh left	16:33
	← cdown left	16:34
osse	mkjackson: is the folder empty in the svn repo ?	16:34
milki	ignore wouldnt apply to a fetch	16:34
mkjackson	nope, it definitely has files	16:34
	→ mizu_no_oto joined	16:35
	← cdown_ left	16:36
	← sebhoss left	16:37
	← otter768 left	16:37
	→ melter joined	16:37
	→ cdown joined	16:37
	← cjwilburn left	16:38
	→ tchan joined	16:38
mkjackson	OK, so maybe I just don't understand how SVN works (it's been a while). Looks like a file was added that didn't change?	16:39
	← cdown left	16:39
mkjackson	like it's saying "this file was added" but it was already there and svn import is just saying "nothing to see here, whatever, ignore"	16:39
	← rns2 left	16:39
	→ rns2 joined	16:40
	← MrRoot left	16:40
mkjackson	holy crap it is	16:40
	looks like the directory they committed is often regenerated	16:40
	n00b devs just commit all changes	16:40
	→ rath joined	16:41
	→ cdown joined	16:41
	→ ghostpl joined	16:41
	osse loves modified: imstupid.o	16:41
mkjackson	svn says "hmmm... original was deleted and now here's a new one. let's just mark that it's deleted and add all the new stuff"	16:41
	→ dm7freek joined	16:41
mkjackson	too dumb to realize that it's the same thing under the hood but git recognizes it and ignores	16:41
	hooray for intelligent software	16:42
	← okanck left	16:42
mkjackson	:-/	16:42
	→ FunkyAss joined	16:42
	← CarlFK left	16:43
	→ monbro joined	16:43
	← ehmatthes left	16:43
	← psoo left	16:45
	← ghostpl left	16:45
	← studmuf left	16:45
	→ zarubin joined	16:46
	← zarubin left	16:46
	→ MarkyC joined	16:46
	→ studmuf joined	16:46
	← dm7freek left	16:46
	← xk_id left	16:46
	→ Awhy joined	16:47
	← Awhy left	16:48
	→ kpease joined	16:48
	← studmuf left	16:48
	← b100s left	16:49
	→ Icjwp joined	16:49
	→ MechtiIde joined	16:49
sybariten	Hm	16:51
	i'm not sure about the meaning of git saying "new file" when doing git status. How long is it gonna do that?	16:52
mkjackson	sigh, I love gloating to the uneducated about the inherent benefits of Git over SVN	16:52
	← Artpicre left	16:52
sybariten	I added a dir with git add -f thedir , in order to get it supervised despite the fact that my gitignore file says "*"	16:52
	← endiruna left	16:52
	← cagedwisdom left	16:52
mkjackson	was showing my supervisor how I have a long journal-like history of commits and merges while the "svn" branch is almost silent with gigantic cumbersome commits that are few and far between	16:53
sybariten	So now the dir is maybe watched ... but then i changed a file, juist to hacve it appear among the "modified" files. But it, and many others, are "new" ...	16:53
	→ dm7freek joined	16:53
	→ _Atom_ joined	16:53
	← mkjackson left	16:53
	→ studmuf joined	16:54
_ikke_	sybariten: It's new as long as it hasn't been comitted before	16:54
	← lsiv568 left	16:54
	→ bsanford joined	16:54
	← SirRetnuh left	16:55
	→ cromero joined	16:55
	→ lsiv568 joined	16:55
	← MasterPiece left	16:55
	→ Solid1 joined	16:56
	→ pheaver joined	16:56
	→ SFLimey joined	16:57
	← EminenceHC left	16:58
	→ Artpicre_ joined	16:58
	← hans_s left	16:58
	← tens0r left	16:58
	← lsiv568 left	16:59
	← ki0 left	16:59
	→ lsiv568 joined	16:59
sybariten	_ikke_: OK	16:59
	← zenith__ left	16:59
	→ shuaib joined	16:59
	→ MasterPiece joined	17:00
	← a_le_ left	17:00
	← shuaib left	17:00
	← highcup left	17:00
	→ a_le joined	17:01
	→ EminenceHC joined	17:01
	← mikecmpbll left	17:01
	→ jonnyro joined	17:01
	← EminenceHC left	17:01
	← wachterjohannes left	17:01
	→ EminenceHC joined	17:02
	→ JEEB joined	17:02
sybariten	gah i got rid of the new ones, but i still have the same set of "modified" and "deleted" files actually, with git status... (in red text, if that matters) i thought those would also become normal once i did git commit..?	17:02
	← gfixler left	17:02
	← dm7freek left	17:02
	→ rehat joined	17:02
osse	git add -u	17:02
	now they are green	17:02
	← joeyDB_ left	17:03
	← tier left	17:03
	← lsiv568 left	17:03
	→ okanck joined	17:04
sybariten	but..ok. Shouldnt add be used only when i'm actually adding new thigns to the project? In this case, the things that are in red are my d:\portable\putty\blablabla files. Some files i've edited. If it's in red and "modified" , surely its already added ?	17:04
	← cdown left	17:04
rehat	I'm kinda new wtih the git setup with this new client. I need to create pull requests in github before my branch is merged in. I get how to do that but do I need to merge the parent branch into my current branch before doing that?	17:05
sybariten	at some point i'm guessing i have done git add -f d:\portable\putty before ...	17:05
	← jnavila_ left	17:05
	→ joelm joined	17:05
	← Icjwp left	17:05
osse	sybariten: git-add can be used to stage deletions also	17:06
	← mbury left	17:06
osse	you can use git rm if that is more comfortable :-)	17:06
	← oojacoboo left	17:06
	→ Dragooon joined	17:06
	→ CheckDavid joined	17:06
	→ mostlybadfly joined	17:07
	→ Quevin_ joined	17:07
sybariten	osse: no, i just mean.... i thought this dir must surely already be added? If git sees the file changes?	17:07
	→ OneEyedWill joined	17:07
	→ munke joined	17:08
	→ SirRetnuh joined	17:08
osse	sybariten: that is not how add works. add does not mean "I want this to be part of the repo". it means "I want this version to be part of the next commit"	17:08
	sybariten: so all changes in all commits must be added	17:08
sybariten	osse: man. this is tough shit. :)	17:09
	→ tier joined	17:09
	→ joeyDB_ joined	17:09
	← studmuf left	17:09
	← jerematic left	17:09
	→ thiago joined	17:09
	← hexagoxel left	17:10
sybariten	osse: ok, thanks for clearing that up. So, for my average newbie actions, is it safe to say that i want to throw in a "git add -u" in there every time ive changed a file somewhere?	17:10
	→ Nizumzen joined	17:10
osse	sybariten: yup	17:10
	sybariten: you can also do git commit -a	17:10
	← MasterPiece left	17:10
osse	to do it all in one step	17:10
rehat	if my develop branch has updates that my current branch does not have, is it normal to merge those updates in master into my branch before making a pull request ?	17:11
	→ anli joined	17:11
milki	i dont think so. you should only pull request what you intend to pull request	17:12
	← Guest71448 left	17:12
	→ leolrrj-alt joined	17:12
	→ Marcus_ joined	17:13
	→ flaguy48 joined	17:13
	← leolrrj left	17:13
	Marcus_ → Guest3095	17:13
	→ xk_id joined	17:13
Dougie187	rehat: No, you should only submit a PR for the changes you're making. The person assigned to it might ask you to do that merge if they want you to.	17:13
ruediger	rehat: If your PR merges fine with master then I wouldn't do it	17:13
	← Dragooon left	17:13
ruediger	rehat: maybe rebase before the PR, if the branch isn't public	17:13
Dougie187	You shouldn't even do it if you get merge conflicts. Unless you're requested to.	17:13
	→ Mwr joined	17:13
sybariten	osse: merci	17:13
osse	de rien	17:13
	← tchan left	17:13
milki	moin?	17:14
Dougie187	ruediger: and rebasing could break previous commits, which the project might want to be "testable"	17:14
rehat	ok thanks	17:14
	→ tcurdt joined	17:14
	→ Terens joined	17:14
	→ cavallari joined	17:14
	→ jerematic joined	17:14
	← Mwr left	17:15
	→ leolrrj joined	17:15
	← leolrrj-alt left	17:15
	→ michaelrice joined	17:15
	→ imachuchu joined	17:15
rehat	I think I was using git wrong before haha. I would always merge any updates into my local branch before merging my local branch into master. Just wasn't familiar with this pull request requirement lol	17:15
	→ Uavbp joined	17:15
rehat	I need to do more open source contributions haha	17:16
	← jerematic left	17:16
	→ twoface88 joined	17:16
	→ jerematic joined	17:16
Dougie187	rehat: Basically, you should only merge updates into your branch if you need them, and can clearly describe why you need them. If you're doing it "just to make sure you're up-to-date" that's not a good enough reason.	17:17
	← Uavbp left	17:17
sybariten	but uhh... theres no real way to see which folders ive actually done "git add" on? Or, maybe once again, that question doesnt make sense....	17:17
	→ Freetekton joined	17:17
	→ Rftaz joined	17:18
Freetekton	hello	17:18
gitinfo	Freetekton: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	17:18
osse	sybariten: git status	17:18
rehat	Dougie187: thanks	17:18
Freetekton	I have a problem here is a screenshot http://i.imgur.com/XtqC4eI.gifv .	17:18
osse	sybariten: it distinguishes between staged and unstaged changes	17:18
	← oriba left	17:18
osse	sybariten: roughly speaking staged = added	17:18
rehat	so while my PR is waiting to be approved and I want to continue adding to it, do I create a branch off of my local branch or just keep working on the same one	17:19
	→ amcgee7_ joined	17:19
	← polyzen left	17:20
	← leolrrj left	17:20
	→ dsdeiz joined	17:20
osse	rehat: if you continue working on it and push then the PR is automatically updated	17:20
	← bibi-23 left	17:21
osse	so it's up to you	17:21
rehat	gotcha thanks	17:21
	ChanServ set mode: +o	17:22
	osse set mode: -o	17:23
osse	not sure if that is worth a ban	17:23
	he PMed me also	17:23
	← steele left	17:23
Freetekton	no it doesnt worth	17:23
	← amcgee7 left	17:23
	← twoface88 left	17:23
	ChanServ set mode: +o	17:23
Freetekton	:(	17:24
osse	then stop	17:24
	→ apurcell joined	17:25
	→ cdown joined	17:25
sybariten	OK.... sorry, i have to ask again. Imagine that i have d:\portable .. and under there, i have my git repo (i believe). Or, its checked out there. .git is there. And i have foldoers for programs like emacs, gimp, putty, notepadplus, you name it. But theres like 800 Mb worth of software, i dont want to version all of them. So certain folders (programs) should be noted as being "watched". How do i check,	17:25
	→ highcup joined	17:25
sybariten	here and now, which are actually watched? If i cant remember.	17:25
	← adamben left	17:26
	← apurcell left	17:26
sybariten	(the gitignore says *)	17:26
	→ aqabiz joined	17:26
	← aqabiz left	17:26
	→ apurcell joined	17:26
osse	sybariten: git ls-files	17:26
	← xk_id left	17:26
	← liamkeily left	17:26
	→ adamben joined	17:26
	→ konradb joined	17:26
	→ aqabiz joined	17:27
	← aqabiz left	17:27
	→ aqabiz joined	17:27
	← aqabiz left	17:27
	→ veganista joined	17:28
	← wicope left	17:28
	→ aqabiz joined	17:28
	← aqabiz left	17:28
	→ aqabiz joined	17:29
	← aqabiz left	17:29
	→ doug joined	17:29
	← Rftaz left	17:29
	→ aqabiz joined	17:29
	← aqabiz left	17:29
sybariten	osse: freakin amazing	17:29
	→ liamkeily joined	17:29
	← rns2 left	17:30
osse	yeah it is incredibru	17:30
	→ aqabiz joined	17:30
	← aqabiz left	17:30
sybariten	hehe... nah, seriously, this could be so great	17:30
	← SFLimey left	17:30
	← apurcell left	17:30
	← kurkale6ka left	17:30
	→ tens0r joined	17:31
	← tens0r left	17:31
	→ SFLimey joined	17:31
	→ mikecmpbll joined	17:31
sybariten	uhm, can i do something (with a gitignore) to the effect of "first ignoring everything, then letting certain filetypes through" ?	17:31
	← fooforge left	17:31
osse	ignorethis	17:31
sybariten	Not much point for me in versioning Win32 .exe files	17:31
osse	!butnotthis	17:31
	man gitignore	17:31
gitinfo	the gitignore manpage is available at http://jk.gs/gitignore.html	17:31
	→ tchan joined	17:32
	← tchan left	17:32
	→ tchan joined	17:32
	← Guest3095 left	17:32
	→ tens0r joined	17:32
	← tens0r left	17:32
	→ sbogg joined	17:32
	← PCatinean left	17:32
	← angliscwork left	17:33
sybariten	i'm actually not getting man pages with my Windows git/bash setup .. but thats OK i think i have them on other *nix systems	17:33
	← cdown left	17:33
osse	sybariten: git help ignore	17:33
	→ polyzen joined	17:33
	← MrJones left	17:33
	→ cjwilburn joined	17:34
	→ leolrrj joined	17:34
sybariten	wuuuuuut it actually knew about my chrome browser?	17:34
	i never thought my bash on Win would be this... "integrated"	17:34
	(git help opened the help page in a web browser)	17:34
	→ cdown joined	17:34
osse	it does on windows	17:34
	also on rinux if you use git help -w foo	17:35
	https://github.com/git/git/blob/master/git-web--browse.sh	17:35
	← Nizumzen left	17:35
	→ leolrrj-alt joined	17:37
	→ LucasTT joined	17:37
	← IIT left	17:37
	← liamkeily left	17:37
	→ wachterjohannes joined	17:38
	← cjwilburn left	17:38
doug	anyone got a good strategy for building the next feature when the last one hasn't been through qa yet?	17:38
Eugene	doug - !beer	17:38
gitinfo	doug: Beer! It's what's for dinner!	17:38
tsnow	It's liquid bread, good for you.	17:39
	→ mmoretti joined	17:39
doug	like, i'm gonna make stuff dependent on changes in another branch, those changes might end up in the qa pipeline before the previous stuff gets out	17:39
	← leolrrj left	17:39
doug	and there's some risk that someone will try to merge in the new stuff before the old stuff is merged	17:39
	← duckydan left	17:39
	← workerbeetwo left	17:40
osse	why is that risk there?	17:40
	← twem2 left	17:40
	→ lindenle joined	17:41
	→ lieber joined	17:42
	← King_Hual` left	17:42
	→ King_Hual` joined	17:43
	→ Noldorin joined	17:44
	← leolrrj-alt left	17:44
	→ \sky joined	17:45
	← nnyk left	17:45
doug	osse: that depends on your viewpoint. multiple qa people might pick up my stuff, there's no current mechanism for preventing it, etc.	17:46
	Artpicre_ → Artpicre	17:47
	→ luriv joined	17:48
	→ jadne joined	17:48
	→ Zuton joined	17:49
	← wachterjohannes left	17:49
	← SirRetnuh left	17:50
	← rap left	17:51
	→ studmuf joined	17:51
	→ cjwilburn joined	17:51
	→ mcrutchfield joined	17:51
	← OneEyedWill left	17:51
	← SFLimey left	17:52
	→ leolrrj joined	17:52
	→ SFLimey joined	17:53
	→ lsiv568 joined	17:53
	← lsiv568 left	17:53
	→ EvilPenguin joined	17:53
	→ lsiv568 joined	17:53
	← thebrush left	17:54
	→ chiemseesurfer joined	17:55
moritz	don't you have a ticket system to track this kind of stuff?	17:55
	→ MasterPiece joined	17:55
	← veganista left	17:55
	← cromero left	17:55
	→ Alex______ joined	17:56
	→ dreiss joined	17:57
	→ Sasazuka joined	17:57
	← duderonomy left	17:57
	← encod3 left	17:58
	→ MattMaker joined	17:58
	← leolrrj left	17:59
	→ OneEyedWill joined	17:59
	← wrouesnel left	17:59
	→ JanC_ joined	17:59
	→ SirRetnuh joined	17:59
	← studmuf left	18:00
	← marcogmonteiro left	18:00
	← mnml left	18:00
	← chiemseesurfer left	18:01
	← JanC left	18:01
	← dreiss left	18:02
	→ gsingh93 joined	18:02
	← eletuchy left	18:03
	→ tieTYT2 joined	18:04
osse	doug: i don't have any good suggestions except the "obvious" stuff like working on something else while you wait	18:05
	osse set mode: -o	18:06
	← deuterium left	18:06
	→ steele joined	18:06
	← steele left	18:06
	← diegoviola left	18:06
	→ steele joined	18:07
	→ jstimm joined	18:07
	→ jontmorehouse joined	18:07
	→ Dragooon joined	18:08
	→ Van_Glorious joined	18:09
	→ SumDude_ joined	18:09
	← Van_Glorious left	18:09
	→ _2_chana87 joined	18:10
_2_chana87	hello new	18:10
gitinfo	_2_chana87: 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.	18:10
	← joeyDB_ left	18:11
	→ tritone joined	18:11
	← Acidnerd left	18:11
	→ rsavage joined	18:12
	→ nnyk joined	18:12
rsavage	Howdu GITlings!	18:12
	← SumDude left	18:12
	→ liamkeily joined	18:13
rsavage	I have a special request... I have a special condition in which I need to send in a modified into a particular branch of a repo into a specific path. How can I do this without having a local copy of the repo?	18:13
	← jadne left	18:14
	← russt left	18:15
	← Noldorin left	18:15
	← SumDude_ left	18:15
	→ SumDude joined	18:15
doug	you want to add a commit to a remote repo?	18:16
	← Takle_ left	18:17
	← SirRetnuh left	18:17
	→ SirRetnuh joined	18:17
	← bb010g left	18:18
sybariten	is "git rm --cached -r D:\portable\putty" 'dangerous' ?	18:18
	← Freetekton left	18:18
	← _2_chana87 left	18:19
	← joelm left	18:19
sybariten	i realized that i dont want it added the way it is added now... i think... i want to define everything in the gitignore file, and be able to do git add . later	18:19
	← doug left	18:19
	→ nour joined	18:20
	→ sp1rs joined	18:21
	← SirRetnuh left	18:21
	← maxvi left	18:21
	→ ZenMasta joined	18:22
	→ eletuchy joined	18:22
ZenMasta	is it possible to prevent untracked files from being listed when you git status?	18:22
osse	sybariten: not dangerous	18:22
	ZenMasta: ignore them. man gitignore	18:22
gitinfo	ZenMasta: the gitignore manpage is available at http://jk.gs/gitignore.html	18:22
	→ joeyDB_ joined	18:23
	← paulweb515 left	18:23
ZenMasta	I have ignored the folder that contains them already	18:23
osse	ZenMasta: then either the folder is not untracked or there is a syntax error in gitignore	18:24
	!repro	18:24
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	18:24
ZenMasta	alright I'll double check	18:24
	→ joelm joined	18:24
	← monbro left	18:24
	→ Vile joined	18:26
	← rehat left	18:26
ZenMasta	:q!	18:26
	lol wrong window	18:26
osse	wrong buffer	18:26
	or window, pane, tab, workspace, view	18:26
	→ Guest21838 joined	18:27
	← hesco left	18:27
sybariten	or editor	18:27
	→ buffal0 joined	18:27
	sybariten takes shelter	18:27
	→ Acidnerd joined	18:27
	← anli left	18:28
	← MattMaker left	18:29
	→ pantsman- joined	18:29
	← joelm left	18:29
	→ jadne joined	18:29
	→ MattMaker joined	18:29
	→ phlx joined	18:29
	phlx → f0ster_	18:29
	f0ster_ → thef0ster	18:30
osse	Gimme shelter	18:30
	← pm90_ left	18:30
thef0ster	what is the easiest way to undo my last commit? like make HEAD be what it was before the last commit	18:30
	→ sq-one joined	18:31
osse	thef0ster: git reset HEAD~	18:31
	← achadwick left	18:31
	→ joelm joined	18:31
thef0ster	osse: why not git revert ?	18:31
	← MattMaker left	18:31
osse	thef0ster: because that doesn't change HEAD the way you want	18:32
	Unless I misunderstood	18:32
	← vmiklos left	18:32
	→ xk_id joined	18:32
	← Dragooon left	18:32
osse	git revert creates a new commit, so that moves HEAD forward	18:32
	→ endiruna joined	18:33
	→ otter768 joined	18:33
thef0ster	i want the HEAD to be what it was before, e.g pretned the last commit i made never even happened for all I care	18:33
	← Spacew00t left	18:33
osse	thef0ster: the you want reset	18:34
	then	18:34
thef0ster	okay ty osse	18:34
	→ Moleboy joined	18:34
	← mcrutchfield left	18:34
	→ vmiklos joined	18:34
osse	thef0ster: Add - - hard for maximum destruction	18:34
	→ MattMaker joined	18:34
osse	--hard	18:34
	← mizu_no_oto left	18:35
PerlJam	thef0ster: just be aware that --hard will destroy information.	18:35
thef0ster	hahah	18:35
	alright.. gtk	18:35
	→ NBhosting joined	18:35
osse	not unrecoverably though	18:36
	so it's "fine"	18:36
	→ mcrutchfield joined	18:36
	← liamkeily left	18:37
	→ Noldorin joined	18:37
	← otter768 left	18:38
qsuscs	osse: not necessarily though	18:38
sybariten	sessions is a dir. Cant i not define it like this in gitignore? !portaputty/.putty/sessions Do i need to do !portaputty/.putty/sessions/* ?	18:38
qsuscs	so it’s only almost fine	18:38
	← th3fallen left	18:39
sybariten	I'm thinking in rsync ways here	18:39
osse	sybariten: !portaputty/.putty/sessions/	18:39
	→ th3fallen joined	18:39
osse	the last / am the importantness	18:39
	← munke left	18:39
	→ Dragooon joined	18:39
sybariten	osse : ooh ... you know, thats the opposite of what i was lead to believe, coming from rsync!	18:39
	→ breadmonster joined	18:40
sybariten	hm, nah, didnt work. Ive done something else wrong	18:40
breadmonster	What's the default git directory?	18:40
	I ran `git clone https://github.com/ocaml/tuareg` without specifying a directory.	18:41
	...and I've lost my files :P	18:41
osse	breadmonster: they're in ./tuareg	18:41
	← a-l-e left	18:41
breadmonster	Thanks (:	18:41
osse	that is: the tuareg directory inside the current one (wherever you ran git clone=	18:41
sybariten	hm, this did it !portaputty/.putty/sessions/*	18:42
breadmonster	osse: Yeah, I ran it from home.	18:42
	Cool stuff, thanks (:	18:42
	← vmiklos left	18:42
	→ BSaboia joined	18:43
	← cdown left	18:43
	← mroach left	18:43
	→ vmiklos joined	18:44
osse	sybariten: oooh, I confused ignore and un-ignore	18:45
	← dsdeiz left	18:45
	← jadne left	18:45
	JanC_ → JanC	18:46
	→ rubyonrailed joined	18:46
	→ githogori joined	18:46
	→ Nizumzen joined	18:46
	← melter left	18:47
	← vurma left	18:48
	← teran left	18:48
	← Aune left	18:49
	→ studmuf joined	18:50
	→ dm7freek joined	18:51
	← jceb_ left	18:51
	← sp1rs left	18:51
	← OneEyedWill left	18:52
	← Dragooon left	18:52
	→ SirRetnuh joined	18:52
	← MattMaker left	18:52
	← studmuf left	18:52
	← tcurdt left	18:53
	→ Jackneill joined	18:54
	← MasterPiece left	18:54
	← Moleboy left	18:55
	→ curiousmansi joined	18:55
	← dm7freek left	18:56
	← SirRetnuh left	18:56
	→ isifreek joined	18:57
	← mcrutchfield left	18:57
	→ drfoo joined	18:57
	→ mcrutchfield joined	18:57
	→ _0xAX joined	18:57
curiousmansi	hey i created the pull request	18:57
	→ stamina joined	18:57
curiousmansi	then what is close pull request there	18:57
	?	18:57
	← drfoo left	18:58
	→ hesco joined	18:58
curiousmansi	how i can share the pull request url	18:58
	?	18:58
	→ baweaver joined	18:58
	→ nour_ joined	18:59
	← baweaver left	18:59
isifreek	I have a repo with 3 branches (A + B + C). A tracks origin/master and B tracks foo/master. C (local-only) gets all updates from A and B via merge. would it be better to have a single branch with 2 remotes, it is possible for origin/master and foo/master to conflict.	19:00
	→ IrishPrime joined	19:00
isifreek	?	19:00
	→ vurma joined	19:00
	← _0xAX left	19:00
	→ MasterPiece joined	19:01
	← shift8 left	19:01
	← nour left	19:03
	→ Spacew00t joined	19:03
	→ dreiss joined	19:05
	→ akiva joined	19:06
curiousmansi	anyone around to help	19:06
	→ pm90_ joined	19:07
	← cjwilburn left	19:07
	→ cjwilburn joined	19:08
	→ baweaver joined	19:08
	← tritone left	19:09
	→ cjwilbur_ joined	19:10
ZenMasta	So, I added a single line to .gitignore, git commit - m 'added dir to ignore', git push origin master then it says "Everything up-to-date" but when I git status it shows changes not staged for commit: modified .gitignore	19:10
	what did I do wrong?	19:10
	← pm90_ left	19:11
	→ pm90_ joined	19:11
hmsimha	zenmasta: did you git add .gitignore?	19:12
kevireilly	ZenMasta: I'm not sure there is supposed to be a space between - and m in "- m"	19:12
	← cjwilburn left	19:12
ZenMasta	hmsimha I didn't git add, because we've already been tracking it. I thought once a file is being tracked you dont have to use git add	19:13
kevireilly	doing it again to make sure won't hurt	19:13
	← akiva left	19:13
ZenMasta	kevireilly no space, I just typed it wrong in this window	19:13
hmsimha	zenmasta: pretty sure you have to 'git add' to stage any changes to be committed	19:14
	unless you git commit -am	19:14
	→ Gizburdt joined	19:14
	← nnyk left	19:14
	→ micechal_ joined	19:14
	→ apurcell joined	19:15
hmsimha	zenmasta: the '-a' flag automatically adds and commits any files being tracked	19:15
	← _Vi left	19:16
	← glebihan left	19:16
	→ pfo joined	19:16
	→ munke joined	19:16
	← Solid1 left	19:16
	→ AAoK_ joined	19:16
	← micechal left	19:17
	← mattcen left	19:17
sybariten	osse: yeah, uh, well right now it seems as if with un-ignore i have to specify everything explicitly, meaning, every file. I would like to un-ignore a subdir... but cant make it work	19:17
ZenMasta	thanks	19:17
	← AAoK left	19:17
	← skinkitten left	19:17
hmsimha	If I amend the most recent commit on a feature branch, but that commit has already been merged to the development branch and pushed, is there away to repair this situation on the central repo without a force push?	19:18
	→ shift8 joined	19:18
	← Gizburdt left	19:18
	→ glebihan joined	19:18
qsuscs	hmsimha: make a new commit instead of amending and merge again	19:19
	← apurcell left	19:19
	→ adamellsworth joined	19:20
	→ jadne joined	19:21
	→ hexagoxel joined	19:24
	→ dik_dak joined	19:24
hmsimha	qsuscs: thanks, that's what I thought.. Are there any techniques for teams to make their commit history more concise?	19:25
qsuscs	hmsimha: think before you type.	19:25
	or at least before you push	19:26
hmsimha	I was hoping it wouldn't come to that :P	19:26
	→ kadoban joined	19:27
	→ t-mart joined	19:27
	→ dannymichel joined	19:27
	→ apurcell joined	19:28
	← stamina left	19:28
	← Malgorath left	19:28
	← t-mart left	19:28
	→ t-mart joined	19:29
	→ MattMaker joined	19:31
	→ skinkitten joined	19:31
	← Sasazuka left	19:31
	→ sburgess joined	19:32
	← jadne left	19:32
	← dannymichel left	19:32
	← vurma left	19:32
	→ paulweb515 joined	19:33
	→ joo-_ joined	19:33
	← paulweb515 left	19:33
	→ paulweb515 joined	19:33
	← adamben left	19:33
	→ Sasazuka joined	19:33
	→ mattcen joined	19:34
	→ dannymichel joined	19:35
	→ Dragooon joined	19:35
	← daedeloth_ left	19:36
	← paulweb515 left	19:36
	← baweaver left	19:36
	← isifreek left	19:36
	→ paulweb515 joined	19:36
	→ SirRetnuh joined	19:37
	→ Dexter24 joined	19:37
	← Sasazuka left	19:38
	← CheckDavid left	19:38
	→ JagaJaga joined	19:38
	← SirRetnuh left	19:39
	← WaReZ left	19:40
	→ lid_ joined	19:41
	→ zenith__ joined	19:41
	→ drfoo joined	19:41
	→ liamkeily joined	19:42
	← drfoo left	19:42
	→ cavallari1 joined	19:42
	→ drfoo joined	19:43
	← cavallari left	19:43
	→ teran_ joined	19:44
	← highcup left	19:45
	→ highcup joined	19:45
	→ teran__ joined	19:45
	→ anli joined	19:46
curiousmansi	how i can merge the changes i have pushed to master with another branch	19:47
	→ teran joined	19:48
	← teran_ left	19:49
osse	curiousmansi: with git merge... But I guess your question goes deeper than that?	19:49
	→ andi4 joined	19:49
	→ beastd joined	19:50
	← MarkyC left	19:50
	→ editshare-ericf joined	19:50
curiousmansi	i have a repository which i forked from some repository. I cloned it started working.	19:50
	when finished i pushed the code	19:50
	so the code is now lying in master	19:51
	← teran__ left	19:51
	← skinkitten left	19:51
curiousmansi	now i can c there is one more branch called gh-pages	19:51
	→ MarkyC joined	19:51
	← mcrutchfield left	19:51
curiousmansi	if i want my changes to reflect there then what i have to do?	19:51
	osse:	19:52
J1G\|Anon126	curiousmansi: that is for Github Pages https://pages.github.com/	19:52
	→ vurma joined	19:52
J1G\|Anon126	it's from the original repository; you don't have to worry about it	19:52
curiousmansi	?	19:52
J1G\|Anon126	(if you are looking for some more detail) Github Pages lets users host websites for their projects	19:53
	← Vadimus left	19:53
J1G\|Anon126	they do that simply by pushing to a branch called gh-pages	19:53
curiousmansi	but the another contributor is facing some issue with the PR i created	19:53
	→ teran_ joined	19:54
curiousmansi	how i can solve his problem	19:54
J1G\|Anon126	what problem is this?	19:54
ELFrederich	any idea on how to get either a status or a diff of a directory outside of a repo to a commit within a repo?	19:54
	← fabio_p left	19:54
osse	curiousmansi: fetch from the Repo you forked and try the merge yourself	19:55
	curiousmansi: yYou may need to add the original repo as remote	19:55
curiousmansi	@mansisce I believe the master branch was deleted. Please repost this PR to the gh-pages branch	19:55
	← teran left	19:56
curiousmansi	JI\|Anon126	19:56
	JIG\|Anon126	19:56
	osse:	19:56
	→ Literphor joined	19:56
osse	ELFrederich: anything that involves running Git from outside the repo to operate on needs --work-tree etc or the corresponding environment variables	19:56
curiousmansi	this is what he says " I believe the master branch was deleted. Please repost this PR to the gh-pages branch"	19:56
ELFrederich	osse, yeah... I'm trying to use --work-tree but I can't seem to get status working	19:57
	← breadmonster left	19:57
osse	ELFrederich: there's also git -C as a shorthand	19:57
curiousmansi	he is suggesting like this : Recreate the PR, but point it to the gh-pages branch	19:57
osse	ELFrederich: if you specify one you also need to specify the other	19:57
curiousmansi	J1G\|Anon126:	19:57
J1G\|Anon126	hm...	19:58
	→ mcrutchfield joined	19:58
	→ awosi joined	19:58
osse	curiousmansi: that is a plain github problem. Just do what you did the first time	19:58
	← chitopunk left	19:58
curiousmansi	first time	19:58
	?	19:58
sybariten	this git unignore thing is driving me crazy...	19:59
osse	curiousmansi: You've already created one PR right?	19:59
_ikke_	git unignore?	19:59
J1G\|Anon126	curiousmansi: open a new PR	19:59
curiousmansi	can i close that	19:59
sybariten	if i have i'm trying to unignore directories recursively but appearently its not that easy	19:59
curiousmansi	i can open with master onlyt right	19:59
osse	no	19:59
curiousmansi	?	19:59
	→ diegoviola joined	20:00
J1G\|Anon126	curiousmansi: you can specify which branch to open on	20:00
_ikke_	sybariten: something like !ignore_whitedir?	20:00
gitinfo	sybariten: [!gitignore_whitedir] A global/directory .gitignore blacklist with a (potentially) subdirectory whitelist is not easy to specify in git. However, something like `echo -e '/\n!/a/\n/a/\n!/a/b/\n/a/b/\n!/a/b/c/' > .gitignore` (ignore everything but a/b/c directory) or `echo -e '\n!/\n!.c' > .gitignore` (ignore everything but *.txt files) may do what you want.	20:00
osse	You can create a PR from/to any branch	20:00
curiousmansi	not what he is suggesting like open the pr pointing to gh_pages	20:00
	but gh_pages don't have my changes	20:00
sybariten	wuut ...	20:00
osse	curiousmansi: doesn't matter	20:00
	← pfo left	20:01
curiousmansi	ooh is it	20:01
	→ stamina joined	20:01
sybariten	first i ignore * ... then i unignore !*/ then i unignore something like !/sub/ or !/sub , and is hoping to get sub/dir1/file.txt , sub/dir2/file.c , etc, but i dont	20:02
	← jontmorehouse left	20:02
sybariten	i more or less have to specifyu them explicitly	20:02
_ikke_	yes	20:02
osse	sybariten: * then !sub/ then !sub/* should be enough	20:02
gitinfo	sybariten: [!subgit] SubGit is a two-way git<->svn bridge. It provides a (self-)hosted alternative to git-svn, with some advantages. See http://subgit.com/	20:02
ELFrederich	osse, this is how I put something in, then get check it out somewhere else. Now I make a change to it and want to see either the status or diff. http://paste.pound-python.org/show/1RxSyJCpZa7mWmdZOZLP/	20:03
	→ jceb_ joined	20:03
	← sburgess left	20:03
	← cavallari1 left	20:03
	→ lqi joined	20:04
	← MasterPiece left	20:04
	→ cavallari joined	20:04
sybariten	osse: hehe, you activated gitinfo with that	20:04
curiousmansi	osse: There isn't anything to compare.	20:04
	→ skinkitten joined	20:04
curiousmansi	so i am not able to create PR with branch as gh_pages	20:04
ELFrederich	osse, actually this one... don't think bash likes those spaces. These are the Git commands my little tools ends up running. http://paste.pound-python.org/show/2ZxycykZ8xs912PSY58h/	20:04
	← cavallari left	20:05
	← liamkeily left	20:05
	→ cavallari joined	20:06
	← cavallari left	20:06
	← Quevin_ left	20:06
	← lqi left	20:06
	← lieber left	20:07
sybariten	hm, nah i dont think it worked. I think i may be expecting something from gitignore that is not really in line with how it actually works	20:07
osse	sybariten: dirty way: ignore everything and add -f what you need	20:08
sybariten	osse: yeah	20:09
osse	curiousmansi: show me	20:09
	← endiruna left	20:09
	← rath left	20:09
	← _Atom_ left	20:09
curiousmansi	osse: how	20:10
	?	20:10
osse	ELFrederich: I don't understand what you're trying to do	20:10
	→ baweaver joined	20:10
	← Dragooon left	20:10
aboccia	Hi All, forgive my noobness. I am writing a hook to check the file extensions of incoming committed files. It is on a private gitolite server. I am wondering if I can create a pre-commit hook and have it reside in the repo dir on the server or if it will only work locally on my machine's cloned copy of the repo?	20:10
osse	curiousmansi: Link to your repo	20:10
	→ das_beard joined	20:10
_ikke_	aboccia: On the repo on the server	20:10
osse	aboccia: the developers need to install it themselves	20:11
_ikke_	oh	20:11
	yeah. precommit on the repo	20:11
	local	20:11
aboccia	ah I see, so i'd have to add it to the repo/.git/hooks dir in the cloned copy on my machine	20:11
	→ fredrikslattman joined	20:11
aboccia	Thank you _ikke_ and osse	20:11
	← EminenceHC left	20:12
	→ wedgie_ joined	20:14
	← Spacew00t left	20:14
diamonds	anyone got an opinion on --no-ff workflow vs. `rebase` workflow for merging feature branches into trunk?	20:14
	tryna get a better understanding of the pros & cons	20:14
sybariten	osse: hey... i dunno how, exactly, but this helped: !totalcmd/plugins/ and !totalcmd/plugins/** (note, double asteriskts). Then i get for instance totalcmd/plugins/somefancyplugin/lang , without specifying it explicitly.	20:16
_ikke_	diamonds: --no-ff for better history	20:16
	← cjwilbur_ left	20:16
	← SumDude left	20:16
	← wedgie left	20:17
	← steele left	20:17
	← xk_id left	20:17
	→ oojacoboo joined	20:17
	← fredrikslattman left	20:17
	→ fredrikslattman joined	20:17
	→ rayman22201 joined	20:18
	→ MasterPiece joined	20:18
diamonds	_ikke_ even if you have to pull the upstream into feature like 3 times during development?	20:18
	won't it split/merge/split/merge/split/merge?	20:19
	ty for your help	20:19
osse	sybariten: i didn't know that was necessary, but it does make sense	20:19
diamonds	vs. rebase which will group all the commits on tip	20:19
osse	** is like * but recursive	20:19
ELFrederich	osse, I reworked the example to be standalone. The comments explain what I'm trying to do. http://paste.pound-python.org/show/v2WPDSSCpsr2bOqcgXPR/	20:19
	→ steele joined	20:19
	→ Spacew00t joined	20:20
	→ xk_id joined	20:20
	→ steele_ joined	20:20
	← Dougie187 left	20:21
	← fredrikslattman left	20:21
	→ fredrikslattman joined	20:22
	← rayman22201 left	20:22
sybariten	osse: it's that simple? OK, great	20:22
	→ Dragooon joined	20:23
sybariten	anywhooo.... i am now trying to "upload" my local things to my git server. Here's a command ive used before, that isnt working out now :) git remote add origin [email@hidden.address]	20:23
	i get "fatasl: remote origin already exists"	20:23
	← steele left	20:24
imachuchu	sybariten: it's saying "yeah, I already know about that server". Try "git push" instead to just push your changes to it	20:24
ELFrederich	I think it would be similar to a situation like this. Lets say you got some kernel sources for some device and untar'd them to /tmp/some_devices_kernel. You know the kernel is based off of 3.10 and you have the Linux kerne's Git repo. How would you do a diff?	20:25
sybariten	imachuchu: thats really surprising... wouldnt it know about it on a per-shell-basis? I havent done anything related to my IP before today, after opening git bash	20:25
	→ Takle joined	20:25
	→ rayman22201 joined	20:25
	← davividal left	20:25
	→ Arsonide joined	20:25
sybariten	i mean, i thought this was something i have to define each time	20:25
osse	sybariten: you need to define it once per repository	20:26
	sybariten: unless that repository is a clone, in which case 'origin' is set up for you	20:26
sybariten	oh. Well then i suppose its saved into .git somewhere then	20:26
osse	sybariten: .git/config	20:27
	cat it and see	20:27
sybariten	also, i think in the past ive done "git push origin master", not simply "git push" . Does it make a difference ?	20:27
	← tvw left	20:27
osse	no	20:27
sybariten	osse: yeah sure enough, the IP was in there. thanks	20:27
	← fredrikslattman left	20:27
	← cbojar left	20:30
	← rsavage left	20:31
	← curiousmansi left	20:31
	← pm90_ left	20:32
	→ haptiK joined	20:33
	← zenith__ left	20:34
	← m0viefreak left	20:34
	→ otter768 joined	20:34
	→ armadillu joined	20:35
	← armadillu left	20:35
	← Dragooon left	20:37
	→ giusef joined	20:38
	→ wastrel joined	20:38
	→ chitopunk joined	20:38
	← otter768 left	20:38
	← terribleplan left	20:39
	← highcup left	20:39
wastrel	hi i messed up a pull request, and need help fixing or removing it. pushed a commit, was asked to make changes, made changes, pushed, was asked to squash, squash, commit, push now there's 3 unrelated commits in my pull request (?)	20:39
	← Literphor left	20:40
	→ dm7freek joined	20:40
	← jeffmjack left	20:41
	→ Literphor joined	20:41
	→ pacon joined	20:42
	→ willharrison joined	20:42
	→ cdown joined	20:42
_ikke_	Based on what branch did you create the pull request?	20:43
	→ Guin joined	20:44
wastrel	i made a feature branch	20:44
	← dm7freek left	20:44
	→ fredrikslattman joined	20:44
wastrel	and am asking to merge into main	20:45
	← LACabeza left	20:45
	← xk_id left	20:45
_ikke_	And what is the state of your feature branch?	20:45
	← diegoviola left	20:45
wastrel	i reset the head to the original commit that i pushed	20:46
	and then pushed again but i didn't see a change in the pull request	20:46
	→ nnyk joined	20:46
ELFrederich	it seams "git diff HEAD" is supposed to diff your working directory against the most recent commit. Can I instead do a diff against an arbitrary commit?	20:46
_ikke_	You have to probably force push	20:46
	ELFrederich: sure	20:47
wastrel	did use force yes i saw that error when i didn't use -f :)	20:47
_ikke_	wastrel: github or something else?	20:47
wastrel	github yes	20:47
	← fredrikslattman left	20:48
	← buffal0 left	20:49
	← Sebtoast left	20:49
	← cdown left	20:49
	→ cdown joined	20:50
	→ fredrikslattman joined	20:50
	→ jontmorehouse joined	20:50
	→ xk_id joined	20:50
	← fredrikslattman left	20:50
	→ Dragooon joined	20:51
	→ nnyk_ joined	20:51
	← Zuton left	20:51
	d4ryus___ → d4ryus	20:52
	← nnyk left	20:53
	← cdown left	20:53
	← Literphor left	20:54
	→ highcup joined	20:55
ELFrederich	what does <path> mean in the help for git diff	20:55
	← wastrel left	20:55
qsuscs	well, a path o_O	20:55
ELFrederich	I keep trying various combinations trying to get the diff I expect but can't get it	20:55
	→ Literphor joined	20:56
	← ev_ left	20:56
ELFrederich	qsuscs, in this example I made a change by echoing "hello" to a new file called "world". But I can't seem to figure out a way to generate a diff that shows that. http://paste.pound-python.org/show/v2WPDSSCpsr2bOqcgXPR/	20:57
	← Nizumzen left	20:57
	→ ev_ joined	20:57
	→ iamjarvo joined	20:58
	→ Quevin_ joined	20:58
qsuscs	wtf	20:58
	→ phantomtiger joined	20:58
qsuscs	i don’t understand your setup in one minute. okay, i’m half asleep, but wtf	20:58
	→ adamben joined	20:59
ELFrederich	qsuscs, I'm using git as a storage for items. items are defined by a directory	20:59
	so in the first part I create some dummy data called item123	20:59
	... then I initialize a git repo and put that data into it as a new commit and create a reference to it refs/heads/item123	21:00
	... then I show how I retrieve the data out of git and put it somewhere else.	21:00
iamjarvo	hi all, so if i am in a detached head. is there a quick way to get back to the last branch?	21:00
	→ zenith__ joined	21:00
ELFrederich	now I'd like to see how to do a difference when I change it	21:00
grawity	iamjarvo: try `git checkout -`	21:01
	→ EminenceHC joined	21:01
	← sandr8 left	21:01
	← Dragooon left	21:01
rayman22201	Hi interwebs citizens. Can you help me solve this mystery. We have been having an issue for months where, occasionally, changes seem to “disappear” or regress in our repo. I finally caught it happening in the act. Our workflow is to create a feature branch. When we are ready to merge our work, we first merge master onto the feature branch, and fix any conflicts. During this particular merge, git decided to choose the feature branch	21:01
	version of a chunk, when it should have chosen the code from master. No merge conflicts, git just decided that was the right thing to do, incorrectly. why?	21:01
iamjarvo	grawity thank you	21:02
grawity	ELFrederich: 'world' is an entirely new file, untracked at this point	21:03
	→ ajustrun joined	21:03
	← lsiv568 left	21:03
	→ Dragooon joined	21:04
	→ phos1 joined	21:04
grawity	ELFrederich: you need to at least add it to the index	21:04
	→ fredrikslattman joined	21:04
	→ boombatower joined	21:04
	← boombatower left	21:04
	→ boombatower joined	21:04
phos1	Trying to push my repo into butbucket and getting “failed to push some refs to…” How do I fix / push this? The repo I am in has all the correct date, can i do a force to make it updated bitbucket?	21:05
	← zenith__ left	21:05
	← MarkyC left	21:05
	→ akiva joined	21:05
	← EminenceHC left	21:06
_ikke_	phos1: did you rewrite something? (rebase, amend, moved branches, etc..)	21:06
phos1	New to git, so all i”m doing atm is commiting and pushing to bitbucket	21:07
	← bgerber left	21:07
	← Jackneill left	21:07
	→ kyb3r_ joined	21:07
phos1	I did delete var/caches from the repository (and it is in bitbucket) because it stores a ton of pictures	21:07
	← d0nkeyBOB left	21:07
	→ Sasazuka joined	21:07
_ikke_	phos1: Did someone else push to bitbucket?	21:08
grawity	did you rebase/filter-branch?	21:08
phos1	I’m the only with access at the moment. Don’t know how to rebase or do a fitler-branch yet	21:08
	← irqq left	21:08
ELFrederich	grawity, I thought there were some diff commands that would look at the working directory and not the index	21:08
_ikke_	phos1: What is the exact message?	21:09
	→ cbojar joined	21:09
	→ EminenceHC joined	21:09
phos1	error: failed to push some refs to 'git@bitbucket.org:act2281/chemcrest.git'	21:09
	To prevent you from losing history, non-fast-forward updates were rejected	21:09
	Merge the remote changes before pushing again. See the 'Note about	21:09
	fast-forwards' section of 'git push --help' for details.	21:09
	← Dragooon left	21:09
	→ Dragooon joined	21:11
	→ bgerber joined	21:12
	← fredrikslattman left	21:12
	← iamjarvo left	21:12
_ikke_	phos1: If you are sure what you have locally is correct, you can force push, but this shouldn't happen if someone else didn't push, and you didn't rewrite history by accident	21:12
qsuscs	fetch, !visualize	21:13
gitinfo	You can visualize whole repo graph with gitk GUI viewer (gitk --all HEAD) or !lol for terminal view (git log --oneline --graph --decorate --all)	21:13
DolphinDreamm	grawity, i'm back to the same clone / mirror local repos again ... i tried clone mirror and i get some sort of fatal error : Checking connectivity... fatal: bad object 5bc556775f853c43504b2e36e1b00cb82db2f37e .. any ideas why ?	21:13
grawity	the file is corrupted, that's why	21:14
DolphinDreamm	fatal: remote did not send all necessary objects	21:14
grawity	try running `git fsck` on all the repos	21:14
DolphinDreamm	i did	21:14
	all is ok	21:14
	→ iamjarvo joined	21:15
	→ ColdKeybo[a]rd joined	21:15
	← Sasazuka left	21:15
DolphinDreamm	git fsck --full	21:16
	→ Sample joined	21:16
	← rayman22201 left	21:16
DolphinDreamm	Checking object directories: 100% (256/256), done.	21:16
	Checking objects: 100% (16763/16763), done.	21:16
	← m0ltar left	21:16
sybariten	i'm soon off, dead tird, but before i forget i wanna thank you all that helped me with some beginner moves tonight!	21:16
	← ColdKeyboard left	21:16
	→ Sasazuka joined	21:17
sybariten	and i wanna thank my family... my producers...	21:17
	← u1106 left	21:17
	← joo-_ left	21:17
	→ jmverges joined	21:17
	→ u1106 joined	21:17
osse	not your agent?	21:17
sybariten	no he's a money sucking leech	21:18
	→ Dougie187 joined	21:18
qsuscs	not even ssh-agent?	21:18
sybariten	ok then	21:18
	← Dragooon left	21:18
	→ fredrikslattman joined	21:18
Sample	Is there a recommended pastebin for my git graphs?	21:18
DolphinDreamm	so.. again.. repoA and repoB were pulling from a remote repoC .. now repoA has some local commits/braches i don't want to push to repoB .. but i want to pull those changes directly into repoB.. how do i do it ?	21:18
Sample	I have a problem/question that I've illustrated	21:19
DolphinDreamm	push to repoC *	21:19
	← Skapadapaduu left	21:19
qsuscs	Sample: i personally hate pastebin (full of ads and other crap), but use what you want, as long as it qualifies as a pastebin	21:19
	→ texasmynsted joined	21:19
	→ fooforge joined	21:20
DolphinDreamm	osse, do you want to be my agent? i will make sure you to mention thank you ;)	21:20
texasmynsted	if I am on branch foo and want to apply some commits from branch bar, I should be able to do this right?	21:20
Sample	Oh wait I think I have sprunge, that should work	21:20
texasmynsted	git cherry-pick c08f533, 10672ae	21:20
	← munke left	21:21
texasmynsted	where I am on branch foo, and those sha1s are on branch bar	21:21
	→ Dragooon joined	21:21
	→ pbrobst joined	21:21
	← fredrikslattman left	21:21
	→ Polyatomic joined	21:21
texasmynsted	I am getting an error. Hmm I wonder if these need to be applied in order	21:21
Sample	Okay here is my question: http://sprunge.us/aNHV	21:22
qsuscs	Q_Q TL;DR	21:23
	or coffee	21:23
	← cbojar left	21:23
	→ cbojar joined	21:23
	← tieTYT2 left	21:23
	→ axisys joined	21:24
	← baweaver left	21:24
DolphinDreamm	so.. localReboA <-- remoteRepo .. localRepoB <-- remoteRepo .. now i want to pull localRepoB <-- localReboA .. any ideas how ?	21:24
	← u1106 left	21:24
	→ u1106 joined	21:25
Steve_Jobs	DolphinDreamm: just add another remote	21:25
moritz	add localRepoB as a remote to localRepoA	21:25
	file:// URLs work	21:25
Steve_Jobs	then you can git fetch localRepoA from localRepoB	21:25
	in fact you can push to the same repo if you use . as the name of the remote	21:25
	← jmverges left	21:26
	→ fredrikslattman joined	21:26
DolphinDreamm	never had to add more than one remote	21:26
	← Guin left	21:26
Steve_Jobs	ie, git push . origin/master:master will update master without having to checkout master	21:26
DolphinDreamm	git remote add origin username@address:~/path/to/repo would do ?	21:26
Steve_Jobs	DolphinDreamm: I've had up to 3 remotes	21:26
DolphinDreamm	i already have one origin.. shoudl i pick a different name ?	21:27
	← jstimm left	21:27
Steve_Jobs	git remote add some/other/path I thing	21:27
	← petersr left	21:27
Steve_Jobs	you may need to prfix with file:///	21:27
	I think	21:27
	→ ap0c joined	21:27
DolphinDreamm	i have	21:28
	origin git@192.168.0.41:NavioIntraOp (fetch)	21:28
	origin git@192.168.0.41:NavioIntraOp (push)	21:28
	already	21:28
	→ jstimm joined	21:28
	← fredrikslattman left	21:28
DolphinDreamm	should the new remote be called soemthing other than 'origin' ?	21:28
osse	Sample: I think the end result is that the two unwanted features won't be in the merge result	21:28
	← Dorf left	21:28
	← iamjarvo left	21:28
	→ xaa joined	21:28
Sample	osse: I was presuming there would be a merge conflict (in the case of the v1.6 merge into master, since the lineage is divergent)	21:29
osse	Sample: because the branch that has the revert commits also has the originals	21:29
texasmynsted	wow its steve jobs	21:29
	← ams__ left	21:29
	→ Dorf joined	21:29
Sample	osse: ohhh, interesting	21:29
osse	Sample: that may be, but that won't be because of those commits I think	21:29
texasmynsted	No flash in heaven right Steve Jobs?	21:29
	→ rayman22201 joined	21:30
Sample	osse: interesting. yeah it's a confusing situation. v1.5 does see the two commits in its history, but develop doesn't see the removal of them in its own	21:31
	but I think you may be right, upon merge they may silently be removed	21:32
	does this look like a clean/acceptable/best approach to this problem, and the exclusion of those commits for release?	21:33
	← vmiklos left	21:33
osse	Sample: when I	21:33
	← Dorf left	21:33
	← editshare-ericf left	21:33
	→ CustosL1men joined	21:34
osse	Sample: in simple terms: when a merge happens git combines what each branch has that the other one doesn't have. Both branches have the feature commits, so they "don't count". only one branch has the revert commits, so they are "respected" (so to speak) in the result	21:34
	← IrishPrime left	21:34
	→ vmiklos joined	21:35
osse	whether it's a good way I don't really now. It seems fine to me. But if you ever want those features back I think the cleanest thing to do would be to cherry-pick them.	21:35
	← u1106 left	21:35
	→ tieTYT2 joined	21:35
	→ u1106 joined	21:35
	← Neozonz\|Disc left	21:36
	← UKn0Me left	21:37
	← geomyidae_ left	21:38
	← DolphinDreamm left	21:38
	→ studmuf joined	21:38
	← amcgee7_ left	21:38
	← tristanp left	21:38
	← studmuf left	21:39
	→ WaReZ joined	21:41
	→ snearch joined	21:41
	→ stick-shift joined	21:42
	→ SirRetnuh joined	21:42
	← hardenedapple left	21:43
	← boombatower left	21:43
	← ojacobson left	21:43
	→ arez joined	21:44
_ikke_	git merge doesn't even look at commits, git looks at trees	21:45
	so whatever happened in between doesn't matter	21:45
osse	i concur	21:45
	it was just a figure of sprechen	21:45
_ikke_	Yeah, just to make it clear	21:46
	→ pm90_ joined	21:46
	→ baweaver joined	21:47
	← pheaver left	21:49
	→ linuxmint joined	21:49
	← EvilPenguin left	21:51
	← LucasTT left	21:51
	← cbonobo left	21:53
	← willharrison left	21:54
	← Dougie187 left	21:54
	← ketas left	21:54
	→ MrRoot joined	21:56
	← vurma left	21:56
	← zacts left	21:56
	← settermjd left	21:57
	← tier left	21:57
	→ Consuela joined	21:57
	← drfoo left	21:57
	← snearch left	21:57
	→ fredrikslattman joined	21:58
	← jakob left	21:58
	→ drfoo joined	21:58
	← steele_ left	21:59
	→ j_t joined	21:59
	→ syngress joined	21:59
syngress	hello	21:59
gitinfo	syngress: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	21:59
	← jceb_ left	21:59
j_t	We disallow pushing to master, you have to use the pull request method through stash. If I accidentally made a commit to my local master, how can I wipe that out so I'm synced to our master?	21:59
	→ robert__ joined	22:00
	→ zacg joined	22:00
qsuscs	j_t: cherry-pick it on the branch you actually want it, reset --hard master to master^	22:00
syngress	i have 3 commits on branch MASTER, how can i get back to commit 2 (made some local changes) and push it to server ?	22:00
	← stick-shift left	22:00
	← JagaJaga left	22:00
j_t	qsuscs: reset --hard master to master^ ?	22:01
	← Dragooon left	22:01
j_t	qsuscs: git reset --hard; that?	22:01
qsuscs	j_t: git checkout master; git reset --hard master^	22:01
	← SirRetnuh left	22:01
j_t	hmm, what does ^ do	22:01
qsuscs	j_t: man gitrevisions	22:01
gitinfo	j_t: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	22:01
qsuscs	j_t: “first parent of that commit”	22:01
syngress	i have 3 commits on branch MASTER, how can i get back to commit 2 (made some local changes) and push it to server, to branch MASTER as commit 4 ?	22:02
	→ cagedwisdom joined	22:02
	→ snearch joined	22:02
	← fredrikslattman left	22:02
	→ m0ltar joined	22:02
_ikke_	revert commit 3	22:03
Sample	_ikke_: what do you mean when you differentiate looking at commits vs looking at trees. when you say "tree" are you meaning "the current state of all the files in the project"	22:03
	aka, the head commit?	22:03
_ikke_	as recorded in the specific commit	22:03
	→ jakob joined	22:03
syngress	revert ?	22:04
_ikke_	git revert	22:04
	ajustrun → ajustrun\|away	22:04
	← King_Hual` left	22:04
	→ pheaver joined	22:04
	← baweaver left	22:04
_ikke_	Sample: each commit has a reference to a tree object	22:04
	→ King_Hual` joined	22:04
_ikke_	that tree records the state of all the files that were comitted	22:04
Sample	osse, _ikke_: so if the merge only looks at the head commits of each branch, wouldn't it see that the files are present in one tree and absent in the other?	22:04
	← jds left	22:05
	→ Dragooon joined	22:05
	→ devol joined	22:05
syngress	I have something like this:	22:05
	← macabre left	22:05
devol	how to let `git checkout master` also put back deleted files?	22:05
_ikke_	Sample: reading your explenation	22:05
	← King_Hual` left	22:05
syngress	Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded	22:05
qsuscs	Sample: git ls-tree HEAD^{tree}; git rev-parse HEAD^{tree}; git cat-file -p HEAD \| grep tree	22:05
	→ King_Hual joined	22:06
	← bgerber left	22:06
qsuscs	(though git ls-tree HEAD would also work, HEAD counts as tree-ish)	22:06
	→ _Vi joined	22:06
syngress	i can't push it	22:07
	← ajustrun\|away left	22:07
	→ fredrikslattman joined	22:07
	gitinfo set mode: +v	22:07
	← stamina left	22:07
syngress	! [rejected] master -> master (non fast-forward)	22:07
	→ specious joined	22:07
devol	answer to my own question : `git checkout --`	22:08
	→ willharrison joined	22:09
	← Cata\|Work left	22:09
	← ev_ left	22:10
	← denete left	22:10
	→ ajustrun joined	22:10
	→ syngress_ joined	22:10
syngress_	i have 3 commits on branch MASTER, how can i get back to commit 2 (made some local changes) and push it to server, to branch MASTER as commit 4 ?	22:10
	→ userghost joined	22:11
Sample	_ikke_: the question was in the sprunge above	22:11
_ikke_	yeah, found it	22:11
	← jerematic left	22:11
Sample	k	22:11
	← netcarver left	22:11
_ikke_	was a bit distracted though	22:12
Jordan_U	I'm trying to use git rebase -i for the purposes of rewriting history, i.e. I'm not trying to rebase off of a new branch with different changes. I'm using "git rebase -i HEAD~8" but even just "git rebase HEAD~8" fails with the following output: http://paste.debian.net/hidden/ccf12274/ . I'm clearly misunderstanding how git rebase works as I thought that "git rebase HEAD~8", without the -i, would simply replay the last 8 ...	22:12
	... commits exactly as they are, and thus would be essentially a no-op. What is actually going on here, and what command should I be using to edit some of the recent commits I've made?	22:12
	→ denete joined	22:12
	← syngress left	22:13
	→ duderonomy joined	22:13
	→ steele joined	22:14
	← freestyl3r left	22:14
	→ ojacobson joined	22:15
	→ bgerber joined	22:15
	← fredrikslattman left	22:15
	← rubyonrailed left	22:15
_ikke_	Sample: what's the difference between 1.5 and v1.5?	22:16
	← robert__ left	22:17
	→ munke joined	22:17
	← userghost left	22:18
	→ robert__ joined	22:18
	→ denete_ joined	22:19
	← autochthon left	22:19
	← zadock left	22:20
	← The_Phoenix left	22:20
	← denete left	22:22
	→ mikeric joined	22:23
	← jonnyro left	22:24
	→ SirScott joined	22:24
	← basiclaser left	22:24
	← steele left	22:24
SirScott	any git-flow oh-my-zsh users here? doing my first 'git flow release 1.0.0' and the resulting tag is being applied onto the release branch, not onto master as I might have expected from the docs.	22:25
	← CKyle left	22:25
	← nnyk_ left	22:25
	← snearch left	22:25
bremner	uh. I don't know what the shell has to do with it. But try bash just in case.	22:26
	→ SumDude joined	22:26
	← j_t left	22:26
	← Kicer86 left	22:26
	← willharrison left	22:27
	← Zoddo left	22:28
	→ randiman joined	22:28
	← Consuela left	22:28
	← pbrobst left	22:28
tang^	omz has a git plugin that may change the behaviour of git	22:29
	so yeah, try bash	22:29
	→ dm7freek joined	22:29
_ikke_	iirc, it never changes git behaviour	22:29
SirScott	well I know i just run the right commands manually and be fine, so perhaps this question is better suited in #zsh or something along those lines	22:29
bremner	they hate omz ;)	22:30
	← ZenMasta left	22:30
	→ Zentdayn joined	22:30
	_ikke_ uses omz	22:30
RichiH	_ikke_: don't	22:30
bremner	see!	22:30
_ikke_	RichiH: I'm contend with it	22:30
	→ stick-shift joined	22:30
_ikke_	content*	22:31
RichiH	https://github.com/RichiH/zshrc	22:31
	https://github.com/RichiH/vcsh/https://github.com/RichiH/vcsh/	22:31
	paste fail	22:31
	or try the grml zshrc	22:31
	← bote left	22:31
	→ stephen_ joined	22:32
	→ willharrison joined	22:33
	← dm7freek left	22:34
	← okanck left	22:34
	→ nnyk_ joined	22:34
	← SumDude left	22:35
	→ otter768 joined	22:35
	← tyreld_ left	22:35
	← denete_ left	22:36
Sample	_ikke_: I use v1.5 to refer to the tag and the branch and 1.5 just to refer to the release (casually)	22:36
	→ ciampix joined	22:36
	→ steele joined	22:37
	→ BlackFox joined	22:37
	→ boombatower joined	22:37
	← boombatower left	22:37
	→ boombatower joined	22:37
BlackFox	I need someones opinion on making git repository commit and push all changes at the end of every day	22:37
_ikke_	ko	22:37
	ok	22:37
	→ SirRetnuh joined	22:37
	→ Sergio965 joined	22:37
	← Sergio965 left	22:37
	← zumba_addict left	22:38
	← RedShift left	22:38
	→ ketas joined	22:38
	→ SumDude joined	22:39
	→ tohuw joined	22:39
	← otter768 left	22:40
	← SumDude left	22:40
	→ SumDude joined	22:41
	← hackvana left	22:41
	← giusef left	22:41
	→ hackvana joined	22:41
	← stick-shift left	22:42
	← hackvana left	22:43
thiago	BlackFox: you have to ask a question before anyone gives you an answer	22:44
	← nnyk_ left	22:45
	← kermit left	22:45
	← Alex______ left	22:46
	← pm90_ left	22:46
	→ lieber joined	22:46
	← stephen_ left	22:46
	← duderonomy left	22:47
	→ kermit joined	22:47
	→ stick-shift joined	22:47
	← syngress_ left	22:47
	→ pbrobst joined	22:47
BlackFox	thiago, what does anyone think on making git repository auto-commit and push at the end of the day?	22:47
	:V	22:47
thiago	BlackFox: bad idea	22:48
	commit when you have stuff to be committed	22:48
	← robert__ left	22:48
thiago	push only when you want to publish your work	22:48
BlackFox	well I'm the only one working really	22:48
	→ _Atom_ joined	22:48
qsuscs	doesn’t matter.	22:48
thiago	then you don't have to push	22:48
	anyway, if you're doing development, once a day commits is too infrequent	22:49
	← pantsman- left	22:49
thiago	if you're not doing anything, there's nothing to be committed	22:49
qsuscs	if you’re really in the flow, make all the commits at once with git gui or git add -p	22:49
BlackFox	-p?	22:49
	→ sgen joined	22:49
qsuscs	but SVN-like „this and this and that, and while we’re at it, also that one“ commits are bad habits	22:49
	--patch	22:49
	!tias or man git add	22:49
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	22:50
	the git-add manpage is available at http://jk.gs/git-add.html	22:50
BlackFox	Ah	22:50
	← randiman left	22:50
	← livingstn left	22:50
	← AaronMT left	22:51
	→ robert__ joined	22:51
BlackFox	I just find that I can't be bothered to manage the repositories that nobody will probably ever look at	22:51
	← sgen left	22:51
BlackFox	So I end up comitting everything in the end of the day anyway	22:51
	Dunno	22:52
	I have two repositories, for content and assets, and another one for source code	22:52
	→ baweaver joined	22:52
BlackFox	It's inconvenient to keep two terminals for two repositories open all the time	22:52
	Or open them up all the time	22:53
	I'm on Windows and all I get is a taskbar which gets filled up already	22:53
	← axl_ left	22:53
	← Somasis left	22:53
	→ Somasis joined	22:53
	→ toothrot joined	22:54
Jordan_U	I'm trying to use git rebase -i for the purposes of rewriting history, i.e. I'm not trying to rebase off of a new branch with different changes. I'm using "git rebase -i HEAD~8" but even just "git rebase HEAD~8" fails with the following output: http://paste.debian.net/hidden/ccf12274/ . I'm clearly misunderstanding how git rebase works as I thought that "git rebase HEAD~8", without the -i, would simply replay the last 8 ...	22:54
	... commits exactly as they are, and thus would be essentially a no-op. What is actually going on here, and what command should I be using to edit some of the recent commits I've made?	22:54
thiago	BlackFox: you asked our opinion	22:54
	→ axl_ joined	22:54
qsuscs	Jordan_U: are there any merges involved?	22:54
	← axl_ left	22:54
BlackFox	thiago, I'm giving you a bit more information as a request for possibly more opinion :)	22:54
thiago	Jordan_U: do you have a merge commit in the last 8 commits?	22:55
Jordan_U	qsuscs: One, yes.	22:55
	← SumDude left	22:55
thiago	that's the problem	22:55
	← ciampix left	22:56
	← SirRetnuh left	22:56
	→ CSergiu94 joined	22:57
	← pacon left	22:57
	← baweaver left	22:58
	→ sgen joined	22:58
	← Sasazuka left	22:59
	→ Consuela joined	22:59
	← phos1 left	22:59
	← sq-one left	22:59
	← Spacew00t left	23:00
	→ Sasazuka joined	23:00
	→ baweaver joined	23:01
Jordan_U	thiago: Ok. How can I solve that problem?	23:01
thiago	Jordan_U: fix the conflict	23:01
offby1	teach the conflict	23:01
	teach the controversy	23:01
	&c	23:01
Jordan_U	thiago: Is this a conflict that I fixed when I made the original merge commit? I'm trying to understand why (what seems to me to be) an already solved problem is coming up again.	23:02
	→ rns2 joined	23:02
luto	I've got this secenario: http://i.imgur.com/VxBz0Vx.png base/v2.0.0/v1.0.0 aren't my code, v1.0.0...custom is. My custom code is based on v1.0.0. I'd now like to transfer it on top of v2.0.0; Is a range-cherry-pick the right way to do this?	23:02
thiago	Jordan_U: it's possible there was no conflict	23:02
luto	btw, there are many more commits between base...v1.0.0 and base...v2.0.0	23:02
thiago	Jordan_U: you're linearising history now, which means you're reordering commits that had no relationship to each other before.	23:03
	→ Gitzilla joined	23:03
	← WaReZ left	23:03
_ikke_	Sample: still here?	23:04
	← highcup left	23:04
	← steele left	23:04
	← gsingh93 left	23:05
	← Sasazuka left	23:05
	→ Sasazuka joined	23:06
	← Sasazuka left	23:06
	← jontmorehouse left	23:06
	→ cbonobo joined	23:06
	← snima left	23:07
	← Consuela left	23:07
	→ Dougie187 joined	23:07
	→ Consuela joined	23:07
	← danzilio left	23:07
	← willharrison left	23:08
	← rayman22201 left	23:09
	→ cdown joined	23:09
	→ bulletmark joined	23:09
	← Consuela left	23:09
	← maqr left	23:09
	→ Consuela joined	23:09
	→ zumba_addict joined	23:10
	← rendar left	23:10
	← kyb3r_ left	23:10
	← CSergiu94 left	23:11
	← teufelChiCoder left	23:12
	← Consuela left	23:12
	← MrRoot left	23:13
	→ rayman22201 joined	23:13
	← t-mart left	23:14
	→ Xe joined	23:14
	← Dragooon left	23:15
	← stick-shift left	23:15
	→ tang^^ joined	23:15
	→ t-mart joined	23:16
	← TinkerTyper left	23:16
	← tang^ left	23:17
	→ dan_w joined	23:17
Sample	_ikke_: yep yep	23:17
	→ jontmorehouse joined	23:17
Sample	_ikke_: so what are your thoughts on the result of the "1.6" 3-way-merge into master given merging only looking at the state of the tree for each head?	23:18
	← cdown left	23:18
	→ TinkerTyper joined	23:18
dan_w	Hi all! When I pull on by Ubuntu box, it resets the chmod of one/all of my files. Is there any way to avoid this? Thanks!	23:18
_ikke_	Sample: what does git merge-base v1.5 1.6 return?	23:20
	→ t-mart_ joined	23:20
	← robert__ left	23:21
	← duckson left	23:21
	← thiago left	23:22
	→ duckson joined	23:22
	← joeyDB_ left	23:22
tang^^	dan_w: git only records 644 and 755. you shouldn't have any other setting	23:22
	→ mkaesz joined	23:22
	← t-mart left	23:24
rayman22201	Hi everyone. I have a question about rebase vs. merge.	23:24
	→ zacts joined	23:24
	← dmarr left	23:24
	→ Consuela joined	23:25
	← _Atom_ left	23:25
dan_w	tang^^: I am pulling my website files into my public_html dir, and there is a script in there which every time I update, I have to chmod +x a file to be able to execute it again. Do I need to chmod it in the master repo?	23:26
	→ robert__ joined	23:26
tang^^	dan_w: I thought that sounded like a !deploy scenario	23:27
gitinfo	dan_w: 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	23:27
	→ dmarr joined	23:27
	← phantomtiger left	23:27
	← robert__ left	23:27
tang^^	dan_w: well, +x is a 755 case so yes you could... but you have to use git to do it	23:27
	→ robert__ joined	23:27
	→ liamkeily joined	23:29
	← linuxmint left	23:29
	← jerius left	23:30
kadoban	rayman22201: Are you waiting for someone to force it out of you or something?	23:30
rayman22201	Right new we create a feature branch, and then merge master onto the feature branch as a kind of integration test to apply everything that was on master to the feature. But this causes problems sometimes. is Rebase the correct way to do this?	23:30
	lol. sorry, a lot to type	23:30
	and I got distracted	23:30
	← tang^^ left	23:30
rayman22201	Thanks for waiting :-P	23:30
kadoban	Hehe, okay. Just making sure you weren't waiting for a response first :)	23:30
	← das_beard left	23:31
	→ litespeed joined	23:31
kadoban	rayman22201: rebase vs merge, it really just depends what you want history to look like. What kinds of problems is your current approach running into? (mostly, rebase will run into…pretty much exactly the same problems, possibly more)	23:31
	← litespeed left	23:31
	→ litespeed joined	23:32
rayman22201	Well, the problem is occiasionally, git will choose the feature branch version of a chunk of code, and it should choose the master version.	23:32
	but we get no warnings or merge conflicts	23:32
	just code regressions magically	23:32
qsuscs	then merge --no-commit	23:32
	→ leeN joined	23:32
qsuscs	and look around yourself	23:32
	← baweaver left	23:33
	← litespeed left	23:33
	→ stephen_ joined	23:33
	→ ktchup joined	23:33
kadoban	rayman22201: That sounds rather odd. It's possible, but… you sure whoever is doing the merge isn't just doing it incorrectly? I've only once had git automerge and it turned out incorrect, after…many many tries. That one I'm not even sure of.	23:34
rayman22201	So it’s not really the merge strategy that is the problem. We just need to double check the result of the merge?	23:34
	← boombatower left	23:34
	← mcrutchfield left	23:34
rayman22201	It doesn’t happen all the time, but it happens often enough to cause some serious and annoying problems	23:34
	← TinkerTyper left	23:34
kadoban	rayman22201: Well, it could be the merge strategy. But yeah you really do have to check the result of a merge. Ideally automatically (test suites, etc.), but by hand if not.	23:34
stephen_	I'm having an issue with renaming a directory with submodules as children: I have directory parentDir, and I would expect 'git mv parentDir newParentDirName' to fix all references to submodueles contained within it, but after the move, git status fails with malformed submodule references. Reversing the rename restores the repo to a working state. https://dpaste.de/xuq	23:35
	← chitopunk left	23:35
	→ litespeed joined	23:35
	→ baweaver joined	23:36
	← BSaboia left	23:36
	→ TinkerTyper joined	23:36
	← Consuela left	23:37
kadoban	rayman22201: But as to your original question: I don't think rebase will help you avoid that kind of problem.	23:37
	→ Consuela joined	23:37
rayman22201	hrmmm. What is the recomended workflow? We don’t want to merge our features onto master without first checking the interactions of the code changes. Master and our features can get out of sync very quickly.	23:38
kadoban	I don't know that there's a real recommended workflow…git is very flexible there, and it kind of depends on what you want to achieve. The little I've heard about your workflow doesn't sound like a mistaken choice.	23:39
	← awosi left	23:40
	← thef0ster left	23:40
	→ madewokherd joined	23:40
	→ Ikd joined	23:40
	← Weezey left	23:41
	← munke left	23:41
	← troyt left	23:41
	→ Weezey joined	23:41
	→ UKn0Me joined	23:42
	← MasterPiece left	23:42
	→ troyt joined	23:43
	← cagedwisdom left	23:43
rayman22201	In general how would keep a long running feature branch up to date with master?	23:44
kadoban	I'd merge master in occasionally.	23:45
rayman22201	merge and not rebase?	23:45
	← Ikd left	23:45
rayman22201	The whole rebase vs merge thing is because I also asked this question on stackoverflow and that was the answer I got… much to my confusion lol	23:46
kadoban	Yeah, I usually consider rebase kind of…ugly. The only time I do it is when I'm working locally for a while and then I'm pushing something upstream that nobody has seen before and it'll be easier for them if it looks like I started at the tip of master instead of wherever I did.	23:46
	Otherwise I like to preserve as much history as I can, which merges do.	23:47
	→ uokra joined	23:48
	→ awkwardusername joined	23:48
rayman22201	That’s what I thought	23:48
	→ joeyDB_ joined	23:49
	← uokra left	23:49
	→ elbeardmorez joined	23:50
	→ bnb joined	23:50
bnb	How can I pull updates from the source repo that I forked?	23:50
	→ qeq joined	23:50
_ikke_	bnb: add it as a remote	23:51
	← qeq left	23:51
bnb	_ikke_: How can I do that?	23:51
rayman22201	Ok. Well, for now we are just going to double check all our merges, even if there are no merge conflicts. Thanks everyone, especially @kadoban	23:51
	← xk_id left	23:51
	← zumba_addict left	23:52
	→ geau joined	23:52
kadoban	rayman22201: 'welcome. Try to figure out what's causing the merge weirdness, if you can. I have a feeling it's not just as simple as git screwing up, with the default settings and strategy and such, that should be…quite rare.	23:52
	← geau left	23:52
	← nour_ left	23:52
_ikke_	bnb: git remote add <name> <url>	23:52
	→ nour joined	23:53
	→ zumba_addict joined	23:53
	← mkaesz left	23:53
	→ auuf joined	23:53
	← joeyDB_ left	23:53
bnb	the repo I forked is called "website", and my fork is called "website". does "website" (without quotes) go in <name>?	23:53
rayman22201	Well, the guy who this tends to happen to is a ‘quite rare’ individual lol	23:54
_ikke_	bnb: the name is something you choose yourself	23:54
bnb	_ikke_: what do I put there? Not the name of the repo I'm pulling from?	23:54
_ikke_	bnb: upstream is a common way to refer to the repo you forked from	23:55
bnb	Okay, so it's not the name of the upstream repo?	23:55
	← ojacobson left	23:55
_ikke_	No, that's where the url is for	23:56
kadoban	rayman22201: Ahh, hah. Yeah I'm especially…disbelieving if it tends to happen to one guy. Have him share his terminal history when it happens again and see what he's doing that he shouldn't.	23:56
	← zumba_addict left	23:56
_ikke_	bnb: The remote name is just a shortcut name	23:56
	bnb: you could have named it foo for all git matters	23:56
	→ zumba_addict joined	23:56
bnb	Okay, doing that step now.	23:56
rayman22201	I do have an example of it happening, looking at the git log.	23:56
	I don’t know the best way to share that though.	23:57
bnb	_ikke_: Is [email@hidden.address] the right url?	23:58
	← smccarthy left	23:58
	← yang left	23:59
	← zacg left	23:59
_ikke_	looks good	23:59
	→ zumba_ad_ joined	23:59
bnb	Okay	23:59

Logs Search ←Prev date Next date→

Channels Documentation