IRCloggy #git 2015-12-03

Provider of IRC logs since 2005.

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

	2015-12-03
ojacobson	You don't.	00:00
qsuscs	or to actually shorten $commit $commit^, you can also do $commit^!	00:00
kadoban	starsinmypockets: Like, "the child(ren) of this commit"? There's not a refspec for that. It's harder because a commit has an explicit reference to its parent(s), but can't for its children.	00:00
qsuscs	why are there objects beneath my ^ key	00:00
ojacobson	(and in fact a commit can have irrelevant children, for example commits orphaned by a rebase)	00:00
starsinmypockets	kadoban - that makes perfect sense	00:01
	→ rubyonrailed joined	00:01
	← diegoviola left	00:02
	→ samw joined	00:03
	← daito left	00:03
	→ diego2 joined	00:04
	← lindenle_ left	00:04
	← BillCriswell left	00:04
	→ lindenle joined	00:05
	→ diego3 joined	00:06
	← diego3 left	00:07
	→ diego3 joined	00:07
	diego3 → diegoviola	00:07
	← ag4ve left	00:08
	← diego2 left	00:09
	← lindenle left	00:10
	← rorro left	00:11
	relrod_ → relrod	00:12
	← diegoviola left	00:12
	→ lindenle joined	00:13
	→ IWishIKnew joined	00:16
	← tang^ left	00:17
	→ peoliye joined	00:18
	← WaReZ_ left	00:20
	← biertie left	00:22
	→ biertie joined	00:22
	← lindenle left	00:22
	→ lindenle joined	00:23
	→ cagmz joined	00:24
	← paddyez left	00:24
	→ diegoviola joined	00:24
	← diegoviola left	00:26
	→ diegoviola joined	00:26
	→ lindenle_ joined	00:27
	← faux___ left	00:28
	← lindenle left	00:28
	→ CheckDavid joined	00:29
diegoviola	is there a way to find how many commits I have on master?	00:29
	commit count	00:29
qsuscs	git rev-list --count master	00:30
sonOfRa	git log --oneline \| wc -l	00:31
diegoviola	ty	00:31
sonOfRa	there's lots of ways!	00:31
diegoviola	ty	00:31
qsuscs	git log \| grep '^commit' \| wc -l	00:31
	some of these ways make more sense, some less.	00:31
	→ zacg joined	00:32
	← zacg left	00:32
	→ zacg joined	00:32
	← lindenle_ left	00:34
	→ lindenle joined	00:35
	→ bronson joined	00:36
	← infernix left	00:38
	← hexagoxel left	00:39
	← lindenle left	00:39
	→ hexagoxel joined	00:40
	← bronson left	00:41
	→ lindenle joined	00:41
	← cagmz left	00:41
	→ bronson joined	00:41
	← kpease left	00:43
	→ harish joined	00:43
	biertie → bdesmet	00:43
	→ Technocrat7 joined	00:44
	← ixjlyons left	00:44
	→ SmashingX joined	00:45
	← dickdaley left	00:45
	→ cryptsting joined	00:45
SmashingX	is there any way to do a grep on a blame?	00:45
	I mean is there any way to search for a scpecific string that someone specific changed?	00:46
	→ lindenle_ joined	00:46
	← lindenle left	00:47
	→ wxg joined	00:48
	← Technocrat7 left	00:48
	← opencard left	00:49
	→ Lyqyd joined	00:50
	→ ascarter joined	00:51
	← HelloAtMega left	00:51
	← mezod left	00:52
	← peoliye left	00:53
	← lindenle_ left	00:54
	→ sheilong joined	00:55
	← m0viefreak left	00:55
	→ lindenle joined	00:56
	→ CKyle joined	00:57
	← yonatankoren left	00:57
	→ infernix joined	00:58
	← clemf left	00:58
mutex_	does IO stat extended information provide data about the Free bsd drive layer or the drive hardware layer ?	00:58
	doh, wrong room	00:58
	← fstd left	00:59
	→ Jesmaybe joined	00:59
	→ fstd joined	00:59
	← kilo_bravo left	00:59
	→ otter768 joined	01:00
ecmike	SmashingX: git grep <regexp> $(git rev-list --author=<guy's name>)	01:00
	ashka` → ashka	01:00
	← ashka left	01:00
	→ ashka joined	01:00
	← imachuchu left	01:00
	← lindenle left	01:01
	→ anth0ny joined	01:02
	← xfbs left	01:03
	→ lindenle joined	01:03
qsuscs	SmashingX: man git log -S --author	01:04
gitinfo	SmashingX: the git-log manpage is available at http://jk.gs/git-log.html	01:04
	→ thiago joined	01:04
	← otter768 left	01:04
	← diegoviola left	01:04
	→ sr____ joined	01:05
	→ diego1 joined	01:06
	mutex_ → mutex	01:07
	← diego1 left	01:07
	→ diego1 joined	01:07
	diego1 → diegoviola	01:07
	→ peoliye joined	01:07
	← samw left	01:07
	→ unreal joined	01:07
	← qpdb left	01:08
	→ qpdb joined	01:09
	← lindenle left	01:09
	→ peoliye_ joined	01:09
	→ checkItOut joined	01:10
	→ rnsanchez joined	01:10
	← checkItOut left	01:10
	← mellernoia left	01:10
	→ checkItOut joined	01:11
	→ keldwud joined	01:11
	← keldwud left	01:11
	→ keldwud joined	01:11
	← cdg left	01:11
	→ lindenle joined	01:11
	← peoliye left	01:11
	← Vivekananda left	01:12
	← avtobiff left	01:15
	→ avtobiff joined	01:16
	→ yonatankoren joined	01:17
	→ yonatankoren_ joined	01:18
	← yonatankoren left	01:18
	→ ckim joined	01:18
	← geomyidae left	01:18
	← mingwandroid left	01:20
	→ SirRetnuh joined	01:20
	→ nycreep joined	01:20
	← dreiss left	01:20
	← lindenle left	01:20
	← bitkiller left	01:21
	→ lindenle joined	01:22
	yonatankoren_ → yonatankoren	01:23
	← Shentino left	01:23
	← jstimm left	01:23
	← SirRetnuh left	01:23
	← nycreep left	01:24
	→ opencard joined	01:25
	← QwertyDragon left	01:26
	→ jstimm joined	01:29
	← jstimm left	01:29
	← SmashingX left	01:29
	← fstd left	01:30
	→ fstd joined	01:30
	← justanotheruser left	01:30
	← ascarter left	01:32
	← CKyle left	01:32
	← Lyqyd left	01:32
	← sheilong left	01:33
	← lindenle left	01:33
	→ lindenle joined	01:35
	← liamonade left	01:35
	← fstd left	01:36
	← anth0ny left	01:36
	→ fstd joined	01:37
	→ Vivekananda joined	01:38
	← KtoTo left	01:39
	→ checkItO_ joined	01:42
	← checkItO_ left	01:43
	← lindenle left	01:43
	→ daito joined	01:43
	→ ascarter joined	01:43
	→ checkItO_ joined	01:43
	← checkItO_ left	01:44
	→ checkItO_ joined	01:44
	← checkItO_ left	01:44
	→ rclanan joined	01:44
	→ checkItO_ joined	01:44
	← phrozensilver left	01:44
	→ lindenle joined	01:45
	← ascarter left	01:45
	→ ascarter joined	01:46
	← checkItOut left	01:46
	→ phrozensilver joined	01:49
	← s8321414 left	01:50
	→ twb joined	01:52
twb	How do I convince git stash to stash a new file?	01:53
	→ rchavik joined	01:53
twb	If i 'git add' it first, stash ignores it because it's in the index	01:53
	git stash --no-keep-index ?	01:53
	← phrozensilver left	01:53
	← shinenelson left	01:53
	→ mokbu joined	01:54
	→ beckyconning_ joined	01:54
twb	Got it: git stash --keep-index	01:55
	No, I tell a lie. I'm still confused. "git show stash --stat" shows both the new file and the new hunks (of an existing file), but "git show stash" makes it look like the stash is empty.	01:55
	→ xtun joined	01:56
	← jackburton left	01:56
	→ CKyle joined	01:57
	← lindenle left	01:57
	← starsinmypockets left	01:57
	→ lindenle joined	01:58
	→ zhiwliu joined	01:59
	← zhiwliu left	01:59
	← NeverDie_ left	02:00
	→ NeverDie joined	02:00
	→ Technocrat7 joined	02:02
atrigent	twb: I think stash does save the index state?	02:05
	← Imaginativeone left	02:05
atrigent	like, by default?	02:05
twb	atrigent: for the new file, it wasn't clear what was happening	02:06
	← lindenle left	02:06
twb	So I just gave up and copied it somewhere outside of git for half an hour, and I'll copy it back when I'm done	02:06
	→ lindenle joined	02:06
atrigent	I think it should have been saved	02:06
twb	Don't worry about it	02:07
	← opencard left	02:07
	← xtun left	02:08
	← jonmorehouse left	02:10
	← Technocrat7 left	02:10
	← MrWoohoo left	02:11
	← MrWoohoo2 left	02:11
	→ Shentino joined	02:12
	← CKyle left	02:13
	→ justanotheruser joined	02:13
	→ clemf joined	02:15
	→ CKyle joined	02:15
	← clemf left	02:15
	← lindenle left	02:15
	← SupaHam left	02:17
	← hyperair left	02:17
	→ SupaHam joined	02:17
	← s00pcan left	02:17
	← NeverDie left	02:18
	← SupaHam left	02:18
	→ atomicb0mb joined	02:19
	→ SupaHam joined	02:19
	→ lindenle joined	02:19
	→ s00pcan joined	02:19
	→ xtun joined	02:19
	→ johan_sun joined	02:20
	→ pamplemousse joined	02:20
	← CKyle left	02:21
	← hahuang61 left	02:22
	→ NeverDie joined	02:23
	→ tyll_ joined	02:24
	→ anth0ny joined	02:25
	→ sheilong joined	02:25
	← blimpse left	02:25
	← lindenle left	02:25
	← jagob left	02:25
	→ cagmz joined	02:26
	← Walex left	02:26
	← tyll left	02:26
	→ lindenle joined	02:27
	← xaa left	02:27
	← LeBlaaanc left	02:28
	← CheckDavid left	02:29
	← akushner_ left	02:30
	← harish left	02:30
	← LBV_User left	02:30
	→ githogori joined	02:31
	→ Oog joined	02:32
	→ nvahalik joined	02:32
	→ livingstn joined	02:34
	→ lindenle_ joined	02:36
	← lindenle left	02:36
	← aidalgol left	02:36
	← gfixler left	02:37
	→ aidalgol joined	02:37
	← kyle_444 left	02:39
	→ mizu_no_oto joined	02:41
	← lindenle_ left	02:42
	← Vampire0 left	02:43
	→ dreiss joined	02:44
	→ lindenle joined	02:44
	← ckim left	02:47
	→ harish joined	02:47
	← nidr0x left	02:50
	← lindenle left	02:50
	← pks left	02:51
	→ bb010g joined	02:51
	gitinfo set mode: +v	02:51
	→ QwertyDragon joined	02:51
	← peoliye_ left	02:51
	← ahr3n left	02:52
	← anth0ny left	02:52
	→ smithbone joined	02:52
	→ pks joined	02:53
	→ lindenle joined	02:53
	→ nidr0x joined	02:54
	→ hyperair joined	02:56
	← zacts left	02:56
Sasazuka	if there are multiple commits to a file, I actually need to cherrypick all the commits instead of just the latest right?	02:57
	→ ICantCook joined	02:58
ICantCook	I am finding the following command, does not ommit merges on 1 machine, but it does on the others:	02:58
	git log --no-merges -1	02:58
	was this introduced in a recent version of git?	02:58
preaction	Sasazuka: yes. cherry-pick works by applying changes. you could also checkout the file to the right version and then commit that	02:59
	← lindenle left	02:59
	→ zacts joined	02:59
	← nemix left	03:00
	→ nemix joined	03:00
	→ otter768 joined	03:00
	→ lindenle joined	03:01
	← IWishIKnew left	03:01
Sasazuka	preaction: thanks	03:03
	← italoacasas left	03:03
	→ mehola joined	03:04
	← chucky_z left	03:05
	← otter768 left	03:05
ICantCook	So when I use git version 1.8.3.msysgit.0	03:05
	← rubyonrailed left	03:05
ICantCook	the --no-merges flag for git-log does nothing	03:05
	← dreiss left	03:06
ICantCook	It will be tricky to upgrade that git install, will have to work at 3am on a Sunday, so I just want to make sure upgrading will fix this, if anyone knows	03:06
	← _ingo left	03:07
	← mehola left	03:08
	← lindenle left	03:10
	→ strayPuppy joined	03:11
aidalgol	Are worktrees a common sticking point for inexperienced (Git) users? We're transitioning to Git from Subversion at my workplace, and several people are complaining about "worktrees not working".	03:11
preaction	ICantCook: check the git changelog, or the git log of git	03:11
	→ lindenle joined	03:12
	← frem left	03:12
bremner	aidalgol: there a common complaint of svn users	03:12
preaction	ICantCook: https://git-scm.com/docs/git-log <- there's a dropdown with the version, check yours	03:12
aidalgol	bremner: worktrees, or git at all? :P	03:13
bremner	aidalgol: well, it's a special case of "this new tool is different from the old tool that I understand"	03:13
	in particular svn users miss having all the branches checked out at the same time	03:13
aidalgol	I suspected as much.	03:14
	bremner: Wait, that's what worktrees let you do.	03:14
bremner	aidalgol: well, I'm guessing. in normal git usage there is one worktree that people talk about. but there is some contrib tool that lets you have multiple worktrees	03:15
preaction	man git-worktree	03:15
gitinfo	the git-worktree manpage is available at http://jk.gs/git-worktree.html	03:15
aidalgol	I'm talking about the command git-worktree	03:15
preaction	no, it's core. it's just very very new	03:16
bremner	yep. same thing. maybe it moved out of contrib	03:16
aidalgol	preaction: heh, perfect timing for us	03:16
preaction	i've never heard of it, never used it, and can't see the need for it, really	03:16
	→ rubyonra_ joined	03:17
preaction	but then i also learned the hard way multiple times that branches in svn aren't	03:17
	they're just directories	03:17
	← Oog left	03:17
	→ hahuang61 joined	03:17
aidalgol	preaction: We're often working on multiple branches, so we want to keep the build artefacts around, which simply switching a single checkout between branches won't let us do.	03:18
	← s00pcan left	03:18
	→ arescorpio joined	03:18
aidalgol	And our codebase is massive, so it's impractical to just make a second clone.	03:18
	→ watabou joined	03:18
	→ mhg joined	03:19
preaction	so they dont work, you'll likely have to find the right place to submit a bug report. if it's in core, i'd guess the mailing list, but i don't know	03:19
	→ Walex joined	03:19
	→ s00pcan joined	03:20
	← sbogg left	03:20
aidalgol	preaction: No, they work; the users don't. :P	03:21
	← rubyonra_ left	03:21
	← hahuang61 left	03:22
bremner	aidalgol: yes, write the mailing list with a test case, they're pretty helpful in my experience	03:23
	← lindenle left	03:23
bremner	oic. Well, can't help you with PEBKAC	03:23
aidalgol	haha! sorry, I should have been clearer what I meant by "not working".	03:24
	← _cyril_ left	03:25
	→ lindenle joined	03:25
preaction	maybe introduce them to git bisect or git grep to show them shiny things that svn could never usefully do?	03:26
	← waveclaw left	03:26
	→ dreiss joined	03:27
	→ tmcmahon joined	03:27
aidalgol	It's just growing pains. They're not being obstinate. I was just wondering whether git-worktree is a common tripping point for new users, but seeing as it's only just made its way into core, probably not.	03:27
preaction	yeah, nope. it seems like a thing for a certain, uncommon use-case	03:28
aidalgol	Yeah, plenty of those there.	03:28
	We even managed to break Subversion merging several times, because of our crazy workflow(s).	03:29
	← atomicb0mb left	03:29
	→ rubyonrailed joined	03:30
	→ jonmorehouse joined	03:31
	→ waveclaw joined	03:31
	→ CKyle joined	03:31
	← dreiss left	03:32
	→ _cyril_ joined	03:34
	→ Geo joined	03:35
	← rubyonrailed left	03:35
	← CEnnis91 left	03:35
	→ arup_r joined	03:36
Geo	Hi, I was doing a commit and got overzealous in adding files, and added a file that should not have been part of a commit. I have pushed the commit, with the extra file, to my upstream repo. How do I revert the changes to that file that should not be part of the original commit?	03:36
	→ funfunctor joined	03:37
preaction	!revert	03:37
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	03:37
	→ ncthom91 joined	03:38
	← CKyle left	03:39
Geo	the code base has moved several commits into the future between me realizing this	03:39
	→ CKyle joined	03:40
Geo	so i cant straight go back to it, I'll loose the other stuff	03:40
	let me read up more on revert though, thanks for that	03:40
	← cagmz left	03:40
Geo	can I use revert to move those changed files back to the staging area?	03:41
	← CKyle left	03:41
	← lindenle left	03:42
preaction	you use revert to create a commit that undoes all or part of a previous commit. you can pass the -n option to stage but not commit	03:42
	→ CKyle joined	03:42
preaction	but you're still going forwards, not backwards	03:42
Geo	Thats the thing though, I need to keep 98% of the rest of the commit	03:43
	its just the changes to a single file that need to come out	03:43
	*single file of that commit, that shouldn't have been included	03:43
	I'll keep reading, it sounds like its possible from what you said	03:44
preaction	that's why i mentioned the -n flag	03:44
	→ shinenelson joined	03:45
preaction	or, even if the commit happens, it's local until you push it. you can reset it	03:45
	→ lindenle joined	03:45
Geo	yep, thank you	03:45
	← CKyle left	03:47
	← nidr0x left	03:47
	→ nbdy joined	03:48
	→ peoliye joined	03:49
	← nbdy left	03:50
	→ nbdy joined	03:50
	← lindenle left	03:50
	→ lindenle joined	03:51
	← diegoviola left	03:51
	→ CEnnis91 joined	03:52
	← yqt left	03:53
	← waveclaw left	03:54
	→ waveclaw joined	03:55
	← lindenle left	03:57
	→ lindenle joined	03:57
	→ dreiss joined	03:57
	→ hahuang61 joined	03:58
	→ ffio joined	03:58
	→ gfixler joined	03:58
	→ robot joined	03:59
	← Vivekananda left	04:01
	→ ratanparai joined	04:02
	← Geo left	04:02
	← joki left	04:02
	← daito left	04:02
	← Sasazuka left	04:02
	← funfunctor left	04:04
	← fscala left	04:05
	→ lethjakman-l joined	04:06
	← lindenle left	04:07
	← tmcmahon left	04:07
	→ joki joined	04:09
	→ fscala joined	04:09
	→ lindenle joined	04:09
	→ devoldmx joined	04:10
	← xtun left	04:12
	← Evey_Hammond left	04:13
	→ user6342 joined	04:14
	→ kp666 joined	04:15
	← aidalgol left	04:18
	← lindenle left	04:18
	→ jteneyck joined	04:19
	← jteneyck left	04:19
	→ jteneyck joined	04:19
	← harish left	04:19
	→ lindenle joined	04:19
	→ jstimm joined	04:20
	← ncthom91 left	04:22
	← jonmorehouse left	04:23
	← dreiss left	04:24
	→ funfunctor joined	04:25
	→ jteneyck_ joined	04:26
	→ s8321414 joined	04:26
	→ lindenle_ joined	04:26
	← lindenle left	04:26
	← jteneyck left	04:29
	→ ixjlyons joined	04:29
	→ DWestCoast joined	04:31
	→ harish joined	04:32
	← _cyril_ left	04:32
	→ Motoko joined	04:33
	← lindenle_ left	04:33
	→ lindenle joined	04:33
	← lethjakman-l left	04:34
	→ jonmorehouse joined	04:35
	→ eka joined	04:35
	← ascarter left	04:36
	← FireArrow133 left	04:37
	← systmkor left	04:38
	→ mehola joined	04:38
	← lindenle left	04:39
	← ratanparai left	04:40
	→ xtun joined	04:40
	→ lindenle joined	04:41
	← mizu_no_oto left	04:41
	← peoliye left	04:41
	→ peoliye joined	04:42
	→ dtrott joined	04:44
	→ DolpheenDream joined	04:45
	→ dreiss joined	04:45
	← lindenle left	04:46
	→ lindenle joined	04:47
	→ _cyril_ joined	04:47
	→ daito joined	04:48
	→ Manikandan joined	04:49
	← jstimm left	04:51
	← DWestCoast left	04:51
	← sdothum left	04:52
	← lindenle left	04:53
	← ixjlyons left	04:53
	← axelunicorn left	04:54
	→ lindenle joined	04:55
	→ axelunicorn joined	04:55
	→ Lyqyd joined	04:55
	→ ncthom91 joined	04:56
	→ sssilver joined	04:57
	← ncthom91 left	05:00
	← lindenle left	05:01
	→ otter768 joined	05:02
	← sheilong left	05:02
	→ subhojit777 joined	05:02
	← _cyril_ left	05:03
	← subhojit777 left	05:03
	→ subhojit777 joined	05:04
	→ lindenle joined	05:06
	← otter768 left	05:06
	← kp666 left	05:07
	← checkItO_ left	05:08
	← zacg left	05:13
mhg	hi guys, how could i ignore all files in a directory execpt one file? (There is a specific use case for this)	05:13
	← rnsanchez left	05:13
ojacobson	by doing exactly that	05:13
	ignore all files, and then either unignore the one file (man gitignore) or `git add --force` the one file (since git will never ignore tracked files).	05:14
gitinfo	the gitignore manpage is available at http://jk.gs/gitignore.html	05:14
	← sssilver left	05:14
	← presto left	05:14
	→ sssilver joined	05:14
	← livingstn left	05:15
mhg	ojacobson: Thanks guys, let me do this.	05:15
	← lindenle left	05:15
mhg	It's solved. Thanks again.	05:16
	→ jstimm joined	05:17
	← sssilver left	05:17
	→ ayaz joined	05:18
	→ rubyonrailed joined	05:19
	← sparetire_ left	05:19
	← DolpheenDream left	05:20
	← axelunicorn left	05:20
	→ lindenle joined	05:21
	→ Sasazuka joined	05:23
	→ sssilver joined	05:26
	← lindenle left	05:26
	→ robbyoconnor joined	05:27
	→ lindenle joined	05:28
	← harish left	05:28
	→ harish joined	05:29
	→ DanZ3 joined	05:29
	← jteneyck_ left	05:32
	→ lindenle_ joined	05:33
	← lindenle left	05:33
	← nilg left	05:37
	→ lindenle joined	05:38
	→ Sleepy63 joined	05:38
	← lindenle_ left	05:38
	→ derpvid joined	05:38
	← ribasushi left	05:39
	← sssilver left	05:39
	→ LucyParsons joined	05:39
	← devoldmx left	05:39
	→ checkItOut joined	05:39
	← Sleepy63_ left	05:40
	→ ixjlyons joined	05:42
	← lindenle left	05:43
	→ lindenle joined	05:43
	← holodoc left	05:43
	→ holodoc joined	05:47
	← lindenle left	05:48
	→ ayaz_ joined	05:49
	← ayaz_ left	05:49
	→ sssilver joined	05:49
	← murky left	05:49
	→ ValF joined	05:50
	← mkoskar left	05:51
	→ ribasushi joined	05:51
	→ lindenle joined	05:51
	← daito left	05:51
	→ daito joined	05:51
	→ josuebrunel joined	05:52
	← arescorpio left	05:53
	← xtun left	05:54
	→ overcast joined	05:54
	← sssilver left	05:54
	→ zhiwliu joined	05:54
	← zhiwliu left	05:55
	← lindenle left	05:55
	→ lindenle joined	05:55
	→ sssilver joined	05:57
	← josuebrunel left	05:57
	→ _cyril_ joined	05:59
	← arup_r left	05:59
	← lindenle left	06:00
	→ yes`r joined	06:00
	→ arup_r joined	06:00
	→ josuebrunel joined	06:01
	→ MechtiIde joined	06:01
	← funfunctor left	06:02
	← hackel left	06:02
	← Lyqyd left	06:02
	avgn5 doesn't understand why one would want to use something like git for anything other than text based files, as you can't really diff binary files.	06:02
	→ lindenle joined	06:02
	← lindenle left	06:03
	← _cyril_ left	06:04
	→ funfunctor joined	06:04
Motoko	avgn5 some tools can	06:04
	← arup_r left	06:05
Motoko	Also, still useful for versioning things.	06:05
ojacobson	avgn5: git doesn't process diffs internally, so git-the-version-system isn't affected by it	06:06
dtrott	And good if you have the same blob(s) in multiple locations	06:06
ojacobson	if you have an external tool that can usefully compare complete copies of a file with one another, then git can invoke those (see man git-mergetool and man git-difftool)	06:06
gitinfo	the git-mergetool manpage is available at http://jk.gs/git-mergetool.html	06:06
	the git-difftool manpage is available at http://jk.gs/git-difftool.html	06:06
avgn5	Motoko: How can one version binary files in a useful way? I mean with format-specific diff tools, I can see it being more useful. Not sure if git actually allows for something like that (plugins?)	06:07
	oh	06:07
ojacobson	Sometimes it's enough to track _that_ something changed, and to be able to recover old versions.	06:07
	← Nikhil_D left	06:07
Motoko	Git allows external diff tools.	06:07
ojacobson	(eg. certificates, thinking in terms of a config management system tracked in Git.)	06:07
Motoko	I use Kaleidoscope (OS X application) for that.	06:07
	← dreiss left	06:07
ojacobson	Yeah, KS is nice for a lot of formats.	06:07
	The KS image diff is fantastic. :)	06:07
	← Manikandan left	06:08
Motoko	And what ojacobson said. Sometimes it's worthwhile to just know that something changed.	06:08
avgn5	Ok that's pretty damn cool. I didn't realize that git was rather modular like that.	06:08
Motoko	Like, say, an external library binary.	06:08
ojacobson	It its core, git stores snapshots of your project and lets you navigate the relationships between those snapshots	06:08
	→ Nikhil_D joined	06:08
ojacobson	everything else is UI chrome :)	06:08
avgn5	Ah.	06:08
	← DaddyEric left	06:09
	← sssilver left	06:09
avgn5	Knowing this, I randomly wonder if anyone has used git to track changes in an SQL type database or so.	06:09
ojacobson	other systems -- mercurial, svn, and a few others -- do store diffs internally, but they tend to store binary diffs, and synthesize textual diffs as needed, rather than storing textual diffs directly	06:10
avgn5	(Not counting exporting the whole thing to .sql files)	06:10
ojacobson	Might work for something like sqlite or derby, but not going to work well for a real dbms	06:10
avgn5	ah	06:10
	ojacobson: Yeah... for something like Oracle or even mysql, it'd imagine there'd be a big impact on performance?	06:11
	→ sssilver joined	06:11
ojacobson	postgres, for example, emits and discards gigabytes of transaction logs per hour on a moderately-busy database. The total transaction log on disk is usually only tens of megabytes (maybe a bit longer if there's replication involved), but if you stored that in Git, you'd store all the historical transaction logs forever	06:11
	long after they're of any use to anyone	06:11
	→ settermjd joined	06:12
ojacobson	(and the bare tuple pages are more or less useless without the most recent transaction logs, unless you stop the server entirely)	06:12
avgn5	ojacobson: And probably be eating disk space like world is going to end.	06:12
	→ arup_r joined	06:12
ojacobson	Oh my yes.	06:12
	Git uses zlib, but even so, versioning postgres data _usefully_ in it would either mean writing some kind of export system (pg_dump, sql files, or something else) or storing far more data than is actually useful simply to satisfy git's expectations.	06:13
	← s8321414 left	06:14
dtrott	or hacking git into the storage engine of Postgres …	06:14
ojacobson	MySQL's even worse, in some ways: if you take a disk snapshot of a MySQL db in mid-transaction, the InnoDB (or, yick, MyISAM) files are inconsistent and you need the undo log to make sense of them.	06:14
	Postgres avoids that specific problem by creating new tuples instead of overwriting tuples in place, but you still need the WAL to make sense of which tuples are visible and which tuples are not	06:15
avgn5	So yeah, source-code style versioning isn't useful for every kind of format. I would anything that can reliably broken down into logical chuncks and "diff"ed in some way makes sense, but things that change rapidly or are really dynamic in nature, aren't.	06:15
ojacobson	Yeah. Source control systems embed the assumpion that there's a meaningful time to stop making changes for long enough to record the state of the project.	06:16
	In a database -- especially under concurrent load -- that never happens	06:16
	→ tildes joined	06:16
avgn5	I think another way to put it, is versioning seems to work best for formats users directly alter, rather than things machines modify (often.)	06:17
ojacobson	That's a sane way of looking at it.	06:17
	→ Lor_ joined	06:17
ojacobson	FWIW most DBMS sysems already know how to return to a point in the past anyways	06:17
avgn5	ojacobson: I like how you put it, "that there's a meaningful time to stop making changes for long enough to record the state of the project."	06:17
ojacobson	Postgres and MySQL both have point-in-time recovery capabilities built into their replication and transaction log systems.	06:18
	Postgres even supports divergent histories, though not merging.	06:18
Motoko	avgn5: http://www.apexsql.com/sql_tools_source_control.aspx	06:18
avgn5	ojacobson: Yeah there's that. No need to to run an external versioning system on a system that already has a similar concept integrated into it.	06:18
	→ Ceber joined	06:18
Motoko	Maybe what you were thinking of?	06:18
avgn5	Oh wow.	06:18
ojacobson	I tend to use liquibase or flyway for versioning database schemata, and to store the migration steps in Git	06:19
Motoko	Tracks structure, not data. Probably can track seed data.	06:19
ojacobson	I don't version the _data_, just the schema	06:19
avgn5	Motoko: That's pretty cool. I didn't think such a thing actually existed, as this was really just a random though. Always nice to be pleasantly surprised by human ingenuity.	06:19
	→ Manikandan joined	06:19
	→ SimonNa joined	06:20
ojacobson	There's an entire pragmatic press book about versioning databases :)	06:20
	← geoid left	06:20
Motoko	You could also do things like manage databases in a Visual Studio project, which can be managed with Git.	06:20
avgn5	ojacobson: Yeah exactly, versioning a database's structure makes sense, in the same way a C header file would.	06:20
	It is nice to know that there are so many possibilities.	06:21
ojacobson	Oops, I lied, it's Addison-Wesley, not prag press: http://www.amazon.com/Refactoring-Databases-Evolutionary-paperback-Addison-Wesley/dp/0321774515	06:22
	christ, it's almost a decade old now? I feel ancient. :)	06:22
	← tristanp_ left	06:24
	→ Macaveli joined	06:24
	← settermjd left	06:25
	→ tristanp joined	06:25
	← tristanp left	06:25
	← phantombeta left	06:26
	← sekrit left	06:26
avgn5	ojacobson: Addison-Wesley? I remember text books by them all the way back to when I was first learning arithmatic.	06:27
	→ sekrit joined	06:28
	→ boombatower joined	06:28
	← user6342 left	06:28
	→ rclanan_ joined	06:28
	← rclanan left	06:30
	← MechtiIde left	06:31
	← Gamecubic left	06:34
	→ nidr0x joined	06:36
	→ noyb joined	06:36
	← Exagone313 left	06:37
	← dtrott left	06:37
	→ liri_ joined	06:37
	← qpok left	06:38
	← tjbp left	06:38
	← de-vri-es left	06:38
	← Fiouz left	06:38
	← _rgn left	06:38
	← dsop left	06:38
	→ qpok joined	06:39
	← MeltedLux left	06:39
	→ MeltedLux joined	06:39
	→ mkoskar joined	06:39
	→ dsop joined	06:39
	→ _rgn joined	06:39
	→ Fiouz joined	06:39
	→ de-vri-es joined	06:39
	→ Corneliu joined	06:40
	→ tjbp joined	06:40
	← ionelmc left	06:40
	→ Exagone313 joined	06:41
	→ dickdaley joined	06:41
	← akiva left	06:41
	→ ionelmc joined	06:41
	← hahuang61 left	06:44
	→ akushner joined	06:44
	→ ThomasLocke joined	06:44
	→ xtun joined	06:47
	→ InfoTest joined	06:47
	→ Seveas joined	06:47
	← funfunctor left	06:48
	← strayPuppy left	06:48
	→ jetpackjoe joined	06:49
	→ mingwandroid joined	06:54
	← sssilver left	06:54
	← mingwandroid left	06:55
	← xtun left	06:57
	→ Junior joined	06:57
	← Corneliu left	06:59
	← Motoko left	07:00
	→ _cyril_ joined	07:00
Junior	yello! :)	07:00
	← tildes left	07:00
	→ Kicer86 joined	07:01
	→ sssilver joined	07:02
	→ bjpenn joined	07:02
	→ otter768 joined	07:02
bjpenn	can i git clone a repo within a local repo i have	07:03
	and commit it as code in my repo?	07:04
	→ lindenle joined	07:04
bjpenn	i tried to make it a submodule, but i want to be able to make changes to it, and distribute my repo	07:04
	← _cyril_ left	07:04
	← josuebrunel left	07:06
	← peoliye left	07:06
	→ tvw joined	07:07
	← otter768 left	07:07
	← lindenle left	07:08
	→ peoliye joined	07:10
	← Lor_ left	07:10
	→ nnyk joined	07:15
	→ alex_ joined	07:16
	duckson- → duckson_	07:16
	duckson_ → duckson	07:17
	← alex_ left	07:17
	→ rnsanchez joined	07:17
	kzisme → kzisme[away]	07:18
	→ roelmonnens joined	07:18
	← Wetmelon left	07:18
	← _nadim left	07:19
	← QwertyDragon left	07:19
	→ Karkus joined	07:19
	← InfoTest left	07:20
	→ dreiss joined	07:21
	← twb left	07:21
	→ MrWoohoo joined	07:21
	→ MrWoohoo2 joined	07:21
	← ffio left	07:22
	→ acolson joined	07:23
	→ ffio joined	07:24
	← Manikandan left	07:25
	← sssilver left	07:25
	← dickdaley left	07:25
	→ viod joined	07:25
	→ sssilver joined	07:25
	← Corosus left	07:26
	→ Corosus joined	07:27
	→ geoid joined	07:28
	→ scarabx joined	07:28
	← jaeckel left	07:30
	← jcooke left	07:31
	→ z8z joined	07:32
viod	hi! i can't seem to have gitattributes work, my branch-specific files keep being merged, and i don't understand why. Here's an example session: http://pastebin.com/Jq6Vnkpq	07:33
	→ settermjd joined	07:33
viod	I've already done "git config --global merge.ours.driver true"	07:33
	← jonmorehouse left	07:33
	→ encod3 joined	07:34
viod	anyone knows what i missed? thanks in advance!	07:34
	just in case it matters, i'm using git 2.6.2	07:35
	→ Anderson69s joined	07:36
	→ devoldmx joined	07:36
	← tpollard left	07:37
	→ xtun joined	07:37
	← z8z left	07:37
	→ Manikandan joined	07:37
	→ Alienpruts joined	07:38
	← NeverDie left	07:38
	→ sssilver_ joined	07:40
	← sssilver left	07:40
	→ josuebrunel joined	07:40
	← devoldmx left	07:41
	← pamplemousse left	07:43
	→ Sceorem joined	07:44
	→ skylite joined	07:45
	→ jaeckel joined	07:45
	→ User458764 joined	07:45
	← encod3 left	07:46
guardian	hello, how does git decide to not warn against Makefiles when tab-in-indent is active?	07:46
	← ixjlyons left	07:47
	→ Flyingmana joined	07:48
	← thiago left	07:49
	← bjpenn left	07:50
	← Karkus left	07:51
	← nnyk left	07:51
	← peoliye left	07:51
	→ ShapeShifter499 joined	07:52
	→ TomyWork joined	07:52
	← ffio left	07:53
	← scarabx left	07:54
	← geoid left	07:54
	→ scarabx joined	07:54
	← sssilver_ left	07:54
	← josuebrunel left	07:57
	→ xaa joined	07:57
	← HarryHallman left	07:58
	← harish left	07:59
	→ rixx joined	08:00
	→ DaddyEric joined	08:00
	gitinfo set mode: +v	08:00
	→ sssilver joined	08:02
	→ Nizumzen joined	08:03
	← j416 left	08:03
	→ David1977 joined	08:05
	→ jnavila joined	08:05
	→ ratanparai joined	08:06
	→ Fijit joined	08:06
	← e7d left	08:08
	→ e7d joined	08:08
	← DanZ3 left	08:08
	← arup_r left	08:10
	→ DanZ3 joined	08:10
guardian	nevermind, it seems by default it never applies tab-in-indent and .gitattributes is supposed to enable it on patterns	08:11
	→ lb joined	08:11
	→ roxlu joined	08:11
	← ratanparai left	08:11
	→ ratanparai joined	08:11
	→ ffio joined	08:12
	← DaddyEric left	08:12
	← ratanparai left	08:12
	← sssilver left	08:12
	→ ratanparai joined	08:13
	← ratanparai left	08:13
	→ ratanparai joined	08:13
	← DanZ3 left	08:13
	← noyb left	08:13
	→ [Brain] joined	08:13
	→ monthy joined	08:14
	→ dc5ala joined	08:16
	← Anderson69s left	08:17
	← diogenese left	08:18
	← tonyj left	08:18
	→ diogenese joined	08:18
	→ julius joined	08:19
julius	hi	08:19
	→ jay-m joined	08:19
julius	when using " git mergetool -t meld", i put all the changes from the left file in the middle one and the changes from the right one to the middle one. right?	08:19
	← Corosus left	08:20
julius	after doing that and saving i still got a .orig file floating around....why is that one not deleted?	08:20
	→ noyb joined	08:20
	← kadoban left	08:21
	→ sssilver joined	08:21
	← jay-m left	08:23
	← dreiss left	08:23
	→ jay-m joined	08:24
	← Fijit left	08:24
	← rasto left	08:24
	→ josuebrunel joined	08:25
	← indieross left	08:25
	← th0m__ left	08:26
	← Macaveli left	08:26
	→ aspiers joined	08:26
	→ Macaveli joined	08:26
	← akushner left	08:28
	→ dreiss joined	08:28
	← sssilver left	08:28
	→ indieross joined	08:29
	→ sssilver joined	08:30
	→ Hounddog joined	08:31
	← jetpackjoe left	08:31
	→ rominronin joined	08:31
	→ PCatinean joined	08:32
	← markelite left	08:33
	← SegFaultAX left	08:33
	← Eugene left	08:33
	← blackjid left	08:33
	→ nettoweb joined	08:33
	→ SegFaultAX joined	08:34
	→ markelite joined	08:34
	→ _nadim joined	08:35
	→ Eugene joined	08:35
	→ blackjid joined	08:36
	← rubyonrailed left	08:36
osse	julius: you can set 'git config --global mergetool.keepBackup false'	08:37
	← watabou left	08:37
	→ rasto joined	08:38
	→ HarryHallman joined	08:38
	→ psprint joined	08:38
psprint	Hello. I changed password on GitHub. How to update password in my already cloned repository?	08:38
	← sssilver left	08:39
qsuscs	psprint: did you clone via SSH or HTTPS?	08:40
	→ rubyonrailed joined	08:41
julius	osse, ah ok. so its a option	08:42
	← monthy left	08:42
	→ DaddyEric joined	08:43
	→ dvaske joined	08:43
psprint	qsuscs: https	08:44
	→ boxrick1 joined	08:44
	← dreiss left	08:44
	→ sssilver joined	08:45
psprint	qsuscs: should I do git credential-osxkeychain erase? My os is os x	08:46
	← noyb left	08:46
	← maxorator left	08:47
qsuscs	shrug no idea about os x	08:48
	→ dvaske_ joined	08:48
	← gravitron left	08:48
psprint	qsuscs: I found git help page and it worked https://help.github.com/articles/updating-credentials-from-the-osx-keychain/	08:48
	← dvaske left	08:49
	→ maxorator joined	08:50
	→ gravitron joined	08:50
	→ doener joined	08:51
	← surfdue left	08:52
	→ funfunctor joined	08:53
	→ courrier_ joined	08:54
	→ clmsy joined	08:55
	← oojacoboo left	08:56
	← yes`r left	08:56
	→ surfdue joined	08:57
	→ oberststen joined	08:59
	→ dantix__ joined	09:00
	← sssilver left	09:01
	→ encod3 joined	09:01
	← johan_sun left	09:01
	→ sssilver joined	09:02
	→ mykespb joined	09:02
	→ johan_sun joined	09:02
	→ kurkale6ka joined	09:03
	→ _cyril_ joined	09:03
	→ otter768 joined	09:03
	→ Balliad joined	09:03
	← beckyconning_ left	09:04
	← rclanan_ left	09:05
	← stemid left	09:05
	← CEnnis91 left	09:05
	→ yes`r joined	09:05
	← jzk left	09:05
	← rnsanchez left	09:05
	← Sasazuka left	09:06
	→ jnavila_ joined	09:06
	→ PeterBooker joined	09:06
	→ exarch__ joined	09:07
	← jnavila left	09:07
	← oberststen left	09:07
	→ _ingo joined	09:07
	← _cyril_ left	09:07
	← sssilver left	09:07
	→ howdoi joined	09:08
	← otter768 left	09:08
	← mykespb left	09:08
	→ elastix joined	09:10
	→ rnsanchez joined	09:12
	← dantix__ left	09:14
	→ dantix__ joined	09:14
	→ oberststen joined	09:15
	→ jzk joined	09:15
	← elastix left	09:15
	→ opencard joined	09:16
	← dantix__ left	09:17
	→ dantix__ joined	09:17
	← jnavila_ left	09:18
	→ marcogmonteiro joined	09:22
	← Hounddog left	09:23
	→ wwwald joined	09:23
	→ Hounddog joined	09:23
	← joshsyn left	09:24
	← liri_ left	09:27
	→ tristanp joined	09:27
	← madewokherd left	09:29
	← ShapeShifter499 left	09:29
	← daito left	09:30
	← tristanp left	09:32
	→ Imaginativeone joined	09:32
	← Macaveli left	09:34
	→ troulouliou_div2 joined	09:34
	→ mwhooker joined	09:34
	← scarabx left	09:35
	← oberststen left	09:36
	→ tayfun joined	09:37
	→ devoldmx joined	09:37
	← tvw left	09:37
	→ xfbs joined	09:38
	← justanotheruser left	09:38
	← xfbs left	09:39
	← dantix__ left	09:39
	→ dantix__ joined	09:39
	→ xfbs joined	09:39
	→ geoid joined	09:40
	→ justanotheruser joined	09:41
	← devoldmx left	09:42
	→ sbasso joined	09:43
	→ alkino joined	09:44
alkino	hi o/	09:44
	→ achadwick joined	09:44
alkino	I was hoping that this new version of git could have fixed the translation problems of gitk. But no :( WHy?	09:44
	→ harish joined	09:45
	← derpvid left	09:46
	absence_ → absence	09:47
	→ Macaveli joined	09:48
	→ s8321414 joined	09:50
	→ permalac joined	09:50
	← justanotheruser left	09:50
	← Macaveli left	09:50
	→ justanotheruser joined	09:50
	→ Macaveli joined	09:52
	← bronson left	09:53
	← rubyonrailed left	09:53
	→ zeroed joined	09:54
	← xaa left	09:54
	→ xaa joined	09:55
Kartagis	https://github.com/paradigm/dotfiles/blob/master/.gitconfig#L6 what does this do?	09:56
	→ Jackneill joined	09:56
Kartagis	alkino: people are lazy?	09:56
ykrons	Hello, I'm trying to extract a subfolder in a new git repo to create a subtree. My problem is that the folder as been rename so I don't know how to user filter-branch to keep history before and after renaming. Any idea?	09:56
alkino	Kartagis: it have already been fixed in gitk IIRC	09:57
Kartagis	alkino: laziness?	09:58
	I mean laziness has been fixed?	09:58
alkino	Kartagis: the bug with translations.	09:58
	← ayaz left	09:58
	→ Oog joined	10:01
	← wxg left	10:02
	← e7d left	10:03
	→ _cyril_ joined	10:03
	← mwhooker left	10:04
	← rominronin left	10:04
	→ LeRieur joined	10:06
	→ stuivi joined	10:06
	→ lindenle joined	10:07
	← boombatower left	10:08
	← _cyril_ left	10:08
	← Hounddog left	10:08
	← reim left	10:08
	→ reim joined	10:09
	→ Hounddog joined	10:11
	← lindenle left	10:11
	→ jnavila_ joined	10:12
	← Hounddog left	10:13
	→ Hounddog joined	10:13
	→ jnavila__ joined	10:15
	← Hounddog left	10:16
	tyll_ → tyll	10:16
	→ Hounddog joined	10:16
	← jnavila_ left	10:16
	→ mwhooker joined	10:17
	← Hounddog left	10:19
	→ Hounddog joined	10:19
guardian	is there a way to reuse pretty formats specifiere when formatting message from plumbing commands?	10:19
	← ratanparai left	10:22
	← dantix__ left	10:22
	→ dantix__ joined	10:23
	← fscala left	10:23
	→ RaceCondition joined	10:24
	← Hounddog left	10:24
	← dantix__ left	10:25
	→ dantix__ joined	10:25
	← funfunctor left	10:25
	→ fscala joined	10:26
	← dantix__ left	10:26
	→ dantix__ joined	10:26
	→ rjvb joined	10:27
rjvb	a good late CET morning to ye'all	10:28
	← Nizumzen left	10:28
	← mehola left	10:29
rjvb	hopefully quick question: is there a configuration setting or best practice to include an organisation name, or anything else that could be used to indicate from what host one made a given commit?	10:29
	→ mehola joined	10:30
	← jay-m left	10:31
	→ daito joined	10:31
rjvb	I may be the only one thus limited, but I get automatic merges that I cannot explain because I cannot remember what I might have done on my only other development host that could have made a merge necessary ...	10:31
alkino	rjvb: do you often code drunk?	10:32
	→ funfunctor joined	10:32
	← xaa left	10:32
rjvb	no, but while drinking tea all the time	10:33
	← barq left	10:33
	→ barq joined	10:33
	← barq left	10:33
	→ barq joined	10:33
	→ jay-m joined	10:33
	→ xaa joined	10:33
Seveas	alkino: it'll be in the next release.	10:33
alkino	Seveas: ok, thanks ;)	10:33
	I'm disappointed, but it's life \o/	10:33
Seveas	you can use the development version :)	10:34
rjvb	is that "it" related to what I asked or to something I just put my foot in?	10:34
	← mehola left	10:34
	→ Hounddog joined	10:34
Seveas	rjvb: if you set user.name and user.email to something not related to your organization, nothing identifying your organization is in the commit.	10:35
	← daito left	10:35
alkino	rjvb: nothing related with you;)	10:35
Seveas	Kartagis: man git-config, search for alias.*	10:36
gitinfo	Kartagis: the git-config manpage is available at http://jk.gs/git-config.html	10:36
	← xfbs left	10:36
Seveas	ykrons: did you try git-subtree split?	10:37
	→ Element9 joined	10:37
rjvb	heh, of course. What I'm looking for is not really related to organisation of course; it's just that I could use an organisation hook to record it	10:37
	→ aswen joined	10:38
	← aswen left	10:38
rjvb	the alternative would be to put a "(from <host>)" string in my user.name, or a modified/different email address, both of which seem wrong	10:38
Seveas	guardian: that depends on the plumbing command, for instance for-each-ref accepts formats	10:38
	→ sanketdg joined	10:39
rjvb	ideally one could deduce this kind of metadata from a commit hash, but I don't suppose that's possible?	10:39
	← Hounddog left	10:39
	→ tvw joined	10:39
Seveas	rjvb: something something commit-msg hook something something interpret-trailers	10:40
	→ Hounddog joined	10:40
Seveas	not sure how to do it, but with those two, you should be able to auto add:' Committed-on: myhostname' to commit messages	10:40
rjvb	ah, yes, that could do the trick	10:40
	← reim left	10:41
Seveas	off to the manpages you go :) And if you get it working, please mail me the recipe (dennis@kaarsemaker.net), I'm quite curious to see if this would work :)	10:41
rjvb	so, ahem, those automatic "merge branch" events happen when I made a commit locally that I didn't push, and that don't cause a conflict when I pull?	10:41
Seveas	there's no such thing as an automatic merge branch event. Each merge is triggered by a human by doing git merge or git pull.	10:42
ykrons	Seveas, No I haven't tested this option. Did you know if renaming is managed?	10:42
Seveas	ykrons: I don't know, that's why I asked whether you tried :)	10:42
ykrons	Ok! I'll try it today and see, thanks	10:43
rjvb	seveas: I mean I get them when doing `git pull`. Not all the time, of course	10:43
Seveas	rjvb: pull = fetch + merge	10:43
rjvb	yep	10:44
Seveas	if you don't want the merge, then fetch+rebase or pull --rebase	10:44
	→ geri joined	10:44
guardian	Seveas: what I want is producing my own messages with colors, without reinventing the wheel, from a hook	10:44
	← Hounddog left	10:44
rjvb	it's not that I don't want the merge (I do, if it's required), I just don't always remember why it's required	10:44
	← RaceCondition left	10:44
	← dantix__ left	10:44
	→ Hounddog joined	10:44
Seveas	guardian: echo -e \033[1mHello world, I'm bold\033[m	10:45
	→ dantix__ joined	10:45
Seveas	guardian: those are ansi color codes. Wikipedia has a good article on them, including lists of which code to use for which color.	10:45
rjvb	I'm guessing that they can be explained by helping me recall that I forgot to push a given commit	10:45
Seveas	rjvb: !lol may interet you	10:45
gitinfo	rjvb: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:45
	→ aswen joined	10:46
	← Hounddog left	10:46
	→ Hounddog joined	10:46
guardian	Seveas: thanks	10:47
	← aswen left	10:48
	→ nilg joined	10:48
rjvb	gitinfo: heh, that one always has me looking for ascii cows (if you're old enough to get the reference ;))	10:48
	→ aswen joined	10:49
	← jnavila__ left	10:49
rjvb	seveas: I think commit.template is all that's required for my purpose, should have thought of that myself	10:49
	← Hounddog left	10:49
	→ Hounddog joined	10:50
Seveas	rjvb: https://github.com/seveas/dotfiles/blob/master/.bashrc.d/cow.sh	10:50
	← dantix__ left	10:51
Element9	git diff <hash>^ <hash> and git diff <hash-of-commit-I-see-in-log-is-its-parent> <hash> give different results. the commit <hash> commit does have two parents. in was circumstances can this happen?	10:51
	→ dantix__ joined	10:51
	→ ratanparai joined	10:52
	← ratanparai left	10:52
	→ ratanparai joined	10:52
qsuscs	Element9: a merge	10:52
Element9	*the <hash> commit DOESN'T have two parents	10:52
	sorry, i made a typo	10:52
	→ reim joined	10:52
Element9	it doesn't have two parents	10:52
	can it still be a merge commit?	10:52
	→ kam270 joined	10:53
qsuscs	no. zero parents -> root commit, >1 parents merge commit	10:53
	→ rominronin joined	10:53
rjvb	seveas: yeah, I guess so; despite my evident memory failures :) I recall txt documents from a former era that were a list of ascii cows. cowsay must have evolved from that, blind watchmaker fashion :)	10:53
Element9	any ideas why this two ways of doing diff is giving different results?	10:53
	→ bronson joined	10:54
	← tvw left	10:55
	← Oog left	10:55
	← jab416171 left	10:57
	← bronson left	10:58
	← aswen left	10:58
	→ mischat joined	10:59
	← salamanderrake left	11:00
	← Hounddog left	11:00
	← kam270 left	11:01
	→ nephyrin` joined	11:01
	← troulouliou_div2 left	11:02
	→ naitsirhc_ joined	11:02
	→ nfk\|laptop joined	11:02
	→ twem2 joined	11:02
	→ ironGian1 joined	11:03
	→ salamanderrake joined	11:03
	← sarri left	11:03
	→ othll0 joined	11:03
atrigent	Element9: are you sure the thing you're seeing in git log is actually its parent or might it just be the one that is listed before it?	11:03
	← nephyrin left	11:03
atrigent	you can do git rev-parse <hash>^ to show you what it is getting for <hash>^	11:03
	← naitsirhc left	11:03
atrigent	or you could do git log --graph to show you more precisely what is the parent of what	11:03
	← BrianBlaze420 left	11:03
	← twem2_ left	11:03
	← ironGiant left	11:03
Element9	it's listed before it	11:04
	→ otter768 joined	11:04
Element9	i thought if it's listed before it, it's its parent	11:04
	→ BrianBlaze420 joined	11:04
atrigent	ok, well unless your history is strictly linear, git log will show stuff from multiple lines of development	11:04
	do git log --graph to visualize that	11:05
	← skynxnex left	11:05
	→ sarri joined	11:05
	→ jab416171 joined	11:05
atrigent	there are also gui programs like gitk for visualizing that	11:05
	→ robot__ joined	11:07
	→ Hounddog joined	11:07
	← robot left	11:08
	← dantix__ left	11:08
	← otter768 left	11:08
Element9	yeah, i'll use a gui to understand what's happening	11:08
	thanks	11:08
	→ dantix__ joined	11:09
atrigent	well, did --graph not help?	11:09
	they show you pretty similar things	11:09
	← dantix__ left	11:11
	→ dantix__ joined	11:11
	→ DaddyEric_ joined	11:12
	→ Darcidride joined	11:12
	← jay-m left	11:12
	→ jay-m joined	11:13
	← LeRieur left	11:14
	→ johtso joined	11:14
	← DaddyEric left	11:16
	← madhakish left	11:17
	← mwhooker left	11:18
	→ InfoTest joined	11:18
	→ kam270 joined	11:18
	← xtun left	11:18
	→ bollullera joined	11:19
	← Knyght left	11:19
	→ madhakish joined	11:20
	→ fracting1 joined	11:21
	→ Roze joined	11:21
	← opencard left	11:22
	→ nadim joined	11:22
	← _nadim left	11:22
	← salamanderrake left	11:22
Imaginativeone	is it possible to change my working directory?	11:22
	← jay-m left	11:23
	→ xtun joined	11:24
_ikke_	change it in what sense?	11:24
	→ hfp__work joined	11:24
	← geoid left	11:25
	← hfp_work left	11:25
	← tg left	11:25
	hfp__work → hfp_work	11:25
	→ salamanderrake joined	11:26
Imaginativeone	My working directory is currently: H:\working_copiesme	11:26
	My working directory is currently: H:\working_copies_me	11:26
	→ skynxnex joined	11:26
Imaginativeone	I would like it to be: S:\app\me	11:27
	→ sdothum joined	11:27
Imaginativeone	How do I make that change?	11:27
atrigent	copy it?	11:28
	or move it?	11:28
_ikke_	You can just move the directory	11:28
	git doesn't mind	11:28
atrigent	I think there's also some new thing with having multiple working directories, if that's what you want	11:28
	← aboseley left	11:29
atrigent	git worktree	11:29
Imaginativeone	I'm very new to git...	11:30
	My repository is in the former url, my files are in the latter	11:30
	I can't access my files with git at the moment; they are not visible in Egit	11:31
	← wwwald left	11:31
Imaginativeone	but if I could change the working directory, I could see them in the IDE	11:31
	→ fees joined	11:32
	→ mojibake joined	11:32
_ikke_	and is there a reason you cannot just move the entire repository?	11:33
atrigent	Imaginativeone: why are your files in a different place?	11:33
Imaginativeone	very long story	11:34
	Essentially, it is most expedient to have the repository on the file server and working directory on the SharePoint server	11:35
	BUT - the SharePoint server accommodates git poorly	11:35
	for various reasons	11:35
_ikke_	Imaginativeone: one more question: Do you need the working directory also on the file server, or only the repository files them selfs	11:35
Imaginativeone	the latter	11:36
	← led_belly left	11:36
	← dantix__ left	11:36
Imaginativeone	If I could work with the working directory on the non-file server, that would be great	11:36
	→ dantix__ joined	11:37
_ikke_	In your working tree (without the .git dir itself), you can add a file called .git, which contains the path to the repository (the actual .git dir)	11:37
	Not sure exactly what version that got added though	11:37
atrigent	2.5: https://github.com/blog/2042-git-2-5-including-multiple-worktrees-and-triangular-workflows	11:38
	→ devoldmx joined	11:38
_ikke_	isn't that git-add-worktree?	11:38
Seveas	atrigent: no, that's something else	11:38
	the gitfile support is much, much older	11:38
	← dantix__ left	11:39
	← Sceorem left	11:39
	→ dantix__ joined	11:39
atrigent	well, maybe the support for having .git be a file is old, but this command is new	11:39
	← reim left	11:39
	→ CausaMortis joined	11:40
	→ opencard joined	11:40
	→ bjpenn joined	11:40
	→ jost joined	11:41
atrigent	it looks like git-worktree is a command for managing directories with those sorts of .git files? unless I'm missing something?	11:42
Seveas	it uses such files, yes. But they were not invented for it.	11:42
	← devoldmx left	11:42
_ikke_	1.7.8	11:42
atrigent	ok	11:42
Seveas	b44ebb19e3234c5dffe9869ceac5408bb44c2e20	11:43
	1.5.6	11:43
	→ tg joined	11:43
Seveas	_ikke_: which commit did you end up with?	11:44
	→ Brain joined	11:44
	← bjpenn left	11:45
_ikke_	Seveas: ah ok. I just checked release notes	11:45
	← _rgn left	11:46
	→ _rgn joined	11:46
	→ skynxnex_ joined	11:47
	← [Brain] left	11:48
_ikke_	Seveas: No mention in the relnotes about it	11:48
	← ryannathans left	11:48
	→ ryannathans joined	11:48
	← ryannathans left	11:48
Seveas	_ikke_: that's why I git blame :)	11:48
	I don't trust relnotes to be complete	11:49
osse	At first you blame git, then you can start git blame	11:49
	→ reim joined	11:49
_ikke_	Seveas: I guess it was just a technical implementation, nothing worth mentioning in the relnotes	11:49
Seveas	runinng gag at work was 'git blame qsuscs' (well, not qsuscs, but can't say the actual name) whenever that user broke something again :)	11:50
	← skynxnex left	11:51
	← mhg left	11:51
_ikke_	lol	11:51
	Seveas: Interesting, it was mentioned in repository-layout	11:52
atrigent	git blame Got ZNC?	11:54
	→ jay-m joined	11:54
	→ bronson joined	11:54
	← reim left	11:54
	→ checkItO_ joined	11:54
	← checkItOut left	11:54
	→ anohigisavay joined	11:55
	→ mellernoia joined	11:56
	→ wwwald joined	11:56
	← cagedwisdom left	11:57
	← bronson left	12:00
	→ mizu_no_oto joined	12:01
	→ freimatz joined	12:01
	→ sebbel joined	12:01
	← DaddyEric_ left	12:04
	→ DaddyEric_ joined	12:04
	→ _cyril_ joined	12:05
	→ RaceCondition joined	12:06
	← mkoskar left	12:06
	← dantix__ left	12:06
	→ dantix__ joined	12:07
	← nbdy left	12:07
	→ reim joined	12:08
	← dantix__ left	12:09
	→ lindenle joined	12:09
	→ dantix__ joined	12:09
	← _cyril_ left	12:09
Element9	atrigent: aha, i see. yes it's shows the same. great!	12:11
	← Sleepy63 left	12:11
	→ geoid joined	12:11
	→ wwwald_ joined	12:12
	→ xfbs joined	12:12
	← StuartMI left	12:13
	← lindenle left	12:14
	← wwwald left	12:15
	→ aax joined	12:16
	→ sebbel- joined	12:18
	← reim left	12:18
	← ratanparai left	12:19
	→ liamonade joined	12:19
	→ niels_ joined	12:19
	← niels_ left	12:19
	← xaa left	12:20
	← subhojit777 left	12:20
	← fracting1 left	12:20
	→ ratanparai joined	12:20
	← ratanparai left	12:20
	→ ratanparai joined	12:20
	← dc5ala left	12:21
	← sebbel left	12:21
	← dantix__ left	12:22
	→ dantix__ joined	12:22
	← ICantCook left	12:23
qsuscs	Seveas: i love you too	12:24
bremner	get a chatroom!	12:25
	→ Sleepy63 joined	12:26
	← dantix__ left	12:27
	→ dantix__ joined	12:27
	← LucyParsons left	12:27
	← paulweb515 left	12:28
qsuscs	i have some cozy ones on conference.qsuscs.de	12:31
	→ mkoskar joined	12:31
	← sebbel- left	12:34
	→ jojovem joined	12:35
	← dsdeiz left	12:35
	→ reim joined	12:36
	← Element9 left	12:38
	→ rnsanchez_ joined	12:38
	← rnsanchez left	12:38
	← ratanparai left	12:40
	→ bjpenn joined	12:40
	← reim left	12:40
	← bjpenn left	12:45
	← Ratler left	12:45
	→ Ratler joined	12:46
	← ronny left	12:48
	→ jnavila__ joined	12:49
	→ adiman joined	12:50
	← robot__ left	12:50
	← rominronin left	12:52
	→ chrisml joined	12:53
	→ bronson joined	12:54
	→ bitkiller joined	12:55
	→ metastableB joined	12:55
	← sanketdg left	12:57
	← bronson left	12:58
	← fstd left	12:59
	→ faux___ joined	12:59
	→ fstd joined	12:59
	→ rominronin joined	12:59
	→ eijk joined	12:59
	→ ronny joined	12:59
	→ dsdeiz joined	13:01
	→ daito joined	13:02
	→ Yeomra joined	13:03
	→ otter768 joined	13:05
	→ _cyril_ joined	13:06
	→ petaflot joined	13:07
	← daito left	13:07
petaflot	hello! I ran a django script inside a project dir, this script removed some files and now git complains this is not a repository. but the -git directory is still here (and looks intact AFAIK)	13:08
	← moei left	13:09
	→ CrypticGator joined	13:09
	→ Sigfrid joined	13:09
	← otter768 left	13:09
	→ tomog999_ joined	13:10
	← opdavies left	13:10
	← _cyril_ left	13:10
	→ opdavies joined	13:10
moritz	petaflot: it's likely that restoring from backup + git pull is much less work than trying to debug what's missing	13:10
	← ThomasLocke left	13:10
	← rominronin left	13:11
petaflot	moritz: uh thanks. it was only a loncal repo	13:11
moritz	petaflot: how much did you change this your last backup?	13:12
petaflot	moritz: I would have done this before if I had a copy of it. shit loads have been changed, I wasn't expecting git to suddenly decide it's not there	13:12
	← tomog999 left	13:12
petaflot	it's more than 1000 lines of code	13:13
	← mizu_no_oto left	13:13
	← chrisml left	13:13
	→ _wwwald_ joined	13:14
	← Junior left	13:15
	→ Junior joined	13:15
	→ ratanparai joined	13:15
	← ratanparai left	13:15
	→ ratanparai joined	13:15
	← wwwald_ left	13:15
moritz	petaflot: ok, then it might be worth the effort	13:15
	→ zacg joined	13:16
	← zacg left	13:16
	→ zacg joined	13:16
	← BaD_CrC left	13:16
moritz	petaflot: I'd start with an 'strace git describe' or so; that'll tell you what files git is looking for	13:16
	← alkino left	13:16
	← InfoTest left	13:17
	← nvahalik left	13:17
Seveas	petaflot: pastebin the output of: ls -la .git	13:18
	← SimonNa left	13:18
Seveas	also, pastebin the django script	13:18
	→ rominronin joined	13:19
	→ Sceorem joined	13:19
petaflot	drwxr-xr-x 3 john john 4096 3 déc 13:53 .	13:19
	drwxr-xr-x 5 john john 4096 3 déc 13:53 ..	13:19
	-rw-r--r-- 1 john john 651 3 déc 00:34 COMMIT_EDITMSG	13:19
	drwxr-xr-x 123 john john 4096 3 déc 00:34 objects	13:19
	petaflot installing strace	13:19
Seveas	petaflot: pastebin. not paste	13:19
	and if that's all you have, you're pretty much screwed.	13:19
	← vrishab left	13:19
	← skasturi left	13:19
	← sulky left	13:19
moritz	no branches, refs, HEAD, config, index?	13:20
	→ algae joined	13:20
moritz	sounds like "ouch"	13:20
Seveas	the objects are there, so that's something. Unless they're gone.	13:20
	→ moei joined	13:20
Seveas	pastebin the output of find .git	13:20
	→ GitGud joined	13:20
	→ sulky joined	13:20
	← settermjd left	13:20
	→ roygbiv joined	13:21
GitGud	hello there. question. what command can i use so that my remote repo completely syncs up with my local repo. i understand there is an add and a rm function but is there a command that does a sync of adding and rming automatically?	13:21
Seveas	petaflot: also, git didn't decide it's not there. Looks like your django command does some sort of cleanup rather aggressively.	13:21
petaflot	Seveas: sorry, that was 4 lines. "find .git" basically returns a list of objects (almost 300). can't install strace, my internet connection is too bad	13:21
GitGud	i want to push a commit that makes the local repo the remote repo	13:21
osse	Seveas: http://sprunge.us/ACPL	13:22
	→ dickdaley joined	13:22
	← faux___ left	13:22
petaflot	Seveas: sorry for the insult to git. didn't mean it	13:22
	← YP-QMUL-W left	13:22
Seveas	petaflot: ok, you have some hope of recovering something	13:22
moritz	GitGud: a commit cannot change the configuration of a repo	13:22
	→ robot joined	13:22
Seveas	petaflot: first make a backup of everything you have. And then a copy in which you can try some commands I'll give you.	13:23
	← davidosomething left	13:24
GitGud	well say there are 2 files. file a.txt and file b.txt. i want to delete a.txt and add c.txt to my remote repo. to push the whole thing successfully, i would have to add c.txt and rm a.txt with git then do a push. is there a way so that that function is done with one command?	13:24
Seveas	qsuscs: you need to do something about osse...	13:24
	GitGud: time to read the !book, you're missing essentual basic knowledge about git.	13:24
gitinfo	GitGud: 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	13:24
GitGud	the whole book for just that one command	13:25
	?	13:25
Seveas	no, the first few chapters of the book to understand why the question is meaningless	13:25
	→ YP-QMUL-W joined	13:26
	← rasto left	13:26
GitGud	allow me to redirect you to a link as well: http://www.serenabydesign.com/wp-content/uploads/2012/03/Einstein.jpg	13:26
	← GitGud left	13:26
	→ marscher joined	13:26
Seveas	a bit testy, aren't we...	13:26
petaflot	Seveas: done	13:27
	← opencard left	13:27
Seveas	petaflot: ok, in the copy try this: echo 'ref: refs/heads/master' > .git/HEAD	13:27
	touch .git/index	13:27
	mkdir -p .git/refs/heads	13:27
	← _Vi left	13:27
Seveas	git status	13:27
	git status should say all your files are untracked and that you're on an unborn branch or something	13:27
	← d0nn1e left	13:28
	← daleharvey left	13:28
	→ daleharvey joined	13:28
	← dantix__ left	13:29
	→ dantix__ joined	13:29
	→ symm- joined	13:29
Seveas	actually, rm the .git/index file again, that just confuses git more.	13:29
	but if you now do a 'git fsck' it should say something about dangling commits	13:30
	← gv left	13:30
	→ tristanp joined	13:30
	→ d0nn1e joined	13:30
	← dantix__ left	13:30
	→ dantix__ joined	13:30
petaflot	Seveas: "not a repository".	13:30
	→ MarkyC joined	13:31
	← DaddyEric_ left	13:31
	→ blimpse joined	13:32
	→ gv joined	13:32
Seveas	petaflot: hmm. Give me the output of this one again please: ls -la .git	13:32
osse	bash: this: command not found	13:33
Seveas	git rm -rf --kill --lart --defenestrate osse	13:34
	← tristanp left	13:34
	← xfbs left	13:35
	← ykrons left	13:35
	→ DolpheenDream joined	13:35
qsuscs	Seveas: wat	13:36
	i don’t have time here, i have to investigate this network	13:36
petaflot	Seveas: http://vpaste.net/ZrYjK	13:36
Seveas	qsuscs: you just need to ban osse	13:36
	← XDS2010 left	13:36
	← dantix__ left	13:36
	ChanServ set mode: +o	13:36
	→ XDS2010 joined	13:37
	→ dantix__ joined	13:37
Seveas	petaflot: you did't do the mkdir -p .git/refs/heads	13:37
	→ Gamecubic joined	13:37
	← dantix__ left	13:38
	→ dantix__ joined	13:38
	→ elastix joined	13:38
	→ rwb joined	13:38
	→ devoldmx joined	13:39
	→ rasto joined	13:39
	← dantix__ left	13:40
	→ bjpenn joined	13:40
	→ dantix__ joined	13:41
	← gv left	13:41
petaflot	Seveas: aha I had missed it. now is says something like "initial commit", like if the repo was brand new	13:41
	← skynxnex_ left	13:42
	→ CEnnis91 joined	13:42
Seveas	excellent	13:43
	← dantix__ left	13:43
Seveas	then try git fsck	13:43
	→ atomicb0mb joined	13:43
	→ dantix__ joined	13:43
	← devoldmx left	13:43
Seveas	it should say something like: dangling commit 864c345397fcb3bdb902402e17148e19b3f263a8	13:43
	and that for a few more sha1's	13:43
	→ gv joined	13:44
	→ yohnnyjoe joined	13:45
	← bjpenn left	13:45
	← zacg left	13:45
	→ andrybak joined	13:45
	→ nnyk joined	13:46
	→ subhojit777 joined	13:47
	→ mezod joined	13:48
	→ JohnMaximilian joined	13:48
	← _wwwald_ left	13:49
petaflot	Seveas: got 5 dandling blobs and 1 dandling commit	13:50
	← nowhere_man left	13:50
	→ Guest66757 joined	13:50
	→ Spacew00_ joined	13:51
	← Spacew00t left	13:51
	→ reim joined	13:51
	→ faux___ joined	13:52
	← faux___ left	13:52
Seveas	so you had only one branch. git update-ref refs/heads/master put-the-sha1-of-that-dangling-commit-here	13:52
	→ faux___ joined	13:52
	← Sleepy63 left	13:52
Seveas	then do git status again. It should now say you deleted all your files and that they're all untracked. We'll fix that in a sec, but please confirm that first :)	13:53
	→ nowhere_man joined	13:53
	← rwb left	13:55
petaflot	Seveas: it says the files have been deleted and untracked	13:55
	→ KettleWork joined	13:55
	→ BaD_CrC joined	13:55
	→ sgambino joined	13:55
	→ codedmart joined	13:56
	← atomicb0mb left	13:56
Seveas	excellent. That can be fixed with git reset --mixed. Then do git init to reinitialize the config and you should be good to go.	13:56
	← David1977 left	13:56
	→ bjpenn joined	13:56
	→ LeBlaaanc joined	13:56
KettleWork	git status on my local machine says I'm up to date with latest origin and nothing is modified. git status on my local virtual machine - reading the SAME project folder - says all files are modified (marked red) - what am I doing wrong?	13:56
petaflot	Seveas: so first "git reset --mixed" and the "git init" ?	13:57
KettleWork	as in; same project folder, but two different environments (local box is Windows 7, virtual machine is ubuntu)	13:57
Seveas	KettleWork: what you're doing wrong is sharing the same repo between two machines, just make two clones...	13:57
	petaflot: yes.	13:57
	→ nvahalik joined	13:57
Seveas	KettleWork: especially if they're two different operating systems, you're most likely running into !crlf here.	13:58
gitinfo	KettleWork: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	13:58
petaflot	Seveas: SO NICE :-) thanks a lot for your help	13:58
KettleWork	Seveas: It is a very common workflow to edit files on your local machine and run a virtual machine in vagrant for example (this case). Ok I'll check crlf that might be the case.	13:58
Seveas	petaflot: no worries. I do feel compelled to throw a !backup your way :)	13:58
gitinfo	petaflot: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	13:58
	← mastier left	13:58
	→ italoacasas joined	13:59
	→ mastier joined	13:59
	→ kpease joined	13:59
	→ Macaveli_ joined	14:00
	← bjpenn left	14:00
	→ livingstn joined	14:01
Seveas	KettleWork: then you shouldn't care too much about the state of the repo in that vm :)	14:01
	→ cdg joined	14:02
	← Macaveli left	14:02
	← waveclaw left	14:03
	← rejerson69_ left	14:04
	← dvaske_ left	14:04
	→ thiago joined	14:04
	→ _wwwald_ joined	14:04
petaflot	Seveas: you're so right... I usually have a remote copy of my repo :-/	14:05
	→ _Vi joined	14:05
	→ c0defeed joined	14:05
	← johtso left	14:06
	→ Sleepy63 joined	14:06
c0defeed	under normal circumstances, should a bare repository used to push/pull between team members ever be tracking remote branches?	14:06
	→ _cyril_ joined	14:06
	← reim left	14:06
osse	I don't see the point, but it does no harm I suppose	14:07
	→ johtso joined	14:07
	→ ctburley joined	14:08
	→ mhg joined	14:08
	→ The_Phoenix joined	14:09
	→ lykinsbd joined	14:10
	← jnavila__ left	14:10
	← dantix__ left	14:10
	→ dantix__ joined	14:10
c0defeed	The server that hosted my team's bare git repo died and my teammate restored it from his local copy. I am cleaning it up and found that it is still set to track branches from the old server (that no longer exists). I feel confident that removing these refs is ok, but I want to check and make sure since I may be overlooking something.	14:11
	→ lykinsbd_ joined	14:11
	← _cyril_ left	14:11
	← YP-QMUL-W left	14:11
	← Manikandan left	14:11
	← JanC left	14:12
	← Sonderblade left	14:12
BtbN	Just push the branches back there?	14:12
	← toothrot left	14:12
	← mroth left	14:12
Seveas	c0defeed: you can safely delete those refs if all commits are also in local branches.	14:12
	→ mroth joined	14:13
c0defeed	Seveas, That's what I needed to know, thank you.	14:13
	← lykinsbd left	14:14
	→ Anderson69s joined	14:14
	← dantix__ left	14:14
	← ItSANgo left	14:15
	→ dantix__ joined	14:15
	← tfnico left	14:15
	→ anth0ny joined	14:15
	→ tfnico joined	14:15
	← faux___ left	14:15
	→ kappy joined	14:15
	→ reim joined	14:16
	→ ehynds joined	14:16
	→ dimi1947 joined	14:16
	← funfunctor left	14:18
	← dsdeiz left	14:19
	→ Manikandan joined	14:20
	→ chitopunk joined	14:20
	← geoid left	14:20
	→ ICantCook joined	14:20
	→ wwwald_ joined	14:20
	→ funfunctor joined	14:21
	→ raininja joined	14:21
	→ faux___ joined	14:22
	→ jnavila__ joined	14:23
	← dimi1947 left	14:23
	→ andrei_ joined	14:23
	← _wwwald_ left	14:24
	← faux___ left	14:24
	→ faux___ joined	14:24
	→ Sonderblade joined	14:25
	→ ItSANgo joined	14:25
	→ ItSANgo_ joined	14:25
	→ arup_r joined	14:25
	→ notebox joined	14:25
	← Anderson69s left	14:26
	← faux___ left	14:26
	→ marc_v92 joined	14:26
	← ItSANgo left	14:26
	→ JanC joined	14:26
	→ mellernoia-work joined	14:28
	← dantix__ left	14:28
	→ dantix__ joined	14:28
	→ faux___ joined	14:28
	← faux___ left	14:28
andrei_	hi, I have a question about git branching strategy, right now I have implemented something like this: no master branch, only release branches, release 1, release 2... so whenever there is a new release planned I branch latest release and increment the version. Is this a proper branching strategy, or does anyone see a problem with this aproach?	14:29
	→ faux___ joined	14:29
	→ opencard joined	14:30
	← mellernoia left	14:30
	← mhg left	14:30
andrei_	or is it better to have master and whenever there is a new release merge latest release into master and then create new branch for new release from master?	14:31
	→ David1977 joined	14:31
BtbN	why would you ever merge a release back into master?	14:31
	They usualy branch off from master.	14:31
	← Sigfrid left	14:32
	← shinenelson left	14:33
andrei_	so you mean master will be current latest release code, until it's actually released?	14:33
	← s8321414 left	14:35
	→ fracting1 joined	14:35
andrei_	to give you more context, the project is a testing framework around main application	14:35
David1977	I guess someone might have multiple branches, test things in branch "a" or branch "b" and if all works fine and as expected, merge it into master for final release	14:35
	→ sparetire_ joined	14:36
	← raininja left	14:37
	← seg left	14:38
andrei_	the project is a testing framework around main application, so basically the framework has to match or maintain multiple versions to be able to still work with previous versions of the main application	14:39
	→ seg joined	14:39
	→ Nizumzen joined	14:40
	→ rwb joined	14:40
	→ IrishPrime joined	14:40
	← dantix__ left	14:40
	← nettoweb left	14:40
andrei_	I am just not sure to either do something like this: release1 --> release2 --> release3 (no master), or something like this: master --> release1, master --> release2, etc	14:40
	← robbyoconnor left	14:40
	→ dantix__ joined	14:41
Seveas	why do you want release branches at all?	14:41
	← reim left	14:41
David1977	I wouldnt name it "release". I would name it "nightly1" or maybe "release candidate1"	14:41
	→ tvw joined	14:41
	← dantix__ left	14:43
	→ dantix__ joined	14:43
David1977	And all those "nightlies" and "RC"s (Release Candiddates) are a branch from master until you think, they work fine and then merge them to master	14:43
andrei_	I need release branches (or version branches) to still be able to run the code against older version of the main application, and even possibly to make changes to them later if there are fixes to older releases	14:44
	← DolpheenDream left	14:44
	← rchavik left	14:44
ojacobson	-generally- people use tags to mark releases, since tags are stationary by default.	14:45
	← TomyWork left	14:45
ojacobson	Using a branch to track subsequent changes based on a release is fine, but you can always postpone creating those branches until you need them	14:46
	← Junior left	14:46
	→ Junior joined	14:47
andrei_	I think tags wont work since I might need to do changes later, so your suggestion is to still keep master branch?	14:49
	← yes`r left	14:49
	→ mbrzuzy joined	14:50
	← checkItO_ left	14:50
	→ AaronMT joined	14:50
	→ checkItOut joined	14:50
	→ irqq joined	14:51
	← kpease left	14:51
	→ knownasilya joined	14:52
	← kam270 left	14:53
	→ djosh joined	14:54
djosh	hm. if i want to get user input (like a 'y' keystroke for a confirmation) in a post-merge githook .... is there an easy way to do that?	14:54
	seems that it's not really possible from what i saw online	14:55
	→ bronson joined	14:56
	→ JosephSilber joined	14:56
	→ kpease joined	14:57
	→ NeverDie joined	14:57
	→ LeRieur joined	14:57
	← mojibake left	14:57
	→ DolpheenDream joined	15:00
	→ Squarism joined	15:00
	→ cvanball joined	15:00
	→ phaleth joined	15:00
	← bronson left	15:00
	→ joel_falcou joined	15:01
	→ raininja joined	15:02
Squarism	I wonder if my approach is unecessarily awkward. When i merge say master into a feature (to make my feature pullable) i do: checkout master, pull master, checkout feature, merge master. I wonder if i really could do : (on feature) git fetch, merge remote/refs/master ?	15:02
	→ daito joined	15:03
	← rominronin left	15:03
	← CausaMortis left	15:03
	→ reim joined	15:04
	→ frem joined	15:04
	→ checkItO_ joined	15:04
	← checkItOut left	15:04
	← RaceCondition left	15:05
	← nvahalik left	15:05
	→ _wwwald_ joined	15:05
	→ otter768 joined	15:06
ojacobson	djosh: local hooks like post-merge inherit the controlling terminal, if any, but stdin may be tied up	15:07
	→ lubarch joined	15:07
	← daito left	15:07
	→ RaceCondition joined	15:08
	← wwwald_ left	15:09
	→ Gamer-Pro joined	15:09
Gamer-Pro	DOWNLOAD THIS AMAZING GAME FOR WINDOWS http://www.indiedb.com/games/spaceshooter-x1/downloads/spaceshooter-x1-update-for-windows	15:09
	→ rubyonrailed joined	15:09
	ChanServ set mode: +o	15:10
	ojacobson set mode: +b	15:10
djosh	lame Gamer-Pro	15:10
	ojacobson kicked Gamer-Pro (spam)	15:10
	ojacobson set mode: -o	15:10
	→ tonyj joined	15:10
djosh	yay t.y. ojacobson	15:10
	← nivag left	15:10
	← otter768 left	15:11
	← Roze left	15:11
	← reim left	15:12
	→ tristanp joined	15:12
	→ lindenle joined	15:12
	→ incredible joined	15:13
	← SwedFTP left	15:14
	→ nivag joined	15:15
	→ yes`r joined	15:15
livcd	is there a way how can i make Git to point to a single repo even when I am outside the repo's directory ?	15:15
	Kind of like the default "repo" so if i enter to another repo it changes to that specific one	15:15
	→ ncthom91 joined	15:16
	← checkItO_ left	15:16
djosh	you mean like nested git directories??	15:17
	→ presto joined	15:17
	← lindenle left	15:17
	→ SwedFTP joined	15:17
livcd	have to google that	15:17
	← Nizumzen left	15:17
	→ Corosus joined	15:18
djosh	essentially you'd end up with a git directory inside a git directory if you did what you're trying to do, i think	15:18
	← dantix__ left	15:18
djosh	but not sure i understand what you're asking very well	15:18
	→ dantix__ joined	15:19
	→ paulweb515 joined	15:20
livcd	so i have a git repo /default/todo/.git and i want this to be the default thing whenever i move in a filesystem. I eneter /foo <there is not a .git> and do git commit -m "blah blah" and thet gets routed to /default/todo/.git. When i enter /bar/<.git exists here> the repo changes to the </bar/.git>	15:20
djosh	yeah i don't really think what you're trying to do is possible, for good reasons, if i understand correctly. but i'm not a super expert on git	15:21
	← acolson left	15:21
livcd	ok maybe that requires some wrapper function	15:22
	← RaceCondition left	15:22
nedbat	livcd: how would you map the structure of the current directory onto the structure of the git repo?	15:22
djosh	^	15:22
	← anth0ny left	15:22
	→ mhg joined	15:22
djosh	he essentially wants a global git repo, but that seems like a Really Bad Idea (TM)	15:23
	→ King_Hual joined	15:23
	← King_Hual left	15:23
	→ King_Hual joined	15:23
	← David1977 left	15:23
livcd	nedbat: true...i guess i write a wrapper that when it does not find a local .git enters the "default repo path" and after commit changes back to the dir	15:24
	do you think that would work ?	15:24
	← lubarch left	15:24
	→ cyphase joined	15:25
	← cyphase left	15:25
	→ cyphase joined	15:25
	← Laaw left	15:26
	← skylite left	15:26
	→ phrozensilver joined	15:26
nedbat	livcd: i don't understand how you intend to map the filenames in /a/real/dir into /default/todo/.git	15:26
	livcd: so I don't know if it would work.	15:26
ojacobson	livcd: what nedbat is asking is this: you're in /foo (with no git repo). You type 'git add some-file.txt', which exists in /foo.	15:26
	What is staged?	15:26
	And where?	15:26
	→ madewokherd joined	15:26
nedbat	livcd: and if I try to "git add" /dir1/subdir/foo.txt, and later try to add /dir1/another/foo.txt, where do they each go? Is there a collision?	15:28
	→ Dougie187 joined	15:28
livcd	ok ok you convinced me	15:29
	← raininja left	15:29
ojacobson	I wasn't trying to convince you of anything -- I was trying to understand what it was you wanted	15:29
	→ inamoriti joined	15:30
	→ robbyoconnor joined	15:32
livcd	ojacobson: well i do not think git is capable doing what I intend to do with it. I imagine i really won't add /dir/another/foo to /default/todo.git...instead what i want is when git does not find a /foo/.git it enters /default/todo/.git and adds /default/todo/foo.txt to /default/todo/.git	15:32
djosh	livcd: i think trying to understand why you want to do that would also help. you may have a legitimate problem you're trying to solve with a completely impractical solution	15:33
	so, like, what problem are you trying to solve with this?	15:33
livcd	djosh: I'd like to have a simple cli todo list	15:33
ojacobson	I use https://github.com/idcmp/pyd for that	15:33
djosh	nice. yeah looks like ojacobson has a decent solution to your problem livcd	15:34
	:)	15:34
	→ jnavila joined	15:34
livcd	i'll check that out	15:34
	← jnavila__ left	15:35
	← ncthom91 left	15:35
	← robbyoconnor left	15:38
	→ dmi386 joined	15:39
	→ Laaw joined	15:39
	→ devoldmx joined	15:39
dmi386	Hi folks. I have a question about the behavior of format=%cd when running git show on a tag	15:40
	← tristanp left	15:40
	→ xfbs joined	15:40
dmi386	it seems that %cd outputs the commit date of the commit referenced by an annotated tag, rather than the commit date of the annotated tag itself	15:40
	→ sigdk joined	15:41
dmi386	It seems like the only way that the commit date of the annotated tag itself is displayed is when running git show without any options on the annotated tag	15:41
	← marc_v92 left	15:42
dmi386	I feel like this is incorrect behavior, as an annotated tag is a commit, and the commit date of the annotated tag can be completely different than the commit date of the commit the tag points to	15:42
	Does anyone have any insights into/knowledge about this behavior?	15:42
sigdk	can I have individual .gitignore files all over my directories that are part of the project or should there be only one at the root directory ?	15:42
	→ sssilver joined	15:43
Seveas	sigdk: both work	15:43
	→ dontsnee joined	15:44
	← devoldmx left	15:44
Seveas	dmi386: you're asking for the commit date, so you get the commit date. Isn't there a tag date format thingy?	15:44
dmi386	nope	15:44
	→ kj_ joined	15:44
dmi386	or at least, not in the git show man page	15:44
	← anohigisavay left	15:44
	← dantix__ left	15:45
	→ Ahmed90 joined	15:45
	→ dantix__ joined	15:45
dmi386	but what I'm saying is that an annotated tag is a commit (albeit an empty one) so %cd should show the tags creation date	15:45
Seveas	an annotated tag is not an empty commit	15:45
	it's a different object type, a tag object	15:45
dontsnee	how do i use winmerge to view git diff?	15:45
	← DolpheenDream left	15:46
Seveas	dontsnee: have a look at man git-difftool	15:46
gitinfo	dontsnee: the git-difftool manpage is available at http://jk.gs/git-difftool.html	15:46
dontsnee	thank you	15:46
dmi386	Seveas: ok. Is there any way I can inspect the tag object itself?	15:46
	← gravitron left	15:46
	→ gravitron joined	15:46
dmi386	I'm currently parsing the output of git show, but it's not ideal formatting	15:46
	← lykinsbd_ left	15:47
	← geri left	15:47
	← incredible left	15:47
Seveas	git cat-file tag tagname-here	15:47
	← _ingo left	15:48
	← LeBlaaanc left	15:48
	← arup_r left	15:48
dmi386	$ git cat-file tag 0.1	15:49
	object a3c78d9e710290e2c4cb5a2bec8dac16236fd7aa	15:49
	type commit	15:49
	tag 0.1	15:49
	says it's a commit :)	15:49
Seveas	then you're not looking at a tag object, but at a lightweight tag	15:49
	which is just a ref to any object	15:49
	← dontsnee left	15:49
dmi386	nope, it's a tag object	15:49
	$git tag -a -m "Another tag" 0.2	15:50
	$ git cat-file tag 0.2	15:50
	object a3c78d9e710290e2c4cb5a2bec8dac16236fd7aa	15:50
	type commit	15:50
	tag 0.2	15:50
Seveas	ah doh, 'type commit' just refers to the type of the refered object	15:50
	→ Sadeukko joined	15:50
dmi386	Another tag	15:50
Seveas	tags can point to other things as well (blobs, trees)	15:50
dmi386	ah, I see	15:50
	← cvanball left	15:51
	→ anth0ny joined	15:51
Seveas	the object is the object it refers to, not the sha1 of the tag object	15:51
	→ incredible joined	15:51
dmi386	I still think that git show --pretty=format:%cd should show the annotated tag creation date... or there should be at least another date format option	15:51
Laaw	hey so I've got a git flow question	15:52
	→ tristanp joined	15:52
	→ raindev joined	15:52
Laaw	if I have features A B and C that are all dev complete, and merged back into develop	15:52
	← faux___ left	15:52
Seveas	dmi386: I'd favor the latter	15:52
	→ kilo_bravo joined	15:52
Laaw	and I scope my release to include A and B but not C, how do I create a release branch for those?	15:52
	do I have to cherry pick?	15:52
dmi386	I feel like adding another option that only makes sense for tags is strange though	15:52
	I'll think about it and perhaps submit a path.	15:53
	patch	15:53
	← neunon left	15:53
dmi386	The particular problem I faced that led me to this was wanting to display annotated tag creation date in the git log	15:54
	I had to make a monstrosity of a one-liner with sed to achieve it	15:54
	when you should really be able to do it with --pretty	15:54
	→ jds joined	15:54
	→ _ingo joined	15:54
dmi386	since using %cd for both would make it ambiguous in git log, I guess another option does make sense	15:55
	→ tinajohnson_ joined	15:55
dmi386	%td?	15:55
Seveas	%ta would then make sense too for tagger	15:55
	← incredible left	15:55
	→ LBV_User joined	15:56
	→ liri_ joined	15:56
	← ajpiano left	15:57
	→ lykinsbd joined	15:57
	→ faux___ joined	15:57
	→ d0nkeyBOB joined	15:58
	← anth0ny left	15:58
	← tristanp left	15:58
	← Deez_Nuts left	15:58
	→ tristanp joined	15:58
	→ arup_r joined	15:58
	→ BillCriswell joined	15:58
	→ ajpiano joined	15:59
	← sgen__ left	15:59
	← notebox left	15:59
	→ neunon joined	15:59
dmi386	hmm. this won't really work for git-log	15:59
	Unless we have a format option explosion for %d	15:59
	→ demonlove joined	15:59
	→ lykinsbd_ joined	16:00
	← dantix__ left	16:00
	→ dantix__ joined	16:00
	→ toogley joined	16:01
demonlove	i want to upload my local file on git ?	16:01
	how to do it?	16:01
	→ jteneyck joined	16:01
	← jteneyck left	16:01
	→ jteneyck joined	16:01
	← petaflot left	16:01
	→ petaflot joined	16:02
	← Macaveli_ left	16:02
	← petaflot left	16:02
	→ notebox joined	16:02
	← lykinsbd left	16:03
	← nivag left	16:03
	→ Ornacia joined	16:03
	← arup_r left	16:03
	← kegster left	16:06
	← psprint left	16:06
	→ kadoban joined	16:06
	→ LeBlaaanc joined	16:06
	→ happy-dude joined	16:06
	→ nivag joined	16:07
	→ kegster joined	16:07
	← madewokherd left	16:10
	← roelmonnens left	16:10
	← _wwwald_ left	16:11
	← livingstn left	16:11
	← surfdue left	16:11
	→ ncthom91 joined	16:12
	← johnny56 left	16:12
	← smithbone left	16:12
	→ _cyril_ joined	16:13
	← d0nkeyBOB left	16:13
	← funfunctor left	16:13
	→ MechtiIde joined	16:14
	→ johnny56 joined	16:14
	← nadim left	16:14
	→ devoldmx joined	16:14
	→ editshare-ericf joined	16:15
	← afuentes left	16:15
	← Sceorem left	16:15
	→ surfdue joined	16:16
Hedgework	demonlove: I think we need to back up a bit. Do you have a git repository, or do you need to create one?	16:16
	→ nadim joined	16:16
	→ petaflot joined	16:17
	→ RaceCondition joined	16:17
	← Alienpruts left	16:17
	→ arup_r joined	16:18
	← LeRieur left	16:19
	→ dontsnee joined	16:19
dontsnee	i asked ealier on about using winmerge as my difftool	16:20
	→ derpvid joined	16:20
dontsnee	i followed this instruction here https://coderwall.com/p/76wmzq/winmerge-as-git-difftool-on-windows	16:20
	but when i do	16:20
	← dantix__ left	16:20
	← tvw left	16:20
dontsnee	$ git difftool mybranch master	16:20
	→ dantix__ joined	16:21
alanjf	Is there a way to see a file's last modified timestamp that it had at the time it was added or comitted?	16:21
dontsnee	i get, fatal: bad config file line 14 in z://.gitconfig	16:21
	← nadim left	16:21
dontsnee	my line 14 is the "$REMOTE"	16:21
demonlove	<Hedgework> i have git account	16:21
jan__	would it be possible to have 'autostash' restore the timestamp of the original files?	16:22
demonlove	i created a repositry	16:22
	→ geekbri joined	16:22
demonlove	<Hedgework>?	16:22
	← nfk\|laptop left	16:22
demonlove	Hedgework: ?	16:22
	← Manikandan left	16:22
Hedgework	demonlove: sorry, I'm multitasking at a work meeting	16:23
demonlove	ok	16:23
	← LBV_User left	16:23
	← dantix__ left	16:23
Hedgework	demonlove: "a git account" isn't a thing...do you know that Github and git are different things?	16:23
	→ mihaicris joined	16:23
	← kzisme[away] left	16:23
	→ dantix__ joined	16:23
demonlove	git related to terminal	16:23
	right?	16:23
Hedgework	demonlove: git can (and usually should) be used from the terminal, yes.	16:24
	but what account are you talking about having?	16:24
milki	git is a tool	16:24
	github is a company	16:24
	← derpvid left	16:24
	← _ingo left	16:24
	→ nvahalik joined	16:24
Hedgework	git is an application...github is a services company that offers, among other things, a popular hosting service for git repositories	16:24
demonlove	i want to upload my blog app on my account so that others can see	16:24
Hedgework	demonlove: what account?	16:25
	→ Anderson69s joined	16:25
demonlove	github	16:25
	→ griotspeak joined	16:25
	← jay-m left	16:25
Hedgework	thank you	16:25
demonlove	?	16:25
	→ jay-m joined	16:25
	→ rorro joined	16:26
	← dontsnee left	16:26
demonlove	git	16:26
	sorry	16:27
	→ nadim joined	16:27
	→ Macaveli joined	16:27
	→ aard_ joined	16:27
symm-	git branch -a isn't showing newly created remote branches	16:27
	← stuivi left	16:27
symm-	do I need to fetch or something?	16:27
demonlove	Hedgework: ?	16:27
alanjf	Is there a way to see a file's last modified timestamp that it had at the time it was added or comitted?	16:29
	← devoldmx left	16:30
	← nvahalik left	16:30
ojacobson	no	16:30
	→ atm0sphere joined	16:30
atm0sphere	Hedgework: ?	16:30
	← cpt-oblivious left	16:30
ojacobson	git tracks commit and author time for the whole commit, and the +x bit for each file, and that's it	16:30
	→ nvahalik joined	16:31
alanjf	ojacobson: I've searched around and that's all I could find, was commit and author time. I was hoping I could get what the mtime on the file was when it was committed, just for the info.	16:31
	← notebox left	16:31
alanjf	I guess it's not that important, but sometimes it can be nice to have. Like when adding a file that already existed for sometime to a new repo created in it's dir.	16:32
	In such a case I'd like to know what it's original last mod time was it was added/committed the first time.	16:32
Hedgework	one sec, working	16:32
	→ funfunctor joined	16:33
	← demonlove left	16:33
	→ afuentes joined	16:33
	→ davidosomething joined	16:34
alanjf	Like say the file was last editted in july of 2013, and was added and committed the first time in november 16th, 2015, I can only get the latter from git? There is no way to get the original last mtime of July 21st, 2013 ??	16:34
	→ Karkus joined	16:34
	← inamoriti left	16:34
	← dantix__ left	16:34
	→ nbdy joined	16:34
ToxicFrog	alanjf: git does not record ctime/mtime/atime, no	16:34
	→ notebox joined	16:35
	← atm0sphere left	16:35
	→ demonlove joined	16:35
ToxicFrog	Furthermore, when you check out, the mtime of the file is set to the checkout time, not the time it was originally committed -- doing the latter would break basically every dependency-aware build system.	16:35
	← Sadeukko left	16:35
	← nbdy left	16:35
demonlove	hello susan	16:36
	→ dantix__ joined	16:36
ToxicFrog	That said, you can tell git to lie about the commit time when you make the commit, using the GIT_AUTHOR_DATE and GIT_COMMITTER_DATE envars.	16:36
	→ [0xBEAKER] joined	16:36
	← BernhardPosselt left	16:36
demonlove	Hedgework:?	16:36
ToxicFrog	For something like this, the best approach is probably to use GIT_AUTHOR_DATE, which will effectively record in the commit "this commit was made in 2015, but the content in it was authored in 2013"	16:36
	← andrei_ left	16:37
alanjf	ToxicFrog: I understand about the file mtime being changed on checkout and such, I was just hoping there was a way to just get the original mtime. Nice to know about the env vars though, that can be useful for first time commits of fiels that have existed for sometime.	16:37
	→ kevwil joined	16:38
	← Caesar left	16:38
	← raindev left	16:38
	→ Caesar joined	16:39
	← Caesar left	16:39
	→ Caesar joined	16:39
Hedgework	demonlove: Chill. I am at work. Unless you want to pay my $325/hour consulting rate, you can be patient and accept my FREE help when work can spare me for a few minutes.	16:39
	← dmi386 left	16:40
	→ madewokherd joined	16:40
demonlove	Hedgework: you are getting angry?	16:40
	milki demands a !refund	16:40
milki	hmm	16:41
	!refund	16:41
gitinfo	If you are not satisfied with git, or the support provided by the volunteers in #git, you are entitled to a full refund of the purchase price, and are invited to use another VCS. Elsewhere.	16:41
milki	oo, it doesnt look at actions	16:41
	← Hounddog left	16:41
	→ wilsongis joined	16:41
	madewokherd has an alternative !refund theory	16:42
	← dantix__ left	16:42
madewokherd	nope, you were right	16:42
	→ dantix__ joined	16:42
	→ Hounddog joined	16:42
	→ BernhardPosselt joined	16:44
	→ IWishIKnew joined	16:44
	← Hounddog left	16:44
	→ systmkor joined	16:44
	← Macaveli left	16:45
	→ Hounddog joined	16:45
	→ geri joined	16:46
	→ Macaveli joined	16:46
	→ hobodave joined	16:46
	← Hounddog left	16:47
	→ Hounddog joined	16:47
	← geri left	16:47
	→ nnyk_ joined	16:48
	→ Pseudocrat joined	16:48
	← Pseudocrat left	16:48
	→ Pseudocrat joined	16:48
	← dantix__ left	16:48
	← PeterBooker left	16:48
	→ dreiss joined	16:49
	→ dantix__ joined	16:49
Hedgework	demonlove: Just annoyed. Repeatedly trying to get my attention after I explained that I was multitasking at work and would be with you when time allowed was very rude of you.	16:49
	→ Es0teric joined	16:49
	← Hounddog left	16:49
	→ Hounddog joined	16:49
	← nnyk left	16:50
	→ jottr joined	16:50
	→ WizJin joined	16:50
ToxicFrog	milki: it doesn't? It should, IMO.	16:50
	← dantix__ left	16:51
	→ dantix__ joined	16:51
demonlove	Hedgework: sorry, apploize	16:51
	← ELLIOTTCABLE left	16:51
alanjf	( "are invited to use another VCS" <-- I must really be old for my mind wanted to think of Atari when "VCS" was mentioned ;p )	16:52
Hedgework	Thank you.	16:52
	lol alanjf	16:52
	→ aretecode joined	16:52
Hedgework	demonlove: So, you've said that you want to upload some web content you are working on via git...but you haven't said where you want to upload to, or whether you've already created a git repository. Getting more clear information from you would be helpful.	16:53
	demonlove: I'm not sure how you expect us to provide you support if you can't tell us what you are doing.	16:53
	→ Macaveli_ joined	16:53
alanjf	ToxicFrog: Thanks for your help.	16:53
	← Hounddog left	16:54
demonlove	i have created reositry on git	16:54
	Hedgework: there i want to add my content which i made on my lappy	16:55
	← tristanp left	16:55
	← Macaveli left	16:55
	→ ELLIOTTCABLE joined	16:55
	→ tristanp joined	16:56
	← Balliad left	16:56
	→ mwhooker joined	16:56
	→ Hounddog joined	16:56
	← sbasso left	16:56
	← barq left	16:57
	← Spacew00_ left	16:57
	→ barq joined	16:57
	→ bronson joined	16:57
	→ shinenelson joined	16:57
	→ atrigent_ joined	16:58
	← dv_ left	16:58
	→ dv_ joined	16:59
Hedgework	demonlove: "git" is not a place, it's a program.	17:00
demonlove	ok whatever	17:00
Hedgework	There are many git servers out there -- thousands of them, at least -- and they behave differently from one another.	17:00
demonlove	what	17:00
	← griotspeak left	17:00
qsuscs	demonlove: !book.	17:01
gitinfo	demonlove: 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	17:01
demonlove	you are a vetran in it	17:01
	← Hounddog left	17:01
demonlove	i just want my code to be submitted on my git repositry	17:01
	← faux___ left	17:01
	← atrigent left	17:02
	← Anderson69s left	17:02
	← bronson left	17:02
	← [0xBEAKER] left	17:02
	← Darcidride left	17:03
Hedgework	demonlove: You've essentially said "how do I check if my vehicle needs service? I don't know the make, model, or year of my vehicle or when it was last serviced, and I won't tell you where I bought it."	17:03
	← bollullera left	17:03
ctburley	snrk	17:03
	→ Anderson69s joined	17:03
	→ daito joined	17:04
	→ samw joined	17:04
	← nadim left	17:04
	→ zeroXten joined	17:04
	← jnavila left	17:04
	→ Hounddog joined	17:04
demonlove	git version 1.9.1	17:05
	→ artgoeshere joined	17:05
demonlove	want to post my code on https://github.com/myname	17:06
zeroXten	So, what could possibly go wrong with a 90,000 line commit comment....	17:06
	→ incredible joined	17:07
ctburley	zeroXten, (a) nobody will read it?	17:07
	→ otter768 joined	17:07
kadoban	zeroXten: What could go right with it?	17:07
	← xtun left	17:07
zeroXten	something about this branch is killing gitlab	17:07
	can't view the commit and sidekiq gets stuck	17:07
qsuscs	demonlove: read introductory material. the book linked above, jessica kerr’s !talk, whatever.	17:08
gitinfo	demonlove: [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	17:08
qsuscs	you ask to be spoonfed and nobody is willing to, for good reasons.	17:08
	→ faux___ joined	17:08
	← bb010g left	17:08
	← RaceCondition left	17:08
	← daito left	17:08
	← gfixler left	17:09
	← lb left	17:09
	→ Spacew00t joined	17:10
	→ nadim joined	17:10
	← dantix__ left	17:10
	← otter768 left	17:11
	← faux___ left	17:12
	→ kaiza joined	17:12
	← Macaveli_ left	17:13
	→ Technocrat7 joined	17:14
	→ jcooke joined	17:14
	→ RaceCondition joined	17:16
	→ lindenle joined	17:16
	← Brain left	17:16
	← fl0w left	17:17
	→ Brain joined	17:17
	→ faux___ joined	17:17
	← jcooke left	17:18
	← Technocrat7 left	17:18
	→ Wetmelon joined	17:18
	→ fl0w joined	17:19
	→ _nadim joined	17:20
	← _Vi left	17:20
	← nadim left	17:20
	← Squarism left	17:21
demonlove	qsuscs: tere are lots of tut on everything how many one you get eveyone	17:21
qsuscs	demonlove: SO READ ONE OF THEM	17:21
	→ dvaske_ joined	17:21
demonlove	approx 72 hrs of video uploaded on youtube per hrs, dso you gonna watch everyone	17:21
	← ehynds left	17:22
	← faux___ left	17:22
demonlove	its better to ask directly to people who are familiar with required technology	17:22
qsuscs	yeah, and our answer are direct videos of approx 20min, or a very good book	17:22
	← tristanp left	17:22
qsuscs	if you don’t want to learn, fine. not my problem.	17:23
	→ tristanp joined	17:23
demonlove	m telling to invest time properly	17:23
	← lindenle left	17:23
	→ faux___ joined	17:23
	← tristanp left	17:24
demonlove	lerning involves many worth-less thing	17:24
	→ bjpenn joined	17:24
	→ tristanp joined	17:24
	→ yashu-seth joined	17:26
	→ lindenle joined	17:26
	← kurkale6ka left	17:26
	← irqq left	17:27
	← The_Phoenix left	17:28
	→ imachuchu joined	17:28
	→ nadim joined	17:28
	← faux___ left	17:28
	← King_Hual left	17:28
	← _nadim left	17:29
	→ \|-o-\| joined	17:30
	→ faux___ joined	17:30
\|-o-\|	hey guys, i just tried git rebase for the first time, and now git status says that my feature branch has now diverged from 'origin/feature-branch'	17:30
	and that i have 21 and 2 different commits each, respectively, and to use git pull to merge the remote branch into mine	17:31
	← mezod left	17:31
	→ jetpackjoe joined	17:31
\|-o-\|	nothing to cmmit, working directory clean	17:31
	so, how should i proceed?	17:31
	→ devoldmx joined	17:31
_ikke_	\|-o-\|: usually that advise is correct, but in this case it isn't	17:31
	!rewrite	17:31
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	17:31
	← jetpackjoe left	17:31
\|-o-\|	can i just do a git push to the remote feature branch?	17:31
	← opencard left	17:31
\|-o-\|	or would have i to git push -f	17:32
	oh ok	17:32
	that's what i was going to do :)	17:32
	so i thought git rebase was supposed to make the whole process of having multiple people working on the same branch cleaner	17:33
	← johnny56 left	17:33
	→ jottr_ joined	17:33
_ikke_	\|-o-\|: it wil, as long as you haven't pushed the commits yet, which you have in this case	17:33
	→ johnny56_ joined	17:33
\|-o-\|	ok	17:33
	← dvaske_ left	17:34
	← faux___ left	17:34
	→ Xango joined	17:34
	→ opencard joined	17:35
	← jottr left	17:35
	← devoldmx left	17:35
	→ faux___ joined	17:36
\|-o-\|	and that shooould do it	17:36
	let's see	17:36
	← demonlove left	17:36
	→ griotspeak joined	17:36
	← lindenle left	17:36
	→ lindenle joined	17:37
	← encod3 left	17:37
_ikke_	use --force-with-lease	17:38
	it's safer	17:38
\|-o-\|	thanks	17:39
	← User458764 left	17:39
	→ encod3 joined	17:39
\|-o-\|	did it :)	17:39
	→ nettoweb joined	17:39
	← Xango left	17:39
	← faux___ left	17:41
	← tristanp left	17:41
	→ User458764 joined	17:42
	→ faux___ joined	17:42
	← lindenle left	17:42
	→ lindenle joined	17:44
	← liamonade left	17:46
	→ _ingo joined	17:46
	← mwhooker left	17:46
	→ geri joined	17:46
	→ bronson joined	17:47
	← xfbs left	17:48
	→ Nizumzen joined	17:48
alanjf	ToxicFrog: Ok I tried setting GIT_AUTHOR_DATE and adding a file but commit and author date remain the same (time whne I sent the command.) Does GIT_AUTHOR_DATE need a specific format? I searched the web and found many differing examples.	17:48
	Some look like: export GIT_AUTHOR_DATE="Wed Feb 16 14:00 2037 +0100"	17:48
	← geri left	17:49
	← lindenle left	17:49
	← funfunctor left	17:49
	→ akushner joined	17:50
	→ mustmodify joined	17:50
	→ mcnesium joined	17:50
	← aspiers left	17:50
	→ reim joined	17:50
	→ hackel joined	17:50
	← jottr_ left	17:50
	← nettoweb left	17:50
	→ lindenle joined	17:51
	→ tristanp joined	17:51
	→ jcooke joined	17:51
mustmodify	ok I have a mystery on my hands. A github repo clearly shows that a file, .rock.yml, was updated 14 days ago. That change is on master. I have not changed that file, but the original copy is on my machine. I did `git pull origin master` and it's still wrong. I did a `git log .rock.yml` and it shows the last change as happening on July 20. All this came up because a PR I submitted shows me reverting that file, which I don't want.	17:53
	→ nettoweb joined	17:53
	→ xlegoman joined	17:54
	← lykinsbd_ left	17:54
mcnesium	i need help with git svn. there is this svn repo I need to use to publish my stuff. locally I used git, and I also have my own remote git repo to push to. so I did a git svn clone url/to/svnrepo and then git remote add mygit url/to/my/git/repo plus git pull mygit master. now there are tons of conflicts because the stuff from the svn repo is older. so how can I tell to just use everything that comes from the	17:54
	remote git repo and commit it to the svn?	17:54
alanjf	I even tried just epoch time, and it still seems to ignore it.	17:54
	→ jagob joined	17:55
	← tristanp left	17:55
	→ tristanp joined	17:55
	→ ril joined	17:56
alanjf	stat --format=%Y "foo.txt" => 1299017262 \| GIT_AUTHOR_DATE="$(stat --format=%Y "foo.txt")" git add foo.txt \| git commit -m "first commit foo.txt" \| git log -1 --format="%ad" -- foo.txt => Thu Dec 3 09:53:48 2015 -0800	17:57
	→ scoobertron joined	17:57
alanjf	--format=%y "tf2.txt"	17:57
	oops	17:57
	→ raininja joined	17:57
alanjf	stat --format=%y "foo.txt" => 2011-03-01 14:07:42.703250000 -0800	17:58
	→ lykinsbd joined	17:58
alanjf	Why is GIT_AUTHOR_DATE being ignored?	17:58
	(ignore the tf2.txt, hat was a mis-tab-completetion)	17:59
	← clmsy left	17:59
	← mbrzuzy left	17:59
	← samw left	18:00
	← jgornick left	18:01
	← lindenle left	18:02
	→ sanketdg joined	18:02
	→ tristanp_ joined	18:02
	← tristanp left	18:04
	← SirCmpwn left	18:04
	← robot left	18:05
	→ samw joined	18:05
	→ LBV_User joined	18:06
ToxicFrog	alanjf: git help commit will list the valid formats, but note that it has to be set when you commit, not when you add	18:06
	← indieross left	18:06
	← thiago left	18:07
	alanjf facepalms...	18:07
alanjf	ToxicFrog: Thanks.	18:07
	← LBV_User left	18:07
	← samw left	18:07
ToxicFrog	alanjf: also, note that the default for stuff like git log is to show commit date, IIRC. Try 'git log --pretty=fuller' to show all dates.	18:07
	← reim left	18:08
	→ mehola joined	18:08
	→ mizu_no_oto joined	18:09
alanjf	ToxicFrog: Thanks. I was using `git log -1 --format="%ad" -- foo.txt` to test. I'll keep --pretty=fuller in mind too. Thanks you.	18:09
	→ indieross joined	18:09
	← hyperair left	18:09
alanjf	s/Thanks you./Thank you./ # Is it just me or does "thanks you" sound like something Gollum from LOTR would say?	18:09
	→ lindenle joined	18:09
mustmodify	alanjf: +1	18:09
alanjf	:)	18:10
	→ cmoneylulz joined	18:10
	← griotspeak left	18:10
	← josuebrunel left	18:10
	← subhojit777 left	18:11
	→ ahr3n joined	18:11
	← ec\_ left	18:11
	→ led_belly joined	18:11
	→ jgornick joined	18:12
DolphinDream	can i use branch command to create a branch off another branch ?	18:13
	← mhg left	18:13
DolphinDream	git branch fromBranch newBranch ?	18:13
	→ LBV_User joined	18:13
qsuscs	other way round	18:14
DolphinDream	oh.. ok	18:14
	kewl. thx qsuscs	18:14
	← akushner left	18:15
	→ crose joined	18:15
	→ Sasazuka joined	18:15
	← mihaicris left	18:15
DolphinDream	qsuscs, and the second parameter can be any ref not necessarily a branch, right >?	18:15
	git branch newBranch someTag	18:15
qsuscs	any commitish	18:16
	→ gfixler joined	18:16
	→ samw joined	18:16
DolphinDream	sha, tag, branch, HEAD^, etc	18:16
	← dreiss left	18:16
	← liri_ left	18:16
	← samw left	18:17
	→ dopesong joined	18:17
	→ _rnsanchez_ joined	18:17
	← guampa left	18:17
	← bjpenn left	18:17
	← marscher left	18:18
	← lindenle left	18:18
	→ marscher joined	18:19
	← rnsanchez_ left	18:19
	→ jonmorehouse joined	18:19
	← toogley left	18:19
	← mehola left	18:20
	→ mezod joined	18:21
	← nettoweb left	18:21
	→ lindenle joined	18:21
	→ geoid joined	18:22
	← incredible left	18:22
	→ settermjd joined	18:22
	→ mrmagu joined	18:23
	→ diegoviola joined	18:23
	→ paddyez joined	18:23
	← paddyez left	18:23
	→ paddyez joined	18:23
mcnesium	i just used git checkout --theirs on every single file, thank you	18:24
	→ Pookz joined	18:24
	← PCatinean left	18:24
	← tcurdt left	18:25
	← marcogmonteiro left	18:26
	→ samw joined	18:26
	→ CheckDavid joined	18:26
	→ tcurdt joined	18:27
	← fracting1 left	18:28
	← sigdk left	18:28
	→ fracting1 joined	18:28
	← opencard left	18:28
	← ItSANgo_ left	18:30
	← arup_r left	18:30
	← elastix left	18:30
	→ SirCmpwn joined	18:30
	← jonmorehouse left	18:30
	← geoid left	18:30
	→ hahuang61 joined	18:31
	← lindenle left	18:31
	→ geoid joined	18:31
	→ bjpenn joined	18:32
	→ nour joined	18:32
	← cmoneylulz left	18:32
	← permalac left	18:32
	← raininja left	18:32
	→ ec\ joined	18:33
	→ mischat_ joined	18:33
	← mcnesium left	18:33
	→ tristanp joined	18:34
	← tristanp_ left	18:34
	← notebox left	18:34
	← LBV_User left	18:35
	← dickdaley left	18:35
	→ mischat__ joined	18:35
	← roxlu left	18:36
	→ raininja joined	18:36
	→ vdv joined	18:36
	→ vrishab joined	18:36
	← mischat left	18:36
	← overcast left	18:36
	→ elastix joined	18:37
	→ overcast joined	18:37
	← ribasushi left	18:37
	→ romankl joined	18:37
	← LiENUS left	18:37
	← mischat_ left	18:38
	→ lindenle joined	18:38
	→ geri joined	18:38
	← kaictl left	18:39
	→ King_Hual joined	18:39
	← King_Hual left	18:39
	→ King_Hual joined	18:39
	← Brain left	18:40
	→ petersr joined	18:40
	← IWishIKnew left	18:40
	→ jonmorehouse joined	18:40
	← bjpenn left	18:40
	← crose left	18:41
	← _ingo left	18:41
	→ ribasushi joined	18:41
	→ gopar joined	18:41
	← jay-m left	18:41
	← lindenle left	18:42
	→ LiENUS joined	18:43
	← mustmodify left	18:43
DolphinDream	how can i check if a branchA is tracking the origin/branchA ?	18:44
	(scripting purposes)	18:44
	← geoid left	18:44
	← fscala left	18:44
	→ sucks joined	18:44
	→ xfbs joined	18:44
	Ornacia → Deez_Nuts	18:45
\|-o-\|	DolphinDream: git branch -vv	18:45
	eh	18:45
	→ geoid joined	18:45
	→ kaictl joined	18:46
	← courrier_ left	18:46
qsuscs	DolphinDream: git rev-parse --symbolic-full-name branchA@{u}	18:46
	→ lindenle joined	18:46
qsuscs	or something something config	18:46
	→ toogley joined	18:47
qsuscs	branch.branchA.*	18:47
	← geoid left	18:47
	→ fscala joined	18:47
toogley	hello. can i show somehow the complete file as it was to a specific commit?	18:47
qsuscs	toogley: git show commit:file	18:48
	← jonmorehouse left	18:49
	← Nizumzen left	18:49
	← tristanp left	18:50
toogley	qsuscs: ah, thank	18:51
	+s	18:51
qsuscs	!next	18:51
gitinfo	Another satisfied customer. NEXT!	18:51
	← vdv left	18:52
	→ mounir_ joined	18:52
littlebear	btw, does the git command line have the release function? afaik I have only found tags	18:52
	→ hyperair joined	18:52
	← orfix left	18:52
	← mischat__ left	18:53
	→ tristanp joined	18:54
toogley	o.O	18:54
alanjf	I think that is a github.com thing?	18:54
	→ DanZ3 joined	18:54
	→ geoid joined	18:54
	← encod3 left	18:54
	→ ascarter joined	18:55
	← sucks left	18:56
	← petersr left	18:56
	← ahr3n left	18:57
	← settermjd left	18:59
	← DanZ3 left	19:00
	← achadwick left	19:00
DolphinDream	thx qsuscs	19:01
	← italoacasas left	19:02
	← Karkus left	19:02
	→ Karkus joined	19:03
	← zeroed left	19:03
	← bket left	19:03
Nevik	it is.	19:04
	← lindenle left	19:04
	→ dreiss joined	19:04
	→ daito joined	19:05
	← tristanp left	19:05
	→ tristanp joined	19:06
	→ lindenle joined	19:06
	← weaksauce left	19:07
	→ otter768 joined	19:08
	→ ixjlyons joined	19:08
	← geoid left	19:08
	← rorro left	19:08
	→ ormaaj joined	19:09
	← daito left	19:09
	← xfbs left	19:10
	→ yrashk joined	19:10
	← LeBlaaanc left	19:10
	← faux___ left	19:10
ormaaj	I keep getting `gpg: signing failed: No pinentry` when attempting to commit. `credential.helper = /usr/bin/pinentry-curses`, which exists on this system. Is that not a non-graphical pinentry client?	19:11
	← marscher left	19:11
	→ weaksauce joined	19:11
	← geekbri left	19:12
	← otter768 left	19:13
	← weaksauce left	19:13
	→ dickdaley joined	19:13
	→ faux___ joined	19:14
	→ silverslide joined	19:14
	→ tildes joined	19:15
ormaaj	seems to work stand-alone even.	19:15
	← Kronuz left	19:16
	← nnyk_ left	19:16
	→ dvaske joined	19:17
	← ncthom91 left	19:17
	← eijk left	19:18
	→ Kronuz joined	19:18
	→ eijk_ joined	19:18
	← andrybak left	19:18
	→ Ragnar joined	19:18
ormaaj	hm tht might not even be git's invocation issue though I thought I had this working elsewhere.	19:18
	← jstimm left	19:20
	← rubyonrailed left	19:20
	→ chucky_z joined	19:20
	← zacts left	19:21
	→ zacts joined	19:21
	→ kzisme joined	19:21
	← cdg left	19:21
	→ thiago joined	19:21
	← dvaske left	19:21
	→ dvaske joined	19:21
	← lindenle left	19:23
	→ sucks joined	19:24
ormaaj	bleh this had to do with gentoo's `eselect pinentry` setting. apparently that takes precedence over git for some reason.	19:24
	→ lindenle joined	19:24
	→ ncthom91 joined	19:25
	← petaflot left	19:25
	→ petaflot joined	19:25
	← cschneid left	19:26
	→ robot joined	19:26
	→ roxlu joined	19:26
	← ascarter left	19:26
	→ apotry joined	19:28
	← paulweb515 left	19:29
	← upene left	19:29
	← mezod left	19:30
	← sssilver left	19:30
	→ jeffmjack joined	19:31
	→ majikman joined	19:31
	→ sssilver joined	19:31
	→ devoldmx joined	19:32
	→ cmoneylulz joined	19:32
	→ soerenb joined	19:32
	→ astrofog joined	19:33
	→ cschneid_ joined	19:35
	← CJ_ left	19:35
	→ CJ_ joined	19:35
	← jost left	19:35
	→ italoacasas joined	19:36
	← CJ_ left	19:36
	→ aboseley joined	19:36
	← devoldmx left	19:36
	← MechtiIde left	19:36
	→ jost joined	19:37
	← lindenle left	19:38
	← jost left	19:38
	← LiENUS left	19:38
	→ jost joined	19:38
	← wilsongis left	19:39
	← jost left	19:40
	→ lindenle joined	19:40
	→ _ingo joined	19:41
	→ jost joined	19:42
	→ dstarh joined	19:42
	→ upene joined	19:44
	→ alexruf joined	19:44
	→ incredible joined	19:44
	→ josuebrunel joined	19:45
	← Karkus left	19:45
	→ FireArrow133 joined	19:45
	← s00pcan left	19:46
	← dserodio left	19:46
	ratanparai → observerX	19:47
	→ s00pcan joined	19:47
	→ mbrzuzy joined	19:48
	← jojovem left	19:48
	← lindenle left	19:49
	→ yqt joined	19:49
	← tristanp left	19:50
	← jokajak left	19:50
	← tildes left	19:50
	← gfixler left	19:50
	→ tristanp joined	19:50
	← observerX left	19:50
	→ ratanparai joined	19:50
	← ratanparai left	19:50
	→ ratanparai joined	19:50
	→ LiENUS joined	19:50
	→ cvanball joined	19:51
	→ spiritz joined	19:51
	← NeverDie left	19:51
	→ lindenle joined	19:51
	→ nettoweb joined	19:51
	→ zeroed joined	19:52
	→ Chill_Surf joined	19:52
	→ hcaldwel joined	19:52
\|-o-\|	DolphinDream: you can also just cat .git/config :)	19:52
	though, i'm not sure what parser you would use for that	19:52
hcaldwel	Is there a way to commit a branch of one repository to be under a subdirectory of another repository?	19:53
	→ rom1v joined	19:53
rom1v	hi	19:53
	→ jokajak joined	19:53
rom1v	How can I exclude ".gitignore" from the result of "git archive"?	19:53
_ikke_	man gitattributes	19:54
gitinfo	the gitattributes manpage is available at http://jk.gs/gitattributes.html	19:54
rom1v	I want a tar.gz of a specific commit, but not the .gitignore file	19:54
	→ bket joined	19:54
rom1v	ok	19:54
	← RaceCondition left	19:54
	→ settermjd joined	19:55
_ikke_	there is an export attribute	19:55
rom1v	if you have an example, I'm interested :)	19:55
_ikke_	export-ignore	19:55
	echo ".gitignore export-ignore" >> .gitattributes	19:56
	← jost left	19:56
CrypticGator	Hi I'm having trouble with a conflict. One of my files has been erased and I can't trace it. I've tried git log -- filename.c . A solution I'm thinking is to go back to the commit that my local and remote has incommon. copy my files from that commit, replay it on top of the remote branch, then replay the commits I have locally since my last push	19:56
rom1v	great, thank you :)	19:58
	← ril left	19:58
	→ jost joined	19:59
	→ geoid joined	19:59
CrypticGator	If my idea is reasonable, how do I stage a snapshot of a commit?	19:59
	→ gfixler joined	19:59
DolphinDream	\|-o-\|, git rev-parse --symbolic-full-name branchA@{u} works fine	19:59
	← kpease left	19:59
\|-o-\|	ok	20:00
	→ mwhooker joined	20:00
	← samw left	20:01
	→ zeroed_ joined	20:01
	→ peoliye_ joined	20:01
	← zeroed_ left	20:01
	← zeroed left	20:02
	→ samw joined	20:02
	→ RaceCondition joined	20:02
	← cebor left	20:03
	← luksaur left	20:03
	→ hexfusion joined	20:04
	← samw left	20:04
	→ namikr joined	20:04
	← namikr left	20:05
	← othll0 left	20:05
	← ratanparai left	20:05
	← LiENUS left	20:05
	→ HelloAtMega joined	20:06
	→ ratanparai joined	20:06
	← ratanparai left	20:06
	→ ratanparai joined	20:06
	← ratanparai left	20:06
	→ othll0 joined	20:06
	→ cagedwisdom joined	20:07
	→ aidalgol joined	20:07
	← lindenle left	20:07
	← rom1v left	20:08
	→ cebor joined	20:08
hexfusion	is it possible to diff a branch and a tag. This is what Iam trying to do diff origin/master:<branch>dir/ foo/<tag>:dir/ but says the <tag> is “Invalid object name”	20:08
	where foo is a remote	20:09
	← _cyril_ left	20:09
hexfusion	got it I don’t have to define the remote	20:12
	diff origin/master:<branch>dir/ <tag>:dir/	20:12
	→ _cyril_ joined	20:14
	→ iatkotep joined	20:14
	← iatkotep left	20:14
	→ iatkotep joined	20:15
	→ lindenle joined	20:15
	→ NeverDie joined	20:16
	← romankl left	20:17
	← mirton left	20:17
	→ ahr3n joined	20:18
	← CheckDavid left	20:19
	← aboseley left	20:19
	← lindenle left	20:19
	← tristanp left	20:20
	→ luksaur joined	20:20
	← MrWoohoo2 left	20:21
	← MrWoohoo left	20:21
	→ Kate_21 joined	20:21
	→ tristanp joined	20:21
	→ m0viefreak joined	20:21
Zorkmid	I'm trying to run https://github.com/gappc/aco from the command line but I'm getting errors saying that packages don't exist when they are in my root dir. I've read up about classpaths but I'm still stuck.	20:24
	→ lindenle joined	20:25
	← iatkotep left	20:25
	→ rnsanchez joined	20:26
	← Kate_21 left	20:26
	← kzisme left	20:26
DolphinDream	\|-o-\|, btw thx for your suggestions too.	20:26
	← cvanball left	20:26
	← hexfusion left	20:26
\|-o-\|	:)	20:26
	it's hard to script with git	20:27
	mounir_ → orfix	20:27
	→ Balliad joined	20:27
	← _rnsanchez_ left	20:27
	→ irqq joined	20:28
ojacobson	Zorkmid: mail the author and ask him to check the build script into git	20:29
	→ kzisme joined	20:29
	→ lykinsbd_ joined	20:29
Zorkmid	?	20:29
ojacobson	though honestly it does look like `javac -sourcepath src -classpath bin -d bin src/AntColonyMain.java` should be enough to compile that code, there's nothing terribly complicated going on there around packages	20:30
	← lykinsbd left	20:30
	← lindenle left	20:30
DolphinDream	script wise, is this a good/reliable way of getting the currently checkedout branch ? : git rev-parse --abbrev-ref HEAD	20:30
ojacobson	Depends on what you want to use it for	20:30
	that's _a_ way, sure	20:30
DolphinDream	how about : git rev-parse --symbolic-full-name --abbrev-ref HEAD	20:31
	→ lindenle joined	20:31
	→ sctskw joined	20:31
	← upene left	20:31
	← geoid left	20:31
Zorkmid	ojacobson: thanks, I'll try that. I'm sure it's nothing complex, I'm new to programming and don't really understand the cmd line stuff	20:31
	I've only compiled through an IDE	20:32
	← scoobertron left	20:32
ojacobson	that's _a_ way, sure	20:32
Zorkmid	What differentiates a program that must be run from the cmd line from one that can be run through an IDE?	20:33
ojacobson	No program "must" be run through an IDE, that's what.	20:33
ecmike	the user	20:33
Zorkmid	No, but some can't be run.	20:33
ojacobson	or, rather, any program _can_ be run through an IDE, given sufficient energy. The things IDEs automate are all doable outside an IDE.	20:33
	← silverslide left	20:33
	← kzisme left	20:34
	→ anchorite joined	20:35
	→ scoobertron joined	20:35
	← scoobertron left	20:35
	← tristanp left	20:36
	→ filisko joined	20:37
	→ dserodio joined	20:38
	← toogley left	20:38
	→ toogley joined	20:40
	ChanServ set mode: +o	20:40
	→ tristanp joined	20:40
	← lindenle left	20:41
Laaw	guh, I did this once before but I forget what I did	20:41
	anyway what I did was I set up a repo to automatically accept any pushes	20:41
	and not a .repo	20:41
	it's a setting, like --allow-something	20:42
_ikke_	git config receive.denyNonFastForwards false	20:43
Zorkmid	ojacobson: does using "-d bin" mean creating a directory for placing the class files?	20:43
	called bin	20:43
ojacobson	yes	20:44
	← elastix left	20:44
ojacobson	javac -? will list what each option does; for more info, see the oracle tool documetation on their website - #git isn't really the place to discuss java build problems	20:44
	← hcaldwel left	20:44
	→ samw joined	20:44
	← samw left	20:45
	→ lindenle joined	20:46
ojacobson	Zorkmid: private help starts at $300/hr, in one hour increments. Keep it public. :) And, yes, you'll have to get the original author to give you a hand, here, ultimately: they're responsible for the code you're having trouble with.	20:46
bremner	why is this not in ##java?	20:46
_ikke_	Zorkmid: I gave you the commands///	20:46
ojacobson	It is. They told Zorkmid to contact the author too.	20:46
	← Guest56271 left	20:46
_ikke_	I got it to run	20:47
	← phrozensilver left	20:47
	→ adama joined	20:48
	→ Sucks_ joined	20:48
	← othll0 left	20:48
_ikke_	javac -cp src src/aco/AntColonyMain.java && java -cp src aco.AntColonyMain	20:48
	adama → Guest66748	20:48
_ikke_	Works for me	20:48
	← tristanp left	20:48
	→ LeBlaaanc joined	20:49
	→ uri joined	20:49
Zorkmid	_ikke_ yes thanks for that, I'm just struggling with trying to understand what's going on. Sorry for channel floodin'	20:49
	→ rorro joined	20:49
	→ crose joined	20:49
	→ tristanp joined	20:49
	← sctskw left	20:49
	← tristanp left	20:49
_ikke_	Zorkmid: the first command compiles the javacode	20:49
	the -cp sets the classpath, which is the path where java searches for the classes	20:49
	→ tristanp joined	20:49
_ikke_	then you execute the main class	20:49
	← mmlb left	20:50
	← nilg left	20:50
	→ elastix joined	20:52
	→ oojacoboo joined	20:52
	→ tvw joined	20:52
	→ paulweb515 joined	20:52
	← incredible left	20:52
	← lindenle left	20:53
	← lykinsbd_ left	20:53
	→ lykinsbd joined	20:54
Zorkmid	SO it all has to be on the same line?	20:54
	→ samw joined	20:54
	← sucks left	20:55
	→ mmlb joined	20:55
	→ tpollard joined	20:55
	← Ragnar left	20:56
	← MeltedLux left	20:56
	← elastix left	20:56
	← phaleth left	20:57
	← Spacew00t left	20:57
	→ DolpheenDream joined	20:57
	→ kzisme joined	20:58
	→ lindenle joined	20:59
	→ LiENUS joined	20:59
	← Anderson69s left	20:59
	archmint → erchmint	20:59
	← raininja left	20:59
	→ liamonade joined	20:59
	erchmint → archmint	21:00
	→ opencard joined	21:00
	← opencard left	21:01
	← johan_sun left	21:01
	→ johan_sun joined	21:02
	← liamonade left	21:02
	→ ctruelso joined	21:02
	→ nnyk_ joined	21:03
	← roxlu left	21:03
	← LiENUS left	21:04
	→ MeltedLux joined	21:04
	→ Spacew00t joined	21:05
ctruelso	Hello all, I’m having trouble interactively rebasing. When I run git rebase master -i, it shows the git-rebase-todo file, but then automatically rebases without letting me make changes to that file. It then deletes the file. Any ideas?	21:05
	→ daito joined	21:05
	→ tristanp_ joined	21:06
	← paulweb515 left	21:06
	→ paulweb515 joined	21:06
	← toogley left	21:06
	← tristanp left	21:06
	← Hounddog left	21:06
	← faux___ left	21:08
	← NeverDie left	21:08
	← irqq left	21:08
	→ tang^ joined	21:08
	← HelloAtMega left	21:08
	→ IWishIKnew joined	21:08
	→ otter768 joined	21:09
	← tvw left	21:09
	← daito left	21:10
	← gfixler left	21:10
	→ _Vi joined	21:10
	← lindenle left	21:11
	→ akshat joined	21:11
	→ ItSANgo joined	21:11
	→ cdg joined	21:11
	← _cyril_ left	21:11
	→ axelunicorn joined	21:12
	→ NeverDie joined	21:13
	← nour left	21:13
	→ aspiers joined	21:13
	← Kingsy left	21:13
	← Caelum left	21:13
	← otter768 left	21:13
	→ faux___ joined	21:14
	→ lindenle joined	21:14
	→ Hink joined	21:14
_ikke_	what editor do you have?	21:15
	← bket left	21:15
ctruelso	sublime	21:16
	3	21:17
	Smirnov_ → Smirnov	21:17
ojacobson	What's $EDITOR set to?	21:17
	Sublime, like most GUI editors, has two modes for its CLI editor: one that blocks until you close the file, and one that returns control to the caller immediately while leaving the editor open.	21:17
	Git has no idea bout the editor window; it relies on the editor command to block until editing is complete.	21:18
	← tristanp_ left	21:18
ctruelso	when i run `echo $EDITOR` i get nothing	21:18
	← faux___ left	21:18
ojacobson	What about `git config core.editor`	21:19
	or $VISUAL, or $GIT_EDITOR	21:19
	→ tristanp joined	21:19
ctruelso	git config core.editor = subl	21:19
ojacobson	subl is of the latter (return immediately) kind	21:19
ctruelso	nothing for $GIT_EDITOR or $VISUAL	21:19
	← bitkiller left	21:19
ctruelso	interesting	21:19
ojacobson	so that explains what you're seeing	21:19
	you'll have to dig around in the sublime docs to figure out how to get the other mode. I know it exists.	21:20
ctruelso	ok will do. thank you!	21:20
	→ bitkiller joined	21:20
	← alexruf left	21:20
	→ faux___ joined	21:20
	← faux___ left	21:21
	→ faux___ joined	21:21
	← multi_io left	21:21
_ikke_	https://stackoverflow.com/questions/22631863/setting-up-sublimetext-3-as-git-commit-text-editor	21:22
	→ Kingsy joined	21:22
_ikke_	apparently just uses subl	21:22
	→ Karkus joined	21:23
_ikke_	-w	21:23
	https://stackoverflow.com/a/25255676/20261	21:23
	← algae left	21:23
	→ multi_io joined	21:23
ctruelso	core.editor = subl —wait	21:23
	thanks all	21:24
	← MarkyC left	21:24
	← tristanp left	21:24
	→ tristanp joined	21:25
	→ iatkotep joined	21:26
	← rwb left	21:27
	← lindenle left	21:27
ojacobson	If you put an em-dash in your git config, you're gonna have a bad time grin	21:27
_ikke_	haha	21:28
	← majikman left	21:29
	→ tildes joined	21:29
	← IrishPrime left	21:30
	→ sbogg joined	21:30
	← jteneyck left	21:31
	→ opencard joined	21:31
	→ lindenle joined	21:31
	→ walli joined	21:31
	→ devoldmx joined	21:32
	← Chill_Surf left	21:33
	← jason237 left	21:34
	← nettoweb left	21:35
	→ diego2 joined	21:35
	← latrommi left	21:35
	← diegoviola left	21:35
	← diego2 left	21:36
	→ diego2 joined	21:36
	← kevwil left	21:36
	← tildes left	21:36
	→ bket joined	21:36
	← devoldmx left	21:36
	→ latrommi joined	21:37
	← Jackneill left	21:37
	← ctruelso left	21:37
	← swilsonau left	21:38
	→ SimonNa joined	21:38
	← yrashk left	21:39
	→ elastix joined	21:39
	← weyer left	21:39
	→ mischat joined	21:39
	← roygbiv left	21:39
	→ t4nk822 joined	21:40
t4nk822	hi there	21:40
gitinfo	t4nk822: 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.	21:40
	→ swilsonau joined	21:40
	← cmoneylulz left	21:40
	→ cmoneylulz joined	21:40
	→ Caelum joined	21:42
t4nk822	I was hoping i'd find someone here that could help me figure out how to clone a repository again, since the desktop client broke on me and using any sort of command hasn't really achieved anything. Wether i init a new repository or try to clone the existing one, all i get is an empty folder with no .git file and no way to pull the files from the remote repository.	21:42
jost	Can I merge branchA into branchB, while being on branchA? Can't easily switch to branchB, because of submodule-stuff	21:42
_ikke_	nope, you can only merge into the current branch	21:43
	→ ColdKeyboard joined	21:43
jost	_ikke_: mäh :(	21:43
	→ phrozensilver joined	21:43
	← lindenle left	21:44
jost	rebasing?	21:44
_ikke_	also requires checkout	21:44
	jost: Why can't you switch branches?	21:44
jost	I want to merge develop into master. In master, there are files, which are there in develop too. But in develop, the subtree with these files has become a submodule	21:45
	→ mirton joined	21:45
	← cdown_ left	21:46
jost	Message is: Please move or remove them before you can switch branches.	21:46
	→ cdown joined	21:46
jost	The following untracked working tree files would be overwritten by checkout:	21:46
	← iatkotep left	21:46
jost	develop is based on master	21:47
_ikke_	jost: and does git stash help?	21:47
jost	_ikke_: there is nothing to stash, everything is committed, in the main repo and in the submodules	21:48
_ikke_	right	21:48
	← linduxed left	21:48
	← yashu-seth left	21:48
	→ iatkotep joined	21:48
	→ avgn5- joined	21:48
	← avgn5 left	21:48
_ikke_	what version of git do you have?	21:48
	← _ingo left	21:48
	→ ShapeShifter499 joined	21:49
	→ lindenle joined	21:49
jost	_ikke_: 2.5.0	21:49
	← mirton left	21:50
	← avgn5- left	21:50
	← Balliad left	21:50
jost	Just got it working though - just deleted those files, switched to master, did the merge, and then checked the files out again	21:50
_ikke_	.git of the submodule, is that a file or a directory?	21:50
jost	worked because they are in a submodule	21:50
	→ avgn5 joined	21:50
_ikke_	right	21:50
	→ tristanp_ joined	21:50
jost	file	21:50
	← tristanp left	21:51
jost	_ikke_: thanks for the support	21:51
	← djosh left	21:51
_ikke_	not sure why git sees any files that can't be removed	21:51
	this was a problem with old versions of git where it did not want to remove the .git dir	21:52
	→ raininja joined	21:52
	← DolpheenDream left	21:53
	→ t0by joined	21:53
	← crose left	21:53
	← DolphinDream left	21:53
	→ ncd\|leeN joined	21:54
	← jost left	21:55
	← rorro left	21:55
	→ paul424 joined	21:55
	→ weyer joined	21:56
	atrigent_ → atrigent	21:57
t4nk822	So... anyone got any advice on what to do in my situation? Github's desktop client doesn't work for anything anymore, using the console "creates" new repositories but doesn't form a .git folder and doesn't pull any files from my master branch. My only access to my github project atm appears to be downloading the .zip and not using git anymore. o.o	21:57
	→ Bobbix joined	21:57
	← leeN left	21:57
	→ nilg joined	21:57
	← peoliye_ left	21:58
_ikke_	t4nk822: does git for windows still work (the command line version)?	21:58
t4nk822	it works as in i can launch it and type commands, but it doesn't seem to actually do anything outside of the command line.	21:58
	← Spacew00t left	21:58
Bobbix	Hi, i've a question. Can i upgrade git from 2.1.0 to a newer version withoit problems for existing repos?	21:59
	In other words the existing repositories can be used from newer version even if they are created with an older version?	21:59
canton7	yep	21:59
	even so git 2.1.0's pretty new in the grand scheme of things	21:59
	but git is backwards-compatible to way back in the history of repo-time	21:59
	← cdown left	22:00
Bobbix	Ok ... good. But i read version 2.6.3 that is more recent.	22:00
	← sgambino left	22:00
	← lindenle left	22:01
	← cmoneylulz left	22:01
	→ Chill_Surf joined	22:02
_ikke_	.version	22:02
gitinfo	_ikke_: .version: still at 2.6.3, not updating topic.	22:02
	← luksaur left	22:02
	→ lindenle joined	22:04
	← italoacasas left	22:04
	← kappy left	22:05
	← Karkus left	22:05
	→ kappy joined	22:05
	→ lykinsbd_ joined	22:06
	→ hectron joined	22:07
	← astrofog left	22:07
	← eijk_ left	22:07
	→ gfixler joined	22:07
	← t4nk822 left	22:08
	← anchorite left	22:08
	← doener left	22:09
	← lykinsbd left	22:09
	← samw left	22:09
	← uri left	22:10
	→ LaptopBrain joined	22:10
	→ samw joined	22:11
	→ cmoneylulz joined	22:11
	← atrigent left	22:12
	→ jason237 joined	22:13
	← samw left	22:14
	→ peoliye_ joined	22:14
	← dstarh left	22:14
	← yarnfive8 left	22:15
	← weyer left	22:15
	← settermjd left	22:15
	← raininja left	22:15
	← Bobbix left	22:16
	→ nettoweb joined	22:17
	→ boxbeatsy joined	22:17
	→ mirton joined	22:17
	← lindenle left	22:18
	← tristanp_ left	22:18
	→ cdown_ joined	22:18
	← roger_raymond left	22:18
	→ tristanp joined	22:18
	← paul424 left	22:18
boxbeatsy	hi, i'm trying to grant a freelancer the ability to test his front-end code without giving him full access to our code base. my current solution is to set up a new git repo that only includes the files he touches, and setting up a webhook that pulls his git commits onto a live staging server. does anyone know of a better set up?	22:19
	← cmoneylulz left	22:19
	← SimonNa left	22:19
	→ luksaur joined	22:20
	← bakingbread left	22:20
	← nettoweb left	22:20
	← madewokherd left	22:21
	→ samw joined	22:21
	← BrianBlaze420 left	22:22
	→ icedp joined	22:22
	→ lindenle joined	22:24
boxbeatsy	anyone? :\	22:24
	→ BrianBlaze420 joined	22:25
	← lykinsbd_ left	22:25
	→ MarkyC joined	22:25
	→ roger_raymond joined	22:25
	→ s8321414 joined	22:26
littlebear	boxbeatsy: setup a vm, rsync it one way to that vm, he can run wild within the vm	22:26
	← Es0teric left	22:26
preaction	use a submodule or a subtree	22:27
	← tristanp left	22:28
	→ axl_ joined	22:29
	← MarkyC left	22:30
boxbeatsy	hmm, ok, will look into both options. thanks!	22:30
	→ LiENUS joined	22:31
	→ paul424 joined	22:32
	→ RaceCondition_ joined	22:32
	← IWishIKnew left	22:32
	← RaceCondition left	22:33
	RaceCondition_ → RaceCondition	22:33
	→ ascarter joined	22:34
	→ ratanparai joined	22:34
	← ratanparai left	22:34
	→ ratanparai joined	22:34
	← diego2 left	22:34
	← luksaur left	22:35
	→ weyer joined	22:36
	→ zacg joined	22:36
	← zacg left	22:36
	→ zacg joined	22:36
	← lindenle left	22:37
	← dvaske left	22:37
	← Hink left	22:37
	← mkoskar left	22:37
	← howdoi left	22:38
	→ Hink joined	22:39
	← t0by left	22:39
	→ lindenle joined	22:39
	→ mkoskar joined	22:40
	← rjvb left	22:40
	← orfix left	22:42
	← cagedwisdom left	22:42
	← mwhooker left	22:42
	← jason237 left	22:42
	← aard_ left	22:43
	→ tristanp joined	22:44
	← weyer left	22:44
	← ascarter left	22:45
	← dickdaley left	22:46
	→ ascarter joined	22:47
	← lindenle left	22:47
	→ lindenle_ joined	22:47
	← mizu_no_oto left	22:48
	→ diego2 joined	22:48
	→ mounir_ joined	22:49
	← ascarter left	22:49
	← peoliye_ left	22:51
	← LaptopBrain left	22:51
	→ LaptopBrain joined	22:53
	← josuebrunel left	22:54
	→ cagedwisdom joined	22:55
	← editshare-ericf left	22:55
	← tristanp left	22:55
	← lindenle_ left	22:55
	← iatkotep left	22:57
	→ mwhooker joined	22:57
	→ lindenle joined	22:58
	← LaptopBrain left	22:58
	← nadim left	22:58
	← Dougie187 left	22:59
	← mwhooker left	22:59
	→ LaptopBrain joined	23:00
	→ _cyril_ joined	23:02
	← OnkelTem left	23:02
	→ nadim joined	23:02
	→ linduxed joined	23:02
	← linduxed left	23:02
	← jokajak left	23:02
	← Yeomra left	23:02
	→ OnkelTem joined	23:03
	← bitkiller left	23:03
	← bronson left	23:03
	← dreiss left	23:03
	→ bobdel joined	23:03
	→ jokajak joined	23:03
	→ Yeomra joined	23:04
	→ linduxed joined	23:04
	← linduxed left	23:04
	← faux___ left	23:04
	← lindenle left	23:05
	← King_Hual left	23:05
	→ daito joined	23:06
	→ tristanp joined	23:06
	→ faux___ joined	23:07
	← s8321414 left	23:07
	→ iatkotep joined	23:07
	→ s8321414 joined	23:07
	→ linduxed joined	23:07
	← hahuang61 left	23:08
	← linduxed left	23:09
	← tinajohnson_ left	23:09
	← paul424 left	23:09
	→ otter768 joined	23:09
davidosomething	https://github.com/davidosomething/git-my/issues/1	23:09
	whoops	23:10
	← aspiers left	23:10
	← nilg left	23:10
	← daito left	23:11
	→ neurtcme joined	23:11
	→ linduxed joined	23:11
	← s8321414 left	23:11
	→ s8321414 joined	23:11
neurtcme	hi does anyone know how to configure gogs?	23:12
_ikke_	doesn't ring a bell	23:12
	← faux___ left	23:12
	← linduxed left	23:12
	← nadim left	23:13
	→ lindenle joined	23:13
	→ nadim joined	23:14
tang^	go git service?	23:14
	← otter768 left	23:14
	← Kicer86 left	23:16
	← MattMaker left	23:16
neurtcme	I keep getting an error related to mysql when at the install page	23:16
	→ peoliye_ joined	23:16
neurtcme	yes go git service	23:16
	on the install page i see the following error:	23:17
	Database setting is not correct: dial tcp 127.0.0.1:3306: getsockopt: connection refused	23:17
	← xrogaan left	23:18
_ikke_	is mysql running?	23:19
	← wgrant left	23:19
jwest	neurtcme: I can't help you debug it, but my guess is that either mysql isn't running or it's running and only listening on its socket instead of on the port.	23:20
	→ faux___ joined	23:20
neurtcme	yes, mysql is running	23:21
	→ MattMaker joined	23:21
neurtcme	jwest: do you know how i can let it listen to the port?	23:21
	← mmlb left	23:21
	← JohnMaximilian left	23:23
	← davidosomething left	23:23
	→ JohnMaximilian joined	23:23
	→ strayPuppy joined	23:23
	← marlinc left	23:25
	← faux___ left	23:25
	← lindenle left	23:26
	← knittl left	23:27
	→ weyer joined	23:27
	→ faux___ joined	23:27
	← bobdel left	23:27
	← s00pcan left	23:28
	← paddyez left	23:28
	← dopesong left	23:28
	→ knittl joined	23:29
	← knittl left	23:29
	→ knittl joined	23:29
	← filisko left	23:29
	→ s00pcan joined	23:29
	→ jackburton joined	23:30
	← hectron left	23:30
	→ dsdeiz joined	23:31
	→ atrigent joined	23:31
	→ lindenle joined	23:31
	← fees left	23:31
	← codedmart left	23:31
	← dsdeiz left	23:32
	→ dsdeiz joined	23:32
	← faux___ left	23:32
	← tristanp left	23:32
	Guest66757 → skasturi	23:32
	skasturi → Guest98601	23:33
	→ devoldmx joined	23:33
	→ wgrant joined	23:33
	Guest98601 → skasturi	23:33
	→ faux___ joined	23:34
	→ rnsanchez_ joined	23:34
	← BillCriswell left	23:34
	← axl_ left	23:36
	← AaronMT left	23:36
	← rnsanchez left	23:36
neurtcme	no one knows how to let mysql listen to a port?	23:37
	← knittl left	23:38
	← devoldmx left	23:38
	→ dvaske joined	23:38
	← faux___ left	23:38
	→ knittl joined	23:39
	← knittl left	23:39
	→ knittl joined	23:39
	← samw left	23:39
	← aretecode left	23:39
	→ faux___ joined	23:40
	← lindenle left	23:40
	← mbrzuzy left	23:41
	← strayPuppy left	23:42
	← dvaske left	23:42
bremner	neurtcme: what is this to do with git?	23:42
	bremner reads backlog	23:43
bremner	ok, still, you'd have more luck asking mysql experts.	23:43
	← faux___ left	23:43
	→ faux___ joined	23:43
neurtcme	go git service has to do with git i guess	23:43
	thanks for your help anyway	23:44
	← hobodave left	23:44
	→ dreiss joined	23:45
	← MattMaker left	23:45
	→ marlinc joined	23:45
	→ HelloAtMega joined	23:45
	→ lindenle joined	23:45
	← neurtcme left	23:45
	→ MattMaker joined	23:46
	pi- → Guest75415	23:47
	← MattMaker left	23:48
	← Guest75415 left	23:48
	→ hahuang61 joined	23:48
	← cyphase left	23:48
	→ _rnsanchez_ joined	23:48
	← NeverDie left	23:49
	→ tristanp joined	23:50
	← rnsanchez_ left	23:50
	← sssilver left	23:51
	→ MattMaker joined	23:52
	← jcooke left	23:52
	← lindenle left	23:52
	→ fatalhalt joined	23:52
	→ bronson joined	23:52
	← faux___ left	23:53
	→ samw joined	23:54
	→ cmoneylulz joined	23:55
	← fracting1 left	23:57
	→ lindenle joined	23:57
	← samw left	23:59

Logs Search ←Prev date Next date→

Channels Documentation