IRCloggy #git 2013-08-02

Provider of IRC logs since 2005.

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

	2013-08-02
	→ linkonu joined	00:00
	→ mckendricks joined	00:01
	← linkonu left	00:02
	→ michaelarestad joined	00:03
	→ jon_r joined	00:04
	→ emergion joined	00:04
	← sraf left	00:04
	→ sraf joined	00:04
	→ dreiss joined	00:05
	→ guzzlefry joined	00:06
	← sgambino left	00:06
	← enr left	00:06
	→ z8z joined	00:06
	→ chrisgeorge joined	00:06
	← _Roden_ left	00:06
guzzlefry	How can I grab a diff between what's in origin and my current working copy? I've tried doing git fetch origin master && git diff HEAD...origin; with no luck.	00:06
LBV_User	there is some way I can get only the name of current branch?	00:06
guzzlefry	LBV_User, git branch?	00:06
	→ doener joined	00:07
LBV_User	guzzlefry: it lists all...	00:07
guzzlefry	LBV_User, quick and dirty way: git branch \| grep \*	00:07
	There's probably a better one.	00:07
LBV_User	that is, I'm writing a cmake command, and I need to run it on windows too, so I cannot afford for string manipulation commands from bash/sh...	00:07
	← michaelarestad left	00:08
	→ yshh joined	00:08
	← hellome left	00:09
saustin	If, say, a team was to want to track something like a hundred projects using Eclipse and EGit, would they create a repository per project? or a repository for all projects?	00:09
	← infogulch left	00:09
	→ nathancahill joined	00:09
LBV_User	saustin: save yourself from headaches.... 1 repo per project and submodule everybody	00:10
guzzlefry	LBV_User: I'm not seeing anything, which is odd. You'd think that would be in there. You can read over man git branch to check after me if you want to be sure.	00:10
gitinfo	LBV_User: the git-branch manpage is available at http://jk.gs/git-branch.html	00:10
saustin	LBV_User thanks :)	00:10
kevlarman	LBV_User: submodules avoiding headaches? this is news to me :P	00:10
LBV_User	kevlarman: I've been using submodules just as a convenience... add all projects to a superproject helps to fetch everybody at once	00:11
	← ncd\|leeN left	00:11
	→ infogulch joined	00:12
	← Balliad left	00:12
LBV_User	guzzlefry: I've searched man pages... tried many commands... but it didn't found anything that would work without grep and friends	00:12
	→ kermit joined	00:13
	← aberrant left	00:13
	→ trungqtran joined	00:14
	← nathancahill left	00:15
	← konundra left	00:15
kevlarman	guzzlefry: first of all, !four, second of all git fetch;git diff origin/master	00:16
gitinfo	guzzlefry: [!fetchfour] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).	00:16
kevlarman	LBV_User: git symbolic-ref HEAD	00:16
	← simesy left	00:16
	← emergion left	00:17
	→ LuxuryMode joined	00:18
LBV_User	kevlarman: :D --short will come in handy also :D thanks	00:19
	→ SebanK joined	00:19
kevlarman	LBV_User: if it's newer than 1.4.2, i have no idea it exists :P	00:19
	→ enr joined	00:20
LBV_User	I'm using 1.8.3.3... :P	00:20
kevlarman	i'm on 1.8.1.2, doesn't stop me from being oblivious to all features introduced in the middle	00:20
	except @{u}	00:21
	i love @{u}	00:21
guzzlefry	kevlarman: thanks, that worked.	00:21
LBV_User	that CMakeLists will never be the same now :D	00:21
kevlarman	guzzlefry: if you specify 2 commits, you get a diff between them, if you specify 1, you get a diff against the working copy (and .../.. don't actually do anything as far as diff is concerned)	00:22
	← sriracha left	00:22
	→ jaeckel joined	00:22
	→ sriracha joined	00:22
	→ goshawk joined	00:23
LBV_User	there is a way to count how many commits existed between the last tag and last commit?	00:24
	← enr left	00:24
LBV_User	(I'm starting to think it is easy to put the sha1 in the final binary)	00:24
	← ntus1017 left	00:24
	→ emergion joined	00:25
kevlarman	LBV_User: git describe	00:26
	← Bruno_ left	00:26
	→ BSaboia joined	00:26
	← jefflyne left	00:26
	← AAA_awright left	00:28
	→ michaelarestad joined	00:29
	← Trieste_zzz left	00:30
	← Kabaka left	00:30
	← umib0zu left	00:32
	→ groglogic joined	00:32
	→ Kabaka joined	00:33
	← BJfreeman left	00:33
	← iliketurtles left	00:34
	← emergion left	00:34
	→ fridim_ joined	00:35
	→ jefflyne joined	00:35
	← chrob left	00:35
	→ cads joined	00:35
	← yshh left	00:36
	→ yshh joined	00:36
	← pr0ton left	00:37
	→ Trieste_zzz joined	00:37
	→ janauzzz joined	00:39
	→ joelpitt_ joined	00:39
	← joelpitt_ left	00:39
	→ joelpitt_ joined	00:39
	← yshh left	00:41
	← janaus_ left	00:42
	← joelpittet left	00:42
	← tplaner left	00:43
	← Fritz7 left	00:43
	→ Pio joined	00:43
	→ Fritz7 joined	00:43
	→ boombatower joined	00:44
	← devth left	00:44
	← nilg` left	00:44
	→ tplaner joined	00:44
	← crash\ left	00:45
	← normanrichards left	00:45
	← trungqtran left	00:45
	← hyperair left	00:46
	→ pr0ton joined	00:47
	← DonRichie left	00:47
	→ ology joined	00:47
	→ madewokherd joined	00:47
	← Fritz7 left	00:48
	→ DonRichie joined	00:48
	→ trungqtran joined	00:48
	← PeterBooker left	00:49
	→ hellome joined	00:49
	← AaronMT left	00:49
	→ crash\ joined	00:49
	→ ntus1017 joined	00:50
	→ nbouscal joined	00:51
	→ hachque joined	00:53
	→ Fritz7 joined	00:53
SebanK	Hello everybody. At my student assistant job we use Gitlab to host the projects managed by Git. I was asked to find out if it is possible to display the different projects at the projects page in Gitlab in some specific order, not just one below the other. With specific order I mean sth like this http://pastebin.com/PJJ3Edga	00:54
	← ntus1017 left	00:54
	← Liir left	00:54
SebanK	Does someone of you know if and how this is possible?	00:54
	→ danecando joined	00:55
	→ JosephSilber joined	00:55
	→ hemanth joined	00:55
	← ojacobson left	00:56
	← guzzlefry left	00:58
	← Fritz7 left	00:58
	← hachque left	00:59
	← rednaks left	00:59
	→ hachque joined	00:59
	→ yshh joined	01:00
	← harish_ left	01:00
	← goshawk left	01:00
	← pitzips left	01:00
LBV_User	SebanK: never used it, but I guess you'll need some Ruby coding...	01:01
	→ Suprano joined	01:01
	→ k_sze[work] joined	01:01
	← sampiero left	01:02
	← Vinnie_win left	01:02
	→ Fritz7 joined	01:02
LBV_User	or maybe you can use separated repositories for each group...	01:02
	→ weiyang joined	01:02
	← Marenz left	01:04
	← z8z left	01:05
	← thiago left	01:05
	← Fritz7 left	01:06
	→ Fritz7 joined	01:06
	→ Davey joined	01:06
	← LuxuryMode left	01:07
	← michaelarestad left	01:08
	← kermit left	01:08
	→ Vampire0 joined	01:09
SebanK	LBV_User: thanks for the help. I don't know if anyone in the team is familiar with ruby, most are electrical engineers or sth similar. In the link I posted 'Document 1', 'Document 2', 'Git' and the '...' would be repositories. On the gitlab server, every team has a gitlab group wherein their repos are stored. Now we would like to display them in a clearer way	01:09
	← Fritz7 left	01:09
	→ M4renz joined	01:10
	→ z8z joined	01:11
	← mckendricks left	01:13
	→ kini joined	01:13
	→ stkrzysiak joined	01:13
	← Kyzz left	01:14
	→ Fritz7 joined	01:14
	← Suprano left	01:14
LBV_User	SebanK: the "git solution" I can think by now is submodules, but I don't think Gitlab will hide submodules and show only superprojects... this way, I still think you will need do some ruby code... (it is supposed to be easy)...	01:15
	→ hyperair joined	01:18
	← Fritz7 left	01:18
	← dhruvasagar left	01:18
	→ Fritz7 joined	01:19
	← groglogic left	01:19
	← ology left	01:19
	→ enr joined	01:20
	→ GT4066 joined	01:21
	→ emergion joined	01:21
	← enr left	01:22
	← Mamoru left	01:22
	← Fritz7 left	01:23
	→ Goplat joined	01:24
	← chrisgeorge left	01:26
	← nick22 left	01:28
SebanK	LBV_User: Using ruby, to put it simple I would have to rewrite the part of gitlab that lists the projects from 'put them one below the other' to 'sort them in the structure I want'. Is that what you mean?	01:28
	← crash\ left	01:28
	→ michaelarestad joined	01:29
LBV_User	SebanK: yes... I don't think there is any other way you can say to Gitlab that project A and B are related and should be shown inside SomeGroup...	01:29
	← CheckDavid left	01:30
	→ Fritz7 joined	01:30
	→ crash\ joined	01:30
	→ voiceofgrog joined	01:31
	→ luc_ joined	01:31
	← zbcm left	01:32
	→ troulouliou_dev joined	01:32
troulouliou_dev	hi i wan to create a branch that will never be merged against master, is itpossible to localy delete master	01:32
	and point head to that branch locally	01:33
	← carbohydrate left	01:33
troulouliou_dev	even if the server is not aware of this ?	01:33
LBV_User	troulouliou_dev: if you just don't push that branch, it will remain only local...	01:34
	← Fritz7 left	01:34
	→ dhruvasagar joined	01:34
troulouliou_dev	LBV_User, but i want to psh it	01:34
	LBV_User, i want to use it like a second fork on github	01:35
	→ Fritz7 joined	01:35
troulouliou_dev	as github don't allow to fork a repo twice	01:35
	→ simesy joined	01:35
troulouliou_dev	i don't plan to pr from this branch too	01:35
deryni	What's wrong with just branching normally? Or do you want to make it impossible to merge?	01:36
	→ xpirator joined	01:36
	→ tmcmahon joined	01:36
	← emergion left	01:36
	→ iliketurtles joined	01:36
	→ harish_ joined	01:37
SebanK	LBV_User: Ok. I will have to look into this. Thank you!	01:37
	← jfoy left	01:38
troulouliou_dev	deryni, yes i m creating a fork of a project	01:38
	i have a master , normal clone; that i m using for pull request	01:38
	→ daito joined	01:38
	← warlock_mza left	01:39
	← pr0ton left	01:39
troulouliou_dev	and then i want the second fork that i will work on	01:39
LBV_User	SebanK: ;)	01:39
	← janauzzz left	01:39
troulouliou_dev	hard to explain ;(	01:39
	← Fritz7 left	01:39
	→ janauzzz joined	01:39
	→ warlock_mza joined	01:40
troulouliou_dev	but basically i think that repointing head is the solution	01:40
	← jhulten left	01:40
	→ Fritz7 joined	01:40
deryni	I'm not sure I see why your "second fork" isn't just a second branch.	01:41
	← hemanth left	01:41
	← dhruvasagar left	01:42
	← Fritz7 left	01:44
	→ Fritz7 joined	01:46
	→ Dougie187 joined	01:46
	← xrfang left	01:47
	← maslowbeer left	01:48
	← SebanK left	01:48
	→ umib0zu joined	01:48
	← umib0zu left	01:49
	← iliketurtles left	01:49
	← Goplat left	01:50
	→ mckendricks joined	01:50
	← tplaner left	01:51
	← troulouliou_dev left	01:51
	→ tplaner joined	01:52
	→ lavaman joined	01:52
	→ modInfo3 joined	01:52
	→ iliketurtles joined	01:52
	→ Goplat joined	01:53
	→ DolpheenDream joined	01:56
	→ kermit joined	01:57
	← harish_ left	01:57
	→ Nicholas_Rishel joined	01:58
	→ bklane_ joined	01:59
	← hahuang61 left	01:59
	→ insejn_ joined	01:59
	← insejn left	01:59
	insejn_ → insejn	01:59
	→ SebanKr joined	02:00
	← BitPuffin left	02:01
	→ sgambino joined	02:02
	← bklane left	02:02
	← tmcmahon left	02:03
	← kukks left	02:04
	→ dsdeiz joined	02:04
	→ zbcm joined	02:06
	← dreiss left	02:06
	← trusktr left	02:07
	← trungqtran left	02:07
	→ xwl joined	02:08
	→ normanrichards joined	02:09
	→ cha1tanya joined	02:09
xwl	hi, is there a way to git log a branch’s file only?	02:09
	← joshsmith left	02:09
EugeneKay	xwl - man git-log, see how to use !dashes	02:10
gitinfo	xwl: Use a double-dash(--) to separate refs or arguments from file paths. This is especially useful when dealing with ambiguous names. Ex: `git checkout origin -- master` will check out the file "master" from branch "origin"	02:10
	xwl: the git-log manpage is available at http://jk.gs/git-log.html	02:10
	← HelloComputer15 left	02:11
xwl	ah, thanks	02:11
	← daito left	02:12
	→ thiago joined	02:12
	→ daito joined	02:13
	← tplaner left	02:15
	← loteriety left	02:15
SebanKr	I have another question: What is the differnece between the tools listed under 1.5 and 1.6? https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools	02:15
	← Fritz7 left	02:16
	→ AndChat\|157044 joined	02:16
	← xwl left	02:16
	← aartist left	02:16
	← daito left	02:17
	→ Fritz7 joined	02:17
	→ FreezingCold joined	02:19
	→ daito joined	02:20
deryni	The web interfaces and acl tools?	02:20
	→ enr joined	02:21
EugeneKay	Well	02:21
	← simesy left	02:21
EugeneKay	Web interfaces provide an interface for your web browser	02:21
	And the acl tools don't.	02:21
	→ devth joined	02:21
EugeneKay	!gitolite is the best one of the latter to use	02:21
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	02:21
	← Nicholas_Rishel left	02:22
	← m0viefreak left	02:23
	→ HelloComputer15 joined	02:24
SebanKr	ok thanks. but doesn't scm manager use the browser too? I don't get for example the difference between scm manager and gitlab. and gitolite sounda like gitlab, too.	02:24
	← Fritz7 left	02:24
	→ harish_ joined	02:24
	→ Nicholas_Rishel joined	02:24
	→ Fritz7 joined	02:25
	← enr left	02:25
deryni	gitolite does acls. web interfaces give you a web interface to a repo. Some of the fancier web interfaces are also git repo management tools (and so do acls and such).	02:25
	← Fritz7 left	02:25
EugeneKay	gitolite is an acl layer, with builtin functionality for SSH key management	02:25
	→ Fritz7 joined	02:25
deryni	But gitweb and cgit, for example, are just web interfaces to repos.	02:25
	mribeirodantas → vuln	02:26
EugeneKay	That's all it does, and it does it excellently.	02:26
	web interfaces tend to be written and ruby(and thus, a br0grammer's shitfest)	02:26
	Including gitlab	02:26
	vuln → mribeirodantas	02:26
	← shinnya left	02:26
	mribeirodantas → vuln	02:26
	vuln → mribeirodantas	02:27
	← michaelarestad left	02:27
EugeneKay	(cgit and gitweb no, but they have no features to speak of)	02:29
	→ Sir_Rai joined	02:29
SamB	EugeneKay: what, browsing code with pretty colors isn't a feature anymore?	02:29
EugeneKay	I want gifs	02:30
SebanKr	i see. thanks guys	02:30
	← bklane_ left	02:32
	→ bklane joined	02:32
	nkambo → nkambo-on-holida	02:32
	→ sarcasticsimba joined	02:33
	sarcasticsimba → vigs	02:33
	← cads left	02:33
	← LBV_User left	02:33
	← hwrd\|work left	02:33
	← nbouscal left	02:35
	← meLon left	02:35
	→ meLon joined	02:36
	← frgtn left	02:36
	→ nbouscal joined	02:36
	→ michaelarestad joined	02:37
	← nbouscal left	02:37
	→ macabre joined	02:37
	→ damccull joined	02:39
	→ Vinnie_win joined	02:39
	← joelpitt_ left	02:40
	← damccull left	02:41
	← Aww left	02:42
	← Kabaka left	02:42
	← kevlarman left	02:43
	→ echo-area joined	02:43
	→ Kabaka joined	02:43
	→ HelloComputer16 joined	02:43
	← HelloComputer16 left	02:44
	→ Jeaye joined	02:45
	← HelloComputer15 left	02:45
Jeaye	In an interactive rebase, I've renamed my commits in the buffer where I choose my actions (all of which are reword). Is there a way I can just have git take those new commit names isntead of ignoring the changes and prompting me for each one?	02:46
	→ joshsmith joined	02:46
	← joshsmith left	02:48
	→ joshsmith joined	02:49
	→ bmac joined	02:49
	→ Pengoo joined	02:49
	→ hahuang61 joined	02:49
	← warlock_mza left	02:50
	→ simesy joined	02:50
	← cha1tanya left	02:51
	→ frgtn joined	02:52
	→ Kyzz joined	02:52
	← michaelarestad left	02:53
	← xpirator left	02:53
	← frgtn left	02:53
	← DolpheenDream left	02:53
	← hahuang61 left	02:55
	→ cha1tanya joined	02:55
	→ dreiss joined	02:56
	→ Gooder` joined	02:57
	→ kadoban joined	02:59
	← z8z left	03:00
	← Gooder left	03:00
	← devth left	03:00
	← yacks left	03:01
	← shuaib left	03:04
	→ carlos-huang joined	03:04
	← breck7 left	03:06
	← sgambino left	03:08
SebanKr	There are just sooo many git tools out there. :/ Let's say I have a lot of repos, but the server they are stored on doesn't enable me to see them all in an organized way. Is there some kind of front-end, that allows me to sort and catagorize the repos? The server in use runs gitlab.	03:08
deryni	Jeaye: Not that I know of (and the man page seems to indicate that they are just for convenience). That wouldn't let you specify long commit messages if it did work either.	03:10
	Unless you were categorizing based on data contained in git that isn't something that really needs to know anything about git.	03:11
	← Fritz7 left	03:12
	→ Fritz7 joined	03:12
	→ yacks joined	03:12
	← Fritz7 left	03:14
	→ Fritz7 joined	03:15
	→ xwl joined	03:17
	← AndChat\|157044 left	03:17
	→ IanSmithers joined	03:19
IanSmithers	Gentlemen.	03:19
	I want to push local staged changes to a remote branch of my defining. I've done it before but I've forgotten the syntax as it was a while ago.	03:19
	Is it something like: git push origin myname:myfeature?	03:20
	→ enr joined	03:21
	→ Aww_ joined	03:21
	Aww_ → Aww	03:21
	→ loteriety joined	03:23
	← hugo_dc left	03:24
	→ SebanK joined	03:24
	← SebanKr left	03:24
deryni	You want to push a branch you created locally to the remote?	03:24
IanSmithers	No not a local branch, just local staged changes to a new custom branch on the remote for someone else to grab should they wish.	03:25
	← bitkiller left	03:25
SebanK	I had a disconnect. can someone have a look and tell me if someone replied to my question at x:08?	03:26
	← gusnan left	03:26
SebanK	*from x:08	03:26
	← enr left	03:26
	→ devth joined	03:28
	← Dougie187 left	03:28
	→ mandelbr0t joined	03:29
deryni	IanSmithers: Local changes to an existing branch pushed to a new branch name? 'git push $remote $branch:$newname' I think.	03:31
	SebanK: The organize one?	03:31
	← Davey left	03:31
SebanK	yes =)	03:32
	→ nbouscal joined	03:32
	← bklane left	03:33
IanSmithers	So git push origin master:newname then. That looks familiar. thanks deryni	03:33
deryni	I commented that I don't see why that needs to be a git tool at all (unless you want to organize them based on data stored in the repos).	03:33
	← alfplayer left	03:36
	→ michaelarestad joined	03:36
	← jon_r left	03:36
	← hellopat left	03:36
	← iateadonut left	03:37
	Arokh → Arokh[Off]	03:38
SebanK	deryni: thanks! they should be organized by task (i guess task fits, I'm not a native english speaker =) ). e.g. one group for writing latex documents, one group for developing software x, one group for help files/how tos and so on. It does not have to be a git tool, but I thought maybe there is some tool that can list repos hosted on a gitlab server. but any other suggestion is welcomed too, of course. thanks again	03:41
deryni	Repos are just directories. You could write a static html page with links to the gitlab entry points for the repos if you wanted to.	03:42
IanSmithers	deryni If there is an existing remote branch of the name I specify, my changes just be added to it as another commit right?	03:42
	→ xpirator joined	03:43
deryni	IanSmithers: Not if your changes aren't a fast-forward of that commit, no.	03:43
IanSmithers	A fast-forward is what exactly?	03:43
	My changes are new additions to that branch in this case.	03:44
milki	IanSmithers: !fast	03:44
gitinfo	IanSmithers: [!ff] A fast-forward merge occurs when you merge a commit which is a descendant of !HEAD. No new commit is created, instead the branch is simply moved forward. See http://sandofsky.com/images/fast_forward.pdf	03:44
IanSmithers	Yeah so in this case it's a fast-forward commit yes.	03:45
deryni	Why didn't you just checkout that branch for your work then?	03:45
	→ Davey joined	03:46
IanSmithers	Because I'm on master, and want to keep my work updated with what's on master, but, add new things I don't want to wreck the integrity of master with.	03:46
	Which is what branching is for right? Working on new potentially unstable or prototype work whilst not interfering with the main work.	03:46
milki	IanSmithers: learn to !rebase	03:46
gitinfo	IanSmithers: [!mergerebase] @!merge_or_rebase	03:46
	← preflex left	03:47
IanSmithers	Yeah of course I rebase.	03:47
milki	then its all good	03:47
	→ preflex_ joined	03:47
IanSmithers	I'm not talking about getting the work from master, I'm talking about pushing my work to a custom remote branch so it isn't part of the live build.	03:47
deryni	Right. My question was why not checkout that branch, then do the work, then push rather than do the work on master, push to a different name and then need to reset your local master back to upstream master.	03:48
	preflex_ → preflex	03:48
deryni	I'm assuming you reset after the push or I'm not sure how you could keep working on master.	03:48
IanSmithers	Well I don't need to reset my local master, whether I have the changes or not isn't of consequence. I just don't want those changes in master is all. So I just push them to a branch as I go.	03:50
	I mean 6 of 1 really it seems.	03:50
deryni	If you push to a branch and then keep working your next changes are still on top of those first changes.	03:51
SebanK	deryni: thanks a lot. I will look into this	03:52
IanSmithers	Ah OK deryni well then I will reset.	03:52
	It's OK.	03:52
	→ rchavik joined	03:55
	← guampa left	03:56
	← cha1tanya left	03:57
	← danecando left	03:58
	← bmac left	03:58
	→ AndChat\|157044 joined	03:59
	← xwl left	03:59
	← SebanK left	04:00
	← JosephSilber left	04:01
	→ DolpheenDream joined	04:02
	← the_cybersphinx left	04:03
	→ rgenito joined	04:04
rgenito	hello everyone! i just pulled the recent changes of a branch, and a developer committed a branch that we want to COMPLETELY remove	04:04
	→ bmac joined	04:05
	→ austin joined	04:05
rgenito	so i did "git revert HEAD^" to revert the commit	04:06
	and when i saw the commit message, i realized it was reverting the previous to last commit -.-	04:06
milki	probably	04:06
rgenito	doing ":q!" in vim didn't cancel the revert ;( ... now how do i remove that "revert"?	04:06
milki	rgenito: !fixup	04:06
gitinfo	rgenito: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	04:06
	← devth left	04:06
	← joeyh left	04:08
	← alvaro_o left	04:08
rgenito	oh neato...thanks milki:)	04:08
	so now i want to remove the revert, AND i want to remove the commit before that (from the developer) .... so, please help me out here... i'm all nervous since this isn't my territory =\| is this what i want? git reset --hard HEAD~2	04:08
	?	04:08
	btw, this link is awesome @_@	04:09
deryni	Assuming you have no local changes I believe that is what you would want. Yes.	04:11
	← IanSmithers left	04:12
	→ rasto joined	04:13
	→ CodeShark joined	04:13
	← DolpheenDream left	04:13
rgenito	deryni thanks...i'm still reading to make sure. but ya, i'm pretty set that's it...thanks:)	04:14
	← iliketurtles left	04:14
	→ jon_r joined	04:14
	→ iliketurtles joined	04:16
	→ breck7 joined	04:17
	← Guest91483 left	04:18
	← simesy left	04:18
	← motox left	04:19
	← parcs_ left	04:19
	→ Fissure joined	04:20
	← Noldorin left	04:20
	→ Orbitrix joined	04:20
	← Orbitrix left	04:20
	→ Orbitrix joined	04:21
	← ktosiek left	04:21
rgenito	deryni / milki so i did "git reset --hard HEAD" instead, and got the message "HEAD is now at 0894b78 Revert "broken login reverted to working version"" ... now when i do "git log" i still see the commit all the way at the top	04:21
	"git reset --hard HEAD" didn't remove that last commit like i expected....is there something else i'm looking for?	04:21
	or do i need to do something else (like git push) in order to remove the commit?	04:21
	← breck7 left	04:22
	→ Nicholas_Rishel_ joined	04:22
	→ enr joined	04:22
aspect	I normally merge from develop to beta - now I've just committed a single patch on beta that I want develop to share - how do I best do this without risk of pulling other commits from beta?	04:22
	→ ktosiek joined	04:22
aspect	is this a cherry-pick?	04:23
deryni	rgenito: You are already at HEAD. Resetting to HEAD isn't going to to anything.	04:24
	← Nicholas_Rishel left	04:24
	→ simesy joined	04:25
	→ trusktr joined	04:25
rgenito	ahh	04:25
	deryni, what am i looking for then?	04:26
	→ hoschi joined	04:26
rgenito	...am i looking to revert the revert AND the previous commit as well?	04:26
	i guess i could just do "git revert HEAD^" twice in a row... and this would revert the correct commit as well as the accidental revert :D	04:26
	← carlos-huang left	04:26
johndo	aspect: yes	04:26
	← enr left	04:27
AndChat\|157044	the cherry-pick from..to wont continue if there is conflict, even after resolved?	04:27
johndo	rgenito: but be aware that reset is only to fix local commits which hasn't been pushed to a public or shared repository	04:27
	AndChat\|157044 → xwl	04:28
rgenito	oh wait	04:29
	so, since i did "git reset HEAD", this should have removed my local commits, right?	04:29
	← daito left	04:29
deryni	git revert reverts the commit you name.	04:30
	git reset resets HEAD to the commit you name.	04:30
SamB	I don't think "git reset HEAD" does much?	04:30
deryni	git revert adds a new commit	04:30
	→ daito joined	04:30
deryni	git reset does not.	04:30
	You want, as you said in the first place, to reset to the commit two before head.	04:30
	You cannot revert and remove commits.	04:30
rgenito	earlier, i pulled the recent changes of a branch, and a developer committed a branch that we want to COMPLETELY remove	04:30
	so i did "git revert HEAD^" to revert the commit. and when i saw the commit message, i realized it was reverting the previous to last commit -.-	04:31
	do you have any guidance on how i can solve the problem i created?	04:31
johndo	rgenito: so if you haven't pushed that last commit you can "undo" it by git reset HEAD~	04:32
rgenito	the "git revert HEAD^" commit happened even when i exited the editor and left no commit message... which i didn't expect	04:32
	johndo thank you! @_@	04:32
johndo	rgenito: but you cannot undo a commit made by a different developer that way	04:32
deryni	You can if you force the push (and synchronize everyone around that change).	04:32
	rgenito: Do you see why that revert you tried was wrong?	04:33
rgenito	sweet, thanks johndo ... git reset HEAD~ is exactly what i wanted	04:33
	deryni yes, i should've done git revert HEAD	04:33
johndo	s/cannot/should not/ :)	04:33
	→ Tommy[D]_ joined	04:34
	← daito left	04:34
	← xwl left	04:35
	→ mutbuerger joined	04:35
	→ xwl joined	04:35
	→ h0bbit joined	04:35
deryni	johndo: Heh. Sure.	04:35
	← yacks left	04:36
	← Tommy[D] left	04:37
	→ dex_ joined	04:38
	← Katafalkas left	04:38
	→ Nikoli joined	04:39
	→ AndChat\|157044 joined	04:39
	← Nikoli_ left	04:39
	→ nilg joined	04:39
	← austin left	04:39
	→ AndChat-157044 joined	04:40
	→ m104 joined	04:40
	← xwl left	04:40
	← AndChat\|157044 left	04:43
	← tjbiddle left	04:44
	← tpollard left	04:45
	← BSaboia left	04:46
	→ Huevos joined	04:46
	→ dhruvasagar joined	04:47
	→ nrogers64 joined	04:48
	← Orbitrix left	04:49
nrogers64	Hey guys, I'm trying to come up with the simplest way to view how a single file was modified in a past commit. I came up with a command, but it doesn't seem very elegant: git diff hash123~1..hash123 -- [path]	04:50
	→ acharlieh joined	04:51
	← saintcajetan left	04:52
	← Huevos left	04:53
	← simesy left	04:53
deryni	git show hash -- [path]	04:53
	→ saintcajetan joined	04:54
	← NimeshNeema left	04:55
	← chriswk left	04:55
	→ beawesomeinstead joined	04:57
	← Nicholas_Rishel_ left	04:57
	→ chriswk joined	04:57
	→ jab416171 joined	04:58
	← heidar left	04:58
	← ziddey left	05:00
	→ daito joined	05:00
	← madewokherd left	05:01
	→ beautifulmind joined	05:02
	← trusktr left	05:02
	→ vipzrx joined	05:02
	→ Nicholas_Rishel joined	05:03
	← w0ng left	05:04
	← beautifulmind left	05:05
	→ shuaib joined	05:06
	→ simesy joined	05:07
	→ sqlnoob joined	05:07
	← sqlnoob left	05:08
	→ gmdaas joined	05:08
	→ sqlnoob joined	05:08
	← daito left	05:09
	← mandelbr0t left	05:09
	← joshsmith left	05:09
nrogers64	deryni: Thank you!	05:09
	→ beautifulmind joined	05:09
	← PaulCapestany left	05:10
	← vigs left	05:11
	← Nicholas_Rishel left	05:13
	← nrogers64 left	05:14
	→ Orbitrix joined	05:14
	← Orbitrix left	05:14
	→ Orbitrix joined	05:14
	→ Nikoli_ joined	05:18
	← Nikoli left	05:19
	→ trusktr joined	05:19
	→ glosoli joined	05:21
	→ cha1tanya joined	05:21
	→ enr joined	05:22
	→ maslowbeer joined	05:24
	→ daito joined	05:25
	← mribeirodantas left	05:26
	→ simesy_ joined	05:26
	← Fritz7 left	05:27
	→ Nikoli joined	05:27
	← enr left	05:27
	← vid401t left	05:27
	→ Cromulent joined	05:28
	→ xwl joined	05:28
	← Nikoli_ left	05:28
	← simesy left	05:28
	→ AndChat\|157044 joined	05:29
	← simesy_ left	05:29
	← xwl left	05:29
	→ tjbiddle joined	05:29
	← AndChat-157044 left	05:30
	→ bduc joined	05:33
	→ ThomasLocke joined	05:35
	← nicedice left	05:35
	← Cromulent left	05:35
	→ edwardly joined	05:36
	→ simesy joined	05:39
	← hyperair left	05:40
	← nbouscal left	05:40
	→ hahuang61 joined	05:41
	→ jayfk joined	05:50
	← dex_ left	05:50
	← akurilin left	05:51
	→ mishok13 joined	05:51
	→ kcj joined	05:52
	→ shruggar joined	05:53
	→ arvind_khadri joined	05:54
	→ rbento joined	05:55
	← iliketurtles left	05:55
	→ Nikoli_ joined	05:56
	→ stliu joined	05:56
	← jaimef left	05:57
	← Nikoli left	05:58
	← m104 left	05:58
	← fridim_ left	05:58
	→ iliketurtles joined	05:59
	← tjbiddle left	05:59
	→ bodom joined	05:59
	→ xwl joined	06:00
	← AndChat\|157044 left	06:00
	→ ewnd9 joined	06:00
	→ _________ joined	06:01
	← glosoli left	06:02
	→ glosoli joined	06:03
	→ Caritade joined	06:05
	→ papegaaij joined	06:05
	→ chovy joined	06:06
chovy	is there an equivalent of 'svn info' ?	06:06
luto	git info? :D	06:07
	what does svn info do?	06:07
chovy	git info isn't a command.	06:07
	→ GeertV joined	06:07
chovy	svn info tells me where the repo is	06:07
	← joki left	06:07
luto	like on which server?	06:07
chovy	yeah	06:07
luto	git can list remotes: git remote -v	06:08
	but there may be more than on server in that list :)	06:08
	depending on your local config	06:08
	← chriswk left	06:08
	← akitada left	06:09
	← Toro left	06:09
	← Sieben left	06:10
	← hackygolucky_ left	06:10
	← glosoli left	06:10
	→ pantsman joined	06:10
	← beawesomeinstead left	06:11
	← GameGamer43 left	06:12
	→ zOOd joined	06:12
	→ marthinal joined	06:13
	→ joki- joined	06:13
	→ Destos joined	06:13
	→ Cromulent joined	06:14
	← shruggar left	06:14
	→ rath joined	06:14
	← jab416171 left	06:14
	→ cbreak-work joined	06:14
	← shennyg left	06:15
	joki- → joki	06:16
	→ beawesomeinstead joined	06:16
	← hahuang61 left	06:17
	→ akitada joined	06:17
	→ johnlcox joined	06:17
	← zOOd left	06:17
	→ soee joined	06:18
	→ zOOd joined	06:18
	← scottrowe_ left	06:19
	← dhruvasagar left	06:19
	→ Sieben joined	06:19
	→ AWinterm_ joined	06:19
	→ shennyg joined	06:19
	← trusktr left	06:20
	← Destos left	06:20
	← crane left	06:22
	← zbcm left	06:23
	→ SergeyPenkin joined	06:24
	← mckendricks left	06:27
	→ rudak joined	06:28
	← jon_r left	06:29
	← scorphus left	06:29
	→ Sigma joined	06:29
	← ewnd9 left	06:29
	→ jaimef joined	06:29
	→ Marenz joined	06:30
	→ pduin joined	06:31
	← _________ left	06:31
	← pantsman left	06:31
	→ fRAiLtY- joined	06:32
	→ jnewt joined	06:32
	← M4renz left	06:32
	→ breck7 joined	06:33
	→ Liska joined	06:33
	→ Amandil joined	06:34
	← Liska left	06:34
	→ Guest___ joined	06:34
jnewt	stashed a few changes i'm thinking of making, continued working on branch. popped stash later, got conflict. did git reset -- file now i have the <<<<<updated upstream and ==== littered trhoughout the file. how do i get back to the file in the form that i stashed it?	06:35
	← tallest_red left	06:35
	→ tallest_red joined	06:35
deryni	What does git status say about the file?	06:36
jnewt	modified, not staged for commit	06:37
osse	jnewt: git checkout refs/stash -- file	06:37
	but the conflicts were likely for a good reason, so be careful	06:38
deryni	Yeah. I would probably have suggested 'stash branch' or something.	06:38
	→ train_or joined	06:39
	← mishok13 left	06:39
jnewt	deryni, that would have been the way to go.	06:39
	← huoxito left	06:40
deryni	The stash entry should still be there. pop doesn't remove the entry if there's a conflict.	06:40
jnewt	deryni: yup, got it.	06:40
	→ psoo joined	06:42
	← breck7 left	06:42
	→ rob_w joined	06:42
	→ noyb joined	06:43
	→ v0apihgt34 joined	06:44
	← harish_ left	06:44
	← Cromulent left	06:45
	→ v1apihgt34 joined	06:45
	← v1apihgt34 left	06:46
	← arvind_khadri left	06:46
	← iliketurtles left	06:47
	→ arvind_khadri joined	06:47
	← arvind_khadri left	06:48
	→ enr joined	06:48
	→ arvind_khadri joined	06:48
	→ ewnd9 joined	06:50
	→ dhruvasagar joined	06:51
	← homer91 left	06:51
	← train_or left	06:51
	← nilg left	06:51
	← Jeaye left	06:51
	→ frgtn joined	06:53
	→ vince_prignano joined	06:54
	→ ec joined	06:54
	→ heidar joined	06:55
	→ threesome joined	06:56
	← jayfk left	06:56
	→ dytrivedi joined	06:57
	→ iliketurtles joined	06:58
	← frgtn left	06:58
	← Guest___ left	06:59
	← vince_prignano left	06:59
	→ dimm joined	07:00
	← xwl left	07:00
dimm	hello	07:00
gitinfo	dimm: 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.	07:00
	→ xwl joined	07:00
	→ vince_prignano joined	07:00
	→ Gu_______ joined	07:02
dimm	what can i do if i need work with cyrillic symbols in folder name?	07:02
	→ mishok13 joined	07:02
	← normanrichards left	07:02
	← michaelarestad left	07:02
	← netiul left	07:03
	→ NimeshNeema joined	07:04
	→ jayfk joined	07:04
tkil	dimm -- filenames should be "just bytes" to git (other than "/" and "\0").	07:04
	are you running into difficulty?	07:04
	→ sidus joined	07:04
	→ michaelarestad joined	07:05
	← michaelarestad left	07:05
	→ jacobat joined	07:06
	→ netiul joined	07:06
dimm	tkil: my project has some amount of folders with cyrillic symbols, they are pulled fine. But running pre-commit hook has trouble. I see that digits is a bytes from folder name, but i don't know how i can solve this =/ http://paste.org.ru/?dbb9y0	07:08
	← bmac left	07:08
milki	dimm: post your pre-commit hook?	07:09
tkil	and check for LANG= and similar nasties...	07:09
	← zOOd left	07:10
	→ koda joined	07:10
	← psoo left	07:10
	→ psoo joined	07:10
	→ gua_ould joined	07:11
	→ zOOd joined	07:11
dimm	pre-commit - http://paste.org.ru/?mvhizg setcommithash.pl - http://paste.org.ru/?l10iit	07:11
	tkil: is $LANG working when git client is on windows (and git server is on windows)	07:11
	tkil: ?	07:12
tkil	i was afraid you'd say that one end or the other is on windows...	07:12
	dimm, i don't know. windows has the issue that the filesystem is case-preserving but not case-sensitive, and that can cause issues.	07:12
	→ harobed_ joined	07:12
tkil	windows FS also tends to use code pages, which can make things ugly (vs "just bytes" utf8). but i've never actually worked in such a realm, so i can't say for sure.	07:13
	→ lb1a joined	07:13
milki	also, windows uses utf16 rather than utf8	07:14
tkil	$search = 'C.o.m.m.i.t.....R.e.v.i.s.i.o.n.:.'; // speaking of utf16...	07:14
	tkil gets a bad case of the heebie-jeebies	07:14
	→ zoresvit joined	07:14
	← AWinterm_ left	07:15
tkil	dimm -- anyway, i don't see those error strings in the sample scripts you've posted.	07:15
	so i suspect we're still missing a step.	07:15
	regardless, what you'll want to do is test the precommit hook in a more controlled setting, and possibly also find a way to dump what environment it's being run within ($ENV{LANG} at the least, probably also pwd and friends.)	07:16
	← beautifulmind left	07:16
	← enr left	07:19
	→ maxmanders joined	07:20
	← bdavenport left	07:20
	→ kewah joined	07:21
	→ enr joined	07:21
	→ hahuang61 joined	07:22
	← iliketurtles left	07:22
	← enr left	07:23
	→ iliketurtles joined	07:24
	→ enr joined	07:24
	→ Balliad joined	07:24
	← arvind_khadri left	07:24
	→ arvind_khadri joined	07:26
	→ SuperDMP joined	07:27
	← vince_prignano left	07:30
	Arokh[Off] → Arokh	07:32
	→ zero7 joined	07:33
	← Sigma left	07:35
	← Gu_______ left	07:35
	→ cilly joined	07:35
	→ michaelarestad joined	07:35
	← billy_ran_away left	07:36
	→ Plummer joined	07:37
	→ billy_ran_away joined	07:37
	→ Asenar joined	07:38
	← cilly left	07:38
	→ arand joined	07:38
	← simesy left	07:38
	← daito left	07:38
	→ daito joined	07:39
	→ Sigma joined	07:39
	→ dfanjul joined	07:40
	← billy_ran_away left	07:43
	→ _iron joined	07:43
	← daito left	07:44
	→ billy_ran_away joined	07:44
	→ Anders_J joined	07:45
	← h0bbit left	07:45
	← michaelarestad left	07:45
	← Sieben left	07:45
	← thiago left	07:46
	→ harish_ joined	07:46
	→ h0bbit joined	07:47
	← iliketurtles left	07:48
	→ valgrind joined	07:48
	← rgenito left	07:48
	← noyb left	07:49
	← mutbuerger left	07:50
	→ mklappstuhl joined	07:50
	← GT4066 left	07:50
	→ mutbuerger joined	07:50
	← mutbuerger left	07:53
	→ mutbuerger joined	07:53
	← ferdev left	07:53
	← mutbuerger left	07:54
	→ mutbuerger joined	07:54
	← dytrivedi left	07:54
	← NimeshNeema left	07:56
	→ p1ng joined	07:57
	→ joooooo joined	07:58
	→ LimeBlast joined	07:58
	← xwl left	08:01
	← Sigma left	08:01
	→ xwl joined	08:01
	→ daito joined	08:01
	→ Sigma joined	08:01
	← Sigma left	08:02
	→ achadwick joined	08:03
	→ ferdev joined	08:05
	← chuckf left	08:05
	→ gebi joined	08:05
	→ konadr joined	08:05
	→ chuckf joined	08:06
	→ hackygolucky_ joined	08:06
konadr	morning all, is gitifier a commonly used tool? I'm just wondering how safe it is	08:06
	→ chriswk joined	08:06
	→ HeN joined	08:06
	→ Toro joined	08:06
	← Goplat left	08:06
	→ multi_io joined	08:07
	→ scalability-junk joined	08:07
	← ferdev left	08:07
	→ OliverJAsh joined	08:07
selckin	looks harmless why are you worried	08:08
jast	never heard of it	08:08
	→ xerxas joined	08:08
	→ PeterBooker joined	08:08
	→ crane_work joined	08:08
	→ tatsuya_o joined	08:08
	← jayfk left	08:08
	← Davey left	08:08
jast	sounds inefficient, though	08:09
	I mean, automatically fetching full updates for all repos every so many minutes?	08:09
selckin	well hopefull its smart to do incremental	08:09
jast	suppose one of the updates contains a few hundred megabytes worth of data...	08:09
	→ ferdev joined	08:09
	← boombatower left	08:09
jast	bit much to fetch all of that for a little popup :)	08:09
selckin	seems rather useless, but if it floats your boat	08:10
tkil	jast -- should be easy enough to fetch just the remote refs, no?	08:10
	tkil skims harder.	08:10
jast	not if you want the actual commit messages	08:10
	the refs are just commit IDs	08:10
	→ Naeblis joined	08:10
	→ GameGamer43 joined	08:10
	← SuperDMP left	08:10
jast	the protocol doesn't support fetching the history without the actual files	08:10
tkil	hm... one can get just those objects, too, tho, no?	08:10
	→ michaelarestad joined	08:11
	→ SuperDMP joined	08:11
	→ jab416171 joined	08:11
tkil	and if you're pinging every 60s, it'd be rare that hundreds of MB of data would show up magically, i'd think.	08:11
	→ phluks joined	08:11
tkil	i'm more irked that growl went payware with one of the recent updates. (not that i use it much, but now i need to set aside some time to uninstall the pos, because it's now asking for money.	08:12
	→ Sigma joined	08:12
	← ecube left	08:13
jast	if you're pinging every 60s and you're monitoring 50 repositories, you'll probably be busy fetching talking to git servers nonstop	08:13
	→ w0ng joined	08:13
	← kadoban left	08:13
	→ _rgn joined	08:13
jast	(at work I use ~150 repositories)	08:13
	← w0ng left	08:14
	→ w0ng joined	08:14
	→ jkremser joined	08:15
	← jkremser left	08:15
	→ jkremser joined	08:15
	← michaelarestad left	08:15
konadr	it's quite handy as I dont have email alerts for the repo yet though. Only reason I'm worried is that it's private code not a github it's attached too	08:16
	← SuperDMP left	08:16
konadr	is there any alternatives	08:16
	→ scottrowe_ joined	08:16
	→ noname001 joined	08:16
konadr	s/is/are/needcoffee	08:16
	→ Sonderblade joined	08:17
	→ nicoulaj joined	08:18
	→ AndChat\|157044 joined	08:19
	← xwl left	08:19
	← dhruvasagar left	08:20
	← arand left	08:20
konadr	oh also I havent installed growl, just the standard system notifications	08:20
	← p1ng left	08:20
	← ec left	08:22
	← heidar left	08:22
	→ p1ng joined	08:22
	← p1ng left	08:22
	← OliverJAsh left	08:23
	← _rgn left	08:23
	→ howlymowly joined	08:23
	← zero7 left	08:24
	← valgrind left	08:24
	→ rurufufuss joined	08:25
cbreak-work	usually, polling is dumb.	08:25
	← hackygolucky_ left	08:25
	← Toro left	08:25
tkil	cbreak -- true.	08:25
	← HeN left	08:25
	→ valgrind joined	08:25
	→ HeN joined	08:26
	← shennyg left	08:26
	← scalability-junk left	08:26
	→ diegoviola joined	08:27
	→ Guest___ joined	08:27
	→ shennyg joined	08:27
	→ guns joined	08:27
diegoviola	hi	08:27
tkil	cbreak -- but there's also "i don't have admin rights to the far end, and never will, and pinging it every 300s or 60s or whatever is the best i can do."	08:28
sh4rm4	what's a good strategy for dealing with this situation: you add 2 features, one of which depends on the other, but you should do it in separate branches, so you can make clean pull requests	08:28
	→ Gooder`` joined	08:29
cbreak-work	tkil: nah	08:29
	you could just ask when ever you need to know	08:29
tkil	cbreak -- yeah, but what if "when i need to know" is "when a collaborator checks something in"?	08:30
cbreak-work	tkil: spyware on their machines	08:30
	that's the only way to be sure	08:30
sh4rm4	if you base branch2 on branch1, your pull request for branch2 will include stuff from branch1	08:30
tkil	cbreak -- http://suptg.thisisnotatrueending.com/archive/18205767/images/1330912219544.gif	08:31
	→ jayfk joined	08:31
	← Gooder` left	08:31
	→ trusktr joined	08:31
	tkil goes back to trying to figure out where an update is getting dropped...	08:32
	← Guest___ left	08:32
konadr	So I guess I have to wait until we setup e-mail alerts then right? Hmm	08:32
	→ alkino joined	08:33
	← arvind_khadri left	08:33
	→ arvind_khadri joined	08:33
	← jefflyne left	08:33
	← harish_ left	08:34
	→ ecube joined	08:34
tkil	konadr -- if the gitifier thing works fine, then just use it.	08:35
	→ xwl joined	08:35
	← xwl left	08:35
tkil	seems harmless, and the code is on github if you're paranoid (or so it seems)	08:35
	on the other hand, if your machine is often offline, or if you have tons of remote repos, or if your repos are prone to getting hundreds of MB dumped in them ... you might occasionally get caught out.	08:36
	tradeoff as you see fit.	08:36
	← v0apihgt34 left	08:37
	← cizra left	08:37
	→ marhaban joined	08:37
	→ v0apihgt37 joined	08:37
konadr	thanks tkil, i've just had a quick look at the code, but nothing springs out as immediately terrible, i will see how it goes	08:37
	← AndChat\|157044 left	08:37
tkil	as much as cbreak and the rest of us are coming up with doomsday scenarios, even naive "git fetch" would be fine on most sane repos every 60s or so.	08:38
	← daito left	08:38
tkil	perfect vs. good, etc.	08:38
	→ Guest___ joined	08:38
	→ daito joined	08:39
konadr	:) thanks	08:39
	← bodom left	08:40
tkil	having said that, cbreak's assertion that "notifications are better than polling" is true 99% of the time, and you should do your best to evolve your workplace to that idea.	08:41
	ideal even.	08:41
	→ egh34wz746w joined	08:41
	← v0apihgt37 left	08:41
konadr	ya we hope to have a mail server setup soon :) that will hopefully solve our issues	08:42
cbreak-work	you don't have to use mail	08:42
	you can do anything you want in a hook	08:42
	I have mine post messages to Jira	08:42
konadr	ohh shiny	08:43
	on that note, is there any dashboard tool that just displays all the commits going on?	08:43
	← daito left	08:43
	← mutbuerger left	08:44
	← Orbitrix left	08:45
cbreak-work	dashboard?	08:46
	→ Piggy_ joined	08:46
	→ hackygolucky_ joined	08:46
	← Guest___ left	08:47
	← ewnd9 left	08:47
konadr	just a handy web frontend that can display commits, like a twittery kind of thing really, just to give others visibility of commits for display on large screens	08:47
	→ jakie joined	08:47
	→ Edgan joined	08:48
	→ ewnd9 joined	08:48
	→ p1ng joined	08:48
	← boblee left	08:49
	← FreezingCold left	08:49
	→ arand joined	08:49
jakie	hi All during a git pull I got 'CONFLICT (content): Merge conflict' on one of my files and automatic merge failed. The merged content is difficult to correct and I wanted to see my HEAD file that I committed. How do I do that?	08:50
	→ frgtn joined	08:50
	→ aChatir joined	08:50
	→ harish_ joined	08:51
	← loteriety left	08:51
	→ boblee joined	08:51
	→ scalability-junk joined	08:51
jakie	svn kept 2or3 revisions of the file to help with the merge but I don't see those kind of files in git	08:52
	I would really appretiate some help	08:52
	← maslowbeer left	08:53
tkil	jakie -- git show HEAD:path/to/file ?	08:54
	→ nkuttler joined	08:55
jakie	tkil, let me try that	08:55
	→ dhruvasagar joined	08:55
cbreak-work	jakie: use a merge tool, like git mergetool	08:55
canton7	jakie, there's some archaic syntax... base: `git show :1:file`, ours: `git show :2:file`, theirs: `git show :3:file`	08:55
cbreak-work	it will offer you usually a three way view	08:55
canton7	there's also man git mergetool	08:55
gitinfo	the git-mergetool manpage is available at http://jk.gs/git-mergetool.html	08:55
canton7	which opens a graphical 3-way merge tool of your choice	08:55
	jakie, there's also 'git checkout --ours/--theirs file' to replace the merged file with one from either side of the merge	08:57
	→ sgambino joined	08:57
	→ eijk_ joined	08:58
	→ Element9 joined	08:59
cbreak-work	you should not use that to look at stuff, only to do some kind of one side resolution	09:00
	← valgrind left	09:00
jakie	canton7, git checkout --ours was exactly what I wanted thank your so much. somehow I am not confortable with the 'git mergetool' gui.	09:00
	Thanks all	09:01
	← w0ng left	09:01
	→ Gooder``` joined	09:02
	← St_Marx left	09:02
	← Cassiel left	09:03
	→ Guest___ joined	09:03
	← gmdaas left	09:03
	→ mikecmpbll joined	09:04
	→ gmdaas joined	09:04
	← Gooder`` left	09:05
	← jnewt left	09:05
	→ jnewt joined	09:06
	← jargon left	09:06
	→ St_Marx joined	09:06
cbreak-work	jakie: the gui is not from git	09:07
	jakie: you can chose which external program you use	09:07
sh4rm4	is there a way to merge or cherrypick a commit without whitespace changes ?	09:07
cbreak-work	sh4rm4: you can manually remove the whitespace changes again	09:08
sh4rm4	cbreak, how ?	09:08
	← weiyang left	09:08
cbreak-work	sh4rm4: after the cherry-pick, git checkout -p HEAD~ && git commit	09:08
	← Guest___ left	09:08
	→ ij joined	09:09
	→ yacks joined	09:10
sh4rm4	cbreak, that puts me into git add --patch mode	09:10
	→ rbelouin joined	09:11
tkil	sh4rm4 -- well, the git rule is to apply deltas perfectly (without complaint) or not at all.	09:11
	← nkuttler left	09:11
sh4rm4	it shows entire hunks to be merged	09:11
tkil	if an incoming patch / branch has whitespace damage, you are best off fixing that WS damage in that branch.	09:11
	so that you can do a clean merge.	09:11
	→ michaelarestad joined	09:11
sh4rm4	i want to remove all whitespace changes	09:11
	not damage	09:12
	because its a 5000 line commit, of which 4900 are whitespace noise	09:12
	→ valgrind joined	09:12
tkil	sh4rm4 -- uhg. take your dev out back and slap them around a bit...	09:12
	having said that, some games with "diff -b" and raw "patch" (not git apply), might be in order.	09:13
cbreak-work	sh4rm4: you have to use that mode to remove the whitespace changes again	09:13
sh4rm4	actually what i want to merge is exactly what gitk shows when i click "hide whitespace changes"	09:13
tkil	cbreak -- handling chunks of 30 lines with added \r on the end, not very helpful.	09:13
cbreak-work	tkil: it's quite easy	09:13
	→ TomyLobo joined	09:13
	→ jargon joined	09:13
cbreak-work	answer yes if it's a whitespace change, answer no if it's a change with content	09:13
tkil	cbreak -- the issue is, i guarantee that it's mixed.	09:14
cbreak-work	:/	09:14
	committer been dumb?	09:14
sh4rm4	yes, its mixed	09:14
tkil	so you have 50 lines with the 25th line having a valid change.	09:14
	sh4rm4 -- again, step outside the git box, or play games on a throw-away branch.	09:14
	take whatever mode gives you the reduced patch ... then force apply that patch.	09:14
osse	sh4rm4: git show ... \| git stripspace \| git apply	09:15
	or so	09:15
	← GeertV left	09:15
tkil	cbreak -- fwiw, i've been told to look into -i / -p many times, and i've always found it useless, since it's inevitably because i was lazy and mixed two different changes within 3 lines of each otehr.	09:15
	other.	09:15
	and that's on top of the insult of making me leave my one true editor for the slums of a mere terminal window. laugh	09:15
osse	ehh, never mind. apparently stripspace is for commit messages	09:15
	← michaelarestad left	09:16
	← jnewt left	09:16
cbreak-work	tkil: I found it to be the best thing in git	09:16
	→ jnewt joined	09:16
	← tirengarfio left	09:16
osse	tkil: both true editord have plugins for that :)	09:16
tkil	cbreak -- i guess i find it remarkable that all your changes are more than 3 lines apart?	09:16
	→ Guest___ joined	09:16
tkil	(or whatever the context limit is for git diff)	09:17
	→ tirengarfio joined	09:17
sh4rm4	i would be happy enough if gitk could export the whitespace stripped verrsion as a patch	09:17
	← ij left	09:17
cbreak-work	tkil: nah. It's quite easy	09:17
	→ beautifulmind joined	09:17
	← chovy left	09:17
cbreak-work	tkil: and for rare cases there's e	09:17
osse	sh4rm4: idea, instead of cherrypicking, take the diff against its parent and use -b	09:18
tkil	sh4rm4 -- again, arrange to get copies of the affected files in the two different states, then do a "diff -w" or whatever the "ignore whitespace" is, then apply that by hook or crook.	09:18
	← beautifulmind left	09:18
tkil	sh4rm4 -- ideally, you'll do that as a commit in the offending branch, so the merge is still clean and shows proper attribution.	09:18
	→ abrkn\ joined	09:18
tkil	cbreak -- when i'm less annoyed at my embedded hardware (8ms, really, guys?), i'll try to play with it.	09:19
sh4rm4	tkil, hmm, so i basically needed to undo the commit but keep the changes	09:19
	→ paul424 joined	09:19
sh4rm4	so i can use git diff	09:19
tkil	osse -- hm, i've played with dvc (?) and git.el, tried magit once but didn't get it, etc.	09:19
	sh4rm4 -- no...	09:19
	sh4rm4 -- clone offending branch, add a commit that fixes just whitespace, then you can switch back to head and do the nice merge with fixed branch head.	09:20
sh4rm4	and how would i do the whitespace fixing commit ?	09:20
tkil	yes, history now has "this dev was stoopid and took a nap on their space bar" commit, but who care?	09:20
	who cares, even.	09:20
	← rbelouin left	09:20
	→ quackgyver joined	09:21
tkil	sh4rm4 -- depending on the whitespace damage, it can be as simple as cloning the offending branch, running a pretty printer on the offending files, and then committing that change.	09:21
	← abrkn left	09:21
	← quackgyver left	09:21
	→ quackgyver joined	09:21
sh4rm4	lol that will add even more noise	09:21
tkil	if it's mixing \r\n with \n, then use whatever tool you like. (M-x visit-file-literally)	09:21
	sh4rm4 -- better one isolated and explained bit of noise.	09:21
sh4rm4	too much effort	09:21
	→ tkrugg joined	09:21
quackgyver	Hi, I'm getting the error "you need to resolve your current index first" for changes I haven't made.	09:22
tkil	sh4rm4 -- or, you know, just pitch git out the window. "it compiles, ship it!"	09:22
quackgyver	Can I just ignore them?	09:22
canton7	quackgyver, what are you doing?	09:22
quackgyver	I don't even know what happened.	09:22
	canton7: I'm trying to switch branches	09:22
canton7	quackgyver, you're in the middle of a conflicted merge, I suspect	09:22
quackgyver	it's telling me I've made changes to files that are way outside the scope of where I work.	09:22
canton7	the output of 'git status' will confirm/deny that	09:22
quackgyver	canton7: Yeah, exactly, but I haven't touched the files. :/	09:22
canton7	did you kick off a merge recently?	09:22
quackgyver	What does that mean?	09:23
	I haven't merged anything, nah.	09:23
canton7	did you type 'git merge' or 'git pull' recently?	09:23
quackgyver	Yeah, I pulled from the main dev branch	09:23
	but haven't touched these files	09:23
osse	tkil: hmm. then I don't know. When you use -p git can split the changes up as long as there is at least one untouched line between each hunk. For even more fine-grained stuff you need to edit the hunk manually	09:23
canton7	quackgyver, right, so you did merge. Have you looked at the conflicts?	09:24
quackgyver	canton7: I didn't know a pull was considered a merge. I specifically use the "merge" command, so I thought that's what you meant.	09:24
canton7	quackgyver, a pull is just a fetch followed by a merge	09:24
quackgyver	oh ok	09:24
	→ glosoli joined	09:24
quackgyver	The conflict is just telling me that a couple of files have the conflict "delete/modify"	09:24
	← yacks left	09:25
quackgyver	and that theyre deleted in "head" and modified in the main branch	09:25
	→ pen joined	09:25
quackgyver	i dont understand what this means.	09:25
canton7	so one side deleted the file, and the other side modified it. have you accidentally deleted the file(s) in question?	09:25
tkil	osse -- yes, that's the crux of my "at least three lines" comment. i was finding that i was often adding debugging prints right next to the line that was actually doing work, so...	09:25
quackgyver	no no, I'm 200% certain i haven't touched any of these files. there's just no mistaking it	09:25
	that's what's confusing me. im super careful about this stuff	09:25
	← freestyl3r left	09:25
quackgyver	so i dont understand how this could happen :(	09:26
tkil	quackgyver -- pull != fetch...	09:26
canton7	quackgyver, what's the output of 'git log -p -- path/to/conflicted/file'?	09:26
	→ daito joined	09:27
quackgyver	canton7: its just printing the entire contents of that file	09:28
	as committed by someone other than me	09:28
	many months ago	09:28
	no wait, a couple of days ago	09:28
canton7	at the beginning of each line, is there a '+' or a '-'?	09:28
quackgyver	a -	09:28
	and one or two +++	09:28
	and a @@	09:28
	oh, thats not part of the code, i think	09:29
	yeah minuses	09:29
canton7	only minuses?	09:29
	← tirengarfio left	09:29
	→ tirengarfio joined	09:30
	→ enr^ joined	09:30
canton7	(if so, that's the log of the deletion)	09:30
	← TheJH left	09:31
	← tirengarfio left	09:31
quackgyver	canton7: You mean something's been deleted?	09:32
canton7	it would probably be useful if you pastied the output of 'git log --graph -p --all -- path/to/conflicted file', or as much of it as you're allowed to	09:32
quackgyver	and its conflicting because the file exists locally?	09:32
	→ Cromulent\|2 joined	09:32
canton7	quackgyver, yes, one side of the merge modified the file, the other side deleted it	09:32
	← jnewt left	09:32
quackgyver	canton7: I haven't modified them though, that's what's so messed up	09:32
canton7	quackgyver, that's why I want to see the log	09:32
quackgyver	can i make a pull that just overrides my changes?	09:32
	or conflicts?	09:32
	thats all i want	09:32
	→ TheJH joined	09:32
canton7	you can 'git checkout --theirs path/to/file' to checkout their side	09:32
	(of course, if their side was the deletion, use 'git rm' instead)	09:33
	→ tirengarfio_ joined	09:33
	→ tirengarfio joined	09:33
canton7	hrm, "git log --graph --name-status --all --online -- path/to/conflicted/file" would be better	09:33
	s/online/oneline	09:33
quackgyver	Ok something is really wrong.	09:34
canton7	add --decorate	09:34
quackgyver	I removed the three files i was having issues with, did git status agian, and now instead of those three files its giving me a huge list of modifications, added files and removed files	09:35
	and i still cant do a pull	09:35
	even though i did git rm <file>	09:35
	← Cromulent\|2 left	09:35
quackgyver	is there a way to just pull from origin with one single command	09:35
	and have it just override everything	09:35
	← tirengarfio_ left	09:35
	← tirengarfio left	09:35
canton7	quackgyver, you're still in the middle of a merge, don't forget	09:35
quackgyver	whatever it may be	09:35
	→ Cromulent\|2 joined	09:36
canton7	presumably you want to complete the merge without throwing away all of your local commits leading up to that point?	09:36
quackgyver	well, my local commits are in different branches	09:36
	im okay with overriding this one	09:36
	← marhaban left	09:36
quackgyver	i just want to get the hell out of it :(	09:36
canton7	git merge --abort to abort the merge	09:36
	the git reset --hard <remote branch> to make it the same as the remote branch	09:37
	→ tirengarfio joined	09:37
canton7	make damn sure you have the right branch checked out	09:37
	→ _BJFreeman joined	09:37
quackgyver	is origin a common term in git?	09:37
jacobat	yes	09:37
	→ Jenser joined	09:37
	→ WhoKnew joined	09:37
	→ ij joined	09:37
jacobat	it's the default remote repository	09:37
quackgyver	ok so when i do this hard reset, should i do origin/branch or just branch	09:37
	→ GeertV joined	09:37
	← enr^ left	09:37
	← guns left	09:37
	← Jenser left	09:38
tkil	quackgyver -- also, don't forget that you can reset your head (as hard as you like), then create a branch off your head, and try the merge in the branch.	09:38
	→ lpapp joined	09:38
lpapp	hi, remote: warning: only found copies from modified paths due to too many files.	09:38
	_BJFreeman → BJfreeman	09:38
lpapp	remote: warning: you may want to set your diff.renamelimit variable to at least 4468 and retry the command.	09:38
	should I care?	09:38
quackgyver	tkil: thanks but im not proficient enough to know how to do that	09:38
tkil	that's a lot less stressful than worrying about corrupting your main head.	09:38
lpapp	should I set that stuff, and retry?	09:38
	I have too many files apparently that I would like to push.	09:38
	it is intentional though.	09:38
	→ dwmw2_gone joined	09:38
	← paul424 left	09:39
	← OOPMan left	09:39
	→ OliverJAsh joined	09:39
OliverJAsh	i have a merge conflict, and i'd like to see where exactly changes have been made on the branch i'm merging in that are causing it to conflict	09:39
	locally i have moved the lines of code to another file, in the other branch the lines of code have been modified	09:40
canton7	quackgyver, if you're merging in the 'master' branch on the remote called 'origin', you can reset to 'origin/master'	09:40
	to be safe, 'git fetch' first	09:40
	→ hyperair joined	09:40
	→ shwouchk joined	09:40
shwouchk	Hello	09:40
	→ m0viefreak joined	09:41
shwouchk	When there are conflicts in git merge, how do I take just the other/my side of a file?	09:41
canton7	shwouchk, git checkout --ours/--theirs path/to/file	09:41
shwouchk	canton7: thanks	09:42
	→ elixir joined	09:42
canton7	I'm saying that command a lot today... must be one of those days	09:42
	→ michaelarestad joined	09:42
quackgyver	canton7: I just did git reset --hard origin/branchname	09:42
	to avoid confusion, should i do something at this point?	09:43
	iuo?	09:43
canton7	iuo?	09:43
	so the current branch is now the same as origin/branchname	09:43
	→ Sieben joined	09:43
	→ X3NQ joined	09:43
	← mklappstuhl left	09:44
	→ nilg joined	09:45
	→ beautifulmind joined	09:46
	← michaelarestad left	09:47
lpapp	any ideas?	09:47
	→ carlos-huang joined	09:48
	→ OOPMan joined	09:48
	← nilg left	09:49
	lpapp will use git config diff.renames 0	09:49
quackgyver	canton7: In your opinion. :)	09:49
	Also, I don't know if it's the same.	09:49
	← hyperair left	09:49
quackgyver	The problem is that I was forced into GIT without proper training or the ability to quickly comprehend the context of what I'm doing	09:49
	→ nilg joined	09:49
quackgyver	I have no idea how to "visualize" what is going on	09:49
	← whaley left	09:50
quackgyver	So I'm just fumbling in the dark	09:50
	following instructions to the point, pretty much.	09:50
canton7	quackgyver, 'gitk --all'	09:50
tkil	quackgyver -- nice belts-and-suspenders approach: do a deep recursive copy of your entire repo before trying something you aren't comfortable with.	09:50
uwjesq	quackgyver: Maybe read the wikipedia article?	09:50
canton7	!book, !bottomup	09:50
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	09:50
	'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf	09:50
	← lpapp left	09:51
canton7	but yeah, get very comfortable with the output of gitk	09:51
	that's your repo visualisation	09:51
quackgyver	canton7: hm, it didnt recognize gitk :o	09:51
tkil	quackgyver -- that is, if your repo lives in my_crazy_git_repo, then you can do: cd .. ; cp -a my_crazy_git_repo backup_of_my_crazy_git_repo	09:51
canton7	what OS?	09:51
quackgyver	tkil: What do you mean? What does that entail?	09:51
tkil	then you can go into the backup and do whatever you like.	09:51
quackgyver	tkil: Oh, thanks for the clarification	09:51
	That is really useful	09:51
tkil	the original is untouched.	09:51
	→ dytrivedi joined	09:52
tkil	git provides faster and easier ways to do almost all that, but if one doesn't grok / trust git, that isn't useful.	09:52
	equiv on windows would be ... copy /s main_repo backup_of_repo	09:52
	i think, it's been a while.	09:52
	copy /s /y prolly	09:53
	dunno.	09:53
quackgyver	uwjesq: "Maybe read the wikipedia article." Cool, here's one for you: http://en.wikipedia.org/wiki/Dissocial_personality_disorder#Dissocial_personality_disorder	09:53
	Especially regarding point 1.	09:53
	canton7: Is that considered the best possible book you could pick up on the subject?	09:53
	I've been reading stuff online mostly	09:53
	but it's not coming to me fast enough.	09:53
	You think this is better?	09:53
	→ mklappstuhl joined	09:53
tkil	quackgyver -- please, relax. from personal experience, i can appreciate that it's not obvious / intuitive for all mindsets.	09:53
	quackgyver -- if others are curt, just disregard and move on.	09:54
	← tkrugg left	09:54
	→ babilen joined	09:54
canton7	quackgyver, it's generally regarded as the best resource	09:55
tkil	quackgyver -- from our POV, if you're thrust into a role w/o training, is that the fault of the software, the fault of the support infrastructure for that [free!] software, or a failure on the part of your management?	09:55
	uwjesq breathes out.	09:55
	→ jon_r joined	09:55
tkil	quackgyver -- finally, consider playing around with a "throw-away" repo, so you can learn w/o worrying about screwing with important content.	09:55
canton7	"git from the bottom up" is a lot shorter, but covers the basic internals, which will help you a lot	09:55
tkil	and yes, the free online books will help.	09:55
	← dwmw2_gone left	09:55
	→ rita40in joined	09:56
tkil	but you can't learn while being worried about protecting the crown jewels. if that's an issue, stop for 4 or 8 hours and play around with some throwaway content.	09:56
	→ shruggar joined	09:56
uwjesq	tkil: Hey, reading is not spoon feeding. insult insult another insult :-D	09:56
	← rita40in left	09:56
tkil	uwjesq -- NO, YOU'RE WRONG!!!!!!	09:57
uwjesq	tkil: :-)	09:57
tkil	uwjesq -- prost. :)	09:57
	→ dwmw2_gone joined	09:57
	← frgtn left	09:57
	→ the_cybersphinx joined	09:57
	← vipzrx left	09:57
	→ BitPuffin joined	09:59
quackgyver	tkil: I'm not blaming git nor you guys. On the contrary, I appreciate your help and the fact that #git seems more constructive than most freenode chans I've been to, but there's always a small number of people who seem to use opportunities like these to drop backhanded suggestions as if to insinuate that what you're dealing with should be simple enough that	09:59
	you should be able to pick it up from a commonly used reference.	09:59
	If calling people out on this is against the rules then I apologize, but if not then I see nothing wrong.	09:59
	But that's an aside, and I'm relaxed. :)	09:59
	← dhruvasagar left	10:00
tkil	fair enough.	10:00
uwjesq	quackgyver: Sorry I made you consider reading something.	10:00
quackgyver	See what I mean?	10:00
	People like these are just toxic.	10:00
	Anyway, ignoring him/her.	10:00
tkil	so, if you're still ucomfortable with git, please do try to take a few minutes / few hours and just play around.	10:00
	if there's not time for that, there's not time for doing it right in the first place, and the best you can do is duck and cover.	10:01
quackgyver	tkil: Yeah, I actually purchased a Linode server yesterday with the intention of installing and testing out git. :)	10:01
	But that'll take time.	10:01
	and problems will occur along the way.	10:01
tkil	quackgyver -- shrug it's a 2-way street, both provocation and reaction, and different POVs.	10:01
quackgyver	And this is one of those problems. :)	10:01
	← p1ng left	10:01
tkil	quackgyver -- think about something you're skilled at. if someone came along and asked you for detailed help that existed in a FAQ or similar, would you parrot the faq, or would you point them at it?	10:02
	→ NimeshNeema joined	10:02
tkil	the pointng might have been somewhat undiplomatic, but it was still a pointer.	10:02
	and take it all in context that you're being asked to drive an expensive car on a crowded freeway without much practice.	10:02
	(that is, being asked to drive git on core IP / "crown jewels" without appropriate chance to learn the ropes.)	10:03
	we don't throw unexperienced drivers on the autobahn, your mgmt shouldn't expect unexperienced gits [heh] to navigate flawlessly.	10:03
	→ marhaban joined	10:04
quackgyver	tkil: Honestly? I'd do everything I could to help them, because I know that certain things don't come so easily to certain people, depending on their mindset or psychology. I'd never dismiss their question by pointing them to - what to them might be - a convoluted reference. Wikipedia is not exactly intuitive, because it's often used as a playground for	10:04
	people who want to showcase their ability to formulate excessively complex sentences, so it can actually be very hard to get anything worthwhile out of a technical reference article.	10:04
tkil	quackgyver -- also also wik, at this hour, there are probably more non-native-USA-english-speaking folks than otherwise on this channel, so there's that filter to accomodate as well.	10:04
	← harish_ left	10:04
	← Cromulent\|2 left	10:04
tkil	quackgyver -- right, but you still won't parrot the whole thing: you'll probe and respond. what makes sense to them? what doesn't? what have you tried? what did you expect? what did you actually get? what are you trying to accomplish? how close did you get?	10:05
	← gerard0 left	10:05
	← nitrodex left	10:05
jast	linking people to so-called personality disorders isn't a terribly constructive way of arguing :}	10:05
	→ ncd\|leeN joined	10:05
tkil	quackgyver -- i have to agree with jast -- was it better to send a [very lightly veiled] "you're an asshole" message, or should you just have moved on?	10:06
quackgyver	tkil: I've risked my position by sending feedback up the chain of command about stuff like this, and sometimes going directly to the board if it's a big enough issue.	10:06
	I'm doing everything I can here.	10:06
	But at the end of the day it's not my call.	10:06
tkil	quackgyver -- and, if you ignore the bits that annoy / offend you, i think we've given you more options.	10:06
	→ dex_ joined	10:06
	→ luke-jr_ joined	10:06
tkil	my suggestion for out-of-git copying, quite a few links to read, etc.	10:06
	← mikecmpbll left	10:06
	← beawesomeinstead left	10:06
	← kcj left	10:07
	← whowantstolivefo left	10:07
	← WakiMiko left	10:07
	← Luke-Jr left	10:07
canton7	you've got links to, imo, the two best git resources. between them they taught me git	10:07
quackgyver	jast / tkil: It was my way of jokingly telling him that what he's doing is actually rude and not very informative. He doesn't know my circumstnaces yet dismissively points me to a non-intuitive reference doc. I know nothing of him, and points him to a personality disorder.	10:07
	← HedgeMage left	10:07
	← markovh left	10:07
tkil	quackgyver -- yet you create a negative vortex. next time, just walk past it. :)	10:07
	← Nothing4You left	10:08
	← JSharpe left	10:08
tkil	anyway. back to ground truth: what state are you trying to reach? what's getting in your way?	10:08
canton7	also, !lol	10:08
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:08
	→ Droolio joined	10:08
jast	personally I do distinguish between straightforward personal attacks and assumptions of ignorance not phrased in an inflammatory way... YMMV	10:08
tkil	jast -- that's only because you're a jerk. ;->	10:08
canton7	(if you don't have gitk, but I'd recommend getting it)	10:09
jast	possibly :)	10:09
	← hahuang61 left	10:09
tkil	jast -- sorry. i've had ... a bit ... of wine, and i just discovered i spent 3 hours tracking down 8ms of error. so.	10:09
	← KernelPanicMK2 left	10:09
	→ Mekkis joined	10:09
	→ torbjorn joined	10:11
jast	tkil: I am reminded of http://www.ibiblio.org/harris/500milemail.html	10:11
	→ Lulzon joined	10:11
canton7	haha, classic one	10:11
	→ sonOfRa joined	10:12
quackgyver	tkil: I didn't drop that comment to protect my ego. I did it because I feel bad that every tech channel on fnode has a handful of people who poke every new user to see if they can get a reaction, and then proceed to bully that person out of the chan if they discover that said person doesn't have thick enough skin. I apologized if what I said was against the	10:12
	rules, but if not, then I feel like these people should at least be called out on their poor behavior.	10:12
	→ midnightmagic joined	10:12
quackgyver	And I didn't intend for this to become such a big deal.	10:12
	→ epsylon joined	10:13
jast	us #gits don't usually try to get rid of people, it's against the spirit of the whole thing	10:13
quackgyver	Or for it to become a source of negativity. :)	10:13
	jast: Yeah. I already said that I was glad to see that #git appears to be way more constructive than most fnode chans. :)	10:13
	→ michaelarestad joined	10:13
	→ hahuang61 joined	10:13
tkil	jast -- yeah, we just stick them in the .gitignore file. :)	10:13
quackgyver	lol	10:13
	Anyway, no ill-intend from my side, so nvm it all.	10:14
	→ HedgeMage joined	10:14
jast	we do often get people who know essentially nothing, though, and _lots_ of them... explaining all the details over and over each time is incredibly tedious	10:14
	→ markovh joined	10:14
jast	so personally I'd much rather point someone towards a decent starting point and answer any questions that may come up while they read it	10:14
tkil	quackgyver -- ok, so, let's review. where are you now? where do you want to be? what did you try to do to get there? where did you actually end up?	10:14
	→ gmdaas2 joined	10:14
canton7	next time, why not call him out politely, one of us will probably have a quiet chat with him on the side, with the thread of the mute hammer if that isn't constructive :P	10:14
	← chuckharmston left	10:14
	← egh34wz746w left	10:14
canton7	*threat	10:14
	← dex_ left	10:14
	← gmdaas left	10:15
tkil	canton7 -- that's crazy talk!	10:15
	→ egh34wz746w joined	10:15
jast	oh noes, not the evil mute hammer!@	10:15
	→ BiggFREE joined	10:15
tkil	jast -- remember, the worst thing about censorship is XXX XXXXXX XXX XXXX XXXXXXX!	10:15
canton7	the vil mute hammer of death, doom, and destruction!	10:15
	→ jakob joined	10:15
canton7	*evil	10:15
	and muting...	10:15
	← egh34wz746w left	10:15
quackgyver	jast: Not that I'm trying to tell you what to do, but my personal opinion is "help or ignore." Some people - myself included - have a really hard time with certain technologies or certain approaches to learning. Documentation doesn't help a person like me. It's not just laziness, and I need to just ask questions in a certain way to be able to understand it.	10:15
	← ameoba left	10:15
quackgyver	canton7: I didn't know you did things like that. Thanks for informing. I will keep that in mind for the future.	10:16
canton7	by all means ask away - that's what we're here for :P	10:16
	← ecube left	10:16
	→ roflin joined	10:16
	→ hyperair joined	10:17
quackgyver	tkil: Okay so, I'm currently in the branch that I previously couldn't leave due to the conflict caused by a modification that - for some strange reason - occured on my side, in contrast to a deletion of the same file being made on origin. I did a hard reset with git reset --hard origin/branch	10:17
	and now I'm just trying to ask you guys/gals what to do next, just so i dont mess anything up	10:17
jast	the mysterious changes are probably related to automatic line ending normalization	10:17
	tkil stares at "couldn't leave"...	10:17
jast	at least that's the most common cause by far	10:18
quackgyver	tkil: couldnt switch branch due to merge conflict	10:18
	← michaelarestad left	10:18
jast	well, the reset destroyed anything you have that isn't already in the remote. just continue normally.	10:18
	← xpirator left	10:18
canton7	we aborted the merge, used reset to make your local branch match the remote one (you said you didn't have any commits on the local one)	10:18
	now, what did you want to do?	10:18
	→ AeroNotix joined	10:18
AeroNotix	killll meeeeeee http://i.imgur.com/7wadpNc.png	10:18
	→ WakiMiko joined	10:19
	→ ecube joined	10:19
	→ selckin joined	10:19
uwjesq	AeroNotix: sfw?	10:19
canton7	it is	10:19
	→ _rgn joined	10:20
	→ ec joined	10:20
	→ heidar joined	10:20
uwjesq	AeroNotix: :-) One commit for everything.	10:20
	→ zero7 joined	10:20
	→ egh34wz746w joined	10:21
	← egh34wz746w left	10:21
tkil	uwjesq -- and in the darkness bind them?	10:21
uwjesq	tkil: lol.	10:21
quackgyver	jast: Are you 100% sure that the specific command I used made my local branch an exact copy of the remote one?	10:21
	← kewah left	10:21
quackgyver	and that it wont affect any other branches?	10:21
AeroNotix	I LITERALLY WANT TO KIL	10:21
	KILL	10:21
canton7	quackgyver, it won't affect your other branches because reset only affects the current branch	10:21
quackgyver	Ok. :)	10:21
	← sidus left	10:21
canton7	quackgyver, have a look at the output of !lol	10:22
gitinfo	quackgyver: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	10:22
uwjesq	AeroNotix: I think you can still split that commit into smaller ones that make sense.	10:22
	→ egh34wz746w joined	10:22
quackgyver	gitinfo: thanks. :)	10:22
gitinfo	quackgyver: you're welcome, but please note that I'm a bot. I'm not programmed to care.	10:22
quackgyver	unless youre a bot	10:22
AeroNotix	uwjesq: probably, but such an amateur	10:22
quackgyver	haha	10:22
	← egh34wz746w left	10:22
quackgyver	who triggered gitinfo to tell me that?	10:22
canton7	that's one of its features	10:22
iveqy	AeroNotix: good luck doing a bisect that ends on that commit...	10:22
	quackgyver: canton7	10:23
canton7	thanks, gitinfo	10:23
gitinfo	canton7: you're welcome, but please note that I'm a bot. I'm not programmed to care.	10:23
AeroNotix	good luck doing anything	10:23
	→ bjornars1 joined	10:23
quackgyver	Ah	10:23
	gitinfo: thanks for nothing	10:23
gitinfo	quackgyver: you're welcome, but please note that I'm a bot. I'm not programmed to care.	10:23
	→ Toro joined	10:23
	← alkino left	10:23
jast	it's automatic	10:23
quackgyver	:)	10:23
	→ egh34wz746w joined	10:23
	← egh34wz746w left	10:23
quackgyver	That's pretty impressive. He came off as human.	10:23
	→ Nothing4You joined	10:23
iveqy	quackgyver: if I understand you correctly you've trouble with reading documentation. Please consider listen to a !talk, I recommend Jessica Kerrs	10:23
gitinfo	quackgyver: [!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	10:23
tkil	gitinfo, botsnack.	10:23
	→ z8z joined	10:23
jast	that was the general idea :)	10:23
tkil	.... lame.	10:23
uwjesq	AeroNotix: You can use this horrible error for good by using it in your company how to not do it.	10:23
	→ FreezingCold joined	10:24
jast	!botsnack	10:24
gitinfo	Om nom nom	10:24
canton7	for a long while, jast and the bot were one and the same	10:24
	very confusing	10:24
jast	:}	10:24
uwjesq	uwjesq: As an example I mean.	10:24
	→ AAA_awright_ joined	10:24
	→ mechanicalduck joined	10:24
jast	and then I buckled down and wrote something that isn't irssi scripts.	10:24
AeroNotix	uwjesq: I've just quit	10:24
	uwjesq: literally just handed my notice in	10:24
quackgyver	iveqy: My problem is mostly that most references use terminology that is interchangeable and vague to someone who is not familiar with what they are reading, and which only has a specific meaning to those who are. This makes me think that reference aren't good learning sources, but rather references for people who are halfway into the language already.	10:24
	→ _Qman joined	10:24
tkil	AeroNotix -- just in time for these "good bye" cards: http://www.despair.com/mistakes.html	10:25
quackgyver	If a talk is more suitable, then I'll check them out	10:25
jast	quackgyver: the only potential difference left between your branch and the upstream is untracked files littering your working tree	10:25
quackgyver	thanks for that suggestion	10:25
AeroNotix	tkil: oh god, that's so fitting	10:25
	→ dvor joined	10:25
	← tirengarfio left	10:25
canton7	quackgyver, random stuff on the web generally isn't good. The !docs we've collected are	10:25
gitinfo	quackgyver: [!doc] A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful.	10:25
tkil	quackgyver -- and don't be afraid to do the "outside of git" deep copy then experiment.	10:25
	→ sidus joined	10:25
jast	quackgyver: we have different things we can recommend depending on how you like to learn something	10:25
	→ tirengarfio joined	10:25
	→ chuckharmston joined	10:26
jast	for instance, one that is geared towards computer scientists	10:26
tkil	quackgyver -- after getting shut down on the git mailing list (because extra diagnostics == regression, of course!), that was my main crutch.	10:26
jast	another that is more geared towards hackers	10:26
	etc.	10:26
	← WhoKnew left	10:26
uwjesq	AeroNotix: Realy?	10:26
	AAA_awright_ → AAA_awright	10:26
AeroNotix	uwjesq: yes, really	10:26
iveqy	quackgyver: references is not a good learning point. I totally agree with you, however introductions and tutorials is. !book is good and when you've read that you'll be halfway in and able to understand the man pages. However Jesica really shows you the design difference in thinking to other version control system	10:27
gitinfo	quackgyver: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	10:27
AeroNotix	I'm not working with people like that, uwjesq	10:27
jast	if the demotivationals are "so fitting", something is wrong :P	10:27
quackgyver	jast: That's a really nice, approach. I find that most people can be devided into two learning styles where one side prefers to push through sources, ignoring unfamiliar information and memorizing as much as possible until they get a sense of context, and the other side wants to understand and visualze what they're doing on a more abstract level so that they	10:27
	can extrapolate from that in order to understand unfamiliar concepts.	10:27
	← tirengarfio left	10:27
AeroNotix	jast: did you see the image I linked to?	10:27
quackgyver	I belong to the latter group, and I find that it's hard to get ahold of good resources for that approach. :)	10:27
AeroNotix	It was extremely fitting	10:27
	→ aard_ joined	10:27
	→ mikecmpbll joined	10:27
quackgyver	I've met other people like me who has had the same complain.	10:27
	complaint*	10:27
jast	AeroNotix: my condolences	10:28
AeroNotix	indeed	10:28
uwjesq	AeroNotix: Good ridance.	10:28
AeroNotix	uwjesq: to me?	10:28
jast	for a rather more abstract introduction to git, check out !gcs	10:28
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs/	10:28
quackgyver	Anyway, I'm not rejecting your suggestions. I've added them to my to-do list.	10:28
	→ tirengarfio joined	10:28
quackgyver	And will check them out.	10:28
uwjesq	AeroNotix: Yes.	10:28
	→ Edogaa joined	10:28
	→ tirengarfio_ joined	10:28
AeroNotix	why?	10:28
quackgyver	jast: Cool, thanks. :)	10:28
jast	aaaand... lunch break!	10:29
	← tirengarfio left	10:29
	← tirengarfio_ left	10:29
uwjesq	AeroNotix: Who wants to work at a place where they allow such commits.	10:29
	→ eqyiel joined	10:29
AeroNotix	uwjesq: sorry, are you not a native english speaker?	10:29
	← diegoviola left	10:30
	→ egh34wz746w joined	10:30
uwjesq	AeroNotix: Yes. How would I have said it properly?	10:30
AeroNotix	hmm, well, the phrase "Good Riddance to <name>" means "fuck <name>" in layman's terms	10:30
	so I thought you were saying "Fuck AeroNotix"	10:30
	→ tirengarfio joined	10:31
	← tirengarfio left	10:31
uwjesq	AeroNotix: I though you say it when you throw away something very useless.	10:31
AeroNotix	You can, but then I asked "To Me?" and you said "Yes"	10:31
	← infogulch left	10:31
	→ tirengarfio joined	10:31
AeroNotix	I presume you thought I was asking "Were you directing that phrase at me" instead of "about me"	10:31
	→ dhruvasagar joined	10:31
uwjesq	AeroNotix: Yes.	10:31
AeroNotix	:)	10:32
	← egh34wz746w left	10:32
	→ egh34wz746w joined	10:32
	← egh34wz746w left	10:33
	→ jcromartie joined	10:33
	→ egh34wz746w joined	10:34
	← egh34wz746w left	10:34
	← mechanicalduck left	10:35
	→ egh34wz746w joined	10:37
	← egh34wz746w left	10:38
	← yshh left	10:38
	← hahuang61 left	10:38
	→ insejn_ joined	10:38
	← insejn left	10:38
	insejn_ → insejn	10:38
	→ egh34wz746w joined	10:39
	← ij left	10:40
	← BJfreeman left	10:40
	← egh34wz746w left	10:40
	→ khushildep joined	10:40
	→ egh34wz746w joined	10:40
	→ sampiero joined	10:41
	← sidus left	10:41
	← dfanjul left	10:41
	← egh34wz746w left	10:42
	→ frgtn joined	10:42
	→ egh34wz746w joined	10:43
	← egh34wz746w left	10:43
	← tirengarfio left	10:43
	→ m0ltar joined	10:43
	→ tirengarfio joined	10:44
	→ michaelarestad joined	10:44
	← k_sze[work] left	10:45
	→ Iszak joined	10:45
	← Iszak left	10:45
	← beautifulmind left	10:45
	→ Iszak joined	10:46
	→ egh34wz746w joined	10:46
	← Iszak left	10:46
dimm	must i restart something after edit /etc/gitconfig ?	10:47
	→ Iszak joined	10:47
	← Iszak left	10:47
	← sgambino left	10:47
	→ sgambino joined	10:48
	→ yacks joined	10:48
	→ Iszak joined	10:48
	← nilg left	10:48
	← Iszak left	10:48
	→ r0bby joined	10:48
	→ CodeShar_ joined	10:48
	← z8z left	10:48
	→ Progster_ joined	10:48
	← CodeShark left	10:48
shwouchk	dimm: no	10:48
	→ Kyzz_ joined	10:48
	← michaelarestad left	10:48
shwouchk	dimm: wait, on a client or on a server?	10:49
	← BiggFREE left	10:49
	→ ctin joined	10:50
	← Kyzz left	10:50
	← robbyoconnor left	10:50
	← Progster left	10:50
	→ JSharpe joined	10:50
AAA_awright	Should still be no	10:51
	→ infogulch joined	10:52
	→ freestyl3r joined	10:52
	← s0undt3ch left	10:53
	← pen left	10:53
	→ gerard0 joined	10:53
	← carlos-huang left	10:54
	→ s0undt3ch_ joined	10:54
	→ nilg joined	10:54
	→ harish joined	10:54
	→ Woet joined	10:54
	← luc_ left	10:56
	← echo-area left	10:56
	→ cads joined	10:57
	→ pdx joined	10:57
	← aard_ left	10:59
	→ z8z joined	10:59
	← z8z left	11:00
	← egh34wz746w left	11:01
	→ egh34wz746w joined	11:01
	← ewnd9 left	11:02
	← dhruvasagar left	11:03
	→ w0ng joined	11:03
	← egh34wz746w left	11:03
	→ egh34wz746w joined	11:03
	→ ewnd9 joined	11:03
	← w0ng left	11:03
	→ w0ng joined	11:03
	→ hahuang61 joined	11:04
	← egh34wz746w left	11:04
	→ egh34wz746w joined	11:04
	← egh34wz746w left	11:05
	← glosoli left	11:06
	→ nova_ joined	11:07
	→ denver joined	11:07
	→ elixir_ joined	11:08
	← ecube left	11:09
	→ Ivo joined	11:09
	→ spaceonline joined	11:11
	← daito left	11:11
	← elixir left	11:11
	→ daito joined	11:12
	← hahuang61 left	11:12
	← m0ltar left	11:12
	→ Guest67126 joined	11:13
	← elixir_ left	11:13
	← TheJH left	11:13
	→ troulouliou_dev joined	11:13
	→ mechanicalduck joined	11:13
	→ WhoKnew joined	11:14
	→ TheJH joined	11:14
	→ egh34wz746w joined	11:15
	→ michaelarestad joined	11:15
	← infogulch left	11:15
	← egh34wz746w left	11:15
	← mklappstuhl left	11:15
	← dreiss left	11:16
	← daito left	11:16
	→ egh34wz746w joined	11:16
	→ pen joined	11:17
	→ elixir_ joined	11:17
	← m0viefreak left	11:17
	→ sgambino_ joined	11:17
	→ CodeShark joined	11:18
	← egh34wz746w left	11:18
	→ infogulch joined	11:18
	→ squeakytoy\|w joined	11:18
	← trusktr left	11:18
	← Dreamer3 left	11:18
	← r0bby left	11:18
	← sgambino left	11:18
	sgambino_ → sgambino	11:18
	→ r0bby_ joined	11:18
	→ egh34wz746w joined	11:18
	→ Kyzz joined	11:19
	→ Progster joined	11:19
	← Caritade left	11:19
	← michaelarestad left	11:19
	← egh34wz746w left	11:19
	← CodeShar_ left	11:20
	← harish left	11:20
	→ egh34wz746w joined	11:20
	← Progster_ left	11:20
	← Kyzz_ left	11:20
	→ Dreamer3 joined	11:21
	← insejn left	11:22
	← hyperair left	11:22
	→ insejn joined	11:22
squeakytoy\|w	Hey all. I wonder if you guys could give me some advice. I am thinking of creating a git repository-proxy-ish between TFS and Git. Long story short, I need someone kind of a Continuous Integration solution, that basically.. for each commit that goes into a certain repository, it should execute a command line (which does the TFS-push).	11:22
	What is the easiest way to put up such a system, in windows?	11:23
Tacker	use jenkins	11:23
squeakytoy\|w	Seems a bit overkill, since now I need a servlet container as well.	11:24
Tacker	its easy to set up and straight forward	11:24
squeakytoy\|w	what servlet container you suggest?	11:24
	← egh34wz746w left	11:25
Tacker	I dont know of any	11:25
muep	but wouldn't some kinf of a push hook in the git repository work fine for that?	11:25
squeakytoy\|w	how can you then say its easy and straight forward, if you actually dont know how	11:25
Tacker	Whenever one of our developers pushes to the repo, jenkins publishs a build to testflight and the people on the dev team can download the build	11:25
	its very nice	11:25
squeakytoy\|w	muep, hm, a hook for each user, or can you create a hook once someone pushes into the main one? hm	11:25
	→ egh34wz746w joined	11:26
muep	squeakytoy\|w: my impression is that the hook could be just in the shared repository	11:26
	← ctin left	11:26
squeakytoy\|w	I am more thinking about creating a simple node.js that does git log on the main repository, and if the top commit has changed, execute a command	11:27
	← Guest___ left	11:29
	← h0bbit left	11:31
	← mechasr left	11:31
	→ dhruvasagar joined	11:34
	← Guest67126 left	11:35
	← mechanicalduck left	11:36
Tacker	sure you could spend all this time trying to create your own solution, or you could just use stuff thats already available to you ;)	11:37
	→ abrkn joined	11:37
	→ emergion joined	11:37
	→ ecube_ joined	11:38
	→ dfanjul joined	11:39
	← Celelibi left	11:39
	← abrkn\ left	11:40
	← marthinal left	11:40
	← marhaban left	11:41
	→ zhost joined	11:42
	→ whowantstolivefo joined	11:42
	→ bmac joined	11:45
	← Weiss left	11:45
	→ Weiss joined	11:45
	→ whaley joined	11:45
	→ michaelarestad joined	11:46
	← elixir_ left	11:47
	← deuterium left	11:47
	→ rednaks joined	11:48
	→ elixir_ joined	11:48
	→ yshh joined	11:48
	← WhoKnew left	11:48
cbreak-work	why bother with any of that?	11:48
dimm	tkil: i solve my trouble via quotepath = false	11:49
	tkil: after set this parameter cyrillica symbols display fine	11:49
	s/i solve/we solve/	11:50
	;-)	11:50
	← bmac left	11:50
	← yshh left	11:50
	→ yshh_ joined	11:50
	← michaelarestad left	11:50
	← BitPuffin left	11:51
	← sgambino left	11:53
	→ tinti joined	11:54
	← flaguy48 left	11:55
	→ Guest___ joined	11:56
	→ hyperair joined	11:56
	← fRAiLtY- left	11:57
	← zhost left	11:57
	→ rednaks_ joined	11:58
	→ Cromulent joined	11:58
	← shuaib left	11:59
	← rednaks left	12:00
	→ tritech joined	12:00
tritech	hi there	12:01
gitinfo	tritech: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:01
	← chuckharmston left	12:01
tritech	if u have done a git add, git commit on a branch and then do a git push,	12:01
	ecube_ → ecube	12:01
	→ armin joined	12:02
	→ beautifulmind joined	12:02
tritech	switch to master branch and do a git merge	12:02
iveqy	How do I do a shallow clone from a specific commit?	12:02
frogonwheels	tritech: get merge <branch-you-just-left> presumably?	12:02
tritech	should u see that merge action appear on the master branch so that u could do a pull request?	12:02
frogonwheels	iveqy: !shallow	12:02
gitinfo	iveqy: Shallow clones give you only a specified number of commit's depth. It sounds nice, but really it causes all sorts of problems if you are trying to do anything non-trivial so avoid using where-ever possible. Anybody caught doing shallow clones should be beaten viciously with their own head.	12:02
frogonwheels	tritech: pull request?	12:03
	→ zhost joined	12:03
cbreak-work	iveqy: you can not chose the commit	12:03
frogonwheels	tritech: oh. !github possibly?	12:03
gitinfo	tritech: Feel free to ask us about Github-specific features (Forks, Pull Requests, Wikis, etc), but there are no guarantees. There is a #github channel, which might help too (again, no guarantees)	12:03
cbreak-work	iveqy: it'll always start at a branch tip	12:03
armin	hi, is there any way to tell a remote about other remotes? like, i have a git server that holds some repos that i just have on my "local" gerrit server in case github is down or so, can i define a github remote and save it in the gerrit one here?	12:03
iveqy	frogonwheels: I know that	12:03
	Nikoli_ → Nikoli	12:03
tritech	ok gitinfo	12:03
	→ chuckharmston joined	12:03
	→ hemanth joined	12:03
iveqy	cbreak-work: I was afraid of that. It must be possible to change that.	12:03
	tritech: !gitinfo	12:03
gitinfo	tritech: I am an IRC bot which responds to certain keywords to provide helpful(?) information to humans. Please see http://jk.gs/git/bot for more information about how to use me.	12:03
cbreak-work	armin: yes, if you have access to the remote, with git remote add	12:03
	iveqy: I doubt that.	12:04
armin	cbreak-work: that will only add it to my local checkout of my workstation, not on the repo of the git server here in the company, right?	12:04
cbreak-work	iveqy: the protocol is extremely streamlined to be efficient	12:04
tritech	anyone for my question?	12:04
	→ jantman joined	12:04
cbreak-work	tritech: what's a merge action?	12:04
	tritech: what pull request?	12:04
frogonwheels	tritech: as soon as you started talking about 'pull request' I was assuming github. Hence, I pointed you at github	12:04
cbreak-work	I assume e-mail containing the words "please pull"	12:05
tritech	hi frogonwheels	12:05
jantman	is there a relatively simple way (bash?) to determine what branch the current is cut from? i.e. what branch I was on when I did `git checkout -b foo` to get the current branch?	12:05
tritech	i'm trying to find out if i should b able to do a pull request	12:05
iveqy	tritech: remember, github is not a part of git and therefore the "github way" is just one of many ways to use git	12:05
frogonwheels	tritech: 'pull request' is not a 'git' term, therefore you will have to define it. if you mean from github. ...	12:06
iveqy	cbreak-work: I know the protocol is simple, byt it shouldn't be too much work AFAIK. Seems like I need to investigate some more	12:06
tritech	so should i be asking this question on the github channel?	12:06
frogonwheels	tritech: well assuming your are talking about a pull request on github, yes.	12:07
iveqy	tritech: if you're using github, yes	12:07
	→ audiotek joined	12:08
	← Cromulent left	12:08
cbreak-work	jantman: maybe git rev-parse --symbolic-full-name @{u}	12:09
	jantman: but that might not work most of the time	12:09
	← sriracha left	12:09
iveqy	jantman: not actually. You can get things like the relation between two branches, or the commit you branched from, but not exactly which branch you branched from (since a branch is a pointer to a commit and that branch-pointer can have moved (or even that commit might have plenty branch-pointers to it)	12:09
	← zhost left	12:09
	→ zhost joined	12:09
jantman	iveqy: right. so I guess the commit I branched from is what I want, and then I can do some relatively project-specific bash-fu to find what branch...	12:10
cbreak-work	jantman: if you want to guess, do a git merge-base with all other branches	12:10
	jantman: then calculate the number of commits from the merge base to your tip	12:10
	jantman: pick the one with the least commits, and then do a git branch --contains	12:10
jantman	cbreak-work: yeah....	12:11
cbreak-work	jantman: the branches you will see are all branches that contain that commit	12:11
	so all are possible candidates	12:11
	jantman: from then on: guess.	12:11
	→ p1ng joined	12:11
cbreak-work	easy :)	12:11
tritech	how do u git rid of a commit that u did say 2 days ago?	12:12
	← fragles left	12:12
iveqy	jantman: what cbreak-work said, with the exception that if a branch has been rebased so that it no longer uses that commit, you won't find it. However you'll be screwed anyway	12:12
cbreak-work	tritech: history rewriting. Did you push it already? Then you might be stuck with revert.	12:12
iveqy	tritech: git rebase -i	12:12
moritz		12:12
tritech	yes it has already been pushed	12:12
iveqy	tritech: !revert !public	12:12
gitinfo	tritech: That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	12:12
	tritech: [!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). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	12:12
jantman	ok. well, thanks all	12:12
	← jantman left	12:12
	→ konundra joined	12:13
	← Guest___ left	12:13
	→ kewah joined	12:14
	→ deuterium joined	12:14
	→ devoldmx joined	12:14
	→ mechanicalduck joined	12:14
	→ beawesomeinstead joined	12:14
	→ anonymuse joined	12:14
	→ alkino joined	12:14
	← pduin left	12:15
	→ breakingthings joined	12:15
	→ Sebo1 joined	12:16
	← devoldmx3 left	12:16
	→ michaelarestad joined	12:16
	← mikecmpbll left	12:16
	→ IrishPrime joined	12:18
	→ marthinal joined	12:20
	→ cads2 joined	12:20
	tizzo-afk → tizzo	12:21
	← michaelarestad left	12:21
	← valgrind left	12:21
	→ mikecmpbll joined	12:23
	← D9 left	12:24
	→ bklane joined	12:25
	← nevyn left	12:26
	→ nevyn joined	12:27
	→ freeed joined	12:27
	← ejnahc left	12:28
	→ ejnahc joined	12:29
	→ noyb joined	12:30
	→ guampa joined	12:30
	→ devoldmx3 joined	12:31
	→ kukks joined	12:31
	← kukks left	12:31
	→ kukks joined	12:31
	← zhost left	12:31
	f8l → nicnamedeth0	12:31
	→ mechasr joined	12:31
	← devoldmx left	12:31
masak	given a commit SHA-1 and an absolute path, what's the speediest way to get the blog SHA-1 for the file at that commit?	12:31
	← howlymowly left	12:32
	← nevyn left	12:32
cbreak-work	masak: git cat-file -p SHA:path	12:32
grawity	git rev-parse $commit:$path	12:32
	→ nevyn joined	12:32
cbreak-work	masak: path must be relative to the repository root	12:32
masak	thank you.	12:33
grawity	cbreak's command returns the blob's contents	12:33
masak	right, that's what I meant by 'absolute'.	12:33
	→ WhoKnew joined	12:33
	→ kontoo joined	12:33
cbreak-work	true	12:33
masak	there's no real good word for 'relative to repository root' :)	12:33
grawity	I guess the meaning of 'absolute' is relative :D	12:33
masak	yup.	12:33
	→ valgrind joined	12:34
kontoo	anyone here using "A successful Git branching model" or a modified version of it and has some experience?	12:34
iveqy	kontoo: !anyone	12:34
gitinfo	kontoo: Usually, it does not help to ask for someone specific to help you. Without knowing your specific problem, nobody knows if they can be of assistance. Please ask your questions and wait until somebody speaks up.	12:34
kontoo	it makes no sense to ask if no one is using it	12:34
lb1a	!just_ask	12:34
gitinfo	You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)	12:34
	← noyb left	12:35
	→ zhost joined	12:35
	← devoldmx3 left	12:35
jast	it makes no sense to answer if I don't even know whether I'll be able to answer your specific question :P	12:35
	← mechanicalduck left	12:35
	→ mechanicalduck joined	12:36
iveqy	kontoo: There's 999 persons here. Git branching the way you describe is pretty populair. So the answer is yes, there's a couple of hundreds of people here that have that experience	12:36
jast	(and that's how a deadlock works, ladies and gentlemen)	12:36
uwjesq	jast: :-)	12:36
	→ andref_dias joined	12:37
	← rbento left	12:37
	→ Orbitrix joined	12:38
	← Orbitrix left	12:38
	dwmw2_gone → dwmw2	12:38
	→ Orbitrix joined	12:38
	→ mechanicalduck_ joined	12:39
	← zhost left	12:39
kontoo	how to handle the case that you don't want the steps you made in a release branch to be merged back into development? example: development version is configured to use some specific includes and ports; in the release branch one would change this to the production values and bumb the version. you obviously want that changes in the master branch but not in the development branch. the solution i have come up with is: merge release-* back to master but not to	12:39
	development (simple… duh) but the problem comes when i branch off master for a hotfix. merging this hotfix branch back to master and development is a requirement, but i override the settings in development with production (master branch) values. is cherry pick the actual hotfix content the solution here?	12:39
osse	quackgyver: I didn't see it mentioned so I figured I would: when it comes to technobabble I recommned perusing man gitglossary. It's more or less exactly what it says on the tin, a Git glossary :) I certainly wish I had known about that sooner. Look up words as you need them,	12:39
gitinfo	quackgyver: the gitglossary manpage is available at http://jk.gs/gitglossary.html	12:39
kontoo	there you go, assuming you know the branching model	12:40
quackgyver	osse: Thanks, adding that to my list of things to read. Really appreciate it. :)	12:40
	→ sidus joined	12:40
	dpac\|away → dpac	12:41
jast	kontoo: ideally, site-specific configuration is kept out of the normal development history	12:41
	see also !configfiles	12:41
gitinfo	It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	12:41
	→ devoldmx joined	12:41
	→ kesha joined	12:41
kontoo	jast: not possible in that case	12:41
jast	have you even followed the link?	12:42
	← mechanicalduck left	12:42
	tizzo → tizzo-afk	12:42
	mechanicalduck_ → mechanicalduck	12:42
kontoo	part of the project is a web-gui, i.e. javascript. the settings have to be in the javascript	12:42
jast	yes, that's great. and at what point is that incompatible with ALL of the suggestions in the page the bot linked to?	12:42
osse	quackgyver: it's nice to be aware of that one. It explains stuff like "HEAD" and "tree" etc. Of course some definitions refer to others	12:43
quackgyver	osse: Yeah, that's exactly the kind of stuff I'd love to be able to quickly wrap my head around in terms of just visualizing their contexts	12:43
	when it comes up	12:44
jast	I suppose I should overhaul my cheat sheet	12:44
	it's been four or five years now...	12:44
iveqy	kontoo: you could just keep those settings in a commit and branch of from below that commit when you're doing your quickfixes	12:44
	→ _goTAN joined	12:44
kontoo	jast: looked through that site, nothing new for me. that approaches aren't working in my case	12:44
	← elixir_ left	12:45
quackgyver	kontoo: A suggestion. When someone tells you a solution, you need to tell them why it will not work before you ask another question.	12:45
	Otherwise people cannot understand your situation.	12:45
kontoo	iveqy: what do you mean by branching off from below?	12:45
jast	kontoo: well, as long as I don't know what exactly makes it not work in your case, I can come up with a million ideas and chances are they won't work either...	12:45
kontoo	quackgyver: thanks for that valuable tip	12:46
quackgyver	kontoo: No problem. :)	12:46
iveqy	kontoo: instead of having your quickfix branch to start from RELEASE let it start from RELEASE~	12:46
kontoo	quackgyver: i stated already why it isn't working, maybe change your tip to "if a person wants to enforce his solutions that aren't working for you -- as you reasoned earlier -- repeat your point again"	12:47
	→ devoldmx3 joined	12:47
	→ michaelarestad joined	12:47
	jast stops paying attention	12:47
quackgyver	kontoo: You only explain it sometimes, not always.	12:47
	kontoo: You need to be very careful about your questions.	12:47
iveqy	kontoo: your reason was that your code was in javascript? Or did I miss something?	12:47
quackgyver	kontoo: Otherwise things get complicated. :)	12:48
	kontoo: Do your best to tell what you need, what your situation is and why all the help you get will not work.	12:48
	← devoldmx left	12:48
kontoo	iveqy: hmm i don't quite get what you mean	12:48
	but let me explain it again	12:48
	← soee left	12:48
jast	in unrelated news, it's disturbingly warm	12:48
iveqy	jast: siting on a rock by the sea, it's pretty okay =), too bad I've to study physics instead of float around in the sea.	12:49
jast	sitting in an office building :(	12:50
	→ tmcmahon joined	12:50
	→ mklappstuhl joined	12:50
	← ewnd9 left	12:50
	tizzo-afk → tizzo	12:51
quackgyver	kontoo: You cannot say "i dont understand." You need to be specific. For example: "im new to git. i dont understand what your solution means" or "i understand your solution, but not how it relates to my problem?"	12:51
	You need to help people understand you. :/	12:51
iveqy	jast: =(. Last year I worked in a really hot office, good news was that they installed a brand new aircondition. The installation was finished when the autumn began	12:51
quackgyver	Just take off your pants.	12:51
	→ elixir_ joined	12:51
quackgyver	It's the path of least resistance.	12:51
kontoo	iveqy: project is split into client (website) and server. the client is configured to use uncompressed javascript files (a <script> tag that needs to be changed for production) and an url for the server, which has to be in the javascript(!!!). so a release/xxx branch (which purpose is to prepare a development snapshot for release) would change the <script> tag, the url and the version number.	12:51
jast	and shirt, right	12:51
	← michaelarestad left	12:52
cbreak-work	kontoo: that sounds rather idiotic	12:52
	kontoo: how about doing that at the deployment stage?	12:52
	→ TheBrainWork joined	12:52
	← aChatir left	12:52
	← Gooder``` left	12:52
cbreak-work	(or build stage if you have that)	12:53
iveqy	kontoo: !deploy	12:53
gitinfo	kontoo: Git is not a deployment tool, but you can build one around it(in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/the-list-and-irc/deploy.html	12:53
kontoo	cbreak-work: how would that work?	12:53
cbreak-work	kontoo: you have scripts that make your source code into something that runs on the server, by configuring things	12:54
	like "Compiling"	12:54
	→ e3r98gh35t joined	12:54
kontoo	or more specific: how to change settings in html / js files in the deploy / build step	12:54
	← e3r98gh35t left	12:54
cbreak-work	sed	12:54
	or awk	12:54
	or perl	12:54
quackgyver	jast: Just the pants.	12:54
	I'm a duck.	12:54
	→ e3r98gh35t joined	12:54
	← e3r98gh35t left	12:54
quackgyver	Not a neanderthal.	12:54
iveqy	kontoo: however I find the best way of doing this is to always have the correct deploy values set up in the code and alter my development and test enviroments to fit the deploy enviroment. However in more complex scenarios (when we just don't talk about a URL that can be put in your hosts-file) listen to cbreak-work	12:54
	← alkino left	12:55
kontoo	cbreak-work: so your approach would be (for example) to wrap the important parts in the html / js with like "<!-- ##BUILD-URL-START## -->" and "<!-- ##BUILD-URL-END##-->" and sed that in the deploy script	12:56
	cbreak-work: ?	12:56
	guess that would work	12:56
cbreak-work	kontoo: I'd use a single marker	12:56
	kontoo: git archive can do some things with marker replacement	12:56
	but a proper script would be more flexible	12:57
kontoo	cbreak-work: yeah i used git archive before to insert the tag hash	12:57
cbreak-work	kontoo: also, of course a user configurable config file would be best, with a template for users if needed	12:57
	tizzo → tizzo-afk	12:57
kontoo	cbreak-work: but the development version shall have the development entries, not some placeholder	12:57
	← cads left	12:57
cbreak-work	they can just build it too.	12:57
	← agile left	12:57
	← emergion left	12:58
kontoo	cbreak-work: there is no building on the client site, it's static html	12:58
	cbreak-work: see the problem? :P	12:58
cbreak-work	you can build static html	12:58
	→ alkino joined	12:58
cbreak-work	that's what tools like cgi-bins, or other more modern things do	12:58
kontoo	dunno, but again, your sed + deploy script seems like a good solution	12:58
	← tmcmahon left	12:58
kontoo	still wondering how you stand towards my cherry pick the actual change and merge it back to development approach	12:58
	→ schemanic joined	12:59
cbreak-work	messing with history for something meaningless such as configuration is dumb.	12:59
masak	is there any way to get only the --stat information out of git-show or git-diff?	12:59
cbreak-work	masak: git diff --stat? :)	12:59
	← schemanic left	12:59
masak	cbreak-work: d'oh! :)	13:00
	works fine.	13:00
kontoo	iveqy: just read your message. yeah i would prefer that too, but the production server proxies websockets through nginx so the url changes and i'm not willing to enforce a equal setup on my / other developers machines	13:01
	← dfanjul left	13:01
	← Amandil left	13:02
	→ LadyRainicorn joined	13:02
	→ kevwil joined	13:02
frew	I changed the location of a submodule and now pulls give errors because they can't find the head the submodule is supposed to be at; what's the command to fix my submodules?'	13:05
	→ marhaban joined	13:06
iveqy	frew: !repro , we need to know what you mean with "changed the location". (also, this will be possible to do automatic in git 1 - 2 versions from now)	13:06
gitinfo	frew: 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.	13:06
frew	oh sorry, that was indeed vague	13:07
	the submodule is checked out in the same place, but the remote repo it points to was changed	13:07
iveqy	frew: was changed where? it .gitmodules?	13:07
frew	I can't exactly give you a transcript, all I did was cd into the submodule, made a commit, pushed it to my own fork, and then edited .gitmodules to point at my forl	13:08
	fork*	13:08
	iveqy: right.	13:08
iveqy	frew: man git submodule try git submodule sync	13:08
gitinfo	frew: the git-submodule manpage is available at http://jk.gs/git-submodule.html	13:08
frew	ok	13:08
	I usually do git submodule update --init	13:09
	→ troker joined	13:09
	→ m8 joined	13:09
iveqy	frew: that's' not the same thing at all, please read the man page	13:09
frew	I know they aren't the same	13:09
	I am just telling you waht I normally do	13:09
	→ ffio joined	13:09
	→ sgambino joined	13:09
	← sgambino left	13:09
	→ sgambino joined	13:10
frew	ok, so I need to start doing this more regularly	13:12
	← mitz left	13:12
	← squeakytoy\|w left	13:13
	→ mitz joined	13:13
troulouliou_dev	is it possible to have a svn submodules ?	13:13
	→ e3r98gh35t joined	13:14
	→ sriracha joined	13:14
	→ normanrichards joined	13:15
	← arvind_khadri left	13:15
	→ dfanjul joined	13:15
	→ Seveas joined	13:15
iveqy	troulouliou_dev: yes and no, you can't have svn submodules but your submodules can use git-svn	13:16
cbreak-work	submodules can't really use git svn :/	13:16
	→ axl_ joined	13:16
	← rednaks_ left	13:16
	← jcromartie left	13:16
troulouliou_dev	iveqy, and can i have a submodule in a non root path ex : ./lib/core/test/mysubmodules ?	13:17
iveqy	cbreak-work: why not?	13:17
frew	jfkdls; somehow I lost my commits to the submodule	13:17
	thanks guys	13:17
	sync is a good command to know	13:17
cbreak-work	iveqy: because they are not a valid remote you can git clone from	13:17
	iveqy: and git svn clone might not give you the same hashes	13:17
	← jon_r left	13:17
	← e3r98gh35t left	13:18
	→ michaelarestad joined	13:18
	→ e3r98gh35t joined	13:18
iveqy	troulouliou_dev: non root path? as in not the root of your superproject? In that case it's yes	13:18
	← SergeyPenkin left	13:18
	← freestyl3r left	13:19
troulouliou_dev	iveqy, ok	13:19
	← e3r98gh35t left	13:19
	→ e3r98gh35t joined	13:19
	→ natechan joined	13:19
iveqy	cbreak-work: Hmm you're right about that is isn't distributeable to use a submodule with git-svn	13:20
	cbreak-work: you can still use submodules though	13:20
	← e3r98gh35t left	13:20
iveqy	howver the best way is of course to have git-mirror of the svn archive	13:20
	← LimeBlast left	13:20
	→ Brivelt joined	13:21
	← axl_ left	13:21
	→ Nitrodex joined	13:21
	→ Cerise joined	13:21
	→ Christi123 joined	13:22
	Nitrodex → Guest93127	13:22
	→ Thra11 joined	13:22
	← michaelarestad left	13:23
	→ hellopat joined	13:24
	← GeertV left	13:24
	→ cannonball joined	13:25
	→ LimeBlast joined	13:25
	→ darchitect joined	13:25
	→ GeertV joined	13:25
	→ Destos joined	13:25
frew	wow I am retarded, I was ssh'ing into the wrong machine to find the lost commits	13:25
	frew needs more sleep	13:25
	→ Milossh joined	13:25
	→ ewnd9 joined	13:25
	→ gusnan joined	13:26
	← tatsuya_o left	13:27
	← devoldmx3 left	13:28
	→ aChatir joined	13:28
	→ flaguy48 joined	13:28
	← darchitect left	13:29
	← GeertV left	13:29
	→ oliveiraev joined	13:30
	← byprdct left	13:30
	→ harish joined	13:31
frew	ok, so the code is correctly pushed (https://github.com/frioux/awesome-utils/commit/797c300) the super repo has the right commit ref (https://github.com/frioux/dotfiles/commit/cb263df8) I ran git submodule sync to fix the remote urls, ran git submodule update, but it still isn't correctly checking out that repo (full commands and output here:	13:31
	http://paste.scsys.co.uk/264721?tx=on&ln=on&tidy=on&hl=on&submit=Format+it!)	13:31
	anyway, I'll just manually handle it for now	13:31
	but ideas are welcome	13:31
	→ danecando joined	13:32
	→ trungqtran joined	13:33
	← kesha left	13:33
	→ kesha_ joined	13:33
	→ carlos-huang joined	13:34
iveqy	frew: looks like all submodules are up to date	13:34
	← Christi123 left	13:34
frew	when I manually fix it git status shows the submodule has new commits, for some reason	13:35
	→ Christi123 joined	13:35
	← beautifulmind left	13:35
frew	oh I'm sorry	13:35
	somehow	13:35
	in the next commit I rolled back the submodule	13:35
	well that explains everything	13:36
	← acharlieh left	13:38
	→ glosoli joined	13:39
frew	thanks for your help and patience iveqy	13:39
	→ mike_af joined	13:40
	→ hahuang61 joined	13:40
	→ aartist joined	13:40
	→ Kingsy joined	13:41
	→ ruslan_osmanov joined	13:41
Kingsy	I am trying to do a git pull origin master on a clean git repo and it says error: Untracked working tree file /path/to/file.php would be overwritten by merge.	13:41
ruslan_osmanov	hi, git pull/clone/fetch stalls on "select" syscall. Could you help me please?	13:42
Kingsy	an no files from the pull are getting checked out.. whats wrong?	13:42
	← phluks left	13:42
	→ mfulz joined	13:42
	← crane_work left	13:43
	← hemanth left	13:43
Kingsy	ohh I see	13:43
	nm	13:43
cbreak-work	sounds like your repo isn't clean :)	13:43
lb1a	yeah, call the cleaners	13:44
Kingsy	yep :P there was a hidden file I didnt see	13:44
	thanks	13:44
ruslan_osmanov	what about my issue?	13:44
	→ rabellamy joined	13:45
	nicnamedeth0 → f8l	13:46
	← rchavik left	13:47
ruslan_osmanov	'git clone -vvv git@myrepo...': http://bpaste.net/show/119525/	13:47
	← carlos-huang left	13:47
	← normanrichards left	13:47
	← hahuang61 left	13:47
	← m8 left	13:48
	→ carlos-huang joined	13:48
	→ BitPuffin joined	13:49
cbreak-work	ruslan_osmanov: select is used for pseudo async file/socket IO	13:49
	→ michaelarestad joined	13:49
	tizzo-afk → tizzo	13:49
	→ leen^\| joined	13:49
	← mechanicalduck left	13:50
	→ nbouscal joined	13:50
	Arokh → Arokh[Off]	13:50
	← ryez left	13:50
	← rabellamy left	13:50
ruslan_osmanov	cbreak-work, well, I guessed it. However, it's still weird. Who makes my connection to stop, ISP, the remote repo server, remote firewall...	13:50
	just stalls, it's irritating	13:50
	Arokh[Off] → Arokh	13:52
	→ shamrock joined	13:52
	← ncd\|leeN left	13:52
	shamrock → Guest39632	13:52
	→ ToothlessGear joined	13:53
	← Guest39632 left	13:53
	→ bitkiller joined	13:53
	→ rgr joined	13:53
	← michaelarestad left	13:53
	← r0bby_ left	13:55
	← ruslan_osmanov left	13:55
	→ r0bby_ joined	13:55
	← rob_w left	13:55
	→ HenryG joined	13:55
	← netiul left	13:56
	← kesha_ left	13:56
	→ nicholasruunu joined	13:57
	→ dougsland joined	13:58
	← dougsland left	13:58
	→ dougsland joined	13:58
	← Christi123 left	13:59
	→ Christi123 joined	14:00
	→ JSharpe_ joined	14:00
	← cads2 left	14:00
	→ mribeirodantas joined	14:01
	→ huoxito joined	14:01
dimm	shwouchk: see your message now, sorry... i was asked about both: client and server :-)	14:02
	bye, all!	14:02
	← dimm left	14:02
	← Brivelt left	14:04
	← JSharpe left	14:04
	→ TeckniX joined	14:05
	→ Brivelt joined	14:05
	← mishok13 left	14:06
	→ mechanicalduck joined	14:07
	→ tang^ joined	14:07
	→ Cromulent joined	14:08
	→ michaelarestad joined	14:08
	← kontoo left	14:09
	→ loteriety joined	14:10
	← rgr left	14:11
	← jakie left	14:11
	→ JosephSilber joined	14:11
	← WhoKnew left	14:12
	→ v0n joined	14:12
	→ normanrichards joined	14:13
	→ parcs_ joined	14:13
	← parcs_ left	14:14
	← albel727 left	14:14
	→ parcs joined	14:14
	← Brivelt left	14:15
	← tang^ left	14:20
	→ LBV_User joined	14:20
	← Cromulent left	14:21
	→ Davey joined	14:21
	→ rgr joined	14:22
	← BitPuffin left	14:22
	← akitada left	14:22
	← stliu left	14:23
	← pen left	14:23
	← johnlcox left	14:23
	← mikecmpbll left	14:23
	← nevyn left	14:23
	→ mikecmpbll joined	14:24
	→ mckendricks joined	14:24
	→ nevyn joined	14:24
	→ rue joined	14:24
	← rgr left	14:25
	→ pen joined	14:26
gauthierm	I'm ahead of origin by 1 commit. After I run git pull it says I'm ahead by 12 commits. Is that normal?	14:26
	→ tmcmahon joined	14:27
	→ train_or joined	14:27
	→ tang^ joined	14:28
	→ rgr joined	14:28
	← tmcmahon left	14:29
uwjesq	gauthierm: Do you have multiple remotes?	14:29
	← tritech left	14:30
	← harish left	14:30
gauthierm	uwjesq: yes, but only one that is tracking for the branch	14:31
	← kewah left	14:32
	→ papegaaij_ joined	14:32
uwjesq	gauthierm: What do you mean by tracking? Do you mean you push this particular branch only to the same remote?	14:32
	← yacks left	14:33
	← papegaaij left	14:33
	← train_or left	14:33
	← sqlnoob left	14:33
	→ jwmann joined	14:33
	← psoo left	14:34
	→ Dougie187 joined	14:35
gauthierm	The branch has a particular remote branch set as upstream.	14:35
	← nevyn left	14:35
	← hoschi left	14:35
	→ nevyn joined	14:35
	→ devth joined	14:37
	← mckendricks left	14:37
	→ kewah joined	14:37
	← ThomasLocke left	14:38
	→ crane_work joined	14:39
	→ joshsmith joined	14:39
	→ Cromulent joined	14:39
	← Sigma left	14:40
	→ train_or joined	14:40
	→ acharlieh joined	14:41
	→ \|Freeman\| joined	14:41
	← Sonderblade left	14:42
	← cagedwisdom left	14:42
	→ mutbuerger joined	14:42
	← rgr left	14:42
	← enr left	14:43
	→ hahuang61 joined	14:44
	→ aldodelgado joined	14:44
	→ Nicholas_Rishel joined	14:45
	→ boombatower joined	14:45
	← jacobat left	14:46
	→ astro73\work joined	14:48
	← lb1a left	14:48
	← andref_dias left	14:48
	← _Qman left	14:49
	→ rednaks joined	14:50
astro73\work	Is there a way to run filter-branch on a list of files, or excluding directories?	14:50
	i've pulled out a bunch of directories through repeated copy/filter-branch, and now I want everything else	14:50
	← rudak left	14:51
	← papegaaij_ left	14:51
	← hahuang61 left	14:51
	→ rudak joined	14:52
	← shwouchk left	14:52
	← dhruvasagar left	14:52
	← nbouscal left	14:53
	→ rgr joined	14:53
	← kermit left	14:53
	→ cads joined	14:53
	→ tjbiddle joined	14:54
boblee	If I am running scp command in a post-receive hook what user is it running under?	14:54
	→ kermit joined	14:54
moritz	boblee: the one that the user logged in as for the push	14:55
boblee	moritz: so it's running that command from the client, basically?	14:55
jast	boblee: if the push happens via SSH, the user account used with SSH	14:55
moritz	(if the push was via ssh; and if not, the user that the receiving daemon runs)	14:55
	boblee: well, the client has some kind of URL, like user@host:directory	14:56
	and that 'user' from before the '@' is the user name that the post-receive hook is run as	14:56
boblee	I would rather not due user@host and instead just host if it in fact uses the client username that pushed the update	14:56
	→ pitzips joined	14:57
	← Nicholas_Rishel left	14:58
	← lavaman left	14:58
	→ m8 joined	14:58
	← carlos-huang left	14:59
	→ dhruvasagar joined	15:00
	← rgr left	15:00
	boblee goes to try some tests	15:00
	← aartist left	15:01
troulouliou_dev	hi how can i add an empty folder and gitignore all its content ?	15:02
	→ FernandoBasso joined	15:02
	← AeroNotix left	15:03
	← cha1tanya left	15:03
osse	troulouliou_dev: git cannot track empty directories, but you can put a .gitignore inside it.	15:03
	in your case that could simply say '*'	15:03
troulouliou_dev	osse, just thanks	15:03
	→ Nicholas_Rishel joined	15:04
	← kewah left	15:04
	← M_____ left	15:04
	← TheJH left	15:05
	← mribeirodantas left	15:05
	→ jefflyne joined	15:05
boblee	moritz: jast: doesn't appear that the scp command is run from the client.	15:05
bklane	Hey I did a git pull and got this https://gist.github.com/blklane/a899e56a3e5d07a49481 unsure exactly how to fix	15:05
jast	boblee: that's because it isn't.	15:05
	the command runs on the server	15:05
	during the push	15:05
	→ TheJH joined	15:05
jast	the push happens via ssh	15:05
boblee	yes I push via ssh	15:06
bklane	I want to update to the last commit while also merging to that and pushing my commit	15:06
jast	thus the hook as run as the user the ssh client uses	15:06
	→ adamwathan joined	15:06
jast	i.e. if you push to foo@host, the hook runs as user foo	15:06
	→ albel727 joined	15:06
	← Cromulent left	15:06
	→ Fritz7 joined	15:06
osse	bklane: have you run git pull twice?	15:06
bklane	osse: no, should i?	15:07
osse	bklane: definitely not.	15:07
	← normanrichards left	15:07
jast	the error suggests that you ran pull (or am/merge/rebase) at an earlier time and never properly finished	15:07
osse	bklane: but it seems you had uncommited changes at the time you ran it	15:07
	→ Wizecoder joined	15:07
bklane	osse: its my front-end designer and ive never seen those, so thats what causes it?	15:08
	← cbreak-work left	15:08
adamwathan	sort of a noob question I suppose, but is it possible to squash commits only for once branch while keeping that history on a different branch? say i do a bunch of work on a development branch and want to squash those together when i push to the master branch so the master branch goes straight from A > D without commits B and C in the history, but I want to keep the full history on my development branch	15:08
	→ tritech joined	15:08
cmn	bklane: you're already in the middle of a mrege	15:08
	← rath left	15:09
osse	adamwathan: sounds to me like you want a regular merge	15:09
	→ johnlcox joined	15:09
osse	adamwathan: it's perfectly possible for A to be D's parent in the history	15:09
	← Droolio left	15:09
bklane	cnn: osse: so i changed the files with MERGE and that stuff by going in, now how do i know i fixed everything?	15:09
adamwathan	so if I do a git merge dev, the master branch wont know anything about the intermediate history?	15:10
cmn	you look at the files	15:10
	→ verysoftoiletppr joined	15:10
adamwathan	the specific scenario is we have a repository where our client can view the codebase but we want to keep that repository as clean as possible (just pushing a full iteration at a time) while maintaining a more detailed history in our own repository	15:10
	and where the client doesn't have any way to see anything besides the per iteration commits	15:11
	→ nicknisi joined	15:11
osse	adamwathan: that's not possible with git	15:11
moritz	huh?	15:11
	git merge --squash seems to do what adamwathan wants, unless I misunderstood	15:11
	the full history is still on the original branch	15:11
osse	ahh, yes that could work	15:11
cmn	bklane: once there are no more conflict markers and the files look like you think they should, stage the changes and commit your merge	15:12
	← aChatir left	15:12
	← tallest_red left	15:12
moritz	but branch master only sees one commit	15:12
	← babilen left	15:12
	→ tallest_red joined	15:13
adamwathan	ah ok git merge --squash looks promising. that won't squash the commits on the branch im merging from correct? so I'll still have a full history on the original branch, and the branch that performed the merge just gets those commits all squashed into one applied on top of it?	15:13
	→ enr joined	15:13
osse	yes	15:13
moritz	adamwathan: correct	15:14
adamwathan	great, thanks moritz and osse going to play with it now	15:15
moritz	adamwathan: and !backup before playing :-)	15:15
gitinfo	adamwathan: 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	15:15
	→ lavaman joined	15:16
	← dfanjul left	15:17
	dpac → dpac\|away	15:17
	← danecando left	15:17
bklane	thank you cmn and osse	15:17
	← _iron left	15:18
	← Sir_Rai left	15:19
	← jefflyne left	15:20
	← enr left	15:21
	→ aard_ joined	15:21
	← ecube left	15:22
	← sampiero left	15:23
	← ewnd9 left	15:24
	→ ewnd9 joined	15:24
	→ normanrichards joined	15:25
	→ ecube joined	15:25
	← Balliad left	15:26
	← Fritz7 left	15:26
	→ ISF joined	15:26
	← gua_ould left	15:29
	← JosephSilber left	15:30
	← aard_ left	15:30
	→ simesy joined	15:30
	→ vince_prignano joined	15:31
	→ aard_ joined	15:31
	← vince_prignano left	15:31
	→ groglogic joined	15:31
	→ vince_prignano joined	15:33
	→ nicedice joined	15:35
	→ rkunde joined	15:35
	→ kewah joined	15:36
	← kewah left	15:37
	← jkremser left	15:37
	← rudak left	15:37
	→ WhoKnew joined	15:37
	→ Katafalkas joined	15:39
	← nevyn left	15:40
	← P1x3lF1r3_ left	15:40
	→ [1]tritech joined	15:40
	→ sferry joined	15:41
	← sferry left	15:41
	→ sferry joined	15:41
	← tritech left	15:41
	→ nevyn joined	15:41
	rohan32\|afk → rohan32	15:41
	→ tritech joined	15:41
adamwathan	is it possible to checkout a new branch with none of the history of the branch it is branching from?	15:42
osse	adamwathan: --orphan	15:42
adamwathan	great thanks again osse	15:42
	← trungqtran left	15:43
	← [1]tritech left	15:45
	→ ojacobson joined	15:45
	→ fridim_ joined	15:45
	← rkunde left	15:46
	→ sampiero joined	15:46
	→ rkunde joined	15:46
	← mutbuerger left	15:47
	← barneybook left	15:47
	← dhruvasagar left	15:48
	← nova_ left	15:48
	→ hahuang61 joined	15:48
	← \|Freeman\| left	15:49
	→ rabellamy joined	15:49
	→ shinnya joined	15:49
	→ nova_ joined	15:49
	→ Shusshu joined	15:49
	← Wizecoder left	15:50
	← Shusshu left	15:50
	→ ericweic63amg joined	15:51
	→ dhruvasagar joined	15:52
	← mechasr left	15:52
	← Dougie187 left	15:52
	← jargon left	15:53
	← WhoKnew left	15:53
	→ kesha_ joined	15:53
	→ P1x3lF1r3_ joined	15:55
	→ aberrant joined	15:55
	← elixir_ left	15:55
	→ _elixir joined	15:55
	← sampiero left	15:56
	→ sampiero joined	15:56
	→ sgambino_ joined	15:56
	← hahuang61 left	15:56
	← rabellamy left	15:57
	→ rath joined	15:58
	← sampiero left	15:58
	→ Wizecoder joined	15:58
	← Milossh left	15:58
	← Destos left	15:58
	→ sampiero joined	15:59
	→ duch_kazatel joined	15:59
	← mikecmpbll left	16:00
	← sgambino left	16:00
	sgambino_ → sgambino	16:00
	→ babilen joined	16:01
	→ rosco_y joined	16:01
	← gebi left	16:02
	← ecube left	16:02
	→ Milossh joined	16:03
rosco_y	I have a file that became corrupted recently--how do I restore it to a prior versions?	16:03
	← Christi123 left	16:03
	← valgrind left	16:03
osse	rosco_y: git checkout <commit> -- <file>	16:03
	← Piggy_ left	16:04
rosco_y	osse: thank you again!	16:04
	→ ecube joined	16:04
	→ mechasr joined	16:05
	→ WhoKnew joined	16:07
	← ericweic63amg left	16:07
	← mklappstuhl left	16:09
osse	np	16:09
	← LadyRainicorn left	16:09
	→ LadyRainicorn joined	16:09
	← achadwick left	16:10
	→ mklappstuhl joined	16:10
	→ Destos joined	16:11
	← Asenar left	16:15
	← jwmann left	16:15
	→ jefflyne joined	16:16
	→ jwmann joined	16:16
	→ Guest___ joined	16:16
	← salamanderrake left	16:16
	→ zerorez joined	16:16
	← konundra left	16:17
	→ _BJFreeman joined	16:18
	→ enr joined	16:18
	_BJFreeman → BJfreeman	16:18
	→ dc5ala joined	16:20
	→ akitada joined	16:20
	→ salamanderrake joined	16:20
	← Plummer left	16:21
	→ revyd joined	16:21
	← nicholasruunu left	16:22
	← noname001 left	16:23
	← enr left	16:23
	← onethfour left	16:23
	← konadr left	16:24
	→ goshawk joined	16:24
	→ Christi123 joined	16:25
	→ jnavila joined	16:25
	→ rudak joined	16:25
	← jrex left	16:25
	← Destos left	16:25
	→ cenuij joined	16:26
	→ Liir joined	16:27
	← FernandoBasso left	16:27
	← mechasr left	16:27
	← WhoKnew left	16:30
	← DolphinDream left	16:30
	→ jrex joined	16:31
	← Guest___ left	16:32
	← markalanevans left	16:32
	← LadyRainicorn left	16:33
	← simesy left	16:33
	→ Destos joined	16:34
	← m8 left	16:34
	← deuterium left	16:34
	→ DolphinDream joined	16:34
	→ kadoban joined	16:35
	← tjbiddle left	16:36
	→ devoldmx3 joined	16:38
	← devoldmx3 left	16:38
	→ onethfour joined	16:39
	→ devoldmx joined	16:39
	→ plasticboy joined	16:39
	→ mechasr joined	16:40
	mechasr → chasr	16:41
	chasr → mechasr	16:41
	← hyperair left	16:42
	← rudak left	16:42
	→ devoldmx3 joined	16:43
	→ cofeineSunshine joined	16:43
	← michaelarestad left	16:43
	← mechanicalduck left	16:44
	→ devoldmx27 joined	16:44
	→ iAsterisk joined	16:44
	→ drizzd joined	16:45
	→ mechanicalduck joined	16:45
	← crane_work left	16:45
	← devoldmx left	16:45
	← w0ng left	16:46
	→ Fritz7 joined	16:47
	← devoldmx3 left	16:47
	← sferry left	16:47
	→ sferry joined	16:48
	→ devoldmx joined	16:49
Norrin	trying to figure out a workflow that supports the following:	16:50
	if I have changes that I want to keep out of master....	16:50
	← maxmanders left	16:50
Norrin	but are required for any form of testing whatsoever….	16:50
PerlJam	... don't put them in master ;)	16:50
skorgon	lol	16:50
	→ ErKa joined	16:50
luto	branch!	16:50
duch_kazatel	create a new branch that you merge with master.	16:50
	← drizzd left	16:50
duch_kazatel	rather - that you merge master into on occasion	16:51
Norrin	what type of branch setup could i use to develop features with the needed testing coe, but then merge the features into master easily	16:51
	?	16:51
skorgon	why would you keep things that are required out of master?	16:51
	that workflow seems broken by design	16:51
	← mechanicalduck left	16:51
Norrin	they are private keys, on an open source project, so master excludes the keks	16:52
	keys*	16:52
	seems like i may have stumped the crowd	16:53
arand	Sounds iffy to keep them in vcs at all.	16:53
PerlJam	Norrin: so ... they shouldn't show up in any branch, should they?	16:53
	← devoldmx27 left	16:53
skorgon	yeah, i think i'd try to check in some dummy keys so everything works and think about deployment with real keys later	16:53
duch_kazatel	sounds like you need to either create an excluded config file, or .gitignore them.	16:53
	*and .gitignore	16:54
	→ Noldorin joined	16:54
	→ noname001 joined	16:54
Norrin	PerlJam, well no branch that is public	16:55
	← alkino left	16:55
Norrin	duch_kazatel, that sounds like i t might work	16:56
	was using git stash initially… but that evidentability gets combined in stashes with other changes.	16:56
	→ hahuang61 joined	16:56
duch_kazatel	that's not what stash is for :(	16:57
	→ mechanicalduck joined	16:57
cmn	that's the only real place where the stash is useful above doing saner things	16:57
	← shruggar left	16:58
	← devoldmx left	16:58
	→ rudak joined	16:59
	← staodd left	16:59
	→ iliketurtles joined	16:59
	→ cigarshark joined	16:59
	← jayfk left	16:59
	← Christi123 left	17:00
	← X3NQ left	17:01
	← hahuang61 left	17:02
	→ Christi123 joined	17:02
	← kesha_ left	17:02
	← SuperLag left	17:03
	→ jerius joined	17:04
	→ kesha_ joined	17:04
	← vince_prignano left	17:04
	← jnavila left	17:04
	← khushildep left	17:05
	→ donmichelangelo joined	17:05
	→ aChatir joined	17:06
	← Christi123 left	17:06
	← kesha_ left	17:06
	→ Christi123 joined	17:07
	→ kesha_ joined	17:07
	← worstadmin left	17:07
	← JSharpe_ left	17:07
	→ smooki joined	17:09
smooki	hi guys	17:09
gitinfo	smooki: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	17:09
	← jperry left	17:09
luto	gitinfo: you are not guys, you are bot. Shut up.	17:09
	→ _________ joined	17:09
	→ michaelarestad joined	17:10
smooki	I need to know how I can save my work (maybe to a different branch) then checkout to my last commit, is thatpossible ?	17:10
	← donmichelangelo left	17:10
luto	stash, maybe?	17:10
	!stash	17:10
	!stashing	17:10
	!stashes	17:10
	← arand left	17:10
luto	meh.	17:10
smooki	stash, ok let see that	17:10
	→ jperry joined	17:10
PerlJam	luto: first you tell the bot to shut up, then you try to make it talk. Make up your mind! ;)	17:10
	→ newbie joined	17:10
luto	PerlJam :D	17:10
smooki	:)	17:10
PerlJam	smooki: you can always save your work to a branch if you need to.	17:11
smooki	gitinfo: !stash	17:11
	newbie → Guest34885	17:11
luto	!help	17:11
gitinfo	What do you need help with? Something with git? Tell us what's going on, and please be specific. For information on how to abuse me (I'm a bot!), see http://jk.gs/git/bot . Please be gentle.	17:11
smooki	PerlJam: well I would prefer that	17:11
luto	hmm.	17:11
	← ferdev left	17:11
	→ maasdesigner1 joined	17:11
	→ hyperair joined	17:11
	← iliketurtles left	17:11
luto	is there really no !stash? :-/	17:11
	→ yacks joined	17:11
smooki	git branch 'newbranch' without commit ?	17:12
	← jerius left	17:12
	→ Sonderblade joined	17:13
PerlJam	smooki: to be clear ... you have local changes that have not yet been committed and you want to commit them to sa new branch?	17:13
	→ tjbiddle joined	17:13
	← causasui left	17:14
PerlJam	smooki: if that's the case, you can do "git checkout -b new-branch", then commit your changes, then "git checkout old-branch" to get back where you were without those changes	17:14
smooki	ok thanks	17:14
	→ crane joined	17:14
	→ Dougie187 joined	17:14
	→ trungqtran joined	17:14
smooki	I wanted to be sure :D	17:14
PerlJam	smooki: See !float	17:14
gitinfo	smooki: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	17:14
	← kevwil left	17:15
smooki	hmmm	17:15
	ok	17:15
	never done patch etc so I prefer to backup by hand	17:15
	← trungqtran left	17:16
smooki	I need to practice more	17:16
	maasdesigner1 → maasdesigner	17:16
	← JakePee left	17:16
	→ trungqtran joined	17:16
	← verysoftoiletppr left	17:17
Norrin	slip of the mind….	17:18
	← anonymuse left	17:18
Norrin	think i just reminded though	17:18
	(moving HEAD backwards in time)	17:19
	reset & rebase	17:19
	← aldodelgado left	17:19
	← sampiero left	17:19
	← meLon left	17:19
	→ worstadmin joined	17:20
	→ Mode-M joined	17:21
	→ iliketurtles joined	17:21
	→ dreiss joined	17:22
	← michaelarestad left	17:23
	← jason237 left	17:23
	→ michaelarestad joined	17:24
	→ kesha__ joined	17:25
Norrin	duch_kazatel, hmm it's not paying attention to the gitignore. probably because the files are part of tracking?	17:25
	→ rnsanchez joined	17:26
Norrin	I see what you meant now. can't have them in tracking	17:26
	← nicknisi left	17:26
	→ michaela_ joined	17:26
	→ ferdev joined	17:27
	← aChatir left	17:27
	← michaelarestad left	17:28
	← kesha_ left	17:28
	← kesha__ left	17:30
milki	is there a way to specify which config files to read or which ones to ignore? i have a test for my hooks, but allows config to disable them. turns out the user's global configs disabled them so the tests failed unexpectadly	17:30
	← OOPMan left	17:30
milki	unexpectedly?	17:30
	← normanrichards left	17:30
milki	that looks better	17:30
	← train_or left	17:30
	→ Cromulent\|2 joined	17:31
	→ deuterium joined	17:33
	→ geekbri joined	17:33
	→ LuxuryMode joined	17:33
cmn	you can specify --system, --global or --local	17:35
LuxuryMode	So I deleted a file and put a new one it in its place (happened to be some png) and after I committed and tried pushing git said everything was up to date..but the remote definitely has the old asset	17:35
	→ train_or joined	17:35
cmn	check that you really included the file in the commit and that you're pushing the right branch	17:36
	← mfulz left	17:36
	← Cromulent\|2 left	17:36
	→ mfulz joined	17:36
	← smooki left	17:36
	→ PaulCapestany joined	17:37
LuxuryMode	cmn, hmm i actually dont see the commit now	17:37
	whats the right way to replace an asset like this?	17:37
	as far as git goes	17:37
cmn	the same way as every other modification	17:38
milki	cmn: can i do that while running other git commands?	17:38
	well	17:38
cmn	milki: no, that's just for git-config	17:38
milki	i should just @!tias	17:38
	cmn: i thought so	17:39
LuxuryMode	cmn, in my file system just replace the file?	17:39
	← Wizecoder left	17:39
	→ konundra joined	17:39
cmn	LuxuryMode: yes	17:39
LuxuryMode	git didnt seem to detect any change when i first did that	17:39
	→ h0bbit joined	17:39
LuxuryMode	so i git rm'd it and then added it	17:39
	→ maxmanders joined	17:39
LuxuryMode	git then detected it	17:39
	→ LekeFly joined	17:39
LuxuryMode	i then added and committed	17:39
	but dont see the commit	17:39
cmn	that won't change what git "detects"	17:39
	→ maslowbeer joined	17:39
milki	cmn: i think my only solution would be just to have a local gitconfig for my tmprepo that overrides the users gitconfig	17:39
LuxuryMode	looks like i needed to commit the git rm before adding...	17:40
	works now	17:40
cbreak	LuxuryMode: no	17:40
cmn	that won't change it	17:40
LuxuryMode	dunno what happened or where im confused	17:40
cbreak	you don't need to git rm in the first place	17:41
	just change, git add the change, commit, push, done	17:41
cmn	this is exactly the same as every other single modification you've done to your repo	17:41
LuxuryMode	cbreak, tried that but it didnt work	17:41
cbreak	LuxuryMode: of course it worked!	17:41
LuxuryMode	maybe i did something else wrong	17:41
	whatever, works now	17:41
	thought that it should work the way you said	17:41
	mustve just screwed something up	17:41
	oh well	17:41
	→ thiago joined	17:43
	← Element9 left	17:44
	→ Sigma joined	17:44
	→ simesy joined	17:44
	→ hwrd\|work joined	17:45
	← LekeFly left	17:45
	← aberrant left	17:46
	→ JakePee joined	17:46
	← mechanicalduck left	17:46
	← pen left	17:46
	→ arand joined	17:47
	→ mdhopkin_ joined	17:48
	← maxmanders left	17:48
	← _________ left	17:49
	← simesy left	17:49
	← nevyn left	17:49
LBV_User	why git status is saying I'm ahead 1 commit, but when I git push everything is up-to-date?	17:49
	→ jayfk joined	17:49
	→ maxmanders joined	17:49
	→ _________ joined	17:49
	→ nevyn joined	17:50
	→ mechanicalduck joined	17:50
	← fobban left	17:51
	← Christi123 left	17:51
	→ Christi123 joined	17:52
	→ gvr01 joined	17:52
cbreak	LBV_User: because you don't push where it compares you with? or because you didn't fetch to make sure your view of the remote is correct?	17:52
	→ fobban joined	17:52
	← fobban left	17:53
	→ kesha__ joined	17:53
	→ fobban joined	17:53
	← _goTAN left	17:54
LBV_User	cbreak: how can I get what it is using to compare?	17:54
	← yacks left	17:54
cbreak	look at the configured upstream in git branch -vv	17:54
LBV_User	oh, now it seems to be ok...	17:56
	maybe when I git push origin myBuggyBranch it updated the refs?	17:56
	← kesha__ left	17:57
	→ hahuang61 joined	17:58
	← Christi123 left	17:59
	→ rickruby joined	18:00
	← astro73\work left	18:00
	nkambo-on-holida → nkambo	18:01
	→ aldodelgado joined	18:02
	→ johnnyfuchs joined	18:02
	→ pr0ton joined	18:03
	← hahuang61 left	18:03
	← _________ left	18:04
	→ Mamoru joined	18:04
	→ infynyxx joined	18:04
	← Katafalkas left	18:04
johnnyfuchs	So I'm having trouble with git diff and git status, I can commit, merge, list branches, etc. But git diff and git status don't show any tracked files or changes.	18:05
	My .git/config is pretty bare	18:05
	https://gist.github.com/anonymous/92e9529fc3001ac761f1	18:05
	(well, apart from private repo info)	18:06
	Anyone ever run into this or have any thoughts?	18:06
LBV_User	dont you have ignore rules?	18:06
johnnyfuchs	yeah, but none of the files apply	18:07
	I checked .gitignore and some exclude file command	18:07
	→ dsdeiz_ joined	18:07
EugeneKay	`git status` doesn't show tracked files	18:08
	← dsdeiz left	18:08
EugeneKay	If it's tracked and unchanged, it's clean. Why do you want to be spammed with that info?	18:08
	← dvor left	18:08
johnnyfuchs	I don't, I'm changing files that were (are?) tracked, but the changes aren't showing up in diff or stat	18:09
	sorry, I meant "tracked and modified", not just tracked	18:09
	git ls-files shows the files i'm changing, but not any modifications	18:10
EugeneKay	Did you `git add` the files?	18:10
	The default behaviour of `git diff` checks work-tree against index. For index vs last commit("staged to be commited"), add --cached. For work-tree vs last commit, add HEAD.	18:12
johnnyfuchs	I did, new info though: running `git update-index --no-assume-unchanged [file_path]` now shows up in git diff	18:12
	← marhaban left	18:12
	→ agile joined	18:13
johnnyfuchs	ah yeah, you called it on the index. The work-tree index must have been out-of-date or something? Can that happen?	18:13
	→ danecando joined	18:13
EugeneKay	No, not really. Methinks you just misunderstood the output	18:13
	← danecando left	18:14
johnnyfuchs	maybe so :/	18:14
	but now `git diff` responds to changes in that file	18:14
	→ mattis_ joined	18:14
johnnyfuchs	but not others	18:14
EugeneKay	!repro	18:14
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript (https://gist.github.com/2415442) of your terminal session -- or, even better for complex issues, design a minimal case in which your problem can be reproduced, and share it with us. This will help immensely with troubleshooting.	18:14
	→ bbloom joined	18:15
johnnyfuchs	got it	18:15
	→ danecando joined	18:15
	← koda left	18:15
	← danecando left	18:16
	→ shuaib joined	18:16
mattis_	how do i delete everything in a branch and replace it with files in another branch?	18:16
EugeneKay	Delete the branch entirely and recreate it where you want it(possibly a history !rewrite); or get the contents of another branch and make a new commit?	18:17
gitinfo	[!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). If you must, you can use `git push -f` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:17
	← mklappstuhl left	18:17
	→ nathancahill joined	18:18
	→ axl_ joined	18:18
	→ enr joined	18:19
	← shuaib left	18:19
	→ guzzlefry joined	18:19
guzzlefry	Hello	18:19
	How does Git detect changes in binary files? I've changed an image but Git doesn't seem to notice.	18:20
	← troulouliou_dev left	18:20
	← maxmanders left	18:20
	→ m8 joined	18:20
	← mechanicalduck left	18:20
cmn	the same way as every other file; the contents have changed	18:21
	double-check you are changing the file you are changing, and check what status says about it	18:21
EugeneKay	(my understanding is that ) git does a `stat` check to see if the mtime has changed. If so, it hash-objects the file(basically a SHA1) and checks against what exists i nthe index	18:22
	→ g00s joined	18:22
EugeneKay	You can run `git diff -- path/to/file.jpg` to force the latter to occur, which should update `git status` output as well	18:22
	→ maxmanders joined	18:22
	→ mechanicalduck joined	18:22
	→ ffio_ joined	18:23
	← enr left	18:23
	← h0bbit left	18:24
	← ffio left	18:24
	→ kesha__ joined	18:24
	→ _iron joined	18:25
guzzlefry	oh okay, it seems this server just has really really aggressive image caching. :/	18:25
EugeneKay	Cache harder, not smarter	18:25
	← jkyle left	18:25
g00s	hi, noob question about git diff. regardless of form (wd vs index, wd vs commit, index vs commit, commit vs commit) i see 1st line printed "diff --git a/file1 b/file1" …. but i don't understand what a and b are. i t would be more intuitive if it said 'diff --git index/file1 <commit>/file1'. how should i think about a and b ?	18:26
luto	EugeneKay: it can happen that `git diff` changes stuff? o.O	18:26
	← _elixir left	18:26
EugeneKay	Not in the worktree, no.	18:27
luto	yea, in .git	18:27
EugeneKay	strace it if you want specifics ;-)	18:27
luto	I would never except a command named `diff` to write anything anywhere..	18:27
	← jsec left	18:27
	→ w0ng joined	18:27
EugeneKay	I'm pretty sure it generates at least two temp files for `diff` to work against	18:27
	→ Plouj- joined	18:28
Plouj-	hi	18:28
gitinfo	Plouj-: 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.	18:28
	→ dsdeiz joined	18:28
luto	well.. temp files	18:28
johnnyfuchs	EugeneKay: Thanks for the help! Checking out a different branch then jumping back in seemed to fix the issue. I must've been dabbling in commands that are too far over my head. :)	18:29
Plouj-	How can I clone a remote into a bare repo such that doing 'git branch -r' in the resulting repo would show origin/* branches rather than just setting up remote tracking branches?	18:29
	← dsdeiz_ left	18:29
	← ffio_ left	18:29
	← kesha__ left	18:30
EugeneKay	write(1, "diff --git a/self b/self\nnew fil"..., 69) = 69	18:30
	I don't see anything else being written	18:31
	→ Wizecoder joined	18:31
	EugeneKay shrugs	18:31
EugeneKay	Digging around in internals is a PITA	18:31
	← Wizecoder left	18:31
	← Sigma left	18:31
	← sriracha left	18:32
	← michaela_ left	18:32
	→ hahuang61 joined	18:32
	→ motto joined	18:33
	→ rabellamy joined	18:33
	← m8 left	18:34
	→ michaelarestad joined	18:35
	← rabellamy left	18:36
	← g00s left	18:36
	← ecube left	18:37
	→ _elixir joined	18:37
	← breakingthings left	18:38
	← michaelarestad left	18:38
cbreak	C++ looks so much cleaner.	18:38
	← kukks left	18:39
	← mattis_ left	18:39
	→ ecube joined	18:39
	← infynyxx left	18:40
	← johnnyfuchs left	18:40
	→ kukks joined	18:40
	← kukks left	18:40
	→ kukks joined	18:40
	→ CheckDavid joined	18:40
EugeneKay	"EugeneKay is right because EugeneKay is always right."	18:42
	Derp	18:42
	→ marhaban joined	18:44
	← dc5ala left	18:45
	→ alvaro_o joined	18:45
	→ hoschi joined	18:45
	← mfulz left	18:45
	← Nicholas_Rishel left	18:46
	→ infynyxx joined	18:47
	← marhaban left	18:49
	← tty1 left	18:49
	← keller left	18:49
	luke-jr_ → Luke-Jr	18:54
	← groglogic left	18:54
	→ breakingthings joined	18:54
	→ m8 joined	18:54
	← fobban left	18:54
	← _iron left	18:55
	← CheckDavid left	18:55
	← adamwathan left	18:56
	→ sq-one joined	18:56
	← motto left	18:56
	→ _goTAN joined	18:57
	← _goTAN left	18:57
	→ fobban joined	18:57
	→ trusktr joined	18:58
	→ octaviordz joined	18:58
octaviordz	Hi room	19:00
gitinfo	octaviordz: 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.	19:00
covi	I am doing git rebase -i master and I see a bunch of commits. How can I squash all commits into the last one? (i.e. use all commits, but use the commit message of the last commit?) What 'verbs' should I put in front of the commits?	19:02
osse	covi: squash	19:02
	covi: at the bottom of the text file there's a legend	19:02
covi	osse: yeah but I don't quite understand. Do I put 'squash' in front of all commits but the last one?	19:02
	→ bfig joined	19:03
	← frgtn left	19:03
bfig	hello, is there a way to run gitk as if there was some particular branch checked out? I want to find out whether some commits in one branch are merged to master at some point or not	19:03
covi	osse: the legend says 'meld into the previous commit' for squash, but it seems like what I want is to meld into the next commit..	19:03
osse	covi: then you put 'squah' in front of the next one instead	19:04
	covi: a commit with 'squash' in front is squashed into the one above it	19:04
	→ aartist joined	19:04
	→ srcerer joined	19:04
	→ tty1_ joined	19:04
	→ abrkn\ joined	19:05
	→ VoidAtValhalla joined	19:05
	← rue left	19:05
octaviordz	I'm using git-svn, I created a svn/tag by "git svn tag -m "x" tagname... and git basically now shows all my commits twice (in different branch) wondering if that is an known issue, and if there is a way to fix it	19:05
	→ zhost joined	19:05
covi	osse: ok, what do i put for the rest of the commits then? I want to use them, but discard their commit messages.	19:05
	→ txwikinger2 joined	19:05
	← txwikinger2 left	19:05
	→ txwikinger2 joined	19:05
	→ gsvolt_ joined	19:05
covi	osse: the legend mentions 'fixup', but it says 'like squash', which kind of confuses me.	19:05
	→ marhaban joined	19:06
	→ Nikoli_ joined	19:06
	→ mutbuerger joined	19:06
	→ sr78ger joined	19:06
	→ Fritz77 joined	19:06
	← Fritz77 left	19:06
osse	covi: put squash on all of them	19:06
	→ Dreamer3__ joined	19:06
	→ Fritz77 joined	19:06
	→ johnnyfuchs joined	19:06
	→ jargan joined	19:06
	← Fritz77 left	19:06
	→ csgeek joined	19:07
	→ acharlie_ joined	19:07
	→ sriracha joined	19:07
	→ tuvxy joined	19:07
	← MacWinner left	19:07
	→ deryni_ joined	19:08
	→ troker_ joined	19:08
	→ zacts_ joined	19:08
osse	covi: ahh, I see what you mean. When you squash you are asked to edit the commit message of the new "supercommit". Initially the buffer will contain all commit messages merged into one. But if you use fixup that commit's message is thrown away	19:08
	← bklane left	19:09
covi	osse: ok, can i use more than one verb before a commit?	19:09
	← ecube left	19:09
	→ maasdesigner1 joined	19:09
	→ ciaranm_ joined	19:09
	← ciaranm_ left	19:09
	→ ciaranm_ joined	19:09
osse	not afaik	19:09
	what are you trying to do ?	19:10
	→ ecube joined	19:10
bfig	hello, is there a way to run gitk as if there was some particular branch checked out? I want to find out whether some commits in one branch are merged to master at some point or not	19:10
covi	never mind ;) thanks	19:10
grawity	bfig: gitk yourbranch	19:10
bfig	great! thanks :D	19:10
grawity	it is a history viewer, it does not particularly care about which part of history is checked out	19:10
	bfig: `gitk --all` too.	19:10
	→ jsec joined	19:11
	→ dav2d joined	19:11
covi	OK now git says 'cannot apply SHA...' for one of the commits during rebasing. How can I see more info on the issues to start fixing it?	19:11
	→ michaelarestad joined	19:11
	→ chuckf_ joined	19:11
	→ Someguy1234 joined	19:12
covi	nvm, git status.	19:12
bfig	niceee	19:12
	→ kesroesw1yth joined	19:12
bfig	:))	19:12
	→ jdav_gon` joined	19:12
bfig	this makes everything sooo much easier :D	19:12
	← johnnyfuchs left	19:12
	← ciaranm left	19:13
	→ vals_ joined	19:13
	ciaranm_ → ciaranm	19:13
	→ insejn_ joined	19:13
	→ mechanicalduck_ joined	19:13
	→ drager_ joined	19:13
	→ Fritz77 joined	19:14
	→ bambams_ joined	19:14
	← bambams_ left	19:14
	→ bambams_ joined	19:14
	← iliketurtles left	19:14
	→ Thra11_ joined	19:15
	← tg left	19:15
	→ tg` joined	19:15
	→ g00s joined	19:15
	→ bklane joined	19:16
	→ normanrichards joined	19:16
	tg` → tg	19:16
	← Fritz7 left	19:17
	Fritz77 → fritz7	19:17
	← Dougie187 left	19:17
	→ rfoust_ joined	19:17
LBV_User	Makefile dont get rules to update files generated with configure_file, right?!	19:18
cbreak	LBV_User: what?	19:19
	← g00s left	19:19
cbreak	you aimed at some other channel but slipped? :)	19:19
	→ kesha__ joined	19:19
LBV_User	sure...	19:19
	wrong channel	19:19
	→ trusktr_ joined	19:19
LBV_User	sorry :)	19:19
	← trusktr left	19:20
	← mechanicalduck left	19:20
	← thiago left	19:20
	← maasdesigner left	19:20
	← rednaks left	19:20
	← acharlieh left	19:20
	← Thra11 left	19:20
	← Seveas left	19:20
	← troker left	19:20
	← Sebo1 left	19:20
	← abrkn left	19:20
	← insejn left	19:20
	← Dreamer3 left	19:20
	← zero7 left	19:20
	← midnightmagic left	19:20
	← sonOfRa left	19:20
	← torbjorn left	19:20
	← Sieben left	19:20
	← Naeblis left	19:20
	← jab416171 left	19:20
	← chuckf left	19:20
	← Nikoli left	19:20
	← rfoust left	19:20
	← Chaser left	19:20
	← bambams left	19:20
	← kesroesweyth left	19:20
	← drager left	19:20
	← zacts left	19:20
	← adamm left	19:20
	← txwikinger left	19:20
	← Olipro left	19:20
	← Plouj- left	19:20
	← Someguy123 left	19:20
	← tango_ left	19:20
	← deryni left	19:20
	← jdav_gone left	19:20
	← Werring left	19:20
	← jast left	19:20
	← asedeno left	19:20
	← tizzo left	19:20
	← dr_lepper left	19:20
	← Arokh left	19:20
	← SicoWork left	19:20
	← samir left	19:20
	Someguy1234 → Someguy123	19:20
	Dreamer3__ → Dreamer3	19:20
	jargan → jast	19:20
	insejn_ → insejn	19:20
	← pr0ton left	19:21
	← kesha__ left	19:21
	← octaviordz left	19:22
	→ Chaser joined	19:23
	→ rednaks joined	19:23
	← hwrd\|work left	19:24
	→ Sebo joined	19:24
	→ kesha joined	19:24
	← trusktr_ left	19:25
covi	If I am on branch A, and I want to rebase my commits onto local master, shoud I use 'git rebase -i --onto master A' or some other command?	19:25
	← PeterBooker left	19:25
	→ nicoulaj_ joined	19:25
	← nicoulaj_ left	19:25
	→ iliketurtles joined	19:26
osse	covi: no need for --onto in most cases	19:26
	→ Olipro joined	19:26
	← audiotek left	19:26
covi	osse: more info: I haven't published A, and A is checked out from master.	19:26
	← denver left	19:27
covi	osse: so only 'git rebase -i master' (while I'm on A)?	19:27
	vals_ → tango_	19:27
osse	yes	19:27
covi	osse: will try, thanks	19:27
	← train_or left	19:27
	→ scorphus joined	19:27
cbreak	leave away the -i	19:28
osse	covi: one possibility is is to rebase A "onto itself" for the interactive stuff. e.g. git rebase -i HEAD~5	19:28
	← sr78ger left	19:28
osse	and then do a regular rebase when you are done	19:28
	→ pandeiro joined	19:28
	→ michael_mbp joined	19:28
	→ Plouj joined	19:29
	← maasdesigner1 left	19:30
	→ adamwathan joined	19:30
	→ BSaboia joined	19:31
	→ dvor joined	19:31
	→ cerra_morto joined	19:31
	← aartist left	19:31
	→ aberrant joined	19:31
covi	During rebasing I tried to resolve some conflicts, then use 'git add' to mark them as resolved. However, I observed that as the rebase finished, some changes in my local commits are lost (in those marked-as-resolved files).	19:32
	→ quimes joined	19:32
covi	Is it incorrect to use add?	19:32
	→ zhost_ joined	19:32
	← zhost left	19:33
	← Olipro left	19:33
	← dvor left	19:35
	→ z8z joined	19:35
	→ dvide joined	19:36
	→ Naeblis joined	19:37
	→ WhoKnew joined	19:38
cbreak	covi: no.	19:38
	← WhoKnew left	19:38
cbreak	covi: you likely resolved incorrectly	19:38
	covi: git diff HEAD before you rebase --continue or commit	19:39
	← rath left	19:39
	← scorphus left	19:39
	→ scorphus joined	19:39
	← rudak left	19:40
	→ Olipro joined	19:40
	→ torbjorn joined	19:40
	→ Werring joined	19:40
	→ thiago joined	19:40
	→ Seveas joined	19:40
	→ midnightmagic joined	19:40
	→ sonOfRa joined	19:40
	→ adamm joined	19:40
	→ asedeno joined	19:40
	→ SicoWork joined	19:40
	→ GodEater joined	19:40
	→ Nevik joined	19:40
	→ rudak1 joined	19:40
	← p1ng left	19:40
	← noname001 left	19:40
	← Olipro left	19:41
	cerra_morto → guara	19:41
	← worstadmin left	19:41
	→ vince_prignano joined	19:42
	→ p1ng joined	19:43
	→ Olipro joined	19:43
	→ noname001 joined	19:43
	← noname001 left	19:44
	← rudak1 left	19:44
	→ napping joined	19:44
	→ etherfreak joined	19:46
	← IrishPrime left	19:46
	← gtmanfred left	19:47
	→ CheckDavid joined	19:47
	→ mencito joined	19:47
	← Mode-M left	19:47
	← infynyxx left	19:48
	→ Cromulent\|2 joined	19:48
	← guara left	19:48
	→ _iron joined	19:48
	← TheJH left	19:48
	← ecube left	19:49
	← sferry left	19:49
	← zhost_ left	19:49
	→ juliohm joined	19:49
	→ gtmanfred joined	19:49
	mechanicalduck_ → mechanicalduck	19:49
	→ TheJH joined	19:50
	→ shruggar joined	19:50
	← geekbri left	19:51
	→ noname001 joined	19:51
	→ ecube joined	19:52
	→ Komorebi joined	19:52
	← sriracha left	19:53
	→ worstadmin joined	19:53
	→ yacks joined	19:54
	← jayfk left	19:55
	← marthinal left	19:55
	→ xrq joined	19:56
	← Liir left	19:56
	→ nbouscal joined	19:57
	→ infynyxx joined	19:57
	← axl_ left	19:57
	dav2d → dav1d	19:57
	→ koda joined	19:59
	← asakura left	19:59
	→ ameoba joined	20:00
	→ PeterBooker joined	20:01
	← Komorebi left	20:02
	← oliveiraev left	20:02
	← SJr left	20:03
	← BJfreeman left	20:03
	→ asakura joined	20:04
	→ Mamoru_ joined	20:05
	← BSaboia left	20:05
	→ BSaboia joined	20:05
	→ devoldmx joined	20:06
	← nbouscal left	20:07
	← mike_af left	20:08
	→ mike_af joined	20:08
	← rickruby left	20:09
	← Mamoru left	20:09
mechanicalduck	hi	20:10
	so I used git branch -b 1.1.0 to switch to branch 1.1.0.	20:11
	was that right?	20:11
	I want the working dir to be branch 1.1.0	20:11
	← worstadmin left	20:11
cbreak	git branch -b?	20:11
	what's tat supposed to do?	20:11
	you mean git checkout -b?	20:11
	← jaeckel left	20:11
cbreak	to create a new branch 1.1.0 from current HEAD and switch to it?	20:12
	→ jaeckel joined	20:12
	← tang^ left	20:12
	← infynyxx left	20:12
covi	cbreak: what do you mean by resolved incorrectly?	20:13
	← Cromulent\|2 left	20:13
	← mike_af left	20:13
covi	cbreak: what is HEAD during rebasing?	20:14
cbreak	covi: if there are things missing then someone removed them	20:14
	cbreak looks at covi	20:14
	→ mike_af joined	20:14
cbreak	you're the prime suspect!	20:14
	→ hwrd\|work joined	20:14
cbreak	covi: HEAD is the current commit	20:14
covi	cbreak: nope, the missing things are unpublished, private, and I made those changes	20:14
cbreak	covi: that is exactly why you are the prime suspect	20:14
covi	cbreak: if I did a git rebase --abort, I can see those changes	20:14
SamB	covi: rebase is tricky :-(	20:15
cbreak	covi: who did the conflict resolution?	20:15
SamB	I remember the conflicts looking a bit backwards in rebase situations	20:15
cbreak	spill it! where were you between git rebase <newbase> and git rebase --continue?!!	20:15
	→ Liir joined	20:16
cbreak	SamB: because you "merge" the other way around	20:16
	← russt_ left	20:16
SamB	I still find it kind of confusing	20:17
	← ewnd9 left	20:18
	← Davey left	20:20
	← mechanicalduck left	20:20
	→ worstadmin joined	20:22
	→ JosephSilber joined	20:23
	← bgerber left	20:23
	← z8z left	20:23
	→ jayfk joined	20:24
	→ mechanicalduck joined	20:24
	→ \|Freeman\| joined	20:24
	→ z8z joined	20:24
	← z8z left	20:25
	← mike_af left	20:26
	→ mike_af joined	20:26
	← mike_af left	20:27
	→ mike_af joined	20:27
	← pitzips left	20:30
	→ pr0ton joined	20:31
	← devoldmx left	20:31
	← michaelarestad left	20:31
	← pr0ton left	20:31
	→ michaelarestad joined	20:32
iliketurtles	any of you use kaleidoscope.app as your mergetool?	20:32
	i am using 1.8.3.4, and when i type git mergetool or git difftool it opens kaleidoscope, but no window opens inside the app ):	20:32
	→ tmz joined	20:32
	→ jkyle joined	20:33
	→ pr0ton joined	20:33
jkyle	I have a sha I'm looking for. if I do git show <sha> I get a diff. But if I do: git --contains <sha>, I don't get any hits	20:34
	git branch --contains, rather	20:34
PerlJam	jkyle: maybe that commit isn't on a branch?	20:36
	← michaelarestad left	20:36
napping	jkyle: does the diff mention a branch or anything? I think it's just a diff against the parent, nothing to do with branches	20:36
	→ Octalot joined	20:37
	← v0n left	20:39
	← Liir left	20:40
	→ Collin_ joined	20:41
Collin_	Is it possible to make git perform some action on a pull? i.e. pull another repository	20:41
jkyle	napping: it doesn't mention a branch, but I don't think the other commits do either (did a git show <sha1> on a commit in the current branches history)	20:42
	→ bgerber joined	20:43
napping	yeah, I mean that git show giving you a diff doesn't imply the commit is reachable from branches	20:43
	→ groglogic joined	20:43
	→ tatsuya_o joined	20:43
jkyle	napping: how can I find out where it's located/reachable from?	20:43
	→ infynyxx joined	20:43
SamB	Collin_: maybe just define a new alias command that does the thing you want done?	20:43
	← aberrant left	20:43
docwhat	I'm just curious, why isn't 'core.autocrlf=input' the default configuration?	20:43
jkyle	I'm doing a pull req, this sha is referenced in a submodule change...I'm verifiying it's referencing an existing sha	20:44
Collin_	SamB: Sorry, I have the caveat that I need this to happen for anyone who clones the repo	20:44
jkyle	like, where is it if not in a branch/tag	20:44
SamB	Collin_: did you want them to clone some other repository instead?	20:44
	if so, it's a pity git doesn't have an MOTD feature	20:44
	→ Rylai joined	20:44
Collin_	I have two tightly related repositories that should be a single repo	20:45
	If one is pulled, the other should also be pulled	20:45
napping	does git branch --contains find tags?	20:45
Rylai	Collin_: submodules?	20:45
gmac	no	20:45
Collin_	Submodules are so bad that they dont' deserve to be called a feature	20:45
gmac	git tag --contains does	20:46
Collin_	But yeah, they don't do that	20:46
onethfour	what file do i edit aliases?	20:46
	← fobban left	20:46
jkyle	k, not there either	20:46
	← e66 left	20:46
napping	jkyle: it might also be retained as a ref that's not a branch or tag (or maybe even just not quite GC'd yet)	20:46
jkyle	if it's not in a branch and not in a tag, where might it be?	20:46
	→ fobban joined	20:47
	→ e66 joined	20:47
	← infynyxx left	20:48
	→ shrodikan joined	20:48
shrodikan	Hello all	20:49
gitinfo	shrodikan: 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.	20:49
jkyle	what I want to protect against is a submodule sha being referenced that doesn't exist upstream...so I have to verify it's reachable.	20:49
	→ kvalle joined	20:49
	← kvalle left	20:49
napping	can you run git gc upstream and see if the sha still exists?	20:49
	or do you want a way to check automatically?	20:49
jkyle	I can figure out automated ways later, probably just in our build server when it gets finished.	20:50
	→ train_or joined	20:50
napping	how did you get the sha in the first place?	20:50
	← nathancahill left	20:51
jkyle	it's referenced as the submodule sha in a parent project	20:51
	← mechanicalduck left	20:51
napping	is it referenced in the child project?	20:51
jkyle	so I wasn going to find the branch and verify it exists upstream	20:51
	← dsdeiz left	20:51
shrodikan	So I stashed quickly (I use git-extensions), switched to a different branch and came back + applied my stash and did some more work. Now my local master is ahead of origin/master (visual representation here http://i.imgur.com/4ONfbGY.png?1). I don't know how I get back in synch with origin/master	20:52
	if that makes sense	20:52
jkyle	I can show it with "git show sha" in the child project, but I can't actually find where it is...which is someone important.	20:52
napping	what's in .git/refs in the child project?	20:52
jkyle	is somewhat* important	20:52
	← quimes left	20:52
jkyle	lessee	20:52
	→ nathancahill joined	20:52
napping	also .git/packed-refs	20:53
	→ Dougie187 joined	20:53
jkyle	yeah, there's some hits in refs	20:53
	→ mechanicalduck joined	20:53
napping	how did you check?	20:53
LBV_User	how can I get only the sha1 from the current commit?	20:53
jkyle	it's in package-refs too	20:53
napping	I just know you can put all sorts of directory structure under refs, but not how to see if a commit is reachable from them	20:54
	← hahuang61 left	20:54
napping	or is it actually named by one of those?	20:54
jkyle	napping: grep'd	20:54
napping	ah, so it is literally some ref	20:54
	which?	20:54
jkyle	I'm seeing stuff like this: .git/FETCH_HEAD:96906e76e4544bcc4cf4676ec4bb248d7d3be27enot-for-mergebranch 'feature/BD-135-pao12' of	20:54
	and	20:54
	.git/info/refs:96906e76e4544bcc4cf4676ec4bb248d7d3be27erefs/remotes/origin/feature/BD-137-pao11	20:55
	← troker_ left	20:55
	→ DoniRS joined	20:55
	← pr0ton left	20:56
napping	is that in the parent or child? Either way, those don't sound like enough to be sure it's retained	20:56
jkyle	child	20:57
	← freeed left	20:57
	→ pr0ton joined	20:57
	← Sebo left	20:57
jkyle	there's gotta be a way to find out where a sha is coming from	20:58
	just did a fresh clone, it's still in there.	20:58
	→ Sebo joined	20:58
	← TheBrainWork left	20:58
napping	oh, that's a clone of the child?	20:59
	→ Davey joined	20:59
	← Sebo left	20:59
jkyle	just now, made a clone. yeah	20:59
	→ infynyxx joined	20:59
napping	.git/info is some kind of cache of .git/refs, I think	20:59
	but it sounds like you have a refs/feature/BD-137-pao11 on the server	20:59
	→ Sebo1 joined	21:00
	→ iamtakingiteasy joined	21:00
	← gvr01 left	21:00
	← konundra left	21:00
	← zacts_ left	21:00
	← spaceonline left	21:01
	→ rickruby joined	21:01
	← PeterBooker left	21:01
	→ [1]tritech joined	21:01
	→ justinabrahms joined	21:02
	← tritech left	21:02
	[1]tritech → tritech	21:02
	→ zacts joined	21:02
jkyle	I give up, here's to hoping things don't break upstream :P	21:02
	← trungqtran left	21:02
justinabrahms	hey guys. A VCS tool I was using discarded my commit before it was written out due to git pre-commit hook failing (yay!). Is there a way to find things that were once added to stash but since "pop"ed?	21:03
jkyle	feature/blahblah is just a branch. so I don't know why, if it's there, git branch --contains doesn't show it	21:03
	→ ColKurtz joined	21:03
	← shrodikan left	21:03
gmac	try git branch -a --contains?	21:03
	← parcs left	21:04
	← ojacobson left	21:04
	← Guest34885 left	21:04
covi	cbreak: i did the resolution	21:04
jkyle	nice!	21:04
	did it	21:04
johndo	justinabrahms: shouldn't your changes still be staged when the commit failed?	21:04
gmac	jkyle: awesome	21:04
	→ noyb joined	21:05
justinabrahms	johndo: they should be, but they are not.	21:05
	bug in my IDE (what joy!)	21:05
	→ ojacobson joined	21:05
	← DolphinDream left	21:06
	← rickruby left	21:06
	→ troker joined	21:07
	← LuxuryMode left	21:07
	← breakingthings left	21:08
	← aldodelgado left	21:08
napping	jkyle: If you were working in a clone, the branches would come down as remote-tracking branches.	21:09
cbreak	covi: yes. You probably accidentally removed things	21:09
napping	and I was misreading that ref, guess everything under remotes is a branch	21:09
	← nilg left	21:09
cbreak	covi: you can try again if you want	21:09
	rohan32 → rohan32\|afk	21:09
	← mechanicalduck left	21:10
	← hwrd\|work left	21:11
	→ mechanicalduck joined	21:11
	← marhaban left	21:11
	→ mribeirodantas joined	21:11
milki	can remote names contain /?	21:11
	milki tries	21:11
	→ marhaban joined	21:11
milki	omg	21:12
	it can	21:12
	that sucks	21:12
	→ SuperDMP joined	21:12
milki	its not easy to parse out the remote name from a branch ref without knowing remote names then...	21:13
	rohan32\|afk → rohan32	21:13
	→ Sieben joined	21:14
comps	milki: the point is that you should not be parsing a remote name from a branch ref	21:14
	there's git-remote for that	21:14
	→ zero7 joined	21:14
milki	git clone --branch cant handle branch names with the remote name in it	21:14
	as far as i can tell	21:14
	though this is only what someone said	21:15
	i should try it...	21:15
comps	ehrm	21:15
	← Spyro left	21:15
covi	cbreak: let's say I have three commits: A, B, C to rebase, in that order. In C I have a function, but after rebasing (and resolving conflicts in the process -- i am pretty sure I just take whatever is in HEAD and delete whatever is theirs in the process) that function is gone.	21:15
	→ jab416171 joined	21:15
	← iliketurtles left	21:15
	→ verysoftoiletppr joined	21:16
milki	fatal: Remote branch origin/master not found in upstream origin	21:16
	comps: ^	21:16
cbreak	covi: theirs is C	21:16
	→ parcs joined	21:16
cbreak	covi: HEAD is the thing you rebase on	21:16
	← maslowbeer left	21:16
cbreak	if you have X, Y, A, B, C, and there's now X, Y, Z, and you rebase A, B, C onto it	21:17
	then the first step will be X, Y, Z, A'	21:17
	if that is conflict free that is	21:17
	then X, Y, Z, A', B'	21:17
	then, if you get a conflict with C, HEAD points to B'	21:17
	and theirs is C	21:18
	covi: see also !cs	21:18
gitinfo	covi: "Git for Computer Scientists" is a quick introduction to git internals for people who are not scared by phrases like Directed Acyclic Graph. http://eagain.net/articles/git-for-computer-scientists/ See also !concepts !bottomup	21:18
	→ cagedwisdom joined	21:18
johndo	covi: try merge.conflictstyle = diff3	21:18
	← ISF left	21:18
johndo	that helped me a lot when resolving conflicts manually	21:18
comps	milki: well it works for me	21:18
	git version 1.7.2.5	21:19
	→ grampajoe joined	21:19
	← zerorez left	21:19
	← jrex left	21:19
	← _iron left	21:19
	→ enr joined	21:20
johndo	covi: (and to understand the merging better)	21:20
	→ aberrant joined	21:20
	→ Spyro joined	21:20
	→ axl_ joined	21:20
	→ hahuang61 joined	21:20
	← shruggar left	21:20
	→ rabellamy joined	21:21
	→ SHyx0rmZ joined	21:21
comps	milki: http://pastebin.com/dMDMNLkn	21:23
	milki: it works even if I rename "del1" to "origin" and try to clone it to ie. del3	21:23
milki	thats because its a real branch name now...	21:24
comps	so?	21:24
	← enr left	21:24
milki	im not trying to clone a branch named origin/master	21:25
	im trying to clone a branch names master	21:25
comps	I was just trying to prove that this statement is false:	21:25
	23:14 < milki> git clone --branch cant handle branch names with the remote name in it	21:25
milki	and it is mistaken to tack on a remote name	21:25
	← grampajoe left	21:25
milki	o ok	21:26
	that wasnt clear	21:26
	← Pengoo left	21:26
	→ Nicholas_Rishel joined	21:26
	→ Pengoo joined	21:26
comps	I still don't get what your issue is :)	21:27
	← sq-one left	21:27
	← infynyxx left	21:27
milki	i thought it was obvious if the branch existed and i mentioned that in --branch	21:27
	rohan32 → rohan32\|afk	21:27
	← hellopat left	21:27
	→ infynyxx joined	21:27
milki	if i have a branchref that isnt a sha or just the branch name, clone --branch cant handle it	21:28
	and i dont believe there are any utilities that can parse out the real branch name without the git repo	21:28
	← ColKurtz left	21:28
	← dytrivedi left	21:28
	← hahuang61 left	21:29
milki	it might be able to infer from the git ls-remote listing, but im not sure if that is sufficient/accurate in all cases	21:29
comps	uh .. come again? ... it's called --branch because it operates on branches ... if you try to give it a tag, it will use just HEAD (default, ie. master) - "Remote branch wootag not found in upstream origin, using HEAD instead"	21:30
Collin_	Any idea why my post-merge hook isn't running? It's content is just '#!/bin/sh \ echo test'	21:30
milki	is it executable?	21:30
comps	milki: still not sure what you mean by "real branch" .. is there some "unreal" branch?	21:31
milki	comps: how can you tell if origin/branch is the branch name or if branch is the branch name?	21:31
	← mechanicalduck left	21:31
comps	milki: just from the string itself, you can't ... you need to take context into account	21:31
milki	if its impossible, then i think thats the answer then	21:32
	→ jrex joined	21:32
	← maxmanders left	21:32
comps	milki: git-clone uses two arguments by default, argv[1] for source, argv[2] for destination ... if you specify --branch, it reads (via getopt()) an additiona argument for the --branch option, which is a branch name, regardless of any slashes	21:33
	→ mechanicalduck joined	21:33
comps	so it's still git-clone --branch <branchname> <source> <destination>	21:33
	ie. git-clone --branch origin/master origin master is perfectly fine :)	21:34
	← ojacobson left	21:34
covi	cbreak: thanks	21:35
	johndo: thanks	21:35
	← nicedice left	21:35
	→ nicedice joined	21:36
	← Vampire0 left	21:36
	← pr0ton left	21:36
	← jkyle left	21:36
	→ devoldmx joined	21:37
	← mutbuerger left	21:38
	← HedgeMage left	21:38
	← _elixir left	21:39
	→ g00s joined	21:40
	→ Vampire0 joined	21:40
	← adamwathan left	21:40
	← axl_ left	21:41
	→ maslowbeer joined	21:42
	→ michaelarestad joined	21:42
	← scorphus left	21:43
g00s	hi, in "diff --git a/Rakefile b/Rakefile" … what are "a" and "b" ?	21:43
	← saintcajetan left	21:43
	→ FernandoBasso joined	21:43
	← infynyxx left	21:43
	← babilen left	21:43
	← train_or left	21:43
	→ _elixir joined	21:46
	→ sriracha joined	21:46
	→ hwrd\|work joined	21:47
	→ babilen joined	21:47
	← michaelarestad left	21:47
	→ pr0ton joined	21:47
	→ HedgeMage joined	21:48
	→ rudak joined	21:49
	← rudak left	21:49
	→ adamwathan joined	21:49
	→ mattis_ joined	21:50
	→ infynyxx joined	21:50
	← hoschi left	21:50
	← troker left	21:51
	→ Katafalkas joined	21:51
	→ danman joined	21:53
	→ freestyl3r joined	21:54
	→ akurilin joined	21:54
	← Katafalkas left	21:54
	← mike_af left	21:55
	→ Balliad joined	21:55
	← devoldmx left	21:55
	← loteriety left	21:56
	→ train_or joined	21:57
	← infynyxx left	21:58
	→ rudak joined	21:58
	← rudak left	21:58
	← adamwathan left	22:00
	← nicoulaj left	22:01
	→ rickruby joined	22:01
	← jefflyne left	22:02
	→ trusktr_ joined	22:02
	← Destos left	22:02
grawity	they're directory names – although they almost never get used	22:02
onethfour	is there a way to run a command while checking out a branch?	22:03
	← mechanicalduck left	22:03
onethfour	or immediately after	22:03
	← natechan left	22:03
grawity	g00s: almost all patches are applied with -p1, that is, with the first path component being stripped, because even before Git and similar programs, people would create diffs by running `diff -r -u someproject-original/ someproject-updated/`	22:03
	→ jefflyne joined	22:04
grawity	onethfour: `man githooks`, look for post-checkout	22:04
gitinfo	onethfour: the githooks manpage is available at http://jk.gs/githooks.html	22:04
	→ mechanicalduck joined	22:04
onethfour	just found it	22:05
	→ jnavila joined	22:06
	← kermit left	22:06
	← LBV_User left	22:06
	← Thra11_ left	22:07
	← rickruby left	22:07
	← jefflyne left	22:07
	← aard_ left	22:09
g00s	grawity ok, thanks. i am confused though. of the various ways one can call git diff (wd/index, wd/commit, index/commit, commit/commit, etc) … when i see "--- a/file1" and "+++ b/file1" i'm still not sure how to discern which file is from the wd/index/commit	22:09
	→ kermit joined	22:10
grawity	g00s: try enabling the diff.mnemonicPrefix config option	22:11
	(see `man git config`)	22:11
gitinfo	the git-config manpage is available at http://jk.gs/git-config.html	22:11
g00s	grawity awesome! thats exactly what i was looking for, thanks !	22:12
	← jrex left	22:12
	→ devoldmx joined	22:13
	→ Thra11_ joined	22:14
	→ JorgeRuiz joined	22:14
	← devth left	22:15
onethfour	is there such thing as a machine-wide post-checkout hook?	22:16
	rather than repo-based	22:16
osse	onethfour: the one you write that you symlink all the others too :)	22:16
	← Dougie187 left	22:17
onethfour	that could get messy	22:17
osse	why?	22:17
onethfour	there are other machine-wide global options, why not hooks?	22:17
	too dangerous?	22:17
	→ longbeach joined	22:18
	← jnavila left	22:19
osse	I suppose it could be because options are inert, while hooks can be run willy-nilly	22:19
	← Thra11_ left	22:19
	→ zipper_ joined	22:20
	← g00s left	22:20
	← zipper_ left	22:20
	← redrocket left	22:21
	← mattis_ left	22:22
	→ jcao219 joined	22:23
	← tatsuya_o left	22:24
	← harobed_ left	22:24
	← kesha left	22:24
	→ ColKurtz joined	22:25
	← VoidAtValhalla left	22:25
	← Spyro left	22:25
	← jcao219 left	22:26
	→ Spyro joined	22:26
	← rnsanchez left	22:26
	→ oriba joined	22:27
	→ tatsuya_o joined	22:27
	← whaley left	22:28
	← e66 left	22:28
	← tatsuya_o left	22:28
	← Octalot left	22:30
	→ juvenal joined	22:30
	← mechanicalduck left	22:30
	→ whaley joined	22:31
	← Balliad left	22:31
	→ jnavila joined	22:32
	→ jon_r joined	22:32
	← fritz7 left	22:35
	→ jerrad joined	22:35
	← jerrad left	22:36
	→ jerrad joined	22:36
	← Underbyte left	22:37
	← marhaban left	22:37
	← train_or left	22:37
	← DoniRS left	22:38
	← boombatower left	22:38
	← _elixir left	22:39
	← hellome left	22:40
	← dreiss left	22:41
	→ jefflyne joined	22:41
	→ hellome joined	22:41
	bambams_ → bambams	22:42
	Mamoru_ → Mamoru	22:44
	← noname001 left	22:46
	→ Brivelt joined	22:47
	→ grampajoe joined	22:47
	→ Sacs joined	22:47
	← jon_r left	22:48
	→ mechanicalduck joined	22:48
	→ earny joined	22:49
	← devoldmx left	22:51
maslowbeer	what is the easiest way to git pull which overwrites any staged commits or anything local that may be diverged? i.e., i just want to git pull over everything I have locally with no merge.	22:51
	→ devoldmx joined	22:52
osse	maslowbeer: git fetch; git reset --hard origin/master	22:53
	← SuperDMP left	22:53
	← mechanicalduck left	22:54
osse	or any remote-name/branch-name	22:54
	← pdx left	22:55
maslowbeer	osse, right so in my case I want to pull origin/release-v8 over my local version. so git fetch; git reset --hard origin/release-v8	22:55
	right?	22:55
osse	yep	22:55
maslowbeer	cool thx	22:55
	← napping left	22:55
maslowbeer	that won't reset or otherwise touch my other branches tho right?	22:56
osse	nope	22:56
	only the current one	22:56
maslowbeer	cool	22:56
	← sidus left	22:56
osse	which in principle doesn't have to be release-v8	22:56
	so make sure it is	22:56
maslowbeer	right good point	22:56
	← noyb left	22:57
	← devoldmx left	22:57
	→ aChatir joined	22:57
	→ jjb123 joined	22:57
	← Brivelt left	22:58
	← kesroesw1yth left	22:58
	→ kesroesw1yth joined	22:58
	← Sacs left	22:59
	→ Joshi3s` joined	23:00
	← groglogic left	23:00
	rohan32\|afk → rohan32	23:00
	→ jnavila_ joined	23:01
	← jnavila left	23:01
	jnavila_ → jnavila	23:01
	← tty1_ left	23:01
jjb123	Hey everyone, is there a way to interactively rebase the entire current branch? I know I can do "git rebase -i HEAD~4", but can I do the entire branch so I don't have to count commits?	23:01
	→ breck7 joined	23:02
duch_kazatel	have you pushed the branch somewhere else?	23:02
	→ rickruby joined	23:02
jjb123	Nope, it's a local feature branch. I want to clean up the history before merging it into my develop branch (which is pushed).	23:02
duch_kazatel	aaaah	23:03
	you can rebase against another branch.	23:03
johndo	jjb123: rebase it against the development branch, if it's based from that	23:03
	s/based/branched/	23:03
jjb123	johndo: Can I use --no-ff when doing that? I like to have merge commits so I can keep the branch history.	23:04
osse	jjb123: git rebase -i $(git merge-base HEAD master)	23:04
	or so	23:04
	let git do the counting	23:04
	← freestyl3r left	23:04
	← TeckniX left	23:04
osse	I guess s/master/develop/ in your case	23:05
jjb123	osse: Cool, thanks. I assume I would replace master with develop if that's what I branched from?	23:05
	ah yeah nvm	23:05
	→ michaelarestad joined	23:06
	← rickruby left	23:07
	← sriracha left	23:07
	← mtk left	23:07
	← vince_prignano left	23:08
	→ harobed joined	23:08
	→ sriracha joined	23:08
	← kadoban left	23:09
	← jnavila left	23:09
	← harobed left	23:10
	→ devoldmx joined	23:11
	← ErKa left	23:12
	← nova_ left	23:13
	→ b1101 joined	23:14
	→ mtk joined	23:14
	← revyd left	23:15
	← m8 left	23:15
	← jayfk left	23:16
	← devoldmx left	23:18
b1101	I have my php, sql code on a server on which I have no permisssion to install git. Can git still copy files to it in any way ?	23:18
	→ enr joined	23:21
	← cannonball left	23:22
osse	b1101: git archive --format=tar \| ssh server 'cd /var/www; tar -xf '	23:23
	oops	23:23
	tar -xf -	23:23
	← mdhopkin_ left	23:23
	← juliohm left	23:24
	← eijk_ left	23:24
	→ jon_r joined	23:24
	← melee left	23:25
	→ dytrivedi joined	23:25
	← enr left	23:25
	→ hahuang61 joined	23:25
	← danman left	23:26
	← Nicholas_Rishel left	23:26
	← tango_ left	23:27
b1101	so it would archive it, send it over and extract it ?	23:27
	← rabellamy left	23:27
osse	yep	23:27
b1101	cool	23:27
	thx	23:27
osse	that will send whatever commit you specify it to send	23:28
	but it'll send the whole thing though	23:28
b1101	that's fine	23:28
	for now anyway.	23:28
	→ tango_ joined	23:28
osse	and convince the ultra bosses to install git	23:28
	then you could use hooks on the receiving end to make things easier	23:29
	← bbloom left	23:33
	← BSaboia left	23:33
	← jon_r left	23:34
	← acharlie_ left	23:34
	→ D4N3 joined	23:34
	→ devoldmx joined	23:36
	← tjbiddle left	23:36
	← hahuang61 left	23:37
	← egh34wz746w left	23:38
	← jjb123 left	23:38
	← SHyx0rmZ left	23:39
	← breck7 left	23:40
	→ jon_r joined	23:42
	→ tjbiddle joined	23:44
	← leen^\| left	23:44
	← tjbiddle left	23:44
	← joooooo left	23:44
	← rednaks left	23:45
	← jon_r left	23:47
	→ g0bl1n joined	23:51
	← g0bl1n left	23:51
	→ g0bl1n joined	23:51
	← grampajoe left	23:54
	→ tjbiddle joined	23:57
	← JosephSilber left	23:57
	← aChatir left	23:59

Logs Search ←Prev date Next date→

Channels Documentation