IRCloggy #git 2015-09-01

Provider of IRC logs since 2005.

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

	2015-09-01
	→ mingwandroid joined	00:00
	← Mixologic_ left	00:00
toothe	anyone?	00:01
	← imachuchu left	00:02
	← faux___ left	00:03
	← phantombeta left	00:03
	→ Mixologic_ joined	00:03
	← \|digits\| left	00:04
	→ \|digits\| joined	00:04
	← \|digits\| left	00:05
	← mingwandroid left	00:05
	→ \|digits\| joined	00:06
	← Mixologic left	00:06
	← \|digits\| left	00:07
	→ \|digits\| joined	00:07
	← \|digits\| left	00:07
	← RonRichie left	00:07
	← stickperson left	00:07
	→ Mixologic joined	00:07
	→ mingwandroid joined	00:08
	→ phantombeta joined	00:08
	← jigjug left	00:09
	→ dtrott joined	00:09
	→ \|digits\| joined	00:10
	← \|digits\| left	00:11
	→ Poof joined	00:11
toothe	gah!!!	00:11
	how do I push this!!!!	00:11
	← Mixologic_ left	00:11
	→ Mixologic_ joined	00:11
	→ zhiwliu joined	00:13
	← zhiwliu left	00:13
	→ \|digits\| joined	00:13
	← \|digits\| left	00:13
toothe	seriously, how do I comit? it keeps saying everythig it up to date	00:13
	per google, I Have a detached head.	00:13
	okay, i can't figur eout how to do this	00:14
Eugene	If you had provided a proper !transcript or even just consulted `git status`....	00:14
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	00:14
toothe	Is anyone present?	00:14
Eugene	!detach !reattach	00:14
gitinfo	[!detached] A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	00:14
	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	00:14
	← Poof left	00:14
	← Mixologic left	00:14
Eugene	Perhaps also of interest: anyone	00:15
	!anyone	00:15
gitinfo	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.	00:15
	→ bollullera joined	00:15
toothe	yeah sorry, just fristrated cuz no one was responding	00:15
	ChanServ set mode: +v	00:15
toothe	so, git status says "On branch develop-toothe \n nothing to commit, working directory clean"	00:15
qsuscs	toothe: if you have no idea of nothing, !book	00:16
gitinfo	toothe: 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	00:16
	→ dougsland joined	00:16
	→ Mixologi- joined	00:16
	→ \|digits\| joined	00:16
	← \|digits\| left	00:16
Eugene	So, you've created a new branch	00:16
dtrott	I am guessing toothe, simply wants to push	00:17
toothe	okay, so i have a detached head. I just followed gitinfo, which said checkout the current branch	00:17
	so I did git develop-toothe, then git push	00:17
	and it still says everything is up to date.	00:17
Eugene	New branches(by default) are not set up to push to any remotes. You need to explicitly say what to push, and where: `git push <remote> <mybranch> -u`	00:17
	The -u flag will make it so `git push` will Just Work like you're used to	00:17
	→ \|digits\| joined	00:18
	→ teran joined	00:18
	→ vF3hNGxc47h8 joined	00:18
	← \|digits\| left	00:19
	→ \|digits\| joined	00:19
	→ Mixologi\| joined	00:19
	→ NeverDie joined	00:19
toothe	so, I went to my other machine and git a git pull	00:19
	i saw that the branch develop-farhan was seen as present, but when I do 'git branch' it only shows master.	00:20
	← \|digits\| left	00:20
	→ \|digits\| joined	00:20
	← Mixologic_ left	00:20
	← \|digits\| left	00:20
	→ jon-mac joined	00:20
Eugene	Try `git branch -vva`	00:20
	And rememebr that !pull is more than just fetch-ing new commits	00:20
gitinfo	pull=fetch+merge (or with flags/config also fetch+rebase). It is thus not the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/	00:20
	→ \|digits\| joined	00:20
	← \|digits\| left	00:21
	← ncd\|leeN left	00:21
	→ teran_ joined	00:21
	← teran_ left	00:21
	← cbonobo left	00:22
	← mprelude left	00:22
	← maletor left	00:23
	← Mixologi- left	00:23
	→ mingwandroid_ joined	00:23
	← teran left	00:23
	← dreiss left	00:23
	→ Mixologic_ joined	00:23
toothe	so...this article seems like it would make a lot more sense if I had a sense of what I was reading	00:23
	sorry	00:23
	sometimes when you're brand new, i need to see an explanation first.	00:24
	→ \|digits\| joined	00:24
toothe	err, see what I need done first, then the explanation afterweards.	00:24
	← mingwandroid left	00:24
	← \|digits\| left	00:24
	← dougsland left	00:25
	→ \|digits\| joined	00:25
	→ Mixologi- joined	00:25
	← xcesariox left	00:25
	→ dstarh joined	00:26
	← Mixologi\| left	00:26
	← tvw left	00:26
	← leprechau left	00:28
	→ devoldmx joined	00:28
	← Mixologic_ left	00:28
	→ Mixologic_ joined	00:28
	→ leprechau joined	00:30
	← jmpp left	00:30
	← \|digits\| left	00:30
toothe	okay, so I read through this article, but I'm not certain it does what I was looking for	00:30
	← qpdb left	00:31
	→ checkItOut joined	00:31
	→ qpdb joined	00:31
	→ Mixologi\| joined	00:32
	← devoldmx left	00:32
	← Mixologi- left	00:32
toothe	http://dpaste.com/0FM4B5D	00:32
	so, i didn't want this file to be committed	00:33
	i actually put in the file .gitignore that had *.sqlite3	00:33
	but, its complaining about that file	00:33
	← Mixologic_ left	00:36
	→ dadamssg joined	00:37
bremner	toothe: it looks like you already committed that file in the past. Adding it to .gitignore after you committed doesn't help.	00:37
toothe	I'm using i had.	00:37
	→ tristanp_ joined	00:37
	→ Lyqyd joined	00:37
toothe	i just deleted it from the local git repo and did a pull, worked.	00:37
	← bronson_ left	00:37
	→ Mixologic_ joined	00:38
toothe	but, now when I do git branch, the only branch that's displayed is the master. I have to use the -r flag to view all branches. Why is that?	00:38
	→ ASOLAr joined	00:38
	→ arescorpio joined	00:38
	← tristanp left	00:39
bremner	!tracking	00:39
gitinfo	[!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branch> <remote	00:39
bremner	toothe: ^	00:39
	← Mixologi\| left	00:39
	→ faux___ joined	00:40
toothe	okay, so if I do `git fetch`, it'll make it non-read-only.	00:40
	← mingwandroid_ left	00:40
toothe	i see....	00:41
	← Sonicbit left	00:41
	→ Mixologic joined	00:41
	← dadamssg left	00:41
toothe	there....thanks!	00:41
	← d10n-work left	00:42
	← Steadfast left	00:44
	← faux___ left	00:44
	→ Mixologi- joined	00:44
	← Mixologic_ left	00:45
	→ mezod joined	00:45
	→ mehola joined	00:45
	← michael_mbp left	00:45
Tee_Pee	Why does git reset --hard still tell me I am 2 commits ahead :\|	00:46
	→ JackFruh joined	00:47
	← linux-modder left	00:48
	→ michael_mbp joined	00:48
	→ SirFunk joined	00:48
milki	those are unrelated	00:48
	→ Mixologic_ joined	00:49
	← Mixologic left	00:49
SirFunk	Did git change the default behavior of push change to push all branches?	00:49
	at some point?	00:49
milki	default behaviour of push did change	00:49
Eugene	SirFunk - Kind of. man git-config; see push.default.	00:49
gitinfo	SirFunk: the git-config manpage is available at http://jk.gs/git-config.html	00:49
	→ Mixologic joined	00:49
milki	but "push all branches" is vague	00:49
	← mehola left	00:50
SirFunk	yeah	00:50
Eugene	I prefer upstream myself shrug	00:50
SirFunk	I almost destroyed something at work.. but force pushing something.. that also force pushed master :-P	00:50
milki	dont rely on default behaviour for force push >.>	00:52
	← Mixologi- left	00:52
	← dstarh left	00:52
SirFunk	weird, mine was set to tracking	00:52
	wonder how that happened	00:52
	→ Mixologi- joined	00:53
	← Mixologic_ left	00:53
Eugene	matching?	00:53
	What's git --version say	00:53
	← ASOLAr left	00:53
SirFunk	matching? 1.9.1	00:54
	sorry 2.5.1 (wrong box)	00:54
	→ faux___ joined	00:56
	→ dstarh joined	00:56
	← LucasKA left	00:56
	← irwiss left	00:56
	→ Mixologic_ joined	00:57
	← Mixologic left	00:57
	← MZAWeb left	00:58
	→ bronson joined	00:59
	→ d10n-work joined	00:59
	→ Mixologi\| joined	00:59
	← Mixologi- left	01:00
	← faux___ left	01:00
	← n00bdev left	01:00
	← mezod left	01:01
	→ \|digits\| joined	01:02
	← UmbraMalison left	01:02
	← \|digits\| left	01:03
	→ \|digits\| joined	01:03
	← \|digits\| left	01:03
	→ Vampire0 joined	01:03
	→ \|digits\| joined	01:03
	← \|digits\| left	01:03
	← Vampire0 left	01:03
	→ Vampire0 joined	01:03
	← rubie left	01:03
	← Mixologic_ left	01:04
	→ rchavik joined	01:04
	→ IWishIKnew joined	01:04
	← dtrott left	01:04
	← NeverDie left	01:04
	→ KnightsOfNi joined	01:05
	→ \|digits\| joined	01:05
	← \|digits\| left	01:05
	→ \|digits\| joined	01:05
	→ jorj joined	01:05
	→ Mixologic_ joined	01:05
	→ UmbraMalison joined	01:05
	← vF3hNGxc47h8 left	01:06
	← Vampire0_ left	01:06
	→ Mixologi- joined	01:08
	← Mixologi\| left	01:10
	← \|digits\| left	01:10
	← IWishIKnew left	01:11
	← checkItOut left	01:11
	← msonntag left	01:11
	← dmarr left	01:11
	→ Mixologi\| joined	01:12
	← Mixologic_ left	01:12
	→ efco joined	01:12
	← macabre left	01:13
	→ msonntag joined	01:13
	→ macabre joined	01:14
	→ dmarr joined	01:14
	→ snonez joined	01:14
	→ Mixologic_ joined	01:15
	← snonez left	01:15
	← Mixologi- left	01:15
	→ irwiss joined	01:16
	← qpdb left	01:17
	← sfan786 left	01:17
	→ qpdb joined	01:17
	→ \|digits\| joined	01:18
	← \|digits\| left	01:18
	→ Mixologi- joined	01:18
	→ iraw_ joined	01:18
	→ \|digits\| joined	01:19
	← \|digits\| left	01:19
	← Mixologi\| left	01:19
	→ \|digits\| joined	01:19
	← \|digits\| left	01:19
	→ AramKaram joined	01:20
	→ Mixologi\| joined	01:21
	→ IWishIKnew joined	01:21
	→ \|digits\| joined	01:21
	← \|digits\| left	01:21
	→ spyroboy joined	01:22
	→ sfan786 joined	01:22
	← Mixologic_ left	01:22
	→ \|digits\| joined	01:23
	← \|digits\| left	01:23
	→ unreal_ joined	01:23
	→ Mixologic_ joined	01:23
	← kpease left	01:24
	← Mixologi- left	01:24
	← unreal left	01:25
	← dsilva left	01:25
	→ \|digits\| joined	01:26
	→ daito joined	01:26
	→ dangad999 joined	01:27
	← \|digits\| left	01:27
	→ \|digits\| joined	01:27
	→ keroro520 joined	01:27
	→ Mixologic joined	01:28
	← Mixologi\| left	01:28
	← bronson left	01:28
	→ devoldmx joined	01:29
	→ cbonobo joined	01:29
	→ hrlty joined	01:30
	← hrlty left	01:30
	← Mixologic_ left	01:31
	→ Mixologic_ joined	01:31
	← \|digits\| left	01:31
	→ darkbit joined	01:32
	← Sasazuka left	01:32
	→ m0ltar joined	01:33
	← dangad999 left	01:33
	→ hrlty joined	01:33
	← devoldmx left	01:34
	→ sargas joined	01:34
	← refried_ left	01:34
	← sfan786 left	01:34
	→ bronson joined	01:34
	→ Mixologi- joined	01:35
	← Mixologic left	01:35
	← sparetire_ left	01:36
	Padawan_ → Padawan	01:37
	← mellernoia left	01:37
	→ Mixologic joined	01:38
	← hrlty left	01:38
	← Mixologic_ left	01:38
	← bronson left	01:39
	→ harish joined	01:40
	← neanderslob left	01:40
	→ neanderslob joined	01:41
	← IWishIKnew left	01:41
	→ Mixologic_ joined	01:41
	← Mixologi- left	01:41
	→ bronson joined	01:42
	→ MZAWeb joined	01:42
	← Mixologic left	01:45
	→ sdfgsdfg joined	01:45
	→ Mixologi- joined	01:45
	→ mizu_no_oto joined	01:46
	→ faux___ joined	01:46
	→ Goplat joined	01:46
	← bronson left	01:47
	→ Steadfast joined	01:47
	→ iyp joined	01:47
	← iyp left	01:48
	→ AmR\|EiSa joined	01:48
	← Mixologic_ left	01:48
	→ Mixologic_ joined	01:48
	→ hrlty joined	01:48
	→ dreiss joined	01:49
	← s00pcan left	01:49
	→ mischief joined	01:49
	← joo-_ left	01:49
mischief	hello	01:49
	is it possible to use git with miniperl	01:50
	→ igacm joined	01:50
	← igacm left	01:50
	→ s00pcan joined	01:51
	← Mixologi- left	01:52
	← raven-au left	01:52
	→ jmpp joined	01:52
	→ nettoweb joined	01:52
	→ Mixologi- joined	01:52
	← dstarh left	01:53
	→ dstarh joined	01:53
	→ jigjug joined	01:53
kadoban	mischief: I'm assuming that's some complier/interpreter? git doesn't care what language you're writing. If it's text that's anything like … any programming language it'll work fine.	01:54
	→ dtrott joined	01:54
mischief	...	01:55
	the git-submodule shell script uses perl to implement some of the functionality.	01:55
	→ fracting joined	01:55
kadoban	Ah, no idea.	01:55
mischief	i am asking if it is possible to make it function without a full (~50MB) perl installation.	01:55
	← Mixologic_ left	01:56
	← dreiss left	01:56
	← luksaur left	01:56
	← irwiss left	01:57
	← neanderslob left	01:57
	→ neanderslob joined	01:58
	→ luksaur joined	01:58
	← sargas left	01:58
	→ Mixologic_ joined	01:58
	← pks left	01:59
	→ raven-au joined	01:59
	→ pks joined	02:01
	→ Mixologi\| joined	02:01
	← Mixologi- left	02:01
	← dsantiago left	02:01
	→ Mixologi- joined	02:01
	→ madebymarkca joined	02:02
	→ samthewildone joined	02:03
samthewildone	Hi, what command do I use to clone on a certain branch of the kernel repo ?	02:03
madebymarkca	does anyone know why when I use git difftool --dir-diff with beyondcompare4 the right column is symlinks?	02:04
	→ watabou joined	02:04
frogonwheels	samthewildone: You don't clone a branch, you clone a project and checkout the branch. Generally because of compression this is Not A Problem.	02:04
	← nettoweb left	02:04
frogonwheels	madebymarkca: weird.	02:04
samthewildone	grr... I'm trying to write a script which can pull only selected trees/branches	02:04
madebymarkca	ikr?	02:04
	→ Mixologic joined	02:05
	← jonno11 left	02:05
samthewildone	http://codepad.org/leYWskDU	02:05
	← Mixologic_ left	02:05
	← Mixologi\| left	02:05
samthewildone	^ I'm trying to just pull what the user enters	02:05
	← mizu_no_oto left	02:06
frogonwheels	samthewildone: ok.. if the server supports it you can grab a tarball of a selected branch through git. However generally that's not the recommended way of doing it as if it's done a lot then it's extremely inefficient	02:07
	samthewildone: man git-archive	02:07
gitinfo	samthewildone: the git-archive manpage is available at http://jk.gs/git-archive.html	02:07
	→ Mixologic_ joined	02:08
	→ linux-modder joined	02:08
	← cbonobo left	02:08
	← Mixologi- left	02:08
	← fracting left	02:08
	→ cbonobo joined	02:09
madebymarkca	http://snag.gy/YLLZH.jpg	02:09
	← linux-modder left	02:09
	← Steadfast left	02:09
	→ frekoya_ joined	02:10
	← Padawan left	02:11
	→ Padawan_ joined	02:11
	→ Mixologi- joined	02:11
	← Mixologic left	02:12
madebymarkca	http://pastebin.com/Np8eAL41	02:12
	do I need to give the command other params, I am using git difftool --dir-diff	02:12
	→ dreiss joined	02:13
	→ linux-modder joined	02:13
	← iraw_ left	02:14
	→ DolphinDream joined	02:14
	← Mixologic_ left	02:15
	→ foul_owl joined	02:15
	← dstarh left	02:15
foul_owl	What is a free self-hosted open source alternative to github?	02:15
	← kadoban left	02:15
	→ s8321414 joined	02:16
	← frekoya_ left	02:16
	→ Mixologic_ joined	02:16
madebymarkca	gitlab	02:18
	I think phabricator can host repos as well	02:19
	← samthewildone left	02:19
foul_owl	Thanks!	02:20
	→ Mixologi\| joined	02:20
	← Mixologi- left	02:20
phroa	gogs.io, trac, your own server + a web ui like gitiles, cgit	02:20
	→ vectortrex joined	02:21
foul_owl	I'll check out those as well. Thanks!	02:21
madebymarkca	makes me sad no one ever has answers for my questions on irc :(	02:22
	→ \|digits\| joined	02:23
	← Mixologic_ left	02:23
	→ penna__ joined	02:23
foul_owl	Mine was "low hanging fruit"	02:23
	← \|digits\| left	02:24
foul_owl	What are your questions?	02:24
phroa	yeah I've never used difftool :D	02:24
	→ \|digits\| joined	02:25
	← \|digits\| left	02:25
	→ rubie joined	02:25
madebymarkca	I'm going to try smartgit, maybe it well work better	02:25
	← dreiss left	02:25
	→ fracting joined	02:25
madebymarkca	trying to find something I can do group based gits like with kaleidoscope on mac	02:25
	instead of serial diff and merge	02:26
	→ \|digits\| joined	02:26
	← \|digits\| left	02:26
	→ Mixologic_ joined	02:26
	→ \|digits\| joined	02:26
	← \|digits\| left	02:26
	→ gambl0re joined	02:26
	→ ahr3n joined	02:26
	→ dsantiago joined	02:26
	→ fullstack joined	02:27
	→ \|digits\| joined	02:27
	← \|digits\| left	02:27
	← m0ltar left	02:27
	← penna_ left	02:27
madebymarkca	this is my question foul_owl -> when I use git difftool --dir-diff with beyondcompare4 the right column is symlinks?	02:27
	→ \|digits\| joined	02:28
	← \|digits\| left	02:28
	→ Mixologic joined	02:29
	→ \|digits\| joined	02:29
	← Mixologi\| left	02:29
	← \|digits\| left	02:29
	→ dreiss joined	02:29
	→ \|digits\| joined	02:30
	← fracting left	02:30
	← \|digits\| left	02:30
	→ \|digits\| joined	02:30
	← Mixologic_ left	02:30
	NotVgr → Vgr	02:31
	← \|digits\| left	02:31
	→ gfixler joined	02:31
	→ \|digits\| joined	02:33
	← \|digits\| left	02:33
frogonwheels	madebymarkca: looks like you have a symlink in your repo.. git does handle them (unless you're in windows)	02:33
	→ sfan786 joined	02:33
madebymarkca	I don't though	02:34
frogonwheels	madebymarkca: you could always turn symlinks off. (core.symlinks ??)	02:34
	madebymarkca: what? You mean that file isn't a symlink?	02:34
	← dreiss left	02:34
	← AramKaram left	02:34
madebymarkca	maybe it is	02:34
	hmm	02:34
	→ Mixologic_ joined	02:35
madebymarkca	i'm supposed to be apple to select the left and right column and see the diff	02:35
	← snthsnth left	02:35
	→ CKyle joined	02:35
madebymarkca	I thought bc4 made temp files to the dirty work though	02:36
foul_owl	Never used beyondcompare4	02:36
	Looking that up now though	02:36
frogonwheels	madebymarkca: Have you looked at the temp directories? I use bc in windows	02:36
	← Mixologic left	02:36
frogonwheels	foul_owl: beyond compare is a reasonably priced commercial difference viewer (with 3-way diffs) that is avail on windows, linux (+mac?)	02:37
	→ Sonicbit joined	02:37
madebymarkca	yes mac too	02:37
	← sfan786 left	02:37
frogonwheels	madebymarkca: bc4 doesn't make the tempfiles. That's git.	02:37
madebymarkca	but I use kaleidoscope on mac	02:37
	www.kaleidoscopeapp.com	02:37
	→ NeverDie joined	02:37
	← m0viefreak left	02:37
	→ dadamssg joined	02:38
	→ sfan786 joined	02:38
	← cebor left	02:38
	→ Mixologic joined	02:38
madebymarkca	where do the temp files get created?	02:39
	→ \|digits\| joined	02:40
	→ franl joined	02:40
	← NeverDie left	02:40
frogonwheels	madebymarkca: Git will create them. I don't use --dir-dif. Is there a CLI option in bc4 that will dereference symlinks?	02:41
	← Noldorin left	02:41
	→ NeverDie joined	02:41
	← sfan786 left	02:41
	→ cebor joined	02:41
	→ Mixologi- joined	02:42
	← dadamssg left	02:42
	← JackFruh left	02:42
	← Mixologic_ left	02:43
	→ sfan786 joined	02:43
	← NeverDie left	02:43
	← thiago left	02:43
	← \|digits\| left	02:45
	← Mixologic left	02:45
madebymarkca	maybe?	02:45
	→ \|digits\| joined	02:46
	→ Mixologic_ joined	02:46
	← \|digits\| left	02:46
frogonwheels	madebymarkca: I'd look at how git presents those 2 directories and make bc4 deal with it. I _suspect_ that git is symlinking the actual files so that you can update them through the symlink	02:46
	→ skorgon joined	02:47
	→ fracting joined	02:47
	→ bronson joined	02:47
	→ iraw_ joined	02:48
	← sfan786 left	02:48
	→ Mixologi\| joined	02:49
	→ \|digits\| joined	02:49
	← \|digits\| left	02:49
	← Mixologi- left	02:50
	← bollullera left	02:50
	→ theskillwithin joined	02:51
	→ sailorswift joined	02:52
	→ \|digits\| joined	02:52
	→ Mixologi- joined	02:52
	← bronson left	02:52
	← Mixologic_ left	02:52
	← \|digits\| left	02:53
	→ \|digits\| joined	02:53
	← \|digits\| left	02:53
	← durham left	02:53
	← oojacoboo left	02:53
	← jigjug left	02:54
	→ t-mart_ joined	02:54
	→ dgutierrez1287 joined	02:55
	→ \|digits\| joined	02:55
	← \|digits\| left	02:55
	← Mixologi\| left	02:56
	→ Mixologic_ joined	02:56
	← fracting left	02:56
	← t-mart__ left	02:57
	→ Mixologi\| joined	02:58
	→ \|digits\| joined	02:59
	← \|digits\| left	02:59
	← cavallari left	02:59
	← sdothum left	02:59
	← toothrot left	02:59
	← Mixologi- left	02:59
	→ \|digits\| joined	03:00
	← \|digits\| left	03:00
	→ ASOLAr joined	03:00
	← dgutierrez1287 left	03:00
	← rubie left	03:00
	→ nettoweb joined	03:01
	→ fracting joined	03:01
	← nettoweb left	03:01
	→ sdothum joined	03:02
	→ Mixologic joined	03:02
	← Mixologic_ left	03:02
	← sanketdg left	03:03
	→ nettoweb joined	03:03
	→ rubie joined	03:03
	← nettoweb left	03:03
	→ nettoweb joined	03:03
	← nettoweb left	03:03
	→ Motoko joined	03:04
	← Mixologi\| left	03:05
	← meLon left	03:06
	→ Mixologic_ joined	03:06
	→ meLon joined	03:06
	← madebymarkca left	03:08
	← Mixologic left	03:09
	→ PraetorOmega joined	03:09
	← maestroj_ left	03:09
	→ Mixologic joined	03:10
	← franl left	03:10
	→ linuxmint2 joined	03:11
	← linux-modder left	03:12
	→ Mixologi- joined	03:12
	← Mixologic_ left	03:13
	→ xcesariox joined	03:15
	→ Mixologic_ joined	03:15
	← watabou left	03:15
	→ terminal_echo joined	03:16
	← darkbasic left	03:16
	← Mixologic left	03:16
	← xcesariox left	03:17
	→ darkbasic joined	03:17
	→ xcesariox joined	03:17
	→ Mixologic joined	03:18
	← Mixologi- left	03:19
	→ Sasazuka joined	03:19
	→ Mixologi- joined	03:21
	← efco left	03:22
	← Mixologic_ left	03:22
	→ thiago joined	03:23
	→ snthsnth joined	03:24
	← Mixologic left	03:25
	← CKyle left	03:25
	→ madebymarkca joined	03:25
	→ Mixologic joined	03:25
	← Mixologi- left	03:27
	← sdothum left	03:28
	→ Mixologic_ joined	03:29
	→ Mixologi- joined	03:29
	→ devoldmx joined	03:29
	← ASOLAr left	03:30
	← Mixologic left	03:32
	← PraetorOmega left	03:32
	→ Mixologic joined	03:32
	← daivyk_ left	03:33
	← Mixologic_ left	03:33
	← devoldmx left	03:34
	← Algebr left	03:35
	→ Mixologic_ joined	03:36
	← Mixologi- left	03:36
	→ BeatrixKiddo joined	03:37
	← BeatrixKiddo left	03:37
	→ BeatrixKiddo joined	03:37
	→ ASOLAr joined	03:38
	→ Mixologi- joined	03:38
	← Mixologic left	03:39
	→ modocache joined	03:40
	← Populus left	03:41
	→ Mixologi\| joined	03:42
	→ watabou joined	03:42
	← Mixologic_ left	03:43
	→ mehola joined	03:44
	→ GT4066 joined	03:44
	← modocache left	03:44
	→ Mixologic_ joined	03:45
	← shinnya left	03:45
	← Mixologi- left	03:46
	← cbonobo left	03:47
	→ AramKaram joined	03:48
	← Guest2398 left	03:48
	→ Mixologi- joined	03:49
	← Mixologi\| left	03:49
	→ _Atom_ joined	03:49
	← xcesariox left	03:49
	← Mixologic_ left	03:51
	→ Mixologic_ joined	03:52
	→ Kamran joined	03:53
	Kamran → Guest34185	03:53
	← clarkpan left	03:55
	→ Mixologic joined	03:55
	← madewokherd left	03:55
	← madebymarkca left	03:56
	→ pm90_ joined	03:56
	← daito left	03:56
	→ LACabeza joined	03:56
	→ sailorsw_ joined	03:56
	← Mixologi- left	03:56
	→ daito joined	03:56
	← SimonNa left	03:56
	← snthsnth left	03:57
	→ NeverDie joined	03:57
	→ temmi_hoo joined	03:58
	← iraw_ left	03:58
	← mehola left	03:58
	→ Mixologi- joined	03:59
	← Mixologic_ left	03:59
	← jeadre left	03:59
	→ Mixologic_ joined	03:59
	→ dl9pf_ joined	04:00
	← dl9pf left	04:00
	← sailorswift left	04:00
	← daito left	04:01
	→ schlumpi joined	04:01
	→ BeerSerc joined	04:01
	← d10n-work left	04:02
	← Mixologic left	04:02
	← NeverDie left	04:02
	→ Mixologic joined	04:03
	← cebor left	04:03
	← Mixologi- left	04:04
	→ dreiss joined	04:04
	→ cebor joined	04:05
	← Kulrak left	04:05
	← Mixologic_ left	04:06
	→ Mixologi- joined	04:06
	→ rhinojr joined	04:08
	→ Mixologic_ joined	04:10
	← toothe left	04:10
	→ Mixologi\| joined	04:11
	← Mixologic left	04:11
	→ Mixologi^ joined	04:13
	→ refried_ joined	04:14
	← Mixologi- left	04:14
	→ mehola joined	04:14
	← s8321414 left	04:14
	← Mixologic_ left	04:15
	→ arussel joined	04:15
	→ s8321414 joined	04:15
	← s8321414 left	04:16
	→ Mixologic_ joined	04:16
AramKaram	hey there, got a question, what is the `remote` to git's context? what does remote command do?	04:17
akkad	how does one checkout files from a bare repo?	04:18
	→ Kulrak joined	04:18
	← Kulrak left	04:18
	→ Kulrak joined	04:18
	← Mixologi\| left	04:18
akkad	mkdir foo && cd foo && ln -s ../foo.git .git && git checkout?	04:18
	← watabou left	04:18
akkad	oh clone. nice	04:18
skorgon	AramKaram: it's a pointer/reference to another repository. man git remote	04:19
gitinfo	AramKaram: the git-remote manpage is available at http://jk.gs/git-remote.html	04:19
	→ NeverDie joined	04:20
	← Mixologi^ left	04:20
AramKaram	skorgon thanks	04:20
	→ C4ta\|Work joined	04:21
	← NeverDie left	04:21
	← tomog999 left	04:21
	→ Mixologi- joined	04:21
	← Mixologic_ left	04:23
	← refried_ left	04:24
	→ Mixologic_ joined	04:24
	← Cata\|Work left	04:24
	← wcpan left	04:26
	← rhinojr left	04:26
	→ Mixologi\| joined	04:27
	→ wcpan joined	04:27
akkad	warning: --depth is ignored in local clones; use file:// instead.	04:28
	← Mixologi- left	04:28
	→ daito joined	04:29
	← arescorpio left	04:29
	← Mixologic_ left	04:30
	→ Mixologi- joined	04:30
	→ griotspeak joined	04:31
phroa	akkad: from the bare repo you must use "git show" or clone the repo	04:33
	→ madebymarkca joined	04:34
	← Mixologi\| left	04:34
	→ Mixologic joined	04:34
	→ iamtakingiteasy joined	04:34
AramKaram	`git remote add origin` means that we want to add this to a branch called origin ?	04:35
	← knownasilya left	04:35
phroa	AramKaram: man git remote	04:35
gitinfo	AramKaram: the git-remote manpage is available at http://jk.gs/git-remote.html	04:35
phroa	a "remote" and a "branch" are extremely different things	04:35
	← madebymarkca left	04:35
	→ madebymarkca joined	04:36
	← C4ta\|Work left	04:36
	→ C4ta\|Work joined	04:36
	→ devoldmx joined	04:37
	→ Mixologic_ joined	04:37
	← devoldmx left	04:37
	← dtrott left	04:37
	→ devoldmx joined	04:37
	← Mixologi- left	04:37
	→ jceb_ joined	04:38
	→ dadamssg joined	04:38
	← darkbasic left	04:39
	→ darkbasic joined	04:40
	→ Mixologi- joined	04:40
	← Mixologic left	04:41
	← LACabeza left	04:41
	→ Mixologic joined	04:42
	← Zarthus left	04:43
	← dadamssg left	04:43
	← Mixologic_ left	04:44
	→ Zarthus joined	04:44
	← rubie left	04:44
	→ clarkpan joined	04:45
	→ gabor_bernat joined	04:45
	← Mixologi- left	04:45
	← jceb_ left	04:46
	→ NeverDie joined	04:46
	→ emulator_ joined	04:47
	→ bronson joined	04:47
	→ tomog999 joined	04:48
	← emulator_ left	04:48
	→ maestrojed joined	04:50
	← ahr3n left	04:50
	← GT4066 left	04:51
	→ synthmea1 joined	04:52
	← NeverDie left	04:52
	← bronson left	04:52
	← synthmeat left	04:53
	→ NeverDie joined	04:54
	← _Atom_ left	04:54
	← NeverDie left	04:57
	← zumba_ad_ left	04:57
	→ ciampix_ joined	05:01
	→ NeverDie joined	05:04
	← ciampix left	05:04
	← in3xes left	05:06
	→ ckruczek joined	05:06
	← MattMaker left	05:08
	→ c0mrad3 joined	05:08
	← dreiss left	05:09
	→ oojacoboo joined	05:10
	← terminal_echo left	05:12
	→ MechtiIde joined	05:15
	← nesti left	05:15
	→ nerd joined	05:16
	← ciampix_ left	05:16
	← griotspeak left	05:18
	← frogonwheels left	05:18
	→ nesti joined	05:18
	← mostlybadfly left	05:19
	→ frogonwheels joined	05:20
	→ thomas joined	05:20
	→ Manikandan joined	05:20
	→ dreiss joined	05:22
	→ dgutierrez1287 joined	05:22
	← thomas left	05:22
	← gopar left	05:24
	← Goplat left	05:25
	← dgutierrez1287 left	05:26
	← Motoko left	05:26
	→ ayaz joined	05:26
	← keroro520 left	05:31
	→ maestroj_ joined	05:31
	→ emulator_ joined	05:32
	← sailorsw_ left	05:33
	→ keroro520 joined	05:33
	← marvi_ left	05:33
	→ marvi joined	05:33
	← marvi left	05:34
	→ marvi joined	05:34
	← ASOLAr left	05:34
	← luksaur left	05:34
	→ terminal_echo joined	05:35
	← maestrojed left	05:35
	→ scarabx joined	05:35
	→ pantsman- joined	05:36
	→ luksaur joined	05:36
	→ radsy joined	05:37
	← Lyqyd left	05:39
	→ zoso joined	05:39
	← oojacoboo left	05:39
	← pocketphiz left	05:41
	→ modocache joined	05:41
	→ jceb_ joined	05:41
	← Gamecubic left	05:43
jantje	hi	05:45
	← modocache left	05:46
	← jceb_ left	05:46
ckruczek	gooood morning vietnammmm!	05:46
jantje	I would like to 'watch' a set of files/directories on a remote repository. I would need to 'mirror' those into a separate repository, including all new tags and branches.	05:47
	← AramKaram left	05:47
	← bernardio left	05:47
	← Sasazuka left	05:48
jantje	where do I start?	05:48
ckruczek	what do you mean by 'watch' jantje?	05:49
	→ soerenbf joined	05:50
jantje	well, whenever a new commit/push happens to that remote repository for a particular list of files I need to know about it, also, when tags are applied. To watch for changed files I could do ls-remote and just see if the refs/heads/* change, (and then pull in that particular revision to see if the files are changed)	05:51
	basically I would need to do an incremental git-filter-branch where I did remote everything except for a few directories.	05:52
	s/remote/remove/	05:52
	→ nilg joined	05:53
	← pantsman- left	05:53
ckruczek	where is the repository hosted? Do you have access to the server?	05:53
	← NeverDie left	05:53
	← skorgon left	05:54
jantje	ckruczek: yes, I'm hostign it myself	05:55
	← MechtiIde left	05:56
	← devoldmx left	05:56
jantje	But I don't want to implement it as a post-receive hook	05:56
ckruczek	ok so then you can apply a post-hook for your repository	05:56
	hrrr....	05:56
	:D	05:56
	Why not?	05:56
_ikke_	jantje: post-receive hook is the best place I guess	05:56
	yeah, why not?	05:56
	It's the best time to these kind of operations	05:57
	→ tverr joined	05:57
_ikke_	If it's taking too long time, you can at least use it to schedule something	05:57
jantje	The problem is that I can't run multiple post-receive operation that both might update the same working tree or something, I would need to implement locking or pass the refs to somethnig else	05:58
	← maestroj_ left	05:58
	→ ferhaty joined	05:59
jantje	is it possble to mimick the post-receive invocations without having access to the post-receive script?	05:59
	→ daviid joined	05:59
	→ modocache joined	06:00
	← avinashrbhat left	06:00
jantje	eg, could I somehow find out which refs were updated, which ones are new, deleted, etc. Basically what git-receive-pack gives	06:01
	← modocache left	06:02
	→ modocache joined	06:02
	← emulator_ left	06:03
	← gabor_bernat left	06:04
	→ modocach_ joined	06:04
	← modocache left	06:04
	← luizetn left	06:05
	→ pm90__ joined	06:05
	→ dionysus69 joined	06:06
	→ modocache joined	06:06
	→ Godfather_ joined	06:07
	← soerenbf left	06:07
	→ modocac__ joined	06:08
	← modocache left	06:08
	← modocach_ left	06:08
	← pm90_ left	06:08
	→ Technocrat7 joined	06:09
	→ modocache joined	06:10
	← modocac__ left	06:10
	→ FilipNortic joined	06:10
jantje	I suppose I could just record all the invocations of the post-receive script, but it would have been useful to not rely on post-receive feeding the data. (that way it could be run on any remote server and not on the box that hosts the repository)	06:12
	← modocache left	06:12
	→ modocache joined	06:12
	← modocache left	06:14
	→ modocach_ joined	06:14
	→ jceb joined	06:14
	← Technocrat7 left	06:14
ckruczek	well I am out, can't help you sorry :(	06:15
	→ s8321414 joined	06:16
	← modocach_ left	06:16
	→ modocache joined	06:16
	← MZAWeb left	06:16
	→ skylite joined	06:16
	→ acolson joined	06:17
	← Denizzi left	06:17
	← modocache left	06:17
	→ in3xes joined	06:17
	→ modocache joined	06:18
	→ eatsfoobars joined	06:18
	→ joo-_ joined	06:18
	→ rscata joined	06:19
	→ modocach_ joined	06:20
	→ roelmonnens joined	06:20
	→ Technocrat7 joined	06:20
	← nilg left	06:21
	→ modocac__ joined	06:22
	← modocach_ left	06:22
	← modocache left	06:22
	→ modocache joined	06:24
	← modocac__ left	06:24
	→ HmmrFll joined	06:24
	→ modocach_ joined	06:26
	← modocache left	06:26
	→ modocache joined	06:27
	← modocach_ left	06:27
	← tpollard left	06:29
	→ arup_r joined	06:29
	→ modocach_ joined	06:29
	← modocache left	06:30
	→ modocache joined	06:31
	← modocach_ left	06:31
	← Manikandan left	06:33
jantje	no proble, thanks ckruczek	06:33
	← modocache left	06:33
	→ leeN joined	06:33
	→ modocache joined	06:33
	→ t2mkn joined	06:35
	← modocache left	06:35
	→ modocache joined	06:35
	← mehola left	06:36
	→ cabreraM516 joined	06:36
	← modocache left	06:37
	→ PCatinean joined	06:37
	→ modocache joined	06:37
	→ izabera joined	06:37
	← in3xes left	06:37
	← waveclaw left	06:38
	→ catsup joined	06:38
	← izabera left	06:38
	→ modocach_ joined	06:39
	→ dadamssg joined	06:39
	← modocache left	06:40
	→ settermjd joined	06:40
	← Technocrat7 left	06:40
	→ Manikandan joined	06:40
	→ modocache joined	06:41
	← modocach_ left	06:42
	← cabreraM516 left	06:43
	← modocache left	06:43
	→ nnyk joined	06:43
	→ modocache joined	06:43
	→ whomp joined	06:44
	← scarabx left	06:44
whomp	how can i condense all of my changes from a branch into one commit?	06:44
	→ Sceorem joined	06:44
	← dadamssg left	06:44
ckruczek	git rebase -i and then squash all commits in one.	06:45
	→ modocach_ joined	06:45
	→ lb1a joined	06:45
ckruczek	!squash	06:45
	← joo-_ left	06:45
ckruczek	damn it	06:45
	← modocache left	06:45
ckruczek	!rebase-interactive	06:45
	DAMN IT GITINFO	06:45
whomp	lawl	06:46
	→ luizetn joined	06:46
whomp	thx	06:46
	→ joo-_ joined	06:47
	← joo-_ left	06:47
	→ modocache joined	06:47
	← modocach_ left	06:47
	← modocache left	06:49
whomp	ckruczek, but now i get merge conflicts with intermediate commits. i want to bundle up all of my changes, and then apply it as a commit, so that i don't have to deal with merge conflicts with intermediate commits	06:49
	→ avinashrbhat joined	06:49
	→ modocache joined	06:49
	← tristans1 left	06:49
	→ modocach_ joined	06:51
	← modocache left	06:51
	→ LordLeBrand joined	06:51
	→ modocache joined	06:53
	← modocach_ left	06:53
	→ Kelzier joined	06:54
	← modocache left	06:55
	→ modocache joined	06:55
	→ flowinho joined	06:56
	→ modocach_ joined	06:57
	← modocache left	06:57
	← radsy left	06:58
	← modocach_ left	06:58
	→ modocache joined	06:59
ckruczek	whomp: well then do it again after you merged, do a squash again	06:59
	→ shad_ joined	07:00
	← modocache left	07:01
	→ modocache joined	07:01
	← michael_mbp left	07:01
	→ bronson joined	07:02
	← shad_ left	07:02
	→ shad_ joined	07:02
	→ modocach_ joined	07:03
	← modocache left	07:03
_ikke_	ckruczek: !trigger	07:03
gitinfo	ckruczek: [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: http://jk.gs/git/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.	07:03
	← leeN left	07:03
_ikke_	ckruczek: Then there is also man <page>	07:03
	ckruczek: man git	07:03
gitinfo	ckruczek: the git manpage is available at http://jk.gs/git.html	07:03
	← shad_ left	07:04
	← modocach_ left	07:04
	→ modocache joined	07:05
	→ shad_ joined	07:05
	→ Nick-S joined	07:05
	← jmpp left	07:06
	→ michael_mbp joined	07:06
	← modocache left	07:06
	→ modocache joined	07:07
	← bronson left	07:07
	← shad_ left	07:08
	← Kelzier left	07:08
	→ soerenbf joined	07:08
	← modocache left	07:08
	→ modocache joined	07:08
ckruczek	thx _ikke_	07:10
	← Timvde left	07:10
	← modocache left	07:10
	→ modocach_ joined	07:10
	← darkbasic left	07:11
	→ chargen joined	07:12
	→ darkbasic joined	07:12
	→ Timvde joined	07:12
	← modocach_ left	07:12
	→ modocache joined	07:12
	→ TomyWork joined	07:13
	← Sazhen86 left	07:14
	→ modocach_ joined	07:14
	← modocache left	07:14
	→ Dazzyp joined	07:15
	→ Sazhen86 joined	07:15
	← modocach_ left	07:16
	→ modocache joined	07:16
	→ alextheger joined	07:17
	→ torbjorn joined	07:17
	← MarcGuay left	07:17
	← daviid left	07:17
torbjorn	git pull is rpevented by a file with local changes, but git diff shows nothing, and if i git checkuot that file, i still cannot git pull	07:17
	what can i do to just ignore that file and do the git pull?	07:18
	→ bonswouar joined	07:18
canton7	torbjorn, output of 'git status'?	07:18
	canton7 places a bet on the file being staged	07:18
torbjorn	oh its ia new file yes	07:18
Seveas	no bet	07:18
	→ modocach_ joined	07:18
	← modocache left	07:18
canton7	follow the instructions that 'git status' gives you to unstage the file	07:18
torbjorn	ignore me	07:19
	yes	07:19
	torbjorn heads back down into his hole	07:19
	← alextheger left	07:19
	← modocach_ left	07:20
	← thiago left	07:20
	→ modocache joined	07:20
	→ modocach_ joined	07:22
	← modocache left	07:22
	→ tumulte joined	07:24
	← modocach_ left	07:24
	→ modocache joined	07:24
	← _tgunr left	07:24
	→ {0xc6} joined	07:25
	→ nuge joined	07:25
	{0xc6} → {198}	07:25
	→ modocach_ joined	07:26
	← modocache left	07:26
	→ dvaske joined	07:27
	→ andyr joined	07:27
	← modocach_ left	07:28
	→ modocache joined	07:28
	→ MarcGuay joined	07:29
	→ dvaske_ joined	07:29
	← mattp_ left	07:29
	→ modocach_ joined	07:30
	← chargen left	07:30
	← modocache left	07:30
	← vectortrex left	07:30
	→ TekhnoLife joined	07:31
	← BeatrixKiddo left	07:31
	← dvaske left	07:31
	→ modocache joined	07:32
	← modocach_ left	07:32
	← AmR\|EiSa left	07:34
	→ modocach_ joined	07:34
	← modocache left	07:34
	→ Balliad joined	07:34
	← t2mkn left	07:35
	← TekhnoLife left	07:36
	→ modocache joined	07:36
	← modocach_ left	07:36
_ikke_	remember, git status is your friend :P\	07:36
	→ jost joined	07:36
	← flowinho left	07:36
	→ flowinho joined	07:37
	→ Dro__ joined	07:37
	→ mikoni joined	07:37
	→ modocach_ joined	07:38
	← modocache left	07:38
	← nnyk left	07:39
	← modocach_ left	07:39
	→ modocache joined	07:40
	→ modocach_ joined	07:42
	← modocache left	07:42
	→ GT4066 joined	07:42
	← modocach_ left	07:43
	→ modocache joined	07:43
	→ hvaiu joined	07:44
	← hvaiu left	07:44
	→ alivx joined	07:45
	→ rolfb joined	07:46
	→ modocach_ joined	07:46
	← modocache left	07:46
	← eatsfoobars left	07:46
	→ modocache joined	07:47
	← modocach_ left	07:47
	→ alivx_ joined	07:48
	→ Nizumzen joined	07:48
	→ dgutierrez1287 joined	07:48
	← Nizumzen left	07:48
	→ joel_falcou joined	07:49
	→ Nizumzen joined	07:49
	→ modocach_ joined	07:49
	← modocache left	07:50
	→ vdr joined	07:50
	← modocach_ left	07:51
	→ modocache joined	07:51
	← vdr left	07:51
	← zoso left	07:52
	← farn left	07:52
	← dgutierrez1287 left	07:53
	→ modocach_ joined	07:53
	← modocache left	07:54
	→ Silox\| joined	07:55
	← modocach_ left	07:55
	→ modocache joined	07:55
	→ zoso joined	07:56
	← D-Boy left	07:56
	→ devoldmx joined	07:56
	→ basiclaser joined	07:57
	→ modocach_ joined	07:57
	← modocache left	07:57
	→ modocache joined	07:59
	← modocach_ left	07:59
	→ TheBrayn joined	08:00
	← maxorator left	08:00
TheBrayn	hi	08:00
ckruczek	hi	08:00
	← Orbitrix left	08:00
	← ferhaty left	08:00
	→ Orbitrix joined	08:01
	← devoldmx left	08:01
	← modocache left	08:01
	→ modocache joined	08:01
TheBrayn	I have committed this and pushed it to github: https://github.com/SC-Networks/puppet-foreman/commit/b1d6cea98187d8f1addd9a926ed85c3a26cd48ec the indendation is messed up in the diff but not in the actual file: https://github.com/SC-Networks/puppet-foreman/blob/plugin_prefix/manifests/init.pp#L22	08:01
	I'm also seeing this locally so it's not a github specific thing	08:02
	→ maxorator joined	08:02
	← harish left	08:03
	← modocache left	08:03
	→ modocach_ joined	08:03
	← Sazhen86 left	08:04
	← WeS left	08:04
	→ modocache joined	08:05
	← modocach_ left	08:05
	← modocache left	08:07
	→ modocache joined	08:07
	→ bongjovi joined	08:07
	→ farn joined	08:07
	← modocache left	08:09
	→ tvw joined	08:09
	→ modocache joined	08:09
	← dreiss left	08:10
	→ AramKaram joined	08:10
	← modocache left	08:11
	→ modocache joined	08:11
	→ nour joined	08:11
	→ dc5ala joined	08:11
	→ Sazhen86 joined	08:13
	→ modocach_ joined	08:13
	← modocache left	08:13
	← Dazzyp left	08:13
	→ vomy joined	08:14
	→ marcogmonteiro joined	08:14
	→ pjp joined	08:14
	← michael_mbp left	08:14
	→ modocache joined	08:15
	→ D-Boy joined	08:15
	← vomy left	08:15
	→ noisebleed joined	08:15
pjp	Hi, how does one use the reported-by attribute when committing a change?	08:15
	← modocach_ left	08:15
	← s8321414 left	08:15
pjp	Or is it used when formatting a patch with format-patch??	08:15
	→ s8321414 joined	08:16
	→ michael_mbp joined	08:17
	→ modocach_ joined	08:17
	← modocache left	08:17
	→ encod3 joined	08:17
	→ howdoi joined	08:18
	→ bstrarm joined	08:18
canton7	pjp, just add it to the commit message - it's nothing special, other than text	08:18
_ikke_	pjp: It depends on the project	08:19
	→ modocache joined	08:19
	← modocach_ left	08:19
pjp	canton7: I see, I thought it's a command line option, thank you.	08:19
	_ikke_: Yep,	08:19
jast	no, only signed-off-by has a command line switch	08:20
	→ sagittarian joined	08:20
pjp	jast: Yes,	08:20
	← bustrarm left	08:20
	→ dsdeiz_ joined	08:20
	→ onmzc joined	08:20
	← c0mrad3 left	08:20
	→ modocach_ joined	08:21
	→ Alienpruts joined	08:21
	← modocache left	08:21
	→ kurkale6ka joined	08:21
	← terminal_echo left	08:21
	← onmzc left	08:21
	← dsdeiz left	08:21
	← torbjorn left	08:21
	→ Jwzu joined	08:22
	→ tristans1 joined	08:22
	→ nnyk joined	08:22
	← modocach_ left	08:22
	→ modocache joined	08:23
	← Jwzu left	08:23
	← zacts left	08:23
	→ nicechap joined	08:23
	→ zacts joined	08:24
	← Kulrak left	08:24
	→ modocach_ joined	08:24
	← modocache left	08:25
	← tristans1 left	08:26
	← modocach_ left	08:26
	→ modocache joined	08:26
	→ rvfo joined	08:27
	← rvfo left	08:27
	← nnyk left	08:28
	→ Kcpb joined	08:28
	← modocache left	08:28
	→ modocach_ joined	08:28
	→ Hounddog joined	08:28
	← Kcpb left	08:29
	→ Kulrak joined	08:30
	← Kulrak left	08:30
	→ Kulrak joined	08:30
	← fscala left	08:30
	← modocach_ left	08:30
	→ Ufbig joined	08:30
	→ modocache joined	08:30
	→ fscala joined	08:31
	← Ufbig left	08:31
	→ howlymowly joined	08:31
	→ Tiv joined	08:32
	← Tiv left	08:33
	→ arussel` joined	08:33
	→ sysanthrope joined	08:33
	→ udzka joined	08:34
	→ endiruna joined	08:34
	→ nnyk joined	08:35
	← udzka left	08:35
	← modocache left	08:35
	→ kraplax joined	08:35
	→ tdgp joined	08:35
	← hrlty left	08:36
	← madebymarkca left	08:36
	→ Steadfast joined	08:36
	← tdgp left	08:36
	→ jds joined	08:37
	← arussel left	08:37
	← Ratler left	08:37
	→ denimsoft joined	08:37
	→ Jmzz joined	08:38
	→ CustosLimen joined	08:38
	← Jmzz left	08:38
	→ Ratler joined	08:39
	→ liamkeily joined	08:39
	→ omuu joined	08:40
	→ dadamssg joined	08:40
	→ aard joined	08:40
	← omuu left	08:41
AramKaram	everytime I make a change to my file I need to stage it again in order to have it tracked?	08:41
	→ ferhaty joined	08:42
	← blr left	08:42
	→ Voqb joined	08:43
	← Voqb left	08:44
	← liamkeily left	08:44
	← dadamssg left	08:45
	→ Oqe joined	08:45
	→ sinkensabe joined	08:45
	← CustosLimen left	08:46
	← Oqe left	08:46
	← TomyWork left	08:46
	→ Uope joined	08:46
lb1a	AramKaram, you'll have to stage anything that should be in your next commit	08:47
tobiasvl	AramKaram: kgirthofer yes	08:47
	← Uope left	08:47
tobiasvl	kgirthofer: sorry, wrong hilight	08:47
	→ elsevero joined	08:48
	→ Zariel joined	08:48
	← elsevero left	08:49
	→ aoaoo joined	08:49
AramKaram	thanks lb1a tobiasvl :) one more question, could somebody give me an url or whatever it is that explains what remotes are? Ive read one or two about it but it doesn't entirely make sense to me, I can't seem to understand what it is?	08:49
	← aoaoo left	08:49
lb1a	AramKaram, !progit is a nice open book to read about it. and you can play with the interactive tutorial from !try_git	08:50
gitinfo	AramKaram: [!book] 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	08:50
lb1a	!trygit	08:50
gitinfo	A quick, interactive, in-browser introduction to git is available at http://try.github.io	08:50
lb1a	AramKaram, ^ !trygit	08:50
	→ iuqi joined	08:50
	→ aspiers joined	08:50
AramKaram	thanks :)	08:51
	← iuqi left	08:51
	→ matleh joined	08:51
	→ joo-_ joined	08:51
lb1a	yw	08:51
	→ darkbasic_ joined	08:52
	← darkbasic left	08:52
	← Zariel left	08:53
	← kraplax left	08:53
	→ kraplax joined	08:54
	→ TomyWork joined	08:54
	→ wrouesnel1 joined	08:55
	← matleh left	08:55
	→ notebox joined	08:56
	→ diafour_ joined	08:57
	→ CustosLimen joined	08:58
	→ geoid joined	08:59
	← nerd left	08:59
	→ dimi1947 joined	09:01
	← michael_mbp left	09:01
	→ freestyl3r joined	09:02
	← TomyWork left	09:03
	← LadyAlissa left	09:03
	← tvw left	09:03
	← reim left	09:04
dimi1947	can the assume unchanged command be implemented in an untracked file	09:04
	→ michael_mbp joined	09:04
dimi1947	?	09:04
	→ TomyWork joined	09:05
canton7	don't use --assume-unchanged	09:05
	see !config	09:05
gitinfo	[!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	09:05
canton7	... but for untrakced files, you can ignore them using .gitignore anyway, surely?	09:05
	← nnyk left	09:05
canton7	(or .git/info/exclude if you don't want the ignore rule to be public)	09:05
	← endiruna left	09:05
dimi1947	what is .gitignore...is it a command	09:05
	→ harish_ joined	09:06
_ikke_	It's a file	09:06
	man gitignore	09:06
gitinfo	the gitignore manpage is available at http://jk.gs/gitignore.html	09:06
	→ jost_ joined	09:07
dimi1947	then...what is better to use...gitignore or the assume unchanged command...what is the difference between the two?	09:08
	→ endiruna joined	09:08
canton7	never ever ever use --assume-i=unchanged	09:08
	* --assume-unchanged	09:08
	jost → Guest41462	09:08
	← jost_ left	09:08
	→ jost_ joined	09:09
	← jost_ left	09:09
dimi1947	why?	09:09
	→ LadyAlissa joined	09:09
_ikke_	!assume	09:09
gitinfo	[!assume_unchanged] git update-index --assume-unchanged is a promise to git you won't change a file. If you do change that file, you will make git cry.	09:09
	← notebox left	09:10
jast	assume-unchanged is only for optimizing. the flag isn't stable. it may be removed at any time, and git may also overwrite the file with a fresh copy at any time.	09:10
	→ mattp_ joined	09:10
dimi1947	ok....	09:10
	one more thing...	09:10
jast	how about we make the trigger a bit more informative...	09:10
	← LadyAlissa left	09:10
	← Guest41462 left	09:10
	→ LadyAlissa joined	09:10
dimi1947	gitignore is an extension name? I cannot find the file	09:10
canton7	yeah, "make git cry" isn't a very good answer to "why"	09:10
	dimi1947, read man gitignore	09:10
gitinfo	dimi1947: the gitignore manpage is available at http://jk.gs/gitignore.html	09:10
jast	working on it	09:10
_ikke_	dimi1947: It's a file you can make yourself	09:10
	jast: ok	09:11
	dimi1947: git doesn't create it automatically	09:11
	← AramKaram left	09:11
canton7	dimi1947, see also https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files	09:11
jast	.trigger_edit assume_unchanged git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually meant to tell Git that there are definitely no changes at all in the file, to reduce unnecessary disk access. Git will feel free to discard the flag or overwrite the file at any time it feels like it.	09:11
gitinfo	jast: Okay.	09:11
	→ nnyk joined	09:11
	← denimsoft left	09:11
jast	it's not exactly true but true enough for our purposes, I think	09:12
	→ denimsoft joined	09:12
_ikke_	I liked the promise bit, but alright	09:12
	→ bastelfreak joined	09:13
	← endiruna left	09:13
	→ darkbasic joined	09:14
	← Sceorem left	09:14
	← darkbasic_ left	09:14
jast	.trigger_edit assume_unchanged git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.	09:15
gitinfo	jast: Okay.	09:15
jast	more accurate, more promise	09:15
	hope it's not too long now... !assume	09:15
gitinfo	[!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.	09:15
	→ jonno11 joined	09:16
	→ Zariel joined	09:18
	→ sailorswift joined	09:18
	← Zariel left	09:18
	← Padawan_ left	09:19
	→ Zariel joined	09:19
	→ tehtraveler2321 joined	09:19
	→ Padawan_ joined	09:20
	← Balliad left	09:21
	← wrouesnel1 left	09:22
	→ jiggerypokery joined	09:23
	→ Balliad joined	09:24
	← arup_r left	09:26
	→ notebox joined	09:26
	→ arup_r joined	09:27
	← jonno11 left	09:27
	→ jonno11 joined	09:27
	← arup_r left	09:27
	← sshine`` left	09:28
	→ eGGsha joined	09:30
dimi1947	I am using alse git gui...and I face a strange situation where a file is shown with a modification in it....but in the editor(Netbeans..which is connected with git)...no mod is shown....THE FILE IS INCLUDED IN THE INDEX	09:30
	→ sparetire_ joined	09:31
	← eliasp left	09:32
	→ Walex joined	09:33
	→ eliasp joined	09:34
	← dc5ala left	09:34
	← whomp left	09:35
	→ reim joined	09:36
	→ ahr3n joined	09:37
canton7	dimi1947, sounds like a netbeans issue? or is there something else going on/	09:38
	dwmw2_gone → dwmw2	09:39
	→ nerd joined	09:39
	← Dro__ left	09:40
	← Sazhen86 left	09:41
	→ troulouliou_div2 joined	09:44
	→ dougsland joined	09:49
	← fracting left	09:49
	→ jonno11_ joined	09:49
	← daito left	09:49
	→ fracting joined	09:50
	→ daito joined	09:50
	→ X67r joined	09:51
	← alivx_ left	09:52
	→ sixtyten joined	09:53
	← rivarun left	09:53
	← jonno11 left	09:53
	← dimi1947 left	09:53
	→ arup_r joined	09:53
	→ rivarun joined	09:53
	← ShapeShifter499 left	09:53
	← raven-au left	09:53
	← s8321414 left	09:54
	← daito left	09:55
	← fracting left	09:55
	eGGsha → eGGshke	09:55
	eGGshke → eGGsha	09:55
	→ darkbasic_ joined	09:56
	→ tjm_jimmy joined	09:56
	eGGsha → eGGshke	09:56
	← darkbasic left	09:56
	→ devoldmx joined	09:57
	← devoldmx left	10:02
	→ bronson joined	10:03
	→ fracting joined	10:03
	→ raven-au joined	10:04
	← sailorswift left	10:04
	← ferhaty left	10:04
	← markelite left	10:06
	← bronson left	10:08
	← soerenbf left	10:09
	→ tristans1 joined	10:10
	→ clarkpan_ joined	10:10
	→ markelite joined	10:12
	← a3Dman left	10:12
	← temmi_hoo left	10:13
	← jokke left	10:13
	← clarkpan left	10:13
	eGGshke → eGGsha	10:14
	← clarkpan_ left	10:14
	← tristans1 left	10:15
	→ a3Dman joined	10:16
	← bongjovi left	10:17
	→ jeadre joined	10:18
	→ Sceorem joined	10:18
	← reim left	10:19
	→ tristans1 joined	10:19
	→ ferhaty joined	10:20
	→ stamina joined	10:21
	→ astrofog joined	10:25
	→ eatsfoobars joined	10:25
	← eatsfoobars left	10:26
	← neanderslob left	10:26
	← geoid left	10:27
	→ usr819563 joined	10:27
	→ neanderslob joined	10:28
	→ modocache joined	10:31
	← maxorator left	10:32
	→ maxorator joined	10:32
	→ geoid joined	10:34
	← zoso left	10:35
	← modocache left	10:36
	← synthmea1 left	10:37
	→ synthmeat joined	10:37
	→ soerenbf joined	10:39
	← ahr3n left	10:40
	→ dadamssg joined	10:41
	→ mprelude joined	10:42
	← LadyAlissa left	10:42
	→ LadyAlissa joined	10:42
	← tehtraveler2321 left	10:43
	→ leeN joined	10:44
	→ mgc-svetatroica joined	10:44
	← dadamssg left	10:45
	→ zoso joined	10:47
	← sleezd left	10:48
	→ sleezd joined	10:50
	→ reim joined	10:51
	→ temmi_hoo joined	10:53
	→ mostlybadfly joined	10:53
	← neanderslob left	10:53
	→ EduardoMartins joined	10:55
	→ neanderslob joined	10:55
	← reim left	10:57
	← freestyl3r left	10:58
	← neanderslob left	10:58
	← stfn left	10:59
	← Zariel left	10:59
	→ stfn joined	11:00
	→ neanderslob joined	11:00
	← theskillwithin left	11:01
	← neanderslob left	11:03
	← Manikandan left	11:04
	eGGsha → eGGshke	11:05
	→ neanderslob joined	11:07
	→ freestyl3r joined	11:07
	flowinho → flowinho[afk]	11:08
	→ Dro__ joined	11:08
	← darkbit left	11:09
	→ saidelike joined	11:10
	← tjm_jimmy left	11:10
	→ cavallari joined	11:11
	→ rnsanchez joined	11:13
	→ iraw_ joined	11:13
	← neanderslob left	11:13
	← DolphinDream left	11:14
	→ sdothum joined	11:15
	→ neanderslob joined	11:15
	eGGshke → eGGsha	11:15
	← macabre left	11:15
	→ macabre joined	11:16
	→ Kallis joined	11:17
	← Kallis left	11:17
	← OnkelTem left	11:18
	→ Manikandan joined	11:18
	→ OnkelTem joined	11:19
	→ Akagi201 joined	11:21
	→ reim joined	11:22
	← Manikandan left	11:23
	→ dgutierrez1287 joined	11:23
	→ Kallis joined	11:23
	← ferhaty left	11:24
	← sixtyten left	11:24
	← encod3 left	11:25
	← neanderslob left	11:25
	→ jazywest joined	11:26
	→ sixtyten joined	11:28
	← reim left	11:29
	→ reim joined	11:32
	→ Peaker joined	11:33
	→ encod3 joined	11:34
Peaker	it seems everybody encountering a "delete/modify" conflict -- thinks they should just delete or re-add the file.. both are wrong ways to resolve almost always! Is there a sane way to see what the modify was?	11:34
	← aspiers left	11:34
Peaker	my current way is to use "git mergetool", when it asks if to accept the modified/deleted file, I say "abort", get 4 files left over on my file system, and can diff BASE with LOCAL or REMOTE to see what the change was and find how it should be applied (if at all)	11:34
	but this is insane!	11:34
	surely there should be a way to extract what the delete/modify conflict actually is?	11:35
osse	Peaker: the conflict by nature is the whole file. If it was deleted in Foo and modified in Bar you can see the modifications with git diff Foo...Bar file	11:36
	note triple dot, not double	11:36
Peaker	osse: the conflict is: one side deleted whole file. another side made some potentially small change. I want to see what the change was	11:37
	but I'm in the middle of a rebase	11:37
	→ Dazzyp joined	11:37
Peaker	I don't typically have easy access to the exact refspecs	11:37
	← keroro520 left	11:37
	← Sceorem left	11:38
osse	the output of git rebase tells you which commit you're currently rebasing. git show {that commit}	11:38
	→ Manikandan joined	11:38
osse	my first suggestion should also work jsut fine	11:38
Peaker	git show {that commit} -- {that file} might work if the modification is in the commit being cherry-picked in the rebase	11:39
	→ egs_3 joined	11:39
Peaker	but if it was deleted in the rebase, then I guess git diff ...rebase-target -- {that file} might work	11:39
osse	if git rebase stopped then it is.	11:39
	sure, git diff Bar...Foo then	11:40
	← reim left	11:41
	→ tempname11 joined	11:41
Peaker	where "Bar" and "Foo" are the "hash being cherry-picked" (hopefully I have my console log from the rebase still available) and "rebase-target"?	11:41
	← skylite left	11:41
osse	I think you can replace "hash being cherry-picked" with "the branch you're rebasing"	11:42
	→ Kelzier joined	11:42
	→ mezod joined	11:42
Peaker	that'll throw some noise in though if the file was touched later	11:42
osse	yes	11:43
	which will probably also be conflicts later anyway	11:43
	→ s8321414 joined	11:43
osse	otherwise git show "has being cherry-picked" will show it	11:43
	→ darkbasic joined	11:44
Peaker	the 3-dot diff shows the deletion on one side, and nothing on the other :(	11:44
	← darkbasic_ left	11:44
	→ m0viefreak joined	11:44
Peaker	git diff {being_rebased}...master -- {the file} shows deletion (that happened in master)	11:44
	git diff master...{being_rebased} -- {the file} shows nothing	11:45
	oh, I think the changes may have been reverted inside the branch, canceled themselves out	11:45
osse	that sounds likely	11:45
	→ jigjug joined	11:45
Peaker	yep, master...{midpoint_in_branch_that_had_the_conflict} has the useful output	11:46
	is it possible to automate this easily? A command that can nicely figure out what diff to compute when it sees a delete/modify conflict?	11:46
	I want to enhance my resolve-trivial-conflicts :)	11:46
	→ SimonNa joined	11:47
	← arussel` left	11:47
osse	don't you already have it? git diff master..midpoint	11:48
	git diff master...midpoint in the case of a rebase	11:48
Peaker	and IMO the fact that github guide and stack overflow answers and mergetool all suggesting the proper way to resolve such a conflict is either adding or deleting the file -- is virtually guaranteed to lead to faulty conflict resolutions	11:48
	→ dsilva joined	11:48
osse	but that diff should be equal to the diff git diff midpoint shows	11:48
	ehh, git show midpoint	11:48
Peaker	osse: I want something that works in all delete/modify conflict states, whether they're from rebase, merge, etc	11:48
	osse: (automated)	11:48
	→ Sceorem joined	11:49
	→ m0ltar joined	11:49
osse	hmm	11:50
	I want a new car	11:50
	← encod3 left	11:50
	→ encod3 joined	11:51
	← astrofog left	11:51
Peaker	osse: Oh I'm willing to write it myself, just wondering where the information lies	11:51
	I can go dig inside the code of "git mergetool" because it extracts that information somehow	11:51
	→ aspiers joined	11:52
	← macabre left	11:52
osse	if merge: git diff HEAD...MERGE_HEAD or git diff MERGE_HEAD...HEAD depending. if rebase: git diff Foo..midpoint where Foo is what you rebase onto and midpoint is as above.	11:53
	btu as I said git diff midpoint~ midpoint should give the same result in that case	11:53
	you can find the midpoint by looking in .git/rebase-todo or something. can't remember exactly	11:53
	← EduardoMartins left	11:54
Peaker	ok the code of mergetool isn't that complicated	11:54
	→ EduardoMartins joined	11:55
	← joo-_ left	11:55
	← encod3 left	11:56
	→ joo-_ joined	11:57
	← joo-_ left	11:57
	→ devoldmx joined	11:58
	→ tinajohnson joined	11:58
	← fstd left	11:59
	← ManneW left	11:59
	→ fstd joined	11:59
	← s8321414 left	12:00
	← iraw_ left	12:01
	→ iraw_ joined	12:02
	← devoldmx left	12:02
	← dionysus69 left	12:02
	→ reim joined	12:04
	← iraw_ left	12:06
	← sixtyten left	12:07
	→ ferhaty joined	12:08
	→ iraw_ joined	12:08
	← Dro__ left	12:09
	→ Dro___ joined	12:10
	← mikoni left	12:10
	← Cyclohexane left	12:10
	← nour left	12:10
	→ mikoni joined	12:11
	→ knownasilya joined	12:12
	← reim left	12:14
	→ vurma joined	12:14
	← Elion left	12:14
	→ reim joined	12:14
	← Kallis left	12:14
	→ paul424 joined	12:14
	→ Cyclohexane joined	12:15
	→ black_silence joined	12:15
	→ Noldorin joined	12:16
	→ mellernoia joined	12:17
	← qpdb left	12:17
	← aard left	12:17
	→ sixtyten joined	12:18
	→ mizu_no_oto joined	12:18
	← Manikandan left	12:18
	← jonno11_ left	12:18
	→ encod3 joined	12:19
	← Silox\| left	12:20
	← jceb left	12:20
	→ jceb joined	12:20
	→ uri_ joined	12:21
	→ rwb joined	12:22
	→ joo-_ joined	12:22
	← joo-_ left	12:22
	← dsdeiz_ left	12:23
	← darkbasic left	12:25
	→ darkbasic joined	12:25
	← mezod left	12:25
	← pjp left	12:27
	→ joo-_ joined	12:27
	← nerd left	12:27
	← joo-_ left	12:27
	→ joo-_ joined	12:28
	← joo-_ left	12:29
	eGGsha → eGGshke	12:29
	→ LBV_User joined	12:29
	← Akagi201 left	12:31
	← halfline left	12:31
	→ nerd joined	12:32
	→ modocache joined	12:32
	→ Zariel joined	12:32
	→ flashpoint9 joined	12:32
	→ halfline joined	12:33
	→ joo-_ joined	12:33
	→ aard joined	12:33
	→ mezod joined	12:34
	→ Joel_ joined	12:34
	→ crose joined	12:35
	eGGshke → eGGsha	12:35
	Joel_ → Guest64799	12:35
	← joel_falcou left	12:36
	← modocache left	12:37
	→ linduxed joined	12:38
	← darkbasic left	12:39
	← ferhaty left	12:39
	→ darkbasic joined	12:39
	→ abibas joined	12:40
	→ s8321414 joined	12:40
	→ dadamssg joined	12:42
	← soerenbf left	12:45
	← s8321414 left	12:46
	← dadamssg left	12:47
	← faux___ left	12:47
	→ c0mrad3 joined	12:47
	← ColdKeyboard left	12:47
	→ faux___ joined	12:48
	← Godfather_ left	12:52
	← abibas left	12:53
	→ ColdKeyboard joined	12:53
	→ s8321414 joined	12:53
	→ MarkyC joined	12:56
	← MarkyC left	12:57
	← iraw_ left	12:58
	→ macabre joined	12:58
	→ iraw_ joined	12:58
	← reim left	12:59
	→ MarkyC joined	12:59
	← s8321414 left	13:00
	→ CheckDavid joined	13:00
	→ griotspeak joined	13:02
	← jazywest left	13:02
	← notebox left	13:03
	→ notebox joined	13:03
	← tristans1 left	13:04
	→ jxpx777 joined	13:04
	← dgutierrez1287 left	13:05
	→ Joel__ joined	13:06
	→ nszceta joined	13:06
	→ Spacew00t joined	13:06
	← nszceta left	13:06
	← s00pcan left	13:07
	→ nszceta joined	13:08
	← nszceta left	13:08
	→ s00pcan joined	13:09
	→ nszceta joined	13:09
	← Guest64799 left	13:09
	← nszceta left	13:10
	← mizu_no_oto left	13:10
	→ chuchunaku joined	13:10
	→ clarkpan joined	13:11
	← ayaz left	13:11
	→ s8321414 joined	13:11
	← Peaker left	13:11
	→ dstarh joined	13:12
	← kraplax left	13:12
	→ tjm_jimmy joined	13:13
	→ Godfather_ joined	13:14
	← troulouliou_div2 left	13:14
	← egs_3 left	13:14
	← LadyAlissa left	13:15
	← michael_mbp left	13:15
	← Dreamer3 left	13:15
	→ LadyAlissa joined	13:15
	← clarkpan left	13:15
	→ dsdeiz joined	13:16
	→ michael_mbp joined	13:17
	→ nettoweb joined	13:18
	← notebox left	13:19
	→ iraw__ joined	13:20
	← iraw__ left	13:21
	→ keroro520 joined	13:21
	→ WeS joined	13:22
	← iraw_ left	13:22
	→ chitopunk joined	13:22
	→ notebox joined	13:22
	→ Gamecubic joined	13:25
	← jxpx777 left	13:26
	→ NimeshNeema joined	13:29
	→ devoldmx joined	13:29
	→ ferhaty joined	13:29
	← keroro520 left	13:31
	→ linux-modder joined	13:31
	← linux-modder left	13:32
	← devoldmx left	13:33
	→ cdown joined	13:34
	eGGsha → eGGshke	13:34
	← cdown left	13:36
	← Zariel left	13:37
	→ sfan786 joined	13:37
	→ linux-modder joined	13:37
	→ Zariel joined	13:37
	← Zariel left	13:37
	→ Zariel joined	13:38
	← Zariel left	13:38
	→ cbonobo joined	13:38
	→ modocache joined	13:38
	→ tvw joined	13:39
	→ Zariel joined	13:39
	← sfan786 left	13:39
	→ keroro520 joined	13:40
	→ sfan786 joined	13:40
	← EduardoMartins left	13:41
	→ yohnnyjoe joined	13:41
	→ qpdb joined	13:42
	eGGshke → eGGsha	13:43
	← Raging_Hog left	13:44
	→ kevwil_ joined	13:44
	→ xudongz joined	13:45
	→ qt-x joined	13:46
	← uri_ left	13:46
	→ CKyle joined	13:46
	→ marc_v92 joined	13:48
	→ axl_ joined	13:49
	← Kelzier left	13:49
	← chuchunaku left	13:50
	→ AaronMT joined	13:50
	← CKyle left	13:52
	→ DolphinDream joined	13:52
	← ckruczek left	13:54
	→ mbrzuzy joined	13:56
	→ kadoban joined	13:56
	→ thiago joined	13:57
	← daynaskully left	13:57
	← mezod left	13:58
	→ daynaskully joined	13:58
	← Joel__ left	13:59
	← s8321414 left	13:59
	← xudongz left	14:00
	→ KaIdEn13 joined	14:01
	→ Peaker joined	14:01
	KaIdEn13 → wessbrown84	14:02
	← crose left	14:02
	→ ehynds joined	14:02
	← keroro520 left	14:03
	← wessbrown84 left	14:03
	→ wessbrown84 joined	14:03
	← sfan786 left	14:04
	← cyphase left	14:04
	← eGGsha left	14:04
	→ CKyle joined	14:04
	→ cyphase joined	14:05
	← cyphase left	14:05
	→ Technocrat7 joined	14:05
	← synchron- left	14:05
	→ Tesseract85 joined	14:05
	← joo-_ left	14:05
	← alivx left	14:07
	→ ASOLAr joined	14:07
	← ASOLAr left	14:07
	← Kulrak left	14:07
	← diafour_ left	14:07
	← phantombeta left	14:08
	→ MZAWeb joined	14:08
	→ irwiss joined	14:08
	→ reim joined	14:09
	→ eGGsha joined	14:09
	→ keroro520 joined	14:10
	→ jacaballero joined	14:10
	→ phantombeta joined	14:10
	→ Darcidride joined	14:10
	→ jmckind joined	14:11
	← linux-modder left	14:11
	→ kevwil joined	14:11
	→ cyphase joined	14:11
	← cyphase left	14:11
	→ cyphase joined	14:11
	← kevwil_ left	14:12
	← jacaballero left	14:12
	→ joo-_ joined	14:13
	← joo-_ left	14:13
	→ sfan786 joined	14:16
	← keroro520 left	14:16
	→ joo-_ joined	14:16
	← joo-_ left	14:17
	← arup_r left	14:18
	← mgc-svetatroica left	14:19
	→ joo-_ joined	14:20
	← qt-x left	14:20
	← joo-_ left	14:20
	→ Kulrak joined	14:20
	← Kulrak left	14:20
	→ Kulrak joined	14:20
	← dvaske_ left	14:21
	← Zariel left	14:21
	→ joo-_ joined	14:21
	← reim left	14:21
	→ Joel__ joined	14:22
	← joo-_ left	14:23
	→ prefixed joined	14:23
prefixed	how do ignore an already tracked file?	14:23
	git reset name_of_file does not appear to work	14:23
	→ Zariel joined	14:24
	← marc_v92 left	14:25
bremner	!ignore_tracked	14:25
gitinfo	Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	14:25
	→ voodo joined	14:25
	→ IrishPrime joined	14:26
	← Technocrat7 left	14:26
prefixed	hm	14:26
	→ marc_v92 joined	14:26
	→ gamename joined	14:27
kadoban	prefixed: Also see !config , since that's 99% of the time why people want to do that.	14:27
gitinfo	prefixed: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	14:27
prefixed	ok	14:27
	← gfixler left	14:27
	→ madewokherd joined	14:28
	← dsdeiz left	14:29
	→ joo-_ joined	14:29
	← joo-_ left	14:29
	→ sanketdg joined	14:30
	→ bernardio joined	14:31
	→ joo-_ joined	14:32
	→ pjp joined	14:32
	← joo-_ left	14:32
	→ mezod joined	14:33
	→ skylite joined	14:34
	← geoid left	14:34
	→ synchronous joined	14:34
	→ JackFruh joined	14:35
	→ Raging_Hog joined	14:35
	← CKyle left	14:36
	→ Ornacia joined	14:36
	← ferhaty left	14:37
	→ geoid joined	14:37
	→ joo-_ joined	14:37
	→ keroro520 joined	14:37
	← mattcen left	14:37
	← joo-_ left	14:37
	← denimsoft left	14:37
	← howlymowly left	14:37
	← wgrant left	14:38
	← paul424 left	14:39
	→ mattcen joined	14:39
	→ wgrant joined	14:39
	→ joo-_ joined	14:40
	← notebox left	14:40
	← joo-_ left	14:40
	→ gargola joined	14:41
	→ denimsoft joined	14:41
	→ p4trick joined	14:41
	wessbrown84 → WeSsBrOwN84	14:42
	→ dadamssg joined	14:43
	→ darkbit joined	14:43
	← Nick-S left	14:43
	← avinashrbhat left	14:43
	← Kulrak left	14:43
	→ joo-_ joined	14:43
	← joo-_ left	14:43
	→ daivyk joined	14:44
	→ NeverDie joined	14:45
	← madewokherd left	14:46
	→ joo-_ joined	14:47
	← joo-_ left	14:47
	← rchavik left	14:47
	← griotspeak left	14:47
	← tvw left	14:47
	← darkbit left	14:48
	← dadamssg left	14:48
	← acolson left	14:48
	← nettoweb left	14:48
	→ darkbit joined	14:48
	→ weiyang joined	14:48
	← Peaker left	14:48
	← weiyang left	14:48
	→ weiyang joined	14:49
	→ adgtl joined	14:49
	→ theskillwithin joined	14:49
	← sdfgsdfg left	14:49
	→ glosoli joined	14:50
	← Alienpruts left	14:50
	→ adgtl_ joined	14:51
	← lb1a left	14:51
	← eGGsha left	14:52
	→ CKyle joined	14:52
	→ DrHouse\|HP8440p joined	14:52
	→ DolphinDreamm joined	14:52
	→ t2mkn joined	14:53
	→ bronson joined	14:53
	→ neurodrone_ joined	14:53
	← mattcen left	14:54
	← sfan786 left	14:54
	← adgtl left	14:54
	← Khisanth left	14:55
	→ mattcen joined	14:55
	← rscata left	14:55
	← MarcGuay left	14:56
	← glosoli left	14:56
	→ sfan786 joined	14:57
	← Joel__ left	14:57
	Ornacia → Deez_Nuts	14:57
	← bronson left	14:57
	← keroro520 left	14:58
	← DrHouse\|HP8440p left	14:59
	→ Peaker joined	14:59
	← sfan786 left	14:59
	→ Kulrak joined	14:59
	← Kulrak left	14:59
	→ Kulrak joined	14:59
	→ rubie joined	14:59
	← Zariel left	15:00
	→ ShapeShifter499 joined	15:00
	← CKyle left	15:00
	→ sfan786 joined	15:00
	← cavallari left	15:01
	→ joo-_ joined	15:01
	← joo-_ left	15:01
	→ jacaballero joined	15:01
	→ bango2 joined	15:02
	→ nettoweb joined	15:03
	→ DrHouse\|HP8440p joined	15:04
	← roelmonnens left	15:05
	← flowinho[afk] left	15:05
	→ Khisanth joined	15:06
	→ PerlJam joined	15:06
	→ The_Phoenix joined	15:07
	→ nofxx joined	15:07
	→ joo-_ joined	15:07
	← joo-_ left	15:07
	← rolfb left	15:08
nofxx	Is there some sanity tool to work with ppl with stupid editors? Tip: you're using it if you never felt like a slave monkey merging dead space sh**	15:09
	← p4trick left	15:09
	← rubie left	15:09
	→ joo-_ joined	15:09
qsuscs	nofxx: trailing whitespace or cr and/or lf fuckup?	15:09
	→ MarcGuay joined	15:09
	→ tgunr joined	15:10
	← weiyang left	15:10
nofxx	qsuscs, sorry my rant... =D yeah	15:10
	← kevwil left	15:10
nofxx	qsuscs, also tabs to spaces	15:10
	← joo-_ left	15:10
qsuscs	nofxx: git can't handle the latter one (i recommend some seven feet russians with baseball bats for that), for the former !crlf and man git diff --whitespace-something	15:11
gitinfo	nofxx: to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/	15:11
	nofxx: the git-diff manpage is available at http://jk.gs/git-diff.html	15:11
	← Sceorem left	15:11
qsuscs	or git diff --check? tell people to use it as hook, iirc it was even in the sample hook	15:11
	→ joo-_ joined	15:12
	→ madewokherd joined	15:13
	← t2mkn left	15:13
	← joo-_ left	15:13
	← bonswouar left	15:14
	→ joo-_ joined	15:14
	← joo-_ left	15:14
	→ _tgunr joined	15:14
nofxx	qsuscs, ty	15:14
	← tgunr left	15:14
	← black_silence left	15:14
	← Kulrak left	15:14
	→ Technocrat7 joined	15:15
	→ gh0sted joined	15:15
	→ dgutierrez1287 joined	15:17
_ikke_	You can setup a smudge / clean filter with expand	15:17
	→ Amandil joined	15:18
	→ Zariel joined	15:20
	→ rodrigograca31 joined	15:20
	← Ragnor left	15:21
	← dgutierrez1287 left	15:22
	← jacaballero left	15:22
	← settermjd left	15:23
	→ joo-_ joined	15:23
	← joo-_ left	15:23
	← vurma left	15:25
	→ shaggycat_ joined	15:25
	→ jerematic joined	15:28
	← tumulte left	15:28
	← pjp left	15:28
	← jceb left	15:29
	→ refried_ joined	15:29
	← refried_ left	15:29
	→ keroro520 joined	15:29
	← francis7 left	15:29
	→ avinashrbhat joined	15:29
	← jerematic left	15:29
	← gh0sted left	15:29
	→ joo-_ joined	15:29
	→ devoldmx joined	15:29
	→ tang^ joined	15:30
	← stamina left	15:30
Peaker	osse: thanks for the help, I ended up using git checkout-index --stage=all -- <path> which reads stages 1,2,3 of the index of the unmerged file. 1=base, 2=local, 3=remote	15:30
	osse: it's basically what mergetool does to get its own versions of the file	15:30
	← Zariel left	15:31
	← jmckind left	15:31
	→ renegade_ joined	15:31
	→ refried_ joined	15:32
	→ Ragnor joined	15:33
	→ fexlion joined	15:33
	← refried_ left	15:34
	← devoldmx left	15:34
	→ jmckind joined	15:34
	← marc_v92 left	15:36
	← TomyWork left	15:37
	→ dreiss joined	15:37
Peaker	resolve-trivial-conflicts now makes delete/modify conflicts behave just like ordinary conflicts (adds conflict markers) where you can resolve A/B changes in the markers and then resolve-trivial-conflicts will fix the conflict for you :)	15:37
	→ marc_v92 joined	15:37
	→ Kulrak joined	15:39
	← Kulrak left	15:39
	→ Kulrak joined	15:39
	← noisebleed left	15:40
	→ francis7 joined	15:41
	← Godfather_ left	15:41
	← Technocrat7 left	15:42
	← Peaker left	15:42
	← Balliad left	15:42
	→ Technocrat7 joined	15:42
	← Technocrat7 left	15:43
	→ Technocrat7 joined	15:43
	← Technocrat7 left	15:44
	→ Technocrat7 joined	15:44
	← flashpoint9 left	15:44
	← hahuang65 left	15:45
	← Nizumzen left	15:45
	← voodo left	15:46
	→ Dragooon joined	15:48
	→ oojacoboo joined	15:48
	← adgtl_ left	15:48
	← aard left	15:48
	← nnyk left	15:48
	→ durham joined	15:50
	→ noisebleed joined	15:50
	← renegade_ left	15:50
	→ jacaballero joined	15:50
	→ roelmonnens joined	15:51
	← keroro520 left	15:51
	→ keroro520 joined	15:51
	← roelmonnens left	15:51
	→ maestrojed joined	15:53
	← keroro520 left	15:53
	→ sorta joined	15:53
	→ keroro520 joined	15:53
	← thiago left	15:54
	→ rubie joined	15:54
	← Amandil left	15:54
	→ gabor_bernat joined	15:54
	→ Amandil joined	15:55
	LadyAlissa → Alissa	15:55
	← Dro___ left	15:55
	gitinfo set mode: +v	15:55
gabor_bernat	helllo, how can I delete all refs matching a pattern in a mirror clone?	15:56
	← geoid left	15:56
	← Amandil left	15:56
	→ Amandil joined	15:56
_ikke_	man git for-each-ref	15:56
gitinfo	the git-for-each-ref manpage is available at http://jk.gs/git-for-each-ref.html	15:56
	← sfan786 left	15:57
	← sagittarian left	15:57
osse	git for-each-ref ...	15:57
grawity	you can't easily blacklist them from further fetches though	15:57
	← Amandil left	15:57
	← Technocrat7 left	15:57
_ikke_	man git show-ref	15:57
gitinfo	the git-show-ref manpage is available at http://jk.gs/git-show-ref.html	15:57
	← msonntag left	15:58
	→ MaceBewley joined	15:58
osse	git for-each-ref --format='delete %(refname)' 'refs/heads/*' \| git update-ref --stdin	15:58
	be amazed	15:58
	→ Danjo1 joined	15:59
Seveas	git amazing --osse	15:59
gabor_bernat	cool :) thanks	16:00
	→ Amandil joined	16:00
	← keroro520 left	16:00
gabor_bernat	afterwards do I need a aggressive gc to cleanup?	16:00
osse	Seveas: http://i.giphy.com/U1XhGr8CWqvVC.gif	16:00
Eugene	gabor_bernat - only if you're OCD about getting the last 500KB out of your filesystem.	16:01
	→ msonntag joined	16:01
	ChanServ set mode: +o	16:01
	→ griotspeak joined	16:01
	Eugene changed the topic to: Welcome to #git, the place for git help and pre-sequels \| Current stable version: 2.5.1 \| clone it, fetch it, merge it, push it \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Updates were rejected: use the --force	16:01
	Eugene set mode: -o	16:02
_ikke_	Someone got inspired	16:02
osse	there are three jokes per topic now?	16:02
Eugene	Are there? Shit.	16:02
	← pm90__ left	16:02
	ChanServ set mode: +o	16:02
	← zoso left	16:02
	Eugene changed the topic to: Welcome to #git, the place for git help and pre-sequels \| Current stable version: 2.5.1 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Updates were rejected: use the --force	16:02
_ikke_	Forgot to remove the old one	16:02
	→ shinnya joined	16:02
Eugene	The middle one snuck in with DaftPunk.git	16:03
	← jmckind left	16:03
	Eugene kicked Eugene (Incompetence)	16:03
	→ Eugene joined	16:03
_ikke_	Het just wanted an extra topic edit :P	16:03
	← marc_v92 left	16:03
	→ gbbr joined	16:05
	← Darcidride left	16:05
gbbr	/usr/local/git/libexec/git-core/git-pull: line 381: exec: git-merge: not found	16:05
	fatal: 'pull' appears to be a git command, but we were not	16:05
	able to execute it. Maybe git-pull is broken?	16:05
	Q: I've recently updated git to 2.5.0 using ./unistall.sh and the downloaded installer. Now I get the above when I do `git pull origin`	16:05
Eugene	Cool. Sounds like your git install is broken. Are you using a rpm/deb/some other package?	16:06
	→ crose joined	16:06
Eugene	Ah nope, you've decided to roll your own. See our rant about using a !package	16:06
gitinfo	[!packaged] Unless you have a specific technical need for the "latest and greatest" you should go with a packaged version. Compiling and installing your own is not something that we will walk you through or troubleshoot (though it is fairly easy for developers with GNU/Linux experience).	16:06
gbbr	I'm on OS X, just did the above	16:06
	I need the latest	16:06
	Instead of saying it's fairly easy maybe you could provide a link	16:07
	← Hounddog left	16:07
Eugene	There's a INSTALL document in git.git. If that isn't enough then you should be using a package.	16:07
	_ikke_ looks in his bag if he has a link	16:07
Eugene	Package- and version-management is a non-trivial task, and I am too well employed to explain it	16:08
	If you want to be high-and-mighty with me, well, have fun.	16:08
gbbr	What's git.git?	16:08
	I'm not being high and mighty :)	16:08
Eugene	......seriously?	16:08
	https://github.com/git/git.git	16:08
gbbr	But I've used this installer: https://git-scm.com/download/mac	16:09
	→ Zariel joined	16:09
gbbr	I haven't installed from source	16:09
	→ SubZeroFX joined	16:09
gbbr	Anyway, nvm, this isn't helpful	16:09
	← cagedwisdom left	16:09
Eugene	Well that's an entirely different bred of brokenness	16:09
	→ imachuchu joined	16:09
_ikke_	ls -l /usr/local/git/libexec/git-core/git-pull	16:10
	← fexlion left	16:10
gbbr	_ikke_: the file is there, does that need to be in $PATH?	16:10
_ikke_	not necessarily	16:10
	does it have execute permissions?	16:10
	← c0mrad3 left	16:10
gbbr	Yes, if I run it, it says: /usr/local/git/libexec/git-core/git-pull: line 51: git-sh-setup: No such file or directory	16:10
grawity	it does need to have itself in $PATH though	16:11
	normally `git pull` adds it automatically	16:11
	but if you run stuff from libexec directly, you also have to set $PATH manually	16:11
gbbr	t/usr/local/git/libexec/git-core/git-sh-setup doesn't have the right permissions though	16:11
grawity	it does	16:11
	← sorta left	16:11
grawity	you're just thinking it needs more permissions than it has	16:11
_ikke_	It doesn't need to be executable	16:12
	git pull sources it	16:12
	← gabor_bernat left	16:12
_ikke_	gbbr: GIT_TRACE=1 git pull	16:12
	it says git-merge not found	16:12
gbbr	yeah, let me see if perms are ok	16:13
	lrwxr-xr-x 1 root wheel 13 Aug 31 12:59 git-merge -> ../../bin/git	16:13
	← Muzer left	16:13
gbbr	Trace doesn't really reveal anything insightful, do you wanna see a copy of it or should I be looking for somethign?	16:14
	← tjm_jimmy left	16:15
_ikke_	That symlink looks suspicious	16:15
	→ tjm_jimmy joined	16:16
	osse has a file called git-merge but it's a hardlink	16:16
	← mbrzuzy left	16:16
	→ marc_v92 joined	16:16
_ikke_	ah yeah	16:17
gbbr	_ikke_: yeah that is weird	16:17
	→ notebox joined	16:17
	→ scarabx joined	16:17
_ikke_	gbbr: does that symlink resolve to something?	16:17
	→ sbogg joined	16:18
gbbr	No	16:18
	Should I fix it so that it points to the correct git binary?	16:18
_ikke_	This isn't working anyway, so you can only improve things	16:18
	→ jmckind joined	16:18
gbbr	:)	16:19
	← bernardio left	16:19
	← dreiss left	16:19
	→ adgtl joined	16:19
gbbr	That fixed it. Thanks _ikke_	16:20
	← tjm_jimmy left	16:21
	→ wald0 joined	16:21
_ikke_	yw	16:21
wald0	it is possible to clone only a directory of a git repo?	16:21
Eugene	wald0 - short answer: no.	16:22
	→ daviid joined	16:22
wald0	specifically, i want to make a fork of a theme included in the repo of an application, but the repo is huge and i only need the "theme" directory	16:22
Eugene	Long answer: What do you want it for?	16:22
	→ Muzer joined	16:22
wald0	so i want to fork it as a git because is important to keep track of the changes on it	16:22
	← guampa left	16:22
Eugene	Download the theme directory and `git init` yourself a fresh repo.	16:23
qsuscs	18:07 * _ikke_ looks in his bag if he has a link <= git:kernel:git/git::INSTALL	16:23
gitinfo	Git web link: https://git.kernel.org/cgit/git/git.git/tree/INSTALL?h=HEAD	16:23
	→ johtso joined	16:23
Eugene	In the initial commit, give a message of "Forked from <url>" or similar.	16:23
qsuscs	git:hostingplace:repo:tree:path	16:23
	← daynaskully left	16:24
	← DrHouse\|HP8440p left	16:24
	→ daynaskully joined	16:25
wald0	and so... how i can pull updates from the remote later, if i only have "that" directory and not the entire project Eugene ?, is that possible?	16:25
grawity	I'd probably filter-branch it out	16:25
wald0	because i think that i did something similar in the past	16:25
	somebody told me to add a remote repo that had different contents, to fetch a same directory	16:25
	← Kulrak left	16:26
_ikke_	subtree split + merge	16:26
	← MaceBewley left	16:27
	← declanqian left	16:27
	→ bernardio joined	16:29
	→ MaceBewley joined	16:29
	← Orbitrix left	16:29
	← kini left	16:31
	→ mbrzuzy joined	16:31
	← Amandil left	16:31
	← MarcGuay left	16:32
	→ declanqian joined	16:32
	→ bb010g joined	16:32
	gitinfo set mode: +v	16:32
	← jeadre left	16:32
	→ kini joined	16:34
	→ Peaker joined	16:34
	← adgtl left	16:34
	→ jeadre joined	16:34
	→ sfan786 joined	16:35
	← kurkale6ka left	16:35
	→ endiruna joined	16:35
	← scarabx left	16:36
	→ dwg2 joined	16:36
	← usr819563 left	16:36
	← luizetn left	16:37
	← dwg2 left	16:38
	→ dwg2 joined	16:38
	→ flashpoint9 joined	16:38
	← flashpoint9 left	16:39
	→ adgtl joined	16:39
	→ wlritchi joined	16:40
	← kadoban left	16:40
	→ Anxi80 joined	16:40
	← Anxi80 left	16:40
	→ Anxi80 joined	16:40
	→ Kulrak joined	16:41
	← Kulrak left	16:41
	→ Kulrak joined	16:41
	→ thedodd joined	16:41
	→ Amandil joined	16:43
Anxi80	I had a large git branch that was broken down into many separate branches and they now use eachother through git submodules. Unfortunaly, the entire history from the original large branch lives in all the new small submodules as well. Is their a way to get rid of the unwanted history in the submodules?	16:43
	→ pm90_ joined	16:43
	→ nickjj joined	16:44
	→ dadamssg joined	16:44
nickjj	i am receiving remote: fatal: Out of memory, malloc failed when trying to push a fairly large change to a bare remote	16:44
	googling says to make a few changes to the config, but which config would need the changes , the bare remote repo?	16:45
	→ hahuang65 joined	16:45
	→ cavallari joined	16:46
	← Peaker left	16:46
	→ MarcGuay joined	16:47
	→ Rolybrau joined	16:47
	← Dragooon left	16:47
nickjj	actually all of the solutions i see seem to be for windows, but i'm having this issue on linux	16:47
	→ Gama11 joined	16:47
	← m0viefreak left	16:48
	← dwg2 left	16:48
	← dadamssg left	16:49
	→ [gmi] joined	16:49
	→ petersr joined	16:49
	→ CKyle joined	16:49
wlritchi	Anxi80: You can do some scary things in that area with git-filter-branch, but that involves changing every commit object in the repo which is a less than ideal route.	16:50
	← Zariel left	16:50
	← petersr left	16:50
	← CustosLimen left	16:50
	→ jceb_ joined	16:51
	← Rolybrau left	16:51
wlritchi	Question: Is there any particular reason why a DVCS like git shouldn't or can't include a second type of parent field for cherry-picks (potentially easing merging/rebasing), or does git lack such a field "just because"?	16:52
	→ mellernoia-work joined	16:52
	← linuxmint2 left	16:53
	← mellernoia left	16:53
	→ maletor joined	16:55
	→ Rolybrau joined	16:55
	→ Dragooon joined	16:56
	← mezod left	16:57
Anxi80	wlritchi, thanks.	16:57
	→ Jackneill joined	16:58
	→ Joel_ joined	16:58
	Joel_ → Guest17699	16:58
	← meLon left	16:59
	← basiclaser left	16:59
	→ kadoban joined	17:01
	← griotspeak left	17:01
	← howdoi left	17:01
	← Amandil left	17:02
	→ Amandil joined	17:02
	← Guest17699 left	17:02
	← sfan786 left	17:02
	→ adgtl_ joined	17:03
	← modocache left	17:03
	→ meLon joined	17:04
	→ kpease joined	17:04
	← Gitzilla left	17:04
	← Amandil left	17:04
	→ Amandil joined	17:05
	→ griotspeak joined	17:05
	→ Mace-Bewley joined	17:06
	← Amandil left	17:06
	← {198} left	17:07
	← adgtl left	17:07
	← PCatinean left	17:07
	→ Sasazuka joined	17:08
	← shinnya left	17:08
	← Anxi80 left	17:09
	→ blackwind_123 joined	17:09
	→ Peaker joined	17:09
_ikke_	wlritchi: There is no intrinsic reason why git shouldn't be able to	17:10
	← bernardio left	17:11
	← Kulrak left	17:11
	← ehynds left	17:11
	→ nnyk joined	17:12
	→ Gitzilla joined	17:12
	← Dragooon left	17:13
	← gusnan left	17:13
	← endiruna left	17:13
	→ reim joined	17:13
	← marc_v92 left	17:14
	← faux___ left	17:14
	→ Anxi80 joined	17:14
	→ faux___ joined	17:14
	← joo-_ left	17:14
	→ gusnan joined	17:15
grawity	git commits can have arbitrary metadata, both as visible "trailers" (part of the commit message), and as hidden metadata fields (like the usual 'parent' links)	17:15
	→ MechtiIde joined	17:15
grawity	`git cherry-pick -x` even adds the former	17:15
	so ... it's mostly "nobody cared enough to implement this"	17:15
	→ marc_v92 joined	17:15
	← tempname11 left	17:16
	← nnyk left	17:17
	→ Amandil joined	17:17
	→ joo-_ joined	17:17
	← sarri left	17:18
	→ chuchunaku joined	17:18
	← multi_io left	17:19
	← kadoban left	17:19
	→ licensed` joined	17:19
	← fracting left	17:19
	→ multi_io joined	17:20
	→ endiruna joined	17:21
	→ sarri joined	17:21
	→ Aih joined	17:22
	← Anxi80 left	17:22
	→ {198} joined	17:23
	← nettoweb left	17:23
	← Aih left	17:23
	→ Hubn joined	17:24
	← jsgrant left	17:24
	→ glosoli joined	17:24
	← Hubn left	17:25
	→ stickperson joined	17:25
	→ editshare-ericf joined	17:25
	← encod3 left	17:25
	→ Wyta joined	17:25
	→ Kulrak joined	17:26
	← Kulrak left	17:26
	→ Kulrak joined	17:26
	→ dreiss joined	17:26
	→ nettoweb joined	17:26
	← Wyta left	17:26
	→ axpb joined	17:28
	→ CKyle_ joined	17:28
	← qpdb left	17:28
	← axpb left	17:28
	→ nfk joined	17:29
	→ jsgrant joined	17:29
	→ whomp joined	17:29
	← MZAWeb left	17:29
	← Danjo1 left	17:29
	→ Anxi80 joined	17:30
	→ Amandil\|2 joined	17:30
	← gbbr left	17:30
	→ layer joined	17:30
	→ devoldmx joined	17:30
	→ MZAWeb joined	17:30
	← chuchunaku left	17:30
	→ mezod joined	17:30
blackwind_123	http://ericsink.com/entries/hg_denzel.html so what is ERIC trying to say here...? is SVN okay compared to git and mercuiral...? no flame wars please , just trying to understand...	17:31
bremner	blackwind_123: why don't you ask #svn about svn?	17:31
	← CKyle left	17:31
	← _raymond_ left	17:32
blackwind_123	bremner : never added #svn to my autoconnect list in IRC channel :) i guess its time to	17:32
	→ flashpoint9 joined	17:32
osse	blackwind_123: he probably means that svn is older but has a solid reputation	17:32
	→ modocache joined	17:33
	← Amandil left	17:34
	← marcogmonteiro left	17:34
blackwind_123	osse : oh okay , tnx...	17:34
	→ rhinojr joined	17:34
	← mezod left	17:35
	← devoldmx left	17:35
osse	but unlike svn morgan freeman is still relevant :p	17:35
	← griotspeak left	17:36
	← The_Phoenix left	17:36
	→ gsingh93_ joined	17:36
blackwind_123	osse : hehe	17:37
	→ Byqh joined	17:38
	← denimsoft left	17:38
	← Byqh left	17:39
	→ MZAWeb_ joined	17:39
	← adgtl_ left	17:39
	→ adgtl joined	17:39
	← darkbit left	17:39
	→ ioil joined	17:41
	← MZAWeb left	17:41
	← ioil left	17:41
	→ iota_pi joined	17:42
	→ raymond joined	17:42
	→ illbyte joined	17:43
	← temmi_hoo left	17:43
	→ kpease_ joined	17:43
	→ cromero joined	17:44
	← whomp left	17:44
	→ kadoban joined	17:44
	→ beaconwriter joined	17:45
	← wowaname left	17:45
	← kpease left	17:45
	← faux___ left	17:46
	→ adgtl_ joined	17:46
	← oojacoboo left	17:46
	← [gmi] left	17:46
	← cromero left	17:47
	→ Eeoe joined	17:47
	← Eeoe left	17:48
	→ Kicer86 joined	17:49
	→ qif joined	17:49
	← qif left	17:49
	← SubZeroFX left	17:50
	← adgtl left	17:50
	→ bronson joined	17:50
	← marc_v92 left	17:50
	→ wrouesnel1 joined	17:51
	→ eatsfoobars joined	17:52
	→ Xfsq joined	17:52
	→ pjp joined	17:52
	→ whomp joined	17:53
	← Xfsq left	17:53
	← whomp left	17:54
nuge	anyone know how to read the contents of a gitlab repostiory?	17:54
	← pjp left	17:55
	→ refried_ joined	17:55
	← noisebleed left	17:55
iveqy	nuge: yes?	17:55
nuge	i'm on osx -so i can't install gitlab locally	17:55
bremner	you need git locally	17:55
nuge	am trying to migrate a gitlab repository to my github account	17:55
	is there a way to access the contents of the depot without gitlab?	17:56
	→ adgtl joined	17:56
	→ Oxpe joined	17:56
bremner	use git clone?	17:56
iveqy	nuge: are we talking only of the repositories or also wiki, tickets etc?	17:56
nuge	(I don't need the history)	17:56
bremner	oh. no idea then.	17:56
	to be fair, this _is_ #git.	17:57
nuge	understood - i'm new to git - not too sure what the different flavors are	17:57
	→ ehynds joined	17:57
phroa	!gitlab	17:57
gitinfo	Gitlab is Git hosting similar to Github, but for your own server or on gitlab.com, giving you unlimited free private repositories: http://gitlab.com/	17:57
phroa	er	17:58
	I expected something else for that	17:58
	← Oxpe left	17:58
phroa	carry on :x	17:58
	→ ckinniburgh joined	17:58
	→ lancero joined	17:58
	→ Sauzs joined	17:59
iveqy	nuge: hard to help you when you refuse to explain your problem	17:59
	← adgtl_ left	17:59
	← CheckDavid left	17:59
	→ mezod joined	17:59
	→ marc_v92 joined	17:59
	← Sauzs left	18:00
	→ luizetn joined	18:00
nuge	iveqy - just need the repostory contents - i'm taking over a project from a previous dev that used gitlab locally	18:00
	they just gave me an export - but I can't use it locally as there doesn't seem to be a OSX version of their software.	18:00
	→ Ouee joined	18:01
wlritchi	grawity: Thanks. Supposing I did for some reason reference an object in either the commit message or metadata, is there any way to alter the reachability graph calculation to prevent it from being pruned and cause it to be transferred with clone, fetch, etc?	18:01
	→ tterrag joined	18:01
phroa	nuge: gitlab's data bits are in /opt/gitlab last I checked. that said, you should be able to `git clone` -- git is a command line tool to manage repositories. all gitlab is is basically a wrapper around it to act as a server.	18:01
grawity	wlritchi: currently, no	18:01
phroa	nuge: you can read !book online for more, or maybe !getting_started	18:01
gitinfo	nuge: 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	18:01
	→ krawchyk joined	18:01
grawity	wlritchi: (and even if you did, you'd have problems with older Git versions not honoring it)	18:01
phroa	no, !getting_started doesn't even exist either. damn	18:01
grawity	wlritchi: a way to add generic object references would be nice though	18:01
	→ FunkyAss joined	18:01
iveqy	nuge: so just install linux on a virtual machine and clone your copies? I don't know about gitlab but I've a hard time imagine they have some custom backend, it wouldn't surprise me if you can just clone the repos from the export you've	18:02
grawity	wlritchi: for now, you might want to take a look at how `git notes` works	18:02
tterrag	hm...so I have an interesting question. I have joined a project which (stupidly) lost the git history for a project when they migrated repos. I was wondering if it would be possible to apply the old project's git history "behind" the current project?	18:02
grawity	wlritchi: and/or how `git replace` works	18:02
	← Ouee left	18:02
	→ petersr joined	18:02
tterrag	I know that would be pretty non-standard and probably very bad :P	18:02
	but I'm interested either way	18:02
wlritchi	grawity: As it so happens I have both of those pages already open, the former thanks to your earlier suggestion and the latter by coincidence	18:02
	→ thiago_ joined	18:02
	← jacaballero left	18:02
grawity	wlritchi: the latter just has special refs named refs/foo/<commitid>, the former actually generates a sort-of "side" DAG containing the notes	18:02
nuge	iveqy - that was my next step - to create a VM and gitlab install - but that's further into territory i'm new to. :)	18:02
phroa	nuge: installing gitlab shouldn't be necessary to access it. is the server still running somewhere?	18:03
	← Padawan_ left	18:03
	→ jacaballero joined	18:03
nuge	no - htey just handed over the repo	18:03
tterrag	basically I need to replace the "Initial Commit" with the entire history for the old project	18:03
iveqy	nuge: so have you tried the "just clone the repos" solution you've been adviced three times?	18:03
grawity	tterrag: first `git fetch` the history into the new repo	18:03
phroa	nuge: is this repo a file tree, or is it a folder with things like "HEAD", "index", "objects" inside it	18:03
grawity	tterrag: then use a) grafts, or b) replaced objects, to add a fake parent to your initial commit	18:04
	tterrag: finally use `git filter-branch` to "bake in" the graft/replace	18:04
nuge	the repo shows "branches, objects, info, reffs"	18:04
tterrag	grawity: well I'd need to replace the initial commit, not add a parent to it	18:04
	→ Uoexj joined	18:04
	→ Danjo1 joined	18:04
	← artgoeshere_ left	18:04
tterrag	since the initial commit adds all the code that is from the old history	18:04
	← Uoexj left	18:04
grawity	tterrag: that's fine	18:04
	← bronson left	18:04
tterrag	also, I'm not familar with grafts	18:04
grawity	tterrag: commits are not diffs, they're snapshots	18:04
	tterrag: so Git will handle this normally	18:05
phroa	nuge: okay, that is what's known as a "bare repo". copy it to your computer, then make a new folder outside of it. install git, run `git clone /path/to/the/bare/repo` inside tha tnew folder	18:05
tterrag	noted	18:05
nuge	phroa - great, i'll try that now.	18:05
grawity	tterrag: once done, the leftover "initial commit" commit will just show up as having no changes, and it can be removed using `git rebase -i` the same way you'd remove any other commit	18:05
	→ wowaname joined	18:05
tterrag	yeah	18:05
phroa	nuge: you may have to prepend "file://" to /path/..., I'm not sure.	18:05
	← Raging_Hog left	18:06
grawity	that's not needed	18:06
	→ nszceta joined	18:06
phroa	k	18:06
	→ ekqq joined	18:06
	← joki left	18:06
tterrag	grawity: could you explain what a graft is? I'm unfamiliar and google isn't being very helpful	18:06
	→ faux___ joined	18:06
	← nszceta left	18:06
tterrag	is it just copying the objects?	18:06
	← ekqq left	18:07
grawity	it's a side way to tell Git that a commit has more parents than it actually has	18:07
	https://git.wiki.kernel.org/index.php/GraftPoint, maybe http://ben.straubnet.net/post/939181602/git-grafting-repositories	18:07
	← MZAWeb_ left	18:07
	→ nszceta joined	18:08
nuge	phroa - i get an error that i "I appeared to have cloned an empty repository	18:08
grawity	basically, in the .git/info/grafts file, you add a line having "<new_initial_commit_ID> <old_final_commit_ID>"	18:08
	→ MZAWeb joined	18:08
phroa	nuge: I don't really feel qualified to help troubleshoot bare repos, I barely (ha) use them. perhaps someone else can help	18:08
	← nszceta left	18:08
	→ dspirito joined	18:08
grawity	nuge: go back to the bare repo, and run `git show-ref` in it – what branches does it have?	18:09
nuge	no worries - ppreciate the attempt. i've got some more info than I started with. :)	18:09
tterrag	grawity: ok...I think I can work with that	18:09
	I'll report back	18:09
grawity	many things can be done inside bare repos too	18:09
	→ sfan786 joined	18:09
	← sinkensabe left	18:09
	← Shentino left	18:09
nuge	gravity - it shows a refs/heads/master and folder for the root of the project	18:09
grawity	tterrag: just don't forget that grafts are only step 2, after `git fetch`ing the old history into the new repo (or vice versa)	18:09
nuge	refs/head/project	18:09
	→ Shentino joined	18:10
tterrag	yeah	18:10
	← rhinojr left	18:10
grawity	nuge: ok, and what does the same command show in your new clone?	18:10
	→ artgoeshere joined	18:10
	← nickjj left	18:10
	→ uuaex joined	18:11
nuge	i get nothing from my new repo	18:11
	do I need to use git init?	18:11
	← faux___ left	18:11
	← uuaex left	18:11
	← nardev left	18:11
	→ joki joined	18:11
grawity	no, cloning does that automatically	18:12
	maybe you cloned the wrong path though	18:12
	← ehynds left	18:12
	→ Naauu joined	18:12
	← rideh left	18:12
nuge	I suspect os - do I need to navigate to any of the sub dirs?	18:12
	← Naauu left	18:12
	→ rideh joined	18:12
nuge	or is the lcoation with the objects/info/refs etc the "root" of the repo?	18:12
	← refried_ left	18:12
grawity	it's the root, yes	18:13
	→ stamina joined	18:13
grawity	well, the location with "config", "objects/", and "refs/" is the root	18:13
	→ dvaske joined	18:13
nuge	k - i'm reading hte man page on git now	18:13
	→ Owaj joined	18:13
	← Owaj left	18:14
	→ xjpo joined	18:15
	← xjpo left	18:15
	← hahuang65 left	18:15
	→ dvaske_ joined	18:16
	→ HanClinto joined	18:16
	→ upene joined	18:16
	→ victortyau joined	18:16
ELFrederich	hey guys... I've been using Git on a directory that is now part of a bigger project. I'd like to graft on this history. Is there a way to re-write history to make the entire repo appear to be under a subdirectory?	18:16
	→ Dcuii joined	18:17
	← kpease_ left	18:17
	← flashpoint9 left	18:17
	→ Algebr joined	18:17
_ikke_	git subtree merge	18:17
	→ dgutierrez1287 joined	18:17
tterrag	grawity: if there is no grafts file I create it, correct?	18:17
grawity	tterrag: yes	18:17
	← dvaske left	18:18
Algebr	somewhat of a github question as well, Can I make one branch of a repo private? I guess that means requiring each branch to have a different upstream. Surely git can do this?	18:18
grawity	ELFrederich: that might be unnecessary – just subtree-merge it	18:18
	→ tempname11 joined	18:18
	← Dcuii left	18:18
grawity	Algebr: on the github side, you'd need them to be on separate repos	18:18
	which makes things a little annoying, since after cloning repo 1, one would need to manually add repo 2 as a remote	18:18
	← cwillu_at_work left	18:19
Algebr	oh damnit	18:19
grawity	some projects do this	18:19
Algebr	I have a vced .emacs.d and I a branch for work and a branch for public personal use	18:19
	want	18:19
tterrag	http://puu.sh/jWupO.png	18:19
	→ papna joined	18:19
	tterrag waits	18:19
	← tempname11 left	18:19
nuge	gravity - i get "fatal: bad default revision 'HEAD'" when I try git show in the root	18:20
	→ Kdt joined	18:20
grawity	nuge: that's not unusual inside bare repos	18:20
nuge	ok. thats good to know.	18:20
grawity	though you can `git symbolic-ref HEAD refs/heads/master`	18:20
	← NimeshNeema left	18:20
papna	I want to create a working copy of a certain commit of a repo at a particular place. Is there a nicer way to do it than "git clone foo bar; cd bar; git checkout f6e7ecb3a0384d84efa2335739d4ff742fe281ca` ?	18:20
	→ tempname11 joined	18:21
canton7	there's man git worktree	18:21
gitinfo	the git-worktree manpage is available at http://jk.gs/git-worktree.html	18:21
	← Kdt left	18:21
	← jacaballero left	18:21
	← tempname11 left	18:22
	← dgutierrez1287 left	18:22
	→ flashpoint9 joined	18:23
	← adgtl left	18:23
	← CKyle_ left	18:23
	→ \|digits\| joined	18:23
	← \|digits\| left	18:23
	→ cwillu_at_work joined	18:23
	→ \|digits\| joined	18:23
	← \|digits\| left	18:23
	→ \|digits\| joined	18:24
	← \|digits\| left	18:24
	→ febi joined	18:24
	→ dgutierrez1287 joined	18:24
	→ \|digits\| joined	18:24
	← \|digits\| left	18:24
	← febi left	18:25
	→ \|digits\| joined	18:25
	← \|digits\| left	18:25
papna	Thanks	18:25
	→ anth0ny joined	18:25
	→ pantsman- joined	18:25
	→ vF3hNGxc47h8 joined	18:25
	→ \|digits\| joined	18:25
	← \|digits\| left	18:25
tterrag	grawity: what if the "new" repo had a commit that was just the readme, THEN it added the code	18:26
anth0ny	Every time I want to upload a new branch, I have to do "git push --set-upstream origin myBranch". Is there any way around this? I'd like it to be automatic when I push	18:26
	→ hahuang65 joined	18:26
tterrag	should I graft to the second commit?	18:26
	→ \|digits\| joined	18:26
	← \|digits\| left	18:26
	→ asrax joined	18:26
	→ \|digits\| joined	18:26
	← \|digits\| left	18:26
iveqy	anth0ny: man git config	18:27
gitinfo	anth0ny: the git-config manpage is available at http://jk.gs/git-config.html	18:27
	→ \|digits\| joined	18:27
	← \|digits\| left	18:27
	→ kpease joined	18:27
grawity	tterrag: I think so, yes	18:27
iveqy	anth0ny: however --set-upstream should already fix this for you, for some reason your configuration isn't saved. Do you get any message about that?	18:27
	→ \|digits\| joined	18:28
	← \|digits\| left	18:28
grawity	hmm I'm not sure if grafts overwrite existing parents, or just add new ones	18:28
	← asrax left	18:28
anth0ny	iveqy: I don't get messages about that	18:28
grawity	either way, you can use regular `gitk` or `tig` to take a look at the result	18:28
_ikke_	grawity: overwrite	18:28
anth0ny	iveqy: will look into adding to my config	18:28
nuge	grawity - i tried "git clone -l -s -n . ../copy" from the repo root - its also reports cloning an empty repo	18:28
	→ \|digits\| joined	18:28
	← \|digits\| left	18:28
phroa	man git branch	18:28
gitinfo	the git-branch manpage is available at http://jk.gs/git-branch.html	18:28
grawity	nuge: odd	18:28
	nuge: how about this:	18:28
	nuge: 1) mkdir myproject	18:28
phroa	anth0ny: `git branch --set-upstream-to=origin myBranch`	18:28
	← Amandil\|2 left	18:28
	→ \|digits\| joined	18:29
	← \|digits\| left	18:29
grawity	nuge: 2) mv thegitlabrepo myproject/.git	18:29
	nuge: 3) cd myproject/.git && git config core.bare false	18:29
	← MechtiIde left	18:29
grawity	now it's non-bare	18:29
	→ Oio joined	18:29
	→ \|digits\| joined	18:29
	← \|digits\| left	18:29
tterrag	grawity: hm...yeah I'm using the visualizer. This is what I have http://puu.sh/jWv27.png	18:29
anth0ny	phroa: yeah, but that's one word less than the other solution with 'git push', which isn't ideal	18:29
tterrag	but when I click on the "Initial Commit" it still shows the diff as everything	18:30
	→ \|digits\| joined	18:30
	← \|digits\| left	18:30
	← Oio left	18:30
phroa	anth0ny: yeah, but you only have to do it once...	18:30
	which is currently an improvement	18:30
	← Danjo1 left	18:30
tterrag	oh wait derp	18:30
	→ \|digits\| joined	18:30
tterrag	I need to squash up to "added in all the original files"	18:30
	FUN	18:30
anth0ny	phroa: yeah, that's how it operates with push, once I set-upstream with push, i never have to do it again	18:30
tterrag	need to squash some commits that are ~1000 back	18:31
grawity	hmm, or just graft to that "added in all..."	18:31
	→ CKyle joined	18:31
nuge	grawity - tried that - now from that root git show-ref doesn't report anything	18:31
	← \|digits\| left	18:31
iveqy	anth0ny: the thing is that using --set-upstream should add this to you config...	18:31
	→ Silox\| joined	18:31
tterrag	grawity: yeah...might just want to start over :P	18:31
nuge	(root of the new proejct)	18:31
	→ uaahu joined	18:31
	tterrag nukes	18:31
phroa	anth0ny: I see what you're saying now.	18:31
anth0ny	phroa: iveqy: "git config --global push.default current" did the trick	18:31
	→ Balliad joined	18:31
	← uaahu left	18:32
anth0ny	iveqy: yes, but I believe only for that branch	18:32
	→ worstadmin joined	18:32
anth0ny	i was hoping for a global solution	18:32
	→ AaronMT_ joined	18:32
anth0ny	all is figured out now	18:32
worstadmin	I merged two branches and I want to rebase instead how can I rewind and fix the history?	18:32
iveqy	anth0ny: oh? What was the solution?	18:32
	and yes, that's only for one branch	18:33
anth0ny	iveqy: "git config --global push.default current"	18:33
phroa	worstadmin: you can use `man git reset` with --hard to rewind the current branch pointer before the merge.	18:33
gitinfo	worstadmin: the git-reset manpage is available at http://jk.gs/git-reset.html	18:33
	← AaronMT left	18:33
phroa	e.g. `git reset --hard @~` for one commit ago.	18:33
	do that on the branch it was merged into	18:33
	→ Ezka joined	18:34
nuge	grawity - so I have a better sense, they mus thave created the repo that I recieved by calling git push - correct?	18:34
grawity	nuge: probably	18:34
	well, first `git init --bare`, then pushing to it	18:34
	→ Danjo1 joined	18:34
tterrag	grawity: does it hugely matter that I'm on the "dev" branch while doing this? dev is completely ahead of master so I wouldn't think it would	18:34
phroa	nuge: gitlab manages repo creation in the web interface	18:34
	nuge: when they would then push to, yes :)	18:34
grawity	tterrag: no, you're only rewriting the current branch, and it doesn't matter which branch it is	18:34
tterrag	grawity: er...wait	18:35
	← Ezka left	18:35
tterrag	so I need to do this for all branches then?	18:35
nuge	ok. i use github and beanstalk as my hosts - if I create a repot there can I push the bare to my host?	18:35
Algebr	If I am on one branch and I want to do a commit, can I make that commit go on another branch while on this current one	18:35
grawity	tterrag: you need to filter-branch all of them	18:35
nuge	or is a bare repo somewhat of a dead-end?	18:35
tterrag	ah ok	18:35
	can do	18:35
	only ~2 minutes per branch -_-	18:35
grawity	I mean, the grafts are global, but each branch has to be rewritten to 'bake' them in	18:35
	filter-branch has --all though	18:35
tterrag	yeah	18:35
grawity	nuge: yeah, you can push from a bare repo	18:36
	← MZAWeb left	18:36
	→ paul424 joined	18:36
iveqy	anth0ny: ah, you might want to know that the default for push.default was changed in git 2.0. So if you are changing versions you might want to be observative. Good you found the solution =)	18:37
tterrag	grawity: no --all for me	18:37
anth0ny	iveqy: thanks for the heads up	18:37
	→ Coxiu joined	18:37
nuge	k - i created repot on my new server, calling git push http://<myserver>project.git reports "the current branch master has no upstream branch"	18:38
	← Coxiu left	18:38
worstadmin	phroa: I already pushed the resulting merge	18:39
	← jceb_ left	18:39
worstadmin	so if I reset it to HEAD~2 and rebase will it kill the future merge commit?	18:39
phroa	worstadmin: your options are to live with it, make a `man git revert` commit, or !rewwrite	18:39
gitinfo	worstadmin: the git-revert manpage is available at http://jk.gs/git-revert.html	18:39
phroa	!rewrite, sorry	18:39
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	18:39
	← wowaname left	18:40
phroa	resetting past a pushed commit and adding commits on to it will cause rewrite issues.	18:40
tterrag	oh one last thing grawity, related to the above. This is a thing which will require fresh checkouts right? since it's going to need a force push	18:40
grawity	tterrag: yes	18:40
tterrag	best to get it done now	18:40
	thanks	18:40
grawity	(or, at least, a lot of fetch + reset --hard's.)	18:40
worstadmin	phroa: so basically you're boned once you push the merge	18:41
	→ shad joined	18:41
tterrag	oh dang it	18:41
	lol	18:41
	I just set the parent to the first commit of the old repo -.-	18:41
phroa	worstadmin: unless you are okay with doing the nuclear option (--force push), yes, pushing anything you later want to remove will bone you	18:41
tterrag	waste of time that was	18:41
	→ duol joined	18:41
phroa	if you're the only one using the repo it isn't really terrible to use --force, otherwise you'll have to let everyone know they need to nuke their own clones and re-pull the proper one. (or run the --reset themselves, but that's another matter)	18:42
tterrag	this channel is huge btw...I expected a big channel but not this big	18:42
phroa	it's almost like a lot of people use git or something	18:43
tterrag	ikr :D	18:43
	← duol left	18:43
	→ faux___ joined	18:43
	← mrkake left	18:44
phroa	worstadmin: I don't know how precious your rebase is to you, but if you reallyreallyreally want those commits linear and reallyreallyreally don't want to --force, you can `git revert` the merge commit and rebase on to the target branch... you'll then have both a merge and a rebase of the same stuff in there, but if it's worth it to you...	18:44
	→ dadamssg joined	18:45
	← Kulrak left	18:45
	→ d10n-work joined	18:45
	→ ItSAN____ joined	18:45
nuge	grawity - appreciate the help - going to start over with the archive and work from teh start again. I'm not 100% sure that the archive I recieved was intact. But yu've given me some stuff to chase down and investigate	18:46
	← ItSANgo left	18:46
	← faux___ left	18:48
	← dadamssg left	18:49
	← kpease left	18:49
	→ mrkake joined	18:49
	→ bronson joined	18:50
	→ eooet joined	18:50
	→ DrHouse\|HP8440p joined	18:51
	→ kpease joined	18:52
	← eooet left	18:52
	← BBBThunda_ left	18:52
	→ BBBThunda joined	18:52
	← vF3hNGxc47h8 left	18:53
	→ Fontly joined	18:53
	← flashpoint9 left	18:54
	← c74d left	18:54
	← GT4066 left	18:55
	← Fontly left	18:55
	→ dna113p joined	18:55
	→ c74d joined	18:55
	→ Vna joined	18:56
	→ cannonball joined	18:56
	← Anxi80 left	18:56
	→ griotspeak joined	18:56
	→ rhinojr joined	18:57
	→ Anxi80 joined	18:57
	← Vna left	18:57
	← tristanp_ left	18:59
	→ tristanp joined	18:59
	→ grill joined	18:59
	← prefixed left	18:59
	← nettoweb left	18:59
	→ Kulrak joined	19:00
	← Kulrak left	19:00
	→ Kulrak joined	19:00
	→ ItSANgo_ joined	19:00
	← rhinojr left	19:00
	→ akiva joined	19:00
	→ Uaus joined	19:00
	← grill left	19:00
	→ FabTG_ joined	19:01
	← Uaus left	19:02
	← ItSAN____ left	19:02
	← tristanp left	19:04
	→ Ieic joined	19:04
	← Strat left	19:04
tterrag	grawity: is it possible to squash forwards? I want to push the first 3 commits in the repo into the 4th	19:04
	→ Strat joined	19:04
	← petersr left	19:04
	→ oojacoboo joined	19:04
	← Ieic left	19:05
bremner	you can squish all 4 and keep the last commit message	19:05
	→ gabor_bernat joined	19:05
_ikke_	tterrag: You can reorder the commits and then squash them	19:05
	← macabre left	19:05
_ikke_	tterrag: basically move the last commit as first	19:05
tterrag	hm	19:06
	but even then, if I run `git rebase -i [first commit SHA]` that opens up the rebase with the SECOND commit as the first one in the file	19:06
MarkyC	Is it possible to show modified lines, by author, by day?	19:06
	← michael_mbp left	19:07
	← stamina left	19:07
	← sfan786 left	19:07
MarkyC	I can do git log --author=my@email.ca --no-merges --simplify-merges --format="%ad %s <%h>" --date=short	19:07
_ikke_	tterrag: is it the first commit in the repo?	19:07
	→ MZAWeb joined	19:07
tterrag	_ikke_: of course	19:07
_ikke_	tterrag: git rebase --root	19:08
tterrag	otehrwise how would the SHA even be recognized?	19:08
	ah	19:08
MarkyC	then for each commit, git show <hash> and print a header if the date changes	19:08
_ikke_	tterrag: I did not follow the conversation	19:08
	← robbyoconnor left	19:08
	→ sfan786 joined	19:08
tterrag	bremner: how would I keep the 4th commit's message?	19:08
	oh nvm	19:08
	it's in the file	19:08
	→ Guest78008 joined	19:09
	← Guest78008 left	19:10
	→ m0viefreak joined	19:10
	← sfan786 left	19:11
	→ michael_mbp joined	19:11
	← nerd left	19:11
	→ Ngrr joined	19:11
	← hahuang65 left	19:12
	← cyphase left	19:13
	← Ngrr left	19:13
	← DrNick left	19:13
	→ jmpp joined	19:15
	→ sfan786 joined	19:16
	→ jceb_ joined	19:16
	← ShapeShifter499 left	19:17
	← Papabear left	19:17
	← Balliad left	19:17
	→ elux joined	19:19
	← sfan786 left	19:20
	→ iibfl joined	19:20
	← iibfl left	19:21
	← michael_mbp left	19:21
	→ Ode joined	19:22
	← Ode left	19:22
	→ michael_mbp joined	19:23
	→ miguel_ joined	19:23
miguel_	it's my first time starting a git repo in amazon ec2 but I cant push changes	19:24
	→ cvanball joined	19:24
miguel_	I dont think I started it as a bare repo	19:25
	→ hbg joined	19:25
	→ faux___ joined	19:25
miguel_	whats the right way to start a bare repository and set the master branch?	19:25
	← jpnurmi left	19:26
	→ jpnurmi joined	19:26
	← hbg left	19:26
	→ jacaballero joined	19:27
_ikke_	git init --bare	19:27
	← griotspeak left	19:27
_ikke_	no need to set the master branch	19:27
	→ serapath joined	19:27
	→ griotspeak joined	19:27
	→ CustosLimen joined	19:27
	→ DrNick joined	19:27
	→ cyphase joined	19:28
	→ hahuang65 joined	19:28
	→ ShapeShifter499 joined	19:28
	← marc_v92 left	19:29
miguel_	@+_ikke_ just that?	19:29
	thx	19:29
_ikke_	yes	19:30
	← griotspeak left	19:30
	← faux___ left	19:30
	→ Sazhen86 joined	19:30
	→ marc_v92 joined	19:30
phroa	miguel_: for what it's worth, the + sign isn't part of _ikke_'s nick :)	19:30
	→ Xqz joined	19:31
	→ devoldmx joined	19:31
miguel_	hehe :) noted	19:31
	→ macabre joined	19:31
	← wahibdon left	19:31
	← Xqz left	19:31
	→ gnoel joined	19:32
	→ nickety joined	19:32
	← Dazzyp left	19:32
	→ tomaw_ joined	19:33
	← AaronMT_ left	19:33
	← bronson left	19:33
	← nickety left	19:33
	→ akoe joined	19:33
	← akoe left	19:33
	← m0viefreak left	19:34
	← paul424 left	19:34
	← dgutierrez1287 left	19:34
	← Algebr left	19:34
	← luizetn left	19:34
	← jsgrant left	19:34
	← stickperson left	19:34
	← blackwind_123 left	19:34
	← MarcGuay left	19:34
	← sbogg left	19:34
	← phantombeta left	19:34
	← cbonobo left	19:34
	← Gamecubic left	19:34
	← chitopunk left	19:34
	← s00pcan left	19:34
	← SimonNa left	19:34
	← OnkelTem left	19:34
	← rnsanchez left	19:34
	← leeN left	19:34
	← HmmrFll left	19:34
	← martinbjeldbak left	19:34
	← joako left	19:34
	← aretecode left	19:34
	← kgirthofer left	19:34
	← phantomcircuit left	19:34
	← ntio left	19:34
	← flaguy48 left	19:34
	← DeMiNe0 left	19:34
	← evie_hammond left	19:34
	← diogenese left	19:34
	← M-ou-se left	19:34
	← zapb_ left	19:34
	← whaley left	19:34
	← ngladitz left	19:34
	← alduin left	19:34
	← oxsyn left	19:34
	← Kaisyu left	19:34
	← doop left	19:34
	← Stravy left	19:34
	← venmx left	19:34
	← Volund left	19:34
	← MrC left	19:34
	← kriskropd left	19:34
	← kappy left	19:34
	← squentin left	19:34
	← jast left	19:34
	← Pookz left	19:34
	← styx_ left	19:34
	← ghormoon left	19:34
	← kaictl left	19:34
	← parrotriver left	19:34
	← kandinski left	19:34
	← krawchyk left	19:34
	← jmckind left	19:34
	← halfline left	19:34
	← slixpk left	19:34
	← bodie_ left	19:34
	← james3015 left	19:34
	← unforgiven512 left	19:34
	← Xe left	19:34
	← aucecil left	19:34
	← joelsmith left	19:34
	← Kulrak left	19:34
	← fullstack left	19:34
	← elementalest left	19:34
	← Milos left	19:34
	← kini left	19:34
	← miguel_ left	19:34
	← aboccia left	19:34
	→ kossy joined	19:34
	→ krawchyk joined	19:34
	→ halfline joined	19:34
	→ bodie_ joined	19:34
	→ james3015 joined	19:34
	→ unforgiven512 joined	19:34
	→ aucecil joined	19:34
	→ joelsmith joined	19:34
	→ Seveas joined	19:34
	weber.freenode.net set mode: +v	19:34
	← unforgiven512 left	19:34
	← kossy left	19:34
	→ slixpk joined	19:35
	→ KronTMX joined	19:35
	→ m0viefreak joined	19:35
	→ paul424 joined	19:35
	→ dgutierrez1287 joined	19:35
	→ Algebr joined	19:35
	→ luizetn joined	19:35
	→ stickperson joined	19:35
	→ blackwind_123 joined	19:35
	→ MarcGuay joined	19:35
	→ sbogg joined	19:35
	→ phantombeta joined	19:35
	→ cbonobo joined	19:35
	→ Gamecubic joined	19:35
	→ chitopunk joined	19:35
	→ s00pcan joined	19:35
	→ SimonNa joined	19:35
	→ OnkelTem joined	19:35
	→ rnsanchez joined	19:35
	→ leeN joined	19:35
	→ HmmrFll joined	19:35
	→ martinbjeldbak joined	19:35
	→ joako joined	19:35
	→ aretecode joined	19:35
	→ kgirthofer joined	19:35
	→ phantomcircuit joined	19:35
	→ ntio joined	19:35
	→ flaguy48 joined	19:35
	→ DeMiNe0 joined	19:35
	→ evie_hammond joined	19:35
	→ whaley joined	19:35
	→ diogenese joined	19:35
	→ M-ou-se joined	19:35
	→ zapb_ joined	19:35
	→ ngladitz joined	19:35
	→ alduin joined	19:35
	→ Volund joined	19:35
	→ oxsyn joined	19:35
	→ Kaisyu joined	19:35
	→ doop joined	19:35
	→ parrotriver joined	19:35
	→ Stravy joined	19:35
	→ venmx joined	19:35
	→ MrC joined	19:35
	→ kappy joined	19:35
	→ squentin joined	19:35
	→ jast joined	19:35
	→ Pookz joined	19:35
	→ styx_ joined	19:35
	→ ghormoon joined	19:35
	→ kaictl joined	19:35
	→ kandinski joined	19:35
	→ colona joined	19:35
	→ ninsei joined	19:35
	→ Kronuz joined	19:35
	→ SJr joined	19:35
	→ Pieter_ joined	19:35
	→ timthowtdi joined	19:35
	→ Samual joined	19:35
	→ unforgiven512 joined	19:35
	← jjasinski left	19:35
	← Kronuz left	19:35
	← OnkelTem left	19:35
	← blackwind_123 left	19:35
	← ghormoon left	19:35
	← M-ou-se left	19:35
	slixpk → Guest67904	19:35
	→ ghormoon joined	19:35
	→ Kulrak joined	19:35
	→ fullstack joined	19:35
	→ elementalest joined	19:35
	→ Milos joined	19:35
	→ semajnz joined	19:35
	→ tHEMtZ joined	19:35
	→ ashleyis joined	19:35
	→ weltall joined	19:35
	→ Xe joined	19:35
	→ kossy joined	19:35
	→ jjasinski joined	19:35
	→ OnkelTem joined	19:35
	→ kini joined	19:35
	← devoldmx left	19:36
	tomaw_ → tomaw	19:36
	→ Kronuz joined	19:36
	→ blackwind_123 joined	19:36
	← michael_mbp left	19:36
	→ scampbell joined	19:37
	→ Bajax joined	19:37
	→ kriskropd joined	19:37
	← stickperson left	19:38
	→ aboccia joined	19:38
	← kgirthofer left	19:38
	→ jmckind joined	19:38
	→ kgirthofer joined	19:39
	← aboccia left	19:39
	← Guest67904 left	19:39
	→ Guest67904 joined	19:40
	→ aboccia joined	19:40
	→ Givo joined	19:41
	→ AaronMT joined	19:41
	← irc-5225225 left	19:41
	← Givo left	19:41
	→ michael_mbp joined	19:42
	← AaronMT left	19:42
	→ faux___ joined	19:43
	→ Acic joined	19:43
	→ Papabear joined	19:44
	← Acic left	19:44
	← marc_v92 left	19:46
	← sanketdg left	19:46
	← faux___ left	19:47
	← Bajax left	19:47
	← Kronuz left	19:47
	← KronTMX left	19:47
	← m0viefreak left	19:47
	← paul424 left	19:47
	← dgutierrez1287 left	19:47
	← Algebr left	19:47
	← luizetn left	19:47
	← MarcGuay left	19:47
	← sbogg left	19:47
	← phantombeta left	19:47
	← cbonobo left	19:47
	← Gamecubic left	19:47
	← chitopunk left	19:47
	← s00pcan left	19:47
	← SimonNa left	19:47
	← rnsanchez left	19:47
	← leeN left	19:47
	← HmmrFll left	19:47
	← martinbjeldbak left	19:47
	← joako left	19:47
	← aretecode left	19:47
	← phantomcircuit left	19:47
	← ntio left	19:47
	← flaguy48 left	19:47
	← DeMiNe0 left	19:47
	← evie_hammond left	19:47
	← diogenese left	19:47
	← zapb_ left	19:47
	← whaley left	19:47
	← ngladitz left	19:47
	← alduin left	19:47
	← oxsyn left	19:47
	← Kaisyu left	19:47
	← doop left	19:47
	← Stravy left	19:47
	← venmx left	19:47
	← Volund left	19:47
	← MrC left	19:47
	← kappy left	19:47
	← squentin left	19:47
	← jast left	19:47
	← Pookz left	19:47
	← styx_ left	19:47
	← kaictl left	19:47
	← colona left	19:47
	← ninsei left	19:47
	← parrotriver left	19:47
	← Pieter_ left	19:47
	← timthowtdi left	19:47
	← SJr left	19:47
	← Samual left	19:47
	← kandinski left	19:47
	← rubie left	19:48
	→ sagittarian joined	19:48
	← mbrzuzy left	19:48
	→ Dmf joined	19:48
	← Dmf left	19:49
	→ zendrix joined	19:50
	→ yosito joined	19:50
tterrag	uhhhh? http://puu.sh/jWAoE.png	19:50
	← rodrigograca31 left	19:50
	← durham left	19:51
_ikke_	tterrag: Do you have a shallow clone?	19:51
	→ livingstn joined	19:51
	→ aiaj joined	19:51
tterrag	_ikke_: not sure what that means	19:51
	but I don't think so	19:51
_ikke_	ok	19:51
	← aiaj left	19:51
tterrag	I've done some pretty heavy grafting (3 separate repos)	19:51
	→ robbyoconnor joined	19:52
	← notebox left	19:52
	← michael_mbp left	19:52
	→ Bajax joined	19:52
	→ Kronuz joined	19:52
	→ KronTMX joined	19:52
	→ m0viefreak joined	19:52
	→ paul424 joined	19:52
	→ dgutierrez1287 joined	19:52
	→ Algebr joined	19:52
	→ luizetn joined	19:52
	→ MarcGuay joined	19:52
	→ sbogg joined	19:52
	→ phantombeta joined	19:52
	→ cbonobo joined	19:52
	→ Gamecubic joined	19:52
	→ chitopunk joined	19:52
	→ s00pcan joined	19:52
	→ SimonNa joined	19:52
	→ rnsanchez joined	19:52
	→ leeN joined	19:52
	→ HmmrFll joined	19:52
	→ martinbjeldbak joined	19:52
	→ joako joined	19:52
	→ aretecode joined	19:52
	→ phantomcircuit joined	19:52
	→ ntio joined	19:52
	→ flaguy48 joined	19:52
	→ DeMiNe0 joined	19:52
	→ evie_hammond joined	19:52
	→ whaley joined	19:52
	→ diogenese joined	19:52
	→ zapb_ joined	19:52
	→ ngladitz joined	19:52
	→ alduin joined	19:52
	→ Volund joined	19:52
	→ oxsyn joined	19:52
	→ Kaisyu joined	19:52
	→ doop joined	19:52
	→ parrotriver joined	19:52
	→ Stravy joined	19:52
	→ venmx joined	19:52
	→ MrC joined	19:52
	→ kappy joined	19:52
	→ squentin joined	19:52
	→ jast joined	19:52
	→ Pookz joined	19:52
	→ styx_ joined	19:52
	→ kaictl joined	19:52
	→ kandinski joined	19:52
	→ colona joined	19:52
	→ ninsei joined	19:52
	→ SJr joined	19:52
	→ Pieter_ joined	19:52
	→ timthowtdi joined	19:52
	→ Samual joined	19:52
	← robbyoconnor left	19:52
	← Kronuz left	19:52
	← KronTMX left	19:52
	← Gamecubic left	19:52
	← jceb_ left	19:53
	→ KronTMX joined	19:53
	← MarcGuay left	19:53
	← dgutierrez1287 left	19:53
	→ Gamecubic joined	19:53
	← johtso left	19:53
_ikke_	tterrag: you can try man git repack or something	19:53
gitinfo	tterrag: the git-repack manpage is available at http://jk.gs/git-repack.html	19:53
	→ odei joined	19:53
	← FunkyAss left	19:53
	→ Kronuz joined	19:53
	→ michael_mbp joined	19:54
	→ AaronMT joined	19:54
	→ irc-5225225 joined	19:54
	← IrishPrime left	19:54
	← illbyte left	19:54
	← odei left	19:54
	→ Umoh joined	19:56
	→ jceb_ joined	19:56
	← Umoh left	19:56
	→ rhinojr joined	19:57
	← sagittarian left	19:57
	→ Eqpa joined	19:57
	← gnoel left	19:58
	← Eqpa left	19:58
tterrag	grawity: any ideas?	19:59
	← rhinojr left	19:59
	→ tozsn joined	19:59
	→ Padawan joined	19:59
_ikke_	tterrag: did you do the repack?	20:01
	← tozsn left	20:01
tterrag	yes	20:01
	← jacaballero left	20:01
tterrag	this seems suspect http://puu.sh/jWBeR.png	20:01
	→ jacaballero joined	20:01
	← dvaske_ left	20:01
	← wrouesnel1 left	20:01
	← jmpp left	20:02
_ikke_	nah	20:02
	they are innocent	20:02
	← AaronMT left	20:02
tterrag	ok	20:02
	→ declanqian_ joined	20:02
_ikke_	git add + git reset can create them for example	20:02
tterrag	then I'm lost :(	20:02
	→ AaronMT joined	20:02
	→ Vabt joined	20:03
njbair	I found a cache directory in my repo that i didn't intend to include. Once I add it to .gitignore, should I do anything like git rm --cached to remove what's already included without deleting it from disk?	20:03
	← declanqian left	20:03
	← Vabt left	20:03
	→ gopar joined	20:05
	→ kudyv joined	20:05
	→ faux___ joined	20:05
	← jceb_ left	20:05
	→ pm90__ joined	20:05
	← kudyv left	20:05
	→ ehmatthes joined	20:06
	→ MarcGuay joined	20:06
	← michael_mbp left	20:06
	thiago_ → thiago	20:06
_ikke_	yes	20:07
	→ flashpoint9 joined	20:07
	→ Oaei joined	20:07
	→ MinetestForFun joined	20:07
	→ dangad999 joined	20:07
_ikke_	note that it doesn't get removed from existing commits	20:07
	→ michael_mbp joined	20:08
	← Oaei left	20:08
	→ temmi_hoo joined	20:08
	← pm90_ left	20:08
	← jacaballero left	20:09
	→ tristanp joined	20:09
	→ whi joined	20:09
	← pm90__ left	20:10
	← faux___ left	20:10
	← whi left	20:10
	→ rusi joined	20:11
	← tverr left	20:11
	← rusi left	20:12
	→ mbrzuzy joined	20:12
	→ eni joined	20:14
	← yosito left	20:14
	→ nettoweb joined	20:14
	← Stravy left	20:14
	→ jmpp joined	20:15
	→ stickperson joined	20:15
	← jeadre left	20:15
Anxi80	I have a git branch made from a subdirectory of another much larger branch. My new smaller branch has inherited all the history of the larger branch it came from. How do I get rid of the history that is no longer pertinant to my new smaller branch?	20:16
	← eni left	20:16
	→ Stravy joined	20:17
Anxi80	git —filter-branch comes up a lot on my searches but I’m not sure how to use it even after reading the doc	20:17
	→ jeadre joined	20:17
	→ wrouesnel1 joined	20:18
	← glosoli left	20:18
	→ rubie joined	20:20
bambams	Anxi80: You'll probably have to clarify what you've done to create the new smaller "branch".	20:21
	→ ghostlines joined	20:21
bambams	Anxi80: I'm guessing you will need a --tree-filter option to delete everything except for your subdirectory and move the contents of your subdirectory to the root.	20:21
	Anxi80: Remember to !backup.	20:21
gitinfo	Anxi80: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	20:21
	← jds left	20:22
	← ghostlines left	20:22
	→ bronson joined	20:22
	← michael_mbp left	20:22
	→ settermjd joined	20:22
	→ marc_v92 joined	20:22
	← irwiss left	20:22
	→ ghostlines joined	20:23
	← flashpoint9 left	20:23
	← marc_v92 left	20:23
	→ lrvick joined	20:23
	← settermjd left	20:24
lrvick	Any ideas why this does not work?	20:24
	GIT_TRACE=1 GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no -o UserHostsFile=/dev/null -i /tmp/git-deploy-test/sshkey" git clone ssh://git@localhost:2222/git/testrepo.git /tmp/git-deploy-test/testrepo	20:24
	→ xudongz joined	20:24
	← xudongz left	20:24
lrvick	Trace reveals: 20:25:23.925164 run-command.c:341 trace: run_command: 'ssh' '-p' '2222' 'git@localhost' 'git-upload-pack '\''/git/testrepo.git'\'''	20:24
	So it is clearly not passing my custom ssh options	20:24
	→ Uvvi joined	20:24
	→ michael_mbp joined	20:25
	→ c1v0 joined	20:25
lrvick	git 2.1.4	20:25
	← {198} left	20:25
	← axl_ left	20:25
	→ ahr3n joined	20:25
lrvick	(I know this is normally terrible practice, it is a part of some end to end testing for some CI)	20:25
	← AaronMT left	20:26
	← Uvvi left	20:26
ghostlines	howdy, I've searched a bit and can't find 'simple' way of setting permissions on my remote repo so that collaborators don't get any permissions errors	20:26
	← jeadre left	20:26
ghostlines	what's a good approach to achieve this?	20:27
_ikke_	ghostlines: how are they accessing the repo?	20:27
	my goto sollution would be gitolite	20:27
ghostlines	_ikke_ ssh	20:27
	→ Zvoua joined	20:27
	← rwb left	20:28
	→ irwiss joined	20:28
	→ jeadre joined	20:28
	← phantombeta left	20:29
	→ bstrrm joined	20:29
	← Zvoua left	20:29
_ikke_	one solution would be git config core.sharedRepository group	20:29
	and then making them part of the same group	20:29
	← leTali left	20:29
ghostlines	_ikke_ thx, I'll try the last option	20:30
	← bstrarm left	20:31
	← ehmatthes left	20:31
	→ foolv joined	20:31
	← foolv left	20:32
	← tchan left	20:32
	→ refried_ joined	20:33
stickperson	how can i pull a remote branch and rebase into master? if i do git fetch origin, i see the new branch “origin/new_branch” so i do “git checkout origin/new_branch” and see “You are in 'detached HEAD' state…”	20:33
_ikke_	stickperson: just do git checkout new_branch	20:34
	this will automatically create new_branch locally	20:34
stickperson	_ikke_: ah, ok. then rebase master, then checkout master and merge	20:34
	?	20:34
	← Shentino left	20:35
_ikke_	yes	20:35
Anxi80	bambams, thanks you. The original larger repo was cloned. Then several git file moves and deletes were performed to obtain only the new smaller branch. A commit followed for the final result.	20:36
	← meLon left	20:36
	→ notebox joined	20:36
	→ pm90_ joined	20:36
	← michael_mbp left	20:36
	→ yqt joined	20:36
bambams	Anxi80: So you still want the subdirectory path in the repo, but want to trim history that touches other files? :-/	20:37
	→ michael_mbp joined	20:37
	→ pm90__ joined	20:37
Anxi80	Yes because the new smaller repo is now being used as a submodule to the larger one.	20:38
qsuscs	lrvick: git --version, GIT_SSH_COMMAND was only introduced recently	20:38
	→ M-ou-se joined	20:38
qsuscs	git:kernel:git/git::Documentation/RelNotes	20:38
gitinfo	Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation/RelNotes?h=HEAD	20:38
Anxi80	bambams ^^	20:38
lrvick	git 2.1.4. How recently?	20:38
	→ afranc202 joined	20:38
qsuscs	2.3.0	20:39
lrvick	ah, damn. thanks	20:39
qsuscs	git:kernel:git/git::Documentation/RelNotes/2.3.0.txt#n25	20:39
gitinfo	Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation/RelNotes/2.3.0.txt?h=HEAD#n25	20:39
	→ surfdue joined	20:39
	→ leTali joined	20:39
	→ loe joined	20:39
	← DolphinDream left	20:39
	← Silox\| left	20:40
bambams	Anxi80: Wouldn't it be "better" to regenerate the history by moving the contents of the subdirectory up for every commit then?	20:40
	← Gama11 left	20:40
	→ flashpoint9 joined	20:40
	← endiruna left	20:41
	← pm90_ left	20:41
	← loe left	20:41
	→ matleh joined	20:42
	→ faux___ joined	20:42
	→ allcentury joined	20:43
	← zendrix left	20:44
allcentury	Am I reading right that git commit -v is only verbose to the user writing the commit message?	20:44
lrvick	thanks	20:45
Anxi80	bambams, I am not aware of this git feature. How can I perform this?	20:45
	→ cgooi joined	20:45
	← tinajohnson left	20:45
bambams	allcentury: What you're asking doesn't make sense to me. commit -v will basically include the patch in the commit log template so that you can read the patch while writing your commit log.	20:45
	→ dadamssg joined	20:46
	← cgooi left	20:46
	← matleh left	20:46
	← faux___ left	20:46
	→ djwesto joined	20:47
	→ nfx joined	20:47
	→ Shentino joined	20:47
	← nfx left	20:47
allcentury	bambams: Right, but it's just for me as a guide right. Coworkers won't see the diff when they read my log message will they?	20:48
	← djwesto left	20:48
	← jeadre left	20:48
	→ durham joined	20:49
	← hvoigt left	20:49
	→ jeadre joined	20:50
bambams	allcentury: Nope, git is smart enough to know where the patch begins and excludes it from the commit log.	20:50
	← dadamssg left	20:50
	→ ueyt joined	20:51
	← ueyt left	20:51
bambams	allcentury: And while we're on the subject, any user can also use log -p to see the patch in the log as well.	20:51
allcentury	oh cool	20:51
	→ jaafar joined	20:52
	← thedodd left	20:53
	← nettoweb left	20:54
	→ thedodd joined	20:54
	→ Tsz joined	20:54
	← wrouesnel1 left	20:54
	← Tsz left	20:54
	← pantsman- left	20:54
Anxi80	I think “git filter-branch --prune-empty --subdirectory-filter $SRC_DIR” will do what I want where $SRC_DIR is the path of the subfolder I want the history of.	20:55
	→ fpu joined	20:55
Anxi80	$SRC_DIR is the path of the subfolder I want the history of in the larger original branch that is	20:56
	← fpu left	20:56
bambams	Anxi80: Sounds right. Make sure you backup before attempting it, just in case. :) I think if all goes well your latest commit won't even be necessary.	20:56
	→ nettoweb joined	20:57
	← durham left	20:57
	← jiggerypokery left	20:58
Anxi80	bambams I hope so. Only doubt I have is that I am only specifiying the old path to the folder and not the new path. There have been a couple commits since the split on the new submodule and I would like to keep them as well.	20:58
	← thedodd left	20:59
Anxi80	I am tempted to inlcude both the old and new path in $SRC_DIR but not sure how	20:59
	→ wrouesnel1 joined	20:59
	← cavallari left	20:59
	→ durham joined	20:59
	← durham left	20:59
	→ tpollard joined	20:59
	→ Ezaci joined	20:59
	← Ezaci left	21:00
	← madewokherd left	21:00
	→ durham joined	21:01
	→ meLon joined	21:01
	→ Xakit joined	21:01
	← CKyle left	21:01
	→ beefcakeba joined	21:01
	← Xakit left	21:01
bambams	Anxi80: If the path changes then you'll likely need to do more.	21:02
	Anxi80: You might be best with an explicit --tree-filter in that case.	21:02
	→ ruhw joined	21:03
	← ruhw left	21:03
	← bstrrm left	21:03
Anxi80	thanks bambams, both these commands will only affect my local branch right? It won’t auto push to origin will it?	21:04
	→ Eiyp joined	21:04
bambams	Anxi80: No. In fact, your history will be incompatible with origin/upstream.	21:05
	→ encod3 joined	21:05
	← encod3 left	21:05
bambams	Anxi80: It will be rewritten. Entirely new SHA1s. You'd have to push --force, and you shouldn't do that. :P	21:05
	← Eiyp left	21:05
	→ griotspeak joined	21:05
	← crose left	21:05
	→ Sob joined	21:06
Anxi80	I don’t think I have a choice as we have a central stash	21:06
	← michael_mbp left	21:06
	→ HardWall joined	21:06
	← Sob left	21:06
	← rubie left	21:07
	← luksaur left	21:07
	← elux left	21:07
	→ Amandil\|2 joined	21:07
Anxi80	bambams, my only other option is to create a new repo in stash?	21:07
	→ michael_mbp joined	21:08
	→ Boj joined	21:08
	← Boj left	21:09
bambams	Anxi80: Define "stash". :-/	21:10
	→ nnyk joined	21:10
Anxi80	bambams, Atlassian Stash. Not git stash!	21:10
	bambams is going AFK..	21:10
	→ Ifn joined	21:10
bambams	Anxi80: I'm not familiar. Is that a clone/"fork"?	21:10
	→ systmkor joined	21:10
bambams	Anxi80: Well as long as you coordinate with your team you can force push the "fixed" repo(s) after. But be careful because if anybody works in between you will destroy it.	21:11
	← Ifn left	21:11
bambams	Anxi80: You basically need the team to freeze and/or track their changes with patches while you do this.	21:11
	← MarkyC left	21:11
Anxi80	bambams, It could be either. It’s just a git folder management tool on a server with a web front end for browsing.	21:11
	bambbams, thanks so much!	21:11
	← mbrzuzy left	21:12
	← CussBot left	21:12
	← Amandil\|2 left	21:17
	→ CussBot joined	21:17
	→ Lhab joined	21:18
	→ lancero_ joined	21:18
	→ tchan joined	21:19
	← tchan left	21:19
	→ tchan joined	21:19
	← Lhab left	21:19
	← rnsanchez left	21:19
	→ Wea joined	21:20
	← ahr3n left	21:20
	← Wea left	21:20
	→ ohcibi joined	21:20
	← gamename left	21:21
	→ pvpxa joined	21:21
	→ dsdeiz joined	21:21
	← ORiON-- left	21:21
	← dna113p left	21:21
	← pvpxa left	21:21
	← lancero left	21:21
	→ gamename joined	21:22
	→ dna113p joined	21:22
	← synthmeat left	21:22
	→ bakers joined	21:22
	→ endiruna joined	21:22
	→ Jesp joined	21:22
bakers	My git directory got messed up. I just want to throw everything away and get back to master	21:22
	Can I use git clean for this?	21:22
	← Jesp left	21:23
bakers	Or what's the best way?	21:23
	← gamename left	21:23
osse	bakers: have you commited stuff?	21:23
	→ faux___ joined	21:24
	→ luksaur joined	21:24
	← ghostlines left	21:24
	→ ghostlines joined	21:24
	→ zumba_addict joined	21:24
	→ cavallari joined	21:25
_ikke_	bakers: git clean is for untracked files	21:25
	← ghostlines left	21:25
	→ darkbit joined	21:25
n-st	hi, i'm trying to copy a file, including its commit history, from one repo to another. http://gbayer.com/development/moving-files-from-one-git-repository-to-another-preserving-history/ recommends git filter-branch --subdirectory-filter foo -- --all, but that fails with "fatal: failed to unpack tree object ⏎ Could not initialize the index" — what am i doing wrong?	21:25
	→ maxb joined	21:26
	→ ORiON-- joined	21:26
	← dspirito left	21:27
	← Kicer86 left	21:27
	← editshare-ericf left	21:28
	← faux___ left	21:29
	← modocache left	21:29
	← Anxi80 left	21:30
	← cvanball left	21:30
	← griotspeak left	21:31
	→ akurilin joined	21:31
	→ Ixl joined	21:31
	→ devoldmx joined	21:32
	← endiruna left	21:32
	→ toothrot joined	21:32
	← eatsfoobars left	21:32
	→ endiruna joined	21:32
	← Ixl left	21:33
	→ jsgrant joined	21:34
	← akurilin left	21:35
	← michael_mbp left	21:36
	← devoldmx left	21:36
	← MZAWeb left	21:37
	→ rubie joined	21:37
	← dna113p left	21:37
	→ dna113p joined	21:38
	← endiruna left	21:38
	→ michael_mbp joined	21:39
	← Rolybrau left	21:39
	→ Eijk joined	21:39
	→ madewokherd joined	21:39
Eugene	TBQH, the problem is right there in the first sentence. That sounds like a painful plumbing-involved thing to do	21:40
	← dstarh left	21:40
	→ ahr3n joined	21:40
Eugene	"could not initialize the index" seems to happen when you have a problem with the index's lockfile.... are you doing one file, ora folder-full?	21:41
	← Eijk left	21:41
n-st	Eugene: just one file	21:41
Eugene	Got me, then.	21:41
n-st	i've resorted to `git format-patch -1` for now	21:42
	← MinetestForFun left	21:42
	→ endiruna joined	21:42
	→ faux___ joined	21:42
	→ MattMaker joined	21:42
	→ ssap joined	21:43
	← notebox left	21:44
	← krawchyk left	21:44
	← chitopunk left	21:44
	→ Godfather_ joined	21:44
	→ gamename joined	21:45
	→ Nizumzen joined	21:45
	← bronson left	21:45
	← ahr3n left	21:47
	← faux___ left	21:47
Eugene	I advise !beer	21:47
gitinfo	Beer! It's what's for dinner!	21:47
	→ MistahKurtz joined	21:47
	→ synthmeat joined	21:49
	← Godfather_ left	21:49
bambams	bakers: Be careful just throwing things away. Sometimes, even if you think it's garbage, it's best to save it. Git makes it easy to save things many different ways.	21:51
	← skylite left	21:51
	← nuge left	21:51
	← diget left	21:52
	← michael_mbp left	21:52
	← jmckind left	21:52
	→ bronson joined	21:53
	← gsingh93_ left	21:54
	← tanath left	21:54
	→ michael_mbp joined	21:55
	← daviid left	21:55
	← ssap left	21:55
Algebr	Can I put computations in my .gitconfig for aliases, like r = reset --hard $(current upstream branch of this branch)	21:55
	→ cagedwisdom joined	21:55
	→ Zxig joined	21:56
	← synthmeat left	21:56
	← flashpoint9 left	21:56
	← dawik left	21:56
bremner	you can make shell aliases	21:56
	← Zxig left	21:57
Algebr	in the .gitconfig or plain ole .rc file you mean?	21:57
	← luizetn left	21:57
	→ ASOLAr joined	21:57
bremner	in .gitconfig	21:57
	→ dawik joined	21:58
Algebr	oh nice, thanks	21:58
	→ noisebleed joined	21:58
	→ izuku joined	21:58
	← victortyau left	21:59
	→ tanath joined	21:59
	← macabre left	22:00
	← izuku left	22:01
	→ shinnya joined	22:02
	← bango2 left	22:03
	→ luizetn joined	22:03
	→ qgaaa joined	22:03
	← qgaaa left	22:03
	→ Cubpu joined	22:05
	→ dgutierrez1287 joined	22:05
	← Cubpu left	22:05
bakers	osse: No nothing is commited. I attempted a merge and it went all haywire. I just want to get back to a clean slate of what master was.	22:06
	← michael_mbp left	22:06
osse	bakers: git reset --hard	22:06
	and run git status	22:06
	→ Osrn joined	22:06
	← LBV_User left	22:07
	→ tristans1 joined	22:07
	← Nizumzen left	22:07
	← Osrn left	22:07
	← X67r left	22:07
	← ckinniburgh left	22:07
	→ michael_mbp joined	22:09
	← wrouesnel1 left	22:09
	← dgutierrez1287 left	22:10
	→ ahr3n joined	22:10
	← tg left	22:11
	← BBBThunda left	22:11
	→ mquin_ joined	22:12
	← mquin left	22:13
	→ tg joined	22:13
	← Jackneill left	22:13
	← MistahKurtz left	22:14
	→ terminal_echo joined	22:15
	← darkbasic left	22:15
	→ darkbasic joined	22:15
	→ bernardio joined	22:17
	← Spacew00t left	22:18
	← HardWall left	22:19
	← Sazhen86 left	22:20
	← luksaur left	22:20
	→ Sazhen86 joined	22:21
	→ Haso joined	22:21
	← dsantiago left	22:21
	← Haso left	22:22
	← michael_mbp left	22:22
	→ ghostlines joined	22:22
	← rubie left	22:23
	→ rubie joined	22:23
	← thiago left	22:23
	→ kmyih joined	22:24
	← zumba_addict left	22:24
	→ michael_mbp joined	22:24
ghostlines	_ikke_ I set setgid bit on the repo directory seems to be allowing users to modify the same files without permission issues	22:24
	→ thiago joined	22:24
	← dreiss left	22:24
	← nettoweb left	22:25
	← kmyih left	22:25
	→ jipu joined	22:26
	→ marc_v92 joined	22:27
	← Danjo1 left	22:27
	← jipu left	22:27
	← nfk left	22:27
	← Padawan left	22:28
	→ dsantiago joined	22:28
	→ Egswo joined	22:28
	→ robbyoconnor joined	22:28
	← Egswo left	22:29
	→ msavr joined	22:30
	← msavr left	22:31
	← robbyoconnor left	22:32
	← cannonball left	22:32
	→ ixu joined	22:32
	→ tag joined	22:33
	← ixu left	22:33
tag	Is there no way to add an empty tree?	22:33
phroa	git commit --allow-empty	22:34
	or do you mean an empty folder	22:34
tag	I mean an empty directory	22:34
	or a tree object with no chillin's	22:34
phroa	git tracks content, not directories. you'll have to add a .gitignore/.gitkeep/.keep/whatever empty file inside there	22:35
	← gargola left	22:35
	← ASOLAr left	22:35
tag	Sure but it tracks contents as tree objects which have trees and blobs in them	22:35
	and I wanna stuck a tree with no blobs	22:35
	in my tree that's there, and have it stay	22:35
	d'amnit	22:36
phroa	if you don't believe me read this http://stackoverflow.com/q/115983	22:36
	← michael_mbp left	22:36
phroa	you can force add a tree with the hash of an empty directory but you can't check it out	22:36
	← endiruna left	22:37
tag	I believe you https://git.wiki.kernel.org/index.php/Git_FAQ#Can_I_add_empty_directories.3F	22:39
	So I just stuffed an empty .gitignore in there	22:40
	← mprelude left	22:41
	→ michael_mbp joined	22:42
	→ faux___ joined	22:42
	← gamename left	22:43
	← paul424 left	22:44
	← ghostlines left	22:44
	← penna__ left	22:46
	→ Lirux joined	22:46
Lirux	Anyone have some advice how to manage dotfiles on github for desktop and laptop while they have minor config changes between them?	22:46
	→ dadamssg joined	22:46
	← faux___ left	22:47
	→ luksaur joined	22:47
Algebr	branches	22:48
	→ penna__ joined	22:48
	← m0ltar left	22:49
tag	\o/	22:49
	← Peaker left	22:49
tag	other thing I do, is if the file format supports some sort of includes, is add an empty local config extension to .gitignore, start with reasonable defaults, and add local overrides.	22:49
	→ snthsnth joined	22:50
	← dadamssg left	22:51
	← cavallari left	22:51
	← michael_mbp left	22:52
	← temmi_hoo left	22:53
	← noisebleed left	22:53
	→ michael_mbp joined	22:53
	← hahuang65 left	22:54
	← soerenb left	22:55
	→ noisebleed joined	22:55
	← pm90__ left	22:55
	← shinnya left	22:55
	← snthsnth left	22:56
	← lg188 left	22:56
phroa	tag: there is a global gitignore (man gitignore) at ~/.gitignore by default, I believe. that takes effect in every repo. you can't include gitignores in other gitignores on a per-project level, but gitignores in subdirectories will inherit from the parent gitignore	22:58
gitinfo	tag: the gitignore manpage is available at http://jk.gs/gitignore.html	22:58
phroa	ah, no, it's located in an XDG folder until you tell it otherwise	22:58
	← nnyk left	22:59
	← Volund left	22:59
	→ AramKaram joined	23:00
	→ thepreacher joined	23:01
	← mezod left	23:02
	→ bioomboom joined	23:02
	→ ASOLAr joined	23:02
	→ clarkpan joined	23:03
	→ fstd_ joined	23:03
bambams	Algebr: Git will also automatically pick up git-<foo> commands in your PATH so that git <foo> works.	23:03
	← thepreacher left	23:03
	← fstd left	23:03
	fstd_ → fstd	23:03
phroa	tag: oh lol you weren't asking for anything were you	23:04
	sorry :P	23:04
	I totally misread that	23:04
	→ soerenb joined	23:04
	← DrHouse\|HP8440p left	23:04
	← beejoomboom left	23:05
tag	hahaha	23:06
	No worries.	23:06
	← michael_mbp left	23:06
	→ pm90_ joined	23:06
	→ michael_mbp joined	23:07
	← c1v0 left	23:07
	← bernardio left	23:10
	← bronson left	23:11
	→ jeffmjack joined	23:11
	← noisebleed left	23:11
	← kpease left	23:12
	← ahr3n left	23:12
	← dsdeiz left	23:12
	→ kpease joined	23:13
	→ robbyoconnor joined	23:13
	← kpease left	23:14
	← Lirux left	23:17
	← bakers left	23:18
	→ Lirux joined	23:19
	→ daviid joined	23:19
	→ bronson joined	23:20
	→ macabre joined	23:21
	← michael_mbp left	23:22
	← refried_ left	23:23
	→ michael_mbp joined	23:24
	→ faux___ joined	23:24
	→ kpease joined	23:24
	→ refried_ joined	23:26
	→ bollullera joined	23:26
	→ qpdb joined	23:26
	← layer left	23:27
	← faux___ left	23:28
	← toothrot left	23:30
	→ bobslop_ joined	23:30
	← marc_v92 left	23:30
	→ DolphinDream joined	23:30
	→ snthsnth joined	23:31
	→ devoldmx joined	23:33
	→ mezod joined	23:35
	→ toothrot joined	23:36
	← iota_pi left	23:36
	← michael_mbp left	23:36
	→ r0bby_ joined	23:37
	← devoldmx left	23:37
AramKaram	I can tell how pushing and creating a remote are different to one another ? :-/ as far as I understand from it's official explanation they seem to do the same thing ? :-/	23:37
	→ michael_mbp joined	23:38
	→ Danjo1 joined	23:38
	← bronson left	23:38
Eugene	AramKaram - push is the act of moving commits from your local repo to a remote one	23:38
	← terminal_echo left	23:38
	→ darkbasic_ joined	23:38
Eugene	`git remote add` creates a link between your local repo and the named remote	23:38
	`git init` from the context of the remote, creates an empty repo	23:38
	→ mizu_no_oto joined	23:38
	← tag left	23:38
AramKaram	Eugene hmm that sounds fair enough, does this mean I need to create a remote before I can push?	23:39
	← darkbasic left	23:39
Eugene	Backing up a step, a "repo" is just an object storage location	23:39
	Yes, the destination needs to exist before you can push into it.	23:39
AramKaram	ahh I see:) your explanation sounds much cleaner than this last 2 hour stuff I looked up on the internet, let me ask something else please	23:39
Eugene	(some abstraction layers, in particular gitolite's WILD REPO feature, will dynamically init the destination as you push into it. These are non-standard)	23:39
	← robbyoconnor left	23:39
AramKaram	what is this `git remote add origin` what is this origin ?	23:40
Eugene	!origin	23:40
	Useless bot.	23:40
AramKaram	hahaha :)	23:40
Eugene	Origin is the default name used for a remote by `git clone`. There's nothing at all special about it.	23:40
	I typically name my remotes based upon where they are, eg "github" or "my-server"	23:41
AramKaram	can I put any other name I want ? would everything work fine if say i do `git add remote whatever url` ?	23:41
Eugene	Yup.	23:41
	→ hahuang65 joined	23:41
Eugene	Except, it's `git remote add <name> <url>`.... but yes	23:41
	→ faux___ joined	23:41
AramKaram	makes sense:) Im new to this git thing and its a little overwhelming as of now but these last a few days Ive learned a bit already :)	23:42
	← Danjo1 left	23:42
	← Algebr left	23:42
Eugene	Glad to hear. If you havent' seen it already, add !concepts to your reading list	23:42
gitinfo	"Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	23:42
AramKaram	so this `origin` has nothing to do `master` ? in other words, `origin` is just another brand new brach if u create one?	23:42
	← r0bby_ left	23:42
Eugene	!master	23:43
gitinfo	[!master_branch] 'master' is the default name for the first branch created by git, and it is in no way special. You can just delete it, and use more meaningful names such as 'dev' 'stable' 'unstable' 'bug/001' etc. If this is a bare repo, you will want to change the default branch(`git symbolic-ref HEAD refs/heads/somebranch`) first.	23:43
Eugene	(yay, bot!)	23:43
	→ whomp joined	23:43
	→ Authenticator joined	23:43
Eugene	origin/master is just defaults poking through	23:43
	gitinfo set mode: +v	23:43
AramKaram	ahhh I loved that slide show :) I think me and the author of that article speak the very same human language :))	23:44
Eugene	sitaram is a good guy like that	23:44
	→ iota_pi joined	23:44
AramKaram	sitaram ;-)	23:44
	lol	23:44
	Eugene thanks for taking your time and explaining things in human-like language, that a few sentences helped me a lot	23:45
Eugene	Pay it forward, etc	23:46
	← faux___ left	23:46
	← jigjug left	23:46
	← rubie left	23:48
	← maestrojed left	23:49
whomp	i'm having some trouble with rebasing, because the intermediate commits in the branch whose changes i'm applying in the rebase have stuff in them that causes merge conflicts, even though in later commits in that branch i get rid of that code, so there are no more merge conflicts at the end. even just creating a .diff file	23:51
	→ uqur joined	23:51
	← uqur left	23:51
	→ Lyqyd joined	23:52
	→ xudongz joined	23:52
AramKaram	one more question please, say Ive a clone of some repo on my account, the the owner of this repo changes something in it, i need to pull it so I can have the latest changes too right?	23:52
	← d10n-work left	23:52
	← michael_mbp left	23:52
Authenticator	If you branch/edit/merge/edit/merge (without a rebase onto the updated master) you get a zipper pattern in the graph. When viewing the graph on the CLI with --pretty, etc, there's a superfluous 'dodge right' in the graph. Is there a point to this that I'm missing?	23:52
	← wald0 left	23:53
	← kpease left	23:53
phroa	likely just an artifact of the graph algorithm. does gitk or other viewers work?	23:53
	← hexagoxel left	23:54
	→ michael_mbp joined	23:54
Authenticator	whomp: rebase interactive and squash the offending commits.	23:54
whomp	Authenticator, an interactive rebase will still apply each commit individually, rather than lumping them all together	23:55
	right?	23:55
phroa	interactive is a very different subject than non. he's saying to interactively rebase the commits into one large commit, all on the same branch	23:55
	← Steadfast left	23:55
Authenticator	whomp: But it gives you the chance to squash the bad ones and the ones that fix the bad ones together, before trying to apply them.	23:55
	→ gargola joined	23:56
	→ hexagoxel joined	23:56
Authenticator	say you have commits 1,2,3,4,5 - 1 is good, 2 introduces the merge conflict, it persists into 3, and gets removed in 4, then 5 is good. So you'd 'pick' 1 and 2, 'squash' 4 and 4, and 'pick' 5.	23:57
	^^ "3 and 4"	23:57
Eugene	AramKaram - you need to either merge or rebase against Upstream, yes. Pull=fetch(obtain objects)+merge(combine trees)	23:57
	→ dreiss joined	23:58
Eugene	(rebase is like a merge, but it appears after the Upstream commits, instead of adjacent)	23:58
whomp	Authenticator, and squashing everything to the last one would solve it as well, correct?	23:58
Authenticator	phroa: gitk and intelliJ both show the graph sensibly, the CLI program has the weird extra line because it doesn't use '\\|' for the branches, but '\|/' ...	23:58
AramKaram	Upstream... now I have to ask what is the Upstream :-/ @ Eugene	23:59
	→ ahr3n joined	23:59
Eugene	AramKaram - "the original author's repo"	23:59
	→ Nizumzen joined	23:59
	← fstd left	23:59
Authenticator	whomp: Yup. That's a bigger hammer, but will work.	23:59
	→ fstd joined	23:59
Eugene	AramKaram - are you using the Github ecosystem?	23:59
AramKaram	Eugene ohh got it, but isn't that what "pull request" is? when you trying to have them feature your changes on the original repo on master ?	23:59

Logs Search ←Prev date Next date→

Channels Documentation