IRCloggy #git 2013-03-08

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-03-08
	→ catsup joined	00:00
	→ w09x joined	00:00
	← w09x left	00:01
iveqy	but the parents git doesn't exists anymore?	00:02
	← __Big0__ left	00:02
avalarion	the parent exists, but is not recognizing the files from the childs git	00:02
	→ __Big0__ joined	00:03
	← Squarism2 left	00:03
iveqy	is there a file called .git in the child?	00:03
avalarion	i deleted it^^	00:03
	so not anymore	00:03
	→ guampa joined	00:04
iveqy	I'm confused... Let's see	00:04
	you had a git repo: a	00:04
avalarion	/home/.git	00:04
	← v0n left	00:04
avalarion	is a	00:04
	/home/plugins/.git	00:05
	is b	00:05
iveqy	okay	00:05
	and you delete plugins/.git?	00:05
avalarion	yep, I did	00:05
iveqy	and was that a file or a directory?	00:05
avalarion	because I wanted to add all plugins to the main git	00:05
	it was a directory	00:05
	← catsup left	00:06
	← anonymuse left	00:06
iveqy	okay, in that case you should be able to do a git add now..	00:06
	→ tplaner joined	00:06
	← elixir_ left	00:06
	→ catsup joined	00:07
avalarion	git status says that everything is up to date	00:07
	git add is not changing anything about this	00:07
	→ SBoudrias joined	00:07
iveqy	did you use git add before removing the .git dir in b?	00:08
avalarion	inside b or from parent? I would say both yes	00:08
iveqy	then b is registered as a submodule	00:09
avalarion	automatically?	00:09
iveqy	you need to delete the submodule to make git look for files in that directory again	00:09
	no, you added it...	00:09
avalarion	I've been afraid that you'd say this^^	00:09
iveqy	there's no way to delete a submodule today in git	00:09
	but you can do it manually: http://stackoverflow.com/questions/1260748/how-do-i-remove-a-git-submodule	00:10
	however, as you already done some cleanup not all steps applies to you	00:10
avalarion	git rm --cached path_to_submodule will not delete any files?	00:10
	← Davey left	00:10
iveqy	avalarion: I'm unsure, I wouldn't count on it	00:11
	and I would suggest a backup before	00:11
	← _abc_ left	00:11
	← ssb1 left	00:11
	→ scelis joined	00:12
avalarion	thanks for your help!	00:12
iveqy	git submodules are extremly powerful, and hard...	00:12
	good luck =)	00:12
avalarion	I wll try it out tomorrow	00:12
	← catsup left	00:12
avalarion	is it still not possible to be on master with submodules? do you know it?	00:12
	← giallu left	00:12
iveqy	you mean to track master and not a specific commit?	00:13
	→ catsup joined	00:13
avalarion	yep	00:13
	→ roler joined	00:14
iveqy	oh, well git 1.8.1.3 was released a few hours ago. In the release message there was a note about git submodule had started to learn that	00:14
	← sebuba left	00:14
	→ rabellamy joined	00:14
iveqy	I don't think git submodule had learnt it by heart yet... but hopefully soon	00:14
avalarion	it would be so much easier	00:15
	→ snql joined	00:15
iveqy	yeah in some cases. In some cases it just will be worse.	00:15
	You can easily end up with a configuration noone else had tested	00:15
roler	Hey guys, my team and I are taking the plunge to switch from svn to git. We have 2 other developers besides me. I am the final check of all code before it goes live. This is a website. What is the proper way to set this up? Setup live website as the "server" which I have ssh access to. I clone the directory. Do my developers clone the same live server, or my clone? Also, do they push updates to me, or do I pull updates from them to th	00:16
	push live?	00:16
	← Vampire0 left	00:16
	→ cthuluh joined	00:17
	→ pinchy joined	00:17
	← breck7 left	00:17
iveqy	roler: it's up to you...	00:17
	roler: git is flexible and can be used in many ways. You'll need to find the optimal way for your team to work	00:18
	→ mattp joined	00:18
	→ Vampire0 joined	00:18
	→ hakunin_ joined	00:18
iveqy	bare in mind that you cannot (or should not) push to a repository with a working index. That is, only push to bare repositories	00:19
	← markalanevans left	00:20
	← pastime left	00:21
	← hakunin left	00:21
	→ siriuz joined	00:21
roler	iveqy; so the working index being the main master that I cloned rom.. So I should always log into the box and run a pull ?	00:23
	→ diegoviola joined	00:23
	→ pastime joined	00:23
iveqy	roler: yes, but you could automate that with a hook	00:23
	← pinchy left	00:25
	→ xiangfu joined	00:25
	← __Big0__ left	00:25
	← jayrobot left	00:29
	← b1rkh0ff left	00:29
	← felipe left	00:29
	← Nibato left	00:29
	← Learath2 left	00:29
	← charon left	00:29
	← hwrd\|work left	00:29
	← Tommy[D] left	00:29
	← mattp_ left	00:29
	← przemoc86 left	00:29
	← hyperair left	00:29
	← todd_dsm left	00:29
	← nelk left	00:29
	← kukks left	00:29
	← cyphase left	00:29
	← rgngl left	00:29
	← mgedmin left	00:29
	← halcyonCorsair left	00:29
	← xerxas left	00:29
	← roger_raymond left	00:29
	← vmiklos left	00:29
	← Adys left	00:29
	← claudiu____ left	00:29
	← floppyears left	00:29
	← ldlework left	00:29
	← Khisanth left	00:29
	← pdtpatrick left	00:29
	← jbub left	00:29
	← Derander_ left	00:29
	← dlan left	00:29
	← chadi_ left	00:29
	← SaCu left	00:29
	← Stravy left	00:29
	← hays left	00:29
	← ToBeFree left	00:29
	← cxreg left	00:29
	← RichardBronosky left	00:29
	← PaulePanter left	00:29
	← raz left	00:29
	← Tekk_ left	00:29
	← heidar left	00:29
	→ kpreid_ joined	00:29
	→ Parhs8 joined	00:29
	→ revele joined	00:29
	← Parhs left	00:29
	← preflex left	00:29
	← phryk left	00:29
	← alegen left	00:29
	← mloskot left	00:29
	→ phryk_ joined	00:29
	→ cybersphinx joined	00:29
	← robbyoconnor left	00:29
	→ sonicblud joined	00:29
	→ RichardBronosky_ joined	00:29
	→ Moult_ joined	00:30
	← kmels_ left	00:30
	← Internet13 left	00:30
	← kpreid left	00:30
	← orafu left	00:30
	← rvl left	00:30
	kpreid_ → kpreid	00:30
	← ohcibi left	00:30
	← Moult left	00:30
	→ tokkee joined	00:30
	→ rufhausen joined	00:30
	→ orafu joined	00:30
	→ ohcibi_ joined	00:30
	→ preflex joined	00:30
	→ kmels_ joined	00:30
	← the_cybersphinx left	00:30
	← ehsan_ left	00:31
	← pfefferz_ left	00:31
	→ duosrx joined	00:31
	← duosrx left	00:31
	→ Marcux83\|away joined	00:31
	Marcux83\|away → Guest40226	00:31
	→ Nibato joined	00:31
	→ while1eq1 joined	00:31
	→ Learath2 joined	00:32
	→ Turicas joined	00:32
	← yshh left	00:32
	← boombatower left	00:33
	→ anabelle joined	00:33
	← primitive left	00:33
	→ Internet13 joined	00:34
	→ alegen joined	00:34
	→ heidar joined	00:34
	← eletuchy left	00:34
	← techlife left	00:34
	← karupanerura left	00:35
	→ eletuchy joined	00:35
	← j^2 left	00:35
	→ karupanerura joined	00:35
	← lethjakman_lapto left	00:36
	→ stliu joined	00:36
	← rufhausen left	00:36
	← natechan left	00:36
	→ cashwilliams joined	00:37
cashwilliams	is this the correct channel to ask for help?	00:37
	or is there a git-support or something I should be in?	00:38
	→ techlife joined	00:38
	→ vierja joined	00:38
	→ decotii joined	00:39
	← SBoudrias left	00:39
	← decotii left	00:39
	→ hwrd\|work joined	00:39
	→ Tommy[D] joined	00:39
	→ mattp_ joined	00:39
	→ przemoc86 joined	00:39
	→ todd_dsm joined	00:39
	→ nelk joined	00:39
	→ kukks joined	00:39
	→ cyphase joined	00:39
	→ rgngl joined	00:39
	→ mgedmin joined	00:39
	→ halcyonCorsair joined	00:39
	→ xerxas joined	00:39
	→ roger_raymond joined	00:39
	→ vmiklos joined	00:39
	→ Adys joined	00:39
	→ claudiu____ joined	00:39
	→ floppyears joined	00:39
	→ ldlework joined	00:39
	→ Khisanth joined	00:39
	→ Tekk_ joined	00:39
	→ pdtpatrick joined	00:39
	→ jbub joined	00:39
	→ Derander_ joined	00:39
	→ dlan joined	00:39
	→ chadi_ joined	00:39
	→ SaCu joined	00:39
	→ Stravy joined	00:39
	→ hays joined	00:39
	→ ToBeFree joined	00:39
	→ cxreg joined	00:39
	→ PaulePanter joined	00:39
	→ raz joined	00:39
	→ w0m joined	00:39
	→ surfdue joined	00:39
	→ Slush- joined	00:39
	→ tm512 joined	00:39
	→ sacrelige joined	00:39
	→ Paparaciz joined	00:39
	→ ejnahc joined	00:39
	→ badfw2 joined	00:39
	→ Hamled joined	00:39
	→ iAsterisk joined	00:39
	→ alip joined	00:39
	→ Tuna-Fish joined	00:39
	→ Aaeriele joined	00:39
	→ eagles0513875_ joined	00:39
	→ SBoudrias joined	00:39
HedgeMage	cashwilliams: here's fine, just ask	00:39
iveqy	!welcome	00:39
gitinfo	Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	00:39
	← vierja left	00:40
iveqy	:), that worked. I really getting to like @gitinfo	00:40
	← eletuchy left	00:40
cashwilliams	thanks	00:41
	← d2dchat left	00:41
cashwilliams	I just got this message - "Your branch and 'origin/development' have diverged,	00:41
	and have 408 and 151 different commits each, respectively."	00:41
HedgeMage	lol iveqy	00:42
cashwilliams	but thing is, I have made 0 commits	00:42
	I'm guessing someone changed history or something?	00:42
	← kenperkins left	00:42
	← Gentlecat left	00:44
	← AdrienBrault left	00:45
	← aberrant left	00:46
	→ myndzi joined	00:47
myndzi	hey, i've generated an ssh key and added it to my github account, but git still prompts me for a user/password	00:47
	it's got to be some config thing but i don't know what to look for, any help?	00:47
	→ eletuchy joined	00:47
	← skorgon left	00:48
	→ jjore joined	00:49
HedgeMage	myndzi: You need to tell ssh how to id you to github :)	00:49
	myndzi: You are on Linux?	00:49
myndzi	i think i just found the problem actually (of course)	00:49
	need ssh:// in the config	00:49
	yes?	00:49
HedgeMage	just go to your ~/.ssh/config and add an entry that looks like this:	00:50
	Host github.com	00:50
	User yourusername	00:50
	Hostname github.com	00:50
	IdentityFile /path/to/your/key	00:51
	← opus left	00:51
HedgeMage	:)	00:51
myndzi	ah that makes sense. i suppose my local user isn't the one i want to log in with	00:51
HedgeMage	Then you're done	00:51
myndzi	thanks so much!	00:51
HedgeMage	You want to log in with your github username :)	00:51
	np	00:51
	→ R1KRDO joined	00:52
	← minusthetiger left	00:53
Turicas	HedgeMage, myndzi to push to GitHub you should log-in with user 'git'	00:53
	its servers will identify your GitHub username based on your public key	00:53
myndzi	that did it	00:54
	\o/	00:54
	← etcetera left	00:54
	← bubbles10101 left	00:55
	→ opus joined	00:55
	← roler left	00:56
	→ mikepack joined	00:56
	← sonicblud left	00:56
	→ SethRobertson joined	00:56
	→ jayrobot joined	00:56
	← otherj left	00:58
	→ Gentlecat joined	00:58
	← Ryback_ left	00:58
	← ejd left	00:59
	← Targen left	01:00
	← myndzi left	01:00
	→ tmcmahon joined	01:00
	← nkr left	01:00
	→ scrape joined	01:01
	SeoZ-work[AWAY] → SeoZ	01:01
	→ rchavik joined	01:01
	← rabellamy left	01:02
	→ Targen joined	01:03
	→ yshh joined	01:03
	← jjore left	01:03
	← Gentlecat left	01:04
	→ rfoust joined	01:04
	→ huoxito joined	01:04
	→ Gentlecat joined	01:05
	→ thl0 joined	01:05
	→ minusthetiger joined	01:06
	← mikef left	01:06
	← pxdr left	01:06
	→ pxdr joined	01:07
	→ OliverJAsh joined	01:07
	← danishkhan left	01:08
	← tmcmahon left	01:08
HedgeMage	Turicas: Interesting, I've always done it with my github username...it works	01:08
	HedgeMage shrugs	01:08
	← thl0 left	01:10
Turicas	HedgeMage, hahah so probably they ignore it, but when you copy the "git clone URL" from the Web interface, it says "*git*@github.com:username/repo.git"	01:10
	← NiteRain left	01:10
	→ bousquet joined	01:10
	→ ojacobson joined	01:10
HedgeMage	fair enough	01:10
	I've been using hub for awhile, so maybe it overrides what's in my ssh config anyway	01:11
	HedgeMage stopped paying attention after "it works"	01:11
HedgeMage	:P	01:11
	→ yshh_ joined	01:12
	jayrobot → jayrobot_	01:12
	← yshh left	01:13
	→ boombatower joined	01:13
dtm	guys, i'm wanting to change the 'git' command which is embedded in the gitstats script, so that it only displays since a certain date and only with certain contributors. what's the syntax for the 'git' command to do that?	01:13
SethRobertson	dtm: man git-log. Look at the --since and --author restrictions. Most commands that allow selection allow those restrictions	01:14
gitinfo	dtm: the git-log manpage is available at http://jk.gs/git-log.html	01:14
	jayrobot_ → jayrobot	01:14
	→ sgronblom joined	01:16
	← maestrojed left	01:16
	← scrape left	01:16
	← bootstrapper left	01:16
	← sallesao left	01:17
	← bartzy left	01:17
	← avtobiff left	01:17
	→ hyperair joined	01:17
	→ ehsan joined	01:17
	→ ssb1 joined	01:18
	← bmac left	01:18
	← chuckhar_ left	01:18
	← monk3y left	01:19
	← pdeee left	01:19
	→ relipse joined	01:19
	→ etcetera joined	01:21
	← cashwilliams left	01:22
dtm	SethRobertson: thanks	01:22
	→ dhruvasagar joined	01:22
dtm	SethRobertson: all i know is that it seems to me that the gitstats script calls the 'git' executable. i dont think it calls the git-log executable.	01:23
	← Turicas left	01:24
	→ lethjakman_lapto joined	01:25
	→ skorgon joined	01:25
bremner	dtm: perhaps you should pastebin the relevant part of the script	01:26
dtm	bremner: yeah sorry i'm workin on finding that, thanks	01:26
	← mfilipe left	01:29
	← Sky[x] left	01:29
	→ dmarkham_ joined	01:30
	← nigelb left	01:30
	→ nigelb joined	01:31
	← OliverJAsh left	01:34
	← mikepack left	01:35
	→ cirenyc joined	01:35
	← cirenyc left	01:36
	← R1KRDO left	01:37
	← eletuchy left	01:38
	→ danishkhan joined	01:38
	→ eletuchy joined	01:38
	→ lethjakman joined	01:39
	← boombatower left	01:40
	← AnimeCYC left	01:40
	→ boombatower joined	01:41
	← lethjakman_lapto left	01:41
	→ chuckharmston joined	01:42
	→ aberrant joined	01:42
	← gdoteof left	01:42
	← eletuchy left	01:43
	← LeMike left	01:44
	← opus left	01:45
tongcx	hi guys, why my git pull won't automatically rebase	01:45
	→ bootstrapper joined	01:45
bremner	maybe you didn't tell it to?	01:45
tongcx	is that because I didn't specify upstream or downstream or sth?	01:46
	bremner: how do i tell it to do automatically rebase?	01:46
	← danishkhan left	01:46
bremner	man git pull	01:47
gitinfo	the git-pull manpage is available at http://jk.gs/git-pull.html	01:47
bremner	err, automatically must be a config option	01:47
devians	yep. rebase = true in config under the branch	01:47
bremner	see man git config, search for rebase	01:47
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	01:47
	→ pfefferz_ joined	01:48
	← juril left	01:48
	← kmels_ left	01:48
	→ sgambino joined	01:49
	→ bradios joined	01:51
	→ trungqtran joined	01:52
	→ Derega joined	01:52
	← bradios left	01:52
	← marc_kdab left	01:52
	→ marc_kdab joined	01:52
	← hwrd\|work left	01:53
	→ CodeShark joined	01:57
	← rakl left	01:57
	← simesy left	01:58
	→ simesy joined	01:58
	← pfefferz_ left	01:59
	→ kmels_ joined	02:00
	→ jackh joined	02:02
	← chuckharmston left	02:02
	← maletor left	02:02
	← simesy left	02:03
	← alexim left	02:03
	→ d2dchat joined	02:05
	→ sluther joined	02:05
	← WouterDS left	02:05
	← mmlac left	02:05
	← squentin left	02:06
	→ wrouesnel joined	02:07
	MatthewWilkes → mwilkes\|away	02:07
	→ mfilipe joined	02:07
	← dmarkham_ left	02:07
	→ anna18 joined	02:08
	← thiago left	02:08
	→ TechCel joined	02:08
	→ eletuchy joined	02:09
	→ jackh_ joined	02:09
	← s0undt3ch left	02:10
	→ sallesao joined	02:10
	→ s0undt3ch joined	02:10
	← dreiss left	02:10
	→ avtobiff joined	02:10
	→ squentin joined	02:10
	← jackh left	02:10
	→ madewokherd joined	02:11
	→ simesy joined	02:11
	← jaequery left	02:11
	→ pfefferz_ joined	02:12
	← snql left	02:13
	→ maestrojed joined	02:13
	→ hiroyuki joined	02:14
	→ Noldorin joined	02:15
	← quazimodo left	02:15
	← mfilipe left	02:16
	→ WouterDS\|Away joined	02:18
	← lethjakman left	02:19
	→ hwrd\|work joined	02:19
	← eletuchy left	02:19
	→ intripoon joined	02:19
	→ private joined	02:22
	→ cashwilliams joined	02:22
	private → Guest98604	02:22
	→ cirenyc joined	02:23
	← intripoon_ left	02:23
	→ rurufufuss joined	02:23
	→ Jay0x1 joined	02:23
	← simesy left	02:24
	gitinfo set mode: +v	02:24
	→ gdoteof joined	02:24
	→ simesy joined	02:25
Jay0x1	is it generally a good idea to git my whole c:/xampp?	02:25
bremner	no	02:25
Jay0x1	or separate repositories?	02:25
bremner	probably. What is c:/xampp?	02:25
Jay0x1	the web server bundle	02:26
	apache, mysql, php, perl	02:26
	http://www.apachefriends.org/en/xampp.html	02:26
bremner	in general, git is best suited for version control of source code, or similar text files	02:26
	→ bmac joined	02:26
Jay0x1	i ask bc i've made changes to the config files of apache and would like to record these	02:27
	← cashwilliams left	02:27
Jay0x1	the conf files are std txt files	02:27
bremner	right, that could work out.	02:27
	← spyro left	02:27
	← pfefferz_ left	02:27
	→ Goplat joined	02:27
Jay0x1	i'm sure there is a regex cmd for excluding exe files?	02:28
bremner	technically a glob and not a regex, but yes, you can do that.	02:28
	→ spyro joined	02:28
	→ pppaul joined	02:29
	← HerrK left	02:29
bremner	if it's just config files, and they all live in the same place, it might make sense to put them in the same repo, like !etckeeper does	02:29
gitinfo	etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://kitenet.net/~joey/code/etckeeper/	02:29
	← simesy left	02:29
	→ Vampire0_ joined	02:29
Jay0x1	don't have an /etc (i'm on win7)	02:30
	and the file structure looks like, c:/xampp/apache, c:/xampp/mysql, ...	02:31
bremner	well, it's up to you I guess.	02:31
	← Vampire0 left	02:32
	← splud left	02:33
Jay0x1	never heard of glob, googled "git glob" but the details are sparse	02:33
bremner	it's just a wildcard, like *.exe	02:33
Jay0x1	is there a certain syntax to it?	02:34
bremner	technically it is the "fnmatch" syntax	02:35
	maybe that is a better google term.	02:35
	see also man gitignore	02:35
gitinfo	the gitignore manpage is available at http://jk.gs/gitignore.html	02:35
Jay0x1	real fast on the glob	02:36
	could it be something like "git add *.[!exe]"	02:37
	← soypirate left	02:37
bremner	not directly.	02:37
	→ chuckharmston joined	02:37
	← etcetera left	02:38
Jay0x1	just simply "git add [!.exe]" (everything NOT a ".exe")	02:38
	→ simesy joined	02:38
bremner	that syntax doesn't exist, but if you know a scripting language, it's easy enough.	02:38
	← bmac left	02:39
Jay0x1	i wanted to learn git before i did programming so as to document changes (show growth and the like)	02:39
bremner	ah catch 22 ;)	02:39
	what about just adding individual config files?	02:39
	git add configdir/* would work, for example	02:40
	→ markalanevans joined	02:40
	← anna18 left	02:40
Jay0x1	xampp/ has 24 folders...	02:40
	i could just simply add the files i've touched (if i'm using the right terminology)	02:41
	the files i've made edits to	02:41
bremner	right. that makes sense.	02:41
	maybe even commit them before you edit, if you remember	02:41
Jay0x1	ah! that's right...	02:42
	i won't remember lol	02:42
	← alvaro_o left	02:44
	→ geniusape joined	02:44
	← geniusape left	02:44
Jay0x1	ok, onto the .gitignore	02:45
	← sgambino left	02:45
bremner	good luck, /me off for now.	02:45
	→ NiteRain joined	02:45
Jay0x1	i could make that file in either the project's .git or my $HOME/.gitconf right?	02:45
	thank you sir	02:45
	→ sgambino joined	02:45
	← jcromartie left	02:46
	→ eletuchy joined	02:46
	← SonikBoom left	02:46
	→ keller joined	02:47
	← chuckharmston left	02:47
	← ssb1 left	02:47
	← ozette left	02:47
	← eletuchy left	02:47
MistuhKurtz	So it seems like you can't initialize a brand new .git repo with a .gitmodules config file and run 'git submodule init' to initialize the submodules in there	02:47
	→ eletuchy joined	02:48
MistuhKurtz	anyone know if I'm mistaken?	02:48
	← daniel_- left	02:48
MistuhKurtz	lol asking it in here helped me come up with a better search query - http://stackoverflow.com/a/11258810/193494	02:49
lucs	MistuhKurtz: That happens to me all the time: I prepare a question to paste into an IRC channel, then I just pop it into google, and bingo! :)	02:50
MistuhKurtz	I'm trying to create a boilerplate repo with submodules	02:50
	→ __Big0__ joined	02:51
MistuhKurtz	clone boilerplate -> rm .git -> git init -> git submodule init	02:51
	→ timj1 joined	02:51
MistuhKurtz	I suppose I'll just include that script in my boilerplate	02:52
	→ erkules_ joined	02:52
	← devians left	02:53
tongcx	hi guys, how to list commits between two branches?	02:54
	up to common parent?	02:54
	← timj left	02:54
	→ jaequery joined	02:55
	← erkules left	02:55
	← __Big0__ left	02:56
	← bousquet left	02:56
	← redrocket left	02:57
	← aartist left	02:57
	← jaequery left	02:58
	← pen left	03:00
	← pr0ton left	03:01
	→ mmlac joined	03:01
	→ redrocket joined	03:02
	→ meLon joined	03:02
	← trungqtran left	03:03
	← Jay0x1 left	03:04
	alainus[-_-] → alainus	03:04
	→ herdingcat joined	03:05
	→ cbreak\|evil joined	03:05
	← marhaban1 left	03:07
	→ __Big0__ joined	03:08
rking	If you had a repo with dozens of branches, and you remember that one of the commit subjects said Foozwangle, how would you find that?	03:08
	← timj1 left	03:09
rking	I could list out each branch then search each history, but that's a mess and also is going to be slow.	03:09
	→ dreiss joined	03:09
	← Mannequin left	03:10
	← guampa left	03:11
	→ frogonwheels joined	03:11
	← orafu left	03:12
	→ OuLouFu joined	03:12
	OuLouFu → orafu	03:12
	← apok left	03:13
	← s0undt3ch left	03:14
	← armin left	03:14
	← minusthetiger left	03:17
	← hkj left	03:19
	← herdingcat left	03:21
	← arvind_khadri left	03:22
	→ cashwilliams joined	03:23
tongcx	hi guys, when remote branches are deleted, i need to manually delete the local remote branches, right?	03:25
	→ pen joined	03:26
	→ jason237 joined	03:27
	← cashwilliams left	03:27
	→ pencilcheck joined	03:29
	← cirenyc left	03:29
milki	yes	03:31
	→ natechan joined	03:31
	← pen left	03:32
	← dankest left	03:32
	→ mikepack joined	03:33
	← eletuchy left	03:35
	→ eletuchy joined	03:35
	→ normanrichards joined	03:36
	→ fire joined	03:36
	→ infynyxx joined	03:38
	← pastime left	03:39
	→ robbyoconnor joined	03:39
	← eletuchy left	03:40
	→ __Big0___ joined	03:42
	← sluther left	03:43
	← Anders_J left	03:43
	← kmels_ left	03:44
	← __Big0__ left	03:45
	→ silntbob joined	03:46
	→ taylorlapeyre joined	03:47
	→ brian_ joined	03:48
	← silntbob left	03:48
	→ whitemage joined	03:49
	→ beautifulmind joined	03:49
	→ sluther joined	03:49
	→ nickpresta joined	03:50
	← Bankzilla left	03:51
	← Guest98604 left	03:52
	→ pfefferz_ joined	03:55
	← whitemage left	03:55
	← wrouesnel left	03:57
	→ chrisgeorge joined	03:57
	→ wrouesnel joined	03:57
	← pfefferz_ left	03:57
	→ chuckharmston joined	03:57
	← markalanevans left	04:01
	← chuckharmston left	04:03
	← kcj left	04:04
	→ diamonds joined	04:04
	← infynyxx left	04:05
	← hatake left	04:06
	→ eletuchy joined	04:06
	→ kcj joined	04:07
	← diamonds left	04:09
	← pencilcheck left	04:10
	← tjbiddle left	04:10
	→ curist joined	04:11
	→ pen joined	04:12
	→ griotspeak joined	04:14
	→ jaequery joined	04:14
	→ OOPMan joined	04:17
	← eletuchy left	04:17
	← kpreid left	04:17
	→ kpreid joined	04:18
	← philips_ left	04:18
	← jaequery left	04:18
	← mattp_ left	04:20
	→ eletuchy joined	04:20
	← pen left	04:21
	← __Big0___ left	04:23
	← ojacobson left	04:24
	→ philips_ joined	04:25
	→ aweorit joined	04:25
	→ chuckharmston joined	04:26
	→ mattp_ joined	04:26
aweorit	are branch commits completely removed from history when you delete a branch?	04:29
	← natechan left	04:30
EugeneKay	No?	04:30
	← Chryyz left	04:30
milki	aweorit: what kind of history?	04:30
	← chuckharmston left	04:30
	→ chuckharmston joined	04:31
	→ aweorit` joined	04:32
	← hwrd\|work left	04:32
	← aweorit left	04:34
	← Bombe left	04:35
	→ thiago joined	04:36
	← obert left	04:38
	→ dc5ala joined	04:38
	← chuckharmston left	04:38
	→ Bombe joined	04:40
	→ pen joined	04:41
	→ chuckharmston joined	04:41
	→ eletuchy_ joined	04:41
	← gtmanfred left	04:42
	→ hwrd\|work joined	04:43
	→ gtmanfred joined	04:43
	← Esa_ left	04:44
	← nickpresta left	04:44
	← eletuchy left	04:45
	← hwrd\|work left	04:45
	→ dankest joined	04:46
	→ solusfaran joined	04:47
	→ vedant joined	04:48
	← dankest left	04:54
	→ preflex_ joined	04:54
	→ dydave joined	04:56
	← preflex left	04:56
	preflex_ → preflex	04:56
tongcx	hi guys, with git log --all --graph i can see the structure of all commits	04:57
	how could I see all structure of a sub tree?	04:57
	→ AdrienBrault joined	04:58
	← SBoudrias left	04:59
	← maestrojed left	05:01
	← aberrant left	05:02
	← cworth left	05:02
	← jayrobot left	05:02
	→ pretty_function joined	05:03
	→ jayrobot joined	05:04
	→ s0undt3ch joined	05:05
	→ armin joined	05:07
	← dpwrussell left	05:07
	→ dpwrussell joined	05:08
	← s0undt3ch left	05:10
	→ JeremyWei joined	05:11
	← mmlac left	05:12
	→ maestrojed joined	05:12
	← vedant left	05:13
	← jphilly left	05:13
	→ subhojit777 joined	05:13
	→ b1rkh0ff joined	05:14
	← Gentlecat left	05:14
	→ asd joined	05:14
	→ private joined	05:15
	asd → Guest72858	05:15
	→ s0undt3ch joined	05:15
	private → Guest90493	05:15
	← anabelle left	05:17
	← aweorit` left	05:17
	→ Gentlecat joined	05:17
	← dc5ala left	05:18
	→ dermoth_ joined	05:18
	→ otherj joined	05:18
	→ aberrant joined	05:19
	← solusfaran left	05:19
	← kukks left	05:19
	← cybersphinx left	05:19
	← taylorlapeyre left	05:20
	← bootstrapper left	05:21
	← dermoth\|home left	05:21
	→ cashwilliams joined	05:23
	← aberrant left	05:24
	← jdunck left	05:24
	← griotspeak left	05:24
	→ brum joined	05:24
	← Tommy[D] left	05:25
	← dpwrussell left	05:25
	→ dpwrussell joined	05:25
	← nihilista left	05:25
dtm	bremner: sorry to delay. this is an old post, but it illustrates the portion of the code which queries the 'git' executable. http://stackoverflow.com/questions/4686647/how-do-i-modify-gitstats-to-only-utilize-a-specified-file-extension-for-its-sta	05:27
	← cashwilliams left	05:27
	→ quazimodo joined	05:28
dtm	and here's the whole file https://github.com/ShawnMilo/gitstats/blob/master/gitstats	05:29
	so it's on line 277	05:29
	so just look at that github link on line 277 i guess.	05:30
	if you'd be so kind.	05:30
	again, i'm just wanting to know how to tell gitstats to use the 'git' executable to narrow its report down to just since a certain date and with certain people.	05:31
	← brum left	05:31
	→ camkego joined	05:32
	← JeremyWei left	05:32
	← camkego left	05:34
	Vampire0_ → Vampire0	05:37
	← scorphus left	05:37
	→ scorphus joined	05:38
	← OOPMan left	05:38
	← eletuchy_ left	05:39
	← Fandekasp left	05:39
	→ eletuchy joined	05:39
	→ rakl joined	05:39
	→ Tommy[D] joined	05:39
	→ Fandekasp joined	05:40
	→ felipe joined	05:42
	→ camkego joined	05:42
	← mikepack left	05:43
	← camkego left	05:43
	← littlebearz left	05:43
	← eletuchy left	05:43
	→ littlebearz joined	05:43
	→ QaDeS joined	05:47
	← dhruvasagar left	05:49
	→ hoschi joined	05:51
	→ dhruvasagar joined	05:51
	← o-O-o left	05:51
	← fire left	05:52
	→ v0n joined	05:52
	→ dev2 joined	05:54
	← chrisgeorge left	05:55
dev2	I have two machines. I run git daemon --export all in my git repo on machine A. Then I clone that repository on machine B. Now machine B has the repo as well. Should I expect to see uncommited changes from machine A on the newly cloned machine B?	05:56
	← rue left	05:56
	→ fire joined	05:56
milki	no	05:56
dev2	is there a way to force it? I really just want to move all my work to another machine. I could just ftp it....	05:57
	← Guest72858 left	05:57
milki	rsync?	05:57
	commit the changeS?	05:57
	← boombatower left	05:58
	← stliu left	05:58
	← fire left	05:58
	← normanrichards left	05:58
dev2	its just a one time move. I thought clone took the working tree	05:58
	← otherj left	05:59
thiago	dev2: git only transfers commits	05:59
dev2	thiago: I thought clone was an exception.	05:59
	guess not :)	05:59
thiago	nothing is an exception	06:00
	git only transfers objects from the object database	06:00
	commits, tags, notes and stuff commits points to (trees and blobs)	06:00
	→ rue joined	06:01
	← m0viefreak left	06:01
dev2	now I know	06:01
	→ eletuchy joined	06:02
	→ thierryp joined	06:03
	← eletuchy left	06:03
milki	dev2: nothing wrong with commit one-time things	06:03
	→ eletuchy joined	06:04
	→ fire joined	06:05
	→ eletuchy_ joined	06:05
	← TechCel left	06:05
	← fire left	06:06
	← rakl left	06:06
	→ gruen0 joined	06:08
	← eletuchy left	06:08
	→ richardeid joined	06:09
	→ rakl joined	06:09
	← tewecske left	06:09
	← simesy left	06:10
	→ simesy joined	06:11
	→ sgambino_ joined	06:12
	← rue left	06:12
	← picasso left	06:12
	→ Sigma joined	06:12
	← Noldorin left	06:12
	← sgambino left	06:13
	sgambino_ → sgambino	06:13
	→ jdunck joined	06:13
	→ Jay0x1 joined	06:14
	← Katafalkas left	06:14
	gitinfo set mode: +v	06:14
	← huoxito left	06:14
	← quazimodo left	06:15
	← simesy left	06:15
	← scorphus left	06:17
	→ fire joined	06:17
	→ infynyxx joined	06:18
	→ camkego_ joined	06:19
	← kswenson left	06:19
	gitinfo set mode: +v	06:19
	→ bootstrapper joined	06:20
	gitinfo set mode: +v	06:20
camkego_	hello?	06:20
gitinfo	camkego_: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	06:20
	→ mihamina joined	06:20
camkego_	I broke the code. wow.	06:20
	Question for the knowledgeable :	06:21
	On this page: http://git-scm.com/book/en/Getting-Started-Git-Basics	06:21
	it says : Git has three main states that your files can reside in: committed, modified, and staged.	06:21
	and further, it says : Committed means that the data is safely stored in your local database. Modified means that you have changed the file but have not committed it to your database yet. Staged means that you have marked a modified file in its current version to go into your next commit snapshot.	06:22
	Is that true?	06:22
	Is there three states?	06:22
muep	yes	06:22
camkego_	I get modified, but am confused on Committed vs Staged	06:23
muep	staged is not yet in any commit	06:23
camkego_	git commit, commits to the index, correct?	06:23
muep	but it is what would get recorded into a commit if you run git commit	06:23
dev2	before you can commit you have to stage the file (git add myfile.rb)	06:23
camkego_	so staged = new file in work dir, and modified = file in working dir with modifications?	06:24
dev2	new files aren't staged until you do git add new_file.txt	06:25
camkego_	I think I get it, thank you for the clarification	06:25
	I was thinking modified and staged are the same, but they are not	06:25
	→ nickpresta joined	06:25
camkego_	Thank you, muep, dev2 !	06:25
	← nickpresta left	06:26
camkego_	it is funny, because you need a commit after an 'add', correct?	06:27
dev2	yes	06:27
	you can use git add .	06:27
camkego_	so a staged file is not in the 'staging area' [index] correct?	06:28
	maybe that was part of my confusion	06:28
dev2	to add all of the files, I avoid it though	06:28
camkego_	yeah, I think git add . will get me in trouble	06:28
	lots of non-ignored files not in the repo	06:29
	Let me clarify, a staged file is not in the staging area, correct ?	06:29
dev2	yeah, like the credit card statement I accidently put in my project folder :)	06:29
camkego_	only Commited files are in the staging area, correct?	06:30
	→ R1KRDO joined	06:30
	← cagedwisdom left	06:30
dev2	I think that it IS in the staging area	06:30
	once its commited its unmodified	06:31
	→ Chryyz joined	06:31
camkego_	well, if I understand, only a 'git commit' will put files in the staging area [index] ?	06:31
dev2	I'm still very green myself so don't take my words to the bank	06:31
	→ giallu joined	06:31
camkego_	so, a 'git add' will put a new file in the staging area, but it is as of yet, uncommited. correct?	06:31
dev2	I think git add adds the files to the index, git commit commits the staged (index) files to the repo.	06:32
	← vdv left	06:32
camkego_	its all semantics, but import for us to understand	06:32
	← fire left	06:32
camkego_	dev2, I dont think so!	06:32
	commit -> index	06:32
	push -> repo	06:32
	I think	06:32
	experts?	06:32
dev2	no, repo is local as well	06:32
camkego_	I am not talking local vs remote	06:33
	→ quazimodo joined	06:33
camkego_	just commit vs push	06:33
dev2	push pushes all your commits to another repo, either remote or in some arbitrary location	06:33
	→ hwrd\|work joined	06:34
	← sluther left	06:34
camkego_	you said 'git commit commits the staged (index) files to the repo.', I think that is wrong, I think the commit puts files in the index	06:34
	but I am just trying to figure it out. :)	06:34
	i am pretty sure commit -> index	06:35
	→ kswenson joined	06:35
thiago	no	06:35
camkego_	thank you for all the help though	06:35
thiago	commit commits the staging are to the repository	06:36
	← Guest90493 left	06:36
thiago	to the object database	06:36
	it is correct	06:36
dev2	index stores the files until you are ready to commit them	06:36
camkego_	then what does 'push' do ?	06:36
	I thought commit goes from working files -> index	06:37
	where index == staging area	06:37
thiago	push uploads the contents of one repository to another	06:37
	where contents = commits, tags and notes	06:37
	not the inde	06:37
	x	06:37
	git add does workdir -> index	06:38
camkego_	I need to keep reading, and not waste your time! : )	06:38
thiago	git commit does index -> repo	06:38
	git push does repo -> other repo	06:38
camkego_	local repo, i get it!	06:38
	thank you for explaining	06:38
	I feel silly, but it will sink in. : )	06:39
dev2	yes thanks thiago	06:39
camkego_	so, a git clone creates a local repo?	06:39
thiago	git commit can do workdir -> index -> repo in one go	06:39
	yes, it downloads the object database and creates a repository	06:39
	optionally, it checks out that repository (that is, create the workdir and index)	06:39
camkego_	ok, so I better get used to the concept of local, and remote repo	06:39
	← phryk_ left	06:40
camkego_	Thiago, thank you for the help	06:40
dev2	push and pull, (like send and get)	06:40
thiago	no	06:41
	push and fetch	06:41
	→ simesy joined	06:41
	→ phryk joined	06:42
dev2	right bc pull does a merge	06:42
thiago	correct	06:42
dev2	or?	06:42
	ok	06:42
camkego_	so when I do a git clone, I usually copy from remote repo, and create local repo, and working dir, and local index, correct?	06:42
thiago	correct	06:43
	except there's no "usually"	06:43
camkego_	always?	06:43
thiago	in what case wouldn't it be?	06:43
camkego_	ok, got it	06:43
	→ fire joined	06:44
	← mihamina left	06:44
	← Jay0x1 left	06:44
	→ maletor joined	06:44
	→ jaequery joined	06:45
	← madewokherd left	06:47
	← Damgaard left	06:48
	← maestrojed left	06:48
	→ engla joined	06:49
	← d2dchat left	06:49
	← simesy left	06:50
	← jdunck left	06:51
	→ pantsman joined	06:53
	← pantsman left	06:53
	→ pantsman joined	06:53
	← PaulCapestany left	06:53
	→ Sky[x] joined	06:54
	→ fRAiLtY- joined	06:57
	→ Cromulent joined	06:59
	→ scrape joined	07:01
	→ pencilcheck joined	07:02
	→ nfroidure_ joined	07:03
	← v0n left	07:04
	→ pen_ joined	07:05
	→ ThomasLocke joined	07:05
	← pen left	07:06
	→ johnny_rose joined	07:06
osse	Correct me if I'm wrong: all the subdirectories of $GIT_DIR/objects should have the sticky bit set.	07:06
	→ _abc_ joined	07:07
	← nfroidure left	07:07
	← chuckharmston left	07:07
	← pencilcheck left	07:07
	→ pen joined	07:08
	← skorgon left	07:09
	→ longbeach joined	07:10
	→ cbreak-work joined	07:11
	→ cenuij joined	07:11
	← cenuij left	07:11
	→ cenuij joined	07:11
	← nfroidure_ left	07:11
	← pen_ left	07:12
	← hwrd\|work left	07:12
	→ nfroidure joined	07:12
	← nfroidure left	07:13
	← maletor left	07:14
	→ hwrd\|work joined	07:15
	→ jargon joined	07:15
	→ skorgon joined	07:15
	→ Katafalkas joined	07:15
	← R1KRDO left	07:16
	← Sigma left	07:16
	← Goplat left	07:19
	← hanzz left	07:19
	→ cyd joined	07:20
	← cyd left	07:20
	← beautifulmind left	07:20
	→ cyd joined	07:20
	→ KBme joined	07:22
	→ maestrojed joined	07:23
	→ cashwilliams joined	07:24
	→ Mez joined	07:25
	← Mez left	07:25
	→ Mez joined	07:25
	← KBme left	07:28
	erkules_ → erkules	07:28
	← cashwilliams left	07:28
	← alexwhitman left	07:29
	← Mez left	07:30
	← Cromulent left	07:30
	→ Mez joined	07:31
	← Mez left	07:31
	→ Mez joined	07:31
	→ jdunck joined	07:32
	→ alexwhitman joined	07:32
camkego_	OK, git pros! question number 2: ARE LOTS OF UNTRACKED FILES A PROBLEM? OR OK ? (about 30 files from git status)	07:33
osse	camkego_: not a problem if they aren't supposed to be in the repo (for example build products)	07:33
	camkego_: but if that's the case then you might want to add them to .gitignore so that git-status becomes for useful	07:34
engla	it's your call	07:34
	→ Damgaard joined	07:34
engla	if you have a clean repo you're not going to forget to add new files etc	07:34
camkego_	okay, cool. I was wondering if I was supposed to have everything in .gitignore	07:34
	good point, engla!	07:34
	← thiago left	07:35
camkego_	so ideally, with a good .gitignore, no untracked files ?	07:35
osse	camkego_: say someone else clones your repository for purposes of working on the same project. Does he need/want the untracked files you now see?	07:35
	→ jceb joined	07:35
	→ TheJester joined	07:35
Bombe	camkego_, not everything belongs in .gitignore… also, there are three different ways to ignore files in Git. :)	07:36
	← Mez left	07:36
camkego_	it is a big project, and getting a perfect .gitignore is a fair bit of work, but it sounds like it is recommended	07:36
	→ Sigma joined	07:36
camkego_	Bombe, what are the three ways?	07:36
	→ gasbakid joined	07:36
Bombe	camkego_, well, there’s .gitignore, there’s .git/info/exclude, and there’s a global ignore file (man git-config has details).	07:37
gitinfo	camkego_: the git-config manpage is available at http://jk.gs/git-config.html	07:37
	→ marthinal joined	07:37
Bombe	camkego_, I use the global file for files I always want to ignore, such as backups from my editor.	07:37
camkego_	Bombe, @gitinfo, thanks	07:37
gitinfo	camkego_: you're welcome, but please note that I'm a bot. I'm not programmed to care.	07:37
camkego_	nice!	07:37
Bombe	camkego_, .git/info/exclude I am using to exclude local environment stuff, such as configuration of my IDE.	07:37
	→ KBme joined	07:38
camkego_	Bombe, cool, thanks	07:38
Bombe	camkego_, and that leaves mostly only build products for .gitignore, such as *.o if you’re doing C/C++, or target/ folders if you’re e.g. working with Java/Maven.	07:38
	→ arvind_khadri joined	07:39
camkego_	ok, cool	07:39
	→ RandalSchwartz joined	07:40
	RandalSchwartz waves	07:40
	→ tsdh joined	07:40
	→ soee joined	07:42
	← pppaul left	07:42
	→ h0bbit joined	07:42
	← Jahm left	07:43
	→ rob_w joined	07:44
	→ ducch joined	07:45
	→ Jahm joined	07:46
	→ simesy joined	07:46
	→ Mez joined	07:46
	← Mez left	07:46
	→ Mez joined	07:46
	→ Cerise joined	07:47
	→ elixir_ joined	07:47
	→ Guest45517 joined	07:48
	→ boucman_work joined	07:48
	gitinfo set mode: +v	07:48
	← thyseus left	07:48
TheJester	anyone here using git bash under windows ? im having trouble getting access to repo. Doing ssh -i privatekey gitolite@host gives me gitolite output. Doing a git clone ssh://gitolite@host/repo calls for a passwd, while doing the same from a linux pc does an actual clone... any ideas ? private key is also in dir in /d/Users/username/.ssh	07:48
	→ vedant joined	07:50
cbreak-work	TheJester: you need to make git use the private key	07:50
	which means making ssh automatically use it	07:50
	→ sjugge joined	07:50
cbreak-work	TheJester: the easiest way on Mac OS is to use ssh-agent, with ssh-add key	07:50
	← sjugge left	07:50
	→ LeMike joined	07:50
cbreak-work	and then everything will work automatically	07:50
	probably won't work on windows, so try naming it correctly	07:50
TheJester	and correctly means ?	07:51
cbreak-work	it must be in $HOME/.ssh/id_rsa	07:51
	← marthinal left	07:51
cbreak-work	id_rsa being the file containing the private key	07:51
	→ netiul joined	07:51
	← eletuchy_ left	07:51
cbreak-work	you can cat $HOME/.ssh/id_rsa to look at it	07:51
	→ marthinal joined	07:52
cbreak-work	(if you don't see your private key, then it's not at the right place)	07:52
	→ eletuchy joined	07:52
cbreak-work	TheJester: you can also configure the ssh client to use the key, details are in man ssh_config	07:52
	→ thyseus joined	07:53
	← simesy left	07:53
cbreak-work	(look for IdentityFile)	07:53
	← elixir_ left	07:53
TheJester	daamn.... its working... file must be named exactly id_rsa	07:54
	← bootstrapper left	07:54
cbreak-work	yes.	07:54
	→ Guest12999 joined	07:54
cbreak-work	if it's an rsa key :)	07:54
TheJester	i was under the assumption that you could have multiple, and just make names of the private keys unique and throw them all in .ssh and it would work	07:54
	← dydave left	07:55
	→ bootstrapper joined	07:55
cbreak-work	nope, won't work.	07:55
TheJester	but anyway, assumptions are the mother of all....	07:55
cbreak-work	if you want that, use the config file as I said above	07:55
	or the agent as I said above	07:55
TheJester	ok, i will look into it... thanks !	07:55
cbreak-work	np :)	07:55
	← St_Marx left	07:56
	→ arietis joined	07:56
	← eletuchy left	07:56
	→ mihamina joined	07:57
	← ferdev left	07:57
	→ grn joined	07:57
	→ rath joined	07:57
	← xiangfu left	07:57
	← Guest12999 left	07:57
	← AdrienBrault left	07:57
	← pen left	07:57
	← dhruvasagar left	07:57
	→ xiangfu joined	07:58
	→ thierryp_ joined	07:58
	← thierryp left	07:58
	→ ThePawnBreak joined	07:59
	→ eletuchy joined	07:59
	→ heoa joined	08:00
	← bootstrapper left	08:00
	← _abc_ left	08:01
	ohcibi_ → ohcibi	08:01
	← ducch left	08:02
	→ stewiee joined	08:03
	→ papegaaij joined	08:04
	→ dhruvasagar joined	08:04
	← stewiee left	08:05
	→ stewiee joined	08:05
	← quazimodo left	08:05
	← fire left	08:06
	→ YoungFrog joined	08:06
	→ quazimodo joined	08:08
	→ baba joined	08:08
	→ flijten joined	08:08
	← baba left	08:09
	→ pen joined	08:10
	← dhruvasagar left	08:10
	→ mulinux joined	08:12
	→ kewah joined	08:13
	← bauruine left	08:14
	→ r0bby joined	08:14
	→ alorence joined	08:16
	→ OOPMan joined	08:16
	← robbyoconnor left	08:17
	→ suy joined	08:19
	← a-l-e left	08:19
	→ snql joined	08:19
	→ dydave joined	08:19
	← dnr left	08:19
	← TheJester left	08:21
	→ _Qman joined	08:21
	← mihamina left	08:23
	→ magnus joined	08:24
	→ cashwilliams joined	08:24
	← variousnefarious left	08:25
	→ Guest24782 joined	08:25
	→ jfisk1987 joined	08:26
jfisk1987	hey all	08:26
	how can i undo a commit, but keep the changes i made?	08:27
	→ variousnefarious joined	08:27
	← Guest24782 left	08:27
jfisk1987	i commited stuff on the wrong branch	08:27
	→ ferdev joined	08:27
	← pantsman left	08:28
	← pen left	08:28
magnus	hello! this might seem like a odd question, but is it possible to completely replace the master of an origin? the situation i have is that i've deviated so much from the original tree that i just want to replace whatever is at origin. and i would prefer to not merge or keep any of the history. I could remove the entire repo and start over, but my origin is managed by a broken system which makes that difficult. Can i somehow push a new master	08:28
	that replaces the old one at my remote?	08:28
	→ vStone joined	08:28
vStone	When doing a git svn migration, and using --ignore-paths, is it possible to have git log all files that have been ignored?	08:29
	← cashwilliams left	08:29
jfisk1987	magnus: yes, you can delete hte old one	08:29
	delete the old one by git push origin :master	08:29
	and push a new one	08:30
engla	jfisk1987: you can cherry-pick the commit you made, onto the new branch	08:30
	→ nesti joined	08:30
	← tango_ left	08:31
jfisk1987	engla: i just thought of that. and then i realized i am just tired and was actually on the right branch :)	08:31
engla	hehe	08:31
	→ tango_ joined	08:31
magnus	i just did push -f, seem to do what i want	08:32
	→ mihamina joined	08:32
	← kcj left	08:33
jfisk1987	hmmm	08:33
	idk enough about that, but im pretty sure it will retain the history from bfore	08:33
	→ jjido joined	08:35
	← nesti left	08:35
jfisk1987	anywayz im out	08:35
	← jfisk1987 left	08:35
	← jjido left	08:36
	→ tim joined	08:36
	→ psoo joined	08:36
engla	it should be fine. some git hosts deny forced updates but allow deleting branches though	08:37
	← snql left	08:37
	→ jjido joined	08:37
	→ tomek joined	08:38
	→ maxmanders joined	08:38
	→ nesti joined	08:38
	← kewah left	08:39
	→ dhruvasagar joined	08:40
	→ Thra11 joined	08:40
	→ snql joined	08:43
	→ tPl0ch joined	08:43
	→ rasputin joined	08:44
	→ StanleyDing joined	08:44
	→ hendry joined	08:45
	→ elixir_ joined	08:47
	← relipse left	08:47
	→ setmeaway2 joined	08:47
	→ xarragon joined	08:48
	← Thra11 left	08:48
	← StanleyDing left	08:49
	→ nihathrael joined	08:49
	→ simesy joined	08:49
	→ cristi_ joined	08:50
	cristi_ → Guest30	08:50
	→ charon joined	08:51
	→ Cromulent joined	08:51
	← joooooo left	08:51
	← setmeaway2 left	08:52
	← dpwrussell left	08:54
	→ Sonderblade joined	08:54
	← ThePawnBreak left	08:54
	→ dpwrussell joined	08:54
	← simesy left	08:54
	→ leehambley joined	08:55
	→ LekeFly joined	08:55
	← LekeFly left	08:56
xarragon	I just managed to push an annotated tag to a public repo, attached to a commit that was local. However, that commit had not been reviewed and was not ready for pushing. Deleting tags is bad practice from what I can tell. Is the proper solution to push the commit to origin, revert it and then push it once reviewed?	08:57
	→ setmeaway joined	08:58
	→ francisfish joined	08:58
	→ oposomme joined	08:59
xarragon	I assume that pushing a tag is similar to pushing a branch, everything up until that tag is pushed?	08:59
	→ Thra11 joined	09:00
	→ WorkeD joined	09:01
	→ puchrojo joined	09:01
	→ dbck joined	09:01
SamB_	xarragon: yeah	09:01
	← jdunck left	09:01
SamB_	the difference being that tags aren't supposed to change	09:01
	← dbck left	09:02
xarragon	Yeah, since they're more or less reference points..	09:02
	← jjido left	09:03
	← jaequery left	09:04
SamB_	(though if you make a mistake and catch it quickly enough it's not too bad)	09:04
	alainus → alainus[-_-]	09:05
	→ Jamiltz joined	09:07
	← Thra11 left	09:07
	← SeoZ left	09:09
engla	I think deleting tags is fine.. but never reuse the tag name	09:11
xarragon	Well now I let it sit and rot for a while, the commit is trivial and just moves a block of code in a build support script so in this case I will just push that one and keep the tag/commit.	09:12
	← quazimodo left	09:13
xarragon	But for next time I'd nuke it if none else is working on the repo.	09:13
Jamiltz	Hey. Little question, imagine this: I'm working on my local development branch and make 10 commits for example. Then I merge to master and commit on master. Then I do a git log and see all the commits I performed on the development branch in the history. When I push to github I see all the "development commit". But I don't want them to appear.	09:13
	→ SeoZ joined	09:13
	← dreiss left	09:13
	→ quazimodo joined	09:14
Jamiltz	especially when I name my commits on the development branch like s*** http://cl.ly/image/0l2u2H1N191U	09:14
milki	Jamiltz: !perfect and clean up that history before pushing	09:15
gitinfo	Jamiltz: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.	09:15
	→ kmels_ joined	09:15
Jamiltz	milk gitinfo thanks, yeah that's basically it. Or even simpler, I want to ignore all the commit messages of the development branch after merging with master	09:18
gitinfo	Jamiltz: you're welcome, but please note that I'm a bot. I'm not programmed to care.	09:18
	← rakl left	09:18
	→ AaronMT joined	09:18
	← Vile left	09:18
Jamiltz	:\|	09:18
milki	the do the rebase before the merge	09:19
	then*	09:19
	→ Thra11 joined	09:19
Jamiltz	milki cool	09:20
	→ LekeFly joined	09:21
	← gruen0 left	09:22
	→ soc42 joined	09:23
	→ cashwilliams joined	09:24
	← cashwilliams left	09:25
	→ IntricateRuin joined	09:25
	← yuwang left	09:25
	← wanders left	09:25
	→ wanders joined	09:26
	→ bootstrapper joined	09:27
	→ daniel_- joined	09:27
	→ simmel joined	09:28
	← Damgaard left	09:28
	← Zenith77 left	09:28
	← Gentlecat left	09:28
	→ Zenith77 joined	09:28
simmel	Before you could use `git rebase -i` to automaticlly avoid "Merge-commits", but since a few released I now get $EDITOR to pick which one I want to include in the rebase. What changed and what should my new workflow be?	09:29
dr_lepper	-i means "interactive"	09:30
	it has always been spawning editor	09:31
	→ Damgaard joined	09:31
simmel	Ok, so I guess I'm remembering it wrong then = / What is the command I should be using?	09:31
	← Damgaard left	09:32
	→ amcsi joined	09:32
	← wanders left	09:32
simmel	Ah, it might be `git pull --rebase`?	09:32
	← mihamina left	09:32
	→ wanders joined	09:32
dr_lepper	it might, yes	09:33
	→ Damgaard joined	09:33
	→ bauruine joined	09:33
	→ dahood joined	09:34
	← bootstrapper left	09:34
simmel	Thanks and have a great weekend dr_lepper!	09:34
	← dahood left	09:34
	← simmel left	09:34
	→ eletuchy_ joined	09:34
pretty_function	can we change the command line text editor (used to type merge messages, etc) to a gui text editor?	09:35
lb1a	pretty_function: yes	09:36
pretty_function	how?	09:36
lb1a	pretty_function: man git config see core.editor	09:36
gitinfo	pretty_function: the git-config manpage is available at http://jk.gs/git-config.html	09:36
pretty_function	lb1a: gitinfo thanks, I'll take a look	09:37
gitinfo	pretty_function: you're welcome, but please note that I'm a bot. I'm not programmed to care.	09:37
pretty_function	ouch LOL	09:37
lb1a	^^	09:37
	← charon left	09:37
	→ charon joined	09:37
	← eletuchy left	09:37
lb1a	pretty_function: maybe this helps you too http://stackoverflow.com/questions/8951275/git-config-core-editor-how-to-make-sublime-text-the-default-editor-for-git-on	09:38
	← Damgaard left	09:38
	← babilen left	09:38
	→ Damgaard joined	09:39
pretty_function	lb1a: so it should be the path to the executable/bin, right?	09:39
lb1a	if this bin is not in your PATH then yes	09:39
	→ duosrx joined	09:39
	← eletuchy_ left	09:39
	← littlebearz left	09:40
	← vedant left	09:43
	← johnny_rose left	09:44
	→ jalmeida joined	09:49
	← lifelike left	09:49
	← OOPMan left	09:49
pretty_function	now how do I test it? (make git open the editor)?	09:49
	→ ncd\|leeN joined	09:49
	pretty_function feels dumb	09:49
	← Damgaard left	09:50
	← GeertJohan left	09:50
	→ amcsi_ joined	09:50
	← jackh_ left	09:50
	→ Damgaard joined	09:50
	← amcsi_ left	09:50
	← siriuz left	09:51
lb1a	pretty_function: commit something?	09:51
pretty_function	lb1a: lol, yeah. thanks :)	09:51
	← arvind_khadri left	09:52
	→ OOPMan joined	09:54
	← AaronMT left	09:55
	→ eletuchy joined	09:56
	→ exoon joined	09:56
	→ JSharpe joined	09:56
	← mulinux left	09:58
	← dpwrussell left	09:58
	→ jetole joined	09:58
jetole	osse: ok. you there	09:58
	my comment and question was off topic for #bash	09:59
	→ dpwrussell joined	09:59
jetole	or if anyone else knows and wants to answer, my questions was: 04:58 < jetole> osse: regarding git, iirc, no one will ever commit the same file. I mean the file that git stores. I know two people might commit say, program.c changes but doesn't git store those as sha1's in a directory? Actually asking. not too sure	09:59
	→ mikef joined	09:59
osse	jetole: no, they won't, but they put files in the same subdir of $GIT_DIR/objects. And if that subdir is not writable, then you get an error.	10:00
	← tinti left	10:00
	→ Guest7609 joined	10:01
	→ nihilista joined	10:02
milki	i dont see the reasoning behind not committing the same file	10:03
jetole	osse: so every commit is a different file named as the sha1?	10:03
milki	what if i want to add two empty files with different filenames?	10:03
osse	jetole: if I commit something that results in an object named abcdef12346 that is stored in $GIT_DIR/objects/ab/cdef123456. If ab/ didn't exit it will be created. Then you commit something and need to upload an object named ab5464534, to be put in $GIT_DIR/ab/6454334. But if the ab/ directory was created in such a way that it's not writable than me, then I can't upload.	10:03
	Oops, I mean if ab/ isn't writable by you	10:03
jetole	milki: I think you just run "git add file1 file2" and then "git commit"	10:04
	milki: I think. I don't use git often	10:04
milki	but wouldnt the file blobs be the same?	10:04
jetole	osse: ah I see	10:04
osse	milki: thatæs not a problem.	10:04
	← Guest30 left	10:04
osse	milki: yes, the blobs will be the same.	10:04
	→ siriuz joined	10:04
jetole	milki: probably but they would be saved as separate files inside git since they are separate files	10:04
osse	jetole: hence the need to setsid the objects/ directory, so that when I create ab/ it will be writable by all.	10:05
	mwilkes\|away → MatthewWilkes	10:05
jetole	osse: give me a sec	10:05
	osse: I don't think setsid is what you need	10:05
	uh.. you mean setuid?	10:05
osse	jetole: no, they won't. It's one of the ways git saves spaces. If two files are equal, they will be stored once. But if you check them out, you do get two files in the working tree.	10:05
	jetole: hmm, perhaps.	10:05
milki	iif the file blobs are the same, i would expect the file tree to be able to reuse the same file blob and just use a different filename	10:05
osse	jetole: no, setgid.	10:06
jetole	osse: I know git saves a lot of space but I didn't realize it did that for two different files commited separately	10:06
osse	milki: yes, that's how it works	10:06
	← elixir_ left	10:06
jetole	osse: though it actually sonds like a good idea so no complaint from me	10:06
	→ elixir_ joined	10:06
jetole	osse: anyways I want to look into your ssh issue. give me a sec	10:06
	← Guest7609 left	10:06
osse	jetole: keep in mind, the issue has been solved. so there's no rush :P	10:06
	→ mikewintermute joined	10:07
	→ Vile joined	10:07
jetole	osse: one thing that came to mind just now which is common in many VCS's is post commit hooks where you write a program or script or whatever and you tell the VCS to run this script I wrote after every commit to the server	10:07
milki	jetole: man githooks, either post-receive or update hooks	10:08
gitinfo	jetole: the githooks manpage is available at http://jk.gs/githooks.html	10:08
jetole	osse: but that still sounds like crutch resolution. I don't think your git install should be doing what it's doing and if it was normal then this corrective action would be done by default	10:08
	milki: I'm good. Helping out someone else. I don't use git often but we started the conversation in #bash	10:09
	osse: see what milki and gitinfo just said	10:09
	→ jkremser joined	10:09
jetole	milki and gitinfo: you guys sound like you can be helpful to osse here. He's running git+ssh. Every commit, if a dir doesn't exist then it's created with the perms of the user who commited it so other users can't commit to that dir until he chmod's the dir	10:10
	→ Raging_Hog joined	10:10
milki	check out !gitolite	10:10
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	10:10
milki	or the man git init --shared=group	10:11
gitinfo	the git-init manpage is available at http://jk.gs/git-init.html	10:11
jetole	milki and gitinfo: this doesn't sound like what I would call normal working behavious of a well tested and widly used application so... have you guys seen this? Have any advice for him. I was about to google and read on it but only because I'm not the guy to know the answer	10:11
	← sirdancealo2 left	10:11
jetole	!gitolite osse	10:11
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	10:11
	← hwrd\|work left	10:11
jetole	well that didn't work	10:11
	→ mmlac joined	10:12
	← alorence left	10:12
jetole	osse: but you now have a good place to start I think. I hope. Good luck. I'm going to bed but it seems like milki and ... oh that's a bot. Seems like milki may be a good person to ask from here or, well obviously the room in general. You get the point. Night	10:12
	osse: good night and good luck. Don't worry. I can feel the force is strong in this one. peace	10:13
	← elixir_ left	10:14
milki	confuzzled	10:14
jetole	it's ok milki. I'm weird sometimes but osse needs the help so later guys	10:15
milki	later	10:15
	→ marhaban joined	10:15
	← kerrick left	10:15
	← wanders left	10:16
	→ babilen joined	10:16
osse	I could write a hook that double-checks that the permissions are correct, or I could isntall gitolite... OR I could setgid on the objects/	10:16
	:)	10:16
	→ jn_ joined	10:17
milki	osse: git init --shared=group will alleviate the need for setgid yourself	10:17
osse	I realize using gitolite is the proper way to go. But we are only three developers here. It has worked well for a year so far. It was just now that two developers needed to access the same objects subdirectory	10:17
	→ anderse joined	10:17
	← kswenson left	10:17
jetole	milki: back when I was a kid drugs were common and we all used to hang out and have parties. big campfires outside, everyone passing acid or shrooms or whatever around, usually a bunch of joints and making free love whenever we felt like it. It was a fun and exciting time but things are different now. Anyways, we had a wild ride back then and I would do it again but you know, because of all the fun we had I can seem weird or ...	10:18
	→ beautifulmind joined	10:18
jetole	... ecstatic sometimes but only too kids who aren't from that day and age man	10:18
	god I miss 2011. It was like so wild and radical and open	10:18
milki	lol sounds like a former hippie	10:18
osse	milki: I will definitely do that. I did not know about that option. I did chmod g+s on all the object dirs :O For future repos I'll do this. I should probably even run it in the current ones as well.	10:18
	milki nods	10:18
jetole	just kidding about 2011 or still being a kid then or doing tons of drugs when I was a kid but thought a little humor may be in order before I leave	10:18
milki	it sets a config option	10:18
	note its not the same as clone --shared	10:19
osse	core.sharedRepository is set to true in all the repos already. I can just change it to group I suppose	10:19
milki	i think it just tells git to use a differnt umask	10:20
	← anderse left	10:20
	← exoon left	10:20
	← dhruvasagar left	10:21
	→ pastime joined	10:21
	→ dhruvasagar joined	10:22
	← giallu left	10:22
	→ g3orge joined	10:23
	→ alorence joined	10:24
	milki uses gitolite and im the only user for most of the repos -.-	10:26
milki	its just so easy to use	10:27
	← WorkeD left	10:29
	→ kurkale6ka joined	10:30
	→ codebeaker joined	10:30
kurkale6ka	Hi, how can I revert the changes related to a specific SHA?	10:30
wereHamster	kurkale6ka: what do you mean by 'revert to a specific SHA'?	10:31
	← leehambley left	10:31
	→ vedant joined	10:32
kurkale6ka	wereHamster: not to a specific SHA, there many comits since that I wanna keep, but all changes to files in that SHA I want them back	10:32
	→ DoniRS joined	10:33
	← soc42 left	10:33
	← DoniRS left	10:33
	→ DoniRS joined	10:33
engla	git revert does exactly this	10:34
kurkale6ka	engla: ok, so git revert MY_SHA	10:34
	engla: cheers	10:35
	→ giallu joined	10:37
	→ wanders joined	10:39
	← curist left	10:40
	→ tinti joined	10:42
	→ hkj joined	10:43
	→ AdrienBrault joined	10:43
	→ the_cybersphinx joined	10:43
	← wanders left	10:45
	→ wanders joined	10:46
	→ Guest92252 joined	10:46
	← Guest92252 left	10:46
	→ rasputin1 joined	10:46
	← dorkmafia left	10:49
	← rasputin left	10:49
	← Chryyz left	10:50
	→ simesy joined	10:50
	← OOPMan left	10:51
	→ eijk_ joined	10:52
	← ncd\|leeN left	10:52
	→ bartzy joined	10:54
	← simesy left	10:54
	→ alexbligh joined	10:55
	← wanders left	10:55
	→ hatake joined	10:56
	→ ozette joined	10:57
	→ Chryyz joined	10:59
	→ mikecmpbll joined	11:02
	przemoc86 → przemoc	11:02
	→ mihamina joined	11:05
	→ jcromartie joined	11:06
	← Cromulent left	11:07
	→ bootstrapper joined	11:09
	← babilen left	11:09
	→ VinceThePrince joined	11:10
	→ Raydiation joined	11:12
Raydiation	any tipps for	11:12
	* Error in `git': malloc(): memory corruption: 0x0000000001b7f4e0 *	11:12
	im getting this very often on more than one pc	11:12
	if i rebase	11:12
engla	sounds bad	11:13
	→ wanders joined	11:13
engla	git version and platform?	11:13
	← jcromartie left	11:14
Raydiation	git version 1.8.1.5	11:14
	engla: archlinux	11:15
	→ ThePawnBreak joined	11:15
wereHamster	Raydiation: can you reliably reproduce it?	11:16
Raydiation	im trying sec	11:16
	cloning the repo again :)	11:16
	→ Tommy[D]_ joined	11:17
	← mikef left	11:17
	→ elixir_ joined	11:17
	← elixir_ left	11:17
	→ jcromartie joined	11:18
	→ elixir_ joined	11:18
	← bootstrapper left	11:18
	→ babilen joined	11:18
	→ Hounddog joined	11:18
	← Tommy[D] left	11:19
	← wanders left	11:19
	← sgronblom left	11:21
	→ Squarism2 joined	11:22
	← codebeaker left	11:22
	← hyperair left	11:23
	→ wasanzy joined	11:24
Raydiation	wereHamster: yeah, i can reproduce it	11:24
	git clone https://github.com/owncloud/core.git	11:24
	cd core/	11:24
	git pull --rebase https://github.com/PatrickHeller/core.git master	11:25
	→ wanders joined	11:25
iveqy	using git version 1.7.2.5	11:26
	I can't reproduce it	11:26
	→ cashwilliams joined	11:26
	← mmlac left	11:26
iveqy	using git version 1.8.2.rc3	11:29
	I can't reproduce it	11:29
	dwmw2_gone → dwmw2	11:29
	← Khisanth left	11:30
	← hkj left	11:30
	← cashwilliams left	11:31
	← wanders left	11:31
iveqy	using git version 1.8.1.5	11:32
Raydiation	iveqy: maybe introduced in a newer version?	11:32
	← Alecs left	11:32
iveqy	I can't reproduce it	11:32
	→ lahwran joined	11:32
Raydiation	iveqy: ty	11:32
	→ hkj joined	11:32
	← hkj left	11:32
Raydiation	maybe ram or ssd issue	11:33
iveqy	Raydiation: this is still a problem, but not reproduceable on debian squeeze	11:33
Raydiation	although i havent noticed anything yet	11:33
	iveqy: does git link other libs?	11:33
YoungFrog	you said on multiple pc, do you share any hardware between them ?	11:33
	→ hkj joined	11:33
Raydiation	no	11:33
	← hkj left	11:33
	→ brocken joined	11:33
iveqy	Raydiation: yes a few. libcurl, libc etc.	11:33
Raydiation	i cant try to reproduce the issue though because im 7 hours away from my main pc	11:34
	→ hkj joined	11:34
	← hkj left	11:34
	← Hounddog left	11:34
	← VinceThePrince left	11:34
	→ hkj joined	11:34
	← hkj left	11:34
iveqy	I would say the next step is to use git fetch and git rebase instead of git pull	11:35
YoungFrog	ok, just try with git version 1.8.1.4 and couldn't reproduce either.	11:35
	s/try/tried/	11:35
	→ hkj joined	11:35
	← hkj left	11:35
	→ littlebearz joined	11:35
iveqy	if the error is in git fetch we could have a problem with libcurl, and that can be a reason we can't reproduce it (we're not using the same version of libcurl as you)	11:35
	← Kichael left	11:36
	→ hkj joined	11:36
	← hkj left	11:36
	← kurkale6ka left	11:36
YoungFrog	you say you see the problem often ; how do you work around it usually ? or do you just leave thinsg as they are ? or is trying again sufficient ?	11:36
	→ tvw joined	11:36
	→ Chikore joined	11:36
Raydiation	most of the time i merge it	11:37
	not rebase	11:37
	→ hkj joined	11:37
	← hkj left	11:37
Raydiation	although im not sure tbh	11:37
	im trying to split the stuff like you said	11:37
	how do i rebase after i fetched?	11:37
	simply git rebase?	11:37
	← Jamiltz left	11:37
	← Chikore left	11:37
	→ hkj joined	11:37
	← hkj left	11:37
	→ wanders joined	11:37
	← ThePawnBreak left	11:38
YoungFrog	I guess it should be "git rebase FETCH_HEAD"	11:38
	→ hkj joined	11:38
	hatake → rhyda	11:38
	← hkj left	11:38
	→ hkj joined	11:39
	← hkj left	11:39
Raydiation	ty	11:39
	→ hkj joined	11:39
	← hkj left	11:39
	→ hkj joined	11:40
	← hkj left	11:40
	→ hkj joined	11:41
	← hkj left	11:41
	← dhruvasagar left	11:41
	→ leo2007 joined	11:41
leo2007	has anyone used gitlab?	11:41
	→ hkj joined	11:42
	← hkj left	11:42
	→ hkj joined	11:42
	← hkj left	11:42
	← g3orge left	11:42
wereHamster	leo2007: ask your actual question	11:43
	→ hkj joined	11:43
	← wanders left	11:43
	← hkj left	11:43
wereHamster	!yes	11:43
Raydiation	iveqy: http://dpaste.com/1016014/	11:43
	→ Onkeltem joined	11:43
Raydiation	can this even be related to curl?	11:43
	gitinfo set mode: +v	11:43
	→ hkj joined	11:44
wereHamster	Raydiation: no, this is in rebase	11:44
	→ hachque joined	11:44
	← hkj left	11:44
Onkeltem	Hi all. I forgot how to automatically run merge tool when CONFLICT occurs :-/ Help please :)	11:44
leo2007	it seems quite an effort to install. do you find it useful?	11:44
wereHamster	Raydiation: lines 8,9,10 are from git-rebase	11:44
Raydiation	yeah	11:44
	→ bootstrapper joined	11:44
	→ hkj joined	11:44
	← hkj left	11:44
Onkeltem	So when I do: git merge something, I just get "CONFLICT (content): Merge conflict in blah blah" and my lovely meld is not launched :-/	11:44
wereHamster	leo2007: so your actual question is: Does anybody find GitLab useful?	11:45
iveqy	Raydiation: probably not, it's in rebase as wereHamster says	11:45
leo2007	wereHamster: ;)	11:45
	→ hkj joined	11:45
	← hkj left	11:45
Raydiation	iveqy: git pull works fine	11:45
wereHamster	leo2007: somebody does. Many do, in fact. Otherwise the people who write and use it wouldn't have started that project	11:45
Raydiation	so its probably something only related to rebase	11:45
wereHamster	leo2007: also: http://gitlab.org/ -> Who is already using GitLab?	11:46
	→ hkj joined	11:46
	← hkj left	11:46
iveqy	the strange part is, we know that the problem probably is in git, but can't reproduce it	11:46
	→ dokma\|2 joined	11:46
	→ hkj joined	11:46
	← hkj left	11:46
leo2007	what is the easiest way to get gihlab installed?	11:46
	gitlab*	11:47
Raydiation	maybe related to ram size?	11:47
	ive got 4gb	11:47
	→ hkj joined	11:47
	← hkj left	11:47
iveqy	Raydiation: me too	11:47
	← dydave left	11:48
	→ hkj joined	11:48
	← hkj left	11:48
Raydiation	:/	11:48
iveqy	you said you can reproduce this on multiple machines?	11:48
wereHamster	leo2007: there is a button 'installation guide' on the website.	11:48
Raydiation	iveqy: well, ive encountered this on my other archlinux pc before	11:48
	→ Khisanth joined	11:48
	→ hkj joined	11:48
	← hkj left	11:49
	← Adys left	11:49
iveqy	and always on arch linux?	11:49
Raydiation	but i cant reproduce this issue since im 7h away	11:49
	← diegoviola left	11:49
Raydiation	yes	11:49
	havent tried other distros yet though	11:49
iveqy	any specific version of arch linux	11:49
	?	11:49
Raydiation	amd64	11:49
	x86_64	11:49
	→ hkj joined	11:49
	← dokma left	11:49
	← hkj left	11:49
	ChanServ set mode: +v	11:49
jast	let's create 6502_64	11:50
wereHamster	Raydiation: arch linux as well, same git version. Cna't reproduce	11:50
	→ hkj joined	11:50
	← hkj left	11:50
iveqy	wereHamster: Raydiation: same archlinux version?	11:50
jast	Onkeltem: sounds like you want to run 'git mergetool'	11:50
iveqy	thinking of glibc	11:50
wereHamster	iveqy: unlikely, arch linux is a rolling release	11:50
	→ Adys joined	11:51
	→ hkj joined	11:51
	← hkj left	11:51
wereHamster	glibc probably yes	11:51
Raydiation	glibc version?	11:51
	n	11:51
	sry :)	11:51
	core/glibc 2.17-3 (base) [installed]	11:51
	→ arvind_khadri joined	11:51
	→ hkj joined	11:51
	← hkj left	11:51
	→ gusnan joined	11:52
iveqy	wereHamster: that's fearly new build, since 28 january this year (I think)	11:52
	→ hkj joined	11:52
	← hkj left	11:52
	← jcromartie left	11:52
	→ hkj joined	11:53
	← hkj left	11:53
	← bootstrapper left	11:53
	← tplaner left	11:53
	→ hkj joined	11:53
	← hkj left	11:54
	← wrouesnel left	11:54
	→ hkj joined	11:54
	← hkj left	11:54
	→ wanders joined	11:54
Raydiation	glibc is famous for crap right?	11:55
	→ OOPMan joined	11:55
	→ hkj joined	11:55
	← hkj left	11:55
	← h0bbit left	11:55
jast	the only thing I know that glibc is famous for is Ulrich Drepper	11:55
iveqy	Raydiation: not what I know about.	11:55
leo2007	wereHamster: thanks.	11:55
Raydiation	jast: ah right :D	11:55
	→ hkj joined	11:55
	← hkj left	11:56
iveqy	I'm more in the thought of git using glibc in a strange manner. But malloc is pretty standard, there shouldn't be any problem there	11:56
	→ gommo joined	11:56
iveqy	more likely a memory corruption in git	11:56
	Raydiation: you should use valgrind to digg deeper in this	11:56
	→ hkj joined	11:56
	← hkj left	11:56
	← kadoban_ left	11:57
	→ hkj joined	11:57
	← hkj left	11:57
Raydiation	iveqy: not sure if this is helpful, arch builds without debug symbols	11:57
	dont ask me why	11:57
	→ hkj joined	11:57
	← hkj left	11:58
	← eletuchy left	11:58
	→ hkj joined	11:58
Raydiation	or does valgrind work without debug symbols?	11:58
	← hkj left	11:58
	→ eletuchy joined	11:58
bremner	it works better with debug symbols, but it does work without.	11:59
	→ hkj joined	11:59
	← hkj left	11:59
	→ hkj joined	12:00
Raydiation	valgrind /usr/bin/git =	12:00
	?	12:00
	→ nkr joined	12:00
Raydiation	http://dpaste.com/1016031/	12:02
	heres the valgrind output	12:02
	← r0bby left	12:02
	← rhyda left	12:03
Raydiation	do i need to use valgrind with the proper git rebase param?	12:03
	← eletuchy left	12:03
Raydiation	like valgrind /usr/bin/git --rebase ...	12:03
	→ tcurdt joined	12:03
iveqy	Raydiation: yes, you need a git crash	12:04
	← DoniRS left	12:04
	← tcurdt left	12:04
	→ aksnot joined	12:05
	→ RawProduce joined	12:05
	→ Element9 joined	12:06
Onkeltem	I've just realized how to handle several local branches :) Just make them all linked with remote!	12:06
RawProduce	I have a particular piece of code that I need to retrieve from a previous unknown commit - how can I grep through the entire set of changes in the repository and get the hash of any matching commits?	12:06
Raydiation	any tipps? im not an experienced C programmer ;)	12:07
	valgrind /usr/bin/git pull --rebase https://github.com/PatrickHeller/core.git master	12:07
	doesnt really rebase anything	12:07
grawity	RawProduce: man git log, see the -S and -G options	12:07
gitinfo	RawProduce: the git-log manpage is available at http://jk.gs/git-log.html	12:07
RawProduce	thanks grawity	12:08
	← mishok13 left	12:08
	← kmels_ left	12:08
	→ mishok13 joined	12:09
	→ DoniRS joined	12:09
Raydiation	k, oversaw git error msg	12:11
	now im stuck with http://dpaste.com/1016037/	12:11
	← rasputin1 left	12:11
Raydiation	if i ctrl c this is the output http://dpaste.com/1016038/	12:12
	→ rmichnik joined	12:12
	→ boo joined	12:12
	← vedant left	12:13
iveqy	Raydiation: thanks. However I'm unable to give you any good answer. I would suggest that you put together the things we talked about (the logs, the version, etc.) and then send a mail to [email@hidden.address] then you will reach more people that can look in to this more closely	12:13
	→ Ryback_ joined	12:14
	← Conjuro left	12:14
Raydiation	iveqy: thanks	12:15
iveqy	Raydiation: you're welcome. And please to, this is not an error we want in git...	12:17
	← infynyxx left	12:18
	← marhaban left	12:18
	→ bootstrapper joined	12:18
	→ marhaban joined	12:19
	boo → Conjuro	12:20
	← leo2007 left	12:20
	→ FernandoBasso joined	12:22
Raydiation	ok, sent the mail	12:22
	→ guampa joined	12:23
	→ cirenyc joined	12:23
	← yshh_ left	12:23
	← beautifulmind left	12:24
	← marhaban left	12:24
	→ untaken joined	12:24
untaken	is there away to run git status without being in the directory setup on git? ie git status /some/dir/with/git/on	12:25
	or do we have to do `cd` first?	12:25
grawity	(cd /some/dir && git status)	12:25
untaken	k	12:26
	ta	12:26
	→ kmels_ joined	12:26
	→ itatitat joined	12:27
	← bootstrapper left	12:27
	← Raging_Hog left	12:27
	→ hyperair joined	12:27
nihathrael	Is there any way I can detect a subtree merge, after it has happened? Meaning by going through all the commits?	12:28
jast	untaken: you can do it without the subshell but it's not very convenient because you have to pass git two extra arguments	12:29
	→ eletuchy joined	12:29
jast	something like --work-tree=/foo/repo --git-dir=/foo/repo/.git	12:29
untaken	thats no worries, I'll just do the cd && ... option for now. cheers	12:30
	→ marhaban joined	12:30
jast	luckily the () means you end right back up where you were :)	12:30
	it was a few years after I started using shell script that someone told me about that	12:31
	→ Mannequin joined	12:31
	← cirenyc left	12:31
	→ Chikore joined	12:31
	→ R1KRDO joined	12:32
	→ normanrichards joined	12:32
	← AdrienBrault left	12:32
	→ kristofers joined	12:33
	← Thra11 left	12:34
	→ Thra11 joined	12:37
	→ Adlai joined	12:38
Adlai	anybody using the alias alias?	12:38
	I'm having trouble getting it to work ( https://git.wiki.kernel.org/index.php/Aliases#alias )	12:38
	→ jcromartie joined	12:39
	← eletuchy left	12:39
	→ AdrienBrault joined	12:41
	← R1KRDO left	12:41
	← Vile left	12:42
	← aksnot left	12:42
	→ pandeiro joined	12:42
	← setmeaway left	12:42
	→ otherj joined	12:42
	→ aksnot joined	12:43
	← WinstonSmith left	12:45
	→ Vile joined	12:45
Adlai	My .gitconfig and the actual errosr are here: http://www.bitbin.it/q9p6o8bv	12:46
	← jcromartie left	12:46
	→ JaredMiller joined	12:47
	← JaredMiller left	12:47
	→ beaky joined	12:47
beaky	hello	12:47
	how do I switch from my current version of my project to an ancient one?	12:47
	→ WinstonSmith joined	12:48
beaky	to demonstrate what beaky's app 1.0 looks like (compared to 2.0)	12:48
bob2	do you mean 'git checkout somerandomhash'	12:48
beaky	ah thanks	12:48
	← jn_ left	12:48
	← dokma\|2 left	12:48
Adlai	beaky: there should be tags, though	12:49
	→ infynyxx joined	12:49
beaky	ah	12:49
	tags? what's that	12:49
Adlai	try `git tag --list' to see the available tags, and then `git checkout v1.0' or whatever	12:49
beaky	ah thanks	12:49
	hmm.. git tag --list gives nothing :( maybe i didn't put tags	12:49
Adlai	tags are a way of pointing to a specific commit and saying, "This is version X"	12:50
	they're pretty easy to use and save you the trouble of remembering old hashes afterwards	12:50
beaky	fortunately every discrete commit/merge in my master is one version :D how do I tag each?	12:50
engla	use git tag -a on each	12:51
	← Katafalkas left	12:51
beaky	ah thanks	12:51
	→ Katafalkas joined	12:51
Adlai	beaky: you can read http://git-scm.com/book/ch2-6.html for some more info about tags	12:52
	← mishok13 left	12:52
Adlai	or read the git-tag manpage, it's not that long	12:52
	→ Anders_J joined	12:52
	→ jn_ joined	12:53
	→ mishok13 joined	12:53
	← babilen left	12:53
Adlai	any git wizards have comments about my issue? http://www.bitbin.it/q9p6o8bv	12:53
	→ Guest50376 joined	12:54
beaky	wow my git version history is now nice and neat :D thanks for teaching me tags	12:54
Adlai	I tried escaping the hash so git doesn't treat it as a comment, but that also gave an error	12:54
	beaky: you're welcome	12:55
	it's reassuring that I can still give git help after three years of not touching it...	12:55
	Adlai is just getting his feet wet again with programming	12:55
	← NiteRain left	12:55
beaky	how do I diff a certain file (maybe open them side-by-side) between two different commits (like bettween version 1.0 and 2.0)? :D	12:57
bob2	git help diff	12:57
engla	git difftool for external programs	12:57
beaky	ah thanks	12:58
	← infynyxx left	12:58
	oposomme → oposomme\|away	12:59
	← bartzy left	13:00
	→ tagava joined	13:00
Adlai	ok, I solved my issue and am fixing the version in the git wiki :)	13:01
	beaky does the it dance	13:01
beaky	git*	13:01
	→ Raging_Hog joined	13:01
	← mikecmpbll left	13:02
	← Guest50376 left	13:02
RawProduce	trees do the git dance the best because they branch so often	13:03
	← tagava left	13:03
	← DoniRS left	13:04
	→ tagava joined	13:04
beaky	how do I do soemthing like difftool, but open up the entire files rather than just the differences?	13:04
	→ DoniRS joined	13:05
	→ eletuchy joined	13:06
	← Raging_Hog left	13:06
	← rob_w left	13:06
bob2	maybe you want git show	13:07
	→ ankurankan joined	13:07
bob2	which git tutorial did you read?	13:07
	← heytrav left	13:07
	← sgambino left	13:07
beaky	I read from the book pro-git linked in git-scm.com	13:08
	← Khisanth left	13:09
beaky	http://git-scm.com/book	13:09
	→ Khisanth joined	13:09
	← xiangfu left	13:10
	→ Raging_Hog joined	13:10
	← ankurankan left	13:11
	← tagava left	13:12
	→ v0n joined	13:12
cmn	difftool gets the whole file, if you're not happy with your current tool, there are more available	13:13
	→ heytrav joined	13:14
	← hellopat left	13:14
	← eliasp left	13:15
	→ lmm joined	13:15
	← daniel_- left	13:15
Adlai	fixed version at work, solving one of my pet peeves... http://www.bitbin.it/hKFgMPO1	13:16
lmm	hi, is there an existing module/similar for offering http access to repositories with node.js?	13:16
	→ tagava joined	13:16
	← eletuchy left	13:16
	← itatitat left	13:16
	→ sirdancealo2 joined	13:16
	← Khisanth left	13:16
	→ angelsl joined	13:16
	→ anonymuse joined	13:18
iveqy	lmm: you can reach a git-repository with http, https, ssh, git	13:18
	← normanrichards left	13:18
lmm	iveqy: I want to serve my repository so that other people can access it with http	13:18
	the machine I want to serve it from is running node.js but not apache	13:18
	← eijk_ left	13:18
lmm	it wouldn't be a huge effort to install apache on it as well and do some routing between them	13:19
	→ eijk joined	13:19
lmm	but I'd rather just do both the git hosting and the other stuff I'm hosting there in node.js if possible	13:19
cmn	unless you're willing to reimplement the git object packer, you should use git	13:19
	→ oriba joined	13:19
	← avtobiff left	13:20
lmm	"use git" in what sense?	13:20
	← Chikore left	13:20
	← sallesao left	13:20
wereHamster	"I want to serve my repository so that other people can access it with http" you mean clone via http or a html repo viewer?	13:21
lmm	clone via http	13:21
	hmm, looking into it it seems the apache way of doing it is actually just webdav?	13:21
wereHamster	lmm: man git-http-backend	13:21
gitinfo	lmm: the git-http-backend manpage is available at http://jk.gs/git-http-backend.html	13:21
	← pastime left	13:22
	→ wrouesnel joined	13:22
	MatthewWilkes → mwilkes\|away	13:23
lmm	ok, looks like there's a way to do cgi from node, so that will work	13:23
	thanks	13:23
	→ fire joined	13:23
	→ sebuba joined	13:24
	← guampa left	13:24
jast	that sounds like a pretty bad idea	13:25
	remember that as long as the CGI doesn't finish, node can't serve any other requests	13:25
	← Adlai left	13:25
	→ edgy joined	13:26
	→ Adlai joined	13:26
iveqy	jast: is node.js single threaded?	13:26
	→ cashwilliams joined	13:26
jast	yes	13:27
	it's got a pretty good event loop, but no concurrency	13:27
lmm	oh, point	13:27
iveqy	oh =(	13:28
jast	well, you can fork processes	13:28
	← mikewintermute left	13:28
jast	but the event loop still doesn't continue until your request callback returns	13:28
beaky	how does git compare to the other dvcs like hg, bzr, darcs, mstfs?	13:28
iveqy	use nginx as a load balancer before node.js and allow multiple node.js instances to run?	13:28
jast	!isgitbetter :}	13:28
gitinfo	We think so, but if you don't, please go away and use $YourFavoriteSystem instead. For a comparison to other VCSes, see http://thkoch2001.github.com/whygitisbetter/	13:28
	→ obert joined	13:28
	← edgy left	13:28
beaky	ah thans	13:28
jast	not sure how up-to-date that is, though	13:28
lmm	meh, if I was going to set up nginx in front I might as well set up apache in front instead, since I know how to make it serve git already	13:29
jast	basically, node.js shouldn't be used to serve anything ;P	13:29
	→ mikewintermute joined	13:29
iveqy	lmm: nginx is so much better than apache ;)	13:29
	→ iron_houzi joined	13:30
jast	depends on your requirements	13:30
	apache sure has more of a tendency to lock up	13:30
lmm	not better in a way that matters for me yet	13:30
jast	but perhaps that's what some people need for their applications	13:30
	→ Khisanth joined	13:30
lmm	I've never had it lock up, shrug	13:30
jast	happened to me several times last week	13:30
	single worker processes hung at 100% CPU usage	13:30
lmm	it works, I know how to use it, and I'm not in a position where performance is going to be an issue any time soon	13:31
jast	(no, we don't run mod_php)	13:31
lmm	shrug; never seen that myself	13:31
	← cashwilliams left	13:31
	→ geekbri joined	13:31
	← pandeiro left	13:31
iron_houzi	if I create branch A, then, while on branch A, I create branch B. This means that branch A has a "sub-branch" B, right? If so, what happens to branch B if I merge branch A with master?	13:31
bob2	nothing at all	13:32
	and using terms like 'sub-branch' is just going to confuse you	13:32
iveqy	jast: that's why I used the ;). it depends on your needs of course. A pretty usual setup is to use nginx to load balance multiple apache servers	13:32
jast	there's no such thing as sub-branches	13:32
haarg	branches aren't based on other branches, they are based on commits	13:32
	← Raydiation left	13:32
jast	B is basically a copy of A	13:32
	(at the point you create it)	13:32
	except it reuses everything, so it's more like with hardlinks	13:32
haarg	the branches may have the same commits in them, but that is the only relationship between the branches	13:32
	← mikewintermute left	13:33
	SeoZ → SeoZ-work[AWAY]	13:33
iron_houzi	bob2: But will branch B still available and branch A be removed when it is merged into master?	13:33
jast	nothing is removed automatically	13:33
iron_houzi	OK	13:33
jast	if you want to get rid of a branch, you delete it. if you don't, it stays.	13:34
wereHamster	jast: are you sure about that? If you spawn a CGI process (fork, ..) you can write/read to its stdin/stdout without blocking node	13:34
	→ mikecmpbll joined	13:34
	→ tplaner joined	13:34
iron_houzi	But if I explicitly remove branch A after merging it with master, branch B will still be available and working as it should..?	13:35
	→ guampa joined	13:35
	→ BadDesign joined	13:36
	← BadDesign left	13:36
	→ BadDesign joined	13:36
bob2	of course	13:36
iveqy	iron_houzi: yes, afaik. Which SCM are you used to?	13:36
bob2	'B' is just a pointer at a commit	13:36
iron_houzi	iveqy: What is an SCM?	13:37
iveqy	iron_houzi: source control manager	13:37
	→ skanev_ joined	13:37
	→ R1KRDO joined	13:37
iron_houzi	I use git from the linux command line	13:37
	→ skanev joined	13:37
	→ sunya7a joined	13:37
skanev	hey guys	13:37
gitinfo	skanev: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:37
iron_houzi	..obviously a noob though	13:37
iveqy	iron_houzi: a branch in git is simple a pointer to a commit. Making a new branch is basically creating a small file with a sha1 in	13:37
	iron_houzi: oh okay. It sounded like you'd used something else before git...	13:38
	→ xeviox joined	13:38
skanev	I'm trying to do some esoteric here. Is there a way to have a hook that commits in a submodule in the same repo?	13:38
	→ daniel_- joined	13:38
iron_houzi	iveqy: no no, just learning..	13:38
	→ erichynds joined	13:38
xeviox	if I simply clone a svn repository using "git svn", are the branches kept in separate folders like they appear in svn?	13:38
iveqy	xeviox: no	13:39
jast	wereHamster: yes, but as long as the HTTP request handler still runs (i.e. the request hasn't ended and we haven't sent a response to the client), the event loop stays out of the loop (pardon the pun)	13:39
	in node.js, that is	13:39
	→ kmels__ joined	13:39
wereHamster	jast: wrong.	13:39
xeviox	iveqy: so just the "trunk" gets cloned?	13:39
iveqy	xeviox: I'm afraid git-svn doesn't handle svn branches very well	13:39
xeviox	I want to migrate from svn to git	13:39
skanev	I tried writing a post-commit hook, but when i add something to the submodule's repo, I get unable to create submodule-name/.git/index.lock: not a directory. However, if I run the same script directly (instead of a post-commit hook), it works	13:39
xeviox	to later drop svn completely	13:40
wereHamster	jast: I dont' think you should be giving advice about node if you don't know how it works ;)	13:40
bob2	skanev, are you sure you want submodules?	13:40
iveqy	xeviox: I'm not fully up to date, I used git-svn latest last summer. Then you should clone trunk only, otherwise you'll end up with a git repo with all svn-branches in it	13:40
skanev	bob2, well, not, but they seem to be an OK idea. do you want me to tell you what I'm trying to accomplish?	13:41
iveqy	skanev: that's because .git in a submodule isn't a directory but a git file.	13:41
skanev	iveqy, sure, but why don't I get this error outside of the post-commit hook?	13:41
	→ Desproges joined	13:41
	← guampa left	13:42
	→ diamonds joined	13:42
iron_houzi	So please help the noob understand something: If I am working on a feature branch (branch A) that isn't completely working yet, but good enough to start focusing on some other feature I want to start working on (branch B). Then I complete branch A and want to merge it with my other work: Do I merge branch A with master and branch B and then remove branch A. Then when branch B is complete, I merge branch B with master??	13:42
	← kmels_ left	13:42
iveqy	skanev: I can't answer that I'm afraid. But start with checking if .git actually is a dir. It souldn't be	13:42
	← littlebearz left	13:42
	→ eletuchy joined	13:42
xeviox	iveqy: that's what I mean, using "git svn" in the simplest way, I would end up with all branches in different folders on the created git clone, right?	13:43
jast	wereHamster: oh, right. it does the callback dance. never mind, then. still doesn't make me appreciate the concept. :)	13:43
	I retract my previous statement. CGI can be done sanely in node.js, for certain values of 'sane'.	13:43
	→ shwaiil joined	13:43
iveqy	xeviox: yes. So just to git svn clone [path]/trunk	13:44
	→ babilen joined	13:44
shwaiil	hello : )	13:44
	→ minusthetiger joined	13:44
xeviox	iveqy: thanks! :D	13:44
	← v0n left	13:44
iveqy	xeviox: the svn and git branch concepts are so different it's almost impossible to keep them in sync in a good way	13:44
	in svn you can do a branch of a part of your tree, it's not possible with git. A branch is always your complete tree	13:45
	→ SkAzZ joined	13:45
	← subhojit777 left	13:45
	← SkAzZ left	13:45
	← GodEater left	13:45
xeviox	iveqy: yup, I just want to be sure that a simple "git svn clone [path]" ends up with everything being cloned (and branches move to different subfolders like it appears in a svn tree)	13:45
shwaiil	Q: How to have a specific git config user based in the logged in user. I'm right now logged in to my VM as userX and I'm wondering if I set git config --global user if this is going to be equal to all users or just userX ?! What should I do, so that each user has its own git config user ? Tks : D	13:45
	→ SkAzZ joined	13:45
	→ GodEater joined	13:45
xeviox	iveqy: just wanted to be sure that it doesn't skip branches by default..	13:46
	iveqy: thank you!	13:46
	← bgerber left	13:46
	→ normanrichards joined	13:46
	← GodEater left	13:46
	← eijk left	13:46
	→ eijk joined	13:46
	→ jcromartie joined	13:47
iveqy	shwaiil: --global is for all your repositories. Not for all users on the machine, you shouldn't have write access to do settings for other users	13:47
	at least not if you're using a unix-system	13:47
shwaiil	iveqy: thanks for looking! I used to work in my localmachine but I just setup a VM running linux ubuntu. I'm now working in the VM and wondering if someday I ask some help and if I need him to log to this VM or something, maybe he'll just work in his environment, I'm just confused in the moment :Z	13:49
	← elixir_ left	13:49
	→ elixir_ joined	13:49
	→ JaredMiller joined	13:50
	→ GodEater joined	13:50
	→ pandeiro joined	13:50
iveqy	shwaiil: give him a different user and he will have an own enviroment	13:50
	← DoniRS left	13:50
	→ sgambino joined	13:50
	→ bgerber joined	13:50
	→ simesy joined	13:51
shwaiil	iveqy: truth :) sorry for the question, just confused in the moment	13:51
	→ JaredMiller1 joined	13:53
	→ DoniRS joined	13:53
	← eletuchy left	13:53
	← JaredMiller left	13:54
	← simesy left	13:56
	→ gruen0 joined	13:56
	← gruen0 left	13:56
	→ revagomes joined	13:57
	← beaky left	13:57
	→ AndroUser joined	13:57
	→ okar joined	13:57
	← JaredMiller1 left	13:58
	← ISF_ left	13:58
	← AndroUser left	13:58
	→ trungqtran joined	13:58
	← paulweb515_ left	13:58
	← jn_ left	13:59
	← rfoust left	14:00
	→ vedant joined	14:00
	→ GodEater_ joined	14:00
	→ tmcmahon joined	14:01
	→ Guest16355 joined	14:03
	→ cannonball joined	14:03
	← GodEater_ left	14:03
	← GodEater left	14:03
	→ GodEater joined	14:04
	← Squarism2 left	14:04
	← GodEater left	14:04
	← OOPMan left	14:05
	→ avtobiff joined	14:07
	← Cerise left	14:08
	→ sallesao joined	14:08
	← Guest16355 left	14:08
	→ Chikore joined	14:09
	← stewiee left	14:10
	→ Shurakai joined	14:10
	→ decotii joined	14:11
	← rath left	14:11
	← nihilista left	14:13
	→ paulweb515_ joined	14:13
	← hkj left	14:13
	→ freeed joined	14:13
	← _protagoras271_ left	14:13
	← Raging_Hog left	14:15
	→ infynyxx joined	14:15
	← tagava left	14:15
	→ jn_ joined	14:15
	← gdoteof left	14:16
	→ hkj joined	14:16
	→ nihilista joined	14:16
	← tmcmahon left	14:17
	← jargon left	14:17
	→ maleknet joined	14:18
	← gasbakid left	14:19
	→ eletuchy joined	14:20
	← daniel_- left	14:20
tongcx	why sometimes, it's prefered to do a merge when fast-forward is default?	14:21
	← elixir_ left	14:21
	→ macabre joined	14:22
jast	if you want to leave an explicit record that you added that new history, you create a real merge commit	14:22
	maybe to indicate that you verified/tested the new stuff	14:23
tongcx	jast: in terms of maintainence, is merge better?	14:23
	jast: maybe in future, it's easier to take the merge off?	14:24
	← alorence left	14:25
tongcx	jast: sorry, what i said doesn't make sense	14:26
	→ breakingthings joined	14:26
jast	actually, merges are harder to "undo"	14:27
	because if you revert them (using 'git revert'), you can't merge that history again	14:27
	← otherj left	14:27
	→ thl0 joined	14:27
	→ alorence joined	14:27
	← maleknet left	14:28
	→ rfoust joined	14:28
	→ rue joined	14:29
	→ Raging_Hog joined	14:30
	← eletuchy left	14:30
	→ lethjakman joined	14:30
	← bluj left	14:31
	→ chimay joined	14:32
	mwilkes\|away → MatthewWilkes	14:34
	← aksnot left	14:35
	→ PigeonFriend joined	14:35
	→ brokenjames joined	14:36
	→ dc5ala joined	14:36
	← vedant left	14:36
	→ ries joined	14:37
	← fire left	14:37
ries	Hello! Small question, with git you cannot checkout a single file under a different revision (like in SVN) right?	14:37
cmn	ries: git checkout <commitish> -- <files>	14:38
	→ rbmk joined	14:38
	→ gdoteof_ joined	14:38
ries	cmn: Hmm interesting… I always thought it was a all or nothing..	14:38
	← soee left	14:39
cmn	you're thinking about history	14:39
ries	cmn: is that the same for updates? Let's say I have a repo and can I checkout a single file from a specific commit?	14:39
	← gommo left	14:39
cmn	what updates?	14:39
	← marthinal left	14:40
cmn	what I just told you is how to checkout a file from a commit	14:40
	this has nothing to do with updating anything	14:40
ries	cmn: Let me explain a bit better… our report users commit a file to SVN under a revision.. then during deployment we checkout that specific revision of a file… I know it's a bad way of working but….	14:40
cmn	you can ask git for a particular commit's version of a file	14:40
ries	ok..	14:41
cmn	if you want it to stick, you can commit it	14:41
	→ gustavnils joined	14:41
ries	ok	14:41
	← brian_ left	14:42
	→ msimav joined	14:42
	→ netzmonster joined	14:42
	← Raging_Hog left	14:43
	← jn_ left	14:43
	→ tomprince joined	14:44
msimav	hi all, how can i force git to ask merge message?	14:44
wereHamster	msimav: git merge --no-ff	14:44
msimav	thx wereHamster	14:45
tomprince	I'm using git-svn, with two remotes, and doing 'git svn fetch' appears to be grabbing the 'ignore-paths' config from the wrong config section	14:45
	← Katafalkas left	14:47
	← BadDesign left	14:47
	→ v0n joined	14:48
tongcx	if someone did a fast-forward, is there anyway to track the name down?	14:50
	since there is not commit created, is this info stored or lost?	14:50
wereHamster	'the name'? Which name	14:50
bob2	as in who did it?	14:51
tongcx	yes	14:51
	who did fastforward	14:51
wereHamster	no	14:51
armin	hi, when i do "git checkout -b spielwiesenbranch --track remotes/origin/2.0", why does git branch -a not show me a "-> remotes/origin/2.0" after the spielwiesenbranch entry in the output? git already told me that the new local branch spielwiesenbranch has been set up to track the remote one.	14:51
tongcx	wow, that's sad, so perfer to have a merge even if can be fastforwarded?	14:52
	→ simesy joined	14:52
jast	tomprince: I don't think using git-svn with multiple remotes gets a lot of love, code wise	14:52
bob2	if you want a merge commit, yes	14:52
wereHamster	tongcx: git merge --no-ff	14:52
tongcx	wereHamster: great! thanks	14:52
bob2	(it's not sad, it's part of the git model)	14:52
	→ huoxito joined	14:52
	→ bmac joined	14:52
jast	armin: 'git branch' doesn't show that info without -vv	14:53
	← nihathrael left	14:53
	→ cashwilliams joined	14:53
	→ itatitat joined	14:54
	→ ojacobson joined	14:54
msimav	So is there any way to alias merge to 'merge --no-ff'? Adding it to .gitconfig affects behavior of pull which something i dont want.	14:54
tongcx	bob2: haha, is it possible to make --no-ff default?	14:54
wereHamster	msimav: make an alias?	14:54
ojacobson	sure: I have 'git config --global alias.ff "merge --ff-only"'	14:54
jast	msimav: you can create a new command, e.g.: git config --global alias.supermerge merge --no-ff	14:54
ojacobson	you can hack that, I'm sure	14:54
	← philips_ left	14:54
msimav	well i accidently merge with 'git merge' not 'git supermerge'	14:55
jast	the config doesn't distinguish between 'git merge' and 'git pull', since internally git pull simply calls git merge	14:55
	→ yshh joined	14:56
msimav	jast, i see	14:56
jast	alternatively you can set merge.ff to false and use 'git pull --ff'	14:56
	← simesy left	14:56
jast	setting branch.<your branch>.mergeoptions to '--ff' might take care of that for you	14:57
	not sure	14:57
	→ eletuchy joined	14:57
tongcx	msimav: you can reflog	14:57
	→ natechan joined	14:57
msimav	thx jast	14:57
	→ NiteRain joined	14:57
tongcx	msimav: and revert back to before-merge status	14:57
	→ xiangfu joined	14:57
	← netiul left	14:58
	→ bartzy joined	14:58
	← Parhs8 left	14:58
msimav	i will search about them, tongcx	14:58
	→ AnimeCYC joined	14:59
	→ jatt joined	14:59
	→ philips_ joined	14:59
	← arietis left	15:00
	← mtk left	15:01
	→ Goles joined	15:01
	← quazimodo left	15:02
	← rue left	15:03
	← marhaban left	15:04
	→ mtk joined	15:04
	→ johnthebear joined	15:04
	→ mmitchell joined	15:05
	→ arietis joined	15:05
	← teear left	15:06
	← mmitchell left	15:06
	→ Esa_ joined	15:06
	→ teear joined	15:06
	← mtk left	15:06
	→ mmitchell joined	15:06
	→ mtk joined	15:07
	→ vedant joined	15:08
	← eletuchy left	15:08
	→ _iron joined	15:08
	→ e66 joined	15:09
	→ __Big0__ joined	15:09
	→ hellopat joined	15:09
	→ kukks joined	15:10
	← kukks left	15:10
	→ kukks joined	15:10
	← mtk left	15:11
	→ TeckniX joined	15:12
	→ unbounced joined	15:12
	→ bootstrapper joined	15:12
	→ CreativeEmbassy joined	15:12
	← arvind_khadri left	15:12
CreativeEmbassy	can anyone help me diagnose what I'm doing wrong with subtrees?	15:13
	← babilen left	15:13
	← tim left	15:13
	→ tim joined	15:13
CreativeEmbassy	I have an open source ticketing engine	15:13
	at https://github.com/fracturedatlas/artfully_ose	15:13
	← infynyxx left	15:13
CreativeEmbassy	it's a complete Rails engine	15:13
	→ breck7 joined	15:13
CreativeEmbassy	I also have a standalone Rails app at https://github.com/fracturedatlas/artfully_app	15:14
	→ santosh joined	15:14
CreativeEmbassy	and it adds artfully_ose as a subtree at lib/artfully_ose	15:14
	→ Pigeon\|Dup joined	15:15
	← normanrichards left	15:15
CreativeEmbassy	so I've been pulling the engine's changes with `git subtree push --prefix=lib/artfully_ose ose 1.1.0.rc1`	15:15
	← breck7 left	15:15
santosh	How to add all untracked (just untracked) files?	15:15
	← PigeonFriend left	15:15
	→ mtk joined	15:15
CreativeEmbassy	(changes that my co-workers make to the engine by itself)	15:15
	and likewise, pushing subtree changes with `git subtree push --prefix=lib/artfully_ose ose 1.1.0.rc1`	15:15
	← rmichnik left	15:15
	← Desproges left	15:15
axrfnu	santosh: maybe git add $( git ls-files -o )	15:16
CreativeEmbassy	erm, I meant pulling the engine's changes with `git subtree pull --prefix=lib/artfully_ose ose 1.1.0.rc1` earlier	15:16
	← xeviox left	15:16
	→ beitao joined	15:17
CreativeEmbassy	"ose" in those examples is the remote repository for artfully_ose, of course	15:17
	→ axl_ joined	15:17
	→ guampa joined	15:17
CreativeEmbassy	so when I pull, I get	15:17
	* branch 1.1.0.rc1 -> FETCH_HEAD	15:17
	Already up-to-date.	15:17
	→ chrisirc joined	15:17
CreativeEmbassy	but if I try to push out there, I get	15:18
	! [rejected] c1fed7c4f4fcbc7528448247cd66540902f4719a -> 1.1.0.rc1 (non-fast-forward)	15:18
	how do I figure out what's going on? there's no reason why my ose subtree and the branch on the remote repo should be any different	15:18
	should I be merging or splitting somewhere that I'm not? am I missing something?	15:18
	→ m0viefreak joined	15:19
	← santosh left	15:19
	← m0viefreak left	15:19
	→ m0viefreak joined	15:19
	→ jackh joined	15:19
	→ pareidolia joined	15:20
	→ eijk_ joined	15:20
pareidolia	Hi all	15:20
	→ chrisgeorge joined	15:20
	→ tjbiddle joined	15:21
pareidolia	Can someone help me with some problems, I'm trying to do a rebase -i to squash commits	15:21
	← bootstrapper left	15:21
chrisirc	Hi. How do I apply (rebase, cherry-pick) a range of commits on top of the current branch?	15:21
	I excplicitely don't want to rebase from a common merge base.	15:21
pareidolia	But these commits span over a branch merge, some googling showed me that this is a difficult case	15:21
chrisirc	Just "rebaseget $from $to", where $from is a (grand*)parent of $to.	15:22
	← Pigeon\|Dup left	15:22
pareidolia	chrisirc, me?	15:22
chrisirc	No, that was an extension of what I said myself.	15:22
	→ OOPMan joined	15:23
	gitinfo set mode: +v	15:23
	← eijk left	15:23
	→ chuckharmston joined	15:23
	→ plasticboy joined	15:23
CreativeEmbassy	ah crap, I haven't had voice the entire time I've been talking	15:23
chrisirc	pareidolia, you might want to try my http://github.com/pflanze/cj-git-patchtool	15:23
	→ tjbiddle_ joined	15:24
CreativeEmbassy	I'll try to be more succinct the second time around	15:24
	→ griotspeak joined	15:24
chrisirc	CreativeEmbassy, "should I be merging or splitting.." was the last thing I saw	15:24
	→ cilly joined	15:24
pareidolia	chrisirc: I am wondering if removing the last commits without throwing away the current state would work	15:24
CreativeEmbassy	alright, that's where I ended	15:25
	→ PigeonFriend joined	15:25
	→ garbagecollectio joined	15:26
garbagecollectio	how can i merge a remote branch into a local branch	15:26
	neither of them are master	15:26
wereHamster	garbagecollectio: fetch the branch, merge it	15:27
chrisirc	pareidolia, typically you would rework the history while ignoring the merge, then merge again afterwards.	15:27
	← tjbiddle left	15:27
	tjbiddle_ → tjbiddle	15:27
garbagecollectio	while on the local branch i want it to merge into?	15:27
chrisirc	pareidolia, or, if the part after the merge is depending on the merge, rework the part before, merge, rework the rest.	15:27
	→ thiago joined	15:27
	← msimav left	15:27
wereHamster	garbagecollectio: yes, you are always merging into the branch you are currently on	15:27
	→ St_Marx joined	15:27
garbagecollectio	so git fetch <branchname>	15:27
	→ jonshea_ joined	15:27
garbagecollectio	git merge	15:27
CreativeEmbassy	anyhow, I'm getting the hint "Updates were rejected because the tip of your current branch is behind its remote counterpart. Merge the remote changes (e.g. 'git pull') before pushing again."	15:27
garbagecollectio	or can i just do git pull origin/branchname	15:28
CreativeEmbassy	but I have been `git pulling` and `git subtree pulling`	15:28
wereHamster	garbagecollectio: no, git fetch takes other arguments.	15:28
CreativeEmbassy	so I'm not sure where the difference lies, and why I can't fast-forward	15:28
garbagecollectio	wereHamster, can you tell me	15:28
	→ infynyxx joined	15:28
	← jkremser left	15:28
	← pretty_function left	15:29
wereHamster	garbagecollectio: yes. But the man page has it described in much better words that I could ever produce. man git-fetch	15:29
gitinfo	garbagecollectio: the git-fetch manpage is available at http://jk.gs/git-fetch.html	15:29
	→ jkremser joined	15:29
	→ HerrK joined	15:29
	← CarieFisher left	15:29
	← jonshea left	15:29
	jonshea_ → jonshea	15:29
garbagecollectio	git pull origin <branchname> right?	15:29
wereHamster	garbagecollectio: !tias	15:30
gitinfo	garbagecollectio: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/1-basic-usage/tias.html may help with git-specific TIAS.	15:30
garbagecollectio	lol I'm not going to try and see on a codebase	15:30
pareidolia	chrisirc: How about a soft reset?	15:30
	← lethjakman left	15:30
wereHamster	garbagecollectio: "If in doubt, make backups before you experiment ..."	15:30
garbagecollectio	wereHamster, can you be a bit human and just tell me what to do	15:30
	← vedant left	15:31
chrisirc	pareidolia, you can do that, yes, then commit -a, to squash everything since the reset point together.	15:31
	→ vedant joined	15:31
chrisirc	pareidolia, but that doesn't magically take care of the merge (properly)	15:31
pareidolia	chrisirc, yes, but I don't care about the other branch, it's deleted	15:32
garbagecollectio	Automatic merge failed; fix conflicts and then commit the result.	15:32
chrisirc	pareidolia, meaning, you would get the merged changes without saying what was merged, which could be confusing in the future	15:32
	pareidolia, ok, if nobody has the other branch, then you'll be fine.	15:32
pareidolia	chrisirc: It was a private "feature branch"	15:32
chrisirc	I think you'll be fine then.	15:32
	← plasticboy left	15:33
chrisirc	Never did this myself, but from my understanding it should do what you want.	15:33
	← FernandoBasso left	15:33
pareidolia	chrisirc: I think I can promote this to a "workflow thingy". I hope I won't have to do it too often though	15:33
	← __Big0__ left	15:33
	← Sky[x] left	15:33
	→ plasticboy joined	15:33
	→ relipse joined	15:33
	← ThomasLocke left	15:34
pareidolia	chrisirc: Thanks so much for your help :)	15:34
	→ sjugge joined	15:34
chrisirc	Yes, may make sense; as long as you're happy to squash every feature into a single commit:)	15:34
	← sjugge left	15:34
	→ eletuchy joined	15:34
	← mikecmpbll left	15:34
	← sirdancealo2 left	15:34
chrisirc	np	15:34
	← rchavik left	15:35
	→ __Big0__ joined	15:36
	← Chikore left	15:36
	→ mezner joined	15:37
	← ries left	15:37
	→ littlebearz joined	15:38
	→ aberrant joined	15:38
	← mezner left	15:39
	→ yshavit joined	15:40
	beitao → trythis	15:40
	→ normanrichards joined	15:40
	→ kswenson joined	15:41
yshavit	I've got a local repo of a github repo (I'm asking here because it seems like a git question, not github). A few branches have been deleted on the remote (github), but they still show up for me when I type `git branch -r --merged master`. I've done a git fetch, and a git pull. Is there a way to get these branches to go away?	15:41
	→ bootstrapper joined	15:41
	→ kevwil joined	15:42
wereHamster	yshavit: git remote prune ...	15:44
grawity	or `git fetch -p`	15:44
	← psoo left	15:44
	← eletuchy left	15:45
yshavit	wereHamster, grawity: that did the trick, thanks!	15:45
	→ Noldorin joined	15:46
	→ tjbiddle_ joined	15:47
	← __Big0__ left	15:47
	← pareidolia left	15:48
	→ __Big0__ joined	15:49
	← kermit left	15:49
	← alunduil left	15:49
	→ penguin1 joined	15:50
	→ GodEater joined	15:50
	→ tjbiddle__ joined	15:50
	← tjbiddle left	15:50
	tjbiddle__ → tjbiddle	15:50
	→ daniel_- joined	15:51
	→ kermit joined	15:51
	→ esr joined	15:52
	← tjbiddle_ left	15:52
	→ alunduil joined	15:52
	→ simesy joined	15:52
	← Sigma left	15:52
	← jrex left	15:53
	→ Destos joined	15:53
	← cashwilliams left	15:53
	→ elixir_ joined	15:53
chrisirc	Is there a way to check whether the working directory is clean, while ignoring changes in subrepositories?	15:54
	← scrape left	15:54
	← ehsan left	15:55
	→ MB_wrk joined	15:55
	← Thra11 left	15:55
	→ willob joined	15:55
chrisirc	Or at least to ignore untracked content in submodules.	15:56
	← magnus left	15:56
	→ mnemoc joined	15:56
MB_wrk	Hello. So I made a branch, develop, from the master branch. And then I made a commit on the master branch. How do I rebase the develop branch on the new master branch?	15:56
	← simesy left	15:57
	← thiago left	15:57
mnemoc	hi, can I make `git ls-files -m` consider staged changes? -s/--stage has a totally different meaning ... and git state --porcelain is messy to parce when there are renames with spaces :\|	15:57
	← itatitat left	15:59
	→ jrex joined	15:59
	→ SJS joined	16:00
	← SJS left	16:00
	→ SJS joined	16:00
	→ jaequery joined	16:00
	← jackh left	16:00
	→ exoon joined	16:00
charon	mnemoc: parse git status --porcelain -z instead	16:00
	→ anabelle joined	16:00
MB_wrk	Welp, got it. Had to cherry pick the commit.	16:00
charon	mnemoc: but to answer the specific question, git diff-index	16:01
	← flijten left	16:01
	→ j^2 joined	16:02
	→ PaulCapestany joined	16:03
	→ d2dchat joined	16:03
mnemoc	charon: `git diff-index --name-only -z` is exactly what I needed, thanks!	16:04
	← nilg left	16:04
	→ hatake joined	16:05
mnemoc	\| xargs -r0 friendly :)	16:05
	→ aksnot joined	16:05
	← maxmanders left	16:06
	← MB_wrk left	16:07
	→ mmu_man joined	16:08
	→ ankurankan joined	16:08
	→ Sicp joined	16:08
	← SJS left	16:09
	→ fobban joined	16:10
	← cbreak-work left	16:10
	→ oposomme joined	16:10
	← oposomme left	16:10
	→ oposomme joined	16:11
	← hyperair left	16:11
	→ cjs joined	16:11
	← GodEater left	16:11
	→ SJS joined	16:11
	← SJS left	16:11
	→ SJS joined	16:11
	→ eletuchy joined	16:11
	→ guillaum joined	16:12
	→ dhruvasagar joined	16:12
	← ankurankan left	16:12
	→ marhaban joined	16:13
	← cjs left	16:13
	→ rue joined	16:14
	→ AnimeCYC_ joined	16:14
	← oposomme\|away left	16:15
	→ green- joined	16:15
	→ rgsteele joined	16:15
	← elixir_ left	16:15
	← oposomme left	16:16
green-	i have a file that differs on two checked out copies/clones of a repos, though both working copies say they are fully up to date w/o any uncommitted or changes … any ideas on how this is possible?	16:17
	← alorence left	16:17
	← Noldorin left	16:17
	← AnimeCYC left	16:18
	→ private joined	16:19
	→ jpcamara joined	16:19
	private → Guest65498	16:19
alexbligh	How do I set up a file that is not in the repo, is in .gitignore, but does NOT get cleaned by git clean -xdf. It's editor settings in this case.	16:19
	← xiangfu left	16:20
wereHamster	alexbligh: don't uxe -x in git clean	16:20
	← rue left	16:20
	← LekeFly left	16:20
	→ xxghostxx joined	16:21
	← _Qman left	16:21
	← pandeiro left	16:22
	→ scrape joined	16:22
	← eletuchy left	16:22
	→ last_chance joined	16:23
	← rgsteele left	16:23
	← brandonw left	16:24
	→ ehsan_ joined	16:24
	← daniel_- left	16:24
	← mihamina left	16:24
	→ lethjakman joined	16:25
	← netzmonster left	16:26
	← chuckharmston left	16:27
	← ehsan_ left	16:27
	→ kenperkins joined	16:27
	→ madewokherd joined	16:28
	← alexbligh left	16:28
	→ Chillance joined	16:28
	← vedant left	16:29
	→ hwrd\|work joined	16:29
	← __Big0__ left	16:29
	→ __Big0__ joined	16:30
	← kswenson left	16:30
	← last_chance left	16:31
	← aberrant left	16:32
	← tsdh left	16:34
	← infynyxx left	16:34
	← runde left	16:35
	← tjbiddle left	16:35
	← CodeShark left	16:35
	→ ehsan_ joined	16:35
	← Sonderblade left	16:35
	→ tjbiddle joined	16:36
	← lb1a left	16:36
	← ehsan_ left	16:36
	← ejnahc left	16:36
	→ runde joined	16:37
	→ ehsan_ joined	16:37
	← tplaner left	16:37
	→ ejnahc joined	16:37
	← nitrix- left	16:39
	→ hyperair joined	16:39
	← maestrojed left	16:40
	← garbagecollectio left	16:40
	→ misster_lonely joined	16:40
	→ garbagecollectio joined	16:41
	← bootstrapper left	16:41
	← __Big0__ left	16:41
	← misster_lonely left	16:42
	← siriuz left	16:42
	→ __Big0__ joined	16:42
	← tim left	16:43
	← enex left	16:43
	→ enex joined	16:43
	→ siriuz joined	16:44
	← LeMike left	16:44
	→ pppaul joined	16:45
	→ Thra11 joined	16:46
	← b1rkh0ff left	16:47
	→ LeMike joined	16:47
	→ system64 joined	16:48
	→ eletuchy joined	16:48
	← jatt left	16:49
	← puchrojo left	16:49
	→ maleknet joined	16:51
	← papegaaij left	16:51
	← LeMike left	16:52
	→ malkomal_ joined	16:52
	→ simesy joined	16:52
	← lavaman left	16:53
	→ dreiss joined	16:53
	← malkomal_ left	16:55
	← angelsl left	16:55
	← yshavit left	16:55
	→ malkomalko joined	16:56
	← toddWork_ left	16:57
	→ Davey joined	16:57
	← simesy left	16:57
	→ infynyxx joined	16:57
	→ alvaro_o joined	16:57
	→ b1rkh0ff joined	16:58
	← eletuchy left	16:58
	← Leucaruth left	16:58
	→ elixir_ joined	16:58
	→ macrover joined	16:58
	← Adlai left	16:59
	→ Chikore joined	16:59
	→ soypirate joined	17:00
	← sallesao left	17:01
	← avtobiff left	17:01
	← Guest65498 left	17:01
	← malkomalko left	17:02
	→ rakl joined	17:02
	→ malkomalko joined	17:02
	→ sluther joined	17:02
	← tomprince left	17:04
	← Goles left	17:04
	← AdrienBrault left	17:05
	← hkj left	17:05
lucs	Hmm... Is it just me, but my gitk diffs highlight (in red) lines that don't start with "-" (and they don't because they have not changed!)?	17:05
	→ juvenal joined	17:06
	→ arvind_khadri joined	17:07
	→ maxmanders joined	17:07
	→ Parhs joined	17:08
	← Parhs left	17:08
	→ Parhs joined	17:08
	→ Cromulent joined	17:09
	→ nioncode joined	17:09
	← tureba left	17:09
	→ bootstrapper joined	17:09
	← jaequery left	17:10
	← infynyxx left	17:10
	← fRAiLtY- left	17:10
	→ lavaman joined	17:11
	→ gotwig joined	17:11
gotwig	how can I update my git project from origin	17:11
HedgeMage	gotwig: git pull origin master (assuming master is the branch you are pulling to)	17:12
	← cdeszaq_ left	17:12
	→ cdeszaq joined	17:12
	→ hiroyuki_ joined	17:12
	← skanev_ left	17:13
	→ rmichnik joined	17:13
gotwig	HedgeMage: when I do that, whats next?	17:13
	HedgeMage: how can I remove obsolote, old files which are not part of the current trunk?	17:13
HedgeMage	gotwig: if they are files tracked by git, and they were deleted with "git rm" git will do that for you	17:13
	gotwig: if they are untracked files you must remove them manually	17:14
gotwig	HedgeMage: so that pull thing overwrote my old files?	17:14
charon	HedgeMage: !pull4	17:15
gitinfo	HedgeMage: [!fetchfour] Never use the four-word version of git-fetch or git-pull (e.g. git fetch <remote> <refspec>). It always ends in tears. Yes, if you understand the implications of FETCH_HEAD it can technically be done, but really it is easier to just fetch the whole remote (or perhaps edit the fetchspec if you never want other bits). If you must, see !fetch4why	17:15
charon	gotwig: !pull	17:15
gitinfo	gotwig: pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	17:15
	← bootstrapper left	17:15
gotwig	oh	17:15
	great	17:15
	I understand it now	17:15
	→ throstur joined	17:15
gotwig	( I guess )	17:15
	→ tureba joined	17:15
charon	it's really less a matter of overwriting than of git updating the worktree to match what you merged.	17:16
throstur	hey guys, I made a big boo-boo when creating a git repo, I meant to only add 1 file but I have a whole folder instead	17:16
	→ mikef joined	17:16
throstur	how can I remove all files except that one file so that when I push/pull that the .o files and such don't get synced?	17:16
wereHamster	throstur: git reset; git add <dat file>	17:16
	← hiroyuki left	17:16
throstur	thanks wereHamster	17:16
	← maleknet left	17:16
	→ mikewintermute joined	17:16
charon	gotwig: and it is very careful. if that update ran the risk of actually destroying uncommitted work, it would abort. it's still better if you don't merge with uncommitted work, however.	17:16
	→ nitrix joined	17:17
gotwig	nothing to commit (working directory clean) ;P	17:17
	← bauruine left	17:17
	→ Goles joined	17:18
lucs	Spurious red: http://scullucs.com/Selection_004.png	17:18
	→ maletor joined	17:19
	→ sq-one joined	17:19
lucs	Anyone else get things like that from gitk?	17:19
	→ bryanstedman joined	17:19
	→ Adlai joined	17:20
	→ SonikBoom joined	17:20
charon	lucs: if you have a simple reproducer, send it to the list -- the Tk dinosaurs will have a look at it	17:20
	→ aberrant joined	17:20
	→ itatitat joined	17:21
	← Vinnie_win left	17:21
lucs	charon: Hmm... Dunno if I can build a simple example that will reproduce the problem.	17:22
	If it drives me nuts, I'll give it a shot :)	17:22
charon	lucs: well, you could start by making a repo that contains only the pre- and postimage of this file in two successive commits	17:22
	then see if that reproduces	17:22
	that would be simple enough in my book ;)	17:23
lucs	I'm not sure I understand what you mean. A repo holding two PNGs?	17:23
charon	err no	17:24
	→ Vinnie_win joined	17:24
charon	pre/postimage is just the terminology for before/after sides of a diff	17:24
	→ gregorio joined	17:24
lucs	Ah, I see.	17:24
	I could try that.	17:24
	→ eletuchy joined	17:24
	← francisfish left	17:25
	← gregorio left	17:25
	← mikewintermute left	17:27
	← jceb left	17:27
	← tPl0ch left	17:27
	→ gasbakid joined	17:28
	→ daniel_- joined	17:29
	→ thiago joined	17:30
	→ jn_ joined	17:31
	→ jaequery joined	17:31
	→ bootstrapper joined	17:32
	← brocken left	17:32
	← itatitat left	17:34
	← eletuchy left	17:34
	← tjbiddle left	17:35
	← dreiss left	17:35
	→ babilen joined	17:35
	← trungqtran left	17:36
	→ tagava joined	17:37
	← gotwig left	17:37
	← esr left	17:37
	← mikef left	17:38
	→ chuckharmston joined	17:38
	← griotspeak left	17:38
	← gasbakid left	17:38
	← macrover left	17:38
	← boucman_work left	17:39
	← rurufufuss left	17:40
	alainus[-_-] → alainus	17:41
	→ sallesao joined	17:42
	→ avtobiff joined	17:42
	← thierryp_ left	17:42
	← chuckharmston left	17:43
	← mishok13 left	17:45
	→ o-O-o joined	17:45
	← elixir_ left	17:47
	← sq-one left	17:47
	→ splud joined	17:47
	→ elixir_ joined	17:47
	← elixir_ left	17:47
	→ rue joined	17:48
	← Sicp left	17:49
	← dc5ala left	17:49
	→ gittish joined	17:49
	→ marthinal joined	17:50
	← sunya7a left	17:51
	→ skanev_ joined	17:52
	← bgerber left	17:52
	→ scorphus joined	17:52
	← mmu_man left	17:52
	→ Thra11_ joined	17:52
	→ boombatower joined	17:53
	→ simesy joined	17:53
axl_	is it very hard to set up a git repository within the branch of another git repository?	17:53
	→ alexim joined	17:53
	→ gasbakid joined	17:54
	← Thra11 left	17:54
axl_	( i want to ignore a branch in the parent repository and make it its own repository)	17:54
	← skanev_ left	17:54
	→ goshawk joined	17:54
	→ brandonw joined	17:55
	→ gotwig joined	17:55
HedgeMage	axl_: I think what you are trying to get at is a git submodule -- throw that phrase in your favorite search engine and watch the documentation fly :)	17:55
	← riskable left	17:55
axl_	awesome. thanks that should get me going	17:56
	→ bgerber joined	17:56
	→ etcetera joined	17:56
	→ juril joined	17:56
	← etcetera left	17:56
HedgeMage	axl_: No problem. :)	17:56
	→ LekeFly joined	17:57
	← suy left	17:57
	← simesy left	17:57
	→ eletuchy joined	18:00
	→ drizzd joined	18:00
	← Cromulent left	18:00
	→ hkj joined	18:01
	← relipse left	18:01
	← madewokherd left	18:01
	→ Sigma joined	18:02
	← maxmanders left	18:02
	→ kiffer84 joined	18:03
	← ferdev left	18:03
	← engla left	18:03
	→ engla joined	18:04
	→ skanev_ joined	18:05
	← wasanzy left	18:05
	← obert left	18:06
	← dharrigan left	18:07
	← dev2 left	18:08
	← eletuchy left	18:08
	→ guy joined	18:09
guy	if I have uncommitted changes, what will happen when I do git checkout -b foo?	18:09
	← breakingthings left	18:09
guy	will these be moved to a new branch?	18:09
	← bmac left	18:10
haarg	they will stay in your working tree	18:10
grawity	technically they don't belong to any branch yet, so there's nothing to move	18:10
	→ skanev__ joined	18:10
	→ Saby joined	18:10
	← Saby left	18:10
	→ Saby joined	18:10
grawity	`git checkout -b` will just create a new branch, won't touch uncommitted changes.	18:10
	← OOPMan left	18:10
guy	great.	18:10
	→ afflicto-laptop joined	18:11
	→ chrisgeorge_ joined	18:11
	→ setmeaway joined	18:11
	← chrisgeorge left	18:12
	chrisgeorge_ → chrisgeorge	18:12
	← tvw left	18:13
	→ Steelsouls joined	18:13
	→ sunya7a joined	18:13
	← skanev_ left	18:14
	→ cworth joined	18:14
	← skanev__ left	18:14
	← hwrd\|work left	18:14
ttz	quick question, does OpenSMTPD support a recipient delimiter, to do plus addressing	18:15
	→ macrover joined	18:15
EugeneKay	Not a clue. Try #opensmtpd	18:15
	→ frenchlaf joined	18:15
	← Chikore left	18:16
	→ taylorlapeyre joined	18:17
	→ hwrd\|work joined	18:17
	→ mikef joined	18:17
	← bgerber left	18:18
	← huoxito left	18:19
	→ bgerber joined	18:19
	→ m0ltar joined	18:20
	← hwrd\|work left	18:20
	→ sfalcon joined	18:21
	← cworth left	18:21
	← PaulCapestany left	18:22
	→ dreiss joined	18:22
	→ tjbiddle joined	18:22
	← chimay left	18:22
	→ cashwilliams joined	18:22
	→ jaseemabid joined	18:25
	→ dmarkham_ joined	18:25
	→ opus joined	18:26
	← arvind_khadri left	18:26
	MatthewWilkes → mwilkes\|away	18:26
	← LekeFly left	18:26
	→ cworth joined	18:27
	→ mihamina joined	18:28
o-O-o	grawity: so you can start cracking your code and by the time you realize you'd need to commit it into a new branch, you just create it and commit? :)	18:28
_ikke_	o-O-o: correct	18:28
o-O-o	so much better than svn...	18:28
	← rfoust left	18:28
	← cashwilliams left	18:29
	→ jdunck joined	18:29
	← duosrx left	18:29
	← sunya7a left	18:30
cmn	nope	18:30
	you can do the same with svn	18:30
	→ rath joined	18:30
	→ sunya7a joined	18:30
	→ johnkw joined	18:31
	→ trungqtran joined	18:31
	← chuckf left	18:32
	← trungqtran left	18:34
	→ Sonderblade joined	18:34
	← Sonderblade left	18:34
	mwilkes\|away → MatthewWilkes	18:34
	→ Sonderblade joined	18:34
	→ eletuchy joined	18:35
	→ maestrojed joined	18:35
	← system64 left	18:35
	← dougsland left	18:36
	johnkw wonders why there's a git "--staged" but a git "--keep-index" referring to the same thing	18:36
EugeneKay	!why	18:36
gitinfo	Why? Because screw you, that's why.	18:36
cmn	because that's what the authors wrote	18:36
	MatthewWilkes → mwilkes\|away	18:36
milki	!wry	18:36
	darn	18:36
johnkw	insightful	18:36
_ikke_	Because junio accepted the patch that added the argument	18:36
grawity	because "index" and "staging area" are aliases, I thought	18:37
	← jcromartie left	18:37
EugeneKay	When looking at git's architecture you have to remember that it is proof of evolution, not intelligent design	18:38
johnkw	several web pages use them interchangeably	18:38
	← Damgaard left	18:38
EugeneKay	Because who the hell would have designed git-checkout	18:38
cmn	hear hear	18:38
esc	EugeneKay: yeah, wtf is that all about	18:38
EugeneKay	Design by mailing list ;-)	18:38
esc	there is even a git stage alias for git add now	18:38
	← Sigma left	18:39
engla	it's been thought for a long time that stage is the better term to use	18:39
	but we're stuck less than half way there	18:39
esc	git diff still even has a --cached option	18:39
EugeneKay	I hope that git 3.0 gets a fresh set of porcelain, in addition to SHA3 et al	18:39
_ikke_	EugeneKay: Where is git 2?	18:39
	→ john2496 joined	18:39
	→ Damgaard joined	18:39
EugeneKay	Hiing	18:40
	Hiding	18:40
grawity	heh, at least there's no "dircache" anymore	18:40
esc	Git 3.0 will be based on libgit2 and have a porcelain in python	18:40
grawity	I sincerely hope you are joking.	18:40
EugeneKay	And lasers	18:40
bremner	and sharks	18:40
_ikke_	and bears	18:40
esc	yeah, and cow super-powers	18:40
grawity	and LASER COWS	18:40
EugeneKay	I sincerely hope he isn't - libgit2 is the only sane git API I've found :v	18:40
	← alainus left	18:40
	→ mikehaas763 joined	18:41
grawity	no, git 3.0 will be a renamed bzr with its git plugin	18:41
	johnkw boggles at "--cached"	18:41
	← QaDeS left	18:41
	→ skanev_ joined	18:41
vad	You left out git 2.0	18:41
grawity	johnkw: git used to be called "dircache" long long ago	18:41
	johnkw resolves to always type `git stage` from now on, for improved clarity	18:41
	→ skanev__ joined	18:41
EugeneKay	vad - go look at the logic behind linux 3.0 and you'll get the joke	18:41
	→ ferdev joined	18:42
esc	i think using the python library argparse, or optrions.py (from bup) one could make a real solid CLI	18:42
	← eletuchy left	18:43
EugeneKay	Now you're trying to make me vomit	18:43
esc	EugeneKay: ;p	18:43
grawity	I avoid hg primarily because python takes so long to load from disk	18:43
Sonderblade	how can you take the last commit from the master branch and "move" it to a feature branch?	18:43
cmn	that doesn't make much sense	18:43
grawity	Sonderblade: including all previous commits?	18:44
cmn	Sonderblade: cherry-pick most likely	18:44
esc	Sonderblade: man git cherry-pick	18:44
gitinfo	Sonderblade: the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	18:44
EugeneKay	Sonderblade - many git-cherry-pick	18:44
cmn	depends on what you mean by modve	18:44
EugeneKay	Damn, beaten	18:44
esc	hehe :)	18:44
	← HerrK left	18:44
esc	EugeneKay: what would you use to write the cli?	18:44
_ikke_	assembly	18:45
Sonderblade	grawity: no just 1 commit	18:45
EugeneKay	esc - in all seriousness, Python is probably pretty good. But I've used it just enough to know when to emulate an ostrich	18:45
	← skanev_ left	18:46
_riz_	So, I'm hearing from elsewhere that it's considered a Bad Thing to have commits on the same branch in two different repos in git	18:46
	a) is this true and b) if so, dubyateeeff?	18:46
EugeneKay	Huh?	18:46
esc	EugeneKay: ok	18:47
	← skanev__ left	18:47
cmn	that sentence doesn't say much	18:47
EugeneKay	That doesn't even make sense _riz_. If they're the same history then it's the same commit, so.... what's the problem?	18:47
cmn	having branches in multiple repos is how you work	18:47
	→ sq-one joined	18:47
	← gittish left	18:47
	→ B\|aster joined	18:48
	← guy left	18:48
B\|aster	hey has anyone seen this error... error: inflate: data stream error (invalid distance too far back) fatal: object 33f1c034c308b29eb6ee48c0fc6654ae7d471c00 is corrupted	18:48
_riz_	I haven't gotten details	18:48
B\|aster	it's happening when I run git clone	18:48
grawity	_riz_: please get them	18:48
	→ tmcmahon joined	18:48
milki	B\|aster: sounds like something is corrupted	18:48
grawity	B\|aster: cloning from which repository?	18:48
	→ skanev_ joined	18:48
B\|aster	on my one machine I did a git clone --bare repo repo.git	18:49
cmn	B\|aster: is that a local error? does it have remote: as a prefix?	18:49
B\|aster	then uploaded repo.git to my other server and did a git clone repo.git	18:49
	← normanrichards left	18:49
B\|aster	yes its local	18:49
grawity	run `git fsck` in all three	18:49
	→ oriba_ joined	18:49
	← wrouesnel left	18:49
_riz_	grawity: trying to. I want to make sure that when I dislike git, it's for all the right reasons ;)	18:49
	← shwaiil left	18:49
	→ chuckharmston joined	18:50
	mwilkes\|away → MatthewWilkes	18:50
	→ alainus joined	18:50
cmn	if someone says that sentence, you can feel free to ignore them	18:50
_riz_	all I have so far is "and apparently if you commit on the same branch in two different repos, the commits clobber each other in some crazy way instead of just needing to be merged"	18:50
cmn	right, ignore it	18:50
	← unreal left	18:51
grawity	sounds like someone just tried git once, had a bad merge trip, and said "never again!"	18:51
cmn	and use !book to get to know git instead	18:51
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:51
_riz_	I would if it wasn't from someone who I respect a lot in other areas	18:51
	the main problem I have with git his how horribly bad the "user interface" is	18:51
grawity	that's true	18:51
	→ obert joined	18:51
grawity	but do they have a practical example for the merge problem?	18:52
_ikke_	_riz_: If you repeat that often enough, you are going to believe it	18:52
_riz_	s/his/is/	18:52
o-O-o	lolz	18:52
milki	riz wants a gui?	18:52
	← oriba left	18:52
_riz_	milki: no, just a sane command line interface	18:52
milki	its not sane?	18:52
_ikke_	_riz_: It's not that bad	18:52
TheJH	so what's insane about git's command line interface?	18:53
grawity	heh, we just had this discussion half an hour ago	18:53
_riz_	no, it is definitely not. certainly not compared to monotone or mercurial	18:53
cmn	don't assume it's some other VCS with a different prefix	18:53
johnkw	index/cache/stage naming is insane, for the record	18:53
cmn	they're different things	18:53
	they have different UIs	18:53
	← exoon left	18:53
grawity	EugeneKay was right about `git checkout` being ... poor	18:53
cmn	johnw: yes, we know you don't like it	18:53
_ikke_	johnkw: Who cares	18:54
	MatthewWilkes → mwilkes\|away	18:54
johnkw	I don't have strong feelings about it one way or the other - just objectively pointing out that it's insane	18:54
	TheJH asked - shrug	18:54
milki	some objective perspective you have	18:54
_ikke_	All three terms describe a way the index is used	18:54
_riz_	I love how defensive people get when you suggest that their pet isn't perfect.	18:55
	← skanev_ left	18:55
_ikke_	_riz_: I'm not saying git is perfect	18:55
	_riz_: But people tend to bash git for the sake of it	18:55
johnkw	TheJH asked what's insane - I gave an example of insanity - it wasn't bashing for the sake of it	18:56
	→ unreal joined	18:56
	← IntricateRuin left	18:57
	← ttz left	18:58
_ikke_	And with every release the interface of git gets a bit better	18:58
engla	at the same time it adds more flags and options	18:58
	I don't have a good grasp of all pushing and remote and branch defaults options even	18:58
_riz_	Mostly, I'm just frustrated that none of the other tools gained the popularity git has. any of them would be preferable to me.	18:59
	→ cashwilliams joined	18:59
_riz_	(the distributed vcses)	18:59
	← Davey left	18:59
johnkw	bah. you can never have too many flags or options. http://2.bp.blogspot.com/_sSz4SqR6_10/SnNTm2QlDWI/AAAAAAAAGeU/GzFHVvYHL4I/s400/more+flags+more+fun.jpg	18:59
cmn	!refund	18:59
gitinfo	If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.	18:59
	→ looper joined	19:00
Adlai	my daddy always said that free advice was worth what you paid for	19:00
_riz_	cmn: thanks, love the attitude. _Very_ helpful.	19:00
cmn	the attitude is that if all you want to do is badmouth git, you can go somewhere else	19:00
	→ sirdancealo2 joined	19:00
	→ hwrd\|work joined	19:01
	→ kevwil_ joined	19:01
	← jason237 left	19:01
engla	...	19:01
_riz_	there's that defensive attitude again.	19:01
	→ initself joined	19:01
	← cilly left	19:02
initself	what command gets me changes made to an individual file over time?	19:02
grawity	initself: git log $file	19:02
	← kevwil left	19:02
	→ duosrx joined	19:02
initself	is there anything that actually shows me the source code changes?	19:02
grawity	initself: git log -p $file	19:02
_ikke_	_riz_: Maybe that's because git does have something that is usefull :)	19:02
initself	grawity++	19:02
grawity	_riz_: personally, I use git because it gives me control over everything	19:03
	→ valtih joined	19:03
Adlai	initself: try also blame	19:03
	← alexim left	19:03
grawity	_riz_: it does not tell me "thou shalt not remove a commit" or "this functionality comes as a year-old extension" or things like that	19:03
_ikke_	When I have to use mercurial, I find it very limiting in what it can do	19:03
	→ dorkmafia joined	19:03
	← tmcmahon left	19:03
Adlai	initself: in other words, `git blame file'	19:04
grawity	`tig blame file` is more colourful	19:04
valtih	in windows, I am getting "could not readlink, 'this_file' is not a directory" for symlinks	19:04
Adlai	grawity: tig?	19:04
valtih	how do I git a symlink in Windows?	19:04
cmn	you don't	19:04
initself	Adlai: cool thanks	19:05
	← Khisanth left	19:05
grawity	Adlai: tig	19:05
	http://i.imgur.com/GSRWQ3l.png – blame on the left, history on the right	19:05
	that's the second largest reason why I stick with git :D	19:05
	← hwrd\|work left	19:05
_ikke_	_riz_: What git lacks in interface, it makes up in flexibility and control	19:06
valtih	I read that git and windows support symlinks. Why do I get "could not readlink, 'this_file' is not a directory" for symlinks?	19:06
	→ oposomme joined	19:06
	← cashwilliams left	19:07
	→ pr0ton joined	19:07
	→ relipse joined	19:07
	→ alexim joined	19:07
grawity	msysgit or cygwin git, and Windows symlinks or Cygwin symlinks?	19:07
	→ Noldorin joined	19:07
Adlai	I see what you did there grawity and I like it	19:07
	→ tinti_ joined	19:07
	→ trungqtran joined	19:07
grawity	Adlai: the best part is jumping directly to the commit from blame view, or split history/commit view	19:08
	→ eletuchy joined	19:09
cmn	valtih: Windows has something not quite like symlinks, which git doesn't record	19:09
	← guillaum left	19:09
_riz_	_ikke_ like not being able to have multiple heads on a branch?	19:10
	→ hwrd\|work joined	19:10
_riz_	So, I just did my test	19:10
_ikke_	_riz_: That's a mercurialism	19:10
_riz_	maybe I'm doing something wrong and folks can correct me	19:10
	no	19:10
	it's not	19:10
cmn	that's not how you do things	19:10
	if it's worth keeping, you name it	19:10
	otherwise, you throw it away	19:10
_ikke_	_riz_: What do you want to achieve with "multiple heads on the same branch"	19:10
_riz_	ah, there's that vaunted "flexibility"	19:10
cmn	mercurial branch != git branch	19:10
grawity	cmn: It does have symlinks now.	19:11
_riz_	for example, I just created a test repo	19:11
cmn	now?	19:11
_riz_	one file	19:11
	← oposomme left	19:11
_riz_	"foo", containing "bar"	19:11
grawity	in git, a branch is a head	19:11
_riz_	cloned it to another machine	19:11
cmn	_riz_: git branch is a hg bookmark, roughly	19:11
_riz_	changed that file on both machines	19:11
valtih	cmn: people get massive downvotes at stackoverflow for what you are saying http://stackoverflow.com/a/46891/1083704	19:11
_riz_	now, how do I sync that? :)	19:12
_ikke_	define sync	19:12
_riz_	it should just be a merge	19:12
cmn	valtih: and I care?	19:12
_riz_	get the changes over and reconcile them	19:12
_ikke_	_riz_: You can just merge it	19:12
cmn	_riz_: sync doesn't exist, say what you want to do	19:12
	then fetch and merge	19:12
grawity	_riz_: if you modified that line on both repos, how is git supposed to reconcile conflicting changes like that?	19:13
valtih	cmn: I see that you do not care. I with people who do not care keep silence.	19:13
cmn	valtih: that post has absolutely nothing to do with what we're talking about	19:13
	I know about Windows links	19:13
	this has less than zero to do with shortcuts	19:13
_ikke_	_riz_: like grawity said, in git, a branch is a head. So you merge them by merging branches	19:14
_riz_	grawity: by having two heads. or branches. or whatever.	19:14
grawity	cmn: I'm not talking about shortcuts. I'm not talking about junctions. I'm saying that Windows has actual Unix-style symlinks starting with Vista on 7.	19:14
	_riz_: how is that a merge if the changes remain completely separate?	19:14
_ikke_	_riz_: git namespaces branches	19:14
cmn	grawity: nobody said anything about shortcuts	19:15
	→ skanev_ joined	19:15
_ikke_	_riz_: if you fetch from a repo called origin, git prefixes the branchnames with origin/	19:15
	← duosrx left	19:15
_ikke_	_riz_: so if you fetch master from origin, the branch you just fetched is called origin/master	19:15
	← tongcx left	19:15
	→ Katafalkas joined	19:15
_ikke_	_riz_: So if you want to merge it, you do git merge origin/master while on the master branch	19:15
	← bootstrapper left	19:16
_riz_	and that's where "horrible user interface" comes in, with messages like	19:16
	"fatal: 'merge' is not possible because you have unmerged files."	19:16
	← eletuchy left	19:16
	→ bootstrapper joined	19:17
valtih	Is there a Windows 7 client that supports symlinks?	19:17
_ikke_	_riz_: Well, if git would merge those files, you'd loose changes	19:17
	← Vile left	19:17
_ikke_	_riz_: That would be a good interface...	19:17
	→ elixir joined	19:17
	→ mloskot joined	19:17
cmn	_ikke_: in fairness, it should shout telling you you're in the middle of a merge	19:17
_riz_	I don't want git to auto-merge anything. I want it to behave rationally.	19:18
	→ etcetera joined	19:18
_riz_	I can then edit the file and commit	19:18
cmn	that sentence makes no sense	19:18
	git merges whenever you ask it to, only	19:18
_riz_	but attempting to push gets me another horribly cryptic error	19:18
_ikke_	_riz_: note that mercurial pull == git fetch	19:18
	← Element9 left	19:18
_riz_	yes, I get that	19:18
	← thl0 left	19:19
	→ fisted joined	19:19
	← etcetera left	19:19
	← sunya7a left	19:19
_ikke_	_riz_: Probably because you are pushing to a non-bare repository	19:19
_riz_	for such a simple (and common) case, resolving this is exceedingly complex.	19:19
	→ thl0 joined	19:19
o-O-o	what is the difference between fetch and pull?	19:19
	→ dougsland joined	19:19
_riz_	THAT is what I mean by "horrible user interface"	19:20
o-O-o	I always use pull	19:20
_ikke_	o-O-o: pull = fetch + merge	19:20
	→ rcu joined	19:20
o-O-o	and fetch does that, exactly?	19:20
	and fetch does what, exactly?	19:20
_riz_	(that, and things like "fetch" and "pull" have slightly different semantics)	19:20
_ikke_	o-O-o: get history from another reposity	19:20
Adlai	o-O-o: downloads the objects from another repository	19:20
_riz_	anyway, I'll stop now.	19:20
o-O-o	why you don't want to merge after a fetch?	19:20
Adlai	o-O-o: but it just downloads them to the git database, without updating your working tree	19:21
o-O-o	Adlai: I understand. Now tell me a reason for doing that	19:21
	please	19:21
_riz_	o-O-o: because you want to be able to see and manipulate the changes, without being required to edit anything immediately?	19:21
	← jkremser left	19:21
	→ etcetera joined	19:21
o-O-o	_riz_: that is for resolving conflicts?	19:22
	← rmichnik left	19:22
	→ cilly joined	19:22
	← dhruvasagar left	19:22
_riz_	it can be. Of course, I've already demonstrated that I don't necessarily understand or agree with the assumptions made by the "designers"	19:22
	→ madewokherd joined	19:22
cmn	there is no such animal	19:22
	→ sunya7a joined	19:22
cmn	if you think you can make it better, make it better	19:23
	← elixir left	19:23
o-O-o	if I do a fetch, but I go to sleep. when I wake up, I do a second fetch and there is new content available from remote repo. what happens?	19:23
cmn	it's get fetched	19:23
PerlJam	o-O-o: nothing important.	19:24
cmn	that's all that ever happens when you fetch	19:24
PerlJam	:-)	19:24
o-O-o	so I can just ignore my first fetch and I still can merge my local data with 2nd fetch?	19:24
	← fisted left	19:24
	→ fisted joined	19:24
cmn	you merge with whatever you think you should merge	19:25
	→ Khisanth joined	19:25
	← lethjakman left	19:25
cmn	if it's what you get the second day, then merge with that	19:25
	→ rmichnik joined	19:25
o-O-o	cmn: so having a daemon that does autofetching can be good?	19:25
	→ _protagoras271_ joined	19:25
cmn	unlikely	19:25
o-O-o	I can just decide to merge whenever I want	19:25
	cmn: why? It can run while I am sleeping	19:26
	← dougsland left	19:26
cmn	but why is that so important to have?	19:26
_ikke_	o-O-o: It's not like it's going to take all night	19:26
o-O-o	and when I wake up, I will have everything in my devbox	19:26
_ikke_	o-O-o: or when you wake up, you do git fetch	19:26
cmn	but whta's "everything" do you continuously merge?	19:26
_riz_	o-O-o: it is a very sane and normal way to want to work, yes.	19:26
	← cilly left	19:26
	← rue left	19:26
cmn	do you work on 50 branches all at once or what?	19:26
o-O-o	_ikke_: but that can take a long time that can be saved at night :)	19:26
	→ rue joined	19:26
o-O-o	cmn: we have A LOT of developers here	19:26
_ikke_	o-O-o: 15 seconds	19:26
cmn	but why is the number of devs relevant?	19:27
	← mihamina left	19:27
cmn	you're working on your thing	19:27
o-O-o	cmn: usually each one works in a separate feature and feature branches are poping around	19:27
	→ apok joined	19:27
o-O-o	cmn: or not	19:27
cmn	right, but why do you have to keep so up to date with every single one?	19:27
_ikke_	o-O-o: It's not going to take on hour to fetch the changes or something	19:27
	→ kadoban_ joined	19:28
o-O-o	cmn: I can't answer with details and I don't think that is relevant since I am just asking how git works	19:28
_riz_	failure of imagination. It absolutely can take that long with large repos.	19:28
	→ danishkhan joined	19:28
o-O-o	yup	19:28
cmn	yes, so?	19:28
_riz_	ok I really need to leave before I become impolite.	19:29
	← _riz_ left	19:29
cmn	o-O-o: and I'm telling you that you don't need to get every single thing all the time	19:29
o-O-o	why?	19:29
cmn	that's how git works	19:29
_ikke_	o-O-o: distributed development	19:29
o-O-o	do you know what is my job role?	19:29
cmn	because you're working on your thing	19:29
o-O-o	or where are the repos?	19:29
	← fisted left	19:29
o-O-o	because you ASSUMED	19:29
cmn	and I supposed to guess?	19:29
	→ fisted joined	19:29
o-O-o	don't guess and don't make assumptions either, please	19:29
cmn	o-O-o: I'm telling you how development with git works, which is what you're asking	19:29
	← danishkhan left	19:29
o-O-o	cmn: you are telling about what I need	19:30
	→ tongcx joined	19:30
o-O-o	that is irrelevant and pedantic	19:30
cmn	then what do you want to know?	19:30
	because I'm answering the issue you just said you wanted answered	19:30
_ikke_	The question started with why you wanted to merge	19:30
o-O-o	my issue was solved, you gave me the OK to fetch a lot	19:30
	yes	19:30
	← gotwig left	19:30
_ikke_	You want to merge because you have diverged history	19:30
cmn	o-O-o: either say what you're actually trying to achieve or don't complain that we assume you're a developer	19:31
	← rakl left	19:31
	← Praise left	19:32
	→ danishkhan joined	19:32
	→ LekeFly joined	19:32
	← xxghostxx left	19:32
	→ rakl joined	19:33
	→ Praise joined	19:33
o-O-o	cmn: whatever	19:33
	→ Davey joined	19:33
	← Khisanth left	19:34
	← fisted left	19:34
cmn	indeed	19:34
	→ fisted joined	19:34
madewokherd	I think it's a good policy to answer the question that was asked, and if you think it was the wrong question you can explain further	19:35
	then you can be helpful without making assumptions	19:35
	→ vdv joined	19:35
	← Noldorin left	19:36
bremner	_I_ think it's a good policy to be nice to the people donating time to help you.	19:36
PerlJam	Postel's Law is a good policy too :)	19:36
	← relipse left	19:36
	← tongcx left	19:36
	→ elixir joined	19:37
	→ tagava\|2 joined	19:37
	→ jcromartie joined	19:37
	→ aweorit joined	19:37
	← bootstrapper left	19:37
	← cworth left	19:38
johnkw	yuck. postel's law leads to the nightmare that is modern html rendering.	19:38
	← axl_ left	19:38
aweorit	does git accept things like *.(a\|b\|c) in gitignore/gitattributes?	19:39
_ikke_	No	19:39
	← tagava left	19:39
wereHamster	aweorit: man fnmatch, that's what git uses	19:40
cmn	the next release will also support wildmatch, for some reasobn	19:40
	← Goles left	19:41
	← Xethron left	19:42
	→ kcj joined	19:42
	→ cworth joined	19:42
	→ whowantstolivef1 joined	19:43
madewokherd	bremner: sure, but I can understand the frustration when you ask a question and just get answers to irrelevant questions you didn't ask (or you got the answer to the wrong question and someone knew a better one but didn't tell you)	19:43
	→ eletuchy joined	19:43
	→ primitive joined	19:43
	← skanev_ left	19:43
	→ skanev_ joined	19:44
	→ tagava joined	19:44
	← skanev_ left	19:44
	← tagava\|2 left	19:44
cmn	then you need to say why it's not going in the right direction	19:46
	not get offended because someone is explaining the typical way to use git when you're a developer, which is what you get here	19:46
PerlJam	This is all normal communication difficulty anywya	19:46
	→ breakingthings joined	19:47
PerlJam	I tend to ask my qife very precise questions (in the hope that I'll get an answer), but most times I have to ask the question 2 or 3 times to get an answer.	19:47
	← sirdancealo2 left	19:47
	← Davey left	19:47
PerlJam	But, from her perspective, she was answering me.	19:47
	← teear left	19:48
	→ PaulCapestany joined	19:48
	← siriuz left	19:48
	→ skanev_ joined	19:49
	← tagava left	19:49
valtih	Is there a Windows 7 client that supports symlinks?	19:50
	→ tagava joined	19:50
	→ infynyxx joined	19:50
	← eletuchy left	19:50
	→ siriuz joined	19:51
	→ ThePawnBreak joined	19:51
	← pr0ton left	19:51
	→ danillonunes joined	19:52
	← geekbri left	19:52
	→ teear joined	19:53
	→ simesy joined	19:53
	← longbeach left	19:54
	← cbreak\|evil left	19:56
	→ cashwilliams joined	19:56
	→ Samual joined	19:57
	→ cbreak joined	19:57
	→ grizwako joined	19:57
	→ gotwig joined	19:57
	→ jjore joined	19:58
	← simesy left	19:58
	→ Khisanth joined	19:58
	→ Noldorin joined	19:58
	← ThePawnBreak left	19:59
	← elixir left	20:00
	→ rvl joined	20:02
	← danillonunes left	20:02
	← revele left	20:03
	← opus left	20:03
	← throstur left	20:03
	→ tvw joined	20:03
	← etcetera left	20:04
	← sunya7a left	20:04
	→ elixir joined	20:04
	← jwmann left	20:05
	← skanev_ left	20:05
	← taylorlapeyre left	20:06
	→ opus joined	20:06
	← jpcamara left	20:07
	→ lacrymology joined	20:07
	→ mirkgeo joined	20:07
	→ maxmanders joined	20:08
	→ jwmann joined	20:08
	← elixir left	20:08
	→ sunya7a joined	20:10
	← rmichnik left	20:10
	→ Vile joined	20:11
	→ bootstrapper joined	20:11
	← opus left	20:11
	gitinfo set mode: +v	20:11
mirkgeo	hello	20:11
gitinfo	mirkgeo: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	20:11
	→ ErKa joined	20:11
	← grizwako left	20:12
	→ nicoulaj joined	20:12
	→ grizwako joined	20:13
	← infynyxx left	20:13
mirkgeo	If I'm going to create a whitelabel version of a product, what would be the best way to do that? just create a new branch?	20:13
	← jcromartie left	20:14
	→ webczat joined	20:14
milki	whats a whitelabel?	20:15
	← avtobiff left	20:15
vad	different color than a pink label	20:15
	← grizwako left	20:15
	→ zealiod joined	20:16
	← CreativeEmbassy left	20:16
	← sallesao left	20:16
mirkgeo	milki: almost the same functionality but another brand.	20:16
zealiod	Is it possible to have a origin that is local rather than remote - and how do I set this up?	20:16
	→ ThePawnBreak joined	20:16
vad	zealiod: remotes can point to anywhere	20:16
	← DoniRS left	20:17
	← chuckharmston left	20:17
	→ eletuchy joined	20:17
zealiod	vad: So, a the mo I have "git remote add origin [email@hidden.address] - that is the address of the repo - but it's local to me, how could I reference it locally instead rather than looping in?	20:18
	← afflicto-laptop left	20:18
	← HardDisk_WP left	20:18
	← LekeFly left	20:19
	← valtih left	20:20
	→ tjbiddle_ joined	20:20
	← jn_ left	20:20
	← tjbiddle left	20:20
	tjbiddle_ → tjbiddle	20:20
	← cenuij left	20:21
	→ oakdog8 joined	20:21
	→ leehambley joined	20:22
	← boombatower left	20:22
cmn	you give git a path	20:23
	→ TriRas joined	20:23
	→ lethjakman joined	20:23
	→ LekeFly joined	20:23
	← nkr left	20:24
	→ relipse joined	20:24
cmn	but be aware that doing it via the filesytem goes around gitlite's hooks, IIRC you make it unhappy if you try to push afterwards	20:24
	← webczat left	20:25
	← eletuchy left	20:25
	← cashwilliams left	20:25
	← rakl left	20:25
mirkgeo	We want have the possibility to merge in bugfixes to the main product	20:26
Adlai	mirkgeo: you can always cherry-pick commits back and forth	20:26
	← aweorit left	20:26
Adlai	or rebase feature branches	20:26
	→ CreativeEmbassy joined	20:26
	→ jcromartie joined	20:27
mirkgeo	Adlai: cherry-pick was the first idea. I just thought if there maybe is some other ways to do it? A separate repo would be a bad idea?	20:27
	→ pantsman joined	20:27
	← pantsman left	20:27
	→ pantsman joined	20:27
	← bootstrapper left	20:27
	← alexim left	20:28
	→ AnimeCYC joined	20:28
Adlai	mirkgeo: I'd say two "parallel" branches in the same repo	20:28
cmn	a repo is where you store your branches; using different repos is about separating who has access to what	20:28
	→ rakl joined	20:28
cmn	having one repo or two doesn't affect how you work much	20:28
Adlai	mirkgeo: you'd do most development on one version, and then just merge stuff periodically into the other branch	20:29
	→ HardDisk_WP joined	20:29
	← HardDisk_WP left	20:29
	→ HardDisk_WP joined	20:29
	→ bootstrapper joined	20:29
mirkgeo	Adlai: Okok! Right now there is one dev and one master for the base product. I think the best would be to have the same for this separate version, one dev and one master?	20:29
cmn	that's bound to get confusing, as they're the same project, just slightly different versions	20:30
Adlai	mirkgeo: no, I think there should be three branches: dev, master, and whitelabel	20:30
	development takes place on dev, and then when there are releases, dev gets merged into master and whitelabel	20:30
	(seperately to each one)	20:30
mirkgeo	Hm	20:31
Adlai	that way, you get all the features and fixes into each release branch, without contaminating between them	20:31
	← fobban left	20:31
mirkgeo	But dev for whitelabel and original will always be different	20:31
	← AnimeCYC_ left	20:31
	→ tplaner joined	20:31
	mwilkes\|away → MatthewWilkes	20:31
	← juvenal left	20:32
	→ alexim joined	20:32
Adlai	mirkgeo: why? how big is the difference between them?	20:32
	if you need to make something just for whitelabel, you can have a temporary "dev-white" branch for that	20:33
mirkgeo	Adlai: much, the functionality will be almost the same but a bit scaled in whitelabel. But the UI would be totally different	20:33
	→ mishok13 joined	20:33
Adlai	but you should do as much dev as possible on one dev branch	20:33
	← danishkhan left	20:34
	→ pr0ton joined	20:34
	← Saby left	20:34
Adlai	otherwise you'll just have a history that's full of extraneous merges	20:34
	← relipse left	20:34
cmn	if the UI is going to be completely different, it could be easier to have that as a compile/deploy option, rather than make a different branch	20:35
	→ longbeach joined	20:35
mirkgeo	Adlai: yeah, bugfixes	20:35
Adlai	mirkgeo: what cmn said... maybe you can separate the UI from the backend, and avoid the need for separate branches	20:36
cmn	a branch is useful for when you have diverging development; if you have a completely different UI, a different dir might be all you need (and would make it easier to handle)	20:36
	→ stayarrr joined	20:36
mirkgeo	true	20:37
	← alfplayer left	20:37
cmn	I'd say the same applies to features you're going to scale/limit/whatever, you might want to use a compile/build/deploy option	20:37
mirkgeo	but what I also want is to kind of isolate the whitelabel-project, since that will be deployed to another server. We would actually avoid touching the main-product as much as possible	20:37
cmn	a build script could take care of extracting only the features/code you need	20:38
	← zealiod left	20:39
	→ Gentlecat joined	20:40
	→ gommo joined	20:40
mirkgeo	yeah true	20:40
cmn	the gist of it is that it's easier to put this logic into a script than the devs having to figure out which changes belong in which branch and how to bring together all those different changes you've done to the different branches	20:40
	← sgambino left	20:40
	→ etcetera joined	20:41
	→ tewecske joined	20:41
	← macrover left	20:41
	→ BadDesign joined	20:41
mirkgeo	yeah, but I think there will be very few changes that are merged between the both products	20:42
	→ zealiod joined	20:42
	← pppaul left	20:42
	← Ryback_ left	20:43
cmn	I'm thinking about bugfixes to the core that you discover in one or the other	20:43
	it can get complex	20:43
mirkgeo	me too, but I think there may be a big win to be able to separate it to 2 projects..	20:44
	Since the main product isn't developed any more at this time	20:44
	← rcu left	20:45
cmn	ok, that changes things a bit	20:45
	→ pppaul joined	20:45
cmn	if the dev is going to be on this new version and any fix porting will be rare, then you can probably fork it as a different project	20:45
mirkgeo	and this whitelabel would be a smaller project that I think would be stop developed after these changes are made	20:46
	what is the difference between fork and branch?	20:46
cmn	a fork is mostly a mental thing	20:46
	it's when you take the code and essentially produce a different product	20:46
	← scrape left	20:47
	← hoschi left	20:47
cmn	(the term is overloaded, as GitHub calls "fork" the repo you have in your personal account that's taken from an uptream project, which may or may not be a fork in the traditional ssense)	20:47
mirkgeo	ah	20:48
	what is a fork in traditional sense then?	20:48
cmn	it's getting fed up with the project and starting your own taking the existing code as starting point	20:48
	→ gyre007 joined	20:49
_ikke_	mirkgeo: Taking a project in a different direction	20:49
	← etcetera left	20:49
mirkgeo	aha	20:49
	but still have the possibility to merge things?	20:49
breakingthings	fork is just a concept for cloning a repo	20:49
	it's separate from the original repo, more than just a branch	20:49
	← trungqtran left	20:50
breakingthings	you can take the code from there and commit your own things	20:50
	gtmanfred → dontcare	20:50
	KaiSforza → doescare	20:50
cmn	breakingthings: that's not the traditional fork concept	20:50
mirkgeo	ah	20:50
breakingthings	this includes taking the project somewhere completely else, or making changes and making a pull request to have some fixes pulled into the source repo	20:50
	← kcj left	20:50
_ikke_	breakingthings: forking used to be a radical thing to do	20:50
breakingthings	cmn: the traditional fork concept has always been "a separate copy of an original thing"	20:50
cmn	to take it in a different direction	20:51
breakingthings	right, but that's a motive.	20:51
cmn	it's not a fork in the traditional sense when you clone to send aptach	20:51
	yes	20:51
breakingthings	fork as a concept still wasn't necessarily tied to that motive.	20:51
cmn	and the motive is what makes it the traditional one	20:51
	→ eletuchy joined	20:51
	← TriRas left	20:52
	→ Thra11 joined	20:52
	breakingthings shrugs	20:52
mirkgeo	but you could still pick specific commits and merge between the original and fork?	20:52
breakingthings	It's all a semantics read-in to what people were thinking when they forked projects	20:52
_ikke_	https://en.wikipedia.org/wiki/Fork_(software_development)	20:52
	→ etcetera joined	20:52
	← whowantstolivef1 left	20:52
breakingthings	You could still fork and make fixes for your own use without actually being motivated to change the project direction	20:52
	← tplaner left	20:52
	doescare → KaiSforza	20:53
_ikke_	breakingthings: You usually fork just because you can't change a projects direction	20:53
breakingthings	_ikke_ and you still can't.	20:53
	That's why we fork.	20:53
cmn	breakingthings: then you aren't forking the project	20:53
breakingthings	cmn: but you are	20:54
wereHamster	I created a fork. And I feel good about it!	20:54
breakingthings	the concept of forking is you clone the repo and do something with it	20:54
_ikke_	I use forks to eat with	20:54
	→ simesy joined	20:54
breakingthings	it doesn't have to be I fork linux and make xunil	20:54
wereHamster	I EAT FORKS!	20:54
	WITH FORKS!	20:54
breakingthings	I can fork linux and make a few bug fixes and still call it linux	20:54
	still a fork	20:54
	not a radical change in direction	20:54
cmn	that'd be the concept of forking a repo, not a project	20:54
wereHamster	nope, yours will be a SPOON	20:54
breakingthings	the concept has always existed as just a technical term for "a separate copy of an original thing"	20:54
	← dorkmafia left	20:55
	→ grizwako joined	20:55
	← Thra11_ left	20:55
_ikke_	breakingthings: In the time without distributed scm's, you couldn't just clone a project	20:55
breakingthings	whatever, it's all semantic read-in of whatever people in the past said fork for, who gives a.	20:55
	alainus → alainus[-_-]	20:55
wereHamster	every time you download the source of a project (tarball, svn checkout, git clone) you could view it as a fork.	20:55
breakingthings	^	20:55
	distributed means nothing	20:56
	source is what matters.	20:56
jast	if a fork is the same thing as a copy, I just call it a copy	20:56
breakingthings	thas' all I'm gonna say in the matter.	20:56
jast	and use the word 'fork' for something different	20:56
	I dunno, makes sense to me	20:56
	← bootstrapper left	20:56
	→ kcj joined	20:57
jast	I maintain a fork of this channel, by the way	20:57
	→ jason237 joined	20:57
jast	... in ~/irclogs	20:57
_ikke_	mine is in .weechat/logs	20:57
bremner	fork off with your forking confusing terminology.	20:57
	oh, well, it is git.	20:57
	← soreau left	20:57
jast	hey _ikke_, wanna merge forks?	20:58
_ikke_	jast: sure	20:58
wereHamster	wanna spoon?	20:58
	← tewecske left	20:58
	→ dougsland joined	20:58
	← simesy left	20:58
jast	are we regurgitating atlassian jokes now?	20:58
	→ skanev_ joined	20:58
_ikke_	atlassian jokes?	20:58
jast	atlassian had a video on spooning for bitbucket last April 1st	20:58
_ikke_	oh, lol	20:59
mikehaas763	I never saw it!	20:59
_ikke_	https://bitbucket.org/spooning/	20:59
	← eletuchy left	20:59
	← kcj left	20:59
	→ sgambino joined	20:59
	← JSharpe left	20:59
	→ tewecske joined	20:59
	← gasbakid left	21:00
	← gusnan left	21:00
jast	the presenter is doing an awesome job	21:00
	→ gregor3005 joined	21:00
	→ hesco2 joined	21:01
_ikke_	Fork, spoon and knife :D	21:01
	→ kcj joined	21:01
	← erichynds left	21:02
	→ ivanzgb joined	21:02
	→ boombatower joined	21:03
mirkgeo	cmn: but using rebase isn't a good idea then? create 2 new branches, whitelabel-master and whitelabel-dev. Each time master is fixed I rebase whitelabel-master from that?	21:03
mikehaas763	haha wtj	21:03
mirkgeo	whitelabel-master/whitelabel-dev	21:03
mikehaas763	*wth	21:03
	← daurnimator left	21:04
	→ danishkhan joined	21:04
cmn	rebase causes problems if the branch is public	21:05
EugeneKay	Old	21:05
cmn	!rewrite	21:05
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). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://git-scm.com/docs/git-rebase.html#_recovering_from_upstream_rebase	21:05
	← jcromartie left	21:05
	dontcare → excitebike	21:05
cmn	so you should avoid it	21:05
mirkgeo	cmn: what do you mean by public?	21:06
cmn	other people know about it and may have fetched it	21:06
	→ dharrigan joined	21:06
	← dharrigan left	21:06
	→ dharrigan joined	21:06
cmn	the main dev branch is public e.g.	21:06
mirkgeo	cmn: just the dev team	21:06
cmn	that's still public	21:06
mirkgeo	aha	21:06
	gitinfo set mode: +v	21:06
	excitebike → gtmanfred	21:07
cmn	rebase rewrites history, so if they merge what you have, you'll get the commits twice (sort of, they're different commits, with the same changes)	21:07
	→ RWOverdijk joined	21:07
hesco2	I was doing some final changes on a branch specific to a ticket I was working on. I have now checked out the local branch for the tagged release I need to add these changes to, before pushing those changes to the corresponding remote tagged release in the origin repo. How is it I first inspect the diff for the two files I am concerned with between the ticket branch and the release branch, and then merge just those changes from the ticket br	21:07
	← dougsland left	21:07
	← ivanzgb left	21:07
	→ dougsland joined	21:08
RWOverdijk	(PR: on github). Let's say I have a PR waiting, and I want to start working on the next PR… But the files I have to work in are in the first PR and I don't want to cause conflicts, but I also don't want to wait for that PR to be merged.. What's the best thing to do?	21:08
	→ trungqtran joined	21:08
mirkgeo	cmn: true	21:09
cmn	while rebase is useful when you're preparing your branch to be sent upstream, once the code lands upstream, you don't rewrite it	21:09
	← ErKa left	21:10
cmn	there are exceptions for branches that are accessible to other people but understood to be unstable, but those wouldn't usually end up in the main repo	21:10
	→ dorkmafia joined	21:10
	← rath left	21:11
_ikke_	RWOverdijk: Create a new branch based on the first branch. When the first branch has been merged, rebase your new branch on top of it	21:11
	(ie, on top of upstream)	21:11
RWOverdijk	_ikke_: Isn't that how the next PR will have a ton of commits from the previous PR?	21:11
	(sorry, new to this sort of stuff)	21:11
mirkgeo	cmn: alright	21:11
	← drizzd left	21:12
_ikke_	RWOverdijk: Nope	21:12
	RWOverdijk: rebase sees duplicate commits	21:12
	← tinti_ left	21:12
RWOverdijk	_ikke_: Thank you :)	21:12
	MatthewWilkes → mwilkes\|away	21:13
	← pppaul left	21:14
	→ gusnan joined	21:14
	← danishkhan left	21:14
mirkgeo	cmn: so you think a fork would be the best?	21:14
	← RWOverdijk left	21:14
	mwilkes\|away → MatthewWilkes	21:14
	→ ohnoesit_ joined	21:15
	← skanev_ left	21:16
cmn	from what you're saying, the development is really going to be in this whitelabel stuff, no? then you can concentrate on developing the new project and leave the old one mostly behind	21:16
	← BadDesign left	21:16
cmn	you'd still be able to backport with cherry-pick (as long as the code hasn't diverged too much), but you can leave the old project alone in its own repo if it's not going to get used really	21:17
	← jjasinski left	21:17
mirkgeo	cmn: yes, that is what it looks like. That is why 2 new branches was the idea from the beginning	21:17
_ikke_	mirkgeo: two repo's or two branches are basically the same thing	21:17
cmn	two new branches are four branches	21:18
	← jjore left	21:18
mirkgeo	yeah, so 2 repos with 4 branches or 1 repo with 4 branches	21:18
	← AnimeCYC left	21:19
	← sebuba left	21:19
EugeneKay	Therre are four lights	21:19
cmn	right, in this case case it would be easier with two repos	21:19
	→ QaDeS joined	21:19
	gtmanfred → dontcare	21:19
	← anabelle left	21:19
	← leehambley left	21:20
	dontcare → gtmanfred	21:20
	→ Thra11_ joined	21:20
	← mishok13 left	21:20
	→ jjasinski joined	21:20
	→ Chikore joined	21:21
	Chikore → Shuck	21:21
	← johnthebear left	21:22
	← Thra11 left	21:22
	→ ecksit joined	21:22
	← daniel_b left	21:23
	→ mishok13 joined	21:24
mirkgeo	cmn: guess so too	21:24
	← longbeach left	21:24
	← zealiod left	21:24
	→ zealiod joined	21:24
	← zealiod left	21:24
	→ tinti_ joined	21:24
	→ eletuchy joined	21:25
	← e66 left	21:25
	→ cashwilliams joined	21:25
	→ jjore joined	21:26
	→ ouah joined	21:26
	→ scrape joined	21:26
	← Orbitrix left	21:26
	← freeed left	21:26
mirkgeo	I cloned the master branch of a github-repo. Another branch is 17 commits ahead. How do I do to merge it into master and then push it to github?	21:27
	→ chuckharmston joined	21:27
	→ cashwilliams1 joined	21:28
	← cashwilliams left	21:28
	← b1rkh0ff left	21:28
charon	mirkgeo: git merge origin/other; git push origin master ?	21:28
	unless by "cloned the master branch" you mean you actually did a restricted clone of only that branch	21:28
	→ Turicas joined	21:29
	→ b1rkh0ff joined	21:30
	→ boblannon joined	21:30
mirkgeo	chol: not restricted as far as I know :)	21:30
	← b1rkh0ff left	21:31
	← guampa left	21:31
	→ mcdebugger joined	21:31
boblannon	i like using git add -p. i swear i used to be able to split hunks on it, though. now i don't see the option	21:31
	and pressing 's' gives me the same result as pressing '?'	21:32
breakingthings	boblannon: git add -i	21:32
	I do beleev.	21:32
	← eletuchy left	21:32
breakingthings	that is what you are look for.	21:32
	→ b1rkh0ff joined	21:32
mirkgeo	charon: looks like it worked. But github still says on branches-page that the other is 17 ahead..	21:32
	← chuckharmston left	21:33
	← jason237 left	21:34
	→ Sigma joined	21:35
boblannon	breakingthings: still the same result. when i get to the interactive patch screen, it only offers some of the normal options	21:35
	"Stage this hunk [y,n,q,a,d,/,j,J,g,e,?]?"	21:35
	note the lack of 's'!	21:35
_ikke_	boblannon: It means git can't split it up further	21:35
breakingthings	^	21:35
boblannon	oh, okay, that's what i was afraid of	21:36
breakingthings	never used -p so wasn't sure if it couldn't split for another reason	21:36
	but ikke is indeed correct	21:36
	→ sq-one_ joined	21:36
breakingthings	however, you can always use 'e'	21:36
	to be a 1337 inline haxx0r	21:36
	→ mmu_man joined	21:36
	→ pooya joined	21:36
boblannon	right. 'e' keeps opening nano, though. is there a way to make it use vim?	21:37
	← m0ltar left	21:37
boblannon	(i have vim set as my difftool already)	21:37
_ikke_	boblannon: change the EDITOR virable	21:37
	← marhaban left	21:37
vad	vi, a virable (viral...) editor, no less.	21:38
cmn	there's also core.editor in the config if you don't trust your environment to set the right one	21:38
	← revagomes left	21:39
	← pr0ton left	21:39
	← etcetera left	21:39
	→ danishkhan joined	21:39
	← sq-one_ left	21:39
boblannon	awesome, thanks!	21:39
	← sq-one left	21:40
boblannon	setting core.editor got the job done	21:40
	← cashwilliams1 left	21:40
	gtmanfred → excitebike	21:40
cmn	you might still want to set the environment settings, as they also affect other parts of the system	21:40
	like what less does when you hit v	21:41
vad	use ? to find out	21:41
	→ tjbiddle_ joined	21:41
	← tjbiddle_ left	21:41
cmn	what?	21:41
	→ Cromulent joined	21:42
	← dougsland left	21:43
	← aksnot left	21:43
	grawity → _grawity_	21:43
_ikke_	wat?	21:43
	_grawity_ → grawity	21:43
vad	Use the '?' key while in less to get help, and to figure out what 'v' would do	21:43
cmn	how does that help you set the visual editor?	21:43
	KaiSforza → gtmanfred	21:43
	→ dougsland joined	21:43
vad	I misread your line, then,.	21:44
	gtmanfred → KaiSforza	21:44
	→ guampa joined	21:44
cmn	not that '?' gives you help anyway	21:44
	← PaulCapestany left	21:44
	← tjbiddle left	21:44
	→ mulinux joined	21:45
	→ daniel_b joined	21:47
	→ gruen0 joined	21:47
	← dropdriv1 left	21:48
	← jaseemabid left	21:48
	→ dropdrive joined	21:48
garbagecollectio	i do a git pull	21:48
	and it says	21:48
	"There is no tracking information for the current branch."	21:48
	grawity → gtmanfred	21:48
garbagecollectio	please specify which branch you want to merge with	21:48
	← danishkhan left	21:49
	gtmanfred → Guest61923	21:49
	Guest61923 → grawity	21:49
	→ danishkhan joined	21:49
	excitebike → gtmanfred	21:49
	→ ErKa joined	21:51
pooya	hmm, any idea why when i try to cherry-pick or rebase a range of pervious commits, it does nothing?	21:51
cmn	they're already applied on your current code?	21:52
	also, !repro	21:52
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session. This will help immensely with troubleshooting.	21:52
	→ tjbiddle joined	21:52
	← tinti_ left	21:52
	← redrocket left	21:53
	→ AnimeCYC joined	21:53
garbagecollectio	any reason why	21:53
pooya	cmn: already applied but reverted	21:53
garbagecollectio	There is no tracking information for the current branch."	21:53
	why would that have happened	21:53
cmn	garbagecollectio: because you never set it	21:53
garbagecollectio	but it was set	21:53
	what happened was someone pushed updates from something from their side	21:54
	← jonshea left	21:54
garbagecollectio	and then it said i needed to update	21:54
	and i did a pull	21:54
	← v0n left	21:54
garbagecollectio	and it said no tracking information	21:54
pooya	I used to use a script like this to revert a bunch of changes and put in a different branch: http://pastebin.com/LNWJYNvn but in this case it is not working	21:54
	i wonder if anyone did a force push onto the master branch	21:55
cmn	garbagecollectio: when was it set?	21:55
	← mikehaas763 left	21:55
	← j^2 left	21:55
	→ marhaban joined	21:55
garbagecollectio	i don't know if it was set	21:55
	it usually is set	21:55
	probably when i first do it	21:55
	the question is how did it get unset	21:55
cmn	that shouldn't be the question, as you don't know it was	21:56
	← rue left	21:56
cmn	how did you create the current branch?	21:56
	← albel727 left	21:56
	← arietis left	21:56
	→ albel727 joined	21:56
	→ taylorlapeyre joined	21:56
	→ timj joined	21:56
	→ tinti_ joined	21:57
	→ pr0ton joined	21:57
	← jstemmer left	21:57
garbagecollectio	it was set days ago	21:58
	it somehow got unset	21:58
	not manually	21:58
	→ zoned joined	21:58
garbagecollectio	what do i do	21:58
	seriously	21:58
cmn	either set the upstream information or tell pull what it should do	21:59
garbagecollectio	how do I do that	21:59
cmn	git branch -u <upstream> in the branch sets its upstream	21:59
	→ eletuchy joined	21:59
	← frenchlaf left	22:00
	← sunya7a left	22:00
zoned	i was trying to push a local 'updates' branch over the top of my 'dev' branch… so i did: git push -f origin updates:dev; git checkout dev; git pull; and i was missing my updates. I'm assuming this is because i forgot to do a git commit on the updates branch first. so now i do a git checkout updates; git pull; … and its still old…. how do i get my updates back!?	22:00
cmn	pooya: both master and $TAG_FROM are pointing to the same place	22:00
	so the rebase is a noop	22:00
	← ouah left	22:01
cmn	oh, wait; maybe not, why are you using such a complex way to commit a particular set of files?	22:01
pooya	i just want to revert a set of commits and put them in a different branch	22:01
	so that they can easily be merged later	22:02
grawity	zoned: if you didn't commit them, then they're still in your working tree	22:02
	zoned: run `git status`	22:02
zoned	grawity: the only thing it says has been modified is my .cache folder	22:02
pooya	i revert them all, branch and rebase that set. not sure why you say complex	22:02
cmn	pooya: you're not reverting anything, you're committing on top of $TAG_TO with the files of $TAG_FROM, and undoing anything after $TAG_FROM	22:02
	→ pastime joined	22:03
grawity	zoned: does `git log updates` show them?	22:03
cmn	and setting your master branch to $TAG_TO	22:03
zoned	grawity: no, last commit was days ago	22:03
cmn	oh, i see what you're doing	22:03
pooya	cmn: on top of master not TAG_TOP	22:03
cmn	pooya: use diff	22:03
	pooya: master is at TAG_TOP	22:03
pooya	i want to keep history	22:03
cmn	not with this script	22:04
pooya	yes, before i start the operation	22:04
zoned	grawity: it has some of them, but not the recent stuff	22:04
pooya	cmn: the script works on a normal repo, i've tested it	22:04
cmn	for some values of normal	22:04
zoned	(because i never committed it…) i really hope i didn't lose these..	22:04
pooya	not that master changes after the first batch of revert commands	22:04
cmn	your rebase just seems to be a very complicated way of doing cherry-pick	22:04
pooya	s/not/note/	22:04
cmn	there are no revert commands	22:04
pooya	cherry-pick is pretty bad with merges	22:04
cmn	it's exactly the same	22:05
	you're rebasing the one diff	22:05
pooya	ya, the whole revert is squashed into a single commit	22:05
cmn	right	22:05
pooya	so that i can re-merge the old commits	22:05
	otherwise git will think they are already applied	22:05
cmn	which makes the difference between cherry-pick and rebsae what?	22:05
	← R1KRDO left	22:06
cmn	this sounds a lot like an xy problem, what are you actually trying to accomplish?	22:06
pooya	at least for me i have to manually cherry-pick one by one and specify -m <n> when needed	22:06
	this sounds like easier to batch	22:06
cmn	now you're talking about doing something different	22:06
	← gyre007 left	22:06
pooya	i am trying to take out a series of recent commits and put them in a different branch so that i can merge them back	22:06
	→ kawamanza joined	22:06
pooya	but since they're already pushed i don't want to use reset --hard...	22:07
	and push -f	22:07
	← eletuchy left	22:07
	← stayarrr left	22:07
cmn	so what's the deal with the resets?	22:07
	why are you setting master back?	22:08
	alainus[-_-] → alainus	22:08
	→ redrocket joined	22:08
garbagecollectio	git branch -u and then what	22:08
	to get my shit tracking	22:08
	→ WorkeD joined	22:08
cmn	garbagecollectio: that's what sets the upstream information	22:08
garbagecollectio	but what do i give it to the	22:08
	just the branch name	22:09
	just the branch name?	22:09
	← redrocket left	22:09
cmn	the remote-tracking branch name	22:09
garbagecollectio	which would be what	22:09
	just the name	22:09
	← ThePawnBreak left	22:10
	← kawamanza left	22:10
cmn	its name, upstream/fancy or whatever they're called	22:10
	← daniel_b left	22:10
garbagecollectio	origin/feature-geapp-207-part1	22:10
	?	22:10
cmn	that could be	22:10
garbagecollectio	how do i find out which one it is	22:11
	→ etcetera joined	22:11
cmn	you're the one who should know	22:11
	← Cromulent left	22:11
cmn	it's the project you're working with	22:11
	what branch corresponds to what you're basing off of or where it should go?	22:11
garbagecollectio	its called feature-geapp-207-part1	22:12
	so what do i type	22:12
	→ PaulCapestany joined	22:12
cmn	what you just did	22:12
	<upstream> would be origin/feature...	22:12
garbagecollectio	but i have the branch locally already	22:13
	git brnach --set-upstream mybranch name origin/mybranchname	22:14
	→ markalanevans joined	22:14
pooya	cmn: those resets are making a diff change of things that needs to be reversed. hard reset to TAG_FROM but soft reset to TAG_TO	22:14
	so actual code will be similar to TAG_FROM state, but HEAD pointer will be on TAG_TO	22:15
	so gives a list of changes reversed...	22:15
cmn	don't think of HEAD as something special, you're moving master to TAG_TO	22:16
pooya	try it	22:16
	it works	22:16
	← SonikBoom left	22:16
pooya	yes, code wise it is on TAG_TO	22:16
	no i mean the other way	22:16
cmn	master is pointing to TAG_TO after the second reset	22:16
pooya	the actual files will be similar to TAG_FROM	22:17
	but a git diff will show the differences with TAG_FROM	22:17
	← etcetera left	22:17
cmn	right, you're taking the known files and commit as they are in TAG_FROM	22:17
	which you can just do with a read-tree $TAG_FROM	22:17
	without having to reset anything to anything	22:17
pooya	try it man, that step is working fine	22:17
cmn	I know the diff will be right	22:18
	but why are you moving master	22:18
pooya	it's the second rebase step that is failing in this case	22:18
	like i said i want to revert changes but if i do git revert	22:18
cmn	you say you don't want to rewrite, but yo move master, why is that?	22:18
pooya	i want to move master to an old tag (TAG_FROM)	22:18
	→ yedi joined	22:18
pooya	but if i just do git --reset hard TAG_FROM	22:19
	and do a git push -f	22:19
yedi	how do i clear all the files in my staging area	22:19
pooya	it will break everyone else's pull	22:19
yedi	i need to do this all the time and idk how its possible that i haven't figured it out yet	22:19
	i thought it was like git checkout -- .	22:19
cmn	yes, but if you want master's code to be at $TAG_FROM, you can do git read-tree $TAG_FROM && git commit -m "whatever"	22:19
	I guess it'd be easier to see what's happening if you git checkout $TAG_FROM -- . && git commit	22:20
	→ etcetera joined	22:20
cmn	now you have a commit on top of master with the files at $TAG_FROM, without rewriting history	22:20
pooya	that's exactly what i want. i can rewrite history because it's already pushed	22:21
	if i rewrite history other dev's checked out repos will break	22:21
	← etcetera left	22:21
cmn	right	22:21
	so don't move master	22:21
	← vdv left	22:21
	→ jaseemabid joined	22:22
cmn	I don't get why you keep saying you can't move master but still want to move it to TAG_TO	22:22
evanp	Will "git checkout $TAG -- . && git commit" delete files created since $TAG? IIRC it won't....	22:22
	← boblannon left	22:22
	→ Watabou joined	22:22
cmn	no	22:22
	← __Big0__ left	22:22
pooya	cmn: oh i see what you're saying, i should that step in a tmp branch	22:22
	actually this works	22:23
	← Thra11_ left	22:23
cmn	or detach HEAD, anything but reset master	22:23
	and really, those resets just confuse	22:23
pooya	ya	22:23
	anyhow you know what i want to do in that step	22:23
	my question is the second one	22:23
	← kadoban_ left	22:23
	← jaequery left	22:23
	← dorkmafia left	22:24
cmn	TAG_TO isn't off of master	22:24
	← hellopat left	22:24
	← Noldorin left	22:24
cmn	have you tried w/o moving master to be built on top of TAG_TO/	22:24
	← ojacobson left	22:24
	→ cogitos joined	22:25
	← Sigma left	22:25
	→ mattt_ joined	22:25
	→ relipse joined	22:26
mattt_	Is there a way to replay changes in some branch that's ahead of master (but shouldn't be) over master?	22:26
	→ cebor joined	22:26
	→ Noldorin joined	22:27
	→ Thra11 joined	22:27
	→ Davey joined	22:27
	← jjore left	22:28
	← scrape left	22:29
	→ johnw joined	22:31
	→ jjore joined	22:31
	→ Gaddel joined	22:32
Gaddel	hi, i have a github repo that i own. i want to basically clear out that repo and replace it with my local files. what's the best way of doing this?	22:32
	my local repo is much more up to date than the remote repo	22:33
grawity	Force-push	22:33
	or, no, maybe don't.	22:33
	→ eletuchy joined	22:33
	← pr0ton left	22:34
	← _iron left	22:34
	← marhaban left	22:34
Gaddel	that's sort of what i want to do. i want to overwrite the remote repo (i've never pulled it before, to my current computer)	22:34
	also i am very new to git so i am a bit lost	22:35
	← lethjakman left	22:35
	← Thra11 left	22:35
	→ PhreakIT joined	22:36
	← rbmk left	22:37
zoned	git add .; git commit -am "some message"; git push origin local_branch:remote_branch	22:37
	← macabre left	22:37
	← trungqtran left	22:37
Gaddel	okay, done that; it all works. thanks	22:38
	← gruen0 left	22:38
	→ m0ltar joined	22:39
	← Parhs left	22:40
	→ milStaja joined	22:41
	→ tjbiddle_ joined	22:41
	← eletuchy left	22:42
	→ SonikBoom joined	22:43
	→ lethjakman joined	22:44
	← tjbiddle left	22:44
	tjbiddle_ → tjbiddle	22:44
	← brokenjames left	22:44
	← john2496 left	22:46
	← mulinux left	22:47
	← diamonds left	22:47
	→ rfoust joined	22:47
	→ pppaul joined	22:48
	→ marhaban joined	22:48
	← hwrd\|work left	22:48
	← mirkgeo left	22:48
	← Noldorin left	22:49
	→ hwrd\|work joined	22:49
	← hesco2 left	22:49
	→ pr0ton joined	22:50
	← gommo left	22:50
	← nicoulaj left	22:51
	→ Noldorin joined	22:51
	→ jason237 joined	22:53
	← SonikBoom left	22:53
	← Davey left	22:53
	→ SonikBoom joined	22:53
mattt_	How can I retroactively merge the remote master?	22:54
	alainus → alainus[-_-]	22:54
vad	You can't retroactively, only now	22:55
wereHamster	or in the future	22:56
	unless you have a time-travel machine. Then you can do it retroactively	22:56
	but if you have, consider using it for something more useful (like killing hitler or something)	22:56
vad	see Novikov self-consistency principle	22:57
PerlJam	mattt_: why do you want to do this?	22:57
vad	The XY problem: You want to do X, but don't know how. You think you can solve it using Y, but don't know how to do that, either. You ask about Y, which is a strange thing to want to do. Just ask about X.	22:57
	the command alias to output _that_ still works ;)	22:57
wereHamster	vad: FYI, there is the !xy trigger :)	22:58
gitinfo	vad: This sounds like an "XY Problem" http://mywiki.wooledge.org/XyProblem So let's step back for a minute. What are you actually trying to achieve? Why are you doing it this way?	22:58
mattt_	PerlJam: Working on bitbucket I did a pull request from my fork's branch to remote master, then I merged the same branch into my fork's master, and figured I'd be up to date with remote, but that wasn't the case. Now I've made a bunch of changes and can't figure out how to reconcile my fork with remote	22:58
	← lonewulf` left	22:59
vad	wereHamster: only in select channels; so, to have the club ready at any time, only a client-level trigger/alias (like /xy) is the true solution!	22:59
	→ skanev_ joined	22:59
	← kermit left	22:59
	← maestrojed left	23:00
	→ lonewulf` joined	23:00
	← oakdog8 left	23:00
	→ fisted_ joined	23:00
	← CreativeEmbassy left	23:01
	→ Davey joined	23:01
	→ kermit joined	23:01
	← skanev_ left	23:02
	← breakingthings left	23:02
	← Damgaard left	23:03
	← fisted left	23:04
	fisted_ → fisted	23:04
	← cannonball left	23:04
	→ maestrojed joined	23:07
	→ eletuchy joined	23:08
	← m0ltar left	23:09
	← mattt_ left	23:09
	← pantsman left	23:09
	→ Sky[x] joined	23:10
	← d2dchat left	23:10
	← trythis left	23:10
	← nioncode left	23:11
	← hwrd\|work left	23:12
	→ hwrd\|work joined	23:13
	← Destos left	23:13
	→ etcetera joined	23:13
	← thiago left	23:14
	← etcetera left	23:15
	→ quazimodo joined	23:15
	← eletuchy left	23:16
perlstein	hey	23:17
	what do people use for internal code review?	23:17
	← zoned left	23:18
	← Gaddel left	23:18
	← green- left	23:19
	→ bmac joined	23:19
	← garbagecollectio left	23:22
	← gdoteof_ left	23:23
atrus	perlstein: custom tools here. tool pushe review branch to common location for review. issues are filed, and resolved and pushed to that common location again for verification. once the review is finished, the tool merges the review branch into branch the code was originally targeted for.	23:23
	!review	23:23
gitinfo	[!codereview] Gerrit is a code review tool for git. See http://code.google.com/p/gerrit/ You may want to enforce certain workflow to prevent people bypassing review. gitolite (and a branching workflow) or a integrator repository (distributed workflow) would be good for this.	23:23
atrus	(we don't use that, i was just curious if !review had useful content)	23:23
gitinfo	[!codereview] Gerrit is a code review tool for git. See http://code.google.com/p/gerrit/ You may want to enforce certain workflow to prevent people bypassing review. gitolite (and a branching workflow) or a integrator repository (distributed workflow) would be good for this.	23:23
atrus	(oops)	23:23
	← unbounced left	23:24
	← sgambino left	23:24
	→ tjbiddle_ joined	23:25
	← hiroyuki_ left	23:25
	← WorkeD left	23:26
atrus	gerrit does sound pretty close to what we use.	23:27
	← decotii left	23:27
	→ eletuchy joined	23:27
	← taylorlapeyre left	23:27
	→ zacts joined	23:28
	← tjbiddle left	23:29
	tjbiddle_ → tjbiddle	23:29
	← bartzy left	23:29
	← maxmanders left	23:29
	← gotwig left	23:30
	← thl0 left	23:30
	← lethjakman left	23:30
	← Shurakai left	23:31
atrus	although it looks like gerrit operates on individual commits?	23:31
	→ lethjakman joined	23:31
	← eletuchy left	23:31
atrus	maybe not?	23:31
	← mmitchell left	23:31
	→ tjbiddle_ joined	23:32
	← cebor left	23:32
	← erkules left	23:32
	→ erkules_ joined	23:32
	→ beitao joined	23:33
	← mitzip left	23:33
	← pastime left	23:34
	← penguin1 left	23:35
	← Watabou left	23:35
	← tjbiddle left	23:35
	tjbiddle_ → tjbiddle	23:35
	← hwrd\|work left	23:35
	→ hwrd\|work joined	23:36
	← engla left	23:36
	← anonymuse left	23:38
	→ pastime joined	23:38
	← markalanevans left	23:39
	← lavaman left	23:39
	→ hellopat joined	23:40
	← pr0ton left	23:40
	→ tjbiddle_ joined	23:43
	→ pr0ton joined	23:43
	← malkomalko left	23:43
	→ beitao_ joined	23:44
	← beitao_ left	23:44
	← hwrd\|work left	23:44
	→ DarkAceZ joined	23:44
	← willob left	23:44
	← beitao left	23:44
	← cogitos left	23:44
	← tjbiddle_ left	23:45
	→ hwrd\|work joined	23:45
	← tjbiddle left	23:46
	→ Watabou joined	23:46
	→ kadoban_ joined	23:46
	→ normanrichards joined	23:47
	→ Xethron joined	23:47
	← scorphus left	23:50
	← lethjakman left	23:50
	← hwrd\|work left	23:51
	← sfalcon left	23:53
	← TeckniX left	23:53
	→ simesy joined	23:55
	→ hwrd\|work joined	23:55
Adlai	errrrr... error? http://bitbin.it/hqXQg6UP	23:56
	← eijk_ left	23:56
	← bmac left	23:56
	→ hwrd\|wor_ joined	23:58
	← madewokherd left	23:59
	← simesy left	23:59
	→ madewokherd joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation