IRCloggy #git 2013-11-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.

	2013-11-13
	→ jarr0dsz joined	00:00
	← elplatt left	00:00
	→ elplatt joined	00:00
	← ItSANgo left	00:00
	→ Fernandos joined	00:00
Fernandos	hi	00:00
	juvenal → juvenal_away	00:01
	juvenal_away → juvenal	00:01
Fernandos	can anyone tell me howto find out the the date something was commited on github? Github only tells me 2years ago. But not exactly when. Doing a comparison and am curious when this was first released: https://github.com/zurb/foundation/tree/v2.0.0	00:01
	← iron_houzi left	00:03
	→ Brmm joined	00:03
	← hiroyuki left	00:03
	← Misan left	00:04
	← Watabou left	00:05
	→ Droolio joined	00:05
knighthawk	thegorn you still here?	00:05
Fernandos	k, I had to clone the entire thing to find it out manually, but doesn't github show the date somewhere?.. would be pain in the ass for them to let people clone repos just for finding that out.	00:05
	→ canooon joined	00:06
	→ akurilin joined	00:07
	→ ItSANgo joined	00:07
	← PeterBooker left	00:07
	← mklappstuhl left	00:07
	← bakers left	00:08
	← nottombrown left	00:09
	→ daito_ joined	00:09
	→ nottombrown joined	00:09
	← jhulten left	00:09
	[emmajane] → emmajane	00:10
	← srji left	00:10
	← tang^ left	00:11
	emmajane → [emmajane]	00:11
	→ ruskie joined	00:11
	← kriks left	00:12
	← elplatt left	00:12
offby1	Fernandos: I assume that if you use the API you'll get a nice Unix-y timestamp	00:12
	← harish left	00:13
	← Fandekasp left	00:13
	← daito_ left	00:13
	→ iron_houzi joined	00:13
	→ bits8mybytes joined	00:13
	← bits8mybytes left	00:13
	→ bits8mybytes joined	00:13
	→ Fandekasp joined	00:13
	→ TenJack joined	00:13
	← boombatower left	00:14
	← Zarthus left	00:14
	→ matthiaskrgr joined	00:14
	gitinfo set mode: +v	00:15
matthiaskrgr	I'm recompressing (from scratch) a repo of around 150 MB size	00:15
TenJack	Hey, is there any way to write a git plugin of sorts that would observe commits and be able to send that information to an API?	00:15
matthiaskrgr	and git already ate around 3GB of ram for this	00:15
	how can this be?	00:15
	← johnnyfuchs left	00:15
	← King_Hual left	00:16
	← Brmm left	00:16
matthiaskrgr	its even using just one thread	00:16
canooon	TenJack, http://git-scm.com/book/en/Customizing-Git-Git-Hooks	00:16
	→ samuel02 joined	00:16
	→ Dougie187 joined	00:17
TenJack	canooon: cool, thanks!	00:17
offby1	Fernandos: e.g., curl https://api.github.com/repos/offby1/rudybot/git/refs/heads/master gives me (among other things) "url": "https://api.github.com/repos/offby1/rudybot/git/commits/fe96936d185def903565a8598345a7540c9b7318", and that second URL gives me author.date and committer.date, both in Zulu as God intended.	00:17
	→ threesome joined	00:18
	→ mklappstuhl joined	00:19
TenJack	canooon: and im assuming you could make an http request within a hook?	00:19
canooon	TenJack, yeah they are just shell scripts you can do curl/wget or w/e	00:19
	[emmajane] → emmajane	00:19
canooon	well shell scripts or any executable	00:19
TenJack	canooon: sweet	00:19
Fernandos	offby1: nice, gonna make a shell alias to g.remote.date (autosuggest makes typing that g.r.d)	00:20
	emmajane → [emmajane]	00:20
imachuchu	matthiaskrgr: what commands did you run to compress your repo?	00:20
	← samuel02 left	00:21
Fernandos	offby1: thanks	00:21
matthiaskrgr	imachuchu: git reflog expire --expire=1.minute --all	00:22
	git pack-refs --all --prune	00:22
	git gc --prune=now --aggressive	00:22
offby1	pretty complex alias	00:22
	Fernandos: you ight find http://stedolan.github.io/jq/ handy	00:22
matthiaskrgr	imachuchu: but I usually can compress fare bigger repos with this without getting problems :/	00:22
	→ galaris joined	00:23
	→ Pieter_ joined	00:23
	→ mribeirodantas joined	00:23
	→ AaronMT joined	00:24
	→ JustinMac joined	00:24
	← krixxkraxx left	00:24
	← SHyx0rmZ left	00:24
	→ corygibbons joined	00:25
	→ elplatt joined	00:25
imachuchu	matthiaskrgr: just in case something really weird is going on, fun git fsck	00:25
	← dorkmafia left	00:25
imachuchu	matthiaskrgr: (though most likely one of those commands call it anyway)	00:25
	← primitive left	00:26
	→ Brmm joined	00:26
	→ boombatower joined	00:26
	→ jfoy joined	00:26
	→ thecha joined	00:27
imachuchu	*run	00:29
	← thecha left	00:29
	← freestyl3r left	00:31
	→ SonicX joined	00:31
	← jarr0dsz left	00:31
	← boombatower left	00:32
	← Brivelt left	00:32
	→ dyng joined	00:32
	→ freestyl3r joined	00:32
	→ Entomo joined	00:33
	← CreativeEmbassy left	00:34
	← Derega left	00:34
	→ Advocation joined	00:34
	→ BSaboia joined	00:35
	→ thiago joined	00:35
	← robinsmidsrod left	00:36
	→ jason237 joined	00:36
	→ hellopat joined	00:37
	→ Sigma joined	00:38
	→ robinsmidsrod joined	00:38
	← Gavrisimo left	00:39
	← Advocation left	00:39
	→ Derega joined	00:40
	→ sebrock joined	00:41
	→ gustavo__ joined	00:41
	← tagava\|2 left	00:42
	← tagava left	00:42
	→ Jasper joined	00:42
	← snuffeluffegus left	00:42
Jasper	git-send-email can't seem to find my CA certificates.	00:43
	← R1KRDO left	00:43
Jasper	It keeps failing with: "STARTTLS failed! SSL connect attempt failed with unknown error error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed at /usr/libexec/git-core/git-send-email line 1236."	00:43
	← raonyguimaraes left	00:43
Jasper	Does anybody know where git-send-email looks for CA certificates?	00:44
	← canoon left	00:44
	← canooon left	00:44
	→ canoon joined	00:45
jrnieder	Jasper: see --smtp-ssl-cert-path in man git-send-email	00:45
gitinfo	Jasper: the git-send-email manpage is available at http://jk.gs/git-send-email.html	00:45
	← mklappstuhl left	00:45
	← sebrock left	00:45
Jasper	jrnieder, ctrl+f on that page for "ssl-cert" gives an error	00:46
	← dyng left	00:46
Jasper	Are those webpages just out of date?	00:46
	← cenuij left	00:46
Jasper	Aha, yeah, my local man pages have it.	00:46
jrnieder	"Last updated 2013-04-18"	00:47
	that option was added in july	00:47
	→ dyng joined	00:47
jrnieder	hm, ^jast	00:47
Jasper	jrnieder, hm, it seems that it's already pointing to the right place.	00:47
jrnieder	Jasper: maybe someone is trying to MITM you? :)	00:48
	← cmn left	00:48
Jasper	I'd prefer a better error message and cert dump then.	00:48
	← koptein left	00:48
Jasper	Just giving up with "unknown error error" isn't too pleasant	00:48
	→ koptein joined	00:48
	jrnieder nods	00:49
jrnieder	the message is from IO::Socket::SSL::errstr()	00:49
	→ nottombr_ joined	00:49
	→ kcj joined	00:49
	→ cmn joined	00:50
	← nottombr_ left	00:50
	→ nottombr_ joined	00:51
	← nottombrown left	00:52
	→ nottombrown joined	00:53
	→ srji joined	00:53
	← bwreilly left	00:53
Jasper	meh	00:53
	just going to use GIT_SSL_NO_VERIFY=true for now	00:54
	so the NSA will see my X server patches. who cares	00:54
jrnieder	and your email password :(	00:54
Jasper	it's gail	00:55
	gmail	00:55
	they already have direct access anyway	00:55
	want me to care more? make better error messages	00:55
	grr, still didn't work	00:56
	→ shinnya joined	00:56
	← nottombr_ left	00:56
	→ Gavrisimo joined	00:57
	← eijk left	00:58
	← yhager left	00:58
	→ groglogic joined	00:58
	← dreiss left	00:59
	← echo-area left	00:59
	→ yhager joined	00:59
	→ PaulCapestany joined	01:00
	← Kayra left	01:01
	→ neo1691 joined	01:02
	← yhager left	01:04
	← Brmm left	01:04
	→ MattMaker joined	01:04
	← dyng left	01:05
	← shinnya left	01:05
Jasper	$ git config --global sendemail.smtpsslcertpath /etc/pki/ca-trust/extracted/pem/email-ca-bundle.crt	01:05
	that fixed it	01:05
	← srji left	01:05
	← jfoy left	01:06
	← hyperair left	01:06
	→ dyng joined	01:06
	→ jfoy joined	01:07
	← decotii left	01:07
	→ srji joined	01:07
	← ehmatthes left	01:08
	→ Brmm joined	01:08
	→ raonyguimaraes joined	01:09
	← nailora left	01:09
	← neo1691 left	01:12
	← pheaver left	01:13
	→ unkmar joined	01:14
	→ tmcmahon joined	01:14
unkmar	git me happy	01:14
	I'm seeing lots of ^M as the cause of my files being diff-erent.	01:15
	as in CRLF problems or EOL problems.	01:15
	← penguin42 left	01:15
	→ zaczee joined	01:16
unkmar	How might I go about getting git to return a sane git status without modifying the repo or the local files.	01:16
	Use of a switch or .gitattribute or .gitconfigure is fine.	01:16
	→ thiago_ joined	01:18
	← thiago left	01:19
	→ weiyang joined	01:19
	→ ehmatthes joined	01:19
	← maestrojed left	01:20
	← TheMoonMaster left	01:20
	← lacrosse left	01:20
	→ jhulten joined	01:20
	← Jasper left	01:21
	← abelsiqueira left	01:21
	→ nailora joined	01:21
	← felixsamora left	01:21
	← raonyguimaraes left	01:21
EugeneKay	!crlf	01:22
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	01:22
	→ boombatower joined	01:22
	← AaronMT left	01:22
	→ NBhostin_ joined	01:24
	← NBhosting left	01:24
unkmar	1.7.2 settings aren't going to help me when I still have 1.7.1. Missed it by, 'that' much	01:24
knighthawk	anyone have a recommended git diff tool for sublime text? (I guess I'm just assuming there is a sublime plugin)	01:25
	→ boombatower_ joined	01:25
	→ felixsamora joined	01:25
	→ neo1691 joined	01:25
	← jhulten left	01:25
	← gustavo__ left	01:27
	→ rchavik joined	01:27
	→ wbill joined	01:29
	← richwestcoast left	01:30
knighthawk	unkmar I here there is a config but I used used dos2unix.	01:30
	→ pheaver joined	01:30
	→ Snibble joined	01:31
unkmar	knighthawk: Won't modify the time and date of every file I use it on?	01:31
	← tmcmahon left	01:31
	→ bronson_ joined	01:33
	← srji left	01:33
	thiago_ → thiago	01:33
	→ CreativeEmbassy joined	01:33
	← Mars__ left	01:33
knighthawk	unkmar not if you use the -k switch (I think that's the right one)	01:34
	→ Mars__ joined	01:34
	← thelorax123 left	01:34
knighthawk	unkmar yeah -k or --keepdate	01:34
unkmar	knighthawk: thank you.	01:35
	← Snibble left	01:35
knighthawk	I haven't decided how yet but I think I'm going to use create a hook to run dos2unix on every push up.	01:36
	→ thelorax123 joined	01:36
knighthawk	that way I don't have to become the line ending police.	01:36
	→ Watabou joined	01:36
unkmar	that shouldn't be needed there are plenty of switches for that.	01:36
	← HenryG left	01:37
	← Brmm left	01:38
	← Mars__ left	01:38
	← jfoy left	01:39
unkmar	knighthawk: find ./ -type f -iname '*.php' -exec dos2unix -k {} \;	01:40
	← mribeirodantas left	01:40
	← occupant left	01:41
	→ occupant joined	01:41
	→ sebrock joined	01:41
knighthawk	thanks unkmar	01:42
	I'll need it for .js file and a few other types too but thanks.	01:42
	← elplatt left	01:42
	← boombatower_ left	01:43
	← ni__ left	01:44
	← abdostar left	01:44
unkmar	broke my website. :(	01:45
	→ chuckharmston joined	01:45
	→ abdostar joined	01:45
	← tvw left	01:45
unkmar	it should be fixed now.	01:45
	that process changed owner of the files.	01:46
	← sebrock left	01:46
unkmar	I had to set the chgrp the files back to ftp	01:46
	→ diegoviola joined	01:46
knighthawk	oh sorry about that. (I'm sure there is a switch for that as well though)	01:46
	← bronson_ left	01:47
	← Sigma left	01:47
unkmar	knighthawk: yeah, I'll look for it next time and... Just wanted to warn you about it.	01:47
	← kaawee left	01:48
	→ dev__ joined	01:48
	← abdostar left	01:49
	← Targen_ left	01:49
	← neo1691 left	01:49
	→ abdostar joined	01:50
	← rafaqueque left	01:50
	← jaimef left	01:50
unkmar	nope, don't see a way to keep owner:group	01:50
	← rnsanchez left	01:51
	→ jaimef joined	01:51
	← Davey left	01:51
	← staafl left	01:51
	→ TheMoonMaster joined	01:53
	→ bronson_ joined	01:53
	← NBhostin_ left	01:54
	← DonRichie left	01:54
	→ DonRichie joined	01:54
	→ Davey joined	01:54
	→ srji joined	01:54
	← alvaro_o left	01:55
	← renatow left	01:56
	→ shuaib joined	01:56
	→ rjhunter joined	01:56
	← imachuchu left	01:58
	← asQuirreL left	01:58
	← hahuang65 left	01:59
	→ renatow joined	01:59
	→ kaawee joined	01:59
	→ johnnyfuchs joined	02:00
	← bitkiller left	02:00
	← johnnyfuchs left	02:00
	← felixsamora left	02:01
	→ pixelgremlins_ba joined	02:01
	← ivan\ left	02:01
	→ daito joined	02:01
	→ lresende joined	02:01
	→ ivan\ joined	02:02
	→ breadfruitman joined	02:02
	← breadfruitman left	02:02
akurilin	Is there any kind of mnemonic for remembering what gets rebased onto what by default?	02:03
	I can never remember which direction things go if I say something like `git rebase mybranch`	02:03
	I think it means "rebase branch x onto current branch"	02:03
	← pixelgremlins left	02:03
	→ samuel02 joined	02:04
	← thiago left	02:04
	← kaawee left	02:05
	→ Goplat joined	02:05
	← SirFunk_ left	02:06
	→ luc_ joined	02:06
	← daito left	02:06
	→ wrouesnel1 joined	02:06
	→ echo-area joined	02:06
	← samuel02 left	02:09
jrnieder	akurilin: the original purpose of 'git rebase' is "I am maintaining a set of patches and want to move them to a new base before mailing them out"	02:10
	akurilin: so, your patches are the current branch, and the new base is the argument	02:10
	← srji left	02:10
jrnieder	akurilin: alternatively you can pass no arguments at all, to make it behave roughly speaking like "git rebase @{u}"	02:11
	→ daito joined	02:11
	→ AaronMT joined	02:11
akurilin	jrnieder, so with rebase I'm effectively saying "take current HEAD and make it point to branch X"?	02:12
	← SocalNick left	02:12
akurilin	to whatever ref is pointed to by branch X I mean	02:12
	← etcetera left	02:14
	→ geomyidae joined	02:14
	← AaronMT left	02:14
jrnieder	nah, you're taking the commits X..HEAD	02:14
	← Gavrisimo left	02:14
jrnieder	and re-applying them on top of X	02:14
	e.g., if you wrote 5 patches on top of "master" a year ago	02:15
	→ etcetera joined	02:15
jrnieder	and now you have a newer version of "master"	02:15
	then "git rebase master" will give you 5 (or fewer!) patches on top of the new "master"	02:15
	("or fewer" because if some of the patches were already applied in "master" then your extra copies of them will be dropped)	02:15
	← etcetera left	02:16
jrnieder	s/copies/copy/	02:16
	→ SirFunk joined	02:16
akurilin	yeah that just went over my head...	02:16
	→ adamwathan joined	02:16
jrnieder	sorry	02:16
	what was your question?	02:17
akurilin	I need to find a solid point of reference and grok this	02:17
	→ etcetera joined	02:17
	→ mattattaque joined	02:17
jrnieder	taking a step back, what are you trying to do?	02:17
akurilin	Just trying to remember well what exactly goes on behind the scenes of a rebase.	02:17
jrnieder	ok	02:17
akurilin	so I don't have to use a reference every time I need to use it	02:17
	to remember what goes where and in which order	02:18
	← chuckharmston left	02:18
jrnieder	I think it's easier to put in context if I know why you are using rebase in the first place	02:18
	→ chuckharmston joined	02:18
	← Watabou left	02:20
akurilin	jrnieder, all I'm doing is either keeping master <--> develop in sync with a clean history (both acquire commits independently of each other). I'm already using interactive rebase to squash topic branches into a single blob.l	02:20
	← ecube left	02:20
jrnieder	akurilin: so, you want a mnemonic for the order of arguments to 'git rebase --interactive'?	02:21
akurilin	so my steps are usually: fetch master from repo, rebase on local master, go to develop, rebase master to it etc.	02:21
	make some changes to develop, go to master and rebase from develop	02:21
	rinse and repeat	02:21
jrnieder	hm, for this kind of thing I'd usually use 'git pull --rebase'	02:21
	← CreativeEmbassy left	02:21
jrnieder	i.e., 'git branch --set-upstream-to=origin/master master; git branch --set-upstream-to=origin/master develop'	02:22
	← etcetera left	02:22
	← Boohbah left	02:22
jrnieder	and then whenever I'm on "master" and want to pull in the upstream changes, I'd run "git pull --rebase"	02:23
	← chuckharmston left	02:23
jrnieder	likewise when on "develop"	02:23
	→ CreativeEmbassy joined	02:23
	← qknight left	02:23
	← mtx_init left	02:23
	← moondoggy left	02:23
	→ qknight joined	02:23
jrnieder	There's a little terminology issue in how you're describing the steps	02:23
akurilin	jrnieder, that's neat, thanks for sharing. That won't cause develop to update origin/master on push, will it?	02:23
	← Luke-Jr left	02:23
jrnieder	by default in current git, "git push" does something you don't want :)	02:24
	→ Luke-Jr joined	02:24
jrnieder	"git push origin develop" does the right thing (pushes your local develop branch to the remote develop branch) and doesn't care about the upstream	02:24
	In git 2.0, plain "git push" without further arguments would act like "git push origin master" when you're on the 'master' branch	02:25
	and would just complain that it doesn't know what you mean when you're on the 'develop' branch	02:25
	→ btree joined	02:26
	→ jfoy joined	02:26
	← BSaboia left	02:26
	→ chamunks joined	02:27
jrnieder	Maybe what I called "something you don't want" is might be actually the behavior you want if you're used to it.	02:27
	I should have asked.	02:27
	s/is might be/might be/	02:27
	← delasteve left	02:28
	→ dabar joined	02:28
akurilin	jrnieder, I somehow learned to use the full git push <remote> <branch> form, so that hasn't affected me personally, but I remember reading about that change recently	02:29
	jrnieder, so do you know of a good resource for more low-level explanations of something like rebase?	02:30
	← chamunks left	02:30
akurilin	or should I be able to understand everything completely in depth from git-scm book?	02:30
	(the online version at least)	02:30
	→ moondoggy joined	02:30
	→ sebhoss joined	02:30
	← nwertman left	02:30
	← JokerxHarley left	02:31
	← jfoy left	02:33
jrnieder	akurilin: man git-rebase isn't bad	02:33
gitinfo	akurilin: the git-rebase manpage is available at http://jk.gs/git-rebase.html	02:33
	← SonicX left	02:34
	→ SonicX joined	02:34
dabar	Hello. The team and I are trying out a new branching workflow. Somehow somewhere it looks like code from one of the commits is changed, but I don't see that in the git log -p output. I suspect it is because of the merges and such. Any insight into where to look next?	02:34
	← sebhoss left	02:35
	→ Advocation joined	02:35
	← chrisss404 left	02:35
jrnieder	dabar: -m can show more detail about merges	02:35
	dabar: it mixes well with --first-parent	02:35
	← Skrypter left	02:35
	→ ledtc_ joined	02:36
ledtc_	Hi, how do i clean out my current repo and add fresh files ?	02:36
	→ jfoy joined	02:36
	→ d2dchat joined	02:37
	← btree left	02:37
ledtc_	Another funny thing, i cant press the "send" button on the final stage of the gui ?	02:37
	→ mtx_init joined	02:37
dabar	thank you	02:37
akurilin	jrnieder, thanks again!	02:37
	→ chrisss404 joined	02:37
	← jaimef left	02:38
	← Kromitvs left	02:38
	→ jaimef joined	02:38
	fangism → fangism-shadow	02:39
	→ Kromitvs joined	02:39
	← Advocation left	02:40
ledtc_	Anyone ?	02:41
	← thelorax123 left	02:42
	→ sebrock joined	02:42
	→ ecube joined	02:42
	← ecube left	02:42
	→ ecube joined	02:42
	→ Snibble joined	02:42
	→ Guest59632 joined	02:43
	→ Vampire0_ joined	02:43
	→ thelorax123 joined	02:44
	diegoviola → Guest27397	02:44
	Guest59632 → diegoviola	02:44
	→ Watabou joined	02:44
	→ Mars__ joined	02:44
	← Guest27397 left	02:45
	← sebrock left	02:46
	← Vampire0 left	02:47
	← jfoy left	02:47
	← CheckDavid left	02:47
	→ mintyFresh joined	02:47
	← Mars__ left	02:49
	mintyFresh → Guest24803	02:49
	→ dhruvasagar joined	02:49
	← TenJack left	02:50
	Guest24803 → minty	02:50
	→ aberrant joined	02:50
	← Kromitvs left	02:50
	→ Kromitvs joined	02:51
	→ intripoon_ joined	02:51
	← Watabou left	02:52
	← geomyidae left	02:53
	← bronson_ left	02:53
	← dhruvasagar left	02:55
	← intripoon left	02:55
	← Kromitvs left	02:55
	← dyng left	02:56
	→ Kromitvs joined	02:56
	→ Watabou joined	02:57
	→ geomyidae joined	02:57
	→ mintmoney joined	02:58
	→ dhruvasagar joined	03:00
	← PaulCapestany left	03:00
	← dabar left	03:01
	← minty left	03:01
	→ silviof1 joined	03:01
	→ dyng joined	03:01
	← ledtc_ left	03:02
jrnieder	akurilin: any time	03:03
	→ Destos joined	03:03
	← silviof left	03:03
	← knigitz left	03:07
	← Samual left	03:11
	→ Samual joined	03:11
	← Samual left	03:11
	→ Samual joined	03:11
	← TheMoonMaster left	03:11
	← hellopat left	03:12
	→ Guest99488 joined	03:12
	← whunt left	03:12
	→ hellopat joined	03:13
	← Kromitvs left	03:13
	← dyng left	03:13
	→ Kromitvs joined	03:14
	← diegoviola left	03:14
	← knighthawk left	03:14
	→ knighthawk joined	03:15
	→ diego1 joined	03:15
	← hellopat left	03:17
	→ lacrosse joined	03:17
	← Guest99488 left	03:18
	← Kromitvs left	03:18
	→ nwertman joined	03:18
	→ Kromitvs joined	03:18
	← knighthawk left	03:19
	→ oojacoboo joined	03:20
	← jkremser left	03:20
	diego1 → diegoviola	03:20
	→ GreenAsJade joined	03:21
	← aberrant left	03:22
GreenAsJade	I can tell the difference, in diff terms, between two remotes using git diff origin/master other_remote/master ...	03:22
	← SirFunk left	03:22
GreenAsJade	... but how can I get the difference in terms of "commits" instead of patches?	03:22
	← mtx_init left	03:22
GreenAsJade	I would like to know that other_remote is one commit ahead of origin, for exampe	03:22
	← SimonNa left	03:22
jrnieder	GreenAsJade: try "git log --left-right --oneline origin/master...other_remote/master"	03:23
	→ SirFunk joined	03:23
	→ aberrant joined	03:24
	→ jerius joined	03:25
	← dhruvasagar left	03:25
	← nwertman left	03:25
	← shruggar left	03:26
GreenAsJade	That is awesome!!	03:27
	offby1 tries	03:28
	→ CKyle_ joined	03:28
	GreenAsJade takes his hat off to jmieder	03:28
	← jday_ left	03:29
	→ dsdeiz_ joined	03:29
	← dsdeiz left	03:29
GreenAsJade	I never would have worked that out from reading the man page of git log, I can tell you that! :)	03:29
	← Snibble left	03:30
	← jonez left	03:30
	→ LuxuryMode joined	03:31
	← caseydriscoll left	03:31
	← adamwathan left	03:31
	← jerius left	03:32
	→ caseydriscoll joined	03:32
	→ rc111 joined	03:32
	← ikoo_ left	03:33
	← hwrd\|work left	03:35
	← Kromitvs left	03:36
	→ Kromitvs joined	03:36
	→ Advocation joined	03:36
	→ adamwathan joined	03:37
	→ rurufufuss joined	03:39
	← AWinterman left	03:40
	← Advocation left	03:41
	→ hwrd\|work joined	03:41
	→ ikoo joined	03:42
	→ sebrock joined	03:43
	→ Katafalkas joined	03:43
	→ skorgon joined	03:43
	→ jonez joined	03:43
	→ wrouesnel2 joined	03:44
	← CKyle_ left	03:45
	← SirFunk left	03:45
	← mmitchell left	03:45
	← sebrock left	03:47
	← juvenal left	03:47
	→ juvenal joined	03:48
	→ etcetera joined	03:48
	← pheaver left	03:49
	→ TheMoonMaster joined	03:50
	← dsdeiz_ left	03:50
	→ dsdeiz joined	03:51
	→ cmpera joined	03:51
	→ samuel02 joined	03:53
	← GreenAsJade left	03:53
	juvenal → juvenal_away	03:53
	→ GreenAsJade joined	03:55
	← GreenAsJade left	03:57
	→ hellopat joined	03:57
	← samuel02 left	03:58
	→ diego1 joined	03:58
	→ MattStratton joined	03:59
	← Dougie187 left	03:59
	← diegoviola left	04:00
	diego1 → diegoviola	04:00
	← Kromitvs left	04:01
	→ Kromitvs joined	04:01
	← hellopat left	04:01
	→ el3ctron_ joined	04:04
	→ twoface88 joined	04:05
	→ Sigma joined	04:05
	→ CKyle_ joined	04:06
	← diegoviola left	04:06
	← thelorax123 left	04:06
	← Kromitvs left	04:06
	→ Kromitvs joined	04:06
	juvenal_away → juvenal	04:07
	→ germanoak joined	04:07
	→ fairuz joined	04:07
	→ Guest65320 joined	04:07
	→ Brmm joined	04:07
	← adamwathan left	04:07
	← Luke-Jr left	04:08
	→ Luke-Jr joined	04:08
	→ thelorax123 joined	04:08
	Guest65320 → diegoviola	04:09
	← d2dchat left	04:10
	← hwrd\|work left	04:11
	→ chuckharmston joined	04:13
	→ dyng joined	04:14
	← germanoak left	04:14
	→ sabgenton joined	04:16
	← daito left	04:17
sabgenton	how do I show a commits information (parents)	04:17
	→ daito joined	04:18
	← nottombrown left	04:18
deryni	git show <commit> ?	04:18
	→ preflex_ joined	04:18
	← guampa left	04:18
sabgenton	deryni: doesn't show the parrent or tree sha's	04:19
	← dyng left	04:19
	→ hahuang65 joined	04:20
skorgon	sabgenton: add '--parents'	04:20
	← preflex left	04:20
	preflex_ → preflex	04:21
sabgenton	skorgon: yay that worked	04:21
	shows in in the same line as commit:	04:21
	I rember it saying parents: in the past	04:21
	mabye it was something else	04:22
	← daito left	04:22
	→ SirFunk joined	04:22
skorgon	sabgenton: don't know. just found it in man git log. and for some reason it apparently also works for git show.	04:23
gitinfo	sabgenton: the git-log manpage is available at http://jk.gs/git-log.html	04:23
	← freestyl3r left	04:23
	← guns left	04:23
deryni	Merge commits lists a 'Merge:' line with parents or did you mean 'git cat-file -p <commit>'?	04:24
	→ hahuang61 joined	04:24
	← hahuang65 left	04:24
sabgenton	ok so git log stuff works with git show	04:24
	→ GT4066 joined	04:24
sabgenton	ah cat-file -p way beter :D	04:26
	→ beautifulmind joined	04:27
skorgon	or, git show --pretty=raw <commit>	04:28
	← misterpink left	04:28
	→ knighthawk joined	04:28
	CKyle_ → CKyle	04:28
skorgon	or you can define your own output format for log/show	04:29
	→ R1KRDO joined	04:29
	← R1KRDO left	04:30
	← akiva left	04:30
	→ ezekielnoob joined	04:31
	→ sebhoss joined	04:31
	→ ErKa joined	04:33
	← SonicX left	04:35
	← abdostar left	04:35
	→ abdostar_ joined	04:35
	→ jnavila joined	04:35
	← diegoviola left	04:36
mattcen	Hi all. Can anybody think of a one-liner that will let me list all branches whose most recent commit was before $date?	04:36
	← sebhoss left	04:36
	← abdostar_ left	04:36
	→ abdostar joined	04:37
	→ diegoviola joined	04:37
	← abdostar left	04:37
	← CKyle left	04:37
	→ abdostar joined	04:38
	→ mizu_no_oto joined	04:38
	→ yhager joined	04:39
mattcen	Ah. I can cheat by showing exactly 1 commit, and ensuring that commit is newer than "$date", which will give no output if the branch matches my desired criterua	04:40
	criteria*	04:40
	→ jfoy joined	04:41
	← abdostar left	04:41
	→ abdostar joined	04:41
	→ PaulCapestany joined	04:41
mattcen	git branch -a \| while read -r branch; do git log --after=2013-11-05 --color=always -1 "$branch" \| grep -q ^ \|\| echo "$branch"; done	04:42
	→ sebrock joined	04:43
	→ zeograd joined	04:44
	← wrouesnel2 left	04:46
	← mudmaster left	04:46
	→ maslowbeer joined	04:47
	→ mudmaster joined	04:47
	← sebrock left	04:48
deryni	[ $(git rev-list --after=2013-11-05 --count "$branch" -gt 0 ] && echo "$branch" ?	04:48
	← Sigma left	04:49
	← yhager left	04:49
	← cmpera left	04:50
	← maslowbeer left	04:50
	→ maslowbeer joined	04:50
	→ yhager joined	04:51
	→ gustavo__ joined	04:51
	← Katafalkas left	04:51
	→ Katafalkas joined	04:52
	→ Amogh joined	04:53
	← Katafalkas left	04:53
	→ Katafalkas joined	04:53
	gitinfo set mode: +v	04:53
	→ delasteve joined	04:53
	→ nottombrown joined	04:54
	← ErKa left	04:55
	→ shoshin joined	04:55
	← mizu_no_oto left	04:55
	juvenal → juvenal_away	04:56
	← Amogh left	04:56
	← renegaderyu left	04:57
	← jnavila left	04:58
	→ dyng joined	04:58
	← Katafalkas left	04:58
	→ Katafalkas joined	04:59
	→ jnavila joined	04:59
	← sabgenton left	05:00
	→ hobodave joined	05:00
	← donmichelangelo left	05:00
	← lresende left	05:01
	→ donmichelangelo joined	05:01
	← diegoviola left	05:01
	← rc111 left	05:03
	← Katafalkas left	05:04
	← danecando left	05:05
	→ tang^m joined	05:05
	← SynthesizerPatel left	05:05
	← tang^m left	05:08
	← jperry left	05:08
	← rjhunter left	05:10
	→ jperry joined	05:10
	juvenal_away → juvenal	05:10
	juvenal → juvenal_away	05:11
	→ rjhunter joined	05:11
	← mintmoney left	05:14
	→ sqlnoob joined	05:15
	← caktux left	05:16
	→ daito joined	05:18
	→ Guest74408 joined	05:19
	→ guest242 joined	05:19
	← Brmm left	05:20
	← maslowbeer left	05:21
	Guest74408 → diegoviola	05:21
	→ robbyoconnor joined	05:22
	← jnavila left	05:24
	← aberrant left	05:26
	→ jazz264 joined	05:27
	→ saurabh joined	05:28
	saurabh → Guest11993	05:28
	→ harish_ joined	05:28
	→ lresende joined	05:29
	← lresende left	05:29
	→ toobluesc joined	05:29
	← joelm left	05:30
	← jazz264 left	05:31
	→ Brmm joined	05:32
	← cotton left	05:32
	→ jazz264 joined	05:32
	→ mintyFresh joined	05:33
	→ maslowbeer joined	05:34
	mintyFresh → Guest14583	05:34
	← Guest14583 left	05:34
	→ mintmoney joined	05:34
	→ maestrojed joined	05:36
	→ CKyle joined	05:37
	→ ErKa joined	05:37
	→ Advocation joined	05:38
	→ dcpc007_ joined	05:39
	← Brmm left	05:41
	→ samuel02 joined	05:41
	← dcpc007 left	05:41
	← Advocation left	05:42
	→ ewnd9 joined	05:42
	← LuxuryMode left	05:42
	← nicedice_ left	05:43
	← harish_ left	05:44
	→ sebrock joined	05:44
	→ Brmm joined	05:44
	→ hellopat joined	05:45
	← matanya left	05:45
	→ dhruvasagar joined	05:46
	← samuel02 left	05:46
	← hobodave left	05:47
	→ Tommy[D] joined	05:48
	← SporkWitch left	05:48
	→ master_j joined	05:49
	← sebrock left	05:49
	→ matanya joined	05:49
	← hellopat left	05:50
	← el3ctron_ left	05:51
	← Brmm left	05:51
	← Tommy[D]_ left	05:52
	→ rflktr joined	05:53
	← groglogic left	05:54
	← matanya left	05:55
	← kpreid left	05:55
	→ kpreid joined	05:56
	→ matanya joined	05:57
	← robbyoconnor left	05:58
	→ robbyoconnor joined	05:59
	← robbyoconnor left	05:59
	→ svector joined	06:00
	→ mfulz joined	06:01
	→ Sigma joined	06:01
	← diegoviola left	06:01
	← Droolio left	06:02
	← tpollard left	06:03
	← bits8mybytes left	06:03
	← svector left	06:03
	→ svector joined	06:04
	← jperry left	06:05
	← the_cybersphinx left	06:06
	→ jperry joined	06:07
	→ dunin joined	06:07
	← dunin left	06:08
	→ dunin joined	06:08
	← dsdeiz left	06:09
	→ dsdeiz joined	06:09
	← CKyle left	06:09
	← PaulCapestany left	06:10
	→ hoschi joined	06:11
	← canoon left	06:11
	← rflktr left	06:12
	→ ayaz joined	06:12
	← rjhunter left	06:13
	silviof1 → silviof	06:13
	← johnkevinmbasco left	06:13
	→ canoon joined	06:14
	← canoon left	06:14
	→ canoon joined	06:14
	→ akiva joined	06:15
	← abdostar left	06:15
	→ abdostar joined	06:15
	← yhager left	06:16
	→ h0bbit_ joined	06:17
	← tomplast left	06:18
	→ Katafalkas joined	06:18
	→ longbeach joined	06:18
	→ Search12 joined	06:19
	← Bass10 left	06:20
	← abdostar left	06:20
	← dsdeiz left	06:21
	← dunin left	06:21
	→ dsdeiz joined	06:22
	→ BiggFREE joined	06:24
	← ewnd9 left	06:24
	← chuckharmston left	06:26
	← kukks left	06:27
	→ chuckharmston joined	06:27
	← Sigma left	06:29
	← BiggFREE left	06:30
	→ dunin joined	06:30
	← Katafalkas left	06:31
	← chuckharmston left	06:31
	→ lite_ joined	06:32
	→ Katafalkas joined	06:32
	→ sebhoss joined	06:32
	← N0body99 left	06:32
	→ User458764 joined	06:33
	→ Katafalk_ joined	06:35
	← kloeri left	06:35
	→ kloeri joined	06:35
	← Gamecubic left	06:36
	← jfoy left	06:36
	← Katafalkas left	06:36
	← sebhoss left	06:37
	← dunin left	06:37
	→ pantsman joined	06:37
	← pantsman left	06:37
	→ pantsman joined	06:37
	→ vipzrx joined	06:38
	← vipzrx left	06:38
	→ jargon joined	06:39
	← Katafalk_ left	06:39
	→ vipzrx joined	06:39
	← vipzrx left	06:39
	← Goplat left	06:39
	→ kukks joined	06:40
	← daito left	06:41
	→ arvind_khadri joined	06:41
	→ daito joined	06:41
	← surfdue left	06:41
	← h0bbit_ left	06:42
	→ surfdue joined	06:42
	← madewokherd left	06:43
	← dyng left	06:44
	→ madewokherd joined	06:44
	→ sebrock joined	06:44
	→ dyng joined	06:45
	← daito left	06:46
	← sebrock left	06:49
	→ Katafalkas joined	06:49
	→ dburba joined	06:50
	→ vipzrx joined	06:52
	→ Brmm joined	06:52
	← vipzrx left	06:52
	→ marthinal joined	06:53
bluesm	Do you know any repo that have decent amount of tags ?	06:55
	To make exerciese on tags ?	06:56
	← nottombrown left	06:56
	← yacks left	06:56
	→ sente joined	06:56
Nevik	bluesm: linux.git	06:57
	or git.git	06:57
cjh`	http://git.koha-community.org/gitweb/?p=koha.git;a=summary has about 400 tags	06:57
	→ nottombrown joined	06:57
	← avolz left	06:58
	← nottombrown left	06:58
	← User458764 left	06:58
	→ nottombrown joined	06:58
	← nottombrown left	06:58
	→ nottombrown joined	06:59
	← mfulz left	06:59
	→ mlechner joined	06:59
	→ thierryp joined	07:00
	← MattMaker left	07:00
	← kukks left	07:00
	→ MattMaker joined	07:00
	← arvind_khadri left	07:02
bluesm	Neptu: cjh` : Thanks :)	07:03
	← acl_ left	07:03
	← kukks1 left	07:04
	← nottombrown left	07:04
	← woollyams left	07:04
	← JustinMac left	07:04
	← SirFunk left	07:05
	→ lun__ joined	07:05
	→ daito joined	07:05
	→ johnkevinmbasco joined	07:07
	← pantsman left	07:07
	→ sebrock joined	07:07
	← jargon left	07:08
	→ BiggFREE joined	07:08
	→ SirFunk joined	07:08
	← guest242 left	07:08
	→ guest242 joined	07:08
	→ jargon joined	07:09
	→ papegaaij joined	07:09
	→ cbreak-work joined	07:10
	← Brmm left	07:10
	→ freimatz joined	07:10
	→ dunin joined	07:11
	← mitz left	07:11
	← dunin left	07:11
	← delasteve left	07:11
	→ dunin joined	07:12
	→ mitz joined	07:12
	→ mishok13 joined	07:13
	→ arvind_khadri joined	07:13
	→ fRAiLtY- joined	07:13
	→ Brmm joined	07:14
	→ soee joined	07:14
	← SirFunk left	07:16
	→ SergeyPenkin joined	07:16
	→ JohnBat26 joined	07:16
	← ErKa left	07:17
	← nafg left	07:18
	→ Mars___ joined	07:18
	→ sebhoss joined	07:18
	← jrobichaud left	07:19
	→ Rix joined	07:19
	← dhruvasagar left	07:20
	→ dhruvasagar joined	07:21
	← galaris left	07:22
	← Katafalkas left	07:23
	→ Katafalkas joined	07:23
	← maestrojed left	07:24
	→ cenuij joined	07:25
	← cenuij left	07:25
	→ cenuij joined	07:25
	← Katafalkas left	07:25
	→ Katafalkas joined	07:25
	← matanya left	07:26
	→ samuel02 joined	07:27
	→ chuckharmston joined	07:27
	← brandonw left	07:28
	→ TomyLobo joined	07:28
	→ brandonw joined	07:30
	→ Gonzo89 joined	07:30
	← mishok13 left	07:31
	→ robbyoconnor joined	07:31
	→ chuck8 joined	07:31
	→ ciampix joined	07:31
	← guest242 left	07:32
	→ Xethron joined	07:33
	← Xethron left	07:33
	→ Xethron joined	07:33
	← chuckharmston left	07:33
	← Mars___ left	07:33
	→ magnus^p joined	07:33
	→ hellopat joined	07:33
	→ Mars___ joined	07:33
jast	.man_update	07:34
gitinfo	jast: You must be logged into NickServ in order to use this command.	07:34
	← magnus^^p left	07:34
jast	.man_update	07:34
gitinfo	jast: Manpage index updating. Please allow a few seconds before using again.	07:34
jast	jrnieder: ^ :)	07:34
	→ takamichi joined	07:35
	→ vipzrx joined	07:35
	← noname001__ left	07:35
	→ h0bbit_ joined	07:36
	← chuck8 left	07:36
	→ nnyk_ joined	07:37
	← nnyk_ left	07:37
	← Mars___ left	07:38
	→ sm0ke joined	07:38
	← mattattaque left	07:38
	← hellopat left	07:38
	→ nnyk_ joined	07:38
	← nnyk_ left	07:39
	← dunin left	07:39
	→ ngladitz joined	07:39
	← ngladitz left	07:39
	→ ngladitz joined	07:39
	→ Advocation joined	07:39
	← arvind_khadri left	07:40
	→ srajan joined	07:41
	← srajan left	07:41
	→ srajan joined	07:41
	← srajan left	07:41
	← threesome left	07:42
	← beautifulmind left	07:43
	→ JustinMac joined	07:43
	→ blahdodo joined	07:43
	→ maestrojed joined	07:43
	← samuel02 left	07:44
	← Advocation left	07:44
	← madewokherd left	07:44
	← knighthawk left	07:44
	→ acharlieh joined	07:45
	→ knighthawk joined	07:45
	→ eijk joined	07:45
	→ netiul joined	07:49
	← netiul left	07:49
	→ netiul joined	07:49
	← knighthawk left	07:49
	← simesy left	07:51
	← Cassiel left	07:51
	→ simesy joined	07:52
	← mitz left	07:52
	→ h_kon joined	07:54
	→ mitz joined	07:55
	→ SirFunk joined	07:56
	← simesy left	07:56
	← thierryp left	07:56
	← twoface88 left	07:56
	→ thierryp joined	07:56
	→ joelmo joined	07:57
	→ chuckharmston joined	07:58
	→ simesy joined	07:59
	→ mishok13 joined	07:59
	← luc_ left	08:00
	← Kicer86 left	08:00
	← TomyLobo left	08:00
	→ noname001__ joined	08:01
	→ Kicer86 joined	08:01
	← thierryp left	08:01
	← chuckharmston left	08:02
	← kermit left	08:02
	← shoshin left	08:03
	← _Vi left	08:03
	→ Raging_Hog joined	08:04
	→ Guest4410 joined	08:04
	← fairuz left	08:05
	→ fairuz joined	08:05
	← fairuz left	08:05
	← blahdodo left	08:05
	← qknight left	08:05
	→ luc_ joined	08:06
	→ lb1a joined	08:06
	← thelorax123 left	08:08
	→ occup4nt joined	08:08
	→ harobed joined	08:09
	→ nottombrown joined	08:09
	→ juril joined	08:10
	→ thelorax123 joined	08:10
	→ xerxas joined	08:11
	← occupant left	08:11
	→ blahdodo joined	08:12
	← Exdaix left	08:15
	← nottombrown left	08:15
	→ fightback joined	08:15
	← acharlieh left	08:15
	← mitz left	08:16
	← sebhoss left	08:17
	→ mitz joined	08:17
	→ sebhoss joined	08:17
	→ WECoyote joined	08:18
	← WECoyote left	08:18
	← Norm__ left	08:19
	← dev__ left	08:19
	→ staafl joined	08:19
	→ mf_ joined	08:21
	→ Chwing joined	08:21
	→ threesome joined	08:21
	← sebhoss left	08:22
	→ shruggar joined	08:23
	→ rendar joined	08:23
	→ neo1691 joined	08:24
	→ _Qman joined	08:25
	→ galaris joined	08:27
	→ aChatir joined	08:28
	→ honk joined	08:28
	← maestrojed left	08:29
	→ marhaban joined	08:29
	← oojacoboo left	08:29
	→ shoshin joined	08:29
	← marhaban left	08:29
	→ Sonderblade joined	08:30
	juvenal_away → juvenal	08:30
	← Sonderblade left	08:30
	→ Sonderblade joined	08:31
	← Katafalkas left	08:31
	← CreativeEmbassy left	08:31
	← jayrobot left	08:31
	→ HelloShitty joined	08:31
	→ guest242 joined	08:31
	→ _Vi joined	08:32
	← aChatir left	08:32
	→ thierryp joined	08:32
	→ sebhoss joined	08:33
	→ vurma joined	08:33
	→ snql joined	08:33
	→ khushildep joined	08:33
	→ guest2421 joined	08:35
honk	Hello, I've got a question regarding git-svn and the resulting git repository: I'm trying to migrate a project from svn to git via "git svn clone --stdlayout", but most of the branches from svn have a pretty broken history in git: the first commit on the branch in git does not have a parent at all and is completely empty, the second commit (with the same commit message) adds all files.	08:35
	→ garrilla joined	08:35
honk	this breaks merging pretty much completely as far as I can tell :/	08:35
	← guest242 left	08:35
honk	(the branches were created via eclipse's svn plugin and show up properly in the svn history)	08:35
_ikke_	honk: It's a limitation in git svn. You can use git grafts to manually add those references	08:36
	← joelmo left	08:36
	← guest2421 left	08:36
	→ guest242 joined	08:37
garrilla	i want to include (but not alter) someone else's repo in my project - for example, d3.js - is there something I have to do with git to do this?	08:37
	← sebrock left	08:37
_ikke_	!subprojects	08:38
gitinfo	So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	08:38
_ikke_	garrilla: Sounds like a usecase for !submodules	08:38
gitinfo	garrilla: [!submodule] git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://book.git-scm.com/5_submodules.html	08:38
honk	_ikke_: I see. I'll try to google a bit and see if I understand that. thanks so far	08:38
	← Brmm left	08:39
	← bgerber left	08:39
	→ _iron joined	08:40
	→ Advocation joined	08:40
	→ bgerber joined	08:40
	← khushildep left	08:40
garrilla	ok, so what are the scenarios where I would use gitignore or submodule ?	08:41
_ikke_	with .gitignore, you just clone the project in a directory and ignore it. That means when someone else clones the project, he has no clue there is still a submodule required	08:42
	→ chovy joined	08:42
	← cenuij left	08:42
chovy	is it bad if i do 'git push origin master' and 'git push test master' and 'git push prod master' simultaneously in 3 different windows from my working copy?	08:43
	→ Mars___ joined	08:44
	← Advocation left	08:44
	← _Vi left	08:44
	← Xethron left	08:45
	→ Misan joined	08:46
moritz	chovy: I don't think so	08:46
	→ dabi joined	08:46
	← thierryp left	08:46
	→ jarr0dsz joined	08:46
	→ thierryp joined	08:47
garrilla	as you can tell I'm very noob - my case is is simple, I'm make a web-app that takes some open data and builds a graph. It will have a page each for html,css,js,& php. It will use the d3.js library, which I have downloaded. I don't understand if I should include this in my repo... it seems like if everyone who ever used jquery added it to their repo it would get messy... so I'm guessing I...	08:48
	...should download it to my project folder but gitignore it?	08:48
	← Mars___ left	08:48
	→ intellix joined	08:48
	← j416 left	08:49
	→ TomyWork joined	08:49
	juvenal → juvenal_away	08:49
	→ alorence joined	08:50
	← dcpc007_ left	08:50
	← dabi left	08:50
	juvenal_away → juvenal	08:50
	→ sebhoss_ joined	08:51
	→ dcpc007 joined	08:51
	← sebhoss left	08:51
	→ stardiviner joined	08:51
	← thierryp left	08:51
	← shruggar left	08:51
	→ h0bbit joined	08:51
	→ dreiss joined	08:52
moritz	garrilla: there are basically three options	08:52
	1) adding it to your repo	08:52
	2) include it as a submodule	08:52
	3) don't include it, .gitignore it	08:52
	→ nnyk_ joined	08:52
	→ wrouesnel2 joined	08:52
	← nnyk_ left	08:52
moritz	1) is easiest to deploy, but gets messy if you update to a new d3.js version often	08:52
	2) is a rather clean solution, but requires messing with submodules	08:53
	→ halu joined	08:53
moritz	and 3) is problematic, because there is no validation or automatic provision of the correct d3.js version	08:53
	so I'd go either with 1) or 2)	08:54
	→ ewnd9 joined	08:54
stardiviner	Is there a good way to to manage a github repository's wiki repo in current repository's directory ?	08:55
	→ harish_ joined	08:55
	→ brammm joined	08:55
brammm	I have accidentily done a git commit -am and committed two files I didn't want to commit. Now I would like to amend that commit by adding two more files (but also extracting the other two), what would be my best approach?	08:56
	← lun__ left	08:56
brammm	amend first and then take out the other two?	08:56
	or undo the entire commit?	08:56
	→ FernandoBasso joined	08:57
garrilla	moritz thx	08:57
	← Watabou left	08:57
	→ thierryp joined	08:57
	← luc_ left	08:58
canoon	brammm, you can revert the other files by doing `git checkout HEAD^ file; git add file`	08:58
	then just ammend	08:58
moritz	brammm: undo the commit with 'git reset HEAD^', bring the staging area to the state you want it, then commit	08:58
	or what canoon said :-)	08:58
brammm	aha, okay , thanks ^^	08:58
moritz	there's more than one way to do it :-)	08:59
brammm	all roads lead to Rome, clearly ^^	08:59
	← teran left	08:59
	→ fightbac_ joined	08:59
	← fightbac_ left	08:59
err_ok	How did i miss this happening... http://www.reddit.com/r/programming/comments/1qefox/jenkins_developers_accidentally_do_git_push_force/	08:59
	→ Watabou joined	08:59
	← fightback left	08:59
brammm	god damnit, now I do git commit -am again >.<	08:59
	stupid muscle memory	08:59
moritz	brammm: I know, I do that all the time too, and always curse afterwards	09:00
	→ cenuij joined	09:00
	← cenuij left	09:00
	→ cenuij joined	09:00
moritz	err_ok: not reading hackernews or r/programming, I presume :-)	09:00
err_ok	moritz: as yes	09:00
	→ tty-1 joined	09:00
err_ok	ah *	09:00
	← guest242 left	09:00
	→ guest242 joined	09:01
	← guest242 left	09:01
	→ guest242 joined	09:02
	→ Bass10 joined	09:02
	→ luc_ joined	09:02
	← Rob___ left	09:03
	→ srji joined	09:04
	← Watabou left	09:04
	→ Kayra joined	09:04
	→ Nicholas_Rishel joined	09:05
	← Nicholas_Rishel left	09:05
	→ j416 joined	09:05
	→ Rob___ joined	09:05
	← thierryp left	09:07
	← wrouesnel2 left	09:07
	← j416 left	09:08
	→ thierryp joined	09:08
	→ germanoak joined	09:08
	← Bass10 left	09:08
	→ Mars___ joined	09:09
	→ j416 joined	09:09
	← v0n left	09:11
	→ sebrock joined	09:11
	← sebrock left	09:11
	← thierryp left	09:13
	→ lun__ joined	09:13
	→ vadym joined	09:14
	→ Serus joined	09:15
	→ rath joined	09:15
	← chovy left	09:16
	→ Octalot joined	09:16
	← j416 left	09:16
	→ j416 joined	09:16
	juvenal → juvenal_away	09:17
	→ mdiers joined	09:17
	← Mars___ left	09:19
	→ Mars___ joined	09:19
	→ twoface88 joined	09:20
	→ user258467 joined	09:20
	→ shruggar joined	09:20
	→ hellopat joined	09:22
	→ sabgenton joined	09:22
	→ m0ltar joined	09:22
sabgenton	is there any way to supress the bla bla detatched head message?	09:23
	well ok it usefull but at least shorten it?	09:23
	git config detatchedhead.warning.shorter = true ?	09:24
_ikke_	You can only disable them	09:24
	← Mars___ left	09:24
sabgenton	how?	09:24
	← germanoak left	09:24
	→ mattattaque joined	09:24
_ikke_	git config --global advise.detachedHead false	09:24
	git config --global advice.detachedHead false	09:24
	→ mbuf joined	09:24
	← dreiss left	09:25
sabgenton	ah thanks, I'm using __git_ps1 in my $PS1 anyways	09:25
	moritz doesn't quite see the relation	09:25
	→ SimonNa joined	09:26
	← guest242 left	09:26
sabgenton	when you in detatched head you prompt says d0cea02	09:26
_ikke_	moritz: it would tell you you are in a detached HEAD	09:26
sabgenton	not	09:26
	master	09:26
	etc	09:26
	← hellopat left	09:26
moritz	_ikke_: ah	09:26
sabgenton	moritz: the prompt gives you a sha1 rather than a branch etc	09:27
mbuf	is there a way that git can identify which C function changed? or if language support needs to be included where can it be done inside git?	09:27
	← zaczee left	09:27
	← j416 left	09:28
	→ j416 joined	09:28
	→ zaczee joined	09:28
	← maslowbeer left	09:28
osse	mbuf: the diff header (@@ blabla @@) usually says which function the diff hunk belongs to	09:28
	→ teran joined	09:29
	← h_kon left	09:29
	→ DaisyTheCow joined	09:29
mbuf	osse: if there are changes in multiple functions in a file, I have observed that the diff header only mentions the first function	09:30
	→ h_kon joined	09:30
mbuf	osse: git log -p \| grep -E '^(commit\|@@)' \| sed 's/@@.*@@//'	09:31
osse	but there are multiple headers :O	09:31
mbuf	osse: it doesn't list for all the functions	09:32
sabgenton	_ikke_: so my only way to change the detached msg would be to recompile git?	09:32
_ikke_	sabgenton: afaik, yes	09:32
osse	mbuf: du you have an example?	09:32
sabgenton	:(	09:32
	→ thierryp joined	09:34
	→ hotsyk joined	09:34
	→ j0ran1 joined	09:34
	← hotsyk left	09:34
	← dyng left	09:34
	→ v0n joined	09:35
	→ hotsyk joined	09:35
	← hotsyk left	09:35
	→ hotsyk joined	09:36
mbuf	osse: https://github.com/kushaldas/retask	09:36
	← hotsyk left	09:36
mbuf	osse: SHA1 5ae123bfec78751831a8743c59c1662f3d6b4794	09:36
	← takamichi left	09:36
	→ hotsyk joined	09:36
	← hotsyk left	09:37
	← harobed left	09:37
_ikke_	https://github.com/kushaldas/retask/commit/5ae123bfec78751831a8743c59c1662f3d6b4794	09:37
	→ hotsyk joined	09:37
	← hotsyk left	09:37
	← sqlnoob left	09:38
	→ takamichi joined	09:38
	→ Norm_ joined	09:38
	→ hotsyk joined	09:38
	← hotsyk left	09:38
	juvenal_away → juvenal	09:38
	→ beautifulmind joined	09:38
	← calcifea left	09:39
	→ harobed_ joined	09:39
	← harobed_ left	09:39
	→ hotsyk joined	09:39
	→ faBimon joined	09:39
	← hotsyk left	09:39
	→ calcifea joined	09:39
	← Kayra left	09:39
	→ hotsyk joined	09:40
	← hotsyk left	09:40
	→ hotsyk joined	09:40
	← hotsyk left	09:41
	→ Advocation joined	09:41
	→ hotsyk joined	09:41
	→ dyng joined	09:42
	← hotsyk left	09:42
	← h0bbit left	09:42
	← neo1691 left	09:42
	← sm0ke left	09:42
	→ hotsyk joined	09:42
	← hotsyk left	09:42
	→ hotsyk joined	09:43
	← calcifea left	09:43
	← hotsyk left	09:43
	→ neo1691 joined	09:43
	→ calcifea joined	09:43
	← calcifea left	09:44
	→ calcifea joined	09:44
	→ maslowbeer joined	09:44
	→ hotsyk joined	09:45
	← hotsyk left	09:45
	← Advocation left	09:45
	→ Kayra joined	09:45
	→ Xethron joined	09:45
	← Xethron left	09:45
	→ Xethron joined	09:45
	→ hotsyk joined	09:45
	← hotsyk left	09:46
	→ hotsyk joined	09:46
	← hotsyk left	09:47
	← tty-1 left	09:47
	→ achadwick joined	09:47
	← j416 left	09:47
	→ j416 joined	09:47
	→ hotsyk joined	09:47
	← hotsyk left	09:48
	→ hotsyk joined	09:48
	← hotsyk left	09:49
	→ hotsyk joined	09:49
	→ RaceCondition joined	09:49
	← hotsyk left	09:49
	→ hotsyk joined	09:50
	← hotsyk left	09:50
	→ hotsyk joined	09:51
	← hotsyk left	09:51
	→ Vinnie1991 joined	09:51
	→ BSaboia joined	09:51
	→ hotsyk joined	09:51
	← hotsyk left	09:52
	← weiyang left	09:52
	→ hotsyk joined	09:52
	← hotsyk left	09:53
	→ Sendoushi joined	09:53
	→ Tuna-Fish joined	09:53
	→ raonyguimaraes joined	09:53
	→ hotsyk joined	09:53
	← hotsyk left	09:53
	juvenal → juvenal_away	09:54
	→ hotsyk joined	09:54
	← hotsyk left	09:54
	→ hotsyk joined	09:55
	← hotsyk left	09:55
	→ hotsyk joined	09:56
	← hotsyk left	09:56
	→ hotsyk joined	09:56
	← hotsyk left	09:57
	→ asakura joined	09:57
osse	hmm	09:57
	← oscarholmedo left	09:57
osse	seems like as far as Git is concerned there's only two hunks	09:57
	→ hotsyk_ joined	09:57
osse	mbuf: you can look at man gitattributes ("Defining a custom hunk-header")	09:58
gitinfo	mbuf: the gitattributes manpage is available at http://jk.gs/gitattributes.html	09:58
	→ jkremser joined	09:58
	← jkremser left	09:58
	→ jkremser joined	09:58
	← GT4066 left	09:59
	← SirFunk left	10:00
	→ Mars___ joined	10:00
	← FernandoBasso left	10:00
	← echo-area left	10:00
	← srji left	10:01
mbuf	osse: thanks!	10:01
	← Mars___ left	10:01
	← m0ltar left	10:01
	← johnkevinmbasco left	10:02
	→ Mars___ joined	10:02
osse	Hmm, I get more relevant hunk headers with Git 18.4 locally than what github gives	10:03
	(I come from the future where Git 18 was released to wide critical acclaim last year)	10:04
	← matthiaskrgr left	10:05
	← staafl left	10:05
	← dsantiago left	10:06
	← Mars___ left	10:06
	← Search12 left	10:07
	← Gonzo89 left	10:07
	→ Mars___ joined	10:08
	← neo1691 left	10:08
	→ neo1691 joined	10:08
	→ harobed joined	10:09
	← terminalRepeat left	10:09
	← harobed left	10:09
_ikke_	cool	10:09
	→ harobed joined	10:10
	← harobed left	10:10
	→ harobed joined	10:11
	← harobed left	10:11
	→ spaceonline joined	10:11
	→ harobed joined	10:12
	← harobed left	10:12
	→ ChrisAnn joined	10:12
	diget_ → diget	10:12
	→ arvind_khadri joined	10:12
	→ harobed joined	10:12
	← harobed left	10:13
lb1a	osse, is it compatible with linux 42.2834.2323.21 ?	10:13
	← takamichi left	10:13
lb1a	LTS	10:13
	→ nnyk_ joined	10:13
	→ harobed joined	10:13
	← harobed left	10:14
	← nnyk_ left	10:14
	→ takamichi joined	10:14
	→ mklappstuhl joined	10:15
	→ harobed joined	10:15
	← raonyguimaraes left	10:15
	ChanServ changed the topic to: Welcome to #git, the place for git-related help and french toast \| Current stable version: 1.8.4.3 \| Start here: http://jk.gs/git \| Seeing "Cannot send to channel" or unable to change nick? /msg gitinfo .voice \| When you play the game of clones, you merge or you reset --hard.	10:16
	→ abdostar joined	10:16
osse	lb1a: of course	10:16
lb1a	good	10:16
	:)	10:16
osse	lb1a: everywhere libe runs, Git runs	10:17
	→ vtunka joined	10:17
lb1a	faboulubuntu sould be compatible then	10:17
	should*	10:17
	← neo1691 left	10:18
osse	E is the prevailing language in my time, the successor to D. (Not to be confused with the party drug)	10:19
	← BiggFREE left	10:20
	← Mars___ left	10:20
	← lite_ left	10:20
	→ Mars___ joined	10:20
	← harobed left	10:21
	→ johanhar joined	10:21
	← abdostar left	10:21
	→ harobed joined	10:21
	← harobed left	10:21
johanhar	I am working in a submodule. I have a detached HEAD. Changes has been done on remote. If I checkout master, fetch and merge, will I lose all my commits and changes?	10:21
	→ harobed joined	10:22
	← harobed left	10:22
	← mattattaque left	10:22
	← halu left	10:23
	→ m0ltar joined	10:23
_ikke_	johanhar: Have you made changes in the submodule itself?	10:23
	(on a detached HEAD)?	10:23
	→ lite_ joined	10:23
	← Vinnie1991 left	10:23
	→ mattattaque joined	10:23
	→ j0ran2 joined	10:24
johanhar	Yes	10:24
	I even commited	10:24
	:(	10:24
_ikke_	so git branch --contains HEAD returns nothing?	10:24
	just create a branc	10:24
	git branch -b <new_branch>	10:24
	→ Vinnie1991 joined	10:24
	← j0ran1 left	10:24
	→ codiez joined	10:25
johanhar	When I tried to push, git said that I was not working on any branch. When I tried to push to origin remote HEAD:master it said I needed to fetch first, because of changes in the repository on remote.	10:25
_ikke_	johanhar: correct	10:25
	← Mars___ left	10:25
johanhar	So if I do checkout master, fetch, merge origin/master (or was it master/origin, I dont remember the syntax), will I lose my commits and changes?	10:25
_ikke_	johanhar: You first need to create a branch!	10:26
	→ Mars___ joined	10:26
	← thierryp left	10:26
johanhar	Ok, thanks...	10:26
	→ strk joined	10:26
strk	how do I automaticall resolve conflicts to pick a "stash-popped" change ?	10:26
johanhar	Then I merge that new branch with master later on?	10:26
_ikke_	johanhar: correct	10:27
strk	git checkout stash@{0} <the_file> # did it, it looks like	10:27
	← mklappstuhl left	10:27
strk	but I'm not sure I hadnt checkout the _next_ stashed thing, since "git stash pop" should supposedly remove what's been just appled from the stack ?	10:28
	← Mars___ left	10:28
	→ Mars___ joined	10:28
_ikke_	strk: git stash pop doesn't drop the stash when conflicts happen	10:28
	→ dunin joined	10:29
	← Draconis left	10:29
	← dunin left	10:29
johanhar	_ikke_: so I create the branch, checkout master, fetch, merge origin/master (or master/origin, which syntax?), and then merge master with that branch (syntax for this? thanks)	10:29
	← h_kon left	10:29
	→ Draconis joined	10:29
	→ dunin joined	10:30
	← dunin left	10:30
_ikke_	johanhar: Yes. The syntax is origin/master (<remotename>/<branchname>)	10:30
	→ SirFunk joined	10:30
_ikke_	johanhar: But you should merge that new branch into master	10:30
	→ dunin joined	10:31
	← dunin left	10:31
	juvenal_away → juvenal	10:31
johanhar	Ok.. Hmm	10:32
	→ dunin joined	10:32
	← dunin left	10:32
	← Mars___ left	10:33
	→ eletuchy_ joined	10:33
	→ sm0ke joined	10:33
	→ dunin joined	10:34
	→ guest242 joined	10:34
	← Kayra left	10:34
	← dunin left	10:34
	→ Kayra joined	10:35
	← eletuchy left	10:36
	← ciampix left	10:36
	← zaczee left	10:37
	← m0ltar left	10:37
	← eletuchy_ left	10:37
	← luc_ left	10:38
	← Kayra left	10:39
	→ m0ltar joined	10:40
	← galaris left	10:41
	← pradeepc left	10:42
	← pradeepc_ left	10:42
	→ Brmm joined	10:42
lb1a	.trigger_edit cgit http://git.zx2c4.com/cgit/about/ web interface (cgi) for git repositories, written in C	10:43
gitinfo	lb1a: Okay.	10:43
	→ dbuch joined	10:43
	← mattattaque left	10:43
	← gustavo__ left	10:43
	→ molten_tar joined	10:44
	→ ni__ joined	10:44
	→ mattattaque joined	10:44
lb1a	!botsnack	10:45
gitinfo	Om nom nom	10:45
	→ zhost joined	10:45
	← m0ltar left	10:46
	← Brmm left	10:47
	← mattattaque left	10:49
	← dhruvasagar left	10:49
	→ PeterBooker joined	10:49
	→ pradeepc joined	10:49
	← ni__ left	10:49
	→ h_kon joined	10:50
	→ dhruvasagar joined	10:50
	← frgtn left	10:50
	→ eletuchy joined	10:50
	→ victorbjelkholm joined	10:51
	→ frgtn joined	10:51
Serus	.random	10:51
gitinfo	that's normal. Next patient! [18]	10:51
	← frgtn left	10:51
	→ Ozch joined	10:51
	→ frgtn joined	10:51
	→ wet88 joined	10:52
	→ mikecmpbll joined	10:53
	← guest242 left	10:53
cbreak-work	https://arstechnica.com/security/2013/11/hoping-to-avert-collision-with-disaster-microsoft-retires-sha1/	10:54
	when will git follow microsoft's lead?	10:54
	← BSaboia left	10:55
	← Chwing left	10:55
	← mitz left	10:56
	→ penguin42 joined	10:56
	→ halu joined	10:56
	← dhruvasagar left	10:56
	← zarubin left	10:57
	→ dhruvasagar joined	10:57
_ikke_	I deem the risk with git using sha1 lower then using it for secure connections	10:57
cbreak-work	using it to sign one of the most popular server kernel source codes?	10:58
	secure connections are less critical, their exposure is time limitted.	10:58
	but git history persists over year	10:58
_ikke_	Siging uses pgp / gpg	10:59
	→ Mars___ joined	10:59
cbreak-work	unlike the ephemeral ssl connections secured by certificates that expire within one or two years, git has to prepare for a much more long term exposure	10:59
	← DaisyTheCow left	10:59
	→ guest242 joined	10:59
cbreak-work	_ikke_: gpg/pgp is worthless if you can just change the commit with a colliding one.	10:59
	gpg only signs a hash.	10:59
_ikke_	I know	11:00
	← shoshin left	11:00
	← sebhoss_ left	11:00
	→ guest2421 joined	11:00
	← guest242 left	11:00
	← daito left	11:00
	→ daito joined	11:01
	← guest2421 left	11:01
	→ guest242 joined	11:01
	← lite_ left	11:01
	← h0bbit_ left	11:02
	← guest242 left	11:02
	→ guest242 joined	11:02
	← jazz264 left	11:03
	← dhruvasagar left	11:03
	→ angelsl joined	11:03
	→ shoshin joined	11:03
	juvenal → juvenal_away	11:03
	→ dhruvasagar joined	11:03
	→ h0bbit_ joined	11:03
	→ bvi joined	11:04
	→ jazz264 joined	11:04
	→ SpecialK joined	11:04
	← pikpik left	11:05
SpecialK	is it possible for a shallow clone to result in a repo with a detached HEAD?	11:05
	← zhost left	11:05
	← daito left	11:05
	← corygibbons left	11:06
_ikke_	cbreak-work: You could ask the question on the mailing list ;-)	11:06
	← Mars___ left	11:07
	→ corygibbons joined	11:07
	SpecialK → Maior	11:08
Maior	er, right, now again with the ability to speak	11:09
	is it possible for a shallow clone to result in a repo with a detached HEAD?	11:09
	← Norm_ left	11:09
Maior	(a shallow clone of a branch, or so it should be)	11:09
_ikke_	Maior: Your previous message came through too	11:10
	→ hellopat joined	11:10
Maior	_ikke_: ah whoops, apologies	11:10
	← brammm left	11:10
	juvenal_away → juvenal	11:10
Maior	"We have a spam protection system that prevents unregistered users from talking."; I wasn't registered, but yeah, probably should have expected a better failure UX than silence	11:10
	← dyng left	11:11
_ikke_	Maior: That was disabled again because gitinfo wasn't present a while ago	11:11
	→ dyng joined	11:11
Maior	ah right	11:11
	→ zapb_ joined	11:12
	← dyng left	11:13
	→ dyng joined	11:13
	← strk left	11:14
	← beautifulmind left	11:14
	← hellopat left	11:14
	→ Gavrisimo joined	11:15
	← teran left	11:15
	→ vjacob joined	11:15
	→ teran joined	11:15
	← teran left	11:16
	→ teran joined	11:16
	← dhruvasagar left	11:17
	→ caseydri_ joined	11:17
	→ dhruvasagar joined	11:17
	→ samuel02 joined	11:17
	→ echo-area joined	11:18
	← teran left	11:18
	→ teran joined	11:19
	← donmichelangelo left	11:19
	← aisbaa_ left	11:19
	← amcsi_work left	11:19
	← dyng left	11:20
	← teran left	11:20
	← hotsyk_ left	11:20
	→ teran joined	11:20
	→ donmichelangelo joined	11:20
	→ Norm_ joined	11:20
	→ asQuirreL joined	11:21
	→ aisbaa joined	11:21
	→ beautifulmind joined	11:23
	→ brammm joined	11:23
	→ galaris joined	11:24
	→ dyng joined	11:24
	← snql left	11:25
	juvenal → juvenal_away	11:25
	← blahdodo left	11:27
	← bvi left	11:27
	← JustinMac left	11:27
d33tah	could I somehow configure git status so that it'd first show me the untracked files, then a newline and untracked directories?	11:27
	← dyng left	11:28
	← guest242 left	11:29
	→ abelsiqueira joined	11:30
	← ezekielnoob left	11:31
	→ the_cybersphinx joined	11:31
	← beautifulmind left	11:32
	→ ezekielnoob joined	11:32
	← boblehest left	11:32
	← jnewt left	11:33
_ikke_	d33tah: I don't think so	11:33
	→ boblehest joined	11:34
	← vjacob left	11:35
canoon	lol unless you want "git status --porcelain \| grep '/$' ; echo ; git status --porcelain \| grep -v '/$'"	11:35
lb1a	canoon, just thought of that ;)	11:35
	← dhruvasagar left	11:35
canoon	d33tah, directories aren't really "tracked" anyway	11:36
	just the files	11:36
d33tah	yeah, i know, but they're in git status results and obfuscate it	11:38
	← ewnd9 left	11:38
	→ davividal joined	11:38
canoon	d33tah, do you actually just want the files then?	11:40
	no directories	11:40
Maior	hm so actually this looks like a Bamboo bug	11:40
canoon	--untracked-files=all sounds like what you want	11:40
d33tah	canoon: yeah, that could work as well.	11:40
Maior	'til I get it fixed - is there a decent way to approximately go from commit hash, to "these branches have that in their history"?	11:40
	→ dhruvasagar joined	11:41
	← err_ok left	11:41
	→ jnewt joined	11:41
	→ Advocation joined	11:42
	← Entomo left	11:42
lb1a	Maior, git branch --contains <sha>	11:43
	← arand left	11:43
	← molten_tar left	11:43
	← codiez left	11:43
jnewt	i'm trying to squash two commits in a branch that was merged with master. everytime i do, it creates a new branch. is it possible to do an in-place squash?	11:43
	→ beautifulmind joined	11:43
	→ tureba joined	11:43
	→ codiez joined	11:43
	← kcj left	11:44
lb1a	jnewt, "in a branch that was merged with master" ? i guess you mean change the history of the master branch and squash these 2 commits	11:44
	in that case git rebase -i can help you	11:45
	but be aware of !rewrite	11:45
gitinfo	[!rewriting_public_history] Rewriting public history is usually bad. 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` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	11:45
	→ HenryG joined	11:45
	→ Kayra joined	11:45
jnewt	lbla: i'm aware of the history rewriting.	11:45
lb1a	good	11:45
	s/lbla/lb1a/	11:46
	← Advocation left	11:46
jnewt	but, everytime i do git rebase -i, and set the two commits to squash, the original lines remain, but a new branch is created, which doesn't merge with master	11:46
Maior	lb1a: thanks	11:46
	→ aChatir joined	11:46
lb1a	jnewt, !repro	11:46
gitinfo	jnewt: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	11:46
	← aChatir left	11:47
	← Vinnie1991 left	11:48
	← tirengarfio left	11:49
	← Kayra left	11:50
	→ tirengarfio joined	11:50
	← asQuirreL left	11:51
	← paulweb515 left	11:52
	→ guest242 joined	11:52
	← Misan left	11:53
	→ Misan joined	11:54
	→ aChatir joined	11:55
	→ codiez_ joined	11:55
	← guest242 left	11:56
	→ harobed joined	11:57
	← harobed left	11:57
jnewt	lbla: seems to happen on a branch with no merge too. i just do rebase -i <sha of commit i want to squash into> then select to squash a couple commits after that one.	11:58
	→ harobed joined	11:58
jnewt	then i get Successfully rebased and updated detached HEAD	11:58
	← dhruvasagar left	11:58
canoon	jnewt, sounds like you aren't on a branch to begin with	11:58
	← codiez left	11:59
	← boombatower left	11:59
	← brammm left	12:00
	← penguin42 left	12:00
	→ sebhoss joined	12:01
	→ dsantiago joined	12:02
	→ lite_ joined	12:03
	→ cmpera joined	12:03
	→ chuckharmston joined	12:03
	→ Mars___ joined	12:03
	→ dhruvasagar joined	12:03
	→ Brmm joined	12:04
	juvenal_away → juvenal	12:05
	← canoon left	12:07
	→ nnyk_ joined	12:07
	← Mars___ left	12:08
	→ arand joined	12:08
	→ tty-1 joined	12:09
	← tirengarfio left	12:09
	← tureba left	12:09
	← Brmm left	12:10
	→ lun___ joined	12:10
	→ tirengarfio joined	12:11
	← lun__ left	12:11
	→ thierryp joined	12:11
	← Xethron left	12:11
	→ mklappstuhl joined	12:12
	→ ni__ joined	12:13
	← eletuchy left	12:13
	→ eletuchy joined	12:13
	← dhruvasagar left	12:13
	→ Xethron joined	12:14
	← Xethron left	12:14
	→ Xethron joined	12:14
jnewt	cannon: yeah, you're right, when the branch is not merged, it works fine, i just didn't have it checked out	12:14
	→ Kayra joined	12:14
	→ dhruvasagar joined	12:14
jnewt	canoon ^	12:14
	but if it's merged, the original commits and the subsequent merge remain, and the branch them becomes unmerged	12:15
	← xpirator left	12:15
	→ omarek joined	12:16
omarek	Hi, I just restored 2 of my modified files with 'git checkout -- filename' and made a commit. Can I retrieve these modified versions ?	12:17
_ikke_	What do you mean with modified versions?	12:17
omarek	those from before 'git checkout -- filename'	12:17
_ikke_	you can't	12:18
	Unless you have git added them before	12:18
nnyk_	omarek: you basically removed the changes before the commit...git had no record of changes during the commit.	12:19
	→ rethus joined	12:19
	→ srji joined	12:20
	← mbuf left	12:20
	← dsdeiz left	12:21
	← dhruvasagar left	12:22
	← thierryp left	12:22
	→ Snibble joined	12:23
	← Snibble left	12:24
	← codiez_ left	12:24
	← tirengarfio left	12:24
rethus	if i do git status, i got one antracked file. But if i try to checkout another branch, 1. I got no response on cli, but 2. The branch is not changed.	12:25
	→ ewnd9 joined	12:25
	→ amcsi_work joined	12:25
	← bluesm left	12:25
_ikke_	rethus: Why do you think the branch is not changed?	12:25
rethus	git status show the wrong one	12:26
	→ tirengarfio joined	12:26
	→ daito joined	12:26
warbaque	what is the easiest way to get origin/master current sha id? currently I just checkout, use reflog and select id by hand	12:26
_ikke_	warbaque: Where do you need the id for?	12:26
	→ bitkiller joined	12:26
	← frgtn left	12:27
warbaque	_ikke_: for logging purposes	12:27
_ikke_	git rev-parse origin/master would do that	12:27
	→ frgtn joined	12:27
	← ni__ left	12:28
	→ DoniRS joined	12:28
	→ gasbakid joined	12:28
	→ thierryp joined	12:29
	← frgtn left	12:31
	→ safinaskar joined	12:31
	← Guest11993 left	12:32
rethus	i also use egit from eclipse, if i try to switch the branch with it, he say many non comitted files. But if i try to stash, reset or commit, it also dosent work. if i trd to commit, the list is empty	12:33
	← trooney left	12:33
	← Fandekasp left	12:33
	← daito left	12:33
jnewt	lbla: here's a simplified version of what i tred: http://pastebin.com/zHgDLnB7	12:34
	→ tty-1_ joined	12:34
	→ hellopat joined	12:35
	→ Fandekasp joined	12:35
rethus	switch to master worked. but switch to those both branches are not wored	12:36
	wokod	12:36
	worked	12:36
	:D	12:36
	→ a-l-e joined	12:36
	→ zhost joined	12:37
omarek	nnyk_: Thank you.	12:37
jnewt	question is how do i squash those commits "in-place"	12:37
nnyk_	omarek: yw	12:37
	← tty-1 left	12:38
	← bgerber left	12:39
	← hellopat left	12:39
rethus	ok, no checkout to each other branch still work	12:40
	→ bgerber joined	12:40
	tty-1_ → tty-1	12:40
johanhar	I'm in a submodule that had detached HEAD. I did many commits and when I wanted to push I got an error. Also remote has changes which needs to be fetched. So I made a branch, with git checkout -b work_13_11. When I try to say git push now, I get a fatal error: The current branch work_13_11 has no upstream branch. What does that mean?	12:41
	← sebhoss left	12:41
	→ sebhoss joined	12:41
	→ dyng joined	12:43
	→ tmcmahon joined	12:43
	← tirengarfio left	12:43
	→ Advocation joined	12:43
	→ marhaban joined	12:43
rethus	are any hardcore git expert here which can help me to save all my work in the branches :)	12:44
	← Misan left	12:44
Silex	johanhar: it means that git doesn't know on what to push the local branch you created	12:45
johanhar	How can I fix that Silex?	12:45
Silex	johanhar: you have work_13_11 which is your saved work. Now what do you want to do exactly?	12:45
	→ tirengarfio joined	12:45
	← tmcmahon left	12:45
Silex	get the latest changes and add yoru changes on top of that?	12:45
	← sebhoss left	12:46
	→ neo1691 joined	12:46
Silex	merge your changes with the latest changes?	12:46
johanhar	I had many commits in detached HEAD. I want those commits to master, but there is changes so I need to fetch. This is inside a submodule	12:46
Silex	ok	12:46
johanhar	Someone told me to make a branch, and then merge with master	12:46
Silex	yes, but you don't merge by pushign	12:46
johanhar	I thought maybe I had to push the new branch before doing so	12:47
	← dyng left	12:47
	→ guampa joined	12:47
johanhar	Can I checkout master and from there say merge work_13_11?	12:47
Silex	no. if you are afraid of losing work_13_11 and you want to push it upstream to keep it you can type "git push -u origin work_13_11". If you want to merge to your local master branch you shoudld type "git checkout master; git merge work_13_11;"	12:48
	← Advocation left	12:48
Silex	and if you want to get the latest changes you should then type "git pull" when on the master branch	12:48
johanhar	Thanks	12:48
Silex	the git pull could come in between the checkout and the merge	12:48
johanhar	What if I merge local branch and master, then pull?	12:49
Silex	it probably doens't matter	12:49
johanhar	The order of things here is confusing :)	12:49
	Ok	12:49
Silex	I mean, you can have conflicts both ways	12:50
	← aChatir left	12:50
johanhar	Yeah..	12:50
Silex	either teh conflcits are with the pull, or with the merge	12:50
	it depends which you prefer to have	12:50
johanhar	Dont know	12:50
	→ kaawee joined	12:50
johanhar	I'm new to git, don't know which is preferable	12:50
Silex	hum	12:50
johanhar	I'll try to push -u origin	12:50
	checkout master from there, and merge, and pull	12:50
	in that order, sounds ok?	12:51
Silex	yeah	12:51
johanhar	I'll try that then :) Thanks	12:51
	← Kayra left	12:51
Silex	keep in mind you can _always_ cancel and start over because of the reflog	12:51
	← neo1691 left	12:51
Silex	just make sure work_13_11 really do contain all your latest changes	12:51
	← jkremser left	12:51
	→ Kayra joined	12:51
johanhar	When HEAD was detached I did git checkout -b work_13_11	12:52
	Guess that the changes are not lost then	12:52
Silex	it looks ok. type "git log --oneline --all --graph --decorate"	12:52
	it'll show you your commits and the branches they are onto	12:52
	← mikecmpbll left	12:53
	→ xpe joined	12:53
	← sm0ke left	12:53
	→ gae7a joined	12:53
Silex	you should see the old master, and then your commits on top of it leading to work_13_11	12:53
johanhar	Thanks, its a mess because it is a submodule	12:53
Silex	well, remove --all maybe	12:53
johanhar	can make a gist	12:53
	https://gist.github.com/bstcm/7448612	12:54
	→ GT4066 joined	12:54
johanhar	It's norwegian, the commit messages	12:54
rethus	ok, now it works. Don't know why, or why not, sometime time does a good job :D	12:54
johanhar	But ok, trying the push -u origin now	12:54
	→ tincricket joined	12:56
	← Kayra left	12:56
johanhar	Silex: no conflicts :)	12:57
	Lovely, thanks man!	12:57
	→ keller joined	12:57
	← gae7a left	12:58
	→ mikecmpbll joined	12:59
Silex	yw	12:59
	→ gae7a joined	12:59
	← Fandekasp left	12:59
rethus	what is the best way to create a orgin master on staging-Server? Till now, i have git-repo only locally	13:00
jnewt	hwo do i squash commits in-place? here's my example: http://pastebin.com/zHgDLnB7 i don't want the branch moved out on it's own, i want the commits to be squashed "in-place"	13:00
Silex	johanhar: it helps to think of branches as "post its" put on a tree of commits	13:00
	→ Kayra joined	13:01
	← vtunka left	13:01
	→ rudak joined	13:01
	→ frgtn joined	13:02
	→ Exdaix joined	13:02
	← boblehest left	13:02
	→ staafl joined	13:03
	← Kayra left	13:03
	→ neo1691 joined	13:03
	→ Kayra joined	13:04
	→ johnkevinmbasco joined	13:04
	→ Mars__ joined	13:04
	→ erichynds joined	13:04
	→ guest242 joined	13:04
	→ BigBlueBacon joined	13:04
	→ kriks joined	13:04
	← Kayra left	13:05
	← vmiklos left	13:05
	← guest242 left	13:05
	→ Kayra joined	13:06
	→ guest2421 joined	13:06
	← Exdaix left	13:06
	← dbuch left	13:07
	→ fightback joined	13:08
	← MattStratton left	13:08
	← fightback left	13:08
	← Mars__ left	13:08
	← SimonNa left	13:08
	← safinaskar left	13:09
	→ Brmm joined	13:09
	→ guest242 joined	13:09
	← guest242 left	13:09
thegorn	jnewt: yea, this gets kinda complicated	13:09
	→ vmiklos joined	13:10
	← guest2421 left	13:10
	← jargon left	13:10
thegorn	jnewt: because of the fact that you are trying to merge an already merged branch	13:10
	← Kayra left	13:10
	→ Exdaix joined	13:10
	← mklappstuhl left	13:11
thegorn	jnewt: what you did so far is correct, but you'll need to redo the merge to master or whatever that other branch is	13:11
	→ jargon joined	13:11
	← j0ran2 left	13:11
	→ whaley joined	13:11
thegorn	so git checkout -b fixitup 4896e1f && git merge dev-track_rpm	13:11
	→ hyperair joined	13:11
	← MacGyver left	13:11
thegorn	and then you can use rebase to put the post-merge commits on master onto fixitup	13:12
	→ MacGyver joined	13:12
	→ guest242 joined	13:13
thegorn	but yea, once you merge you're kinda out of luck, it is recorded in the other branch's history so you can't just rewrite the merged branch and expect it to rewrite the merged-into branch as well	13:13
	→ dort joined	13:13
	← Brmm left	13:13
	← garrilla left	13:14
	→ rafeca joined	13:14
	→ jonatasnona joined	13:14
	→ guns joined	13:14
	→ gasbakid_ joined	13:14
	← abelsiqueira left	13:15
	→ freestyl3r joined	13:15
	← gasbakid left	13:15
	→ j0ran joined	13:16
	← MacGyver left	13:16
	→ MacGyver joined	13:17
	← MacGyver left	13:17
	→ MacGyver joined	13:17
	← gae7a left	13:17
	← hyperair left	13:20
	→ breakingthings joined	13:20
	→ jpalmer joined	13:21
	← jpalmer left	13:21
	→ jpalmer joined	13:21
	← marhaban left	13:21
	→ TheWarden joined	13:23
Sonderblade	say im working on branch a, now i want to import all file changes from branch b into a, without adding any new commits, is that possible?	13:23
	← vadym left	13:23
	→ fightback joined	13:23
TheWarden	Hi	13:24
	→ yacks joined	13:24
TheWarden	Is it possible to clone a repo and then have it automatically setup a few directories and then auto set permissions and ownership of the files/directories?	13:24
_ikke_	Sonderblade: "git checkout branchB ."	13:25
	(uncommitted changes will be overwritten)	13:25
Sonderblade	that's a really nice trick	13:28
	→ dglambert joined	13:30
	← thierryp left	13:30
thegorn	TheWarden: !backup	13:30
gitinfo	TheWarden: Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	13:30
	← cmpera left	13:30
	d1b_ → d1b	13:30
	→ cmpera_ joined	13:30
thegorn	ah, nm, no such luck	13:30
	TheWarden: i know gitinfo has some information about using git as a backup	13:31
dglambert	after I do my initial push "git push -u origin master" if I want to make another push, can I just say push	13:31
TheWarden	thegorn: thanks, not sure that is what I'm looking for. I want to git clone and then have permissions, ownership and a couple directories setup after the clone occurs.	13:32
thegorn	TheWarden: git doesn't track ownership/permissions	13:32
	and doesn't automatically run scripts post-clone (security nightmare)	13:32
	→ Snibble joined	13:32
thegorn	TheWarden: you could have a script in your git repo which sets up the permissions/ownership but past that you can't do it with stock git	13:33
TheWarden	thegorn: well normally I would agree but in the case that I'm using this in it would be very helpful. As it is now I have to do all this manually which takes quite some time to do. Maybe a git hook. I've never done hooks before.	13:33
thegorn	TheWarden: hooks are not part of the repository	13:34
	security nightmare again	13:34
Tectu	I'm trying to git svn rebase and I get "needs update" on every file. HOw to fix this? I want to get the state of the remote svn repo	13:34
	no local changes should be kept	13:34
thegorn	TheWarden: you need to just set up a script in your git clone called setup_permissions.sh and run that, in any case there is no point in doing it all manually	13:34
	but there isn't going to be something in git that does it automatically	13:34
	→ abelsiqueira joined	13:36
	→ mklappstuhl joined	13:36
	→ sebrock joined	13:36
thegorn	TheWarden: you might take a look at this list https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#Backups.2C_metadata.2C_and_large_files	13:37
	← rafeca left	13:37
TheWarden	thegorn: ok, thanks for your help.	13:37
thegorn	there might be some frontend that helps you out, gitperms/metastore/etckeepa/git-cache-meta	13:37
	those all look interesting for your situation	13:37
	→ paulweb515 joined	13:37
	→ kanyl joined	13:38
Tectu	can I tell git rebase to ignore all local files and just get the remote ones? I get a bunch of conflict on binary files	13:39
cbreak-work	Tectu: you can resolve them with git checkout --theirs -- file	13:39
kanyl	Can git do "sudo" on a remote server before pushing the changes?	13:39
Tectu	cbreak, can I do that on the whole repo?	13:40
cbreak-work	Tectu: see man git-merge for the theirs suboption for the recursive strategy too	13:40
gitinfo	Tectu: the git-merge manpage is available at http://jk.gs/git-merge.html	13:40
Tectu	I see	13:40
_ikke_	kanyl: no	13:40
cbreak-work	Tectu: only for ours	13:40
	← fightback left	13:40
Tectu	cbreak, I really don't want to do them all manually :(	13:40
cbreak-work	theirs exists as a conflict resolution strategy	13:40
	but not as a "ignore EVERYTHING I have"	13:40
	if you want that, why bother with rebase anyway?	13:40
	← chuckharmston left	13:40
cbreak-work	just use reset --hard	13:40
kanyl	_ikke_: What do I do instead?	13:41
Tectu	cbreak, It's a git mirror of an existing svn repo. It used to work fine by just running "git svn rebase && git push" so far. But now it's completely out of sync	13:41
kanyl	The repo is owned by another user	13:41
_ikke_	kanyl: Use a proper deployment system	13:41
	← whaley left	13:41
Tectu	cbreak-work, ^	13:41
	→ asQuirreL joined	13:41
_ikke_	kanyl: It's just for pushing?	13:41
	→ TheBrainWork joined	13:42
cbreak-work	Tectu: so... use git svn fetch instead	13:42
	→ Kayra joined	13:42
cbreak-work	then, instead of rebasing, use git reset --hard	13:42
_ikke_	kanyl: either setup the repo to be shared, or use something like gitolite	13:42
cbreak-work	look at git branch -a to find a branch to reset to	13:42
Tectu	cbreak-work, git svn fetch and then git reset --hard without any merging?	13:42
cbreak-work	yes	13:42
	→ mklappst_ joined	13:42
cbreak-work	you will lose local work	13:42
	but I assume you don't have any	13:42
kanyl	I got access to a customers server to do some changes on their website, the account I got has read access to the repo, so I cloned it over ssh, but then I can't push to it. sudo requires no password. I don't really want to mess around with the permissions if possible, I don't want to break anything on their server	13:42
	→ jkremser joined	13:43
	← jkremser left	13:43
	→ jkremser joined	13:43
	→ Dudalus joined	13:44
	→ vtunka joined	13:44
	→ sHeemskerk joined	13:44
	← mklappstuhl left	13:45
	← dglambert left	13:45
	← glebihan left	13:46
	→ aartist joined	13:46
	← keller left	13:46
	← Kayra left	13:46
sHeemskerk	Hello. can I ask here about EGit?	13:46
	→ Bass10 joined	13:46
	→ glebihan joined	13:46
YoungFrog	kanyl: this may be silly and I don't even know if it works, but I'd try, as user@remote, to do `git clone website.git' ; then set that cloned repo as your remote and push to it, and then you can push using your ssh access to the actual remote.	13:47
	kanyl: does that make sense ?	13:47
cbreak-work	kanyl: if you need sudo to push, then something's seriously broken	13:47
	kanyl: you should ask them how their deployment procedure works.	13:48
	→ MattStratton joined	13:48
kanyl	YoungFrog: Hmm, yes, so I have a copy in my home folder that I push to, and then push from that to the production one	13:48
	cbreak-work: Will do	13:49
rethus	what is the best way to create a orgin master on staging-Server? Till now, i have git-repo only locall	13:49
	→ Jackneill joined	13:49
	→ leeN joined	13:49
rethus	and is it recommended to put the orgin-master same time as staging-document-root?	13:49
lb1a	rethus, !deploy	13:50
gitinfo	rethus: 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/the-list-and-irc/deploy.html	13:50
	← lazers left	13:50
	← glebihan left	13:51
	← GarethAdams left	13:51
	→ glebihan joined	13:51
	→ hiroyuki joined	13:52
	→ dyng joined	13:52
	→ chuckharmston joined	13:52
	→ tvw joined	13:53
	→ Zarthus joined	13:53
	← stardiviner left	13:53
	→ alfadir joined	13:54
rethus	what better easy way to deploy are recommended for php projekts ?	13:55
	→ penguin42 joined	13:55
rethus	any suggestions?	13:55
	→ Sigma joined	13:56
	→ rc111 joined	13:56
	→ GarethAdams joined	13:57
	← GarethAdams left	13:57
	→ GarethAdams joined	13:57
	→ hyperair joined	13:57
	→ scampbell joined	13:57
	→ kevwil joined	13:57
	← gasbakid_ left	13:57
	→ gasbakid joined	13:58
	← neo1691 left	13:58
	→ adamwathan joined	13:58
	← glebihan left	13:58
	← Serus left	13:58
_ikke_	I use capistrano, but that's written in ruby	13:58
	→ hellopat joined	13:59
	→ glebihan joined	13:59
rethus	_ikke_: in this hard to start with, if not working with it before?	13:59
	→ Roots47 joined	13:59
	→ lun__ joined	13:59
	← kaawee left	14:00
	→ kaawee_ joined	14:00
	→ macabre joined	14:00
	→ garrilla joined	14:00
	← lun___ left	14:01
	← YoungFrog left	14:02
	→ gasbakid_ joined	14:02
	← gasbakid left	14:02
_ikke_	rethus: I used a railsless deploy module, which removed a lot of rails specific assumptions	14:03
	→ mizu_no_oto joined	14:03
	→ neo1691 joined	14:03
_ikke_	rethus: If you're not afraid of writting ruby, it's not that difficult	14:03
	← saorge_ left	14:03
_ikke_	rethus: (I have very little experience with ruby, but still managed to use capistrano)	14:04
	→ Squarism joined	14:04
	→ Mars__ joined	14:05
	→ CreativeEmbassy joined	14:05
rethus	i have no experience with ruby, need only to get a running deployment-enviroment within 2 hours	14:05
	← caseydriscoll left	14:06
_ikke_	rethus: What entails deployment? Is it mainly putting code there, or does a lot of other things need to happen?	14:06
	→ snql joined	14:06
	← kaawee_ left	14:06
	→ kW_ joined	14:06
	→ IrishPrime joined	14:06
	caseydri_ → caseydriscoll_	14:07
	→ stardiviner joined	14:07
	← FabTG_ left	14:07
	→ Snetty joined	14:07
	→ FabTG joined	14:08
rethus	only deploy code to staging and live	14:08
	from dev	14:08
	→ joshbetz joined	14:08
	→ m0ltar joined	14:09
alfadir	hi, have a beginner question : cloned a public repo, made 2 commits, sent them as patches (format-patch), they got accepted. when pulling i get a conflict. should it not just recognize that origin have thouse two patches now ? no other changes than my 2 patches were made to origin in this time.	14:09
	← Mars__ left	14:09
alfadir	the commits were added with git am so I thought they would have the same hash ? but they do not..	14:10
	my commit 160c53a389.. the same commit from git am 43d6..	14:11
	→ danicampa901 joined	14:11
rethus	k, first of all, i'll create an own folder as my git-remote -orgin master, right?	14:11
	caseydriscoll_ → caseydriscoll	14:11
	← dyng left	14:12
	← Bass10 left	14:12
	→ TheHoneyBadger joined	14:12
	← TheHoneyBadger left	14:12
	→ TheHoneyBadger joined	14:12
	← ojacobson left	14:13
	← gasbakid_ left	14:14
	→ Brmm joined	14:14
	→ j0ran2 joined	14:14
	→ jerius joined	14:14
	→ gasbakid joined	14:14
	← RaceCondition left	14:14
	→ shinnya joined	14:14
	← j0ran left	14:14
	← mizu_no_oto left	14:15
	← HelloShitty left	14:15
	← Destos left	14:16
	← rc111 left	14:16
	→ koleS320 joined	14:16
	→ cannonball joined	14:17
koleS320	How can I move file to current revision, which was added, commited and then removed from repo?	14:17
	checkout that revision copy it somewhere , go back to HEAD and copy it there?	14:18
	→ pikpik joined	14:18
lov	huh?	14:18
	I'm a little confused about what you're asking	14:18
	→ lazers joined	14:18
lov	if you know what revision it was in, you can just do "git checkout <SHA> -- path/to/file	14:18
	iirc	14:18
	← Brmm left	14:18
	← neo1691 left	14:19
	← TomyWork left	14:19
	← Jackneill left	14:19
	→ Jackneill joined	14:20
koleS320	and that file will appear in current revision?	14:20
	← paulweb515 left	14:20
	→ Kayra joined	14:20
	← scathen^C left	14:21
koleS320	lov: thx, exactly what I needed	14:21
	← shruggar left	14:23
	← jonez left	14:23
	→ paulweb515 joined	14:23
	← Snibble left	14:24
	→ shruggar joined	14:24
	→ hobodave joined	14:25
	← beautifulmind left	14:25
	← h_kon left	14:26
	← rchavik left	14:26
	→ russoneto joined	14:26
	→ h_kon joined	14:26
	→ rflktr joined	14:26
	→ jatt joined	14:27
	← SergeyPenkin left	14:27
	→ srji_ joined	14:27
	→ tty-1_ joined	14:27
	← MattStratton left	14:28
	← kW_ left	14:28
	← nnyk_ left	14:29
	← tty-1 left	14:30
	← srji left	14:30
	→ Snibble joined	14:30
	→ mmitchell joined	14:30
	→ aberrant joined	14:30
	← h_kon left	14:31
	→ CKyle joined	14:31
	← h0bbit_ left	14:31
	→ h0bbit_ joined	14:34
	← yargy left	14:34
	→ kW_ joined	14:35
	→ joelrobichaud joined	14:35
	→ jonez joined	14:35
	← jazz264 left	14:35
	→ TomyWork joined	14:35
	← lb1a left	14:36
	← davividal left	14:36
	← Sigma left	14:37
	→ CheckDavid joined	14:38
	→ LuxuryMode joined	14:39
	→ Destos joined	14:39
	← jargon left	14:39
	← CKyle left	14:40
	qsusOFFcs → qsuscs	14:40
	→ aChatir joined	14:41
	← snql left	14:41
	→ sebhoss joined	14:41
	← simesy left	14:42
	→ simesy joined	14:42
	→ lb1a joined	14:44
	→ tufflax joined	14:44
	→ Advocation joined	14:44
	→ dsdeiz joined	14:44
	→ SynthesizerPatel joined	14:44
	← omarek left	14:45
	← lite_ left	14:45
	→ srji joined	14:45
	→ lite_ joined	14:45
	← adamwathan left	14:46
	→ Guest____ joined	14:46
	← Ozch left	14:46
	← ktosiek_ left	14:47
	← simesy left	14:47
	← cagedwisdom left	14:47
	← TomyWork left	14:48
	← srji_ left	14:48
	← Advocation left	14:49
	→ boblehest joined	14:49
	→ davividal joined	14:49
	← lite_ left	14:50
	← soee left	14:50
	← bgerber left	14:51
	→ Dougie187 joined	14:51
	→ boblee joined	14:51
	← sebhoss left	14:51
	→ k4rtik joined	14:52
	← johanhar left	14:52
	→ sebhoss joined	14:52
rethus	i have dublicate the staging-folder to /git/staging.	14:53
	now i init git on this folder.	14:53
	→ bgerber joined	14:53
rethus	this repo should be the orgin master for my project.	14:53
	→ TomyWork joined	14:54
	→ snql joined	14:54
lb1a	a repo isn't a origin master	14:54
rethus	have i to add git .ignore for cacheFolders on this repo?	14:54
	so how can i create a orgin master	14:54
lb1a	in fact "origin" is just a default name for a remote that you initially cloned a repo from.	14:55
	→ gua_ould joined	14:55
	→ el3ctron_ joined	14:55
rethus	ok, but now this:	14:55
lb1a	"master" ist just a the default name of a new repo to give you something to start with	14:55
	args	14:55
	"master" ist just a the default name of a branch in a new repo to give you something to start with	14:55
	"master" is a branchname	14:56
	"origin" is a remote name	14:56
	← hobodave left	14:56
lb1a	just names. like dust in the wind.	14:56
rethus	ok. but now this situation	14:56
	i still has a git on local machine. tlii now, i've developed localy and push changed files via ftp to staging.	14:56
	← sebhoss left	14:56
	← Kayra left	14:57
lb1a	what's "a git" ?	14:57
rethus	so the staging-folder, i've copy now is simlar to my local master	14:57
lb1a	a repo that you work on?	14:57
	← aChatir left	14:57
	← jab416171 left	14:57
rethus	i work on branches. if they work, i merge to master	14:57
	← xpe left	14:57
rethus	never working on master	14:57
lb1a	what are you talking about? what's " so the staging-folder, i've copy now is simlar to my local master" ??	14:58
	→ ktosiek joined	14:58
	→ strk joined	14:58
rethus	please be patient and let me explain	14:58
strk	can a remote tag be removed ?	14:58
	← mklappst_ left	14:59
PerlJam	strk: yes	14:59
	← mikecmpbll left	14:59
	strk did it.. push :<tag>	14:59
	→ mklappstuhl joined	14:59
	← abelsiqueira left	14:59
	← gasbakid left	14:59
PerlJam	rethus: perhaps you should think through your problem, then compose a paste that describes everything relevant and finally show the link to the paste here.	14:59
	← boblee left	15:00
	← donmichelangelo left	15:00
	← strk left	15:00
	JPohlman1 → JPohlmann	15:00
	← JPohlmann left	15:00
	→ JPohlmann joined	15:00
	→ boblee joined	15:00
lb1a	PerlJam, +1	15:00
	→ apipkin joined	15:00
PerlJam	rethus: that way, you won't get interrupted in your explanation and there will be less "wtf?" from #git	15:00
	→ donmichelangelo joined	15:00
	← jerius left	15:01
rethus	I developed local. There i have the master which is the actually state of the staging-server. cause if i finished a local branch, i merge it to master and then put changed files via FTP to STAGING-Server.	15:01
	Thats as its now.	15:01
PerlJam	... or just ignore me.	15:01
	← Gavrisimo left	15:01
	→ Gavrisimo joined	15:02
	→ YoungFrog joined	15:02
rethus	So i want to put the master on the staging-server, cause other developer should join the project.	15:02
	← rudak left	15:02
rethus	I have copy the staging-document-root to /git/staging (this should become the new git master-repo for all developers)	15:03
	now my question:	15:03
	← etcetera left	15:04
rethus	Can i only do a git init on /git/staging, and configure this as orgin master in my local git?	15:04
	→ elplatt joined	15:04
	→ nwertman joined	15:04
	← cmpera_ left	15:04
	→ Kayra joined	15:04
	→ rudak joined	15:04
	→ jerius joined	15:04
	← apipkin left	15:05
	→ richgilbank joined	15:05
	→ Mars__ joined	15:05
rethus	cause i want to have all the commit-messages on this master	15:05
PerlJam	rethus: you have a confusion of terminology in your question, but if I decipher you correctly, it sounds like you want to make "/git/staging" as a remote for your local git repo. If that's what you're asking, the answer is "yes"	15:06
rethus	PerlJam: didn't see your post,sorry. was busy by writing	15:06
	→ King_Hual joined	15:06
rethus	yes	15:06
	← Gavrisimo left	15:06
	→ bluesm joined	15:08
	→ Sigma joined	15:09
	← Mars__ left	15:09
	← shinnya left	15:10
	→ JSharpe_ joined	15:10
	→ Ozch joined	15:10
	→ aspiers joined	15:11
	→ knighthawk joined	15:11
	← paulweb515 left	15:12
	← JSharpe__ left	15:13
	→ petey joined	15:14
	→ brammm joined	15:15
	← brammm left	15:15
	→ brammm joined	15:15
	← TomyWork left	15:15
	← brammm left	15:15
	→ tty-1 joined	15:16
	→ keller joined	15:16
	→ zeknox joined	15:17
rethus	so any hint PeelJam?	15:17
zeknox	if i clean / reset all local changes on a git branch that have not been staged or commited, will it affect any other branch?	15:17
lb1a	rethus, he/she/it already gave you the answer "yes"	15:17
	← dewdrop left	15:17
rethus	lb1a: which answer	15:18
lb1a	zeknox, no, since uncommited/unstaged changes dont belong to any branch	15:18
	← Maior left	15:18
rethus	ah ok,	15:18
lb1a	rethus, to repeat PerlJam : "rethus: you have a confusion of terminology in your question, but if I decipher you correctly, it sounds like you want to make "/git/staging" as a remote for your local git repo. If that's what you're asking, the answer is "yes""	15:18
rethus	i missread it	15:18
zeknox	lb1a: thats what I was thinking, so I must atleast stage changes with git add filename in order to not loose those branch changes	15:18
rethus	lb1a: thanks	15:18
	→ bwreilly joined	15:19
lb1a	zeknox, changes dont belong to any branch, as long as you don't commit them. !float	15:19
gitinfo	zeknox: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	15:19
	→ Gavrisimo joined	15:19
	→ mribeirodantas joined	15:20
lb1a	and yes you will !destroy those changes if you reset/clean your workdir without commiting those changes to a branch ( or stash them )	15:20
gitinfo	The operation/command sequence just mentioned will destroy uncommitted changes. Please apply caution.	15:20
	← tty-1_ left	15:20
	← Gavrisimo left	15:20
	→ TomyWork joined	15:20
	→ mikecmpbll joined	15:20
	→ Gavrisimo joined	15:21
zeknox	gitinfo: thanks for the info, i created a branch from my master so I could add additional functionality. The functionality it not working yet and I have made no stages / commits. I would like to be able to go back to master branch and clean it without loosing anything from the new branch	15:21
gitinfo	zeknox: you're welcome, but please note that I'm a bot. I'm not programmed to care.	15:21
	← mlechner left	15:21
zeknox	doh! bot got me	15:21
	→ Serus joined	15:21
	→ bamj0rb joined	15:22
	← rouf left	15:22
	→ johnnyfuchs joined	15:23
	→ rouf joined	15:23
	← shoshin left	15:23
	← papegaaij left	15:23
	← lc0dd0cl left	15:25
	← rouf left	15:25
	← Gavrisimo left	15:25
	← honk left	15:25
	← ShooterMG left	15:25
	→ rouf joined	15:25
	← MacGyver left	15:25
	← CreativeEmbassy left	15:26
	→ MacGyver joined	15:26
	← MacGyver left	15:26
	→ MacGyver joined	15:26
	← glebihan left	15:26
	← thelorax123 left	15:26
	→ glebihan joined	15:27
	← petey left	15:27
	→ petey joined	15:28
	← bwreilly left	15:28
	→ thelorax123 joined	15:28
zeknox	i've staged some changes within a branch using 'git add filename'. how do I make these staged changes stay with this branch, when i do 'git checkout master' all the staged changes float	15:28
	→ Kakera joined	15:28
ToxicFrog	You commit them.	15:28
Kakera	I just committed something and noticed my autocrlf setting was wrong. How to recommit the same thing after fixing the setting?	15:29
	← aberrant left	15:29
zeknox	ToxicFrog: is commiting them the only way, i would be commiting broken functionality, doesn't seem logical to me	15:30
	but at the same time I dont want to loose my progress that ive made	15:30
lb1a	zeknox, it is logical. you want to save those changes. even if they aren't complete yet.	15:30
	← mj12albert left	15:30
	→ CKyle joined	15:30
lb1a	zeknox, since your commit will never leave your pc, you cann always finish it later, and maybe fix your history with squashed commits before pushing your stuff out to the world to know	15:31
	→ mizu_no_oto joined	15:31
zeknox	lb1a: ok, thanks for the help, much appreciated	15:31
	→ mj12albert joined	15:32
	→ PaulCapestany joined	15:32
	← glebihan left	15:32
	← mj12albert left	15:32
	← Kayra left	15:33
	→ glebihan joined	15:33
	→ mj12albert joined	15:33
lb1a	zeknox, you're welcome	15:33
	→ snag joined	15:33
	→ MyTallest joined	15:34
lb1a	zeknox, i for example, often commit ~15 WIP commits a day while trying new stuff. end of the day i do a git rebase to pack my stuff into logical commits with correct messages and push it to our company repo	15:34
	→ iamjarvo_ joined	15:35
sabgenton	when in a merge does git check file do something different?	15:36
	it seems like it's checking out a potential merge	15:36
	→ caktux joined	15:36
zeknox	lb1a: thanks for the tip, didn't know you could rebase / tweak you previous commits other than removing sensitive data. watching more git videos to learn the ways of the force	15:36
sabgenton	rather that the local HEAD	15:36
	← caktux left	15:37
	← guest242 left	15:38
	→ guest242 joined	15:38
	→ Gamecubic joined	15:40
	→ akitada joined	15:40
	→ Artpicre joined	15:41
	→ ciampix joined	15:41
	→ tham joined	15:42
	← m0viefreak left	15:42
	→ etcetera joined	15:43
	→ lc0dd0cl joined	15:43
	← glebihan left	15:43
	→ rpg joined	15:44
	→ glebihan joined	15:44
	← snql left	15:44
	→ Advocation joined	15:45
	← MyTallest left	15:45
	← Xethron left	15:45
	→ tang^ joined	15:45
	→ Kaapa joined	15:46
	← Norm_ left	15:46
	← CKyle left	15:46
Kaapa	hey guys	15:46
	I have 2 remote servers	15:47
	(2 github remotes, that I usually keep in sync manually from the shell)	15:47
	however, for some reason (well, user error for sure), I can't get the tags to sync	15:47
	→ dyng joined	15:48
	→ whaley joined	15:48
milki	tags have a single namespace	15:48
	and arent tied to remotes	15:48
Kaapa	not sure I understand what that means	15:49
milki	do you know what a namespace is?	15:49
	← Advocation left	15:49
Kaapa	git tag shows nothing; git ls-remote --tags origin shows nothing; git ls-remote --tags origin2 shows tags	15:49
	→ ciampix_ joined	15:49
milki	o	15:49
	← ayaz left	15:50
milki	so you didnt even pull the tags	15:50
Kaapa	yep - that's probably what I'm missing	15:50
milki	in some cases, tags arent automatically pulled	15:50
	→ ciampix__ joined	15:50
milki	and you need to add --tags somewhere	15:50
Kaapa	I thought git pull origin2 master would do that	15:50
milki	sometimes	15:50
	man git pull for when tags are automatically pulled	15:50
gitinfo	the git-pull manpage is available at http://jk.gs/git-pull.html	15:50
Kaapa	cause the manual says --no-tags is not the default	15:50
	← ciampix__ left	15:50
milki	same with push	15:50
	thats not where you want to look	15:51
	← ciampix left	15:51
	← ciampix_ left	15:51
milki	you want the conditions for automatic tags	15:51
	--no-tags disables the condition for the automatic part	15:51
cbreak-work	you only get tags for hashes you own.	15:51
	← bgerber left	15:51
milki	looks like its only on the man git fetch page	15:52
gitinfo	the git-fetch manpage is available at http://jk.gs/git-fetch.html	15:52
	← r00tWearsRedHats left	15:52
	→ glosoli joined	15:52
	→ r00tWearsRedHats joined	15:53
	→ znode joined	15:53
	→ simesy joined	15:53
	← iamjarvo_ left	15:53
	→ Misan joined	15:53
	← rath left	15:54
	→ halu_ joined	15:54
	→ bgerber joined	15:55
Kaapa	hum	15:55
	ok, a simple git -t pull origin2 master brought the tags	15:55
	← r00tWearsRedHats left	15:56
Kaapa	would have been helpful if that was documented	15:56
	thanks guys!	15:56
	← srji left	15:56
	← a-l-e left	15:56
	← lun__ left	15:56
	← sHeemskerk left	15:56
lb1a	Kaapa, man git fetch documents -t	15:56
gitinfo	Kaapa: the git-fetch manpage is available at http://jk.gs/git-fetch.html	15:56
	← dyng left	15:57
	→ adamwathan joined	15:57
	→ snql joined	15:57
	← scampbell left	15:57
	← halu left	15:57
	← simesy left	15:58
	← snql left	15:58
	← netiul left	15:58
	→ ciampix joined	15:59
	→ dyng joined	15:59
	← ciampix left	16:00
tang^	Kaapa: git pull issues a git fetch and a git merge. so the documentation for fetch is usable for pull	16:00
	← takamichi left	16:00
	→ hwrd\|work joined	16:00
	← keller left	16:00
Kaapa	tang^: got it - thanks	16:01
	→ ciampix joined	16:02
	→ zarubin joined	16:02
cbreak-work	Kaapa: in general it is not advisable to pull a specific branch	16:02
	← ciampix left	16:02
	→ takamichi joined	16:02
	→ RaceCondition joined	16:03
cbreak-work	if your upstream is configured, you can simply git pull -t	16:03
Kaapa	this is for sync'ing different remotes	16:03
	← jatt left	16:03
	← glebihan left	16:03
Kaapa	(eg: main github rep and my fork)	16:03
	→ glebihan joined	16:04
	← dyng left	16:04
	← lb1a left	16:04
	→ daivyk joined	16:04
tang^	I do that with a git fetch --all; git rebase upstream/master; git push origin. where origin is my fork and upstream is the original	16:04
	→ lb1a joined	16:04
	→ a-l-e joined	16:05
	→ Cromulent joined	16:05
	→ Mars__ joined	16:06
	→ srji joined	16:06
	→ LeMike joined	16:06
milki	might as well fetch --mirror and push --mirror	16:06
	hm, or maybe its pull --mirror	16:07
	theres a mirror somethwere	16:07
lb1a	milki, clone --mirror see !backup	16:07
gitinfo	milki: Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	16:07
	← Raging_Hog left	16:07
LeMike	hi there. i ignored some files. with "git status -u" all i want appear. but with "git add . && git status" only one fresh new touched file appears. why could that be?	16:07
	→ dyng joined	16:08
daivyk	hi, I have lot of projects on the same repo and we are going to split. let say proj A and proj B, can I do this on the same repo? test the soft. with version proj A 1.3 and proj B 2.0 ?! because as far as I know this will not be possible on the same repo, right ?	16:08
	so the better thing to do is one project = one repo, right ?	16:08
milki	yes, one repo one project	16:08
	← _iron left	16:08
lb1a	LeMike, you said you ignored them. git add dont care about files that are ignored.	16:09
	→ RaceCondishun joined	16:09
	← DoniRS left	16:09
lb1a	daivyk, yup one repo per project is the git way	16:09
daivyk	ok, thanks!	16:09
	← Snibble left	16:10
	→ joelmo joined	16:10
	← RaceCondition left	16:10
	RaceCondishun → RaceCondition	16:10
	→ Moosya joined	16:10
	← cbreak-work left	16:10
	← adamwathan left	16:10
	← Mars__ left	16:10
	← rudak left	16:10
	→ lun__ joined	16:11
	→ adamwathan joined	16:11
	← faBimon left	16:11
	← adamwathan left	16:11
	← threesome left	16:11
	← _Qman left	16:11
	← LeMike left	16:12
	→ nottombrown joined	16:12
	→ r00tWearsRedHats joined	16:12
	→ Snibble joined	16:12
	→ ciampix joined	16:12
	→ iamjarvo joined	16:13
	← ciampix left	16:13
	→ ulkesh joined	16:13
	← boblee left	16:13
	→ chisler joined	16:14
	→ Brmm joined	16:15
	→ boblee joined	16:16
	← Roots47 left	16:16
	← zedsix left	16:17
	→ abelsiqueira joined	16:18
	→ Variantdataaa joined	16:19
	→ thierryp joined	16:19
	← Brmm left	16:19
Sonderblade	if you do "git checkout branch1 ." on branch2, can you get git not to stage "undo changes" that branch1 didn't touch?	16:19
	← Cromulent left	16:20
	→ Matt_R joined	16:21
	→ _iron joined	16:21
	← garrilla left	16:21
	→ CKyle joined	16:21
	→ Roots47 joined	16:21
	→ oonska joined	16:22
rethus	git config -f /html/git/.gitignore_global	16:22
	why this not work?	16:22
lb1a	Sonderblade, ?	16:22
	← Kaapa left	16:22
lb1a	rethus, !doesnt	16:22
gitinfo	rethus: [!doesntwork] Sorry to hear it doesn't work, but how about some details? At this point we don't even know whether it did nothing, spit out an error message, or abducted your pet unicorn in a flying saucer. That makes it hard to troubleshoot – unicorn abduction requires a completely different solution than an error message, for instance. So, please be specific...	16:22
Sonderblade	lb1a: what?	16:23
rethus	if i enter, git config open the help menu	16:23
	← vurma left	16:23
lb1a	Sonderblade, what are you trying to do?	16:24
rethus	https://help.github.com/articles/ignoring-files	16:24
	← tvw left	16:24
rethus	add those global config	16:24
	→ tvw joined	16:24
rethus	but on mittwald (hoster) its not possible as global, cause missing permission.	16:25
	← joelmo left	16:25
rethus	so i want to use the file in the folder above my git-repo	16:25
	therefor --file or -f	16:25
Sonderblade	lb1a: im working on branch a, now i want to import all file changes from branch b into a, without adding any new commits, is that possible?	16:26
lb1a	rethus, you do understand the difference between a config file and a .gitignore file?	16:26
Sonderblade	lb1a: and with "all file changes from branch b" i mean the diff between master and branch b	16:26
lb1a	Sonderblade, import in the sense of, get the changes of branch b into my workdir?	16:27
	← dougsland left	16:27
Sonderblade	yes	16:27
lb1a	Sonderblade, git checkout a ; git checkout b -- .	16:27
	→ dougsland joined	16:27
	← danicampa901 left	16:27
	→ apipkin joined	16:28
	→ jfoy joined	16:28
	→ LeMike joined	16:28
	← jfoy left	16:28
	→ NBhosting joined	16:29
	← wrouesnel1 left	16:30
bamj0rb	git merge --no-commit?	16:30
	→ fletch49er joined	16:31
	→ paulweb515 joined	16:31
	→ foucist joined	16:31
lb1a	rethus, you didn't read your own link very well. read again and try to copy/paste the correct comand mentioned ni that help article	16:31
	→ ojacobson joined	16:31
	← vtunka left	16:32
	→ St_Marx joined	16:32
	← gua_ould left	16:32
	← paulweb515 left	16:32
	← koleS320 left	16:32
	→ paulweb515 joined	16:32
	← dyng left	16:32
foucist	what do you guys do when you make a commit locally and it turns out you totally don't need it, but you might want to keep it around? just doing a git revert immediately after seems a bit messy heh	16:33
	← arvind_khadri left	16:33
	→ marhaban joined	16:33
	← marhaban left	16:33
	← Moosya left	16:34
lb1a	foucist, you want to keep a commit you dont need, but you dont want it in your history?	16:34
	← yacks left	16:34
	← noname001__ left	16:35
	← takamichi left	16:35
tang^	put it into a branch and reset to the previous commit before going forward on the original branch?	16:36
	→ bwreilly joined	16:36
	→ bronson_ joined	16:36
	← galaris left	16:37
Sonderblade	lb1a: that command will stage "undo changes" that weren't touched in branch b	16:37
	→ takamichi joined	16:38
	← Variantdataaa left	16:38
	← etcetera left	16:38
lb1a	Sonderblade, what are "undo changes" ?	16:39
	→ lavaman joined	16:40
	→ AWinterman joined	16:40
	→ tommcdo joined	16:40
	← sabgenton left	16:40
	→ etcetera joined	16:41
Sonderblade	lb1a: change diffs that undo previous work	16:41
qsuscs	do i miss something or is Pro Git not available as mobipocket in german?	16:41
	→ Variantdataaa joined	16:41
	← PaulCapestany left	16:41
	→ Skrypter joined	16:41
	← JohnBat26 left	16:42
	← tommcdo left	16:42
	← glebihan left	16:42
	→ Cromulent joined	16:43
	→ axl_ joined	16:43
	→ ketas- joined	16:43
	→ glebihan joined	16:43
	→ matteo joined	16:43
	← Snibble left	16:44
	→ Targen joined	16:44
	← rouf left	16:44
lb1a	qsuscs, not directly. but you can create it from source	16:45
	← LeMike left	16:45
	← Snetty left	16:45
	← ketas left	16:45
lb1a	qsuscs, https://github.com/progit/progit?source=cc see "making ebooks"	16:46
	→ joelm joined	16:46
	← Octalot left	16:46
	→ natechan joined	16:46
	← BigBlueBacon left	16:46
	← mribeirodantas left	16:46
qsuscs	thanks	16:46
	← rethus left	16:46
	→ BigBlueBacon joined	16:47
	→ maestrojed joined	16:47
	← tirengarfio left	16:48
lb1a	Sonderblade, so you dont want to checkout the the state of b onto branch a? did you try to use git checkout a ; git merge --no-commit b	16:49
	→ danicampa901 joined	16:49
	→ Snibble joined	16:49
	→ tirengarfio joined	16:50
Sonderblade	lb1a: that seems to work better, only the changes from master..b seem to be applied iiuc	16:50
	→ SocalNick joined	16:51
	→ luxgeek joined	16:51
	← luxgeek1 left	16:51
	← asQuirreL left	16:51
	→ PaulCapestany joined	16:51
qsuscs	mhh on readme for the german pro git, it says that some parts ar missing or not as good as they should be	16:52
	ah screw it, i actually understood the english one quite well	16:52
	→ Moosya joined	16:52
unkmar	I've made several changes I don't want to commit right now. I don't want to save my changes for later. but I need to roll back to previous commit to make different changes.	16:52
	I'm not sure how to proceed in this form of branching.	16:52
foucist	lb1a: i guess so, but if it's not in the history, how will i ever find it :P	16:52
	→ Kayra joined	16:53
	→ aberrant joined	16:53
	← Variantdataaa left	16:53
	← nottombrown left	16:53
lb1a	qsuscs, the english version is the master. all translations are more or less complete. german one is ok as far as i know. but the english version is always the best way to go	16:53
	→ snql joined	16:53
	← mishok13 left	16:53
lb1a	unkmar, !revert	16:54
gitinfo	unkmar: 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]?	16:54
	← ehmatthes left	16:54
unkmar	in other words, how do I save my current state. Roll back to previous commit, make some changes and commit then come back to what I was working on.	16:54
	→ nottombrown joined	16:54
qsuscs	the mobipocket is really nicely done btw	16:54
	← Sonderblade left	16:54
lb1a	unkmar, so you do want to save your stuff or not? you just said yes and no	16:54
	→ nicedice_ joined	16:55
	→ threesome joined	16:55
	← glebihan left	16:55
	→ Kupo24z joined	16:55
unkmar	lb1a: branching	16:55
qsuscs	one of the reasons why i use git - the hg book is not available as mobipocket, the svn book mobi is poorly done (and it's centralized anyway) and darcs no mobi neither	16:55
	→ glebihan joined	16:55
Kupo24z	Hey all, is it possible to do git pulls as a user with no shell access?	16:55
	→ cotton joined	16:55
unkmar	the long if it. A co-worker continued making changes on his local without commits. We were working from svn. during that time I was attempting to migrate svn to git.	16:56
lb1a	Kupo24z, it's not a question of git. it's about access right. if your repo is served over other ways than ssh, then maybe (https/git)	16:56
	← ezekielnoob left	16:56
	← daivyk left	16:57
Kupo24z	lb1a: its only via SSH, am I out of luck then?	16:57
unkmar	the state of the migration is the proper current state. His work should be branch of to a future roll out.	16:57
lb1a	Kupo24z, yup	16:57
Kupo24z	Thanks	16:57
unkmar	And current things need to change without that branch effecting current work.	16:58
	← ewnd9 left	16:58
	→ Robarelli joined	16:58
unkmar	In otherwords. I feel he is down a branch without having previously CREATING the branch.	16:59
lb1a	unkmar, still not completely understand your question.	16:59
	→ LeMike joined	17:00
lb1a	unkmar, are you 2 working with git?	17:00
	← angelsl left	17:01
unkmar	3 states. C = current website. B = Bob's changes without commits since C. I = immediate changes from state C.	17:01
	we are now.	17:01
	I managed to migrate us to git Yesterday.	17:01
lb1a	good	17:01
	so your all work on the same branch ? ("master" i guess )	17:01
	s/your/you/	17:02
unkmar	currently, yes, "master" is the only branch.	17:02
	← iamjarvo left	17:03
	← tirengarfio left	17:03
lb1a	so you have 2 repos? each has it's master branch. unkmar/master and bob/master. both have changes that are not commited?	17:03
	→ iderik joined	17:03
	← teran left	17:04
	→ tirengarfio joined	17:04
unkmar	there are more than the 3 repos, but yes.	17:04
	→ adamwathan joined	17:04
unkmar	and I doubt I have any changes that haven't been committed.	17:04
lb1a	so what prevents you from commiting your work and merge the 2 states?	17:05
	← a-l-e left	17:05
unkmar	Absoultely nothing.	17:05
	I want to know how to branch his work.	17:05
	He needs to be able to switch in and out of "master"	17:06
lb1a	he can !float his stuff over to a (new)branch .	17:06
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	17:06
	← znode left	17:06
	→ znode joined	17:06
	→ Mars__ joined	17:06
	→ ehmatthes joined	17:06
	← znode left	17:07
	← alorence left	17:08
lb1a	unkmar, that's what branches are about in git	17:08
	← thierryp left	17:09
	← adamwathan left	17:09
	← glebihan left	17:10
	→ glebihan joined	17:10
	← Mars__ left	17:11
	← tty-1 left	17:11
	→ primitive joined	17:11
	→ sebhoss joined	17:11
	← sebhoss left	17:12
	→ imachuchu joined	17:12
	← srji left	17:13
unkmar	lb1a: thank you	17:13
	→ LzrdKing_ joined	17:13
	← j416 left	17:13
	→ j416 joined	17:13
	← weltall left	17:13
LzrdKing_	is there a way to have git reject commits without a valid username set?	17:13
	→ yacks joined	17:14
	← freimatz left	17:14
	pixelgremlins_ba → pixelgremlins	17:14
	← TomyWork left	17:14
	← intellix left	17:14
	→ ShooterMG joined	17:15
	→ devbug joined	17:15
	← Snibble left	17:15
	← LeMike left	17:15
	→ weltall joined	17:15
	← apipkin left	17:15
	← joel_falcou left	17:15
	← Guest4410 left	17:16
	← glebihan left	17:16
	← Kayra left	17:16
	→ glebihan joined	17:16
_ikke_	LzrdKing_: Define valid username?	17:16
	LzrdKing_: And when do you want to reject them?	17:17
	→ ErKa joined	17:18
LzrdKing_	_ikke_: it looks like when there is no username set, it shows up as "unknown"	17:18
	i suppose valid is anything other than blank or unknown	17:18
sonOfRa	http://git-scm.com/book/en/Customizing-Git-An-Example-Git-Enforced-Policy <- this chapter has a lot of things on policy enforcement	17:18
lb1a	LzrdKing_, where does it show up?	17:18
sonOfRa	I don't know if that has what you need, though	17:18
LzrdKing_	and then when should be as soon as possible	17:18
	s/then/the/	17:18
	← snql left	17:19
_ikke_	LzrdKing_: for whom? Because git is decentralized, you can't enforce it on other repos	17:19
	LzrdKing_: Git will btw show a message when make a commit an don't have one set	17:19
	→ chuck8 joined	17:19
	← takamichi left	17:20
	← mikecmpbll left	17:20
	← KillYourTV left	17:20
	← chisler left	17:21
LzrdKing_	i see it in Redmine, "Added by unknown about 11 hours ago"	17:21
	← danicampa901 left	17:21
	← zapb_ left	17:21
LzrdKing_	thats the only repo that needs to enforce this	17:21
warbaque	how do I take only few changes from my stash?	17:22
	→ chisler joined	17:22
warbaque	I noticed I've made too many edits and would like to apply my work in smaller batches	17:23
	→ Pullphinger joined	17:23
_ikke_	LzrdKing_: You can add a pre-receive hook which does that	17:23
	← rurufufuss left	17:23
	→ Norm_ joined	17:23
lb1a	warbaque, man git stash use the -p option ( --patch )	17:23
gitinfo	warbaque: the git-stash manpage is available at http://jk.gs/git-stash.html	17:23
	→ KillYourTV joined	17:23
	→ galaris joined	17:23
_ikke_	git checkout -p stash@{N}	17:24
	where N is the stash #	17:24
	← hahuang61 left	17:25
	→ beastd joined	17:25
	← Misan left	17:25
	→ Brmm joined	17:25
warbaque	_ikke_: thank you	17:26
	← johnkevinmbasco left	17:26
	→ mfulz joined	17:27
	→ johnkevinmbasco joined	17:28
	→ oojacoboo joined	17:29
	→ mikecmpbll joined	17:29
	← Brmm left	17:30
	← donmichelangelo left	17:30
	← txomon\|fon left	17:30
	→ rcu joined	17:30
	← mikecmpbll left	17:30
	→ donmichelangelo joined	17:31
	← rflktr left	17:31
	← Moosya left	17:31
	← mizu_no_oto left	17:31
	→ thierryp joined	17:32
	→ apipkin joined	17:32
	← oojacoboo left	17:33
	→ Sigma[Mtp] joined	17:34
	→ hiroyuki_ joined	17:34
	→ yhager joined	17:34
	→ rouf joined	17:34
	→ duxbarak joined	17:35
	← axl_ left	17:35
	← hiroyuki_ left	17:35
duxbarak	I'm trying to clone an SVN repository into a new git repository and I get ""perl: /build/buildd/subversion-1.7.9/subversion/libsvn_subr/dirent_uri.c:321: canonicalize: Assertion `*src != '/'' failed.	17:35
	10:31:24 AM - duxbarak: error: git-svn died of signal 6"" Any help?	17:35
	→ rflktr joined	17:35
	← Sigma left	17:35
	→ zapb_ joined	17:35
	← RaceCondition left	17:36
	← Kupo24z left	17:36
duxbarak	er, disregard that "10:31:24 AM - duxbarak: "	17:36
	→ hiroyuki_ joined	17:36
	← hiroyuki left	17:36
	→ snql joined	17:36
	→ Artpicre_ joined	17:36
	← johnkevinmbasco left	17:38
	← fRAiLtY- left	17:38
	← tham left	17:38
_ikke_	What version of svn do you have?	17:38
	← nhmood left	17:39
	← thierryp left	17:39
duxbarak	1.7.9	17:39
	→ nhmood joined	17:39
unkmar	how do I list files associates with a commit?	17:39
	← chuckharmston left	17:39
	← nhmood left	17:39
_ikke_	unkmar: git show --name-only <commit>	17:39
	→ nhmood joined	17:39
	← nhmood left	17:39
	→ axl_ joined	17:39
_ikke_	duxbarak: Oh, the message showed that	17:40
	→ nhmood joined	17:40
	← nhmood left	17:40
	→ chuckharmston joined	17:40
	→ kukks joined	17:40
	← kukks left	17:40
	→ kukks joined	17:40
	→ nhmood joined	17:40
	← nhmood left	17:40
unkmar	s/assocaites/associated/ sorry.	17:40
	→ Shusshu joined	17:40
	→ thierryp joined	17:40
	← arand left	17:41
_ikke_	duxbarak: what is the command you are executing?	17:41
	→ johnkevinmbasco joined	17:41
	← Shusshu left	17:41
duxbarak	git svn clone /var/svn/oldrepo/ --no-metadata -s	17:41
_ikke_	duxbarak: https://trac.macports.org/ticket/32753 ?	17:42
	→ nhmood joined	17:42
	← nhmood left	17:42
	← cenuij left	17:42
	→ nhmood joined	17:42
	← nhmood left	17:42
_ikke_	Are you on a mac?	17:42
duxbarak	Nope, Ubuntu	17:43
_ikke_	ok	17:43
duxbarak	but from my googling, it does seem to be something only affecting certain version combinations of svn and git, does that sound right?	17:43
LzrdKing_	i was able to get the emails for the "unknown" users from git log and sent them to the project lead so he can yell at them	17:44
_ikke_	duxbarak: Yup	17:44
duxbarak	your link supports that theory	17:44
_ikke_	I ran into a problem with svn 1.8.0	17:44
	Downgrading to 1.7.x, solved my problem, but you already are	17:44
	← chuckharmston left	17:44
	← shruggar left	17:44
duxbarak	right	17:44
	→ TomyLobo joined	17:45
	→ nhmood joined	17:45
	← nhmood left	17:45
	→ nhmood joined	17:45
	← nhmood left	17:45
	→ nhmood joined	17:45
	← nhmood left	17:46
	→ nhmood joined	17:46
	← nhmood left	17:46
	→ srji joined	17:46
	→ Sylario_ joined	17:46
	← Matt_R left	17:46
	→ nhmood joined	17:46
	← nhmood left	17:46
	→ nhmood joined	17:46
	← nhmood left	17:46
	→ RaceCondition joined	17:46
	→ Advocation joined	17:46
	→ nhmood joined	17:46
duxbarak	ok, I tried pulling from a copy of the svn repo on a different system, and it get ""E: 'trunk' is not a complete URL and a separate URL is not specified"" any idea from that?	17:47
_ikke_	are you using official ubuntu packages?	17:47
duxbarak	yes, just upgraded to 13.10	17:47
	← lb1a left	17:48
_ikke_	ok	17:48
	→ chuckharmston joined	17:48
	← chuckharmston left	17:49
	← glebihan left	17:49
	→ chuckharmston joined	17:49
	→ glebihan joined	17:50
	→ hobodave joined	17:50
	← johnkevinmbasco left	17:50
	← juril left	17:50
	← Advocation left	17:51
	→ lite_ joined	17:51
_ikke_	If it is a mismatch between two packages, you might want to inform ubuntu	17:51
	← harobed left	17:51
	← elplatt left	17:51
	← bgerber left	17:51
	← richgilbank left	17:51
	→ tham joined	17:51
duxbarak	Ok, I checked their bug reports and couldn't find one, but I'll look into it.	17:52
	→ johnkevinmbasco joined	17:52
	→ bgerber joined	17:52
	→ elplatt joined	17:52
	← elplatt left	17:53
	← jonatasnona left	17:53
	→ SonicX joined	17:54
	→ elplatt joined	17:54
	← mmitchell left	17:54
	→ mmitchell joined	17:55
	← RaceCondition left	17:55
duxbarak	so, I'm brand new to git, been using svn for years, I work by myself, but from multiple locations, but I'm starting to do things that I think git would be better at than svn, like branching. Any tips on making the transition?	17:55
	← PaulCapestany left	17:56
	ketas- → ketas	17:56
	← aspiers left	17:56
_ikke_	duxbarak: Don't try to lean too much on your svn experience, because it's not going to help	17:57
	← tham left	17:57
	→ Guest32031 joined	17:57
	→ whunt joined	17:57
duxbarak	specifically, my workflow is: get to location, update from svn server, work on stuff, commit, go to different location, update, work on same stuff, commit. How is that going to compare?	17:57
	→ m8 joined	17:58
	→ looper joined	17:58
	← abelsiqueira left	17:58
_ikke_	in git, comitting things, and "sharing" those commits are two separate steps	17:58
	→ joelmo joined	17:58
skorgon	but the fundamental flow works with git as well	17:59
_ikke_	http://git.or.cz/course/svn.html	17:59
	→ maqr joined	17:59
duxbarak	_ikke_: right, I'm guessing I'll be needing to do both of those from each location, right?	17:59
	→ jhulten joined	17:59
	→ Xethron joined	18:00
	← Xethron left	18:00
	→ Xethron joined	18:00
_ikke_	duxbarak: yeah, but you commit more often then you push	18:00
	← mmitchell left	18:00
	→ saorge joined	18:00
_ikke_	duxbarak: You don't need to push after every commit	18:00
	← looper left	18:00
	→ arand joined	18:00
_ikke_	You can make a bunch of commits, and after you are done, you can push them	18:00
	← ChrisAnn left	18:00
	← johnkevinmbasco left	18:01
duxbarak	well, I work mornings at home, and afternoons in my client's office, often on the same code each day from both locations	18:01
_ikke_	duxbarak: But because of this model, you can create implicit branches	18:01
duxbarak	so I'll need to push before leaving each location?	18:01
_ikke_	duxbarak: yes	18:01
duxbarak	ok	18:01
moritz	... unless you use the same laptop on both locations :-)	18:01
duxbarak	but perhaps multiple commits while working at one location?	18:02
_ikke_	duxbarak: Correct	18:02
	→ johnkevinmbasco joined	18:02
_ikke_	duxbarak: It works best if you keep your commits smallish	18:02
duxbarak	laptop there, desktop here, no carrying equipment :)	18:02
_ikke_	duxbarak: containing logical changes	18:02
duxbarak	_ikke_: makes sense	18:02
_ikke_	also read !book	18:03
gitinfo	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	18:03
Serus	!svn bad	18:03
gitinfo	[!svn_upstream] git-svn determines the upstream branch to push to by finding the topmost commit in your current branch that has a "git-svn-id" line (i.e., 'git log --grep=^git-svn-id: --first-parent -1'), and using the branch mentioned in it.	18:03
_ikke_	It'll explain you git concepts	18:03
	Serus: triggers can't contain spaces	18:04
Serus	oh	18:04
duxbarak	so, when setting this all up, should I have a master copy on my desktop at home, and pull/commit/push from a separate working copy on both my desktop and laptop, or would it make just as much sense to just use my working copy on the desktop as the master copy?	18:04
Serus	How do I explain my schoolmates they shouldn't use svn?	18:04
	← dburba left	18:04
tang^	don't	18:04
	← johnkevinmbasco left	18:04
tang^	explain why git is better	18:05
Serus	I did	18:05
	but they seem to be glued to a wall called svn	18:05
_ikke_	Serus: You can't convince them if they don't want to change	18:05
	master_j → juls	18:05
	→ sq-one joined	18:05
	← twoface88 left	18:05
tang^	and some large corporations still use CVS	18:05
_ikke_	duxbarak: It's easiest if you have one 'master' repo which you can push to from both locations	18:06
duxbarak	ok, perfect	18:06
Serus	tang^: I heard yes.	18:06
	← pixelgremlins left	18:06
	← NBhosting left	18:06
tang^	Serus: invite them to work on a project with you and only provide a git repository	18:06
_ikke_	Serus: If they see version control as a place to dump their code, nothing is going to convince them git is better	18:06
Serus	My main problem with svn is that I always get a ton of conflicts.	18:06
tang^	that's not limited to svn	18:07
	← chuck8 left	18:07
	→ Mars__ joined	18:07
Serus	tang^: I'll probably never see them again after this project.	18:07
	← Slush- left	18:07
_ikke_	If you get conflicts because you keep editing the same code, no vcs is going to help you	18:07
	→ hahuang61 joined	18:07
duxbarak	Thanks for the help all.	18:07
	← frgtn left	18:08
	← juls left	18:08
	← milli left	18:08
Serus	_ikke_: I have been doing it wrong all the time...	18:08
	→ Slush- joined	18:08
	→ Moosya joined	18:08
	→ juls joined	18:08
	← jcarouth left	18:08
	→ frgtn joined	18:08
	← achadwick left	18:09
	← petey left	18:09
	→ looper joined	18:10
Serus	_ikke_: would the correct way to work with any source control be to create a separate branch per person? and merge them later on	18:10
	→ petey joined	18:10
	← MacGyver left	18:10
	→ MacGyver joined	18:10
	← MacGyver left	18:10
	→ MacGyver joined	18:10
	← joshbetz left	18:11
	→ Matt_R joined	18:11
	→ jfoy joined	18:11
	← frgtn left	18:11
_ikke_	Serus: No, because that would still cause merge conflicts when merging when the same code has changed	18:11
	← edwardly left	18:11
	← Mars__ left	18:11
_ikke_	The only thing helping against that is good communication	18:11
	→ frgtn joined	18:12
_ikke_	Serus: The key is to make smallish feature branches	18:12
	Serus: And letting the person who wants to merge that branch in take care of any conflict	18:12
	Serus: Because those branches are small, the conflicts also are small	18:12
Serus	wouldn't megre tools allow you to choose what to merge into the master branch?	18:12
_ikke_	Serus: Sure, merge conflicts aren't a problem per se	18:13
	→ rednaks joined	18:13
	→ PaulCapestany joined	18:13
_ikke_	Serus: But lots of them is a pain	18:13
	Artpicre → Artpicre__	18:13
	→ MadDog31 joined	18:13
	Artpicre_ → Artpicre	18:13
	→ CreativeEmbassy joined	18:13
_ikke_	Serus: So you want to avoid large branches which only get merged in after a long period	18:13
Serus	I'm sure you know of hginit	18:13
_ikke_	The tutorial from fogcreek?	18:14
	← SonicX left	18:14
	← petey left	18:14
Serus	http://hginit.com/00.html	18:14
	← stardiviner left	18:14
_ikke_	Yeah, from fogcreek	18:14
Serus	There he mentions that merging, supposedly a 5 minute job, takes very long with svn.	18:15
	← Artpicre__ left	18:15
Serus	Let me try to find the actual thing he said	18:15
	→ Gavrisimo joined	18:15
	← kW_ left	18:16
_ikke_	Serus: Merging can take a long time with dvc's too if you don't merge / rebase regularly	18:16
	→ _kW joined	18:16
	→ Snibble joined	18:16
	← Pyrogerg left	18:16
_ikke_	But the reason a conflict happens can make a difference	18:16
	→ aard joined	18:16
	← kukks left	18:16
Serus	"What should have been a five minute process ended up with six programmers around a single computer working for two weeks trying to manually reapply every single bug fix from the stable build back into the development build."	18:16
_ikke_	The problem with older svn versions was that it didn't track merges. So any merge you created would look like a normal commit, causing conflicts the next time you merged again	18:17
	[emmajane] → emmajane	18:17
davividal	I have a big legacy project that I'll be working on a upgrade project. This upgrade project will last for at least one year. My strategy is to migrate the app module by module. So, my new project must include/embed the legacy, and the legacy project will continue to run and be updated until we are done. What's the best git tool for the job? Submodule or subtree?	18:18
_ikke_	How are the modules currently arranged?	18:19
	← maestrojed left	18:19
duxbarak	can I make a repository bare after creating it?	18:19
	→ edwardly joined	18:20
	← Snibble left	18:20
_ikke_	duxbarak: Easiest way to is to clone --bare that repo	18:20
duxbarak	'git init --bare'?	18:20
_ikke_	duxbarak: No, that won't help on an existing repo	18:20
duxbarak	ok, so go into the repo, and just "git clone --bare"? or clone it somewhere else as bare, and then move?	18:21
	← jerius left	18:21
_ikke_	duxbarak: the latter	18:21
duxbarak	gotcha	18:21
Serus	_ikke_: would you avoid large files of code? As with large files people could edit the same file.	18:22
davividal	_ikke_: are you talking to me? The legacy project is a symfony 1.4 project and the new will be a symfony 2. So I have legacy/apps/frontend/modules/* , while the new modules will be src/Company/*	18:22
	← maslowbeer left	18:22
	← _kW left	18:22
_ikke_	davividal: But they are in one repo, correct?	18:22
davividal	_ikke_: yes.	18:22
_ikke_	But you need them in separate repositories?	18:23
	← mklappstuhl left	18:24
	→ chuck8 joined	18:24
	→ Kayra joined	18:24
	→ phoenixSunset joined	18:24
	→ vurma joined	18:24
phoenixSunset	hey everyone... I just made a horrible mistake.. was in a branch.. stashed changes.. checked out master to look at some stuff. forgot to checkout my branch again... and then did git stash pop	18:25
	and now i have a billion conflicts and lost my stash	18:25
	is there a way to undo this, or am i screwed?	18:25
	→ jerius joined	18:25
_ikke_	phoenixSunset: When conflicts happen, your stash is still there	18:26
	→ Brmm joined	18:26
phoenixSunset	_ikke_: oh.. ok so I can just git reset HEAD --hard	18:26
_ikke_	yes	18:26
phoenixSunset	and then switch to my branch and all should be ok	18:26
	← occup4nt left	18:26
_ikke_	aye	18:26
	git stash list	18:26
	git stash show -p stash@{0}	18:27
phoenixSunset	whew.. i was scared	18:27
	thanks	18:27
	→ stodan joined	18:27
	→ Snibble joined	18:27
	→ milli joined	18:28
davividal	_ikke_: I don't need them in separate repositories.	18:28
	← Artpicre left	18:28
	→ sr105 joined	18:28
	← duxbarak left	18:28
	gitinfo set mode: +v	18:28
	→ dreiss joined	18:29
_ikke_	Is the legacy app still being worked on?	18:29
davividal	_ikke_: in fact, I need something like: ROOT/src/Company/* => ROOT is my main repo. ROOT/legacy => legacy is the legacy project.	18:29
_ikke_	davividal: Then you need neither submodules nor subtree merges	18:29
davividal	_ikke_: yes and it will continue to be.	18:29
sr105	How do I clone remotes from one repo to another?	18:29
	→ Artpicre joined	18:29
sr105	or rather fetch	18:29
	← Kayra left	18:29
_ikke_	sr105: What do you mean with remotes?	18:29
davividal	BUT: if I want to change the legacy project I'll do it using the legacy clone, I'll never update the legacy project from the new one.	18:29
	→ Snibble1 joined	18:30
	← MadDog31 left	18:30
_ikke_	davividal: ok	18:30
	→ nottombr_ joined	18:30
_ikke_	Do updates from the legacy project need to be ported to the new one?	18:30
	← kriks left	18:30
sr105	so I create a repo cloned from some upstream source and I get a bunch of remote branches. I do my own work and push to a new local git repo. I now fetch all of the new changesets from upstream in the first repo and I want to get all of that into a clone of my new repo. Do I have to create a local tracking branch of every remote branch first? (Sorry if I'm messing up the terminology)	18:31
	→ adamwathan joined	18:32
	→ stardiviner joined	18:32
	← Roots47 left	18:32
_ikke_	sr105: does git branch -r show those branches?	18:32
sr105	that is, if I "git fetch some_local_repo" I only get the local (? right term) branches and not the remotes in	18:32
	← Snibble left	18:32
_ikke_	sr105: correct, you only get the actual branches (refs/heads/*	18:33
	)	18:33
sr105	_ikke_: in the first, yes. A bunch of origin/* branches	18:33
	← nottombrown left	18:33
_ikke_	sr105: Yeah, those don't get fetched	18:33
	sr105: There is git clone --mirror	18:34
	← Snibble1 left	18:34
_ikke_	(but it implies --bare)	18:34
sr105	I guess what I'm asking is... git clone url://upstream .... How do I create an upstream_copy that looks like upstream without having to re-fetch/clone from the url?	18:34
davividal	_ikke_: the updates need to be ported to the new one.	18:34
sr105	I'll check out mirror.	18:35
	I'm coming from mercurial which doesn't have remotes and it's been a little confusing.	18:35
	← guest242 left	18:35
	→ guest242 joined	18:35
	→ matanya joined	18:35
_ikke_	sr105: (those are called remote tracking branches)	18:36
	← hwrd\|work left	18:36
_ikke_	sr105: I find them less confusing than anonymous heads	18:36
	→ abelsiqueira joined	18:36
	→ takamichi joined	18:36
	← adamwathan left	18:37
	→ cenuij joined	18:37
	← lavaman left	18:37
sr105	_ikke_: but they contain all of the changesets from the remote, right? In mercurial, I can clone an existing local clone of a huge repo to save time. I was trying to figure out the equivalent in git.	18:37
	← shuaib left	18:38
sr105	I guess the solution is to create tracking branches for all of the heads/remote branches first and then git clone/fetch will act like mercurial	18:38
	← dreiss left	18:38
	→ lavaman joined	18:38
_ikke_	sr105: I know in mercurial it is practice to use multiple clones of the same repo, but with git you don't see that much	18:39
sr105	I guess I need to adjust my workflow. :)	18:39
sayd	git remote prune upstream prunes all the pr refs, but when i git pull.. they all come back	18:39
sr105	use the tools as they were intended. :)	18:39
	← zapb_ left	18:39
	→ petey joined	18:40
_ikke_	sr105: git branches are like hg bookmarks	18:40
	← aartist left	18:40
	→ Mars__ joined	18:40
	→ iamjarvo_ joined	18:40
	→ jnavila joined	18:40
_ikke_	sr105: What is your usecase where you use multiple clones of a repository?	18:40
	sayd: Do you have one, or more remotes/	18:41
	← jarr0dsz left	18:41
sayd	_ikke_: i have 2, origin and upstream	18:41
	maybe i should now push to my origin	18:41
_ikke_	That would not help	18:42
	← nottombr_ left	18:42
_ikke_	You can't push "the deletion of refs"	18:42
	← rcu left	18:42
sayd	oh	18:42
	→ lifechamp joined	18:42
_ikke_	Did you alter the refspecs so pr branches would be fetched?	18:42
sayd	I think so	18:43
sr105	_ikke_: I cloned u-boot from upstream. I then created a branch for our local company changes. Then I pushed it all into our local git server into a new company-specific u-boot repo. Now, I want to pull down the latest changes from upstream, and then update our repo with the latest.	18:43
_ikke_	Or do you mean your own feature branches you use for pull requests?	18:43
lifechamp	got get a branch, eg off github, I first clone to the repo, then do git fetch origin, git checkout -b branchname origin/branchname?	18:43
	→ JustinMac joined	18:43
sayd	it was part of a script to use local repos instead of one master repo	18:43
lifechamp	or is there a more direct way to get the branch that I should use?	18:43
	← cenuij left	18:43
	→ DrShoggoth joined	18:44
sayd	_ikke_: they are things like upstream/pr/99	18:44
	← Mars__ left	18:44
_ikke_	sayd: Has this to do with github, or is it something else?	18:44
	← ulkesh left	18:44
_ikke_	sr105: You can just use one local repo for that	18:45
	sr105: advantage with git is that changed from each remote get in their own namespace	18:45
	sr105: upstream/master is different from origin/master for example	18:45
sr105	_ikke_: yes, that's what I'm realizing. I'm so used to the mercurial workflow where you might reasonably keep multiple local repos.	18:45
_ikke_	sr105: There is not even one project where I have multiple clones of the same repo	18:46
	git branches offer me all the flexibility I need	18:46
	lifechamp: You don't need to fetch after a clone	18:47
sayd	_ikke_: the repos are in github yes	18:47
_ikke_	sayd: k	18:47
sr105	_ikke_: mercurial has never had a great equivalent of git stash, so multiple clones are often used.	18:47
cbreak	I have lots of clones, one per computer	18:47
	sometimes an additional bare for special purposes	18:47
	git's super flexible.	18:47
	→ Advocation joined	18:47
_ikke_	cbreak: I obviously meant per computer ;-)	18:48
	← salamanderrake left	18:48
sr105	_ikke_: and without the overhead of remotes and namespaces, it's much easier conceptually to fetch/push between clones	18:48
cbreak	there's that new-workdir contrib script you can use to get fake "clones"	18:48
	→ zorbash joined	18:48
cbreak	sr105: yeah, git rocks at fetching and pushing.	18:48
	→ jarr0dsz joined	18:49
_ikke_	hg branches by default all get pushed	18:49
	→ Misan joined	18:49
cbreak	that sounds idiotic	18:50
	what about private feature branches?	18:50
	temporary branches?	18:50
sr105	it's simpler for new users	18:50
cbreak	"stash" branches?	18:50
_ikke_	cbreak: You'd use bookmarks	18:50
	← phoenixSunset left	18:50
cbreak	_ikke_: too complicated	18:50
	I like git, it's much simpler	18:50
_ikke_	The irony ;-)	18:50
	→ dreiss joined	18:51
sr105	part of the difference is that mercurial has a principal that history is immutable. Git was designed to have the ability to throw away history just by removing a ref.	18:51
sayd	_ikke_: so the fact that pull puts them all back what should i do to fix that	18:51
cbreak	sr105: git history is immutable until they break sha1	18:51
sayd	git remote show: refs/pull/999/head new (next fetch will store in remotes/upstream)	18:51
sr105	The fact that git has garbage-collection would seem to differ with that conclusion. :)	18:51
cbreak	sr105: nope.	18:52
_ikke_	sayd: the problem is probably that the pr branches from both repos get in the same namespace	18:52
cbreak	sr105: it's unrelated with mutation.	18:52
sayd	in my upstream remote :fetch = +refs/heads/:refs/remotes/upstream/	18:52
cbreak	sr105: GC collects unreachable history.	18:52
	← Advocation left	18:52
cbreak	sr105: that history is not mutated. It will stay the same for ever.	18:52
_ikke_	sr105: The same counts for hg	18:52
sr105	cbreak: I only meant that mercurial will never delete a changeset from a repo (in normal usage)	18:52
	cbreak: there is no such thing as unreachable history in mercurial.	18:53
cbreak	git will never delete anything that is part of reachable history	18:53
	← frgtn left	18:53
cbreak	sr105: that sounds inflexible	18:53
	→ zapb_ joined	18:53
cbreak	sr105: so you can't rebase?	18:53
	→ shpoont joined	18:53
	← calcifea left	18:53
cbreak	you can't commit --amend?	18:53
	→ frgtn joined	18:53
_ikke_	cbreak: you can	18:53
sr105	It's also why mercurial sucks at compressing repos like the linux kernel compared to git	18:53
cbreak	you can't even delete a branch?	18:53
	→ phoenixSunset joined	18:53
_ikke_	cbreak: hg branches are tracked in the commit	18:53
	so, no	18:54
cbreak	_ikke_: :O	18:54
	what the hell	18:54
_ikke_	you can only 'close' branches	18:54
sr105	cbreak: you can alter history, but mercurial tries to make it an explicit action	18:54
Dougie187	You can even delete branches in svn... :P	18:54
cbreak	I hope I'll never have to deal with that thing.	18:54
sr105	:)	18:54
_ikke_	Dougie187: svn doesn't have branches, only seperate directories ;-)	18:54
	separate*	18:54
cbreak	sr105: everything in git is explicit. :)	18:54
	← unkmar left	18:55
Dougie187	_ikke_: you can still delete them though	18:55
cbreak	sr105: unless it's default :)	18:55
sr105	Mercurial added bookmarks to try and give us git-style branching	18:55
Remram	well no, mercurial is more explicit here	18:55
sr105	:)	18:55
Remram	if you delete branches and commits become unreachable, they are subject to garbage selection	18:55
cbreak	git is the most fucking explicit motherfucking SCM on this whole fucking network.	18:55
Remram	mercurial don't delete stuff, you have to explicitly do it	18:55
Dougie187	lol	18:55
sr105	off-topic: my irc client highlights user names so I'm seeing "here" and "so" highlighted. I'm going to change my nick to "the"	18:56
Remram	well, it's not	18:56
cbreak	yeah. And git branch -D is needed to delete branches :)	18:56
Dougie187	I really like the idea that you don't have to push all of your branches too	18:56
_ikke_	-d suffices if the branch is deemed merged	18:56
cbreak	sr105: hope you like being highlighted	18:56
sr105	:)	18:56
	← jhulten left	18:57
cbreak	_ikke_: yeah, that doesn't change reachable history though :)	18:57
	→ YannH joined	18:57
_ikke_	true	18:57
sr105	I have been bitten by my other debs before with mercurial pulling all branches by default.	18:57
	→ hwrd\|work joined	18:57
sr105	The just merge all heads without looking.	18:57
	they	18:57
Remram	if you "force-push", moving a branch to something else, Git might implicitely reclaim commits	18:57
	mercurial won't	18:57
_ikke_	well, that's the same with git though	18:57
sr105	devs	18:57
_ikke_	but in git, you don't have to push all your branches	18:58
cbreak	sayd: what exactly is the problem you're having?	18:58
	← frgtn left	18:58
Remram	you don't have to push all your branches with mercurial either...	18:58
sr105	_ikke_: mercurial doesn't have to push all heads. hg push -r head/branch/changeset	18:58
Remram	you can push a branch or a bookmark, just like Git	18:58
cbreak	git config push.default upstream	18:59
	it rocks.	18:59
	← Artpicre left	18:59
	← glebihan left	18:59
	← Sigma[Mtp] left	18:59
	→ frgtn joined	18:59
	→ glebihan joined	18:59
	YannH → Sigma	18:59
	→ alvaro_o joined	19:00
	→ Artpicre joined	19:00
	Sigma → Guest44518	19:00
sr105	one nice thing about git: the kernel is a 600MB bare repo in git. It's 5GB in mercurial.	19:00
Remram	that's completely possible	19:00
	mercurial's storage format is so weird	19:00
	(apparently also inefficient)	19:00
sr105	it can be made to be 2GB with some custom flags, but no smaller	19:00
	← przemoc left	19:01
sr105	it was designed to be strictly linear	19:01
	IIRC git allows seeking	19:01
Remram	Well that's just wrong :(	19:01
	← BigBlueBacon left	19:01
	Guest44518 → Sigma	19:01
	← Sigma left	19:01
	→ Sigma joined	19:01
	→ kermit joined	19:01
Remram	Seeking in pack files?	19:01
cbreak	I bet that's fast.	19:01
	← zapb_ left	19:01
_ikke_	I guess it has to do with gits delta compression in packs	19:02
	→ przemoc joined	19:02
cbreak	Remram: git log -p -- file	19:02
	→ amcsi joined	19:02
sr105	mercurial has some sort of design guarantee that you can process the repo in a stream.	19:02
_ikke_	what does that mean?	19:03
sayd	cbreak: i guess i was just confused why pulling got me all the refs	19:03
_ikke_	sayd: because another remote still has them	19:03
sayd	that i thought were gone because i did an upstream prune	19:03
	→ nottombrown joined	19:03
cbreak	it'll do a fetch of the whole remote by default	19:03
	← TheBrainWork left	19:03
	← d4rklit3 left	19:03
	← victorbjelkholm left	19:04
	→ calcifea joined	19:04
Remram	I use fetchspecs	19:04
cbreak	sayd: prune will only remove local remote tracking branches that do no longer have a corresponding branch on their remote	19:04
Remram	these are annoying	19:04
	having to remove the fetchspec and then do branch -rd...	19:04
cbreak	Remram: you can set it up from the start :)	19:04
	→ nottombr_ joined	19:04
	← calcifea left	19:05
	← hwrd\|work left	19:05
Remram	And never ever change it?	19:05
cbreak	yes	19:05
sayd	im not sure why they were pruned in the first place then	19:05
cbreak	or just add to it :)	19:05
Remram	that's hardly flexible now is it	19:05
sayd	because they didnt exist on origin?	19:05
cbreak	sayd: if it was pruned, then it shouldn't come back	19:05
	if you can fetch it, it shouldn't have been pruned.	19:06
	← elplatt left	19:06
sr105	thanks for the help and discussion. gotta get back to work	19:06
	→ calcifea joined	19:06
	← yhager left	19:06
	→ pantsman joined	19:07
	→ elplatt joined	19:07
sayd	it says new (next fetch will store in remotes/upstream)	19:07
	← lc0dd0cl left	19:07
sayd	so i think a fetch upstream will bring it back in	19:07
	← calcifea left	19:07
	→ Sebastian_ joined	19:07
	← nottombrown left	19:07
	→ lc0dd0cl joined	19:08
	→ Pyrogerg joined	19:08
	→ chuck88 joined	19:09
	→ calcifea joined	19:09
	← lc0dd0cl left	19:09
	← iamjarvo_ left	19:09
	→ iamjarvo_ joined	19:09
	→ Mars__ joined	19:10
	→ lc0dd0cl joined	19:10
	→ codeFiend joined	19:11
	→ LeMike joined	19:11
	→ Sebastian__ joined	19:12
	← chuck8 left	19:12
	← takamichi left	19:13
	← frgtn left	19:13
	→ yhager joined	19:13
	→ frgtn joined	19:13
	sr105 → sr105\|away	19:14
	← Sebastian_ left	19:15
	← frgtn left	19:15
	→ zapb_ joined	19:16
	→ resmo joined	19:17
	→ jhulten joined	19:17
	← shpoont left	19:18
	← resmo left	19:18
	sr105\|away → sr105	19:18
	← jhulten left	19:19
	→ jhulten joined	19:19
	emmajane → [emmajane]	19:20
	← m0ltar left	19:20
	→ shpoont joined	19:21
	→ rabbite joined	19:22
	← Sendoushi left	19:22
rabbite	I made a single commit to master and haven't pushed. I want to move the commit to another branch. Suggestions?	19:22
	→ KaibutsuX joined	19:24
	gitinfo set mode: +v	19:24
	← sq-one left	19:24
	→ Kayra joined	19:24
KaibutsuX	can anyone tell me if it's possible to get git to recognize "git checkout origin/master" as just "git checkout master"?	19:24
LeMike	a submodule can not be in a submodule under the same repo. but can a subtree be in a subtree?	19:25
	← stodan left	19:25
LeMike	lets say "lib/framework" and "lib/framework/myPlugin" ?	19:25
jrnieder	KaibutsuX: what do you mean?	19:25
	← zorbash left	19:25
	← Targen left	19:26
jrnieder	KaibutsuX: is it, "I keep on accidentally typing 'git checkout origin/master' instead of 'git checkout master' by mistake. How do I convince git to do what I mean, not what I say?"	19:26
rabbite	KaibutsuX: Do you want git to ignore your local master always?	19:26
	→ lite__ joined	19:26
	← jhulten left	19:26
rabbite	KaibutsuX: those are two different commands	19:26
	→ stodan joined	19:26
KaibutsuX	I am using a script that only has acces to the branch as "origin/master" and I want git to interpret it as just "master"	19:26
	and I can't edit the variable in this script	19:27
jrnieder	KaibutsuX: or, "I keep on running 'git checkout master' when I really meant to do 'git checkout origin/master', and I end up on a stale branch. How do I convince git to give me origin/master instead?"	19:27
	→ T0bb5 joined	19:27
jrnieder	KaibutsuX: I'd copy and modify the script	19:27
	← Sebastian__ left	19:27
KaibutsuX	ok it's not technically a script, it's jenkins	19:27
	→ oojacoboo joined	19:28
	→ nicknisi joined	19:28
rabbite	Also, that seems horribly contrived. Maybe you should take a step back and rethink your process?	19:28
	→ Sebastian_ joined	19:28
jrnieder	KaibutsuX: my general advice is still the same --- I'd try to figure out how to get Jenkins to do the right thing instead of hacking it around on the git side	19:28
KaibutsuX	jenkins exports the branch as 'origin/master', but then when it uses that variable to checkout another project obviously thats not the same as just 'master'	19:28
rabbite	Trying to bend git into using local commands to mean remote seems like a bad idea, IMO.	19:28
	← Xethron left	19:28
	← ErKa left	19:28
jrnieder	KaibutsuX: or, if I wanted to hack it around on the git side, I'd put a custom "git" command in $PATH that munges arguments :)	19:28
	← Kayra left	19:29
jrnieder	KaibutsuX: anyway, this looks like a Jenkins configuration problem. Someone on #jenkins might be able to help.	19:29
T0bb5	Hi #git I'm pretty familiar with git and I am trying to convert my place of employment to use git as we don't use any version control. If anyone has some time to go over some repository design basics with me I would really appreciate it.	19:29
	→ Snibble joined	19:29
	← russ_ left	19:29
	← lite_ left	19:30
	← KaibutsuX left	19:30
	← nottombr_ left	19:30
	← lite__ left	19:30
	gitinfo set mode: +v	19:30
	→ nottombrown joined	19:31
	→ raonyguimaraes joined	19:31
rabbite	T0bb5: Read this: http://nvie.com/posts/a-successful-git-branching-model/	19:31
	← zapb_ left	19:31
T0bb5	Thanks!	19:31
rabbite	Git-flow is one of the more popular git workflow methods	19:31
	(there are many)	19:32
_ikke_	git flow is the other big one	19:32
LeMike	w8 T0bb5. also read http://danielkummer.github.io/git-flow-cheatsheet/	19:32
moritz	but it's also quite process-heavy	19:32
_ikke_	github flow *	19:32
	→ jhulten joined	19:32
rabbite	T0bb5: you are in the right place though. #git is very helpful, regardless of skill level.	19:33
LeMike	somehow i love gitflow even knowing that I can do this stuff with other commands aleady :P	19:33
	+r	19:33
	← Snibble left	19:34
T0bb5	Thats what I heard from some of my friends. I Really appreciate the resources.	19:34
rabbite	Gitflow is really newbie friendly, so if you are working with a lot of devs who aren't git wizards, it's very safe.	19:34
	I'm coaching my team slowly into gitflow	19:34
mancha	Hi. Is there a way to edit the TZ in a commit?	19:34
	← nottombrown left	19:35
rabbite	T0bb5: Also, smart move to highly encourage your team to use a VCS.	19:35
	← vurma left	19:35
T0bb5	Rabbite do you mind if I PM you?	19:35
rabbite	A programming shop without version control is like a mechanic shop with no fire extinguishers, somebody is guaranteed to get burned.	19:35
	Sure.	19:35
lov	Yeah, if I found out that the place I interviewed at / got hired at didn't use source control, I'd just keep on moving and not look back. That's a red flag of awful systemic problems.	19:37
LeMike	I wonder if it is possible to have Git not storing delta of some files like *.jpg . Just the latest one always. I guess there has to be some hook that erases the old one from bare repo and puts the new one in place. Or?	19:37
	← Brmm left	19:37
lov	LeMike: no, because the entire point of git is keeping every copy.	19:37
rabbite	lov: I wouldn't automatically run. I'd ask if they would allow me the freedom to implement it. If no; then run.	19:38
arand	lov: Well, there's !git-annex, but that's an extra layer	19:38
gitinfo	lov: git-annex.branchable.com -- manage files with git, without checking the file contents into git	19:38
	← elplatt left	19:38
rabbite	Unrelated: I managed to make a single commit on master, I want to pop it off of master and put it back on the branch that I thought I was on.	19:38
LeMike	yee but today we had to expand the image where the repos are in and as I took a look at them, they are fed up with binary files and a few deltas for the source. really a mess I can not avoid, except a hook that says "binary? get off!" :P	19:38
lov	rabbite: I'd consider it a very, very small probability that the place doesn't use source control, but has good practices otherwise and is amenable to improvement.	19:39
	← jfoy left	19:39
lov	unless it's something where you're the only/first developer hired, of course	19:39
	→ elplatt joined	19:39
lov	LeMike: consider storing the binary files somewhere else, or see !git-annex, etc.	19:40
gitinfo	LeMike: git-annex.branchable.com -- manage files with git, without checking the file contents into git	19:40
rabbite	For example, my current place of work used git, but no flow control. Everyone committed to master or develop as they saw fit. They gave me the room to enforce a little more control. It's gotten much better as a result.	19:40
	← Mars__ left	19:40
lov	rabbite: right, but they were still using version control.	19:40
	→ Mars joined	19:41
	← codeFiend left	19:41
rabbite	Yeah,	19:41
	Mars → Guest78439	19:41
	→ dglambert joined	19:41
	→ m0ltar joined	19:41
LeMike	git-annex was a pain in the ass due to it's symlinks that can be messed up easily by inexpertly developers. and storing somewhere else wouldn't be appreciated by the devs -.- i'm stuck like that for a year	19:41
rabbite	If I came to an interview at a place with more than 2 developers who didn't use any VCS, I'd be very wary.	19:42
dglambert	Hey so I deleted a file from a folder I have init, now how do I commit this	19:42
	git commit -m ""	19:42
lov	honestly, I'd say more than 0 developers	19:42
	→ mmcdaris joined	19:42
lov	unless your job is to replace those developers	19:42
	← m0ltar left	19:42
	← preflex left	19:42
	→ mklappstuhl joined	19:42
	→ ni_ joined	19:42
dglambert	doesnt work cause it says changes not staged for commit 'deleted: Test.java'	19:43
imachuchu	rabbite: cherry-pick the commit to the branch you want, reset the other branch to before the commit	19:43
lov	using source control should be something that you Just Do as a developer, even if it's in the form of having a local git repo and some dinky server somewhere acting as your backup.	19:43
	← dort left	19:43
lov	dglambert: the error message tells you the problem :)	19:43
rabbite	imachuchu: I've never used cherry-pick before, but I'll try it out.	19:43
dglambert	lov, yeah, so what do I need to do on the bash side to reflect the deleted file	19:44
	← jkremser left	19:44
	← Cromulent left	19:44
	← shpoont left	19:44
lov	dglambert: you need to tell git to stage that change. In this case, git rm --cached (use --cached because you already deleted the file).	19:44
	→ maestrojed joined	19:44
dglambert	rm ?	19:44
lov	If you don't have any changes staged, git has nothing to commit.	19:44
	← _flow_ left	19:45
	→ zorbash joined	19:45
	→ zapb_ joined	19:46
dglambert	so I need to remove it again in the bash?	19:46
	That doesn't seem right	19:46
_ikke_	dglambert: git rm --cached tells git the files needs to be deleted in the repo	19:46
	dglambert: not rm, git rm	19:47
	→ jfoy joined	19:47
dglambert	sorry, thats what I meant	19:47
	→ lite_ joined	19:47
dglambert	what happens if say I do a few changes, deletes and add some files	19:47
	← Squarism left	19:47
	→ Roots47 joined	19:47
dglambert	and then I go back and need to update my git	19:47
	do I need to do all the add's and rm's	19:47
	← mmcdaris left	19:47
	→ frgtn joined	19:47
_ikke_	dglambert: there are shortcut options, but people are encouraged to think about what they put in a commit	19:48
	→ kukks joined	19:48
	← kukks left	19:48
	→ kukks joined	19:48
dglambert	So in otherwords, I need to keep up with it everytime I make a change, rather than let them build up before I have that problem?	19:48
	← cods left	19:49
	← xxtjaxx left	19:49
mancha	is there any environment variable i can set for git's TZ?	19:49
	← freestyl3r left	19:49
	→ freestyl3r joined	19:49
	← jnavila left	19:49
	← PeterBooker left	19:49
_ikke_	dglambert: I don't understand your question	19:50
	→ jnavila joined	19:50
dglambert	_ikke_, so say if I am commiting everytime I delete or add a file, I will never have more than one to have to update. Like I said what if I added a bunch of files and deleted a few and have to make a commit?	19:51
	s/?/.	19:51
Kwpolska	How will the git gods punish me for an empty commit I had to make to keep a service happy?	19:51
_ikke_	dglambert: there are all sort of options to specify what to add	19:51
	→ kiki67100 joined	19:51
	← kiki67100 left	19:52
	→ kiki67100 joined	19:52
	← k4rtik left	19:52
_ikke_	dglambert: there is for example git add -i, which is an interactive interface to add changes	19:52
	→ _flow_ joined	19:52
dglambert	_ikke_, ok so I deleted from my o/s, next time should I just only do it from with in the bash	19:52
	I am on Windows btw	19:52
lov	I had a vague suspicion from you saying "in the bash"	19:53
_ikke_	It's quite telling ;-)	19:53
dglambert	lov, I figured	19:53
lov	dglambert: it's important to understand what the typical git workflow is.	19:53
	← zorbash left	19:53
dglambert	I'm that transparent eh	19:53
lov	a commit is usually supposed to be a discrete change, such as adding a feature, or fixing a bug.	19:53
_ikke_	dglambert: git is quite flexible	19:53
lov	Generally, if you're making one commit per file, you're Doing It Wrong.	19:53
	→ War2 joined	19:54
	← War2 left	19:54
	→ War2 joined	19:54
imachuchu	Kwpolska: doesn't care, I often use an empty commit as my root node (so I can rebase everything if needed)	19:54
dglambert	lov, I am trying to learn actually, I am only working with a programming challenge problem, not real projects.	19:54
lov	What's nice is that git lets you stage only part of a change that you made to a file, so you can work on multiple things at once and pivot.	19:54
	← mklappstuhl left	19:54
_ikke_	imachuchu: Haven't heard of rebase --root?	19:54
lov	dglambert: it might help to read through http://git-scm.com/book	19:54
Kwpolska	lov: git add -p is really helpful for that. --interactive sans the fluff.	19:54
	← joelm left	19:54
dglambert	lov, I am part way through it	19:54
lov	reading chapter 2 and 3 will be a big help in understanding how to get the most out of git :)	19:54
	← zarubin left	19:55
imachuchu	_ikke_: no I had not, thank you	19:55
lov	Kwpolska: yeah, I agree.	19:55
	← spaceonline left	19:55
	← russoneto left	19:55
dglambert	Well at one point I was, I guess I should take it off the virtual book shelf and blow the virtual dust off it	19:55
_ikke_	mancha:	19:55
	mancha: afaik, git stores unixtimestamps	19:55
	mancha: Those are in UTC	19:55
mancha	it does, but also includes a tz offset	19:55
_ikke_	ah ok	19:55
mancha	i think it takes it from "TZ" though, so testing now.	19:56
_ikke_	mancha: Yeah, there is no git specific one	19:56
dglambert	Ok so I only have deleted one file so far and need to make that change to my repo, say I had deleted 4 or 5 files, would the correct command be the one you gave me earlier	19:56
	git rm --cached	19:57
mancha	_ikke_: yep. thanks.	19:57
lov	dglambert: git rm --cached eachFile asAn argumentWill work	19:57
	note, of course, that you can delete the file via git rm directly	19:57
Kwpolska	what is the best place to report a tiny bug in git manpages?	19:57
lov	if you're using an IDE with git integration, it can do this automatically.	19:57
_ikke_	Kwpolska: the !mailing_list	19:58
gitinfo	Kwpolska: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	19:58
lov	Kwpolska: a tiny mailing list	19:58
dglambert	lov, ok thats what I thought, so i should be trying to make the changes in the bash vs in the o/s explorer	19:58
_ikke_	Kwpolska: If it's a small fix, you can best just send a patch	19:58
lov	use a tiny email client and type on a tiny keyboard :>	19:58
	← axl_ left	19:58
_ikke_	lov: Is a 7 inch tablet with according keyboard enough?	19:58
	tiny enough*?	19:58
lov	dglambert: it depends on your style. it's ok to delete files directly using whatever your editor is, and then adjust yourself later via git.	19:58
mancha	_ikke_: do you know if edit still works on newer gits (for interactive rebase) or must i use reword?	19:58
lov	dglambert: you should get used to running git status to see what's happening in your working directory, along with git diff to see what you've changed since your last commit.	19:59
_ikke_	mancha: edit and reword are two different things	19:59
	mancha: edit allows you to ammend a commit, while reword only gives you the editor to change the commit messages	19:59
	← _flow_ left	19:59
	→ Snibble joined	19:59
	→ RaceCondition joined	19:59
dglambert	also can I just say git push, or do I need to say git push -u origin master	19:59
	← matteo left	20:00
lov	generally, you can just say "git push"	20:00
mancha	_ikke_: aha, so i want edit, since i do want to amend.	20:00
	thanks.	20:00
_ikke_	dglambert: git push -u origin master sets up upstream information for that branch	20:00
	dglambert: That has to be done only once	20:00
	dglambert: But when cloning, git automatically does that for master	20:00
dglambert	_ikke_, Ok I thought I had read that was a one time only thing but I wasn't sure	20:01
_ikke_	dglambert: Also note the setting push.default	20:01
	dglambert: It used to be matching, which means git would push all branches that also exists on the remote repository	20:01
	← oojacoboo left	20:02
dglambert	_ikke_, could you clarify the difference	20:02
_ikke_	dglambert: Difference between what?	20:02
	→ salamanderrake joined	20:02
_ikke_	The settings?	20:02
	dglambert: You most likely want it to be set to 'simple'	20:03
dglambert	push.default of matching or simple	20:03
_ikke_	simple means it pushes only the current branch, but only if it also exists on the remote	20:03
	← kukks left	20:04
	← Snibble left	20:04
	→ _flow_ joined	20:05
	← _flow_ left	20:05
	→ oojacoboo joined	20:05
	→ joelm joined	20:05
	→ m0viefreak joined	20:05
	← stodan left	20:06
	→ devin_ joined	20:06
	→ thegladiator_ joined	20:06
devin_	sorry, lost my connection	20:06
	← rednaks left	20:06
	→ Squarism joined	20:06
_ikke_	You found it back? :P	20:07
devin_	Thanks for the help everyone btw	20:07
	← dglambert left	20:07
	→ _flow_ joined	20:07
	devin_ → dglambert	20:07
_ikke_	ah, it's you ;-)	20:08
	did you get my message?	20:08
	← frgtn left	20:08
dglambert	_ikke_, I don't know what was your message?	20:08
_ikke_	simple means it pushes only the current branch, but only if it also exists on the remote	20:08
	← zapb_ left	20:08
	→ frgtn joined	20:08
dglambert	_ikke_, yes I did, I changed my default to simple cause I said it seems safer	20:08
mancha	_ikke_: ok, rebase fixed older ones and alias fixes newr ones	20:08
	← Jabberish left	20:09
mancha	all's well in camelot	20:09
	→ zorbash joined	20:09
_ikke_	mancha: cool	20:09
	→ cenuij joined	20:09
	← cenuij left	20:09
	→ cenuij joined	20:09
	← thelorax123 left	20:09
	→ err_ok joined	20:10
	← Sebastian_ left	20:10
	← chuck88 left	20:11
	→ thelorax123 joined	20:11
	→ victorbjelkholm joined	20:11
	→ _kW joined	20:11
	← tvw left	20:12
	← breakingthings left	20:12
	← frgtn left	20:13
	→ sq-one joined	20:13
	← coopsh left	20:13
	← pilif left	20:13
	→ zorbash_ joined	20:14
	→ jceb joined	20:14
	jceb → Guest54947	20:14
	← JustinMac left	20:14
	← Guest54947 left	20:14
	← zorbash left	20:14
	← yetet left	20:14
	→ breakingthings joined	20:15
	→ pilif joined	20:15
	→ Snibble joined	20:15
	← victorbjelkholm left	20:15
	→ jceb_ joined	20:16
	→ yetet joined	20:16
	← jceb_ left	20:16
	→ endiruna joined	20:17
kiki67100	Hello	20:17
	Can you send me the deploy page please ?	20:18
bluesm	What is the meaning of the statement "git doesn't track name changes"	20:18
	← jlewis left	20:18
kiki67100	!deploy	20:19
gitinfo	Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	20:19
	→ zorbash joined	20:19
	→ coopsh joined	20:19
_ikke_	bluesm: It means there is no record stored in the git 'database' that says that file1 is renamed to file2	20:20
	→ davispuh joined	20:21
	→ vurma joined	20:21
	← zorbash_ left	20:22
	← lite_ left	20:22
	← dreiss left	20:22
	→ zapb_ joined	20:22
	juvenal → juvenal_away	20:22
	→ SporkWitch joined	20:22
	← SporkWitch left	20:22
	→ SporkWitch joined	20:22
	← joki left	20:23
	← zorbash left	20:23
	← j416 left	20:23
	→ j416_ joined	20:23
	→ zorbash joined	20:24
	→ Kayra joined	20:24
bamj0rb	bluesm: There's no difference between `git mv file1 file2' and `cp file1 file2 && git rm file1 && git add file2'. Git doesn't really care (though it does its best to detect that automatically just for your convenience).	20:24
	→ teran joined	20:24
	← davividal left	20:24
	→ cortexman joined	20:25
cortexman	does anyone know of a web-based text editor for files in a git repo?	20:25
	← Guest78439 left	20:25
	← foucist left	20:26
	→ cods joined	20:26
HedgeMage	github's interface has one IIRC	20:26
	← etcetera left	20:26
	← Snibble left	20:27
bluesm	_ikke_: bamj0rb So the only way to "rename" something in git is to "remove" something from git and add the same file with chenged name (What "git mv" does) Right ? And this would not connect anyhow "deleted" file with "added", it would be seen as just "Deletion of a file, and addition not related file, in the history. Right ?	20:27
_ikke_	bluesm: correct	20:27
	← MacGyver left	20:27
	juvenal_away → juvenal	20:28
	→ etcetera joined	20:28
	← chisler left	20:28
	← PaulCapestany left	20:28
_ikke_	bluesm: Old e-mail from Linus talking about this: http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217	20:28
	← Kayra left	20:28
	→ joki joined	20:29
	→ lite_ joined	20:29
	→ pixelgremlins joined	20:29
	→ Snibble joined	20:29
	← zapb_ left	20:29
	→ srayner joined	20:30
	← Gavrisimo left	20:30
	→ Gavrisimo joined	20:30
	→ MacGyver joined	20:30
	← MacGyver left	20:30
	→ MacGyver joined	20:30
	→ papegaaij joined	20:31
	← _flow_ left	20:31
lov	Does linus spend all of his time writing angry emails?	20:32
	because that's the impression I've slowly been getting.	20:32
	→ qknight joined	20:32
	← rasto left	20:32
_ikke_	He didn't even use a swear word in this e-mail	20:33
	→ Brmm joined	20:33
	→ nottombrown joined	20:33
	← magu\|q left	20:34
	← CKyle left	20:34
	← Gavrisimo left	20:35
	→ magu\|q joined	20:35
	← samuel02 left	20:37
	→ _flow_ joined	20:38
	→ JustinMac joined	20:38
	→ Snibble1 joined	20:38
_ikke_	cbreak: about sha1 and git:	20:39
	cbreak: http://thread.gmane.org/gmane.comp.version-control.git/27/focus=322	20:39
	← cenuij left	20:39
	← endiruna left	20:39
	→ endiruna joined	20:39
	→ Gitzilla joined	20:40
	→ hwrd\|work joined	20:40
	← cortexman left	20:40
	← sq-one left	20:40
	← Snibble left	20:41
	→ rcu joined	20:41
	→ zapb_ joined	20:43
cbreak	sha3!	20:43
	← raonyguimaraes left	20:44
	→ Mars joined	20:45
	→ rasto joined	20:45
	→ chisler joined	20:45
	Mars → Guest17043	20:45
	← elplatt left	20:45
	← err_ok left	20:45
	→ raonyguimaraes joined	20:46
	← LeMike left	20:46
	fangism-shadow → fangism	20:46
	→ davispuhh joined	20:47
	→ thiago joined	20:48
	→ simesy joined	20:48
	→ asQuirreL joined	20:48
	→ Advocation joined	20:49
imachuchu	heexplained it in an e-mail, his perceived anger is just our being insensitive to his culture	20:49
	← lite_ left	20:50
	← h0bbit_ left	20:50
_ikke_	He's very opinionated and not shy of lettig others know they're wrong in his opinion	20:50
	← Snibble1 left	20:50
_ikke_	letting*	20:50
	→ LeMike joined	20:50
bamj0rb	I do not perceive any anger. Perhaps arrogance, but arrogance can easily be confused with _right_. :D	20:50
	← davispuh left	20:51
	← davispuhh left	20:51
	→ Snibble joined	20:51
jrnieder	in that $gmane/322 one I think he was wrong :)	20:51
	because of signed tags	20:51
	→ davispuh joined	20:52
	→ refried_ joined	20:52
	← Jackneill left	20:52
	← simesy left	20:53
	← joelm left	20:53
	← etcetera left	20:54
	← jarr0dsz left	20:54
	← Advocation left	20:54
_ikke_	Wrong in what sense?	20:54
	Or on what point	20:54
	← freestyl3r left	20:55
	juvenal → juvenal_away	20:55
	→ frgtn joined	20:56
bamj0rb	"In other words, I'm right. I'm always right, but sometimes I'm more right than other times." - Linus	20:56
	→ freestyl3r joined	20:56
bamj0rb	Therefore, you are wrong, but sometimes you are more wrong than other times. ;D	20:56
	→ elplatt joined	20:57
	→ tpollard joined	20:57
	→ fcw joined	20:57
	→ duxb joined	20:58
	← davispuh left	20:58
	→ etcetera joined	20:58
	← rcu left	20:58
jrnieder	_ikke_: "I think we could have used md5's as the hash, if we just make sure we have good practices. And it wouldn't have been "insecure"."	20:58
	_ikke_: that's true as long as people don't use protocols that don't authenticate the server	20:59
	→ joelm joined	20:59
duxb	Hi, I was on earlier with some questions about migrating an subversion repo to git, and I was getting an error, but I think I got past it, but now it creates an empty git repo	20:59
	← fcw left	20:59
jrnieder	_ikke_: if everyone uses https and if SSL is secure, then all is well. But as soon as someone uses git protocol and relies on signed tags to decide what kernel to install...	20:59
	→ Kayra joined	20:59
duxb	command I'm using: git svn clone file:///var/svn/semons/ --authors-file=users --no-metadata -s temp	21:00
	→ unkmar joined	21:00
	← _ikke_ left	21:00
	→ SocalNick_ joined	21:01
	← arand left	21:01
	→ LuxuryMo_ joined	21:01
	→ davispuh joined	21:01
duxb	any help?	21:02
	→ gittish joined	21:02
	juvenal_away → juvenal	21:02
	← SocalNick left	21:02
	SocalNick_ → SocalNick	21:02
	← T0bb5 left	21:02
	← LuxuryMode left	21:02
	← ni_ left	21:03
	← juls left	21:03
	→ pivonroll joined	21:03
	← marcidy left	21:03
	→ marcidy joined	21:03
	← rouf left	21:04
unkmar	okay, so I've messed up somehow and Need help fixing it. (refusing to update checked out branch)	21:04
	← HenryG left	21:04
	← tarkus left	21:04
	← luxgeek left	21:04
imachuchu	duxb: sorry, but I have no idea :(	21:04
	unkmar: don't push to a remote repo that isn't a bare	21:05
	← LuxuryMo_ left	21:05
unkmar	imachuchu: its a bear right now. so um, how do I make it bare of convert it or. well, how do I fix this?	21:05
	s/bare of/bare or/	21:05
	← tincricket left	21:06
	→ _ikke_ joined	21:07
unkmar	imachuchu: nevermind. I see I asked a quaqmire of a question. Researching now.	21:07
	← jhulten left	21:07
	← CreativeEmbassy left	21:08
imachuchu	unkmar: a bare repo is one without a local checkout (think like a server that people push/pull from)	21:08
SamB	unkmar: do you know what bare means?	21:08
	so, if you aren't using the working tree in that repository anyway bare is good	21:08
	otherwise, you may need to set up a bare repository as an intermediary	21:09
	→ renegaderyu joined	21:09
	→ mmitchell joined	21:10
	→ err_ok joined	21:10
	← robbyoconnor left	21:10
	← fletch49er left	21:11
unkmar	bare repo only, No working directory. No commits happen to bare, only push/pull. Right?	21:13
bamj0rb	Correct.	21:13
ojacobson	Generally.	21:14
	You can create commits in a bare repo but it's tedious and it's not part of _anyone's_ standard workflow	21:15
	not even crazy people :)	21:15
bamj0rb	Technically I'm doing it, but only because of evil circumstances... I don't consider it bare. Just ... elsewhere. >:)	21:15
duxb	I'm now trying to do "git svn clone svnrepo/ --authors-file=users --no-metadata -s temp" and it comes back with "E: 'trunk' is not a complete URL and a separate URL is not specified", any help?	21:15
	← m8 left	21:16
	→ Jabberish joined	21:16
unkmar	ojacobson: yeah, I sorta kinda figured the not usual part out.	21:16
	← dglambert left	21:16
	← _kW left	21:17
bamj0rb	duxb: Seems you need the file:/// scheme.	21:17
	← Snibble left	21:17
bamj0rb	Or perhaps it would just be file://./svnrepo/ ? I'm not 100% on file URIs..	21:17
	[emmajane] → emmajane	21:17
duxb	when I do that, it gives me an empty git repo	21:18
	but it does work	21:18
bamj0rb	Define "an empty Git repo"...? :-/	21:18
duxb	no files in it, just a .git directory	21:18
bamj0rb	Perhaps it doesn't know what to checkout first? Does git branch -a list anything?	21:19
duxb	and this svn repo has almost 200 revisions of over a hundred files	21:19
	← err_ok left	21:19
	→ simesy joined	21:19
duxb	bamjOrb: nothing	21:19
	← iamjarvo_ left	21:19
bamj0rb	Sounds like something isn't working. What is the output of svn clone? Perhaps you should pastebin a terminal log..	21:20
	→ _kW joined	21:20
	→ tadasZ joined	21:20
	→ madewokherd joined	21:20
bamj0rb	In my own experience, it spits out a ton of junk when it works (in Windows, it also takes weeks... xD).	21:20
	juvenal → juvenal_away	21:21
	← zapb_ left	21:21
duxb	when I do the one using file:///path/to/svnrepo it has no output, just finishes after several seconds	21:22
	← myme left	21:22
	→ Snibble joined	21:22
	← War2 left	21:23
	→ rouf joined	21:25
	← paulweb515 left	21:25
	← Moosya left	21:25
	→ Fandekasp joined	21:26
	→ err_ok joined	21:26
	← gittish left	21:26
bamj0rb	I would say that definitely is not working then. :-/ I don't know.	21:26
duxb	Well, thanks for trying.	21:27
	← IrishPrime left	21:27
	→ kim_plausible joined	21:27
bamj0rb	You're aware that the man page discourages --no-metadata?	21:27
	← simesy left	21:27
bamj0rb	Out of curiosity, if you remove that option do the results improve?	21:28
	emmajane → [emmajane]	21:28
duxb	no, several guides I found said to do it, I'll try without	21:28
	→ kukks joined	21:28
bamj0rb	That is apparently only if you want to exclude traces of Subversion metadata. This might be useful if you plan to throw the Subversion repository away afterward. That said, just for the heck of it, I'd try without just in case it's a bug or something..	21:29
duxb	same thing	21:29
	→ myme joined	21:29
duxb	well, my goal is to throw away the svn repo, but anything I can do to get this working...	21:29
	I took off the -s and now it seems to be working...	21:30
bamj0rb	Maybe try moving the URI after the options (I'm just swinging at gremlins at this point).	21:30
	← marthinal left	21:30
	→ jayrobot joined	21:30
	← DrShoggoth left	21:30
	→ jblue_ joined	21:31
	→ Nuru joined	21:31
jblue_	exit	21:31
	← jblue_ left	21:32
	j416_ → j416	21:32
Nuru	Where's the best place to file a bug report for git?	21:32
	juvenal_away → juvenal	21:32
	→ blami joined	21:32
ojacobson	http://git-scm.com/community is a good place to start	21:32
	juvenal → juvenal_away	21:33
Nuru	ojacobson: that's where I found out about this chat room	21:33
	← _kW left	21:33
	← rouf left	21:33
	← thiago left	21:33
igalic	how do I get the git command line to show me this: https://git-wip-us.apache.org/repos/asf?p=trafficserver.git;a=tag;h=151cc9a22c1754d25898d20aec149937fbe96bf8	21:33
ojacobson	Searching the page for "bug report" may be enlightening.	21:33
bamj0rb	This is the wrong place to report a bug. ;)	21:33
ojacobson	(It's the text _in bold_.)	21:33
Nuru	ojacobson: it recommends sending an email to a mailing list, but I hate that, as spam invariably follows.	21:34
	→ rouf joined	21:34
ojacobson	Okay, so your real question is "is there an alternative" and the answer is no	21:35
bamj0rb	igalic: Maybe git show or git cat-file?	21:35
	→ zapb_ joined	21:35
Nuru	ojacobson: Sorry, yes, you are right about my question, and if that is the answer then I just won't report the bug. Thanks for the quick response.	21:36
ojacobson	Git's actual dev team doesn't hang out in IRC much :)	21:36
	sorry mate	21:36
	← snql left	21:36
	→ iamjarvo_ joined	21:36
bamj0rb	You can always describe it anyway in case you're wrong.	21:36
	← jfoy left	21:36
Nuru	ojacobson: Wasn't expecting to report the bug on IRC, was hoping for something like GitHub's issue tracker.	21:37
duxb	bam, success! running it with --no-metadata and without -s worked	21:37
	← sebrock left	21:37
	← kim_plausible left	21:37
ojacobson	heh	21:37
bamj0rb	duxb: \o/	21:38
	→ dglambert joined	21:38
	← dglambert left	21:38
bamj0rb	duxb: That seems odd though. -s is a pretty normal option (of course, it probably depends on your repository having /branches/, /trunk, and /tags/).	21:39
	duxb: Perhaps the order of arguments matters (since I assume git passes them on to init and fetch).	21:39
	duxb: As long as you have all of your branches/tags that you need you're good. If not then you might want to play with the order.	21:39
	← endiruna left	21:39
	→ jhulten_ joined	21:39
	→ kim_plausible joined	21:39
	→ endiruna joined	21:39
duxb	I didn't have /branches/ /trunk/ or /tags/, maybe that was it	21:40
bamj0rb	Probably yes. :P	21:40
	That probably means that Git imported the history as a single branch/tree. If you did have branches you may want to change that...	21:40
	It would sort of defeat the purpose of using Git if you managed branches like Subversion after. :D	21:41
duxb	No, I wanted to switch to git specifically before I did branches	21:41
	← Nuru left	21:41
	← Destos left	21:42
duxb	ls	21:42
bamj0rb	. .. pr0n/	21:42
duxb	haha, wrong screen	21:42
	→ primiano joined	21:42
	← primiano left	21:42
	← elplatt left	21:44
	→ moffet joined	21:44
	→ elplatt joined	21:45
duxb	well, thanks all, I'm now officially a git user	21:45
	gitinfo set mode: +v	21:45
cbreak	welcome.	21:46
	if you want to use git, you won't get away without branches if you want to do anything useful in a reasonably convenient manner.	21:46
duxb	Oh, I plan on using them, that's why I switched, in part	21:47
	← longbeach left	21:47
	← el3ctron_ left	21:47
duxb	because according to the interwebs, svn sucks at branching/merging, and git rocks at it	21:47
	→ snql joined	21:48
	← endiruna left	21:49
	← Guest32031 left	21:50
	→ Advocation joined	21:50
	→ endiruna joined	21:50
	← thelorax123 left	21:50
bamj0rb	According to the universe, you mean.	21:51
duxb	isn't that what I said? :P	21:51
	→ Octalot joined	21:52
	← macabre left	21:52
	→ thelorax123 joined	21:52
	← jnavila left	21:52
	← zapb_ left	21:53
	→ jnavila joined	21:53
	→ primiano joined	21:53
	← primiano left	21:53
	← Advocation left	21:53
	→ droogans joined	21:54
	← skorgon left	21:54
	→ skorgon joined	21:54
	→ CKyle joined	21:54
	→ VictorCL joined	21:54
skorgon	remote: *** ABORTING ***	21:54
	remote: bad reponame 'foo/..*' or you forgot to set $GL_WILDREPOS	21:54
	→ zorbash_ joined	21:54
skorgon	do i have to do anything to fix the abort?	21:54
	← endiruna left	21:55
skorgon	i set the GL_WILDREPOS in the rc file now, but it doesn't seem to work	21:55
	← oojacoboo left	21:55
penguin42	is there anything more efficnet than git log -Sstring --source --all filename - i.e. anyway to preindex?	21:56
	→ paulweb515 joined	21:56
	← Fernandos left	21:56
	← Snibble left	21:57
	← thierryp left	21:57
	→ gajon joined	21:57
	→ simesy joined	21:57
	← zorbash left	21:57
	← moffet left	21:58
	← jhulten_ left	21:58
imachuchu	penguin42: preindex?	21:58
	← Layke left	21:59
	← zorbash_ left	21:59
penguin42	imachuchu: Well I keep doing searches like that and they're reasonably slow, so I wondered if there was anyway to generate an index based on all strings in all the diffs in a file	21:59
	→ moffet joined	21:59
	← SocalNick left	22:00
	→ avantgeek_ joined	22:00
penguin42	imachuchu: Especially since I'm tending to do lots of searches in the same subset of files for different strings	22:00
	→ zorbash joined	22:00
	→ mnms_ joined	22:00
	gitinfo set mode: +v	22:00
_ikke_	penguin42: If you provide files, it can speed the process up a lot	22:00
	← avantgeek left	22:00
droogans	Why don't you limit the number of commits?	22:00
	git log -n 25	22:01
	→ GeertV joined	22:01
penguin42	droogans: Because I've not got a clue when the changes were made	22:01
	_ikke_: Yeh I'm searching within the history of one or two specific files so I am doing that	22:01
	→ SocalNick joined	22:02
mnms_	Guys do you keep commercial projects on private repos in github ?	22:02
penguin42	droogans: I'm trying to forward port support for a system and come across a symbol undefined, so go and search for that symbol in similar systems to see when that symbol was removed	22:02
kiki67100	it's possible to merge one file from another branch ?	22:02
penguin42	droogans: It kind of works well except that -S is pretty slow	22:02
mnms_	Because I'm not totally convinced about having it there...	22:02
droogans	nmns_ then use bitbucket	22:03
	← teran left	22:03
	→ dglambert joined	22:03
mnms_	I mean security of source code.. Support team have access to it, and can clone anytime	22:03
	→ teran joined	22:03
	→ yargy joined	22:03
	→ gittish joined	22:03
droogans	You can download github's source and install it on a server behind your company's firewall	22:04
	It's not the latest and greatest, like the web version, but it's totally usable.	22:04
	→ tty-1 joined	22:04
mnms_	droogans: That cost a lot ?	22:04
droogans	Free	22:04
mnms_	wow	22:04
	← vurma left	22:04
droogans	Support costs money	22:04
	← gajon left	22:04
bartek	Hmm, I am creating an orphaned branch, and then I checkout "docs" from master on this orphan. However, the "docs" folder on master has a submodule. It seems when I checkout docs, despite it having a submodule, the orphan doesn't fill up the submodule	22:04
mnms_	droogans: what differnce is between bitbucket and github ?	22:05
bartek	I tried doing git submodule update when I checkout "docs" but no luck. What am I missing?	22:05
	→ faBimon joined	22:05
moffet	Hello, we have a web dev team that wants to migrate from subversion to git. Currently when a commit takes place "post-commit" fires and builds an rpm that is then scp over to a webserver and unpacked. Does git have something similar? My google chi is off today .. :/	22:05
	→ harobed_ joined	22:05
	→ ni_ joined	22:06
	→ btcquant joined	22:06
droogans	@mnms_ you get free private repos in bitbucket	22:06
	but if security and trust are your main concerns, look here: https://github.com/sitaramc/gitolite	22:06
	→ oojacoboo joined	22:06
droogans	@moffet google "post commit hook git"	22:07
btcquant	quick question: I've been working on a branch for the past month. Now, it is so far along, that we want to abandon the "master" branch and just make the "temporary branch" the new master. So, I don't want to merge, but want to just "jump". How can I do this?	22:07
droogans	You'll need to install those kinds of hooks on your git server.	22:07
	→ robbyoconnor joined	22:07
	← robbyoconnor left	22:07
	→ sebrock joined	22:07
moffet	droogans: perfect. thank you.	22:07
	← TheHoneyBadger left	22:07
droogans	@btcquant if you don't mind losing that history you can just make a new git init of the branch (in a new folder)	22:08
	← lifechamp left	22:08
btcquant	droogans I'd prefer to keep all the old history. Just in case.	22:08
kiki67100	it's possible two merge a file from another branch ?	22:08
	to*	22:08
droogans	@kiki google "git cherry-pick"	22:09
	→ xeqution joined	22:09
bamj0rb	btcquant: You can give a new name to the old master. E.g., git branch old-master master.	22:09
	btcquant: Then you can reset master to the new branch. git checkout master && git reset --hard $other_branch	22:09
	rm_work\|away → rm_work	22:09
	→ endiruna joined	22:09
mnms_	droogans: It would be good to have github funcionality: issue tracker collaboration tools	22:09
btcquant	bamj0rb Not a bad idea. Why do I need the "reset --hard"	22:09
kiki67100	droogans: thanks i will google that	22:09
bamj0rb	btcquant: Warning. --hard is serious business. Use with caution.	22:09
btcquant	?	22:09
mnms_	droogans: Where I can find source of github ?	22:09
	← Brmm left	22:10
kiki67100	I do a wordpress upgrade git it's very nice to that	22:10
bamj0rb	btcquant: git reset --hard will basically point your current branch (e.g., master) to whatever ref to give it (or HEAD, by default). So you effectively "move" master to $other_branch.	22:10
btcquant	bamj0rb Got it.	22:10
	→ jhulten joined	22:10
kiki67100	multiple branch ( old / new ) to ajust modification	22:10
bamj0rb	btcquant: It will also destroy any uncommitted/staged changes though. Make sure your working directory is clean (or you just don't care about the changes) first.	22:10
btcquant	bamj0rb Its clean. Thanks :)	22:11
droogans	mnms_: I spoke too soon, github's source isn't free, you have to have an enterprise edition of their source	22:11
	← GeertV left	22:11
	← joelrobichaud left	22:11
	→ GeertV joined	22:11
droogans	mnms_: gitolite is free. It's a web-project wrapped around git's features. You don't need github's source for that.	22:11
btcquant	bamj0rb Looks like it worked. WoooHooo. Thanks!	22:12
bamj0rb	btcquant: Of course, everybody is going to have to do something similar within their own repos.	22:12
	→ Layke joined	22:12
bamj0rb	btcquant: If they just "pull" then their master will merge with the new master. Which is probably not what they want.	22:12
btcquant	Only one other person. I might just have them clone the repo from scratch.	22:12
bamj0rb	One person is no big deal. :)	22:13
mnms_	droogans: I cannot find anything about issue tracking funcionality in gitolite ?	22:13
	→ zorbash_ joined	22:13
	→ shruggar joined	22:14
	← bronson_ left	22:14
	← dsdeiz left	22:14
	→ Brmm joined	22:15
SamB	mnms_: git doesn't support issue tracking, so ...	22:15
	← zorbash left	22:15
	← GeertV left	22:16
	← Pullphinger left	22:16
	← gittish left	22:16
	← Robarelli left	22:16
	← Baluse left	22:17
	→ ErKa joined	22:17
droogans	mnms_: how put off are you by a huge set up process?	22:17
	→ AaronMT joined	22:17
	← sebrock left	22:17
droogans	If you can handle a rather large-ish install/setup, check out Gerrit: http://stackoverflow.com/a/10897484/881224	22:17
	→ Baluse joined	22:17
	← zorbash_ left	22:18
	← thelorax123 left	22:18
	→ refried__ joined	22:18
	← Kayra left	22:18
	→ sabgenton joined	22:18
droogans	mnms_: see if this is more of what you'd want http://www.mediawiki.org/wiki/Gerrit/Tutorial	22:19
	→ chamunks joined	22:19
	→ hamiltont__ joined	22:19
	gitinfo set mode: +v	22:20
	→ thelorax123 joined	22:20
	← kiki67100 left	22:20
	→ zorbash joined	22:20
	← zeknox left	22:20
hamiltont__	Could anyone help me understand why my github pull request suddenly has 1000+ commits, instead of the initial <5?	22:20
mnms_	droogans: There is no issue tracking ?	22:20
hamiltont__	It's at https://github.com/TechEmpower/FrameworkBenchmarks/pull/502	22:20
sabgenton	when you git show and you see a diff is that part of the commit or is it generated there and then from the commit verse the previous commits?	22:20
	← chuckharmston left	22:21
	← Pyrogerg left	22:21
	→ yakup joined	22:21
hamiltont__	sabgenton: me?	22:21
	← apipkin left	22:21
droogans	mnms_: In gerrit, pull requests can only be one commit in size (you can configure it however you want, but this is the preferred way)	22:21
sabgenton	anyone	22:21
	:)	22:21
	→ mmcdaris joined	22:21
	→ Robarelli joined	22:22
droogans	mnms_: So every single commit is an pull request, so each can (and should) be treated as an issue.	22:22
	← endiruna left	22:22
droogans	mnms_: however, it takes a lot of discipline to properly administer a team that uses gerrit	22:22
mnms_	droogans: I need it for testers	22:22
droogans	There is this, which isn't free, but is cheap: https://github.com/blog/441-announcing-github-fi	22:22
	← thelorax123 left	22:23
droogans	Then there's this, which is simpler and more expensive https://enterprise.github.com/	22:23
	→ Kayra joined	22:23
droogans	I recommend https://enterprise.github.com/	22:23
	→ hellopat_ joined	22:23
sabgenton	hamiltont__: maybe you should ask in #github ?	22:23
	← eijk left	22:23
mnms_	droogans: Best solution but to expensive for me :(	22:24
	← snag left	22:24
mnms_	droogans: did you try to encrypt files with git crypt ?	22:24
yakup	hey guys did you notice that at the end of the man entry for git, the notes are referenced as like file:///home/junio/share/doc/git-doc/everyday.html - why not http?	22:24
	← t0r left	22:24
	← zorbash left	22:24
mnms_	then I could use github or bitbucket and push only encrypted files...	22:24
	→ russ_ joined	22:24
droogans	mnms_: never heard of that, but it sounds a bit off…not sure how you could get usable diffs out of encrypted files.	22:25
	→ zorbash joined	22:25
	→ thelorax123 joined	22:25
droogans	mnms_: why not separate your issue tracker from your version control?	22:25
	→ gverri_ joined	22:25
	← hellopat left	22:26
mnms_	it is very handy to have everything in one package...	22:26
droogans	mnms_: github simply combines these two tools, but separately they are both free.	22:26
	That's true.	22:26
	→ thiago joined	22:26
	← LeMike left	22:27
bamj0rb	yakup: I'm not sure what you're referring to... :-/	22:27
mnms_	droogans: I agree with you, but Im little worried about my source code after reading that	22:27
	https://help.github.com/articles/github-security	22:27
	→ preflex joined	22:27
	← hellopat_ left	22:27
	← halu_ left	22:27
	→ zeknox joined	22:28
mnms_	Specially Employee access paragraph	22:28
	→ woollyams joined	22:28
yakup	bamj0rb: in the notes section of the manual entry (man git), the links (except mail address) are file:// urls	22:28
gitinfo	bamj0rb: the git manpage is available at http://jk.gs/git.html	22:28
	← elplatt left	22:28
bamj0rb	yakup: Are you on Windows?	22:28
yakup	bamj0rb: nope	22:29
droogans	mnms_: I see. Well, unless you're doing something illegal or so high tech that you're afraid Github is going to steal it...	22:29
jrnieder	yakup: this is in https://git-core.googlecode.com/files/git-manpages-1.8.4.3.tar.gz?	22:29
sabgenton	ok git status's diff is generated, not stored anyware http://stackoverflow.com/a/10398894/790359 yay	22:29
droogans	mnms_: which is absurd. They already have a great reputation in a niche market, I don't see them blowing that over a client's code.	22:29
yakup	jrnieder: checking...	22:29
	← duxb left	22:29
	→ _kW joined	22:29
	← ojacobson left	22:30
	← donmichelangelo left	22:30
mnms_	droogans: Maybe you right.	22:30
bamj0rb	yakup: Ah, I see. Perhaps a bug. I imagine the URIs are meant to be where it's installed locally. You may be offline so a Web URI might not be accessible.	22:30
mnms_	and maybe Im too paranoid	22:30
	→ donmichelangelo joined	22:30
	← zorbash left	22:30
	→ elplatt joined	22:32
	← sabgenton left	22:32
	→ jday_ joined	22:32
	→ sabgenton joined	22:32
	→ chuckharmston joined	22:32
	→ zorbash joined	22:32
	← moffet left	22:33
	← Roots47 left	22:33
	← joelmo left	22:33
	← hamiltont__ left	22:34
yakup	bamj0rb, jrnieder: i've checked it in osx and ubuntu, and in the man source it looks like there's a variable.. but still, both refer to /home/junio so i thought i mention it here :)	22:34
	← ngladitz left	22:34
bamj0rb	yakup: Are you junio? :P Is that who installed Git?	22:35
	← alfadir left	22:35
	← hwrd\|work left	22:36
bamj0rb	For me the URI is to /usr/share/doc. :) Could be different versions too (maybe it was a bug at one time and was fixed since, etc.).	22:36
yakup	bamj0rb: Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano.	22:36
bamj0rb	yakup: Ah, what version of Git do you have?	22:36
	→ ewnd9 joined	22:37
	← refried__ left	22:37
	← rflktr left	22:37
yakup	bamj0rb: 1.7.8 on mac 1.7.10 on ubuntu	22:37
	bamj0rb: i was just studying the manual :)	22:38
	← threesome left	22:38
bamj0rb	I suppose it could also be that junio packaged it for Ubuntu and OS X and had built the documentation locally... :-/ Perhaps a bug for the packages?	22:38
	← rabbite left	22:38
	→ ojacobson joined	22:38
yakup	bamj0rb: but both of them are pointing to the filesystem	22:38
	← srayner left	22:39
bamj0rb	That would have probably been configured statically at built time. E.g., ./configure or `make man' or whatever is done.	22:39
	← ojacobson left	22:39
yakup	bamj0rb: can you confirm by the way?	22:39
bamj0rb	yakup: The reason it points to the file system is because it is expected to be installed in your file system.	22:39
	yakup: I cannot confirm. I am making an educating guess.	22:40
	→ wrouesnel joined	22:40
	wdkevinone → wdkevin	22:40
	→ zorbash_ joined	22:40
	← russ_ left	22:40
	← leeN left	22:41
	← btcquant left	22:41
bamj0rb	yakup: You can try to look up the package source for Ubuntu's git package(s). Or just file a bug with Ubuntu and see what they say. :)	22:41
	← beastd left	22:42
	→ mattattaque joined	22:42
	← kukks left	22:42
	→ sebrock joined	22:42
	← zorbash left	22:43
	→ webguynow joined	22:43
yakup	bamj0rb: i'll go on testing on different distros, and on osx i think i installed it with homebrew...	22:43
	← guest242 left	22:44
	← jhulten left	22:44
	→ elplatt_ joined	22:44
bamj0rb	yakup: You can also check Git's source to see if it screws up... :P	22:44
	← bwreilly left	22:45
	← zorbash_ left	22:45
bamj0rb	Building from source is actually pretty easy. There aren't any obscure dependencies.	22:45
SamB	yakup: yes, those are supposed to be pointing at the installed location on your system	22:45
	← mmcdaris left	22:45
	→ zorbash joined	22:45
SamB	if they are not, yell at the packager or installer (possibly you)	22:45
	→ pandeiro joined	22:46
	← aard left	22:46
bamj0rb	delete this; /* I suck. */	22:47
	← srji left	22:47
	→ lightsoda joined	22:48
	← elplatt left	22:48
	elplatt_ → elplatt	22:48
	← jnavila left	22:48
	→ Snibble joined	22:48
	← maestrojed left	22:48
yakup	SamB: so aptitude and homebrew are at the stake now :)	22:48
	← cannonball left	22:49
	→ Snibble1 joined	22:49
	← TomyLobo left	22:49
	← snql left	22:49
	← sebrock left	22:49
SamB	yakup: did you install git-doc yet?	22:49
	← davispuh left	22:50
SamB	also, by "packager" I meant whoever put the distro package together	22:50
	→ zorbash_ joined	22:51
	← zorbash left	22:51
	→ Kismet010 joined	22:51
Kismet010	extrange	22:51
	← wrouesnel left	22:51
	→ russ_ joined	22:51
	← woollyams left	22:51
Kismet010	.gitignore with .htaccess and local-config.php	22:51
	← abelsiqueira left	22:52
Kismet010	bitbucket shows local-co.. but no .htaccess	22:52
	← gverri_ left	22:52
	→ jxpx777_ joined	22:52
	→ Dreadnaught joined	22:52
	← Dreadnaught left	22:52
	→ Dreadnaught joined	22:52
Kismet010	I tried to remove local.php with rm -r --cached .	22:52
	and force push	22:52
	but it still there	22:52
	what happens?	22:52
	→ maslowbeer joined	22:52
	← Snibble left	22:53
	← Snibble1 left	22:53
	← tty-1 left	22:54
	← tirengarfio left	22:54
	← jxpx777 left	22:55
	sr105 → sr105\|away	22:55
	← zorbash_ left	22:55
	→ maestrojed joined	22:56
	← petey left	22:56
	← TheFuzzball left	22:56
bamj0rb	Kismet010: Please explain what you are trying to do. I do not understand.	22:57
	← droogans left	22:59
	qsuscs → qsusOFFcs	23:00
	← Dougie187 left	23:00
	→ gverri joined	23:01
	→ zorbash joined	23:01
	sr105\|away → sr105	23:01
	juvenal_away → juvenal	23:01
	→ garrilla joined	23:01
	← sabgenton left	23:02
	→ sabgenton joined	23:02
	← jerius left	23:03
	← Zarthus left	23:03
	← TheWarden left	23:04
	← RogerWS left	23:04
	← elplatt left	23:05
	→ elplatt joined	23:05
	← intripoon_ left	23:05
	→ johnkevinmbasco joined	23:06
	← thiago left	23:06
	→ zorbash_ joined	23:08
	← breakingthings left	23:08
	→ bwreilly joined	23:09
	→ T0bb5 joined	23:09
	← faBimon left	23:09
	← sriracha left	23:09
	→ kcj joined	23:10
	← ewnd9 left	23:11
	← zorbash left	23:11
	→ doug joined	23:12
doug	got this branch merged into master	23:12
	← yakup left	23:12
	← erichynds left	23:12
doug	what's the best way to get a list of commits in that branch?	23:12
	→ davispuh joined	23:12
	→ Destos joined	23:12
	← glosoli left	23:13
imachuchu	doug: !lol	23:13
gitinfo	doug: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	23:13
doug	"just in the branch," i guess that'd be commits that are common to that branch and master	23:13
	← zorbash_ left	23:13
imachuchu	doug: !lola	23:13
	aww	23:13
	→ zorbash joined	23:13
	→ TheFuzzball joined	23:13
	← TheFuzzball left	23:13
doug	and not showing commits that aren't in both branches....	23:14
	→ abdostar joined	23:15
doug	basically git rev-list that chops off at the merge base	23:15
	← nottombrown left	23:15
	→ richwestcoast joined	23:15
	→ shinnya joined	23:16
	← CKyle left	23:16
	juvenal → juvenal_away	23:16
	→ luxgeek joined	23:17
	← rpg left	23:17
	← renegaderyu left	23:17
	← pantsman left	23:17
imachuchu	doug: I use gitg, tig, and lol. Is this to be consumed by a program (as opposed ti a person)?	23:17
	← lavaman left	23:17
	← boblee left	23:18
doug	a script, yes	23:18
	← zorbash left	23:18
	← iderik left	23:18
	→ nottombrown joined	23:19
	→ boblee joined	23:20
	→ DrShoggoth joined	23:20
	← devbug left	23:20
	← iamjarvo_ left	23:23
	→ PeterBooker joined	23:24
	→ zorbash joined	23:24
	→ jlewis joined	23:25
	← nottombrown left	23:25
	→ nottombrown joined	23:26
	→ bb_ joined	23:27
	← bamj0rb left	23:29
	← nottombrown left	23:29
	→ nottombrown joined	23:30
imachuchu	doug: sorry but I really don't have any expiriance with that. Could you run revlist twice, one for each branch, then cull the duplicates to get one list?	23:30
	→ macrover joined	23:30
	→ zorbash_ joined	23:30
	← nottombrown left	23:30
	← KillYourTV left	23:30
	← johnkevinmbasco left	23:30
	→ johnkevinmbasco joined	23:30
	→ nottombrown joined	23:30
	← zorbash left	23:31
	→ endiruna joined	23:31
	← bb_ left	23:33
	← VictorCL left	23:33
	→ VictorCL joined	23:34
	→ nottombr_ joined	23:34
	← zorbash_ left	23:34
	→ SBoudria1 joined	23:34
	← DonRichie left	23:34
	← nottombrown left	23:35
	→ zorbash joined	23:35
	→ Lewix joined	23:35
Lewix	how to git add . BUT not the untracked files	23:35
	→ KillYourTV joined	23:35
	← SBoudria1 left	23:35
imachuchu	Lewix: "git add -u" ?	23:36
Lewix	iamtakingiteasy: idk	23:36
	is it?	23:36
imachuchu	Lewix: oh, but that won't get new files	23:36
	← akiress left	23:36
Lewix	git lemme try	23:36
	← elplatt left	23:37
imachuchu	Lewix: "git add -A" might be more what you want	23:37
Lewix	thanks	23:37
	-u worked	23:37
	← nottombr_ left	23:37
	→ jhulten joined	23:38
	← pivonroll left	23:38
	→ nottombrown joined	23:38
	← harobed_ left	23:38
	→ lifechamp joined	23:38
	→ droogans joined	23:39
	← KillYourTV left	23:39
	← zorbash left	23:39
	→ nottombr_ joined	23:40
	→ zorbash joined	23:40
	← nottombrown left	23:40
	← richwestcoast left	23:40
	← droogans left	23:41
	← rendar left	23:41
	← Kakera left	23:41
	← johnkevinmbasco left	23:42
	→ lavaman joined	23:42
	→ KillYourTV joined	23:43
	← natechan left	23:43
	→ sriracha joined	23:43
	→ sriracha1 joined	23:44
	→ txomon\|home joined	23:44
	← nottombr_ left	23:44
	→ nottombrown joined	23:44
	← zorbash left	23:44
	→ zorbash joined	23:45
	← Kayra left	23:45
	← King_Hual left	23:46
	→ sebrock joined	23:46
	→ johnkevinmbasco joined	23:46
	← jonez left	23:46
	→ pw3 joined	23:46
	← Robarelli left	23:46
	→ nnyk_ joined	23:48
	← sriracha left	23:48
	← zeograd left	23:49
	← johnkevinmbasco left	23:49
	← nottombrown left	23:49
	← Sigma left	23:49
	→ johnkevinmbasco joined	23:50
	→ zorbash_ joined	23:50
	← sebrock left	23:50
	← PeterBooker left	23:51
iron_houzi	Is this the best way to fetch and track a branch from a remote: git checkout -b foo origin/foo ?	23:51
	← tadasZ left	23:51
	← maestrojed left	23:51
	→ acl_ joined	23:51
	← zorbash left	23:51
	← lun__ left	23:52
	→ lun__ joined	23:52
	← Guest____ left	23:53
	→ rjhunter joined	23:54
	← mmitchell left	23:54
	→ shuaib joined	23:54
	→ CKyle joined	23:55
	← zorbash_ left	23:56
imachuchu	iron_houzi: no, that won't fetch the remote. "git fetch origin; git checkout -b foo origin/foo"	23:56
	← SirFunk left	23:56
	← lun__ left	23:57
	← nicknisi left	23:57
	← Serus left	23:57
	← endiruna left	23:57
	← jxpx777_ left	23:58
	→ jonez joined	23:58
	→ seanz joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation