IRCloggy #git 2014-01-12

Provider of IRC logs since 2005.

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

	2014-01-12
	← p4denis left	00:00
Fissure	wget: not entirely sure what you're asking	00:00
	← _mtr left	00:00
_ikke_	wget: git checkout .	00:00
	that will put the contents of the index in the working tree	00:00
Fissure	you want to stash the unstaged changes away, then make some different modifications on top of that, stage those, and then get your unstaged changes back?	00:00
	→ prometh joined	00:01
Fissure	if the unstaged changes and the new ones you're making don't overlap, use git add -p	00:01
prometh	i'm doing an interactive rebase and i'm getting "1 ahead, 5 behind" bullshit	00:01
	trying to squash the last 5 commits	00:02
matt-chars	wonderful. Some of the files in my .git folder are owned by root and cant be overwritten by git.	00:02
_ikke_	chown them again	00:02
	prometh: when do you get that?	00:02
prometh	after doign the rebase	00:02
	i can't push	00:02
_ikke_	prometh: !rewrite	00:03
gitinfo	prometh: [!rewriting_public_history] Rewriting public history is usually bad. Everyone who has pulled the old history have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	00:03
	→ psyl0n joined	00:03
prometh	ah	00:03
Fissure	prometh: don't do that if they're already pushed	00:03
	in the words of walter sobchak, you are entering a world of pain	00:03
prometh	why not? it'll make it easier for peole to read	00:03
matt-chars	_ikke_: now it seems to be working. Gotta go into each server and chwon -R all the .git folders and we'll be in business	00:03
Fissure	prometh: because if someone else has based changes on the unsquashed commits you're pulling the rug out from under them	00:04
prometh	i'm doing a pull request and it's easier to read 1 commit than 5	00:04
_ikke_	prometh: is it your own fork?	00:04
prometh	yes	00:04
	own branch	00:04
_ikke_	ok	00:04
	then just push -f	00:04
wget	_ikke_: Ahhh, ok. Indeed, I thought, by index, the author means committed, but indeed, staged is considered as part of the index too. Thanks it works. #masteringGit	00:04
prometh	cool, thanks	00:05
	← mikecmpbll left	00:05
_ikke_	wget: To make it more clear	00:05
	index and stage refer to the same thing	00:05
	The stage is a conceptual idea, the index is how it's implemented	00:05
	← `petey` left	00:06
prometh	thanks guys... worked nicely	00:07
	← prometh left	00:07
	→ _mtr joined	00:08
	→ phipes joined	00:09
	→ Goplat joined	00:09
	← craigp left	00:10
	→ oriba joined	00:10
	← chamunks left	00:12
	→ petey joined	00:12
	→ wbdecker joined	00:12
	← PLejeck left	00:13
	→ PLejeck joined	00:13
	→ kukks joined	00:13
	← kukks left	00:13
	→ kukks joined	00:13
	PLejeck → nuck	00:13
	← ingens left	00:14
	← ngladitz left	00:15
	← Cache_Money left	00:15
	→ macben joined	00:16
	→ dik_dak joined	00:18
	→ eijk_ joined	00:19
	← hellopat left	00:19
	← koda left	00:20
	→ hellopat joined	00:20
	← King_Hual left	00:21
	← corni left	00:21
	← Goplat left	00:22
	← eijk left	00:22
	← macben left	00:22
	→ npatten joined	00:22
	← CheckDavid left	00:23
	← promethazin left	00:23
	← pantsman left	00:23
	→ promethazin joined	00:23
	← _mtr left	00:24
	← hellopat left	00:24
	→ hwrdprkns joined	00:25
	← valtih left	00:25
	← geomyidae__ left	00:25
	← lindenle left	00:26
	→ _mtr joined	00:26
	→ geomyidae joined	00:27
	→ prometh joined	00:27
prometh	how do i correct a commit message?	00:27
	i just did an interactive rebase and forgot to edit the long-ass message	00:27
	← elbeardmorez_ left	00:27
	← hwrdprkns left	00:27
Fissure	commit --amend	00:28
	→ hwrdprkns joined	00:28
	← promethazin left	00:28
	→ valtih joined	00:28
	← dik_dak left	00:28
	→ jayallen_ joined	00:29
	→ dik_dak joined	00:29
xiong	Damn, I don't think gitslave is the answer, either; it tries to do too much -- way too much. The paradigm bothers me of "do this git command for all subprojects"; it's risky.	00:29
	← jayallen left	00:29
	jayallen_ → jayallen	00:29
xiong	I do not like the idea that devs cannot work on the project without using gits... or risk screwing it up. The gimmick, whatever it is, should only need to be used when doing something particular to the super/sub relationship.	00:30
prometh	thanks	00:30
	→ carbon joined	00:31
prometh	Fissure: if i push that, will it both be visible in history?	00:31
	i'm on my own branch, so it's safe to rebase -i and push -f	00:31
Fissure	no	00:31
prometh	it will replace the last commit?	00:32
Fissure	correct	00:32
prometh	cool, thank you	00:32
	Fissure: it's telling me that i'm 1 behind and i need to pull	00:32
	← carbon left	00:32
xiong	May we start over and ask exactly what the risks are if we just nest several repos? What happens then? Changes to any subtree are committed in the super, check; a checkout in a sub dirties the super, check; each sub has its own remotes and history, check.	00:32
prometh	but the only thing to pull are my previous changes	00:33
	← Guest28458 left	00:33
Fissure	yes	00:33
	you rewrote history again	00:33
prometh	force push?	00:33
	ok	00:33
	cool	00:33
	thanks!	00:33
	→ LuxuryMode joined	00:33
	→ defdeafy joined	00:35
	→ lindenle joined	00:36
	→ john2x joined	00:36
	← prometh left	00:37
	← rgr left	00:37
	← phipes left	00:37
	→ Nizumzen joined	00:38
	← kukks left	00:38
	← petey left	00:39
	→ petey joined	00:40
	← defdeafy left	00:42
	→ _mtr_ joined	00:42
	→ simesy joined	00:42
	← _mtr left	00:43
	← _mtr_ left	00:44
	← petey left	00:44
	→ alexandernst joined	00:45
	→ freestyl3r joined	00:45
	← nnyk_ left	00:45
	← ivan\ left	00:45
	← eijk_ left	00:46
	→ cmpera joined	00:46
alexandernst	How can I ignore all files/folders in the current dir, except the file 'a' and the folder 'b'? I'm trying with * \n !.gitignore \n !a \n !b but this is ignoring everything if the folder 'b' aswell.	00:46
	→ ivan\ joined	00:46
	← frogonwheels left	00:47
Fissure	alexandernst: i can't remember if order matters	00:47
	← jkremser left	00:47
Fissure	tracked files are never ignored, so if you add 'a' to the repo it will always be tracked even if it matches the ignore rules	00:47
	→ teran joined	00:47
alexandernst	Fissure: ah, that's good to know :) But I'd like being able to add my files without -f	00:48
	It doesn't feel like a clean solution	00:48
	→ kcj joined	00:49
alexandernst	ah, I think I found it :)	00:49
Fissure	is the -f required if it's already tracked and you're just updating the content? i wouldn't think so	00:49
alexandernst	it sohuld be '!b/' instead of '!b"	00:49
	s/sohuld/should/	00:50
xiong	alexandernst, Why do you want to ignore everything but?	00:50
	→ ingens joined	00:50
	← leeN left	00:50
alexandernst	xiong: I want file 'a' and everything inside folder 'b' to be tracked, but I usually do dirty tests in the root directory, creating files and what not, and I don't want "git st" to "see" them	00:51
	← ariscop left	00:51
	→ petey joined	00:51
xiong	I would do tests in a test/ and ignore that.	00:51
alexandernst	indeed, I do have a test folder, it's just I don't use it. Bad habits :(	00:52
	→ ntio joined	00:52
	→ ariscop joined	00:52
	→ nw8l joined	00:54
	← teran left	00:55
	→ sjohnson joined	00:55
	← Zeelot left	00:57
	→ teran joined	00:58
	→ Zeelot joined	00:58
	← SeptDePique left	00:59
	→ iron_houzi joined	00:59
	← paul424 left	01:01
	→ simesy_ joined	01:01
	← simesy left	01:01
	← hwrdprkns left	01:02
	→ hwrdprkns joined	01:03
	→ toiletbowlJoel joined	01:04
	→ Goplat joined	01:04
	→ jmct` joined	01:04
	→ simesy joined	01:05
	← simesy_ left	01:05
	← HelloShitty left	01:06
	xnrand → o	01:06
	→ prometh joined	01:06
	← Zeelot left	01:06
prometh	is it possible to send a PR to an issue that i created on github?	01:06
milki	prometh: you cant turn an issue into a PR unless you use the api	01:07
prometh	better wording: is it possible to convert an issue that i created to a pr ?	01:07
	what api?	01:07
milki	github api?	01:07
prometh	javascript?	01:07
	or?	01:07
	← amcsi left	01:07
milki	thats not how apis work	01:07
	← gnu-man_ left	01:07
prometh	i'm not a sevrer-side guy	01:07
	→ Exancillatus joined	01:08
milki	apis arent really server related either	01:08
prometh	so it's json based?	01:08
	→ afhammad_ joined	01:08
milki	i adjust my answer, you cannot turn an issue into a pr. the api sounds too hard for you	01:08
prometh	dick.	01:09
	→ mribeirodantas joined	01:09
	→ acharlieh joined	01:09
milki	learn to google	01:09
	and hey, #github	01:09
	→ Fandekasp joined	01:10
	← prometh left	01:10
	← simesy left	01:11
	→ simesy joined	01:11
	→ jmct joined	01:13
	→ phipes joined	01:13
	← afhammad_ left	01:13
	← acharlieh left	01:14
	← mklappstuhl left	01:15
	→ kukks joined	01:15
	← alexandernst left	01:16
	← Exancillatus left	01:16
	← petey left	01:19
	→ drodger joined	01:19
	← hwrdprkns left	01:19
	→ petey joined	01:19
	→ simesy_ joined	01:20
	→ HelloShitty joined	01:20
	← petey left	01:21
	→ petey joined	01:22
	← fesoj left	01:23
	← simesy left	01:23
	← valgrind left	01:24
	→ hwrdprkns joined	01:24
	RofricTheBearded is away: he went out and make himself busy. go ye and do likewise.	01:24
milki	wat	01:25
	← simesy_ left	01:25
	← dougsland left	01:25
	→ Vivekananda joined	01:26
	→ hellopat joined	01:27
	ChanServ set mode: +o	01:27
	bremner set mode: +q	01:28
	o → xnrand	01:28
	bremner kicked RofricTheBearded (you can be unmuted when you disable your away gimmick)	01:28
	→ robbyoconnor joined	01:28
	ChanServ set mode: -o	01:29
	→ dougsland joined	01:29
	← hwrdprkns left	01:32
	← hellopat left	01:32
	← phipes left	01:32
	→ simesy joined	01:34
	→ Kayra joined	01:34
	→ jayallen_ joined	01:34
	← jayallen left	01:34
	jayallen_ → jayallen	01:34
	← simesy left	01:35
	→ simesy joined	01:35
	← Vivekananda left	01:35
	← simesy left	01:36
	→ simesy joined	01:37
	→ phipes joined	01:37
	→ Vivekananda joined	01:38
	← matt-chars left	01:40
	← psyl0n left	01:40
	→ master_j joined	01:40
	← petey left	01:40
	→ petey joined	01:41
	→ Mars joined	01:43
	Mars → Guest37339	01:43
	← BSaboia left	01:43
	← hahuang65 left	01:44
	→ pikaren joined	01:44
	→ nerdfiles joined	01:45
	← petey left	01:45
	← simesy left	01:46
	→ hwrdprkns joined	01:47
	← daivyk left	01:48
	← ingens left	01:48
	→ simesy joined	01:52
	← FerreusR left	01:53
	← jmct left	01:53
	→ _mtr joined	01:54
	→ p4denis joined	01:56
	← steverandy left	01:56
	← neozonz left	01:56
	← netiul left	01:57
	← thunderbolt left	01:57
	← Roch_ left	01:57
	← raghunayyar__ left	01:57
	← GameGamer43 left	01:57
	← knownasilya left	01:57
	← ddv left	01:57
	← twisted` left	01:57
	← jmcantrell left	01:57
	→ raghunayyar__ joined	01:58
	← xerxas left	01:58
	← scalability-junk left	01:58
	→ Roch_ joined	01:58
	→ steverandy joined	01:58
	→ netiul joined	01:58
	← hwrdprkns left	01:59
	→ ddv joined	01:59
	→ GameGamer43 joined	01:59
	→ acharlieh joined	01:59
	← conan left	01:59
	← bwreilly left	01:59
	→ thunderbolt__ joined	01:59
	→ jmcantrell joined	02:00
	→ knownasilya joined	02:00
	→ xerxas joined	02:00
	→ scalability-junk joined	02:00
	→ matt-chars joined	02:00
	→ neozonz joined	02:00
	→ simesy_ joined	02:00
	← tfnico left	02:00
	← p4denis left	02:01
	← ELLIOTTCABLE left	02:01
	← OliverJAsh left	02:01
	← jab416171 left	02:01
	← lacrosse left	02:01
	→ Marenz joined	02:01
	← anarchih left	02:01
	← kapowaz left	02:01
	← ggherdov left	02:01
	→ twisted` joined	02:01
	← jayallen left	02:03
	→ jayallen_ joined	02:03
	→ anarchih joined	02:03
	→ tfnico joined	02:03
	→ OliverJAsh joined	02:03
	← adambrenecki left	02:03
	→ ELLIOTTCABLE_ joined	02:03
	→ jab416171 joined	02:03
	→ kapowaz joined	02:03
	→ lacrosse joined	02:03
	← titusjose_ left	02:04
	← simesy left	02:04
	→ adambrenecki_ joined	02:04
	← simesy_ left	02:04
	← M4renz left	02:04
	← Goplat left	02:05
	→ titusjose__ joined	02:05
	← akitada left	02:05
	← stealthii left	02:05
	← henrikhodne left	02:05
	→ kor__ joined	02:06
	chamunkst → chamunks	02:06
	← looper_ left	02:07
	→ henrikhodne joined	02:07
	→ stealthii joined	02:08
	→ akitada joined	02:08
	→ ggherdov joined	02:08
	→ prometh joined	02:08
prometh	how can i remove a tree, but not the whole repo?	02:09
	← Kayra left	02:09
	→ looper joined	02:09
wbdecker	prometh: rm -rf ?	02:10
	prometh: just don't delete the .git folder	02:10
	→ Suprano joined	02:10
	← _mtr left	02:10
prometh	what's -rf ?	02:11
	a recursive force	02:11
	ah*	02:11
	that can delete a tree?	02:12
bremner	prometh: what do you mean by a tree?	02:12
prometh	github.com/user/repo/tree/1298379hasfyq3	02:12
	→ shinnya joined	02:13
bremner	can you phrase your question in terms of git, rather than the github web interface?	02:13
prometh	that's all i know.	02:13
	← Nizumzen left	02:14
	→ beyondcreed joined	02:14
prometh	i have a PR with a commit that i've overwritten (push -f) ... i'm thinking that if i remove the tree that the commit is on, the reference will be removed as well	02:14
	← oriba left	02:14
	← mribeirodantas left	02:14
	← Marenz left	02:15
prometh	the tree would be a commit hash, i guess	02:15
	→ _mtr joined	02:16
prometh	i'm always using git wrong, but i'm trying to fix my mistakes	02:17
	why do people always stop helping me when i ask hard questions?	02:19
	← Silmarilion left	02:19
bremner	I guess you need to wait for someone github savvy with time on their hands.	02:20
offby1	embarrassment	02:20
	thunderbolt__ → thunderbolt	02:20
offby1	prometh: why do you want to "remove the tree"?	02:20
	→ hellopat joined	02:21
	offby1 elbows bremner aside	02:21
prometh	i have a PR with a commit that i've overwritten (push -f) ... i'm thinking that if i remove the tree that the commit is on, the reference will be removed as well	02:21
	https://github.com/bitovi/canjs/pull/652#ref-commit-051e456	02:21
	see those 2 commits above the bottom one? those have been replaced in history	02:21
	← _mtr left	02:22
offby1	so it sounds like your goal is to update the pull request, somehow	02:22
	interesting	02:22
prometh	it worked with other PRs... my problem is the commist messsages	02:22
	they have #123 in them	02:22
	i'm never doing htat again	02:22
offby1	unfortunately this is indeed a github question, not a git question; also unfortunately, I don't really know how pull requests work :-\|	02:22
	→ dyng joined	02:22
prometh	ok	02:22
	but here	02:22
	https://github.com/stevenvachon/canjs/tree/6f689435fa17c8b80e75cb363084ba3044a462df	02:23
	i want to remove that tree	02:23
	← ArcTanSusan left	02:23
bremner	you may try #github. It's quiet. But at least people won't yell at you for asking github questions.	02:23
prometh	that's the PR tree, i take it	02:23
offby1	"removing a tree" doesn't make any sense.	02:23
prometh	i'm in #github too	02:23
offby1	you can't really remove anything from a git repository; the most you can do is stop referring to certain commits.	02:23
	→ Goplat joined	02:23
	← dyng left	02:23
prometh	i did a rebase -i and push -f	02:23
offby1	you certainly can't delete a tree. That would invalidate every commit that referred to that tree, directly or indirectly.	02:24
prometh	it's been rewritten	02:24
	← ivan\ left	02:24
	→ dyng joined	02:24
offby1	what it really sounds like is: you want to create a _new_ pull request that's similar to the old one, except with the updates.	02:24
prometh	nope, same PR	02:24
	i want to remove those references	02:24
	← dyng left	02:24
offby1	And then you somehow want people to forget about the old PR and start using the new one.	02:24
	→ dyng_ joined	02:24
prometh	i've done this before and it worked perfectly... the problem this time around is that i have #123 in my commits	02:24
	→ ivan\ joined	02:25
	← dyng_ left	02:25
	→ dyng joined	02:26
	→ mtr_ joined	02:26
rawtaz	in your commits?	02:26
	← mtr_ left	02:26
rawtaz	prometh: please try to be more specific in your terminology, otherwise ppl just get confused. for example, do you mean your commit messages?	02:26
prometh	yes	02:26
	→ kermit joined	02:27
	← tvw left	02:28
rawtaz	what's #123 btw, some issue number?	02:28
prometh	issue/PR number	02:28
rawtaz	ok	02:28
	← dyng left	02:30
	← kermit left	02:31
	→ pgokeeffe joined	02:32
	← jmct` left	02:33
	← teran left	02:33
	← Guest37339 left	02:33
	→ Mars joined	02:34
	→ teran_ joined	02:34
	Mars → Guest4760	02:34
	← teran_ left	02:34
	← nw8l left	02:35
	→ teran_ joined	02:35
	← acharlieh left	02:36
	← ariscop left	02:36
	← LucasKA left	02:37
	→ rurufufuss joined	02:37
	← phipes left	02:38
	← Guest4760 left	02:39
	→ LucasKA joined	02:40
	→ tajys joined	02:40
	→ ArcTanSusan joined	02:41
	→ tplaner joined	02:41
	→ mizu_no_oto joined	02:42
	→ kermit joined	02:42
	→ conan joined	02:43
	← sohail left	02:43
	← TDJACR left	02:43
	→ girishr joined	02:44
	← cjsarette left	02:46
	← mizu_no_oto left	02:47
	→ ariscop joined	02:48
	→ tma996 joined	02:48
	→ cjsarette joined	02:48
	← dougsland left	02:49
	tajys → Tajha	02:49
	← kermit left	02:53
	→ dreiss joined	02:55
	→ kermit joined	02:56
	← cmpera left	02:56
	← tma996 left	02:59
	→ tma996 joined	02:59
	→ dsdeiz joined	02:59
	← Chaser left	03:00
	→ Chaser joined	03:02
	→ sohail joined	03:02
	← sohail left	03:02
	→ sohail joined	03:02
	→ phipes joined	03:03
	← teran_ left	03:04
	← kor__ left	03:05
	→ teran joined	03:05
	← dsdeiz left	03:05
	← teran left	03:05
	→ teran joined	03:06
	← dreiss left	03:06
	← kotk1 left	03:08
	→ fire joined	03:08
	→ yhager joined	03:09
	← marcjs left	03:10
	→ CheckDavid joined	03:10
	→ TDJACR joined	03:11
	→ marhaban joined	03:12
	→ tmcmahon joined	03:14
	→ mitz joined	03:14
	→ simesy joined	03:14
	← tmcmahon left	03:16
	← marhaban left	03:18
	← gwb3 left	03:18
	← simesy left	03:20
	← yhager left	03:20
	← wbdecker left	03:21
	→ wbdecker joined	03:22
	→ yhager joined	03:22
	→ Mars joined	03:23
	Mars → Guest47339	03:24
	→ gsvolt joined	03:24
	← MetalMatze left	03:24
	← ariscop left	03:25
	← phipes left	03:25
	← npatten left	03:26
	← yhager left	03:27
hesco	can I explicitly name the key pair I want to use for a git pull? When I ssh [email@hidden.address] gitolite responds with a list of repos this user has access to, but when I use git pull, I get 'Too many authentication failures for git', I suspect related to the keys forwarded from my desktop.	03:27
	→ gwb3 joined	03:28
	← freestyl3r left	03:29
	→ ariscop joined	03:29
	← gwb3 left	03:31
	→ dsdeiz joined	03:31
	← prometh left	03:31
	→ angelsl joined	03:32
	← jayrobot left	03:32
	→ zumba_addict_ joined	03:32
	← zumba_addict left	03:33
	zumba_addict_ → zumba_addict	03:33
	← teran left	03:35
	→ teran joined	03:36
	← teran left	03:36
	→ teran joined	03:37
	→ jayallen joined	03:37
	← jayallen_ left	03:37
	← wbdecker left	03:38
	→ gwb3 joined	03:38
	→ Dougie187 joined	03:38
thiago	hesco: use ~/.ssh/config	03:40
	← LucasKA left	03:40
	← pgokeeffe left	03:41
hesco	I am using .ssh/config	03:41
thiago	there you go	03:41
	problem solved	03:41
	→ SHyx0rmZ joined	03:41
hesco	it seems to be reading the key forwarded from home rather than the key on the remote box intended for this purpose.	03:41
	→ petey joined	03:42
thiago	does ~/.ssh/config specify which key to use for that host?	03:42
hesco	it does	03:42
Dougie187	well, more like it can.	03:42
	→ mizu_no_oto joined	03:42
hesco	but so does the .ssh/config on my home machine from where my key (a different one) is forwarded	03:43
thiago	hesco: is there a problem if you don't forward the SSH agent?	03:43
	← fire left	03:43
	→ GT4066 joined	03:44
hesco	have not tested that. but the key on the remote box is used for other purposes and has been tested with this git repo, though I do not remember this issue before.	03:44
	very strange	03:45
	→ phipes joined	03:45
	← petey left	03:46
	→ ingens joined	03:51
	← robbyoconnor left	03:52
	→ robbyoconnor joined	03:52
hesco	resolved. mismatch between alias and fqdn between .git/config and .ssh/config	03:55
	→ p4denis joined	03:56
sitaram	hesco: I'm getting a strange feeling of deja vu	03:56
	→ macben joined	03:57
hesco	some lessons demand be relearned I suppose.	03:57
sitaram	yeah... and you have a much more complex ssh setup than most people, I think	03:57
hesco	apparently so, multiple keys for various purposes.	03:58
sitaram	oh I have several keys...	03:58
	→ David joined	03:58
sitaram	personally, I don't like ssh forwarding anyway. For me the intermediate host is either trusted, in which case I'll have another priv key on it, or it's untrusted, in which case I won't even use it. Ssh forwarding helps you with untrusted machines only a little	03:58
	that box can still do something, even if it can't actually get your private key, IIRC	03:59
hesco	at any rate it finally cloned and so now I can write a useful deploy script.	03:59
David	Is it possible to have separate identities in git? I have one repo (and only one, so a per-repo solution is fine) that I want to use a different name/email on.	04:00
	one that doesn't match my global git config	04:00
milki	David: are you talking about author/commiter name/email?	04:00
sitaram	David: just run 'git config user.name ...' and user.email within that repo	04:00
	should work	04:00
David	milki: yes	04:00
	thanks sitaram	04:00
	I'll try that	04:00
milki	David: gitolite doesnt care about that. thats all local to your git config	04:00
	← p4denis left	04:01
sitaram	milki: gitolite? he didn't mention gitolite :-)	04:01
milki	o...this isnt #gitolite	04:01
	hi sitaram	04:01
sitaram	:)	04:01
David	:P	04:01
sitaram	hi milki	04:01
	← macben left	04:01
	→ FleaFlicker joined	04:01
milki	David: remember git config by default is per repo. you can do global with --global	04:02
sitaram	hesco: if the intermediate machine is not trustable, I'd simply make a tunnel in one xterm and use that in another; then the intermediate host can only do what any other intermediate network node can do	04:02
David	Right. Thanks again!	04:03
	Will try that now.	04:03
	← thegorn left	04:03
	← CheckDavid left	04:04
	← LuxuryMode left	04:04
	→ ingentis joined	04:05
	← teran left	04:07
	→ teran joined	04:07
	← teran left	04:07
	→ teran joined	04:08
	← ingens left	04:09
	→ dyng joined	04:11
David	just to be clear - local config will take precedence over global one, right?	04:11
	← MindfulMonk left	04:12
	← Goplat left	04:12
	← tplaner left	04:12
	← mitz left	04:13
	← FleaFlicker left	04:15
	→ mitz joined	04:15
	← dyng left	04:16
	→ preflex_ joined	04:17
	← preflex left	04:18
	preflex_ → preflex	04:18
	← angelsl left	04:19
	→ angelsl joined	04:21
	← mizu_no_oto left	04:23
	← ntio left	04:25
	← ingentis left	04:25
	← crazydiamond left	04:26
	→ bl33 joined	04:27
	← lindenle left	04:28
	→ ajunior joined	04:28
SamB	David: yes	04:29
David	thanks	04:29
	→ bl33_ joined	04:32
	← dsdeiz left	04:32
	→ KeiKun_ joined	04:35
KeiKun_	excuse me is there way to git chmod via msys?	04:35
	→ elepfonitus joined	04:37
	→ lindenle joined	04:38
	← teran left	04:38
	→ LucasKA joined	04:38
	← bl33_ left	04:39
	→ teran joined	04:39
	← teran left	04:39
	← blast_hardcheese left	04:40
	→ teran joined	04:40
	→ livingstn joined	04:40
	→ dyng joined	04:42
	← dyng left	04:46
	← pekster left	04:48
	← dglambert left	04:50
	→ pekster joined	04:50
	← kcj left	04:51
	← kukks left	04:56
	← Noldorin left	04:58
	← matt-chars left	05:01
	→ bl33_ joined	05:05
	← kerrick left	05:07
	← rwp left	05:07
	← beyondcreed left	05:08
	→ Goplat joined	05:08
offby1	what does "git chmod" mean?	05:09
	← teran left	05:10
obert	it switch git with the public access	05:10
	→ teran joined	05:10
obert	so the whole world can browse your computer	05:10
	← teran left	05:11
	→ marcjs joined	05:11
	→ teran joined	05:11
	← marcjs left	05:15
	→ alezost joined	05:16
	← gordian left	05:19
	← livingstn left	05:19
	→ LuxuryMode joined	05:20
	← LuxuryMode left	05:20
	← Nicholas_Rishel left	05:21
	← mitz left	05:22
	← JSharpe2 left	05:22
	LulzonAway → Lulzon	05:23
	→ Nicholas_Rishel joined	05:24
	← Goplat left	05:25
	→ ojacobson joined	05:28
	→ macben joined	05:30
	← lindenle left	05:34
	← macben left	05:35
	→ Tommy[D] joined	05:35
	→ mitz joined	05:36
	← Tommy[D]_ left	05:38
	← hellopat left	05:38
	← timewa1ker left	05:38
	→ hellopat joined	05:39
	→ krononaut joined	05:39
	← TDJACR left	05:40
	→ kennon joined	05:40
	← john2x left	05:40
	← ajunior left	05:41
	← teran left	05:41
	→ john2x joined	05:42
	→ teran joined	05:42
	→ petey joined	05:43
	← teran left	05:43
	→ teran joined	05:43
	← hellopat left	05:43
	→ TDJACR joined	05:46
	← petey left	05:47
	← Dougie187 left	05:48
	← TDJACR left	05:50
	← LucasKA left	05:50
	← elepfonitus left	05:52
	→ TDJACR joined	05:53
	→ mrhooray joined	05:54
	← mrhooray left	05:54
	→ mrhooray joined	05:55
EugeneKay	KeiKun_ - git only tracks the execute bit; this looks like a regualr octal perms mask, but it isn't.	05:55
	And it's meaningless(mostly) in a msysgit env anyway	05:55
	← TDJACR left	05:56
	→ p4denis joined	05:57
	→ TDJACR joined	05:57
	← David left	05:57
	← TDJACR left	05:58
	→ TDJACR joined	05:58
	→ acharlieh joined	05:58
	→ macben joined	06:01
	← p4denis left	06:01
	← z^z left	06:01
	→ albioner joined	06:02
	← albioner left	06:02
	→ albioner joined	06:03
	← albioner left	06:03
	← rue left	06:03
	→ albioner joined	06:03
	← albioner left	06:03
	→ albioner joined	06:04
	→ David joined	06:04
	← TDJACR left	06:05
	← albioner left	06:05
	← macben left	06:06
	← ojacobson left	06:07
	← joki left	06:11
	→ marcjs joined	06:11
	← nerdfiles left	06:12
	← teran left	06:12
	→ teran joined	06:13
	← teran left	06:14
	→ teran joined	06:14
KeiKun_	i think msys just doesn't suit for git on windows	06:15
	→ Exancillatus joined	06:15
	← marcjs left	06:16
	← theRealGentleman left	06:16
	→ joki joined	06:17
	gitinfo set mode: +v	06:17
	KeiKun_ → KeiKun	06:17
	→ Atlantic777 joined	06:18
Atlantic777	Hey, any ideas why !*.c doesn't work for me in .gitignore?	06:18
offby1	not me, nuh-uh	06:19
	← digifiv5e left	06:20
	← Exancillatus left	06:20
	→ diegoviola joined	06:20
	→ digifiv5e joined	06:20
	digifiv5e → Guest7148	06:21
	→ craigp joined	06:23
	← Nicholas_Rishel left	06:24
	→ LucasKA joined	06:25
	← donmichelangelo left	06:25
	→ donmichelangelo joined	06:25
	← the_cybersphinx left	06:26
	→ barbles joined	06:27
	← barbles left	06:29
	→ barbles joined	06:29
	← LucasKA left	06:30
	← toiletbowlJoel left	06:33
	→ MattMake_ joined	06:36
	← MattMaker left	06:38
	← teran left	06:40
	← matanya left	06:41
	→ el3ctron joined	06:42
	→ DeanH joined	06:42
	→ CourtJesterG joined	06:46
	← Guest47339 left	06:46
	← mrhooray left	06:48
	→ Mars joined	06:49
	Mars → Guest42835	06:49
	← starkhalo left	06:50
	← Vivekananda left	06:51
	→ mrhooray joined	06:51
	← mrhooray left	06:52
	← bdavenport left	06:53
	→ bdavenport joined	06:53
	← CourtJesterG left	06:57
	← girishr left	06:58
	→ LuxuryMode joined	06:59
	→ TDJACR joined	07:00
	→ ehmatthes joined	07:01
	← TDJACR left	07:07
	← mitz left	07:07
	← jcvfen left	07:07
	→ mitz joined	07:08
	Lulzon → LulzonAway	07:08
	← LuxuryMode left	07:09
	→ rue joined	07:09
	← robbyoconnor left	07:10
	← rue left	07:10
	→ robbyoconnor joined	07:10
	→ a-l-e joined	07:10
	→ hellopat joined	07:11
	→ marcjs joined	07:12
	← hellopat left	07:15
	← sohail left	07:15
	← MattMake_ left	07:16
	← marcjs left	07:16
	→ fire joined	07:17
	← fire left	07:18
	← phipes left	07:22
	← angelsl left	07:23
	→ ajunior joined	07:23
	← acharlieh left	07:24
	→ LucasKA joined	07:25
	← Guest42835 left	07:26
	→ Mars joined	07:26
	Mars → Guest26324	07:27
	→ kesha joined	07:29
	← LucasKA left	07:29
	→ jceb joined	07:31
	→ dreiss joined	07:31
	← Tajha left	07:31
	→ p3lim joined	07:32
	→ Kicer86 joined	07:32
	→ ahmedelgabri joined	07:33
	→ TDJACR joined	07:33
	← Guest26324 left	07:39
	← tma996 left	07:40
	→ petey joined	07:43
	← ahmedelgabri left	07:43
	→ ewnd9 joined	07:44
	← ArcTanSusan left	07:44
	→ phipes joined	07:45
	← TDJACR left	07:45
	→ bondar joined	07:46
	← bondar left	07:47
	← m0viefreak left	07:47
	→ ewnd9_ joined	07:47
	← petey left	07:49
	→ hoschi joined	07:49
	← ewnd9 left	07:49
	→ h0bbit_ joined	07:50
	→ tgkokk joined	07:54
	→ blast_hardcheese joined	07:55
	→ m0ltar joined	07:55
	→ p4denis joined	07:57
	→ emergion joined	07:59
	← m0ltar left	08:00
	→ dsdeiz joined	08:01
	→ mvelioglu joined	08:01
	← p4denis left	08:02
	← cjsarette left	08:02
	← tallest_red left	08:03
	← tgkokk left	08:04
	→ matanya joined	08:06
	→ tgkokk joined	08:07
	→ tallest_red joined	08:07
	→ rendar joined	08:07
	← dik_dak left	08:08
	← joki left	08:09
	→ angelsl joined	08:11
	← tgkokk left	08:12
	→ joki joined	08:12
	→ marcjs joined	08:12
	← thiago left	08:13
	← jceb left	08:13
	← marcjs left	08:17
	→ jackneill joined	08:18
	→ ahmedelgabri joined	08:19
	→ m0ltar joined	08:20
	← diegoviola left	08:23
	← ehmatthes left	08:24
	← ajunior left	08:27
	← krononaut left	08:27
	← David left	08:30
	← GT4066 left	08:30
	→ GT4066 joined	08:31
	→ ngladitz joined	08:33
	← tango_ left	08:34
	→ macben joined	08:36
	→ ewet joined	08:36
	← phipes left	08:37
	← ewet left	08:37
	← dreiss left	08:38
	→ ewet joined	08:38
	← ewet left	08:38
	→ ewet joined	08:39
	← ewet left	08:39
	← ariscop left	08:40
	→ ewet joined	08:40
	← ewet left	08:40
	→ ewet joined	08:41
	← ewet left	08:41
	→ ewet joined	08:41
	← macben left	08:41
	→ tma996 joined	08:41
	← deavid left	08:42
	→ deavid joined	08:42
	→ tango_ joined	08:42
	→ dyng joined	08:45
	→ doev joined	08:45
	→ xequence joined	08:45
	← jrib left	08:46
	← ianmcorvidae left	08:46
	→ ianmcorvidae joined	08:47
	← ewet left	08:47
	→ hits joined	08:47
	← kermit left	08:48
	→ _tpavel joined	08:48
	→ Mars joined	08:49
	Mars → Guest38571	08:50
	← dyng left	08:50
	→ King_Hual joined	08:50
	← Simounet left	08:50
	→ khmarbaise joined	08:51
	→ kcj joined	08:54
	← ahmedelgabri left	08:55
	← Guest38571 left	08:55
	→ ahmedelgabri joined	08:55
	← _tpavel left	08:56
	→ danicampa901 joined	08:58
	→ hellopat joined	08:59
	← quup left	09:01
	→ quup joined	09:02
	← khmarbaise left	09:04
	→ VinceThePrince joined	09:04
	→ ArcTanSusan joined	09:04
	← hellopat left	09:05
	→ macben joined	09:07
	← ArcTanSusan left	09:09
	← tma996 left	09:11
	← macben left	09:11
	→ tma996 joined	09:11
	→ pinage404 joined	09:12
	← jorj left	09:12
	→ marcjs joined	09:13
	→ ArcTanSusan joined	09:16
	← marcjs left	09:18
	→ jorj joined	09:18
	→ David joined	09:20
	→ albertgrala joined	09:21
	→ takamichi joined	09:22
	→ elbeardmorez joined	09:24
	← David left	09:25
	← Vortex35 left	09:25
	→ Vortex35 joined	09:25
	→ thevishy joined	09:26
	→ kotk joined	09:26
	→ LucasKA joined	09:27
	← tma996 left	09:28
	→ noname001__ joined	09:30
	← bl33_ left	09:32
	← bl33 left	09:32
	→ JSharpe2 joined	09:32
	← LucasKA left	09:32
	→ bl33 joined	09:33
	→ zapb joined	09:34
	→ bl33_ joined	09:34
cbreak	Atlantic777: maybe you have the wrong expectations	09:34
	← a-l-e left	09:37
	→ phipes joined	09:38
	→ Sound joined	09:42
	← phipes left	09:43
	→ fphilipe joined	09:44
	→ petey joined	09:44
	← hits left	09:44
	← emergion left	09:45
	→ diegoviola joined	09:45
	→ ahmedelg_ joined	09:45
	← ahmedelgabri left	09:46
	→ dyng joined	09:47
	→ tarkus joined	09:47
	→ ewet joined	09:48
	← ewet left	09:48
	→ ewet joined	09:48
	← petey left	09:49
	← dyng left	09:52
	→ tgkokk joined	09:52
	→ bvi joined	09:53
	← h0bbit_ left	09:54
	← ewet left	09:55
	→ ahmedelgabri joined	09:55
	← diegoviola left	09:55
	→ ewet joined	09:56
	← tgkokk left	09:56
	← ewet left	09:56
	→ ewet joined	09:57
	→ p4denis joined	09:58
	→ diegoviola joined	09:58
	← m0ltar left	09:58
	← ahmedelg_ left	09:59
	calcifea_ → calcifea	09:59
	← scottrb left	09:59
	→ tma996 joined	09:59
	→ ahmedelg_ joined	10:00
	← ahmedelgabri left	10:00
	← p4denis left	10:02
	→ King_Hual` joined	10:03
	→ promethazin joined	10:04
	← fphilipe left	10:05
	→ tgkokk joined	10:05
	← przemoc left	10:07
	→ Freeman42 joined	10:08
	→ przemoc joined	10:08
	→ pantsman joined	10:10
	← pantsman left	10:10
	→ pantsman joined	10:10
	← skorgon_ left	10:12
	← ArcTanSusan left	10:13
	→ marcjs joined	10:13
	→ m0ltar joined	10:14
	→ ahmedelgabri joined	10:16
	→ Silmarilion joined	10:17
	← ewnd9_ left	10:17
	→ fphilipe joined	10:18
	→ nicedice joined	10:18
	← marcjs left	10:18
	→ leeN joined	10:19
	← ahmedelg_ left	10:19
	← diegoviola left	10:19
	← takamichi left	10:19
	→ diegoviola joined	10:19
	→ hyperair joined	10:19
	← tgkokk left	10:21
	→ tgkokk joined	10:21
	← charon left	10:21
	→ takamichi joined	10:21
	← bvi left	10:22
	→ bvi joined	10:24
	→ ahmedelg_ joined	10:24
	← el3ctron left	10:25
	← tgkokk left	10:26
	← promethazin left	10:26
	→ tgkokk joined	10:26
	→ corni joined	10:26
	→ promethazin joined	10:26
	← Sound left	10:27
	→ arietis joined	10:27
	← ahmedelgabri left	10:27
	→ Sound joined	10:28
	← danicampa901 left	10:28
	→ LucasKA joined	10:29
	← eletuchy left	10:30
	→ eletuchy joined	10:30
	← promethazin left	10:30
	→ jtri joined	10:31
	← tma996 left	10:33
	→ khmarbaise joined	10:33
jtri	hello, I started a branch and did some dev in it using > git checkout -b voting	10:33
	← bvi left	10:33
jtri	right after this, on another machien i noticed a change i wanted to make on master branch, so i made it from that machine, then made the same change in my branch	10:34
	← LucasKA left	10:34
jtri	i committed both of these	10:34
	I pushed them both too, using > git push origin voting & > git commit	10:34
	← pantsman left	10:35
jtri	eventually i finished the development in the branch and so i tried to merge it with master, but perhaps i forgot to pull master, not sure	10:35
	anyway, I used > git merge -s ours master	10:35
	there were a few files i left out of the commit from the branch voting, because I didn't want to add them in until i ran south migrations on the other machine	10:37
	anyway, i have this huge mess now	10:37
	and i'm wondering how to go back to the point i know the branches are in good shape, and try this again, or what to do...	10:38
cbreak	jtri: do you know what -s ours means?	10:38
jtri	stragety ours,	10:38
	thought that was what i wanted	10:38
cbreak	yes. Ignore all changes from the other branch	10:38
jtri	figured that meant take the master and keep the branch	10:38
	→ phipes joined	10:39
jtri	which made sense, but i think it did some odd things with files that were not in master	10:39
cbreak	that's irrelevant	10:39
	master is ignored	10:39
jtri	like decided that even though i had added them in the branch they woudl be removed? does that make sense?	10:39
	→ MIFL joined	10:39
	→ kesha_ joined	10:40
cbreak	jtri: !lol, please pastebin the result	10:40
gitinfo	jtri: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:40
cbreak	and tell me which the commits are that you want to be on	10:40
	← kesha left	10:40
cbreak	oh, also pastebin the output of git status	10:40
jtri	here's the woa tangled mess: http://dpaste.com/1547709/	10:41
MIFL	Hi Guys	10:42
gitinfo	MIFL: 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.	10:42
MIFL	I need help with git am	10:42
cbreak	jtri: where do you want to be at?	10:42
MIFL	It is possible to revert a patch with this command?	10:43
jtri	1440ef6 is the good spot on the end of the branch, that's where i meant to merge it back to master, excpept for a couple of south migations	10:43
cbreak	MIFL: git revert reverts things.	10:43
	jtri: so, if you have no uncommitted changes that you want to keep	10:44
jtri	78275d3 is the master i meant to merge with	10:44
	← phipes left	10:44
cbreak	just check out the branch you want to be on	10:44
MIFL	cbreak: yes but need revert varios commits	10:45
	→ jkremser joined	10:45
	← jkremser left	10:45
	→ jkremser joined	10:45
cbreak	so, git checkout voting for example	10:45
	→ jrib joined	10:45
cbreak	jtri: then git reset --hard commityouwanttobeon (this will nuke away uncommitted changes)	10:45
	it will also rewrite history	10:45
	jtri: do this for master too	10:46
	and after that you have the history you want	10:46
	jtri: you can then git cherry-pick 8203efa for example to get a copy of that commit into your rewritten branches	10:46
	MIFL: sure, you can do that.	10:46
	just git revert all of them	10:47
	→ cmpera joined	10:47
	→ dyng joined	10:47
MIFL	one by one?	10:48
	→ hellopat joined	10:48
cbreak	you can also give it a range	10:48
	A..B means all commits reachable by B but not A	10:48
	(all commits between A and B, but not including A, but including B)	10:49
jtri	ok, so got the voting branch and > git reset --hard commitiwanttobeon, same with master (which one's will that nuke?)	10:49
cbreak	both	10:49
	all your uncommitted changes will be gone	10:50
	→ bvi joined	10:50
cbreak	history will become unreachable from those two branches	10:50
jtri	oh, so the history will be there, just seperated?	10:50
cbreak	it will be in the reflog	10:50
MIFL	I usually use this command: git apply -R --check --verbose --ignore-space-change --ignore-whitespace < ./patches/updates/update-01/revert.patch	10:51
cbreak	but not reachable by normal branch heads	10:51
	→ ahmedelgabri joined	10:51
	→ ewnd9_ joined	10:51
cbreak	MIFL: and what's that good for?	10:51
	← albertgrala left	10:51
	→ acharlieh joined	10:51
cbreak	a simple git revert seems much simpler than messing around with patches	10:51
	← dyng left	10:52
MIFL	Ok. Thanks	10:52
	← hellopat left	10:53
	← ahmedelg_ left	10:54
	← takamichi left	10:55
	← JSharpe2 left	10:55
	→ ahmedelg_ joined	10:55
	← ahmedelgabri left	10:56
jtri	ok, ran > git reset --hard 78275d3 from master, and > git reset --hard 1440ef6 from voting branch	10:57
	→ vince_prignano joined	10:57
jtri	it indicated "HEAD is now on ###### in both cases	10:58
	guessing i could checkout back and forth between those now safely and see they are correct?	10:58
cbreak	jtri: or just look at !lol	10:58
gitinfo	jtri: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:58
	← arietis left	10:59
jtri	here's where I'm at: http://dpaste.com/1547724/	11:00
cbreak	jtri: what do you want to do with 8203efa and 1b7c611?	11:01
	← diegoviola left	11:02
jtri	i'm still a little confused, those are new change numbers, right?	11:02
cbreak	jfield: if you want to keep those changes (but forget about the merge 7195056)	11:02
	no	11:02
	those are commits	11:02
	they are already pushed to origin	11:02
	→ JPohlmann joined	11:03
jtri	oh, no, they just moved up	11:03
	→ quup_ joined	11:03
cbreak	if you want to keep them, cherry-pick them	11:03
jtri	i see	11:03
cbreak	(starting with 8203efa)	11:03
	→ PeterBooker joined	11:03
cbreak	after that you can force push to nuke the history on origin too	11:03
jtri	so they are now dangling	11:03
cbreak	no	11:03
	→ cehteh_ joined	11:04
cbreak	they are reachable by origin/master and so on	11:04
	as you can see	11:04
	and origin/voting	11:04
	← khmarbaise left	11:04
	← GT4066 left	11:04
	→ edude03_ joined	11:06
jtri	should i cherry pick them from both voting and master?	11:06
	← King_Hual` left	11:06
	← King_Hual left	11:06
jtri	they should be in voting, until i merged it with master...	11:06
	→ mahler_io joined	11:06
jtri	so they were created in voting	11:07
cbreak	you cherry-pick them into the branch you want them to be	11:07
jtri	ok	11:07
	→ arietis joined	11:07
	← c0ded left	11:07
	→ brainproxy_ joined	11:07
	→ c0ded joined	11:08
	← rurufufuss left	11:08
	← moondoggy left	11:08
	← lfaraone left	11:08
	← cehteh left	11:08
	← JPohlman1 left	11:08
	← silverf0x left	11:08
	← idoru left	11:08
	← edude03 left	11:08
	← camt left	11:08
	← NanoArrow left	11:08
	← linduxed left	11:08
	← xintron left	11:08
	← awx left	11:08
	← geomyidae left	11:08
	← cwillu_at_work left	11:08
	← St_Marx left	11:08
	← atrus left	11:08
	← ozymandias left	11:08
	← tapout left	11:08
	← simpleminds left	11:08
	← Edgan left	11:08
	← DANtheBEASTman left	11:08
	← dmarr left	11:08
	← akersof left	11:08
	← w0ng left	11:08
	← aucecil left	11:08
	← zz_karupanerura left	11:08
	← MIFL left	11:08
	← tgkokk left	11:08
	← rendar left	11:08
	← squentin left	11:08
	← JerryT left	11:08
	← NBeeuwsaert_ left	11:08
	← WaReZ left	11:08
	← ra4king left	11:08
	← slyfox left	11:08
	← Noctis_Lux left	11:08
	← nemesit\|znc left	11:08
	← hike left	11:08
	← LeeXiaolan_ left	11:08
	← toothrot left	11:08
	← rfoust left	11:08
	← Barn3y left	11:08
	← polyzen left	11:08
	← eli left	11:08
	← RogerWS left	11:08
	← qsuscs left	11:08
	← kamal_ left	11:08
	← graphitemaster left	11:08
	← Eridius left	11:08
	← whiskers75 left	11:08
	← mikaelj_ left	11:08
	← kossy left	11:08
	← KK4MGV left	11:08
	← alindeman left	11:08
	← bitkid left	11:08
	← gtmanfred left	11:08
	← ToothlessGear left	11:08
	← Exio4 left	11:08
	← igalic left	11:08
	← unsignedint left	11:08
	← abyss42 left	11:08
	← frobware left	11:08
	← blueyed left	11:08
	← myme1 left	11:08
	← spudz_ left	11:08
	← spacepluk left	11:08
	← tomek left	11:08
	← ahf left	11:08
	← Mission-Critical left	11:08
	← mz` left	11:08
	← dpwrussell left	11:08
	← dsockwell left	11:08
	← einonm_ left	11:08
	← luminous left	11:08
	← runeg_ left	11:08
	← _ikke_ left	11:08
	← CareBear\ left	11:08
	← masak left	11:08
	← drbean left	11:08
	← zso left	11:08
	← ndngvr left	11:08
	← docwhat left	11:08
	← jkremser left	11:08
	← leeN left	11:08
	← ewet left	11:08
	← quup left	11:08
	← doev left	11:08
	← tango_ left	11:08
	← deavid left	11:08
	← mitz left	11:08
	← bdavenport left	11:08
	← craigp left	11:08
	← pekster left	11:08
	← preflex left	11:08
	← gwb3 left	11:08
	← conan left	11:08
	← Suprano left	11:08
	← looper left	11:08
	← akitada left	11:08
	← titusjose__ left	11:08
	← OliverJAsh left	11:08
	← ELLIOTTCABLE_ left	11:08
	← jab416171 left	11:08
	← knownasilya left	11:08
	← netiul left	11:08
	← TheFuzzball left	11:08
	← salamanderrake left	11:08
	← bhldev left	11:08
	← sami\| left	11:08
	← Console left	11:08
	← lahwran left	11:08
	← ConstantineXVI left	11:08
	← SamB left	11:08
	← Mez left	11:08
	← bedouin left	11:08
	← dytrivedi left	11:08
	← _Parnic left	11:08
	← kini left	11:08
	← nickoe left	11:08
	← ryanakca left	11:08
	← dsop left	11:08
	← dwmw2_go` left	11:08
	← Sp4rKy left	11:08
	← jeek left	11:08
	← kwmiebach left	11:08
	← konr left	11:08
	← Imdsm left	11:08
	← NimeshNeema left	11:08
	← Fill left	11:08
	← arcanis left	11:08
	← grn left	11:08
	← bauruine left	11:08
	← Werring left	11:08
	← asQuirreL left	11:08
	← abackstrom left	11:08
	← joevandyk left	11:08
	← adam_ left	11:08
	← skelterjohn left	11:08
	← relipse left	11:08
	← cuppscakes left	11:08
	← pikpik left	11:08
	← joelmo left	11:08
	← jds left	11:08
	← mino left	11:08
	← adamm left	11:08
	← quadz left	11:08
	← TheMoonMaster left	11:08
	← gerard0 left	11:08
	← flexd left	11:08
	← marshmn left	11:08
	← spaceone left	11:08
	← stfn left	11:08
	← kulp left	11:08
	← saurik left	11:08
	← xrq left	11:08
	← jayne left	11:08
	← brainproxy left	11:08
	← Ghjnut left	11:08
	← Tritania left	11:08
	← matthias_dev left	11:08
	← PhonicUK left	11:08
	← max_weller left	11:08
	← theForce1 left	11:08
	← dawik left	11:08
	← meatmanek left	11:08
	← iAsterisk_ left	11:08
	← so left	11:08
	← alip left	11:08
	← gde33 left	11:08
	← rom1504 left	11:08
	← dunpeal left	11:08
	→ tapout joined	11:08
	→ phipes joined	11:08
	← KeiKun left	11:09
	→ pantsman joined	11:09
	→ sq-one joined	11:09
	→ KeiKun joined	11:09
jtri	ok, I cherry picked those two into voting: http://dpaste.com/1547725/	11:09
	← Silmarilion left	11:10
jtri	the graph still looks strange to me	11:10
	there are three independent branches at the top now	11:11
	→ cianuro joined	11:12
jtri	furthermore, i'm on voting and the code that was in voting is not there... like in models.py	11:13
	← phipes left	11:13
	→ mz` joined	11:13
	← kesha_ left	11:13
	→ juliohm joined	11:13
jtri	oh, wait, i think models is fine	11:13
	i was wrong about that, i think	11:14
	→ timewa1ker joined	11:14
	→ marcjs joined	11:14
jtri	yeah, ok, voting looks fine	11:14
cianuro	buongiorno a tutti	11:14
jtri	how do i read the tuples like: (HEAD, voting)	11:15
	→ NanoArrow joined	11:15
	→ awx joined	11:15
jtri	(origin/master, origin/HEAD)	11:15
	→ xintron joined	11:15
	← fphilipe left	11:15
	→ linduxed joined	11:15
	← calcifea left	11:17
jtri	i'm not sure what to do next, whether to push any of this for example, or whether i can/should try merging voting into master	11:17
	→ petertretyakov joined	11:18
	← marcjs left	11:18
	→ calcifea joined	11:18
	→ Silmarilion joined	11:19
	→ h0bbit_ joined	11:20
	← ahmedelg_ left	11:20
	→ fphilipe joined	11:20
	→ MissionCritical joined	11:21
jtri	the message I get when I checkout master says: Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.	11:21
	→ heliomaster joined	11:22
cbreak	jtri: as I said: you have to force push afterwards	11:23
	jtri: those are just lists of refs that point there	11:23
	HEAD is your currently checked out branch	11:24
	origin/master is the master your origin repository had when you last fetched	11:24
	jtri: if you force push, you can kill the origin/* history	11:24
	for example, git push -f origin master voting	11:24
	← cmpera left	11:26
cbreak	that will push those two branches, replacing remote history	11:27
	→ valgrind joined	11:27
jtri	so are voting and master still seperate and both safe?	11:27
cbreak	jtri: check !lol	11:27
gitinfo	jtri: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	11:27
cbreak	that will show you how they relate	11:27
	after force pushing, you have to git fetch and then git reset --hard the local branches in every single clone that exists	11:28
jtri	(you can refer to it as nifty now :) i have it	11:28
	← acharlieh left	11:28
	→ Sly1986 joined	11:28
nevyn	/win 4	11:28
	→ tma996 joined	11:29
jtri	i'm still wondering when i merge voting with master?	11:29
	→ dobalina joined	11:30
	→ LucasKA joined	11:30
	→ the_cybersphinx joined	11:30
jtri	if there's no star on an intersection, do they not intersect?	11:31
	that all of a sudden makes the graph much less confusing	11:31
	→ codeforfun joined	11:31
jtri	the * is a point where things join, and the others are crossings but not touching?	11:32
	what are the double vertical stars **	11:32
	→ aChatir joined	11:32
jtri	just two points with a line between but the line is not drawn to safe space?	11:32
	← cianuro left	11:33
	→ mikecmpbll joined	11:34
	→ skorgon_ joined	11:34
	→ Sp4rKy joined	11:34
	← LucasKA left	11:35
jtri	ok, i think i see it now, i will force push both voting, and master, then it will be time to merge, correct?	11:35
	why force push before merging?	11:35
	← p3lim left	11:36
jtri	also, i will only run > git reset --hard on the other clones, not the one' i'm fixing this stuff from, correct?	11:36
	→ rurufufuss joined	11:37
	→ gnu-man joined	11:38
jtri	also, does > "git push -f origin master voting" force push both simultaniously, or am i missing something?	11:38
	is that the same as > "git push -f origin master" followed by > "git push -f origin voting"	11:38
	→ ahmedelgabri joined	11:39
	→ whiskers75 joined	11:41
	→ EvilDMP joined	11:41
EvilDMP	how can I undo a git add when it's the very first add? git reset earns me a "fatal: Failed to resolve 'HEAD' as a valid ref."	11:42
jtri	well, i ran it: git push -f origin master voting and i can see it removed everything that looked like a branch, all one line now	11:42
	← thevishy left	11:43
	→ cwillu_at_work joined	11:43
	→ St_Marx joined	11:43
	→ atrus joined	11:43
	→ ozymandias joined	11:43
	→ DANtheBEASTman joined	11:43
	→ simpleminds joined	11:43
	→ Edgan joined	11:43
	→ dmarr joined	11:43
	→ akersof joined	11:43
	← valgrind left	11:44
	→ petey joined	11:45
	→ valgrind joined	11:46
	← Sound left	11:46
jtri	so it looks like this now: http://dpaste.com/1547754/	11:46
	whiskers75 → nodejs	11:46
	nodejs → whiskers75	11:47
jtri	i should catch master up to the top now, no?	11:47
	somehow...	11:47
	→ lfaraone_ joined	11:47
	→ jkremser joined	11:47
	→ leeN joined	11:47
	→ ewet joined	11:47
	→ doev joined	11:47
	→ tango_ joined	11:47
	→ deavid joined	11:47
	→ mitz joined	11:47
	→ bdavenport joined	11:47
	→ craigp joined	11:47
	→ preflex joined	11:47
	→ gwb3 joined	11:47
	→ conan joined	11:47
	→ Suprano joined	11:47
	→ looper joined	11:47
	→ akitada joined	11:47
	→ titusjose__ joined	11:47
	→ jab416171 joined	11:47
	→ ELLIOTTCABLE_ joined	11:47
	→ OliverJAsh joined	11:47
	→ knownasilya joined	11:47
	→ netiul joined	11:47
	→ TheFuzzball joined	11:47
	→ salamanderrake joined	11:47
	→ bhldev joined	11:47
	→ sami\| joined	11:47
	→ Console joined	11:47
	→ grn joined	11:47
	→ lahwran joined	11:47
	→ ConstantineXVI joined	11:47
	→ SamB joined	11:47
	→ Mez joined	11:47
	→ bedouin joined	11:47
	→ dytrivedi joined	11:47
	→ _Parnic joined	11:47
	→ kini joined	11:47
	→ nickoe joined	11:47
	→ ryanakca joined	11:47
	→ dsop joined	11:47
	→ dwmw2_go` joined	11:47
	→ jeek joined	11:47
	→ kwmiebach joined	11:47
	→ konr joined	11:47
	→ Imdsm joined	11:47
	→ bauruine joined	11:47
	→ Fill joined	11:47
	→ NimeshNeema joined	11:47
	→ arcanis joined	11:47
	→ Werring joined	11:47
	→ asQuirreL joined	11:47
	→ abackstrom joined	11:47
	→ joevandyk joined	11:47
	→ adam_ joined	11:47
	→ skelterjohn joined	11:47
	→ dunpeal joined	11:47
	→ relipse joined	11:47
	→ cuppscakes joined	11:47
	→ pikpik joined	11:47
	→ joelmo joined	11:47
	→ jds joined	11:47
	→ marshmn joined	11:47
	→ mino joined	11:47
	→ adamm joined	11:47
	→ quadz joined	11:47
	→ TheMoonMaster joined	11:47
	→ gerard0 joined	11:47
	→ flexd joined	11:47
	→ spaceone joined	11:47
	→ stfn joined	11:47
	→ kulp joined	11:47
	→ saurik joined	11:47
	→ xrq joined	11:47
	→ jayne joined	11:47
	→ Ghjnut joined	11:47
	→ Tritania joined	11:47
	→ matthias_dev joined	11:47
	dickson.freenode.net set mode: +vvvv	11:47
	→ PhonicUK joined	11:47
	→ max_weller joined	11:47
	→ theForce1 joined	11:47
	→ dawik joined	11:47
	dickson.freenode.net set mode: +vvvv	11:47
	→ meatmanek joined	11:47
	→ iAsterisk_ joined	11:47
	→ gde33 joined	11:47
	→ so joined	11:47
	dickson.freenode.net set mode: +vvvv	11:47
	→ alip joined	11:47
	→ rom1504 joined	11:47
	dickson.freenode.net set mode: +vv	11:47
	→ enr joined	11:47
	← enr left	11:47
cbreak	jtri: your decision when to merge	11:48
	→ enr joined	11:48
cbreak	the * are commits	11:48
	jtri: if you're on OS X or so, check out source tree	11:48
	it has a GUI with a better graph	11:48
luto	source tree <3	11:48
	→ dyng joined	11:48
cbreak	jtri: force push removed the old merge commits	11:49
	you can make a new one if you want	11:49
	EvilDMP: git rm --cached should do it	11:49
	EvilDMP: git status should tell you	11:49
EvilDMP	thank you cbreak	11:49
cbreak	jtri: master is a bunch of commits behind	11:49
	→ cmpera joined	11:49
	← petey left	11:50
cbreak	jtri: you can now check out master, then git merge voting (which will be fast forward). add --no-ff if you want an actual merge commit	11:50
	← insejn left	11:50
	← mvelioglu left	11:51
	→ silverfox_ joined	11:51
	→ rendar joined	11:51
	→ squentin joined	11:51
	→ JerryT joined	11:51
	→ NBeeuwsaert_ joined	11:51
	→ WaReZ joined	11:51
	→ ra4king joined	11:51
	→ slyfox joined	11:51
	→ Noctis_Lux joined	11:51
	→ nemesit\|znc joined	11:51
	→ hike joined	11:51
	→ LeeXiaolan_ joined	11:51
	→ toothrot joined	11:51
	→ rfoust joined	11:51
	→ Barn3y joined	11:51
	→ polyzen joined	11:51
	→ eli joined	11:51
	→ RogerWS joined	11:51
	→ qsuscs joined	11:51
	→ kamal_ joined	11:51
	→ graphitemaster joined	11:51
	→ Eridius joined	11:51
	→ mikaelj_ joined	11:51
	→ kossy joined	11:51
	→ KK4MGV joined	11:51
	→ alindeman joined	11:51
	→ bitkid joined	11:51
	→ gtmanfred joined	11:51
	→ ToothlessGear joined	11:51
	→ Exio4 joined	11:51
	→ igalic joined	11:51
	→ unsignedint joined	11:51
	→ abyss42 joined	11:51
	→ frobware joined	11:51
	→ blueyed joined	11:51
	→ myme1 joined	11:51
	→ spudz_ joined	11:51
	→ spacepluk joined	11:51
	→ tomek joined	11:51
	→ ahf joined	11:51
	→ dpwrussell joined	11:51
	→ dsockwell joined	11:51
	→ einonm_ joined	11:51
	→ luminous joined	11:51
	→ runeg_ joined	11:51
	→ _ikke_ joined	11:51
	→ CareBear\ joined	11:51
	→ masak joined	11:51
	→ drbean joined	11:51
	→ zso joined	11:51
	→ ndngvr joined	11:51
	→ docwhat joined	11:51
	← f8l left	11:51
jtri	ok, i'll try it with --no-ff	11:51
	→ charon joined	11:52
	← charon left	11:52
	→ charon joined	11:52
	← ahf left	11:52
	← pikaren left	11:52
	→ ahf joined	11:52
	← dyng left	11:53
jtri	yay, my little branch is there: http://dpaste.com/1547760/	11:53
whiskers75	lol	11:54
	← petertretyakov left	11:54
	→ mvelioglu joined	11:55
	→ insejn joined	11:55
jtri	so was > "git push -f origin master voting" same as > "git push -f origin master" and then > git push -f origin voting	11:55
	→ tgkokk joined	11:55
	← gnu-man left	11:55
cbreak	yes	11:57
	→ gnu-man joined	11:57
cbreak	jtri: also, don't use -s ours unless you're sure you want it :)	11:57
jtri	so just merge by itself, no arguments and i should be safe?	11:58
	i don't mind fixing conflicts!	11:58
	← matanya left	11:58
jtri	i'm going to run > git reset --hard on the other machine now	11:58
	→ p4denis joined	11:58
jtri	should i do that from master?	11:58
	→ f8l joined	11:59
	← fphilipe left	12:00
jtri	should i run pull first?	12:00
	→ matanya joined	12:00
	→ fphilipe joined	12:00
	→ Sound joined	12:00
	← fphilipe left	12:02
cbreak	jtri: you should git fetch origin first	12:02
bremner	jtri: fwiw, your use of ">" to suggest a prompt is a bit confusing, since it means output redirection.	12:02
cbreak	jtri: then git reset --hard origin/master while on master	12:02
	and so on	12:02
	that will kill local history	12:02
	→ promethazin joined	12:02
jtri	shit, i already messed it up, i did the reset first, then > git pull	12:02
	and i can tell it's messed up b/c the first south migration is missing	12:03
	← p4denis left	12:03
	← tma996 left	12:03
jtri	ok, ran git reset --hard origin/master while on master	12:04
	understood on the carrot	12:06
	→ gnu-man_ joined	12:07
	→ FerreusR joined	12:08
	← gnu-man left	12:08
	→ petertretyakov joined	12:08
jtri	cbreak: ok, i think i'm back on track, thanks for you help!	12:08
juliohm	The thing I like most about Git is the way changes are tracked, we can add to the commit just the wanted subset of modifications	12:08
	← jtri left	12:09
juliohm	This doesn't happen with Mercurial for instance	12:09
	juliohm is getting to Git	12:09
	→ phipes joined	12:09
whiskers75	git ftw	12:10
cbreak	np :)	12:10
	← pinage404 left	12:10
	→ pinage404 joined	12:10
	← Noctis_Lux left	12:11
	→ koda joined	12:11
	→ jceb joined	12:11
	→ Exancillatus joined	12:12
	→ tma996 joined	12:12
	← phipes left	12:14
	→ psyl0n joined	12:14
	← kcj left	12:14
	→ marcjs joined	12:14
	← jkremser left	12:17
	whiskers75 → windowssucks	12:18
	windowssucks → whiskers75	12:18
	← juliohm left	12:18
	whiskers75 → disconnect	12:18
	disconnect → whiskers75	12:19
	→ _tpavel joined	12:19
	whiskers75 → codercat	12:19
	← marcjs left	12:19
	codercat → minetest	12:19
	minetest → whiskers75	12:19
	→ David joined	12:20
	→ Noctis_Lux joined	12:24
	← David left	12:25
	→ fesoj joined	12:25
	← VinceThePrince left	12:26
	← mtk left	12:27
	← elbeardmorez left	12:29
	→ khmarbaise joined	12:29
	→ elbeardmorez joined	12:29
	← shruggar left	12:29
	← promethazin left	12:30
	← tirengarfio left	12:30
	→ mtk joined	12:30
	→ promethazin joined	12:30
	→ LucasKA joined	12:31
	← khmarbaise left	12:31
	← h0bbit_ left	12:33
	→ Advocation joined	12:33
	whiskers75 → iline	12:33
	iline → oline	12:33
	oline → whiskers75	12:33
	→ mrbubbles joined	12:34
	→ dougsland joined	12:35
	← promethazin left	12:35
	← LucasKA left	12:35
	← m0ltar left	12:36
	→ hellopat joined	12:37
	← _tpavel left	12:38
	→ albertgrala joined	12:38
	← makubi left	12:39
	→ ShalokShalom joined	12:39
	← tma996 left	12:40
	→ tma996 joined	12:40
	→ freestyl3r joined	12:41
	→ makubi joined	12:41
	→ LuxuryMode joined	12:41
	← hellopat left	12:42
ewet	identity crisis ...	12:42
whiskers75	lol	12:42
	sorry :P	12:42
	→ macben joined	12:43
	→ shruggar joined	12:43
	→ enr^ joined	12:43
whiskers75	.	12:46
	→ jayrobot joined	12:46
	→ marcjs joined	12:47
	→ jkremser joined	12:47
	← jkremser left	12:47
	→ jkremser joined	12:47
	← macben left	12:47
	→ enr_ joined	12:48
	← enr left	12:48
_ikke_	..	12:48
	← codeforfun left	12:48
	→ dyng joined	12:49
	→ fphilipe joined	12:50
	← gnu-man_ left	12:50
	← enr^ left	12:51
	← lifelike left	12:52
	← ewnd9_ left	12:52
	→ lifelike joined	12:52
	← KeiKun left	12:54
	→ KeiKun_ joined	12:54
kent\n	annoying: git ls-remote doesn't work on shallow clones :(	12:54
	← Advocation left	12:54
	← dyng left	12:54
	→ ciampix joined	12:54
kent\n	renders a fatal error about trying to fetch/clone.	12:54
	→ mklappstuhl joined	12:54
cbreak	kent\n: just cd out of it	12:55
kent\n	oh, as in 'ls-remote .' bails, but 'cd ../; ls-remote foo' is good? Thats weird.	12:56
	← dobalina left	12:56
cbreak	you'll have to use the URL	12:57
	← ewet left	12:57
	→ ewet joined	12:57
kent\n	"have to use the url" ?	12:58
	→ m-o-s joined	12:58
	← ewet left	12:58
	→ doener joined	12:58
kent\n	its not budging regardless what I try.	12:58
cbreak	git has no clue what foo is	12:58
	you have to use ssh://git@foo.local/foo.git	12:59
	from outside the git repo	12:59
	← pantsman left	12:59
cbreak	because then you're not inside a shallow clone :)	12:59
kent\n	ls-remote ./foo # no good ls-remote file://<path>/ # no good either	12:59
cbreak	it will	12:59
	your problem is that it doesn't work in shallow clones	13:00
	→ pfFredd joined	13:00
cbreak	if you cd out, then you're no longer in a shallow clone	13:00
	→ Mode-M joined	13:00
kent\n	if I'm using the non-shallow URI, well, of course _that_ will work.	13:00
cbreak	the remote must be non-shallow anyway	13:00
	but that's a given	13:00
kent\n	right. But the reason I'm using ls-remote in the first place is because its such an old api it works back to git 1.4	13:00
cbreak	yeah, and?	13:01
	shallow clones can't be used as remotes	13:01
	→ ewet joined	13:01
kent\n	and it allows me to do things I'd usually need other functions/parameters to get working, things that don't work on <git 1.6	13:01
	ie: i'm just wanting to get branch names.	13:01
	→ jcvfen joined	13:01
cbreak	git branch	13:02
kent\n	is useless, because you have to filter out the decorations	13:02
osse	for-each-ref ?	13:02
_ikke_	There are plumbing commands	13:02
cbreak	kent\n: nope, no decorations	13:03
kent\n	* # A decoration	13:03
	→ V1TSK joined	13:03
cbreak	unless you want them	13:03
	for-each-ref, show-ref, ...	13:03
	← Freeman42 left	13:03
kent\n	I was using for-each-ref, but I switched to ls-remote for some reason ( cant remember why , backcompat support )	13:04
cbreak	obviously you can only use local commands	13:04
	→ dobalina joined	13:04
kent\n	oh, right. for-each-ref doesn't exist on <1.5	13:05
_ikke_	and show-ref?	13:05
cbreak	1.5 is irrelevant.	13:05
	← mrbubbles left	13:05
cbreak	1.7 is four years old already	13:05
	→ mrbubbles joined	13:06
cbreak	even Mac OS X ships with 1.8.3.4	13:06
	← arietis left	13:06
osse	cbreak: pre-installed? o_O	13:06
kent\n	Yes. I'm writing a unifying wrapper to support as many versions of Git as possible, in Perl, where supporting Perl >10 years old is stil "normal"	13:06
cbreak	osse: no, install on demand	13:06
	osse: if you get Xcode or the compiler command line tools	13:06
	→ jcvfen- joined	13:06
osse	ahh	13:06
cbreak	I am not sure how the latter work, but there seem to be stubs for the programs	13:07
	so if you type gcc on the command line, it'll ask you if you want to install them	13:07
	← jcvfen left	13:07
cbreak	osse: apple seems to be a big fan of git	13:08
kent\n	In my tooling stack, I can force users to upgrade to newer Perl packages easily, so I can progressively expand support for things, but its harder to get consumers to upgrade git, and I literally have test reports from our network of automated testers with fails that occur due to installs of git 1.4*	13:10
	→ phipes joined	13:10
_ikke_	whut	13:10
	→ mfulz joined	13:10
cbreak	1.4 is like... 2007 or so?	13:11
	2006 even	13:11
kent\n	Yeah. But that said, I get test reports from Perl 5.8, which are like, 2003	13:11
cbreak	morons who can't even update in 8 years are probably not worth the effort	13:11
kent\n	shrugs I can support it reasonably easy, so I do.	13:12
	→ Advocation joined	13:12
kent\n	but upgrading modules is easy, upgrading binary deps, much harder	13:12
cbreak	if the OS itself doesn't support it, get something like homebrew.	13:13
kent\n	its sensible for devs, and I really do wish people would upgrade, and we do encourage using the latest of everything	13:13
cbreak	it's a kind of a "package manager"	13:13
kent\n	but we're also in the reality where people have old things in production, and even though they want to upgrade it too, they're not allowed to	13:13
	mostly, because of the upgrade techincal debt.	13:13
	→ macben joined	13:13
cbreak	good thing that git is irrelevant in production	13:13
qsuscs	yup	13:13
cbreak	it's a development tool	13:14
qsuscs	Siemens still uses cvs	13:14
	and now they consider to use svn. maybe.	13:14
	→ alansaul-laptop joined	13:14
	← unreal left	13:14
kent\n	though I still have non-humans with git installed on their automated testing boxes, and I can't exactly get them to upgrade.	13:15
	← phipes left	13:15
cbreak	you can ignore those outdated testing boxes since they evidently don't test anything useful	13:16
kent\n	but this is not just my problem either, everyone who writes tools based on git has this problem and they don't see it till they get the reports back.	13:16
	So I'm trying to write a somewhat unifying api that gets more git features available without them having to innately know what is and isnt supported	13:16
	← bernalex left	13:16
	→ bernalex joined	13:16
kent\n	so that they get less erroneous error reports that arent' relevant to them	13:16
cbreak	sounds like a waste of time	13:17
	reimplementing git so you can install more software instead of updating git	13:17
	← mklappstuhl left	13:17
kent\n	We do incidentally have a module that munges git things without git at all, but I'd rather rely on git itself as much as possible	13:17
	→ unreal joined	13:17
kent\n	( its not reimplementing, just wrapping at this point )	13:17
	→ arietis joined	13:17
	→ wrouesnel1 joined	13:17
	← Advocation left	13:18
	← macben left	13:18
cbreak	it sounded like you were trying to reimplement for-each-ref :)	13:19
	listing branches in a git repo without git isn't trivial	13:19
	← m-o-s left	13:19
cbreak	there are packed refs that require you to look into binary files	13:20
	← mvelioglu left	13:20
	→ mklappstuhl joined	13:20
	← jceb left	13:21
	→ hayalet joined	13:21
kent\n	yeah, I get that, which is one of the reasons I'm trying to avoid dealing with raw .git/ access directly myself	13:21
	← hayalet left	13:22
	→ rue joined	13:22
	← rue left	13:22
kent\n	I was bitten somewhat when I was using the "no git" tool and a repository suddenly started shipping with GPG sigs, which caused all sorts of fun because the code was too naive to decode the commit attributes	13:22
	kent\n hasn't tried to see how old git handles this mind, it might be no better	13:22
	→ mvelioglu joined	13:23
	→ codeforfun joined	13:26
	→ ewnd9_ joined	13:27
	→ ingentis joined	13:28
	→ thevishy joined	13:29
	→ marhaban joined	13:29
	← mtk left	13:29
	← Watabou left	13:30
	← jkremser left	13:30
	→ carbon joined	13:30
	← Kulrak left	13:30
	→ takamichi joined	13:31
	← insejn left	13:31
	→ LucasKA joined	13:31
	← carbon left	13:31
	← tgkokk left	13:32
	→ pikaren joined	13:32
	← glebihan left	13:32
	← sq-one left	13:32
	← jayallen left	13:32
	← V1TSK left	13:33
	→ jayallen_ joined	13:33
	← mikecmpbll left	13:34
	→ glebihan joined	13:34
	→ Noldorin joined	13:35
	← LucasKA left	13:36
	← eletuchy left	13:37
	← doev left	13:37
	→ eletuchy joined	13:37
	→ Nizumzen joined	13:38
	← psyl0n left	13:41
	→ axl_ joined	13:42
	→ tgkokk joined	13:42
	← eletuchy left	13:42
	→ psyl0n joined	13:43
	→ tobias__ joined	13:43
	← cmpera left	13:44
	→ Kulrak joined	13:44
	→ macben joined	13:44
	← tgkokk left	13:44
	← Kulrak left	13:45
	→ Kulrak joined	13:46
	→ petey joined	13:46
	→ tgkokk joined	13:46
kent\n	alternatively, is there a safe way to detect a shallow repository? I can code around the problem a differently if I have to	13:46
	← tgkokk left	13:48
	→ aard_ joined	13:48
	→ tgkokk joined	13:48
	tgkokk → Guest40403	13:49
	← Guest40403 left	13:49
	← thevishy left	13:49
	→ fphilipe_ joined	13:49
	← macben left	13:49
	→ doev joined	13:50
	← petey left	13:50
cbreak	kent\n: sure	13:51
	→ tgkokk joined	13:51
	→ Kayra joined	13:51
	← fphilipe left	13:52
cbreak	it should be in the config	13:53
	← thrakcattack left	13:53
cbreak	cat .git/shallow	13:54
	→ m0ltar joined	13:54
	← earny left	13:54
	→ thrakcattack joined	13:55
	→ pantsman joined	13:55
	→ xlinkz0 joined	13:56
	← dougsland left	13:56
	→ mtk joined	13:56
	← doev left	13:57
	→ tirengarfio joined	13:57
	← Noldorin left	13:57
xlinkz0	i did git -rm '*' thinking that it would only remove staged removes	13:57
	how do i go back and actually do that? :D	13:58
	→ CheckDavid joined	13:58
	→ doev joined	13:58
	← adaptr left	13:58
	→ p4denis joined	13:59
	→ harish_ joined	13:59
moritz	git reset --hard HEAD # maybe !backup first	13:59
gitinfo	Worried about your data while trying out stuff in your repo? To back up commit history on all branches/tags: `git clone --mirror`. To backup everything, including work tree and staging area: `tar cf repo-backup.tar repodir`. Or do your experiment in a throwaway clone instead. See also http://sethrobertson.github.com/GitBestPractices/#backups	13:59
	← hyperboreean left	13:59
	← doev left	13:59
	← psyl0n left	13:59
	→ doev joined	14:00
xlinkz0	thanks	14:00
	← harish left	14:01
	← pinage404 left	14:01
	→ psyl0n joined	14:01
	← psyl0n left	14:02
	→ psyl0n joined	14:02
kent\n	rsync -avp $REPO/ $NEW/ # is what I've been known to do, just no idea how safe that is with regard to hardlinks	14:02
	← cads left	14:02
	← aChatir left	14:02
	← p4denis left	14:04
	← harish_ left	14:04
cbreak	it'll probably break them	14:05
	which is no correctness problem	14:05
	→ arvind_khadri joined	14:05
	← doev left	14:05
	→ doev joined	14:07
	→ tummy__ joined	14:07
	brainproxy_ → brainproxy	14:07
	→ Freeman42 joined	14:07
	→ eletuchy joined	14:08
	← tummy_ left	14:09
	→ bull_g joined	14:10
	← bull_g left	14:10
	→ cads joined	14:10
	← quup_ left	14:10
	→ phipes joined	14:11
	chamunks → zz_chamunks	14:12
	← takamichi left	14:12
	→ OleVik joined	14:12
	→ fphilipe joined	14:12
	→ JSharpe2 joined	14:12
	← WaReZ left	14:13
	← fphilipe_ left	14:15
	← phipes left	14:15
	← barbles left	14:16
	→ MindfulMonk joined	14:16
	zz_chamunks → chamunks	14:19
	→ hellopat joined	14:19
	← alansaul-laptop left	14:19
	→ sohail joined	14:20
	← sohail left	14:20
	→ sohail joined	14:20
	← jayrobot left	14:21
	← JSharpe2 left	14:23
	← Nizumzen left	14:25
	→ jayrobot joined	14:26
	← aard_ left	14:26
	→ _tpavel joined	14:27
	→ LucasKA joined	14:32
	→ h0bbit_ joined	14:32
	← Exancillatus left	14:36
	← Kayra left	14:36
	← LucasKA left	14:37
	→ WaReZ joined	14:37
	→ King_Hual joined	14:38
	→ King_Hual` joined	14:38
	→ BSaboia joined	14:39
	← tma996 left	14:40
OleVik	Anyone able to give a hand in setting up a ssh config correctly? Having a bit of trouble with my /.ssh/config file and connecting to my server	14:40
	→ Diemuzi joined	14:40
	gitinfo set mode: +v	14:40
	← jave left	14:40
	← Neptu left	14:41
	← bgerber left	14:41
	← mvelioglu left	14:42
	→ bgerber joined	14:42
	→ jave joined	14:42
	→ Neptu joined	14:43
	→ mvelioglu joined	14:43
	← sohail left	14:43
	← LuxuryMode left	14:44
	← Baluse left	14:45
	→ Baluse joined	14:45
	→ jatt joined	14:46
	← BSaboia left	14:46
	→ dougsland joined	14:46
	→ yhager joined	14:47
	→ johnmilton joined	14:47
	→ BSaboia joined	14:47
	→ LuxuryMode joined	14:48
	→ gnu-man joined	14:49
	← mvelioglu left	14:50
	← WaReZ left	14:50
	← ws2k3 left	14:50
	→ ws2k3 joined	14:50
	→ sohail joined	14:52
	← sohail left	14:52
	→ sohail joined	14:52
	→ mvelioglu joined	14:53
	→ promethazin joined	14:54
	→ giusef joined	14:54
	→ tnkhanh joined	14:54
tnkhanh	hi	14:54
gitinfo	tnkhanh: 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.	14:54
	← ws2k3 left	14:54
	← promethazin left	14:55
	→ bhldev_ joined	14:55
	Matrixiumn → CaveJohnson	14:55
	← bhldev left	14:55
	→ promethazin joined	14:55
	← petertretyakov left	14:55
	→ beastd joined	14:56
	→ ehmatthes joined	14:57
	← M-ou-se left	14:57
	→ Nizumzen joined	14:58
	→ oriba joined	14:58
	→ M-ou-se joined	14:58
	→ petertretyakov joined	14:58
	→ m0viefreak joined	14:59
	← promethazin left	14:59
	← xlinkz0 left	15:00
	→ xlinkz0_ joined	15:00
	← matanya left	15:01
	→ WaReZ joined	15:02
	→ khmarbaise joined	15:02
	→ Nicholas_Rishel joined	15:05
	→ mizu_no_oto joined	15:06
	← koda left	15:07
	→ starkhalo joined	15:07
	→ M-ou-se_ joined	15:10
	Dreamer3__ → Dreamer3	15:10
	→ ws2k3 joined	15:10
	← Sound left	15:11
	← M-ou-se left	15:11
	← doev left	15:11
	→ DrShoggoth joined	15:11
	→ phipes joined	15:11
	→ King_Hual_ joined	15:11
	← axl_ left	15:13
	← yhager left	15:13
	← cads left	15:13
	← bhldev_ left	15:13
	→ bhldev joined	15:14
	← fphilipe left	15:14
	← King_Hual left	15:14
	→ King_Hual joined	15:14
	← DrShoggoth left	15:14
	← ws2k3 left	15:15
	→ DrShoggoth joined	15:15
	← h0bbit_ left	15:15
	→ M-ou-se joined	15:15
	→ ws2k3 joined	15:15
	← King_Hual` left	15:15
	← angelsl left	15:15
	→ fphilipe joined	15:15
	→ h0bbit_ joined	15:16
	← M-ou-se_ left	15:16
	→ angelsl joined	15:16
	← phipes left	15:16
	← jcvfen- left	15:17
	→ macben joined	15:17
	→ crazydiamond joined	15:18
	→ plasticle joined	15:18
	→ matheus23 joined	15:19
	→ Gavrisimo joined	15:19
	← ingentis left	15:19
	→ Kayra joined	15:19
	→ David joined	15:20
	← macben left	15:22
	← ewnd9_ left	15:22
	→ ewnd9 joined	15:22
	← hyperair left	15:22
	← plasticle left	15:23
	← shruggar left	15:23
	← mklappstuhl left	15:23
	→ plasticle joined	15:23
	← M-ou-se left	15:23
	← ewnd9 left	15:23
	→ M-ou-se joined	15:24
	← David left	15:25
	→ olivion joined	15:25
	→ ewnd9 joined	15:26
	← john2x left	15:27
	← DrShoggoth left	15:27
	← jan1337z left	15:27
	→ DrShoggoth joined	15:27
	← ewnd9 left	15:28
	→ ewnd9 joined	15:28
	← sohail left	15:28
	→ jkremser joined	15:29
	← jkremser left	15:29
	→ jkremser joined	15:29
	→ nlogn joined	15:30
	← M-ou-se left	15:32
	→ LucasKA joined	15:32
	→ M-ou-se joined	15:32
	← khmarbaise left	15:36
	→ khmarbaise joined	15:37
	→ mklappstuhl joined	15:37
	← Gavrisimo left	15:37
	← LucasKA left	15:37
	→ Gavrisimo joined	15:37
	← khmarbaise left	15:38
	← h0bbit_ left	15:38
	→ khmarbaise joined	15:38
	← glebihan left	15:38
	→ glebihan joined	15:39
	→ godgodgodgo joined	15:40
	→ hyperair joined	15:41
	← jkremser left	15:42
	← _5kg left	15:42
	← Freeman42 left	15:43
	→ petey joined	15:45
	→ axl_ joined	15:45
	← Kayra left	15:45
	← DrShoggoth left	15:46
	← BSaboia left	15:47
	→ DrShoggoth joined	15:47
	← mizu_no_oto left	15:47
	→ zeppo joined	15:49
	← HicksD left	15:53
	← Ratler left	15:55
	← fphilipe left	15:55
	→ BSaboia joined	15:55
	← bvi left	15:55
	→ HicksD joined	15:56
	→ Ratler joined	15:56
	← Ratler left	15:56
	→ Ratler joined	15:56
	← hyperair left	15:56
	→ pulpfiction joined	15:56
pulpfiction	heyo, i'm new to git, but i have one stupid question	15:57
	i'm pretty sure i'm missing something	15:57
	→ bvi joined	15:57
pulpfiction	but when i do git status, it shows me 1 new file and 2 modified files	15:57
	why there's nothing when i do git diff?	15:58
	← pikaren left	15:58
pulpfiction	the files are already added for commit (they are green on git status)	15:58
	→ hyperair joined	15:58
luto	git diff --cached	15:58
	shows added files	15:58
pulpfiction	oh yes, that's nice	15:58
	exactly that	15:58
	thank you luto	15:59
luto	you're welcome :)	15:59
	→ p4denis joined	15:59
	← M00sL0gB0t left	16:01
	→ M00sL0gB0t joined	16:01
	→ GODDOG joined	16:02
	→ sohail joined	16:02
	← sohail left	16:02
	→ sohail joined	16:02
	← p4denis left	16:04
	← dougsland left	16:05
	← m0ltar left	16:05
	→ dougsland joined	16:05
	← Mode-M left	16:05
	← dsdeiz left	16:05
	← mvelioglu left	16:06
	← marhaban left	16:06
	→ Mode-M joined	16:07
	← cagedwisdom left	16:08
	→ dglambert joined	16:08
	→ pekster joined	16:09
	→ livingstn joined	16:09
	← livingstn left	16:09
	→ mvelioglu joined	16:10
	← hyperair left	16:11
	→ pinage404 joined	16:11
	→ yhager joined	16:12
	→ dprophit joined	16:12
	→ w0ng joined	16:12
	→ aucecil joined	16:12
	→ zz_karupanerura joined	16:12
	dickson.freenode.net set mode: +v	16:12
	→ phipes joined	16:12
	→ Dougie187 joined	16:14
	← psyl0n left	16:15
	→ jnewt joined	16:15
	→ takamichi joined	16:16
	← phipes left	16:17
jnewt	it's been a bit since i've used git, so i want to make sure i have this straight in my head. i've got a bunch of changes (dozens of files in my working directory). some are staged (don't remember why), and i'm also behind the origin.	16:17
	← Gavrisimo left	16:17
	→ halu joined	16:17
jnewt	if i do git reset HEAD -- ./* none of my working directory files will be changed, i'll just clear the list of files to be committed	16:18
	← mvelioglu left	16:18
Nevik	jnewt: yes. git status tells you as much	16:18
jnewt	then because it says i can fast forward, i can pull, also without changing the working directory.	16:19
	← noname001__ left	16:19
	← nemesit\|znc left	16:19
Nevik	probbly. if not, pull will abort telling you about it	16:19
jnewt	then i'm basically cleaned up, i can stage and commit the files i want	16:19
Nevik	in which case, stash, pull, stash pop	16:19
	yeap	16:19
jnewt	ok, i was unsure if pull would warn or abort or simply overwrite unstaged / committed files	16:20
	KeiKun_ → KeiKun	16:20
Nevik	nope, pull/merge will not overwrite WC changes	16:20
	← Dougie187 left	16:20
	→ m0ltar joined	16:20
	← fesoj left	16:20
grawity	a merge aborts if you have uncommitted changes	16:20
	if all of them are committed, though, it would try to, uh, merge them.	16:20
	→ nemesit\|znc joined	16:21
	→ fire joined	16:21
	← guampa left	16:22
	→ tplaner joined	16:22
	→ guampa joined	16:23
	← pantsman left	16:23
	← nemesit\|znc left	16:23
	→ nemesit\|znc joined	16:24
	→ diegoviola joined	16:24
	→ eijk_ joined	16:24
	← KeiKun left	16:26
	→ KeiKun_ joined	16:26
	→ ErKa joined	16:26
	← nemesit\|znc left	16:26
	→ phipes joined	16:26
	← Gitzilla left	16:26
	→ nemesit\|znc joined	16:26
	→ dsdeiz joined	16:27
	→ Gitzilla joined	16:27
	← nemesit\|znc left	16:29
	→ jan1337z joined	16:30
	→ nemesit\|znc joined	16:30
	→ JSharpe2 joined	16:30
	→ mizu_no_oto joined	16:30
	← mfulz left	16:31
_ikke_	Note that merge can just continue when the uncomitted changes wouldn	16:32
	wouldn't have to be touched	16:32
	→ LucasKA joined	16:33
	→ becks__ joined	16:33
	← becks__ left	16:33
	→ mvelioglu joined	16:34
	← yhager left	16:34
	← dsdeiz left	16:34
ewet	I'd say that's a prime case to stash your changes, do all the things and pop the stash again. you wouldn't have to think about your changes at all this way.	16:36
	← salamanderrake left	16:37
	→ Gavrisimo joined	16:38
	← m0ltar left	16:38
	→ thiago joined	16:38
	whiskers75 → meow	16:38
	← phipes left	16:38
	meow → whiskers75	16:39
	← petertretyakov left	16:39
	→ salamanderrake joined	16:39
	→ movedx joined	16:39
movedx	Hello. I have added ignores in my project, but I cannot remove files I added before the ignores were put in place: https://github.com/mrcrilly/rita/tree/master/rita -- I've tried 'git rm --cached', but that's not working, git claiming nothing matches the pattern I am giving.	16:40
	I just want to clean up that directory to only contain source code and the configuration so I can place the other files elsewhere.	16:41
milki	movedx: !untrack	16:41
gitinfo	movedx: To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging	16:41
	→ gebi joined	16:41
milki	movedx: and !repro since you did that	16:41
gitinfo	movedx: Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	16:41
	→ mfulz joined	16:41
	→ alansaul-laptop joined	16:41
	← tgkokk left	16:42
	← Nicholas_Rishel left	16:43
	← gebi left	16:44
	→ jayallen joined	16:44
movedx	Ah, it's my fault, milki. Seomthing I keep doing all the time: looking at the wrong branch in Github :)	16:44
	← jayallen_ left	16:44
	← mvelioglu left	16:45
	← gwb3 left	16:45
	→ dutis joined	16:45
	← dutis left	16:45
kent\n	personally I don't understand the fuss about promoting 'pull'. I never ever want pull, I always want 'git remote update' && compare histories && apply merges/rebases as applicable	16:46
	→ Kayra joined	16:46
milki	movedx: that doesnt sound related but ok o.O	16:46
	→ dutis joined	16:46
milki	kent\n: not everyone is patient enough to do that	16:46
kent\n	I guess it does require patience, but so many people get bitten by how magical pull is	16:47
	← axl_ left	16:47
kent\n	"merging with your current tree" is one of the residual behaviours that made other scms' hateful.	16:47
	→ gwb3 joined	16:47
	← gwb3 left	16:47
offby1	I too avoid pull	16:48
	→ mvelioglu joined	16:48
	← Nizumzen left	16:48
kent\n	there are worse things I guess, like HG's branch implementation which gives user a workflow that goes "Oh hey, look, a branch appeared upstream, merge it?"	16:49
movedx	milki: The master branch hasn't been merged with the development branch, so the maste is still tracking those files, right?	16:49
kent\n	and I had a nightmare because idiot cow-workers kept merging branches that were not supposed to be merged	16:49
	→ gwb3 joined	16:49
	← mklappstuhl left	16:49
	→ sq-one joined	16:49
_ikke_	Most people refuse any knowledge about how vcs's work	16:50
	They just want to throw their code over the hedge	16:50
	← JSharpe2 left	16:51
kent\n	I have frustrations with people who are smart, but their obstacle to git is "Git doesn't do X like CVS does" -> "here is how you do that " -> "But I don't want to learn" faceplam	16:51
bremner	to be fair, they mostly don't want to know how their code works, either	16:51
	→ mklappstuhl joined	16:51
	← khmarbaise left	16:52
	→ tgkokk joined	16:52
	→ khmarbaise joined	16:53
	← takamichi left	16:53
	← shinnya left	16:53
	→ takamichi joined	16:53
	→ rethus joined	16:54
	→ ianmcorvidae\|alt joined	16:54
CareBear\	kent\n : I get disappointed by that too	16:54
offby1	_ikke_: I hope that's not true	16:54
	y'all harshing my mellow	16:54
kent\n	I'll give you the upside, the pessimists optimisim: Everyone on the internet is wrong :D	16:55
BinGOs	that isn't right :p	16:55
	← ianmcorvidae left	16:55
	→ tmcmahon joined	16:55
_ikke_	If you don't want to learn, you might want to consider a career switch	16:56
kent\n	I am in the set labelled "Everyone"	16:56
	→ mklappst_ joined	16:56
	← mklappstuhl left	16:56
	← codeforfun left	16:57
	← tmcmahon left	16:57
offby1	I'm a barber; I shave those men who don't shave themselves	16:57
Nevik	offby1: do you make house calls :o	16:58
	← glebihan left	16:58
	← wrouesnel1 left	16:58
	BinGOs just shaves yaks.	16:58
kent\n	offby1: do you shave yaks, and or cats?	16:58
offby1	nope nope	16:58
	→ glebihan joined	16:59
kent\n	darn	16:59
offby1	someone shaved (well, discretely trimmed) the neighbor cat often visits. It looks good on him.	16:59
	← rethus left	16:59
offby1	Quite they mystery who done it, though.	16:59
	kent\n goes back to exploring the wild countryside of Yakistan, ploughing through impenetrable long forests of yak hair	16:59
Nevik	offby1: i would have wanted to rent you :o	17:00
offby1	I'd be too busy trying to decide if I should shave myself or not	17:02
	← LucasKA left	17:03
Nevik	lolol	17:03
	→ hwrdprkns joined	17:05
	→ rethus joined	17:05
	← Kulrak left	17:05
	→ Advocation joined	17:05
	← Gavrisimo left	17:07
	→ nnyk_ joined	17:07
	← diegoviola left	17:08
	→ phipes joined	17:09
	→ travisstaton joined	17:09
	← rethus left	17:10
	← albertgrala left	17:11
	→ npatten joined	17:12
	ianmcorvidae\|alt → ianmcorvidae	17:12
	→ Exancillatus joined	17:12
	← phipes left	17:14
	← Sly1986 left	17:16
	← arietis left	17:16
	→ hyperair joined	17:16
	← nemesit\|znc left	17:17
	→ nemesit\|znc joined	17:17
	→ BSaboia_ joined	17:18
	→ Goplat joined	17:19
	→ Shusshu joined	17:19
	← nemesit\|znc left	17:19
	→ nemesit\|znc joined	17:20
	← BSaboia left	17:20
	→ Noldorin joined	17:21
	← Shusshu left	17:21
	→ sorressean joined	17:21
	→ blarson joined	17:21
	→ macben joined	17:21
	→ girishr joined	17:22
	← KeiKun_ left	17:22
	← nemesit\|znc left	17:22
sorressean	I have a quick question. I am working on a game engine and then I have my game on top of that. my engine is separate code wise, and in a different repo. I would like to type git pull though and update the engine under the game and then update the game if that is possible. Is there a way to merge two repos somehow?	17:22
	→ nemesit\|znc joined	17:22
	→ cmpera joined	17:23
	→ KeiKun joined	17:23
	← richwestcoast left	17:23
	→ richwestcoast joined	17:24
	→ kermit joined	17:24
	← nemesit\|znc left	17:25
	→ shruggar joined	17:25
	→ nemesit\|znc joined	17:25
	← macben left	17:26
_ikke_	sorressean: Sounds like !subtree	17:26
gitinfo	sorressean: The subtree merge method is great for incorporating a subsidiary git repo into your current one with "unified" history. Read http://git-scm.com/book/en/Git-Tools-Subtree-Merging for more info, or try one of the !subtree_alternatives	17:26
	← rurufufuss left	17:26
sorressean	awesome, thanks	17:27
_ikke_	Note that subtree merge is not part of git-core yet	17:27
	→ kerrick joined	17:28
	← Diemuzi left	17:28
ewet	it's also less than elegant, but apparently one of the very few strategies available ...	17:29
	→ arietis joined	17:29
	← giusef left	17:30
offby1	never tried subtree	17:30
	← pekster left	17:30
_ikke_	me neither	17:30
	→ pekster joined	17:30
	← SHyx0rmZ left	17:31
blarson	I've got a git master that can't complete being pushed too because it runs out of memory. How do I clean up this mess so I can use it?	17:31
	→ theRealGentleman joined	17:32
_ikke_	!big_repo	17:32
gitinfo	[!large_repos] Git can be slow in the face of large repositories. There are git-config options which can help. pack.threads=1; pack.deltaCacheSize=1; pack.windowMemory=512m; core.packedGitWindowSize=16m; core.packedGitLimit=128m. Other likely ones exist.	17:32
	← alansaul-laptop left	17:32
	← ehmatthes left	17:33
	← hyperair left	17:33
	← lasers left	17:34
	→ hyperair joined	17:35
	← olivion left	17:35
	→ LucasKA joined	17:35
	→ lazers joined	17:36
	← ahmedelgabri left	17:37
	← petey left	17:38
	→ petey joined	17:39
	← richwestcoast left	17:39
	← mahler_io left	17:39
	→ matanya joined	17:39
	→ harobed_ joined	17:39
	← harobed_ left	17:40
	→ richwestcoast joined	17:40
	→ harobed_ joined	17:40
	← nemesit\|znc left	17:41
	← petey left	17:41
	→ nemesit\|znc joined	17:41
	→ eijk joined	17:41
	→ petey joined	17:41
	← takamichi left	17:41
	← flebron left	17:42
	← GODDOG left	17:43
	→ takamichi joined	17:43
	← eijk_ left	17:43
	← tchan left	17:43
	← nemesit\|znc left	17:44
	→ nemesit\|znc joined	17:44
	→ CKyle joined	17:46
	← edwardly left	17:46
	← Advocation left	17:47
	← CKyle left	17:47
	← boblee left	17:48
	← nnyk_ left	17:48
Kromitvs	Hy. How do I find out in which commit a bug, or a line of code was introduced? Do I have to checkout every commit manually?	17:53
grawity	Kromitvs: `git bisect` is useful for this	17:53
	and `git log -G` for searching diffs	17:54
canton7	Kromitvs, if you're looking for the history of a line of code, git blame / git gui blame. if you're searching history for when a line was added / removed, git log -S / -G	17:54
	if you're looking for the commit which breaks a particular test, git bisect	17:54
grawity	Kromitvs: basically, do `git bisect start <badcommit> <goodcommit>` and go	17:54
canton7	yeah, there are some good examples on the man page	17:54
	→ tchan joined	17:55
	← tchan left	17:55
	→ tchan joined	17:55
Kromitvs	Ok. Thanks for helping	17:55
	← rdd left	17:55
	← LuxuryMode left	17:55
	← nemesit\|znc left	17:56
	→ nemesit\|znc joined	17:58
	→ bob_4234 joined	17:58
	← KeiKun left	17:58
	→ KeiKun joined	17:58
	→ el3ctron_ joined	17:59
	→ p4denis joined	18:00
	→ phipes joined	18:00
	← DrNick left	18:00
	← bob_4234 left	18:01
	← Silmarilion left	18:01
	← gnu-man left	18:02
	→ nnyk_ joined	18:02
	→ fesoj joined	18:02
	← craigp left	18:03
	← kerrick left	18:04
	→ jnavila joined	18:04
	← petey left	18:04
	→ edwardly joined	18:04
	← p4denis left	18:04
	→ petey joined	18:05
	← jayallen left	18:06
	→ jayallen_ joined	18:06
	→ gnu-man joined	18:06
	→ aweorit joined	18:07
	← fesoj left	18:07
	→ LuxuryMode joined	18:07
	← skorgon_ left	18:07
	← travisstaton left	18:08
aweorit	is it me or eol handing in git is completely fucked up	18:09
	← petey left	18:09
_ikke_	aweorit: it's you	18:10
	→ mribeirodantas joined	18:10
_ikke_	!crlf	18:10
gitinfo	to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	18:10
	→ swillits joined	18:11
	→ DrNick joined	18:12
	← Kromitvs left	18:12
	← slyfox left	18:17
	→ craigp joined	18:17
	→ a-l-e joined	18:18
	← eijk left	18:18
	→ slyfox joined	18:18
	← slyfox left	18:18
	→ slyfox joined	18:18
	← bl33 left	18:19
	← bl33_ left	18:20
	→ insejn joined	18:20
	← fire left	18:20
	→ David joined	18:20
	→ CKyle joined	18:21
aweorit	it seems overly complicated	18:22
Lunatrius	Hey, quick question. "warning: push.default is unset; its implicit value is changing in ...", which one will it chose by default, matching or simple (MSYSGIT)?	18:23
offby1	doesn't the message tell you? I certainly don't know	18:24
	→ bl33 joined	18:24
_ikke_	currently, upstream. git 2.0 will use simple	18:24
Lunatrius	Ah, I'm stupid. Don't mind me.	18:24
	← David left	18:25
	← gnu-man left	18:25
_ikke_	It's matching by default, not upstream	18:26
	← CKyle left	18:26
	← tnkhanh left	18:26
	→ bl33_ joined	18:26
	→ petey joined	18:28
sorressean	I am trying to add the most recent git commit logs to my mysql database with post-receive. I have something using git log, but Ican't tell if there's a way to just get the most recent commit(s) that were just pushed.	18:29
	→ psyl0n joined	18:29
moritz	sorressean: post-receive hooks receive the commit ranges on STDIN	18:29
	man githooks	18:30
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	18:30
sorressean	ah, thanks.	18:30
	← mizu_no_oto left	18:30
	→ CKyle joined	18:30
	→ AaronMT joined	18:31
	→ aard_ joined	18:31
	← LucasKA left	18:32
	→ Advocation joined	18:32
	→ amcsi joined	18:32
	→ gnu-man joined	18:32
	← OleVik left	18:33
	→ eliasdiem joined	18:33
	→ Nizumzen joined	18:33
sorressean	ur, I'm sorry. I'm using post-receive. I thought that sounded off, since it doesn't show anything but the object being updated.	18:33
	← ewet left	18:34
sorressean	I see the reference to pre-receive.	18:34
moritz	This hook executes once for the receive operation. It takes no	18:35
	arguments, but gets the same information as the pre-receive hook does	18:35
	on its standard input.	18:35
	← takamichi left	18:35
moritz	that's what 'man githooks' says about post-receive	18:35
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	18:35
moritz	ah, that's what you probably meant	18:35
sorressean	eah. that's what I'm saying. I had them backwards, but it doesn't actually receive the range.	18:36
	← eliasdiem left	18:36
sorressean	it receives the objects being changed.	18:36
moritz	sorressean: maybe you just meesed up reading the input?	18:37
	sorressean: 'cause I know it worked for me, I've written a post-receive hook	18:37
	→ CKyle_ joined	18:37
	← Kayra left	18:37
sorressean	moritz: from the docs: <old-value> SP <new-value> SP <ref-name> LF so old-value is the old value, new-value is the new object name and then it has the object.	18:38
moritz	not name	18:38
	sha1	18:38
	and once you have them, you can run git log $old..$new	18:38
	plus some options for formatting, to make it easier to parse the output	18:39
sorressean	ah. that makes sense, thank you.	18:39
	→ krononaut joined	18:40
	← CKyle left	18:40
	← Goplat left	18:41
	← CKyle_ left	18:42
	← clarkfischer left	18:42
	← nemesit\|znc left	18:43
	→ nemesit\|znc joined	18:43
	← heliomaster left	18:43
	→ madewokherd joined	18:45
	→ nurey joined	18:46
	← enr_ left	18:47
	← petey left	18:50
	← nemesit\|znc left	18:50
	→ nemesit\|znc joined	18:50
	→ petey joined	18:50
	← zeppo left	18:51
	← nnyk_ left	18:51
	← Nizumzen left	18:52
	→ CKyle joined	18:52
	← bl33_ left	18:53
	← bl33 left	18:53
	→ mizu_no_oto joined	18:53
	← ra4king left	18:53
	→ macben joined	18:54
	← Advocation left	18:54
	← petey left	18:55
	→ dyng joined	18:55
	← CKyle left	18:56
	→ jayallen joined	18:56
	→ acharlieh joined	18:56
	→ mklappstuhl joined	18:57
	← jayallen_ left	18:57
	← Exancillatus left	18:58
	← BSaboia_ left	18:58
	← dyng left	18:59
	← macben left	18:59
	← mklappst_ left	18:59
	→ zeppo joined	19:00
	← acharlieh left	19:01
	← LuxuryMode left	19:02
	→ BSaboia joined	19:03
	→ Acidnerd joined	19:03
	← master_j left	19:05
	← eletuchy left	19:05
	← dougsland left	19:05
	← swillits left	19:05
	→ dougsland joined	19:05
	→ ingentis joined	19:08
	→ CKyle joined	19:08
	→ Nicholas_Rishel joined	19:08
	← harobed_ left	19:08
	→ Kayra joined	19:09
	→ krizzii joined	19:10
	→ harobed joined	19:10
	← harobed left	19:10
	→ harobed joined	19:11
	← arietis left	19:11
	→ aweorit` joined	19:11
	← Kayra left	19:12
	← zeppo left	19:12
	→ Kayra joined	19:13
	→ zeppo joined	19:13
	← pheaver left	19:13
	→ longbeach joined	19:14
	← aweorit left	19:15
	← AaronMT left	19:16
	← CKyle left	19:16
	→ JesseCW joined	19:18
	JesseC → Guest42182	19:18
	← Guest42182 left	19:18
	← JesseCW left	19:18
	→ Silmarilion joined	19:19
	→ rpg joined	19:19
	→ adamwathan joined	19:21
	→ cads joined	19:21
	→ danecando joined	19:22
	→ hiroyuki joined	19:23
	← angelsl left	19:24
	← khmarbaise left	19:25
	→ macben joined	19:25
kent\n	annoying. for-each-ref is less useful than ls-remote	19:26
	because ls-remote supports 'refs/heads/**' while for-each-ref does not.	19:26
	← Kayra left	19:26
kent\n	which means that wil only return heads/foo and heads/bar , but not heads/foo/bar	19:28
	← ErKa left	19:28
	→ LucasKA joined	19:29
	→ momomomomo joined	19:29
	← macben left	19:30
	→ eletuchy joined	19:30
	→ daivyk joined	19:31
	← zapb left	19:31
kent\n	argh. git for-each-ref 'foo/' # is the same as ls-remote 'foo/**' , but ls-remote 'foo/' is the same as for-each-ref ''	19:32
	← _W_ left	19:34
	← hiroyuki left	19:34
	← LucasKA left	19:35
	→ _W_ joined	19:35
	→ petey joined	19:35
	← hwrdprkns left	19:36
	→ falconfox joined	19:37
	→ toiletbowlJoel joined	19:39
	← robbyoconnor left	19:39
	→ gchristensen joined	19:39
	→ robbyoconnor joined	19:39
	→ LuxuryMode joined	19:40
gchristensen	Hi, will git clone --mirror clone all refs, such as I never need to access the origin again?	19:41
	→ oriba_ joined	19:41
	→ master_j joined	19:42
	← pinage404 left	19:44
	← tgkokk left	19:44
	← robbyoconnor left	19:44
	→ zapb joined	19:44
	← oriba left	19:44
	→ tgkokk joined	19:45
	→ robbyoconnor joined	19:45
_ikke_	gchristensen: Yes, it will fetch all refs	19:46
	← petey left	19:47
	→ petey joined	19:48
	→ fesoj joined	19:49
	← zeppo left	19:50
	← tgkokk left	19:50
	→ scott3 joined	19:50
gchristensen	wonderful, _ikke_. are there other steps I should consider to do a final archive? these repos are about to be removed from the primary git server, due to their age and inactivity	19:50
	← robbyoconnor left	19:50
	→ jceb joined	19:51
	→ robbyoconnor joined	19:51
scott3	How do I download from github? I've been using Cola Git GUI but after I put the URL in it does nothing? I'm trying to download https://github.com/betfair/API-NG-sample-code/tree/master/java	19:51
	gitinfo set mode: +v	19:52
scott3	seems like i can only download 1 file at a time using the website	19:52
	← Plouj- left	19:52
	→ blahdodo joined	19:53
	→ geomyidae joined	19:53
kent\n	scott3: you have to point to the repository base address, not an individual resource	19:54
	→ dreiss joined	19:54
kent\n	which here, would be: https://github.com/betfair/API-NG-sample-code.git #	19:55
	if you're more used to SVN/CVS, just know you can't do clones of directories in git like you can with them	19:55
scott3	I'm not used to SVN/CVS either	19:56
	→ macben joined	19:56
scott3	I'll give that a try although it looks like it wants to download code for other languages as well	19:56
	← mvelioglu left	19:57
	→ AaronMT joined	19:57
	→ Exancillatus joined	19:58
scott3	yeah that's worked, thanks	19:58
	→ khmarbaise joined	19:58
	← petey left	19:59
	→ harobed_ joined	19:59
	← harobed_ left	19:59
	→ petey joined	19:59
	→ tgkokk joined	20:00
	→ harobed_ joined	20:00
	→ p4denis joined	20:00
	← scott3 left	20:00
	← macben left	20:00
	← harobed left	20:01
	← tgkokk left	20:01
	→ tgkokk joined	20:01
	← dutis left	20:02
	← Exancillatus left	20:03
	← sohail left	20:03
	← petey left	20:04
	→ pheaver joined	20:04
	← npatten left	20:04
	← p4denis left	20:05
	← tgkokk left	20:06
	← sjohnson left	20:06
	→ veebers joined	20:07
	→ primitive joined	20:08
	→ pantsman joined	20:08
	YuviPanda → zz_YuviPanda	20:09
	← Mode-M left	20:10
	→ zeppo joined	20:11
	← zeppo left	20:12
	→ Exancillatus joined	20:12
	→ kcj joined	20:12
	← jayallen left	20:13
	→ LuxuryMo_ joined	20:14
	← cmpera left	20:14
	→ jayallen joined	20:15
	→ enr joined	20:15
	← LuxuryMode left	20:16
	→ David joined	20:17
	← Exancillatus left	20:17
	← enr left	20:19
	→ enr joined	20:20
	→ mvelioglu joined	20:20
	→ acharlieh joined	20:20
	← Silmarilion left	20:21
	← aard_ left	20:21
	← craigp left	20:23
	→ ArcTanSusan joined	20:23
	KeiKun → Guest40010	20:23
	→ KeiKun_ joined	20:23
	← Guest40010 left	20:24
	← David left	20:24
	→ calcifea_ joined	20:25
	← calcifea left	20:26
	← harobed_ left	20:27
	→ macben joined	20:27
	← ArcTanSusan left	20:27
	→ Watabou joined	20:27
	← JerryT left	20:28
	← sq-one left	20:29
	lfaraone_ → lfaraone	20:30
	→ alansaul-laptop joined	20:30
	→ Goplat joined	20:30
	→ raniere joined	20:30
	→ diegoviola joined	20:31
	← krizzii left	20:31
	→ LucasKA joined	20:31
	→ craigp joined	20:32
	← Watabou left	20:32
	← macben left	20:32
	→ aChatir joined	20:33
	← craigp left	20:34
	→ craigp joined	20:34
	← jatt left	20:36
	← raniere left	20:36
	← xSmurf left	20:36
	← kcj left	20:37
	← psyl0n left	20:37
	← phipes left	20:39
	→ liri_ joined	20:40
	← Nicholas_Rishel left	20:40
	→ petey joined	20:44
	← ewnd9 left	20:45
	← King_Hual_ left	20:46
	← aChatir left	20:46
	→ raniere joined	20:49
	← Happzz left	20:49
	LulzonAway → Lulzon	20:50
	← dan64 left	20:51
	→ psyl0n joined	20:52
	← LucasKA left	20:53
	← mizu_no_oto left	20:53
	→ dyng joined	20:55
	→ dan64 joined	20:57
	← longbeach left	20:57
	→ Exancillatus joined	20:58
	← PeterBooker left	20:59
	→ Mars joined	20:59
	Mars → Guest26876	21:00
	← framling left	21:00
	→ LucasKA joined	21:00
	← dyng left	21:00
	← eletuchy left	21:01
	← oriba_ left	21:01
	→ eletuchy joined	21:01
	← Guest26876 left	21:02
	← King_Hual left	21:03
	← cyphase left	21:04
	→ albertgrala joined	21:06
	← dprophit left	21:06
	← a-l-e left	21:07
	→ VictorCL joined	21:07
	→ King_Hual joined	21:07
	→ endiruna joined	21:08
	← jnavila left	21:08
	← corni left	21:09
	← acharlieh left	21:09
	← hellopat left	21:10
	→ hellopat joined	21:10
	← primitive left	21:11
	→ swaechter_ joined	21:11
	→ phipes joined	21:11
	← tummy__ left	21:13
	→ barbles joined	21:13
	← hellopat left	21:15
	← jceb left	21:17
	→ yhager joined	21:18
	← King_Hual left	21:18
	→ dexterity joined	21:19
	→ King_Hual joined	21:19
	→ vince_pr_ joined	21:19
	→ Nizumzen joined	21:19
	← vince_prignano left	21:20
	→ c-vit joined	21:20
dexterity	How do I revert a branch to a specific tag? (I revert commit(s) as the repo has been pushed)	21:21
	→ Arun_ joined	21:21
	← _tpavel left	21:21
cbreak	dexterity: you can use git revert A..HEAD	21:22
	→ Watabou joined	21:22
offby1	dexterity: or, depending what you meant by "revert", "git reset --hard A"	21:22
cbreak	or git revert -n A..HEAD && git commit -m "blah blah blah"	21:22
	← aweorit` left	21:23
	← codehotter left	21:23
	→ Nicholas_Rishel joined	21:24
	→ codehotter joined	21:25
dexterity	cbreak: what do you mean by A? is it a commit or a tag?	21:26
cbreak	dexterity: it's the commit you wish you would be on	21:26
	→ saorge_ joined	21:26
	← c-vit left	21:27
	← xlinkz0_ left	21:28
	→ cagedwisdom joined	21:29
dexterity	cbreak: does `git revert <tagname>` produce the same result as `git revert <tagged commit>..HEAD`?	21:29
cbreak	no	21:30
	git revert T reverts the commit T	21:30
	← saorge left	21:30
cbreak	git revert T.. reverts all commits from T (not including T) to HEAD	21:30
	dexterity: see man gitrevision	21:30
	dexterity: see man gitrevisions	21:31
gitinfo	dexterity: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	21:31
	→ XxLocutusxX joined	21:31
m0viefreak	is there a straight-forward solution to this in case T is not an ancester of HEAD?	21:31
	i could only thing of something like git diff T \| git apply --reverse	21:32
	[emmajane] → emmajane	21:32
	→ afhammad joined	21:32
thiago	dexterity: let's start with what you mean by "revert"	21:32
	dexterity: explain	21:33
	← afhammad left	21:33
	→ ariscop joined	21:33
	← mribeirodantas left	21:34
	→ Bosox20051 joined	21:34
	→ acl_ joined	21:35
	← fesoj left	21:35
	→ petertretyakov joined	21:35
	← ValicekB left	21:38
	← Kicer86 left	21:38
	→ cyphase joined	21:38
	← LucasKA left	21:40
	→ MattMaker joined	21:41
rawtaz	silly question perhaps, but does it make more sense to tag versions with just 1.0 and 1.0.3 instead of 1.0.0 and 1.0.3 (i.e. ditching the last digit when it's a new "major" version)?	21:42
	→ CKyle joined	21:42
	→ aard_ joined	21:42
	→ Happzz joined	21:42
rudi_s	rawtaz: Keeping all three digits makes it easier to sort.	21:43
grawity	only if your sorting algorithm is odd	21:43
	← yhager left	21:43
grawity	I usually see "1.0" sorted above "1.0<anything>"	21:44
	← XxLocutusxX left	21:44
rawtaz	well those comments seem to make sense :)	21:44
MacGyver	rawtaz: I prefer if the numbering of all versions includes all points.	21:44
	rawtaz: Because otherwise confusion at the end user can ensue, e.g. "does 1.0 refer to 1.0.0 or the latest 1.0.x"	21:45
	← hillct left	21:45
rawtaz	on a similar note, do you name stuff v1.0.0 or just 1.0.0 ? i think it's kinda more obvious when seeing a tag or release branch named v1.0.0 than just 1.0.0	21:45
	MacGyver: thats another good point indeed. thanks	21:45
	← tobias__ left	21:47
	← Nizumzen left	21:48
	→ bwreilly joined	21:49
	← zapb left	21:49
	→ yhager joined	21:49
	← matanya left	21:50
	← aard_ left	21:51
	→ redrocket joined	21:51
	← matheus23 left	21:54
	→ LucasKA joined	21:54
bremner	I tend to think the v is redundant in a tag, but otherwise sane seeming people disagree	21:55
	→ simesy joined	21:56
	← CKyle left	21:56
cbreak	I use v for versions and r for revisions	21:56
	→ dyng joined	21:56
cbreak	that way I keep them separated from other tags	21:56
bremner	what's a revision?	21:57
beastd	bremner: depends on your preferences i guess. the leading v in the tag can certainly serve as a namespace for releases and release candidates	21:57
ngladitz	I've got a commit followed by two reverts that cancel each other out ... is there anyway to rebase those three commits into one?	21:57
cbreak	bremner: a counter-like version number... like a release number maybe?	21:58
	ngladitz: squash	21:59
	ngladitz: rebase -i can also delete commits	21:59
	both are rewriting history as usual with rebase	21:59
rawtaz	cbreak: do you mean that you have for example v1.0.0 when theres a release, but revisions/bug fixes you name e.g. r1.0.1 ?	21:59
	→ Mars joined	21:59
cbreak	nah	21:59
	→ jcalonso joined	21:59
ngladitz	I tried git rebase -i HEAD~3 and used pick, fixup, fixup but then it tells me "You asked to amend the most recent commit, but doing so would make it empty."	21:59
	← dexterity left	21:59
cbreak	in most projects I work on I don't bother with version numbers	21:59
	there's just r0, r1, ... r10, r11	21:59
	Mars → Guest63978	21:59
	← diegoviola left	22:00
cbreak	because I don't have to maintain old releases.	22:00
	new == better :)	22:00
	→ JerryT joined	22:00
	→ macben joined	22:00
	← VictorCL left	22:00
	← DrNick left	22:01
rawtaz	cbreak: i see, just release numbers then	22:01
ngladitz	I tried deleting the revert commit before but then the merge from my staged topic branch into the integration branch fails ... it tells me my branch is already there :\	22:01
	→ p4denis joined	22:01
	← dyng left	22:01
	→ mklappst_ joined	22:03
	→ royho joined	22:03
	← macben left	22:05
	← mklappstuhl left	22:05
	← dougsland left	22:05
	→ dougsland joined	22:05
	→ tpollard joined	22:06
	← p4denis left	22:06
	→ Vinnie_win joined	22:06
	← royho left	22:06
	← LucasKA left	22:06
	← Guest63978 left	22:07
	→ hellopat joined	22:07
	← jcalonso left	22:08
	← jackneill left	22:09
thiago	ngladitz: why do you think merge is wrong?	22:09
	→ gordian joined	22:10
	← mklappst_ left	22:10
	← hellopat left	22:10
	→ mklappstuhl joined	22:10
ngladitz	thiago: hm?	22:10
	you mean why it refuses to merge?	22:10
	← phipes left	22:10
thiago	ngladitz: assume git is right	22:10
	ngladitz: and then just look into why you thought it was wrong.	22:11
	→ ValicekB joined	22:11
	← LuxuryMo_ left	22:11
	← acl_ left	22:11
ngladitz	thiago: I don't doubt git is right ... I don't think it is wrong	22:11
	← doener left	22:11
	→ juls joined	22:12
ngladitz	but that doesn't help me :\	22:12
	← hoschi left	22:13
	← de-Vri-es left	22:13
	← master_j left	22:13
thiago	ngladitz: then explain the problem	22:14
	← King_Hual left	22:14
ngladitz	thiago: didn't I?	22:14
	→ King_Hual joined	22:14
thiago	ngladitz: not enough	22:14
	ngladitz: please re-explain	22:14
	what command did you run?	22:15
	→ David joined	22:15
ngladitz	thiago: ok I'll try to reiterate in more detail ... I prepared a topic for integration that I pushed and merged	22:15
	I had a semantic conflict with another topic so I reverted my topic, pushed and merged again	22:16
	then the topic I conflicted with was reverted so I reverted my earlier revert, pushed and merged again	22:16
thiago	what's "pushed and merged" ?	22:16
	and what do you mean by "reverted my topic" ?	22:17
	I need git commands	22:17
ngladitz	"git push stage HEAD" for the push	22:17
thiago	ok	22:17
	that's a push	22:17
	then what?	22:17
ngladitz	the merge is performed by some remote ssh command (I am not entirely sure how it works :\)	22:18
	← bvi left	22:18
ngladitz	it takes the name of the topic that I pushed to stage and merges it into the integration branch	22:18
	→ KeiKun joined	22:18
	→ jayallen_ joined	22:18
	← jayallen left	22:18
	jayallen_ → jayallen	22:18
	→ DrNick joined	22:18
ngladitz	so far all went like expected	22:19
	now usually when I merged multiple commits I rebase to clean up history, then I force push and merge again	22:19
	→ gdogrady joined	22:19
thiago	rebase on top of what?	22:20
	before that push?	22:20
ngladitz	when my topic has e.g. 3 commits in it I run "git rebase HEAD~3" and use fixup for the last two	22:20
	← swaechter_ left	22:21
	← KeiKun_ left	22:21
thiago	ok	22:21
	did you do that before the push?	22:21
ngladitz	I first push all commits, then rebase, then force push	22:21
thiago	ok, that's mistake 1	22:21
	← gdogrady left	22:22
	→ gdogrady joined	22:22
ngladitz	can you elaborate?	22:22
thiago	force push was a mistake	22:22
	what did the CI on the other side do when you force-pushed?	22:22
	← looper left	22:23
ngladitz	nothing yet ... it works on the integration branch after I merge	22:23
	CI (continuous integration I hope?)	22:23
	→ Vivekananda joined	22:24
	← nurey left	22:24
thiago	ah, ok	22:24
ngladitz	so far all of this usually works	22:24
thiago	so you detected the mistake before anything used the first push?	22:24
	← mishok13 left	22:25
ngladitz	no it was already merged into the integration branch	22:25
	→ VictorCL joined	22:25
	← psyl0n left	22:25
thiago	ok	22:25
	← toiletbowlJoel left	22:25
thiago	what did you do after the force push?	22:25
	I'm assuming that unless you do something, it doesn't get used	22:26
	so what did you do?	22:26
ngladitz	I tried to merge my topic into the integration branch	22:26
	← johnmilton left	22:26
thiago	that's the mistake	22:26
	don't do it	22:26
ngladitz	that usually works :\	22:26
	→ jayallen_ joined	22:26
thiago	don't do it	22:26
	← jayallen left	22:26
	jayallen_ → jayallen	22:26
ngladitz	can you elaborate?	22:27
thiago	get the commits right the first time. Once they've been merged into something, they're there for good.	22:27
	NEVER rebase them again	22:27
ngladitz	hm that is the given workflow	22:27
thiago	time to change it	22:27
cbreak	if you rebase public history, you create new history to which the old version still exists	22:27
	so afterwards you have two versions of history	22:28
	← rpg left	22:28
	← rendar left	22:28
cbreak	you can kill the old public history	22:28
	but you have to do that in every single clone	22:28
	good luck with that :)	22:28
ngladitz	nothing is based on the history of the integration branch	22:28
cbreak	is the branch useful?	22:28
	if not, throw it away	22:28
	→ iderik joined	22:28
thiago	ngladitz: are you saying that the result of the first merge is thrown away?	22:28
	← ValicekB left	22:28
ngladitz	for automated testing only	22:28
	I assume it isn't thrown away	22:29
	← Cyb3r-Assassin left	22:29
cbreak	either you throw it away or you keep it	22:29
thiago	ngladitz: then don't merge the force push	22:29
cbreak	if you keep it, you have two versions of history	22:29
thiago	ngladitz: you have two choices:	22:29
	throw the first merge away before merging the rebase; or not rebase	22:30
	ngladitz: choose one	22:30
	→ eijk joined	22:30
	→ Diemuzi joined	22:30
ngladitz	hm but that isn't even the part that broke for me yet	22:30
	gitinfo set mode: +v	22:30
thiago	ngladitz: anything past this point is busted alerady	22:31
	ngladitz: I don't even care what you did afterwards, if it's after the first mistake	22:31
	ngladitz: anyway, from now on, you'll change your workflow	22:31
ngladitz	there is a "master" branch on the remote that contains the final history	22:31
	→ macben joined	22:31
ngladitz	the topics get merged into it when they pass integration	22:31
thiago	fair enough	22:32
	but you told us that the result of the first merge is not thrown away	22:32
	if that's the case, DO NOT rebase	22:32
ngladitz	wouldn't that only break if someone branched from the integration branch?	22:33
	→ kcj joined	22:33
thiago	yes	22:33
	which is what you do if you merge more things into it	22:33
	→ sohail joined	22:33
thiago	so I am telling you: don't	22:33
	← endiruna left	22:33
ngladitz	I still don't know how the remote script is doing the merge	22:34
thiago	I am assuming you know what you're talking about	22:34
	you said you did the first push, then caused your commits to be merged and tested	22:35
	→ Silmarilion joined	22:35
	← mvelioglu left	22:35
thiago	then you rebased, pushed again and asked the script to merge that now	22:35
	→ endiruna joined	22:35
thiago	you also said the original commit was not removed	22:35
	THAT is the mistake	22:35
ngladitz	yes ... but I don't know if it keeps the initial merge when I merge the topic again	22:35
thiago	you need to change your workflow:	22:35
	either make the script throw away the commit, or stop rebasing	22:35
	which way will you choose?	22:36
ngladitz	it isn't my script (nor my workflow) :)	22:36
thiago	for our purposes here, it is	22:36
	you're using it, therefore it's yours	22:36
	→ ValicekB joined	22:36
	→ jatt joined	22:36
	← macben left	22:36
ngladitz	I can't inspect what it does or modify it though :p	22:36
	→ phipes joined	22:36
thiago	you can take conclusions from the results or you can ask the person who wrote it	22:37
	← alezost left	22:37
ngladitz	so far it is working so I just assume it is doing the right thing	22:38
thiago	let's proceed on the assumption that the person who wrote the script thought it through: the failed tests are discarded	22:38
ngladitz	like I said as far as I can tell so far none of that broke anything	22:38
thiago	so you received the results, saw there was a problem, so you made a new set of commits	22:38
	then you force-pushed them	22:38
	ok so far?	22:38
ngladitz	not exactly	22:38
	I saw the conflict and just reverted my last commit, then pushed and merged	22:39
	(so far no force or rebase)	22:39
	← WaReZ left	22:39
ngladitz	then the conflicting topic was reverted by someone else	22:39
thiago	if we assume that the script is doing the right thing, only the last push is relevant	22:39
	so let's skip to the last push	22:39
	what did you do after the last push?	22:39
ngladitz	so I reverted my original revert, pushed and merged again	22:40
	→ mklappst_ joined	22:40
	← mklappstuhl left	22:40
thiago	with git revert?	22:40
ngladitz	yes	22:40
thiago	ok	22:40
	what happened then?	22:40
ngladitz	now to clean up my history (like usually) I ran "git rebase HEAD~3" and set the two reverts to "fixup"	22:40
thiago	ok	22:40
ngladitz	and that failed	22:41
thiago	the rebase failed?	22:41
ngladitz	yes	22:41
thiago	pastebin the output	22:41
	→ tuocuggino joined	22:41
	→ Mars joined	22:42
	Mars → Guest13074	22:42
ngladitz	http://pastebin.com/yRUaFuuN	22:42
	→ axl_ joined	22:42
	← Guest13074 left	22:42
thiago	ngladitz: which commit is "Revert "AddDependencies: new policy requires dependencies to exist"" ?	22:43
	the first of the reverts?	22:43
ngladitz	yes	22:43
thiago	instead of fixup'ing the two reverts, just remove them	22:43
	→ Cyb3r-Assassin joined	22:44
tuocuggino	hi guys someone know what means this error after a git commit: "error unable to create temporary file file exists error error building trees"	22:44
	?	22:44
	← calcifea_ left	22:44
ngladitz	that I tried as well but then the merge on the remote fails telling me the topic is already in the integration branch	22:45
thiago	tuocuggino: pastebin the terminal, including the command you ran	22:45
	ngladitz: force-push?	22:45
	→ acharlieh joined	22:45
	→ mizu_no_oto joined	22:45
ngladitz	I force pushed (worked) but when I invoke the remote ssh merge it doesn't work	22:46
	→ thundar97 joined	22:46
thundar97	125 voiced what???	22:46
tuocuggino	thiago, the problem is not on my pc, but on pc of my coworker... and he there isn't here now, i know only the error	22:46
thiago	ngladitz: what command did not work?	22:46
thundar97	anyway, is it possible to pull request for a whole NEW branch on github?	22:47
thiago	tuocuggino: ok.	22:47
	← khmarbaise left	22:47
thiago	tuocuggino: come back when you have the information	22:47
	thundar97: ask in #github	22:47
	thundar97: but merges apply to the entire branch	22:47
tuocuggino	thiago, ok, what kind of information u need?	22:47
ngladitz	thiago: the remote ssh command that performs the merge	22:47
thundar97	yeah thats what i though	22:48
thiago	thundar97: just make sure that the other person knows to do a git merge	22:48
	tuocuggino: I've already told you	22:48
	tuocuggino: 14:45 < thiago> tuocuggino: pastebin the terminal, including the command you ran	22:48
ngladitz	(from my staged topic branch into the integration branch)	22:48
tuocuggino	the complete output?	22:48
thiago	ngladitz: what git command was run?	22:48
	tuocuggino: I need the command that was run and the exact output from git.	22:49
tuocuggino	ok	22:49
	← VictorCL left	22:49
ngladitz	thiago: if only I knew for sure ... the parameters that look like they belong to git at the end look like this: merge -b integration-branch my-topic	22:49
thiago	ngladitz: if that merge said "already up to date", it implies that my-topic was already merged	22:49
ngladitz	but I don't know what the script actually executes :\	22:49
	← EvilDMP left	22:50
thiago	ngladitz: job done then	22:50
ngladitz	I think the error might be custom since I haven't been able to google it anywhere	22:50
	← jonascj left	22:50
thiago	ngladitz: that means something merged that commit to the base of what the integration script uses	22:51
	ngladitz: my guess is that the script automatically does that if the tests pass, which they did when you pushed the commit + revert + reverting the revert	22:52
ngladitz	I'll try finding out upstream about the error ... I guess it might not even be git related ... assuming I didn't do anything obviously wrong in the steps in between :)	22:52
thiago	ngladitz: you cannot fix the revert and revert revert anymore.	22:52
ngladitz	thanks for all your help	22:52
thiago	ngladitz: so the recommendation is: make sure your commits are right before you ask the integration script to run	22:52
	← Arun_ left	22:53
rawtaz	since annotated tags are stored as objects (if i understand it correctly), does that mean that you cannot edit or remove them later on without the rest of the history (following that tag's point/commit) is affected somehow?	22:53
	← ingentis left	22:53
thiago	rawtaz: yes and no	22:53
rawtaz	or are they not part of the regular chain so to speak	22:53
ngladitz	usually I only know if the commits are "right" after the integration tests ran :)	22:53
thiago	rawtaz: you cannot edit or move a tag. Everyone will notice.	22:53
	rawtaz: but the tag is not part of the commit history. If you remove a tag, the commit history remains intact.	22:54
	← falconfox left	22:54
rawtaz	thiago: i think thats what i was after, that it doesnt affect the commit history (i.e. the hashes etc)	22:54
	→ WaReZ joined	22:54
	→ Arun_ joined	22:55
thiago	rawtaz: right	22:55
rawtaz	thank you. i did try it and didnt see any change but wasnt sure	22:55
	← pantsman left	22:55
	← Diemuzi left	22:55
	→ mklappstuhl joined	22:55
	→ falconfox joined	22:56
	← xequence left	22:57
	→ EngierkO joined	22:57
	← mklappst_ left	22:57
	→ dyng joined	22:58
	← petertretyakov left	22:58
tuocuggino	thiago, he has just se me an email with the error	22:58
	http://pastebin.com/9HRz8gXb	22:58
	← Nicholas_Rishel left	22:58
thiago	tuocuggino: that's not Linux, is it?	22:59
	→ rafaqueque joined	22:59
	→ xSmurf joined	22:59
	→ frogonwheels joined	22:59
tuocuggino	yes he is using windows	22:59
thiago	tuocuggino: then I can't help you further	23:00
	← jayallen left	23:00
thiago	try upgrading to the latest Git, to be sure, but this is as far as I can go	23:00
	→ jayallen_ joined	23:00
tuocuggino	already done but dosen't work	23:00
	→ floatingpoint joined	23:01
floatingpoint	ugh. what the f is this? error: object file .git/objects/28/33769eec39a2312125808b0fe5e1282dc5ff17 is empty	23:01
	→ AndChat92225 joined	23:02
	← dyng left	23:02
	← yhager left	23:02
	← eijk left	23:02
	→ LucasKA joined	23:03
floatingpoint	can I just blow that file away?	23:03
	← alansaul-laptop left	23:05
	→ dik_dak joined	23:06
	→ alansaul-laptop joined	23:06
	→ SeptDePique joined	23:07
	← MetaCosm left	23:07
	← AndChat92225 left	23:07
grawity	well, it's empty anyway, so sure	23:07
	→ AndChat92225 joined	23:07
grawity	but I'm guessing `git fsck` will complain about the repository missing some stuff	23:08
	→ MetaCosm joined	23:08
offby1	floatingpoint: you could try putting something in it :-)	23:08
	← ngladitz left	23:08
offby1	that was NOT a serious suggestion.	23:08
	← leeN left	23:08
	← LucasKA left	23:09
	← AndChat92225 left	23:10
	→ weld_kodia joined	23:11
	← weld_kodia left	23:11
	← petey left	23:11
	→ petey joined	23:12
	← Mangellan2497 left	23:12
	→ weld_kodia joined	23:12
	← weld_kodia left	23:12
	← ciampix left	23:12
	← tuocuggino left	23:13
	← jatt left	23:13
	→ weld_kodia joined	23:13
rawtaz	heh. what is the "index on ..." commit about? im not sure what created it. could it have been the stashing?	23:13
	in http://pastebin.mozilla.org/3998862 , that is	23:13
	→ dsdeiz joined	23:14
	← weld_kodia left	23:14
	→ D4v33 joined	23:14
	→ jexmex joined	23:14
grawity	that's part of the stash, yes	23:14
jexmex	can anybody recommend a really good book to help me understand the more advance parts of git?	23:14
rawtaz	im trying to interpret the diffs	23:14
jexmex	somehow I end up getting double merges and crap	23:15
	← mizu_no_oto left	23:15
	→ LuxuryMode joined	23:15
rawtaz	ok to me it seems that 555dafa is what was staged in the index, and cc4a84f contains some (presumably unstaged) working copy changes	23:15
	← petey left	23:16
	← godgodgodgo left	23:17
offby1	jexmex: the only good book I know of is the stadard one	23:17
	→ weld_kodia joined	23:17
jexmex	offby1: you mean the gitbook?	23:18
	→ ciampix joined	23:18
jexmex	http://git-scm.com/book	23:18
	← beastd left	23:19
offby1	yep	23:19
jexmex	ok will go through that again	23:19
	← enr left	23:20
	gitinfo set mode: +v	23:21
	← veebers left	23:21
offby1	it's perhaps not _that_ advanced, but if you know everything in that book, you should have no trouble reading the man pages	23:22
	→ veebers joined	23:22
	← SeptDePique left	23:23
	→ SeptDePique joined	23:23
	← ValicekB left	23:23
	← Cyb3r-Assassin left	23:25
	→ ErKa joined	23:25
weld_kodia	There are also introductory videos on git-scm.com	23:26
	← LuxuryMode left	23:26
	← madewokherd left	23:26
D4v33	this may be a dumb question, but I'm a newb. is it possible to check in one file that's among a number of staged files or do all have to be checked in?	23:27
osse	D4v33: git add that/one/file; git commit	23:27
offby1	well, there are others staged.	23:28
osse	oh	23:28
offby1	D4v33: technically, no	23:28
	but it's easy to work around	23:28
	"git stash"	23:28
	then stage the one file and commit it	23:28
	then git stash pop	23:28
	or ...	23:28
	just unstage all the other files.	23:28
	that's conceptually simpler.	23:28
osse	git commit that/one/file.txt	23:28
offby1	or ...	23:28
osse	that ignores the index	23:28
offby1	oh!	23:28
	offby1 slaps forehead	23:29
	osse joins in	23:29
offby1	that must be relatively new -- i.e., introduced in the last five years :-)	23:29
	ow.	23:29
	→ jayallen joined	23:29
osse	ow incidentally matches my initials.	23:29
	← jayallen_ left	23:29
offby1	coincidence? You be the judge	23:29
	← Silmarilion left	23:29
offby1	my intials are "slaps osse upside the haid".	23:30
	true story.	23:30
	→ ZujkisNx joined	23:30
D4v33	thanks I look into stashing, so much flexibility!	23:30
offby1	D4v33: as a wise man once said: git stash is cool.	23:30
	→ ValicekB joined	23:31
	← phipes left	23:31
	← mklappstuhl left	23:32
	← weld_kodia left	23:32
osse	offby1: it's been in at least since Aug 8 2005	23:32
	→ weld_kodia joined	23:33
	← gnu-man left	23:33
	→ Cyb3r-Assassin joined	23:33
offby1	funny, I _never_ think to do that.	23:34
	'Course 98% of my interaction with git these days is through a nice front-end	23:34
	← uu1101 left	23:35
	→ Mars joined	23:35
	← vince_pr_ left	23:36
	→ mizu_no_oto joined	23:36
	Mars → Guest42775	23:36
	→ Mangellan2497 joined	23:36
osse	It's started to become a habit of mine if I've changed only one file. 'git commit <tab>' is one character shorter than 'git commit -a' :p	23:37
	→ ciampix_ joined	23:37
offby1	heh	23:37
	← ciampix left	23:38
	← MindfulMonk left	23:38
grawity	well, `git ci -a` is shorter than both	23:38
osse	grawity: I usually use 'g ci <tab>' :p	23:38
	← KeiKun left	23:38
rawtaz	crap. i think i just pruned some stuff i wanted to cherry pick :>	23:40
	← w0ng left	23:40
rawtaz	but i have them in a completely separate/diverged place, so i guess i can grab it from there	23:40
osse	heh, prune and cherry.	23:40
	→ uu1101 joined	23:40
	→ w0ng joined	23:40
	← mizu_no_oto left	23:41
	→ TehRandom joined	23:41
	← TehRandom left	23:41
	← D4v33 left	23:42
	← dobalina left	23:42
	← FerreusR left	23:43
offby1	raisin and pear!	23:43
	← gordian left	23:43
offby1	in math class I learned about logs, roots, "branch cuts", and leaves. Nothing about sticks or stems that I can recall though.	23:44
	→ LuxuryMode joined	23:45
	← albertgrala left	23:45
	→ pgokeeffe joined	23:46
	→ phipes joined	23:46
	← elbeardmorez left	23:46
	→ ggonzalez joined	23:46
ggonzalez	hi	23:46
gitinfo	ggonzalez: 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.	23:46
ggonzalez	thanks gitinfo, really helpful	23:47
gitinfo	ggonzalez: you're welcome, but please note that I'm a bot. I'm not programmed to care.	23:47
	← uu1101 left	23:47
	← acharlieh left	23:47
	← alansaul-laptop left	23:48
ggonzalez	Once in a while a create a branch from master for a separate version but after a while this new branch became the main project source code, making master outdated. Which is the best way to make this branch go to master again? rebase? merge?	23:48
offby1	a fairly clever one, however	23:48
	ggonzalez: I'd check out master, then merge in that other branch.	23:49
	That way you generally have your master branch being current.	23:49
	Note that this isn't always important; if you're the only user of the repository, then it doesn't much matter which branch has the new hotness in it.	23:49
	← ZujkisNx left	23:49
offby1	Even if other people are using it, you _could_ just tell them "hey, forget about master; all the cool stuff is in the 'frotz' branch".	23:49
	But ... it's more conventional to keep master up-to-date, so that's probably what you want to do.	23:50
ggonzalez	offby, yeah I wouldn't mind keep using the branch but I used github for issue tracking and I can't close the issues directly from the branch, which is a bit of a pia	23:50
	s/used/use/	23:50
	→ uu1101 joined	23:50
	← Happzz left	23:50
	← weld_kodia left	23:50
ggonzalez	this is basically the main reason from moving everything back to master	23:51
	→ weld_kodia joined	23:51
	← weld_kodia left	23:51
	→ enr joined	23:51
ggonzalez	offby, so merge, ok thx. Why not rebase in this case?	23:51
	→ petey joined	23:52
offby1	rebase is fine too. The choice is mostly about style (although people here will probably flame me for saying that)	23:52
	there are pros and cons to each.	23:52
ggonzalez	heheh	23:53
offby1	actually, you really don't want to rebase master if other people are tracking it.	23:53
osse	hmm, how about a dose of reset blow that old master branch to kingdom come?	23:53
offby1	that's got the same downside as rebasing.	23:53
	→ cordoval joined	23:53
cordoval	guyz	23:53
offby1	but otherwise that's not necessarily a bad idea.	23:53
	d00dz	23:53
osse	srsly	23:54
cordoval	which is a perfect way to squash all commits into one without interaction?	23:54
thiago	cordoval: are they in the current branch?	23:54
cordoval	well yes	23:54
ggonzalez	ok thx pals :)	23:54
cordoval	i mean i have say feature/x	23:54
	and master	23:54
thiago	cordoval: git reset --soft last-commit-not-to-be-squashed && git commit -m "squash"	23:55
cordoval	and i want to squash 20 commits on feature/x on top of master	23:55
osse	cordoval: merge --squash feature/x	23:55
	← floatingpoint left	23:55
	← ggonzalez left	23:55
cordoval	the merge will merge into a branch, that is not what i want	23:55
	i am sending a PR	23:55
	so merge --squash is not an option right?	23:55
thiago	press release?	23:55
offby1	for super-atomic squash, I occasionally use "git commit-tree".	23:55
osse	cordoval: no it won't. it will squash it on top	23:55
thiago	merge --squash is an option	23:55
	→ hellopat joined	23:56
osse	it will take the whole of feature/x and bolt it onto master like a pair of fake tits	23:56
cordoval	hmm will it keep author info?	23:56
	← enr left	23:56
cordoval	i don't want it to merge on master yet	23:56
thiago	cordoval: no. You get the credit now.	23:56
cordoval	i want to just do it on the same branch	23:56
thiago	cordoval: do what I suggested then.	23:56
cordoval	git reset --soft ..	23:56
osse	cordoval: about git merge --squash: "This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch"	23:57
cordoval	ok i will test it	23:57
	← m0viefreak left	23:57
	→ m0viefreak joined	23:57
cordoval	i mean merge --squash	23:57
	as osse confused me	23:57
osse	cordoval: ahh. but if you want to squash without actually merging then you cannot use it	23:58
cordoval	ok then reset	23:58
	ok i have it clear that it has to be reset	23:58
osse	git reset --soft master && git commit should do the tricknicity	23:58
	← hellopat left	23:58
cordoval	yeah now i just have to calculate the `master`	23:59
	because it is a PR with a specific base	23:59

Logs Search ←Prev date Next date→

Channels Documentation