IRCloggy #git 2016-01-25

Provider of IRC logs since 2005.

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

	2016-01-25
	← lindenle_ left	00:00
	← edakiri left	00:00
	← King_Hual left	00:03
	→ Senecea joined	00:03
	← dreiss left	00:03
	← lindenle left	00:03
	→ codefo joined	00:04
	→ lindenle joined	00:04
	← tpollard left	00:05
	→ skinux joined	00:05
skinux	How do I check which remote repo a project is setup to push to?	00:05
thiago	that's a complex question, actually	00:06
	let's start with the value of the config push.default. What is it?	00:06
	← Senecea left	00:06
	→ Senecea joined	00:06
	← baxx left	00:07
	→ ascarter joined	00:07
	← jam_ left	00:07
	→ jam_ joined	00:09
	→ lindenle_ joined	00:09
	← Senecea left	00:09
	← lindenle left	00:09
	→ Senecea joined	00:10
	→ dama1138 joined	00:10
	← mattfoo left	00:11
skinux	There is no push.default set	00:12
	→ mezod joined	00:12
	← jam_ left	00:12
thiago	which git version?	00:12
	← lindenle_ left	00:13
	→ lindenle joined	00:14
	← Limes_ left	00:15
	← bodom left	00:16
	→ tpollard joined	00:16
	→ Gitzilla joined	00:17
	→ mattfoo joined	00:18
	← lindenle left	00:19
	← AnwarS left	00:19
	→ StormLrd joined	00:19
	→ ketas- joined	00:19
	← Chilley left	00:19
	→ hexagoxel_ joined	00:20
	→ lindenle joined	00:20
	← codefo left	00:21
	← mkopriva left	00:21
	← BeatrixKiddo left	00:23
	← hexagoxel left	00:24
	hexagoxel_ → hexagoxel	00:24
	← lindenle left	00:25
	→ lindenle joined	00:25
	← cagedwisdom left	00:26
	← paddyez left	00:31
	→ lindenle_ joined	00:31
	← lindenle left	00:32
	← AAoK left	00:32
	→ lindenle joined	00:33
	← lindenle_ left	00:33
	→ fahadash joined	00:33
	→ ahr3n joined	00:34
	→ MikeFair joined	00:35
	→ Chilley joined	00:35
	← hyperair left	00:35
MikeFair	So I cloned a repo on GitHub locally, then ended up making some changes which I'd like to submit as a pull request	00:36
	I went ahead and hit "Fork" on the original project, and then created a branch in my copy of that fork	00:37
nevyn	MikeFair: so add a remote for your fork	00:37
MikeFair	But I'm not sure how to upload the changes on my local machine to the Branch I just created	00:37
	→ cagedwisdom joined	00:38
	← lindenle left	00:39
skinux	thiango: Git version 2.5.2.windows.1	00:39
	→ lindenle joined	00:39
nevyn	MikeFair: so add your upstream as a remote. then fetch the new branch	00:39
MikeFair	Won't that mess my changes up somehow?	00:40
nevyn	MikeFair: have you committed the changes in git?	00:40
	← nidr0x left	00:40
	→ jteneyck joined	00:40
	← jteneyck left	00:40
MikeFair	No, I have the changes on the FS locally	00:40
	→ yudi099 joined	00:40
nevyn	in the gitrepo?	00:40
MikeFair	git remote currently says "origin"	00:40
	yes	00:40
nevyn	have you setup git? like user.email and user.name?	00:41
	→ jteneyck joined	00:41
MikeFair	It's been a while seince I looked; I know I've done enough to push/pull from my Git account	00:42
	← firstdayonthejob left	00:42
	← rtail left	00:42
MikeFair	err Github	00:42
	← indieross left	00:42
nevyn	MikeFair: so git 101 git config --global --set user.name 'your name here'	00:42
	then user.email	00:42
	← lindenle left	00:43
MikeFair	nevyn: Ok, did those already	00:43
	MikeFair just looked at git config --get for those parameters.	00:44
	← jor left	00:44
	→ lindenle joined	00:45
	→ elementalest joined	00:45
	← elementalest left	00:45
	→ elementalest joined	00:45
	aidalgol → atg`	00:45
	atg` → aidalgol	00:45
nevyn	kso commit the changes	00:45
	← ascarter left	00:45
nevyn	MikeFair: ^^ add and commit the changes.	00:45
	(on a branch if you want	00:45
MikeFair	nevyn: Well before we do that, help me understand the concepts here	00:45
nevyn	MikeFair: git checkout -b mychanges	00:46
	MikeFair: so fiddling about in github is not.. helpful unless you did it before starting to write the modifications	00:46
MikeFair	Ahh ok	00:46
	So I commit locally, then upload to GH	00:47
nevyn	MikeFair: you could clone your 'fork' then copy things in commit and push	00:47
	→ MattMaker joined	00:47
MikeFair	nevyn: I did that last time this happend and I knew I clearly didn't understand the concepts I was working with, I just new that would work	00:47
nevyn	commits are always local	00:47
	I like !gcs	00:48
gitinfo	[!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	00:48
MikeFair	So is it something like, make my local commits, then change the remote the local repo is attached to?	00:48
nevyn	but there's also !book !parable !videos	00:48
gitinfo	There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable	00:48
	'The git parable' provides some good reasoning behind git. http://tom.preston-werner.com/2009/05/19/the-git-parable.html	00:48
	[!talks] Some good video talks about Git: [yt] http://goo.gl/z72s (Linus Torvalds: History&Concepts); [yt] http://goo.gl/R9H2q (Scott Chacon: Git basics, live examples); http://vimeo.com/35778382 (Randal Schwartz: Git basics, descriptional); http://vimeo.com/46010208 (Jesica Kerr: Git basics, descriptional)	00:48
nevyn	MikeFair: there's no limit on how many remotes your local repo can talk to	00:48
	← MattMaker left	00:49
	← lindenle left	00:49
nevyn	it's not a 1:1 requirement	00:49
	this isn't SVN	00:49
MikeFair	+nevyn: Let me rephrase, a make my local commits; and then remove the original and add my new branch	00:49
nevyn	nope	00:49
	still wrong	00:49
MikeFair	hehe :)	00:50
nevyn	add all the things to your local repo	00:50
	so a github 'fork' is a clone	00:50
	on githubs infra	00:50
MikeFair	right, I understand that	00:51
	→ lindenle joined	00:51
nevyn	a git repository can have as many remotes as you want	00:51
	so add a remote to your github fork in addition to the existing 'origin' which is the project upstream	00:52
	← yudi099 left	00:52
nevyn	I'd rename thatremote to be clearer that it's the project upstream	00:52
	→ daito joined	00:55
MikeFair	ok, renamed origin -> upstream; and added "github"	00:55
nevyn	next	00:56
	so I'd commit your stuff	00:56
	← jteneyck left	00:56
MikeFair	Oh I already did the commit	00:56
nevyn	ok.	00:56
	→ kadoban joined	00:57
	← victortyau left	00:57
nevyn	so you know pull is fetch+merge right?	00:57
	← lindenle left	00:57
MikeFair	yes	00:57
nevyn	so. if you were to pull (don't) you'd merge the new upstream stuff onto your changes	00:57
	that'd be bad.	00:57
MikeFair	But I've never been clear on what that would do with multiple remotes	00:57
	→ lindenle joined	00:57
nevyn	remotes are not at issue here.	00:58
MikeFair	nevyn: There isn't any new upstream atm, but I undersnta	00:58
nevyn	MikeFair: git branch -vv	00:58
	MikeFair: branches know what they're tracking	00:58
MikeFair	"master .... ahead 1"	00:58
	← fstd left	00:59
	→ fstd joined	00:59
	→ MattMaker joined	00:59
	← daito left	01:00
nevyn	see [origin/master]	01:00
	→ markgrady joined	01:00
	→ rclanan joined	01:00
MikeFair	Yes [upstream/master]	01:00
nevyn	that means that master is tracking origin/master (should actually say upstream/master for you)	01:00
	right	01:00
	← MattMaker left	01:00
nevyn	fetch both upstreams	01:01
	fetch both remotes	01:01
	rather	01:01
	→ jalopez joined	01:01
	jalopez → jalopezsilva	01:01
nevyn	git fetch --all	01:01
	← marienz left	01:01
MikeFair	ok my GH account created some new branches	01:02
nevyn	yep	01:02
	well it shouldn't of	01:02
	→ lindenle_ joined	01:02
nevyn	if you run git branch you shouldn't see any of those	01:02
MikeFair	I odn't	01:02
	err don't	01:02
nevyn	right. because they're remote branches	01:02
	MikeFair nods.	01:02
	→ marienz joined	01:02
	← lindenle left	01:02
nevyn	so git checkout -t github/<BRANCHNAME>	01:03
	where that's the github branch you want to create the pull request from	01:03
	→ LekeFly joined	01:03
MikeFair	Ok, done. It's saying something about detached HEAD	01:04
	← abc123_ left	01:04
	→ jottr_ joined	01:05
	→ abc123 joined	01:05
	← rclanan left	01:05
MikeFair	Hmm, I didn't use the -t switch on the checkout	01:05
nevyn	oh!	01:06
	that's super important	01:06
MikeFair	Just redid it	01:06
	it seemed to work	01:06
nevyn	right.	01:06
	→ AtnevRed joined	01:06
nevyn	so now do git merge -ff master	01:06
	← lindenle_ left	01:07
MikeFair	hmm, doesn't like the command...	01:07
nevyn	oh?	01:07
	← jottr left	01:07
nevyn	gist the result (also git status master )	01:07
MikeFair	Ahh, --ff	01:08
nevyn	ah yes	01:08
	mybad	01:08
MikeFair	nw	01:08
	← m0viefreak left	01:08
MikeFair	ok, that seemed to do its thing	01:08
nevyn	so this should make this branch look just like master	01:08
	and pull your changes across	01:08
MikeFair	So that merged the changes from the "master" branch locally with the new branch "locally"	01:09
nevyn	yep	01:09
	so now you want to reset master to origin/master	01:09
	because you should never of written code against that branch (because you can't push it)	01:10
	← italoacasas left	01:10
nevyn	so git checkout master	01:10
	MikeFair nods in understanding.	01:10
nevyn	git reset --hard origin/master	01:10
	→ lindenle joined	01:10
nevyn	so this branch now tracks.. upstreamupstream/master	01:10
	not origin	01:10
MikeFair	yep, ok done	01:11
nevyn	so that should now show a git status of 'up to date'	01:11
	?	01:11
	← AtnevRed left	01:11
MikeFair	yes, working directory is "clean"	01:11
	← stamina left	01:12
nevyn	if you checkout github/<modifiedbranch>	01:12
	you should be 1 ahead	01:12
	→ Rakkan joined	01:12
nevyn	and you should be able to push that.	01:12
MikeFair	nevyn: what does git checkout -b do	01:12
nevyn	makes a new local branch.	01:13
	from where you are right now	01:13
MikeFair	HEAD detached	01:13
nevyn	git checkout -b temp	01:13
	→ bronson joined	01:13
nevyn	oh you need ti give it a name	01:13
	→ yudi099 joined	01:14
	→ victortyau joined	01:14
	← lindenle left	01:14
MikeFair	Well when I did a git checkout github/newbranch it said head detached	01:14
	I tried the -t but it said there's already a local branch with that name	01:14
	← abc123 left	01:15
	→ abc123_ joined	01:15
nevyn	git branch	01:15
	→ lindenle joined	01:16
nevyn	oh.	01:16
MikeFair	* (HEAD detached at github/CreateSocketWithContext)	01:16
	CreateSocketWithContext	01:16
	master	01:16
	← harish_ left	01:17
	→ Sazhen86 joined	01:17
	→ MattMaker joined	01:17
nevyn	git checkout CreateSocketWithContext	01:17
	← Senecea left	01:17
	← bronson left	01:18
MikeFair	ok so when I did the git checkout github/CreateSocketWithContext it put me on something different from the local CreateSocketWithContext branch... ?	01:20
	← lindenle left	01:20
nevyn	yes	01:20
	git checkout github/CreateSocketWithContext will put you on what's in the remote	01:20
	→ hyphenated joined	01:20
	→ dsdeiz joined	01:21
nevyn	if you run git log on that detached head you would not have seen your commit	01:21
	→ jteneyck joined	01:22
	→ lindenle joined	01:23
	→ italoacasas joined	01:23
MikeFair	Ok so if I understand this correctly; and I was where I was where I couldn't push my changes against origin/master; Could I have done checkout -b NewBranch -t github/NewBranch?	01:24
	Then pushed	01:24
	or fetched then pushed	01:24
	← yudi099 left	01:24
nevyn	so for that to work the local repo needs to know bout github/NewBranch	01:25
MikeFair	(I'd still need to reset --hard the local master branch in any event because I had the commit there that couldn't be pushed)	01:25
nevyn	you can push a new branch to github	01:26
	but that'd be git checkout -b newbranch ... <dostuff>	01:26
	→ daito joined	01:26
hyphenated	I have a feature branch off master, and want to merge it back to master and also to another branch (release-x.y) .. so I checkout master, merge feature-x, checkout release-x.y, merge feature-x .. according to everything I read, that should merge the changes on the feature branch to the checked-out branches, right?	01:26
	← mingwandroid left	01:26
nevyn	git push github newbranch	01:26
hyphenated	but when I do the second one, it seems to include all sorts of additional changes that weren't on the feature-x branch (but differ between master and release-x.y)	01:27
ojacobson	hyphenated: yes -- have a look at the output of !lol afterwards	01:27
gitinfo	hyphenated: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	01:27
hyphenated	should I be cherry-picking or..?	01:27
ojacobson	in the latter case, you'll merge the cumulative change since feature-x diverged -from release-x.y-	01:27
hyphenated	ojacobson: ok. that's not what I was hoping to have. what's the correct step to do for that branch?	01:28
ojacobson	That's what "that branch" is.	01:28
	→ Senecea joined	01:28
nevyn	hyphenated: if you want your changes ontop of current then you probably want to rebase.	01:29
ojacobson	If you had a time machine (and you do, this is git) I would branch feature-x off of the last common commit between master and release-x.y	01:29
	← jottr_ left	01:29
ojacobson	since you plan on merging it to both	01:29
MikeFair	nevyn: Right -- so add the github remote, rename origin to upstream because it's just nice; fetch; then checkout -b NewBranch	01:29
ojacobson	that will ensure that the merge only brings in commits that are unique to feature-x, relative to both other branches	01:29
nevyn	MikeFair: yep	01:29
MikeFair	nevyn: Assuming I had also already created the new branch in GitHub; would I also need to add the -t to the checkout?	01:30
	← ketas left	01:30
	← sctskw left	01:30
	← Senecea left	01:31
	→ sctskw joined	01:31
MikeFair	nevyn: checkout == local branchname ; -t == remote tracking branchname	01:31
nevyn	so checkout -t is a shortcut... for checkout -t <remotebranch> -b remotebranchnaem	01:31
	so this is properly a local tracking branch	01:32
	→ Senecea joined	01:32
MikeFair	nevyn: ahh, git checkout -b <branch> --track <remote>/<branch>	01:32
nevyn	the remote tracking brach is github/branchname (if you check this out you end up on detached head	01:32
	because you can't have the state of a remote that's possibly been updated locally	01:33
	MikeFair nods.	01:33
nevyn	the only way tracking branchnes move.. is when you fetch or push	01:33
	remote tracking branches that is	01:33
MikeFair	makes sense	01:34
nevyn	now...	01:34
	← msonntag left	01:34
nevyn	let's imagine for a second that upstream had moved on and made changes that were not in your modified code.	01:35
hyphenated	ojacobson, nevyn: thanks, it helps me understand the mess I'm making :-)	01:35
	← sctskw left	01:35
nevyn	hyphenated: if you're new to this stuff I do reccomend !book or !gcs	01:35
gitinfo	hyphenated: 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	01:35
	hyphenated: [!concepts] "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	01:35
hyphenated	nevyn: not completely new, but getting a bit lost when things don't work smoothly	01:36
nevyn	hyphenated: if you're getting lost I'd suggest that your understanding of how git works is incorrect this is usually the problem	01:38
hyphenated	no doubt :-)	01:38
nevyn	hyphenated: git can appear simple and smooth until you hit a !conflict or something in your model doesn't match reality	01:38
gitinfo	hyphenated: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	01:38
MikeFair	+nevyn: Would just updating the push URL for origin to my GH branch have done the trick?	01:39
hyphenated	I'm marginally better than the guy in the xkcd comic	01:39
	← j416 left	01:40
	← Dazzyo left	01:40
	← lindenle left	01:40
nevyn	hyphenated: in particular once you have multiple repo's (ie at least two people have repos) what people thing is happening and what's actually happening are usually different	01:40
	s/thing/think/g	01:40
	→ lindenle joined	01:40
nevyn	in particular if we all have a branch called master they're not the same thing.	01:40
	→ David1977 joined	01:41
	→ ome joined	01:42
	→ Dazzyp joined	01:42
	← ribasushi left	01:43
	← wagle left	01:43
	← cwillu_at_work left	01:44
	← relrod left	01:44
	→ lindenle_ joined	01:44
	← canine left	01:45
	← lindenle left	01:45
	→ j416 joined	01:45
	← tpollard left	01:45
	← plasticb1y left	01:45
	← tkeith left	01:45
	→ wagle joined	01:46
	← bollullera left	01:46
	→ tkeith joined	01:46
	← rook2pawn left	01:46
	→ plasticboy joined	01:46
	→ rook2pawn joined	01:46
	→ relrod_ joined	01:49
	← relrod_ left	01:49
	→ relrod_ joined	01:49
	← Sucks left	01:49
	→ lindenle joined	01:49
	← lindenle_ left	01:50
	→ ketas joined	01:51
	→ canine joined	01:51
	→ localuser- joined	01:51
	→ ribasushi joined	01:51
	→ tpollard joined	01:51
hyphenated	ojacobson: "I would branch feature-x off of the last common commit between master and release-x.y" .. I'm trying to figure out how that approach would work for hotfixes for example	01:51
	← Noldorin left	01:52
	→ Orion3k joined	01:54
	← lindenle left	01:55
	→ lindenle joined	01:56
	→ cwillu_at_work joined	01:56
	← lindenle left	02:00
	← moei left	02:00
	→ lindenle joined	02:01
	→ moei joined	02:01
	→ rclanan joined	02:01
	← blckbit10 left	02:01
	← flavi0 left	02:01
	→ wxg joined	02:02
	← presto left	02:02
	← David1977 left	02:03
nevyn	hyphenated: branch-hotfix-X is based on the latest common commit between master and release	02:03
	→ blckbit10 joined	02:03
	→ presto joined	02:03
nevyn	then rebased onto each and commited	02:03
	← presto left	02:03
nevyn	or merged	02:03
	← pks left	02:04
	← lindenle left	02:05
	→ noyb joined	02:05
hyphenated	ok. I thought it'd be branched from HEAD of master, do some changes/fixes/tests, merged back to master then.. somehow get it to the other branches	02:05
	← rclanan left	02:06
	← xaa left	02:06
	← codedmart left	02:06
nevyn	hyphenated: so you could do that too. and pull it back to the common point	02:06
	→ lindenle joined	02:06
hyphenated	ok. does that mean "rebase" ?	02:06
	→ pks joined	02:07
nevyn	or cherry-pick it back	02:08
hyphenated	awesome.	02:09
	← mezod left	02:09
ojacobson	rebase is, in a lot of ways, cherry-pick machinery	02:09
nevyn	git checkout commoncommithash && git checkout -b hotfix-porttorelease && git cherry-pick startofhotfix ... master	02:10
	hyphenated: something like that ^^	02:10
ojacobson	git checkout master...release-x.y # a shorthand for "the last common ancestor of master and release-x.y	02:11
	up to git 2.6 for some idiotic reason the -b option disables the three-dot parsing there, so you have to create a branch separately from checking out the right commit	02:11
	→ donmichelangelo joined	02:12
hyphenated	that would have applied to me then.. git version 2.5.4 (Apple Git-61)	02:12
	← lindenle left	02:14
	← BillCriswell left	02:15
	← michelangelo left	02:15
	→ lindenle joined	02:15
	→ watabou joined	02:17
	← jteneyck left	02:18
	← lindenle left	02:19
	→ lindenle joined	02:20
	← victortyau left	02:20
	← lindenle left	02:23
	← localuser- left	02:23
	→ localuser- joined	02:23
	← Arsonide left	02:24
	→ Arsonide joined	02:24
	→ tyll_ joined	02:24
	→ lindenle joined	02:25
	→ jottr_ joined	02:25
	→ nilsi joined	02:26
	← joako left	02:26
	← tyll left	02:26
	→ meloc joined	02:27
	← lindenle left	02:29
	→ harish_ joined	02:30
	← jottr_ left	02:30
	→ SimonNaa joined	02:31
	→ lindenle joined	02:31
	→ Lyqyd joined	02:32
	← tristanp left	02:33
	→ joako joined	02:33
	→ abc123 joined	02:33
	← SimonNa left	02:34
	← abc123_ left	02:34
	abc123 → abc123_	02:34
	→ fracting1 joined	02:34
	← lindenle left	02:34
	→ lindenle joined	02:36
	← fracting left	02:38
	→ Vampire0 joined	02:38
	← fracting1 left	02:40
	→ fracting1 joined	02:40
	← Vampire0_ left	02:41
	← lindenle left	02:41
	→ lindenle joined	02:42
	← fracting1 left	02:42
	→ fracting joined	02:42
	→ victortyau joined	02:43
	← abc123_ left	02:45
	→ abc123 joined	02:45
	→ lindenle_ joined	02:47
	← lindenle left	02:47
	→ johnkevinmbasco joined	02:47
	→ mablae_ joined	02:48
	← craigp left	02:49
	← mablae__ left	02:51
	← algae left	02:51
	← lindenle_ left	02:52
	→ lindenle joined	02:53
	← nfk left	02:54
	→ boombatower joined	02:54
	← victortyau left	02:54
	→ lindenle_ joined	02:58
	← lindenle left	02:58
System42	Is it possible to have the same submodule in two different branches in different states?	02:59
	← Ahmed90 left	02:59
aidalgol	How do I do a push/pull for all of my remote-tracking branches at once?	02:59
System42	I tried to add a submodule on a new branch that didn't previously use a submodule and got a warning that " a git directory was already found locally"	03:00
nevyn	aidalgol: git fetch --all	03:00
ojacobson	push is easy	03:00
	pull is basically impossible, since merges require a work tree, and there's only one of those	03:01
aidalgol	ojacobson: oh, OK then.	03:01
nevyn	ojacobson: a little shell script but.. ewww	03:01
ojacobson	sure	03:01
	fetch is probably the right approach here	03:01
System42	https://stackoverflow.com/questions/10312521/how-to-fetch-all-git-branches	03:01
nevyn	aidalgol: if they're pure tracking branches... I'd drop them	03:01
aidalgol	nevyn: I'm not sure what the correct term is.	03:01
nevyn	and deal with the detached head when you checkout the remote branch	03:01
	→ rclanan joined	03:02
	← lindenle_ left	03:02
	← apiarian left	03:02
nevyn	aidalgol: if they contain no local changes and only exist to track remote branches.. don't have them as local branches at all	03:02
aidalgol	nevyn: They are for making local changes.	03:03
	→ apiarian joined	03:03
	← nilsi left	03:03
	→ snonez joined	03:04
	→ lindenle joined	03:04
	← skcin7 left	03:06
	← snonez left	03:07
	← rclanan left	03:07
	→ AtnevRed joined	03:07
	→ snonez joined	03:07
	→ jteneyck joined	03:08
	← jteneyck left	03:08
	→ jteneyck joined	03:08
	← yongyung left	03:09
	← lindenle left	03:10
	→ lindenle_ joined	03:10
	→ sangy joined	03:10
	← jalopezsilva left	03:10
	→ yongyung joined	03:10
	→ jon-mac joined	03:11
	← AtnevRed left	03:11
	→ rchavik joined	03:12
	← ajf- left	03:13
	← lindenle_ left	03:14
	← LekeFly left	03:14
	→ bronson joined	03:15
	→ lindenle joined	03:15
	← ahr3n left	03:16
	← kadoban left	03:16
	← System42 left	03:16
trumee	How can i force a user to be authenticated even for repo cloning?	03:16
	← drodger left	03:18
preaction	trumee: don't put the repo in a place where unauthenticated users can get to it. are you using gitolite or something?	03:18
	← johnnyfive left	03:18
trumee	preaction, no plain vanilla server. Out of the box it allowing to clone the repo and not asking for password. Is that how git works out of the box?	03:19
	preaction, i followed this tutorial https://forums.freebsd.org/threads/howto-build-a-jailed-git-repository.34878/	03:19
	← diegoviola left	03:19
	← lindenle left	03:20
	← bronson left	03:20
trumee	i tried to clone from a new machine which doesnt have a ssh key. And cloning worked!!	03:20
preaction	trumee: yes. where you set up the git_daemon is where you allowed unauthenticated users. you could just use ssh	03:20
	← italoacasas left	03:20
	→ drodger joined	03:20
	→ sctskw joined	03:21
	→ jalopezsilva joined	03:21
trumee	oh, how can i force git_daemon to authenticate?	03:21
	← modocache left	03:21
	← joako left	03:21
	→ lindenle joined	03:21
preaction	it doesn't. git-daemon, to my knowledge, doesn't do authentication. you can just use ssh for that. you don't need git-daemon at all, just an sshd, which i assume you already have	03:21
	→ modocache joined	03:22
	← ketas- left	03:22
trumee	So i can stop git_daemon and still will be clone using git clone git://myserver/myrepo.git?	03:23
ojacobson	You can't.	03:23
	git:// is an unauthenticated protocol.	03:23
	If you want auth, use ssh or http/https	03:24
preaction	no, you'd use "git clone ssh://myserver/myrepo.git"	03:24
	→ johnnyfive joined	03:24
preaction	!gitolite	03:24
gitinfo	Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/	03:24
	← lindenle left	03:26
	→ moncrey joined	03:26
	→ lindenle joined	03:27
	← abra0 left	03:28
	← johnkevinmbasco left	03:29
moncrey	hey, i need a little guidance from someone whos a bit more familiar with git. I've been trying to rebase for hours.	03:29
	just got a fresh git clone of my own repo	03:29
	i need to rebase/squash my commits down to one.	03:29
nevyn	ok	03:30
trumee	ok, i stopped git_daemon. and tried using git clone ssh://git@myserver/private/myrepo.git. I now get an error fatal:'/private/myrepo.git' does not appear to be a git repository. fatal:Could not read from remote repository	03:30
moncrey	i have git remote add originalrepoAddress	03:30
	then git checkout -b develop of my own branch	03:30
nevyn	moncrey: when you did the development did you pull as you went?	03:30
	or merge?	03:30
moncrey	no i havent nevyn. i assume its outdated from master	03:31
	thats a thing i dont quite understand how to do.	03:31
nevyn	ok.	03:31
	so let's deal with the first thing first	03:31
	make a new branch of your develop that we're going to rebase.	03:32
moncrey	make a new branch of the develop branch...	03:32
nevyn	yep	03:32
	because you want to keep develop incase this doesn't workout	03:32
	so git checkout -b develop-squash	03:33
moncrey	aha okay. that'll create a new branch out of the current branch?	03:33
nevyn	this is going to contain a single squashed commit of the changes you made	03:33
moncrey	alright.	03:33
nevyn	moncrey: yeah do that with develop checked out	03:33
moncrey	okay set	03:33
nevyn	moncrey: now look back through the log until you find where you started working	03:34
	then do git rebase -i <STARTINGPOINTHASH>	03:35
moncrey	okay	03:36
nevyn	this will open an editor. with every commit between starting point and tip of develop.	03:36
	→ jeffreylevesque joined	03:36
	→ mizu_no_oto joined	03:36
trumee	ah i had to give the full path like this git clone ssh://git@myserver/home/git/private/myrepo.git, and now it works	03:37
	← chachasmooth left	03:37
	← Ankhers left	03:38
moncrey	first nevyn… what im looking at in git log are other peoples changes.	03:38
	→ joako joined	03:38
moncrey	i made 13 commits to my develop branch	03:38
	when i type git log, they are not shown	03:38
	→ chachasmooth joined	03:38
nevyn	moncrey: when you ran checkout -b whcih branch were you on?	03:39
	← jalopezsilva left	03:39
	→ ahr3n joined	03:39
	← CheckDavid left	03:39
moncrey	i am pretty sure i was on develop.	03:39
nevyn	try it again	03:39
	make sure	03:39
moncrey	let me back up and start over	03:39
nevyn	meh	03:39
	moncrey: git reset --hard develop	03:39
	(given your on develop-squash now	03:40
moncrey	ohhh	03:40
	← lindenle left	03:40
	← mizu_no_oto left	03:41
	← apiarian left	03:41
moncrey	okay so i just checked out again. then git remote add origRepo again. then git checkout -b develop	03:42
	git log currently shows other peoples changes	03:42
	→ m1dnight1 joined	03:42
	→ lindenle joined	03:42
	→ apiarian joined	03:42
	← m1dnight_ left	03:42
	← ahr3n left	03:44
	← daito left	03:44
moncrey	so i did git pull moncrey develop and now git log shows my changes	03:46
	→ msonntag joined	03:46
	← ome left	03:47
	→ jalopezsilva joined	03:47
	m1dnight1 → m1dnight_	03:50
	→ Limes_ joined	03:50
	→ rtail joined	03:53
nevyn	pull?	03:55
	pull is a merge!	03:55
	you almost certainly don't wantthat.	03:55
moncrey	well shit that explains all these extra commits in rebase heh	03:55
	→ howdoi joined	03:56
nevyn	!pull	03:57
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/	03:57
moncrey	alright so. at a fresh clone. added the remote. switched to branch develop.	03:57
	so i should fetch! okay	03:57
nevyn	so if you pulled while you were working on develop	03:57
	then it's going to get messy	03:58
moncrey	deleted and started over once again	03:58
nevyn	because you have yourstuff... merged upstremastuff yourstuff mergedupstreamstuff	03:58
moncrey	exactly what i was looking at	03:58
nevyn	yeah...	03:58
moncrey	so i should be doing git fetch now?	03:58
	← MikeFair left	03:58
nevyn	if it looks like that.	03:58
	then your best bet is to cherry-pick out yourstuff and build something that cleanly applys on tip of upstream	03:59
	→ MikeFair joined	03:59
	← drupald left	03:59
nevyn	moncrey: it doesn't matter what you do now	03:59
	it matters what happened while you were writing develop	03:59
	if you pull'd as you went then you've got to unravvel that	04:00
	← harish_ left	04:00
nevyn	so if you look at a git log of develop	04:00
	does it have yourstuff back to upstream or is it intermingled?	04:00
moncrey	it looks like all my stuff, but then i take that hash and i run git rebase -i ${hash} i get intermingled commits	04:01
	← aidalgol left	04:01
	← lindenle left	04:02
ojacobson	protip: !lol (or at least `git log --graph --decorate`) is incredibly useful for picking apart the kinds of complicated topologies you're dealing with	04:02
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	04:02
	→ nilsi joined	04:02
	→ lindenle joined	04:03
	← jteneyck left	04:03
	→ drupald joined	04:03
	← abc123 left	04:05
	→ abc123_ joined	04:05
moncrey	so nevyn whats with that? log looks like im only going back to my own commits, but then git rebase -i [hash-of-first-commit] shows me more commits	04:05
nevyn	not first commit.	04:06
	hash of first commit before your commits	04:06
moncrey	oh...	04:06
nevyn	moncrey: are you comefortable sharing the git log --graph --decorate?	04:06
	→ jteneyck joined	04:07
	← jteneyck left	04:07
	→ jteneyck joined	04:07
	← lindenle left	04:08
moncrey	i took the hash right below it and that seems to be correct. now i have a list of 13 commits in rebase -i which is what i was expecting	04:08
	→ lindenle joined	04:08
	← apiarian left	04:11
	→ apiarian joined	04:11
	← lindenle left	04:12
	← jteneyck left	04:12
	→ lindenle joined	04:14
nevyn	so now change the start of those lines to squash to sqash things into the previous commit.	04:14
	→ kadoban joined	04:16
moncrey	so i i took that rebase -i screen, reworded the first and squashed the rest. then it opened EDIT_MSG and i rephrased that one commit… now its showing me all 12 previous commits?	04:16
	→ dEPy joined	04:16
	← lindenle left	04:17
	← wxg left	04:17
	← blackwind_123 left	04:17
	→ lindenle joined	04:18
nevyn	first? or last	04:21
	→ daito joined	04:21
nevyn	first in the graph or first as in the 'top'?	04:21
moncrey	top	04:21
nevyn	is that the oldest one?	04:21
moncrey	im pretty sure that was the first one	04:22
	yes oldest	04:22
nevyn	ok	04:22
	← meloc left	04:22
	← lindenle left	04:22
nevyn	so then change the string at the start of the rest to 'squash'	04:22
	?	04:22
moncrey	yep. did that. then it opened up another page after i save/quit	04:22
	← Senecea left	04:22
nevyn	that's the new commit	04:23
	← jalopezsilva left	04:23
moncrey	okay i updated that, replaced what was there which was my oldest commit msg	04:23
nevyn	so that's for your new commmit log	04:23
	ok	04:23
moncrey	now theres a page that starts "this is a combination of 12 commits"	04:23
	→ lindenle joined	04:24
nevyn	oh..	04:25
	firstn the reword	04:25
	so because you said you wanted to reword the first commit that happens first	04:25
	then the squash commit	04:25
	(shouldof left it as pick)	04:25
moncrey	oh darn	04:25
	i can start over, since i've done so about 50 times by now	04:25
	→ Senecea joined	04:25
moncrey	sigh/lol	04:26
	→ jottr_ joined	04:26
	← kadoban left	04:26
nevyn	nah. just barrel through	04:26
	rewriting history is rewriting history.	04:26
moncrey	okay.	04:26
	so whats up with this "this is a combination of 12 commits" page	04:27
	← Senecea left	04:27
moncrey	do i edit it?	04:27
nevyn	so that's the actual commit for the new squashed change	04:27
	← drodger left	04:27
moncrey	aha okay.	04:27
	ohhhh i understand	04:27
	so the second page would have been the reword	04:28
	i assume	04:28
	→ drodger joined	04:28
	← lindenle left	04:29
	→ lindenle joined	04:29
moncrey	alright, exited emacs	04:30
	success so far!	04:30
	so now im on branch develop	04:30
	→ ra0 joined	04:31
	← jottr_ left	04:31
	← fscala left	04:31
moncrey	can i git push origin develop at this point?	04:31
nevyn	no.	04:32
	well you could try but it'll fail	04:32
	← localuser- left	04:32
nevyn	or be a no-op	04:32
moncrey	aha okay…	04:32
nevyn	if you did that on a seperate branch. like I said nothing has changed on develop	04:32
	if you did it on develop then develop and origin/develop are diverged and you need to do a force push	04:33
	it's still behind upstream	04:33
	→ fscala joined	04:33
nevyn	you need to rebase that work forward onto upstreams current tip still	04:33
	← Sazhen86 left	04:33
moncrey	im pretty sure my own fork is origin/develop	04:33
nevyn	sure	04:34
	so	04:34
	origin/develop you'd pushed this stuff to already right?	04:34
	you just rewrote the history of that by squashing the commits.	04:34
	← amdi_ left	04:35
moncrey	yes	04:35
	thats where im at now	04:35
nevyn	so as the current history and the remote history have diverged.	04:35
	you need to force push to replace the 12 commits with 1 on the remote	04:35
moncrey	the remote being my github repo, right?	04:36
nevyn	yes	04:36
	← MattMaker left	04:37
	← lindenle left	04:37
moncrey	so is that simply git push —force origin develop	04:38
	→ lindenle joined	04:38
	← sparetire left	04:40
moncrey	this would be a bad step to be making a mistake at	04:40
nevyn	meh.	04:41
	you've got everything locally	04:41
	so yes that's correct	04:42
	(while on the rebased branch	04:42
	assuming push.default = current	04:42
moncrey	nevyn thank you so much for your help.	04:42
	← lindenle left	04:43
moncrey	you dont know how valuable your help is to me right now.	04:43
	i need to go thoroughly step through Ry's git tutorial	04:43
	→ Goplat joined	04:43
moncrey	but i needed to get that done promptly for a job im very excited about getting.	04:43
	→ lindenle joined	04:43
moncrey	fingers crossed. Everybody's gotta be a beginner at something at some point	04:44
	→ MattMaker joined	04:44
	→ abc123 joined	04:46
	← abc123_ left	04:46
	abc123 → abc123_	04:46
	← lindenle left	04:48
	→ skcin7 joined	04:49
	← MattMaker left	04:49
	ril → ril[away]	04:49
	→ lindenle joined	04:49
	← fracting left	04:50
	← daito left	04:51
	← hahuang65 left	04:51
	→ mizu_no_oto joined	04:51
	→ abc123 joined	04:51
	← FireArrow133 left	04:52
	← joki left	04:52
	← lindenle left	04:53
	← abc123_ left	04:53
	abc123 → abc123_	04:53
	→ irqq joined	04:53
	→ localuser- joined	04:55
	← mizu_no_oto left	04:56
	→ daito joined	04:58
	← Chilley left	04:58
	→ ayaz joined	04:58
	→ tristanp joined	04:59
	← MikeFair left	04:59
	→ MikeFair joined	04:59
	→ joki joined	04:59
	← localuser- left	05:00
	← xvx left	05:02
	→ Manikandan joined	05:02
	← blckbit10 left	05:03
	→ nnyk joined	05:07
	→ AtnevRed joined	05:08
	→ GT joined	05:09
	→ jteneyck joined	05:09
	→ blckbit10 joined	05:10
	← moncrey left	05:11
	← tristanp left	05:11
	ril[away] → ril	05:11
	← AtnevRed left	05:13
	← jteneyck left	05:15
	← rtail left	05:15
	→ rtail joined	05:17
	→ bronson joined	05:17
	← modocache left	05:19
	← madewokherd left	05:19
	→ MattMaker joined	05:21
	← bronson left	05:22
	← ril left	05:22
	← MattMaker left	05:26
	→ Macaveli joined	05:28
	→ craigp joined	05:28
	→ Chilley joined	05:28
	← scarcry left	05:31
	→ skorgon joined	05:32
	← Chilley left	05:32
	← Macaveli left	05:33
	← Gamecubic left	05:34
	→ tildes joined	05:35
	→ strayPuppy joined	05:38
	→ d0lph1n98 joined	05:40
	← irqq left	05:41
	→ ril joined	05:41
	← holodoc left	05:42
	← d0lph1n98 left	05:43
	→ moncrey joined	05:44
	→ holodoc joined	05:45
	→ tristanp joined	05:45
	← moncrey left	05:45
	→ fedexo joined	05:46
	← drodger left	05:46
	← ril left	05:46
	→ drodger joined	05:47
	← Cabanossi left	05:47
	→ hahuang65 joined	05:47
	→ moncrey joined	05:48
	→ Cabanossi joined	05:49
	→ ril joined	05:49
	← ril left	05:54
	← skinux left	05:54
	→ ayaz_ joined	05:55
	← tildes left	05:55
	→ Algebr joined	05:55
Algebr	I used git lfs track ".dump" and then tried pushing to master but still got this is 106.52 MB; this exceeds GitHub's file size limit of 100.00 MB error as before, the .gitattributes also correct existed, says: +.dump filter=lfs diff=lfs merge=lfs -text	05:56
	So I'm confused what's the issue.	05:56
	← ayaz left	05:57
	→ [1]MikeFair joined	05:59
	← MikeFair left	05:59
	← tpollard left	06:01
	← sdothum left	06:05
	← sctskw left	06:05
	→ tildes joined	06:05
	→ samw joined	06:06
thiago	Algebr: the file is too big	06:07
ojacobson	At least one commit you're pushing contains at least one file over 100.00MB	06:07
	even if you replaced the file with an lfs entry in a subsequent commit, it's still there in the history	06:08
Algebr	so if I blow away the commit then lfs will work?	06:08
	← drodger left	06:09
thiago	how many commits are you trying to push?	06:09
Algebr	1	06:10
	→ nilg joined	06:10
	→ jteneyck joined	06:10
thiago	are you sure? git whatchanged @{u}..	06:10
	(including the two dots)	06:10
	← samw left	06:11
	→ drodger joined	06:12
	← apiarian left	06:12
Algebr	yes. its a brand new repo	06:12
	→ scarcry joined	06:12
	→ apiarian joined	06:12
	← sulky left	06:12
	← ayaz_ left	06:12
Algebr	yes, did it and never before seen prompt appeared	06:12
	git LFS	06:12
thiago	do you see any "A" for new files?	06:13
Algebr	i just blew away .git and re inited	06:13
	← skorgon left	06:13
	← scarcry left	06:14
	→ scarcry joined	06:14
	← jteneyck left	06:15
	← leeN left	06:16
ojacobson	and nothing of value was gained	06:16
	→ Chilley joined	06:17
Algebr	What? I achieved my objective, that's the value.	06:18
	← noyb left	06:18
	→ samw joined	06:19
	← samw left	06:22
	→ rscata joined	06:24
	← daito left	06:25
	→ ril joined	06:25
	→ abra0 joined	06:26
	→ jottr_ joined	06:27
	→ eijk_ joined	06:27
	← rtail left	06:28
	← sssilver left	06:29
	→ circ-user-ohseJ joined	06:30
	→ noyb joined	06:30
	← nanga left	06:30
	→ geoid joined	06:31
	→ Chilley_ joined	06:32
	→ wxg joined	06:32
	→ apotry joined	06:32
	← jottr_ left	06:32
	→ nanga joined	06:32
	← Chilley left	06:34
	← geoid left	06:35
	← noyb left	06:35
	→ ThomasLocke joined	06:35
	→ zeroed joined	06:40
	← zeroed left	06:40
	→ zeroed joined	06:40
	← scottschecter left	06:43
	→ daito joined	06:44
	← apiarian left	06:45
	← tildes left	06:45
	→ apiarian joined	06:46
	→ dreiss joined	06:46
	→ PCatinean joined	06:48
	→ localuser- joined	06:50
	→ Motoko joined	06:50
	→ LucaTM joined	06:52
	→ shiriru joined	06:52
	→ SOLDIERz joined	06:53
	← Lyqyd left	06:56
	← dreiss left	06:58
	→ MikeFair joined	06:59
	← [1]MikeFair left	06:59
	← wethu left	07:00
	→ Raging_Hog joined	07:03
	← Manikandan left	07:03
	→ Anwar joined	07:04
	→ googolhkl joined	07:04
	← googolhkl left	07:05
	ril → ril[away]	07:07
	→ aleksandar2810 joined	07:08
	← blckbit10 left	07:10
	← boombatower left	07:10
	→ blckbit10 joined	07:10
	← apiarian left	07:11
	→ jteneyck joined	07:11
	→ apiarian joined	07:12
	ril[away] → ril	07:12
	→ freimatz joined	07:15
	← Motoko left	07:15
	← localuser- left	07:15
	→ localuser- joined	07:15
	← rewt left	07:16
	← jteneyck left	07:16
	← abc123_ left	07:16
	→ rewt joined	07:16
	← fedexo left	07:17
	→ abc123 joined	07:17
	→ Manikandan joined	07:17
	← diogenese left	07:18
	→ codefo joined	07:18
	← thiago left	07:18
	→ tomog999_ joined	07:18
	→ thiago joined	07:19
	→ dreiss joined	07:19
	→ diogenese joined	07:20
	→ acolson joined	07:20
	← tomog999 left	07:21
	← elementalest left	07:21
	→ BSaboia joined	07:22
	← weox left	07:22
	→ jceb joined	07:23
	→ elementalest joined	07:25
	← elementalest left	07:25
	→ elementalest joined	07:25
	→ Sazhen86 joined	07:26
	← jaafar left	07:27
	← netj left	07:27
	→ jnavila joined	07:28
	→ netj joined	07:28
	→ David1977 joined	07:29
	→ Xethron joined	07:30
	← Manikandan left	07:31
	→ t0by joined	07:31
	→ dopesong joined	07:32
	→ firstdayonthejob joined	07:36
	→ lucido joined	07:37
	← alanwill left	07:37
	→ meloc joined	07:38
	→ Sceorem joined	07:38
	→ alanwill joined	07:38
	← zeroed left	07:38
	← howdoi left	07:38
	→ zeroed joined	07:39
	← zeroed left	07:39
	→ zeroed joined	07:39
	→ izhak joined	07:40
izhak	Hi, guys is it a way to archive branch to send whilst keeping it easy to restore on the other side. Say I have a branch A which not from a top of the master but several commits below. How do I send this branch keeping it's position?	07:42
	→ lamppid joined	07:42
	← lamppid left	07:42
	→ Manikandan joined	07:43
	→ lamppid joined	07:44
	→ karstensrage joined	07:44
	→ moosbart joined	07:44
	← Goplat left	07:45
	← donnib left	07:46
	→ mariuscc joined	07:51
	← moosbart left	07:52
	← hyphenated left	07:52
	← localuser- left	07:52
	→ skorgon joined	07:52
	← alanwill left	07:53
	← strayPuppy left	07:55
	→ AnwarS joined	07:55
	→ joel_falcou joined	07:55
	← Limes_ left	07:55
	→ sagittarian joined	07:55
	← Anwar left	07:55
	← izhak left	07:56
	← davidosomething left	07:56
	→ dan2k3k4 joined	07:57
	← shiriru left	07:58
	→ hyphenated joined	07:58
	← Algebr left	07:58
	→ harish joined	07:58
	← MikeFair left	07:59
	→ MikeFair joined	07:59
	→ tinajohnson__ joined	08:00
	→ pantsman_ joined	08:01
	← Rakkan left	08:01
	→ JeroenT joined	08:01
	← dopesong left	08:02
	→ PHPanos joined	08:02
	← Chilley_ left	08:03
	→ skylite joined	08:03
	← moritz_s left	08:03
	← PHPanos left	08:06
	→ fees joined	08:06
	← discipline left	08:08
	← JeroenT left	08:09
	→ discipline joined	08:09
	← joel_falcou left	08:10
	→ tobeplugged joined	08:10
	→ thierryp joined	08:10
	→ Chilley joined	08:10
	→ JeroenT joined	08:11
	← mzmz left	08:11
	→ _noblegas joined	08:11
	→ jteneyck joined	08:12
	← jteneyck left	08:12
	→ jteneyck joined	08:12
	→ TomyWork joined	08:13
	← skorgon left	08:14
	→ mzmz joined	08:16
	← tobeplugged left	08:17
	← dreiss left	08:17
	← jteneyck left	08:17
	← Kulrak left	08:17
	← snonez left	08:18
	→ Segfault_ joined	08:18
	→ bronson joined	08:20
	← markgrady left	08:21
	→ {AS} joined	08:22
	→ acetakwas joined	08:23
	→ howdoi joined	08:23
	← pantsman_ left	08:23
	→ dopesong joined	08:24
	→ Kulrak joined	08:24
	← Kulrak left	08:24
	→ Kulrak joined	08:24
	← thiago left	08:24
	← MikeFair left	08:25
	← bronson left	08:25
	← kaiza left	08:28
	→ tobeplugged joined	08:28
	← dopesong left	08:28
	→ jottr_ joined	08:29
	← aleksandar2810 left	08:29
	→ aleksandar2810 joined	08:30
	← tobeplugged left	08:31
	→ Balliad joined	08:31
	← apiarian left	08:33
	→ apiarian joined	08:33
	← jottr_ left	08:34
	← blckbit10 left	08:35
	← moncrey left	08:35
	→ blckbit10 joined	08:35
	← acetakwas left	08:36
	← lamppid left	08:37
	← dEPy left	08:38
	→ mrkat joined	08:40
	← nowhere_man left	08:40
	← firstdayonthejob left	08:40
	← JanC left	08:40
	→ QF-MichaelK joined	08:43
	→ Afdla joined	08:44
	→ _rgn joined	08:45
	→ moncrey joined	08:45
	← aleksandar2810 left	08:45
	← Kulrak left	08:46
	→ Kulrak joined	08:46
	← Kulrak left	08:46
	→ Kulrak joined	08:46
	→ herr_barium joined	08:46
	→ lb joined	08:47
	→ lindenle joined	08:49
	→ mahendra_ joined	08:50
	→ lamppid joined	08:51
	← \|node left	08:51
	→ AAoK joined	08:51
	→ zivester joined	08:53
	← lindenle left	08:54
	→ Vgr_ joined	08:55
	← Vgr_ left	08:55
	→ Vgr_ joined	08:55
	← Vgr_ left	08:55
	→ Vgr_ joined	08:55
	← Vgr_ left	08:55
	→ Vgr_ joined	08:55
	← Vgr_ left	08:55
	→ Vgr_ joined	08:56
	← Vgr_ left	08:56
	→ Vgr_ joined	08:56
	← Vgr_ left	08:56
	← Vgr left	08:56
	→ Vgr joined	08:56
	← Vgr left	08:56
	→ Vgr joined	08:56
	← Vgr left	08:56
	→ JanC joined	08:56
	→ Vgr joined	08:56
	← Vgr left	08:56
	→ Vgr joined	08:56
	← Vgr left	08:56
	→ Vgr joined	08:56
	← Vgr left	08:56
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ AtnevRed joined	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	→ Vgr joined	08:57
	← Vgr left	08:57
	← Afdla left	08:57
	→ Vgr joined	08:58
	← Vgr left	08:58
	→ Vgr joined	08:58
	← Vgr left	08:58
	→ Vgr joined	08:58
	← Vgr left	08:58
	→ Vgr joined	08:58
	← Vgr left	08:58
	← jaguarmagenta left	08:58
	→ kaiza joined	08:59
	→ jaguarmagenta joined	08:59
	← codefo left	09:00
	→ nowhere_man joined	09:00
	← AtnevRed left	09:02
	← kaiza left	09:02
	→ kaiza joined	09:02
	→ blur3d joined	09:03
	→ roxlu joined	09:04
	← jaguarmagenta left	09:04
	→ codefo joined	09:06
	→ acetakwas joined	09:07
	← ShapeShifter499 left	09:07
	← lamppid left	09:08
	← zeroed left	09:09
	→ dopesong joined	09:09
	→ zeroed joined	09:10
	← zeroed left	09:10
	→ zeroed joined	09:10
	← jceb left	09:11
	→ flavi0 joined	09:11
Diabolik	what's the easiest way to move a git branch to a new repo whilst keeping the histroy	09:12
	*history	09:12
	← nnyk left	09:12
cbreak	Diabolik: git fetch	09:12
	or git push	09:12
	depending on the direction	09:12
Diabolik	cbreak i want to take branch x from repo a	09:13
	and make it master on repo b	09:13
	→ jteneyck joined	09:13
Diabolik	which is a new repo	09:13
	→ kurkale6ka joined	09:13
	← wxg left	09:13
cbreak	Diabolik: yeah, then do what I told you	09:14
	← JeroenT left	09:14
lb	Diabolik, clone repo a into repo b, git reset --hard <sha> the master branch to whatever it should point to, delete all unneeded branches git branch -D <branch>	09:14
	→ linuxmint joined	09:14
cbreak	lb: then you have tones of garbage in unreachable history :)	09:15
	easier to only fetch / push what is needed	09:15
lb	cbreak, i'd argue that your solution is better, while mine is easier ;D	09:15
	pseudonym → bezaban	09:15
cbreak	git push ssh://server/git/repo.git localbranch:master	09:16
	done	09:16
lb	cbreak, i know that ;) but it mybe not that self explainary to Diabolik :D	09:16
cbreak	:/	09:16
	→ clmsy joined	09:17
lb	Diabolik, what cbreak wanted to tell you: create an empty repo (bare) and just push the branch you want to keep from your old repo into the new repo . the command you need is what cbreak seaid above :)	09:17
	said*	09:18
Diabolik	thanks guys	09:18
	← jteneyck left	09:18
Diabolik	il have a go and see where i get ot	09:18
	*to	09:18
	much obliged	09:18
	cbreak surely the first arg to git push won't link to that branch	09:19
	unless i can get a direct ssh link to the branch	09:19
cbreak	the url is to the repository	09:19
	← QF-MichaelK left	09:19
cbreak	the DESTINATION	09:19
lb	Diabolik, you push from a local clone of the old repo	09:20
cbreak	indeed	09:20
	→ JeroenT joined	09:20
Diabolik	ah so im pushing from repo a	09:20
cbreak	just like with any other push	09:20
	→ Silenced joined	09:21
	→ lamppid joined	09:21
	← nd left	09:22
	← JeroenT left	09:22
	→ jceb joined	09:23
Silenced	Can push stuffs to my repo. How to do so ? http://pastebin.com/QtngfNY3	09:23
moritz	Silenced: the error message tells you how	09:24
	→ jaguarmagenta joined	09:24
Silenced	I did a git pull then tried to push it . Never worked	09:25
	← Orion3k left	09:25
Diabolik	you might need to rebase on top of your changes	09:25
	→ Jellyg00se joined	09:26
	→ powered joined	09:26
	← watabou left	09:27
	← harish left	09:28
	→ vkngpmhc joined	09:29
lb	Diabolik, a rebase might be the last option for a newcomer :D	09:29
moritz	Silenced: show the error message when you pull first, and then push?	09:30
	← jaguarmagenta left	09:30
	← AnwarS left	09:31
	→ ShapeShifter499 joined	09:31
	← daito left	09:31
	→ Dennis84 joined	09:32
Dennis84	hi all	09:32
gitinfo	Dennis84: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	09:32
	← craigp left	09:32
`{^^}`	!backup	09:32
gitinfo	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	09:32
	→ jaguarmagenta joined	09:33
	→ nd joined	09:33
	→ aleksandar2810 joined	09:33
Dennis84	can anybody give me an advice which ready to start git server for windows to use? i want active directory support and limit access rights on branches	09:34
	← freimatz left	09:34
Dennis84	bonobo git server is now in use, but don't have the access rules for branches	09:34
	→ scwizard joined	09:35
scwizard	anyone know why receiving objects would hang in this instance?	09:36
	https://gist.github.com/paulfgps/881a12e44e2e97357f28	09:36
	→ bonswouar joined	09:36
	→ craigp joined	09:36
scwizard	this is git version 2.7.0.windows.1	09:36
	and it's cloning via https	09:36
	← jaguarmagenta left	09:38
	← reim left	09:38
	→ Jackneill joined	09:39
	→ sbasso joined	09:39
	← sbasso left	09:39
	→ sbasso joined	09:40
	← jceb left	09:41
	→ jaguarmagenta joined	09:41
	→ nettoweb joined	09:43
	← blur3d left	09:44
	← Xethron left	09:44
	← ShapeShifter499 left	09:45
	← linuxmint left	09:45
	← Chilley left	09:46
	→ pantsman_ joined	09:47
	→ linuxmint joined	09:50
moncrey	man git has a funny learning curve	09:51
gitinfo	the git manpage is available at http://jk.gs/git.html	09:51
moncrey	its like an S	09:51
	→ JeroenT joined	09:51
moncrey	easy, then really hard	09:51
	→ andyr joined	09:53
	→ jceb joined	09:57
	→ stamina joined	09:57
	→ temhaa joined	09:58
temhaa	hello	09:58
	I want to change committer of spesific commit	09:58
	My commits also in origin side	09:58
	I used another machine during commit, I forgot change global settings :(	09:59
	→ ronskisika joined	10:00
moritz	temhaa: and is that worth rewriting public history?	10:01
	← Raging_Hog left	10:03
temhaa	moritz: my origin is in github	10:04
moritz	temhaa: so, public	10:04
	→ jottr_ joined	10:04
temhaa	moritz: how can I do, Its realy important for me	10:04
jast	keeping in mind that this will screw it up for everyone who has fetched your current history... !fixup	10:05
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	10:05
canton7	temhaa, how many commits?	10:05
	← ronskisika left	10:05
moritz	temhaa: http://stackoverflow.com/a/1320317/14132	10:05
	temhaa: if there are others that work on that project, talk to them first	10:05
	← andyr left	10:05
canton7	he doesn't mention the easy way of doing multiple commits	10:06
	.. and his rebase response doesn't handle merges, as he says later	10:07
	if you want to do multiple commits, see man git filter-branch, search for "The --env-filter option can be used to modify committer and/or author identity"	10:08
gitinfo	the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	10:08
	→ King_Hual joined	10:08
	← King_Hual left	10:08
	→ King_Hual joined	10:08
	← BSaboia left	10:11
	← fahadash left	10:11
	← Silenced left	10:12
	→ leonarth joined	10:12
temhaa	canton7: I want to change last 3 commits	10:12
canton7	then see my link	10:12
	→ nnyk joined	10:13
	→ jteneyck joined	10:14
	← jteneyck left	10:14
	→ jteneyck joined	10:14
	→ chll joined	10:14
	← Manikandan left	10:15
	→ Manikandan joined	10:15
	→ aleksandar2810_ joined	10:16
	← aleksandar2810 left	10:16
	← acetakwas left	10:16
	→ wethu joined	10:17
temhaa	canton7: I didnt see your link	10:18
canton7	<canton7> if you want to do multiple commits, see man git filter-branch, search for "The --env-filter option can be used to modify committer and/or author identity"	10:18
gitinfo	the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	10:18
	← jteneyck left	10:19
	← zivester left	10:19
	→ rnsanchez joined	10:21
	→ notebox joined	10:21
moncrey	i have a question:	10:22
	→ bronson joined	10:22
moncrey	how can i do a rebase while ignoring changes in my local branch	10:22
	simply rewrite the commit message	10:23
canton7	moncrey, stash, rebase, stash pop	10:23
	moncrey, newer gits have an --autostash flag to rebase to automatically stash and pop	10:23
	→ Alienpruts joined	10:24
	→ arcane-methods joined	10:24
	← arcane-methods left	10:25
	→ Chilley joined	10:25
moncrey	okay im having a strange problem.	10:26
	← aleksandar2810_ left	10:26
moncrey	canton7 the changes were irrelevant so i deleted and re cloned my copy of the repo.	10:26
	switched to my develop branch	10:26
_ikke_	!rmrf	10:26
gitinfo	[!startover] There’s usually no need to start over / rm -rf everything and reclone or so. Most situations can be fixed by other means.	10:26
moncrey	git log , found the hash before my changes, did git rebase -i hash	10:27
	left the first commit, squashed the rest	10:27
	← bronson left	10:27
moncrey	and i have a could not apply error	10:27
	with a fresh clone	10:27
_ikke_	can you paste the full error?	10:28
canton7	any merges in the stuff you squashed?	10:28
	→ mischat joined	10:28
moncrey	just error: could not apply [commit message]	10:28
	→ andyr joined	10:29
canton7	by that, _ikke_ means please make a pastebin with the full command, and the full response	10:29
moncrey	okay	10:29
temhaa	moritz: canton7 I applied http://stackoverflow.com/questions/750172/change-the-author-of-a-commit-in-git/1320317#1320317 this intructions but I dont know what is next after git rebase --continue	10:29
	moritz: canton7 It seems true git log in now in my local Should I git push origin ?	10:30
canton7	temhaa, I'm not going to support you if you decide to do something different to what I suggested ;) Go and bug moritz: he's the one who suggested that approach	10:30
	→ daito joined	10:32
temhaa	canton7: I just asked. anyway thank you	10:33
jast	moncrey: my guess is there was a merge commit in there somewhere. rebase does a fun remixing operation with merges unless you pass -p (preserve merges)	10:34
moncrey	yeah thats whats confusing me. i want to just let it take the version in origin/develop	10:35
	→ Amnesia joined	10:36
moncrey	how will preserve merges affect the merge	10:36
Amnesia	question, I accidentally executed "git reset HEAD^" two times instead of one, how can I undo the last one?	10:36
	← daito left	10:37
jast	moncrey: it will re-create the merge (assuming that's one of your commits), with the same contents and all. if the merge is part of what you're squashing together, it should do what you expect.	10:37
	Amnesia: find the correct commit in the output of 'git log -g' (probably HEAD@{1}) and reset to that	10:37
	→ Anwar joined	10:37
jast	moncrey: another way to do this without interactive rebase: 1) discard or stash all uncommitted changes. make sure you're on the branch you want to squash. 2) git reset --soft origin/develop (this will rewind your branch to that place but keep all your changes staged) 3) git commit	10:39
Amnesia	jast: tyvm	10:39
jast	Amnesia: further reading: man git-reflog :)	10:40
gitinfo	Amnesia: the git-reflog manpage is available at http://jk.gs/git-reflog.html	10:40
	← a3Dman left	10:40
moritz	temhaa: you wil need to push with --force	10:43
Amnesia	jast: tyvm	10:43
	← vkngpmhc left	10:43
	→ a3Dman joined	10:45
	→ aleksandar2810 joined	10:45
temhaa	moritz: I pushed to origin my commits seems good but also It shows wrong auther	10:45
	moritz: Can I delete wrong auther from logs.	10:45
	→ mellernoia joined	10:46
	→ harish joined	10:46
moncrey	jast: i'm trying to rebase to combine and rewrite a commit message, but it says —preserve-merges and —interactive dont play well together	10:48
	← Ekho left	10:48
jast	moncrey: in my experience it usually works well, and your case should be simple enough	10:49
moncrey	youd think. clone the repo. checkout origin/develop. rebase -i parentHash	10:50
	error	10:50
	← TomyWork left	10:51
moncrey	ok so i tried git rebase -i hash -p	10:51
	error: could not apply bd438af...	10:52
	→ TomyWork joined	10:52
moncrey	Could not pick bd438af1279cee530ce6d7e7fff32a9c754751a5	10:52
jast	is it the same error?	10:52
	→ acetakwas joined	10:52
moncrey	i did not get "could not pick …" at the end before	10:54
	before trying with -p	10:54
	but otherwise yes	10:54
jast	hmm	10:54
	no idea what might be going on there. it's not too late to try my other suggestion, though :)	10:55
temhaa	moritz: It seems same commit both by me and by wrong auther.	10:55
jast	to make sure we're on the same page: it condenses everything in your branch after origin/develop into a single new commit	10:55
	← acetakwas left	10:55
	→ Calrik_ joined	10:55
jast	in the third step I gave it doesn't fetch a commit message for you, you can add '-c <commit ID>' to populate the editor with another commit's message so you can edit it	10:56
	← aleksandar2810 left	10:56
moncrey	soft reset to origin/develop. nothing to commit	10:56
	→ aleksandar2810 joined	10:56
jast	weird, that would mean the overall outcome of your changes is... nothing	10:57
	and that's a rather pessimistic outlook :)	10:58
moncrey	in code yes, but im trying to reword a commit message	10:58
	3 rather	10:58
	→ AtnevRed joined	10:58
	→ acetakwas joined	10:58
jast	no, I mean the changes that are already there	10:58
moncrey	the number of commits listed on github is still 3 when i'm trying to reduce to 1 and rename	10:59
jast	if git is right with its 'nothing to commit', your series of commits is effectively a no-op, and then squashing that into a single commit would create a commit that does nothing	10:59
moncrey	but rebase reword is significant isnt it?	11:00
	there are no changes in the rebase, other than consolidation	11:00
	of commit message	11:00
jast	this bit doesn't care about rebases. it doesn't see what happened during previous rebases, only what's there now	11:00
	did you abort your rebase before trying the next thing, by the way?	11:01
moncrey	yes	11:01
	→ liamonade joined	11:01
moncrey	again same error	11:01
	sheesh!	11:01
	← AtnevRed left	11:02
jast	unfortunately I can't look into it any deeper right now, I'm kind of busy...	11:02
moncrey	you know, i can just roll back before the merge.	11:02
	← circ-user-ohseJ left	11:03
	→ mkopriva joined	11:04
	← dan2k3k4 left	11:04
	← JeroenT left	11:06
moncrey	fuck	11:06
jast	don't panic, if anything is gone and you didn't 'rm -rf' we can bring it back	11:07
moncrey	heh i've done that maybe 40 times now	11:07
jast	in fact virtually all problems can be fixed without 'rm -rf'	11:07
moncrey	so i tried git rebase [parentSHA] -p and that worked, so then i tried to rebase -i to fix the commit messages and it gave me the error still	11:08
	← Calrik_ left	11:08
moncrey	so i aborted	11:08
	← flavi0 left	11:10
	← scwizard left	11:11
	→ a_l_e joined	11:11
	→ zarubin joined	11:11
	← zarubin left	11:12
	→ zarubin joined	11:12
	← Internet13 left	11:13
	→ indieross joined	11:13
	→ jteneyck joined	11:14
	← dsdeiz left	11:15
	→ codeman joined	11:15
	→ tvw joined	11:15
	→ Internet13 joined	11:17
	→ phillly joined	11:18
	→ irqq joined	11:18
	← jteneyck left	11:19
	← abc123 left	11:19
	→ abc123 joined	11:20
moncrey	heyyy jast you still there	11:21
	i managed to accidentally revert my changes entirely	11:21
	→ xaa joined	11:21
moncrey	they are still there in the history i think	11:21
	i tried to revert to before a bunch of useless commits that were attempts to rebase	11:22
	and i reverted to before my work entirely	11:22
	→ samw joined	11:23
	← irc-5225225 left	11:23
jast	moncrey: git log -g <name of branch> keeps a record of everything you do, so all you have to do is figure out which point in time you want to travel back to, and reset to the corresponding commit	11:23
	→ dopey joined	11:24
	→ freimatz joined	11:24
	→ UniFreak joined	11:24
moncrey	hows this sound? git rebase i [parent comment] then delete the lines that were all mistakes	11:24
dopey	Hi, can anyone recommend the simplest windows git gui client? Ideally like a folder browser that an end user can drag/drop a single file and commit/push it?	11:24
	Have a non technical person that I need to update some files in a git repo.. being a linux/cli user, struggling to find the simplest windows gui :(	11:25
temhaa	hi again, I want to change author in origin commits. And I applied these intructions http://stackoverflow.com/questions/750172/change-the-author-of-a-commit-in-git/1320317#1320317 . my commits seems good but also It shows wrong auther.Can I delete wrong auther from logs.	11:26
	It seems same commit both by me and by wrong auther.	11:27
_ikke_	temhaa: A commit records both the author of a commit and the comitted	11:27
	→ satbyy joined	11:27
	← satbyy left	11:27
	→ satbyy joined	11:27
_ikke_	comitter*	11:27
	← Anwar left	11:27
	← samw left	11:28
	→ Anwar joined	11:28
temhaa	_ikke_: so I couldn't change author correctly, right?	11:28
_ikke_	temhaa: Yes, you can	11:29
temhaa	_ikke_: can you help me	11:29
_ikke_	Can you post a !transcript of what you already have done?	11:29
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	11:29
	→ pagios joined	11:32
pagios	hello dear community, i am having a problem where a subdirectory is not being commited and pushed to repo	11:32
	i tried git add --all ; git commit -m "push" git pull	11:33
	but the directory doesnt upload	11:33
	→ xelxebar joined	11:33
Kartagis	pagios: is it in .gitignore?	11:33
	→ HD\|Laptop joined	11:33
HD\|Laptop	Hi all	11:33
pagios	Kartagis: no i dont have that file	11:33
	← moritz left	11:34
temhaa	_ikke_: https://gist.github.com/ackepenek/733975ee7ce480013a1e	11:34
Kartagis	git commit -m "push" git pull is so wrong	11:34
HD\|Laptop	how do I absolutely reset a repository? Like, delete all untracked files, all files that are under .gitignore, all local changes	11:34
Kartagis	git commit -m "push";git push	11:34
pagios	Kartagis: how can i include that subdir	11:35
	git add --all doesnt do it	11:35
Kartagis	git add -A;git status	11:35
	→ irc-5225225 joined	11:35
Kartagis	that works?	11:35
	→ mohabaks joined	11:35
pagios	no changes added to commit	11:35
Kartagis	maybe you have git rm'd it?	11:36
	→ camason joined	11:36
moncrey	shit. i accidentally removed commits that i didnt mean to	11:36
	→ astrofog joined	11:37
pagios	Kartagis: what can i do?	11:37
camason	Hi guys. I have an issue when moving a submodule. I moved a submodule using `git mv` and it changed the details in my .gitmodules file. However, the ls	11:37
	→ EduardoMartins joined	11:37
	← Manikandan left	11:37
pagios	Kartagis: the files are there	11:37
moncrey	http://pastebin.com/mDLTv5Ey	11:37
camason	(lol ls).. however, the .git/modules/folder also changed, but .git with gitdir:/ didn't update	11:38
	so now when we deploy to servers, it can't checkout	11:38
	← Meteorhead left	11:39
	→ Manikandan joined	11:39
	← HD\|Laptop left	11:39
_ikke_	temhaa: after you rebased, a normal push is rejected	11:40
	→ Meteorhead joined	11:40
	Meteorhead → Guest95270	11:40
	← cagedwisdom left	11:40
	← Guest95270 left	11:40
	→ JeroenT joined	11:41
temhaa	_ikke_: Yes I couldn't push and I executed git pull origin master after than git push origin master I worked	11:42
	_ikke_: *it worked	11:42
_ikke_	temhaa: Now you merged your old history with your new history..	11:42
temhaa	_ikke_: yes. right. how can I fix	11:43
_ikke_	Is the pull the last change you made?	11:44
	→ moritz joined	11:44
temhaa	_ikke_: I couldnt understand, my english is not good	11:44
moncrey	i'm sorry this is awful but i'm unable to revert to a previous commit for some reason. i just deleted work accidentally. this is my current state http://pastebin.com/mDLTv5Ey	11:44
pagios	Kartagis: any iea?	11:44
_ikke_	temhaa: Is the pull the last thing you did?	11:44
	→ s8321414 joined	11:44
	→ italoacasas joined	11:45
	← linuxmint left	11:45
	→ mkoskar joined	11:45
	← lb left	11:45
temhaa	_ikke_: yes I did. my status is in "I merged your old history with your new history"	11:45
	→ Voyage joined	11:45
Voyage	HI	11:45
_ikke_	temhaa: git reset --keep HEAD@{1}	11:46
Kartagis	pagios: with git rm --cached, files are there but you are telling git not to track them	11:46
Voyage	I have branch 1 and 2. I am on 1 and also pushing it to remote branch 1. How do I shift the lastest code in 1 to 2 and then push 2 to remote 2?	11:46
Kartagis	!untrack \| pagios	11:46
gitinfo	To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging	11:46
	→ fbwnd joined	11:47
Kartagis	Voyage: git checkout 2	11:47
moncrey	can anyone give me any guidance?	11:47
_ikke_	moncrey: what are you trying to 'revert'?	11:48
Voyage	Kartagis, ok, git checkout 2 will switch me to the 2 branch. But 2 has old code. I want to shift the latest changes made in 1 to 2	11:48
temhaa	_ikke_: I changed two commit. anyway should I use git reset --keep HEAD@{1}. And is it enough?	11:48
moncrey	_ikke_ easier if i show you https://github.com/mxjxn/eris-cli/commits/develop i want to undo the most recent two commits , then squash the other three	11:48
Kartagis	Voyage: I think what you want is merge	11:49
Voyage	hm. ok. so how to do something 'merge'?	11:49
Kartagis	Voyage: to confirm, ask someone more experienced	11:49
Voyage	ok.	11:49
	Voyage waits for more experienced people	11:49
	→ linuxmint joined	11:50
_ikke_	moncrey: rebase -i c0424f9a	11:50
	moncrey: then remove the lines with the commits you want to undo	11:51
	moncrey: and select squash for all but the first commit you want to squash	11:52
moncrey	it showed me a single line, so i saved it	11:52
	and error: src refspec develop does not match any.	11:52
	error: failed to push some refs to 'https://github.com/mxjxn/eris-cli'	11:52
	_ikke_^	11:52
	← dopesong left	11:52
_ikke_	moncrey: I didn't mention anything about push	11:53
moncrey	ah. okay	11:53
	it looked successful	11:53
	well anyway push failed	11:53
	i've rebased it. it gave me one commit, but said it was combining commits	11:54
temhaa	_ikke_: you're talking about my problem or another issue*	11:54
	_ikke_: I wonder	11:54
	→ flavi0 joined	11:54
moncrey	pick ed0bd5c Fixed #291 `eris update --tool` downloads the most recent binary if go is missing.	11:54
_ikke_	temhaa: I'm now talking to moncrey	11:54
temhaa	_ikke_: ah, ok :)	11:54
moncrey	im sorry, thank you i really appreciate your help	11:54
_ikke_	temhaa: The reset is in order to undo the pull you did	11:54
temhaa	_ikke_: ok I reseted. I got back to before change to author.	11:56
	← EduardoMartins left	11:57
pagios	Kartagis: i deleted the whole folder, recopied all, git add . ; git add * ; git commit -m "ok" ; git push origin master and still that folder doesnt copy!	11:57
	→ dan2k3k4 joined	11:57
	← Chilley left	11:57
	← fbwnd left	11:58
osse	is the folder empty?	12:00
	→ mase-tech joined	12:01
temhaa	_ikke_: what should I do in next step	12:01
	← Amnesia left	12:01
pagios	www/html/config/www this is the director that is not copied	12:03
osse	is the folder empty?	12:03
pagios	no	12:03
	it has files in it but when i commit that folder is not listed	12:03
osse	does it have its own .git inside?	12:04
Voyage	Hi	12:04
	I have branch 1 and 2. I am on 1 and also pushing it to remote branch 1. How do I shift the lastest code in 1 to 2 and then push 2 to remote 2?	12:04
pagios	yes	12:04
osse	then git won't add it	12:04
pagios	osse: ok!	12:04
osse	you have to add it as a submodule	12:04
pagios	should i deleted the .git from it?	12:04
osse	up to you	12:04
	it's a separate repo with its own history	12:05
	→ reim joined	12:05
_ikke_	osse: nice find	12:05
pagios	so if i do an add again after deleting it should be fine?	12:05
osse	i think so	12:05
	← astrofog left	12:06
_ikke_	might be that you need to do a git rm --cached path/to/dir if git recorded it as a submodule	12:06
moncrey	_ikke_ who are you speaking to?	12:07
	← italoacasas left	12:07
	Voyage waits	12:08
osse	he is speaking to pagios	12:09
	← tinajohnson__ left	12:09
	→ Asenar joined	12:10
moncrey	thanks. sorry to be just another person asking for help in a busy room. im sort of at a loss as to how to proceed	12:10
	i've been reading thru man files all day	12:10
	→ dopesong joined	12:11
	→ fbwnd joined	12:11
osse	moncrey: looks like you're trying to push a branch that does not exist	12:11
	moncrey: status says you're on 'devsquash' but you're trying to push	12:11
	'develop'	12:11
	Voyage: git merge 1	12:12
	→ mellernoia-work joined	12:13
	→ italoacasas joined	12:13
moncrey	osse: develop does exist. but there maybe be some missing steps in there. this error is coming right after accidentally deleting one too many lines in interactive rebase. the commits still seem to exist on github but in my own repo they arent the same	12:14
Voyage	osse, am well, I am on branch 1 already.	12:14
	← italoacasas left	12:14
osse	Voyage: git checkout 2 && git merge 1	12:14
	→ Sceorem_ joined	12:14
Voyage	hm	12:14
	jottr_ → jottr	12:14
	→ italoacasas joined	12:14
	→ weox joined	12:14
	→ Orion3k joined	12:14
Voyage	osse, just like that? and then how to push 2 to remote 2?	12:15
	← mellernoia left	12:15
	→ jteneyck joined	12:15
osse	Voyage: git push remoteName branchName	12:15
	← italoacasas left	12:15
Voyage	osse, branch name is 2, whats remoteName?	12:16
osse	Voyage: i have no idea	12:16
	← hyphenated left	12:16
jast	if you don't know, probably "origin"	12:16
Voyage	hm	12:16
	→ italoacasas joined	12:16
osse	if that's the case then what is the name of remote 1 ?	12:16
jast	git remote -v for a list completely with URLs	12:16
	s/ly//	12:16
Voyage	thats 'remote name'? can I have multiple remote names ?	12:16
jast	sure	12:16
	man git-remote	12:16
gitinfo	the git-remote manpage is available at http://jk.gs/git-remote.html	12:16
temhaa	_ikke_: could you please look my issue	12:16
osse	moncrey: sure, develop exists on the remote, but do you have it locally? (aka. do you see it in `git branch`)	12:17
	→ mizu_no_oto joined	12:17
	← Sceorem left	12:18
moncrey	i just did git checkout origin/develop and it says detached from origin/develop	12:18
	osse	12:18
osse	that's unrelated to my question	12:18
	← italoacasas left	12:18
	← dopey left	12:18
Voyage	osse, thanks	12:19
	→ italoacasas joined	12:19
Voyage	jast, I wonder why would anyone need multiple remote names for same server and giturl	12:19
osse	they probably don't	12:19
	but you can have multiple servers and multiple giturls	12:20
	← jteneyck left	12:20
moncrey	okay osse i have the branch now.	12:20
	in git branch	12:20
Voyage	osse, 'they'? probbably dont?	12:20
	they == anyone?	12:20
osse	yes	12:20
Voyage	oh	12:20
	← clmsy left	12:22
osse	moncrey: well, that's why the push failed to begin with. but presumably you want to push the 'devsquash' branch instaed	12:22
moncrey	i was pushing that to the develop branch	12:22
	i had made a duplicate branch just in case i messed something up	12:22
osse	then you should write git push origin devsquash:develop	12:23
	← abc123 left	12:23
	→ abc123_ joined	12:24
	← GT left	12:24
	→ Kicer86 joined	12:25
	← mohabaks left	12:25
	← bannakaffalatta left	12:29
	→ mohabaks joined	12:31
	← Marqin left	12:33
	→ daito joined	12:33
	← M-ixi left	12:35
	→ presto joined	12:37
	hvoigt_ → hvoigt	12:38
	← daito left	12:38
	← Sceorem_ left	12:39
	← acetakwas left	12:39
pagios	thanks osse it works	12:39
	→ acetakwas joined	12:39
	→ Jusle joined	12:44
	← JeroenT left	12:45
	→ sdothum joined	12:45
	← a_l_e left	12:46
temhaa	_ikke_: are you there?	12:46
	→ Sceorem_ joined	12:46
	← dopesong left	12:47
	← nnyk left	12:47
	→ JeroenT joined	12:48
	→ darkbit joined	12:49
	← camason left	12:50
	→ Meteorhead joined	12:51
	← UniFreak left	12:57
	← fstd left	12:59
	← mase-tech left	12:59
	→ fstd joined	12:59
moncrey	is anyone still around who might be able to help? I'm still trying at this on repeat.	13:00
	trying to rebase / squash	13:00
	← Atm0spher1c left	13:01
moncrey	osse?	13:01
	→ toogley joined	13:01
osse	i don't know what's left. did git push origin devsquash:develop not work ?	13:02
moncrey	no it didnt work.	13:03
osse	what happened	13:03
moncrey	Updates were rejected because a pushed branch tip is behind its remote	13:03
	but the thing is, i am trying to revert and rebase	13:03
osse	you have rewritten history. it's common then to have to use --force	13:03
moncrey	aha okay thanks i will try that	13:03
	excellent.	13:04
	→ clmsy joined	13:04
osse	moncrey: but you're happy with how the devsquash branch looks right?	13:04
	you want the develop branch on thr remote repo to look the same way?	13:04
moncrey	i've been happy with both branches for hours. devsquash was unneccessary at this point.	13:04
osse	oh	13:04
moncrey	been trying to fix this literally all night!	13:04
	i think its taken care of	13:04
	that was the last tip i needed.	13:05
	so thank you very much	13:05
osse	"taken care of" in the same way the mafia "takes care" of people? :O	13:05
moncrey	i took care of it...	13:05
	moncrey throws laptop off back of truck	13:05
osse	you should make the laptop take a long walk on a short pier	13:05
moncrey	give it an offer it cant refuse	13:06
	→ dopesong joined	13:06
	→ codedmart joined	13:07
moncrey	god damn it	13:07
	its still the same	13:07
	im baffled right now	13:08
osse	rekt	13:08
	→ filisko joined	13:08
osse	soo	13:08
	!lol I guess	13:09
gitinfo	A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all	13:09
osse	pastebin that, unless it contains sensitive information.	13:09
moncrey	it wasnt finished but i'm making progresss	13:09
	somehow my rebase ended up including someone elses work	13:10
	probably happened when i merged at some point	13:10
	← mizu_no_oto left	13:10
osse	would you go so far as to say that your "shit is fucked" ?	13:10
	ril → ril[away]	13:11
	ril[away] → ril	13:11
	→ Imaginativeone joined	13:11
moncrey	id go so far as to say i've proven to this company that i dont know my stuff inside and out, but god damn am i going to be persistent	13:11
osse	If the answer is anything but a clear "no" then I suggest you use the reflog to get stuff back to how it was, and then start over.	13:11
moncrey	reflog??	13:11
osse	reflog!!	13:11
	!reflog	13:11
gitinfo	The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details. WARNING: reset --hard will trash any uncommitted changes! Visualize with: gitk --all --date-order `git log -g --pretty=%H`	13:12
osse	basically, unrelated to the commit log itself, it's a log of where branches "used to be"	13:12
	← leonarth left	13:13
osse	I don't know exactly what you've done and to which branches you've done it, so I can't really help with specifics	13:13
	but I can be a spirtual guidance in these troubling times	13:13
	← italoacasas left	13:15
osse	... unless you start over, that is	13:16
	→ jomofcw joined	13:17
jomofcw	Hello !	13:17
osse	World !	13:18
jomofcw	... easy one :P.	13:18
	→ sgambino joined	13:18
jomofcw	Is that possible that a pull erase the modification done on the master or will it list conflict ?	13:18
moncrey	got it thankkkk FSM in the skyyyyyyy	13:19
	also thank you osse	13:19
	→ MoSal joined	13:19
moncrey	what a fucking mess that was!	13:19
	→ LBV_User joined	13:19
osse	♫ ♪ The wheel in the sky keeps on turning ♪	13:19
	← wethu left	13:19
moncrey	it was like a chef telling an orangutan to serve pasta to the patrons	13:20
	i didnt even fucking KNOW about serving spoons	13:20
	theres pasta everywhere	13:20
	and that guy over there didnt even ORDER pasta	13:20
	→ marscher joined	13:20
	→ nonconvergent joined	13:20
osse	jomofcw: if modifications have been done on master after the branch was created then no it's not possible. It will result in a conflict	13:20
	← Biopandemic2 left	13:20
MoSal	Is there a way to specify the first commit after a certain tag?	13:21
	→ wethu joined	13:23
	→ rwb joined	13:23
	→ nnyk_ joined	13:24
osse	MoSal: in general, no.	13:24
MoSal	osse: Okay. thanks/	13:24
osse	MoSal: you would have to search for the commit that has the tag as parent	13:24
	← moncrey left	13:25
osse	MoSal: and in prinicple it can be more than one. Though in practive the answer is probably this one: git rev-list tag..master \| tail -1	13:25
	or something to that effect	13:26
temhaa	how can I change author with history	13:26
	I want to change author last 2 commit	13:26
j416	temhaa: man git-filter-branch check for env-filter GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL	13:26
gitinfo	temhaa: the git-filter-branch manpage is available at http://jk.gs/git-filter-branch.html	13:26
j416	temhaa: you might find rebase easier, rebase on the commit before those two, edit both, 'git commit --amend --reset-author' on each	13:27
MoSal	osse: yeah. I just wanted to make sure there was no syntax for it like ~-1 ^-1 ..etc	13:27
j416	(after setting your author info to the correct one)	13:27
	→ bbbthunda joined	13:27
	→ EduardoMartins joined	13:28
temhaa	j416: Yes I tired rebase. I applied these intructions http://stackoverflow.com/questions/750172/change-the-author-of-a-commit-in-git/1320317#1320317 . my commits seems good but also It shows wrong auther.Can I delete wrong auther from logs. It seems same commit both by me and by wrong auther.	13:29
	j416: my status in now: "I merged your old history with your new history"	13:30
	→ mezod joined	13:30
temhaa	j416: sorry, I merged my old history with my new history	13:30
j416	not sure what you're doing	13:30
	you can change the author using any of the above two methods i suggested	13:31
temhaa	j416: I want to change author of last 2 commit	13:31
j416	I know that.	13:31
temhaa	j416: I think --amend doesnt work for me without using rebase.	13:31
	j416: so I used rebase for this. and after than I used git --amend	13:32
	→ moncrey joined	13:32
	→ imack joined	13:32
	← phillly left	13:33
temhaa	j416: but I chouldnt push beacuse. It forced me to pull. I pulled once and I pushed to origin.	13:33
	← mohabaks left	13:33
	← cyan__ left	13:33
	→ cyan__ joined	13:33
temhaa	j416: but in now, It is keeeping both old history(wrong author) and new history(new author) for two commits	13:33
	→ junw_ joined	13:34
	→ daito joined	13:34
mzmz	apologies if this is a silly question... what is a sane way to deal with files you still wanna be able to somehow access later if they ever prove to be needed, but don't need right now in the project, in fact the chances of them being useful again are pretty slim BUT like I said still want the option of getting them back/be greppable	13:35
	← EduardoMartins left	13:35
temhaa	j416: nevermind, I hava new question. You suggested git-filter branch. If I use that	13:35
mzmz	tl;dr - compulsive hoarding 101	13:35
temhaa	j416: will wrong author remove from history?	13:35
mzmz	let me rephrase this, is git-rm the way to go for "I don't need this, probably NEVER will, but if I do I will be able to get it back"	13:36
	← imack left	13:37
ToxicFrog	mzmz: git rm removes something from the next commit (and, depending on the arguments, from the working copy). It doesn't retroactively delete it from history, so you can get it back if needed with git checkout.	13:37
	← ril left	13:37
j416	temhaa: yes.	13:37
ToxicFrog	(if you did want to retroactively delete something from history, you'd use git filter-branch, probably(	13:37
	→ mohabaks joined	13:38
	← daito left	13:39
	→ mizu_no_oto joined	13:39
	→ imack joined	13:39
	→ hyperair joined	13:39
	→ Dougie187 joined	13:40
	← aleksandar2810 left	13:40
	← moncrey left	13:41
mzmz	ToxicFrog: so in other words I can safely git rm anything I will probably never need ever again with the blissful awareness that if the someone (including me) is going to complain about those file missing I can "undelete" them?	13:41
	→ UniFreak joined	13:42
	← imack left	13:42
	→ imack joined	13:42
ToxicFrog	mzmz: yes. (If they were previously committed at some point, but if they weren't "git rm" will refuse to touch them)	13:43
	← mizu_no_oto left	13:43
	← imack left	13:43
mzmz	ToxicFrog: I know that much, thank you	13:43
	→ Rakkan joined	13:43
	→ imack joined	13:43
	→ Noldorin joined	13:44
mzmz	(I mean, that they have to have been commited at some point in order to be "revived")	13:44
	*had	13:44
ToxicFrog	mzmz: there are relatively few commands that can edit history -- git rebase, git filter-branch, and git commit --amend. rm isn't one of them :)	13:44
mzmz	I mean guessed it	13:44
	ToxicFrog: I see	13:45
	→ knownasilya joined	13:45
	← s8321414 left	13:46
	← Gitzilla left	13:46
mzmz	in other words 'git rm' is relatively harmless, I can go on a removing frenzy knowing it all can be restored if anyone cares enough	13:46
	thanks	13:46
	it's time to take out some garbage	13:47
	← JeroenT left	13:48
	← MoSal left	13:50
	→ subhojit777 joined	13:50
	→ italoacasas joined	13:50
	gitinfo set mode: +v	13:52
chernjie	So I realize I tend to do a lot of "ssh+cd git-repo" a lot, and I can't seem to find a tool or convenient function for it on git or ssh	13:52
	specifically something along the lines of:	13:53
	git ssh <remote> # ssh to a git remote	13:53
	git ssh <remote> <command> # execute some command and exit	13:53
	→ Vgr joined	13:55
	← Vgr left	13:55
	→ rclanan joined	13:55
	← sangy left	13:55
	← zarubin left	13:55
	→ Vgr joined	13:55
	← Vgr left	13:55
	→ zarubin joined	13:55
	← Rakkan left	13:55
	→ JeroenT joined	13:56
	→ Vgr joined	13:56
	← Vgr left	13:56
	← subhojit777 left	13:57
	← joako left	13:57
chernjie	I wrote a tool for it https://github.com/chernjie/git-ssh feedback welcomed :)	13:58
	→ Chilley joined	13:58
	→ ash_workz joined	13:58
	→ chitopunk joined	13:59
	→ dabd joined	14:00
	→ ajue joined	14:01
	← SimonNaa left	14:01
	← ajue left	14:01
	← __builtin left	14:01
	→ yn5 joined	14:02
	→ synthroid joined	14:02
	→ joako joined	14:02
	→ Ankhers joined	14:03
	→ __builtin joined	14:03
	← skcin7 left	14:03
	→ Vgr joined	14:03
	← craigp left	14:03
	← Vgr left	14:03
	→ Bennux joined	14:03
	→ skcin7 joined	14:03
	← nickthetait left	14:04
	→ subhojit777 joined	14:05
	→ EduardoMartins joined	14:05
	→ Vgr joined	14:05
	← _noblegas left	14:06
	→ mbrzuzy joined	14:06
	← EduardoMartins left	14:07
	→ nickthetait joined	14:07
	→ zivester joined	14:07
	← Manikandan left	14:08
	→ iota_pi joined	14:08
	→ ShapeShifter499 joined	14:12
	← eijk_ left	14:12
	← nickthetait left	14:12
	→ cdg joined	14:13
	← codefo left	14:13
	→ modocache joined	14:16
	→ jteneyck joined	14:16
	← Voyage left	14:16
	← jteneyck left	14:16
	→ jteneyck joined	14:16
	← hyperair left	14:17
	→ circ-user-ohseJ joined	14:17
	→ Chill_Surf joined	14:17
	→ govg joined	14:18
	→ DeltaHea_ joined	14:18
	→ neurodrone_ joined	14:18
	← notebox left	14:19
	← herr_barium left	14:20
	← jteneyck left	14:21
	→ Manikandan joined	14:22
	→ moncrey joined	14:22
	→ diegoviola joined	14:24
	← acetakwas left	14:24
Seveas	chernjie: nifty idea. I think the implementation is a bit broken though (spaces in ssh opts will break it, the host/directory extraction could be more efficient)	14:26
	← wethu left	14:27
	→ bronson joined	14:27
	→ bongjovi joined	14:27
	← fbwnd left	14:28
	→ BeerBuddy joined	14:28
	→ cbonobo joined	14:28
	← Manikandan left	14:29
	← nettoweb left	14:30
	→ daniel_rose joined	14:30
	← pantsman_ left	14:31
	← bronson left	14:31
	← DeltaHea_ left	14:32
	→ jaafar joined	14:32
	→ bitkiller joined	14:34
	→ notebox joined	14:34
_ikke_	Does it handle url style remotes properly?	14:35
	← uranellus left	14:35
	→ uranellus joined	14:35
	→ pantsman- joined	14:36
	← mezod left	14:36
	→ AnwarS joined	14:36
	← Anwar left	14:37
	← Chilley left	14:39
	→ JeroenT_ joined	14:39
	→ fahadash joined	14:39
	← dopesong left	14:39
	← JeroenT_ left	14:40
	← cyan__ left	14:41
	→ JeroenT_ joined	14:41
	→ dopesong joined	14:41
	← Puffball_ left	14:41
	← temhaa left	14:41
	→ Puffball joined	14:41
	← JeroenT left	14:42
	← dopesong left	14:42
	→ JeroenT joined	14:42
	← JeroenT_ left	14:43
	→ zotherstupidguy joined	14:43
	→ mrcuic joined	14:44
	→ sulaiman joined	14:44
	→ alanwill joined	14:44
	← UniFreak left	14:44
	→ UniFreak joined	14:45
chernjie	Seveas: can you give some examples that I can work with?	14:46
	→ settermjd joined	14:47
chernjie	_ikke_: it supports ssh://, git+ssh:// and user@hostname formats	14:47
	→ hyperair joined	14:47
Seveas	chernjie: expect a pull request soon.	14:47
	→ goTAN joined	14:47
_ikke_	chernjie: ok, nice	14:47
	→ strype joined	14:48
	← flavi0 left	14:48
	gitinfo set mode: +v	14:48
	gitinfo set mode: +v	14:48
	gitinfo set mode: +v	14:49
	← strype left	14:49
	→ dopesong joined	14:49
	gitinfo set mode: +v	14:49
	→ mezod joined	14:50
	← subhojit777 left	14:50
mrcuic	hi, when I put files to .gitignore then I remove from the cache (git rm --cached app / webroot / *. pdf) but remain as untraked files.	14:50
	→ flavi0 joined	14:50
chernjie	Seveas: thanks! Looking forward to it	14:50
	→ aleksandar2810 joined	14:52
	→ AaronMT joined	14:52
	→ subhojit777 joined	14:54
	← moncrey left	14:56
	→ supsup joined	14:57
	→ sparetire joined	14:58
supsup	what git formating just gives you the files in the commit or do you have to pipe it?	14:58
canton7	--name-only, --name-status, etc	14:58
	see man git diff	14:58
gitinfo	the git-diff manpage is available at http://jk.gs/git-diff.html	14:58
	→ samw joined	14:59
	← alanwill left	14:59
	→ frem joined	14:59
	→ AtnevRed joined	15:00
	← dopesong left	15:00
	← rscata left	15:01
	← rchavik left	15:02
	→ CheckDavid joined	15:03
	← ShapeShifter499 left	15:03
	← a3Dman left	15:03
	← mohabaks left	15:03
	← samw left	15:04
	← jwest left	15:04
	← AtnevRed left	15:05
	→ sburgess joined	15:06
	→ craigp joined	15:06
	→ sangy joined	15:06
	→ sulky joined	15:07
	→ Gamecubic joined	15:07
	← pantsman- left	15:07
	← BeerBuddy left	15:08
	← roxlu left	15:09
	← nilg left	15:09
	→ EduardoMartins joined	15:10
	→ Sceorem joined	15:10
	→ nickthetait joined	15:11
	→ InfoTest joined	15:11
	→ Manikandan joined	15:13
	← Sceorem_ left	15:13
	→ dimi1947 joined	15:13
	← subhojit777 left	15:13
	→ HanClinto joined	15:14
	→ temhaa joined	15:17
	→ subhojit777 joined	15:17
	← powered left	15:21
	→ IrishPrime joined	15:21
	→ Gitzilla joined	15:22
	← govg left	15:22
	← EduardoMartins left	15:23
	→ mellernoia joined	15:23
	← Bennux left	15:24
	← zivester left	15:25
	→ quark1 joined	15:25
	→ melter joined	15:25
	← mellernoia-work left	15:25
	← temhaa left	15:27
	← junw_ left	15:27
	→ govg joined	15:27
	→ dopesong joined	15:28
	→ _UniFreak joined	15:28
	← subhojit777 left	15:28
	← AnwarS left	15:28
	→ temhaa joined	15:28
	← jceb left	15:28
	→ kevwil joined	15:28
	→ livingstn joined	15:30
	← UniFreak left	15:30
	← nonconvergent left	15:31
	→ Sceorem_ joined	15:33
	→ lethalspoons joined	15:33
	← lethalspoons left	15:34
	→ pantsman- joined	15:35
	→ acetakwas joined	15:35
	→ daito joined	15:35
	→ truenito joined	15:35
	← settermjd left	15:35
	← JeroenT left	15:36
	→ davidosomething joined	15:36
	← Sceorem left	15:36
	→ phaleth joined	15:36
	→ JeroenT joined	15:36
	← drodger left	15:37
	→ localuser- joined	15:38
	← nilsi left	15:38
	← skylite left	15:38
	← darkbit left	15:38
	→ nilsi joined	15:39
	← mrcuic left	15:39
	← temhaa left	15:39
	→ drodger joined	15:39
	← daito left	15:39
	← modocache left	15:40
	→ sssilver joined	15:41
	← fees left	15:41
	← reim left	15:42
	→ modocache joined	15:42
	→ fees joined	15:43
	→ SimonNa joined	15:43
	← nilsi left	15:43
	→ noyb joined	15:45
	← cryzlr left	15:46
	← dopesong left	15:46
	← GingerGeek left	15:47
	← acolson left	15:50
	← acetakwas left	15:50
	→ KnightsOfNi joined	15:52
	→ mohabaks joined	15:52
	← linuxmint left	15:52
	→ cStubing joined	15:52
	← mariuscc left	15:52
	→ dreiss joined	15:53
	← cStubing left	15:53
	→ nilg joined	15:54
	← drodger left	15:54
	→ temhaa joined	15:56
	→ treaki_ joined	15:56
	→ dmto joined	15:56
	→ mellernoia-work joined	15:57
	← thierryp left	15:57
	← DWestCoast left	15:58
	← mellernoia left	15:58
	← goTAN left	15:58
	→ DWestCoast joined	15:59
	→ kilo_bravo joined	15:59
	← diegoviola left	15:59
	→ drodger joined	16:00
	← clmsy left	16:01
	← drodger left	16:01
	→ mariuscc joined	16:01
	← Manikandan left	16:02
	→ nettoweb joined	16:02
	← blckbit10 left	16:02
	→ diegoviola joined	16:02
	relrod_ → relrod	16:02
	→ ahmedelgabri joined	16:03
	← _UniFreak left	16:03
	→ dopesong joined	16:04
ash_workz	if you do `git pull origin something` while on master, you're not pulling to master, right?	16:05
	→ moriko joined	16:05
	← jason237 left	16:05
moritz	ash_workz: you're pulling to your current branch, whatever that is	16:06
	→ bango2 joined	16:06
ToxicFrog	ash_workz: you are. See !pull4	16:06
gitinfo	ash_workz: [!fetchfour] [pre 1.8.4 only] We recommend against using 'git fetch/pull <remote> <refspec>' (i.e. with branch argument), because it doesn't update the <remote>/<branch> ref. The easy way to fetch things properly is to get everything: 'git fetch' or 'git pull' are sufficient if you have one remote; otherwise we recommend 'git fetch <remote>' (plus 'git merge <remote>/<branch>' if you wanted to pull/merge).	16:06
	→ jason237 joined	16:06
ToxicFrog	'git pull <remote>' is 'fetch updates from remote and merge into the current branch the remote branch corresponding to it'	16:06
	← dopesong left	16:07
ToxicFrog	'git pull <remote> <branch>' is 'fetch that branch from remote and then merge it into the temporary branch, whether they "match" or not, and without updating the remote-tracking branch heads	16:07
	The latter is usually not what you want.	16:07
ash_workz	ToxicFrog: so `git pull origin something` while on master is not pulling to temporary branch "something" ?	16:07
	→ blackwind_123 joined	16:07
	← sssilver left	16:07
ash_workz	ToxicFrog: Like, I did a `git fetch` and I didn't see the new branch I anticipated	16:08
	← daniel_rose left	16:08
	→ blckbit10 joined	16:09
ToxicFrog	ash_workz: "git pull origin something" fetches something to a temporary (FETCH_HEAD, IIRC) and then merges it into your currently checked out branch.	16:10
	It does not update origin/something the way "git fetch origin" or "git pull origin" would.	16:10
	← dmto left	16:11
	→ drodger joined	16:11
ash_workz	ToxicFrog: update origin/something ?	16:11
	← drodger left	16:11
ash_workz	update from* origin/something ?	16:11
	← Sceorem_ left	16:12
	→ Ahmed90 joined	16:13
	→ Sucks joined	16:13
	← lamppid left	16:13
	→ eijk_ joined	16:13
ToxicFrog	ash_workz: your local remote tracking branch	16:13
	→ tang^ joined	16:13
ash_workz	I don't understand	16:14
	further	16:14
ToxicFrog	Like, if you git clone, you have 'master' and 'origin/master'; the former is where you do work, the latter is a local copy of 'master' as it exists in the 'origin' repo	16:14
	'git fetch' updates 'origin/master'; 'git pull' updates 'origin/master' and then merges it into 'master'.	16:14
	Those '<remote name>/<branch name>' branches are called "remote tracking branches" and can be viewed with "git branch -a"	16:14
ash_workz	I don't understand how `git pull origin something` mistakenly while on master does not revert when I do `git pull origin master` ... I hope I didn't accidentally update master... I will probably have to roll that back or something	16:14
	→ herr_barium joined	16:15
ToxicFrog	I'm not sure what you mean by "does not revert" here.	16:15
ash_workz	ToxicFrog: so when you say, "origin/master" you mean, it updates the local master branch with what's on the remote as specified by origin?	16:16
	← truenito left	16:16
	→ drodger joined	16:16
	← aalawlx left	16:16
	→ truenito joined	16:16
ToxicFrog	ash_workz: when I say "origin/master", I mean exactly "the remote tracking branch for 'origin' on remote 'master' that is automatically created by clone and updated by fetch"	16:17
ash_workz	ToxicFrog: I made changes to something, pushed it, jumped on the server, and accidentally pulled something while on master instead of switching first (I thought I was supposed to switch first, but I didn't see the branch when I did `git fetch` so I thought I was wrong, but alas, I should've I guess done `git fetch something` right?) and so I thought just doing `git pull origin/master` would...	16:17
	...get master back to where it should be	16:17
	← truenito left	16:18
	← diegoviola left	16:18
ToxicFrog	Ok, let's back up a bit	16:18
	← King_Hual left	16:18
	→ King_Hual joined	16:18
	← King_Hual left	16:18
	→ King_Hual joined	16:18
ToxicFrog	First of all, if all you want to do is "get master back where it should be", and you haven't pushed it, you can just 'git reset --hard <commit to rewind to>' and you're done.	16:18
ash_workz	ToxicFrog: re: updating origin/master, that sounds unintuitive to me because how can fetching or pulling update a remote?... you're taking from that remote right? So I guess you're updating a reference to the remote?	16:19
	← TomyWork left	16:19
	← JeroenT left	16:19
ToxicFrog	ash_workz: yes. origin/master is a local branch that exactly mirrors the state of master in the remote repo 'origin' (as of last time you fetched from it)	16:19
	→ crose joined	16:19
ToxicFrog	'git fetch <remote>' just updates all of these locally-stored remote-tracking branches to match the current state of the remote.	16:20
	← King_Hual left	16:20
ToxicFrog	(things you might find helpful: git branch -a to list all branches, including remote-tracking; gitk --all to visualize all history and branches, including remote-tracking ones)	16:20
	→ King_Hual joined	16:20
	← King_Hual left	16:20
	→ King_Hual joined	16:20
	← mohabaks left	16:21
	← supsup left	16:21
ash_workz	"gitk"	16:22
	?	16:22
	→ kadoban joined	16:22
ToxicFrog	ash_workz: graphical history viewer.	16:22
	Anyways. You're correct, fetching or pulling never updates a remote. But it does (or can) update your locally stored remote-tracking branches.	16:23
	The "gotchas" with "git pull <remote> <branch>" (rather than just "git pull <remote>") are twofold:	16:23
ash_workz	ToxicFrog: okay, I really don't get this	16:23
	my local machine is on master	16:23
	it has the file in the state it should be in	16:24
	I did `git push origin master` while on that branch	16:24
ToxicFrog	- it doesn't update the remote-tracking branch, so if you try to (e.g.) "git log origin/master..master" it won't show you everything	16:24
ash_workz	jump on the server	16:24
	→ zivester joined	16:24
	→ JeroenT joined	16:25
ash_workz	`git pull origin master` while on master and it says "up-to-date" and the file has the changes I made (didn't want in master)	16:25
ToxicFrog	- it merges <remote>/<branch> into your currently checked out branch rather than the one it matches up with, so if you go "git checkout master; git pull origin totally-unsafe-experimental-stuff" you just merged totally-unsafe-experimental-stuff into master.	16:25
	→ delboy1978uk joined	16:25
delboy1978uk	how do i check one file out from a specific commit?	16:25
	→ sssilver joined	16:25
ToxicFrog	ash_workz: so, to clarify -- you have local machine, and server, and both have clones of the same repo, which is stored in some third location as a bare repo they can push to and pull from?	16:25
	I.e. "server" here is "test server" or similar, not "git server"?	16:25
	delboy1978uk: git checkout <commit> -- ,path>	16:26
	<path> rather	16:26
ash_workz	ToxicFrog: that is correct	16:26
	→ lindistock joined	16:26
delboy1978uk	cheers ToxicFrog :)	16:26
	→ acetakwas joined	16:26
ToxicFrog	ash_workz: so...you commited a file to master by mistake, and pushed that mistake? That's what you mean by "didn't want in master"?	16:26
	← italoacasas left	16:26
ash_workz	ToxicFrog: erm I pulled to master by mistake	16:27
ToxicFrog	But in both cases you already had master checked out, and it was master you were pushing to/pulling from	16:27
	So the branches all matched up	16:27
ash_workz	ToxicFrog: no locally I was on "something"	16:27
ToxicFrog	So your line that starts "`git pull origin master` while on master" should have read "git pull origin something"?	16:28
	→ xvx joined	16:28
ash_workz	oh	16:28
ToxicFrog	Because in your explanation of what you did, the only branch you ever mention is master	16:28
ash_workz	yes, I think	16:28
	lemme look	16:28
ToxicFrog	And if you don't actually know what you did, figuring out where it went wrong and how to fix it will be hard :)	16:28
	→ bronson joined	16:28
	→ Guest55 joined	16:29
ash_workz	yes, `git pull something`	16:29
ToxicFrog	...but you originally committed it to and pushed to master? Or you committed it to something locally, pushed that, and then accidentally pulled it into master on the server?	16:29
	→ scottschecter joined	16:29
	← ThomasLocke left	16:30
ash_workz	ToxicFrog: I will paste my commands	16:30
	something is "iss01" ... not that that matters, I just figured since I started out with a hypothetical I would just run with it	16:30
	← JeroenT left	16:31
	← jnavila left	16:32
	→ ascarter joined	16:32
	← mbrzuzy left	16:32
	→ reim joined	16:32
	→ bollullera joined	16:32
	→ daniel_rose joined	16:33
_ikke_	temhaa: Sorry, I had to work	16:33
	→ italoacasas joined	16:33
	← bronson left	16:33
	← Sonderblade left	16:33
	→ dopesong joined	16:33
	→ Sonderblade joined	16:34
ToxicFrog	ash_workz: that will be easier to make sense of, thanks	16:35
	← daniel_rose left	16:35
	→ lindenle joined	16:35
	← zivester left	16:36
	← acetakwas left	16:36
	→ Chilley joined	16:37
	← Alienpruts left	16:37
	→ acetakwas joined	16:37
	← dopesong left	16:38
	→ tlaxkit joined	16:38
	← localuser- left	16:38
	→ localuser- joined	16:38
	← Balliad left	16:39
	← noyb left	16:39
	← st0opkid left	16:39
	← lindenle left	16:40
	← govg left	16:40
	← acetakwas left	16:40
	→ abc123 joined	16:40
	← abc123_ left	16:40
	→ govg joined	16:41
	→ thiago joined	16:41
	→ alanwill joined	16:41
ash_workz	ToxicFrog: http://dpaste.com/3J0SBC0	16:41
	→ daniel_rose joined	16:41
	← fahadash left	16:41
	→ citizen-stig joined	16:41
	→ BillCriswell joined	16:41
	→ mbrzuzy joined	16:41
	← daniel_rose left	16:41
	← sssilver left	16:42
	→ daniel_rose joined	16:42
ash_workz	I guess origin/master thinks it's up-to-date ?	16:42
	→ mohabaks joined	16:42
	← synthroid left	16:42
	→ Manikandan joined	16:42
	← ascarter left	16:43
ToxicFrog	It is up to date, because it contains all the commits on origin/master. It just also contains iss01.	16:43
	What happened here is:	16:43
	→ TomyLobo joined	16:43
ToxicFrog	- you updated master on localmachine, so it's up to date	16:43
	- you created iss01 based on it, committed your changes, and pushed	16:43
	← sulaiman left	16:44
ToxicFrog	- then on the server, you downloaded iss01 and merged it into master	16:44
	→ acetakwas joined	16:44
	→ tyll joined	16:44
	← tyll_ left	16:44
ToxicFrog	So master on the server now contains an up to date master + your commit on iss01, so it's "up to date" because it's not missing anything, it just has extra stuff.	16:44
	More in a bit, standup meeting	16:44
	← FIQ left	16:44
	→ Es0teric joined	16:45
	→ FIQ joined	16:45
ash_workz	poop	16:46
	← joako left	16:46
	→ zivester joined	16:49
ToxicFrog	ash_workz: ok, so, to get master on the server back in sync with master on origin, that's easy	16:51
	← daniel_rose left	16:52
ToxicFrog	'git checkout master; git reset --hard origin/master'	16:52
	That resets master to exactly match origin/master, throwing away any additional commits on it	16:52
	← reim left	16:52
	→ daniel_rose joined	16:53
	→ sssilver joined	16:54
	→ jfran joined	16:54
	→ reim joined	16:54
	← blckbit10 left	16:55
	← abc123 left	16:56
	→ abc123_ joined	16:56
	← alanwill left	16:56
	← ahmedelgabri left	16:57
	→ madewokherd joined	16:57
	Thorn__ → Thorn	16:57
	→ blckbit10 joined	16:57
	← lindistock left	16:57
	→ alanwill joined	16:57
	← flexd left	16:58
	← CheckDavid left	16:59
ash_workz	ToxicFrog: ah ha!	16:59
	ToxicFrog: thanks so much	17:00
	→ flexd joined	17:00
	← gusnan left	17:00
	← {AS} left	17:01
	→ gusnan joined	17:01
	← gusnan left	17:01
	→ gusnan joined	17:01
	→ Karkus joined	17:02
	← nettoweb left	17:02
	→ BeerBuddy joined	17:02
	→ tinajohnson__ joined	17:02
	← sgambino left	17:02
	← Jellyg00se left	17:03
	← dreiss left	17:03
	← BeerBuddy left	17:03
	→ nettoweb joined	17:06
	← yn5 left	17:07
	← modocache left	17:07
	→ sgambino joined	17:08
	→ yn5 joined	17:08
	← bb010g left	17:08
ToxicFrog	ash_workz: so, breaking down what happened there -- when you did the git fetch, it pulled down the new branch as a remote-tracking branch, but didn't create a corresponding "first class" local branch	17:08
	→ petersr joined	17:09
	← petersr left	17:09
ToxicFrog	This is the default behaviour because some repos have loads of branches and you're only likely to be interested in one or two of them, so you don't want "git branch" to drop hundreds of branch names on you after a fetch	17:09
	← XVar left	17:09
ToxicFrog	"git branch -a" would have listed all branches, including remote-tracking ones, so you would have seen something like:	17:09
	* master	17:09
	origin/master	17:09
	origin/iss01	17:10
	→ XVar joined	17:10
	← reim left	17:10
	← gfixler left	17:11
ToxicFrog	And then "git checkout iss01" does the clever thing and realizes that, while you don't have "iss01", you do have "origin/iss01", so you probably want a normal local branch connected to it -- so it creates such a branch and switches to it.	17:11
	→ imachuchu joined	17:11
	← unreal left	17:11
	→ thm joined	17:12
hfp	Hi, if I remove a commit during a rebase on a branch, will that commit disapear from git or will it still be present in another branch's history that incorporates it?	17:12
	← zivester left	17:12
ToxicFrog	Instead, you did a "git pull origin iss01", which is "fetch the latest state of iss01 from origin, and then merge it into your currently checked out branch, in this case master"	17:12
ash_workz	ToxicFrog: thank you for clearing that up... I get baffled by strange behaviour with git sometimes	17:12
thm	is there a way to configure stash {pop,apply} to use --index by default?	17:12
	← alanwill left	17:12
ToxicFrog	hfp: it will be removed from the branch you are rebasing. It will not be removed from other branches that incorporate it, nor will tags pointing to it break.	17:12
	ash_workz: git pull <repo> <ref> confuses a lot of people, because it's an intuitive thing to type but it's almost never what you actually want. There's a reason we have a warning about it in the bot.	17:13
	→ alanwill joined	17:13
ash_workz	`almost never what you want` ... is there something that is "usually" what you want?	17:13
	→ terminal_echo joined	17:13
ash_workz	ToxicFrog: ^	17:14
	← bonswouar left	17:14
	→ editshare-ericf joined	17:14
hfp	ToxicFrog: Thanks	17:14
	← dan2k3k4 left	17:15
ToxicFrog	ash_workz: check out the branch you want and then "git pull" with no other arguments.	17:15
	→ sssilver_ joined	17:15
	→ modocache joined	17:16
ToxicFrog	That will (a) fetch all updates from origin, and then (b) look for the remote-tracking branch corresponding to one you have checked out, and merge it into your current branch	17:16
	← DWestCoast left	17:16
	→ tiagobarreto joined	17:16
	→ \|node joined	17:17
	← acetakwas left	17:17
ash_workz	ToxicFrog: I see	17:17
	← thiago left	17:17
ToxicFrog	Or, if it's a new branch (as in this case): git fetch (to get the branch); git checkout <branch>	17:18
	← howdoi left	17:18
	→ Anwar joined	17:18
	→ dsdeiz joined	17:19
	→ reim joined	17:19
	← sssilver left	17:19
	← jomofcw left	17:19
	← terminal_echo left	17:20
	← crose left	17:20
	← bsanford left	17:20
	→ terminal_echo joined	17:20
	← craigp left	17:21
	→ d10n-work joined	17:22
	→ junw joined	17:22
	← mbrzuzy left	17:22
	← doener left	17:23
	← nettoweb left	17:23
	→ craigp joined	17:23
	→ gfixler joined	17:23
	← temhaa left	17:24
	→ zivester joined	17:25
	→ synthroid joined	17:25
	← zotherstupidguy left	17:26
	← alanwill left	17:28
	← Manikandan left	17:28
	→ Manikandan joined	17:29
	→ alanwill joined	17:29
	→ d4rklit3 joined	17:30
	← kevwil left	17:31
	← daniel_rose left	17:31
	← jottr left	17:32
	→ kevwil joined	17:32
	→ durham joined	17:32
	← delboy1978uk left	17:32
	→ triuba joined	17:32
	→ diegoviola joined	17:32
	← herr_barium left	17:32
	← kurkale6ka left	17:33
	→ bsanford joined	17:33
	→ crose joined	17:33
	→ mbrzuzy joined	17:33
	← alanwill left	17:33
	→ {AS} joined	17:34
	→ yqt joined	17:34
	← raghu left	17:34
	→ daito joined	17:36
	← flavi0 left	17:36
	← jjttjj left	17:38
	→ jor_ joined	17:39
	← daito left	17:40
	jor_ → jor	17:40
	→ NimeshNeema joined	17:42
	← avgn5 left	17:43
	← freimatz left	17:43
	→ avgn5 joined	17:43
	← craigp left	17:43
	← junw left	17:43
	← liamonade left	17:44
	← aleksandar2810 left	17:44
	← indieross left	17:44
	← mischat left	17:44
	← modocache left	17:44
	← quark1 left	17:45
	→ modocache joined	17:45
	→ craigp joined	17:45
	← David1977 left	17:46
	→ sulaiman joined	17:46
	← mostlybadfly left	17:47
	→ francjay_ joined	17:48
	→ espindola joined	17:48
sangy	Hello, I'm reading the git fetch manpage and I don't see an atomic fetch option. Is that a thing? (2.7.0)	17:48
	← jfran left	17:50
ojacobson	define atomic	17:51
	← yn5 left	17:51
sangy	all refs are fetched successfully or none are updated (e.g., if the connection drops), or if someone pushes in between	17:52
	→ nettoweb joined	17:52
sangy	similar to what atomic pushes provide	17:52
ojacobson	Ah, no, not reasonably possible given how Git stores refs. However, if the connection drops, _no_ refs will be updated.	17:52
	Similarly, pushes that start after a fetch finishes negotiation will have no effect on the fetch	17:52
	← zeroed left	17:52
ojacobson	(fetch transfers objects first in one large batch, then updates refs afterwards.)	17:53
	→ zotherstupidguy joined	17:53
	→ ril joined	17:53
sangy	ojacobson: thanks! Is there a place I can find low-level details about the protocol? I think the book doesn't dig too deep into this does it?	17:53
	← sfz- left	17:54
	→ jjttjj joined	17:54
ojacobson	https://git-scm.com/book/en/v2/Git-Internals-Transfer-Protocols and ftp://www.kernel.org/pub/software/scm/git/docs/v1.7.2.5/technical/pack-protocol.txt	17:54
	There's probably a more-recent version of that 2nd link, but the fundamentals haven't changed much	17:54
	→ mostlybadfly joined	17:54
	→ dopesong joined	17:54
	→ zeroed joined	17:54
	← zeroed left	17:54
	→ zeroed joined	17:54
sangy	Ok, I'll take a look. I wanted to know details about how locks are acquired/released and stuff like this.	17:55
	I already read the first link, but I might have missed details. Thanks a lot :)	17:56
	← MistahKurtz left	17:56
ojacobson	None of the locking is spelled out. You can infer the relevant properties by the order of operations, though	17:56
	→ daniel_rose joined	17:56
	← govg left	17:57
	← PaulCapestany left	17:57
	← Asenar left	17:58
	← dopesong left	17:59
	→ PaulCapestany joined	17:59
	← notebox left	18:00
	→ notebox joined	18:00
sangy	ojacobson: cool, I do like this rfc-like document. I'll dig into it. I guess the last resort is to read the source code?	18:00
	← pantsman- left	18:01
	ril → ril[away]	18:01
sangy	ojacobson: is there a module that manages this (pack protocol) or this belongs to the transport modules	18:01
	ril[away] → ril	18:01
ojacobson	it's all in git-upload-pack and git-receive-pack	18:01
	→ joako joined	18:02
	→ samw joined	18:02
	→ alanwill joined	18:03
	→ Motoko joined	18:04
	← jjttjj left	18:04
	← samw left	18:04
	→ govg joined	18:04
	← dsdeiz left	18:05
	← SimonNa left	18:05
	← dabd left	18:05
	→ subhojit777 joined	18:07
	→ StyXman joined	18:07
	← Guest55 left	18:07
	→ a-l-e joined	18:07
StyXman	I'm trying to spin off one of the directories of my project into its own repo. I cloned the original one and then git filter-branch --subdirectory-filter Elevation/ --tree-filter 'rm -fv Elevation.dgml Makefile sea.png', which does almos what I want except filtering out the files Iḿ removing. what's missing?	18:09
	← govg left	18:09
	← Es0teric left	18:10
	→ samw joined	18:11
	← heroux left	18:11
	← sburgess left	18:12
	← Sucks left	18:12
	→ Es0teric joined	18:12
	→ delboy1978uk joined	18:12
	→ Limes_ joined	18:12
	→ mizu_no_oto joined	18:12
	← dimi1947 left	18:12
	→ nour_ joined	18:12
	→ thiago joined	18:13
	← zeroed left	18:13
	← skcin7 left	18:13
kadoban	StyXman: Use 'git subtree'. That's basically exactly what it's for.	18:17
StyXman	kadoban: ok	18:17
	→ settermjd joined	18:18
	→ rossome joined	18:19
	← mariuscc left	18:19
	→ Sasazuka joined	18:19
	← karstensrage left	18:19
	→ Rakkan joined	18:20
	→ jimi_ joined	18:21
	← drodger left	18:21
	→ paddyez joined	18:22
	← paddyez left	18:22
	→ paddyez joined	18:22
	→ EvilPeng1 joined	18:24
	← alanwill left	18:25
	→ drodger joined	18:26
	← irqq left	18:27
	→ sfz- joined	18:28
	→ dopesong joined	18:28
	→ Ldip joined	18:28
	→ alanwill joined	18:28
Seveas	chernjie: https://github.com/chernjie/git-ssh/pull/1 :D	18:28
	→ bb010g joined	18:29
	→ heroux joined	18:29
	gitinfo set mode: +v	18:29
	← InfoTest left	18:30
	← nnyk_ left	18:30
	→ evil-t0by joined	18:30
	→ bronson joined	18:31
	← shinnya left	18:32
	← dopesong left	18:32
	← t0by left	18:32
	← settermjd left	18:32
	→ jjttjj joined	18:33
	← drodger left	18:33
	→ francjay__ joined	18:33
	← EvilPeng1 left	18:34
	→ dopesong joined	18:34
	→ m0viefreak joined	18:35
	→ heroux_ joined	18:35
	← francjay_ left	18:35
	→ drodger joined	18:35
	← craigp left	18:36
	← heroux left	18:36
	← bronson left	18:36
	heroux_ → heroux	18:36
	← PCatinean left	18:37
	→ arch-nemesis joined	18:37
	→ maletor_ joined	18:37
	← lucido left	18:38
	→ liamonade joined	18:39
	← Chilley left	18:40
	← thomas left	18:40
	← liamonade left	18:40
	← polyzen left	18:40
	→ skcin7 joined	18:41
	← chll left	18:41
	← shymega left	18:41
	← notebox left	18:42
	← marscher left	18:43
	← drodger left	18:43
	→ drodger joined	18:44
qsx	Seveas: lol.	18:44
	→ jellytux joined	18:46
jellytux	Hi, I forgot to add some files to my commit	18:46
	→ ajf- joined	18:46
	→ liamonade joined	18:46
jellytux	or rather	18:46
	→ shymega joined	18:46
jellytux	I want to add some files to the merge	18:46
	`the merge commit`	18:47
	← blckbit10 left	18:47
jellytux	how can I do this?	18:47
grawity	you can commit --amend	18:47
ojacobson	does amend still flatten merge commits? I know it used to.	18:47
	← ajf- left	18:47
grawity	no, it definitely doesn't	18:47
	→ blckbit10 joined	18:47
	→ ajf- joined	18:48
	← ajf- left	18:48
	→ thomas joined	18:48
	→ dhcpfreely joined	18:49
	→ roxlu joined	18:49
jellytux	grawity: oh, so if I `git add somefile.txt` after the merge and then do `git commit --amend` it will add the file to the previous commit?	18:49
grawity	yes	18:50
jellytux	grawity: that's awesome, thank you!	18:50
	← delboy1978uk left	18:51
_ikke_	!evil	18:53
gitinfo	[!evil_merge] What you describe _can_ be done, but results in an "evil merge": a commit that purports to be a merge, but does not actually take all changes from all sides. This violates the assumptions that tools and humans make about merges, and usually results in confusion and pain down the road.	18:53
	→ EvilPeng1 joined	18:53
	→ firstdayonthejob joined	18:53
	← nettoweb left	18:53
	← dopesong left	18:53
thm	can I somehow configure stash pop (stash apply) to use --index by default?	18:56
	← samw left	18:56
	← d4rklit3 left	18:56
ojacobson	I think my most-evil merge was an octopus merge containing conflict resolutions	18:56
	(created using git-commit-tree, because at the time git-merge refused)	18:56
	← rwb left	18:57
	← EvilPeng1 left	18:57
	← codedmart left	18:57
	→ EvilPeng1 joined	18:57
	→ victortyau joined	18:58
	← daniel_rose left	18:58
	← ril left	19:00
	← SOLDIERz left	19:00
	← modocache left	19:00
	← Karkus left	19:00
	← mohabaks left	19:01
	→ daniel_rose joined	19:01
	← Es0teric left	19:02
	← tiagobarreto left	19:02
	→ dreiss joined	19:02
	← mahendra_ left	19:03
	← Sazhen86 left	19:05
	← stamina left	19:06
	← sbasso left	19:06
	→ rwb joined	19:07
	→ ahmedelgabri joined	19:07
	→ Es0teric joined	19:07
	→ cvanball joined	19:08
	→ samw joined	19:08
	→ Guest55 joined	19:08
	→ craigp joined	19:08
	→ cagedwisdom joined	19:09
	← mbrzuzy left	19:09
	← jjttjj left	19:10
	→ kerrick joined	19:10
	→ codedmart joined	19:12
	→ DonVitoCorleone joined	19:12
kerrick	I have branch A that I pulled from upstream. Branch B has new work on it, including some work that's already on A. I want to take the state of the tree from B and use that as a new commit on A. What's a succinct way to do this?	19:13
	Rebasing B onto A doesn't work because A contains some of the changes B has, so there's a merge conflict	19:13
	Hmm looks like git reset B; git commit -am 'My message' does what I want	19:14
	→ nettoweb joined	19:14
kadoban	kerrick: If you throw out every workflow in git that involves a merge conflict, you're going to have a bad time.	19:15
kerrick	err, no, that doesn't work	19:16
	doing reset B is changing the commit history	19:16
	← jellytux left	19:17
	← thiago left	19:19
	→ thiago joined	19:19
	→ herr_barium joined	19:19
	→ nnyk_ joined	19:19
	← diegoaguilar left	19:20
	→ mbrzuzy joined	19:20
kerrick	OK, so it looks like this does what I want: git checkout B; git reset --soft A; git commit -m 'My message', git checkout A; git reset --hard <commit SHA from 'My message'>	19:20
	Is there a faster way to do this?	19:20
	→ sgen joined	19:22
	→ wethu joined	19:22
	← dreiss left	19:22
	← tlaxkit left	19:23
	← sagittarian left	19:23
	← evil-t0by left	19:23
	← bollullera left	19:24
	→ jjttjj joined	19:25
	→ Macaveli joined	19:25
	← LBV_User left	19:26
	← mellernoia-work left	19:26
	→ t0by joined	19:26
	← eka left	19:26
	→ fbwnd joined	19:27
	← drodger left	19:27
	← zivester left	19:27
	← nydel07 left	19:28
	← italoacasas left	19:28
	→ drodger joined	19:28
	→ eka joined	19:29
	→ modocache joined	19:30
	→ irqq joined	19:31
	→ diegoaguilar joined	19:32
	→ Chilley joined	19:32
	→ elastix joined	19:32
foo	I'm migrating a project from php to python (learning python day 1). I'm trying to understand workflow changes. With PHP, I've been committing in git, and pushing to main repo. Then from repo, I've been checking out to live dir when ready. I assume this same workflow in a python virtualenv is the way to go, correct? Thank you. (I realize this is part python/part git)	19:33
	← tvw left	19:33
	→ tvw joined	19:34
	→ dreiss joined	19:34
	← t0by left	19:34
	← localuser- left	19:35
	→ localuser- joined	19:35
	← cdg left	19:35
	→ nydel07 joined	19:36
	→ daito joined	19:36
soerenb	!deploy	19:36
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	19:36
	→ ril joined	19:37
	→ MarkyC_ joined	19:38
	→ Domhack joined	19:38
foo	soerenb: thanks, read that, I'm thinking this same method will work.	19:40
	← Macaveli left	19:40
	→ t0by joined	19:40
	← MarkyC left	19:40
	→ zivester joined	19:40
	← daito left	19:41
	→ fbwnnd joined	19:42
	→ radsy joined	19:44
	→ italoacasas joined	19:45
	→ jwest joined	19:46
	← subhojit777 left	19:47
	→ polyzen joined	19:47
	← drodger left	19:48
	→ drodger joined	19:50
	← t0by left	19:50
	← cvanball left	19:51
	← sanketdg left	19:52
	← EvilPeng1 left	19:54
	→ flavi0 joined	19:54
	← sgambino left	19:56
	→ EvilPeng1 joined	19:56
	→ circuitCarre joined	20:00
	← mbrzuzy left	20:00
	→ TheZeroNine joined	20:01
	← herr_barium left	20:01
	← liamonade left	20:02
	← chris2 left	20:03
	→ doener joined	20:03
	← [zarubin] left	20:03
	→ herr_barium joined	20:03
	→ hyphenated joined	20:03
	→ sgambino joined	20:03
	→ zarubin_ joined	20:03
	→ majorseitan joined	20:04
	→ jteneyck joined	20:04
	← jteneyck left	20:04
	→ jteneyck joined	20:04
	← nilg left	20:05
	← hyphenated left	20:05
	→ _noblegas joined	20:06
	← zarubin left	20:06
	← zarubin_ left	20:07
	→ zarubin joined	20:07
	→ leeN joined	20:08
Walex	suppose I am listing all commits in a repository, by hash. Usually most of the tree of each commit will be shared, as won't have been modified. Which means that I can skip looking at any tree objects that I have seen previously. But if I do that I don't see some blobs that I see if I look at evert tree object. What am I missing? I was under the impressions that if two tree nodes have the same hash, they and anything below them is identicaly	20:08
	→ MattMaker joined	20:08
	→ t4nk195 joined	20:08
ojacobson	That's correct.	20:08
	Up to collisions in SHA1, anyways, which: no	20:09
	← zarubin left	20:09
	← zivester left	20:10
	← ahmedelgabri left	20:10
	← ril left	20:10
	→ DeltaHeavy joined	20:10
	← moei left	20:11
Walex	ojacobson: gah. I then suspect a bug in GitPython's 'traverse' function... I'll double check that.	20:11
	← citizen-stig left	20:11
Walex	ojacobson: thanks for the answer BTW	20:12
ojacobson	(in fact of two objects have the same hash, _they are the same object_ -- git only stores up to one object for any given hash.)	20:12
	(So even if you did find a collision, you'd still only find one of the colliding objects in your repo)	20:12
	← bongjovi left	20:12
Walex	I am writing a simple tools that scans all commits and lists all blobs that pass an "include" test and don't pass an "exclude" test, that's the context.	20:13
	← terminal_echo left	20:13
	→ moei joined	20:13
	→ mbrzuzy joined	20:14
monokrome	Anyone know why I don't get history from another repo if I merge it into my current repo using `read-tree` with `--prefix`?	20:14
	→ ahr3n joined	20:14
monokrome	I'm trying to merge two repos and keep history	20:14
	← [Saint] left	20:14
	← elastix left	20:15
monokrome	This is what I'm running: https://gist.github.com/monokrome/33581b53fb912559b0f4	20:15
	but read-tree just pulls in "new" files	20:15
	not sure how to keep history	20:15
ojacobson	use git-merge or git-subtree here	20:15
	← FIQ left	20:15
monokrome	Oh. I was mistaken that read-tree worked like git-subtree. This article feels a bit confusing if not: http://www.git-scm.com/book/en/v1/Git-Tools-Subtree-Merging	20:16
	← Manikandan left	20:16
	→ [Saint] joined	20:17
	← rnsanchez left	20:17
	→ kitsu joined	20:17
	← jalnt left	20:18
	← MrWoohoo left	20:19
	→ ahr3n_ joined	20:19
	← herr_barium left	20:20
	→ FIQ joined	20:20
	→ herr_barium joined	20:21
	← TheZeroNine left	20:21
kitsu	Hi! How can I move some commits from master to another branch?	20:21
monokrome	ojacobson: All the docs I'm reading say to use "read-tree" to copy the history	20:21
	← marienz left	20:21
monokrome	and when I run it, I end up with a bunch of "new files" and the same filenames also "deleted"	20:22
ojacobson	git read-tree will splat out the files from one commit into the work tree and staging area	20:22
	← drodger left	20:22
ojacobson	but it won't do jack shit with the history of wherever those files came from	20:22
monokrome	got it	20:22
_ikke_	kitsu: with rebase	20:22
ojacobson	I would argue that the git book should not suggest read-tree here at all	20:22
	→ buMPnet joined	20:22
monokrome	yeah, it's confusing	20:22
	all the docs follow this method, and call it subtree - so I can't find docs on the right way	20:22
kitsu	_ikke_ ok, thanks	20:23
	→ marienz joined	20:23
	← samw left	20:23
	→ zivester joined	20:23
	← ahr3n left	20:23
	→ drodger joined	20:23
	→ jalnt joined	20:23
	malide → grammar_nazi	20:23
	→ Imek joined	20:24
	→ samw joined	20:25
	→ FireArrow133 joined	20:25
	← samw left	20:26
	grammar_nazi → malide	20:26
	← StyXman left	20:26
	← Calrik left	20:26
	→ liamonade joined	20:27
	← circuitCarre left	20:28
	← dreiss left	20:28
	← jaguarmagenta left	20:29
	→ jaguarmagenta joined	20:30
	← EvilPeng1 left	20:30
	→ dsdeiz joined	20:30
	→ uri_ joined	20:30
	← zivester left	20:31
	→ citizen-stig joined	20:31
	→ King_Hual` joined	20:31
	← alanwill left	20:32
	→ gnudon joined	20:32
Arsonide	if I want to stop tracking an old branch, but not delete it from origin, what's the command there	20:32
	I want to not have to see it locally	20:32
_ikke_	git branch -D <branchname>	20:32
	→ bronson joined	20:33
	← sgambino left	20:34
	→ w0bni joined	20:34
	← Anwar left	20:34
	← King_Hual left	20:35
w0bni	I need to create my completely own copy of a repository, without any connection to the original repo	20:35
	Is the correct way to just replace the origin with my new repo and push?	20:35
	→ samw joined	20:35
	← nour_ left	20:35
_ikke_	correct	20:36
	→ ril joined	20:36
	→ loneclock joined	20:37
	← modocache left	20:37
	← bronson left	20:38
	→ sgambino joined	20:39
	→ hyphenated joined	20:39
	→ timlegrand joined	20:39
	→ dreiss joined	20:40
	← gnudon left	20:40
	gitinfo set mode: +v	20:40
timlegrand	Hello, is there Git developers here?	20:40
	→ modocache joined	20:40
loneclock	Hello, I'm new to programming and trying to get everything set up properly. I'm using Codeblocks IDE and I have downloaded Git Bash for windows. I made a folder with my codeblocks files, I used the git init command and I used git add on my project file (.cbp) file....I'm still wondering about the process for all this and the best way to set it up...I also made a Github account hopefully I can get that set up too	20:41
	← \|node left	20:41
timlegrand	I am looking for the answer to this question: http://article.gmane.org/gmane.comp.version-control.git/39194/match=index+lock+status	20:41
	→ sfan786 joined	20:41
	← {AS} left	20:41
timlegrand	Is it planned to prevent git from writing files when performing a simple 'git status'?	20:41
	← uri_ left	20:42
	← noteness left	20:42
	→ pikajude joined	20:42
	← yoink left	20:42
	← daniel_rose left	20:43
pikajude	i'm in the middle of an interactive rebase and i'm trying to run a test without the current commit applied	20:43
	what's the best way to do that?	20:43
	→ uri_ joined	20:43
_ikke_	git checkout HEAD^	20:43
	← drodger left	20:44
pikajude	ok cool. and how do I undo that?	20:44
_ikke_	git checkout -	20:44
	→ zeroed joined	20:44
	← localuser- left	20:44
pikajude	ok thanks _ikke_	20:44
	→ zivester joined	20:45
	→ localuser- joined	20:45
	→ drodger joined	20:45
	→ noteness joined	20:45
_ikke_	you're welcome	20:46
pikajude	ok, so I don't want to include the commit represented by HEAD. that's what rebase --skip does, right?	20:46
	→ codefo joined	20:46
_ikke_	yes	20:46
	→ mase-tech joined	20:47
	→ DarkElement joined	20:47
pikajude	ok so i skipped, then i looked at git show HEAD and the changes for the next commit are applied on top of the ones that I thought I just skipped. why are they in there?	20:48
	← nnyk_ left	20:48
	← rpdprd left	20:48
	→ rpdprd joined	20:49
pikajude	here's a gist: https://gist.github.com/pikajude/9e88211dcb83dd8bb574 diff1.diff is what i saw first, then i skipped it, now i see diff2	20:49
	→ localuser joined	20:50
	← tvw left	20:50
DarkElement	I am putting an MIT license on my github repository with the work I have done for the company I work for atm. Would it be the right format to do Copyright (c) DarkElement @ CompanyName ?	20:50
	Never mind, I have learned it is just the company name	20:51
Seveas	that depends on who holds the copyright	20:51
	e.g. at my workplace we don't use the company name when releasing software as open source	20:51
	← IrishPrime left	20:51
DarkElement	You use your own name?	20:51
Seveas	yes.	20:51
	→ t0by joined	20:52
	→ aidalgol joined	20:52
DarkElement	I am going to add a Written By X line between the c line and the rights reserved line, as a friend in another channel just advised me.	20:54
	← drodger left	20:54
DarkElement	Everyone wins, yay :D	20:54
	← localuser- left	20:54
	→ {AS} joined	20:54
	→ drodger joined	20:55
	← modocache left	20:55
aidalgol	If I have a branch 'iss42' that I have just pushed to my remote 'origin', is the command `git merge origin/iss42` any different from `git merge iss42`?	20:56
	→ modocache joined	20:56
_ikke_	No	20:57
	well	20:57
	yes	20:57
aidalgol	head explodes	20:57
DolphinDreamm	(scripting) is there a way to get the local branches without the extra characters shwoing the current branch ?	20:57
	← fbwnd left	20:57
_ikke_	git for-each-ref --format="%(refname:short)" refs/heads	20:58
DolphinDreamm	ah.. i remember that. thx	20:58
_ikke_	managed to get it right from the top of my head	20:58
	:P	20:59
DolphinDreamm	right :) on	20:59
	→ cdg joined	20:59
aidalgol	_ikke_: I've read the "Remote Branches" (sub)chapter in the Git Book, and it doesn't appear to answer this.	20:59
	→ daniel_rose joined	20:59
	→ skcin7_ joined	21:00
	← kevwil left	21:00
	← _rgn left	21:00
	← kerrick left	21:01
_ikke_	aidalgol: I think the difference is minute	21:01
	→ kerrick joined	21:01
_ikke_	The actual merge is the same	21:01
aidalgol	Also, lemme check that I have the terminology right: origin/iss42 is a "remote-tracking branch", correct?	21:01
	_ikke_: OK, good.	21:01
_ikke_	aidalgol: that's correct	21:01
	→ _rgn joined	21:02
	← _rgn left	21:02
	→ _rgn joined	21:02
	← skcin7 left	21:02
aidalgol	So what is the term for the local branch 'iss42' that is tied to the remote-tracking branch?	21:02
	← DarkElement left	21:02
_ikke_	Just branch or local branch	21:02
	It has no separate name	21:03
	← a-l-e left	21:03
aidalgol	So how is it tied to the remote branch?	21:03
	← zivester left	21:03
	← kerrick left	21:04
Seveas	with a piece of string	21:04
	→ kerrick joined	21:04
_ikke_	:D	21:04
	← daniel_rose left	21:04
_ikke_	2 pieces actually :P	21:04
aidalgol	No duct tape and chewing gum?	21:04
	← kitsu left	21:04
	← rclanan left	21:05
Seveas	aidalgol: cat .git/config	21:05
	the config tells git that 'iss42' is related to 'origin/iss42'	21:05
aidalgol	Oh, I see.	21:06
	← kerrick left	21:07
aidalgol	For some reason, I thought it didn't have to keep an entry for each branch.	21:07
	← mbrzuzy left	21:07
	← codefo left	21:07
_ikke_	How else would it know?	21:07
	local branch a can track remote branch b	21:08
aidalgol	black magic? :P	21:08
	grumble	21:08
_ikke_	they don't have to have the same name	21:08
	← phaleth left	21:08
	aidalgol wishes git gui's didn't pollute .git/config	21:08
	← mzmz left	21:09
	← modocache left	21:09
	← flavi0 left	21:09
	→ paul424 joined	21:09
	→ flavi0 joined	21:09
	→ aranea joined	21:10
	← nickthetait left	21:10
	← Domhack left	21:10
	→ nickthetait joined	21:10
	← samw left	21:10
	← toogley left	21:10
	← nickthetait left	21:11
aidalgol	Some of my coworkers seem to think that `git merge origin/somebranch` is more correct than `git merge somebranch` (at least for our workflow). I'm not sure where they get this from. Any ideas on how such a misunderstanding may come about?	21:11
	→ zivester joined	21:11
monokrome	tmux at -d	21:12
	oops	21:12
	→ jellytux joined	21:13
jellytux	Hi, is the git tag referencing the commit? So even if I am amending I don't have to worry about recreating the tag file, right?	21:14
	→ modocache joined	21:14
	→ ferr joined	21:14
jellytux	"A lightweight tag is very much like a branch that doesn’t change – it’s just a pointer to a specific commit."	21:15
	so I take it, that it references it by ID	21:15
_ikke_	yes	21:15
	so if you ammend it, the tag will still point to the old commit	21:15
	← herr_barium left	21:17
	→ kerrick joined	21:17
	→ codefo joined	21:17
	→ zivester_ joined	21:17
	← zivester left	21:18
	→ localuser- joined	21:18
	→ strayPuppy joined	21:18
	← tinajohnson__ left	21:19
	← skcin7_ left	21:19
	→ nickthetait joined	21:19
	→ kitsu joined	21:20
	← MarkyC_ left	21:20
jellytux	_ikke_: thanks as always	21:20
aidalgol	Fast-forward merges don't create a "merge" commit, correct?	21:21
jellytux	_ikke_: do you have a dotfiles repo? If you do, how do you deal when sharing it through multiple devices? Right now I have a branch for each device	21:21
	← Noldorin left	21:21
_ikke_	aidalgol: correct	21:21
	← irqq left	21:21
aidalgol	Yay, I got something right! \o/	21:21
_ikke_	jellytux: I do have one, though, I haven't updated it in ages	21:21
	← crose left	21:22
	← jokajak left	21:22
meejah	jellytux: i have one, and have per-host customizations in ~/dot-files/bash/post-<hash of hostname>.sh	21:22
jellytux	_ikke_: I don't know if its good practice, I have accidently done somet stupid things by doing this, but I have the cloned version in ~	21:22
	→ jokajak joined	21:22
jellytux	_ikke_: so whenever I make a change I just commit straight from ~	21:22
	← NimeshNeema left	21:22
_ikke_	I use symlinks in my homedir to the repo	21:23
Soni	can git do empty commits?	21:23
	← localuser left	21:23
_ikke_	yes	21:23
jellytux	symlinks are much better	21:23
	thanks for the tip	21:23
Soni	like, can I make a commit without changes, just a commit message?	21:23
meejah	Soni: I think it's "git commit --allow-empty"	21:24
_ikke_	meejah: correct	21:24
	← Shentino left	21:25
	→ Shentino2 joined	21:25
Soni	cool	21:25
	← Shentino2 left	21:25
	→ Shentino joined	21:25
Soni	so if I disallow force-push and abuse branches I can have a git-powered issue tracker	21:25
ojacobson	you have invented: bugs-everywhere	21:26
	→ fbwnd joined	21:26
	→ alanwill joined	21:27
	→ daniel_rose joined	21:27
	← rwb left	21:27
Soni	I can also store git patches on the branch for pull requests (and only allow "allowed users" to push commits that change them, while allowing everyone to push empty commits - again no force-push)	21:28
	← bb010g left	21:28
Soni	I could also call it "AbusiveTracker"?	21:29
	so what do I need to write this?	21:29
	← t4nk195 left	21:30
aidalgol	ugh, Git For Windows and MSYS2 Git have different ideas on line endings...	21:30
	→ samw joined	21:31
	← zivester_ left	21:31
	← diegoviola left	21:32
	→ zivester joined	21:32
	→ chris2 joined	21:32
aidalgol	Git on Windows is a misery...	21:32
	← daniel_rose left	21:33
	→ elastix joined	21:33
aidalgol	of course, Windows itself is a misery...	21:33
	← codefo left	21:34
	← blckbit10 left	21:34
	→ localuser joined	21:34
	← timlegrand left	21:35
	← samw left	21:36
	→ daito joined	21:37
	→ namikr joined	21:37
	← localuser- left	21:39
	← zivester left	21:40
	← ahr3n_ left	21:40
	→ samw joined	21:41
	← daito left	21:41
	→ blckbit10 joined	21:42
	→ localuser- joined	21:42
	← FunkyELF left	21:44
	← jjttjj left	21:45
	← localuser left	21:47
	→ jjttjj joined	21:48
	← drodger left	21:49
jellytux	aidalgol: not according to #chat room :(	21:49
	← slick left	21:49
	← wanderer left	21:50
jellytux	according to them windows can do everything *nix can do and more :/	21:50
	off-topic, gotta go bye	21:50
	← jellytux left	21:50
	← rubber-soul left	21:51
	← synthroid left	21:51
	← blckbit10 left	21:52
	← sulaiman left	21:52
	→ blckbit10 joined	21:53
	← modocache left	21:53
	← jimi_ left	21:53
	→ drodger joined	21:55
	→ droid909 joined	21:56
	→ modocache joined	21:57
	← namikr left	21:57
	← liamonade left	21:57
droid909	i have this message Your branch and 'origin/master' have diverged	21:57
	→ slick joined	21:57
droid909	and have 2 and 6 different commits each, respectively.	21:58
	how do i see the difference before pulling?	21:58
	→ wanderer joined	21:58
	wanderer → Guest56913	21:58
	→ uber joined	21:59
	← grawity left	22:00
	← jeffreylevesque left	22:00
	← sfan786 left	22:01
	→ cyan__ joined	22:01
	→ grawity joined	22:02
	→ skcin7 joined	22:02
	← blackwind_123 left	22:03
	→ rclanan joined	22:03
	← victortyau left	22:04
	← JanC left	22:05
	← MattMaker left	22:06
Soni	what's a minimal self-hosted git service with a permission system?	22:06
	← Gamecubic left	22:06
moritz	Soni: gitolite	22:06
	← strayPuppy left	22:06
preaction	ssh	22:07
_ikke_	a filesystem	22:07
	← rclanan left	22:08
Soni	moritz, can I let anyone push empty commits and create branches, but disallow rewriting history and deleting branches and stuff?	22:08
_ikke_	Soni: gitolite can do that	22:08
	← ferr left	22:08
droid909	guys, the master has changed, how can i see what's changed before pulling? using cli tuls?	22:09
	tools	22:09
	← yohnnyjoe left	22:09
_ikke_	git fetch	22:09
Soni	ugh the website ;_;	22:09
_ikke_	git log ..@{u}	22:09
	Soni: it's functional	22:09
	it's not a shiny silicon valey startup	22:09
Soni	_ikke_, what about lua.org? is it functional? because lua.org looks better than the gitolite website	22:10
droid909	_ikke_: what does log..@{u} do?	22:10
Soni	(sorry I'm a bit excited)	22:10
droid909	Soni: i vote for gitolite	22:11
	Soni: try both and see	22:11
_ikke_	Soni: it's in the same ballpark	22:11
	← drodger left	22:11
	← rook2pawn left	22:11
	→ rook2pawn joined	22:11
_ikke_	droid909: the space is not optional	22:11
	it shows you the commits that are in the upstream branch, but not in your local branch	22:12
	"git log ..@{u}"	22:12
rook2pawn	is there a standard thing to identify when a commit is part of a branch? its evident to obtain the branchtip commit from the branchname, but what about earlier commits?	22:12
droid909	_ikke_: thank you	22:12
	→ diegoviola joined	22:12
	← imack left	22:12
_ikke_	rook2pawn: What is it that you are asking?	22:12
	→ lindenle joined	22:12
_ikke_	Do you want git to tell you, or do you want something else?	22:13
	→ MattMaker joined	22:13
	← pasky left	22:13
rook2pawn	when i say git branch foo; git checkout foo; git add bar.txt ; git commit; at this point this commit is deirectly identified by foo	22:13
	← jjttjj left	22:13
rook2pawn	but if i do a second commit, it's somewhat lost that the previous commit was the first commit at the point of the branch	22:14
_ikke_	a commit does not store which branch in belong(s\|ed) to	22:15
	s/in/it	22:15
	→ daniel_rose joined	22:15
rook2pawn	what im asking is if there is an existing git paradigm that tracks this	22:15
	ok	22:15
	← LucaTM left	22:15
_ikke_	Offically, it belongs to a branch when it's reachable from that branch	22:16
	→ lindenle_ joined	22:16
_ikke_	that means the root commit belongs to all branches (ignoring multiple roots)	22:16
	← kitsu left	22:16
Walex	let's ask again: support a 'tree' object has the same hash as another 'tree' object: oes that means that ll subobjects (trees and blobs) also have the same hashes, recursively?	22:16
	← mizu_no_oto left	22:16
_ikke_	yes	22:16
	← lindenle left	22:17
	→ drodger joined	22:17
_ikke_	It's a so called merkle tree	22:17
Walex	because my understanding is that a 'tree' object is a manifest of all the hashes od the subobjects...	22:17
droid909	how can i "save" current local git state, do git pull, and revert back to the state if i didn't like what git pull did?	22:17
	← ash_workz left	22:17
Walex	_ikke_: thanks again...	22:17
_ikke_	droid909: git pull does 2 things: git fetch + git merge	22:18
	droid909: git fetch is not (easily) undoable	22:18
	the merge is	22:18
rook2pawn	_ikke_: Ah, thanks.	22:18
	← paul424 left	22:18
	→ tvw joined	22:19
_ikke_	rook2pawn: What most people consider a branch is when you exclude the commits reachable from some other main branch	22:19
	← elastix left	22:19
	← mezod left	22:19
_ikke_	git log master..dev shows all commits only reachable by dev, not by master	22:19
	it's the same as git log ^master dev	22:19
	← daniel_rose left	22:19
	← lindenle_ left	22:20
_ikke_	show all commits from dev, but exclude commits reachable from master	22:20
Walex	vim	22:20
	oops	22:20
	→ JanC joined	22:20
_ikke_	VIM - Vi IMproved	22:20
	← HanClinto left	22:20
_ikke_	version 7.4.1089	22:20
	→ borodin joined	22:20
_ikke_	by Bram Moolenaar et al.	22:20
	Vim is open source and freely distributable	22:21
	:P	22:21
	→ yohnnyjoe joined	22:21
	→ lindenle joined	22:21
	← drodger left	22:21
Walex	:-)	22:21
borodin	I'm having trouble getting git push to work from a non-interactive process. I have a job in Jenkins which I do git clone, then edit some stuff, then git add, git commit git push origin master. I see this error:	22:22
	← apotry left	22:22
borodin	fatal: could not read Username for "my-server-url" no such device or address	22:22
	→ drodger joined	22:22
borodin	So, it can git clone but it can't git push	22:22
	I have checked in the jenkins workspace and I see in the workspace dir there is .git and the project name	22:23
	the .git there contains config with remote "origin" and branch "master" but it has no username info in it	22:24
	← lindenle left	22:24
_ikke_	borodin: do you use git credential helpers?	22:24
	← Imek left	22:25
borodin	there's also a .git dir within the project - it also has no username info	22:25
	I don't know what a credential helper is	22:25
_ikke_	man gitcredentials	22:25
gitinfo	the gitcredentials manpage is available at http://jk.gs/gitcredentials.html	22:25
	→ lindenle joined	22:26
borodin	do I need to use this?	22:27
	→ kevwil joined	22:27
borodin	on my mac I can git push without entering a password - does that mean I use gitcredentials?	22:27
	→ pasky joined	22:27
	→ codefo joined	22:28
	← lindenle left	22:30
	→ ferr joined	22:30
	← __main__ left	22:31
	← jteneyck left	22:31
	← modocache left	22:31
	→ lindenle joined	22:31
	→ __main__ joined	22:32
	← citizen-stig left	22:32
	← soerenb left	22:33
	→ paul424 joined	22:33
	→ soerenb joined	22:33
	→ modocache joined	22:33
DeltaHeavy	borodin It means you use Public/Private Keys via for SSH authentication.	22:33
_ikke_	No, was just wondering	22:33
	← drodger left	22:34
_ikke_	It's the closest thing I could think of that would give this kind of error message	22:34
	← __main__ left	22:34
DeltaHeavy	Not so sure what gitcredentials is. Wouldn't be surprised if it just abstracts that process and/or isolates those keys specifically for git.	22:34
	→ MrWoohoo joined	22:35
	→ __main__ joined	22:35
	→ bronson joined	22:35
	← zeroed left	22:35
	← lindenle left	22:35
	← livingstn left	22:35
	← eka left	22:35
	→ eka joined	22:36
	→ lindenle joined	22:36
	→ namikr joined	22:38
	← Jackneill left	22:39
	→ localuser joined	22:40
	→ EvilPeng1 joined	22:40
	← bronson left	22:40
	→ drodger joined	22:40
	← namikr left	22:41
	→ namikr joined	22:41
	← majorseitan left	22:41
	→ faux___ joined	22:42
Seveas	borodin: it may mean you use gitcredentials.	22:43
	borodin: git remote -vv	22:43
	if it shows ssh urls, you'll be using keys. Otherwise it's a credential helper indeed	22:43
	← localuser- left	22:43
	← namikr left	22:44
faux___	gitflow question - does one tag the release/* branch or the master branch after merging a release/* branch? according to the gitflow blog post, http://nvie.com/posts/a-successful-git-branching-model/, you tag the master branch. but then, even after merging the release branch into develop, the `git describe` output for develop won't have the latest tag, and that's confusing. any thoughts? thanks	22:44
	← lindenle left	22:46
	← Dougie187 left	22:47
	→ lindenle joined	22:47
	← modocache left	22:47
	← borodin left	22:47
	→ herr_barium joined	22:47
davidosomething	borodin -- is the job configured with a user.name and user.email	22:49
	the system user the job runs under that is	22:49
	e.g. if the job is running as the root user (bad idea) then the when the root user types `git config --get user.name` it should return some name	22:50
	→ daniel_rose joined	22:50
	← madewokherd left	22:50
	→ mezod joined	22:51
	← mezod left	22:51
	← codeman left	22:51
	← lindenle left	22:51
	→ lindenle joined	22:52
	→ liamonade joined	22:52
	→ mezod joined	22:52
	→ modocache joined	22:53
	← fees left	22:54
	→ fahadash joined	22:54
	← daniel_rose left	22:55
	← drodger left	22:56
	← lindenle left	22:56
	← Kicer86 left	22:56
	→ drodger joined	22:57
	→ lindenle joined	22:57
	← roxlu left	22:58
	← herr_barium left	22:58
	→ jimi_ joined	22:59
	← bango2 left	23:00
	→ hobodave joined	23:00
	← blckbit10 left	23:01
	→ TalkToMe joined	23:02
Soni	can I have an empty root commit?	23:02
	→ blckbit10 joined	23:02
	← faux___ left	23:03
	→ lindenle_ joined	23:03
Seveas	yes	23:04
	← fbwnnd left	23:04
Seveas	spirit:/tmp$ git init foo	23:04
	Initialized empty Git repository in /tmp/foo/.git/	23:04
	spirit:/tmp$ git -C foo commit --allow-empty -m'Empty!'	23:04
	[master (root-commit) 75138cf] Empty!	23:04
	← fbwnd left	23:04
	← skcin7 left	23:04
	← lindenle left	23:04
	← Chilley left	23:06
	← drodger left	23:06
	← _noblegas left	23:06
	← Es0teric left	23:06
Soni	cool	23:07
	← DeltaHeavy left	23:07
Soni	now how do I make gitolite only allow empty commits?	23:07
	← aidalgol left	23:07
Seveas	that makes no sense whatsoever	23:08
bremner	use a hook.	23:08
Seveas	but you could make your update hook check that all commits point to the same tree	23:08
	→ aidalgol joined	23:08
	← sgambino left	23:11
	→ drodger joined	23:11
	← lindenle_ left	23:12
	← TalkToMe left	23:13
	← harish left	23:13
	→ lindenle joined	23:13
	→ skcin7 joined	23:14
	← fscala left	23:14
	→ fscala joined	23:15
	← nettoweb left	23:15
	← liamonade left	23:16
	→ lindenle_ joined	23:17
	← lindenle left	23:17
	→ liamonade joined	23:17
	← modocache left	23:20
	← hobodave left	23:20
	→ modocache joined	23:20
	→ lindenle joined	23:21
	← circ-user-ohseJ left	23:21
	← King_Hual` left	23:21
	← lindenle_ left	23:21
	← {AS} left	23:21
	← mase-tech left	23:21
	← lindenle left	23:24
	→ madewokherd joined	23:25
	→ circ-user-ohseJ joined	23:25
	→ lindenle joined	23:26
	← wethu left	23:26
	← skcin7 left	23:26
	← modocache left	23:26
	← drodger left	23:28
	→ sheilong joined	23:29
	← lindenle left	23:29
	← filisko left	23:30
	→ lindenle joined	23:30
	← italoacasas left	23:31
	← jimi_ left	23:31
	← EvilPeng1 left	23:32
	→ Poppabear joined	23:32
	← Poppabear left	23:32
	→ Poppabear joined	23:32
	← paddyez left	23:33
	→ David1977\|2 joined	23:33
	David1977\|2 → David1977	23:33
	→ eijk joined	23:34
	→ drodger joined	23:34
	← lindenle left	23:34
	← BillCriswell left	23:35
	→ faux___ joined	23:35
	→ lindenle joined	23:36
	← faux___ left	23:38
	→ daito joined	23:38
	← eijk_ left	23:38
	→ EvilPeng1 joined	23:40
	← drodger left	23:40
	→ lindenle_ joined	23:40
	← lindenle left	23:41
	→ d4rklit3 joined	23:42
	← eijk left	23:42
	← daito left	23:42
	→ citizen-stig joined	23:43
	← sssilver_ left	23:43
	→ daniel_rose joined	23:44
	← uri_ left	23:45
	→ sssilver joined	23:45
	← chitopunk left	23:45
	← samw left	23:45
	→ drodger joined	23:45
	← yarnfive8 left	23:47
	→ samw joined	23:47
	← citizen-stig left	23:48
	← lindenle_ left	23:48
	→ \|node joined	23:48
	→ lindenle joined	23:49
	← editshare-ericf left	23:49
	← daniel_rose left	23:50
	← lindenle left	23:52
	→ felixn joined	23:52
	← samw left	23:52
	→ abc123 joined	23:52
	→ lindenle joined	23:53
	→ rclanan joined	23:53
	← abc123_ left	23:54
	→ herr_barium joined	23:55
	← aranea left	23:56
	→ lindenle_ joined	23:57
	← lindenle left	23:57
	← rclanan left	23:57
	← loneclock left	23:58
	← Limes_ left	23:58

Logs Search ←Prev date Next date→

Channels Documentation