IRCloggy #git 2014-07-29

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-07-29
	→ jfelchner joined	00:00
	← unomystEz left	00:00
	← koi left	00:00
	→ unomystEz joined	00:00
	← unomystEz left	00:00
	→ unomystEz joined	00:00
	← OffTheRails left	00:00
	→ D-Boy joined	00:01
	← unomystEz left	00:01
	→ supernaut joined	00:01
	→ unomystEz joined	00:02
	← unomystEz left	00:02
	→ unomystEz joined	00:02
osse	6 steps left	00:02
	← WormDrink left	00:02
	← ColdKeyboard left	00:03
	← skynxnex left	00:03
sjmikem	is there a jira or equiv?	00:03
	← jfelchne_ left	00:03
osse	no, just the mailing list	00:03
	← bakers left	00:04
	→ kukks joined	00:04
sjmikem	I probably abuse the command, but can't believe no one else has noticed it...	00:04
	← kukks left	00:04
	→ kukks joined	00:04
sjmikem	it works on 1.7.12	00:05
	← endiruna left	00:05
osse	well shit	00:06
	the bisection give a false positive	00:06
	→ Zimsky-- joined	00:08
madewokherd	check 'git log' for a point where you started getting all the same result	00:09
	er	00:09
	git bisect log	00:09
	← Skapadapaduu left	00:09
madewokherd	oh, sorry, I thought we were somewhere else	00:09
	where people don't know how to use bisect	00:09
	→ tummy joined	00:10
	← jottr left	00:10
osse	I know how to use it, but I haven't used bisect log before :O	00:10
	← unomystEz left	00:12
osse	due to a brainfart I gave bisect wrong revisions...	00:12
	→ unomystEz joined	00:12
	← TimmyTones left	00:13
madewokherd	I usually do git bisect start, checkout the revisions I think I need, and do git bisect good/bad after I've tested them	00:13
	← zumba_addict left	00:14
osse	heh, so did I	00:14
	← Noldorin left	00:14
	→ WormDrink joined	00:15
	→ amikiri joined	00:15
osse	well...	00:15
	'git stash list -p' doesn't work for me, but '~/usr/bin/git stash list -p' does, and I compiled the exact same version	00:15
	so I think I'll just go to bed	00:16
	← tang^ left	00:17
	→ zumba_addict joined	00:18
	→ mspe joined	00:18
	→ luc_ joined	00:19
	← Zimsky left	00:19
sjmikem	thanks for trying	00:19
	Zimsky-- → Zimsky	00:19
	→ Dougie187 joined	00:19
	→ saorge_ joined	00:20
osse	and now I install it to a proper location and it doesn't work any more :p	00:20
	→ souther joined	00:20
	← robbyoconnor left	00:20
	← beastd left	00:20
	← dreiss left	00:21
	→ robbyoconnor joined	00:21
osse	same exact version, I can't fathom it	00:21
	← brownbathrobe left	00:22
	← saorge left	00:23
	→ mizu_no_oto joined	00:23
	← deanclkclk_ left	00:23
osse	FWIW, this is the command that sometimes shows diffs, sometimes not: git log '--format=%gd: %gs' -g -p refs/stash --	00:23
	← mspe left	00:23
	→ OffTheRails joined	00:24
osse	but I don't have enough brain function to use gdb right now	00:24
sjmikem	should I bother reporting this to the list?	00:24
	← gfixler_ left	00:24
sjmikem	Couldn't find what I was looking for in my stash anyways :-((	00:25
	have no idea where it went	00:25
	→ hkon_ joined	00:26
osse	it gets worse. git stash list -p works, but git-stash is a script and the exact same command it executes doesn't work	00:26
	sure, report it to the list	00:26
	I can make a reply in the morning	00:26
	→ pikaren joined	00:27
	← pikaren left	00:27
	← rgr left	00:27
	← Vile left	00:28
	→ pikaren joined	00:28
	→ lungaro joined	00:28
	← quantsini_ left	00:29
	→ zumba_ad_ joined	00:29
lungaro	I'm trying to understand subtree. I am seeing "fatal: entry not found in tree SHA" for trying a git subtree pull --prefix...	00:29
	→ quantsini joined	00:29
	→ eletuchy joined	00:29
lungaro	I made a commit outside of the subtree in a seperate clone and pushed it. Its not clear how i merge that change into the subtree	00:30
	→ edwardly joined	00:30
	← edwardly left	00:30
	→ edwardly joined	00:30
	← hkon_ left	00:30
	← dccc left	00:31
	→ jfelchne_ joined	00:31
	← zumba_addict left	00:32
	← kukks left	00:32
	← _ikke_ left	00:33
	← Quevin left	00:33
	← pikaren left	00:33
	→ jfelchn__ joined	00:34
	→ _ikke_ joined	00:35
	← jfelchner left	00:35
	← awkwardusername left	00:35
	→ kukks joined	00:36
	← kukks left	00:36
	→ kukks joined	00:36
	← jfelchne_ left	00:37
	← luc_ left	00:37
	← sohail left	00:37
	← jay__ left	00:39
	← lyang0 left	00:39
	→ jophish joined	00:40
	→ LBV_User joined	00:41
	← eliasr left	00:42
	→ jfelchner joined	00:42
	← hahuang65 left	00:42
	← knownasilya left	00:43
	→ DeathIncarnate joined	00:43
	← tummy left	00:44
	← Ritzton left	00:44
	← harish_ left	00:44
	← jfelchn__ left	00:45
	→ CraigyDavi` joined	00:46
	→ lid_ joined	00:48
	← CraigyDavi left	00:48
	→ TimmyTones joined	00:48
	gitinfo set mode: +v	00:48
	← TimmyTones left	00:48
	← maestrojed left	00:49
	← lidaaa left	00:50
	→ deanclkclk_ joined	00:50
	← anEffingChamp left	00:53
	→ zivester joined	00:55
	→ otter768 joined	00:55
	← godgodgodgo left	00:55
	→ godgodgodgo joined	00:56
	← veebers left	00:56
	← Reskp left	00:57
	→ veebers joined	00:57
	← DeathIncarnate left	00:59
	→ skynxnex joined	00:59
	→ watabou joined	00:59
	← watabou left	00:59
	→ watabou joined	00:59
	← kevinb left	01:00
	← BSaboia left	01:02
	→ kevinb joined	01:02
	← akushner_ left	01:03
	← skynxnex left	01:04
	← LucasTT left	01:06
	← lid_ left	01:06
	→ LucasTT joined	01:06
	← otter768 left	01:07
	← thiago left	01:10
	→ otter768 joined	01:11
	← Marcus__ left	01:12
	→ shingshang joined	01:13
	← lasserix left	01:14
	→ lyang0 joined	01:15
	xtriz → fifo	01:15
	jmpp greets!	01:16
jmpp	I'm seeing a very weird error with a repo I inherited	01:16
	it's got some pending changes	01:16
	so I'm looking at committing them	01:16
	I git diff a file at path/With/CamelCase/theFile, and i get a diff	01:17
	add that, query wc status again	01:17
	← ropav left	01:17
	→ ropav joined	01:17
jmpp	and then I get that the exact same file, but now at path/with/camelcase, is modified	01:17
	← mueslo_ left	01:18
jmpp	and the diff for that new modification is the exact opposite to what I just added to the index	01:18
	anyone ever seen that?	01:18
	→ milky joined	01:18
jmpp	I'm on OS X, which uses a case insensitive, but case preserving, filesystem	01:18
	← unomystEz left	01:18
pekster	IIRC you can turn on POSIX-compliant behavior	01:19
	→ macrover joined	01:19
pekster	General wisdom when you want a project to be platform-agnostic is not to use files that differ only in case	01:19
	If it's not your project, either fix your filesystem, or run a VM that is more sane ;)	01:20
	→ mspe joined	01:20
jmpp	but... I mean, what may be going on here?	01:21
	and how do I turn on that posix-compliant behavior?	01:21
	and, yes, I inherited this repo, and i'm trying to clean it up a bit before I begin actual work	01:21
	→ k_sze[work] joined	01:21
	→ thiago joined	01:22
jmpp	and these files (it's not just one) have me oging over and over again in circles, until I noticed what was going on	01:22
	in fact, they're my last files to add to the index to finish the one step of the cleanup I'm gonna do now	01:22
	→ Rastus_Vernon joined	01:22
pekster	Looks like your 2 native "Mac solutions" are to reformat your entire HFS volume as case-sensitive (rather painful) or mount a dmg you create as such (far easier, although you give up a tiny bit of efficiency for it)	01:23
	Or use a VM, or a host that you ssh into	01:23
	→ akim joined	01:23
jmpp	other cleaups can wait, most probably for methusalem to do the cleaning ;)	01:23
	but there's no other way to stop these diffs from cycling over cases?	01:24
	← Neozonz left	01:24
jmpp	I've tried adding the files to the index, checking out their HEAD revs to wipe the changes, etc..	01:24
	and every operation I do, I get the same file, with its path in its mirror form, showing the opposite diff	01:25
	← mspe left	01:25
jmpp	the mirror form being camelCase --> camelcase; camelcase --> camelCase	01:25
	← macrover left	01:26
pekster	What happens if you remove HFS+ weirdness from the equation? Can you mimic the behavior in a Linux or BSD VM?	01:26
	→ talmuth joined	01:26
	← godgodgodgo left	01:26
pekster	(or just a checkout on a dmg mounted with case-sensitive filesystem attributes)	01:26
jmpp	would it serve to instead copy the directory over to the dmg?	01:27
	→ lasserix joined	01:27
jmpp	'cause there's no url to clone from	01:27
	I'll create it in a bit	01:27
	but the repo was just a zip file sent over mail	01:27
pekster	git clone file:///Volumes/Mac/whatever/some/path/here ./new-repo	01:27
jmpp	true that, true that	01:28
	← robustus left	01:28
jmpp	and that'll even clone the current state of the index?	01:28
	doesn't seem like it	01:28
	→ Reskp joined	01:28
pekster	Just what's been comitted	01:28
	→ mspe joined	01:28
pekster	You can rsync things, but the whole point is to prevent any pre-existing issues with the way the filesystem treats case	01:29
jmpp	so you'de definitely suggest recreating the index from scratch?	01:29
pekster	Well, it's not a git "feature" that's messing with your case	01:29
	I have a number of repos with file names like ChangeLog and the like, and they work fine on ext3/4, reiserfs, squashfs, and even NTFS	01:30
	← mspe left	01:30
pekster	(UFS too actually, though I usually just deploy tarballs to my BSD VMs for testing)	01:30
	→ knownasilya joined	01:30
	← ropav left	01:31
	→ robustus joined	01:31
jmpp	they've always worked fine for me on HFS+	01:32
preaction	my guess is that someone put both "myfile" and "MyFile" in the index. i had this same problem, and the only way I cleaned it up was by doing git mv to the normalized version, after making the case-insensitive filesystems toe the line: core.ignorecase = true	01:32
jmpp	always use my mac from terminal, and always use git, and it's the first time i ever see this	01:32
	← Reskp left	01:32
preaction	but it's been a long time since this has happened, so i don't remember much anymore	01:33
pekster	If you have 2 files with the same name, differing in case, your best bet is to check it out on a fully case-aware FS, fix it, and commit that	01:33
	← northfurr left	01:33
	→ weiyang joined	01:33
	jmpp clones	01:33
pekster	History might be a bit whack, but it might be fine so long as you don't check out or try to merge from the "broken" revs	01:33
	→ rageshkrishna joined	01:33
jmpp	OK, but... one thing i'm not understanding	01:34
	← pbrobst left	01:34
	→ maestrojed joined	01:34
jmpp	if I'm cloning, I'll only get what's already in the history	01:34
	the current problem is with what's in the working copy	01:35
	← Pookz left	01:36
	→ Vampire0_ joined	01:38
	← kaendfinger[BNC] left	01:38
	→ jackh joined	01:40
	← bdavenport left	01:40
	← Vampire0 left	01:41
	→ daito joined	01:44
	← CheckDavid left	01:44
	→ SLY1986 joined	01:44
	← watabou left	01:44
	→ watabou joined	01:45
	← _5kg left	01:46
	← maestrojed left	01:48
	→ luc_ joined	01:48
	→ hj2014 joined	01:48
	→ EminenceHC joined	01:49
	← luc_ left	01:49
	→ luc_ joined	01:50
	→ _5kg joined	01:50
	← gfixler left	01:51
	← jophish left	01:51
	← shinnya left	01:52
	→ tranzfuse joined	01:52
	← EminenceHC left	01:53
	→ diegoviola joined	01:54
	→ hyperair joined	01:54
	← hyperair left	01:54
	→ hyperair joined	01:54
	→ tokik joined	01:54
	gitinfo set mode: +v	01:55
	← kballou left	01:55
	→ tmcmahon joined	01:55
	→ hahuang65 joined	01:56
	→ bezet joined	01:56
	← LucasTT left	01:57
	← kevinb left	01:57
	→ gfixler joined	01:58
	→ kevinb joined	01:59
	→ reaverb joined	01:59
	→ skynxnex joined	02:00
	← bezet left	02:00
	→ harish_ joined	02:01
	← darkbasic_ left	02:01
	← pweaver_ left	02:02
	→ darkbasic joined	02:02
	← skynxnex left	02:04
	← otter768 left	02:04
	→ otter768 joined	02:06
	← tmcmahon left	02:08
	← leeN left	02:08
	← JeanCarloMachado left	02:08
	← jovy88 left	02:10
	← alezandro left	02:11
	→ jovy88 joined	02:11
	→ punchagan joined	02:12
	← LBV_User left	02:12
	→ CKyle joined	02:12
	← mmitchel_ left	02:13
	← CKyle left	02:13
	→ Guest___ joined	02:14
	← Guest___ left	02:14
	→ hkon_ joined	02:14
	→ Guest___ joined	02:14
	← mizu_no_oto left	02:14
	← Guest___ left	02:15
	→ CKyle joined	02:15
	→ punchagan1 joined	02:17
	← afuentes left	02:17
	← punchagan left	02:17
	← eternnoir left	02:18
	← hkon_ left	02:18
	→ rgr joined	02:20
	→ Goplat joined	02:20
	→ pawelbx joined	02:20
	→ eternnoir joined	02:20
	→ sleepee joined	02:21
	→ jfelchne_ joined	02:22
	← daito left	02:22
	→ nkouevda joined	02:23
	→ mizu_no_oto joined	02:23
	← iaaah left	02:24
	← Consuela left	02:24
	→ daito joined	02:24
	→ northfurr joined	02:25
	→ skylord5816 joined	02:25
	← jfelchner left	02:25
	→ maestrojed joined	02:25
	← jfelchne_ left	02:26
	← Gamecubic left	02:27
	← lasserix left	02:27
	→ listochkin joined	02:28
	→ Gamecubic joined	02:28
	← skylord5816 left	02:28
	→ ropav joined	02:29
	→ Reskp joined	02:29
	← punchagan1 left	02:30
	→ punchagan joined	02:30
	← hahuang65 left	02:31
	← maestrojed left	02:31
	← pawelbx left	02:31
	← weiyang left	02:31
	→ Samual joined	02:31
	← rgr left	02:32
	← listochkin left	02:32
	← Reskp left	02:33
	← hide left	02:35
	← mizu_no_oto left	02:35
	← robbyoconnor left	02:35
	→ rypeck joined	02:35
	← punchagan left	02:35
	→ robbyoconnor joined	02:36
	→ JeanCarloMachado joined	02:37
	→ Lexun joined	02:38
	← kevinb left	02:40
	← CKyle left	02:40
salamanderrake	when to rebase and when to merge?	02:42
	→ weiyang joined	02:42
milki	!rebase_or_merge	02:42
	hm	02:42
	!merge_or_rebase	02:42
gitinfo	For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html	02:42
milki	there	02:42
	→ kevinb joined	02:46
	← diegoviola left	02:49
	← JanC left	02:49
salamanderrake	ty	02:49
	→ diegoviola joined	02:50
	→ hide joined	02:50
	← kpease left	02:51
	← milky left	02:51
	→ ColdKeyboard joined	02:51
	← apb1963 left	02:51
	← ColdKeyboard left	02:51
	← tyreld left	02:52
	→ ColdKeyboard joined	02:52
	← ColdKeyboard left	02:52
	→ ColdKeyboard joined	02:53
	← qwyeth left	02:53
	← knighthawk left	02:54
	→ Bosox20051 joined	02:54
	← Bosox20051 left	02:54
	→ Bosox20051 joined	02:54
	← kukks left	02:54
	→ knighthawk joined	02:54
	← Bosox20051 left	02:56
	← Goplat left	02:57
	→ Goplat joined	02:57
	← amikiri left	02:58
	← knighthawk left	02:59
	→ rgr joined	02:59
	→ shauna joined	03:00
	→ skynxnex joined	03:00
	← weiyang left	03:02
	→ JanC joined	03:03
	→ jfelchner joined	03:04
	← skynxnex left	03:05
	← daito left	03:05
	→ weiyang joined	03:06
	← m0viefreak left	03:07
	→ jottr joined	03:07
	→ fstd_ joined	03:08
	← zumba_ad_ left	03:09
	← tranzfuse left	03:09
	→ zumba_addict joined	03:09
	← kevinb left	03:09
	← Goplat left	03:09
	← jaimef left	03:09
	→ pweaver_ joined	03:10
	→ jaimef joined	03:10
	← nkouevda left	03:11
	← teran left	03:11
	← fstd left	03:11
	fstd_ → fstd	03:11
	← jottr left	03:12
	→ nkouevda joined	03:12
	→ unomystEz joined	03:13
	→ kevinb joined	03:14
	→ jophish joined	03:14
	← ERROH left	03:15
	← ProjektGopher left	03:15
	← JosephFerano left	03:15
	← nnyk_ left	03:16
	← sleepee left	03:17
	→ Goplat joined	03:18
	→ ERROH joined	03:19
	→ daito joined	03:20
	← danillonunes left	03:21
	→ danillonunes joined	03:21
	← unomystEz left	03:22
	→ curiousmansi_ joined	03:23
	← bjeanes left	03:23
	→ CKyle joined	03:25
	← otter768 left	03:25
	← Rastus_Vernon left	03:26
	→ CKyle_ joined	03:27
	← CKyle_ left	03:27
	→ Reskp joined	03:29
	→ DeathIncarnate joined	03:31
	→ skylord5816 joined	03:32
	← akim left	03:32
	← zumba_addict left	03:33
	→ TheMadMechanic joined	03:33
	→ zumba_addict joined	03:33
	← Reskp left	03:34
	← TheMadMechanic left	03:34
	← yacks left	03:35
	→ a_le_ joined	03:35
	→ pikaren joined	03:36
	← mtthw left	03:37
	← Dougie187 left	03:37
	← a_le left	03:37
	→ quazimodo joined	03:37
skylord5816	Hello. I've got about 25 copies of the same software, with a few slight differences. I'd like to put them all under git. I thought of making a repo with a branch for each server, setting up a script to merge changes to master to all of them, and setting up a post-receive hook or a cronjob to pull changes. I was wondering if there was a best practice for this.	03:37
	(using git clone --single-branch on the server)	03:38
	→ mtthw joined	03:39
	→ zdevdusty joined	03:44
	→ beautifulmind joined	03:47
	→ skylord5816_ joined	03:48
	← skylord5816_ left	03:48
	→ skylord5816_ joined	03:48
	← skylord5816 left	03:48
	← CKyle left	03:49
	skylord5816_ → skylord5816	03:49
	→ EminenceHC joined	03:50
	← thiago left	03:50
	→ sontek joined	03:50
	← Tuna-Fish left	03:50
	← Megaf left	03:52
	→ knighthawk joined	03:53
	← ColdKeyboard left	03:54
	← EminenceHC left	03:55
	→ bezet joined	03:56
	← mtthw left	03:56
	→ Tuna-Fish joined	03:57
	← Tuna-Fish left	03:58
	→ Tuna-Fish joined	03:58
	→ skylord5816_ joined	03:59
	← skylord5816 left	03:59
	← OffTheRails left	04:00
	→ CoderBugM joined	04:00
	→ zumba_ad_ joined	04:00
	← bezet left	04:01
	← epifanio left	04:01
	← Lexun left	04:01
	← CoderBugM left	04:01
	← sontek left	04:01
	← Tuna-Fish left	04:01
	→ skynxnex joined	04:01
	→ Tuna-Fish joined	04:02
	← skylord5816_ left	04:04
	→ Guest1258 joined	04:04
	← zumba_addict left	04:04
	← skynxnex left	04:05
	→ darkxploit joined	04:06
	← deanclkclk_ left	04:07
	← deanclkclk left	04:07
	→ deanclkclk_ joined	04:08
	← alvaro_o left	04:10
	← Tuna-Fish left	04:12
	→ curiousmansi__ joined	04:13
	← curiousmansi_ left	04:14
	→ hkon_ joined	04:15
	← beneggett left	04:15
	→ beneggett joined	04:16
	← Guest1258 left	04:16
	← dougsland left	04:19
	← wakd left	04:19
	← darkxploit left	04:19
	← hkon_ left	04:19
	→ skylord5816_ joined	04:21
	→ Tuna-Fish joined	04:23
	→ mennea joined	04:23
	→ hahuang65 joined	04:23
	→ thiago joined	04:24
	→ Tommy[D]_ joined	04:24
	→ wakd joined	04:25
	← snuffeluffegus left	04:25
	← jophish left	04:25
	→ lonewulf` joined	04:25
	← daito left	04:27
	← Tommy[D] left	04:27
	→ spyroboy_ joined	04:30
	→ Reskp joined	04:30
	← mkoskar left	04:31
	← spyroboy left	04:31
	→ awkwardusername joined	04:32
	← Reskp left	04:35
	← matelot left	04:35
	← beneggett left	04:36
skylord5816_	Another thought. Rebasing the servers onto master is bad because it'd change public history, but merging would make a LOT of merge commits.	04:38
phy1729	skylord5816_: how many are going to use this?	04:40
skylord5816_	about 10	04:41
	← rypeck left	04:41
	→ k4r1m joined	04:41
phy1729	can the server specific changes not go into some configuration files?	04:42
preaction	what do the differences entail?	04:42
	← awkwardusername left	04:42
	← hakunin left	04:43
skylord5816_	that was my first thought, but I don't think they can	04:43
	→ bhws joined	04:45
skylord5816_	that would be much cleaner	04:45
	→ FatDarrel joined	04:46
phy1729	is this repo public?	04:46
skylord5816_	No	04:46
	← acharlieh left	04:48
skylord5816_	moving everything to config files might work, worst case we'd have to check the config to see if we should do this or that, wouldn't be too bad. I'm guessing the branches idea would be pretty messy	04:48
phy1729	I have a script that rebases all branches on top on master	04:49
	but it's for use on my personal not public repo	04:49
skylord5816_	Would you mind sharing it? It sounds useful for local projects	04:50
	← davispuh left	04:50
phy1729	thttps://github.com/phy1729/rebase-master PRs welcome	04:50
skylord5816_	I'll talk to the other devs about branches vs config.	04:51
lonewulf`	testing..	04:51
phy1729	lonewulf`: sibilance	04:52
	→ whyy joined	04:52
lonewulf`	:>	04:52
	http://jk.gs/git/ (here we go)	04:53
	← madewokherd left	04:53
	← DeathIncarnate left	04:55
skylord5816_	Thanks for the help! :)	04:56
	← skylord5816_ left	04:56
	← Primer left	04:56
	← hahuang65 left	04:57
	← FatDarrel left	05:01
	← beautifulmind left	05:02
	← UmbraMalison left	05:02
	← unglid left	05:04
	→ UmbraMalison joined	05:05
	→ arup_r joined	05:08
	→ unglid joined	05:09
	← quazimodo left	05:09
	← Mitchbones left	05:09
	← Gamecubic left	05:10
fling	I need to upload changed files only over ftp	05:12
	how to get all new and changed files from all the commits except the first one? :P	05:12
	→ CraigyDavi`` joined	05:12
	← knownasilya left	05:13
	→ beautifulmind joined	05:14
	← pweaver_ left	05:14
	← CraigyDavi` left	05:16
	← Lewoco left	05:16
	→ pantsman_ joined	05:16
	→ kcj joined	05:17
phy1729	fling: parse git diff --raw --summary perhaps?	05:17
	← beautifulmind left	05:17
	← northfurr left	05:17
	→ mspe joined	05:21
osse	fling git diff --name-only <first> <last>	05:21
	→ zumba_addict joined	05:22
	← zumba_ad_ left	05:23
	→ LeMike joined	05:23
	← JeanCarloMachado left	05:25
	← mspe left	05:26
	→ lite_ joined	05:26
	← tplaner left	05:26
	→ daito joined	05:27
	← pikaren left	05:27
	→ quazimodo joined	05:30
	← kevinb left	05:30
	→ Reskp joined	05:31
	← daito left	05:31
	→ daito joined	05:31
	→ nbrosnah_ joined	05:33
	→ Reskp_ joined	05:33
	→ mspe joined	05:33
	→ Sauvin joined	05:33
	→ newbie999 joined	05:34
	→ beautifulmind joined	05:34
	← jovy88 left	05:34
	→ jovy88 joined	05:35
	← Reskp left	05:36
	← nbrosnah_ left	05:36
	← pantsman_ left	05:37
	→ nbrosnah_ joined	05:37
	→ kevinb joined	05:37
	← halis left	05:37
	← mspe left	05:38
	← Reskp_ left	05:38
	← quazimodo left	05:40
	→ quazimodo joined	05:40
	→ ThomasLocke joined	05:43
	← joelm left	05:45
	← the_cybersphinx left	05:46
	→ kyb3r_ joined	05:48
	← kerrick left	05:49
	← pandeiro left	05:49
	→ EminenceHC joined	05:50
	→ Silmarilion joined	05:52
	→ freimatz joined	05:53
	→ Arkaniad joined	05:54
	← reaverb left	05:54
	← starkhallo left	05:54
	← visceral left	05:54
	← LeMike left	05:55
	→ DeathIncarnate joined	05:55
	← EminenceHC left	05:56
	→ bezet joined	05:56
	← zivester left	05:59
	← Obi_obi left	05:59
	← Imdsm^ left	06:00
	← stealthii left	06:00
	← kwmiebach_ left	06:00
	← DeathIncarnate left	06:00
	← jhford left	06:00
	← bezet left	06:01
	← antroy_ left	06:01
	→ koi joined	06:01
	← lite_ left	06:01
	→ mishok13 joined	06:02
	→ lite_ joined	06:02
	← tpollard left	06:02
	← ISmithers left	06:03
	← bedouin left	06:03
	← beautifulmind left	06:03
	→ teran joined	06:03
	← zumba_addict left	06:04
	← thiagovsk left	06:05
	→ Obi_obi joined	06:05
	→ kwmiebach_ joined	06:05
	→ jhford joined	06:06
	→ stealthii joined	06:06
	← lite_ left	06:07
	→ antroy_ joined	06:07
	→ Imdsm^ joined	06:07
	→ zoso joined	06:08
	← kermit left	06:08
	ChanServ set mode: +o	06:08
	→ kermit joined	06:08
	Eugene changed the topic to: Welcome to #git, the place for git help and forgotten problems \| Current stable version: 2.0.3 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| It's big, it's heavy, it's wood! git-log, from BLAMMO!	06:09
	→ KevinTS joined	06:09
	→ hahuang65 joined	06:09
	Eugene set mode: -o	06:09
	← paddymahoney left	06:10
	→ acharlieh joined	06:10
	→ bedouin joined	06:11
	← mishok13 left	06:11
	→ cbreak-work joined	06:12
	→ b00^wk joined	06:13
	← b00^wk left	06:13
	→ halis joined	06:13
	→ kerrick joined	06:13
	→ thiagovsk joined	06:13
	→ FilipNortic joined	06:14
	← hahuang65 left	06:14
	← mennea left	06:14
	→ cdleonard joined	06:15
	→ hkon_ joined	06:15
	→ MickeyO joined	06:17
	→ Balliad joined	06:17
	→ belak joined	06:18
	→ pantsman_ joined	06:20
	← hkon_ left	06:20
	← Balliad left	06:20
	← bgerber left	06:21
	← kwmiebach_ left	06:21
	← Obi_obi left	06:21
	← Imdsm^ left	06:22
	← bedouin left	06:22
	→ Vile joined	06:22
	→ devoldmx joined	06:23
	→ JohnBat26 joined	06:23
	→ LeMike joined	06:23
	→ tvw joined	06:23
	← jhford left	06:24
	← rasto left	06:25
	← stealthii left	06:26
	← antroy_ left	06:26
	← thiagovsk left	06:26
	→ hinogi joined	06:27
	→ Obi_obi joined	06:28
	→ kwmiebach_ joined	06:28
	→ beautifulmind joined	06:28
	→ antroy_ joined	06:29
	→ bedouin joined	06:29
	→ joelm joined	06:29
	→ Imdsm^ joined	06:29
	→ MAAC16K joined	06:30
	→ Errorical joined	06:30
	← Errorical left	06:30
	← harish_ left	06:31
	→ Errorical joined	06:31
	→ thiagovsk joined	06:31
	→ jhford joined	06:31
	→ stealthii joined	06:32
	→ hahuang65 joined	06:33
	→ skynxnex joined	06:33
	← skynxnex left	06:34
	→ Reskp joined	06:34
	→ skynxnex joined	06:34
	→ mspe joined	06:34
	→ Shusshu joined	06:34
	→ sontek joined	06:35
	← danmackay left	06:35
	← Goplat left	06:37
	→ danmackay joined	06:37
	← xobb left	06:38
	← pantsman_ left	06:38
	→ jottr joined	06:38
	→ rasto joined	06:39
	← mspe left	06:39
	← Reskp left	06:39
	← a_le_ left	06:39
	→ dreiss joined	06:39
	← skynxnex left	06:39
	← joelm left	06:40
	→ goTAN joined	06:41
	→ Macaveli joined	06:42
	→ KamalKaur joined	06:42
	→ harish_ joined	06:43
	← Tuna-Fish left	06:44
	← veebers left	06:44
	← dreiss left	06:44
	→ hkon_ joined	06:45
	→ mlechner joined	06:46
	→ Reskp joined	06:48
	← toedwy left	06:49
	→ toedwy joined	06:50
	→ a_le joined	06:51
	← KamalKaur left	06:52
	→ _tpavel joined	06:52
	← Reskp left	06:53
	→ freezevee joined	06:54
	← Vile left	06:54
	→ lite_ joined	06:54
	→ Tuna-Fish joined	06:55
	→ mishok13 joined	06:55
	→ xobb joined	06:56
	→ dreiss joined	06:57
	→ endiruna joined	06:57
	← quazimodo left	06:57
	→ aidalgol joined	06:57
	→ quazimodo joined	06:57
	→ gua_ould joined	06:59
	→ unknwn- joined	06:59
	→ skylite joined	06:59
	→ jnavila joined	06:59
	← Tuna-Fish left	06:59
	→ Tuna-Fish joined	07:00
	← wakd left	07:00
	→ beneggett joined	07:01
	→ B1x1t0 joined	07:01
	→ stodan joined	07:01
	→ bgerber joined	07:02
	→ Vile joined	07:02
	← endiruna left	07:03
	→ KamalKaur joined	07:06
	← Errorical left	07:06
	← toedwy left	07:06
	← Tuna-Fish left	07:09
	← basiclaser left	07:10
	→ basiclaser joined	07:10
	→ rob_w joined	07:11
	→ seschwar joined	07:11
	→ mennea joined	07:12
	CraigyDavi`` → CraigyDavi	07:12
	→ hoschi joined	07:13
	→ ghostlines joined	07:13
	→ lb1a joined	07:15
	← KamalKaur left	07:15
	→ dangerousdave joined	07:15
jfelchner	Is one able to set the similarity threshold globally?	07:16
	→ Tuna-Fish joined	07:16
jfelchner	You can do it in various commands but I can't find a way to do it globally.	07:16
	→ Guest64170 joined	07:16
_ikke_	man git config doesn't mention anything?	07:17
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	07:17
	← sontek left	07:18
jfelchner	_ikke_ I've searched for 'similarity', 'threshold', 'rename', 'copy'	07:18
	I can't find anything	07:18
_ikke_	I don't think there is then	07:19
	→ papegaaij joined	07:19
	← beautifulmind left	07:19
	← alexbligh1 left	07:20
jfelchner	Seems like something that would be fairly useful.	07:20
	→ alexbligh1 joined	07:20
	→ atamanroman joined	07:21
	← Shusshu left	07:21
	→ jluc joined	07:22
_ikke_	You might propose it on the mailing list	07:22
	→ Errorical joined	07:23
	→ jargon joined	07:25
	→ xuitlacoche joined	07:25
	← beneggett left	07:26
	→ dsdeiz_ joined	07:26
	→ unknwn-- joined	07:27
	← basiclaser left	07:27
	← unknwn- left	07:28
	← dsdeiz left	07:28
	→ Balliad joined	07:29
	→ basiclaser joined	07:29
	→ kriks joined	07:34
	→ mspe_ joined	07:36
	← CraigyDavi left	07:36
	← zdevdusty left	07:36
	→ zdevdusty joined	07:37
	← jargon left	07:37
	→ doev joined	07:38
	→ jargon joined	07:38
	dkn64738_afk → dqn	07:39
	→ Junior joined	07:39
	→ Sceorem joined	07:39
	dqn → dkn64738	07:39
	← quazimodo left	07:39
	← mspe_ left	07:40
	→ ferreum joined	07:41
	← zdevdusty left	07:41
	→ Xethron joined	07:42
	← Xethron left	07:42
	→ Xethron joined	07:42
	Sajbar_ → Sajbar	07:43
dcpc007	hello	07:44
	← a_le left	07:44
	← arup_r left	07:44
dcpc007	special case : i create a new repo to start manage old script. already some commits. I found some old versions of my scripts i would add to history. Is it possible to add an "older" version ?	07:45
	like copy the script, add, commit	07:45
	→ arup_r joined	07:45
	→ toedwy joined	07:45
dcpc007	and rebase -i to put this lat commit in #2 position in therepo ?	07:45
	→ a_le joined	07:46
_ikke_	sure	07:46
osse	create an orphan branch, commit the old versions of the script, then move your current branch on top	07:46
	→ numdig joined	07:47
	← jottr left	07:48
dcpc007	create an orphan branch ? scuse near new to git :)	07:48
	← thiago left	07:49
_ikke_	git checkout --orphan <name>	07:49
dcpc007	pfff i will show this to my "real" dev on subversion :)	07:49
	add an older version in the history ! lol ... git is magic	07:49
	← arup_r left	07:49
	← toedwy left	07:50
osse	dcpc007: alternatively (which will essentially be the same): start a new repository where you commit the old versions the usual way. then you can import commits from your other repo as patches	07:50
_ikke_	Note that this does mean you are alterin history	07:50
dcpc007	_ikke_: after i'll do a merge then ? of master on the orphan	07:50
	i'm alone on the repo	07:50
_ikke_	Ok	07:50
	← a_le left	07:50
	xuitlacoche → autochthon	07:50
_ikke_	A merge wouldn't have the effect you want	07:51
dcpc007	here i track changes manuelly in the prod folder and rsync data on my computer to create the commit myslef	07:51
	→ EminenceHC joined	07:51
dcpc007	hard to change 10 years of use ... when other don't want	07:51
	(and git not the easiest to learn when don't want : o)	07:52
moritz	"old habits die hard"	07:52
dcpc007	hehe	07:52
	← bhws left	07:52
	← kcj left	07:52
dcpc007	i try to install gitolite on a small server to centralize those repo	07:52
	→ the_drow joined	07:52
	→ Megga joined	07:53
dcpc007	we work with subcontractors via vpn ... then hard to control	07:53
the_drow	Is there a way to invalidate the credentials cache for a specific repo?	07:53
	← harish_ left	07:53
cbreak-work	dcpc007: the easiest is git rebase -i	07:53
	then commit new stuff in edit mode	07:53
dcpc007	at least now i have an history of change since 6 months	07:53
cbreak-work	then --continue	07:53
dcpc007	ok thx, will try	07:53
	(and REMOVE all those SAVE subfolders in prod servers !!!)	07:54
	→ ErKa joined	07:54
	← koi left	07:54
cbreak-work	you only need to do the --orphan trick if you want to insert commits before the first commit	07:54
dcpc007	they manage via script.sh, SAVE/script.sh.01012008 SAVE/script.sh.05252009 ......	07:54
cbreak-work	dcpc007: shhht... now we know that we can exploit patched security holes by accessing the old versions	07:54
	→ yacks joined	07:55
dcpc007	lol :)	07:55
	you don't want to try connect here	07:55
	you'll lost your soul :)	07:55
cbreak-work	well, by we I meant NSA	07:55
	they have no soul.	07:56
	← SLY1986 left	07:56
	← EminenceHC left	07:56
dcpc007	practice : i modify the scipt in the prod folder and i ask users to test ...	07:56
	and and if i need modify a line ion script, i duplicate the old and put it with # .... and keep all versions if possible	07:56
	or .. #this config should not be here	07:57
	config=blah	07:57
	→ bezet joined	07:57
dcpc007	i love them ...	07:57
	← tvw left	07:57
	→ sdrfnord1 joined	07:57
dcpc007	near finish to remove ALL useless comments :) keep in MY git repo only now :)	07:57
	ok time to test, thx for answers	07:58
	← dreiss left	07:58
	dkn64738 → dkn64738_afk	07:59
	→ Wiz_KeeD joined	08:00
	→ nour joined	08:01
	dkn64738_afk → dqn	08:01
	← bezet left	08:01
	dqn → dkn64738	08:01
	→ martinklepsch joined	08:01
	← jovy88 left	08:02
	→ jovy88 joined	08:03
	→ plitzenberger joined	08:04
	← plitzenberger left	08:04
	→ mennea_ joined	08:05
	← hj2014 left	08:05
	→ hj2014 joined	08:06
	← mennea left	08:06
	← ErKa left	08:07
	→ plitzenberger joined	08:07
	→ dannixon joined	08:08
	→ psoo joined	08:08
	← dannixon left	08:09
	→ Sonderblade joined	08:11
	← Sonderblade left	08:12
	→ Sonderblade joined	08:12
	→ Lenton joined	08:13
	→ mikecmpbll joined	08:15
	← psoo left	08:15
	→ psoo joined	08:15
	→ a_le joined	08:17
	← sdrfnord1 left	08:17
	← teran left	08:18
	← Vile left	08:18
	→ harish_ joined	08:19
	→ normalra joined	08:21
	← martinklepsch left	08:22
	← a_le left	08:22
	→ jackneill joined	08:22
	→ ErKa joined	08:23
	→ jophish joined	08:23
	→ darkxploit joined	08:23
	← misterpink left	08:26
	→ quazimodo joined	08:28
	→ awkwardusername joined	08:28
	← sonOfRa left	08:29
	← BtbN left	08:29
	→ BtbN joined	08:29
	← rainbyte left	08:29
	→ teran joined	08:30
	→ sonOfRa joined	08:31
	← kevinb left	08:32
	→ amcsi_work joined	08:32
	← Guest64170 left	08:32
	→ ciampix joined	08:33
	→ hashtagdata joined	08:34
	→ W0rmDr1nk joined	08:36
	→ kevinb joined	08:36
	→ nnyk_ joined	08:36
	← normalra left	08:36
	← mdhopkins left	08:36
	→ pikaren joined	08:37
	→ arup_r joined	08:38
	← harish_ left	08:38
	→ rainbyte joined	08:38
	→ bezet joined	08:38
	← unknwn-- left	08:39
	← doev left	08:40
	→ SagiCZ joined	08:40
	→ zarubin joined	08:41
	← quazimodo left	08:41
	← hoschi left	08:42
	→ Gizburdt joined	08:43
	← Gizburdt left	08:44
	→ Gizburdt joined	08:44
	← nbrosnah_ left	08:44
	← k4r1m left	08:44
	← kevinb left	08:45
	→ toedwy joined	08:46
	→ kevinb joined	08:47
	→ quazimodo joined	08:47
	→ Sendoushi joined	08:48
	← SagiCZ left	08:50
	→ leeN joined	08:50
	→ SagiCZ1 joined	08:51
	← toedwy left	08:51
SagiCZ1	.	08:51
	is there any simple mechanism that would notify me about new commit on a certain repo?	08:51
moritz	SagiCZ1: depends on where the repo is hosted	08:52
SagiCZ1	gitlab	08:52
	→ mkoskar joined	08:52
moritz	I don't know much about gitlab, sorry	08:52
	→ freestyl3r joined	08:53
	→ mueslo joined	08:54
	← quazimodo left	08:55
	← jovy88 left	08:57
	→ jovy88 joined	08:58
	← nnyk_ left	08:59
canton7	SagiCZ1, various people have written little tools which continually fetch from a remote repo, and alert you if there are new commits	09:01
	→ phix joined	09:01
	← FL1SK left	09:01
	→ FL1SK joined	09:01
phix	hey, I am just wondering what the preferred way is to ignore changes to a file that is in the repo?	09:02
	so if someone checks out the project, changes the file, the changes to the file is never added to the repo	09:02
cbreak-work	phix: remove the file	09:02
canton7	!config	09:03
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	09:03
	← UukGoblin left	09:03
cbreak-work	phix: if the changes to that file are irrelevant,t hen the file does not belong into the repository	09:03
SagiCZ1	canton7: any examples? not sure how to google it	09:03
	← JSharpe left	09:03
phix	cbreak-work: I want it there to provide a default (site specific configuration)	09:03
cbreak-work	phix: so? They should not fuck around with the default	09:03
	→ cilly joined	09:03
phix	cbreak-work: but if changes it doesn't get commited back to the repo	09:03
cbreak-work	phix: they should just copy it and change their own	09:03
canton7	SagiCZ1, quick google gives gitifier, gitwatcher, git-notify	09:03
cbreak-work	phix: separate user config files from default config files	09:03
phix	cbreak-work: that is their own, but I want to give a sane default	09:03
SagiCZ1	cbreak-work: thanks	09:04
	← cilly left	09:04
cbreak-work	SagiCZ1: I didn't even tell you about man githooks	09:04
gitinfo	SagiCZ1: the githooks manpage is available at http://jk.gs/githooks.html	09:04
	→ JSharpe joined	09:04
phix	cbreak-work: I supose I "could" get them to manually copy the file, however something a bit automatic would be better	09:04
	→ harish_ joined	09:04
cbreak-work	phix: then fix your program	09:04
	→ sh0ne joined	09:04
cbreak-work	phix: make the program generate default config files	09:04
phix	cbreak-work: It works fine	09:04
	→ intellix joined	09:04
cbreak-work	apparently not :)	09:04
phix	cbreak-work: Play Framework doesn't do that, although I guess I could add a maven script or something	09:05
cbreak-work	I've never seen a program that doesn't create its own config files should they be missing and required	09:05
phix	cbreak-work: just thought it would be easier to get git to do it	09:05
cbreak-work	either way, it's not git's job to deal with that problem, and there's no sane git solution either	09:05
	← blorbx`` left	09:06
phix	I thought tracking changes and staging changes was git's responsibility	09:06
cbreak-work	it can do that	09:06
	→ blorbx`` joined	09:06
	→ eliasr joined	09:06
cbreak-work	ignoring changes is not something git is good at though	09:06
	← crater2150 left	09:06
phix	hmmmmm	09:06
	moritz just puts .example files under git's version control	09:07
phix	.gitignore ignores stuff but not when they are added :/	09:07
canton7	ignoring changes to tracked files is fraught with confusing corner-cases. there have been several discussions on the list	09:07
phix	canton7: o	09:07
	ok*	09:07
canton7	we have enough complaints about confusing UI to begin adding more gotchas ;)	09:07
	← r0ok left	09:07
phix	canton7: git has a UI?	09:07
sh0ne	Hello. I have a problem with Git on CentOS 6.5. When I run git to fetch something it starts with "Fetching http://github.com/something.git" and just stays that way...no error messages, nothing. What could be the problem?	09:07
canton7	phix, the command-line counts as UI	09:08
phix	canton7: oh wait, I am getting UI mixed with GUI	09:08
canton7	:P	09:08
phix	:)	09:08
	→ Sicp joined	09:08
phix	Yeah I like the command like UI however my boss doesn't and kiddies don't :\	09:08
	← Xethron left	09:09
	← iamtakingiteasy left	09:11
	← pikaren left	09:11
	→ UukGoblin joined	09:12
cbreak-work	phix: .gitignore doesn't ignore changes though :)	09:12
	→ crater2150 joined	09:16
	← sonOfRa left	09:16
	← BtbN left	09:16
	→ Naeblis joined	09:16
	→ Xethron joined	09:16
	← Xethron left	09:16
	→ Xethron joined	09:16
	→ achadwick joined	09:18
	← Gizburdt left	09:18
dcpc007	SagiCZ1: some lnks from google maybe : https://groups.google.com/forum/#!topic/gitlabhq/p0XmOrO8Ltc	09:18
phix	cbreak-work: I noticed :(	09:18
	← teran left	09:18
	→ BtbN joined	09:18
	→ teran joined	09:19
dcpc007	phix: some "small" gui : tig (for console but limited), or gitk, after think it's more heavy apps like gitlab	09:19
	← deanclkclk_ left	09:19
dcpc007	i've seen some youtube videos with ruby application very graphic friendly, but not all the functionnalities	09:20
	← awkwardusername left	09:20
canton7	if you're after a list of guis, git-scm.com has a nice list: http://git-scm.com/downloads/guis	09:20
	→ Guest64170 joined	09:20
	→ sonOfRa joined	09:21
	→ zdevdusty joined	09:21
	← crater2150 left	09:21
	→ crater2150 joined	09:22
	← hashtagdata left	09:22
dcpc007	nah it's in french but can find the softs back. Don't know if it's good.	09:22
	prefer use command line with some aliases for logs	09:23
	and sometimes gitk/tig forsee graph	09:23
	← teran left	09:23
phix	dcpc007: I like TortoiseGit but it is Windows specific. Doesn't matter for me though, I don't mind the command line, although my fellow younger devs and not so technically minded report writers and graphical designers hate it	09:23
	→ koi joined	09:24
dcpc007	tortoisegit seems really limited :-(	09:24
	and think harder to learn git with him than others	09:24
phix	dcpc007: Yeah but it is pretty and all the commonly used options are there ;)	09:24
	→ awkwardusername joined	09:24
dcpc007	tortoisgit want too much to stay close to svn interface	09:25
phix	yeah	09:25
canton7	last time I used tortoisegit, which was a few years ago to be fair, it let you do some really nasty stuff without telling you know what was going on	09:25
dcpc007	the power and difficulty of git is its method and graph	09:25
canton7	oh, and there was no equivalent to push --delete :P	09:25
phix	There is also a "team" feature in Eclipse, but that is pretty limited	09:25
dcpc007	and tortoisegit can't show this	09:25
	← zdevdusty left	09:26
dcpc007	phix what is your main dev work ?	09:26
	← xobb left	09:27
phix	dcpc007: Server side, mostly Linux	09:27
	← watabou left	09:28
phix	Assist in web apps mostly, django, Play Framework, etc.	09:28
	and setup server sider services, networking, infrusture stuff too	09:28
dcpc007	ha mostly linux and don't like command line ..... tssss	09:28
phix	dcpc007: No I use mostly linux :)	09:28
dcpc007	talk of boss and kiddy	09:28
phix	the younger devs and older people use Windows and / or Mac	09:29
	the Mac users never knew about the terminakl	09:29
	terminal*	09:29
	← mennea_ left	09:29
dcpc007	more than windows one :)	09:29
	← autochthon left	09:29
phix	The are against high contrast grey writing on black screen :)	09:29
	even though it is better for your eyes ;)	09:30
	→ ffs82defxp joined	09:30
dcpc007	look at ungit maybe, don't know if reliable or complete set of commands but seems the nearsest GUI from github	09:30
	and multiplatform	09:30
	← jophish left	09:30
phix	I need multiplatform	09:30
dcpc007	lol configure terminal balc on white :)	09:30
	black	09:30
phix	dcpc007: Too bright for me ;)	09:30
dcpc007	http://www.youtube.com/watch?v=hkBVAi3oKvo	09:30
	ungit official prez	09:31
phix	thnx	09:31
	will check it out	09:31
	→ Gizburdt joined	09:31
	→ sdrfnord1 joined	09:32
dcpc007	it seems only basics commands, nothing like rebase -i in first docs i found	09:33
	→ xobb joined	09:33
	→ jens_ joined	09:33
phix	ungit looks alright	09:33
	dcpc007: I have never used rebase before	09:34
	← the8thbit left	09:34
	← weiyang left	09:34
	→ hoschi joined	09:35
dcpc007	wow ... it's unbelioevable tool ! too magic !!!	09:35
	rewrite the history to make it clean	09:35
	or even like i ask this morning : add a commit as if it were created 1 year ago	09:36
	rebase -i can split a commit in 2 commits (if 2 subjects), can merge 2 commit in 1, can reorder commits,....	09:36
	← mkoskar left	09:36
	→ mkoskar joined	09:37
dcpc007	think that using GUI mean loosing all those powerfull tools	09:37
	try git add -p too ... my svn dev were bluffed !	09:37
	→ mspe_ joined	09:38
	← Tuna-Fish left	09:38
	← kriks left	09:38
dcpc007	until now, with git (and my few weeks of small works) i can solve all problems svn dev have since years	09:38
	→ Gonzo89 joined	09:39
	→ nbrosnah_ joined	09:39
	← nbrosnah_ left	09:39
	→ nkouevda_ joined	09:39
	← Derega left	09:39
dcpc007	(i was told that some times ago, they use a real piece of wood to manage who could make a commit in the repo and avoid conflicts :) ) !!!	09:39
	← whyy left	09:40
	← kristofers left	09:40
	→ nbrosnah_ joined	09:40
	← nbrosnah_ left	09:40
dcpc007	like in Dr House episode with an eyed totem	09:40
	→ nbrosnah_ joined	09:41
	← nbrosnah_ left	09:41
	← nkouevda left	09:42
	← mspe_ left	09:42
cbreak-work	dcpc007: token passing, an old strategy	09:44
	dcpc007: it was used in networking too, for token ring networks	09:44
	→ beautifulmind joined	09:44
	← beautifulmind left	09:45
	→ beautifulmind joined	09:45
	→ knownasilya joined	09:45
	→ eletuchy_ joined	09:46
	← ffs82defxp left	09:46
	→ Reskp joined	09:46
	→ toedwy joined	09:47
	→ whyy joined	09:48
	→ the8thbit joined	09:49
	→ Tuna-Fish joined	09:49
moritz	totem passing	09:49
	← eletuchy left	09:49
	→ adhawkins joined	09:49
	← eletuchy_ left	09:50
	← Sendoushi left	09:50
	← sh0ne left	09:51
	→ sh0ne joined	09:51
	← toedwy left	09:51
	→ teran joined	09:52
	← Naeblis left	09:52
	→ EminenceHC joined	09:52
	→ nbrosnah_ joined	09:52
	← Gizburdt left	09:52
	→ CheckDavid joined	09:52
	→ thevishy joined	09:53
	← adhawkins left	09:54
	← hkon_ left	09:54
	← Sicp left	09:54
	→ hkon_ joined	09:54
murosai_	any recommendations for tools to show git version history? im having a hard time reading the gitk output	09:55
	https://github.com/crc8/GitVersionTree	09:55
	something like this but for linux also..	09:55
moritz	murosai_: you could try cola	09:56
	← EminenceHC left	09:57
	→ hkon__ joined	09:57
	← teran left	09:58
	← hkon_ left	09:59
	→ teran joined	09:59
	← beautifulmind left	09:59
	← jens_ left	10:00
	← whyy left	10:01
	← plitzenberger left	10:01
	→ zumba_addict joined	10:01
	→ whyy joined	10:01
	→ h0bbit joined	10:01
	→ jottr joined	10:03
	← Tuna-Fish left	10:03
	← teran left	10:03
	← alexbligh1 left	10:04
	→ alexbligh1 joined	10:04
	→ deed02392 joined	10:04
dcpc007	look for aliases like git lg2 or git lg ther some gist for them	10:04
deed02392	is it possible to enumerate repositories that are exported by git-daemon?	10:05
	← rageshkrishna left	10:05
murosai_	i'm now in a situation where i have reverted several commits after merging a feature branch and now i have to merge that feature branch again	10:06
	it's a huge mess, i'm not sure if the best option is to revert the reverts	10:06
	→ mennea joined	10:06
	→ plitzenberger joined	10:07
	← specing left	10:07
	← abra left	10:08
	← Prawnzy left	10:08
	→ Raging_Hog joined	10:09
	→ abra joined	10:10
SagiCZ1	murosai_: run around flapping your arms repeatedly.. then proceed to jump out of the window	10:11
	← gattuso left	10:12
	← KevinTS left	10:12
	→ Droolio joined	10:12
	← Sceorem left	10:13
	→ KevinTS joined	10:13
	← sh0ne left	10:13
	← aidalgol left	10:13
	→ teran joined	10:13
cbreak-work	murosai_: you can only merge history once, EVER	10:14
	→ Tuna-Fish joined	10:14
	→ kachi8 joined	10:14
cbreak-work	now it is merged and you can never again merge it	10:14
	← Reskp left	10:15
	→ beautifulmind joined	10:15
	→ Reskp joined	10:16
	→ autochthon joined	10:16
osse	murosai_: reverting the reverts is a reasonable option	10:16
	← Reskp left	10:16
osse	murosai_: at least according to some email from either the linux guy or the git guy	10:17
	← danillonunes left	10:17
osse	https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt	10:17
	← Tuna-Fish left	10:17
	→ martinklepsch joined	10:17
	← Raging_Hog left	10:17
	← KevinTS left	10:17
	→ jophish joined	10:18
	→ Sceorem joined	10:19
	→ godgodgodgo joined	10:19
	→ Polymorphism joined	10:20
	→ Raging_Hog joined	10:20
	Guest5180 → totte	10:21
	← totte left	10:22
	→ totte joined	10:22
	→ danillonunes joined	10:23
	→ Caius joined	10:23
MapMan	Hi! I have a problem with git. Git status says im already up to date. I do git pull, it pulls something. Git status says im behind some commits now, do a git pull -> you're already up to date, git status -> you're behind. And so on. My friend had a similar problem and he had to delte some indexes or something? Any help? ;)	10:24
	← intellix left	10:24
	→ TheMadMechanic joined	10:24
	← jophish left	10:25
osse	!repro	10:25
gitinfo	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%.	10:25
	← xobb left	10:25
	→ SittingShiva joined	10:26
	→ listochkin joined	10:26
	→ Ritzton joined	10:28
	← Polymorphism left	10:28
	→ Tuna-Fish joined	10:28
	← rgr left	10:28
	← Tuna-Fish left	10:28
	→ Tuna-Fish joined	10:29
	← kirin` left	10:30
	→ KevinTS joined	10:30
	→ xobb joined	10:31
	← dangerousdave left	10:32
	← curiousmansi__ left	10:32
	← Ragnor left	10:32
	← przemkovv left	10:33
	→ Gizburdt joined	10:34
	→ Reskp joined	10:37
	← Tuna-Fish left	10:37
	→ Tuna-Fish joined	10:38
	← Tuna-Fish left	10:40
	→ _Vi joined	10:41
	→ test__ joined	10:41
	→ Hounddog joined	10:42
	← arup_r left	10:42
	← Raging_Hog left	10:43
	→ stamina joined	10:43
	← SagiCZ1 left	10:44
	→ arup_r joined	10:46
	→ luc___ joined	10:46
	→ amikiri joined	10:47
	gitinfo set mode: +v	10:47
	→ toedwy joined	10:48
	gitinfo set mode: +v	10:48
	→ kirin` joined	10:48
	← xobb left	10:48
test__	Hi, sorry have quick question. Some branch merged to master. Now i want push to server only master branch without commits of other branch. How to do? Thank you	10:49
tobiasvl	test__: what do you mean exactly? you want to remove the merged commits again?	10:49
test__	i want to push clear master commits, without commits of other branch that was merged into master branch	10:50
	← dkn64738 left	10:50
tobiasvl	did you merge into master locally?	10:50
rath	MapMan: sounds like you have branches like "master" and "Master" on a case insensitive file system	10:50
	← luc_ left	10:50
tobiasvl	and just want to "undo" the merge?	10:50
test__	no	10:50
	← luc___ left	10:51
	← whyy left	10:51
test__	just want to push clear branch. Because in "feature branch" that was merged i have many trash and badwords	10:51
tobiasvl	what's "clear branch"?	10:52
	→ Tuna-Fish joined	10:52
tobiasvl	test__: !revert	10:52
gitinfo	test__: 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]?	10:52
test__	want to see oneline commit tree in master branch	10:52
	← toedwy left	10:52
	→ kcj joined	10:53
test__	seems like i want rebase	10:53
	← jottr left	10:53
test__	but not a rebase	10:54
	← hoschi left	10:54
tobiasvl	test__: maybe an !interactive_rebase	10:54
gitinfo	test__: 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'.	10:54
	← kcj left	10:55
	← Tuna-Fish left	10:55
	→ xobb joined	10:55
	→ Tuna-Fish joined	10:55
	← xobb left	10:56
	→ vtunka joined	10:57
	→ tatsuya_o joined	10:57
	← tokik left	10:57
osse	test__: maybe you want merge --squash	10:58
	what you're asking for isn't possible	10:58
	→ Sendoushi joined	10:58
test__	i have already merged feature branch to master. Is it really hard to push only master branch without commits of feature branch?	10:58
osse	yes, because the merge makes all those commits also part of the feature branch	10:59
	but you can push everything before the merge	10:59
	git push origin master~1:master for example (if the merge commit is the newest)	10:59
	← Tuna-Fish left	10:59
	← acharlieh left	11:00
	→ mizu_no_oto joined	11:00
	→ dkn64738 joined	11:00
	→ kcj joined	11:01
	→ intellix joined	11:02
	→ listochk_ joined	11:02
	← k_sze[work] left	11:02
	→ eletuchy joined	11:02
	→ northfurr joined	11:03
	← kcj left	11:03
	← joki left	11:04
	→ Panicky joined	11:04
	← listochkin left	11:05
	→ xobb joined	11:05
	← sonOfRa left	11:05
	← BtbN left	11:05
	→ BtbN joined	11:05
	← marklite left	11:06
	← daito left	11:06
	→ carandraug joined	11:07
	→ marcjs joined	11:07
	← mizu_no_oto left	11:08
	→ sonOfRa joined	11:08
	→ rgr joined	11:08
	→ xMYTHICx joined	11:09
	→ tokik joined	11:09
osse	ehh, I mean all those commits are now part of the master branch	11:09
	← xMYTHICx left	11:09
	← hyperair left	11:09
	← gsingh93 left	11:09
	← GodEater left	11:10
	→ kcj joined	11:10
	← barneybook_8 left	11:10
	→ GodEater joined	11:10
	← GodEater left	11:10
	→ GodEater joined	11:10
	→ joki joined	11:10
	→ zdevdusty joined	11:10
	→ Tuna-Fish joined	11:11
	← kcj left	11:11
	← plitzenberger left	11:11
	← Tuna-Fish left	11:12
	→ fr33domlover joined	11:13
	→ Tuna-Fish joined	11:13
	← listochk_ left	11:13
	← jas4711 left	11:14
	← zdevdusty left	11:15
	→ plitzenberger joined	11:15
	← crane- left	11:16
	← sonOfRa left	11:16
	← BtbN left	11:16
	→ przemkovv joined	11:17
	→ BtbN joined	11:18
	→ mizu_no_oto joined	11:19
	→ crane joined	11:19
	→ sonOfRa joined	11:20
	→ kcj joined	11:22
MapMan	rath: that was it, thanks. To some, it's obvious but to others I have to explain numerous times why not to name their branches like "bugfix" and then "Bugfix" for another work item... Goooood damn it.	11:23
	← ferreum left	11:23
	← kcj left	11:24
	→ Derega joined	11:24
	→ ISmithers_ joined	11:24
	→ whyy joined	11:26
	→ ferreum joined	11:26
	→ ISmithers joined	11:27
	→ toedwy joined	11:28
	→ marklite joined	11:28
	← rvsjoen_ left	11:28
	→ rvsjoen joined	11:28
	← knighthawk left	11:30
	→ knighthawk joined	11:30
	← ItSAN____ left	11:31
	← northfurr left	11:33
	→ BSaboia joined	11:33
	← knighthawk left	11:35
	← amikiri left	11:36
	→ mspe_ joined	11:39
	← scampbell left	11:40
	← freestyl3r left	11:40
	← mkoskar left	11:43
	← hj2014 left	11:43
	→ hj2014 joined	11:44
	← mspe_ left	11:44
	← Gizburdt left	11:45
	← arup_r left	11:45
	→ ovidiu-florin joined	11:46
ovidiu-florin	hello world	11:46
	→ arup_r joined	11:46
ovidiu-florin	I have questions about how to use git-svn, can I ask them here? or is there a separate channel for this?	11:46
masak	ovidiu-florin: I don't know if there's a separate channel, but please ask.	11:47
	→ pmurias joined	11:47
ovidiu-florin	ok	11:47
masak	with some luck, someone will know the answer, or know to point you.	11:47
ovidiu-florin	currently I'm asking only to inform myself about the subject	11:47
	I have to use SVN at work, comming from a git background this is torture for me	11:47
pmurias	is there a way to see by which .gitignore line/file a file is ignored?	11:48
	ovidiu-florin: have you seen git-svn?	11:48
ovidiu-florin	pmurias: I just asked about it	11:48
	my question is regarding to branches. I have a branch in a subdirectory in svn, how can I track that SVN branch into a git branch on my local repo?	11:49
	→ psoo_ joined	11:49
ovidiu-florin	is that possible?	11:49
	or do both my master and my branch have to be at the same dir level checkout form svn?	11:49
rath	pmurias: there's "git check-ignore"	11:49
osse	ovidiu-florin: I think git-svn takes care of all of that for you.	11:50
ovidiu-florin	Please ask if I haven't explained myself clearly enough	11:50
osse	but there are options that lets you specify stuff like that	11:50
	← arup_r left	11:50
	→ test___ joined	11:51
	← test__ left	11:51
	← h0bbit left	11:51
	gitinfo set mode: +v	11:51
ovidiu-florin	do I do a man git svn ?	11:51
gitinfo	the git-svn manpage is available at http://jk.gs/git-svn.html	11:51
ovidiu-florin	thank you	11:52
osse	on your system you probably need a dash between git and svn	11:52
	← psoo left	11:52
test___	Everybody, Thank you. All i need was "merge --squash".	11:52
	→ cscsaba242 joined	11:53
	→ wild_oscar joined	11:53
	→ EminenceHC joined	11:53
	← Ritzton left	11:54
	← cscsaba242 left	11:55
	→ ItSANgo joined	11:55
	→ davidtkelleher joined	11:55
wild_oscar	I made a pull request of a github branch "fix15" to upstream. however, I realised I forgot to commit a file. I have this file in my "development" branch locally. Question: how do I 1) add the file to branch fix15 locally (in a way that it will also be in "development") and 2) update the pull request so that the missing file is there as well	11:55
	→ cscsaba242 joined	11:55
	→ cannonball joined	11:56
	→ groolot joined	11:56
	← cscsaba242 left	11:57
	→ jottr joined	11:57
	← groolot left	11:57
qsuscs	updating the pull request is just pushing	11:57
	first one sounds like man git cherry-pick	11:58
gitinfo	the git-cherry-pick manpage is available at http://jk.gs/git-cherry-pick.html	11:58
	← EminenceHC left	11:58
pmurias	if I have a 'bin' line in a .gitignore shouldn't it just match the file in the directory .gitignore is?	11:58
osse	pmurias: yes, and in any subdirs	11:59
	→ lsiv568 joined	11:59
pmurias	is there a way to stop that	11:59
	?	11:59
osse	pmurias: afaik, use /bin	12:00
	← test___ left	12:01
	← beautifulmind left	12:01
	← Xethron left	12:01
	→ jerius joined	12:04
	→ Xethron joined	12:04
wild_oscar	thks qsuscs	12:05
	→ JDHawke joined	12:05
	→ Emperor_Earth joined	12:05
	← jerius left	12:06
	→ consti joined	12:06
	← consti left	12:06
	← tokik left	12:06
	→ beautifulmind joined	12:07
	← kevinb left	12:07
	← kyb3r_ left	12:09
	← cagedwisdom left	12:09
	← nbrosnah_ left	12:09
	→ adhawkins joined	12:10
	→ siovene joined	12:10
	→ n-st joined	12:10
	→ kevinb joined	12:10
	← xobb left	12:10
	→ listochkin joined	12:11
	← lite_ left	12:12
	← Reskp left	12:13
	← Megga left	12:14
	→ xobb joined	12:16
	← stodan left	12:17
	→ davividal joined	12:17
	← BSaboia left	12:17
	← ninsei left	12:18
	→ nomike joined	12:18
	→ ninsei joined	12:18
	gitinfo set mode: +v	12:19
nomike	hi	12:19
	← jottr left	12:19
nomike	I have a server running Redhat Enterprise Linux 6.	12:19
	My problem is: When I try to run "git help diff	12:19
	My problem is: When I try to run "git help diff" it gives me this:	12:20
	sh: /usr/bin/ls: No such file or directory	12:20
	Error executing formatting or display command.	12:20
	System command (cd "/usr/share/man" && (echo ".ll 21.7i"; echo ".nr LL 21.7i"; echo ".pl 1100i"; /usr/bin/gunzip -c '/usr/share/man/man1/git-diff.1.gz'; echo ".\\\""; echo ".pl \n(nlu+10") \| /usr/bin/gtbl \| /usr/bin/nroff -c -mandoc 2>/dev/null \| /usr/bin/ls) exited with status 32512.	12:20
	← ki0 left	12:20
	→ northfurr joined	12:20
tobiasvl	uh. but you can run regular `ls`?	12:20
	which ls	12:21
	→ ki0 joined	12:21
	← davidtkelleher left	12:21
canton7	ls is usually a shell built-in, isn't it?	12:21
nomike	It is /bin/ls of course	12:21
moritz	canton7: no	12:21
grawity	canton7: only in Windows/MS-DOS :P	12:22
	→ test__ joined	12:22
canton7	heh, fair enough. leaky memory	12:22
tobiasvl	nomike: then why is it looking for /usr/bin/ls	12:22
	wtf	12:22
	path?	12:22
nomike	tobiasvl: I'm asking myself the same question at the moment g	12:22
	PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin	12:23
	ahh....dammit	12:23
osse	that is one fugly command	12:23
nomike	PAGER="/usr/bin/ls"	12:23
	how did that happen?!?	12:23
tobiasvl	nomike: :)	12:23
canton7	hah, oops	12:24
MacGyver	sitaram: Whenever I update gitolite, should I re-run gitolite setup?	12:24
tobiasvl	ls as a pager (regardless of /usr/bin/ls) is pretty weird anyway	12:24
nomike	Should have been	12:25
	← ki0 left	12:25
nomike	"/usr/bin/less" of course	12:25
tobiasvl	yeah	12:25
nomike	But that where some weird symptoms	12:25
osse	nomike: do you have $LESS sett ?	12:26
	set?	12:26
	gitinfo set mode: +v	12:26
nomike	what is "$LESS"? Never heard of it	12:26
osse	it's an environment variable	12:27
	just like PAGER	12:27
	and BROWSER, EDITOR, etc. etc.	12:27
nomike	yeah, but what for?	12:27
osse	default options for less	12:27
nomike	ahh...no I haven't	12:27
	but good to know	12:27
osse	it can trip you up	12:27
	if you set it, Git will respect it. But if it isn't set then Git assumes FSRX	12:27
	So if you set it to F or whatever send suddenly you don't have colors in your diff	12:28
davividal	hi. We were working with one master centralized repository and all devs pulling from/pushing to it. We faced a lot of merge conflicts. Now, we migrated to a PullRequest workflow using Gitlab and we saw close to none merge conflicts. But now we need a team to work on a huge feature that will take some time to finish and they need to share they work, so we opted to fork the repo and the team will work from there, syncing their fork with the main repo. It	12:28
	is working, but it fells wrong. What are my alternatives?	12:28
	← _Vi left	12:28
osse	davividal: why does it feel wrong?	12:29
	← toedwy left	12:29
osse	davividal: they could work in a seperate branch instead of a seperate repo	12:30
	it doesn't really matter to Git	12:30
	→ h0bbit joined	12:31
davividal	osse: we were using separate branches to do the work before the merge-requests thing, but the guys got really confused and so we had to (politically) disable shared branches until they learn how to properly work.	12:31
	osse: I don't know why it does feel wrong, it just looks wrong. Looks like I'm missing something. I told my bosses that we could try some taser-related experiment, but it was oddly forbidden.	12:32
	← Silmarilion left	12:34
osse	it sounds right to me, which is what I'm asking	12:34
	← calculon left	12:34
osse	you're taking advantage of distributed development blah blah	12:34
	*which is why	12:34
	← Relsak left	12:34
	→ pikaren joined	12:35
davividal	osse: I'll give it some more thought... sorry.	12:35
osse	davividal: no need to be sorry :)	12:35
	→ Noldorin joined	12:35
	← plitzenberger left	12:36
	← Emperor_Earth left	12:36
osse	It's just said what you're decribing doesn't sound wrong at all (and even if it did I don't have any better suggestions)	12:36
	→ Emperor_Earth joined	12:36
	→ daito joined	12:36
	← bezet left	12:37
	→ bezet joined	12:38
	→ Nizumzen joined	12:39
	← kevinb left	12:39
	← netj left	12:40
	→ kevinb joined	12:40
	← daito left	12:41
osse	davividal: waaaaaait a minute. How does a PullRequest workflow change if you use a fork versus a different branch in the same repo?	12:41
davividal	osse: same repo: everything goes to master. fork: everything goes to a branch (fork-project) that will be merged into main:master	12:42
	← bezet left	12:42
osse	davividal: but with the same repo everything goes to a seperate branch first right?	12:43
	→ nekyian_ joined	12:44
	→ Not_Whatever joined	12:45
	← xobb left	12:45
sitaram	MacGyver: it never hurts	12:47
	→ calculon joined	12:47
sitaram	MacGyver: for some upgrades it is required, and it's easier to just do it than figure out when it is needed and when not	12:47
	→ Gizburdt joined	12:48
MacGyver	sitaram: Okay, thanks.	12:48
	← zumba_addict left	12:48
	← Gizburdt left	12:49
	→ arup_r joined	12:49
	→ marcaddeo joined	12:49
	→ zumba_addict joined	12:49
	← MacGyver left	12:49
marcaddeo	is it possible to merge my feature branch into master, without switching to master?	12:49
osse	only if it's a fast-forward	12:50
tobiasvl	yes, then you can push to the branch	12:50
	→ darkbasic_ joined	12:50
	→ xobb joined	12:51
	← darkbasic left	12:51
	→ MacGyver joined	12:52
	→ vurma joined	12:53
	← zumba_addict left	12:53
	← mizu_no_oto left	12:53
	← vtunka left	12:54
	→ Relsak joined	12:54
	← JohnBat26 left	12:56
	← Relsak left	12:56
	→ Relsak joined	12:56
	← mennea left	12:56
	→ sgambino joined	12:57
	← Pwnna left	12:58
	← test__ left	12:58
	→ dougsland_ joined	12:58
	→ zdevdusty joined	12:59
	← Sendoushi left	12:59
	← tatsuya_o left	13:00
	→ jtruckz_ joined	13:00
	→ macabre__ joined	13:00
	→ paddymahoney joined	13:00
	→ tatsuya_o joined	13:01
	→ Silmarilion joined	13:01
	→ Pwnna joined	13:02
	→ bezet joined	13:02
	← zarubin left	13:02
	→ netj joined	13:02
	→ Reboot1 joined	13:02
	← zdevdusty left	13:04
	← Reboot1 left	13:04
	→ svector joined	13:04
	← xobb left	13:04
	← jtruckz left	13:04
	→ vtunka joined	13:05
	← tatsuya_o left	13:05
	→ Destos joined	13:06
	→ gdrc joined	13:07
	← netj left	13:07
gdrc	hey	13:07
	→ kristofers joined	13:07
	→ mizu_no_oto joined	13:07
	← lsiv568 left	13:07
	→ ki0 joined	13:08
	→ curiousmansi_ joined	13:08
	→ lsiv568 joined	13:08
	→ it0a joined	13:09
	→ pandeiro joined	13:09
gdrc	bitbucket is down	13:09
	→ zivester joined	13:09
	→ VictorBjelkholm joined	13:09
	← svector left	13:10
	← _tpavel left	13:10
	→ xobb joined	13:10
	→ jerius joined	13:10
davividal	osse: with the same repo, everything goes to master right away.	13:10
	← Willow left	13:11
	→ svector joined	13:12
osse	davividal: but then you cannot have a pull request workflow	13:12
	→ Willow joined	13:12
	← lsiv568 left	13:12
	← whyy left	13:12
	← svector left	13:12
	← kloeri_ left	13:13
	→ toedwy joined	13:13
	→ bluesm joined	13:13
	→ Gamecubic joined	13:14
	dkn64738 → dkn64738_afk	13:14
	→ svector joined	13:16
	← john_doe_jr left	13:16
	← darkbasic_ left	13:16
	→ lsiv568 joined	13:16
	→ darkbasic joined	13:16
	← svector left	13:16
	← jackh left	13:16
	→ whyy joined	13:16
	← Willow left	13:17
	→ jackh joined	13:17
	→ svector joined	13:17
	→ KamalKaur joined	13:17
	→ jottr joined	13:17
	→ mennea joined	13:17
	→ tvw joined	13:18
	→ mmitchel_ joined	13:18
	← svector left	13:18
	→ cscsaba joined	13:18
	← h0bbit left	13:18
	→ punchagan joined	13:18
	→ plitzenberger joined	13:19
cscsaba	hello, in case of fetch and rebase i have conflict	13:19
	→ svector joined	13:19
canton7	!eekaconflict	13:19
gitinfo	Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	13:19
	→ FortySix2 joined	13:20
guzzlefry	Is it possible to set a user-specific .gitignore?	13:20
cscsaba	im on the (foo\|REBASE 1/1) branch, how can resolve a conflict and go back to : foo branch ?	13:20
guzzlefry	I have some IDE files that are in most of my projects, and I'd like to ignore them based on a user setting.	13:20
	← punchagan left	13:21
	← FortySix2 left	13:21
osse	guzzlefry: yes, you can specify a seperate ignore file in your ~/.gitconfig	13:22
	← whyy left	13:22
osse	guzzlefry: or per repo in repo/.git/info/exclude	13:22
	→ FortySix2 joined	13:22
guzzlefry	awesome, thanks	13:22
	→ wlemuel joined	13:23
canton7	cschneid, git status to see what the conflicted file is. edit it in your favourite editor, search for conflict markers ">>>>>" etc, and edit that section to your taste, removing the conflict markers	13:23
	then add the file, and 'git rebase --continue'	13:23
	cscsaba, ^^, rather	13:23
	→ CKyle joined	13:23
	→ _tpavel joined	13:24
cscsaba	??	13:24
	← svector left	13:24
	→ m0ltar joined	13:25
	← FortySix2 left	13:25
	→ FortySix2 joined	13:25
	→ jophish joined	13:27
	← kristofers left	13:27
	← mizu_no_oto left	13:28
canton7	?? what?	13:28
	→ BradND joined	13:28
	← eletuchy left	13:28
BradND	Quick question: does git checkout remove untracked files or not?	13:29
cscsaba	canton7: cscsaba, ^^, rather	13:29
moritz	BradND: it doesn't	13:29
	→ eletuchy joined	13:29
canton7	cscsaba, that message was meant for you, but I put the wrong nick at the beginning	13:29
moritz	BradND: that's "git clean"'s job	13:29
	← dsdeiz_ left	13:29
	→ hoschi joined	13:30
murosai_	how can i easily see whan a branch was created?	13:30
	← jottr left	13:30
	← teran left	13:32
	→ tmcmahon joined	13:33
	→ Willow joined	13:33
	← eletuchy left	13:33
guzzlefry	I have ~/.gitignore in my .gitconfig for core.excludesfiles, and in the .gitignore I have .idea/ Yet it's still being listed as untracked in `git status`	13:34
	← cscsaba left	13:34
guzzlefry	Anything obvious that I'm doing wrong here?	13:34
	← stamina left	13:34
	← tmcmahon left	13:35
	→ Dougie187 joined	13:36
	→ hyperair joined	13:36
	dkn64738_afk → dkn64738	13:36
moritz	guzzlefry: maybe it doesn't expand the ~ in ~/.gitignore ?	13:36
	guzzlefry: try the fully qualified path	13:37
guzzlefry	oh sorry, it is	13:37
canton7	it should, according to the docs	13:37
	← hj2014 left	13:37
guzzlefry	The git config command expanded it for me.	13:37
	→ Guest17312 joined	13:37
	→ jas4711 joined	13:37
canton7	so it does work?	13:37
	→ daito_ joined	13:37
	→ hj2014 joined	13:37
moritz	strace to find out if your ~/.gitignore has been read?	13:37
	→ devoldmx3 joined	13:38
	← devoldmx left	13:41
guzzlefry	Doesn't look like it. :/	13:41
	→ mspe joined	13:41
	← KamalKaur left	13:41
	← daito_ left	13:41
	← hj2014 left	13:42
	← toedwy left	13:42
	← arup_r left	13:43
	→ arup_r joined	13:43
	← northfurr left	13:43
	← Tuna-Fish left	13:45
	→ Reskp joined	13:45
	→ HumanSky joined	13:45
	→ Tuna-Fish joined	13:45
	→ punchagan joined	13:45
	→ Ankhers joined	13:46
	← mspe left	13:46
	→ nickpresta joined	13:46
	→ ehmatthes joined	13:46
	← arup_r left	13:48
guzzlefry	oh fun, there was a typo on this gitready website. :P	13:49
	Vampire0_ → Vampire0	13:49
	← punchagan left	13:50
	← mikedugan left	13:50
	→ Mitchbones joined	13:52
osse	I fixed that bug!	13:52
	plz2uprade to Git 2.0.1	13:53
	→ scrooge_mcduck joined	13:53
	gitinfo set mode: +v	13:53
scrooge_mcduck	hello!	13:53
gitinfo	scrooge_mcduck: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	13:53
	→ EminenceHC joined	13:53
scrooge_mcduck	i am curious if it's possible to ignore all files in a directory but .gitkeep?	13:54
osse	never mind, I fixed it for mailmap.file	13:54
	scrooge_mcduck: * and !.gitkeep	13:54
canton7	scrooge_mcduck, man gitignore, there are unexclude rules	13:54
gitinfo	scrooge_mcduck: the gitignore manpage is available at http://jk.gs/gitignore.html	13:54
canton7	also, .gitignore doesn't work for tracked files, so you can always just add -f the .gitkeep :P	13:54
	→ Palsson joined	13:54
	→ sohail joined	13:54
	← sohail left	13:54
	→ sohail joined	13:54
	← plitzenberger left	13:55
ovidiu-florin	I'm back with more question regarding git-svn. If I want to clone a subdir of TRUNK, and not the whole TRUNK, can I do this? I've tried git svn clone http://svnserver/project/TRUNK/subdir/of/trunk and it fails after it converts a few revisions.	13:55
	← CKyle left	13:55
canton7	ovidiu-florin, you might need to pass --no-minimize-url	13:55
	it can get a bit keen to try and traverse up the path you give it	13:56
	but in general that should be gine	13:56
	→ tplaner joined	13:56
	← Panicky left	13:56
canton7	*fine	13:56
	← Emperor_Earth left	13:56
	→ plitzenberger joined	13:57
	→ aarkerio joined	13:58
	gitinfo set mode: +v	13:58
	← MacGyver left	13:58
	← jas4711 left	13:58
	→ MacGyver joined	13:58
ovidiu-florin	canton7: I'm not sure I understand	13:58
Palsson	Can anyone help me with this problem ? http://paste.ubuntu.com/7895188/	13:58
	How do i do the fixup part	13:58
	← EminenceHC left	13:58
Palsson	This is what i get from the rebase http://paste.ubuntu.com/7895203/	13:59
	← devoldmx3 left	13:59
	← nafg left	13:59
canton7	ovidiu-florin, have you tried passing --no-minimize-url?	13:59
aarkerio	hi! I did a pull request in bitbucket to merge my branch but now I'm getting "changed in source but deleted in destination" on many files	13:59
	any idea why?	13:59
ovidiu-florin	canton7: not yet	13:59
	my svn repo is 40GB big	13:59
	so not a lot of time for testing with commands	13:59
	→ devoldmx joined	14:00
ovidiu-florin	I want to understand what each thing does, before I run the command	14:00
aarkerio	I did this same merge a week ago but I did a revert	14:00
	← Errorical left	14:00
	→ sontek joined	14:00
guzzlefry	How would one force a pull? -f probably isn't doing what I'm expecting.	14:00
scrooge_mcduck	hmm not working yet	14:00
	→ netj joined	14:01
ovidiu-florin	canton7: can you please explain for an noob what that option does?	14:01
	→ anEffingChamp joined	14:01
grawity	guzzlefry: by "force a pull", you mean reset the local branch to exactly where a remote branch is?	14:01
	← Guest17312 left	14:01
	→ fatalhalt joined	14:01
guzzlefry	grawity: yes, but keep anything in .gitignore	14:01
grawity	guzzlefry: pull is fetch + merge, but what you're looking for is fetch + reset	14:01
	← vtunka left	14:01
canton7	ovidiu-florin, git-svn tries to strip bits off the url you giv eit	14:01
grawity	guzzlefry: that is, `git fetch <remote>` followed by `git reset --hard <remote>/<branch>`	14:01
	--hard discards changes, the default keeps them as "unstaged"	14:02
scrooge_mcduck	/assets/!.gitkeep doesn't work :/ neither /assets/**/!.gitkeep	14:02
	← skorgon left	14:02
	→ skorgon joined	14:02
	→ sniptras joined	14:02
guzzlefry	grawity: Will that kill my IDE files? They're in .gitignore, so I'm guessing they'd be safe.	14:03
	→ beneggett joined	14:03
grawity	it'll only overwrite tracked files with their commited copies	14:03
guzzlefry	ok, thanks	14:03
	← devoldmx left	14:04
	→ tokik joined	14:04
	← mennea left	14:04
Palsson	Can anyone help me with this problem ? http://paste.ubuntu.com/7895188/ .	14:04
	I don't know how to do the fixup part	14:05
	← hkon__ left	14:05
	→ hkon_ joined	14:06
	← sohail left	14:06
	→ arup_r joined	14:07
	→ rolledback joined	14:07
	→ mennea joined	14:07
	→ rypeck joined	14:07
	→ sohail joined	14:08
	← arup_r left	14:08
	← aarkerio left	14:08
	← beautifulmind left	14:09
	→ arup_r joined	14:09
	→ devoldmx joined	14:09
	→ MblKiTA joined	14:10
	← hkon_ left	14:10
	→ alezandro joined	14:11
	← rob_w left	14:11
	← rolledback left	14:13
	← FortySix2 left	14:13
	← fstd left	14:13
	← freezevee left	14:13
	→ fstd joined	14:13
	← arup_r left	14:13
	→ rolledback joined	14:13
	→ FortySix2 joined	14:13
	→ freezevee joined	14:14
	← FortySix2 left	14:16
	→ FortySix_ joined	14:16
	← mlechner left	14:16
	← HumanSky left	14:16
	← stealthii left	14:17
	← whaley left	14:17
	← frobware left	14:17
	→ nkouevda joined	14:17
	← tvw left	14:17
	← xobb left	14:17
	← robbyoconnor left	14:17
	← rudi_s left	14:18
	← EvanDotPro left	14:18
	→ robbyoconnor joined	14:18
	→ EvanDotPro joined	14:18
	← nickpresta left	14:18
	← freezevee left	14:18
	← saidelike left	14:18
	← JPT left	14:18
	→ HumanSky joined	14:18
	← devoldmx left	14:18
	← nkouevda_ left	14:19
	← jumblemuddle left	14:19
	← PaulCapestany left	14:19
	← nomike left	14:19
	→ kpease joined	14:19
	→ DarsVaeda joined	14:19
	← mfilipe left	14:19
	→ mfilipe joined	14:19
	→ rudi_s joined	14:19
	→ kpease_ joined	14:19
	→ JPT joined	14:19
	→ devoldmx joined	14:19
	→ acharlieh joined	14:19
	→ mizu_no_oto joined	14:20
	→ whaley joined	14:20
	→ frobware joined	14:20
	→ saidelike joined	14:20
	→ jumblemuddle joined	14:20
	→ PaulCapestany joined	14:21
	→ stealthii joined	14:21
	← DarsVaeda left	14:21
	← hinogi left	14:21
	→ nonconvergent joined	14:21
ovidiu-florin	canton7: if I do something like: git svn clone http://svnserver/svn --trunk=TRUNK/my/subdir/ --branches=BRANCHES/	14:21
	→ astaves joined	14:22
ovidiu-florin	Will this work?	14:22
	→ kushal3 joined	14:22
	← kpease left	14:23
	→ xobb joined	14:23
	→ JohnBat26 joined	14:23
	→ tang^ joined	14:24
	→ starkhallo joined	14:25
	← tang^ left	14:25
	← thevishy left	14:25
	← Guest64170 left	14:25
	→ tang^ joined	14:25
Palsson	Can anyone help me with this problem ? http://paste.ubuntu.com/7895188/ .	14:26
	I don't know how to do the fixup part	14:26
	→ ojacobson joined	14:27
	→ pat__ joined	14:27
	← pat__ left	14:27
	← FortySix_ left	14:27
tang^	that list is detailed enough that you should be able to do the fixup part automatically	14:28
	→ FortySix2 joined	14:28
	← FortySix2 left	14:28
	→ hcc23 joined	14:29
	→ FortySix2 joined	14:29
tang^	Palsson: when you do the interactive rebase, you are shown how to do the fixup part	14:29
	→ pat__ joined	14:29
	← pat__ left	14:29
Palsson	tang^: i get this http://paste.ubuntu.com/7895203/	14:29
	tang^: I don't know where to set the commands	14:30
	→ EminenceHC joined	14:30
	← darkxploit left	14:30
tang^	err, okay maybe not	14:31
	→ dogeydogey joined	14:31
tang^	you may need to widen your rebase -i to actually include commits	14:31
	← lsiv568 left	14:31
	→ lsiv568 joined	14:32
	→ pat__ joined	14:32
	← pat__ left	14:32
	← wlemuel left	14:32
	← darkbasic left	14:33
	→ treehug88 joined	14:33
	→ darkbasic joined	14:33
	→ dharrigan joined	14:33
	→ vtunka joined	14:34
	← wild_oscar left	14:34
	← sohail left	14:35
	← zoso left	14:35
	→ davispuh joined	14:35
	← Gonzo89 left	14:35
	← lsiv568 left	14:36
	← jophish left	14:36
	← kevinb left	14:37
	← KevinTS left	14:37
	← devoldmx left	14:38
	→ sohail joined	14:38
	← anEffingChamp left	14:38
	→ kevinb joined	14:39
	→ jophish joined	14:39
	→ shinnya joined	14:40
	← Palsson left	14:40
	→ punchagan joined	14:41
	→ jaspertheghost_ joined	14:41
	← nonconvergent left	14:41
	→ nonconvergent joined	14:41
	← jaspertheghost left	14:42
	← ws2k3 left	14:42
	→ devoldmx joined	14:42
	→ Sijdesign joined	14:43
	→ freestyl3r joined	14:43
	← bezet left	14:44
	→ sonicparke\|bradm joined	14:44
	jaspertheghost_ → jaspertheghost	14:44
	→ bezet joined	14:45
	← Arkaniad left	14:45
	← Nizumzen left	14:45
	← nonconvergent left	14:46
	← BradND left	14:46
	← rolledback left	14:46
	← diegoviola left	14:46
	→ BradND joined	14:46
	← ehmatthes left	14:46
	← BradND left	14:47
	← Sceorem left	14:47
	← bgerber left	14:48
	→ ws2k3 joined	14:48
	→ morphix0 joined	14:48
	← jaspertheghost left	14:49
	← Sleepy63_ left	14:49
	→ btree joined	14:49
	← btree left	14:49
	→ btree joined	14:49
	spyroboy_ → spyroboy	14:49
	→ jaspertheghost joined	14:50
canton7	ovidiu-florin, depends. in svn, do you really branch TRUNK/my/subdir/somefolder to BRANCHES/somefolder ?	14:50
	← darkbasic left	14:50
	→ darkbasic joined	14:51
	← morphix0 left	14:51
	← skylite left	14:52
	→ matelot joined	14:52
	← btree_ left	14:52
cannonball	Hey, I just wanted to make sure of something. If I do 'git push --set-upstream my_repo branchname', does it only set my_repo:branchname for the current branch I have checked out (same as "branchname") ? Or does it set it for the entire "my_repo"?	14:52
canton7	upstream config is per-branch	14:53
	← jackh left	14:53
cannonball	many thanks	14:53
canton7	--set-upstream and --set-upstream-to act on one branch	14:53
	← devoldmx left	14:53
	→ bgerber joined	14:54
	← matelot left	14:54
	→ matelot joined	14:55
	→ the_cybersphinx joined	14:55
	→ devoldmx joined	14:55
matelot	I just did a FETCH from BBucket repo, how to find out what files were changed ?	14:55
ojacobson	None were changed, fetch updates the repository but not the work tree	14:56
canton7	so things like origin/master will have been updated	14:56
	that's all	14:56
	→ akim joined	14:56
	→ doev joined	14:58
	→ epifanio joined	14:58
matelot	So so local master is updated from the remote repo ....I need to find out what chages were made between my first clone (I did nothing after the clone) and this fetch	14:58
	→ a_le joined	14:58
	→ toedwy joined	14:59
	Orphis_ → Orphis	14:59
canton7	matelot, your local master hasn't been updated yet	14:59
	so 'git diff master origin/master' would show the difference between local master and remote master	14:59
	→ Arkaniad joined	14:59
	→ Panicky joined	15:00
	→ thiago joined	15:00
matelot	canton, so what happened exactly here http://screencast.com/t/Q7C59iv0	15:00
	← Sijdesign left	15:01
matelot	This is from SmartGit	15:01
canton7	like I said, things like origin/master and origin/foo were updated	15:01
	→ kballou joined	15:01
	← israelpattison left	15:01
	← Silmarilion left	15:01
canton7	those are !remote_tracking_branches	15:01
	→ ascarter joined	15:01
canton7	!rtb	15:01
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	15:01
	← Arkaniad left	15:01
	→ israelpattison joined	15:02
canton7	I suggest reading !book	15:02
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	15:02
	← calculon left	15:02
	← kpease_ left	15:02
	→ kpease joined	15:02
	→ Arkaniad joined	15:02
	← mennea left	15:02
matelot	canton7 thanks for the command	15:03
	→ Sleepy63_ joined	15:03
	← a_le left	15:04
	→ devoldmx_ joined	15:04
	→ lite_ joined	15:04
matelot	Yes I'm currently reading Pro Git	15:04
	← Arkaniad left	15:04
	← hoschi left	15:04
	← _tpavel left	15:05
	← _W_ left	15:05
	→ _Vi joined	15:05
	← plitzenberger left	15:05
	→ Arkaniad joined	15:05
	← marcidy left	15:05
	← lb1a left	15:06
	← MickeyO left	15:07
	← cbreak-work left	15:07
	← hebz0rl left	15:07
	→ marcidy joined	15:07
	← Arkaniad left	15:08
matelot	canton7, so now how to get changes into my repo ?	15:08
	← lite_ left	15:08
canton7	matelot, merge them in	15:08
	git merge origin/master	15:08
	← Tuna-Fish left	15:08
canton7	(make sure you master checked out first)	15:08
	← robinsmidsrod left	15:08
	← Macaveli left	15:08
	→ hoschi joined	15:08
	→ Arkaniad joined	15:09
	→ robinsmidsrod joined	15:09
	← treehug88 left	15:09
	→ ssarah joined	15:10
	← devoldmx left	15:10
	→ devoldmx joined	15:10
ssarah	hey guys, why do i do push origin branch ?	15:10
	shouldnt it be the other way around?	15:10
	← marcidy left	15:10
	→ marcidy joined	15:10
	← Arkaniad left	15:10
	← FilipNortic left	15:10
ssarah	(i've checked out the branch to work on)	15:10
	← devoldmx_ left	15:11
canton7	the syntax is 'git push <remotename> <branchname>'	15:11
	→ devoldmx3 joined	15:11
canton7	'git push <remotename> <branchname> [<branchname>, [<branchname>, [...]]]' even - you can specify multiple branches	15:11
	ack, and ignore the commas :P	15:11
	→ Arkaniad joined	15:12
	← nekyian_ left	15:12
	← beneggett left	15:12
ssarah	i get it. but i still think it would make more sense the other way around	15:13
canton7	git push master develop origin?	15:13
	no thanks	15:13
	→ freezevee joined	15:13
ssarah	yeh, look "git push that that that into that"	15:13
	"git push into that, that that that that"	15:14
	no one speaks like that	15:14
canton7	nah, the command-line convention is that repeating things go at the end, and that more important or significant things come first :P	15:14
ssarah	i'm saying too many thats	15:14
	damn conventions	15:14
grawity	canton7: it's sad how `mv` and `cp` break this convention :D	15:14
canton7	it's true :P	15:15
	← scrooge_mcduck left	15:15
ssarah	yeh! yei mv and cp	15:15
canton7	well, I'd argue that 'from' was more important than 'to' in mv and cp :P	15:15
	→ nickpresta joined	15:15
	→ freezeve_ joined	15:16
	← ThomasLocke left	15:16
ssarah	oh, i got another question, im doing push origin branch. but im working on a branch. so could i do: push branch branch (them being the same name) instead?	15:17
	→ tummy joined	15:17
osse	no	15:17
ssarah	reason?	15:17
	← freezevee left	15:18
osse	you'll get an error	15:19
	→ Tuna-Fish joined	15:19
canton7	so 'git push origin branch' will push 'branch' to a remote branch called 'branch'	15:19
	i.e. it's 'git push origin branch:branch'	15:19
	← LeMike left	15:19
	← devoldmx left	15:20
	→ lsiv568 joined	15:20
	→ joelm joined	15:20
	← papegaaij left	15:22
	← Tuna-Fish left	15:22
	← Gamecubic left	15:23
	→ Gamecubic joined	15:23
	← lsiv568 left	15:24
	→ lsiv568 joined	15:24
	→ bhearsum joined	15:24
	gitinfo set mode: +v	15:26
bhearsum	is it possible to have a non-remote upstream? ie, so things like "git diff @{u}..." work	15:26
	← lsiv568 left	15:26
grawity	sure	15:26
bhearsum	oh, huh	15:26
	← freestyl3r left	15:26
bhearsum	"git branch -u $branch" just works	15:26
	i could've sworn that didn't work yesterday...	15:26
	→ lsiv568 joined	15:26
	bhearsum shakes his head, moves on	15:27
bhearsum	thanks :)	15:27
	← przemkovv left	15:27
	← Balliad left	15:27
	→ teran joined	15:27
	← psoo_ left	15:27
	← sdrfnord1 left	15:28
	← ISmithers left	15:28
	→ programmarchy joined	15:29
	← diminoten left	15:29
	→ diminoten joined	15:29
	→ eletuchy joined	15:29
	← bhearsum left	15:30
	← ErKa left	15:30
	→ bdavenport joined	15:30
	← lsiv568 left	15:31
	→ treehug88 joined	15:31
	← vtunka left	15:31
	→ zumba_addict joined	15:31
	→ lsiv568 joined	15:32
	← gua_ould left	15:33
	→ Tuna-Fish joined	15:33
	← listochkin left	15:33
	← seschwar left	15:33
	← Tuna-Fish left	15:33
	← eletuchy left	15:34
	← Reskp left	15:34
	→ esclear joined	15:35
	→ tyreld joined	15:35
	← lsiv568 left	15:35
	→ beneggett joined	15:36
	← beneggett left	15:36
	→ lsiv568 joined	15:36
	← Arkaniad left	15:36
	→ m0viefreak joined	15:37
	→ joelrobichaud joined	15:37
	→ beneggett joined	15:37
	← beneggett left	15:38
	→ rolledback joined	15:38
	← lsiv568 left	15:38
	→ lsiv568 joined	15:38
	→ beneggett joined	15:39
	→ drjeats joined	15:39
	← programmarchy left	15:39
qsuscs	!next	15:39
gitinfo	Another satisfied customer. NEXT!	15:39
	← shingshang left	15:39
qsuscs	oh, i’m a bit slow, ain’t i?	15:40
	→ fstd_ joined	15:40
	← lsiv568 left	15:40
	→ Arkaniad joined	15:40
	→ lsiv568 joined	15:41
	← ORiON-- left	15:41
	→ tranzfuse joined	15:41
	← autrilla left	15:41
	← lsiv568 left	15:42
	→ lsiv568_ joined	15:42
	→ RawProduce joined	15:42
RawProduce	hi	15:42
	→ programmarchy joined	15:43
qsuscs	RawProduce: !welcome	15:43
gitinfo	RawProduce: Welcome to #git, a place full of helpful gits. If you have a question, feel free to just go ahead and ask—somebody should answer shortly. For more info on this channel, see http://jk.gs/git/ Take backups (type !backup to learn how) before taking advice.	15:43
	→ ORiON-- joined	15:43
	→ mspe joined	15:43
	→ ErKa joined	15:43
	← ghostlines left	15:43
	← fstd left	15:44
	fstd_ → fstd	15:44
	← lsiv568_ left	15:44
	← jophish left	15:44
	→ micechal_ joined	15:44
	→ freestyl3r joined	15:44
	→ Tuna-Fish joined	15:44
RawProduce	I'm trying to undo a merge (commit 2d7f5fdd770ee13e1e7d002c063d605cfb103f4d, Merge: 7a270d0 8b17c3f	15:46
	with git reset --hard [previous revision]	15:46
	it doesn't seem to be modifying any files	15:47
	is the "Merge: 7a270d0 8b17c3f" in the git log for the merge commit relevant here?	15:47
osse	it contains the SHA you need to reset to	15:47
	which is 7a270d0	15:47
RawProduce	what's the second SHA about?	15:48
	→ Sceorem joined	15:48
	← mishok13 left	15:48
osse	RawProduce: it's the SHA of the branch you merged in	15:48
RawProduce	ahhh	15:48
	thanks, osse	15:48
	← mspe left	15:48
	← martinklepsch left	15:49
	→ zapb joined	15:49
RawProduce	"git reset --hard 7a270d0" didn't seem to undo the changes in the merge either	15:49
osse	how do you know?	15:49
RawProduce	because I'm checking a particular file for changes	15:49
osse	do you know it changed?	15:49
RawProduce	I'll verify...	15:50
osse	if git rev-parse HEAD says 7a270d0 and git status says things are clean everything is all right	15:50
	← halis left	15:51
osse	you can git diff 7a270d0 2d7f5fd -- <file> to check how that file changed due to the merge	15:51
	← Xethron left	15:51
	← kermit left	15:52
	→ przemkovv joined	15:52
	← Ankhers left	15:53
	← beneggett left	15:53
	← jnavila left	15:54
RawProduce	thanks	15:54
	← goTAN left	15:54
	→ kristofers joined	15:55
	→ hebz0rl joined	15:55
	→ plitzenberger joined	15:55
thiago	RawProduce: most likely, the git command worked and your expectation is off	15:56
	→ beneggett joined	15:56
RawProduce	thiago: that's what I figured too	15:56
	→ Xethron joined	15:56
	→ mspe joined	15:57
	→ Ankhers joined	15:58
	← nkouevda left	15:58
	→ maveneagle joined	15:59
	← maveneagle left	15:59
	→ DeathIncarnate joined	15:59
	→ BBBThunda joined	16:00
	← Junior left	16:00
	← Arkaniad left	16:00
	→ lsiv568 joined	16:01
	← kristofers left	16:01
	→ aartist joined	16:01
	→ kristofers joined	16:01
	→ kriks joined	16:01
	→ verodeb joined	16:01
	← Gamecubic left	16:01
	← nour left	16:02
	→ Arkaniad joined	16:03
	gitinfo set mode: +v	16:03
verodeb	can make a git stash then a git pull	16:03
	what happens if i do a git stash apply?	16:03
	→ kermit joined	16:03
thiago	it will apply the stash	16:03
	→ hj2014 joined	16:04
verodeb	is it going to merge?	16:04
	dkn64738 → dkn64738_afk	16:04
thiago	no	16:04
	well, yes, it will try to merge the files	16:04
	but no, it will not create a merge commit	16:04
	so, "yes and no" :-)	16:04
verodeb	but if its going to merge	16:04
	what if there conflicts?	16:05
	*there is conflicts	16:05
	← Tuna-Fish left	16:05
osse	verodeb: git stash won't do anything different from what it would do if you ran it in any other circumstance	16:05
	← c74d left	16:05
verodeb	osse: it will merge and will notice conflicts right?=	16:05
Vampire0	verodeb, if there are conflicts those file are in conflicted state and you can resolve the conflict as usual	16:05
	→ Kicer86 joined	16:05
osse	essentially it will try to apply a patch, and if it fails it will leave conflict markers. that's it.	16:06
	← KWhat_Work left	16:06
verodeb	ok nice	16:06
	ty	16:06
	→ eletuchy joined	16:06
	→ hkon_ joined	16:06
	→ jay___ joined	16:07
	→ c74d joined	16:08
	← MblKiTA left	16:10
	← tokik left	16:10
	→ MblKiTA joined	16:10
	← eletuchy left	16:11
	← hkon_ left	16:11
	→ brownbathrobe joined	16:11
	← heroux left	16:11
	← Wiz_KeeD left	16:11
	→ heroux joined	16:11
	→ OffTheRails joined	16:12
	→ pweaver_ joined	16:12
	← lsiv568 left	16:12
	← programmarchy left	16:13
	→ lsiv568 joined	16:13
	← ferreum left	16:13
	← zapb left	16:13
	→ User458764 joined	16:14
	→ ehmatthes joined	16:15
	← DeathIncarnate left	16:15
	← brownbathrobe left	16:16
	→ Tuna-Fish joined	16:16
	← User458764 left	16:16
	→ akushner joined	16:16
	← Arkaniad left	16:17
	← lsiv568 left	16:17
	← Xethron left	16:18
	← matelot left	16:18
	→ lite_ joined	16:19
	→ Xethron joined	16:19
	← mizu_no_oto left	16:20
	← plitzenberger left	16:21
RawProduce	thanks for all the help guys - problem was that the previous developers have a terrible deployment process	16:21
	→ lsiv568 joined	16:21
	← JDHawke left	16:21
	→ pbrobst joined	16:22
	→ DeathIncarnate joined	16:22
	← godgodgodgo left	16:23
	← lite_ left	16:23
	← W0rmDr1nk left	16:24
	→ stodan joined	16:26
	← freimatz left	16:26
	→ zapb joined	16:27
	→ Junior joined	16:27
	← shinnya left	16:27
	← jargon left	16:28
	← rolledback left	16:28
	→ Arkaniad joined	16:28
	← lsiv568 left	16:29
	→ smw joined	16:29
	→ lsiv568 joined	16:29
	→ rolledback joined	16:29
	← thiago left	16:29
	→ pandeiro` joined	16:30
	→ luc_ joined	16:31
	← Arkaniad left	16:34
	← lsiv568 left	16:34
	← mikecmpbll left	16:34
	→ Nizumzen joined	16:35
	← robbyoconnor left	16:35
	→ berzerka joined	16:35
	← Droolio left	16:35
SamB	hmm, does git have a boolean type ...	16:36
	← pweaver_ left	16:36
berzerka	hi. if i, on github, issue a pull request from my master, will successive commits to my master branch automatically be included in that pull request? is that why i should use a feature branch to isolate commits, even for trivial changes?	16:36
osse	berzerka: yes, if you push them to github	16:36
	berzerka: a pull request is branch-to-branch	16:36
	← beneggett left	16:37
berzerka	osse: so if i have two very trivial changes and i want upstream to be able to pick one, the other or both, i should put both on feature branches even though it might be only one changed line, right?	16:37
	→ lsiv568 joined	16:37
	→ LeMike joined	16:37
	← exelan left	16:38
	← lsiv568 left	16:38
	→ beneggett joined	16:38
	← pandeiro` left	16:38
	← pandeiro left	16:38
	→ mikecmpbll joined	16:38
osse	then you have to create three pull requests	16:38
	→ lsiv568 joined	16:38
osse	I would include both in one pull request and then wait for comments	16:38
	← EdwardIII left	16:39
	← rolledback left	16:39
	→ Ritzton joined	16:39
berzerka	osse: ok.. but a commit which was once made to a branch is not easily reverted, so if they chosse to pick only the one commit, how would i proceed then?	16:39
osse	berzerka: push --force	16:40
	← hoschi left	16:40
berzerka	osse: could you elaborate?	16:40
osse	berzerka: you need to remove the other commit from your branch and then push the result up. this requires push --force since you're rewriting history	16:41
	→ ehynds joined	16:41
berzerka	osse: i would do that with --amend?	16:41
osse	berzerka: rebase -i	16:41
	or git reset --hard, depending on the situation	16:42
	→ FatDarrel joined	16:42
berzerka	osse: i see, thank you very much. still, creating a feature branch seems to be the more cleaner, intended way of doing it?	16:42
	← pmurias left	16:43
	← lsiv568 left	16:43
berzerka	osse: or is what you describe standard practice?	16:43
	← FortySix2 left	16:43
	→ FortySix2 joined	16:43
	→ rolledback joined	16:43
osse	berzerka: if you want the other guys to easily pick between one, the other or both commits then you need three feature branches	16:44
	→ programmarchy joined	16:44
	→ zuzytel joined	16:44
	← Not_Whatever left	16:44
	← programmarchy left	16:45
osse	AFAIK doing lots of rewriting (reset --hard, commit --amend, rebase -i, etc.) and push --force that up to github seems to me to be relatively normal, in order to make a pull request juuust right	16:45
	→ CognitivePuppy joined	16:45
	← zuzytel left	16:45
	→ zuzytel joined	16:45
	→ beastd joined	16:45
berzerka	osse: hmm.. why can't i just offer the two single branches as branched-off master and they apply both changesets if they want to?	16:46
	← HumanSky left	16:46
	→ halis joined	16:46
	→ HumanSky joined	16:46
osse	berzerka: ah, you could do that I suppse	16:46
	→ Chiftin joined	16:47
	← epifanio left	16:47
berzerka	osse: serious question however, i'm still having a hard time getting into these concepts..	16:47
	→ dreiss joined	16:47
	→ devbug joined	16:47
osse	berzerka: but note that 'master' and 'feature' are fundamentally equal. It doesn't really matter if you offer someone to pull yuor master branch or your foobar branch. It's all the same.	16:48
	→ pweaver_ joined	16:48
	← achadwick left	16:48
berzerka	osse: ok then i will try the two-feature-branches variant on my next parallel contribution to the same upstream branch and see how it goes / what the devs have to say about it. thanks again!	16:48
	← mspe left	16:48
	← sahlberg left	16:49
	→ mspe joined	16:49
	← mspe left	16:49
	→ mspe joined	16:50
	ValekCOS → ValekCOS\|Out	16:50
	→ misterpink joined	16:52
	← berzerka left	16:52
	← Sonderblade left	16:52
	← ki0 left	16:52
	← B1x1t0 left	16:52
	← Hounddog left	16:52
	→ WaReZ joined	16:52
	→ robarelli joined	16:54
	→ eletuchy joined	16:54
	← rolledback left	16:55
	→ Arkaniad joined	16:55
	→ morphix0 joined	16:55
	← mspe left	16:57
	→ mspe joined	16:57
tang^	this is fun. I have a repo giving me stash/rebase grief... apparently it has two directories that differ only by case in the index	16:58
	→ lsiv568 joined	16:58
	← eletuchy left	16:58
	← lsiv568 left	16:58
	→ lsiv568 joined	16:59
osse	tang^: are you on Windows or OSX ?	16:59
	→ junaidnaseer2 joined	17:01
	← junaidnaseer2 left	17:01
	← mspe left	17:01
tang^	we're working on windows primarily, but one dir was created on Linux and "fixed" on Windows	17:02
	I thought OSX had a case-sensitive file system	17:02
	← lsiv568 left	17:02
osse	afaik it's case-insensitive but case-preserving, whatever that means	17:03
	← dreiss left	17:03
Nugget	it means you can name a file "Moo" or "moo" but you can't have both in the same directory.	17:03
osse	isn't that the same as Windows, then?	17:04
	→ lsiv568 joined	17:04
osse	or will Windows change Moo to moo when you're not looking?	17:04
Nugget	you can optionally install OS X as case-sensitive, but a lot of third-party apps will not expect it	17:04
	I have no idea how Windows does it	17:04
	← lsiv568 left	17:04
	→ maestrojed joined	17:05
	→ lsiv568 joined	17:05
	→ thiago joined	17:06
	← pbrobst left	17:06
	← CognitivePuppy left	17:06
tang^	no windows will preserve	17:06
	we changed this on purpose because we have some scripts that run on Linux that expected a specific case	17:07
	checked out on linux, removed the duplicate directory, commit and push	17:07
	→ sdrfnord1 joined	17:07
	← hahuang65 left	17:07
tang^	it was bugging a couple of devs because their stashes never seemed to let them rebase	17:07
	→ martinklepsch joined	17:08
	← lsiv568 left	17:09
	← OffTheRails left	17:10
	→ montchr joined	17:10
	→ JDHawke joined	17:10
	→ CognitivePuppy joined	17:10
	← nitrix left	17:10
	→ epifanio joined	17:11
	→ ferreum joined	17:11
	→ spacediver joined	17:11
	← Chiftin left	17:11
	→ lsiv568 joined	17:11
	← kaiza left	17:11
	← luc_ left	17:12
	← epta left	17:12
	← spacediver left	17:12
	→ spacediver joined	17:12
	gitinfo set mode: +v	17:12
	← CussBot left	17:12
	← montchr left	17:12
spacediver	hi folks	17:12
gitinfo	spacediver: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	17:12
	→ Chiftin joined	17:12
spacediver	why would following fail?	17:13
	git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' -- HEAD	17:13
	fatal: Needed a single revision	17:13
	← ropav left	17:13
	← SpartanWarrior_ left	17:13
canton7	'git show HEAD'?	17:13
	→ Quevin joined	17:13
spacediver	whoops. it's broken	17:14
	meanwhile, i have some	17:14
	rev like b3fde482a63095bd58739079be64b6e33d69005a	17:14
	← kriks left	17:14
	← whaley left	17:14
	→ pantsman_ joined	17:14
spacediver	git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' -- b3fde482a63095bd58739079be64b6e33d69005a	17:14
	← akushner left	17:14
spacediver	fails in the same way	17:14
	→ mspe joined	17:14
spacediver	but git-shows normally	17:14
	→ montchr joined	17:14
	→ akushner joined	17:14
	← Arkaniad left	17:14
canton7	I suspect you might have to filter-branch a branch, not a commit?	17:15
spacediver	the same error with eligible branch name (local, remote)	17:15
	git version 1.7.9.5	17:15
	→ rolledback joined	17:15
	← morphix0 left	17:16
	→ dreiss joined	17:16
	← CognitivePuppy left	17:16
spacediver	is it an error in command syntax or has something to do with concrete repo?	17:16
canton7	all of them fail with 'needed a single revision'?	17:17
spacediver	yep	17:17
	I've recreated a fresh repo, syntax is ok	17:17
	:(	17:17
	→ kaiza joined	17:18
	→ whaley joined	17:18
	→ Hounddog joined	17:18
canton7	give me the latest command you're trying?	17:18
	← Tuna-Fish left	17:19
	← Davey left	17:19
	→ Tuna-Fish joined	17:19
spacediver	git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' b3fde482a63095bd58739079be64b6e33d69005a	17:19
canton7	try creating a branch to that command	17:19
	and filter-branching that	17:20
spacediver	fatal: Not a valid object name: 'master'.	17:20
	that's what broken seemingly	17:20
canton7	'git show master'	17:20
	← amcsi_work left	17:20
spacediver	ok, thanks	17:21
	i worked on broken clone	17:21
	it seems to work at original clone	17:21
	thanks a lot!	17:21
	→ Sijdesign joined	17:21
canton7	haha ok? cool	17:21
spacediver	yep. ;)	17:21
	→ Davey joined	17:22
	← spacediver left	17:22
	→ LucasTT joined	17:22
	← Okaria left	17:22
	← SegFaultAX left	17:22
	→ SegFaultAX joined	17:23
	→ iamtakingiteasy joined	17:23
	← bluesm left	17:24
	← edude03 left	17:24
	→ B1x1t0 joined	17:24
	→ BSaboia joined	17:25
	← mjulian left	17:25
	← Guest18120 left	17:25
	← whitby left	17:25
	← jumblemuddle left	17:25
	→ mjulian joined	17:26
	← mjulian left	17:26
	→ mjulian joined	17:26
	→ Guest56146 joined	17:26
	← whaley left	17:26
	← mspe left	17:26
	← daveeloo left	17:26
	← ehmatthes left	17:26
	→ rezrov joined	17:26
	→ a_le joined	17:26
	→ epta joined	17:26
	→ mspe joined	17:26
	← tummy left	17:26
	→ tummy_ joined	17:26
	→ stamina joined	17:26
	← SamB left	17:27
	← philp left	17:27
	← rethus left	17:27
	← kaiza left	17:27
	← arrdem left	17:27
	← Mapley left	17:28
	→ daveeloo joined	17:28
	← gwb3 left	17:28
	→ gwb3 joined	17:28
	→ SamB joined	17:28
	← joelsmith left	17:28
SamB	oops	17:28
	→ philp joined	17:28
SamB	I meant to close #gmane, since that was empty ... stupid mouse ...	17:28
	→ thibaultcha joined	17:29
	→ amcsi_work joined	17:29
	→ Okaria joined	17:29
	← Tuna-Fish left	17:29
	← bevilaqua left	17:29
	← marcaddeo left	17:29
	→ whitby joined	17:29
	→ bevilaqua joined	17:29
	← Davey left	17:29
	→ edude03 joined	17:30
	→ whaley joined	17:30
OxBADA55	how do you fix the delete key not working?	17:30
bremner	and this is git related somehow?	17:30
SamB	OxBADA55: not working in what context?	17:30
	← thibaultcha left	17:30
	→ SpartanWarrior joined	17:30
	← sontek left	17:30
markmarkmark	don't use vi?	17:30
SamB	OxBADA55: is this related to the editor that git opens sometimes?	17:31
OxBADA55	when making a git patch interactively SamB bremner	17:31
	→ thibaultcha joined	17:31
SamB	in which case, there are a number of ways to instruct git to open your favorite editor	17:31
	→ jumblemuddle joined	17:31
SamB	such as setting VISUAL in your environment	17:31
	which should theoretically inform EVERYTHING about your favorite text editor	17:31
	→ lasserix joined	17:32
SamB	OxBADA55: does that sound good to you?	17:32
OxBADA55	it seems it has opened vi. delete works in vi. however, when git is in patch mode delete doesn't work	17:32
	← mspe left	17:32
OxBADA55	i have no problems with vi when not making a git patch	17:32
SamB	OxBADA55: exactly what command did you run?	17:32
OxBADA55	git add -i <file>	17:32
	→ morphix0 joined	17:33
OxBADA55	and went into making a patch	17:33
	i get a ^H on the screen when backspace is hit	17:33
	instead of entered keys being deleted	17:33
	← Fiouz left	17:33
	→ joelsmith joined	17:33
	→ kaiza joined	17:34
OxBADA55	http://i.imgur.com/KKLmqw9.png	17:34
	i'm assuming git has opened vi, as vi seems to be default and i probably don't have emacs installed. but what vi options is git using to cause this?	17:35
	→ mspe_ joined	17:35
	→ marcaddeo joined	17:35
	← Hounddog left	17:36
SamB	OxBADA55: you mean you typed "patch"?	17:36
	→ lucha joined	17:37
OxBADA55	SamB, no, but if it helps you, yes	17:37
	can get to patch through -i also	17:37
	← cbreak left	17:37
OxBADA55	but -p if that helps you	17:37
	← HumanSky left	17:37
	← xobb left	17:37
	→ cbreak joined	17:37
	SamB sighs and opens the picture ...	17:37
	→ freezevee joined	17:38
	→ Arkaniad joined	17:38
	← freezeve_ left	17:38
	← bezet left	17:38
OxBADA55	SamB, see the problem?	17:38
canton7	OxBADA55, tried hitting 'y <enter>'?	17:39
OxBADA55	canton7, i don't want y	17:39
	i want y deleted	17:39
	← martinklepsch left	17:39
canton7	backspace?	17:39
SamB	OxBADA55: what OS is this?	17:39
OxBADA55	SamB, OS X	17:39
	10.9	17:40
SamB	I suspected as much	17:40
OxBADA55	.4	17:40
	→ Tuna-Fish joined	17:40
SamB	I don't think it much matters which version you have	17:40
OxBADA55	canton7, the problem backspace doesn't work	17:40
	canton7, it makes the ^H	17:40
canton7	aha! I didn't read far enough up the scrollback	17:40
OxBADA55	canton7, no prob	17:40
	→ martinklepsch joined	17:40
	← stodan left	17:41
SamB	OxBADA55: backspace on TTY certainly does seem to work oddly there	17:41
OxBADA55	SamB, i don't know what the means, but ok	17:41
SamB	I blame their flagrant violation of Debian policy	17:41
OxBADA55	i do basically no customization, so these is the default behavior git has. seems like there should be a known fix for this	17:42
	← doev left	17:42
	→ Davey joined	17:42
	← Ankhers left	17:42
	→ jaequery joined	17:42
	→ arrdem joined	17:42
OxBADA55	SamB, lol, debian's policies are what everyone is required to follow?	17:43
SamB	I'm only half kidding	17:43
	→ xobb joined	17:43
	← pweaver_ left	17:43
OxBADA55	ok, if no one knows, i need better search terms	17:43
	"git delete key doesn't work" isn't getting me any answers	17:43
SamB	but, if they would have followed the same policy WRT backspace/delete on TTYs as Debian, I suspect that you would not be having this problem	17:44
	← Xethron left	17:44
	→ Pookz joined	17:44
SamB	OxBADA55: try "terminal delete key doesn't work mac" or something?	17:44
	or, well, "backspace"	17:44
	→ CussBot joined	17:44
SamB	OxBADA55: because that is really the backspace key no matter what label they print on it ;-P	17:45
OxBADA55	right	17:45
	1 step closer... terminal actually has a setting for this	17:45
tang^	it is backspace... use the fn key to make it a forward-backspace	17:45
OxBADA55	the problem is, there is some other software that required terminal to send ctrl+H	17:45
	← intellix left	17:45
OxBADA55	so git's requirements are conflicting with some other software i can't rememer what it is right now	17:46
	i'll find out soon though. b/c i just turned off the ctrl+H option	17:46
SamB	OxBADA55: yeah, I think the terminal device may be misconfigured	17:46
	→ arachnocrat joined	17:46
OxBADA55	i may end up using delete instead of backspace with git	17:46
	← atamanroman left	17:47
	← jaequery left	17:47
	← lucha left	17:47
	← _Vi left	17:47
	← a_le left	17:50
	← hyperair left	17:50
	→ lucha joined	17:53
	← Ritzton left	17:53
	→ pweaver_ joined	17:55
	→ hkon_ joined	17:55
	← toedwy left	17:55
	→ eletuchy joined	17:55
osse	i blame perl	17:55
	→ hahuang65 joined	17:56
	→ pothibo joined	17:56
	← DeathIncarnate left	17:56
OxBADA55	osse, sounds probable. I forgot I think I saw patch runs in perl	17:56
	← jfelchner left	17:56
	← Nizumzen left	17:57
	← drjeats left	17:57
	→ pags joined	17:57
pags	i want to create a complete copy (commit history, all branches, etc) of a repo to a new remote location. how is this done? i was thinking --mirror but not clear on whether that creates some sort of link between the original repo and the new one	17:58
	i don't want them to be linked after the fact in any way what so ever	17:58
	← eletuchy left	17:59
	← hkon_ left	17:59
	← hebz0rl left	17:59
	→ m8 joined	18:00
	→ hebz0rl joined	18:00
	→ a_le joined	18:00
	← mspe_ left	18:00
	→ mspe joined	18:01
	← VictorBjelkholm left	18:01
	← Quevin left	18:01
	→ upene joined	18:03
	→ mspe_ joined	18:04
	→ kriks joined	18:04
	→ jophish joined	18:04
	← kermit left	18:05
	← upene left	18:05
	← mspe left	18:05
	→ upene joined	18:05
	← FortySix2 left	18:05
	← stamina left	18:05
	→ FortySix2 joined	18:06
	← FortySix2 left	18:06
	→ FortySix2 joined	18:07
	→ hebz0rl_ joined	18:07
	← a_le left	18:08
	→ certainstrings joined	18:08
	← vurma left	18:09
	← hebz0rl left	18:09
	→ hebz0rl__ joined	18:09
	← martinklepsch left	18:10
	← dreiss left	18:12
	← hebz0rl_ left	18:12
osse	OxBADA55: git add -i (and -p (and git checkout/reset -p)) is a perl script	18:13
tobiasvl	pags: what's wrong with just cloning and removing the remote afterwards?	18:13
	← glebihan left	18:14
	→ thevishy joined	18:14
	← FortySix2 left	18:14
	← lsiv568 left	18:14
pags	tobiasvl: i don't know, i'm pretty noob with git.	18:14
	→ lsiv568 joined	18:15
	→ FortySix2 joined	18:15
osse	pags: there is no "link" in the sense that one repo relies on another	18:15
	--mirror will work just fine	18:15
cbreak	osse: normally there's not :)	18:15
	← FortySix2 left	18:15
	→ lite_ joined	18:15
	→ FortySix2 joined	18:15
osse	whether you push from foo to bar, or clone/pull/fetch in bar from foo	18:15
cbreak	pags: be aware that with mirror you'll get a bare, so you'll have to clone again for a working dir	18:15
	without mirror you'll only get one local branch, you can create the rest yourself easily	18:15
	← CussBot left	18:16
pags	cbreak osse thanks ... it appears to have worked fine. i just wanted to be certain that if i started messing with my new copy, it wouldn't reflect on the original!	18:16
cbreak	the fetch spec will be different with mirror too, but if you delete the remote afterwards it won't matter	18:16
	pags: it won't reflect wether you remove the remote or not	18:16
osse	pags: git will never do that by itself	18:16
cbreak	pags: a clone is a fork is a separate repository	18:16
tobiasvl	pags: oh, if that's all you want to achieve, just make a clone (not --mirror)	18:16
	→ jas4711 joined	18:16
	← alexbligh1 left	18:17
tobiasvl	pags: nothing you do on your clone will reflect on the remote repo (the one you cloned from) unless you specifically "git push" there	18:17
	→ alexbligh1 joined	18:17
pags	tobiasvl that's what i thought, just wanted to be sure. remember how scary git is when you first start using it :)	18:17
tobiasvl	and removing the remote ("git remote rm origin", where origin is the default remote you cloned from) will make that very hard to do	18:17
	pags: I remember vividly ;)	18:18
cbreak	I remember git saving my ass.	18:18
	← lsiv568 left	18:19
	← ValicekB left	18:19
	→ livingstn joined	18:22
	← certainstrings left	18:23
	→ martinklepsch joined	18:23
	→ glebihan joined	18:23
Eugene	`git stash save ass`	18:24
	← Sauvin left	18:24
osse	git stash save grace	18:24
	→ gsingh93 joined	18:25
	→ ilam joined	18:25
	← jas4711 left	18:26
osse	git's saving grace is git stash save face	18:26
	→ phanimahesh joined	18:27
ilam	When I do git pull, I get a merge conflict and open up the individual files and remove the part / modify the part where it is conflicting using Sublime, is there a better tool where I can just make selections and do this quickly?	18:28
_ikke_	sure	18:29
	jmpp greets!	18:29
_ikke_	there are 3-way merge tools	18:29
	→ ValicekB joined	18:29
_ikke_	(git mergetool opens it when you have configured one)	18:29
jmpp	so, if i git reset --hard HEAD~1, the head commit is completely obliterated from the repo?	18:29
tobiasvl	jmpp: well, not in that instant	18:30
_ikke_	No, the commit is still there	18:30
jmpp	it's obliterated if I gc?	18:30
_ikke_	Not yet	18:30
jmpp	in other words, how can I get it back?	18:30
_ikke_	git reflog	18:30
	man git reflog	18:30
gitinfo	the git-reflog manpage is available at http://jk.gs/git-reflog.html	18:30
	← beneggett left	18:31
_ikke_	objects newer then 2 weeks will not be removed, and also not when still refered to via the reflog (which holds entries for 90 days)	18:31
	so you are good for around 3 months	18:31
	→ beneggett joined	18:31
jmpp	OKOK	18:31
	I see it there	18:31
	← devoldmx3 left	18:31
jmpp	not terribly important, I could easily recreate it	18:31
	→ devoldmx joined	18:31
	→ kermit joined	18:31
	→ lsiv568 joined	18:32
jmpp	but it'd still be cool to learn how to re-acquire it from the reflog	18:32
_ikke_	But good to know it's possible :-)	18:32
jmpp	absolutely!	18:32
_ikke_	Easiest is to just reset --hard to that commit again	18:32
	← devoldmx left	18:32
_ikke_	unless you made other commits after that	18:32
	→ devoldmx joined	18:32
	→ toedwy joined	18:32
jmpp	nope	18:32
	not yet	18:32
_ikke_	ok	18:32
	→ myndzi\ joined	18:33
jmpp	I just tried git reset --hard $sha1	18:33
	where sha1 is the sha next to the reset commit in the reflog	18:33
	← yacks left	18:33
_ikke_	right	18:33
	→ eldaryus joined	18:33
jmpp	but I think that's not the right sha1	18:33
	← sohail left	18:33
	→ CussBot joined	18:33
jmpp	that's the sha1 of the reset operation, apparently	18:34
_ikke_	Yeah, you want the one before that	18:34
jmpp	the commit I nuked seems to be below	18:34
	← whaley left	18:34
	← Okaria left	18:34
	← Guest56146 left	18:34
jmpp	so, did I just break anythign with that reset I just did?	18:34
_ikke_	No	18:34
	← jumblemuddle left	18:34
	← SirCmpwn left	18:34
jmpp	no-op?	18:34
	← rezrov left	18:35
	← mjulian left	18:35
	← philp left	18:35
	← joelsmith left	18:35
	← kaiza left	18:35
	→ mjulian joined	18:35
_ikke_	Yea	18:35
	→ sohail joined	18:35
	← sohail left	18:35
	→ sohail joined	18:35
jmpp	great, thanks! ;)	18:35
	← whitby left	18:35
jmpp	repo back in shape, reflog now in my toolbox! ;)	18:35
	← binaryhat left	18:35
eldaryus	Hi, I added a thirdparty component into a repo subdirectory via subtree merging, then did my own changes in this subdir. Now I want to merge the changes from upstream into my subdir, but when I do 'git pull -s subtree upstream_branch', my local changes get overwritten. Am I doing something wrong?	18:35
	→ rezrov joined	18:35
	← tgies left	18:35
	← forgot left	18:36
	→ paul424 joined	18:36
_ikke_	jmpp: Note that you can also refer to reflog entries using HEAD@{n} where n is the entry index	18:36
	→ binaryhat joined	18:36
	→ jumblemuddle joined	18:36
jmpp	yeah, shows in the output	18:36
	→ whaley joined	18:36
_ikke_	So if you do git reset --hard HEAD~, you can undo that by using git reset --hard HEAD@{1}	18:36
	← marcaddeo left	18:36
	← halis left	18:36
jmpp	so if head0 was the reset operation, I could have reset to head1?	18:37
	← camt left	18:37
	→ philp joined	18:37
_ikke_	HEAD@{1}	18:37
jmpp	right, right	18:37
	→ forgot joined	18:37
	← bevilaqua left	18:37
jmpp	well, yeah, minus that sintax, which I find a pain to write :P	18:37
	→ Zamerick joined	18:37
	← scorphus left	18:37
_ikke_	newer versions allow @{1}	18:37
	← epta left	18:37
	→ camt joined	18:37
	→ HumanSky joined	18:37
	← ErKa left	18:37
jmpp	e.g. don't understand why it simply isn't HEAD@N	18:38
	← Naive left	18:38
osse	Git 3 will also understand HEAD☢1	18:38
jmpp	I understand not using head, as opposed to HEAD, as that might introduce confusion...	18:38
	git 3? wow, 2.0 is just fresh out of the oven! :P	18:38
	← Davey left	18:38
_ikke_	jmpp: He's not being serious	18:39
jmpp	:P	18:39
_ikke_	osse: what character was that? It shows as a box here	18:39
bernalex	so when I git send-email, and that fails in some way, how can I send that failed patch-thingy?	18:39
jmpp	so, seriously, what's the need for the {} cage?	18:39
	smily face, or something	18:39
_ikke_	jmpp: I guess consistency	18:39
	← hypnosb left	18:39
bernalex	if I annotate my patches with messages, and it fails because e.g. I wrote the wrong password, I don't want to lose my annotations.	18:39
osse	_ikke_, jmpp: http://www.fileformat.info/info/unicode/char/2622/index.htm	18:40
	→ Guest44231 joined	18:40
_ikke_	radioactive sign	18:40
	→ whitby joined	18:40
jmpp	_ikke_: well, can't say anything against that, I just ranted over twitter about lack of consistency!	18:40
_ikke_	wahaha :D	18:40
	→ kaiza joined	18:40
_ikke_	see man gitrevisions	18:40
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	18:40
	→ jfelchner joined	18:40
jmpp	https://twitter.com/jmp_imaginarium/status/494182316995256320 https://twitter.com/jmp_imaginarium/status/494183179377709056	18:40
	→ Davey joined	18:41
	← B1x1t0 left	18:41
	→ hypnosb joined	18:41
	← pags left	18:41
_ikke_	jmpp: you can also do HEAD@{yesterday) for example	18:41
	→ Okaria joined	18:41
_ikke_	or	18:41
	HEAD@{2 days ago}	18:42
osse	I can't immediately see a reason why Git shouldn't interpret HEAD@n as HEAD@{n} if n is a number	18:42
	→ pandeiro joined	18:42
osse	(and only a number)	18:42
_ikke_	Yeah, that could be added	18:42
	→ Ragnor joined	18:43
	→ NaiveFrost joined	18:43
	→ joelsmith joined	18:43
jmpp	it would really aid in avoiding the annoying syntax	18:43
osse	but string comparisons and matching and all that is so painful in C that I sure as hell won't do it	18:43
	→ tgies joined	18:43
	→ CKyle joined	18:43
	→ SirCmpwn joined	18:43
	← lsiv568 left	18:43
osse	if (++cp = '{' && cp+1 > 74 && cp+1 < 95) { etc. etc. etc.	18:44
	bleeeh	18:44
jmpp	_ikke_: you can really write HEAD@{yesterday}? that literall string?	18:44
_ikke_	jmpp: yeah	18:44
jmpp	how's that interpreted?	18:44
Hello71	man gitrevisions	18:44
gitinfo	the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	18:44
	→ scorphus joined	18:44
	→ lsiv568 joined	18:44
Hello71	this is the second time	18:44
osse	jmpp: it looks in the reflog for the newest entry that was before midnight	18:44
	→ jluc_ joined	18:45
jmpp	what does "yesterday" mean? you'll surely have many commits yesterday, the last one?	18:45
	okok	18:45
	so it's kinda risky	18:45
	← scorphus left	18:45
	→ scorphus joined	18:45
jmpp	well, if you're doing a dangeours operation like reset in the first place	18:45
canton7	useful for something like 'git log'	18:45
jmpp	of course	18:45
	true, true	18:45
_ikke_	note that it's reflog dates, not commit dates	18:45
	← jluc left	18:45
	← gfixler left	18:46
	← Tuna-Fish left	18:46
	→ devoldmx3 joined	18:46
	→ bevilaqua joined	18:46
	→ epta joined	18:47
	← devoldmx left	18:47
	→ sq-one joined	18:48
	jmpp hadn't noticed	18:48
_ikke_	The man page mentions that	18:48
	← lsiv568 left	18:48
	← edude03 left	18:49
	← nezZario left	18:49
	← CussBot left	18:50
	→ studmuf joined	18:50
	← kpease left	18:51
	← sniptras left	18:51
	← devoldmx3 left	18:51
	→ devoldmx joined	18:51
	→ edude03 joined	18:52
	→ kpease joined	18:52
	→ DeathIncarnate joined	18:53
	← whaley left	18:53
	← Junior left	18:54
jmpp	_ikke_: haven't had time to read it just yet ;(	18:54
	← zuzytel left	18:54
	→ zuzytel joined	18:54
_ikke_	That's why I tell it here :P	18:54
	← Guest44231 left	18:54
	← jumblemuddle left	18:55
	→ darkxploit joined	18:55
osse	I don't think I've ever used @{fancy date} for anything useful	18:55
	← brainproxy left	18:55
	→ mennea joined	18:55
	← epta left	18:55
_ikke_	Mostly for git log	18:55
	← SpartanWarrior left	18:55
	→ eletuchy joined	18:56
	← Uhrzeitlich left	18:56
	→ CussBot joined	18:56
osse	it would be nice if there was something similar for commit dates. I always screw up those --since and --until things	18:56
	→ nezZario joined	18:57
	→ jumblemuddle joined	18:57
	→ whaley joined	18:57
	→ Uhrzeitlich joined	18:57
	→ Tuna-Fish joined	18:57
	→ brainproxy joined	18:57
	→ nitrix- joined	18:57
	→ SpartanWarrior joined	18:57
	← FatDarrel left	18:58
	← SpartanWarrior left	18:58
	← DeathIncarnate left	18:58
	→ SpartanWarrior joined	18:58
	→ epta joined	18:58
	→ robbyoconnor joined	18:59
	→ FatDarrel joined	18:59
	→ Nizumzen joined	18:59
	← hockey567 left	18:59
	← eletuchy left	19:00
	→ plitzenberger joined	19:00
	→ hockey567 joined	19:01
	← lite_ left	19:02
	← kermit left	19:02
	← EminenceHC left	19:02
	→ KevinTS joined	19:02
	→ DeathIncarnate joined	19:02
	→ EminenceHC joined	19:02
	→ btree_ joined	19:03
	→ _Vi joined	19:03
	← CussBot left	19:03
	← CKyle left	19:03
	→ CussBot joined	19:03
	→ Sonderblade joined	19:04
	→ Motoko joined	19:04
	→ lsiv568 joined	19:05
	← Tuna-Fish left	19:05
	← teran left	19:05
	→ _W_ joined	19:06
	→ teran joined	19:06
	← btree left	19:06
	→ mishok13 joined	19:06
	← Dreamer3 left	19:06
	← JohnBat26 left	19:07
	→ srji joined	19:07
	← EminenceHC left	19:07
	← robarelli left	19:08
	← teran left	19:10
	→ devoldmx3 joined	19:10
	← rolledback left	19:12
	→ vurma joined	19:12
	← sohail left	19:12
	← devoldmx left	19:12
sjmikem	osse, looks like there is a lot of discussion on the problem we found yesterday :-)	19:13
	→ hebz0rl_ joined	19:13
	→ kentr joined	19:13
	→ kermit joined	19:13
osse	sjmikem: yep. no response to the weirdness I'm seeing though :(	19:14
	← plitzenberger left	19:14
osse	sjmikem: I want to apply the patches Jeff King has proposed and see if I still experience it	19:14
	← hebz0rl__ left	19:14
	→ Tuna-Fish joined	19:15
	→ Not_Whatever joined	19:16
	← jophish left	19:16
	→ jophish joined	19:16
	← srji left	19:18
	← kentr left	19:18
	→ sohail joined	19:19
	→ kentr joined	19:19
	→ teran joined	19:20
	← newbie999 left	19:20
	← kentr left	19:20
	← babilen left	19:21
	→ babilen joined	19:22
	← pikaren left	19:22
	← Tuna-Fish left	19:22
	← Sceorem left	19:23
	← kristofers left	19:23
	← teran left	19:26
	→ rethus joined	19:26
	← ilam left	19:26
	→ _hockey567 joined	19:27
	→ Mapley joined	19:27
	→ teran joined	19:27
	← hockey567 left	19:28
	→ binaryhat_ joined	19:29
	→ bvi joined	19:29
	← Nizumzen left	19:29
	← upene left	19:29
	← lsiv568 left	19:31
	→ ki0 joined	19:31
	→ lsiv568 joined	19:31
	→ listochkin joined	19:31
	← vurma left	19:31
	← teran left	19:32
	← binaryhat left	19:32
	← mishok13 left	19:32
	→ Apocalis_ joined	19:32
	→ vurma joined	19:32
	→ Gamecubic joined	19:33
	→ Tuna-Fish joined	19:33
	← robbyoconnor left	19:35
	← lsiv568 left	19:35
	→ hcc23_ joined	19:36
	← hcc23 left	19:36
	← Chiftin left	19:36
	← Arkaniad left	19:37
	← DeathIncarnate left	19:37
	→ mishok13 joined	19:37
	→ Chiftin joined	19:37
	← vurma left	19:37
	← KevinTS left	19:37
	← xhoy left	19:38
	→ lsiv568 joined	19:38
	→ bezet joined	19:38
	← Tuna-Fish left	19:39
	→ a_le joined	19:39
	← Sijdesign left	19:40
	← devoldmx3 left	19:40
	← hahuang65 left	19:40
	→ sinkensabe joined	19:41
	← zapb left	19:42
	← bezet left	19:43
	← ssarah left	19:43
	→ fragamus joined	19:43
	→ hkon_ joined	19:43
	→ plitzenberger joined	19:45
	← pothibo left	19:45
	→ hahuang65 joined	19:46
	← hcc23_ left	19:46
	→ moat joined	19:46
	→ hcc23_ joined	19:47
	Nevik_ → Nevik	19:47
	← lasers left	19:47
	← hkon_ left	19:48
	← pweaver_ left	19:48
	→ B1x1t0 joined	19:48
	→ igli joined	19:49
	→ Tuna-Fish joined	19:50
	→ alvaro_o joined	19:51
	← mspe_ left	19:51
	→ jottr joined	19:52
	→ mspe joined	19:53
	→ Matrixiu- joined	19:53
	← Xack left	19:53
	← kermit left	19:55
	→ dreiss joined	19:55
	→ EminenceHC joined	19:55
	← punchagan left	19:56
	→ eletuchy joined	19:56
	→ punchagan joined	19:57
	← mspe left	19:57
	→ lazers joined	19:58
igli	how do i push a new branch i just made to a repo? git push origin foo # assuming i'm on (new) branch 'foo' would be my guess but i have a feeling it's incorrect	19:58
_ikke_	It is correct	19:59
igli	ah thanks _ikke_	19:59
_ikke_	And you don't have to be on the branch	19:59
	→ mspe joined	19:59
	Matrixiu- → Xack	19:59
igli	lemme just get this done first, then i'll think about what you're saying. user is waiting to test it	19:59
	→ CognitivePuppy joined	19:59
	← freestyl3r left	20:00
	→ KevinTS joined	20:00
	← ki0 left	20:00
	→ AKK9 joined	20:00
	→ Arkaniad joined	20:01
	← eletuchy left	20:01
	← Zamerick left	20:01
	→ gfixler joined	20:02
	← hebz0rl_ left	20:03
	← nickpresta left	20:03
	← Tuna-Fish left	20:03
	→ pweaver_ joined	20:04
igli	ah ok, so if i were on master, that would still push foo to a new branch origin:foo ?	20:04
	→ m0nkmaster joined	20:05
osse	oui	20:05
	→ Sauvin joined	20:05
	← listochkin left	20:06
	← hcc23_ left	20:07
_ikke_	igli: origin foo	20:07
	origin:foo means something else	20:07
	← mikecmpbll left	20:07
	→ zapb joined	20:08
	→ hcc23_ joined	20:08
	→ robarelli joined	20:08
	← neurodrone_ left	20:09
igli	hmm okie. that explains a lot ;)	20:13
	→ mechanicalduck joined	20:13
qsuscs	do git log and gitk etc respect a /.mailmap by default?	20:13
igli	ah (local) revision:branch (remote)	20:14
	← FortySix2 left	20:14
	→ jas4711 joined	20:14
	→ Tuna-Fish joined	20:14
	→ FortySix2 joined	20:14
	→ btree joined	20:14
	← FatDarrel left	20:15
	← morphix0 left	20:15
	→ zapotek6 joined	20:15
	← mechanicalduck_ left	20:15
	← zapotek6 left	20:15
	← FortySix2 left	20:15
	→ FortySix2 joined	20:15
	← HumanSky left	20:16
	← btree_ left	20:16
	→ vurma joined	20:16
	← the8thbit left	20:17
	→ DeathIncarnate joined	20:18
	→ Embassy joined	20:18
	→ nickpresta joined	20:18
	→ the8thbit joined	20:19
	← CognitivePuppy left	20:20
	← freezevee left	20:20
	← lucha left	20:20
	→ morphix0 joined	20:20
	→ veebers joined	20:21
	← jophish left	20:21
	← ValicekB left	20:21
	← sonicparke\|bradm left	20:21
osse	qsuscs: no, but you can configure them t o	20:22
	qsuscs: git config log.mailmap true	20:22
qsuscs	and what is the format to change someone’s name?	20:22
	← studmuf left	20:23
	→ axl_ joined	20:23
_ikke_	first routes are tried first	20:23
	← Chiftin left	20:24
_ikke_	wrong channel	20:24
	→ Chiftin joined	20:24
	→ JohnBat26 joined	20:25
	← veebers left	20:25
	← vurma left	20:25
	← sq-one left	20:26
	→ Quevin joined	20:28
	← btree left	20:28
Adylas	Hello, I m getting some "RPC failed; result=22, HTTP code = 503" from 2.0.3. (I dont think its release dependent) while cloning. The CPU the "server" is not that large and the connection is going by a proxy. Do you think that this error is related to the proxy on to the git-http ?	20:29
	→ ValicekB joined	20:29
	→ aantix joined	20:29
ojacobson	5xx HTTP errors are server-side errors; have a look in the server's log (git-http-backend respects CGI rules about error messages, IIRC)	20:29
	→ mkoskar joined	20:30
	← jfelchner left	20:31
qsuscs	https://twitter.com/DanaDanger/status/183316183494311936	20:31
	← beneggett left	20:31
qsuscs	tl;dr http response codes	20:31
	→ ki0 joined	20:31
	→ dannixon joined	20:33
	← ki0 left	20:33
	→ ki0 joined	20:34
	→ beneggett joined	20:34
	→ lucha joined	20:34
	← FortySix2 left	20:35
	→ kermit joined	20:35
	← aartist left	20:35
	→ FortySix2 joined	20:36
	→ Gizburdt joined	20:36
	← FortySix2 left	20:36
	→ FortySix2 joined	20:37
	→ CognitivePuppy joined	20:37
	← ki0 left	20:38
	← JohnBat26 left	20:38
	→ Fiouz joined	20:39
	→ cagedwisdom joined	20:39
	← moat left	20:39
	→ moat joined	20:40
	→ CoderBugM joined	20:40
	← CoderBugM left	20:40
	→ _foka joined	20:41
	← thevishy left	20:41
	← sinkensabe left	20:41
	→ sinkensabe joined	20:41
	← kachi8 left	20:42
	→ hoschi joined	20:43
	→ ki0 joined	20:43
	← Tuna-Fish left	20:43
	← axl_ left	20:43
	→ matt_____ joined	20:43
	← morphix0 left	20:44
	→ autonomoid joined	20:45
	← mechanicalduck left	20:46
	← dreiss left	20:46
	← sinkensabe left	20:46
	← Gizburdt left	20:46
Adylas	ojacobson, Thanks. qsuscs hahah	20:46
	← JSharpe left	20:47
	← plitzenberger left	20:47
	→ axl_ joined	20:47
	← m0nkmaster left	20:48
igli	_ikke_: by "that explains a lot" i didn't mean you were terse, btw, tho looking back it could be read like that. i meant that explains my confusion :)	20:49
	→ mikecmpbll joined	20:49
	← GodEater left	20:49
_ikke_	igli: Didn't take it like that	20:50
	← Chiftin left	20:50
igli	cool :)	20:51
	← Pookz left	20:51
	→ Chiftin joined	20:51
	← sdrfnord1 left	20:51
	← ojacobson left	20:51
	← hoschi left	20:52
	← m8 left	20:52
	→ akim__ joined	20:53
	→ Xethron joined	20:53
	← Xethron left	20:53
	→ Xethron joined	20:53
	← Quevin left	20:53
	→ Tuna-Fish joined	20:54
	← beneggett left	20:54
	→ teran joined	20:54
	← hahuang65 left	20:55
	← akim left	20:55
	← zapb left	20:55
	→ rolledback joined	20:55
	← myndzi\ left	20:55
	→ TheFuzzball joined	20:56
	→ plitzenberger joined	20:56
	← esclear left	20:56
	→ eletuchy joined	20:57
	→ madewokherd joined	20:57
	← cannonball left	20:57
	← numdig left	20:58
	← jackneill left	20:58
	← Tuna-Fish left	20:58
	→ Tuna-Fish joined	20:59
	→ beneggett joined	20:59
	← beneggett left	20:59
	NaiveFrost → Naive	21:00
	← rolledback left	21:00
	← livingstn left	21:00
	→ Adam_ joined	21:01
	← eletuchy left	21:01
	← mennea left	21:01
	← pweaver_ left	21:01
	← Chiftin left	21:02
	← Tuna-Fish left	21:02
	← Kicer86 left	21:02
	→ jfelchner joined	21:03
	← Adam_ left	21:03
	← moat left	21:03
	← punchagan left	21:03
	→ Chiftin joined	21:03
	→ Adam_ joined	21:03
	gitinfo set mode: +v	21:04
Adam_	Hey friends, I've got a question about branching. I'm doing some refactoring so I made a new branch called refactor and started working in it but I wanted to see the original so I switched back to my master branch but the files aren't changing back. Do I need to commit on my refactor branch to switch back to my older master?	21:04
	← KevinTS left	21:04
	← beastd left	21:05
qsuscs	commit or !stash, or else !float	21:05
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	21:05
	→ moat joined	21:05
qsuscs	… man git stash, then.	21:05
gitinfo	the git-stash manpage is available at http://jk.gs/git-stash.html	21:05
PerlJam	Adam_: if you don't commit, you're not actually affecting the branch, just your working copy.	21:05
	→ Reskp joined	21:05
	→ tpollard joined	21:06
Adam_	oh I seeeee, thanks!	21:06
	→ jfelchne_ joined	21:08
	→ asparagui joined	21:09
	← autochthon left	21:09
	← jfelchner left	21:11
	→ HumanSky joined	21:11
	→ beneggett joined	21:11
	→ Sceorem joined	21:11
	← axl_ left	21:11
	→ jfelchner joined	21:11
	→ Tuna-Fish joined	21:13
	← moat left	21:13
	→ akim joined	21:13
	→ axl_ joined	21:13
	→ pweaver_ joined	21:13
	→ mehwork joined	21:13
	gitinfo set mode: +v	21:14
	← jaimef left	21:14
mehwork	after creating a local branch on my machine with 'git branch branchname', how do i push it to the remote server, just 'git push' from inside the branch?	21:14
	→ jaimef joined	21:15
	← jfelchne_ left	21:15
	← akim__ left	21:15
	← beneggett left	21:15
	→ punchagan joined	21:15
qsuscs	git push branchname (as described in man git push)	21:15
gitinfo	the git-push manpage is available at http://jk.gs/git-push.html	21:15
_ikke_	deja vu :P	21:16
	git push <remote> <branchname>	21:16
	so git push origin <name>	21:16
	← ferreum left	21:16
	← a_le left	21:16
qsuscs	oh did i forget that?	21:16
	← axl_ left	21:17
qsuscs	it’s still ¾h to go to midnight, why am i so tired? ._.	21:17
	→ psoo joined	21:17
	← asakura1 left	21:18
	← kermit left	21:18
	→ zackiv31 joined	21:18
	← fstd left	21:19
	→ axl_ joined	21:19
_ikke_	same timezone	21:19
	← LeMike left	21:20
	→ kermit joined	21:20
	→ Gizburdt joined	21:21
	→ asakura1 joined	21:21
	→ deanclkclk__ joined	21:21
	→ dreiss joined	21:21
	→ hahuang65 joined	21:21
	→ FatDarrel joined	21:22
	← fr33domlover left	21:22
qsuscs	you were from the netherlands, right?	21:22
	← kriks left	21:23
	← montchr left	21:23
	← Tuna-Fish left	21:24
_ikke_	correct	21:24
	→ Tuna-Fish joined	21:24
	← jas4711 left	21:25
	→ LucasTT_ joined	21:25
	← Tuna-Fish left	21:25
qsuscs	it’s quite funny, usually i assume, everybody else on the interwebs™ is from the US (it’s everything english, after all), but then i learn that there are quite a lot of europeans as well	21:25
	← FortySix2 left	21:25
	→ Tuna-Fish joined	21:25
	→ sinkensabe joined	21:25
	→ FortySix2 joined	21:26
	→ nnyk_ joined	21:26
igli	ah that float factoid is EXACTLY what i've been needing	21:26
	← Sleepy63_ left	21:26
qsuscs	igli: !triggers	21:26
gitinfo	igli: Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	21:26
igli	qsuscs: i meant the content, not the key ;)	21:27
	← _foka left	21:27
osse	qsuscs: shouldn't be too surprising. there are more europeans than americans :p	21:27
qsuscs	igli: you might find other useful information there	21:27
	← FortySix2 left	21:27
igli	ah it's the content too	21:27
	→ kachi8 joined	21:27
	→ FortySix2 joined	21:27
	→ Nizumzen joined	21:27
	← LucasTT left	21:28
	← lsiv568 left	21:28
igli	my bad, misread "list"	21:28
	→ lsiv568 joined	21:28
	← asparagui left	21:29
	→ Balliad joined	21:29
	→ sniptras joined	21:29
	← Tuna-Fish left	21:30
qsuscs	osse: still everything seems to happen in the US	21:30
	→ oriba joined	21:30
qsuscs	i mean, $company unveils a new product, sold here ages after there	21:31
	→ asparagui joined	21:31
	→ _ultra joined	21:31
	← asparagui left	21:31
qsuscs	(unless it’s sony, then japan gets it first)	21:31
	← verodeb left	21:31
	→ beneggett joined	21:32
	← arachnocrat left	21:32
	← Gizburdt left	21:32
	← mishok13 left	21:32
	← tadni left	21:32
	→ fstd joined	21:32
	← _ultra left	21:32
	← lsiv568 left	21:32
	← ehynds left	21:33
	← asakura1 left	21:33
	← ki0 left	21:33
osse	you have the biggest media outlets, that's true	21:34
	hence everything seems to happen there :p	21:34
	← it0a left	21:34
	→ kristofers joined	21:34
	← Adam_ left	21:34
	← Balliad left	21:34
	← LukeT- left	21:35
igli	thanks qsuscs, very handy	21:36
	→ Balliad joined	21:36
	← subleq left	21:36
qsuscs	i wonder whether used computers are cheaper there, or just anywhere else than germany	21:36
	← Balliad left	21:36
	→ a_le joined	21:37
qsuscs	i could use some modern-ish (let’s say core2duo or above) notebooks to test out some other linux distributions	21:37
	→ Balliad joined	21:37
	→ asakura1 joined	21:38
	→ rolledback joined	21:38
	→ Balliad_ joined	21:38
	→ bluesm joined	21:38
	← Balliad_ left	21:39
qsuscs	gentoo and debian are fine, but i’d really like to try with opensuse or fedora once again (i could never get to like yum, even portage is faster… and i haven’t really used opensuse, only in m early times as a n00b)	21:39
	→ Sleepy63_ joined	21:39
	← dreiss left	21:40
	→ CKyle joined	21:40
	← AKK9 left	21:40
	← tplaner left	21:40
	→ Tuna-Fish joined	21:41
	← Balliad left	21:42
	← FortySix2 left	21:43
	→ hkon_ joined	21:44
	→ FortySix2 joined	21:44
	→ mechanicalduck joined	21:44
igli	portage has got a lot slower in last year or two	21:44
	← Tuna-Fish left	21:44
	→ spacediver joined	21:45
qsuscs	dunno, i use gentoo since last october, and i have this computer since april 2013 (started with arch linux)	21:45
	gitinfo set mode: +v	21:45
igli	ah ok	21:45
spacediver	hi folks	21:45
	← hahuang65 left	21:45
igli	it's more because of nutty workarounds like multilib and PYTHON_TARGETS, than anything else.	21:46
	→ pothibo joined	21:46
spacediver	how could this come that I have a blob in a repo, it is not collected by gc --prune=now, it gets counted in count-objects, but git log <sha1> and git log <filename> both show nothing?	21:46
qsuscs	the computer i had before stopped working around october ’12, in the meantime i only had a horribly old thing with an athlon xp (with windows xp first and then arch with LXDE), and then i discovered an old server with a core2duo and fedora, it took me ages to install xorg	21:46
	← FortySix2 left	21:46
spacediver	i'd be glad if you point me how else to track down that blob	21:47
	→ Gizburdt joined	21:47
	→ FortySix2 joined	21:47
	← Nizumzen left	21:47
	← FortySix2 left	21:47
	→ Balliad joined	21:47
	← a_le left	21:47
spacediver	previoiusly I've seen commit for addition of that file, and commit for deletion. later on I've done some filter-branch, and pushed that new branch to a new repo, and now working there	21:47
_ikke_	git cat-file -p <hash>	21:47
	→ FortySix2 joined	21:48
spacediver	this works	21:48
	← rolledback left	21:48
spacediver	showing exact contents	21:48
	→ a_le joined	21:48
spacediver	showing exact contents of that very 400M file I'm trying to get rid of	21:48
_ikke_	spacediver: If the blob is not referenced more by any branches or tags, it will not show up in any of history showing commands	21:48
	← Motoko left	21:48
_ikke_	spacediver: But the reflog might still have a reference to it	21:48
	← jerius left	21:49
	→ Quevin joined	21:49
spacediver	nah, empty	21:49
_ikke_	How old is the blob?	21:49
spacediver	1-2 years	21:49
	2.5K commits rewritten from the addition	21:49
	← hkon_ left	21:49
spacediver	i wonder, if no commits reference this blob anymore — why not gc?	21:50
	filter-branch I've done was with index-filter for removing that blob	21:50
	→ a_le_ joined	21:50
	← Embassy left	21:51
spacediver	I've read up git object structure, now I belive that that blob is linked from tree object, which is linked from... commit? there shouldnt be any	21:51
	git fsck does nothing special	21:51
	→ junaidnaseer2 joined	21:51
	← junaidnaseer2 left	21:51
	← a_le left	21:51
	← zackiv31 left	21:52
	← psoo left	21:52
	← beneggett left	21:53
	→ beneggett joined	21:53
	← phanimahesh left	21:54
	← ValicekB left	21:54
_ikke_	Then it's probably still being referenced	21:54
	← Sceorem left	21:55
	→ Tuna-Fish joined	21:55
	→ northfurr joined	21:55
	→ JSharpe joined	21:55
	← FortySix2 left	21:57
	→ eletuchy joined	21:58
	← Chiftin left	21:58
	→ lidaaa joined	21:58
	→ unomystEz joined	21:59
	← Dougie187 left	21:59
	→ Chiftin joined	21:59
	← axl_ left	21:59
rom1504	is there some project (website, software, whatever) that link a specification (more or less formal) to commits ? (at least a bit automatically)	22:00
	that's a vague question, but google isn't helpful for this	22:01
spacediver	hi	22:01
	where does that spec come from?	22:01
	→ MickeyO joined	22:02
spacediver	basically things like build results are linked within corresponding software	22:02
	← eletuchy left	22:02
	← HumanSky left	22:02
	→ Embassy joined	22:02
	← Tuna-Fish left	22:02
sjmikem	Jas anyone encountered this with git-svn ?	22:03
	https://gist.github.com/anonymous/a2a02e06a2419ac9670b	22:03
spacediver	to which git repo is an external storage	22:03
	← DeathIncarnate left	22:03
	→ Tuna-Fish joined	22:03
	→ HumanSky joined	22:03
	← martinklepsch left	22:03
	→ axl_ joined	22:03
	← punchagan left	22:03
rom1504	I'm not sure, it's just an idea, I don't already have a spec. But I think it would be nice if something in the commit message was linked to an actual functionality need, a bit like commit message that auto-close issue on github	22:03
offby1	Can I have "git log" show me just those commits that changed a file's mode?	22:04
	→ ValicekB joined	22:04
offby1	I can do "git log -p", and grep the output for "^Old mode", but that is kludulous	22:04
	kludgulous	22:04
spacediver	why not, btw?	22:05
	← plitzenberger left	22:05
spacediver	i suspect anything else would be way more lengthy to type	22:05
	→ punchagan joined	22:05
	→ martinklepsch joined	22:06
offby1	well, the output of that grep doesn't include the commit or the file	22:06
	← martinklepsch left	22:06
offby1	I suppose I could add some --before or --after options to the grep, but ... eww	22:06
spacediver	yep	22:06
	→ DeathIncarnate joined	22:06
	← pantsman_ left	22:06
spacediver	and then grep again for commit hashes ;)	22:06
	← mrkake left	22:07
	→ martinklepsch joined	22:07
	← pothibo left	22:07
spacediver	because git log format is quite fixed, you will get precise results	22:07
	← nnyk_ left	22:07
	← deanclkclk__ left	22:07
spacediver	just figure out needed words and line counts	22:07
	← beneggett left	22:07
	← Tuna-Fish left	22:07
	→ beneggett joined	22:08
spacediver	use line start symbol ^ to avoid false matches, if «commit» or «Old mode» appears in the middle of line or commit msg itself	22:08
	→ nnyk_ joined	22:08
Eugene	offby1 --diff-filter=T perhaps?	22:08
	→ Tuna-Fish joined	22:08
Eugene	Or possibly =M combined with -G^$ or such	22:08
	→ deanclkclk joined	22:08
	← damian- left	22:08
spacediver	hey folks, so could you point me on how to research what prevents git from gc'ing a blob?	22:09
	← drbean_ left	22:09
spacediver	commits are rewritten with filter-branch already	22:09
	← BSaboia left	22:09
spacediver	git log is empty for this blob sha1 and filename	22:09
offby1	Eugene: I like the way your mind words	22:09
	works	22:09
spacediver	would I dump the very object structure and grep there?	22:09
offby1	(not in general, of course; just in git-related matters)	22:09
Eugene	Sideways?	22:09
	offby1 scrubs with steel wool	22:09
Eugene	My brain! :-(	22:10
	← fatalhalt left	22:10
	← HumanSky left	22:10
	← acharlieh left	22:11
	← jottr left	22:11
	← Chiftin left	22:12
	→ Chiftin joined	22:12
	← zumba_addict left	22:13
	→ Atrumx joined	22:13
	← Tuna-Fish left	22:13
	→ mrkake joined	22:13
	→ zumba_addict joined	22:14
	→ drbean joined	22:15
	← Embassy left	22:15
	← martinklepsch left	22:16
	→ damian- joined	22:16
	← treehug88 left	22:16
	← zumba_addict left	22:18
	← hj2014 left	22:18
	← a_le_ left	22:18
	→ hahuang65 joined	22:18
	→ hj2014 joined	22:19
	→ ehmatthes joined	22:19
	← sohail left	22:19
	→ Embassy joined	22:19
	← sgambino left	22:19
	→ a_le joined	22:19
	→ ErKa joined	22:19
	← bvi left	22:23
	← hj2014 left	22:23
	→ bvi joined	22:23
	← Embassy left	22:23
	← CKyle left	22:24
	→ Tuna-Fish joined	22:24
	→ logix812 joined	22:25
	← Chiftin left	22:25
	→ Dottimolly joined	22:26
	→ Chiftin joined	22:26
	→ kumarat9pm joined	22:26
kumarat9pm	I am newbe to GIT.	22:26
	← Tuna-Fish left	22:26
	← Dottimolly left	22:27
kumarat9pm	I tried to create a local repo with one directory and within that some more sub dir's and then some files in them.	22:27
	I see a folder is not updated when I am using git add --all and git commit -ma 'test'	22:27
	→ Pacsik joined	22:27
kumarat9pm	Any Idea what could be reason?	22:27
	This is what I did http://pastebin.com/WFh5rDfQ	22:28
	→ endiruna joined	22:29
kumarat9pm	any suggestions experts?	22:29
	← Balliad left	22:29
	← haaja left	22:29
	→ Vile joined	22:29
	← ValicekB left	22:29
Eugene	1) don't use --all	22:29
osse	kumarat9pm: git won't let you commit directories that are empty	22:29
Eugene	2) use `git status`	22:29
	3) !dir	22:29
gitinfo	[!directory] Git does not track directories, only files in directories. Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook	22:29
	→ btree joined	22:30
Eugene	4) don't make /etc into a git repo. That will eat your head. !etckeeper	22:30
gitinfo	etckeeper is a collection of tools to let /etc be stored in a git, mercurial, darcs, or bzr repository. It hooks into various package managers. http://kitenet.net/~joey/code/etckeeper/	22:30
	→ visceral joined	22:30
	→ srji joined	22:30
	← thibaultcha left	22:30
kumarat9pm	Eugene: I am not making entier etc folder	22:30
	I am just doing it for /etc/puppet folder	22:31
	→ haaja joined	22:31
	→ dsdeiz joined	22:31
	→ thibaultcha joined	22:31
kumarat9pm	Eugene: Here is my git status http://pastebin.com/QAQnEmvf	22:31
Eugene	--all doesn't add new files, only update existing ones.	22:32
	`git add modules/`	22:32
kumarat9pm	ohh ok	22:32
Eugene	Hence 1) above	22:32
	← sinkensabe left	22:32
kumarat9pm	so I have to add individual folder?	22:33
	→ tplaner joined	22:33
Eugene	`git add .`	22:33
spacediver	place file in folder	22:33
kumarat9pm	How can I add all my data in /etc/puppet?	22:33
spacediver	it will make it non-empty and git will notice it	22:33
	← btree left	22:33
kumarat9pm	if you observe my /etc/puppet/modules have a file called test.pp	22:33
	then too its not updating.	22:33
logix812	if you subtree split into a branch, is there a way to get any changes in that split back into the original repo?	22:33
	→ montchr joined	22:34
kumarat9pm	Eugene: Will try git add .	22:34
	← carandraug left	22:35
kumarat9pm	Eugene: Same effect.	22:35
	:(	22:35
Eugene	`git status` is the key	22:35
	← jluc_ left	22:36
	← thibaultcha left	22:36
	← sniptras left	22:36
	→ thibaultcha joined	22:36
	→ subleq joined	22:36
	→ Tuna-Fish joined	22:37
	← axl_ left	22:37
	← Destos left	22:38
	← macabre__ left	22:38
	← thibaultcha left	22:39
	→ axl_ joined	22:39
	→ ValicekB joined	22:39
	→ ESphynx joined	22:39
ESphynx	hey guys, my git server is running out of memory, what should I do?	22:39
	compressing objects	22:39
	→ martinklepsch joined	22:40
	→ thibaultcha joined	22:40
	← CognitivePuppy left	22:40
	← Tuna-Fish left	22:40
	← thibaultcha left	22:40
	→ thibaultcha joined	22:40
Hello71	1. jk/pack-bitmap	22:41
Eugene	Buy more RAM and/or have less objects.	22:41
Hello71	2. get more memory	22:41
Eugene	kumarat9pm - do not PM.	22:41
ESphynx	git repack going to help?	22:41
qsuscs	https://wiki.uberspace.de/development:git#ram-nutzung (just ignore the german text, the commands at the very bottom)	22:41
kumarat9pm	Eugene: Sure	22:41
Hello71	not if you fail on single packing	22:41
	← rgr left	22:41
Hello71	if you can spare that then install git... uh, 2.0.0 I think has it	22:42
qsuscs	but seriously, what kind of hardware are you using that it has resource problems with git?!	22:42
Eugene	Or what kind of repo	22:42
ESphynx	qsuscs: there 2 sticks of 256 MB of ram in there	22:42
kumarat9pm	Is there any command to recursively add files/folder. Sub folders have many files and folders again with data?	22:42
ESphynx	and the repo really isn't that big	22:43
	→ tranzfus_ joined	22:43
Eugene	How big	22:43
	← tummy_ left	22:43
Eugene	512MB(though laughable for physical hardware....) ought ot be enough for any /sane/ repo	22:43
ESphynx	46mb db	22:43
	Hello71 smells !binary	22:43
Eugene	46MB of .git/objects/? Or 46MB .db file?	22:43
rom1504	kumarat9pm: git add . ?	22:43
qsuscs	kumarat9pm: git add .	22:43
ESphynx	for the whole .git	22:43
	→ tummy joined	22:43
osse	kumarat9pm: git add top-level	22:44
Eugene	Shouldn't be too bad.... `free -m` ?	22:44
	(but seriously, go buy a computer newer than the 1990s)	22:44
	← dogeydogey left	22:44
Eugene	4GB is like $20	22:44
rom1504	46Mo, you probably have a lot of binary files in there	22:44
	Mb	22:44
	← ciampix left	22:44
ESphynx	rom1504 there are no binary files it's all source	22:45
Eugene	It's within an order-of-magnitude of sanity.	22:45
ESphynx	and it's 39mb on the repo	22:45
kumarat9pm	rom1504: I did that one. But one directory is not added. I don't have .gitignore as well	22:45
	← fragamus left	22:45
kumarat9pm	rom1504: Not sure what is causing the issue?	22:45
	← thiago left	22:45
	← tranzfuse left	22:45
	← thibaultcha left	22:45
Hello71	millibits	22:45
	← pweaver_ left	22:46
rom1504	ESphynx: really ? must be a lot of source then	22:46
ESphynx	rom1504 it sure is.	22:46
	→ jottr joined	22:46
rom1504	I'd say it deserves a decent server then	22:46
	← tang^ left	22:46
	→ thiago joined	22:46
ESphynx	rom1504: I've been delaying the upgrade ;) I really should get to it ;)	22:46
	→ thibaultcha joined	22:46
	← thibaultcha left	22:46
ESphynx	but my office is so hot already :(	22:47
	← tranzfus_ left	22:47
	→ Megaf joined	22:47
	→ thibaultcha joined	22:47
rom1504	kumarat9pm: it's empty	22:47
	← curiousmansi_ left	22:47
	← igli left	22:47
	← hcc23_ left	22:47
ESphynx	git repack seemed to have gone ahead	22:47
	← tummy left	22:48
	→ hcc23 joined	22:48
	→ msmto joined	22:48
qsuscs	Eugene: did you already change the topic today?	22:48
Eugene	Late last night	22:48
	← ValicekB left	22:48
Eugene	I usually get to it, don't worry	22:48
	→ mizu_no_oto joined	22:48
	→ tadni` joined	22:49
	← jfelchner left	22:49
osse	kumarat9pm: try git check-ignore -v <path>	22:49
	← subleq left	22:50
	→ Tuna-Fish joined	22:51
	← autonomoid left	22:53
	→ subleq joined	22:53
	← hcc23 left	22:53
	← thibaultcha left	22:53
	← kballou left	22:53
	→ brownbathrobe joined	22:54
	→ thibaultcha joined	22:54
	← thibaultcha left	22:54
	→ ValicekB joined	22:54
	→ thibaultcha joined	22:54
	← mspe left	22:55
	← thibaultcha left	22:55
	→ thibaultcha joined	22:55
	→ akim__ joined	22:56
	← thibaultcha left	22:56
	→ thibaultcha joined	22:57
	← thibaultcha left	22:57
	← martinklepsch left	22:58
	← axl_ left	22:58
	→ eletuchy joined	22:58
	← akim left	22:58
	→ HumanSky joined	22:59
	← ISmithers_ left	22:59
	→ ISmithers joined	22:59
	← HumanSky left	23:00
	→ axl_ joined	23:00
	← Gizburdt left	23:00
	→ thibaultcha joined	23:00
	← thibaultcha left	23:00
	← srji left	23:01
	← maestrojed left	23:01
	← mikecmpbll left	23:01
	← eletuchy left	23:03
	→ pothibo joined	23:03
	→ godgodgodgo joined	23:03
	← godgodgodgo left	23:03
	→ btree joined	23:03
	← axl_ left	23:04
	← pothibo left	23:05
	← joelrobichaud left	23:05
	← dsantiago left	23:05
	→ shinnya joined	23:06
	← B1x1t0 left	23:06
	← MattMaker left	23:06
	← Pacsik left	23:06
	← Tuna-Fish left	23:08
	← dharrigan left	23:09
	← btree left	23:10
	← beneggett left	23:12
	→ netto_ joined	23:12
	← netto_ left	23:12
	← spacediver left	23:12
	← endiruna left	23:13
	→ dreiss joined	23:13
	→ mikecmpbll joined	23:13
	← mizu_no_oto left	23:14
	← brownbathrobe left	23:14
	→ dharrigan joined	23:14
	← dharrigan left	23:14
	→ dharrigan joined	23:14
	← ErKa left	23:15
	→ dsantiago joined	23:15
	→ jfelchner joined	23:16
sjmikem	having a git-svn issue: https://gist.github.com/anonymous/a2a02e06a2419ac9670b any ideas?	23:17
	looks like my Git:SVN:Util module doesn't match my git version?	23:17
	→ axl_ joined	23:18
	→ rgr joined	23:19
	→ Tuna-Fish joined	23:19
	← mmitchel_ left	23:20
	→ thibaultcha joined	23:20
	→ Skrypter joined	23:22
	← WaReZ left	23:22
jrnieder	sjmikem: yep	23:22
	← Skrypter left	23:22
	→ mmitchel_ joined	23:22
	← jottr left	23:22
	← rgr left	23:23
	→ rgr joined	23:23
sjmikem	looking at http://search.cpan.org/~msouth/Git-0.03/, I don't see any version in there that seems to have any kind of canon* functions in it?	23:24
	→ robbyoconnor joined	23:24
jrnieder	what OS are you on?	23:24
sjmikem	Ubuntu 14	23:25
jrnieder	"dpkg-query -S /usr/share/perl5/Git/SVN/Utils.pm" tells me that module is in the git-svn package on debian-derived OSes	23:25
sjmikem	Just upgraded from 13 - it worked fine there	23:25
jrnieder	reportbug git-svn, then?	23:25
sjmikem	I know zero about perl :-(	23:25
kumarat9pm	osse: Sure Will try git check-ignore	23:26
sjmikem	can u suggest a workaround?	23:26
jrnieder	sjmikem: (step 1) report the bug against the git-svn package	23:26
	sjmikem: (step 2) install git locally (e.g. to /usr/local or $HOME/opt/git)	23:27
	→ stamina joined	23:27
sjmikem	Am I reporting this to git folks, ubuntu folks, or git-svn folks?	23:27
jrnieder	ubuntu folks	23:27
	the command "reportbug git-svn" should dtrt	23:27
	→ pbrobst joined	23:28
	← nickpresta left	23:29
	→ eletuchy joined	23:31
jrnieder	oh, aparently I don't know how Ubuntu works :)	23:31
	something about an 'ubuntu-bug' command instead?	23:31
	anyway, you get the idea	23:31
	→ bitkiller joined	23:31
sjmikem	yeah, I see it	23:32
	← pbrobst left	23:32
	→ hkon_ joined	23:32
sjmikem	would still like to understand a little more, e.g. "git-svn requires Git::SVN version XXX but you used version YYY"	23:32
	← stamina left	23:32
	→ SebastianFlyte joined	23:33
	← netj left	23:33
	→ netj joined	23:33
	← mikecmpbll left	23:34
	→ pbrobst joined	23:35
	← eletuchy left	23:35
	→ beneggett joined	23:35
	← Tuna-Fish left	23:37
	← hkon_ left	23:37
jrnieder	can you put a copy of /usr/share/perl5/Git/SVN/Utils.pm in a pastebin?	23:37
	→ Tuna-Fish joined	23:37
jrnieder	the report can just say "When I try to use git-svn, I get this message"	23:38
	but I'm personally curious :)	23:38
	→ snuffeluffegus joined	23:38
	→ myndzi\ joined	23:39
	← gsingh93 left	23:39
	→ bezet joined	23:39
sjmikem	http://pastebin.com/WnFENRKs	23:39
	→ watabou joined	23:40
sjmikem	canonicalize_path is exported according to that?	23:40
jrnieder	yeah, that's puzzling	23:40
sjmikem	I have a /usr/lib/perl dir	23:41
	is that different?	23:41
	← Tuna-Fish left	23:41
jrnieder	do you have another Utils.pm file anywhere on the filesystem?	23:41
	well, yeah, there are a bunch of those. Another Git/SVN/Utils.pm?	23:42
sjmikem	/usr/share/perl/5.18.2/Git/SVN/Utils.pm	23:42
	→ macabre__ joined	23:42
jrnieder	What does "dpkg-query -S /usr/share/perl/5.18.2/Git/SVN/Utils.pm" say?	23:43
sjmikem	which has no mention at all of the canon function	23:43
	dpkg-query: no path found matching pattern /usr/share/perl/5.18.2/Git/SVN/Utils.pm	23:43
jrnieder	ah, okay, this isn't an ubuntu bug then	23:43
	it looks like someone installed git with some command like 'sudo make install prefix=/usr'	23:43
	← bezet left	23:44
	← myndzi\ left	23:44
sjmikem	ij yeah that was me :-) But I thought I undid it	23:44
jrnieder	you left some files behind :)	23:44
	→ AaronMT joined	23:44
	→ myndzi\ joined	23:45
	← AaronMT left	23:45
jrnieder	"dpkg-query -S /usr/share/perl/5.18.2/Git" tells me the standard git doesn't install any files there	23:45
	so you can wipe out that whole directory	23:45
	that should get your git-svn working again	23:45
sjmikem	how far up into /usr/share/perl/5.18.2/Git/SVN/Utils/pm tree should I delete?	23:45
	← dannixon left	23:45
jrnieder	/usr/share/perl/5.18.2/Git	23:45
sjmikem	is the whole 5.18.2. tree from my install?	23:45
jrnieder	no, 5.18.2 is the perl version	23:45
	lots of programs put files there	23:46
	← robarelli left	23:46
jrnieder	it's just the Git directory that came from the git install	23:46
sjmikem	cool, that worked. Thanks!!	23:46
jrnieder	you can remove /usr/share/perl/5.18.2/Git.pm too while at it if you want to be extra tidy	23:46
	sure thing	23:46
	← rgr left	23:47
sjmikem	anything else I might have left behind?	23:48
	← jfelchner left	23:49
	→ Lyqyd joined	23:50
	→ Pacsik joined	23:50
	gitinfo set mode: +v	23:51
Pacsik	Hello, anyone know how I can see the timestamps on the reflog changes? I can see the date of the actual commits referenced but no the reflog entry itself.	23:52
	→ Tuna-Fish joined	23:52
	← Tuna-Fish left	23:52
	→ jfelchner joined	23:53
	← alezandro left	23:53
	→ reaverb joined	23:54
Pacsik	I'm trying to get changes to the reflog that happened in the last hour but using --since only checks the commit date	23:55
	→ eletuchy joined	23:56
	← kpease left	23:59
	← oriba left	23:59

Logs Search ←Prev date Next date→

Channels Documentation