IRCloggy #git 2014-11-27

Provider of IRC logs since 2005.

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

	2014-11-27
offby1	Life. https://www.youtube.com/watch?v=W8GRQHsAVjI	00:00
delboy1978uk	how do i try that then?	00:00
	← teran left	00:01
	→ teran joined	00:01
	Eugene kicked Eugene (Eugene)	00:02
	→ Eugene joined	00:02
	← RTG` left	00:02
	← pheaver left	00:03
	→ howitdo joined	00:03
	← Technocrat7 left	00:03
	← martinklepsch left	00:03
	← przemoc left	00:05
	← HelloShitty left	00:07
	← msmith_ left	00:07
	← rnsanchez left	00:08
	→ steele joined	00:08
	← aard_ left	00:09
	→ rnsanchez joined	00:09
	← heroux left	00:09
	← jtrag left	00:10
	← Nechradile left	00:11
	mattcen looks quizzically...	00:11
mattcen	"Eugene was kicked from #git by Eugene"... who would do that?	00:11
	→ St_Marx_ joined	00:11
	← a_le left	00:11
	← King_Hual left	00:11
	← steele left	00:12
	→ rnsanchez_ joined	00:13
	← xtriz left	00:13
	← St_Marx left	00:13
Eugene	Eugene.	00:14
	I'm totally not gaming the !stats	00:14
gitinfo	[!irclog] Public logs of #git are kept at: http://colabti.org/irclogger/irclogger_log/git or look at stats for the last 30 days: http://itvends.com/irc/git.html or since Jan 1, 2012: http://itvends.com/irc/git-all.html	00:14
mattcen	Ah. of course....	00:14
	← rnsanchez left	00:15
	← sarri left	00:15
	← jamesheston left	00:15
	→ SheCalledMePaul joined	00:16
SheCalledMePaul	whats the most stable git client for mac?	00:16
	→ sarri joined	00:17
	→ _rnsanchez_ joined	00:17
	← hgl left	00:17
	→ przemoc joined	00:18
	→ amikiri joined	00:18
	← listochkin left	00:18
	← knownasilya left	00:19
	← rnsanchez_ left	00:19
	← thekkid left	00:20
	→ listochkin joined	00:20
	→ msmith_ joined	00:20
	← SheCalledMePaul left	00:20
	→ thekkid joined	00:21
	← whomp left	00:22
	← _rnsanchez_ left	00:22
	→ das_beard joined	00:22
	← Takle left	00:23
	→ a_le joined	00:24
	← pandeiro left	00:24
	← maestrojed left	00:26
	← Smirnov left	00:26
	← das_beard left	00:26
	→ heroux joined	00:27
jrn	git is, I suppose.	00:27
	→ peachriot joined	00:28
	→ SheCalledMePaul joined	00:28
	← SheCalledMePaul left	00:29
	← freenux left	00:30
	← tang^ left	00:30
	→ SheCalledMePaul joined	00:30
SheCalledMePaul	cant open anything in my github repository it doesnt open	00:30
	[19:29:22] <SheCalledMePaul> using github on mac	00:30
	← dialeth left	00:31
	→ dialeth joined	00:31
	← msmith_ left	00:31
jrn	SheCalledMePaul: are you using the commandline or a gui?	00:32
	SheCalledMePaul: my recommendation is to use git from the commandline in Terminal.app	00:33
	→ hgl joined	00:33
SheCalledMePaul	my school requires to use the gui	00:33
offby1	pity	00:33
jrn	SheCalledMePaul: ah, ok. Then I'd get help from other people in your class	00:33
	e.g. TA	00:33
offby1	if you used the command line it'd be easy to get help	00:33
	← WaReZ left	00:34
jrn	there are several GUIs out there and some of them are even okay, but there's no clear winner	00:34
	and some of the better ones are not open source	00:34
	← corni left	00:34
jrn	which means there's no obvious path to one of them becoming the clear winner either :/	00:34
	→ fairuz joined	00:35
	→ reaverb joined	00:36
shingetsu	so with some progress, my make line is now " make BLK_SHA1=y NO_SYMLINK_HEAD=y NEED_CRYPTO_WITH_SSL=yes NEED_SSL_WITH_CRYP	00:36
	O=yes NEEDS_SSL_WITH_CURL=yes NO_R_TO_GCC_LINKER=yes OPENSSLDIR=/usr/local/ssl	00:36
	CURLDIR=/usr/local prefix=/usr/local all -j6", but I'm getting undefined references in libssl towards crypto	00:36
	however, I DO have NEED_CRYPTO_WITH_SSL defined, so not sure what's wrong there	00:36
	← listochkin left	00:38
	← joelm left	00:40
	→ safinaskar joined	00:40
	→ sgen_ joined	00:41
	→ javster_ joined	00:41
	← leeN left	00:42
	→ joelm joined	00:42
	← javster left	00:43
	→ Technocrat7 joined	00:44
	← beneggett left	00:48
	→ listochkin joined	00:48
	← s8321414 left	00:49
	→ steele joined	00:49
	← d10n-work left	00:52
phy1729	Eugene: I THINK I SHOULD GAME THE STATS TOO	00:52
offby1	SHOUTING WILL GET YOU NOWHERE	00:53
phy1729	O RLY? I THINK IT WILL GET ME ON THE STATS	00:54
	ChanServ set mode: +o	00:54
	Eugene kicked phy1729 (Stats++)	00:54
	→ phy1729 joined	00:54
	Eugene kicked Eugene (Op abuse)	00:54
	→ Eugene joined	00:54
offby1	apparently there's a who-kicks-the-most competition amongst the channel bosses	00:54
phy1729	LOL	00:55
Eugene	God no, this is "how often was I kicked"	00:55
	Kicking others is incidental	00:55
phy1729	Eugene wasn't very popular, getting kicked 17 times!	00:55
owen1	i did 'git clone --mirror foo' how to checkout different branch (i am in master)?	00:55
phy1729	git checkout <branch name>	00:56
	→ madewokherd joined	00:56
owen1	phy1729: a	00:56
	fatal: This operation must be run in a work tree	00:56
	← kadoban left	00:56
owen1	http://stackoverflow.com/questions/9262801/fatal-this-operation-must-be-run-in-a-work-tree	00:57
	← harish_ left	00:58
	← SheCalledMePaul left	00:58
	→ dsantiago joined	00:58
	→ Milo- joined	01:00
	→ fstd_ joined	01:00
owen1	i tried cloning it using git clone <path to folder> but 'git branch' only show me master.	01:01
adamw	git branch -r shows you remote branches.	01:01
Milo-	Hey.. Umm, if I do 'git checkout -b NAKKI', when should git add 'ref/heads/NAKKI' to .git/info/refs? Or should it?	01:02
owen1	adamw: thanks!	01:03
Sasazuka	I went into a feature branch and merged master into it, committed, but not pushed - how do I reset my feature back to its original state before my merge?	01:03
	← dimm left	01:03
Sasazuka	it's saying the branch has diverged :<	01:04
	← fstd left	01:04
	fstd_ → fstd	01:04
adamw	Sasazuka: i'd find the commit ID right before the merge and 'git reset --hard (commit)'.	01:04
	no warranties offered.	01:04
Sasazuka	the commit id of origin/feature/XXX ?	01:05
adamw	whatever commit comes right before the merge of master, on the feature branch.	01:06
	← checkit left	01:06
Sasazuka	http://stackoverflow.com/questions/2358643/git-discard-all-changes-on-a-diverged-local-branch or maybe this?	01:06
	→ lando23 joined	01:06
Milo-	or more precisely, on a filesystem level, where does git hold local branch names, if not .git/info/refs?	01:06
offby1	Milo-: I would expect it to store the refs there -- except for those in "packed-refs"	01:06
	we're not supposed to worry our pretty little heads about those sorts of details	01:07
Milo-	offby1 if I want bash-completion to work on those, I need to worry about those heads :)	01:07
adamw	Sasazuka: well, that's something a bit different, i'm not gonna offer any more advice as i'm not sure i entirely understand your situation, but good luck :P	01:07
offby1	Milo-: does bash completion actually grovel around in .git/refs, as opposed to asking git to list them?	01:08
	the latter seems far more reliable	01:08
lando23	hello. I have a fork of a repo that I committed a bug fix, but the upstream repo fixed the bug and added some other things. I would like to revert my (pushed) commit and re-sync with the upstream repo. Is this possible?	01:08
	→ kadoban joined	01:09
	→ weiyang joined	01:09
Milo-	offby1 can't get git to tell me nicely about remote branches (origin/branch_name to show up as branch_name).. __git_refs works for some, but not for all..	01:10
	← M-ou-se left	01:10
	→ msmith_ joined	01:10
	→ mribeirodantas joined	01:11
shingetsu	oh kewl, hi Milo-	01:11
lando23	is it possible to "unpush" a commit?	01:11
Milo-	and now I decided to try doing this through filesystem (allows me not to changedir each time I switch between repo)	01:11
	← ManikM left	01:11
phy1729	lando23: yes but it's a bad idea	01:11
	→ Manny joined	01:11
phy1729	!rewriting public history	01:12
lando23	phy1729: I have a fork of a repo that I committed a bug fix, but the upstream repo fixed the bug and added some other things. I would like to revert my (pushed) commit and re-sync with the upstream repo	01:12
gitinfo	[!rewrite] Rewriting public history is not recommended. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	01:12
Milo-	I'm handling a command that goes through multiple repositories that share common branch names..	01:12
	hey shingetsu o/	01:12
lando23	FWIW no-one is looking at my fork	01:12
	→ bitonic joined	01:12
shingetsu	Milo-: can you help me with compile stuff? (once your issue's done)	01:12
phy1729	lando23: if you are absolutly sure noone is using your fork, you can force push	01:12
bitonic	is there a way to `git merge -s ours' but keeping new files added by the other branch?	01:12
	← a_le left	01:12
lando23	phy1729: I am absolutely sure	01:12
Milo-	shingetsu maybe :)	01:13
shingetsu	Milo-: just PM me when ready <3	01:13
	← fairuz left	01:13
Milo-	I'm thinking about leaving these local branches as a "known feature" :P	01:13
	→ a_le joined	01:13
Milo-	offby1 but as for packed-refs.. grep can't find any matches for the word NAKKI in .git/	01:14
	← arnaud___ left	01:14
Milo-	but git branch obviously knows about it.. so the data must be stored somewhere	01:15
	→ scriptThis joined	01:15
	← MattMaker left	01:16
Milo-	also... for repo in $repos ; do cd $repo ; git branch -a \| style_it_nicely \| cd - ... ; done # doesn't seem sensible to me :)	01:16
	← EminenceHC left	01:17
	→ M-ou-se joined	01:17
	← robustus left	01:18
	→ hatzopoulos joined	01:18
	→ johnkevinmbasco joined	01:18
Sasazuka	sorry went afk -- basically what it's telling me is that I'm 12 ahead and 3 behind - so I think in the middle of merging master into the feature branch, someone else committed - I just want to get rid of my changes so I can do the merge from master again	01:18
hatzopoulos	sup everyone.	01:18
offby1	dine everyone	01:18
	→ jamesheston joined	01:20
	→ robustus joined	01:20
	← msmith_ left	01:20
hatzopoulos	you could reset soft if you want or hard.	01:20
	Sasazuka: how important are your changes	01:20
	?	01:20
	example: git reset --soft HEAD~3	01:21
Sasazuka	not important since I plan on just re-doing them	01:21
hatzopoulos	i think sould do it	01:21
	it will put all the stuff on the 'stage'	01:22
	then you can reset	01:22
	if you like	01:22
	or w/e	01:22
	commit again.	01:22
	stash, rebase/merge , etc	01:22
Sasazuka	ok let me try it out	01:22
	← Technocrat7 left	01:22
	← joelm left	01:23
hatzopoulos	i told you to go back 3	01:23
	but i think you want to go back 12 commits	01:23
	so you might have to repeat until your at	01:24
	..	01:24
	another way	01:24
	is to use `git reflog`	01:24
	find your spot you want to go back to	01:24
	and git reset --hard HEAD{n}	01:24
	← safinaskar left	01:24
hatzopoulos	where n is your reflog moment	01:24
	number	01:24
Sasazuka	this git graph are too scary for me	01:25
hatzopoulos	git graph?	01:25
Sasazuka	the transit map thing	01:25
	with the dots	01:25
hatzopoulos	where do u see this?	01:25
	← alanwill left	01:25
	← livingstn left	01:26
	→ Takle joined	01:26
	← tjm_jimmy left	01:26
	← s00pcan left	01:26
hatzopoulos	sorry i have no idea what you speak of.	01:27
	→ k_sze[work] joined	01:27
	← steele left	01:28
	← gfixler left	01:28
	→ steele joined	01:29
Sasazuka	er let me find a picture	01:31
	← Takle left	01:31
	← bitonic left	01:31
Sasazuka	https://www.atlassian.com/wac/software/sourcetree/overview/overviewHero/imageBinary/ProductOverview_SourceTree_Hero.png	01:31
hatzopoulos	ahh	01:32
	those are very helpful if you ask me	01:32
	offby1 nods	01:32
hatzopoulos	especially if your new to git	01:32
offby1	but then I always liked subway maps	01:32
hatzopoulos	yeah me too, i live in montreal	01:32
offby1	Sasazuka: I'm not sure about that particular program, but with gitk, at least, the map is pretty simple	01:33
	dots are commits, of course	01:33
	→ eletuchy joined	01:33
offby1	the lines show the parent-child relationship	01:33
	← steele left	01:33
offby1	that's pretty much all you need to know	01:33
hatzopoulos	sourcetree is very nice, i use it all day long	01:33
Sasazuka	and it doesn't look like a transit map to you?	01:33
offby1	I'm deeply suspicious of anything from Atlassian, although I will confess that HipChat works well	01:33
Sasazuka	You need the premium features so you can retain your history	01:34
hatzopoulos	it works well, they update it, its 100% free so far.	01:34
Sasazuka	otherwise I would suspect IRC with bots would be better	01:34
	and free	01:34
hatzopoulos	it can do all operations well with customizations.	01:34
	but i like that i can just jump to terminal	01:34
	and do it by hand	01:34
	and it picks up on what i did quickly	01:34
Sasazuka	I'm trying to transition more into terminal	01:34
hatzopoulos	(auto refreshes)	01:34
	← a_le left	01:35
hatzopoulos	good for you.	01:35
	its not hard	01:35
	→ sohail joined	01:35
hatzopoulos	ease in with a cooler prompt and some nice aliases.	01:36
	something like https://github.com/mathiasbynens/dotfiles	01:36
offby1	Sasazuka: terminal is good for a few reasons, in particular: it's easier to get help here if you use it	01:37
Sasazuka	oh I'm still using SourceTree, some things are easier to see there but for actual changes I try to stick to the terminal	01:37
	→ gfixler joined	01:37
offby1	people like me will demand to see a transcript, and with the terminal, you've got it right there	01:37
Sasazuka	I miss the ease of SVN sometimes	01:37
hatzopoulos	are you on windows Sasazuka?	01:38
Sasazuka	but I don't think I'll get sympathy in this channel hahah	01:38
	mac	01:38
hatzopoulos	what ease did you like with subversion?	01:39
	i'm curious	01:39
	→ drupald joined	01:39
hatzopoulos	i use subversion everyday as well.	01:39
Sasazuka	I guess my previous workplace had a real simple workflow albeit very perverse	01:39
hatzopoulos	(as git)	01:39
	← dadada left	01:40
hatzopoulos	your leading me into thinking your current company's workflow with git is not to your liking.	01:41
	→ a_le joined	01:41
hatzopoulos	you can recreate workflows.	01:41
	and improve them	01:41
	← kadoban left	01:42
hatzopoulos	!git-workflows	01:42
	!workflows	01:42
gitinfo	[!workflow] Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	01:42
hatzopoulos	[thats the one]	01:42
	mercurial seems also nice from what i read, although i have never used it for a real project.	01:43
	nice in that it sets some stricter standards that someone from subversion might appreciate	01:44
	but it is very much like git	01:44
	→ otter768 joined	01:45
	→ dtrott joined	01:45
hatzopoulos	for example it won't let you rebase something it is 'aware' exists in the remote(s)	01:45
	where as in git we can do what ever we want	01:45
Sasazuka	I think I just don't understand all the various terminology well enough	01:46
hatzopoulos	it is what you want it to be.	01:46
Sasazuka	again my previous workplace's perverse SVN workflow has spoiled me I suppose	01:46
hatzopoulos	perverse doesnt sound appealing to me.	01:46
	← kukks left	01:46
	← jb55 left	01:46
Sasazuka	we didn't tag, we didn't branch, everything committed to trunk, for deploy we just too everything from master and had the developer who made the change resolve any conflicts	01:47
hatzopoulos	to me that sounds horribly annoying	01:47
Sasazuka	*took	01:47
hatzopoulos	whats the "took" process look like ?	01:47
	→ fatalhalt joined	01:47
Sasazuka	so it's incredibly easy and straightforward but perverse	01:47
hatzopoulos	versuses what do you have now?	01:47
Sasazuka	now we have legitimate git "workflow"	01:48
	I'm not qualified to judge it	01:48
hatzopoulos	using what "workflow"	01:48
Sasazuka	let me rephrase, I'm not qualified to explain it	01:48
hatzopoulos	this one? http://nvie.com/posts/a-successful-git-branching-model/	01:48
	which onr?	01:48
Sasazuka	yes I think	01:49
dtrott	Sasazuka: Just checking you are qualified to judge it, but not qualified to explain it ;-)	01:49
	← otter768 left	01:49
Sasazuka	if I can't explain it, I don't think I should judge it	01:49
hatzopoulos	ok i see, sasazuka	01:49
	your kinda having a bit of source control shell shock	01:50
dtrott	Sasazuka: My point is the fact that dev’s can’t explain it is judgement enough .....	01:50
Sasazuka	I suppose, it's my first real exposure to source control	01:51
hatzopoulos	Sasazuka,, is this going into a public place like for example a private github repo?	01:51
	→ EminenceHC joined	01:51
	→ marshall joined	01:52
hatzopoulos	i'll tell you this. don't stress out	01:52
marshall	hey git. is there a command to download the source of a specific commit from a remote repo without cloning the whole thing?	01:52
Sasazuka	I think it's hosted internally ?	01:52
hatzopoulos	or better yet. "don't panic"	01:53
Sasazuka	oh I'm not stressed...I just don't want to break things :D	01:53
hatzopoulos	make a !backup	01:53
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	01:53
phy1729	marshall: no but you can do a shallow clone iirc	01:53
hatzopoulos	and then never push anything while your trying stuff out	01:53
marshall	phy1729: shallow clone	01:53
	← Nijikokun left	01:54
marshall	phy1729: can i do a shallow clone from a specific commit?	01:55
	with --depth 1?	01:55
	→ harish_ joined	01:55
phy1729	don't think so	01:55
marshall	ok	01:55
	→ wxg4irc joined	01:55
	← shinnya left	01:56
phy1729	could always see if there's something in man git-clone that I don't know about	01:56
gitinfo	the git-clone manpage is available at http://jk.gs/git-clone.html	01:56
	← Marcus___ left	01:56
	← lando23 left	01:56
hatzopoulos	using rsync, sync a backup to a location: $ rsync -vah --delete ~/your_repo ~/my_repo_backups_location/	01:56
	→ kukks joined	01:56
	← kukks left	01:56
	→ kukks joined	01:56
	← EminenceHC left	01:56
hatzopoulos	the --delete will make sure the destination files that dont exist from source are removed.	01:57
	so you can run it sequaentially	01:57
	like in a cron	01:57
	Sasazuka: i am super excited our company is moving to git soon. (from svn) .	01:59
	good ridance.	01:59
Sasazuka	oh I'm at a new company and they are using git hence my issue	01:59
hatzopoulos	the transition has been so fucking long	02:00
Sasazuka	previous company used SVN	02:00
hatzopoulos	its great too. dont get me wrong.	02:00
	but not for what i need it for.	02:01
	if nothing else, git outputs colors!	02:02
	← sohail left	02:02
hatzopoulos	on the prompt	02:02
	in the shell w/e	02:02
	← Foldager left	02:03
	→ BiggFREE joined	02:06
	← sgen_ left	02:07
	→ J1G\|Anon126 joined	02:08
	← dtrott left	02:09
	← russt left	02:09
	← Sasazuka left	02:12
	→ palcu joined	02:12
	→ Vampire0 joined	02:13
thiago	marshall: you can only shallow-clone a specific commit if that commit is the tipo of a branch or it is tagged	02:13
	marshall: is it either of those?	02:13
	→ lando23 joined	02:14
marshall	probs not	02:14
	i'm just using `git submodule`	02:14
	← nnyk left	02:14
marshall	i wanted to get a specific commit for a dockerfile command, but i'm just going to add it as a submodule then do `ADD`	02:15
	→ andrew__ joined	02:16
	← Vampire0_ left	02:16
	← palcu left	02:17
	→ gccostabr joined	02:18
	← mribeirodantas left	02:18
	mark- → mark	02:18
	← tyreld left	02:18
	mark → Guest74905	02:19
	← watabou left	02:20
	← kballou left	02:20
	→ Gues480631 joined	02:21
	← tekkbuzz left	02:22
	→ dtrott joined	02:22
	→ nnyk joined	02:23
	→ tekkbuzz joined	02:23
	→ bb010g joined	02:23
fatalhalt	does git track file permssions when you commit and push to a repo? e.g if you chmod file to be 664 will it checkout as 644 or 664?	02:26
	→ Goplat joined	02:26
	← t0th_-_ left	02:27
	← moparisthebest left	02:27
	→ steele joined	02:29
	← TDJACR left	02:30
	→ ryez joined	02:30
hatzopoulos	fatalhalt: nope	02:31
	← LucasTT left	02:31
	→ DolpheenDream joined	02:32
hatzopoulos	for some workarounds: http://stackoverflow.com/questions/3207728/retaining-file-permissions-with-git	02:33
shingetsu	hi all (again), I'm having trouble compiling git on cygwin, with http(s) support	02:33
	my current status:	02:33
	openssl (including crypto) is compiled and installed in /usr/local/ssl	02:33
	curl is compiled and installed in /usr/local	02:33
	→ moparisthebest joined	02:33
shingetsu	this is the GCC invocation: http://pastebin.com/kpaYymN3	02:33
	it gives me a ton of undefined references in libssl.a (like undefined reference to SHA512_Transform)	02:33
	my make line is: http://pastebin.com/LGt2gc4d	02:33
	← steele left	02:34
fatalhalt	hatzopoulos: you sure, i think it does, i committed and pushed a fil... nevermind, git does track the x/executable bit, which what i'm seeing, makes sense now	02:34
hatzopoulos	only the neccessary for usage	02:35
	aka exec	02:35
	→ dmnd joined	02:35
	← Xiti left	02:35
	→ rchavik joined	02:35
hatzopoulos	fatalhalt: well what does your $ git config core.filemode	02:36
	say	02:36
fatalhalt	hatzopoulos: filemode = true	02:36
	→ daito joined	02:37
dmnd	when I do `git status`, it says I am 3 commits ahead and a lot behind. Then I do `git pull --rebase` and expect still be 3 ahead, but no longer any behind. But when I do `git pull --rebase`, I end up exactly where my remote branch is - none ahead, none behind. I looked at a file I had edited before the rebase and it wasn't up to date. I must be doing	02:37
	something wrong, but I can't think what it is.	02:37
	does that sequence of events make sense to anyone?	02:37
	→ peachriot_ joined	02:38
dmnd	what would cause my "outgoing" commits to vanish after a rebase?	02:38
	← peachriot left	02:38
hatzopoulos	fatalhalt: http://stackoverflow.com/questions/10516201/updating-file-permissions-only-in-git	02:38
	→ TDJACR joined	02:38
	→ NoNMaDDeN joined	02:39
hatzopoulos	i'm not expert but that says your ok.	02:39
	did you add/commit?	02:39
	perhaps you need to change the files some how	02:39
fatalhalt	hatzopoulos: thanks, i'm good, learned something new	02:39
hatzopoulos	$ touch <file>	02:39
	→ Xiti joined	02:41
	← johtso_ left	02:41
hatzopoulos	has anyone used github to create one repo with a shit load of orphan branches?	02:41
	→ nkouevda joined	02:41
	← at0mat left	02:42
hatzopoulos	for the purpose of a simple showcase... what will happen i wonder.	02:42
	→ macrover-3 joined	02:42
	→ fab87 joined	02:42
hatzopoulos	i forked a private repo	02:42
	and the budget is tight	02:43
	the private repo is a sandbox repo	02:43
	so then i made several orhan branches	02:44
	and i plan to push them to my fork later on, in maybe a month.	02:44
	is it all 'kosher' ?	02:44
	i never done that shit.	02:44
	it should work fine.	02:45
	← moritzs left	02:45
hatzopoulos	me thinks	02:45
	← BiggFREE left	02:45
hatzopoulos	just why would github alow such a loop hole?	02:45
	← ferr left	02:45
	→ GT4066 joined	02:45
hatzopoulos	they dont care eh	02:46
	..	02:46
	meh	02:46
	→ moritzs joined	02:48
ryez	shingetsu: not sure if it helps, these are all the deps needed to build git on centos: curl-devel openssl-devel expat-devel gettext-devel zlib-devel asciidoc docbook2x perl-ExtUtils-MakeMaker xmlto	02:49
	← kini left	02:49
	→ govg joined	02:51
	← geomyidae_ left	02:52
	← parski left	02:52
	← lando23 left	02:53
	← Gamecubic left	02:54
	← MACscr left	02:54
	← dreiss left	02:55
Eugene	hatzopoulos - do what now?	02:55
	→ EminenceHC joined	02:56
	→ Gamecubic joined	02:56
	← fab87 left	02:56
	→ kini joined	02:56
	→ echo-area joined	02:57
	→ Bryzzle joined	02:57
	← akiva left	02:59
	→ steele joined	02:59
	← SwedFTP left	03:00
	← EminenceHC left	03:00
	→ robbyoconnor joined	03:02
	→ reaverb1 joined	03:03
	→ Gitzilla joined	03:04
	← reaverb left	03:04
	reaverb1 → reaverb	03:04
	← darkbasic left	03:04
	→ darkbasic joined	03:05
	← towski_ left	03:06
	→ diegoaguilar joined	03:07
	← a_le left	03:08
	→ bhuvanaurora joined	03:08
	→ SwedFTP joined	03:09
	← macrover-3 left	03:09
	← bhuvanaurora left	03:10
	← Manny left	03:11
	← reaverb left	03:11
	→ ManikM joined	03:11
	← moritzs left	03:12
	→ bhuvanaurora joined	03:13
	← boombatower left	03:13
	← delight left	03:14
	← peachriot_ left	03:15
	→ Takle joined	03:15
	← oojacoboo left	03:16
	→ dreiss joined	03:16
	← ManikM left	03:17
	← Noldorin left	03:18
	→ alanwill joined	03:19
	← dsdeiz left	03:20
	← Takle left	03:20
	← hgl left	03:22
	→ kanzure joined	03:27
	← dreiss left	03:27
	→ bhws joined	03:28
	← wxg4irc left	03:28
	→ sohail joined	03:32
	→ hgl joined	03:32
	hgl → Guest95566	03:32
	← listochkin left	03:33
	← adamben left	03:34
	← delboy1978uk left	03:35
	← SwedFTP left	03:37
	→ a_le joined	03:38
	← bhuvanaurora left	03:39
	→ fairuz joined	03:40
	← a_le left	03:45
	→ otter768 joined	03:45
diegoviola	git compresses all the content right?	03:46
	also when cloning...	03:46
	← CheckDavid left	03:47
	→ SwedFTP joined	03:48
	← otter768 left	03:50
	← owen1 left	03:50
	← jaydubya left	03:51
	→ jaydubya joined	03:52
	← tummy left	03:52
	→ maestrojed joined	03:55
	← bhws left	03:55
	← Xiti left	03:55
	← SwedFTP left	03:55
	→ kcj joined	03:55
	→ akiva joined	03:56
	→ smccarthy joined	03:56
	← jaydubya left	03:56
	→ bhuvanaurora joined	03:57
	← Guest95566 left	03:57
	→ SwedFTP joined	03:57
	→ RTG` joined	03:57
	← wookienz left	03:58
	← amikiri left	03:59
	→ wookienz joined	03:59
	← hatzopoulos left	04:00
	→ EminenceHC joined	04:00
	→ plato1 joined	04:01
	→ Rampages_afk joined	04:03
	→ vlovgr_ joined	04:03
	← vlovgr_ left	04:03
	→ vlovgr_ joined	04:03
	← Milkweed left	04:03
	← plato left	04:04
	→ kaiza_ joined	04:04
	→ Virox_ joined	04:05
	→ Xiti joined	04:05
	→ harv_ joined	04:05
	→ offby1` joined	04:05
	← EminenceHC left	04:05
	← Tuna-Fish left	04:06
	→ _W joined	04:06
	→ Dreadnaught joined	04:06
	← Dreadnaught left	04:06
	→ Dreadnaught joined	04:06
	→ Grum_ joined	04:06
	← SwedFTP left	04:06
	→ Peuc2 joined	04:06
	→ mz\|` joined	04:07
	← _W_ left	04:07
	_W → _W_	04:07
	→ thesquib_ joined	04:08
	→ Mercury_ joined	04:08
	→ drupald_ joined	04:08
	→ FabTG__ joined	04:08
	→ Zarthuss joined	04:08
	← govg left	04:08
	→ Drool joined	04:08
	→ brainproxy_ joined	04:09
	← offby1 left	04:09
	→ vladgh_ joined	04:09
	offby1` → offby1	04:09
	← vlovgr left	04:09
	← Rampages left	04:09
	← kaiza left	04:09
	vlovgr_ → vlovgr	04:09
	← Virox left	04:09
	← harv left	04:09
	← mz` left	04:09
	← Peuc left	04:09
	← Zarthus left	04:09
	← Sp4rKy left	04:09
	← thesquib left	04:09
	← brainproxy left	04:09
	← Grum left	04:09
	← FabTG left	04:09
	← Cork left	04:09
	← SJS left	04:09
	← drupald left	04:09
	← albel727 left	04:09
	← toydestroyer left	04:09
	← brutal_lobster left	04:09
	← Mercury left	04:09
	← akushner left	04:09
	← ciaranm left	04:09
	← phy1729 left	04:09
	← wbdecker left	04:09
	← ap0c left	04:09
	← vladgh left	04:09
	← ben_alman left	04:09
	← CentaurWarchief left	04:09
	← ping-pong left	04:09
	← Mogget left	04:09
	harv_ → harv	04:09
	Grum_ → Grum	04:09
	Peuc2 → Peuc	04:09
	← offby1 left	04:10
	→ offby1 joined	04:10
	← HerrK left	04:10
	→ akushner joined	04:10
	← niax left	04:10
	← tazle_ left	04:10
	← fatalhalt left	04:10
	→ phyl729 joined	04:10
	← kloeri left	04:10
	→ Mogget joined	04:10
	→ wbdecker joined	04:10
	phyl729 → Guest37642	04:10
	→ SwedFTP joined	04:10
	→ kloeri joined	04:10
	← tokkee left	04:10
	→ SJS joined	04:10
	→ ciaranm joined	04:10
	← ciaranm left	04:10
	→ ciaranm joined	04:10
	→ tokkee joined	04:10
	→ tazle_ joined	04:10
	← Droolio left	04:10
	← dmnd left	04:10
	→ niax joined	04:11
	→ dmnd joined	04:11
	→ ping-pong joined	04:11
	← Guest37642 left	04:11
	← maestrojed left	04:11
	→ CentaurWarchief joined	04:11
	→ albel727 joined	04:11
	→ ben_alman joined	04:11
	→ nardev joined	04:11
	→ toydestroyer joined	04:11
	→ phy1729 joined	04:11
	→ brutal_lobster joined	04:12
	→ Sp4rKy joined	04:12
	→ arnaud___ joined	04:12
	→ Cork joined	04:12
	← shingetsu left	04:13
	← NoNMaDDeN left	04:13
	→ msmith_ joined	04:14
	← msmith_ left	04:14
	← nkouevda left	04:14
	← gccostabr left	04:15
	← SwedFTP left	04:15
	← dorkmafia left	04:16
	→ t0th_-_ joined	04:16
	→ Technocrat7 joined	04:17
	← Consuela left	04:18
	← Drool left	04:20
	← t0th_-_ left	04:20
	→ Droolio joined	04:20
	→ hgl joined	04:20
	hgl → Guest25764	04:20
	→ subhojit777 joined	04:21
	→ zumba_addict joined	04:22
	→ Consuela joined	04:22
	→ SwedFTP joined	04:23
	← m0viefreak left	04:23
	→ dialeth_ joined	04:25
	← dialeth left	04:25
	← daito left	04:26
	← steele left	04:28
	← Pyrogerg left	04:28
	→ steele joined	04:28
	→ angelsl joined	04:29
	← nnyk left	04:29
	→ otter768 joined	04:30
	→ msm joined	04:31
msm	Is there a way to revert a git tag just pushed on HEAD?	04:31
	← steele left	04:33
	→ MattMaker joined	04:34
	→ tang^ joined	04:35
Dewi	msm: you can replace the tag and push it again	04:36
	might need a couple of forces, and will be confusing to onlookers	04:36
	← fishey left	04:37
	← Bryzzle left	04:37
msm	Dewi: How can I replace the tag?	04:37
Dewi	msm: git tag --force [name]	04:38
	msm: git push --force --tags	04:39
	← SwedFTP left	04:39
Dewi	not sure what you meant by "pushed on HEAD" tho	04:39
	that will replace a tag and push it to a remote	04:39
	→ gccostabr joined	04:42
	→ irqq joined	04:43
	→ SwedFTP joined	04:44
	← Guest25764 left	04:46
	→ Guest25764 joined	04:47
	← subhojit777 left	04:47
	← NaStYdoG left	04:49
	← otter768 left	04:49
	→ NaStYdoG joined	04:49
	← poly left	04:50
	← phantombeta left	04:51
	→ Bryzzle joined	04:52
	← CEnnis91 left	04:52
	← nardev left	04:53
	→ SumDude joined	04:54
	← Guest25764 left	04:54
	→ hgl- joined	04:54
	← Technocrat7 left	04:55
	← hgl- left	04:56
	→ hgl- joined	04:56
	→ nardev joined	04:58
	→ skorgon joined	04:58
	← skorgon left	04:58
	→ skorgon joined	04:58
	→ tristanp joined	04:59
	→ iamjarvo joined	05:01
	← iamjarvo left	05:02
	← Consuela left	05:02
	→ iamjarvo joined	05:03
	→ fishey joined	05:03
	→ Takle joined	05:04
	← hgl- left	05:04
	→ EminenceHC joined	05:04
	→ subhojit777 joined	05:04
	→ hgl- joined	05:04
	← cagedwisdom left	05:07
	→ Tuna-Fish joined	05:07
	← Takle left	05:09
	← EminenceHC left	05:09
	→ dreiss joined	05:09
	→ daito joined	05:10
	→ kyb3r_ joined	05:10
	← gccostabr left	05:11
	← MLM left	05:13
	→ kopparam joined	05:13
	← raven-au left	05:15
	→ raven-au joined	05:15
	→ faylite joined	05:17
	→ The_Phoenix joined	05:19
	→ mennea joined	05:20
	← raven-au left	05:20
	hgl- → hgl	05:21
	→ raven-au joined	05:21
	→ bq joined	05:22
	→ beautifulmind joined	05:22
bq	how do i diff a file from working directory with the same file in another branch?	05:22
	→ Consuela joined	05:22
	→ devoldmx joined	05:23
	← kopparam left	05:23
	→ dorkmafia joined	05:24
	← irqq left	05:24
	→ arup_r joined	05:24
J1G\|Anon126	bq: git diff [branch] [file]	05:26
	← raven-au left	05:26
	→ kopparam joined	05:26
	← devoldmx left	05:27
	→ raven-au joined	05:27
	← tekkbuzz left	05:29
	← kopparam left	05:29
	→ kopparam joined	05:29
	← smccarthy left	05:29
	→ Marcus joined	05:30
	→ mennea_ joined	05:30
	← beautifulmind left	05:31
	← mennea left	05:31
	← Bryzzle left	05:32
	← kopparam left	05:33
	← SwedFTP left	05:33
	→ kadoban joined	05:33
	→ beautifulmind joined	05:33
	→ kopparam joined	05:33
	→ MLM joined	05:35
	← The_Phoenix left	05:36
	← harish_ left	05:36
	← Tuna-Fish left	05:37
	→ The_Phoenix joined	05:37
	→ Tuna-Fish joined	05:38
	→ NoNMaDDeN joined	05:38
	→ EminenceHC joined	05:39
	→ jaydubya joined	05:40
	← fling left	05:42
	→ steele joined	05:42
	← madewokherd left	05:43
	→ qbann0p joined	05:43
	← kadoban left	05:43
	← EminenceHC left	05:44
	← jaydubya left	05:45
	→ punchagan joined	05:45
	← riceandbeans left	05:46
	← k_sze[work] left	05:46
	← punchagan left	05:46
	→ punchagan joined	05:46
	→ tekkbuzz joined	05:47
	→ Sasazuka joined	05:48
	← steele left	05:49
	← NightMonkey left	05:49
	→ k_sze[work] joined	05:50
	→ NightMonkey joined	05:51
	→ jazper_ joined	05:51
	← jazper- left	05:51
	→ otter768 joined	05:52
	→ ManikM joined	05:52
	← tpollard left	05:54
	→ kerrick joined	05:54
	→ SwedFTP joined	05:55
	← tristanp left	05:55
	→ akagr joined	05:56
	→ tristanp joined	05:56
	← raven-au left	05:56
	← bb010g left	05:57
	← Sasazuka left	05:58
	→ raven-au joined	05:58
	→ fling joined	05:59
	← mennea_ left	06:00
	← arup_r left	06:00
	→ mennea joined	06:00
	← tristanp left	06:01
	→ tristanp joined	06:01
	→ devoldmx joined	06:02
	→ pheaver joined	06:02
	← UmbraMalison left	06:02
	← otter768 left	06:02
	← ivan\ left	06:02
	→ ivan\ joined	06:03
	← SumDude left	06:04
	← SwedFTP left	06:04
	→ SumDude joined	06:04
	→ UmbraMalison joined	06:04
	→ geomyidae_ joined	06:05
	→ Takle joined	06:05
	→ t0th_-_ joined	06:05
	← jave left	06:05
	→ SwedFTP joined	06:06
	← tang^ left	06:06
	→ JohnBat26 joined	06:07
	→ jave joined	06:07
	→ wxg4irc joined	06:08
	← bhuvanaurora left	06:08
	→ EminenceHC joined	06:08
	← stellarhopper left	06:09
	← Takle left	06:09
	← t0th_-_ left	06:09
	← rpg left	06:09
	→ marthinal joined	06:10
	← qbann0p left	06:12
	← Gamecubic left	06:12
	← tristanp left	06:12
	→ Gamecubic joined	06:13
	→ tristanp joined	06:13
	→ superradish joined	06:13
superradish	howdy all, hoping to get some help clearing up some shit i screwed up over here with git...	06:13
	← EminenceHC left	06:14
J1G\|Anon126	I'll try. What happened?	06:14
	→ nrsk joined	06:14
	← akagr left	06:14
J1G\|Anon126	superradish	06:15
	→ peachriot_ joined	06:16
superradish	basically i'm trying to revert to an old commit and get rid of a bunch that aren't working right	06:16
	i had some conflicts and ended up reverting like 4 times in a row	06:16
	which has really messed crap out	06:17
	er up	06:17
	it's so bad the preposition is wrong	06:17
J1G\|Anon126	you can always reset to the last good commit	06:17
	git reset --hard [commit]	06:17
	this will destroy all your changes	06:17
	← tristanp left	06:17
	→ ap0c joined	06:18
	← dialeth_ left	06:19
J1G\|Anon126	superradish: so you can start over from the point before all the reverts	06:20
	← n-st left	06:20
	← peachriot_ left	06:20
superradish	let me give that a try	06:22
	→ BlaXpirit joined	06:23
	← solrize left	06:24
	→ settermjd joined	06:27
	← hgl left	06:28
	← nrsk left	06:29
	← mennea left	06:30
	→ hgl joined	06:30
	hgl → Guest64329	06:30
	→ qbann0p joined	06:30
	→ mennea joined	06:30
	→ mustika joined	06:31
	← booboy left	06:31
	→ max joined	06:32
	max → Guest63601	06:32
	← pheaver left	06:32
	← Marcus left	06:33
	→ The_Phoenix1 joined	06:33
	→ Technocrat7 joined	06:34
	← The_Phoenix left	06:35
	← jazper_ left	06:35
	→ jazper- joined	06:35
	← jazper- left	06:35
	→ jazper- joined	06:35
	← Technocrat7 left	06:39
	→ KONIG joined	06:40
	→ sinkensabe joined	06:41
	← iamjarvo left	06:41
	← diegoviola left	06:41
	← dreiss left	06:41
	→ nrsk joined	06:43
	→ stellarhopper joined	06:43
	← stellarhopper left	06:43
	→ stellarhopper joined	06:43
	→ pantsman- joined	06:43
	← NoNMaDDeN left	06:44
	← ryez left	06:44
	← valeriansaliou left	06:46
	← nrsk left	06:47
	→ nrsk joined	06:47
	← dorkmafia left	06:48
	← KONIG left	06:53
	→ craigp joined	06:54
	→ Silmarilion joined	06:55
	← tekkbuzz left	06:57
	→ bhuvanaurora joined	06:58
	← mustika left	06:59
	→ Kicer86 joined	06:59
	← Dreadnaught left	07:00
	← pantsman- left	07:00
	→ steele joined	07:01
	← SumDude left	07:02
	→ dreiss joined	07:02
	← J1G\|Anon126 left	07:04
	← kopparam left	07:04
	← The_Phoenix1 left	07:04
	← steele left	07:06
	→ zumba_ad_ joined	07:06
	← zumba_addict left	07:06
	← veebers left	07:06
	→ zumba_addict joined	07:06
	→ veebers joined	07:07
	← settermjd left	07:08
	→ govg joined	07:09
	→ tjm_jimmy joined	07:09
	→ ehmatthes joined	07:09
	← zumba_ad_ left	07:10
	← DolpheenDream left	07:10
	→ EminenceHC joined	07:11
	→ roelmonnens joined	07:11
	← mennea left	07:11
	→ Takle joined	07:11
	→ Error404NotFound joined	07:11
	→ freimatz joined	07:15
	← EminenceHC left	07:16
	→ AmR\|EiSa joined	07:17
	→ Marcus joined	07:17
	→ nnyk joined	07:18
	← plato1 left	07:18
	→ plato joined	07:18
	→ _0xAX joined	07:19
	← sohail left	07:19
	→ NoNMaDDeN joined	07:20
	→ doev joined	07:20
	← Lyqyd left	07:22
	← plato left	07:23
	← qbann0p left	07:24
	← darkbasic left	07:25
	→ a_le joined	07:25
	→ DrSkyLizard joined	07:25
	→ Takle_ joined	07:26
	→ darkbasic joined	07:26
	← Goplat left	07:27
	← Takle left	07:28
	→ jaydubya joined	07:29
	→ nfk joined	07:29
	← akiva left	07:29
	→ clauswitt joined	07:30
	← a_le left	07:30
	→ tjm_jimm_ joined	07:30
	→ Gizburdt joined	07:31
superradish	ok	07:32
	so i reverted back to code and got the stupid build cooperating	07:32
	how do i delete a previous commit	07:33
	like i just want it gone	07:33
	← Kulrak left	07:33
	← tjm_jimmy left	07:33
	→ Macaveli joined	07:34
	← jaydubya left	07:34
	← beautifulmind left	07:34
	→ listochkin joined	07:34
	→ FunkyAss joined	07:34
	→ cyphase joined	07:35
	← cyphase left	07:35
	→ cyphase joined	07:35
	← bhuvanaurora left	07:35
	← NoNMaDDeN left	07:35
	← Lunatrius left	07:35
	→ Lunatrius joined	07:36
	→ Duikb00t joined	07:37
	→ rob_w joined	07:37
	→ jb55 joined	07:37
	→ Takle joined	07:37
	← listochkin left	07:38
	→ roelmonn_ joined	07:39
	→ bhuvanaurora joined	07:39
	← Takle_ left	07:39
	→ settermjd joined	07:40
	← roelmonnens left	07:42
	← MLM left	07:43
	→ gnfz joined	07:44
	→ delight joined	07:44
	→ kopparam joined	07:44
	← veebers left	07:44
	drupald_ → drupald	07:46
	→ Kulrak joined	07:46
	← Kulrak left	07:46
	→ Kulrak joined	07:46
	← dreiss left	07:47
	→ saint-ron joined	07:48
	→ acolson joined	07:49
	← carlosr left	07:49
	← kcj left	07:49
	→ PCatinean joined	07:50
	← settermjd left	07:50
	→ yzhang joined	07:51
	← yzhang left	07:51
	← Sleepy63 left	07:51
	→ yzhang joined	07:51
	← ManikM left	07:51
	→ ManikM joined	07:52
	← johnkevinmbasco left	07:52
yzhang	hi, I have a problem with git-svn, how can I ask it to ignore certain direction when I use git-svn rebase to get upstream updates	07:52
tobiasvl	superradish: as in, not the latest one?	07:53
yzhang	*directory	07:53
	tried .gitignore, doesn't seem to work for me	07:53
	→ kcj joined	07:53
	→ t0th_-_ joined	07:53
	→ King_Hual joined	07:54
	→ shpoont joined	07:54
yzhang	I added this entry to .gitignore: /tools	07:54
superradish	yes toias	07:55
	tobias	07:55
	← shpoont left	07:55
yzhang	tools/CLAPACK/README.txt: needs update <--- got this when svn rebase	07:55
	→ samskiter joined	07:55
tobiasvl	superradish: man git-filter-branch	07:55
gitinfo	superradish: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	07:55
	→ Raging_Hog joined	07:55
tobiasvl	superradish: OR !interactive_rebase	07:56
gitinfo	superradish: Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.	07:56
tobiasvl	probably the latter if you want to just have the commit gone	07:56
	yeah definitely the latter	07:56
	→ shpoont joined	07:57
	← shpoont left	07:58
	→ cbr_ joined	07:58
	← t0th_-_ left	07:58
	→ hebz0rl joined	07:58
	→ palcu joined	08:00
	← tjm_jimm_ left	08:00
	→ mkaesz joined	08:00
	→ jnavila joined	08:01
	← Gizburdt left	08:01
	← BlaXpirit left	08:03
	→ otter768 joined	08:03
	← philipandersen left	08:03
	→ Gues480631_ joined	08:03
	→ philipandersen joined	08:04
	← philipandersen left	08:04
	← palcu left	08:05
	→ Sleepy63 joined	08:05
	→ jargon joined	08:06
	← Gues480631 left	08:07
	← otter768 left	08:07
	→ Dopagod joined	08:08
	→ Brain joined	08:08
	→ WormDr1nk joined	08:09
	← ehmatthes left	08:09
	← bhuvanaurora left	08:10
	→ Gizburdt joined	08:10
	→ pheaver joined	08:11
	← samskiter left	08:11
	← jargon left	08:11
	← suffice left	08:11
	→ jargon joined	08:12
	→ suffice joined	08:13
	← Gamecubic left	08:13
	→ samskiter joined	08:14
	→ jagob joined	08:16
	→ EminenceHC joined	08:16
	→ abec0 joined	08:17
	← yzhang left	08:17
	→ bhuvanaurora joined	08:18
	→ joo-_ joined	08:18
	← MattMaker left	08:18
	→ shpoont joined	08:18
	← pheaver left	08:19
	← EminenceHC left	08:21
	→ TomyWork joined	08:22
	→ cvanball joined	08:23
	→ LeMike joined	08:23
	← congruent left	08:23
	← craigp left	08:23
	← troyt left	08:24
TomyWork	how would you share a git-svn clone with co-workers?	08:24
thiago	put it in a Git server	08:25
	no one can push to it	08:25
	← skorgon left	08:26
TomyWork	i mean the entire thing	08:26
	→ mennea joined	08:26
TomyWork	with remotes/git-svn, revmap and all	08:26
	→ jceb joined	08:26
TomyWork	do i just upload it somewhere, working copy included, or is there a better way?	08:26
thiago	TomyWork: you can share remotes/git-svn, but not the revmap	08:26
	if you want to share the revmap, you're outside of Git	08:27
	share however you want	08:27
	← jargon left	08:27
	→ paul424 joined	08:27
	→ sebhoss joined	08:28
	← wxg4irc left	08:28
	→ wxg4irc joined	08:29
	→ jargon joined	08:29
	→ saurabh joined	08:29
	saurabh → Guest38453	08:30
	← staafl left	08:30
	→ hs366 joined	08:31
	← Juxtapositional left	08:33
	← GT4066 left	08:35
	← joki left	08:36
	→ vurma joined	08:36
	→ Fandekasp joined	08:39
	← AmR\|EiSa left	08:40
	→ seschwar joined	08:40
	→ joki joined	08:41
	→ cagedwisdom joined	08:41
	→ okanck joined	08:43
	→ intellix joined	08:43
	→ moritzs joined	08:43
	→ dorkmafia joined	08:45
	← jamesheston left	08:45
	← joo-_ left	08:47
	→ iamjarvo joined	08:47
	← teran left	08:48
	→ plato joined	08:49
	← marshall left	08:49
	← dorkmafia left	08:49
	→ The_Phoenix joined	08:50
	→ joo-_ joined	08:50
	→ Polyatomic joined	08:50
	→ petersr joined	08:51
	← Raging_Hog left	08:51
	← kopparam left	08:52
	← bhuvanaurora left	08:53
	→ lb1a joined	08:54
	→ kopparam joined	08:56
	→ AmR\|EiSa joined	08:57
	→ Hipska joined	08:57
	→ alorence joined	08:59
	→ skylite joined	09:01
	→ bhuvanaurora joined	09:01
	→ wakd joined	09:02
	→ jatt joined	09:02
	→ Raging_Hog joined	09:02
	→ steele joined	09:02
	→ Akagi201 joined	09:03
	→ jheg joined	09:03
	← kukks left	09:03
	→ teran joined	09:04
	← jheg left	09:04
	← joo-_ left	09:05
	← moritzs left	09:05
	← The_Phoenix left	09:06
	← bhuvanaurora left	09:06
	→ joo-_ joined	09:07
	← steele left	09:07
	← Error404NotFound left	09:08
	→ Err404NotFound joined	09:08
	← teran left	09:08
	← bgerber left	09:08
	→ psoo joined	09:08
	← michael_mbp left	09:08
	← psoo left	09:08
	→ psoo joined	09:08
	→ michael_mbp joined	09:09
	← AmR\|EiSa left	09:10
	← samskiter left	09:10
	→ samskiter joined	09:10
	→ t0th_-_ joined	09:10
	strictlyb → sb	09:12
	← karstensrage left	09:13
	← thiago left	09:15
	← t0th_-_ left	09:15
	→ harish_ joined	09:15
	→ Guest38290 joined	09:15
	← cvanball left	09:17
	→ EminenceHC joined	09:17
	→ Error404NotFound joined	09:17
	→ DavidCruse joined	09:17
	→ dharrigan joined	09:18
	← dharrigan left	09:18
	→ dharrigan joined	09:18
DavidCruse	Hello all	09:18
	I want to know the minimums of a good commit message as beginner	09:18
	→ jaydubya joined	09:18
TomyWork	thiago thanks	09:18
	short description\n\nlong description	09:18
	← Err404NotFound left	09:19
	← wxg4irc left	09:19
	← joo-_ left	09:19
grawity	DavidCruse: !clean_message	09:20
gitinfo	DavidCruse: It helps to write clean commit messages. http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html explains how.	09:20
	← diegoaguilar left	09:20
	→ joo-_ joined	09:20
osse	also note that it's much easier to write a good commit message if the commit itself is good	09:20
	← psoo left	09:21
grawity	:o	09:21
	→ psoo joined	09:21
TomyWork	the other day, i was discussing with a coworker about whether pushing to a bare git repo (on ext4) is atomic or at least doesnt leave Git in an undefined state if the server's power goes out at the worst possible time	09:21
	← sb left	09:21
TomyWork	assuming no write cache :)	09:21
	← EminenceHC left	09:21
	← Error404NotFound left	09:21
	→ Err404NotFound joined	09:21
cbreak	TomyWork: get zfs :P	09:22
	→ strictlyb joined	09:22
	← darkbasic left	09:23
	← jaydubya left	09:23
grawity	the server first writes the packfile, then writes new hashes to refs/heads/... so I guess the worst that could happen is pushing multiple branches and having it crash before all of them were updated	09:23
	→ darkbasic joined	09:23
	← Fandekasp left	09:24
TomyWork	what if it crashes while the packfile is being written?	09:24
	→ wrouesnel joined	09:24
grawity	you'll have a stale objects/pack/.tmp_asdfghjk	09:25
	the repo remains unchanged otherwise	09:25
TomyWork	awesome	09:25
	so assuming the disk head doesnt crash right onto the repo, power cuts should be fine?	09:26
grawity	heh, optimizing for the worst	09:26
	← Err404NotFound left	09:26
	→ pppp2 joined	09:26
	→ Arsonide joined	09:27
TomyWork	one thing that came up was whether the client gets an ack for its push before it's final	09:28
	can that happen? (again, assuming no write cache)	09:28
Arsonide	So, I have three files in my git that appear to be different from the origin, but I did not change these files. They popped up when I was doing some repo maintenance a while back. They aren't files I've done anything with, and every time I commit now, I have to work around them. How do I get rid of these in my unstaged area, and revert the files back to how they are on the server? I've heard the words "stash" "discard" and	09:28
	"reset", but I don't know what I'm looking for.	09:28
	→ dharriga1 joined	09:28
	← dharrigan left	09:29
TomyWork	Arsonide do you use windows?	09:30
grawity	TomyWork: it sends "unpack ok" followed by whether updating each ref succeeded	09:30
cbreak	TomyWork: don't trust ext so far.	09:30
Arsonide	TomyWork: yes	09:30
TomyWork	Arsonide do you use crlf conversion?	09:30
grawity	TomyWork: not entirely sure when the first is sent – see git-receive-pack.c	09:30
Arsonide	uh...	09:30
	I don't...know	09:30
TomyWork	cbreak what could happen with ext that couldnt happen with zfs?	09:31
	→ valeriansaliou joined	09:31
cbreak	writing could fail, and write something wrong	09:31
TomyWork	grawity ok so it's kinda two-phase?	09:31
cbreak	if it's in the pack file, git would notice	09:31
	but if a ref contains a wrong hash, you'd only see it as dangling	09:32
TomyWork	cbreak err write something wrong?	09:32
	wouldnt that require a broken disk?	09:32
grawity	TomyWork: like I said previously, yes, it first receives the objects, and then points branches to the new stuff	09:32
cbreak	TomyWork: all disks are broken	09:32
	← dpio left	09:32
cbreak	TomyWork: expected error rate for reading is something like one in 10e14 bytes	09:33
	or was it 1e14?	09:33
TomyWork	what was that again... modern flash memory stores a probabilistic approximation of your data?	09:33
	→ marcogmonteiro joined	09:33
cbreak	yeah. Just like spinning metal	09:33
TomyWork	probably	09:34
cbreak	modern hard disks have a scary amount of encoding and error correction to read your data	09:34
	they are surprisingly reliable for the density they offer... but still.	09:34
	errors can happen	09:34
TomyWork	but them, what's the chance of that hitting a ref?	09:34
	← wrouesnel left	09:34
cbreak	tiny.	09:34
TomyWork	then*	09:34
cbreak	a ref is 41 bytes I think	09:34
	← uidzer0 left	09:35
TomyWork	and then i'd still have the reflog, right?	09:35
	or i could mill through the orphans in the repo	09:35
	sort by latest commit date, compare to the wrong hash, pick closest, modify ref, fixed :)	09:36
	← jb55 left	09:36
grawity	or you could just push again	09:36
TomyWork	(likely)	09:36
	or that, assuming that is an option	09:37
	→ jb55 joined	09:37
	→ Error404NotFound joined	09:39
	→ bgerber joined	09:39
	← Takle left	09:39
	→ zoso joined	09:39
	→ Takle joined	09:39
	→ irqq joined	09:39
	→ dharrigan joined	09:39
	← dharrigan left	09:39
	→ dharrigan joined	09:39
	← dharriga1 left	09:40
cbreak	grawity: that'd not be fast forward :)	09:40
	← durre left	09:40
	← kyb3r_ left	09:41
	← jb55 left	09:41
	← Error404NotFound left	09:43
	→ uidzer0 joined	09:43
	← weiyang left	09:45
	→ dharriga1 joined	09:45
	← dharrigan left	09:46
	→ corni joined	09:46
	← corni left	09:46
	→ corni joined	09:46
	→ luriv joined	09:47
	← iamjarvo left	09:47
	→ gccostabr joined	09:48
	→ DaisyTheCow joined	09:48
	→ davidreis joined	09:49
	→ jcalonso joined	09:49
	← himikof left	09:49
	→ magic_ joined	09:50
	← magic_ left	09:51
	→ himikof joined	09:51
	← ManikM left	09:51
	→ ManikM joined	09:52
	← uidzer0 left	09:52
	← dharriga1 left	09:52
	← luriv left	09:54
	→ moritzs joined	09:54
	→ aswen joined	09:55
	← aswen left	09:55
	← nikita left	09:55
	→ aswen joined	09:56
Arsonide	Ok, so I just did "git checkout -- <file>" it appeared to work, no error or anything. The file is still (immediately afterwards) in my unstaged area as changed.	09:56
	The diffs appear to be identical.	09:56
canton7	Arsonide, !repro	09:56
gitinfo	Arsonide: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will raise the odds of getting your problem fixed from about 30% to about 90%.	09:56
Arsonide	That was my terminal session.	09:57
	→ marshall joined	09:57
Arsonide	git checkout -- file	09:57
	→ uidzer0 joined	09:57
	→ nikita joined	09:58
canton7	Arsonide, and 'git status' output both before and after?	09:59
	← DavidCruse left	09:59
	→ dharrigan joined	09:59
	← dharrigan left	09:59
	→ dharrigan joined	09:59
	← kcj left	10:00
	→ luriv joined	10:01
Arsonide	One moment, I'll whip together something	10:01
	← jceb left	10:02
	→ tvw joined	10:02
	→ Juxtapositional joined	10:03
	→ beautifulmind joined	10:03
	→ otter768 joined	10:04
	← dharrigan left	10:04
	→ dharriga1 joined	10:04
	← moritzs left	10:04
	← nikita left	10:05
	→ Aristata joined	10:05
	→ teran joined	10:05
	→ nikita joined	10:07
pikaren	scary moment when you expect a merge conflict but git magically resolves it for you....	10:07
	→ martinklepsch joined	10:07
	→ creep joined	10:07
cbreak	wasn't a conflict then :)	10:08
	← luriv left	10:08
	Solid1_afk → Solid1	10:08
Stummi	its a good idea to have a look what git resolved for you anyway ;)	10:08
Arsonide	canton7: Changed names to protect the innocent, but kept the paths similar in structure: http://hastebin.com/piyuvoqebo.vala	10:09
	← corni left	10:09
	← otter768 left	10:09
canton7	Arsonide, thanks. interesting. just to make sure: you haven't removed any git status output?	10:10
	Arsonide, also, what's the diff for cowdef.txt? Is it a line endings change?	10:10
Arsonide	No I did not modify anything, just replaced names of paths and stuff.	10:10
	How do I check that in the CLI	10:10
	→ luriv joined	10:10
canton7	git diff 'cool stuff/chickens/cows/cowdef.txt'	10:10
	→ niro joined	10:11
	← niro left	10:11
	→ niro joined	10:11
	← doev left	10:11
Arsonide	To me they appear to be identical.	10:12
canton7	pastie the output	10:12
	→ t0th_-_ joined	10:12
	→ ayaz joined	10:12
Arsonide	What would git show if it was a line ending?	10:12
	I can't really paste the output for this, sorry.	10:12
canton7	Arsonide, this sort of thign: http://pastie.org/9746524	10:13
pikaren	i have to look up how git's merge algorithm work :p	10:14
Arsonide	It looks like that, but the format is more like this: http://pastie.org/9746526	10:14
canton7	ok, looks like line endings to meeeee	10:14
Arsonide	why would the line endings be modified if I just checked out the file though?	10:15
canton7	pastie the contents of .gitattributes (if it exists), .git/info/attributes (if it exists), 'git config core.eol', 'git config core.autocrlf'	10:15
	→ tak30 joined	10:15
canton7	let's see what we're working with	10:15
	← pikaren left	10:15
	← dmnd left	10:16
	→ pikaren joined	10:16
	← t0th_-_ left	10:17
Arsonide	Hrm, there's a setting in git attributes to automatically normalize line endings, it's set "text=auto"	10:17
canton7	please, just pastie everything I asked for	10:17
	→ moritzs joined	10:17
canton7	there are a ton of different components to the line endings system	10:17
	cbreak would just turn it off	10:18
	← dharriga1 left	10:18
	→ dmnd joined	10:18
cbreak	line ending conversion just causes trouble for no gain at all	10:18
Arsonide	I'll do some research then	10:18
canton7	!crlf	10:18
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	10:18
	→ weasel joined	10:19
	← plato left	10:19
canton7	ok, if you're not going to tell me what settings you've got.... it's likely that the end results of the crlf settings is to normalize line endings on checkout, and you've got a file in the repo which has non-normalized line endings (i.e. it was like that when the line ending settings were changed, and was never re-normalized)	10:19
	so doing your checkout is normalizing the line endings in that file, and that still counts as a difference	10:19
	→ plato joined	10:19
	← petersr left	10:19
weasel	I'm trying to tell my git to trust only one specific certificate.	10:20
	on debian wheezy (7.x), the following worked: "git -c http.sslCAinfo=/home/weasel/w clone https://www.palfrader.org/git/conf/dotfiles.git test"	10:20
	(where ~/w only had the end-entity cert)	10:20
	this no longer works on debian jessie/testing, with git 2.1 instead of 1.7 (and presumably newer curl too).	10:21
	→ jheg joined	10:21
weasel	any hints?	10:21
	(https://www.palfrader.org/volatile/2014-11-27-I2nA5eo89NQ/w has the cert if you want to test yourself)	10:22
	→ jceb joined	10:22
	← freimatz left	10:22
	← sinkensabe left	10:22
	→ EminenceHC joined	10:22
Arsonide	canton7: If that was the case then wouldn't these files appear as modified for everyone in the repo? I appear to be the only one with this problem, and I'm not the only one on Windows.	10:23
	← plato left	10:23
	← darkbasic left	10:24
	→ darkbasic joined	10:24
canton7	Arsonide, it's happened to your because you've done a checkout on the file	10:24
	which has triggered the line ending normalization	10:25
Arsonide	It was modified before I tried that though.	10:25
	← TheEskil left	10:25
canton7	presumably you did something else to it that triggered the line ending normalization	10:25
	this is a known gotcha	10:25
Arsonide	So best option is git reset --HARD	10:26
	→ jatt` joined	10:26
	← jatt` left	10:26
	← jatt left	10:26
canton7	the best option is to normalize all the files in your repo	10:26
	→ jatt joined	10:26
canton7	https://help.github.com/articles/dealing-with-line-endings/	10:26
	see "Refreshing a repository after changing line endings"	10:26
	no-one did that ^	10:26
	← jceb left	10:27
	← EminenceHC left	10:27
	← alanwill left	10:28
	→ mikecmpbll joined	10:29
	→ dharrigan joined	10:32
Arsonide	Trying to pop up those settings for you, but git config core.eol popped up no output, is there some way to check the setting?	10:32
	← Solid1 left	10:33
	→ wxg4irc joined	10:33
	→ ome joined	10:33
	→ Solid1 joined	10:33
	Virox_ → Virox	10:34
	← kopparam left	10:36
	→ kopparam joined	10:37
	Arsonide learns that means it's set to native.	10:38
	← pacbard left	10:39
	← paulweb515 left	10:39
	→ sinkensabe joined	10:39
	→ jceb joined	10:39
	← dharrigan left	10:39
canton7	yeah - that's just the default	10:39
	→ dharrigan joined	10:40
	← dharrigan left	10:40
	→ dharrigan joined	10:40
	← sinkensabe left	10:41
Arsonide	autocrlf is true already	10:42
canton7	right, so that'll try and normalize on checkout	10:42
	← Raging_Hog left	10:43
	→ encod3 joined	10:43
	→ palcu joined	10:44
	← aswen left	10:44
	→ vtunka joined	10:45
	→ aswen joined	10:45
	→ dorkmafia joined	10:45
	← mennea left	10:45
	← devoldmx left	10:46
	→ mennea joined	10:46
	→ Gues480631 joined	10:46
	← dharrigan left	10:47
	← Marcus left	10:47
	→ dpio joined	10:47
	← Gues480631_ left	10:49
Arsonide	One more time though, what could I have done to these files that makes the normalization happen for me and nobody else? I've never touched them, at least intentionally.	10:50
	I don't even know what they are for.	10:50
	← dorkmafia left	10:50
	→ jaydubya joined	10:50
	← uidzer0 left	10:50
Arsonide	Not trying to be stubborn, I just want to understand so I know in the future.	10:50
	→ uidzer0 joined	10:51
	← darkbasic left	10:51
	← moritzs left	10:51
	→ darkbasic joined	10:52
	← kopparam left	10:52
	→ kopparam_ joined	10:52
	← mennea left	10:54
	→ sinkensabe joined	10:54
canton7	Arsonide, lots of little things can trigger normalization irrc	10:57
	*iirc	10:57
	I can't say for sure what it was	10:57
	→ rath joined	10:57
	← Gizburdt left	10:57
	← St_Marx_ left	10:58
	← palcu left	10:59
	← nikita left	11:01
	← kopparam_ left	11:01
	→ BlaXpirit joined	11:01
	← uidzer0 left	11:02
	→ uidzer0 joined	11:03
	→ nikita joined	11:03
	→ steele joined	11:04
	← daito left	11:05
	→ coredumb joined	11:07
coredumb	Hi folks	11:07
	→ teran_ joined	11:08
coredumb	I want to automate a Git mirror on several servers	11:08
	by creating git clone --mirror xxxx	11:08
	← steele left	11:08
coredumb	then i noted that if i add branches on source repo, git remote update creates it in the clone but a deleted branch will stay in the clone	11:09
	am i missing something or branches must be deleted manually ?	11:09
	oh --prune i guess	11:10
	← pppp2 left	11:10
	← teran left	11:12
	← angelsl left	11:12
	→ rnsanchez joined	11:13
	← Polyatomic left	11:14
	→ kopparam joined	11:15
	→ ecky--ptang-zoob joined	11:16
	→ t0th_-_ joined	11:16
	← sebhoss left	11:17
	→ petersr joined	11:18
	← hxm left	11:19
	← petersr left	11:19
	← darkbasic left	11:20
	→ paulweb515 joined	11:20
	→ darkbasic joined	11:20
	→ hxm joined	11:21
	← fairuz left	11:23
	← sinkensabe left	11:23
	← paulweb515 left	11:25
	→ EminenceHC joined	11:28
	← valeriansaliou left	11:29
	→ Raging_Hog joined	11:32
canton7	coredumb, yep	11:33
	← EminenceHC left	11:33
canton7	there's also a config option to defaut to --prune	11:33
	← jatt left	11:33
	← alorence left	11:36
	→ dharrigan joined	11:36
	← dharrigan left	11:36
	→ dharrigan joined	11:36
	← jceb left	11:38
	→ paulweb515 joined	11:38
	→ Gizburdt joined	11:38
	→ St_Marx joined	11:39
	← beautifulmind left	11:40
	← martinklepsch left	11:40
	← mkaesz left	11:40
	→ martinklepsch joined	11:41
	→ mribeirodantas joined	11:42
	robustus → robustus\|Off	11:42
	→ Error404NotFound joined	11:42
	→ dharriga1 joined	11:43
	← dharrigan left	11:43
	← uidzer0 left	11:44
	harish_ → harish	11:45
	← harish left	11:45
	→ harish joined	11:46
	← Duikb00t left	11:46
	→ Advocation joined	11:47
	→ arup_r joined	11:48
	← dharriga1 left	11:48
	→ uidzer0 joined	11:48
	→ dharrigan joined	11:48
	→ mennea joined	11:48
	← marcogmonteiro left	11:49
	← k_sze[work] left	11:51
	← ManikM left	11:51
	→ ManikM joined	11:52
	→ freimatz joined	11:53
	→ ogzy joined	11:53
ogzy	i already made a commit, and followed it some commits but haven't pushed yet, and realized i wrote my passowrd to one of th efiles i commited, how can i change the commited code?	11:54
	← kopparam left	11:55
	→ astrofog joined	11:55
canton7	ogzy, any merges since that commit you want to edit?	11:55
	have you pushed the commit you want to edit (I know you said you haven't pushed anything after it...)	11:56
ogzy	canton7: no merges, just made commits	11:56
	canton7: no push	11:56
	→ jceb joined	11:56
	← dharrigan left	11:56
canton7	ogzy, cool! nice and easy	11:57
	'git rebase -i <commit before the one you want to edit>'	11:57
	you'll get an editor with a list of commits. change 'pick' to 'edit' on the commit you want to edit	11:57
	save and close	11:57
	rebase will drop you just after the commit you selected to edit	11:57
ogzy	canton7: -i is the commit id?	11:57
canton7	so, make the change you need to that file, add it, then git commit --amend	11:57
	followed by git rebase --continue	11:58
	→ kopparam joined	11:58
canton7	no. the commit is 'git rebase -i <commit before the one you want to edit>', e.g. 'git rebase -i abc123'	11:58
	s/the commit/the command/	11:58
ogzy	canton7: what is abc123?	11:59
	→ beautifulmind joined	11:59
	→ mellernoia joined	12:01
canton7	an example commit hash, of the commit before the one you want to edit	12:02
	→ a-l-e joined	12:02
canton7	tell you what, can you pastie the output of 'git log --oneline'	12:02
	→ durre joined	12:03
	→ mkaesz joined	12:03
	→ lando23 joined	12:03
	→ dharrigan joined	12:03
	← Gizburdt left	12:03
	← Error404NotFound left	12:04
	← joo-_ left	12:04
	→ otter768 joined	12:05
	← Sammy8806 left	12:06
	→ Gizburdt joined	12:06
	← a-l-e left	12:07
	→ bhuvanaurora joined	12:07
	robustus\|Off → robustus	12:08
	← otter768 left	12:09
ogzy	canton7:	12:10
	bd1504 Celery handling is added.	12:10
	← dharrigan left	12:10
ogzy	a28948c Unnecessary file is removed	12:10
	e4f7c8c Sample test for sending metrics via RabbitMq and processing them with a task queue is added	12:10
	addf81b Sample Kafka producer Python code is added	12:10
canton7	pastebin, please	12:11
	don't inline in here!	12:11
	← worc left	12:11
ogzy	canton7: http://dpaste.com/109TE3J	12:11
canton7	cool, and which is the commit you want to edit?	12:11
ogzy	canton7: e4f7c8c	12:11
	← mkaesz left	12:11
	← bhuvanaurora left	12:11
canton7	ok, so the commit is 'git rebase -i addf81b'	12:12
	(or 'git rebase -i e4f7c8c^', which is the same)	12:12
	→ mkaesz joined	12:12
	→ joo-_ joined	12:12
	→ moritzs joined	12:12
	→ Sammy8806 joined	12:12
	→ LBV_User joined	12:13
ogzy	canton7: ok i rebased	12:13
	changed pick to edit	12:13
	saved it	12:13
	now i edit the file i want?	12:13
canton7	<canton7> rebase will drop you just after the commit you selected to edit	12:13
	<ogzy> canton7: -i is the commit id?	12:13
	<canton7> so, make the change you need to that file, add it, then git commit --amend	12:13
	<canton7> followed by git rebase --continue	12:13
	← mennea left	12:14
	← danmackay left	12:14
ogzy	canton7: ok thank you	12:15
canton7	all worked? cool!	12:15
	← mkaesz left	12:16
	← intellix left	12:16
	→ dsdeiz joined	12:16
	← King_Hual left	12:17
	→ Duikb00t joined	12:17
ogzy	canton7: yes, thank you	12:19
coredumb	canton7: ok thx	12:19
	btw is there any side effect defaulting to or running --prune each time git remote update ?	12:19
canton7	can't think of any	12:20
coredumb	ok	12:20
	thx	12:20
	→ valeriansaliou joined	12:21
	→ King_Hual joined	12:22
	← martinklepsch left	12:22
	→ johtso_ joined	12:22
	← ap0c left	12:23
	→ LucasTT joined	12:24
	← valeriansaliou left	12:28
	→ khamru joined	12:28
khamru	Hi	12:29
gitinfo	khamru: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:29
canton7	khamru, googling for 'git ssh noninteractive' brings up some nice results	12:29
	→ angelsl joined	12:29
	→ sebhoss joined	12:30
	→ palcu joined	12:30
khamru	I have used "ssh -o StrictHostKeychecking=no `hostname`" this command to skip (yes/no) option...	12:30
	→ dharrigan joined	12:30
	← dharrigan left	12:30
	→ dharrigan joined	12:30
khamru	but now it is asking to enter password:	12:30
	→ martinklepsch joined	12:30
canton7	that means that ssh key authentication failed, and ssh is falling back to password auth	12:31
	→ amikiri joined	12:32
	→ dijango joined	12:32
khamru	How to handle skipping keychecking verification and password authentication?	12:33
canton7	where are you cloning from?	12:33
	← Esya- left	12:33
khamru	From my localhost	12:34
canton7	does "your localhost" allow you to read git repos without providing any sort of authentication?	12:34
	(e.g. git:// access, or unauthenticated http)	12:34
	→ EminenceHC joined	12:34
	→ Esya joined	12:35
khamru	yes	12:35
canton7	use that, then	12:35
	rather than ssh	12:35
cbreak	then git will not ask for passwords.	12:35
	git will never ask for passwords anyway, but the protocol handlers for git:// won't either	12:36
khamru	am using git clone <url>	12:36
canton7	khamru, at the moment, you're cloning an ssh url	12:36
	ssh is always authenticated	12:36
	if your git server provides git:// or unauthenticated http access, use the appropriate git:// or http url	12:36
cbreak	ssh would be quite worthless if you could just disable authentication by asking nicely	12:36
khamru	ok. you want me to use git:// ?	12:37
cbreak	not like this is paypal.	12:37
canton7	khamru, you said your server supports unauthenticated access	12:37
	if that's over git://, use git://	12:37
	if it's over http(s), use http(s)://	12:37
	khamru, you're the one who set up your server: not us. We don't know what you've set up	12:37
	→ alekks joined	12:38
	← echo-area left	12:39
	← EminenceHC left	12:39
khamru	I dont have git:// and http:// urls for the repo but i only have [email@hidden.address]	12:40
	← Solid1 left	12:40
canton7	canton7> does "your localhost" allow you to read git repos without providing any sort of authentication?	12:40
	<khamru> yes	12:40
	← beautifulmind left	12:40
canton7	^ so you weren't telling the truth?	12:40
khamru	oh sorry no	12:40
	→ plitter joined	12:40
canton7	please make sure you only give correct answers - otherwise it's simply impossible to help you	12:40
	look at git-daemon	12:40
	canton7 is out	12:41
	→ Solid1 joined	12:41
	← St_Marx left	12:41
	← ManikM left	12:41
khamru	Could you please let me know what is git-daemon	12:42
	→ valeriansaliou joined	12:42
canton7	man git-daemon	12:42
gitinfo	the git-daemon manpage is available at http://jk.gs/git-daemon.html	12:42
cbreak	it's a program that provides git://	12:42
canton7	http://gitolite.com/gitolite/gitolite.html, ctrl-f for git-daemon	12:42
khamru	I dont have access to git server. I am developer and i am just want to clone the repo...	12:42
grawity	you cannot clone the repo you don't have access to	12:43
canton7	ok, so you lied about owning the git server, too? ack	12:43
grawity	much like you cannot browse a website you don't have access to	12:43
canton7	khamru, ask whoever set the server up to pretty please let you have unauthenticated access	12:43
	← King_Hual left	12:43
canton7	see what they say ;)	12:43
khamru	:(	12:43
grawity	having access doesn't imply a system account – anonymous access would suffice – but it's not like `git clone` can read it over the ether	12:43
	→ King_Hual joined	12:44
	← plitter left	12:44
canton7	it'd be a pretty shit security system if it let anyone who asked nicely in, whether they actually had access or not	12:44
	→ petersr joined	12:45
	← petersr left	12:45
	→ plitter joined	12:46
grawity	I think IPMI has that actually	12:46
	← arup_r left	12:46
	→ dorkmafia joined	12:46
	← lando23 left	12:47
	→ St_Marx joined	12:47
	→ lando23 joined	12:48
	← marshall left	12:49
	→ marshall joined	12:50
	← lando23 left	12:50
	← dharrigan left	12:50
	→ ManikM joined	12:50
	→ Harzilein joined	12:51
Harzilein	hi	12:51
	← dorkmafia left	12:51
Harzilein	i wonder if someone ever came up with a catchy name for "git, hg or fossil", seeing as dvcs is a bit too broad	12:52
jast	which aspects of dvcs do you want to exclude?	12:52
	→ intellix joined	12:53
	→ buffffal00 joined	12:54
Harzilein	jast: mostly those where the ui is focused on patch queues, but in practice it's "no easy interop with git semantics"	12:54
	← marshall left	12:55
cbreak	Harzilein: like gerrit?	12:55
	→ marchelzo_ joined	12:56
	← Guest38453 left	12:56
	← buffal0 left	12:56
	→ NoNMaDDeN joined	12:56
marchelzo_	Hi, I want to add a potentially breaking feature to my project and I don't want to change the main "branc". I'm pretty new to git, so I don't know what to do. Do I need to create a new branch?	12:57
Harzilein	cbreak: what i mean is that other dvcs projects usually have some unique selling point, while hg and fossil mostly are git workalikes	12:57
cbreak	marchelzo_: git checkout -b newbranchnamehere	12:57
	→ dharrigan joined	12:57
marchelzo_	cbreak: do I have to make a new directory locally for the new branch?	12:58
	← joo-_ left	12:58
	← moritzs left	12:58
canton7	please read about branching in !book	12:58
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	12:58
cbreak	marchelzo_: nope	12:58
canton7	it's a really important topic	12:58
marchelzo_	canton7: Yeah I figured that. Thanks cbreak canton7.	12:58
	← martinklepsch left	12:58
cbreak	marchelzo_: your git repo will be on that branch, you can modify files, commit them, and those commits will be on that branch	12:58
	marchelzo_: you can switch between branches with git checkout branchnamehere	12:58
	→ samskiter_ joined	12:59
marchelzo_	cbreak: sweet. sounds pretty straightforward	12:59
tobiasvl	checking out branches changes the actual files in the git repo directory, so you don't need to do anything	12:59
marchelzo_	awesome. thanks everyone :)	12:59
cbreak	be aware that changes are not on a branch	12:59
	they are in the working directory	12:59
	the act of committing puts them into a branch	12:59
	→ buffal0 joined	12:59
	← fstd left	13:00
cbreak	therefore, if you have changes and switch to an other branch, you'll still have the changes in the working dir	13:00
	→ fstd joined	13:00
	→ DavidCruse joined	13:01
	← samskiter left	13:02
	samskiter_ → samskiter	13:02
	→ moritzs joined	13:03
	← buffffal00 left	13:04
	← NoNMaDDeN left	13:04
coredumb	anyone doing multi master git cluster here =	13:04
	?	13:04
	→ Skapadapaduu joined	13:04
	→ NoNMaDDeN joined	13:05
marchelzo_	Do people usually push different branches to their remote repo or do they create a new repo for each branch?	13:05
coredumb	marchelzo_: branches to remote	13:05
	→ steele joined	13:05
marchelzo_	oh, ok. One repo can have multiple branches?	13:05
	← dharrigan left	13:05
grawity	sure, kinda the whole point of branches	13:06
osse	as many as you like	13:06
	→ Fandekasp joined	13:06
cbreak	marchelzo_: thousands	13:06
marchelzo_	yeah... before this the only git commands I used were 'commit -a -m' and 'push origin master'	13:06
	so this is pretty game chaning	13:06
coredumb	push origin <your banch>	13:07
cbreak	git push	13:07
	→ FilipNortic joined	13:07
coredumb	10 of thousands ?	13:07
cbreak	git push -u remote branch once to set up	13:07
coredumb	:D	13:07
cbreak	coredumb: each branch is about 41 bytes, and one inode	13:07
grawity	that's for recently used branches	13:08
	for packed-refs you don't even need many inodes	13:09
	← andrew__ left	13:09
	← steele left	13:09
	→ andrew__ joined	13:09
cbreak	I am making a worst-case calculation here	13:09
osse	in that case you have to include all the objects and assume it's been rebased 10 times	13:10
	→ Malsasa_ joined	13:10
coredumb	so i guess no one does multi master git services ?	13:11
	:)	13:11
cbreak	one master ought to be enough for everyone	13:11
canton7	'master' is just a name for a branch	13:11
	it's no different to any other branch	13:11
coredumb	^^	13:11
grawity	coredumb: multimaster as in?	13:11
	I imagine Google Code or Github would be doing something like that	13:12
coredumb	grawity: as in share repo files between multiple servers	13:12
grawity	the former is certainly hosted om Bigtable or something such	13:12
	Malsasa_ → Malsasa	13:12
coredumb	kinda cool having transparent failure of one server	13:13
	i guess i'll just failover on my mirror copies	13:13
	← kopparam left	13:13
	→ netcarver joined	13:14
	← rchavik left	13:14
	← Gizburdt left	13:14
cbreak	my git server has a raidz2 ZFS pool backed storage.	13:14
	that's enough. :)	13:15
coredumb	how does that make it enough ?	13:15
	it makes it enough for failing a couple of disks	13:15
	→ liamkeily joined	13:15
coredumb	doesn't help in a failing sever	13:15
	server*	13:15
	← Macaveli left	13:16
	→ martinklepsch joined	13:16
	← dtrott left	13:18
cbreak	coredumb: for that I have ... additional repositories :)	13:18
coredumb	cbreak: automatic mirrors i guess ?	13:18
	← DrSkyLizard left	13:19
cbreak	coredumb: nope, not important enough for that	13:19
coredumb	cbreak: OK :)	13:20
cbreak	gitolite would have a hook for that, but really, if something happens I'll just tell them to restore the vm from backup	13:20
	← martinklepsch left	13:21
	← zoso left	13:24
EvilDMP	I committed a new file I didn't want to, so I did git reset HEAD path/to/file - but git status doesn't now show it as a new file, so I presume it's still in there somehow	13:24
	How can I check?	13:24
	→ pacbard joined	13:24
	← _5kg left	13:25
	→ tirengarfio joined	13:27
grawity	it won't show it as a new file, because it's not new anymore – you committed it	13:27
	and the command did nothing to undo that, really	13:27
	→ phantombeta joined	13:28
grawity	that `git reset` mostly deals with the index; if you want to remove the file from the next commit, you'll need `git rm --cached`.	13:28
	→ Gizburdt joined	13:29
EvilDMP	thank you grawity	13:29
	← subhojit777 left	13:31
	← andrew__ left	13:32
	→ andrew__ joined	13:32
	← andrew__ left	13:32
	→ andrew__ joined	13:33
	← andrew__ left	13:33
	→ dharrigan joined	13:34
	← dharrigan left	13:34
	→ dharrigan joined	13:34
	→ andrew__ joined	13:34
	← andrew__ left	13:34
	→ andrew__ joined	13:35
	← andrew__ left	13:35
	← LeMike left	13:35
	← vurma left	13:35
	→ EminenceHC joined	13:36
	→ andrew__ joined	13:36
	← andrew__ left	13:36
	→ andrew__ joined	13:37
	→ dangerousdave joined	13:37
	→ tjm_jimmy joined	13:37
	← andrew__ left	13:37
	→ andrew__ joined	13:37
	← andrew__ left	13:38
	→ andrew__ joined	13:38
	← andrew__ left	13:39
	→ andrew__ joined	13:39
	→ arup_r joined	13:39
	← tak30 left	13:40
	← andrew__ left	13:40
	← arup_r left	13:40
	→ andrew__ joined	13:40
	→ MarkyC joined	13:40
	← EminenceHC left	13:41
	← armyriad left	13:41
	→ danemacmillan joined	13:41
	← marchelzo_ left	13:44
	→ plato joined	13:45
	← andrew__ left	13:45
	← dharrigan left	13:45
	→ Ring0` joined	13:46
	← Consuela left	13:46
tobiasvl	!revert btw	13:47
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	13:47
Ring0`	Hello. What is the common practice. There are 3 branches, each dev uses one of them. When leader merged a branch1 into master. How should branch2 and branch3 incorporate those changes into their branches?	13:47
	(assuming they are aleady far ahead because last time they pulled master code was long time ago)	13:48
	→ petersr joined	13:48
cbreak	Ring0`: merge?	13:48
	→ Consuela joined	13:48
	→ AR45 joined	13:49
	← AR45 left	13:49
Ring0`	cbreak: so you can just merge master->branch2 and keep working on your code?	13:49
cbreak	if you want.	13:50
	← glebihan left	13:50
	→ AR45 joined	13:50
	→ marshall joined	13:50
Ring0`	thanks cbreak. can i instead (working on branch2) co master, pull, co branch2, commit branch2?	13:51
	← AR45 left	13:51
Ring0`	what's the difference between this and merging master->branch2	13:52
	← ManikM left	13:52
	→ Manny_ joined	13:52
	→ AR45 joined	13:52
AR45	Hello	13:52
cbreak	if you check out master and then merge, the merge commit will be on master	13:52
AR45	I'm on mac	13:52
cbreak	also, the heads have a different order	13:52
AR45	Where can I find the cli download for git	13:52
	I don't want the gui	13:52
cbreak	AR45: get xcode or the command line dev tools	13:53
	it contains git	13:53
Ring0`	AR45: or use brew	13:53
cbreak	or compile it from git.git	13:53
AR45	oh my god..	13:53
	→ glebihan joined	13:53
AR45	idk what's wrong with this computer	13:53
	xcode-select --install	13:53
	just sends back info on usage of xcode-select	13:54
Ring0`	cbreak: "heads have a different" folder. How does it affect me?	13:54
	← wxg4irc left	13:54
	← helgikrs left	13:54
	← marshall left	13:54
	← plato left	13:55
	→ wxg4irc joined	13:55
	← moritzs left	13:55
	→ CEnnis91 joined	13:55
cbreak	Ring0`: order	13:55
	Ring0`: it means different paths via ^ and ~	13:56
	← Consuela left	13:56
	← pacbard left	13:56
	AR45 gives up	13:56
cbreak	AR45: install isn't valid.	13:57
	→ fairuz joined	13:57
cbreak	if you want xcode, get it via the app store or get the dmg from the developer page	13:57
	if you want the command line dev tools, not sure. They are supposed to automatically install themselves if you use them on a computer without tools	13:58
	→ pacbard joined	13:59
	→ sohail joined	13:59
	← mibofra left	13:59
	→ dharrigan joined	14:00
	← dharrigan left	14:00
	→ dharrigan joined	14:00
	→ BSaboia joined	14:02
	← wxg4irc left	14:03
	→ Marcus___ joined	14:04
	← dharrigan left	14:04
	← BSaboia left	14:05
	→ jonatasnona joined	14:05
	→ dharrigan joined	14:05
	← dharrigan left	14:05
	→ dharrigan joined	14:05
	← affa09 left	14:06
	→ affa09 joined	14:06
	← nnyk left	14:06
	→ otter768 joined	14:06
AL13N_work	if i have A-B-G-C-D-E-F .... how can i move the commit G after F to form A-B-C-D-E-F-G ?	14:07
	→ weiyang joined	14:08
AL13N_work	can i just rebase G to F ?	14:08
	→ Consuela joined	14:08
AL13N_work	or does that not work?	14:08
	→ Pyrogerg joined	14:08
	← weiyang left	14:09
	→ _5kg joined	14:09
	← punchagan left	14:09
	→ weiyang joined	14:09
canton7	assuming A is HEAD, it's probably easiest to 'git rebase -i F^'	14:09
	and re-arrange the lines in the editor	14:10
cbreak	AL13N_work: git rebase -i A	14:10
	→ punchagan joined	14:10
canton7	^or that, if G is newest	14:10
	← punchagan left	14:10
	← weiyang left	14:10
canton7	ahem, F is newest	14:10
cbreak	AL13N_work: but you won't get A-B-C-...	14:10
	← otter768 left	14:10
cbreak	you'll get A-B-C'-D'-...	14:10
	→ weiyang joined	14:10
	← weiyang left	14:11
	→ dharriga1 joined	14:12
AL13N_work	yes, that's fine	14:12
	i should've specified	14:12
	← dharrigan left	14:12
	→ weiyang joined	14:12
AL13N_work	i guess it's more like A-B-G-C-D-E-F-H-I --> A-B-C'-D'-E'-F'-G-H-I	14:12
	i guess it's more like A-B-G-C-D-E-F-H-I --> A-B-C'-D'-E'-F'-G'-H-I	14:13
	sorry	14:13
canton7	is A the newest?	14:13
	→ nastri joined	14:13
canton7	still not sure	14:13
AL13N_work	no	14:13
	→ peachriot_ joined	14:13
	← Kingsy left	14:13
AL13N_work	A is the parent	14:13
	I is the latest commit	14:13
	→ tak30 joined	14:13
canton7	A-B-C'-D'-E'-F'-G'-H'-I'	14:13
AL13N_work	right	14:13
	H and I will change too	14:13
	oh wait	14:13
	will they?	14:13
	← peachriot_ left	14:13
	→ jerius joined	14:13
osse	AL13N_work: yes, because their parents change	14:14
cbreak	AL13N_work: what ever you want	14:14
	AL13N_work: use -i	14:14
canton7	they'll have to - their contents won't, but they'll be rewritten to point to their new parents	14:14
cbreak	AL13N_work: then you can reorder commits as you want with a text editor	14:14
AL13N_work	ah yes, indeed	14:14
	so rebase -i and then choose interactively each commit?	14:14
	→ wrouesnel joined	14:15
canton7	rebase -i, re-arrange the lines in the editor to reflect the new order, save and quit, wait	14:15
AL13N_work	sounds simple enough :-)	14:15
	→ joo-_ joined	14:16
	→ NBhosting joined	14:17
	← joo-_ left	14:17
	→ punchagan joined	14:17
	→ joo-_ joined	14:17
	→ mibofra joined	14:17
	← punchagan left	14:19
	→ plato joined	14:19
	← okanck left	14:20
	← _0xAX left	14:20
	→ punchagan joined	14:20
	← dharriga1 left	14:21
	← LBV_User left	14:21
	→ AaronMT joined	14:23
	← hyperboreean left	14:23
Ring0`	ok cbreak so again, if I'm working on branch2 and I want to "merge" master. I do: co master, pull, co branch2, rebase master, continue my work	14:24
cbreak	no	14:24
	Ring0`: you do git merge master	14:25
	Ring0`: if you want to rebase, then you can do rebase master	14:25
	← ayaz left	14:26
	← DavidCruse left	14:26
	← Vile left	14:26
	→ Radivarig joined	14:27
	→ Sendoushi joined	14:27
	← fstd left	14:28
	← seschwar left	14:28
	→ zanchoPansa joined	14:29
	→ xnox joined	14:29
	→ seschwar joined	14:29
xnox	if i have a shallow clone (say depth 100) and I pulled 1000 new commits, how can I "garbage collect" and move the history horizon to be 100 commits again?	14:29
	← cagedwisdom left	14:30
	→ jatt joined	14:30
	← jerius left	14:30
	← Gizburdt left	14:30
	→ okanck joined	14:30
	→ jonas22 joined	14:30
	← jonas22 left	14:31
	← amikiri left	14:31
	→ peachriot_ joined	14:32
	→ Gizburdt joined	14:32
	← zanchoPa1sa left	14:32
	→ moritzs joined	14:33
	← dangerousdave left	14:33
cbreak	xnox: you can try to enshallow it with a different --depth while fetching	14:33
	xnox: but why?	14:33
	git history is usually extremely tiny	14:33
	→ dangerousdave joined	14:33
	← tjm_jimmy left	14:34
	← nikita left	14:34
	→ tjm_jimmy joined	14:34
	→ dharrigan joined	14:35
	← dharrigan left	14:35
	→ dharrigan joined	14:35
	→ nikita joined	14:37
	← jonatasnona left	14:37
	← govg left	14:37
	→ mennea joined	14:37
	→ adamben joined	14:37
	← adamben left	14:37
	→ adamben joined	14:37
	→ EminenceHC joined	14:38
	→ DavidCruse joined	14:38
	→ dreiss joined	14:39
	← tjm_jimmy left	14:39
	← AR45 left	14:40
	← Takle left	14:41
xnox	cbreak: in my case it isn't - someone commited large blob and removed it, and i'm trying to garbage collect it from disk.... (we decided not to rewrite history for now, will move to new repo /history later)	14:41
	→ Takle joined	14:41
	← mennea left	14:41
canton7	so if you didn't rewrite history... that object was never removed, and will never be gc'd	14:42
	← arnaud___ left	14:42
	← EminenceHC left	14:42
	← lachesis left	14:43
	→ Noldorin joined	14:43
	→ mennea joined	14:43
	→ phantombeta_ joined	14:44
	← phantombeta_ left	14:44
	← mribeirodantas left	14:44
	→ polyzen joined	14:45
	→ EminenceHC joined	14:46
	→ martinklepsch joined	14:47
	→ dorkmafia joined	14:47
	→ lachesis joined	14:48
	→ lrojas joined	14:49
	→ kopparam joined	14:49
	→ marshall joined	14:51
	← EminenceHC left	14:51
	→ LeMike joined	14:51
	← okanck left	14:51
	← dharrigan left	14:52
	← dorkmafia left	14:52
	← petersr left	14:52
	→ listochkin joined	14:54
	← t0th_-_ left	14:55
	← eletuchy left	14:56
	← marshall left	14:56
	← Pyrogerg left	14:56
	← _W_ left	14:56
	← moritzs left	14:58
	← Duikb00t left	14:58
	→ jmpp_ joined	14:59
	← jmpp left	15:01
	→ alanwill joined	15:02
	→ tang^ joined	15:02
	← DaisyTheCow left	15:02
	← tak30 left	15:03
	→ CheckDavid joined	15:03
	← peachriot_ left	15:03
	← astrofog left	15:04
	← clauswitt left	15:04
	← teran_ left	15:04
	← DavidCruse left	15:05
	→ teran joined	15:06
	→ dharrigan joined	15:06
	→ teran_ joined	15:06
	← alanwill left	15:07
	→ mdhopkins joined	15:07
	← Gizburdt left	15:08
	→ _W_ joined	15:08
	→ MLM joined	15:08
	robustus → robustus\|Off	15:09
	← rob_w left	15:09
	→ t0th_-_ joined	15:09
	→ fstd joined	15:10
	→ Vile joined	15:10
	← fstd left	15:10
	← teran left	15:10
	← phantombeta left	15:11
	← NoNMaDDeN left	15:13
	← mibofra left	15:13
	→ mibofra joined	15:13
	→ Pyrogerg joined	15:14
	→ Gizburdt joined	15:14
	← weiyang left	15:15
	→ fstd joined	15:16
	← dougsland left	15:17
	→ dougsland joined	15:18
	→ richardlitt joined	15:18
	← dharrigan left	15:19
	← Raging_Hog left	15:19
	→ basiclaser_ joined	15:20
	→ Gavrisimo joined	15:21
	← hs366 left	15:21
	← LeMike left	15:24
	→ LeMike joined	15:25
	→ nnyk joined	15:25
	→ joo--_ joined	15:25
	→ dharrigan joined	15:26
	→ NoNMaDDeN joined	15:27
	← joo-_ left	15:27
	← wrouesnel left	15:30
	→ kadoban joined	15:30
	→ mkaesz joined	15:30
	← fishey left	15:30
	← dharrigan left	15:32
	→ Bryzzle joined	15:32
	→ shinnya joined	15:33
	← ruukasu left	15:33
	← jceb left	15:34
	→ siaw joined	15:36
	← Pyrogerg left	15:37
	→ guest_____ joined	15:38
	→ Gues480631_ joined	15:38
siaw	i cloned a freesource project and created my on repo on github but can’t add the url of MY repo to push too. git tells me access to the ORIGINAL repo url (which i cloned from) denied me access. how do i push the files to the repo that I CREATED?	15:38
	← Gues480631 left	15:38
siaw	*opensource	15:38
guest_____	Hi. I'd like to get the date of the last push for use in a script. How can i do it?	15:38
canton7	siaw, define "can't add"	15:39
	what exactly do you do, and what happens?	15:39
	→ daedeloth joined	15:39
siaw	canton7: mean i can’t do git remote add origin MYREPOURL	15:39
canton7	siaw, there's probably already a remote called origin	15:39
	so either add it under another name, or remote origin and add yours :P	15:40
	← duckydan left	15:40
canton7	'origin' is just the name of a remote - it's nothing special, and no different to any other remote name	15:40
	← cbr_ left	15:40
	← Radivarig left	15:41
	← richardlitt left	15:41
siaw	canton7: so can i do something like this? git remote add somename MYREPOURL?	15:42
	→ cbr_ joined	15:42
canton7	sure	15:42
	convention is that your repo is called origin, and the upstream repo is called upstream	15:42
	→ EminenceHC joined	15:42
canton7	so if you want to keep the ORIGINAL repo's remote, I'd rename it to upstream, then add your repo as origin	15:42
	if you don't want to keep the ORIGIN repo's remote around, just remove it then add yours	15:43
	guest_____, you can't. pushes aren't logged	15:43
	→ ruukasu joined	15:44
	→ Gamecubic joined	15:44
	← Gues480631_ left	15:45
	→ mribeirodantas joined	15:45
guest_____	i'm thinking of the date i see in: git log -n 1	15:46
siaw	canton7: i did but then look https://github.com/siaw23/workshops it show 7 contributers on MY repo	15:46
	→ duckydan joined	15:46
siaw	why am i no the only contributer	15:46
	?	15:46
j416	guest_____: that's on the commit, it is not related to the push	15:46
guest_____	oh, right	15:46
j416	guest_____: a commit stores two timestamps, the time it was authored and the time it was committed.	15:47
	guest_____: but nothing stores when things were pushed.	15:47
	afaik	15:47
	← EminenceHC left	15:47
	← sebhoss left	15:47
guest_____	ok, my bad. I want the last commit time	15:48
	→ tekkbuzz joined	15:48
osse	guest_____: git log --pretty=%at	15:48
	(for example)	15:48
	add -1	15:48
	← huglester_ left	15:48
guest_____	cool, thanks	15:49
	← St_Marx left	15:49
osse	that'll get you the date of HEAD	15:49
	in a hook on a server that	15:49
	's not necessarily correct	15:50
	→ DolpheenDream joined	15:50
	→ LBV_User joined	15:50
	← listochkin left	15:50
	→ St_Marx joined	15:50
	→ listochkin joined	15:51
	→ cdleonard joined	15:52
	← listochkin left	15:52
	← Manny_ left	15:52
	→ ManikM joined	15:52
	→ marshall joined	15:52
	→ listochkin joined	15:52
	→ Pyrogerg joined	15:53
creep	hi peps got problems with merging. so for applying a test i created a new branch (test1). so test1 contains the files frim master. I deleted some files in test1 and did some changes which i commited. and i finished my test1. so i am ready to merge. the thing is now what happens when i merge test1 into master? what happens with the files i deleted in test and changed in test1. further more i only want to take the changes i a file but not the chang	15:53
	e of deleted files	15:53
	→ dharrigan joined	15:53
	← dharrigan left	15:53
	→ dharrigan joined	15:53
creep	what will be the result	15:54
	→ liamkeily1 joined	15:54
	← listochkin left	15:54
osse	creep: git merge --abort exists, so it's fairly harmless to try and see	15:55
	← liamkeily left	15:55
osse	creep: if you delete files in one branch and modify them in another git will say it's a conflict and you'll have to fix it	15:55
	→ King_Hual` joined	15:55
sybariten	ok, this may be a somewhat diffuse question... but if you look at how rsync works or is used, can you do something similar to a dry-run with git? I mean, in that you will see how much data would be transfered to another server	15:56
	→ eletuchy joined	15:56
sybariten	without actually transferring anything	15:56
	← marshall left	15:56
	← Marcus___ left	15:57
	→ lumio joined	15:57
	Solid1 → Solid1_afk	15:57
	← siaw left	15:57
Seveas	sybariten: not sure, but maybe git fetch --dry-run	15:57
	robustus\|Off → robustus	15:58
	→ siaw joined	15:59
	← King_Hual left	15:59
	→ Marcus joined	15:59
	← kopparam left	15:59
	→ jonatasnona joined	16:00
	← Pyrogerg left	16:01
	← eletuchy left	16:01
	← mennea left	16:02
	→ helgikrs joined	16:02
	← acolson left	16:02
	← FilipNortic left	16:02
	← roelmonn_ left	16:02
bq	how do i make an earlier commit in current branch as a new branch and checkout it?	16:02
osse	bq: git checkout -b newbranch oldcommit	16:03
	→ Gues480631 joined	16:03
	← jargon left	16:03
	← uidzer0 left	16:03
	→ uidzer0 joined	16:03
	← Silmarilion left	16:04
	→ marshall joined	16:04
	← Marcus left	16:04
	← martinklepsch left	16:04
	→ jcalonso_ joined	16:05
	← dharrigan left	16:05
	← siaw left	16:05
	← nikita left	16:06
	← jcalonso_ left	16:06
	→ martinklepsch joined	16:06
	→ jcalonso_ joined	16:06
	→ otter768 joined	16:07
	→ nikita joined	16:08
	← jcalonso left	16:08
	← Bryzzle left	16:09
sybariten	the other day i did a git fetch, that didnt really produce me any visible new files until i did a git reset --hard/master .... is this the normal way of working?	16:10
osse	fetch is read-only	16:10
	that is normal	16:10
	← lindenle left	16:11
osse	Whether you merge or rebase or reset (or do nothing) depends on what you want to achieve	16:11
	← otter768 left	16:11
Seveas	sybariten: yes, git fetch fetches objects, tags and does updates to refs/remotes/<remotename>/*. Critically, it does not touch your work tree or any other refs, such as local branches.	16:11
	← teran_ left	16:11
	→ Milkweed joined	16:12
sybariten	OK	16:12
	→ Bryzzle joined	16:12
sybariten	i feel like i'm learning IRC from the beginning or somethign like this, revision control with git is much more complicated than i had thought	16:13
jast	well, think of it like this... you can make your own local commits and such, completely independently of any remote repository	16:14
	→ jamesheston joined	16:14
	→ Raging_Hog joined	16:15
	→ nnyk_ joined	16:15
	← nnyk left	16:15
jast	a command that automatically combines new things arrived at the remote repository with your local changes is definitely useful, but so is a way to be able to look at both versions first. that way is 'git fetch'.	16:15
	→ smccarthy joined	16:15
	→ ehmatthes joined	16:15
	→ felipedvorak joined	16:15
	→ Pyrogerg joined	16:16
	→ felipedvorak341 joined	16:17
	← felipedvorak left	16:17
	← Advocation left	16:18
	← St_Marx left	16:18
	← felipedvorak341 left	16:18
sybariten	jast: hm, could you just rephrase that last one. I dont think i got the point	16:18
	or the "gist" of it	16:18
	→ St_Marx joined	16:18
osse	zing	16:18
sybariten	heh, wasnt even trying to be funny	16:18
jast	well, suppose you've committed some changes locally, and other people have pushed stuff to the remote repository, too	16:18
	← rath left	16:19
jast	one way to move on from there would be a command that says "grab the remote changes and merge them with my own"... but maybe that's not always the thing you'll want to do. maybe you want to compare the two versions or something.	16:19
	→ dharrigan joined	16:20
jast	so, git has an intermediate step that you can take. that's fetching. fetch mirrors the remote state of things into your local repository, out of the way of where you're doing your own work	16:20
	→ Goplat joined	16:20
	→ kukks joined	16:20
	← kukks left	16:20
	→ kukks joined	16:20
jast	you can see the mirrored branches, officially called remote-tracking branches, by using 'git branch -r'	16:21
	← dsdeiz left	16:21
jast	whenever you 'git fetch', that's where the updates go	16:21
	so at this point, you have a way to compare things, look at the changes in depth, that sort of thing	16:21
	← wookienz left	16:22
jast	and then the next step you can do separately, e.g. 'git merge' (create a combined version of the two sides, commit that, and record in the commit that that's what happened)... or 'git rebase' (alter your local commits so that it looks like you made them after the updates from the remote repository came in)	16:22
	→ wookienz joined	16:23
jast	of course, sometimes 'git fetch' isn't really necessary to do as a separate step, so that's why we have 'git pull' that does fetch+merge (or fetch+rebase, depending on options and config) in one go	16:23
	← Gizburdt left	16:23
	← Pyrogerg left	16:24
	← cbr_ left	16:24
	← ManikM left	16:24
	→ Zupoman joined	16:24
	→ jceb joined	16:24
	← irqq left	16:25
	← dharrigan left	16:26
	→ whomp joined	16:26
	→ skorgon joined	16:28
	← skorgon left	16:28
	→ skorgon joined	16:28
	→ fishey joined	16:29
	← skylite left	16:29
sybariten	jast: aaah... ok, thanks!	16:29
	← mkaesz left	16:29
	← sohail left	16:29
sybariten	So, for someone like me, who is the sole user of the repository (using it for dotfiles and configuration), is it safe to say that in most of the cases i will want to do git pull, rather than git fetch?	16:30
jast	probably, yeah	16:30
sybariten	cool, great	16:30
	→ kopparam joined	16:30
AL13N_work	i make adjustments in a branch, and when i want to git push, it keeps complaining that it's rejected	16:31
	← lb1a left	16:31
AL13N_work	due to master	16:31
	← FreezingCold left	16:31
AL13N_work	but i din't make any changes on master	16:31
	← psoo left	16:31
jast	AL13N_work: didn't I tell you about this a day or two ago? by default push tries to update all branches, not just the one you're on right now. to change, use: git config --global push.default simple	16:32
	→ jatt` joined	16:32
	← jagob left	16:33
	← St_Marx left	16:33
	→ dharrigan joined	16:33
	← dharrigan left	16:33
	→ dharrigan joined	16:33
	← jatt` left	16:34
	← jatt left	16:34
	→ St_Marx joined	16:34
	← tekkbuzz left	16:34
AL13N_work	jast: you did, but that's not really the trouble	16:34
	→ subhojit777 joined	16:34
jast	oh, okay. so what is?	16:34
	← mdhopkins left	16:35
AL13N_work	jast: i just don't get why it's complaining about branches that aren't up2date when there is no commits in that branch?	16:35
	→ teran joined	16:35
AL13N_work	jast: you know what i mean?	16:35
	→ rpgade joined	16:36
jast	well, you should be able to let git tell you what it thinks is different between the two:	16:36
	git fetch; git log origin/master..master	16:36
	→ tristanp joined	16:36
	→ teran_ joined	16:37
AL13N_work	hmm, ok, will try	16:37
jast	that gives you a list of commits that are on your local master but not on the remote master	16:37
	← kriks left	16:37
AL13N_work	jast: and... if git push does all branches (i like), why does git pull don't do all branches?	16:37
	→ steele joined	16:37
jast	pull, when it merges, needs the working tree for combining changes in files, and since that can result in conflicts you have to fix manually, there's just too much room for error if it did that automatically for all branches, magically switching your worktree to each branch in turn	16:39
	← delight left	16:39
	← alekks left	16:39
	← Brain left	16:39
	→ konsolebox joined	16:39
	→ DanMAbraham joined	16:39
	← teran left	16:39
	← TomyWork left	16:40
	← mribeirodantas left	16:42
	→ alekks joined	16:42
	← St_Marx left	16:43
	→ claz joined	16:43
	→ dharriga1 joined	16:43
	→ mribeirodantas joined	16:43
	← dharrigan left	16:43
	← cwillu_at_work left	16:43
claz	when I merge but have conflicts does git still add the unconflicting changes?	16:43
	→ St_Marx joined	16:43
	→ moritzs joined	16:44
jast	add to the index, yes... so that once you have fixed the conflicts, all you have to do is 'git add' those and then commit	16:44
	← jonatasnona left	16:45
claz	jast: and if i want to remove all changes brought by the failed merge?	16:45
	would reset --hard fix it?	16:45
	→ Advocation joined	16:45
	← tristanp left	16:45
jast	that aborts the merge and also removes any other uncommitted changes	16:45
claz	thanks	16:45
jast	you can use 'git merge --abort' instead	16:46
	that tries to cleanly remove everything the merge attempt did	16:46
	→ EminenceHC joined	16:46
	→ Pyrogerg joined	16:46
	← Pyrogerg left	16:46
	→ Pyrogerg joined	16:47
claz	will remember in the future :D	16:47
jast	well I gotta go. have a good $timeofday, everyone	16:47
	← dharriga1 left	16:48
	→ dorkmafia joined	16:48
	→ jagob joined	16:48
	→ devoldmx joined	16:48
	← steele left	16:48
	← Vile left	16:48
claz	how do i find out if a branch originates from another branch?	16:49
	← dangerousdave left	16:49
	→ dangerousdave joined	16:50
	← Bryzzle left	16:50
	← helgikrs left	16:50
	← saint-ron left	16:51
	← EminenceHC left	16:51
	← alekks left	16:51
	→ tekkbuzz joined	16:52
	Solid1_afk → Solid1	16:53
	→ nour joined	16:53
	← liamkeily1 left	16:53
	→ tristanp joined	16:54
	→ Bryzzle joined	16:55
	→ mkaesz joined	16:55
	← seschwar left	16:55
	← mribeirodantas left	16:55
	→ m0viefreak joined	16:56
	← whomp left	16:56
	→ mribeirodantas joined	16:56
	← mribeirodantas left	16:56
	→ mribeirodantas joined	16:56
	→ rjvc_ joined	16:56
	← dreiss left	16:57
	← tvw left	16:58
Jupelius	How can I throw away couple commits but not the changes I've made	16:58
	So I can make a new commit which introduces all the changes	16:58
j416	Jupelius: git reset HEAD~2	16:58
	if by a couple you mean two	16:58
	Jupelius: you may also use "git rebase --interactive" to squash commits and reword them	16:59
Jupelius	I think the reset way is easier this time	16:59
	← samskiter left	17:00
	← jnavila left	17:01
	← Pyrogerg left	17:01
	→ liamkeily joined	17:01
	← konsolebox left	17:01
	→ epifanio joined	17:02
	← tristanp left	17:02
	→ dharrigan joined	17:02
	→ numdig joined	17:02
	→ tristanp joined	17:03
	← numdig left	17:03
	← Sendoushi left	17:05
	← moritzs left	17:05
	→ FreezingCold joined	17:05
	← NBhosting left	17:06
	→ amikiri joined	17:06
	← tristanp left	17:07
	→ jonatasnona joined	17:07
	← rjvc_ left	17:08
	→ sohail joined	17:08
j416	Jupelius: you're welcome	17:08
Jupelius	Thank you	17:08
j416	:)	17:08
	← adamben left	17:09
	← LeMike left	17:10
	→ dreiss joined	17:11
	→ thiago_ joined	17:11
	← DanMAbraham left	17:12
	→ eletuchy joined	17:12
	→ Literphor joined	17:13
	← DolpheenDream left	17:13
	← dharrigan left	17:13
	← Goplat left	17:13
	← nastri left	17:14
	→ konsolebox joined	17:14
	← kopparam left	17:14
	→ Gizburdt joined	17:15
	← jcalonso_ left	17:15
	→ jcalonso joined	17:16
	→ TomyLobo joined	17:16
	← Gizburdt left	17:16
	← Takle left	17:17
	← eletuchy left	17:17
	→ Takle joined	17:17
	← paul424 left	17:19
	← rpgade left	17:19
	→ Jackneill joined	17:20
	← Literphor left	17:20
	→ Literphor joined	17:21
	← ome left	17:21
	→ skylite joined	17:21
	← Literphor left	17:21
	← aswen left	17:21
	← dangerousdave left	17:22
	→ jottr joined	17:22
	jottr → elementz	17:22
	→ moritzs joined	17:22
	← lumio left	17:23
	← MLM left	17:23
	→ mnml joined	17:23
	→ alekks joined	17:23
	→ mihaicris joined	17:23
	← ehmatthes left	17:24
	→ jmpp joined	17:24
	← jmpp left	17:24
	→ jmpp joined	17:24
	← jmpp_ left	17:24
	← Noldorin left	17:25
	→ skylamer` joined	17:25
	← claz left	17:25
	← mihaicris left	17:25
	← joo--_ left	17:25
	← skylamer` left	17:26
	→ mihaicris joined	17:26
	→ same_ol_geez joined	17:27
	→ joo-_ joined	17:27
	→ dharrigan joined	17:27
	← dharrigan left	17:27
	→ dharrigan joined	17:27
	← shinnya left	17:28
	→ proq joined	17:28
	← Tuna-Fish left	17:28
	→ steele joined	17:29
	→ pheaver joined	17:29
	→ mkopriva joined	17:29
	← jheg left	17:30
	→ dregad joined	17:31
	← niro left	17:32
	→ madewokherd joined	17:32
	→ Sendoushi joined	17:32
	← kukks left	17:33
	→ LeMike joined	17:33
	← FreezingCold left	17:33
	← mikecmpbll left	17:33
	← WormDr1nk left	17:33
	← moritzs left	17:34
	→ shinnya joined	17:35
	← dharrigan left	17:35
	→ leeN joined	17:35
	← dpio left	17:35
	← liamkeily left	17:37
	← sohail left	17:37
	robustus → robustus\|Off	17:38
	→ diegoviola joined	17:38
	→ Tuna-Fish joined	17:39
	→ otter768 joined	17:40
	→ FreezingCold joined	17:40
	← Advocation left	17:40
	→ danemacm1 joined	17:41
	← Bryzzle left	17:41
	→ Advocation joined	17:42
	← danemacmillan left	17:43
	→ quetz joined	17:43
	← Akagi201 left	17:44
	→ ehmatthes joined	17:44
	← davidreis left	17:45
	← plitter left	17:46
	← tekkbuzz left	17:46
	→ Bryzzle joined	17:47
	thiago_ → thiago	17:47
	→ plitter joined	17:47
	→ freenux joined	17:47
	← dreiss left	17:48
	← vtunka left	17:48
	← alekks left	17:48
	← gabeio left	17:48
	→ gabeio joined	17:49
	→ dharrigan joined	17:49
	← dharrigan left	17:49
	→ dharrigan joined	17:49
	→ moritzs joined	17:49
	ChanServ set mode: +o	17:49
	Solid1 → Solid1_afk	17:50
	← guest_____ left	17:50
	→ EminenceHC joined	17:51
	→ jcalonso_ joined	17:51
	← intellix left	17:51
	← jcalonso left	17:53
	Eugene changed the topic to: Welcome to #git, the place for git help and harvest festivals \| Current stable version: 2.2.0 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| https://www.youtube.com/watch?v=OIz8f3b1KqQ	17:54
	Eugene set mode: -o	17:54
	← same_ol_geez left	17:54
qsuscs	er	17:54
	→ same_ol_geez joined	17:54
qsuscs	Eugene: whatever you smoke, give me some of it.	17:55
	→ m0ltar joined	17:55
qsuscs	(i didn’t turn on the sound yet, as there other people here, but that’s just enough)	17:55
	← EminenceHC left	17:55
	→ dharriga1 joined	17:56
	← dharrigan left	17:56
	→ mennea joined	17:56
	← steele left	17:57
	robustus\|Off → robustus	17:57
	→ Pyrogerg joined	17:57
	← Juxtapositional left	17:58
	← nnyk_ left	17:59
	← otter768 left	17:59
	← uidzer0 left	18:00
m0ltar	Hey everyone. I am having a hard time figuring this out. Should be simple. But I guess I just don't know the basics too well. I need to maintain a fork of a vendor upstream forever. We will make changes to this. Whenever upstream updates, I want to pull those changes in, and then rebase all of my changes on top. So I always have a clear picture of what has changed in my fork. What is the best course for this? Thx!	18:01
	→ stamina joined	18:02
	→ uidzer0 joined	18:02
	→ Juxtapositional joined	18:03
	← Sendoushi left	18:03
osse	m0ltar: assuming your branch is master and vendor is origin: git clone blabla; work; commit; work commit; git fetch; git rebase origin/master; work; commit; work commit; git fetch; git rebase origin/master; work; commit; and so on for eternity	18:03
	← dharriga1 left	18:03
m0ltar	osse: so basically fetch and then rebase?	18:04
osse	exactly	18:04
m0ltar	ok i think i actually get it now! thanks!!!	18:04
	← amikiri left	18:04
m0ltar	i always forget the fact that you can ref remotes like that too, i.e. being specific about what is being rebased	18:04
osse	m0ltar: you'll have a clearer picture of what you've done, but you have a muddier picture of when you did them compared to what the vendor did	18:05
	← dregad left	18:05
m0ltar	is there a better way then?	18:05
	given that my changes will probably be minor	18:05
osse	git merge origin/master; work; commit; git merge origin/master	18:05
	it's up to you. .I'd probably go with rebase myself	18:05
m0ltar	the changes will be like README.pm, some config stuff and minor nonsense	18:06
	→ Literphor joined	18:06
	Guest38290 → karstensrage	18:06
osse	i'd rebase	18:06
	← karstensrage left	18:07
	→ karstensrage joined	18:07
m0ltar	ok, thanks!	18:07
osse	what I said about the muddier picture is true, but you can still find out with some work if need be	18:07
	→ peachriot_ joined	18:07
	← Literphor left	18:07
	← Juxtapositional left	18:08
	← jcalonso_ left	18:08
	← freimatz left	18:09
	← dorkmafia left	18:09
	← ecky--ptang-zoob left	18:09
	→ sohail joined	18:13
	→ eletuchy joined	18:13
	← Gues480631 left	18:13
	→ Gues480631 joined	18:13
	← madewokherd left	18:15
	← epifanio left	18:15
	← adamw left	18:16
	→ ecky--ptang-zoob joined	18:17
	Solid1_afk → Solid1	18:17
	→ mennea_ joined	18:17
	← eletuchy left	18:17
	→ kopparam joined	18:19
	← mennea left	18:19
	→ diegoaguilar joined	18:20
	→ madewokherd joined	18:22
	← buffal0 left	18:22
	→ KONIG joined	18:23
	← kopparam left	18:24
	→ jheg joined	18:25
	→ MarkyC_ joined	18:25
	← peachriot_ left	18:25
	→ fragamus_ joined	18:25
	← MarkyC left	18:25
	MarkyC_ → MarkyC	18:25
	← Pyrogerg left	18:26
	→ jb55 joined	18:27
	→ nnyk_ joined	18:27
	→ peachriot_ joined	18:27
	→ dreiss joined	18:29
	→ michelangelo joined	18:32
	→ ArSn joined	18:32
	→ Juzzika joined	18:33
	→ dorkmafia joined	18:33
	← thiago left	18:34
	→ bhuvanaurora joined	18:34
	← donmichelangelo left	18:35
	→ thiago joined	18:36
	← joo-_ left	18:39
	← m0ltar left	18:39
	← fragamus_ left	18:40
	→ jottr joined	18:40
	→ a_le joined	18:40
	← Advocation left	18:40
	→ J1G\|Anon126 joined	18:40
	→ mikecmpbll joined	18:41
	← jonatasnona left	18:42
	→ buffal0 joined	18:42
	← marthinal left	18:42
	→ amikiri joined	18:42
	← elementz left	18:42
	robustus → robustus\|Off	18:43
	→ DonVitoCorleone joined	18:44
	→ dharrigan joined	18:44
	← dharrigan left	18:44
	→ dharrigan joined	18:44
	← a_le left	18:45
	← ehmatthes left	18:45
	← dreiss left	18:45
	→ maroloccio joined	18:45
	← diegoaguilar left	18:45
	→ HerrK joined	18:45
	→ tekkbuzz joined	18:45
	← subhojit777 left	18:45
	→ Sendoushi joined	18:46
	← mennea_ left	18:47
	→ marthinal joined	18:47
	→ mennea joined	18:48
	← stamina left	18:48
	← pheaver left	18:49
	← dharrigan left	18:50
	→ EminenceHC joined	18:53
	← Takle left	18:54
	→ t0th_-__ joined	18:54
	→ Takle joined	18:55
wbdecker	is there some good way to share a common makefile or (cmakefile) between repositories?	18:55
	or do you have to have N copies of them and keep them all in sync manually	18:55
	like, say you want to suddenly compile all your repositories with -malign-double or something	18:56
	← mikecmpbll left	18:56
	← PCatinean left	18:56
	→ Literphor joined	18:56
kadoban	wbdecker: You could have it as a branch. I have a "skeleton" setup for each language I use, mostly and just merge it into every project I do. Sounds like not exactly the same problem you're talking about though.	18:56
	← smccarthy left	18:56
	→ mikecmpbll joined	18:56
kadoban	wbdecker: You could just link to a common version, but then that won't use version control really.	18:57
	← MarkyC left	18:57
wbdecker	kadoban: you mean a symbolic link?	18:57
kadoban	wbdecker: Yeah.	18:57
thiago	wbdecker: put it in a submodule that all of the other projects include	18:57
wbdecker	I am basically talking about a common makefile include	18:57
	← t0th_-_ left	18:57
	→ MarkyC_ joined	18:57
	→ mahem1_ joined	18:57
osse	maybe there are some env vars that cmake respects	18:57
thiago	and then make an include() or load() or whatever it is that cmake does of that common file	18:57
	← EminenceHC left	18:57
	MarkyC_ → MarkyC	18:57
	→ dharrigan joined	18:57
	← dharrigan left	18:57
	→ dharrigan joined	18:57
	← nnyk_ left	18:57
wbdecker	thiago: so you'd have a repository with nothing in it but the make include?	18:58
	← mribeirodantas left	18:58
	← luksaur left	18:58
thiago	wbdecker: well, you can put other common things there	18:58
pasky_	and you'd have to git submodule update --init every time you clone a repo	18:58
	← MarkyC left	18:58
	→ petersr joined	18:59
pasky_	it's possible but i think you'd generally find life easier with a branch solution as kadoban suggests	18:59
	→ veebers joined	18:59
	→ dreiss joined	18:59
	→ mribeirodantas joined	18:59
pasky_	it's always a tricky tradeoff though	18:59
wbdecker	I thought there was a git clone -r option or something for submodules	18:59
	← mihaicris left	18:59
	→ MarkyC joined	19:00
pasky_	indeed	19:00
	→ roelmonnens joined	19:00
mahem1_	Hey all, kinda confused about github pull requests. What's better? A pull request (with merge commit) or to pull changes yourself and rebase? I don't see if practicle to merge pull requests from developers who commits regularly.	19:00
	← FreezingCold left	19:00
wbdecker	I basically have a git alias "git klone" that is aliased to clone -r	19:00
pasky_	but then there's the question of lock-step development; with a branch you can easily maintain some local tweaks if you need them (or rather when you need them), it's reviewable and in diffs between versions, etc.	19:00
	→ tvw joined	19:00
thiago	mahem1_: whatever is easiest for you and for whomever is merging	19:01
wbdecker	pasky_: what I don't understand about the branch method since wouldn't you need one branch per repository?	19:01
pasky_	i personally advise against using submodules except in special circumstances (when they really refer to an external, very independent component) because life quickly gets messy and difficult otherwise in my experience	19:01
thiago	mahem1_: since there are two people involved, talk to the other party	19:01
	thiago agrees on the submodules	19:01
thiago	well, the independent part and on the getting messy	19:02
	we use it for our own stuff, but they're msotly independent	19:02
pasky_	wbdecker: you can git pull <url> (or git subtree pull -P build/ <url>, whatever floats your boat)	19:02
thiago	it's when they depend that things get messy	19:02
pasky_	indeed	19:02
	← Sleepy63 left	19:02
	← Sendoushi left	19:02
	← jceb left	19:03
wbdecker	I don't understand the branch method--how does that help me keep a file common bw repos?	19:03
thiago	I made a change in module A that made 6.7f get printed as "6.66666669", which broke module B	19:03
	of course I couldn't change module B to expect "6.66666669" before module A got updated...	19:03
	but the unit test system wouldn't let A get updated if B broke	19:03
pasky_	wbdecker: you have a separate repo with the makefile, just like in the case of submodule, but you merge it instead of having it as a submodule	19:03
	← maroloccio left	19:03
pasky_	hehe, ouch	19:04
	← jottr left	19:04
mahem1_	thiago: Ok, I would rather rebase locally, but then the problem is him resyncing. He has to pull from the main repo and then push -f his fork. (And, of course, push -f shoudl be avoided generally)	19:04
thiago	solution: change it to 6.5	19:04
wbdecker	pasky_: I thought merges were for branches within a repo that were otherwise very similar	19:04
thiago	mahem1_: there's no situation where collaboration implies push -f	19:05
mahem1_	thiago: Even if I change the commit hashes? (if I don't ff)	19:06
thiago	mahem1_: you don't change the commits that have been accepted by the upstream	19:06
	mahem1_: therefore, no push -f	19:06
wbdecker	pasky_: oh I see (googling around) you're recommending subtrees as opposed to submodules?	19:06
thiago	mahem1_: you may only change what hasn't been accepted yet	19:06
	→ Technocrat7 joined	19:06
	← Takle left	19:06
	→ Takle joined	19:06
kadoban	wbdecker: There's nothing that requires them to be similar at all to merge.	19:07
	wbdecker: It just puts the stuff together. They don't even need a common history at all, or any kind of relationship.	19:07
wbdecker	kadoban: ok, I didn't realize that	19:07
	← paulweb515 left	19:08
	← Xack left	19:08
	→ jonatasnona joined	19:08
wbdecker	we seem to use artifactory a lot where I work. I wonder if another solution is to pull down the common makefile from artifactory	19:09
	→ Matrixiumn joined	19:09
mahem1_	thiago: Confused, If I pull his downstream fork to my local machine, rebase, then push upstream to the central repo. What does he then do with his out of sync downstream fork?	19:10
	← uidzer0 left	19:10
	→ uidzer0 joined	19:10
thiago	mahem1_: rebase	19:10
	mahem1_: or just drop	19:10
	→ arnaud___ joined	19:10
	← basiclaser_ left	19:11
	→ groolot joined	19:12
	→ Nechradile joined	19:12
	→ fatalhalt joined	19:12
mahem1_	thiago: Rebase? If his fork is on, say, github he would have to rebase local (which still leads to push -f?). But drop looks like a solution.	19:13
	← groolot left	19:13
thiago	mahem1_: his repository contains the unaccepted commits	19:13
	← Matrixiumn left	19:13
thiago	no one pulls from him	19:13
	once you've accepted the commit, he rebases, which will drop existing commits	19:13
	← dharrigan left	19:13
	→ Matrixiumn joined	19:14
	→ irqq joined	19:14
	← J1G\|Anon126 left	19:14
	→ Pyrogerg joined	19:15
	→ jottr joined	19:15
	→ nour_ joined	19:15
	← faylite left	19:15
	→ flowinho joined	19:15
mahem1_	thiago: Ok, so when he rebases simply pushes and the unaccepted commits are no longer at HEAD nor in the new commit tree.	19:16
	thiago: I think I've got it now.	19:16
	→ Sleepy63 joined	19:16
thiago	mahem1_: he pushes with -f to his repository. That's fine.	19:16
	→ Gues480631_ joined	19:16
	← akira left	19:17
	→ akira joined	19:17
mahem1_	thiago: Ok, because nobody should be pulling from him.	19:17
	← mennea left	19:17
thiago	mahem1_: correct	19:18
mahem1_	thiago: Cool, thanks.	19:18
thiago	mahem1_: now, if he and someone else want to collaborate, it's possible, but that's up to them	19:18
	← teran_ left	19:18
	→ Takle_ joined	19:18
	← Gues480631 left	19:18
	← nour left	19:18
	← tekkbuzz left	19:20
	← Takle left	19:20
	→ dharrigan joined	19:20
	→ mennea joined	19:21
	→ cwillu_at_work joined	19:21
	→ dialeth joined	19:21
	← mennea left	19:22
	→ Embassy joined	19:23
	→ helgikrs joined	19:23
	→ Junior joined	19:24
	← israelpattison left	19:25
	→ steele joined	19:26
	→ israelpattison joined	19:26
	→ tristanp joined	19:26
	← Nechradile left	19:26
	← dharrigan left	19:26
	→ samskiter joined	19:27
	← moritzs left	19:27
	← jottr left	19:28
rivarun	is there a global setting for context lines in unified diff format (show, commit -v, etc)	19:28
	→ mennea joined	19:28
rivarun	or even per command	19:28
	→ aard_ joined	19:29
	→ ap0c joined	19:29
	← ecky--ptang-zoob left	19:30
	→ listochkin joined	19:30
	→ FreezingCold joined	19:31
	← Literphor left	19:32
	← Raging_Hog left	19:32
	→ akiva joined	19:33
	→ Nechradile joined	19:34
	← Nechradile left	19:34
	→ xissburg joined	19:34
	← unreal left	19:34
	→ Nechradile joined	19:35
	← Nechradile left	19:35
	→ Nechradile joined	19:36
	← Takle_ left	19:36
	→ unreal joined	19:36
	← Gues480631_ left	19:37
	← punchagan left	19:37
	← buffal0 left	19:38
	→ cagedwisdom joined	19:39
	← amikiri left	19:39
	→ paulweb515 joined	19:40
	→ Advocation joined	19:40
	→ dharrigan joined	19:40
thiago	rivarun: -U<n<	19:40
rivarun	thiago: by <n< you mean the context lines? if so, that's fine for diff, but how do i set it for commit -v for example?	19:41
thiago	I mean the number of lines you want in context	19:41
rivarun	perhaps you meant to type U<n>?	19:42
thiago	oh, right	19:42
	→ J1G\|Anon126 joined	19:42
thiago	sorry, off-by-one key	19:42
rivarun	that's fine	19:42
	→ kukks joined	19:43
	→ amikiri joined	19:43
	← steele left	19:43
	→ m0ltar joined	19:44
	← aspiers left	19:44
	← Pyrogerg left	19:44
	← helgikrs left	19:45
	← dharrigan left	19:45
	→ Vile joined	19:46
	← Nechradile left	19:48
	→ aspiers joined	19:49
	← Advocation left	19:51
	← bq left	19:53
	← netameta left	19:54
	→ teran joined	19:56
	← Aristata left	19:56
	→ EminenceHC joined	19:57
	→ mennea_ joined	19:59
	→ dharrigan joined	19:59
	← dharrigan left	19:59
	→ dharrigan joined	19:59
	→ carlosr joined	20:00
	← shpoont left	20:01
	← mnml left	20:01
	← EminenceHC left	20:01
	→ punchagan joined	20:01
	→ eletuchy joined	20:02
	→ ropav joined	20:02
	← mennea left	20:02
	← rnsanchez left	20:02
	→ Advocation joined	20:04
	→ danmackay joined	20:04
	← marshall left	20:05
	← tirengarfio left	20:06
	← eletuchy left	20:06
	← m0ltar left	20:07
	← angelsl left	20:09
	← sohail left	20:10
	→ Shusshu joined	20:10
	← Shusshu left	20:10
	→ tirengarfio joined	20:11
	→ Noldorin joined	20:12
	→ sohail joined	20:12
	→ dharriga1 joined	20:12
	← NoNMaDDeN left	20:12
	→ livingstn joined	20:12
	← dharrigan left	20:13
	← dougsland left	20:14
	→ safinaskar joined	20:16
	← tirengarfio left	20:16
	← kadoban left	20:17
	← dreiss left	20:17
	→ nnyk_ joined	20:17
	← jonatasnona left	20:18
	← peachriot_ left	20:19
	→ Lyqyd joined	20:20
	→ tirengarfio joined	20:20
	→ m0ltar joined	20:20
	← dharriga1 left	20:21
	→ Prawnzy joined	20:21
	← kerrick left	20:21
	→ helgikrs joined	20:21
	← m0ltar left	20:21
	← safinaskar left	20:21
	→ tirengarfio_ joined	20:21
	→ kerrick joined	20:21
	← tirengarfio left	20:21
	← tirengarfio_ left	20:21
	→ MrSavage joined	20:22
MrSavage	how do you git add all modified files? I tried doing git add -u	20:22
	however the modified files are still not added?	20:22
	→ tirengarfio joined	20:23
osse	show the full output of git status	20:23
	→ jonatasnona joined	20:24
	→ liamkeily joined	20:24
	→ jottr joined	20:25
	→ Gizburdt joined	20:25
	→ lilshaggy joined	20:26
	← Bryzzle left	20:26
	← dorkmafia left	20:26
	← revolve left	20:26
	← Consuela left	20:27
	→ Sendoushi joined	20:27
	→ pheaver joined	20:27
	→ dharrigan joined	20:27
	← Gavrisimo left	20:27
	→ Gavrisimo joined	20:27
	← martinklepsch left	20:28
	→ paul424 joined	20:28
lilshaggy	Hi ! I'm trying to do ssh -vT [email@hidden.address] but it's giving the error 'ssh : could not resolve hostname github.com : Name or service not known' please help	20:28
	← mennea_ left	20:28
	→ kadoban joined	20:28
	→ Juxtapositional joined	20:28
	← mellernoia left	20:28
	→ martinklepsch joined	20:29
	→ mennea joined	20:29
osse	lilshaggy: that space before : looks strange. do you have a typo somewhere?	20:29
	→ WaReZ joined	20:29
osse	an extra space, that is	20:29
lewellyn	try to ping github.com as well	20:29
	→ sq-one joined	20:30
lilshaggy	@osse yes there is no space yes sorry	20:30
MrSavage	osse: here http://sprunge.us/HObO	20:30
	also HOBO!!!!!!!!!!!1	20:30
osse	MrSavage: try git add -u :/ (with the smiley)	20:31
	← plato left	20:31
	← sq-one left	20:31
MrSavage	osse: it worked	20:32
	why did it work?	20:32
	← Technocrat7 left	20:32
lilshaggy	lewellyn , github.com is not pinging	20:32
osse	MrSavage: git add -u I think only adds stuff in the current dir and within it. :/ is a shortcut to refer to the top of the repo	20:32
lewellyn	then the problem is on your wend.	20:32
	end.	20:32
	← FreezingCold left	20:32
MrSavage	thanks	20:32
akira	osse: that's the first command i've seen that seems to be reluctant to be executed	20:32
osse	heh	20:32
	→ hydrozen joined	20:33
	→ plato joined	20:33
	→ alekks joined	20:33
osse	MrSavage: that doesn't explain why the contentDisplay stuff wasn't added though. But I see you've added those before so I asumme you modified the afterwards	20:33
lewellyn	lilshaggy: github.com resolves and pings here. you might want to check your dns settings for sanity. but that's outside the scope of this channel.	20:33
	→ dangerousdave joined	20:34
lilshaggy	lewellyn ok I shall... Thanks	20:34
	← dangerousdave left	20:34
	← Sleepy63 left	20:34
	← TDJACR left	20:36
	← crystal77 left	20:37
	← kadoban left	20:37
	← lilshaggy left	20:37
	← tirengarfio left	20:37
	← Advocation left	20:38
	→ revolve joined	20:39
	← imMute left	20:39
	→ Advocation joined	20:40
	→ imMute joined	20:40
	← imMute left	20:40
	→ imMute joined	20:40
creep	hey peps, i got in master branch some very big data files, so i did ignore them with git. if i create a test branch and delete the big data file they are also gone	20:40
	← liamkeily left	20:41
	← plato left	20:41
	→ Consuela joined	20:41
	→ a_le joined	20:41
creep	how can i have the big data files in master, but in test enviroment they are gone	20:42
	← dharrigan left	20:42
creep	sorry my english could be better	20:42
	→ dangerousdave joined	20:43
	← jonatasnona left	20:43
	← ropav left	20:43
creep	peps ?	20:43
thiago	creep: man git-annex	20:45
	← causasui left	20:45
thiago	oh, no man page?	20:45
	creep: well, see git annex	20:45
	→ mihaicris joined	20:46
	← jamesheston left	20:46
	← a_le left	20:46
	← Consuela left	20:46
	→ Consuela joined	20:47
	→ dorkmafia joined	20:48
	← Advocation left	20:48
	→ Sleepy63 joined	20:48
tang^	creep: try !binary	20:49
gitinfo	creep: Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	20:49
tang^	oops	20:49
	meant !annex	20:49
gitinfo	git-annex and git-media are two solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. See http://git-annex.branchable.com/ and https://github.com/schacon/git-media	20:49
creep	thiago: they are data files in plain text	20:51
	→ plato joined	20:51
	← helgikrs left	20:51
creep	THANKS if will gofo annex	20:51
	← Sendoushi left	20:52
	→ Sendoushi joined	20:52
	→ Ilhami joined	20:53
Ilhami	hey	20:53
	when I use git should I always work on a different branch and then merge? would it be a good idea for each team member to work on his own branch? or should you work on one???	20:54
	→ jrvlima joined	20:54
thiago	Ilhami: you don't have to work on a branch. You do that if you want to	20:55
J1G\|Anon126	Ilhami: it's good to separate it by features or components	20:55
thiago	and each team member works on their own computers. Therefore, which branch they use is their problem.	20:55
	→ dharrigan joined	20:55
	← dharrigan left	20:55
	→ dharrigan joined	20:55
thiago	they can use one with the same name as you. Or not. That's doesn't affect anything.	20:55
	← Jackneill left	20:56
	← hydrozen left	20:56
	→ tirengarfio joined	20:57
Ilhami	ah ok. so let's say I work on a file locally and make changes to it and he is making changes to the very same file. How do we solve that? if I commit first and push to the private repo and he does the same after, will that not result in a merge problem ?	20:58
	← amikiri left	20:58
	← mennea left	20:58
Ilhami	does he have to always pull from repo before pushing?	20:58
	← petersr left	20:58
J1G\|Anon126	yes, one must always pull if there are new commits	20:58
	→ tpollard joined	20:58
	→ mennea joined	20:59
Ilhami	so it's a good idea to decide on the team how often and when you push to repo ?	20:59
	← nnyk_ left	20:59
	← Consuela left	20:59
	← Ilhami left	21:00
	→ Ilhami joined	21:00
	← dharrigan left	21:00
	← LBV_User left	21:00
	← johtso_ left	21:01
	→ EminenceHC joined	21:02
	→ eletuchy joined	21:02
Ilhami	I took that as a yes!	21:03
tang^	always a good idea to figure out your processes early	21:03
Ilhami	thanks for your answers.	21:04
	← quetz left	21:04
MrSavage	How do I get a list of my merge conflicts that need to be committed?	21:05
ojacobson	'git status' if you're already mid-merge	21:05
	→ txomon\|home joined	21:05
ojacobson	if you 'git add' things as you resolve them, the list will stay manageable, otherwise you end up having to inspect things with 'git diff' to remember what state they're in	21:05
MrSavage	ojacobson: i did my merge changes	21:06
	ojacobson: how do i see the list of the files that still need to be commited	21:06
	← EminenceHC left	21:06
	→ Takle joined	21:06
ojacobson	repeating yourself doesn't give me any new information to help you with	21:06
	what happened when you tried my suggestion?	21:06
J1G\|Anon126	MrSavage: git status should give you that as well	21:07
	← kukks left	21:07
MrSavage	ah nvm	21:07
	← eletuchy left	21:07
	← Takle left	21:07
	→ Takle joined	21:07
	← freenux left	21:07
	← Sendoushi left	21:07
	→ nnyk_ joined	21:08
	← bhuvanaurora left	21:08
	← bgerber left	21:09
	← D-Boy left	21:11
	← MrSavage left	21:12
	→ marshall joined	21:12
	← netcarver left	21:14
	← FabTG__ left	21:14
	← flowinho left	21:14
	→ flowinho joined	21:15
	→ Sasazuka joined	21:15
	→ Bryzzle joined	21:15
	← thiago left	21:16
	← martinklepsch left	21:16
	→ Consuela joined	21:17
	→ martinklepsch joined	21:17
	← arnaud___ left	21:18
	→ jkymmel joined	21:18
	← lrojas left	21:18
	← mkopriva left	21:18
	→ bgerber joined	21:19
	→ schrixlux joined	21:19
	→ FabTG joined	21:20
	← mt left	21:21
	← livingstn left	21:21
	← martinklepsch left	21:21
	→ mt joined	21:22
	← Sasazuka left	21:22
	← shauna left	21:23
	← TomyLobo left	21:24
	→ martinklepsch joined	21:24
	← mennea left	21:24
	← _5kg left	21:25
	← Bryzzle left	21:26
	→ Sasazuka joined	21:26
	← LeMike left	21:26
	← dialeth left	21:26
	← dangerousdave left	21:28
	← Sasazuka left	21:29
	→ pandeiro joined	21:29
	→ FreezingCold joined	21:30
	→ _5kg joined	21:31
	← jrvlima left	21:33
	→ psoo joined	21:33
	→ crystal77 joined	21:34
	← crystal77 left	21:34
	← roelmonnens left	21:34
	← dorkmafia left	21:35
	← Gizburdt left	21:35
	→ dharrigan joined	21:36
	← dharrigan left	21:36
	→ dharrigan joined	21:36
	← schrixlux left	21:36
	→ D-Boy joined	21:38
	← Segfault_ left	21:39
	→ moritzs joined	21:39
	→ dharriga1 joined	21:42
	← dharrigan left	21:42
	← t0th_-__ left	21:43
	→ Segfault_ joined	21:43
	→ amikiri joined	21:43
	→ luriv_ joined	21:43
	← MarkyC left	21:43
	→ t0th_-_ joined	21:45
	← marthinal left	21:46
	← luriv left	21:46
	← Juzzika left	21:48
	← Takle left	21:49
	→ dharrigan joined	21:50
	← dharrigan left	21:50
	→ dharrigan joined	21:50
	← dharriga1 left	21:50
	← aspiers left	21:50
	→ Takle joined	21:50
	← fatalhalt left	21:51
	→ Tommy[D] joined	21:53
	Solid1 → Solid1_afk	21:54
	→ diegovio1 joined	21:54
	← veebers left	21:54
	← Lyqyd left	21:55
	→ Gues480631 joined	21:55
	← diegoviola left	21:56
	diegovio1 → diegoviola	21:56
	← Gavrisimo left	21:57
	← dharrigan left	21:57
	→ kopparam joined	21:57
	→ licnep joined	21:57
	← polyzen left	21:58
	Solid1_afk → Solid1	21:58
	→ Ankhers joined	21:58
	← uidzer0 left	21:58
	→ veebers joined	21:59
	→ shauna_ joined	21:59
	← shauna_ left	21:59
	→ dorkmafia joined	22:00
	→ dsdeiz joined	22:00
	→ uidzer0 joined	22:00
	← Prawnzy left	22:00
	→ aspiers joined	22:01
	→ WormDr1nk joined	22:01
	← kopparam left	22:02
	→ EminenceHC joined	22:02
	→ corni joined	22:02
	← kapott left	22:03
	← martinklepsch left	22:03
	→ martinkl_ joined	22:03
	← Junior left	22:04
	→ shauna joined	22:04
	← mkaesz left	22:05
	→ liamkeily joined	22:05
	← dsdeiz left	22:06
	← mihaicris left	22:06
	← aspiers left	22:07
	← sohail left	22:08
	← flowinho left	22:09
	← t0th_-_ left	22:11
	→ Sasazuka joined	22:11
	← Takle left	22:12
	← EminenceHC left	22:12
	← skylite left	22:12
	→ Takle joined	22:12
	← madewokherd left	22:12
	→ steele joined	22:15
	← steele left	22:18
	→ luksaur joined	22:21
	← luksaur left	22:21
	→ luksaur joined	22:21
	← tirengarfio left	22:22
	→ jamesheston joined	22:22
	→ sohail joined	22:24
	← nnyk_ left	22:26
	→ nnyk_ joined	22:26
	→ AmR\|EiSa joined	22:26
	← nrsk left	22:28
	→ adamben joined	22:28
	← marshall left	22:28
	→ madewokherd joined	22:28
	→ s8321414 joined	22:29
	← irqq left	22:30
	→ alexruf joined	22:31
	← jamesheston left	22:31
	→ dharrigan joined	22:32
	→ Takle_ joined	22:32
	← Takle left	22:32
	→ eletuchy joined	22:33
	→ TDJACR joined	22:34
	← punchagan left	22:34
	← AmR\|EiSa left	22:34
	→ pantsman- joined	22:34
	← aard_ left	22:35
	→ marshall joined	22:35
	→ AmR\|EiSa joined	22:35
	→ joelm joined	22:35
	← joelm left	22:35
	← Sasazuka left	22:36
	← alexruf left	22:37
	← marshall left	22:37
	← dharrigan left	22:37
	→ Pyrogerg joined	22:37
	← eletuchy left	22:38
	→ Sasazuka joined	22:38
	← JohnBat26 left	22:39
	← King_Hual` left	22:39
	← TDJACR left	22:40
	→ TDJACR joined	22:41
	← pheaver left	22:41
	→ arnaud___ joined	22:43
	← TDJACR left	22:43
	← samskiter left	22:44
	→ dharrigan joined	22:44
	← dharrigan left	22:44
	→ dharrigan joined	22:44
	→ TDJACR joined	22:44
	→ Takle joined	22:45
	→ dregad joined	22:45
	← Takle_ left	22:45
	→ kukks joined	22:46
	← kukks left	22:46
	→ kukks joined	22:46
	← ivan\ left	22:46
	← shauna left	22:46
	→ shauna joined	22:47
	← TDJACR left	22:47
	→ TDJACR joined	22:48
	← BlaXpirit left	22:48
	← daedeloth left	22:49
	← dharrigan left	22:49
	← nour_ left	22:49
	→ fragamus_ joined	22:49
	→ ivan\ joined	22:50
	← TDJACR left	22:50
	→ dharrigan joined	22:50
	→ TDJACR joined	22:50
	← TDJACR left	22:50
	→ TDJACR joined	22:50
	← xissburg left	22:51
luto	I'm trying to rename a remote from	22:51
	'master' (yes. I know.) to 'origin'	22:51
	error: could not lock config file .git/config	22:52
	error: Could not rename config section 'remote.master' to 'remote.origin'	22:52
	git gives me that..	22:52
	→ samskiter joined	22:52
	← TDJACR left	22:52
luto	$ git remote rename master origin << my rather obvious command	22:52
	← Embassy left	22:54
	← danemacm1 left	22:56
	← fairuz left	22:56
	← Juxtapositional left	22:57
	← Sasazuka left	22:57
	← dharrigan left	22:57
	→ Sasazuka joined	22:57
	→ Juxtapositional joined	22:58
	← sohail left	22:58
	← Pyrogerg left	22:59
	← pantsman- left	22:59
	→ Dougie187 joined	23:00
	← konsolebox left	23:00
	→ n-st joined	23:01
	← Consuela left	23:01
	← jheg left	23:02
	→ kopparam joined	23:03
	← dorkmafia left	23:03
	← amikiri left	23:03
	← Juxtapositional left	23:04
	← psoo left	23:05
	→ jzk joined	23:06
	→ dougsland joined	23:07
	→ sohail joined	23:08
	→ duderonomy joined	23:08
	← paul424 left	23:08
	→ Saw joined	23:09
	← kopparam left	23:09
	← ojacobson left	23:09
	← Zupoman left	23:09
	→ Consuela joined	23:10
	← Sasazuka left	23:10
	→ Sasazuka joined	23:11
	→ EminenceHC joined	23:11
	← dougsland left	23:12
	← diegoviola left	23:12
Saw	hi, quick question. To backup my git repository I usually just copy over the .git directory. Lately though I've added a submodule, and it seems it's not stroed in the .git repository. Or rather, when doing 'git checkout -- .', it doesn't restore the submodule content. Any insights?	23:13
	→ a_le joined	23:13
	← Consuela left	23:16
	← EminenceHC left	23:16
	← CheckDavid left	23:17
	→ crystal77 joined	23:18
osse	Saw: git submodule init	23:19
	(i think)	23:19
	→ delight joined	23:19
Saw	osse - just tried it, didn't help. (Tried checkout again after, inside submodule, then outside, then inside again)	23:20
	Solid1 → Solid1_afk	23:20
	← AmR\|EiSa left	23:20
osse	hmm, then I don't know... I'm not a submodule expert	23:21
	someone here is though	23:21
Saw	:\ i'll just wait then, thx anyway	23:21
osse	Saw: submodule info is stored in .gitmodules in the root of the repo	23:22
	but that should've been restored when you did git checkout -- .	23:22
	git submodule status? Is that a thing?	23:23
	← martinkl_ left	23:23
tang^	git submodule update	23:23
	→ solker joined	23:24
	→ konsolebox joined	23:24
Saw	osse - yeah .gitmodules was copied as well, so that was not the problem. Tried git submodule status, didn't show anything.	23:25
	tang^ - thank you, git submodule master :)	23:25
	→ alvaro_ joined	23:25
	← liamkeily left	23:27
	← Turicas left	23:27
	→ liamkeily joined	23:28
	← St_Marx left	23:29
	← liamkeily left	23:29
	→ Consuela joined	23:30
	← listochkin left	23:31
	→ listochkin joined	23:32
	← jottr left	23:32
	→ St_Marx joined	23:32
	→ dharrigan joined	23:33
	← dharrigan left	23:33
	→ dharrigan joined	23:33
	← nfk left	23:34
	← Saw left	23:34
	← J1G\|Anon126 left	23:34
	← Ankhers left	23:34
	← diget left	23:34
	→ eletuchy joined	23:34
	→ diget joined	23:35
	← encod3 left	23:35
	← listochkin left	23:36
	← JanC left	23:37
	← jkymmel left	23:37
	← eletuchy left	23:39
	← dharrigan left	23:39
	← fragamus_ left	23:40
	→ regedit joined	23:40
	→ diegoviola joined	23:41
regedit	how to recursively rename some folder and all its subfolders & files from uppercase to all lowercase?	23:41
	in a manner that git will recognize it	23:41
	it seems git does not pick up on upper/lower-case renames	23:41
	→ Myk267 joined	23:42
osse	regedit: it does if the filesystem informs it	23:42
	← delight left	23:42
osse	if you need to do stuff like that I suggest a linux system	23:42
regedit	ye it's on mac so we have bash shell and whatnot	23:42
osse	macs are case-insensitive by default	23:42
regedit	orly?....	23:43
	i thought only windows	23:43
osse	!case_mapping	23:43
gitinfo	Git tries its best if you are on a filesystem which does not understand the difference between upper case and lower case, but there are many circumstances, especially when there are two files which only differ by case, that git just cannot cope. Windows and Mac users are especially likely to have such problems. Solution, move to a real filesystem or OS and investigate git-config's core.ignorecase	23:43
tang^	I've run into that	23:43
	← tvw left	23:43
osse	regedit: on a Mac it's optional I think.	23:43
	→ brownbathrobe joined	23:44
	← palcu left	23:44
	← Skapadapaduu left	23:44
	← AaronMT left	23:45
	→ palcu joined	23:45
	← palcu left	23:45
	→ str joined	23:46
	→ TDJACR joined	23:47
	→ aspiers joined	23:47
	→ marshall joined	23:48
	← alekks left	23:48
	← Consuela left	23:48
	← brownbathrobe left	23:50
	← corni left	23:50
	→ JanC joined	23:50
	← teran left	23:51
	← marshall left	23:53
	← Takle left	23:57
	→ Takle joined	23:59
	← sohail left	23:59
	→ t0th_-_ joined	23:59
	→ shpoont joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation