IRCloggy #git 2012-08-23

Provider of IRC logs since 2005.

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

	2012-08-23
	← thiago left	00:00
	→ apok_ joined	00:02
	→ maletor joined	00:02
	→ lustucru joined	00:03
	← lustucru left	00:03
	← tworkin left	00:04
	← apok left	00:05
	apok_ → apok	00:05
	→ Anders_J joined	00:05
	← nightcrawler786 left	00:05
	→ oorang3 joined	00:07
	→ lustucru joined	00:08
	→ sgambino joined	00:08
	→ dinkytoy joined	00:08
	← GameGamer43_ left	00:09
	→ GameGamer43_ joined	00:10
	← apok left	00:11
	→ apok joined	00:12
oorang3	hey folks, first time user here	00:12
	i'm trying to commit the readme, and i get an error	00:12
	error: The requested URL returned error: 403 while accessing https://github.com/rmadair/fuzzer.git/info/refs	00:12
	fatal: HTTP request failed	00:12
	← maletor left	00:12
	← gusnan left	00:13
oorang3	i even copy pasted the suggested lines on "Create a new repository on the command line"	00:13
cmn	this has nothing to do with committing, only pushing	00:14
	the 403 error means you're not allowed to	00:14
SethRobertson	What URL are you using when you cloned?	00:14
	`git remote -v` will tell you/us	00:14
oorang3	okay, let me run that	00:14
	→ Lulzon joined	00:14
oorang3	origin https://github.com/rmadair/fuzzer.git (fetch)	00:14
	origin https://github.com/rmadair/fuzzer.git (push)	00:15
	← GameGamer43_ left	00:15
	→ kvanderw joined	00:15
	→ codeFiend joined	00:15
	→ GameGamer43_ joined	00:16
oorang3	any ideas?	00:16
SethRobertson	Have you ever made a commit with github?	00:16
oorang3	no, this is the first one following the "Create A Repository" instructions	00:17
cmn	is that your username?	00:17
oorang3	rmadair	00:17
	→ maletor joined	00:18
cmn	are you using a hilariously old version of git?	00:18
oorang3	git version 1.7.0.4	00:18
	default in the ubuntu repo	00:18
	→ itatitat joined	00:18
SethRobertson	That may not have https password support	00:18
oorang3	ah	00:18
SethRobertson	Can you upgrade or use the ssh url?	00:19
oorang3	let me remove it and grab the latest version from teh site	00:19
cmn	that should be new enough for smart http	00:19
SethRobertson	But for https user authentication?	00:20
	→ quazimodo joined	00:20
SethRobertson	github requires username/password which requires the credential code	00:20
	→ iocor joined	00:20
cmn	that's handled by curl, that's not a problem	00:21
	the credential cacher won't be there, but http user/pass works in that version	00:21
SethRobertson	I don't think there is any interface to asking for the username/password.	00:21
oorang3	i've never gotten asked ^	00:22
SethRobertson	1.7.7 is the version when it was introduced	00:22
	oorang3 is making newest version atm	00:22
	← psoo left	00:22
cmn	hm, that sounds really odd	00:22
	→ steve6 joined	00:23
cmn	the 403 error code should indicate that there was a password given	00:23
	← erynofwales left	00:24
lindenle	Is there an ubuntu package host for git?	00:24
cmn	a package host?	00:24
	← maletor left	00:24
SethRobertson	precompiled latest apk I'm assuming he wants	00:24
oorang3	okay	00:25
	git version 1.7.12	00:25
	← lustucru left	00:25
	oorang3 retries	00:25
cmn	.deb, isn't apk the Android one?	00:25
EugeneKay	Yes.	00:25
	← hyperair left	00:26
	← itatitat left	00:26
oorang3	haha, that fixed it	00:27
	→ maletor joined	00:27
oorang3	thanks guys, i appreciate the help	00:27
	just needed to get the latest version	00:27
	oorang3 curses the ubuntu repos	00:27
cmn	huh, I'd never noticed that before	00:28
	← luxurymode left	00:28
	→ lresende joined	00:29
	← breck left	00:29
	← steve6 left	00:30
	→ breck joined	00:30
imachuchu	oorang3: what version of ubuntu are you running?	00:31
	→ Yuuhi` joined	00:31
	← gavin_huang left	00:31
	→ AAA_awright_ joined	00:32
	→ steve6 joined	00:32
	→ xwalk joined	00:32
	← murr4y left	00:32
	→ ilteris_ joined	00:32
	← Yuuhi left	00:33
	→ koivula joined	00:33
	→ ska-fan joined	00:33
	→ styx_ joined	00:33
	← harish left	00:34
	→ murr4y joined	00:34
	← devth left	00:34
	← iocor left	00:34
	← YoMomma left	00:34
	← JrCs left	00:34
	← quazimod1 left	00:34
	← steve6 left	00:35
	→ gavin_huang joined	00:35
	→ steve6 joined	00:35
oorang3	imachuchu: 10.04.4 LTS	00:36
	→ sgambino_ joined	00:36
	→ JrCs joined	00:36
	← kenperkins left	00:36
	→ juvenal joined	00:37
	← Sym3tri left	00:37
imachuchu	oorang3: yeah, the LTS isn't going to see newer packages. If you want fresher repos switch to a newer version (12.04 here with git version 1.7.9.5)	00:38
	← sgambino left	00:39
	← steve6 left	00:39
	→ beneggett joined	00:39
	← Synthead left	00:39
mmattice	oorang3: https://launchpad.net/~git-core/+archive/ppa	00:39
	AAA_awright_ → AAA_awright	00:40
	→ steve6 joined	00:40
oorang3	ah, ty for the info :)	00:41
mmattice	much easier than rebuilding it yourself all the time	00:41
	← v0n left	00:41
	→ _keith joined	00:43
	← goshawk left	00:44
	← breck left	00:44
	← diegoviola left	00:45
	→ ehsan joined	00:46
	← daniel-s left	00:49
	→ daniel-s joined	00:50
	→ harish joined	00:51
	→ iori joined	00:51
	hide_ → hide	00:52
	← _keith left	00:53
	← duckxx left	00:54
	→ erynofwales joined	00:54
	→ unreal joined	00:54
	← tmz left	00:55
	→ tmz joined	00:55
	← ahayweh left	00:55
	← gavin_huang left	00:56
	← dreiss left	00:56
	← maletor left	00:56
	← imachuchu left	00:56
zw_yao	Hi,all. I try to rebase my topic branch to the updated master branch, and then squash(use git rebase -i) all my topic commits into single commit. It works. however, I also try the alternative way to do this: first squash the topic branch(there are about 50 commits need to be squash), then rebase to the updated master branch. finally, it failed at the squash, there are many conflicts. Could anyone give some tips?thanks!	00:58
	→ alfplayer joined	00:58
	← msmithng left	00:59
zw_yao	Why the squash successes after rebase and fails before rebase?	01:00
milki	doesnt make sense to me	01:02
	→ gtuckerkellogg joined	01:02
	← hwrd\|work left	01:03
zw_yao	milki, you mean those 2 approaches should both be viable?	01:06
	← etcetera left	01:06
	→ SyouJyoA joined	01:07
	← codeFiend left	01:08
	← ngirard left	01:08
	← dinesh6654 left	01:09
	→ ahayweh joined	01:09
milki	ya	01:10
	→ etcetera joined	01:11
	← SeoZ left	01:11
	→ _keith joined	01:12
	→ SeoZ joined	01:14
	→ dreiss joined	01:15
	→ iocor joined	01:15
	→ hyperair joined	01:16
	→ weiyang joined	01:16
	← p3rror left	01:16
	← etcetera left	01:17
	← _keith left	01:18
	→ Davey joined	01:18
	→ aantix_ joined	01:18
	← palm_vue left	01:20
	← Lgb left	01:20
	← bizhanMona left	01:20
	→ Fernando1asso joined	01:20
	← aantix_ left	01:20
	→ ngirard joined	01:20
	← FernandoBasso left	01:21
	Fernando1asso → FernandoBasso	01:21
	→ palm_vue joined	01:21
	→ Lgb joined	01:21
	→ bizhanMona joined	01:21
	← aantix left	01:21
	← Sebo left	01:21
	← harish left	01:22
	← sgambino_ left	01:22
	→ intripoon joined	01:23
	← cybersphinx left	01:23
	→ gtrak joined	01:24
	→ codeFiend joined	01:24
	→ Chib joined	01:24
	← project2501b left	01:25
	→ project2501a joined	01:26
	← AaronMT left	01:26
	← intripoon_ left	01:26
	← dreiss left	01:28
	→ oogatta joined	01:30
	← Textmode left	01:30
	→ wolftankk joined	01:30
	→ _keith joined	01:31
	← iliketurtles left	01:32
	← _keith left	01:32
	→ hollyw00d joined	01:35
	→ iliketurtles joined	01:35
	→ corburn joined	01:36
	→ _keith joined	01:36
	→ boombatower joined	01:40
	← SyouJyoA left	01:42
	→ xiangfu joined	01:43
	← iliketurtles left	01:44
	← gfontenot left	01:44
	← electrog1ek left	01:45
	→ electrogeek joined	01:45
	← electrogeek left	01:45
	→ electrogeek joined	01:45
	→ harish joined	01:45
	→ etcetera joined	01:46
	→ TheLZA joined	01:46
	→ shane_ joined	01:47
	← etcetera left	01:47
	→ hellopat joined	01:49
	→ blackcustard joined	01:49
	← electrogeek left	01:50
	← iocor left	01:51
	→ toobluesc joined	01:52
	← dhruvasagar left	01:52
	← apok left	01:52
	→ electrogeek joined	01:53
	← electrogeek left	01:53
	→ electrogeek joined	01:53
	→ hwrd\|work joined	01:54
	→ SkAzZ joined	01:56
	← _keith left	01:57
	→ anabelle joined	01:58
	← Eridius left	01:59
	← SkAzZ1 left	02:00
	← weiyang left	02:00
	→ _keith joined	02:00
	← nutron left	02:03
	→ SyouJyoA joined	02:03
	← Lulzon left	02:03
	→ bawigga joined	02:05
	→ andrewhl joined	02:05
	← beneggett left	02:08
	← steve6 left	02:09
	← opus left	02:10
	→ beneggett joined	02:10
	← _keith left	02:10
	→ zdk joined	02:12
	→ xxthink joined	02:12
	→ wctype joined	02:15
	← FernandoBasso left	02:16
	→ weiyang joined	02:17
	→ metcalfc_ joined	02:19
	→ SwK_ joined	02:21
	← shane_ left	02:21
	→ shane_ joined	02:22
	→ breck joined	02:23
	← SkAzZ left	02:24
	← ehsan left	02:25
	→ igotnolegs joined	02:25
	← zdk left	02:25
	→ etcetera joined	02:26
	← Guest49601 left	02:27
blackcustard	what does it mean when git svn update-ref fails with "fatal: refs/remotes/svn/trunk: not a valid SHA1"? the man page doesn't seem to say anything about it	02:27
	i'm thinking it's got the wrong path through the remote repository and isn't finding trunk?	02:27
	→ jpalmer joined	02:27
	← hwrd\|work left	02:28
	→ Eridius joined	02:28
	← bawigga left	02:28
	→ dreiss joined	02:28
	← frogonwheels__ left	02:29
	→ frogonwheels joined	02:29
	← shane_ left	02:31
	← Davey left	02:31
	← Bombe left	02:36
	→ w09x joined	02:36
	→ rehat joined	02:37
	← w09x left	02:37
	← ndngvr left	02:42
	← weiyang left	02:42
	→ Bombe joined	02:43
	→ weiyang joined	02:44
	← oorang3 left	02:44
	← codeFiend left	02:46
	← pppaul left	02:46
	→ ology joined	02:47
	← rohan\|afk left	02:47
	← thansen_ left	02:47
	→ thansen joined	02:47
	→ Samual joined	02:47
	← Samual left	02:47
	→ Samual joined	02:47
	→ shane_ joined	02:48
	→ wctype_ joined	02:49
	← HAL_9001 left	02:50
	→ evanz joined	02:50
	→ jarray52 joined	02:51
	← wctype left	02:51
SethRobertson	sounds more like a git error. Try git-fsck?	02:52
	→ rohan32 joined	02:52
	← thansen left	02:52
jarray52	I'm using git version 1.7.3.4-r1, and I ran git clone <url>. It says Cloning into <dir name>... Then, it asks for username and password. However, the directory does not appear after the git clone command finishes.	02:52
	← rohan32 left	02:53
	← asakura left	02:56
	← xiangfu left	02:56
	→ asakura joined	02:57
	→ xiangfu joined	02:58
	← beneggett left	02:58
	→ maletor joined	02:59
EugeneKay	That sounds peculiar	03:00
	What OS?	03:01
	→ codeFiend joined	03:01
jarray52	Gentoo	03:01
	← CEnnis91 left	03:02
	→ CEnnis91 joined	03:02
	← CEnnis91 left	03:02
	→ CEnnis91 joined	03:02
jarray52	I'm checking out from github, and the same command works perfectly on an Ubuntu machine with gt version 1.7.11.2.249	03:02
	s/gt/git	03:02
SaCu	jarray52, does that ubuntu machine ask you for credentials, too?	03:03
EugeneKay	Abd it's doing the object download? Not erroring out or anything?	03:04
jarray52	SaCu: Yes.	03:04
EugeneKay	What's the exit code of the `git clone` process? (run `echo $?`)	03:04
	← lresende left	03:04
	← hellopat left	03:04
jarray52	128	03:05
EugeneKay	That's definitely an error	03:05
	!repro	03:05
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	03:05
	→ pppaul joined	03:06
jarray52	gitinfo: I ran the command: git clone https://github.com/...	03:06
	gitinfo: Then, I entered username and password.	03:07
	→ beneggett joined	03:07
jarray52	gitinfo: Then, I typed `echo $?`	03:07
	gitinfo: This returned 128	03:07
	← pppaul left	03:08
jarray52	EugeneKay: What do you mean by '!repro' ?	03:08
	→ ndngvr joined	03:08
EugeneKay	!gitinfo	03:08
gitinfo	I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	03:08
EugeneKay	Read the gist linked ;-)	03:09
	→ pppaul joined	03:10
	← pppaul left	03:10
	→ jackh joined	03:10
	→ pppaul joined	03:10
	← pppaul left	03:10
	→ pppaul joined	03:11
SaCu	There are ~20 places in git itself where it exits with 128 :)	03:11
	← TheLZA left	03:12
jarray52	SaCu: Is there a way to get more information about this error without reading the git source code?	03:12
SaCu	jarray52, i'm not really sure. I've never had a case myself where git did "just fail and not tell me why".	03:13
	← maletor left	03:13
lahwran	I have a .patch file exported by format-patch. I want to apply this to my working directory, so that I can manually review and re-commit it. how would I do this?	03:14
	← etcetera left	03:14
jarray52	By the way, I'm new to git. So, this could easily be user error. Something simple.	03:14
	← Yuuhi` left	03:14
	← Eridius left	03:15
SaCu	lahwran, man git-am	03:15
gitinfo	lahwran: the git-am manpage is available at http://git-scm.com/docs/git-am.html	03:15
	→ Yuuhi` joined	03:15
SaCu	jarray52, can you clone the repository with a "git@github....." url?	03:15
lahwran	SaCu: I don't see what's relevant about that (obviously it is, I just don't see it)	03:16
jarray52	Anyone have a sample github account that I could try cloning?	03:16
SaCu	lahwran, 'git am' is the counter-command to format-patch. It applies it. If you have a raw diff output, you can use 'git apply' or just the 'patch' program	03:16
lahwran	ah	03:17
	so will that allow me to review the code?	03:17
	well, er	03:17
SaCu	what exactly do you mean by "review the code"?	03:17
lahwran	I mean I could review the patch, but I'd prefer to review it in the working directory	03:17
SaCu	jarray52, if you don't have a github account on your own, what username/password are you giving it then?	03:19
	← Chib left	03:19
jarray52	SaCu: I have a github account.	03:19
	← pppaul left	03:20
SaCu	jarray52, then why do you want to use another one?	03:20
	← shane_ left	03:20
jarray52	SaCu: To test if the problem is with my account. I wasn't asking for someone's username/password. I was asking if someone had a url that I could download a piece of example code from.	03:21
	← wctype_ left	03:21
SaCu	lahwran, git am will create a local commit; but you could easily discard this one, if you don't like it.	03:21
	← _br_ left	03:21
lahwran	SaCu: or amend it to a commit message that isn't "temp"?	03:22
	:p	03:22
	→ _br_ joined	03:22
SaCu	jarray52, ah, okay. Well, any github hosted project should be okay then :)	03:22
	lahwran, indeed. But you could already have changed that in the patch (that's an advantage of format-patch over "raw" diffs)	03:23
	→ nutron joined	03:23
	→ pppaul joined	03:23
	← pppaul left	03:23
SaCu	lahwran, the original intention of format-patch is to transport commits via mail.	03:24
	← nutron left	03:24
	← kukks left	03:24
	→ nutron\|w joined	03:24
	→ pppaul joined	03:24
	← beneggett left	03:24
jarray52	SaCu: I'll find one. I apologize for my laziness.	03:24
lahwran	blah, I lost work due to this mess	03:25
	← _br_ left	03:26
lahwran	oh well, it wasn't complex work, probably easier to redo than to try to find the lost data in git	03:26
	probably doesn't exist anyway, the whole issue was that it hadn't been committed :p	03:27
jarray52	SaCu: I ran git clone https://github.com/emberjs/ember.js.git and then ran echo $?	03:27
	→ _br_ joined	03:27
jarray52	SaCu: The return value was still 128	03:27
	→ beneggett joined	03:27
	→ ak5 joined	03:27
SaCu	jarray52, does 'git clone git://github.com/emberjs/ember.js.git' work then?	03:28
jarray52	SaCu: No	03:29
lahwran	heavens, git fetch takes a long time	03:29
ak5	hi, I work with a few different computers at my work, so I decided to put my .ssh folder under git (and host it on a private git server). However, my subfolders holding keys have wierd permissions I have never seen before when I clone on another machine. ls -al just gives me ????????? ? ? ? ? ?	03:30
	does anyone know why?	03:30
	this problem persists if I do chown -R myuser:users .ssh/	03:30
jarray52	ak5: Are you root?	03:30
ak5	jarray52: no, not on either	03:30
jarray52	ak5: If I run ls -alh in .ssh, I can see the permissions of all my files such as id_dsa.pub	03:31
	← Bass2 left	03:32
ak5	jarray52: it seems to work in ~/.ssh but not in ~/.ssh/foo/	03:32
jarray52	ak5: I'm not sure then.	03:32
ak5	do you have keys organised in subfolders?	03:33
jarray52	ak5: I have to step out for a moment.	03:33
ak5	ok	03:33
	→ Eridius joined	03:33
	→ rchavik joined	03:33
	← rchavik left	03:33
	→ rchavik joined	03:33
SaCu	jarray52, if cloning via the git@-url doesn't work too, i have currently no clue why it should fail. Do you have a proxy?	03:33
	← cakehero left	03:34
jarray52	SaCu: no. I have to step out for a moment. Thanks for your help.	03:34
	← lotus left	03:34
	→ sebastorama joined	03:34
	← blackcustard left	03:36
	← weiyang left	03:38
	← yaymukund left	03:42
ak5	does git not track permissions?	03:46
offby1	mostly not.	03:47
	it tracks the executable bit ... and AFAIK, that's it.	03:47
ak5	I see	03:47
offby1	Next!	03:47
ak5	:P	03:47
offby1	I can't, however, explain why you're getting a bunch of question marks; I'd expect you to get 644 or something.	03:48
	Perhaps you're using Cygwin	03:48
	← sebastorama left	03:50
	← bgerber left	03:50
	→ weiyang joined	03:51
	→ Kyzz joined	03:52
	→ sebastorama joined	03:53
	→ ReekenX joined	03:57
	← cmullican left	03:57
	→ r0bby joined	03:58
ak5	offby1: I actually fixed it by doing chmod 777 * && chmod 600 *	04:01
	no just linux	04:01
	I have no clue whats going on	04:01
	but it's done now, I'll set up a githook to do that whenever I pull	04:02
	← robbyoconnor left	04:02
offby1	maybe you're using some unusual file system? Or NFS?	04:04
	→ kenperkins joined	04:04
	→ bgerber joined	04:04
offby1	Or ACLs ?	04:04
ak5	nope, ext4	04:04
	no ACLs	04:04
offby1	shrug	04:05
	a mystery	04:05
	← boombatower left	04:05
	← fisted left	04:05
	→ quazimod1 joined	04:06
	← SaCu left	04:07
	→ fisted joined	04:09
	← dinkytoy left	04:09
	← Guest42477 left	04:14
	→ SaCu joined	04:14
	← ndngvr left	04:14
	→ raar joined	04:15
	raar → Guest96406	04:15
	→ ndngvr joined	04:16
	→ Per4u3e joined	04:17
	→ subhojit777 joined	04:17
	← Per4u3e left	04:17
	→ ehsan joined	04:18
	← quazimodo left	04:18
	← aspotashev left	04:18
	← Anders_J left	04:19
	← quazimod1 left	04:19
	→ quazimodo joined	04:20
	← SyouJyoA left	04:20
	→ Davey joined	04:21
	← alexisabril left	04:23
	← Kyzz left	04:24
	← quazimodo left	04:25
	→ iliketurtles joined	04:25
	→ hwrd\|work joined	04:25
	→ javawizard joined	04:26
	← javawizard left	04:26
	→ javawizard joined	04:26
	← khmarbaise left	04:26
	← jcp left	04:26
	← rehat left	04:27
	→ private joined	04:28
	private → Guest2392	04:29
jarray52	Does git have a mechanism of testing whether it is installed properly?	04:29
	← yitz_ left	04:29
	← Kichael left	04:29
	→ etcetera joined	04:30
	← madewokherd left	04:31
	← Natureshadow left	04:34
	← codewrangler left	04:34
EugeneKay	`git init`. If it works, it works. If it doesn't, it doesn't.	04:35
	← shawngo left	04:37
	← breck left	04:39
	→ oorang3 joined	04:39
oorang3	so i created the gh-pages branch, but it just shows up normallly as a list of files. how do i have it render the html?	04:40
	→ r0bby_ joined	04:40
	← yoklov left	04:40
	← ahayweh left	04:41
	← hollyw00d left	04:42
jarray52	EugeneKey: git init works and echo $? returns 0.	04:42
	→ ahayweh joined	04:43
jarray52	EugeneKey: However, I'm still having problems cloning repositories from github.	04:43
milki	jarray52: care to elaborate?	04:43
	← r0bby left	04:44
jarray52	milki: git clone https://github.com/emberjs/ember.js.git fails	04:44
	milki: And echo $? returns 128.	04:44
	→ yoklov joined	04:45
jarray52	milki: There is no error message. Not sure what else to say.	04:45
	← ozzloy left	04:45
milki	not sure here either then >.>	04:46
	← anabelle left	04:46
jarray52	milki: git init works	04:46
	→ eletuchy_ joined	04:47
milki	try another repo?	04:47
	← DanyO83 left	04:47
	→ anabelle joined	04:47
	→ hollyw00d joined	04:47
	→ ozzloy joined	04:47
	← ozzloy left	04:47
	→ ozzloy joined	04:47
	← yoklov left	04:47
	→ maletor joined	04:48
jarray52	milki: I believe I have the problem with all repos, but let me try another.	04:48
	→ pretty_function joined	04:49
	← eletuchy left	04:50
jarray52	milki: git clone https://github.com/thoughtbot/paperclip.git does the same thing.	04:50
	→ borgebjo joined	04:50
milki	then try reinstall git	04:50
	no clue whats wrong	04:51
	maybe rebooting will help :o	04:51
	→ eletuchy joined	04:51
milki	:P	04:51
jarray52	milki: I'm not using git on Windows.	04:52
	← maletor left	04:52
milki	also need to sacrifice your finest goat	04:52
	← ak5 left	04:52
jarray52	milki: lol...	04:52
	milki: I'm running an update on Gentoo. I'll try reinstalling git afterwards. It's possible this update is causing the problem, but it seems as though git is installed and "working".	04:53
milki	hmmm	04:54
	maybe its ssl related then	04:54
	try a non ssl repo	04:54
	or ssh?	04:54
jarray52	Good point	04:55
	← metcalfc_ left	04:55
jarray52	Let me try	04:55
milki	and local	04:55
	← eletuchy_ left	04:55
	← juvenal left	04:56
	→ yaymukund joined	04:57
jarray52	milki: Do you know a project that has a small http: repo?	04:57
	← tnelson left	04:58
milki	nope	04:59
	→ tnelson joined	04:59
	milki only does ssh	04:59
	→ yoklov joined	05:03
	← Eridius left	05:08
	← borgebjo left	05:08
	→ giallu joined	05:10
	← harish left	05:11
	← hollyw00d left	05:12
	→ quazimodo joined	05:12
	← etcetera left	05:12
	→ Sebo joined	05:13
	→ maletor joined	05:14
	← giallu left	05:14
	← kerrick left	05:14
	→ arkiver joined	05:14
	→ thirdknife joined	05:16
	→ beautifulmind joined	05:16
	→ dsirijus joined	05:17
	← gerard0 left	05:18
	← sebastorama left	05:18
	← yaymukund left	05:18
	← loops left	05:19
	→ patrick85 joined	05:19
	→ yaymukund joined	05:19
	← thirdknife left	05:21
	← ryez left	05:21
	→ thirdknife joined	05:21
	← quazimodo left	05:21
	← yoklov left	05:22
	The24z_away → The24z	05:22
	← asakura left	05:23
	← thirdknife left	05:23
	→ loops joined	05:23
	→ gerard0 joined	05:23
	→ quazimodo joined	05:24
	← Psycho_pr_ left	05:24
	→ Psycho_pr joined	05:25
	← loops left	05:25
	→ Chib joined	05:27
	→ loops joined	05:28
oorang3	after creating a gh-pages branch using the page generator, what url actually renders the html?	05:28
	→ shruggar joined	05:32
	r0bby_ → robbyoconnor	05:32
	← simesy left	05:32
	→ simesy joined	05:33
	→ mishok13 joined	05:34
	← iliketurtles left	05:34
	← Davey left	05:35
	→ sq-one joined	05:36
milki	username.github.com/projectname	05:38
	→ longbeach joined	05:38
	← gerard0 left	05:38
	← marc_kdab_ left	05:39
	← mishok13 left	05:39
	→ marc_kdab_ joined	05:39
	← sq-one left	05:39
	→ dinesh6654 joined	05:40
	→ kvanderw_ joined	05:40
	← kvanderw left	05:41
	kvanderw_ → kvanderw	05:41
	→ sebastorama joined	05:42
	→ gerard0 joined	05:42
	→ jnewt joined	05:42
	← pppaul left	05:42
	← Milossh left	05:43
jnewt	i've named branches incorrecly, and pushed. no one has pulled / fetched. if i rename them correctly on my local and push, will it rename the remote branches?	05:44
nevyn	nope	05:44
	it'll add more branches on the remote	05:45
	→ Araxia_ joined	05:46
	← Araxia left	05:46
	Araxia_ → Araxia	05:46
	→ senny joined	05:47
	→ lirt joined	05:47
	→ pppaul joined	05:48
jnewt	nevyn: so this is undoable? great	05:48
	→ ferdna joined	05:48
nevyn	delete them on the remote?	05:48
	← lirt left	05:49
nevyn	sure	05:49
	git push remote :branch will delete a remote branch	05:49
	→ etcetera joined	05:50
	← zw_yao left	05:50
	The24z → The24z_away	05:50
	Guest49240 → chrisward	05:52
jnewt	nevyn: i don't want to delete the remote branch. i just need to run two commands on remote. git branch -m pt_test pt_test_bugfix and then git branch pt_test 61c186 so that i rename the rmote branch bugfix, and put the pt_test back where it was.	05:53
	is that doable?	05:53
	← adamm left	05:54
	→ mishok13 joined	05:54
nevyn	so you don't need to do it on the remote.	05:56
	you can do this with push	05:56
	→ pantsman joined	05:57
	← pantsman left	05:57
	→ pantsman joined	05:57
	→ gavin_huang joined	05:58
	← jcao219 left	05:59
	← SJr left	05:59
oorang3	milki: ty	06:00
	→ SJr joined	06:00
milki	?	06:01
	o	06:01
	pdelvo\|afk → pdelvo	06:02
	← shruggar left	06:02
	→ Nirvanko joined	06:02
	← anabelle left	06:03
	→ OOPMan joined	06:03
	→ MZAWeb joined	06:05
	← andrewhl left	06:06
	← etcetera left	06:06
	← SJr left	06:07
	← meatlover left	06:07
	← pppaul left	06:08
	→ SJr joined	06:09
	→ john_anderson joined	06:09
	→ MaximB_ joined	06:09
	→ afuentes joined	06:13
	← osmosis left	06:15
	→ arvind_khadri joined	06:15
	← patrick99e99 left	06:16
	← sebastorama left	06:17
	→ rehat joined	06:20
	→ igotnole_ joined	06:20
	→ jwmann1 joined	06:21
	← igotnolegs left	06:21
	← jwmann1 left	06:21
	→ jwmann1 joined	06:21
	pdelvo → pdelvo\|afk	06:22
	← _huoxito left	06:22
	→ etcetera joined	06:22
	← Goplat left	06:22
	→ cbreak-work joined	06:23
	→ hoschi joined	06:24
	→ flijten joined	06:24
	← jwmann1 left	06:25
	→ fornext joined	06:25
	← dinesh6654 left	06:26
	→ und3f joined	06:26
	→ lb joined	06:26
	← lb left	06:26
	→ lb joined	06:26
	→ thomasfr joined	06:27
	→ shruggar joined	06:27
	→ skorgon joined	06:27
	← skorgon left	06:27
	→ skorgon joined	06:27
	← mishok13 left	06:30
	→ philips_ joined	06:33
	← etcetera left	06:33
	← john_anderson left	06:33
	→ nor5trom joined	06:35
	→ halpurt joined	06:35
	← thomasfr left	06:35
	→ thomasfr joined	06:36
	→ patrick99e99 joined	06:40
	→ _iron joined	06:40
	← thomasfr left	06:40
	→ marthinal joined	06:40
	← skorgon left	06:44
	← gerard0 left	06:45
	→ thanpolas joined	06:45
	→ caseymcg joined	06:46
	→ towski joined	06:46
	→ gerard0 joined	06:49
	→ skorgon joined	06:50
	← skorgon left	06:50
	→ skorgon joined	06:50
	→ rgr joined	06:50
	← shruggar left	06:52
	← halpurt left	06:52
	→ dc5ala joined	06:52
	→ towski_ joined	06:53
	← towski left	06:53
	← rgr left	06:53
	← xxthink left	06:54
	→ Eridius joined	06:56
	← eletuchy left	06:57
	← iflista left	06:58
	→ shruggar joined	06:58
	→ ph^_ joined	06:59
	→ xxthink joined	06:59
	← SJr left	07:00
	← caseymcg left	07:00
	→ dr_lepper joined	07:01
	← dr_lepper left	07:01
	→ dr_lepper joined	07:01
	← madsy left	07:04
	→ sebastorama joined	07:05
	→ SJr joined	07:05
	→ mishok13 joined	07:08
	← shruggar left	07:08
	← igotnole_ left	07:09
	← Zespre_ left	07:09
	→ timj1 joined	07:10
	→ fepede joined	07:10
	← fepede left	07:11
	→ Zespre joined	07:11
	← kenperkins left	07:13
	← timj left	07:13
	→ xwalk_ joined	07:16
	→ resmo_ joined	07:16
	← Merwin left	07:16
	← vmiklos_ left	07:17
	← wolftankk left	07:17
	← sebastorama left	07:17
	→ Merwin joined	07:17
	→ dhruvasagar joined	07:17
	← jkremser left	07:17
	→ mastro joined	07:17
	→ vmiklos joined	07:17
	← buhman left	07:18
	← ferdna left	07:19
	← bizhanMona left	07:20
	← palm_vue left	07:20
	← Lgb left	07:20
	← towski_ left	07:20
	→ palm_vue joined	07:21
	→ Lgb joined	07:21
	→ bizhanMona joined	07:21
	→ eletuchy joined	07:23
	← MZAWeb left	07:23
	→ eletuchy_ joined	07:24
	← Nirvanko left	07:25
	→ psoo joined	07:26
	→ stodan joined	07:26
	← eletuchy left	07:27
	→ scholtz joined	07:29
	← Sebo left	07:30
	← scholtz left	07:31
	→ amcsi_work joined	07:35
	→ Sebo joined	07:35
	← sh4rm4 left	07:35
	← arkiver left	07:35
	→ sh4rm4 joined	07:36
	→ tqmz joined	07:36
	→ scholtz joined	07:37
	→ TheHaven joined	07:38
	← scholtz left	07:38
	→ Natureshadow joined	07:39
	→ sebbo joined	07:41
	← beautifulmind left	07:42
	→ thiago joined	07:45
	← tqmz left	07:45
	→ scholtz joined	07:45
	→ ipalaus joined	07:46
	→ giany joined	07:46
	→ RaceCondition joined	07:47
	← maletor left	07:48
	← ology left	07:48
	← simesy left	07:49
	→ caseymcg joined	07:49
	→ jkremser joined	07:52
	→ tqmz joined	07:52
	← Eridius left	07:55
	← Pupeno_W left	07:55
	← weiyang left	07:58
	→ Advocation joined	07:58
	← adhawkinz left	07:59
	→ adhawkinz joined	07:59
	adhawkinz → adhawkins	07:59
	← caseymcg left	08:00
	→ shruggar joined	08:02
	← hyperair left	08:02
	The24z_away → The24z	08:03
	→ d3vic3 joined	08:05
	→ madsy joined	08:06
	← madsy left	08:06
	→ madsy joined	08:06
	→ w09x joined	08:06
	← Fissure left	08:07
	← pantsman left	08:08
	→ klj613 joined	08:08
	← Guest85743 left	08:08
	→ Guest85743 joined	08:08
	→ stevedomin joined	08:09
	→ blami_ joined	08:10
	→ deitarion joined	08:10
	← eletuchy_ left	08:11
	→ timthelion joined	08:12
deitarion	I don't suppose anyone here could recommend a trustworthy repo for getting git 1.7.10 on Ubuntu 12.04 (Precise)? The main tree is still on 1.9.5 and I'm really getting tired of waiting for [include]. (As is, I have to leave .gitconfig in a partially-committed state to keep my SMTP password and GitHub secret private.)	08:12
	→ eletuchy joined	08:12
cbreak-work	deitarion: what's wrong with git.git?	08:14
	← jkremser left	08:14
deitarion	cbreak-work: Perhaps nothing. What's git.git?	08:14
	Oh, building from source?	08:15
cbreak-work	it's the git repo of git	08:15
skorgon	https://github.com/git/git	08:15
cbreak-work	what were you asking about?	08:15
	git://git.kernel.org/pub/scm/git/git.git	08:15
	The24z → The24z_away	08:15
deitarion	Were I still on Gentoo, I'd have no problem with that. As I'm on Lubuntu until I have time to debug my own integration gotchas, I'd prefer to not have to manage my own security fixes and manually keep git.git from fighting with apt's dependency resolution.	08:16
cbreak-work	it was no problem on OS X.	08:16
	→ BiggFREE joined	08:16
	← Freeaqingme left	08:17
deitarion	Yeah. As far as I know, OSX doesn't have a package manager. Lubuntu has a package manager that errs on the side of overbearing.	08:17
	→ Fissure joined	08:17
cbreak-work	you can install your own git into /usr/local/bin, or maybe even ~/bin	08:18
deitarion	(For example, I have to keep manually removing pulseaudio because various packages list it as an install-time dependency to try to "help" me "unbreak" my system)	08:18
	← dr_lepper left	08:19
	← Guest85743 left	08:19
deitarion	cbreak-work: That doesn't solve the problem of making me responsible for watching for when security holes are discovered in git or when the Ubuntu-provided git version number passes my own install's.	08:19
	→ actel joined	08:19
cbreak-work	of course not.	08:21
	take responsibility or don't. :)	08:21
	either you compile your source from the repository	08:21
	or you're stuck with what you get via other ways	08:21
deitarion	cbreak-work: I have no problem being stuck with other ways. I'm just looking to see if I can get some consensus on which 3rd-party repos for git 1.7.10+ are most likely to be trustworthy.	08:22
	→ khmarbaise joined	08:23
nevyn	deitarion: pulse is part of modern systems deal.	08:23
cbreak-work	I don't think there are any forks of git	08:23
esc	deitarion: [include], is it coming?	08:23
cbreak-work	and even if there are, if you use a repo, then you'll get just sources	08:23
	← gtuckerkellogg left	08:24
deitarion	nevyn: Nope. I run without it and the only thing that breaks is Skype and only because it's unlucky enough to run up against a rough edge of how Ubuntu tries to force ALSA apps to use pulse.	08:24
	cbreak-work: You obviously don't understand what I'm talking about. Every result in this search potentially contains pre-built binary packages of git for Ubuntu. --> https://launchpad.net/ubuntu/+ppas?name_filter=git	08:24
cbreak-work	yeah, but that's not a repository	08:25
	→ Anders_J joined	08:25
cbreak-work	that's some linux thing	08:25
	← Sebo left	08:25
skorgon	that's a question for #ubuntu	08:25
deitarion	cbreak-work: It's a package repository. It's "a linux thing".	08:25
cbreak-work	they commit binaries?	08:26
	→ asakura joined	08:26
cbreak-work	never heard of that	08:26
deitarion	cbreak-work: It's a tree of folders and metadata. They've been using the terminology since the late 90s at least and it's what Apple App Stores made a crappy knock-off of.	08:27
cbreak-work	so like a package manager?	08:27
deitarion	cbreak-work: Yeah. The server-side collections of source data used by package managers are called package repositories. Completely separate from git/bzr/hg/svn/etc.	08:28
	→ mklappstuhl joined	08:28
cbreak-work	those are probably distro specific	08:28
deitarion	cbreak-work: They are. I just thought I'd ask since, with Ubuntu being so popular, it might not be a total waste.	08:29
	→ Eridius joined	08:29
deitarion	(I already checked in #ubuntu and nobody was technical enough to have needed non-default versions of git)	08:29
	esc: Would you mind clarifying your question?	08:30
cbreak-work	90% of the things I read about ubuntu is complaining about things like Gnome3, Unity and so on.	08:30
lb	try irc.ubuntu.com #ubuntu	08:30
cbreak-work	maybe the popularity is waning. :/	08:30
deitarion	lb: From what I remember of the X-Chat in the LiveCD, I'm pretty sure irc.ubuntu.com is part of FreeNode.	08:30
	cbreak-work: I run Lubuntu, not Ubuntu. Same base OS, but with a sane LXDE desktop.	08:31
	← hwrd\|work left	08:31
deitarion	I hear lots of people use Kubuntu, but I want something lightweight. (And Xubuntu devs are as bad as GNOME devs for feeling essential features are either too scary or too "inelegant")	08:31
	Well, XFCE devs are. All I know is that the Xubuntu devs don't seem to be patching them in.	08:32
esc	deitarion: is there an include statement for the gitconfig file coming>	08:33
	← Eridius left	08:34
deitarion	esc: It's already in 1.7.10. http://stackoverflow.com/a/9733277/435253	08:34
	← jackh left	08:34
	→ jkremser joined	08:34
	→ jackh joined	08:35
	→ Guest50184 joined	08:36
	→ robotmay joined	08:37
	← Vile left	08:37
	← jackh left	08:40
	→ Vert joined	08:41
deitarion	nevyn: Oh, and I do periodically give PulseAudio a chance. It always hits me with some kind of deal-breaking bug within the first few days of use. (Most recently, it would randomly but fairly eagerly start pegging my CPU at 100% until I killed it if I played any games in Wine)	08:41
	← Atlantic777 left	08:42
	→ jackh joined	08:43
deitarion	...and that was with a fresh, clean Lubuntu install with the audio subsystem configured completely with defaults and a fairly ordinary desktop Intel HDA sound chip.	08:43
	← neurodrone left	08:44
deitarion	Anyone who has anything to do with producing or defending PulseAudio's suitability for general use has lost all credibility with me from their repeated cries of "NOW we've fixed all the bugs".	08:44
	→ NicolasNox joined	08:44
	→ Atlantic777 joined	08:44
	← Atlantic777 left	08:44
	→ Atlantic777 joined	08:44
	← NicolasNox left	08:44
	→ davesag joined	08:45
	gitinfo set mode: +v	08:45
frogonwheels	deitarion: ot.	08:45
deitarion	frogonwheels: I was done anyway. Just wanted to make sure nevyn understood why "deal with it" was an unreasonable response.	08:46
	→ papegaaij joined	08:47
	The24z_away → The24z	08:49
	→ Sebo joined	08:49
nevyn	meh. it works for me.	08:50
	→ thomasfr joined	08:50
	→ cantoma joined	09:02
	← artnez left	09:03
	→ kvanderw_ joined	09:03
	← ehsan left	09:04
	→ sam113101 joined	09:04
	← jjang left	09:04
	← oojacoboo left	09:04
sam113101	I NEED HELP	09:04
	→ oojacoboo joined	09:05
	→ giallu joined	09:05
	→ Vile joined	09:06
	→ barq joined	09:06
	← kvanderw left	09:07
	kvanderw_ → kvanderw	09:07
sam113101	I created a new git repo, added a file, commit, created a new branch, I modified the file inside that branch	09:07
	← scholtz left	09:07
sam113101	then I merge the branch into master	09:07
	merged*	09:07
	when I display the graph I don't see the branch	09:08
	is there a minimum of commits to be made before it displays branches (/ \| \ on the command line)?	09:08
jast	looks like you did a fast-forward merge	09:09
	that's when, at the point of merging in stuff, the target branch hasn't actually had new commits of its own	09:09
	i.e. the merge can be performed by just adding the commits on top	09:09
	that way it's not a "real" merge but instead it just adds the commits	09:10
	if you had changed master, too, before merging, you'd now have a real merge	09:10
sam113101	ah	09:10
jast	you can force real merges even if fast-forwarding is possible by using --no-ff	09:10
	→ TheJH joined	09:11
sam113101	so there's no way of knowing that those changes were wade in another branch, now?	09:11
	← barq left	09:12
	→ barq joined	09:13
	→ angelsl joined	09:13
	→ soee joined	09:15
	→ jacobat joined	09:18
jacobat	Is it possible to configure that master should be pulled from remote A and pushed to remote B ?	09:18
	→ Desproges joined	09:19
Desproges	Hi, all, what is the equivalent of "svn resolved /my/file.txt" ?	09:20
	(I m talking about the case you do not use the mergetool feature)	09:20
lb	git add	09:20
	git add foo/bar.txt	09:20
	← OOPMan left	09:22
Desproges	yeah, I just found that, simply .. thanks a lot lb !	09:22
thiago	jacobat: no, I don't think you can configure different remotes	09:22
	← tqmz left	09:23
jacobat	thiago: How about the branch.<name>.merge setting?	09:23
lb	thiago: is git push --set-upstream seperate from the normal remote url?	09:23
thiago	jacobat: that sets the branch name in the remote	09:23
	jacobat: but there's only one remote setting	09:24
	lb: what?	09:24
	jacobat: an option is to set a different push URL for that remote	09:24
	← nirix left	09:24
lb	thought about jacobat question. isn't the push url seperate from the fetch url?	09:25
thiago	lb: if you use that, it sets the pull upstream too	09:25
lb	ok	09:25
thiago	lb: the push URL is separate from the pull URL, yes, but that's not how you set it	09:26
	it also requires that either the branch name is the same in the pulling and in the pushing, or that he can set a push refspec too	09:26
Desproges	lb, I need one more advise: now I m ready to "git commit" : should I type this or is there a special command to use after a merge ?	09:27
	← gavin_huang left	09:27
	← mklappstuhl left	09:29
thanpolas	travis.ci bit spammy ?	09:30
jacobat	Bummer :/	09:30
	→ achadwick joined	09:32
	← d1b left	09:33
	→ d1b joined	09:34
	← thiago left	09:35
	→ jacobian joined	09:39
EugeneKay	_ikke_ - poke	09:42
	→ juvenal joined	09:43
EugeneKay	_ikke_ - I composed a basic man page-like thing for that git-library command I was brainstorming. https://github.com/EugeneKay/scripts/blob/master/bash/git-library.sh	09:43
	← jackh left	09:43
	← khmarbaise left	09:45
	← fluxdude left	09:45
	→ vectorshelve joined	09:45
	← vectorshelve left	09:46
	SeoZ → SeoZ-work[AWAY]	09:48
EugeneKay	But now I'm gonna sleep	09:49
	← BiggFREE left	09:50
	→ Milossh joined	09:54
	→ gavin_huang joined	09:54
	← Milossh left	09:54
	→ Milossh joined	09:55
	← jacobian left	09:55
	← dhruvasagar left	09:56
	← afuentes left	09:59
	← gavin_huang left	10:04
	← Araxia left	10:06
	→ tqmz joined	10:08
	→ thiago joined	10:10
	← iamtakingiteasy left	10:11
	→ dhruvasagar joined	10:11
	← deitarion left	10:11
	→ gavin_huang joined	10:14
	→ harish joined	10:16
	← TheJH left	10:17
	→ iamtakingiteasy joined	10:21
	→ whitman joined	10:22
	→ Fullmoon joined	10:24
	← SeySayux left	10:24
	← eighty4_ left	10:25
	→ eighty4 joined	10:25
	← Internet13 left	10:25
	→ Internet13 joined	10:26
	→ alegen joined	10:28
	→ sgambino joined	10:31
	→ SkAzZ joined	10:31
	← Atlantic777 left	10:32
	← iamtakingiteasy left	10:33
	→ iamtakingiteasy joined	10:35
	← udantee left	10:35
	→ jceb joined	10:36
	→ gusnan joined	10:36
	← iamtakingiteasy left	10:36
	← sgambino left	10:37
	→ SeySayux joined	10:37
	→ udantee joined	10:38
	→ ingsoc joined	10:39
	→ SkAzZ1 joined	10:40
	← ingsoc left	10:41
	→ SkAzZ2 joined	10:41
	← madsy left	10:42
	← SkAzZ left	10:43
	→ iamtakingiteasy joined	10:44
	→ shreya joined	10:44
	← SkAzZ1 left	10:45
	→ varg joined	10:46
	← dc5ala left	10:47
	→ lresende joined	10:50
	← xwalk_ left	10:50
	← multi_io left	10:51
	→ multi_io joined	10:51
	← letharion left	10:52
	→ sawdisk_ joined	10:53
	← sawdisk left	10:53
	→ dpino joined	10:53
	→ diegoviola joined	10:56
	cpg → cpg\|away	10:56
	← heroux left	10:57
	← vogxn left	10:58
	→ letharion joined	11:01
	Guest50184 → Freeaqingme	11:01
	← patrick85 left	11:03
	← gavin_huang left	11:03
	← bartman` left	11:04
	→ fluxdude joined	11:05
	→ Lord_DeathMatch joined	11:06
	← ph^_ left	11:08
	← heinrich5991 left	11:10
	← nor5trom left	11:10
	→ bartman` joined	11:10
	← tinti_ left	11:10
	← letharion left	11:10
	→ znake joined	11:10
	→ bassliner joined	11:11
	→ G__81 joined	11:11
bassliner	hi there, is there a reason git doesn't like ignores in .gitignore that start with ./ like so: ./.foofile ?	11:11
	← angelsl left	11:12
	→ billyoc joined	11:13
	→ nor5trom joined	11:14
G__81	I have a repo which has 2 branches. The repo is remote. I have a copy of the branch 1 locally but when i do clone of the branch2 it fails because the connection gets reset as the code base is quite huge. What i did was this. i did a git pull of the branch 1 and it showed me already upto date and then what i did was i did git checkout -b branch2 -t origin/branch2". Is there a better way to do this process ?	11:14
	the reason why i did was this because to overcome the failure. The admin team is looking into why the connection gets reset but in parallel i have done that. The above mentioned process works but is there a better way to accomplish this ?	11:16
	← znake left	11:18
	→ heinrich5991 joined	11:19
G__81	can someone clarify on this ?	11:19
lb	G__81: if you can see $branch2 in your remotes, then a simple "git checkout $branch2" would do the trick	11:20
G__81	how do i check if i see branch2 in remote?	11:21
	git remote show origin ?	11:21
lb	git branch -r	11:22
	if branch2 shows up, your fine	11:22
G__81	ok else ?	11:22
	← lresende left	11:22
lb	fetch the remote repo	11:22
	git fetch $remote	11:22
	→ beautifulmind joined	11:23
	→ ph^ joined	11:23
G__81	ok once i fetch it i got to do git checkout $branch2	11:23
	→ noecc joined	11:23
lb	yap	11:23
G__81	just to clarify i can just do git fetch $remote ?	11:24
lb	of course	11:24
	G__81: git !pull is not the same as git fetch	11:25
gitinfo	G__81: 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/	11:25
	← tqmz left	11:25
G__81	lb, ok thanks a lot i ll try this	11:25
lb	you're welcome	11:26
	← Milossh left	11:27
	→ letharion joined	11:27
	→ Milossh joined	11:28
	← Exposure_ left	11:31
	→ hollyw00d joined	11:33
	→ OOPMan joined	11:33
	→ angelsl joined	11:34
	→ arkiver joined	11:34
	← hollyw00d left	11:34
	→ rwestphal joined	11:36
	→ tqmz joined	11:38
giany	"remote: error: refusing to update checked out branch: refs/heads/master"	11:40
	what does this error mean?	11:40
	← w09x left	11:40
giany	I'm trying to run git push to a remote location	11:40
FauxFaux	giany: !faq non-bare !deploy	11:40
gitinfo	giany: Git is not a deployment tool. You can build one around it for simple environments. http://sitaramc.github.com/the-list-and-irc/deploy.html	11:40
	giany: Pushing to non-bare repositories is discouraged; more details available at http://jk.gs/gitfaq#non-bare	11:40
	→ TheJH joined	11:44
	→ agileadam joined	11:45
	← Guest2392 left	11:48
	→ berserkr joined	11:48
	→ rurufufuss joined	11:48
	← billyoc left	11:49
	← joephelius left	11:50
	→ cilly joined	11:50
	← cagedwisdom left	11:51
	← letharion left	11:51
	→ erichynds joined	11:51
	← cilly left	11:52
	→ patrick85 joined	11:52
	→ geekbri joined	11:55
	→ hyperair joined	11:56
	→ hidekin joined	11:57
	← ndngvr left	11:58
	→ letharion joined	11:58
	← quazimodo left	12:00
	← Guest6684 left	12:00
	→ lresende joined	12:01
	← eletuchy left	12:01
	→ cannonball joined	12:04
	← nor5trom left	12:04
	→ dr_lepper joined	12:09
	← dr_lepper left	12:09
	→ dr_lepper joined	12:09
	→ iocor joined	12:10
	← hyperair left	12:11
	→ skyf joined	12:11
	→ csmrfx joined	12:11
csmrfx	Good Afternoon	12:12
	I have the honor to introduce rest of my workplace to git	12:13
charon	bassliner: presumably that it just uses fnmatch() in the obvious way, and the ./ prevents a match	12:13
	→ quazimodo joined	12:13
	← lresende left	12:13
	← marthinal left	12:13
csmrfx	What do you think are the most important and difficult concepts for people new to git/distributed versioning?	12:13
FauxFaux	csmrfx: !book !parable	12:14
gitinfo	csmrfx: 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	12:14
	csmrfx: 'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html	12:14
	→ billyoc joined	12:17
	→ thirdknife joined	12:18
	→ mklappstuhl joined	12:19
	← letharion left	12:20
	→ joephelius joined	12:20
	→ nor5trom joined	12:22
	← kcj left	12:24
	→ letharion joined	12:26
	← Chib left	12:30
	← nor5trom left	12:31
csmrfx	Thanks FauxFaux	12:31
	→ eletuchy joined	12:32
	→ nor5trom joined	12:33
	→ guampa joined	12:33
	→ khmarbaise joined	12:34
charon	csmrfx: also, if you're coming from svn, IMHO it's faster to forget anything you know with a bit of booze and re-learn than trying to map over concepts.	12:35
	→ converge joined	12:35
charon	(almost nothing maps 1:1 because git is so different)	12:35
csmrfx	charon: haha, get everybody really drunk and start telling them parables	12:36
	→ les_sylvains joined	12:37
	← les_sylvains left	12:37
	→ les_sylvains joined	12:38
	← les_sylvains left	12:38
	→ les_sylvains joined	12:38
	← les_sylvains left	12:39
	← txomon\|nqas left	12:39
	→ les_sylvains joined	12:40
	→ freeed joined	12:40
	← eletuchy left	12:41
billyoc	Can you get some kind of --dry-run output that matches what you'd get from a git pull? I just want to see all the files that would be updated in a project that I'm not modifying locally.	12:44
	→ PetrMotejlek joined	12:45
	→ dvide joined	12:46
	→ nwest joined	12:47
charon	billyoc: from !pull it follows that e.g. git fetch && git diff --name-status ...@{u} can do something like it	12:49
gitinfo	billyoc: 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/	12:49
charon	billyoc: or just run the merge and see what happens, you can always remove it later	12:49
	→ codeM0nK_ joined	12:49
	→ apok joined	12:50
	← Esa left	12:50
	← codeM0nK3Y left	12:51
	codeM0nK_ → codeM0nK3Y	12:51
	→ barq1 joined	12:51
	← barq left	12:52
thanpolas	that travis project has been spamming me all day today	12:52
	→ _keith joined	12:54
	→ hellopat joined	12:57
	→ lresende joined	12:58
	→ ddelrio1986 joined	12:59
resmo_	thanpolas: afaik is this not travis, travis is fighting to kill this bot	12:59
	← d3vic3 left	13:00
resmo_	thanpolas: see https://twitter.com/travisci/status/238555687804891136	13:00
	← beautifulmind left	13:00
	→ d3vic3 joined	13:01
	→ shtrb joined	13:03
	→ codewrangler joined	13:04
	→ jcromartie joined	13:04
	← kvanderw left	13:05
thanpolas	travis is fighting? maybe github should? :}	13:05
	→ macabre joined	13:08
shtrb	Can git store local commit messages ? - I'm wish to convert an in house VC (based on REST api) as another git VCS , but I wish to save the commit logs localy (as they are not stored in the VC system)	13:08
	→ bartek joined	13:09
	← The24z left	13:09
FauxFaux	shtrb: I don't follow. What's a "local commit message"? How are they associated with commits if they're not in the VCS?	13:09
	→ fireh joined	13:09
lb	shtrb: and in git, everything exept remotes, are local	13:09
	← fireh left	13:09
lb	s/are/is/g	13:09
	← OOPMan left	13:10
shtrb	FauxFaux, when I do git commit and add a message I wish that message to be stored localy, so if I will do git log ... I will have the log from the local rep only	13:10
jast	you can add local notes to commits	13:10
FauxFaux	So you don't want the messages in the git repo, as per pushes/	13:11
shtrb	FauxFaux, the external VS only store rev , auther , changes and date	13:11
jast	but the commit messages themselves will be uploaded during push	13:11
	← skoop left	13:11
shtrb	jast, yes they will be pushed but the server will discard that	13:11
jast	that must be a pretty special git server, then	13:11
	→ yoklov joined	13:12
shtrb	I'm changing the git source itself (another dir as vcs-svn)	13:12
	→ neurodrone joined	13:12
shtrb	the end point should be like git-svn just git-blabla	13:12
	← converge left	13:14
	pdelvo\|afk → pdelvo	13:14
jast	sounds painful	13:14
	but yeah, you can use notes for that; man git-notes	13:15
gitinfo	the git-notes manpage is available at http://git-scm.com/docs/git-notes.html	13:15
shtrb	it is but that would fix all the workaround scripts I'm currently using	13:15
jast	well, good luck :)	13:15
shtrb	:)	13:16
	→ acekim joined	13:16
	→ ehsan joined	13:17
	→ TheJH_ joined	13:19
	→ skoop joined	13:19
	← Lgb left	13:20
	← bizhanMona left	13:20
	← palm_vue left	13:20
	← gtrak left	13:20
	← TheJH left	13:22
	→ palm_vue joined	13:22
	← giallu left	13:22
	→ Lgb joined	13:22
	→ mmc1 joined	13:22
	→ bizhanMona joined	13:22
	→ giallu joined	13:22
	← piggybox left	13:25
	← thomasfr left	13:25
	→ systemclient joined	13:26
systemclient	In branch master, I renamed files. In branch sphinx, I had the files already renamed. Now I want to merge master into sphinx, but it does not remember the renames, so I got index.rst and en.rst sitting around, one "UA", the other "AU". How can I sort this out?	13:26
	← dsirijus left	13:27
	← xiangfu left	13:27
	→ znake joined	13:29
	→ gtrak joined	13:29
	← kermit left	13:29
	← ph^ left	13:30
	→ kvanderw joined	13:30
	← Guest68848 left	13:31
	← apok left	13:32
	→ Eridius joined	13:32
	→ denysonique joined	13:33
	→ paolooo joined	13:33
	← znake left	13:34
	→ Element9 joined	13:34
	→ chrisgeorge joined	13:34
	→ kermit joined	13:34
	→ znake joined	13:34
	→ derekpioneer joined	13:35
cbreak-work	systemclient: so both branches renamed the files?	13:35
	merging should work just fine then	13:35
	← axl_ left	13:36
	← dpino left	13:36
	→ axl_ joined	13:36
	→ revagomes joined	13:36
	→ Ryback_ joined	13:37
	← Ryback_ left	13:37
	→ Ryback_ joined	13:37
	← pretty_function left	13:37
	→ fireh joined	13:38
	← ReekenX left	13:38
	→ dpino joined	13:39
	→ chuckharmston joined	13:39
	→ SamB_Mac_ joined	13:40
	→ dov23 joined	13:40
	← SamB_MacG5 left	13:41
	← yoklov left	13:41
	→ john_anderson joined	13:42
_keith	anyone active in this room right now?	13:44
lb	nope	13:44
_keith	I installed git on my remote Linux box like so yum install git	13:44
	everything went through OK, but it is still not recognizing the "git" command. Where do I tell Linuz the path to my git, which is why I am assuming it is having trouble?	13:45
	← jarray52 left	13:45
jacobat	_keith: That's not really a git question, probably more of a $DISTRO question :)	13:47
_keith	something I figure needs to be updated in my .bash_profile?	13:47
	I figured people who are using git, would have a clue to how to solve a git installation issue	13:48
	← lausi left	13:48
	→ lausi joined	13:48
PerlJam	_keith: rpm -ql git # see where it installed git and make sure that's in your PATH	13:48
	_keith: for me, it's /usr/bin/git (and /usr/bin really should be in your PATH)	13:49
billyoc	_keith: `which git`	13:49
PerlJam	_keith: but somehow I think you're doing something else wrong	13:49
	← iori left	13:49
	← gtrak left	13:50
_keith	PearlJam: it says package not installed when I run that command	13:50
	weird	13:50
PerlJam	_keith: sounds like a clue to me.	13:51
	→ shruggar1 joined	13:51
_keith	why would the results of yum install git say it is installed? weird	13:51
	← soee left	13:51
	← giallu left	13:51
	← patrick85 left	13:51
	→ giallu joined	13:52
	← giallu left	13:52
	→ giallu joined	13:52
PerlJam	_keith: and now you're back to what jacobat said. This is more of a problem with your dist and its tools than a git problem.	13:52
	← shruggar left	13:52
_keith	one thing I notice at the end of running yum install git is that it says "No Match for argument: git"	13:52
PerlJam	_keith: or, as I suspect ... PEBKAC :)	13:52
	→ cakehero joined	13:52
cbreak-work	git-core	13:52
	→ kukks joined	13:53
	← kukks left	13:53
	→ kukks joined	13:53
	← blami_ left	13:53
	→ twigmorewelsh joined	13:54
	→ UnknownCoder joined	13:54
	→ blami_ joined	13:54
_keith	PealJam: thanks for the help, seems it is a distro issue, using CentOS, it needs to be compiled from source	13:54
UnknownCoder	hi, i am relative new to using git, so my question may be a bit nooby ;)	13:54
PerlJam	_keith: or ... listen to cbreak-work	13:54
UnknownCoder	i am working on a project for a while and kept all my changes in my master branch	13:54
_keith	PearlJam: I tried git-core, same result	13:55
	← znake left	13:55
	→ thomasfr joined	13:55
UnknownCoder	some weeks ago i used an experimental branch to test something and later merged it into the master branch	13:55
	now my master branch is way more up to date than the experimental	13:55
	but today i want to test some new things and keep them in my experimental branch	13:55
PerlJam	UnknownCoder: merge master into experimental	13:56
Emmycakes	if I want to create a new-banch from other-branch, how would I do that?	13:56
UnknownCoder	am i right to checkout the experimental branch and then merge the master into it?	13:56
	PerlJam: yeah thanks :)	13:56
	i wasn't sure if i am doing the right thing here	13:56
	thanks for the fast answer :)	13:56
Emmycakes	is it just git checkout other-branch && git checkout -b new-branch ?	13:56
PerlJam	Emmycakes: git branch other-branch new-branch	13:56
	→ pppaul joined	13:57
PerlJam	Emmycakes: your way will work too :)	13:57
	← joephelius left	13:57
Emmycakes	PerlJam: cool beans :D	13:57
PerlJam	Emmycakes: you can always type "git help branch" or "git help checkout" for some quick docs if you're unsure about something	13:57
	→ AaronMT joined	13:58
UnknownCoder	PerlJam: worked :D thanks again for the great help :D	13:58
	← Lord_DeathMatch left	13:58
	→ Lord_DeathMatch joined	13:58
PerlJam	Emmycakes: and looking at the git help, I see that I got the args to "git branch" backwards for your use case :)	13:59
	(I was thinking of "git branch -m" apparently.)	14:00
	→ ReekenX joined	14:01
	← shtrb left	14:01
	→ alexisabril joined	14:01
	→ thirdknife_ joined	14:01
	→ patrick85 joined	14:01
	→ andrewhl joined	14:02
	← thirdknife left	14:02
	← stodan left	14:02
	→ hyperair joined	14:02
lb	Emmycakes: PerlJam a git checkout -b newbranch otherbranch will work too ;)	14:03
	← ehsan left	14:03
	→ marthinal joined	14:04
	← dov23 left	14:05
	→ dov23_ joined	14:05
	← patrick85 left	14:06
	→ gfontenot joined	14:06
	← shreya left	14:06
	← chuckharmston left	14:07
	→ msmithng joined	14:07
	← axl_ left	14:08
	→ axl_ joined	14:09
	← alegen left	14:09
	← tqmz left	14:10
	← dov23_ left	14:10
	← billyoc left	14:12
	← axl_ left	14:12
	→ nirix joined	14:13
	→ axl_ joined	14:13
	→ ph^ joined	14:14
	→ dov23 joined	14:14
bigmeow	can github support svn repo as its upstream?	14:14
	← corburn left	14:16
lb	bigmeow: afaik github supported only a one-time import from svn. but even that is unsupported now	14:16
	https://help.github.com/articles/importing-from-subversion	14:16
	← intransit left	14:18
	→ eijk joined	14:18
	→ intransit joined	14:19
	← khmarbaise left	14:19
cmn	what? github supports updates from svn perfectly fine	14:20
	← axl_ left	14:21
	→ fly9 joined	14:21
lb	then i may misunderstood the question.	14:21
	→ axl_ joined	14:21
cmn	the question doesn't have any specifics, so there's no way to know	14:21
lb	a github repo can be of course used as an svn repo, but a constantly connected "upstream" repo ?	14:21
	→ Davey joined	14:21
	← axl_ left	14:22
cmn	if you want a git mirror of your svn repo, you need to update it yourself	14:22
lb	thats what i meant	14:22
cmn	just like any other git-svn repo	14:22
lb	i'm stumbleing upon the words :/	14:22
cmn	the problem with that is that the git repo will me mostly unusable	14:23
	lb needs to learn english	14:23
	→ axl_ joined	14:23
adhawkins	lb: Your English is better than my <insert your mother tongue here>!	14:23
lb	adhawkins: german ;)	14:23
	→ v0n joined	14:23
adhawkins	Way better then! :D	14:24
	→ nickpresta joined	14:24
	→ makerbreakr joined	14:24
	lb is happy again	14:24
makerbreakr	is there an easy way to delete the whole history of a rebo	14:24
	repo*	14:24
	i tried doing a git clone --depth=1	14:24
adhawkins	I can stumble by in French (just) and follow a conversation in Welsh, but that's as far as it goes for me in terms of multi-linguistics!	14:24
makerbreakr	but i get a error when i push to a new github repo	14:25
lb	makerbreakr: rm -rf .git && git init	14:25
makerbreakr	lb, i did that	14:25
	basically, I did a git clone --depth=1 git@github	14:25
	→ lugzer joined	14:25
makerbreakr	them i rm -rf .git && git init	14:25
lugzer	afternoon	14:26
makerbreakr	add a new remote on git hub	14:26
lb	makerbreakr: !repro	14:26
gitinfo	makerbreakr: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session, or at least explain exactly what you did that led up to the problem. This will help immensely with troubleshooting.	14:26
	← jacobat left	14:26
makerbreakr	https://gist.github.com/3437141	14:26
lb	hm doesnt know that :/ maybe another nice person around here	14:27
makerbreakr	thanks though anyways	14:27
adhawkins	makerbreakr: Is that the result of git push?	14:28
makerbreakr	i also ran git fsck on the cloned repo, nad found no errors	14:28
	yessir	14:28
	← oakdog8 left	14:28
adhawkins	Are you pushing to an existing repro?	14:28
	→ jjbohn joined	14:28
makerbreakr	it was a brand new repo i just created	14:28
lb	error: unable to find 4ecb81922ffd9d33505d4337a2244cfc06aa1b13	14:28
	fatal: object of unexpected type	14:28
	error: unpack failed: index-pack abnormal exit	14:28
	→ trungqtran joined	14:29
adhawkins	And you did the clone in a new directory?	14:29
	→ steve6 joined	14:29
adhawkins	Scratch that, it's a clone	14:29
	doh	14:29
makerbreakr	https://gist.github.com/3437171	14:29
	thats the whole command sequence basically	14:29
	← jceb left	14:30
	→ chuckharmston joined	14:31
adhawkins	After the rm of .git, is .git actually gone?	14:31
makerbreakr	yes	14:31
	← dov23 left	14:31
adhawkins	How about if you just copy the working files somewhere else?	14:31
	← systemclient left	14:31
adhawkins	Something like (in your working directory)	14:31
	mkdir ../tmp && rsynv -avz . ../tmp --exclude .git	14:32
	The in ../tmp do the init, add, remote add and push?	14:32
makerbreakr	i can try that	14:32
	← freeed left	14:32
	← ska-fan left	14:33
	→ ska-fan joined	14:33
	← ska-fan left	14:33
	→ axl__ joined	14:33
	← axl__ left	14:33
	← thirdknife_ left	14:35
adhawkins	makerbreakr: That should be rsync, not rsynv obviously!	14:35
makerbreakr	ya heh	14:35
	→ axl__ joined	14:35
	→ Ntrepid joined	14:35
	← Lord_DeathMatch left	14:36
	← psoo left	14:36
lb	ah normal git clone and a rm -rf of the resulting .git dir should leave the latest version intact in the folder. an git init && git add . && git commit should work Oo	14:36
	→ Lord_DeathMatch joined	14:37
	→ ehsan joined	14:37
	← codeFiend left	14:37
	← axl_ left	14:38
	axl__ → axl_	14:38
	→ lacrymology joined	14:38
	→ ska-fan joined	14:38
	← subhojit777 left	14:39
	→ nadavoid joined	14:39
	← und3f left	14:39
	→ wolftankk joined	14:40
	→ codeM0nK_ joined	14:40
	← GameGamer43_ left	14:40
	← codeM0nK3Y left	14:40
	codeM0nK_ → codeM0nK3Y	14:40
	→ GameGamer43 joined	14:40
	→ axl__ joined	14:41
	→ freeed joined	14:41
	← Lord_DeathMatch left	14:42
lb	just did it...	14:42
	works perfect	14:42
	← axl__ left	14:42
	→ axl__ joined	14:43
	← axl_ left	14:44
	axl__ → axl_	14:44
adhawkins	lb: I'd expect it to work. That's why I asked if the .git directory was actually being removed.	14:46
	→ tbrock joined	14:47
	gitinfo set mode: +v	14:47
tbrock	hey guys im cloning a repo and getting dirty files on a git status immediately after	14:47
	how can that possibly be	14:47
	← wolftankk left	14:48
wereHamster	tbrock: are you cloning the linux kernel under windows?	14:48
	→ Mannequin joined	14:48
	← ska-fan left	14:48
tbrock	wereHamster, nope	14:48
adhawkins	tbrock: Usually line endings I'd expect.	14:48
	What does git diff show?	14:48
	→ ska-fan joined	14:49
tbrock	shows there is a diff	14:49
adhawkins	And is it a 'real' difference?	14:49
	Or just a difference in whitespace.	14:49
tbrock	sorry i didn't mean that to be snippy	14:49
	umm its a real difference	14:49
	upper vs. lower case	14:49
	but i pushed this and can clone it just fine, my colleague clones it and gets dirty files immediately	14:50
adhawkins	In what, filenames?	14:50
	← twisted`_ left	14:50
ikrabbe	you mean upper vs. lower case in file contents	14:50
	or in file names?	14:50
tbrock	its within the file	14:51
	← Yuuhi` left	14:51
lb	upper/lowercase is normally unix / win problem	14:51
adhawkins	tbrock: That sounds very unusual...	14:51
	lb: In the file's contents?	14:51
tbrock	im on linux	14:51
	he's on mac	14:51
lb	in the file is unexpected Oo	14:51
ikrabbe	are you sure the clone hasn't told you some error message?	14:51
tbrock	yeah im sure	14:51
lb	adhawkins: typed before read ;)	14:51
tbrock	i can show output	14:51
adhawkins	tbrock: gist of the diff would be good too	14:52
	→ dov23 joined	14:52
tbrock	http://pastebin.com/jyXj2dax	14:52
	→ Progster joined	14:53
adhawkins	Can you show a git diff too?	14:53
tbrock	http://pastebin.com/t0Fk4Ckj	14:53
adhawkins	There's no way git should be making changes like that of its own accord.	14:54
tbrock	agreed	14:54
	...	14:54
	not sure what to do	14:54
ikrabbe	tbrock check git branch -av	14:54
adhawkins	Some sort of hook?	14:54
tbrock	so bizaare	14:54
	→ Yuuhi joined	14:54
ikrabbe	there must be a dfference between your master and origin/master	14:55
adhawkins	Are you sure the directory didn't exist before you cloned?	14:55
	← lb left	14:55
tbrock	* master 619f4df RUBY: 1.7.0.rc0 release	14:55
	remotes/origin/HEAD -> origin/master	14:55
	remotes/origin/master 619f4df RUBY: 1.7.0.rc0 release	14:55
	yes dir is brand new	14:55
	this is on my machine, the one i pushed from	14:56
	my colleague's is the one with the problem	14:56
adhawkins	Could it be a checkout hook misbehaving?	14:56
	← nor5trom left	14:56
pdelvo	maybe a problem with submodules?	14:56
adhawkins	Is it only ID -> Id that has changed?	14:56
	→ joephelius joined	14:57
adhawkins	Smacks of a badly coded $Id$ to me! :)	14:57
tbrock	hahaha	14:57
	yeah its for docs	14:57
	for a very old version of our driver	14:57
	i fixed a bug where docs for rcs werent generated	14:57
	so this old one got created	14:57
	so that was an old old fix	14:57
ikrabbe	on a fresh checkout this absolutely makes no sense and actually cannot happen at all.	14:58
	try another clone into a new directory	14:58
	← dermoth\|home left	14:59
	← Zespre left	14:59
ikrabbe	you should even be able to clone from your local copy	14:59
	← Sebo left	14:59
	→ dermoth\|home joined	14:59
	→ Zespre joined	15:00
Silex	fatal: ambiguous argument 'foo': both revision and filename	15:00
	I wanted to do git cherry-pick foo	15:00
	how do I specify that I want the branch and not the filename?	15:00
	tried "git cherry-pick foo --"	15:01
lugzer	hide, i'm trying to troubleshoot an issue my friend has - he makes a change in a file, commits & pushes in. then another change to the same file, commit, and when pushing he needs to resolve a conflict with this same file. when i looked at history of changes, it looks like he didn't get fast-forwarded after first push.. any ideas why is this happening? this is Eclipse & Egit.	15:01
cmn	use -- to separate	15:01
	or use the real name of the branch	15:01
Silex	-- only for for the file case	15:01
lugzer	(hide, sorry i wanted to write "hi")	15:01
Silex	cmn: what is the real name?	15:01
cmn	-- is used to separate reivions from filees	15:01
Silex	cmn: I know, but -- isn't helping there	15:01
	→ nor5trom joined	15:02
cmn	the real name depends on what foo is	15:02
Silex	a local branch	15:02
cmn	if it's a local branch, it's refs/heads/foo	15:02
	← cooloney left	15:02
Silex	ok, thanks	15:02
cmn	or you can use foo~0 to make sure git knows you mean a ref	15:02
	← mmc1 left	15:03
Silex	nice trick	15:03
	← rchavik left	15:03
	← SHAGGSTaRR left	15:04
	← angelsl left	15:05
	← Zespre left	15:06
	→ madsy joined	15:07
	← madsy left	15:07
	→ madsy joined	15:07
	→ torjus_ joined	15:08
	→ Araxia joined	15:09
	← Araxia left	15:10
	→ SHAGGSTaRR joined	15:11
	→ codeFiend joined	15:11
	← cbreak-work left	15:12
	→ Zespre joined	15:12
	→ dinesh6654 joined	15:14
	→ flargh2 joined	15:14
	→ dinesh6654_ joined	15:16
	→ UnsignedCode joined	15:18
	← dinesh6654 left	15:19
charon	Silex: umm, which git version is this? i did 'git branch README' in my git.git, and any style of calling 'git cherry-pick README' interprets it as the revision. yes, even 'git cherry-pick -- README'	15:20
	daethorian → thiderman	15:20
	← eijk left	15:22
	→ eijk_ joined	15:22
	→ DanyO83 joined	15:23
	→ aantix joined	15:24
	← torjus_ left	15:24
	→ uicoded joined	15:24
	→ apok joined	15:24
	← aantix left	15:24
	→ aantix joined	15:24
	← skoop left	15:25
	→ skoop joined	15:25
Silex	charon: git version 1.7.9.5	15:25
	← arvind_khadri left	15:25
	← MetaCosm left	15:26
Silex	charon: http://codepad.org/j4RMFtPB	15:27
	→ iori joined	15:27
	← iori left	15:27
	→ kenperkins joined	15:27
EugeneKay	charon - don't use that as a branch name :-p	15:27
charon	EugeneKay: huh?	15:27
	→ SirCmpwn_ joined	15:27
	→ iori joined	15:27
EugeneKay	README	15:27
charon	EugeneKay: we're discussing the case of collisions. of course i am provoking a collision.	15:27
	→ axl__ joined	15:27
Silex	here the vilain in question was "tmp", I forgot I had a subdirectory named like this	15:28
	EugeneKay crawls back under rock	15:28
Silex	my little testcase shows clearly the problem tho	15:28
	← AaronMT left	15:28
EugeneKay	I would suggest using the full refs/heads/Foo syntax in concert with the dashes	15:28
Silex	EugeneKay: we know the solutions, we wonder about why it happens on my machine and not on charon's one	15:29
	SirCmpwn_ → SirCmpwn	15:29
	→ jacobat joined	15:29
charon	Silex: yeah, it was fixed in 6d5b93f2 and went into v1.7.10.2	15:29
Silex	probably simply the git version	15:29
	charon: aight, thanks	15:29
	← neurodrone left	15:29
charon	(and v1.7.11 also)	15:29
Silex	charon: I wonder why the -- version still uses the ref tho, maybe that is a bug	15:30
	← apok left	15:30
	→ nyuszika7h joined	15:30
	← erynofwales left	15:30
	← flijten left	15:30
nyuszika7h	hi, anyone know how can I have multi-line commit messages on Cloud9? \n doesn't seem to work.	15:30
	→ stkrzysiak_ joined	15:30
	→ AaronMT joined	15:30
cmn	nyuszika7h: you should ask cloud9	15:30
charon	Silex: yes, but since the correct fix is already in, i'm not bothered ;)	15:30
	← stkrzysiak_ left	15:31
Silex	charon: oh you mean this is already fixed? nice	15:31
	← axl_ left	15:31
	axl__ → axl_	15:31
charon	Silex: well as i said, starting at v1.7.11 and v1.7.10.2 it simply does not accept any file arguments any more	15:31
nyuszika7h	cmn: I asked in #cloud9ide now, waiting for answer - thanks	15:31
Silex	you said it interprets it as the revision	15:32
	→ vpetro joined	15:32
charon	Silex: so it's slightly inconsistent with other usage of -- in git, but since you cannot give file arguments to cherry-pick, it should be ok	15:32
	→ Synthead joined	15:32
charon	Silex: any arg is now parsed as a revision	15:32
Silex	to me if you write -- FOO it'd fail if there's no file named FOO	15:32
	← skorgon left	15:32
Silex	but I guess it's not that evil	15:32
	→ MetaCosm joined	15:32
	← MetaCosm left	15:32
	→ MetaCosm joined	15:32
Silex	gotta go, bye & thanks	15:32
garo	If i want to completely clean my gitrep, i normally do this: "rm -rf *" (so that only .git and other hidden files/dirs still remain) followed by "git diff \| patch -p1 -R" to restore all the files.	15:33
tango_	Silex: cherry pick does not accept file arguments, so why should it try parsing the thing as a file name	15:33
garo	this works, but has 2 problems:	15:33
	→ torjus_ joined	15:33
tango_	garo: git clean	15:33
Silex	garo: why not git reset --hard?	15:33
	wait, git clean is even better	15:33
	gah gotta go :)	15:33
charon	garo: you actually need both	15:33
garo	ah, thanks	15:33
	charon: ?	15:34
	← nor5trom left	15:34
garo	both is 'git clean' and ... ?	15:34
charon	to both scrap all untracked files and scrap all uncommitted work in tracked files, you need both 'git clean ...' and 'git reset --hard' (or 'git checkout -- .')	15:34
	← Davey left	15:34
	→ ingsoc joined	15:34
tango_	garo: and git reset --hard	15:34
	git clean removes untracked files	15:34
charon	garo: fill in the ... when you are confident that you're not losing anything ;)	15:34
tango_	git reset resets the tracked file	15:34
charon	garo: also note that there is no safety net in either one	15:34
	all of that data is irretrievably lost	15:35
	gitinfo set mode: +v	15:36
garo	will i lose new commits if'm not at the HEAD commit ?	15:36
charon	!HEAD	15:36
gitinfo	HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it serves a different function: it tells clients which branch to checkout initially after cloning. HEAD is not something that exists separately for every branch; that's a common misunderstanding.	15:36
	gitinfo set mode: +v	15:37
ingsoc	scenario: server, and 2 users, user A pushes a new branch to server, user B does fetch, what does user B need to do to be able to work on the new branch	15:37
	← dinesh6654_ left	15:37
garo	sorry i mean "will i lose new commits if'm not at the newest commit ?"	15:37
charon	garo: actually i wanted it to say: ... and HEAD is also not the "global newest commit" (a concept which by itself is already wonky)	15:37
	garo: but no, resetting without a branch arg does not affect history/branches	15:37
	s/branch arg/commit arg/	15:37
	← Fullmoon left	15:38
garo	ok, thanks !	15:38
	← MaximB_ left	15:38
charon	ingsoc: presumably check out a local branch that starts at the remote one, such as by 'git checkout -b name origin/name' or with sufficient dwimmery even just 'git checkout name'	15:38
	← Mannequin left	15:39
	→ Mannequin joined	15:40
ingsoc	charon: ah ok so you can just do a new branch with reference to the origin branch	15:40
	cheers	15:40
	← ipalaus left	15:40
	→ nor5trom joined	15:41
ingsoc	charon: 'git checkout name' would infer origin/name if name hadn;t already been used as a local branch ?	15:41
	→ nadavoid_ joined	15:41
charon	ingsoc: yes, there are also a bunch of checks to ensure that it is unique IIRC	15:41
	→ dinesh6654 joined	15:41
	← papegaaij left	15:42
	← jacobat left	15:42
	→ ISF joined	15:42
	→ dsirijus joined	15:43
	← msmithng left	15:44
	→ thelazydeveloper joined	15:44
ingsoc	charon: nice, I beginning to like git	15:45
	:)	15:45
	← arkiver left	15:46
	← davesag left	15:47
	→ jcao219 joined	15:47
	← nadavoid_ left	15:47
	← alexisabril left	15:47
	→ luxurymode joined	15:48
	← diegoviola left	15:49
	→ metcalfc_ joined	15:49
garo	"git clean" gives me a couple lines like "Not removing somesubdirectory/"	15:50
milki	-Fdx!	15:50
	→ Fullmoon joined	15:51
	→ jim0203 joined	15:51
	→ tomislater joined	15:52
	← dinesh6654 left	15:52
	← Vert left	15:52
garo	strange that -d isn't on by default...	15:53
milki	not really	15:54
	→ hwrd\|work joined	15:55
milki	see description of git-clean	15:55
	says untracekd files	15:55
	← thiago left	15:56
	← iori left	15:57
	→ jcp joined	15:57
	← jcp left	15:57
	→ jcp joined	15:57
	← javawizard left	15:58
	← vpetro left	15:58
	→ ppppaul joined	15:58
	→ Exposure joined	15:59
	→ neurodrone joined	16:00
	← neurodrone left	16:00
	→ neurodrone joined	16:00
	← senny left	16:01
	← torjus_ left	16:02
	→ etcetera joined	16:03
	← robotmay left	16:04
	→ torjus_ joined	16:04
	→ boombatower joined	16:04
	← etcetera left	16:04
	← thomasfr left	16:04
	← Exposure left	16:04
	→ zmuser3 joined	16:05
	→ etcetera joined	16:05
	← nor5trom left	16:05
	← whitman left	16:06
	→ cybersphinx joined	16:07
	→ apok joined	16:07
	→ msmithng joined	16:07
	← timj1 left	16:07
	← styx_ left	16:07
	→ branduren joined	16:08
	← bartek left	16:08
	→ mmc1 joined	16:08
	→ anabelle joined	16:09
	→ nor5trom joined	16:10
	→ jwmann joined	16:10
	← jwmann left	16:10
	→ jwmann joined	16:10
	← jwmann left	16:10
	→ jwmann joined	16:11
	← jwmann left	16:11
	→ jwmann joined	16:11
	← jwmann left	16:11
	→ jwmann joined	16:11
	← jwmann left	16:11
zmuser3	seriously?	16:12
	→ jwmann joined	16:12
	→ private joined	16:12
	← jwmann left	16:13
EugeneKay	Defaulting to -d would cause sooooo many problems with people who didn't really want to clean	16:13
	private → Guest46112	16:13
	← apok left	16:13
EugeneKay	It's almost as bad as `mkdir /\*` and then waiting for a sysadmin to find it	16:13
	← dpino left	16:14
	← jargon- left	16:15
	→ dpino joined	16:15
	→ maletor joined	16:15
	→ styx_ joined	16:15
	← dhruvasagar left	16:16
	→ fluxdude_ joined	16:16
	← fluxdude_ left	16:16
	→ fluxdude_ joined	16:16
	← fisted left	16:16
	← hwrd\|work left	16:17
	→ LucasTizma joined	16:17
	← fluxdude left	16:17
	fluxdude_ → fluxdude	16:17
	← les_sylvains left	16:17
ingsoc	when you do a git fetch this pulls all updates and branches, when you do a git push, you are pushing the commits from the branch you are currently working on (local head)	16:17
	?	16:17
	← PetrMotejlek left	16:18
charon	ingsoc: man git-config, push.default	16:18
gitinfo	ingsoc: the git-config manpage is available at http://git-scm.com/docs/git-config.html	16:18
	→ fisted joined	16:18
	→ jwmann joined	16:18
	← jwmann left	16:18
charon	ingsoc: as for fetch, with no args it will fetch (*) the remote associated to the current branch	16:19
	(*) don't use 'pull' here, because !pull	16:19
gitinfo	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/	16:19
	→ jwmann joined	16:19
	← jwmann left	16:19
	→ jwmann joined	16:19
	← jwmann left	16:19
	← Advocation left	16:20
	→ rohan32 joined	16:21
	← Fullmoon left	16:21
	→ Vert joined	16:21
	→ goshawk joined	16:22
	← MetaCosm left	16:22
	→ jaseemabid joined	16:23
	→ nightcrawler786 joined	16:23
	→ skorgon joined	16:23
	nor5trom → ronald35	16:23
	← aruiz left	16:23
	← mklappstuhl left	16:24
	→ yoklov joined	16:26
	← LimeBlast left	16:26
	← xwalk left	16:27
	← ISF left	16:27
	← mmc1 left	16:28
	→ xwalk joined	16:28
	→ Goplat joined	16:30
	← anabelle left	16:30
	← klj613 left	16:30
	→ martinjlowm joined	16:30
	← lugzer left	16:31
	→ Davey joined	16:31
	← stevedomin left	16:31
	adhawkins → adhawkins-away	16:31
	→ Shusshu joined	16:32
	← Shusshu left	16:32
	→ ferdna joined	16:33
	→ rmr joined	16:33
	→ thiago joined	16:33
	→ aruiz joined	16:35
	← skorgon left	16:35
	← blami_ left	16:37
	← mishok13 left	16:37
	→ ipalaus joined	16:38
	→ kerrick joined	16:39
	← maletor left	16:39
	← brentratliff left	16:39
	← codeFiend left	16:40
	→ MetaCosm joined	16:40
	← MetaCosm left	16:40
	→ MetaCosm joined	16:40
	← aruiz left	16:41
	rohan32 → rohan32\|away	16:41
	← jcromartie left	16:41
	← thanpolas left	16:42
	→ skorgon joined	16:43
	← LucasTizma left	16:44
	→ codeFiend joined	16:45
	→ tewecske joined	16:45
	tizzo-afk → tizzo	16:46
	→ bartek joined	16:46
	← rehat left	16:46
	→ Exposure joined	16:47
	→ Sym3tri joined	16:47
	→ maletor joined	16:48
	← twigmorewelsh left	16:49
	→ patrick85 joined	16:49
	→ Dave^\| joined	16:49
	→ apok joined	16:50
	→ wo66le joined	16:50
	← yoklov left	16:50
	→ eletuchy joined	16:51
	← metcalfc_ left	16:52
	→ jceb_ joined	16:52
	← scttnlsn left	16:52
	tokkee_ → tokkee	16:53
	← Exposure left	16:53
	→ aruiz joined	16:53
	→ Exposure joined	16:53
	→ converge joined	16:53
	→ chester_ joined	16:55
	← dr_lepper left	16:55
	→ aspotashev joined	16:55
	← ronald35 left	16:56
	← Exposure left	16:56
	← barneybook left	16:57
	← genehack left	16:57
	← achadwick left	16:57
	← derekpioneer left	16:57
	→ Exposure joined	16:58
	heoa_ → heoa	16:58
	→ thirdknife_ joined	16:59
	← thirdknife_ left	16:59
	← shruggar1 left	16:59
	→ mmc1 joined	17:01
	→ jargon- joined	17:02
	← giallu left	17:02
	→ les_sylvains joined	17:02
	→ twigmorewelsh joined	17:02
	→ hwrd\|work joined	17:02
	← Exposure left	17:03
	jjbohn → jjbohn\|afk	17:04
	← chuckharmston left	17:04
	← milian left	17:05
	→ Exposure joined	17:05
	→ barneybook joined	17:05
	← bgerber left	17:06
	← ShooterMG left	17:06
	→ dinesh6654 joined	17:06
	← beneggett left	17:07
	→ duckxx joined	17:07
	→ tplaner_ joined	17:08
	← torjus_ left	17:08
	← rurufufuss left	17:09
	← boombatower left	17:09
	← Vert left	17:10
	→ bgerber joined	17:10
	← yaymukund left	17:10
	→ torjus_ joined	17:10
	→ starlays joined	17:11
starlays	hello to all, how can i add file and commit in the same time? can it be done?	17:11
	← jaseemabid left	17:12
charon	starlays: git add file && git commit ;)	17:12
	→ imachuchu joined	17:13
	← makerbreakr left	17:13
	→ uwjesd joined	17:13
starlays	charon: a, ok, i thought that there is an 1 in 9999 command :P	17:13
cmn	commit accepts paths, but it might not do what you want	17:14
	← bgerber left	17:14
cmn	starlays: it's explained in point 3 of man git commit	17:14
gitinfo	starlays: the git-commit manpage is available at http://git-scm.com/docs/git-commit.html	17:14
	← apok left	17:15
	→ rtjure joined	17:16
	→ apok joined	17:16
	→ bgerber joined	17:17
	→ cmullican joined	17:17
starlays	cmn: ok, thank you	17:17
	← duckxx left	17:19
	→ milian joined	17:19
	← starlays left	17:20
	← dsirijus left	17:21
	→ yosinof joined	17:21
Ntrepid	Hi all, may I ask you what the difference is between `git reset --hard HEAD~` and `git reset --hard HEAD^` ? I couldn't find anything in the web...	17:22
	← fornext left	17:22
	→ mischief joined	17:22
cmn	none	17:23
mischief	hey folks, what is the best way to backup/archive multiple git repos into one? maybe using bup..	17:23
cmn	Ntrepid: see man gitrevisions for the explanation of what they mean;	17:23
gitinfo	Ntrepid: the gitrevisions manpage is available at http://git-scm.com/docs/gitrevisions.html	17:23
cmn	in your case, both talk about the same commit (the first parent)	17:23
	← Psycho_pr left	17:24
imachuchu	mischief: are you trying to backup, or combine?	17:24
	→ Psycho_pr joined	17:25
Ntrepid	Thank you	17:25
	I'll have a look at the manpages	17:25
	→ tworkin joined	17:25
imachuchu	mischief: backup: bundle them togther then gzip the bundles. Combine into one: fetch and merge	17:25
	← etcetera left	17:25
imachuchu	mischief: well tar + gzip the bundles	17:26
	← ajpiano left	17:26
cmn	gzip the bundle? that won't help	17:26
	unless you have a gazillion refs	17:26
cbreak	just simply fetching should be enough	17:27
	no need to merge	17:27
	→ derekpioneer joined	17:28
	→ afuentes joined	17:28
	← UnknownCoder left	17:28
	← nirix left	17:28
	→ erynofwales joined	17:29
imachuchu	cmn: the refs get compressed too (so lots of tags automatically get combined to save space), the tar+gzip is to put all of the bundles together, and then it may save space (reducing the redundency between bundles)	17:29
	→ Jay_Levitt joined	17:29
imachuchu	cbreak: yeah, actually, you wouldn't need to merge would you	17:29
	← revagomes left	17:30
cmn	that's what I said about the gazillion refs; but the rest is going to be very un-compressable	17:30
cbreak	tar won't compress anyway	17:30
	no need to gzip the tar	17:30
	← amcsi_work left	17:30
	← juvenal left	17:30
cmn	right	17:30
cbreak	no need to tar either I guess	17:30
	→ todd_dsm joined	17:30
	← ReekenX left	17:30
cbreak	hmm... there's probably also no need to combine them	17:30
	is there a point in anything?!?	17:31
	→ metcalfc_ joined	17:31
	gitinfo set mode: +v	17:31
	← steve6 left	17:31
	OMGOMG_ → OMGOMG	17:31
cmn	tar lets you have all your bundles in one file, so it's harder to keep track of them	17:32
	harder to loose track	17:32
	← freeed left	17:33
mischief	imachuchu: but what about bup?	17:33
imachuchu	mischief: it was always something I had wanted to look into, just never got around to it/got it working in the time I had	17:34
	→ freeed joined	17:34
	← skorgon left	17:35
mischief	i think i may try it	17:35
	i think it will work	17:35
	and also deduplicate files	17:35
	since basically all of the repos i have share files that have little or no modification to them	17:35
	→ chuckharmston joined	17:36
	→ ReekenX joined	17:36
tworkin	what precautions should i take if i want to commit symlinks in my project? we do have a windows build, which doesnt need the symlinks	17:36
cbreak	tworkin: they'll be files containing the path on windows	17:36
	→ SkAzZ joined	17:36
cbreak	make sure the symlinks are relative	17:37
tworkin	`ln -s ../../other/file link` instead of `ln -s /path/to/repo/other/file link` is sufficient for that?	17:37
cbreak	think so. Not like I tried... but you can try :D	17:38
tworkin	cool. thanks	17:38
	← SkAzZ2 left	17:38
tworkin	i can also create them in our 'repo ready' script, but ill see how this goes	17:38
	→ parolin joined	17:40
	← bgerber left	17:40
	← dpino left	17:40
	→ sq-one joined	17:41
	→ revagomes joined	17:43
	→ fork[you] joined	17:43
	← fork[you] left	17:43
	← gusnan left	17:44
	→ jaseemabid joined	17:45
	← jceb_ left	17:45
	→ bgerber joined	17:45
	→ SkAzZ1 joined	17:46
	→ pdtpatrick joined	17:47
	← SkAzZ left	17:47
	→ opus__ joined	17:48
	→ LucasTizma joined	17:48
	→ opus joined	17:48
	← berserkr left	17:50
	← chuckharmston left	17:50
	→ titaniumNoob joined	17:50
	→ phishy joined	17:50
	→ sawdisk joined	17:51
	→ Stoob_ joined	17:51
	→ Hasbro joined	17:51
	→ yaymukund joined	17:53
	← converge left	17:53
	← msmithng left	17:55
	← styx_ left	17:55
	← sq-one left	17:55
	← Vile left	17:56
	→ msmithng joined	17:56
	← Ntrepid left	17:58
	→ shennyg joined	17:59
	← john_anderson left	17:59
	← rmr left	18:00
	→ alexisabril joined	18:01
	→ ajpiano joined	18:01
	← ajpiano left	18:01
	← Synthead left	18:02
	→ khmarbaise joined	18:02
	→ towski joined	18:03
	→ Synthead joined	18:03
	→ stevedomin joined	18:04
	→ ajpiano joined	18:04
	← towski left	18:05
	→ berserkr joined	18:05
	→ glennpratt_ joined	18:06
	→ diegoviola joined	18:06
	← glennpratt left	18:06
	→ converge joined	18:07
	jjbohn\|afk → jjbohn	18:07
	→ styx_ joined	18:08
	← flargh2 left	18:08
	← glennpratt_ left	18:09
	→ joshvermaire joined	18:09
	→ tqmz joined	18:09
	Marcux83\|away → Marcux83	18:09
	→ glennpratt joined	18:10
	← twigmorewelsh left	18:12
	→ twigmorewelsh joined	18:13
	→ gusnan joined	18:14
	← Nicarlo left	18:14
	→ adammokan joined	18:15
	→ eletuchy_ joined	18:16
	← G__81 left	18:16
	← toed left	18:17
	→ pantsman joined	18:17
	← pantsman left	18:17
	→ pantsman joined	18:17
	← converge left	18:19
	← eletuchy left	18:20
	← bartek left	18:21
	→ genehack joined	18:21
	→ joephlius joined	18:22
	→ solidus-river joined	18:22
solidus-river	good sirs, git is amazingly better than mercurial, thank you	18:22
	← kermit left	18:24
	→ Godslastering joined	18:24
	← joephelius left	18:25
	→ MacDada joined	18:25
	→ converge joined	18:25
imachuchu	solidus-river: glad you agree, but why do you say so?	18:25
MacDada	http://stackoverflow.com/questions/12097853/utf8-characters-allegedly-changed-in-netbeans-diff-when-using-git <<< do you think this might be connected to my git config or is it just NetBeans problem?	18:25
	← msmithng left	18:26
	→ bartek joined	18:26
cbreak	changed in diff?	18:26
solidus-river	imachuchu: i'm used to using the git flow branching module and keeping some changes in flux in my current index and pushing them to appropriate places or ammending commits as i go to organize	18:26
	→ towski joined	18:26
	← Davey left	18:26
solidus-river	this is so much better than the place i jsut started workings' methodology of using mercurial patch queues	18:26
	→ msmithng joined	18:26
solidus-river	and all their arguments against it can all be fixed by a better branching method	18:27
cmn	MacDada: that's probably netbeans not knowing how to deal with unicode chars	18:27
	← towski left	18:27
solidus-river	and i dont even want to think whats going to happen if this place ever needs more than one dev to work on a project at a time	18:27
	← converge left	18:27
	← iocor left	18:27
solidus-river	and a full copy for each branch? or you just give up bieng able to see branches via names?	18:27
	either i'm missing a LOT of the features of mercurial or it is quite far behind	18:28
	→ juvenal joined	18:28
	→ towski joined	18:28
solidus-river	and i figured i'd get more clear response from here than from #mercurial, didn't want to start up flames	18:28
	I'm guessing someone from here has previously used mercurial?	18:28
	← towski left	18:29
	→ Davey joined	18:29
cmn	MacDada: if you check the bytes that make up the file, you'll probably find that they have changed	18:29
imachuchu	solidus-river: I haven't, but I like looking at the major DVCS and seeing how they do things differently	18:30
	→ CannedCorn joined	18:30
solidus-river	imachuchu: hmm, mercurial seems to be easier to conceptualize but horrible for pracice of more than one person working on one area at a time, and it looks like anyone can push changes that completly overwrite others	18:31
	the only benefit i see is that it makes it much more handfed to modify history before you push to a repo so your commits are cleaner	18:31
	but like.. learn to commit eh?	18:31
	→ converge joined	18:33
imachuchu	solidus-river: and if you really want an enforced clean history with git, well use a different workflow	18:33
	→ kermit joined	18:34
imachuchu	solidus-river: like a general-lieutenant workflow	18:34
	← axl_ left	18:36
	→ axl_ joined	18:36
	→ aselder joined	18:36
	← aselder left	18:36
	← LucasTizma left	18:37
	→ mabrand joined	18:38
	→ Vile joined	18:39
	← mabrand left	18:40
	← dreiss left	18:40
	→ i42n joined	18:40
	← wo66le left	18:41
	→ dreiss joined	18:41
	← twigmorewelsh left	18:41
	→ osmosis joined	18:41
	→ ehsan_ joined	18:42
	→ darren joined	18:42
	← adammokan left	18:42
	→ mabrand joined	18:42
	← i42n left	18:43
	← ehsan left	18:43
	→ nosalt joined	18:45
	← agileadam left	18:46
nosalt	I had some uncommitted changes in my git repo, and I deleted some files erroneously. I can still see it in the git log, but any way to get them back without loosing the uncommitted changes as well?	18:46
FauxFaux	nosalt: git checkout HEAD path/to/file	18:47
	← paolooo left	18:47
	→ flijten joined	18:47
	← letharion left	18:47
	→ bluethud9765 joined	18:47
nosalt	Thanks...	18:47
	That taught me a lesson about committing more frequently. :'(	18:48
	→ arighi joined	18:48
imachuchu	nosalt: commit early, commit often, you can always change your private history later (as long as it's commited)	18:48
	gitinfo set mode: +v	18:49
CannedCorn	is there any way to introspect the directory structure on github via client side js	18:49
	← arighi left	18:49
nosalt	imachuchu: I know now. :\|	18:49
	← juvenal left	18:49
	→ Eridius_ joined	18:50
	← patrick85 left	18:50
	← berserkr left	18:52
	← yosinof left	18:52
	← nosalt left	18:52
	→ Ulrik joined	18:52
	gitinfo set mode: +v	18:54
	→ patrick85 joined	18:54
	→ letharion joined	18:54
	→ duckxx joined	18:55
	→ boombatower joined	18:57
	← eletuchy_ left	18:57
	← dreiss left	18:59
	← jaseemabid left	18:59
	→ etcetera joined	18:59
	← neurodrone left	18:59
	← hellopat left	19:00
	← kerrick left	19:00
	← mabrand left	19:00
Ulrik	I am trying to get a git-note to get copied in a cherry-pick, but I cannot get it work. Does anyone here have any insights on this matter that could help? I have managed to get notes copied successfully during rebase, but cherry-pick seems to be a different matter.	19:01
	← solidus-river left	19:01
	→ mrOrangeChuck joined	19:01
	→ neurodrone joined	19:01
	→ jaseemabid joined	19:01
	← bluethud9765 left	19:02
	← Progster left	19:02
	→ nightmutewrack joined	19:02
	→ mabrand joined	19:03
	→ jonez joined	19:03
charon	Ulrik: i didn't consider cherry-pick rewriting, so it doesn't do that. write a patch or something if you have a use-case, or copy them manually using 'git notes copy A B'	19:04
	→ twigmorewelsh joined	19:04
	← nightmutewrack left	19:05
	← joshvermaire left	19:05
	→ ISF joined	19:06
	→ gluxon joined	19:06
	→ artnez joined	19:07
gluxon	Hi. I'm having this issue with git commits from different users. One of the contributors for a project of mine keeps making commits that erase the entire file, and re-add everything. This is with changes to 1 or 2 lines.	19:07
	I think the issue is git treating file encoding formats differently?	19:07
	← Hasbro left	19:07
	→ Hasbro joined	19:07
	← Maccer left	19:08
	→ FeelingLuckyPun joined	19:08
canton7	gluxon, sounds a lot like it. !crlf	19:08
gitinfo	gluxon: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	19:08
	← FeelingLuckyPun left	19:08
	→ hellopat joined	19:08
canton7	also https://help.github.com/articles/dealing-with-line-endings	19:09
gluxon	Thank you. I'll suggest that.	19:09
canton7	you can create the .gitattributes file yourself	19:10
	→ lmfao00 joined	19:11
zmuser3	trying out git p4 clone (1.7.12) and getting errors: http://pastebin.com/TnMk5KZh git p4 sync seems to work ok, is git p4 sync + git checkout pretty much the same thing as git p4 clone?	19:11
	← Vile left	19:12
	adhawkins-away → adhawkins	19:13
Ulrik	Charon, thank you, I will try to make do with git notes copy.	19:13
	→ adityamenon joined	19:13
	← chrisgeorge left	19:14
	← warthog9 left	19:14
	← Ulrik left	19:14
	← converge left	19:14
	→ mattalexx joined	19:15
	← mattalexx left	19:15
	→ mattalexx joined	19:15
	→ Progster joined	19:15
mattalexx	I know I can do `git reset --hard [commit-sha]` but how can I define that commit as "the commit where the remote branch remotename/branchname is"?	19:16
canton7	remotename/branchname	19:16
	you said it	19:16
	← axl_ left	19:16
	← gluxon left	19:17
	← kaen left	19:18
	adhawkins → adhawkins-away	19:18
	→ kaen joined	19:18
	→ chrisgeorge joined	19:19
	← Lgb left	19:20
	← palm_vue left	19:20
	← bizhanMona left	19:20
	→ axl_ joined	19:20
mattalexx	canton7, Thanks. Should have tried before I posted.	19:20
	← mabrand left	19:21
	← DanyO83 left	19:21
	→ palm_vue joined	19:21
	→ Lgb joined	19:21
	→ bizhanMona joined	19:21
	← kaen left	19:22
	→ lb joined	19:22
	→ kaen joined	19:22
	← kaen left	19:22
	→ jaequery joined	19:22
	→ warthog9 joined	19:23
	→ Sebo joined	19:24
	→ kaen joined	19:24
	→ ijuma joined	19:25
	→ chuckharmston joined	19:26
	← warthog9 left	19:26
	← noecc left	19:29
	→ beneggett joined	19:29
	← torjus_ left	19:30
	← fireh left	19:31
	← beneggett left	19:31
	→ beneggett joined	19:32
	← bball- left	19:32
	← ReekenX left	19:32
	→ OOPMan joined	19:33
	← ska-fan left	19:33
	← nwest left	19:33
	→ ska-fan joined	19:33
	→ Xizor joined	19:36
	→ iliketurtles joined	19:37
	→ juvenal joined	19:38
	→ torjus_ joined	19:38
	→ bball- joined	19:38
	→ The24z joined	19:39
The24z	Hi everybody, can somebody briefly tell me where the pointer to the commit for a submodule is stored (in the superproject)	19:40
	I might have to manually manipulate it	19:40
	← flijten left	19:40
	← MacDada left	19:41
	← zackiv31 left	19:43
The24z	anybody?	19:43
	← microcolonel left	19:43
	← lb left	19:45
	← marthinal left	19:46
	→ prettyrobots joined	19:47
_ikke_	The24z: It is probably stored in some tree object, not sure how exactly	19:47
	The24z: But why do you think you need to manually tinker with it?	19:48
	→ zackiv31 joined	19:48
	→ warthog9 joined	19:50
	← styx_ left	19:50
	← Khisanth left	19:50
The24z	It pointed to a commit that doesn't exist… not sure how that happened	19:50
	Also on another note: If I change anything inside the submodules directory (inside the superproject) and I push back to the submodules origin, I assume I do have to also commit the superproject to update the pointer? Am I right?	19:51
	→ Khisanth joined	19:51
	→ FernandoBasso joined	19:51
	← khmarbaise left	19:52
	→ thomasfr joined	19:53
	← boombatower left	19:55
	← twigmorewelsh left	19:56
	→ fly9_ joined	19:56
	← fly9_ left	19:56
_ikke_	The24z: yes	19:56
	← fly9 left	19:56
	← zackiv31 left	19:56
	→ fly9_ joined	19:56
The24z	so the workflow would be	19:57
	→ zackiv31 joined	19:57
	→ dbck joined	19:58
	→ entrenador joined	19:58
The24z	git commit -am "..." inside the submodule	19:58
	then push	19:58
	cd into the super project	19:58
	add the submodule folder	19:58
	commit	19:58
	push	19:58
	?	19:58
	→ olliejudge joined	19:58
	→ twigmorewelsh joined	19:59
	← entrenador left	19:59
	→ entrenador joined	19:59
	← olliejudge left	20:00
	← entrenador left	20:00
	→ olliejudge joined	20:00
	← adityamenon left	20:01
	→ Maccer joined	20:01
	→ boombatower joined	20:02
	← pppaul left	20:02
	← dov23 left	20:03
	→ ph^_ joined	20:03
	← zz_jcao219 left	20:04
	← varg left	20:04
_ikke_	The24z: exactly	20:05
	← ph^ left	20:06
	← erynofwales left	20:06
	→ stevedomi joined	20:06
	→ pppaul joined	20:07
	← pppaul left	20:07
	← stevedomin left	20:07
	← thomasfr left	20:07
	← chuckharmston left	20:07
	← patrick85 left	20:07
	→ pppaul joined	20:07
	← pppaul left	20:07
	→ pppaul joined	20:08
	← pppaul left	20:08
	→ pppaul joined	20:08
	← pppaul left	20:08
	→ ben225 joined	20:09
	→ FreeArtMan joined	20:09
	→ pppaul joined	20:09
	← pppaul left	20:09
	→ styx_ joined	20:10
	→ lotus joined	20:10
	→ pppaul joined	20:10
	← pppaul left	20:10
	← beneggett left	20:10
	ben225 → beneggett	20:10
lotus	hey, I want to remove something from the repository but I don't want a checkout -f to delete it -- do I have an option outside of letting checkout -f delete it and then add the file to the folder manually?	20:10
	→ pppaul joined	20:10
	← pppaul left	20:10
	→ chuckharmston joined	20:10
	← chuckharmston left	20:11
	→ chuckharmston joined	20:11
	→ pppaul joined	20:11
	← pppaul left	20:11
	→ pppaul joined	20:12
_ikke_	lotus: git rm --cached	20:12
	→ ephesius joined	20:12
	← hellopat left	20:14
	→ hellopat joined	20:15
	→ thomasfr joined	20:17
	← _iron left	20:17
	← torjus_ left	20:18
	→ erynofwales joined	20:18
	← geekbri left	20:21
	→ j416 joined	20:21
	← TheHaven left	20:22
	→ mabrand joined	20:22
	→ shruggar joined	20:24
	← ph^_ left	20:25
mischief	bash-3.2$ find . -size +10M	20:25
	./.git/objects/pack/pack-ce945118ff585172342d362c9eae5465e47877cb.pack	20:25
	→ madewokherd joined	20:25
mischief	how do i identify this git hash and what objects are in it	20:25
	→ DanyO83 joined	20:25
mischief	i tried to visit that commit but i cannot, at least in gitk	20:25
	→ ph^ joined	20:25
	← kermit left	20:26
_ikke_	mischief: It's not a commit, it's a pack	20:26
	→ nicoulaj joined	20:26
	← FreeArtMan left	20:26
mischief	_ikke_: understood. how do i identify which commits pertain to it	20:26
	← uwjesd left	20:26
	← j416 left	20:27
_ikke_	Well, you'd have to unpack them I guess	20:28
	→ drale2k joined	20:28
	← titaniumNoob left	20:28
	← drale2k left	20:28
mischief	_ikke_: how is that done	20:28
	← lresende left	20:28
	→ yoklov joined	20:29
	← ahayweh left	20:29
	→ mishok13 joined	20:29
	← longbeach left	20:29
	← ph^ left	20:30
	→ ShooterMG joined	20:30
_ikke_	Not sure if it's possible, but you might try git unpack-objects -n /.git/objects/pack/pack-ce945118ff585172342d362c9eae5465e47877cb.pack	20:32
	→ athit joined	20:32
mischief	_ikke_: https://stubbisms.wordpress.com/2009/07/10/git-script-to-show-largest-pack-objects-and-trim-your-waist-line/	20:32
imachuchu	what are you trying to do exactly, just make smaller packs or what?	20:34
	← olliejudge left	20:35
	← patrick99e99 left	20:35
mischief	imachuchu: no	20:35
	there is a 100M file in my git repo	20:36
	and i am trying to use filter-branch to remove it	20:36
	but it persists	20:36
	maybe i need to git gc	20:36
	cpg\|away → cpg	20:36
	← Xizor left	20:37
	← CannedCorn left	20:37
	→ andrewmriley joined	20:39
	→ s0ber_ joined	20:39
imachuchu	mischief: so what you are really trying to do is make your repo smaller (by removing things that are no longer referenced, like those commits that have the 100M file)	20:40
mischief	in a sense i guess	20:41
	some idiot put a .gem in the repo	20:41
	and i am trying to fix his mistake	20:41
	← s0ber left	20:41
	s0ber_ → s0ber	20:41
	→ cagedwisdom joined	20:41
	← mabrand left	20:42
	→ kermit joined	20:42
imachuchu	mischief: expire your reflog then git gc, git repack -Ad	20:42
	← thomasfr left	20:43
	→ mahna_mahna joined	20:43
	→ fork[you] joined	20:43
	→ thomasfr joined	20:43
	→ rehat joined	20:44
	→ mabrand joined	20:44
mischief	imachuchu: still there	20:44
	→ FreeArtMan joined	20:44
imachuchu	mischief: yep, looking for the right command to expire the reflog (I've never done it)	20:45
mischief	git reflog expire --all && git gc --aggressive --prune && git repack -Ad	20:45
imachuchu	mischief: yeah, but do you want to expire everything in the reflog	20:45
	← fork[you] left	20:46
mischief	i have no idea, i am a git noobyie	20:46
imachuchu	mischief: "--expire=<someTime>" would allow you to keep some based on time	20:46
	→ jerware joined	20:46
jerware	I don't know how this happened but my local master diverged from the remote master, therefore I can't do a git pull. I though git reset --hard HEAD would help but it didn't. How can I syncronize my local master with origin master ?	20:46
mischief	after the above command, 'git verify-pack -v .git/objects/pack/pack-*.idx \| grep -v chain \| sort -k3nr \| head' still shows a 100M file	20:46
imachuchu	mischief: ok, so the reflog keeps track of where you have been, it's really usefule esp to get you out of problems	20:46
	mischief: and you should !backup before doing anything	20:47
gitinfo	mischief: Taking a backup of a git repository is always a good idea, especially when taking advice over IRC. Usually, the best way to TACTICALLY back up a git repo is `git clone --mirror`. However, some unusual maintenance might require `tar cf repo-backup.tar repodir`. Testing in a clone is also an excellent idea. See also http://sethrobertson.github.com/GitBestPractices/#backups	20:47
imachuchu	mischief: most likely with a simple tar of the repo	20:47
	← uicoded left	20:47
mischief	i think i already blew it away	20:47
imachuchu	mischief: don't use gc --aggressive, it's got problems (just not optimal)	20:47
	mischief: try a git bundle of the repo, does it contain the file (you'll know because it will be really big)	20:48
	← mishok13 left	20:48
	← shruggar left	20:50
mischief	imachuchu: no it's only 700K	20:50
	→ shruggar joined	20:50
	← beneggett left	20:50
	← twigmorewelsh left	20:51
	→ beneggett joined	20:52
	→ dfr\|mac joined	20:52
	← talexb left	20:54
imachuchu	mischief: try "git reflog expire --expire-unreachable=now --all"	20:54
	→ Beelsebob joined	20:55
	→ und3f joined	20:55
mischief	hm	20:55
	imachuchu: that didn't seem to change/do anything	20:55
Beelsebob	So, this is rather off topic, so feel free to tell me to piss off, what I'm wondering, is if anyone happens to know if it's possible to add to someone's pull request on github? I have someone who's contributed a 90% good pull request with a minor issue that I'd like to fix before pulling it in, so that the repo's never in a broken state.	20:55
mischief	is there a way to tell git to recreate packfiles only from objects which have live references	20:55
imachuchu	mischief: mischief well you'll still need to do the git gc; git repack -Ad	20:56
	← Hasbro left	20:56
	→ mishok13 joined	20:56
	← freeed left	20:56
imachuchu	Beelsebob: no idea, check the #github channel?	20:56
mischief	imachuchu: it's still in the packfile :p	20:56
	cpg → cpg\|away	20:56
Beelsebob	imachuchu: ah cheers, I didn't realise there was a #github	20:56
	→ sebastorama joined	20:57
	→ scelis joined	20:57
pppaul	i screwed up a merge	20:57
imachuchu	mischief: ok, wash rise repeat with "git reflog expire --expire=now --all"	20:57
pppaul	so i reset	20:57
	← Anders_J left	20:57
	← cannonball left	20:57
imachuchu	Beelsebob: best of luck!	20:57
pppaul	and now i can't figure out how to merge again	20:57
	← bartek left	20:57
	← les_sylvains left	20:57
imachuchu	jerware: "git reset --hard origin/master" would do that, but what did you commit to your master?	20:58
	← ddelrio1986 left	20:58
imachuchu	pppaul: "can't figure how to merge", like the right command or does it throw an error?	20:58
	← opus__ left	20:58
	← opus left	20:58
mischief	git reflog expire --expire=now --all && git gc --aggressive --prune && git repack -Ad	20:58
	the object is still in the .pack file	20:58
pppaul	well, i tried merging again after i reset	20:58
	and it says there is nothing to merge	20:59
mischief	maybe it is just not possible to make git remove it	20:59
pppaul	it's telling me to commit	20:59
	but my files are old	20:59
	← rwestphal left	20:59
	← phishy left	20:59
	← Beelsebob left	20:59
	→ linguini joined	20:59
	← beneggett left	20:59
pppaul	i think i reset too far	21:00
imachuchu	mischief: it is	21:00
	mischief: I've seen git be unwilling to create a new pack file if it doesn't think that compressing the newest commits would save enough space	21:01
	← mabrand left	21:02
	→ beneggett joined	21:02
pppaul	the git gods have frown upon me	21:03
	← skyf left	21:04
	→ mabrand joined	21:05
linguini	I would like my local repository to contain a handful of persistent differences form the remote repository. E.g. perl -i -lpe 's/badhardcode/goodhardcode/g' file.cc. Is there some way to do this such that my changes to file.cc are never sent when I do 'git push'?	21:05
	→ dov23 joined	21:05
tworkin	linguini: .gitignore ?	21:05
imachuchu	mischief: "git repack -adf"	21:05
pdelvo	add it to the ignore file?	21:05
imachuchu	mischief: and please backup your repo before you do any of this, I've never attempted it but it seems what it should do	21:06
mischief	same	21:06
linguini	tworkin: Hmm, .gitignore would ignore the entire file.cc, though, right? I really want just a 2 line change here, and a 4 line change in there.cc.	21:06
	I know the question is kind of ugly; I'm not sure how to accomplish this in /any/ revision control system.	21:07
	← revagomes left	21:07
	rohan32\|away → rohan32	21:07
linguini	I think one option is to maintain a separate local branch, and constantly merge from the remote repository my private branch. But I'm not sure how much extra typing this will require on a regular basis.	21:08
	→ toddWork joined	21:09
linguini	Conceptually, I suppose I want something similar to applying a patch file after every git pull, and then unapplying the patch before every git push.	21:09
	← thomasfr left	21:10
	→ zastern joined	21:10
	→ thomasfr joined	21:10
toddWork	how can i verify my pre-commit hook is running?	21:11
	← _keith left	21:11
toddWork	(i can't get it to do a mysql dump; the command works from the cli, however)	21:12
	→ torjus_ joined	21:12
	← rtjure left	21:12
imachuchu	mischief: (I can keep this up all day!) "git prune --expire now" then "git repack -adf"	21:12
mischief	imachuchu: no dice	21:13
	btw this is the script i am using to show the bloat in a repo	21:13
	http://sprunge.us/RZLM	21:13
	pdelvo → pdelvo\|afk	21:13
mischief	i need to grab lunch	21:13
	be back in ~20	21:13
	← thomasfr left	21:15
	← jjbohn left	21:15
	→ tjadc joined	21:15
	The24z → The24z_away	21:16
jonez	greetings. I am a convert from svn.. I was wondering if I am modeling git correctly -- every "working directory" (svn term) is a git repo?	21:16
PerlJam	jonez: yep	21:16
jonez	so when I start a new project, I should cd into the new folder and do 'git init'?	21:16
PerlJam	jonez: yep	21:17
	← nicoulaj left	21:17
PerlJam	(maybe)	21:17
jonez	PerlJam, cool. ty	21:17
	er..? :)	21:17
PerlJam	Well, many people use something like github or their own "centralized" repo for sharing with others.	21:17
	→ opus joined	21:18
PerlJam	You may do something different if you do that.	21:18
	← mabrand left	21:18
	rohan32 → rohan32\|afk	21:18
jonez	oh.. so far, it's just me. I might want to be able to push to another repo in the cloud to share with coworkers or whatnot	21:19
	but that would be just a 'push' command, right?	21:19
	← ngirard left	21:19
	← tplaner_ left	21:19
	→ bartek joined	21:20
	→ kerrick joined	21:20
	← Element9 left	21:20
	← mahna_mahna left	21:21
	→ hubub joined	21:21
	→ microcolonel joined	21:21
hubub	hi all, I have just created a git repo locally and managed to do a git push to my server after running through a tutorial however I can't see any subsequent changes I have made locally, not sure what I'm doing wrong	21:22
	→ mklappstuhl joined	21:22
	← intripoon left	21:22
	→ faenil joined	21:22
faenil	hi :)	21:22
gitinfo	faenil: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	21:22
	← tomislater left	21:23
faenil	I was looking for some help with this:	21:23
	I have a repo I forked, the forked repo has master and "abc" branch	21:23
	→ intripoon joined	21:23
	→ anabelle joined	21:23
faenil	now, I modified in the abc branch	21:23
	but the repo I forked from (upstream) got new commits	21:24
	what should I do before sending my commits?	21:24
	← Sebo left	21:24
cbreak	faenil: you can git fetch origin the new commits	21:25
	← und3f left	21:25
cbreak	(or from what ever remote you want)	21:25
	and then merge or rebase	21:25
	← microcolonel left	21:25
	→ microcolonel joined	21:25
	← martinjlowm left	21:25
faenil	thanks cbreak :) yeah I wasn't sure about that path	21:25
	← microcolonel left	21:26
	← lacrymology left	21:26
	← pantsman left	21:27
	→ microcolonel joined	21:27
faenil	cbreak, at the moment I have uncommited changes in my abc branch	21:27
	and git reports that it will overwrite some of my changes	21:27
hubub	okay, I created a new branch and it is now picking up changes for some reason	21:27
faenil	do I have to commit before fetching? ...:/	21:27
nightcrawler786	whats the difference between using git branch --set-upstream vs git branch --track. Can't find any decent/clear answers on Google	21:27
faenil	I would like to create a commit taking into account the new upstream changes	21:27
	The24z_away → The24z	21:28
	← mishok13 left	21:28
faenil	I don't want to commit, then fetch, then commit again	21:28
hubub	also, I am still not seeing directories that I have created, any help appreciated, I'm trying to add a little sense to my website deployments with git push	21:29
	← torjus_ left	21:29
	→ urseus joined	21:29
urseus	hey how can i discard tracking files which is starting with moc_* , what i have to add in my .gitignore ?	21:30
	← codeFiend left	21:30
RichiH	without cloning the whole repo (slow internet here), how can i find out what tags/releases of git contain https://github.com/git/git/commit/be8779f7ac9a3be9aa783df008d59082f4054f67 ?	21:31
imachuchu	faenil: commit then rebase ontop of the changes	21:31
	← maletor left	21:32
	← ferdna left	21:32
	→ dinesh6654_ joined	21:32
imachuchu	faenil: or stash, pull, stash pop	21:32
faenil	imachuchu, wait...commit then fetch then rebase you mean	21:32
	← acekim left	21:32
faenil	the thing is the new changes I have to get from upstream could break my code, so I want to fetch before committing the changes I have pending	21:32
	← nickpresta left	21:32
faenil	is that doable?	21:32
	← neurodrone left	21:33
imachuchu	faenil: actually fetch will only pull down the changes, not merge them like git pull	21:33
	faenil: commit now, worry about conflicts after you get any remote changes	21:33
	← dinesh6654 left	21:33
faenil	ok, so I can commit then pull upstream?	21:33
imachuchu	faenil: git pull = fetch + merge	21:34
faenil	yeah	21:34
	is that a yes? :)	21:34
	← milian left	21:35
	← cakehero left	21:35
imachuchu	faenil: so you can either commit, pull, then have the merge, or commit, fetch, rebase/merge	21:35
	tizzo → tizzo-afk	21:35
imachuchu	faenil: !tias but commit first (you can always fix it up later)	21:35
gitinfo	faenil: 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://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.	21:35
	← urseus left	21:36
faenil	:)	21:36
	ok thanks ;)	21:36
	← hellopat left	21:36
	→ maletor joined	21:37
	→ Vert joined	21:38
	← hubub left	21:39
	← bartek left	21:39
	← tworkin left	21:40
	← sebastorama left	21:40
	← andrewmriley left	21:41
	→ milian joined	21:42
	← ISF left	21:42
	← MetaCosm left	21:42
imachuchu	RichiH: "git ls-remote <remoteName>"?	21:43
	← aspotashev left	21:44
	← oojacoboo left	21:44
imachuchu	RichiH: nm, I didn't read the whole question. No, no there is not	21:44
RichiH	imachuchu: if you feel like having a quick look, i would appreciate it	21:45
	← lotus left	21:45
RichiH	if not, i am at 25% after 23 minutes so i will have an answer in 45 minutes, anyway :p	21:46
faenil	another thing, I'm seen many commits which are multiline, but only one line is shown when you see commits...	21:46
	how does that work?	21:46
	→ oojacoboo joined	21:46
faenil	should I use /n in git commit -m ?	21:46
	\n	21:47
RichiH	faenil: just don't use -m	21:47
faenil	RichiH, ok :D	21:47
RichiH	or hit ener while ' or " is open	21:47
	enter*	21:47
faenil	ok, thanks	21:47
imachuchu	faenil: yeah, if you don't use -m an editor will open prompting for the message	21:47
	→ maestrojed joined	21:47
faenil	imachuchu, shall I just close it and it will go on?	21:48
	tias :D	21:48
	!tias	21:48
gitinfo	Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://sitaramc.github.com/1-basic-usage/tias.html may help with git-specific TIAS.	21:48
	← dbck left	21:49
	← iliketurtles left	21:49
maestrojed	I have a short commit hash and am interested to see what that change was. I was a commit from a while ago. What is the best way to do this?	21:49
FauxFaux	git show thathash	21:49
imachuchu	maestrojed: "git show <hash>"	21:49
RichiH	faenil: if you don't save the commit message and quit, it will not commit	21:50
	just fyi	21:50
imachuchu	maestrojed: or "git checkout <hash>" then checkout again <wherever> to go back to wherever	21:50
RichiH	and keep a blank line in between your subject and your body	21:50
	plusl, subject should not be longer than 72(?) chars	21:50
	→ fly9 joined	21:50
	← fly9 left	21:51
	← fly9_ left	21:51
	→ fly9 joined	21:51
	← dfr\|mac left	21:51
maestrojed	imachuchu wow, too easy! Thanks!	21:51
	← etcetera left	21:52
	← Psycho_pr left	21:53
faenil	RichiH ;)	21:53
	→ etcetera joined	21:53
imachuchu	maestrojed: np	21:54
	→ jjasinski joined	21:55
	← ppppaul left	21:55
	← gfontenot left	21:56
	→ codeFiend joined	21:56
	→ comps joined	21:56
	→ Psycho_pr joined	21:56
	tizzo-afk → tizzo	21:57
	← jkremser left	21:58
	← msmithng left	21:58
	→ adamm joined	21:59
	→ msmithng joined	22:00
	← opus left	22:00
	cpg\|away → cpg	22:00
	tizzo → tizzo-afk	22:00
	← athit left	22:00
	→ chester_1 joined	22:00
	← ingsoc left	22:01
	← aruiz left	22:01
codeFiend	faenil: either use git stash to save the uncommitted changes	22:01
	← trungqtran left	22:01
	→ opus joined	22:01
	cpg → cpg\|away	22:01
codeFiend	faenil: or create a new branch for your own work and commit things there	22:01
	tizzo-afk → tizzo	22:01
	cpg\|away → cpg	22:01
	← project2501a left	22:02
	← chester_ left	22:04
	→ neurodrone joined	22:05
	← neurodrone left	22:05
	→ neurodrone joined	22:05
faenil	codeFiend, I'm already on my own branch	22:05
codeFiend	ah i thought you meant abc was also upstream	22:06
	← afuentes left	22:06
faenil	nope ;)	22:06
codeFiend	then you shouldn't have any problems… use git stash to save your uncommitted changes	22:06
faenil	mm ok I have to read about stash	22:06
	→ macBigRig joined	22:06
codeFiend	it's basically like making a temporary commit	22:06
	Chaser_ → Chaser	22:07
	→ afuentes joined	22:07
faenil	codeFiend, sounds good	22:07
codeFiend	faenil: so what you want to do is push your changes back up to master?	22:07
	faenil: or what?	22:07
faenil	pull from upstream, and then adapt the code I have in my branch (currently uncommitted) and only then commitr	22:07
	stash then fetch and rebase I guess	22:08
	tizzo → tizzo-afk	22:08
	← camdenx left	22:08
	→ camdenx joined	22:08
codeFiend	faenil: you're saying you have no commits at all on "abc"?	22:08
	you should be committing often, not all in one chunk	22:08
	but that's beside the point	22:08
	← beneggett left	22:09
	← fly9 left	22:10
	← gurps left	22:10
faenil	codeFiend, nope ...that branch is only for this modification	22:11
codeFiend	in your place i would do 'git stash; git checkout master; git pull --rebase; git checkout abc; git merge master;'	22:11
	→ gurps joined	22:11
codeFiend	this will bring your abc branch up to date with master	22:11
	(actually maybe git rebase master)	22:11
	then git stash pop	22:12
	and resolve any conflicts	22:12
	← anabelle left	22:12
faenil	codeFiend, yeah that's the best solution I think :)	22:12
	← scelis left	22:13
	← shruggar left	22:14
	← zivester left	22:14
	→ aruiz joined	22:14
	← chuckharmston left	22:15
	→ zivester joined	22:15
	→ ingsoc joined	22:16
	→ ppppaul joined	22:17
	← macabre left	22:17
	→ tinti joined	22:18
	← zivester left	22:20
	→ zivester_ joined	22:20
	← amcsi left	22:21
	→ iocor joined	22:21
	← jaseemabid left	22:22
	← eijk_ left	22:23
	→ apok_ joined	22:23
	← luxurymode left	22:24
	← apok left	22:26
	apok_ → apok	22:26
	← kerrick left	22:27
	← tjadc left	22:28
	← duckxx left	22:29
	← kermit left	22:29
	→ stkrzysiak_ joined	22:29
	← stkrzysiak_ left	22:30
	→ kermit joined	22:30
	→ hellopat joined	22:30
	Marcux83 → Marcux83\|away	22:31
	→ kcj joined	22:31
	← alexisabril left	22:33
faenil	what if I stashed but forgot to add unstaged files?	22:34
	I read I can unstash with git stash show -p \| git apply -R	22:34
	but that only shows errors	22:34
	tizzo-afk → tizzo	22:35
	→ dinesh6654 joined	22:37
	rohan32\|afk → rohan32	22:38
	← neersighted left	22:39
cmn	faenil: you unstash with git stash pop	22:39
faenil	cmn doesn't that also apply ?	22:39
cmn	it applies to the right places	22:39
faenil	I just need to go back, as if I never used stash	22:39
	← dinesh6654_ left	22:40
diminoten	in github can I refer to other files?	22:40
	okay that's a bad question	22:40
cmn	faenil: then use pop	22:40
	→ w09x joined	22:40
diminoten	say I'm writing a doc in markdown, and I want to reference another doc in my repo, that happens to be in json	22:40
	is there a way to display the contents of my JSON file from within my markdown file?	22:40
cmn	diminoten: this channel isn't about the details of github's markdown display	22:40
diminoten	cmn does such a channel exist	22:41
cmn	they have their own support channels	22:41
	← hellopat left	22:41
diminoten	is this an official git support channel	22:41
faenil	cmn, ok thanks	22:41
cmn	diminoten: as official as anything git gets	22:42
diminoten	okay thanks	22:42
	← msmithng left	22:43
	→ msmithng joined	22:45
	← neurodrone left	22:46
	→ russt_ joined	22:47
	← youngblood_ left	22:47
	→ youngblood joined	22:48
	rohan32 → rohan32\|afk	22:48
	← russt left	22:48
	russt_ → russt	22:48
	← harish left	22:48
	← barq1 left	22:48
	← Synthead left	22:50
	← pppaul left	22:50
	← vitor-br left	22:50
	→ psoo joined	22:50
	→ neurodrone joined	22:51
	→ specialGuest joined	22:52
	← specialGuest left	22:52
	→ specialGuest joined	22:52
	← jonez left	22:52
	→ Psycho_pr_ joined	22:52
	→ corburn joined	22:53
	→ _keith joined	22:54
	← Dave^\| left	22:54
	→ neersighted joined	22:54
	← Psycho_pr left	22:54
	Psycho_pr_ → Psycho_pr	22:54
	→ CannedCorn joined	22:57
	← _keith left	22:58
	→ skyf joined	22:58
	← chester_1 left	22:59
EugeneKay	diminoten - the simple answer to your question is no.	22:59
	← TeckniX_ left	22:59
diminoten	EugeneKay: as I've discovered over in #github :d	22:59
loops	This is the oldest git channel, it might as well be considered official	23:00
	← apok left	23:00
EugeneKay	It's unofficially official	23:01
	→ apok joined	23:01
loops	well, it's as official as it gets in an open source world	23:01
	tizzo → tizzo-afk	23:01
	→ youngblood_ joined	23:01
EugeneKay	Something like that	23:01
loops	change offical to "primary" and the answer is yes	23:01
	→ apok_ joined	23:02
	rohan32\|afk → rohan32	23:03
	← youngblood left	23:04
	youngblood_ → youngblood	23:04
	← codeFiend left	23:04
	← branduren left	23:04
	← apok left	23:05
	apok_ → apok	23:05
	→ boombatower_ joined	23:06
	← boombatower_ left	23:06
	← boombatower left	23:06
	← apok left	23:06
	← Davey left	23:06
	→ apok joined	23:06
	→ john_anderson joined	23:07
	← thelazydeveloper left	23:07
	→ milani joined	23:07
milani	hi, I committed my code, then found out there is commits on the remote. I don't want a merge master commit.	23:07
	what should I do?	23:08
EugeneKay	milani - man git-rebase	23:08
gitinfo	milani: the git-rebase manpage is available at http://git-scm.com/docs/git-rebase.html	23:08
	→ monokrome joined	23:08
monokrome	Hello	23:08
gitinfo	monokrome: welcome to #git, a place full of helpful gits. If you have a question, just ask it–somebody should answer shortly. For more information about git and this channel, see the links in the topic. It can't hurt to do a backup (type !backup for help) before trying advice you receive here.	23:08
	→ boombatower joined	23:08
EugeneKay	milani - you would fetch, then rebase yours	23:08
milani	but I don't have the commits from remote yet.	23:08
	aha.	23:08
	got it. fetch was the key.	23:08
EugeneKay	pull == fetch && merge	23:08
	← corburn left	23:08
milani	yeah didn't come to my mind. thx.	23:08
monokrome	I am using git submodules and I noticed that the repository hosting the module noticed a change in a submodule. If I commit this change, will it try to commit to the submodule's repository - or does git intelligently patch these changes on top of the 3rd party repository?	23:09
	→ beneggett joined	23:09
cmn	intelligently?	23:09
	→ simesy joined	23:09
cmn	a submodule is just another repo	23:09
	← beneggett left	23:09
monokrome	I know that, but I am asking which repo that commit is hosted in.	23:09
cmn	it's in that repo	23:10
monokrome	Okay, thanks :)	23:10
cmn	if you push that somewhere, then it will be in that other one as well	23:10
	→ MetaCosm joined	23:11
	← MetaCosm left	23:11
	→ MetaCosm joined	23:11
	→ dsirijus joined	23:12
	← afuentes left	23:14
	→ thursday joined	23:14
	← opus left	23:18
	← osmosis left	23:18
oorang3	so, git pull origin gh-pages <--- works just fine	23:19
	git push origin gh-pages <--- i get an error	23:19
	error: src refspec gh-pages does not match any.	23:19
zmuser3	if I clone a project from somewhere, can I then git remote add origin and git push it (or even a part of it) to my own central repo? will that keep history?	23:19
	← timthelion left	23:19
oorang3	what am i missing? :/	23:19
FauxFaux	zmuser3: Yes, although the name "origin" will already be taken so you'll have to pick another.	23:20
	← dsirijus left	23:20
	→ eletuchy joined	23:20
canton7	oorang3, the former merges the remote branch gh-pages into the local branch. the latter pushes the local branch gh-pages. you don't have a local branch called gh-pages	23:20
zmuser3	oh ok awesome	23:20
oorang3	canton7: ah, i thought i was getting it with pull. how do i get the local branch gh-pages?	23:21
canton7	oorang3, you can create a local branch based off the remote on. git checkout -b gh-pages origin/gh-pages	23:21
	← CannedCorn left	23:21
	← robbyoconnor left	23:21
canton7	s/remote on/remote one	23:21
	→ robbyoconnor joined	23:21
oorang3	canton7: excellent, ty. let me try that.	23:21
	← Progster left	23:22
canton7	oorang3, I should clarify: 'git pull origin gh-pages' merges the remote branch gh-pages into the currently-checked-out local branch	23:22
	← skyf left	23:22
oorang3	so if all i want to do is grab the latest copy, make changes, and push	23:22
	i will do checkout then?	23:23
canton7	oorang3, if you don't have a local gh-pages, create one. then checkout the local gh-pages ('git checkout gh-pages') and update it ('git pull'). then make changes, commit, push ('git push')	23:23
	← tewecske left	23:23
canton7	oorang3, read !book for a better understanding	23:25
gitinfo	oorang3: 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	23:25
oorang3	great, thanks for the info guys. much appreciated :)	23:25
	← psoo left	23:25
	→ ahayweh joined	23:26
	← ingsoc left	23:26
	→ r0bby joined	23:26
	→ _keith joined	23:26
	← robbyoconnor left	23:26
zmuser3	do I have to git init every new repo on the server before I can push to it? if so, how do you do that since the shell is git-shell? (using ssh protocol)	23:27
	← SirCmpwn left	23:27
	← milani left	23:27
	← linguini left	23:28
	← tabakhase left	23:28
	← __class__ left	23:28
	← asedeno_ left	23:28
	← quadz left	23:28
	← njbair_ left	23:28
	← eighty4 left	23:28
	← idoru left	23:28
	→ psoo joined	23:28
	→ r0bby_ joined	23:29
	← thursday left	23:31
	← r0bby left	23:31
	→ eighty4 joined	23:31
EugeneKay	zmuser3 - you would use !gitolite	23:32
gitinfo	zmuser3: Want to host as many git repos (and users!) as you like, on your own server, with fine-grained access control? You want gitolite: https://github.com/sitaramc/gitolite - Documentation: http://sitaramc.github.com/gitolite/master-toc.html	23:32
zmuser3	ok	23:32
	← erichynds left	23:32
	→ idoru joined	23:32
	→ linguini joined	23:32
	→ tabakhase joined	23:32
	→ __class__ joined	23:32
	→ asedeno_ joined	23:32
	→ quadz joined	23:32
	→ njbair_ joined	23:32
	→ pabs3 joined	23:33
pabs3	with gitk, how do I exclude paths or sets of paths?	23:33
	← r0bby_ left	23:33
	← setmeaway left	23:33
	← camdenx left	23:35
	← FreeArtMan left	23:35
	→ duckxx joined	23:36
	← rehat left	23:36
	→ jjang joined	23:37
	← torjus left	23:37
	→ codeFiend joined	23:37
	← boombatower left	23:37
	→ Esa joined	23:38
	← v0n left	23:39
	→ cakehero joined	23:39
	→ r0bby_ joined	23:39
	→ brentratliff joined	23:39
	rohan32 → rohan32\|dinner	23:40
	→ osmosis joined	23:40
	→ beneggett joined	23:41
	→ Anders_J joined	23:41
	← _keith left	23:41
	r0bby_ → robbyoconnor	23:41
	← hidekin left	23:43
	→ dreiss joined	23:43
	← MetaCosm left	23:44
	→ boombatower joined	23:45
	→ gfontenot joined	23:46
	cpg → cpg\|away	23:47
	→ vervic joined	23:47
	← tqmz left	23:49
	← maestrojed left	23:50
	→ _keith joined	23:51
	← _keith left	23:52
	→ UnsignedCode1 joined	23:54
	← UnsignedCode left	23:54
	← john_anderson left	23:55
	→ mritz joined	23:58
	← Fissure left	23:58
	← AaronMT left	23:59
mritz	any good alternatives to gtiflow ?	23:59

Logs Search ←Prev date Next date→

Channels Documentation