IRCloggy #git 2015-09-15

Provider of IRC logs since 2005.

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

	2015-09-15
	← dadamssg left	00:00
	→ fstd joined	00:00
	→ nilg joined	00:01
	→ sim642 joined	00:02
	← fstd left	00:04
	→ affa09 joined	00:07
	→ codeurge joined	00:10
	→ ahr3n joined	00:10
	→ mac_ified joined	00:10
	← cdown left	00:10
	→ fstd joined	00:12
	← chitopunk left	00:12
	← fstd left	00:13
	→ fstd joined	00:13
	→ bilb_ono joined	00:15
bilb_ono	can someone help me with the repo I just created? I did git init and added the remote. Then I try git push -u origin --all to push up the repo and its ref for the first time	00:15
	and its says No refs in common and none specified; doing nothing.	00:16
	Perhaps you should specify a branch such as 'master'.	00:16
	← hfp left	00:16
phroa	tack a 'master' on the end of that command in place of --all	00:17
bilb_ono	then I try git push -u origin master and that doesn’t work. error: src refspec master does not match any	00:17
phroa	oh. oh well	00:17
	← s8321414 left	00:17
	← hfp_work left	00:17
	← Ingenia left	00:18
bilb_ono	what is the -u supposed to do anyways?	00:18
ojacobson	bilb_ono: does your local repo have any commits in it at all	00:18
	→ nvahalik joined	00:18
	→ causasui joined	00:18
bilb_ono	ohh. oops. I had it added but not commited	00:19
	thanks ojacobson	00:19
	← kpease_ left	00:19
	← jeffreylevesque left	00:21
	→ chrisb joined	00:21
	→ otter768 joined	00:23
	← codeurge left	00:23
	← brucelee left	00:24
	← nvahalik left	00:25
	← ASOLAr left	00:25
	← myra left	00:27
	← drewo left	00:28
	← imachuchu left	00:28
	← otter768 left	00:28
	← King_Hual_ left	00:29
	→ gambl0re joined	00:29
	← sparetire_ left	00:30
	← bernardio left	00:33
	→ bernardio joined	00:34
	→ hfp joined	00:37
	← mizu_no_oto left	00:37
	→ hfp_work joined	00:37
	→ mizu_no_oto joined	00:37
	→ otter768 joined	00:38
	→ linuxmint2 joined	00:40
	→ macabre joined	00:45
	← Steadfast left	00:45
	← chrisb left	00:46
	← mizu_no_oto left	00:48
	→ sythe joined	00:50
	→ chrisb joined	00:50
	← Ahmed90 left	00:51
	→ livingstn joined	00:52
	→ devoldmx joined	00:55
	← jzk left	00:58
	← bilb_ono left	00:59
	→ drewo joined	01:00
	← devoldmx left	01:00
	← pratikmallya left	01:01
	→ squentin joined	01:02
	→ harish_ joined	01:04
	→ AridBullet joined	01:04
	← drewo left	01:05
	→ BullHorn joined	01:07
	← Lyqyd left	01:08
	← scrubbrush left	01:08
	← BullHorn left	01:08
	→ scrubbrush joined	01:09
	← blackjid left	01:10
	→ blackjid joined	01:10
	→ BullHorn joined	01:10
	→ Steadfast joined	01:11
	← Sasazuka left	01:11
	← daivyk left	01:13
	← antiatom left	01:13
	→ javster_ joined	01:14
	→ ncthom91 joined	01:14
	→ watabou joined	01:15
	→ juvenal joined	01:16
	← javster left	01:16
	→ daito joined	01:16
	← javlens left	01:17
	← BullHorn left	01:18
	→ NeverDie joined	01:19
	← the_cybersphinx left	01:19
	→ antiatom joined	01:20
	→ the_cybersphinx joined	01:21
	← Phoenixz left	01:22
	→ jakesyl joined	01:22
	← nettoweb left	01:22
	→ ICantCook joined	01:23
ICantCook	I'm trying to learn how to do a pull request. I created a branch "cook" off of "v2.0". I have made some changes, committed and pushed "cook" to the origin server.	01:25
	now I'm planning to do: git request-pull v2.0 http://url/uri.git cook	01:26
	→ rchavik joined	01:26
ICantCook	will this create a pull request, which someone with access to v2.0 can accept?	01:26
	← chrisb left	01:26
watabou	Is this on a server like Github or Bitbucket?	01:27
ICantCook	watabou: Yeah, atlassian stash (like bitbucket)	01:27
watabou	When you pushed up your branch, Stash should have given you a link to create a pull request	01:28
	Otherwise, you will have to do it from the web-ui of Stash. (Left sidebar, click the three dots, and then click Create Pull Request)	01:28
ICantCook	yeah I saw that, and tried it	01:29
watabou	Now all you have to do is select the branch you want to merge to.	01:29
ICantCook	git pull-request v2.0 <the url stash gave me> cook	01:29
watabou	Don't use request-pull, that only generates the changes for you.	01:29
ICantCook	and got a message:	01:29
	warn: No branch of https://url	01:30
watabou	Git doesn't really have a concept of "Pull Requests". request-pull is not what you should be using in this case.	01:30
	← ssarah left	01:30
	→ keroro520 joined	01:30
	→ ssarah joined	01:30
ICantCook	oh	01:30
	so pull requests are a github/bitbucket level thing?	01:31
watabou	If you have the stash link, all you have to do is click on it	01:31
	← jakesyl left	01:31
watabou	It will automatically take you to the Stash's Create Pull Request screen	01:31
ICantCook	oh, so it does	01:31
watabou	ICantCook: Yes, they are a feature implemented by server side.	01:31
	← pks left	01:31
	→ stevenbenner joined	01:32
watabou	Well basically git servers like Stash, bitbucket and github have pull requests implemented which basically compares your branch to the branch you're trying to merge to.	01:32
	→ rubie joined	01:32
watabou	If the server doesn't implement pull requests, you have to do it manually by sending a patch file and emailing that patch file. If you're using Stash though, this is not needed.	01:33
	← macabre left	01:33
	→ pks joined	01:33
ICantCook	wow okay. Thanks for explaining, I didn't know that	01:33
	→ macabre joined	01:33
	← yqt left	01:34
ICantCook	I've just created it through the Web UI (following that link which Stash gave me)	01:34
watabou	That's what I do at work (we use Stash as well)	01:34
ICantCook	watabou: That explains why you were so familiar with the UI (Left sidebar, click the three dots)	01:35
watabou	:)	01:35
ICantCook	We're just thinking of implementing pull requests now	01:35
	experimenting	01:35
	← weox left	01:35
watabou	Yeah, we've been using PRs just recently too. We like them so far, and the code review process in general. My boss likes the fact that he can create tasks	01:36
	→ nettoweb joined	01:37
	← bollullera left	01:38
	→ darkbit joined	01:38
	← darkbit left	01:38
	→ bmilesp joined	01:38
watabou	This should help if you want more help on PRs, if you want to create them without following the link: https://confluence.atlassian.com/stash/using-pull-requests-in-stash-299570995.html	01:39
	← jonmorehouse left	01:39
	← ssarah left	01:39
	→ gopar joined	01:39
ICantCook	watabou: Thanks.	01:40
	watabou: I don't suppose you've found a Stash equivilent of gists? For sharing random snippets of code	01:40
	← m0viefreak left	01:40
	← zematis left	01:41
watabou	ICantCook: I haven't, no. Apparently Atlassian has created an equivalent for Bitbucket, so it shouldn't take them long to port it to Stash if they decide to do that.	01:41
	← msonntag left	01:42
ICantCook	watabou: Cool, that will be useful	01:43
ojacobson	watabou, ICantCook: there's also a third-party plugin for that	01:43
	which works okay	01:43
watabou	Can't use any Stash plugins due to restrictions.	01:44
ojacobson	Oh, you're using hosted	01:44
watabou	But nice to hear.	01:44
	Yep	01:44
	→ jakesyl joined	01:44
	→ Vampire0_ joined	01:44
	→ pokergod joined	01:44
ojacobson	weirdest niche product ever	01:44
	→ msonntag joined	01:44
pokergod	somehow, all my files are showing "deleted: <...>". Yet I did not issue a delete	01:44
	→ bendangelo joined	01:46
	← bitkiller left	01:46
ICantCook	ojacobson: ah, thanks for that. I'll wait and see if Atlassian port it to Stash first :)	01:47
	← Vampire0 left	01:47
pokergod	git diff shows zero changes. git checkout master tells me that I will be deleting all the files	01:48
	→ djx joined	01:48
	→ queh joined	01:49
watabou	pokergod: Maybe use `git reflog -10` to see what you did to end up in this state	01:49
	← djx left	01:49
	→ djx joined	01:49
	← queh left	01:49
	→ variable joined	01:49
pokergod	wataboiu, only adds	01:50
	the last commit mentions nothing of deleting the files	01:50
watabou	Or if you just want to clear your working directory changes, you could use `git stash` to save every change, just to be safe	01:50
	→ Goplat joined	01:51
djx	hey if I have 100 commits where each commit has a different version of a binary file and that binary file has 10Mb. Will the .git directory end up with 1Gb?	01:51
	→ peqi joined	01:51
	← peqi left	01:51
djx	s/Mb/MB and s/Gb/GB	01:52
	← d10n-work left	01:52
	→ holodoc joined	01:52
ojacobson	probably not	01:53
	(a) Git objects are individually compressed, (b) packed objects are compressed en masse, and (c) packed objects are delta-encoded against nearby candidates to reduce the pack size further	01:53
	→ Ovnny joined	01:54
ojacobson	-the largest- it'll be is a bit over 1Gb, but it's quite possible it'd be smaller	01:54
	← Ovnny left	01:54
	→ tgy joined	01:54
djx	ojacobson: hmm so a git repo that is like that is definitely a bad idea?	01:55
	← tgy left	01:55
	→ pwnz0r joined	01:55
	→ dadamssg joined	01:56
	→ Vkjss joined	01:56
	← Vkjss left	01:57
ojacobson	djx: define "bad idea"	01:57
djx	ojacobson: if it's a shared repository everytime I want to do a pull it will take a huge amount of time to resolve all deltas from the different contributors	01:58
ojacobson	Nah, just once.	01:58
	(Well, once per clone.)	01:58
djx	ojacobson: even if which commit had a different version of that binary?	01:59
	→ BullHorn joined	01:59
	← dadamssg left	02:01
	← rubie left	02:04
	→ shlant joined	02:05
	← holodoc left	02:06
shlant	hi all. I'm trying to find out all files changed in the last push. I was doing git diff --name-only $SHA1^!, but that only gives changes for the latest commit, not ALL commits in the push. Any ideas?	02:06
pokergod	Okay, need help. I had a weird situation, I stashed. It complained that I had untracked files. I committed those files, checked out master, came back to develop. I git stash branch fixit	02:07
	and now those 4-5 files that I committed on develop, are not in fixit	02:07
	how do I correct this?	02:07
shlant	pokergod: git stash apply?	02:09
ojacobson	shlant: git doesn't record pushes.	02:09
shlant	ugh	02:09
	← ncthom91 left	02:09
	← BullHorn left	02:09
shlant	ojacobson: what if I new the last commit for the previous push and the latest commit?	02:10
ojacobson	Then `git diff commit-a commit-b` as usual	02:10
pokergod	How do I take a few commits from develop and merge them into gift?	02:10
	git fix	02:10
	→ BullHorn joined	02:10
	→ jeffreylevesque joined	02:11
shlant	pokergod: git cherry-pick commit	02:11
jeffreylevesque	anyone use travis?	02:12
	← Xiti left	02:13
	← BullHorn left	02:13
preaction	i'm sure someone, somewhere does	02:13
	→ Xiti joined	02:13
pokergod	i type; git status	02:14
	and it shows deleted: <file> ... yet i never deleted the file	02:14
	the file exists	02:14
	→ jstimm joined	02:14
pokergod	why is this happening?	02:14
shlant	jeffreylevesque: naw, circleci	02:15
	→ BullHorn joined	02:15
	← BullHorn left	02:15
jeffreylevesque	can you choose the OS?	02:15
shlant	pokergod: could have happened for many reasons. Do you not want it deleted?	02:15
jeffreylevesque	travis uses ubuntu 12.04	02:15
	but i use ubuntu 14.04	02:15
preaction	jeffreylevesque: they have osx available, but no	02:15
pokergod	shlant, no i don't want these files deleted	02:16
	the whole project is going to be deleted if i merge	02:16
shlant	jeffreylevesque: no, circle uses ubuntu but I test everything in Docker anyways so host OS doesn't really matter	02:16
	→ rubie joined	02:16
shlant	pokergod: do you want it back to how it looks on origin? (github)	02:17
pokergod	shlant, the strange thing is; I type git diff, nothing has changed. git status shows all those files to be deleted	02:17
jeffreylevesque	shlant: does it have to be docker, or can it be vagrant (what i currently use)	02:17
pokergod	shlant, i have made a month worth of changes	02:17
	← mezod left	02:17
	→ BullHorn joined	02:18
shlant	jeffreylevesque: I think circle allows you to do whatever you want. They have the ability to auto-detect test frameworks, but I use a Makefile to whatever really. Depends on their restrictions on the host I guess	02:18
	ketas → ketas-	02:18
jeffreylevesque	shlant: i guess more of an opinion question - why did you choose circle over travis	02:19
shlant	pokergod: http://blog.kablamo.org/2013/12/08/git-restore/	02:19
pokergod	shlant, i am trying to see WHY it wants to delete the files that exist?	02:20
shlant	jeffreylevesque: I used circle in a previous job, they give first container (build) free (even for private repos), they were one of the few that allowed Docker at the time	02:20
	← Steadfast left	02:20
	← kadoban left	02:20
preaction	pokergod: git status has a bunch of different sections. which section is the deleted under?	02:20
	it might be best if you pastebin the entire status output somewhere	02:21
pokergod	Changes to be committed	02:21
jeffreylevesque	shlant: can i test multiple languages in circleci? I want to validate, python (with flask server script), javascript, and maybe puppet modules	02:21
preaction	pokergod: so someone ran "git rm" and left the working copy there. the section also says how to undo it	02:22
	→ ketas joined	02:22
	→ zivester joined	02:22
	→ Kallis joined	02:23
	→ sssilver joined	02:23
	← Kallis left	02:24
	→ darkbit joined	02:25
	← BullHorn left	02:25
pokergod	what I don't get is, the file says Deleted: <file> , yet i can ls that file	02:25
	does that seem right?	02:25
	← otter768 left	02:25
ojacobson	pokergod: "changes to be committed" is based on what's staged, not what's in the work tree	02:25
	presumably if the file exists in the work tree, `git status` also says that the file is "Added" in untracked changes.	02:26
	→ devoldmx joined	02:26
pokergod	http://pastebin.com/7RFL1N7H	02:27
	← rubie left	02:28
	→ skorgon joined	02:28
	← skorgon left	02:28
	→ skorgon joined	02:28
pokergod	any ideas?	02:28
	→ BullHorn joined	02:28
preaction	yes, do what it says to unstage	02:28
	← BullHorn left	02:29
	← bmilesp left	02:29
	→ bmilesp joined	02:29
	→ webguynow joined	02:29
pokergod	i am missing all my edits tho	02:30
	← devoldmx left	02:30
shlant	jeffreylevesque: are they in the same repo?	02:30
jeffreylevesque	shlant: yes sir	02:31
	← ketas- left	02:31
shlant	jeffreylevesque: uhhh I don't know but I imagine so	02:32
	→ gfixler joined	02:32
	→ toothrot joined	02:32
shlant	I think all framworks/languages are available in every container	02:33
pokergod	if git diff, shows no changes... but it wants to delete everything, then i can assume that i can drop that branch, correct?	02:33
	→ jzk joined	02:33
ojacobson	uncommitted changes are not associated with a branch	02:33
jeffreylevesque	shlant: maybe i can have a circleci, and multiple docker images, assigned to test different things: one for python, one for js, one for puppet... unless one docker image can test all of them at once?	02:33
shlant	jeffreylevesque: I image with the machine definition you could just specify multiple: https://circleci.com/docs/configuration#machine	02:34
	but again, you should ask	02:34
	← juvenal left	02:34
shlant	jeffreylevesque: that's an option	02:34
	→ juvenal joined	02:34
shlant	usually you keep docker images as one per process/language	02:34
pokergod	ojacobson, git diff shows empty. git status shows deleted: <files....> I don't know how I got to this point.	02:34
shlant	but you could if you want	02:34
pokergod	I want it to go away.	02:34
	i want my source back lol	02:34
watabou	Do you want to get rid of all the status changes?	02:36
	← nettoweb left	02:37
watabou	git reset --hard HEAD will do that (beware, this does get rid of all uncommitted changes)	02:37
pokergod	1 hour ago. Everything was working fine.	02:37
	← bendangelo left	02:37
jeffreylevesque	shlant: so the first private repo is free, any additional you pay with circleci?	02:37
shlant	1 container is free, forever.	02:38
	Additionally, projects that are public on GitHub will build with 3 extra containers -- our gift to free and open source software.	02:38
	→ bb010g joined	02:39
	gitinfo set mode: +v	02:39
	← cavallari left	02:40
	→ modocache joined	02:42
	→ holodoc joined	02:43
pokergod	is there a way to see why the file was set to be deleted?	02:45
	← webguynow left	02:45
pokergod	a log, of some sort?	02:45
	← modocache left	02:47
	→ boombatower joined	02:47
shlant	pokergod: not unless someone wrote good commit messages	02:47
	← holodoc left	02:47
preaction	pokergod: look in your shell history	02:47
	→ holodoc joined	02:48
	→ webguynow joined	02:48
	→ mezod joined	02:48
	← livingstn left	02:48
pokergod	if i do; git diff <file> and i see no changes. I can safely git reset HEAD <file>, correct?	02:49
	← shlant left	02:49
preaction	all that does is unstage the file. it doesn't change anything unless you start giving it other options	02:50
pokergod	well, git status has "untracked files:..."	02:50
	and it's listing all the files I want to be tracked. it's deleted the files, somehow.	02:50
	I don't know how.	02:50
preaction	you pasted the complete output of git status, and that didn't have any untracked files in it	02:51
	← daito left	02:52
	→ bendangelo joined	02:52
preaction	even if it does, what i said still applies: git reset <file> doesn't affect the working tree. man git-reset says so in the first example under the description	02:52
gitinfo	the git-reset manpage is available at http://jk.gs/git-reset.html	02:52
	→ MrWoohoo joined	02:53
o11c	man git-insult	02:53
pokergod	okay, i did; git checkout develop, and now i see a bunch of files that are Untracked.	02:53
	← mezod left	02:53
	→ daito joined	02:54
	← Nikhil_D left	02:55
	→ Nikhil_D joined	02:55
	→ dsdeiz joined	02:57
	← dsdeiz left	02:57
	→ dsdeiz joined	02:57
dsdeiz	hey all, any suggestions on how to auto delete a remote branch in github once a pull request has been merged?	02:57
	→ xcesariox joined	02:58
jakesyl	Hey, I'm cloning a git repository in a vagrant build and it's telling me The authenticity of host can't be established and to type yes or no. How do I make it auto default to yes in the git clone command	02:58
preaction	jakesyl: that's an ssh setting. man ssh_config	02:59
	← webguynow left	02:59
preaction	look for CheckHostIP	02:59
	→ webguynow joined	03:00
	→ mizu_no_oto joined	03:03
	← webguynow left	03:04
	→ webguynow joined	03:05
	← holodoc left	03:06
	→ holodoc joined	03:07
	← holodoc left	03:07
	→ holodoc joined	03:08
	→ Corosus joined	03:08
	→ dgutierrez1287 joined	03:09
	← waspinator left	03:10
	← Corosauce left	03:11
	→ arescorpio joined	03:11
	← robbyoconnor left	03:11
	← strayPuppy left	03:12
	← sssilver left	03:13
	← Noldorin left	03:13
	← webguynow left	03:13
	→ webguynow joined	03:14
	← sythe left	03:16
milki	dsdeiz: check the github api/webhooks to see if theres a signal you can get	03:17
	dsdeiz: also #github	03:17
	jakesyl: you can also pass in an option via -o to ignore host check	03:18
	← mellernoia left	03:18
	← darkbasic_ left	03:18
milki	hm, theres Strictsomethign and CheckHostIP	03:18
o11c	dsdeiz: I would look into manually adding the fingerprint	03:19
	er, jakesyl	03:19
	→ darkbasic joined	03:19
	→ kadoban joined	03:19
milki	thats too logical	03:19
	← jakesyl left	03:19
	← bmilesp left	03:21
	WilliamPhone → Diitto	03:22
	← webguynow left	03:25
	← ScottE left	03:25
	→ webguynow joined	03:25
	← lindenle left	03:26
	→ durham_ joined	03:27
	← ariver left	03:27
	→ devoldmx joined	03:27
	← Guest11684 left	03:27
	← clone1018 left	03:27
	← jgornick left	03:27
	← bernardio left	03:27
	← thiago_ left	03:27
	← DrNick left	03:27
	← nedbat left	03:27
	→ rubie joined	03:27
	← sjLonghorn left	03:28
	← twisted` left	03:28
	← cschneid left	03:28
	→ dreiss joined	03:28
	← Tee_Pee left	03:28
	← aseidl left	03:28
	← Klumben left	03:28
	← sadmac left	03:28
	← HedgeMage left	03:28
	← Hedgework left	03:28
	→ thiago joined	03:28
	← blackjid left	03:28
	← jrajav left	03:28
	← markelite left	03:28
	← Vorisi left	03:28
	← lacrosse left	03:28
	← tmz left	03:28
	← skorgon left	03:29
	← durham left	03:29
	← killerpty left	03:29
	← davidstrauss_ left	03:29
	← rancyd left	03:29
	← SleePy left	03:29
	← DSH105- left	03:29
	← Guest63161 left	03:29
	← milli left	03:29
	← bandroidx left	03:29
	← Bigcheese left	03:29
	→ scarabx joined	03:29
	→ Bigcheese_ joined	03:29
	← jalnt left	03:29
	→ ariver joined	03:30
	→ Tee_Pee joined	03:30
	ariver → Guest45071	03:30
	→ jgornick joined	03:30
	← toothe left	03:30
	→ Kamran joined	03:30
	→ aseidl joined	03:30
	→ ScottE joined	03:30
	→ cschneid joined	03:30
	→ Hedgework joined	03:30
	→ nedbat joined	03:30
	→ clone1018 joined	03:30
	Kamran → Guest73997	03:30
	→ bandroidx joined	03:30
	→ jrajav joined	03:30
	→ HedgeMage joined	03:31
	→ DSH105 joined	03:31
	→ iml joined	03:31
	→ SleePy joined	03:31
	→ Vorisi joined	03:31
	→ DrNick joined	03:31
	→ davidstrauss joined	03:31
	→ skorgon joined	03:31
	← skorgon left	03:31
	→ skorgon joined	03:31
	→ Klumben joined	03:31
	→ milli joined	03:31
	→ murph joined	03:31
	→ sjLonghorn joined	03:31
	← zivester left	03:31
	← devoldmx left	03:31
	murph → Guest48829	03:32
	→ lacrosse joined	03:32
	→ ironGiant joined	03:32
	→ sadmac joined	03:32
	→ markelite joined	03:33
	→ rancyd joined	03:34
	← macabre left	03:35
	→ isomorphismes joined	03:35
	← holodoc left	03:36
	→ twisted` joined	03:36
	→ tmz joined	03:37
	← toothrot left	03:38
	← daito left	03:39
	← sjLonghorn left	03:39
	← Hedgework left	03:39
	← nedbat left	03:39
	← ScottE left	03:39
	← DSH105 left	03:39
	← markelite left	03:40
	← milli left	03:40
	← cschneid left	03:40
	← Guest48829 left	03:40
	← Klumben left	03:40
	← sadmac left	03:40
	← aseidl left	03:40
	← jgornick left	03:40
	← rancyd left	03:41
	← skorgon left	03:41
	← davidstrauss left	03:41
	← Vorisi left	03:41
	← HedgeMage left	03:41
	← bandroidx left	03:41
	← Guest73997 left	03:41
	← Guest45071 left	03:41
	← DrNick left	03:41
	← sfr^ left	03:42
	← tmz left	03:42
	← rubie left	03:42
	→ Lyqyd joined	03:42
	← pwnz0r left	03:43
	← s00pcan left	03:43
	→ davidstrauss joined	03:44
	← variable left	03:44
	← sdothum left	03:44
	→ s00pcan joined	03:45
	← ICantCook left	03:46
	→ C4ta\|Work joined	03:46
	→ pratikmallya joined	03:46
	→ ScottE joined	03:46
	← ironGiant left	03:47
	Bigcheese_ → Bigcheese	03:47
	← mizu_no_oto left	03:48
	← webguynow left	03:48
	← madewokherd left	03:49
	→ webguynow joined	03:49
	← Cata\|Work left	03:49
	→ madewokherd joined	03:49
	→ Phoenixz joined	03:50
	→ milli joined	03:50
	← jeffreylevesque left	03:51
	→ The_Phoenix joined	03:52
	→ skorgon joined	03:53
	← skorgon left	03:53
	→ skorgon joined	03:53
	→ zivester joined	03:53
	→ mehola joined	03:54
	→ ygeLN joined	03:55
	→ preaction joined	03:55
	→ DrNick joined	03:55
	← mehola left	03:55
	→ mehola joined	03:56
	← Gianormagantrous left	03:57
	← mac_ified left	03:57
	→ dadamssg joined	03:57
	→ mac_ified joined	03:58
	← durham_ left	03:58
	← The_Phoenix left	03:58
	→ jonmorehouse joined	03:59
	→ elsevero joined	04:00
	→ ironGiant joined	04:00
	← elsevero left	04:01
	→ shlant joined	04:01
	← dadamssg left	04:02
	← zumba_addict left	04:02
	→ woodruffw joined	04:02
	→ aseidl joined	04:03
	→ DSH105 joined	04:03
	→ Kamran- joined	04:03
	→ HedgeMage joined	04:04
	→ ariver\|ERR joined	04:04
	→ cschneid joined	04:04
	→ nedbat joined	04:04
	→ tmz joined	04:04
	→ sadmac joined	04:04
	→ jgornick joined	04:04
	→ bandroidx joined	04:04
	→ sjLonghorn joined	04:04
	→ Hedgework joined	04:04
	→ Gianormagantrous joined	04:05
	→ sfr^ joined	04:05
	→ killerpty joined	04:05
	→ bakhtiya joined	04:05
	→ robbyoconnor joined	04:07
	→ rancyd joined	04:07
	→ jceb_ joined	04:09
	→ murph- joined	04:10
	→ blackjid joined	04:11
	→ Klumben joined	04:11
	← NeverDie left	04:12
	→ jmpp joined	04:12
	→ Limech joined	04:13
	← boombatower left	04:13
	← sheilong left	04:15
	← jceb_ left	04:16
	→ devoldmx joined	04:17
	← JanC left	04:17
	→ rubie joined	04:17
	→ durham joined	04:17
	← jmpp left	04:18
	→ jceb joined	04:18
	← aseidl left	04:18
	→ markelite joined	04:21
	→ aseidl joined	04:21
	← durham left	04:21
	← devoldmx left	04:21
	→ devoldmx joined	04:21
	→ durham joined	04:22
	→ jmpp joined	04:23
	← rubie left	04:24
	← shlant left	04:26
	→ otter768 joined	04:26
	→ mjrcox joined	04:29
	← otter768 left	04:31
	← mjrcox left	04:31
	→ JanC joined	04:32
	← durham left	04:32
	→ Raging_Hog joined	04:32
	← fscala left	04:34
	→ brucelee joined	04:35
	→ fscala joined	04:36
	← dgutierrez1287 left	04:38
	→ daito joined	04:39
	← arescorpio left	04:41
	→ bilb_ono joined	04:42
	← Raging_Hog left	04:43
	→ modocache joined	04:43
	→ fairuz joined	04:44
	← daito left	04:44
	← bendangelo left	04:46
	← Phoenixz left	04:46
	→ daito joined	04:46
	← modocache left	04:48
	→ MechtiIde joined	04:50
	← djx left	04:50
	→ dionysus69 joined	04:53
	← dreiss left	04:55
	← bilb_ono left	04:56
	← webguynow left	04:59
	→ forrestv joined	05:00
	→ dreiss joined	05:00
	→ webguynow joined	05:00
	→ Suganthi joined	05:00
	← gusnan left	05:00
	→ gusnan joined	05:02
	← gusnan left	05:02
	→ gusnan joined	05:02
	→ zumba_addict joined	05:02
	← dreiss left	05:04
	← ironGiant left	05:05
	→ ckruczek joined	05:05
	→ Corosauce joined	05:06
	← jceb left	05:07
	← aseidl left	05:08
	→ rubie joined	05:08
	← Gamecubic left	05:09
	← harish_ left	05:10
	← Corosus left	05:10
	→ aseidl joined	05:11
	→ harish joined	05:11
	← rubie left	05:15
	← skorgon left	05:16
	→ mjrcox joined	05:17
	→ pantsman- joined	05:18
	← mjrcox left	05:18
	→ Saturn812 joined	05:19
	← rmrfchik left	05:22
	→ durham joined	05:22
	→ PCatinean joined	05:22
	→ ayaz joined	05:23
	→ khmarbaise joined	05:24
	→ Raging_Hog joined	05:25
	← jmpp left	05:26
	← keroro520 left	05:26
	→ temmi_hoo joined	05:27
	← snthsnth left	05:27
	→ Malsasa joined	05:27
	← Lyqyd left	05:30
	→ keroro520 joined	05:32
	← tristanp left	05:33
	→ dreiss joined	05:34
	← zivester left	05:35
	→ mistry joined	05:39
	← webguynow left	05:41
	→ webguynow joined	05:41
	→ Manikandan joined	05:41
	← mistry left	05:44
	→ mistry joined	05:45
mistry	hi, i have a git repo on server. i have only clone and commit access. it doesnt have a web gui. can i setup a web gui for that repo on my machine?	05:45
	→ Xethron joined	05:46
	→ a3Dman joined	05:47
_ikke_	sure	05:47
	You have the full repository	05:47
	← devoldmx left	05:48
	→ rubie joined	05:48
mistry	_ikke_ : i dont want to clone it	05:50
_ikke_	..	05:51
	Then it's not possible	05:51
	→ infiniteturtles joined	05:51
_ikke_	You need to have the repository in order to be able to serve information about it in a webinterface	05:51
ckruczek	mistry, you have gitk and git gui, that should suffice for all? Or what do you mean with 'web gui'?	05:51
mistry	or maybe.. i want every new commit to be synced up with my cloned copy	05:51
	ckruczek : i want my machine to provide web view to all my team members	05:52
	← scarabx left	05:53
mistry	unfortunately i dont have rights to change anything on that server	05:53
ckruczek	mistry, why your machine? if you have a server set up the web ui on this server. and pls be more specific on what kind of web ui you want to have, there are alot of services out there	05:53
	mistry, yes but as _ikke_ already said, to serve informations about the repo you have to have it locally	05:54
	← n00bdev left	05:54
mistry	i am ready to clone it once	05:54
	← khmarbaise left	05:54
mistry	but i want all the new commits to be synced automatically	05:54
	like a mirror	05:54
	→ khmarbaise joined	05:54
mistry	so idea is like this. one server hosts git repos, while other server hosts GUI	05:55
ckruczek	set up a cron-job which syncs automatically	05:55
mistry	ok	05:56
	→ freimatz joined	05:56
	← aseidl left	05:56
	→ dadamssg joined	05:58
	← khmarbaise left	05:59
mistry	so is there any got frontend that readily does that?	05:59
	→ aseidl joined	05:59
	→ sinknode joined	05:59
	← mistry left	06:00
	→ elsevero joined	06:01
	→ khmarbaise joined	06:01
	← elsevero left	06:01
ckruczek	does what?	06:01
	→ nnyk joined	06:02
	→ khmarbaise_ joined	06:03
	← dadamssg left	06:03
	← MechtiIde left	06:04
	← khmarbaise left	06:06
	→ jrahmy joined	06:06
	← affa09 left	06:06
	→ Nizumzen joined	06:07
	← rubie left	06:07
	← khmarbaise_ left	06:07
	← mehola left	06:08
	→ mehola joined	06:08
	→ tristanp joined	06:08
	← tristanp left	06:09
	→ jceb joined	06:10
	→ eGGsha joined	06:10
	← tristanseifert left	06:10
	← foist left	06:12
	← mehola left	06:12
	→ Phoenixz joined	06:14
	→ rscata joined	06:14
	→ elsevero joined	06:14
	→ s8321414 joined	06:15
	← elsevero left	06:15
	→ arup_r joined	06:15
	← aseidl left	06:17
	→ sushito joined	06:18
	→ mehola joined	06:19
	→ roelmonnens joined	06:19
	← reuf left	06:20
	→ aseidl joined	06:20
	← thiago left	06:20
	→ Malsasa_ joined	06:20
	Malsasa → Guest40949	06:20
	Malsasa_ → Malsasa	06:20
	→ khmarbaise joined	06:21
	← Guest40949 left	06:21
	→ King_Hual_ joined	06:22
	→ acolson joined	06:24
	→ otter768 joined	06:27
	← Goplat left	06:29
	← webguynow left	06:29
	→ webguynow joined	06:29
	← tpollard left	06:31
	← durham left	06:31
	← otter768 left	06:32
	← encod3 left	06:33
	→ skorgon joined	06:35
	→ Kicer86 joined	06:35
	← xcesariox left	06:35
	→ jmpp joined	06:36
	← webguynow left	06:37
	→ webguynow joined	06:37
	← scrubbrush left	06:37
	← dreiss left	06:38
	→ scrubbrush joined	06:38
	← mostlybadfly left	06:39
	← watabou left	06:39
	← King_Hual_ left	06:42
	← aseidl left	06:43
	→ modocache joined	06:44
	→ joo-_ joined	06:44
	→ Sceorem joined	06:45
	→ elsevero joined	06:46
	→ aseidl joined	06:46
	← webguynow left	06:46
	→ SWAT joined	06:47
	← khmarbaise left	06:47
	→ webguynow joined	06:47
	→ Pouya joined	06:48
	→ howdoi joined	06:48
	→ skullcrasher joined	06:48
	gitinfo set mode: +v	06:49
	→ devoldmx joined	06:49
	← modocache left	06:49
Pouya	Is there a way to get a visual image of a repo?	06:50
	→ dgutierrez1287 joined	06:50
	→ mezod joined	06:53
	← devoldmx left	06:53
	← dgutierrez1287 left	06:55
	← brucelee left	06:55
	← darkbit left	06:56
	→ Flotho66 joined	06:57
	→ gua_ould joined	06:57
	← kadoban left	06:57
	← Flotho66 left	06:58
	← mezod left	06:58
	← Phoenixz left	06:58
	→ Phoenixz joined	06:58
	← elsevero left	06:59
	→ SonikBoom joined	06:59
	→ [Brain] joined	07:01
	→ encod3 joined	07:01
	→ stee joined	07:03
	← gopar left	07:04
	← webguynow left	07:05
	→ webguynow joined	07:05
	→ wwwald joined	07:06
osse	what should it look like ?	07:07
	→ Brain joined	07:07
	→ Ingenia joined	07:07
	→ rubie joined	07:07
	→ xcesariox joined	07:08
	← [Brain] left	07:09
	← jceb left	07:09
	← skorgon left	07:10
	→ darkbit joined	07:10
	← aseidl left	07:10
	← gambl0re left	07:11
	← webguynow left	07:12
	→ TomyWork joined	07:12
Pouya	osse : something like this http://git-scm.com/book/en/v2/book/05-distributed-git/images/small-team-5.png	07:12
	← rubie left	07:12
	← a3Dman left	07:13
	→ webguynow joined	07:13
	← mac_ified left	07:14
	→ a3Dman joined	07:14
	→ aseidl joined	07:14
	← robbyoconnor left	07:14
osse	hmm, i dont' know of any such tools	07:15
	→ robbyoconnor joined	07:15
Pouya	so only Git log command ?	07:16
nevyn	git log can do that.	07:16
	so there's standard tools for git to dot which do that.	07:16
	but.	07:16
	git log can give a running history diagram with forks and merges.	07:17
	→ tristanseifert joined	07:17
Pouya	with which options can I get that diagram ?	07:17
	→ zoso joined	07:18
	→ ilmgb joined	07:18
osse	Pouya: --oneline --graph --decorate --all	07:18
	← jmpp left	07:20
	← Brain left	07:21
Pouya	but it's a bit confusing.better tool ?	07:21
	← darkbasic left	07:22
	← tristanseifert left	07:22
	→ bonswouar joined	07:22
osse	probably several of the GUIs	07:23
	→ darkbasic joined	07:24
	← koell left	07:24
Pouya	does Git GUI for windows have this feature ?	07:24
sim642	gitk shows something similar to that git log --oneline etc...	07:25
	it doesn't make much sense to display the history horizontally due to how long it can get	07:25
	← skullcrasher left	07:27
	→ Balliad joined	07:27
	→ skullcrasher joined	07:27
Pouya	you're right.but what does any of these graphical lines show ?	07:31
	→ ilmgb_ joined	07:31
	← reim left	07:31
AridBullet	Are you on windows Pouya?	07:31
	→ adeebnqo joined	07:32
	← nilg left	07:32
sim642	Pouya, they show the same stuff which is in your linked image, how commits follow each other	07:32
	← xcesariox left	07:32
Pouya	yes I'm on windows	07:32
	← ilmgb left	07:32
	→ X3ro joined	07:32
AridBullet	If you are, SourceTree is a good GUI, which gives what you are after pretty much. Everything will go vertical though, you won't find one that goes horizontally as that's a wrong representation of GIT	07:32
	or GitHub has a GUI which is also good, and has a tree view	07:32
	http://git-scm.com/downloads/guis	07:33
	That's the only real way you are going to get a "diagram", through a GUI	07:33
	→ nilg joined	07:33
Pouya	Is that show the same thing as gitk?	07:34
	→ ilmgb joined	07:34
	← Wetmelon left	07:35
	← ilmgb left	07:35
	→ ilmgb joined	07:35
	← PCatinean left	07:37
	← ilmgb_ left	07:38
osse	gitk is included. the ones in that list are extra	07:39
	← cagedwisdom left	07:40
	→ brucelee joined	07:42
	→ Hounddog joined	07:42
	→ spykins joined	07:45
	→ ms7 joined	07:46
	← Hounddog left	07:47
	→ kurkale6ka joined	07:47
	→ Hounddog joined	07:48
	→ devoldmx joined	07:49
	← daito left	07:50
ms7	Hi, running Git 2.3 here. I was working on a branch and had unstaged changes. When I switched back to my master, I noticed those changes also appeared under my master branch, and any other branches I had made. If I discarded those changes from within master or another branch, they would also be discarded from the branch where I had originally made those changes. Is this expected behavior? I remember having it so that any changes made on a branch stay on that	07:51
	branch and when switching to master or so, there’s no changes there. I’m not sure if this changed from when I was on 1.9.x	07:51
jast	yes, it's expected, and it's been like that since the beginning of time	07:51
	!float	07:51
gitinfo	If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	07:51
	← maxorator left	07:51
	← aseidl left	07:52
ms7	got it, thank you jast.	07:52
	← SonikBoom left	07:52
	→ maxorator joined	07:53
	→ aseidl joined	07:53
	← devoldmx left	07:54
ms7	One other question, say I found a small bug after I had already had a feature merged into master. I create a hotfix branch where the only change is something as small as changing a variable to a string. I commit and push the hotfix branch. Is this considered strange when the fix is so small? Could there be a way to merge that change into the last merged PR?	07:55
jast	personally I wouldn't bother making a new branch for a single, straightforward fix	07:55
	if you want to make a pull request for the hotfix it might make sense, I guess	07:56
	→ mikecmpbll joined	07:56
jast	assuming you're using something like github (pull requests as seen on various hosting sites aren't a feature of git itself)	07:56
	→ daito joined	07:57
jast	and messing around with merges that have already been uploaded to some central place is a really bad idea	07:57
ms7	right, PR for the hotfix.	07:57
	jast: that was my thought as well	07:57
	→ dadamssg joined	07:59
	→ jceb joined	07:59
	→ bongjovi joined	08:00
	← Sleepy63 left	08:00
	← zumba_addict left	08:01
	→ holodoc joined	08:02
	→ nour joined	08:02
	→ xcesariox joined	08:02
	← webguynow left	08:03
	← dadamssg left	08:03
	→ webguynow joined	08:04
	← Malsasa left	08:04
	← WeS left	08:05
	← harish left	08:07
	→ Darcidride joined	08:08
	← X3ro left	08:10
	→ YoungFrog joined	08:12
	→ voodo joined	08:12
	← webguynow left	08:12
	→ p4trix joined	08:12
	→ elsevero joined	08:13
	← jrajav left	08:13
	→ Brain joined	08:13
	→ Sleepy63 joined	08:13
	→ webguynow joined	08:13
	→ Dragooon joined	08:18
	→ tristanseifert joined	08:18
	→ spykins_ joined	08:19
	→ ki0 joined	08:21
	← xcesariox left	08:21
	← spykins left	08:22
	→ reydempto joined	08:22
	← tristanseifert left	08:23
	← webguynow left	08:23
	→ webguynow joined	08:24
	← darkbit left	08:24
	← s8321414 left	08:27
	← webguynow left	08:27
	← Nizumzen left	08:28
	→ otter768 joined	08:28
	→ jiggerypokery joined	08:29
	← brucelee left	08:30
	→ aard joined	08:30
	← Sleepy63 left	08:31
	→ terminal_echo joined	08:32
	→ pcypher joined	08:33
	← otter768 left	08:33
	← elsevero left	08:37
ms7	If I am in a feature branch, and there was a merged pull request to master on github with one change that I want to apply to my feature branch, is it (from within feature branch) git fetch, git rebase master?	08:41
	→ khmarbaise joined	08:41
	→ Alienpruts joined	08:42
	← jonmorehouse left	08:43
osse	that's one way to do it, yes	08:43
adeebnqo	ms7 : for single commits, i normally use git cherry-pick.	08:44
	→ bampersand joined	08:44
adeebnqo	not sure if that	08:44
	→ Sleepy63 joined	08:44
	← ayaz left	08:44
adeebnqo	*thats frowned upon	08:44
	→ modocache joined	08:45
ms7	osse: I noticed that if I git fetch from within feature branch, my master is still behind by (x) commits. Which leads me to believe I should git fetch from master..?	08:45
osse	ms7: doesn't matter where you run fetch from	08:46
	ms7: the result would be the same. after fetch you may do a merge or rebase.	08:46
ms7	strange, then it’s not fetching anything, no new changes show up in git log	08:46
	→ elsevero joined	08:47
osse	ms7: by default git log starts listing from HEAD and goes backwards	08:47
	ms7: try git log --all	08:47
	if fetch printed something then it fetched something	08:48
ms7	osse: ah, there it is.	08:48
	← Phoenixz left	08:48
	→ denimsoft joined	08:48
ms7	osse: bingo, thanks for the help	08:49
	← ki0 left	08:49
	← modocache left	08:49
	← adeebnqo left	08:50
	← bampersand left	08:50
	→ CustosL1men joined	08:50
ckruczek	one question here. say we have branch A and branch B, currently both are even. I checkout B and do a rebase -i sha-from-before-two-days and do some changes, e.g. remove one commit, reword one other. does this also effect branch A? I guess so right?	08:51
	→ jost_ joined	08:51
ms7	So when rebasing, git rebase [X] where X is where you want to rebase from, not into	08:51
	→ BullHorn joined	08:51
ckruczek	ms7, was this for me?	08:52
ms7	ckruczek: no, sorry :) was from a previous question	08:52
ckruczek	k :)	08:52
	→ ki0 joined	08:52
	→ jonno11 joined	08:54
	→ skylite joined	08:54
	← ki0 left	08:55
	→ ki0 joined	08:55
	← BullHorn left	08:55
jast	ckruczek: no, branch B will keep pointing to the old commit (pre-rewriting)	08:55
	s/B/A/	08:56
ckruczek	ok jast, thanks	08:56
	← daito left	08:56
	→ daito joined	08:58
	→ silenc3r joined	08:59
	← jrahmy left	09:00
	→ chll joined	09:00
	→ BullHorn joined	09:01
	← elsevero left	09:01
	→ [Brain] joined	09:03
	→ jagob joined	09:04
	→ wwwald_ joined	09:04
	← wwwald left	09:06
	→ elsevero joined	09:06
	← aseidl left	09:06
	← Brain left	09:07
	→ mkoskar joined	09:08
	→ ki0_ joined	09:09
	← ki0_ left	09:09
	→ aseidl joined	09:10
	→ ki0_ joined	09:10
	← Dragooon left	09:10
	← arup_r left	09:10
	← ki0 left	09:12
	← mehola left	09:14
	← Sceorem left	09:14
	→ harish joined	09:14
	→ b1n4ry joined	09:15
	← sushito left	09:16
	→ sushito joined	09:17
	← scrubbrush left	09:17
	← sushito left	09:17
	← BullHorn left	09:17
	→ scrubbrush joined	09:17
	→ Wpkf joined	09:20
	← a3Dman left	09:20
	← b1n4ry left	09:21
	← nnyk left	09:21
	→ b1n4ry joined	09:22
	← Wpkf left	09:22
	→ ronskisika joined	09:22
	→ a3Dman joined	09:23
	← Raging_Hog left	09:23
	→ frg133 joined	09:24
	→ Agud joined	09:25
	← Manikandan left	09:25
	← Agud left	09:26
	← ki0_ left	09:27
	→ jalnt joined	09:27
	→ Manikandan joined	09:27
	← aseidl left	09:29
	← fairuz left	09:29
	← a3Dman left	09:30
	→ GT4066 joined	09:31
	→ aseidl joined	09:31
	→ arup_r joined	09:31
	→ ki0 joined	09:31
	→ a3Dman joined	09:32
	← teran left	09:33
	→ arup_r_ joined	09:33
	→ nphard joined	09:33
	← frg133 left	09:33
	← nphard left	09:33
	→ Lwom joined	09:33
	← Lwom left	09:34
	← juvenal left	09:34
	← daito left	09:34
	→ geoid joined	09:35
	→ fyjgo joined	09:35
	← fyjgo left	09:35
	← spykins_ left	09:35
	→ s8321414 joined	09:36
	→ Ctzy joined	09:36
	← Ctzy left	09:36
	← arup_r left	09:36
	→ ijj joined	09:37
	← ijj left	09:38
	← pcypher left	09:38
	→ Dragooon joined	09:38
	→ mqc joined	09:39
	→ pcypher joined	09:39
	← mqc left	09:40
	← Pouya left	09:40
	→ jonmorehouse joined	09:40
	→ Ueuq joined	09:42
	← terminal_echo left	09:42
	→ tomog999 joined	09:42
	← Ueuq left	09:42
	← b1n4ry left	09:42
	→ b1n4ry joined	09:43
	→ Veap joined	09:44
	→ tvw joined	09:44
	← Veap left	09:44
	← jonmorehouse left	09:44
	← tomog999_ left	09:45
ronny	hi	09:45
	is there a easy way to make git bail out when i accidentially rebase changessets not by me	09:46
	(every time i enter git rebase instead of git rebase master i get into a mess)	09:46
	→ pcypher_ joined	09:46
	→ yzk joined	09:47
	← pcypher left	09:48
	← reydempto left	09:48
	← yzk left	09:49
	← ki0 left	09:50
	→ Sonicbit joined	09:50
	→ devoldmx joined	09:50
	→ dgutierrez1287 joined	09:50
	→ veqaa joined	09:51
	→ ki0 joined	09:51
	← veqaa left	09:51
	← eGGsha left	09:52
	← Zariel left	09:52
	← nilg left	09:53
	→ ikff joined	09:53
	← ikff left	09:53
	← devoldmx left	09:55
	← dgutierrez1287 left	09:55
	→ aioca joined	09:55
	← aioca left	09:56
	→ Zariel joined	09:56
	→ Guest32844 joined	09:56
	→ Ieq joined	09:57
	← Ieq left	09:57
	→ Mziar joined	09:58
	← jalnt left	09:58
	← Mziar left	09:58
	→ zien joined	09:59
	← zien left	09:59
	→ zien joined	09:59
	→ ili joined	09:59
_rgn	git rebase --abort if it didn't finish	09:59
	← ili left	09:59
	→ ExeciN joined	10:00
	→ dadamssg joined	10:00
	← aard left	10:00
	← b1n4ry left	10:00
	← zien left	10:00
	→ Bwiup joined	10:01
	← geoid left	10:01
	→ reydempto joined	10:01
	← Bwiup left	10:01
	→ eGGsha joined	10:02
	← pcypher_ left	10:03
	← elsevero left	10:03
	→ elsevero joined	10:04
	→ Darcidride_ joined	10:04
	← dadamssg left	10:05
	← maxorator left	10:05
	→ maxorator joined	10:05
	← Zariel left	10:05
	→ tristanseifert joined	10:06
	← Darcidride left	10:06
	← pantsman- left	10:07
	→ Zariel joined	10:08
	→ reim joined	10:08
	→ nphard joined	10:08
	→ nnyk joined	10:09
	→ wxg joined	10:09
	→ darkbasic_ joined	10:10
	→ uiu joined	10:10
	← darkbasic left	10:10
	→ jmpp joined	10:11
	← tristanseifert left	10:11
	← uiu left	10:11
	→ opxp joined	10:12
	→ _wwwald_ joined	10:13
	← reim left	10:13
	← opxp left	10:14
	← aseidl left	10:14
	→ aseidl joined	10:16
	← nphard left	10:17
	← wwwald_ left	10:17
	← jmpp left	10:17
	← Dragooon left	10:17
	← nour left	10:21
	→ Ivd joined	10:22
	← Ivd left	10:23
	→ ley joined	10:24
	→ Brain joined	10:24
	→ m0viefreak joined	10:24
	← ley left	10:24
	→ darkbasic joined	10:26
	→ Kuy joined	10:26
	← Kuy left	10:27
	← [Brain] left	10:27
	← darkbasic_ left	10:27
	→ Walex joined	10:27
	→ strayPuppy joined	10:28
	→ Uihrq joined	10:28
	→ otter768 joined	10:29
	← Uihrq left	10:30
	→ tristanseifert joined	10:30
	← maxorator left	10:31
	← juril left	10:31
	← leTali left	10:31
	← cyphase left	10:31
	← smw left	10:31
	← j416 left	10:31
	← spriz left	10:31
	← Rubin left	10:31
	→ teran joined	10:31
	→ Gcfy joined	10:31
	→ ki0_ joined	10:31
	→ j416 joined	10:32
	→ leTali joined	10:32
	→ smw joined	10:32
	→ juril joined	10:32
	→ spriz joined	10:32
	→ fairuz1 joined	10:32
	→ curiousmansi joined	10:32
	← Gcfy left	10:32
	← fairuz1 left	10:32
	← otter768 left	10:34
	← voodo left	10:34
	→ sparetire_ joined	10:35
	→ daito joined	10:35
	← ki0 left	10:35
	→ cyphase joined	10:35
	← teran left	10:36
	← aseidl left	10:36
	→ Pmgui joined	10:36
	← Pmgui left	10:36
	→ nour joined	10:36
	→ Rubin joined	10:37
	→ pantsman- joined	10:37
	→ siua joined	10:37
	← siua left	10:38
	→ teran joined	10:38
	→ Zifre joined	10:38
	→ aseidl joined	10:38
	→ sdfgsdfg joined	10:38
	→ Aedca joined	10:39
	← Aedca left	10:39
	← Zifre_ left	10:39
curiousmansi	hi all	10:40
	HEAD detached from b2714b5	10:40
	← daito left	10:40
	→ chimay joined	10:40
	→ idqwg joined	10:40
curiousmansi	i am not able to chnage this	10:40
	← mrkake left	10:40
	→ Salehi joined	10:40
	← idqwg left	10:40
YoungFrog	!detached	10:40
gitinfo	A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach	10:40
YoungFrog	!reattach	10:41
gitinfo	Letters refer to !detached. (a) and (b): 'git checkout branchname' to continue working on another branch, or 'git checkout -b branchname' to start a new one here; (c) git am --continue; (d) git rebase --continue	10:41
	→ jonmorehouse joined	10:41
	→ Guh joined	10:41
	← ilmgb left	10:41
	→ jackburton joined	10:41
	← Guh left	10:41
	← a3Dman left	10:41
YoungFrog	curiousmansi: does that help?	10:41
	→ ilmgb joined	10:42
	← Manikandan left	10:42
curiousmansi	no	10:43
	→ Repox joined	10:43
	→ a3Dman joined	10:43
	→ geoid joined	10:43
	→ zceoc joined	10:44
	← zceoc left	10:44
	→ mrkake joined	10:45
_ikke_	what did you try?	10:45
	← ms7 left	10:45
	→ sdothum joined	10:45
	→ Bcgy joined	10:46
	← Bcgy left	10:46
	← jonmorehouse left	10:46
	→ modocache joined	10:46
curiousmansi	ok solved	10:46
	← ilmgb left	10:47
	← sdfgsdfg left	10:47
	→ iaak joined	10:47
curiousmansi	another issue is i want to revert my commit	10:47
	i have not yet pushed	10:47
	← iaak left	10:47
	→ ki0 joined	10:47
curiousmansi	Your branch is ahead of 'origin/car_cnb' by 1 commit.	10:47
_ikke_	git reset --keep HEAD~1	10:48
	→ Kqiv joined	10:48
	→ Sceorem joined	10:48
	← Kqiv left	10:48
	← ki0_ left	10:49
YoungFrog	I didn't know about -keep. So that's the safer --hard ?	10:49
	→ fubi_ joined	10:50
	← modocache left	10:50
	→ rkat joined	10:50
	← rkat left	10:50
	→ Manikandan joined	10:50
_ikke_	yes	10:51
	→ Loui joined	10:51
	← Loui left	10:51
bremner	is there a lazy way to have filter branch remove all but a white-listed set of top level directories, or do I have to write a script?	10:52
	← Zariel left	10:52
	→ Uili joined	10:52
	← ujjain- left	10:52
	→ Pouya joined	10:52
	← Uili left	10:52
	← Gravitron left	10:53
	→ ujjain joined	10:53
	← ujjain left	10:53
	→ ujjain joined	10:53
curiousmansi	what wil HEAD~1 do?	10:53
	→ addshore joined	10:53
	→ piht joined	10:53
	← piht left	10:54
	→ kanzure joined	10:54
	→ nettoweb joined	10:54
_ikke_	curiousmansi: Parent of the current commit	10:54
	→ efa joined	10:55
	← efa left	10:55
	→ wwwald_ joined	10:56
	→ Gravitron joined	10:56
	→ [Brain] joined	10:56
	→ azlq joined	10:57
	← azlq left	10:57
	→ Zariel joined	10:57
	→ mezod joined	10:57
	→ nerd joined	10:57
	→ Kallis joined	10:58
	← _wwwald_ left	10:59
	← Zariel left	10:59
	→ CheckDavid joined	11:00
	→ hxyu joined	11:00
	← dionysus69 left	11:00
	← hxyu left	11:00
	← Brain left	11:00
	→ NeverDie joined	11:01
	→ Brain joined	11:02
	→ nvahalik joined	11:02
	→ Nioyh joined	11:03
	← Nioyh left	11:04
	← aseidl left	11:04
tango_	why the heck do I get a fatal: unable to create .git/index.lock: File exists during a rebase?	11:04
	→ lcj joined	11:04
	← [Brain] left	11:04
	← lcj left	11:05
Bombe	Probably because there’s something else accessing the repository during your rebase.	11:05
	GitX was a prime candidate for that error on my machines.	11:05
	← s8321414 left	11:05
	→ s8321414 joined	11:05
tango_	hm nope	11:06
	→ ntwari joined	11:06
	→ Raging_Hog joined	11:06
tango_	and there is no index.lock indeed	11:06
	→ aseidl joined	11:06
tango_	ti almost looks like the rebase is locking itself out	11:06
	→ uzeji joined	11:06
	← ronskisika left	11:07
	← uzeji left	11:07
curiousmansi	_ikke_: thanks	11:07
	→ howlymowly joined	11:08
	→ Mlge joined	11:08
	← Mlge left	11:08
	→ rubie joined	11:09
	→ Eebsa joined	11:10
	← Eebsa left	11:11
	← aseidl left	11:11
	→ reim joined	11:13
	← bongjovi left	11:13
	→ beckyconning_ joined	11:14
	← rubie left	11:14
	→ aseidl joined	11:14
	← chll left	11:14
	→ King_Hual_ joined	11:15
	← paulweb515 left	11:15
	→ stamina joined	11:16
	← darkbasic left	11:16
	→ darkbasic joined	11:16
	→ ejlp joined	11:17
	← ejlp left	11:17
	→ Qcyx joined	11:18
	→ cavallari joined	11:19
	← Qcyx left	11:19
	→ nerd_ joined	11:19
	← nerd left	11:19
	→ Cdlaa joined	11:20
	→ Dro__ joined	11:20
	← Cdlaa left	11:20
	→ maxorator joined	11:20
	→ _wwwald_ joined	11:21
	← unholycrab left	11:21
	→ unholycrab joined	11:22
	← reim left	11:24
	← wwwald_ left	11:25
	→ jalnt joined	11:25
	→ rnsanchez joined	11:26
	← Kallis left	11:26
	← zacts left	11:27
	→ zacts joined	11:28
	→ ac3takwas joined	11:28
ac3takwas	Hi	11:29
gitinfo	ac3takwas: 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.	11:29
osse	ac3takwas: hi! I'd like to manually welcome you to #git, a place full of me, and also some other people	11:30
	→ aard joined	11:30
ac3takwas	Haha. I believe the commands "git-commit" and "git commit" do the exact same thing, right?	11:30
	→ lacrymology joined	11:30
	← wxg left	11:31
osse	yes	11:31
	i think you'll find they're hardlinks to the same program	11:31
	→ wxg joined	11:31
ac3takwas	While learning git some days ago, I could type something of the sort "git-commit" into my terminal and I wouldn't get errors, but it's different now. I get errors	11:32
	So I'm stuck with the "git commit" version instead. Why is that?	11:32
osse	ac3takwas: git-commit is deprecated. i only exists to deal with old scripts. when git itself runs an external program/script it prepends an entry to PATH which contains git-foo for a bunch of foo	11:33
ac3takwas	okay, so I should just stick with the "git foo" version?	11:34
osse	always	11:34
ac3takwas	okay, thanks	11:34
	→ devoldmx joined	11:36
	→ ydofm joined	11:37
	← ydofm left	11:37
	→ reim joined	11:37
	← devoldmx left	11:41
	→ [Brain] joined	11:41
	← Darcidride_ left	11:43
	→ ibqa joined	11:44
	→ chll joined	11:44
	← ibqa left	11:45
	← reim left	11:45
	→ fstd_ joined	11:45
	← Brain left	11:45
	← fstd_ left	11:46
	→ LBV_User joined	11:46
	→ fstd_ joined	11:46
	← jonno11 left	11:47
	← fubi_ left	11:47
	→ Brain joined	11:47
	← ac3takwas left	11:47
	← fstd left	11:47
	fstd_ → fstd	11:47
	→ vgjao joined	11:48
	→ ilmgb joined	11:49
	← [Brain] left	11:50
	→ ironGiant joined	11:50
	→ {0xc6} joined	11:51
	← vgjao left	11:51
	→ ProT-0-TypE joined	11:51
	→ Darcidride joined	11:52
	→ drodger joined	11:53
	→ axei joined	11:53
	→ bitkiller joined	11:53
	← jceb left	11:53
	← axei left	11:53
	→ fzu joined	11:55
	← fzu left	11:56
	→ Etvu joined	11:57
	← Etvu left	11:57
	← Salehi left	11:58
	← fstd left	11:59
	→ Ufzu joined	11:59
	→ b1n4ry joined	11:59
	→ toothrot joined	11:59
	→ fstd joined	11:59
	→ Noldorin joined	11:59
	← Ufzu left	11:59
	← a3Dman left	12:00
	→ dadamssg joined	12:01
	→ ac3takwas joined	12:01
	→ GrayShade joined	12:01
GrayShade	hi, can i get a hand with git-send-email? it doesn't like my smtp server	12:01
	→ bongjovi joined	12:02
GrayShade	it works in thunderbird with connection security: none, authentication method: password, transmitted insecurely	12:02
	← ac3takwas left	12:02
	→ juvenal joined	12:02
	← keroro520 left	12:05
GrayShade	but git-send-email with --smtp-encryption=no says "Command unknown: 'AUTH'"	12:05
	← DWestCoast left	12:05
	← dadamssg left	12:05
	← ProT-0-TypE left	12:06
	← nvahalik left	12:06
	→ nphard joined	12:06
	→ EduardoMartins joined	12:06
	→ jceb joined	12:08
	→ a3Dman joined	12:08
	← zoso left	12:08
	→ mykespb joined	12:09
	← Hounddog left	12:10
	← bsanford left	12:10
	→ mostlybadfly joined	12:11
	→ enleeten joined	12:11
	→ victortyau joined	12:13
	→ bsanford joined	12:13
	→ [Brain] joined	12:14
	← denimsoft left	12:14
GrayShade	oh, it seems that the server doesn't really care about authenticating to it	12:14
	→ zumba_addict joined	12:14
	→ denimsoft joined	12:15
	← Dro__ left	12:15
	← b1n4ry left	12:15
	→ ilmgb_ joined	12:16
	→ b1n4ry joined	12:16
	← Brain left	12:17
	← ilmgb_ left	12:17
	→ ilmgb_ joined	12:18
	← ilmgb left	12:18
nedbat	the tables in the Discussion of this man page are very helpful: https://www.kernel.org/pub/software/scm/git/docs/git-reset.html But I'm trying "git reset --keep HEAD", and it is refusing to reset. According to the tables, if HEAD and target agree (which they must if HEAD is the target), then --keep will succeed. What am I missing?	12:19
	← Pouya left	12:20
	← aseidl left	12:20
grawity	GrayShade: you might be sending through the wrong port	12:20
	→ rwb joined	12:20
grawity	GrayShade: these days most servers use port 587 for "mail submission" – with TLS, AUTH, and all that	12:21
	GrayShade: whereas port 25 is mostly for unauthenticated server-to-server chat	12:21
	→ aseidl joined	12:23
	← jceb left	12:23
	→ Zariel joined	12:23
GrayShade	grawity: right :). but it just says "Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: [...]" with port 587, with --smtp-encryption set to either tls or ssl	12:23
	→ Phoenixz joined	12:24
	→ Brain joined	12:25
	← denimsoft left	12:25
	← [Brain] left	12:27
	← _wwwald_ left	12:27
	← Phoenixz left	12:28
	→ _wwwald_ joined	12:29
	→ SpaghettiCat joined	12:29
	→ otter768 joined	12:30
SpaghettiCat	Hello, I'm trying to take my repo off of BitBucket and move it to local server. Why is it that after `git clone --bare` I need to do a `git push --miror`? Those are the instructions on: https://help.github.com/articles/duplicating-a-repository/	12:30
Seveas	SpaghettiCat: those instructions are incorrect. That should be clone --mirror and push --mirror	12:31
	← mykespb left	12:31
	← dsdeiz left	12:32
	← darkbasic left	12:32
	→ darkbasic joined	12:32
Seveas	SpaghettiCat: what the --mirror does is make sure that all refs (branches, tags and any other refs you may have) are copied.	12:32
SpaghettiCat	Seveas: oh I see thank you. But why is a `push --mirror` necessary?	12:32
Seveas	see above :)	12:32
	→ diegoviola joined	12:32
SpaghettiCat	Seveas: I understand the --mirror, but why `push`?	12:32
	`git clone --mirror` already downloads the ripo to the local disk	12:33
	*repo	12:33
Seveas	the push --mirror is to the new location	12:33
	→ dsilva joined	12:33
	→ gecko19 joined	12:34
SpaghettiCat	Seveas: is there any difference between `git push --mirror` and just `cp -r myrepo.git /to/my/server`?	12:34
Seveas	I'd do rsync -av instead of cp, and the difference is that copying the files will copy configs, hooks etc. as well as git objects.	12:35
	← otter768 left	12:35
	→ iwkse joined	12:35
	← joo-_ left	12:35
Seveas	push essentialy only copies what's in .git/objects and .git/refs	12:35
	← gecko19 left	12:35
	→ t4nk675 joined	12:36
	→ grootseun joined	12:36
iwkse	hi, I have a question about branches. Let's say I forget to git checkout -b local_branch and do changes on master. Can I later fix that? Like creating the local branch and after returning to master and drop changes?	12:36
	→ jceb joined	12:36
	→ daito joined	12:36
	← t4nk675 left	12:37
iwkse	means, leaving them only to the local	12:37
grootseun	hi everyone, my local master is screwed and I want to replace it with origin/master - what is the plan of action for me here	12:37
	→ aswen joined	12:37
	→ denimsoft joined	12:37
SpaghettiCat	Seveas: thanks for the tip. I think I'll just do `git push --mirror`. I don't see how `rsync -av` is better than `cp -a` though	12:37
iwkse	grootseun: I think it's git checkout origin/master	12:37
Seveas	iwkse: absolutely. When there are no uncommitted changes, just do git branch new-branch-name master && git reset --hard commit-you-want-to-point-master-to	12:37
iwkse	not sure though..	12:37
	Seveas: nice, thanks!	12:38
	← b1n4ry left	12:38
	→ git259 joined	12:38
grootseun	iwkse: so I have to be on branch master and checkout origin/master	12:38
Seveas	grootseun: git reset --hard origin/master will discard all local commits that are ahead of origin/master	12:38
	← git259 left	12:38
Seveas	checkout will not do the trick for you grootseun	12:38
grootseun	what a win	12:38
	← reydempto left	12:38
iwkse	Seveas: good to know this too :)	12:38
	→ gecko19 joined	12:39
	← gecko19 left	12:39
	← King_Hual_ left	12:39
grootseun	that you Seveas and iwkse	12:41
	sorted!	12:41
	thank*	12:41
	→ gecko19 joined	12:41
	← daito left	12:41
	→ [Brain] joined	12:41
	→ gecko19_ joined	12:42
	← nphard left	12:43
	← aseidl left	12:43
	← gecko19_ left	12:43
	→ gecko19_ joined	12:44
	gitinfo set mode: +v	12:44
	← Brain left	12:45
gecko19_	Hello All, I have received a tar ball with changes between commits	12:45
	← EduardoMartins left	12:45
gecko19_	is there any way I can merge the tar ball into the git repo	12:45
	→ lg188 joined	12:45
	→ eagles0513875__ joined	12:46
	→ aseidl joined	12:46
eagles0513875__	hey guys how can i check out a particular commit with out detaching the current head in a particular repo	12:46
	→ macabre joined	12:46
	→ joo-_ joined	12:47
	→ modocache joined	12:47
	→ mellernoia joined	12:47
	→ paulweb515 joined	12:48
	← wxg left	12:48
	← totte left	12:49
	→ krawchyk joined	12:49
	← s00pcan left	12:50
	← thorie left	12:50
	→ devoldmx joined	12:50
	← gecko19 left	12:51
	← modocache left	12:51
	→ mac_ified joined	12:51
	→ s00pcan joined	12:51
	→ thorie joined	12:52
	→ juvenal_ joined	12:52
SpaghettiCat	eagles0513875__: what do you mean particular repo?	12:52
	→ shiriru joined	12:53
SpaghettiCat	you want to check out a commit but not detach the head?	12:53
eagles0513875__	SpaghettiCat: exactly	12:53
	← tristanseifert left	12:54
	→ amosb joined	12:54
	← paulweb515 left	12:54
	← curiousmansi left	12:54
Seveas	gecko19_: what's in the tarball? Patches or a snapshot of all files?	12:54
	eagles0513875__: git worktree add /tmp/eagles-test commit-sha1-here	12:55
amosb	hello! How can I manually merge files that are assumed unchanged? I just lost all the changes after I merge origin master	12:55
	← devoldmx left	12:55
eagles0513875__	Seveas: ?	12:55
	→ Nizumzen joined	12:55
Seveas	amosb: don't do assume unchanged.	12:55
	← Timvde left	12:55
	← juvenal left	12:55
amosb	Seveas: What should I do instead?	12:56
eagles0513875__	Seveas: what did you mean by the command you pinged me about	12:56
Seveas	eagles0513875__: that command lets you check out a commit in a separate worktree, leaving your current worktree intact.	12:56
eagles0513875__	ok	12:56
Seveas	amosb: why are you doing --assume-unchanged?	12:56
	← nerd_ left	12:56
eagles0513875__	thanks Seveas	12:56
	Seveas: then can i commit the changes to the same repo?	12:57
	← s8321414 left	12:57
amosb	Seveas: because I have different settings and a lot of thirdparty modification that deviated from origin which should not be push to upstream	12:58
	→ s8321414 joined	12:58
amosb	Seveas: Without --assume-unchanged I'm always in a dirty working tree	12:59
	→ nphard joined	12:59
	→ str joined	12:59
	→ sanketdg joined	12:59
	→ winegoddess joined	13:00
	← Manikandan left	13:00
	→ bmilesp joined	13:01
	→ Dro__ joined	13:01
	→ livingstn joined	13:01
	← CustosL1men left	13:01
	← nphard left	13:01
	→ singke joined	13:02
	→ darkbasic_ joined	13:02
	← darkbasic left	13:03
	→ zivester joined	13:03
	← zivester left	13:03
	← singke left	13:03
	← AridBullet left	13:04
	→ ncd\|leeN joined	13:05
	→ paulweb515 joined	13:06
	→ nerd joined	13:06
	→ Gamecubic joined	13:06
DolphinDream	howdy gitsters	13:06
	→ leatherface416 joined	13:07
	→ nphard joined	13:08
	← _wwwald_ left	13:09
DolphinDream	submodule question.. in a superproject A with a submodule B, with superproject A referencing submodule's B commit A... when i update submodule B repo to a new commit B and do a git diff in superproject i get the difference in submodule reference (- old commit A SHA, +new commit B SHA). Where is this difference located ? is it in the index? any file in particular ?	13:09
	← ckruczek left	13:10
	← darkbasic_ left	13:12
	→ darkbasic joined	13:12
	← toothrot left	13:13
	← nerd left	13:13
	← s8321414 left	13:13
	→ s8321414_ joined	13:13
	← shiriru left	13:13
	← ronny left	13:13
	→ cigarshark joined	13:13
moritz	DolphinDream: it shows you the diff for a path, no?	13:14
	← s8321414_ left	13:14
	→ Timvde joined	13:14
moritz	DolphinDream: if you 'git add' that path, you add it to the index	13:14
	→ dsdeiz joined	13:14
	→ s8321414 joined	13:14
	← bmilesp left	13:14
moritz	DolphinDream: iirc it treats the submodule directory as a file containing just the hash of the submodule, or something like that	13:14
	← eagles0513875__ left	13:15
	→ juvenal joined	13:17
	→ WeS joined	13:17
	→ endiruna joined	13:19
	→ chitopunk joined	13:19
	→ ronny joined	13:19
	← Zariel left	13:19
DolphinDream	moritz, http://pastebin.com/KdYYuhpW	13:20
	← juvenal_ left	13:20
DolphinDream	yes.. it is a path.	13:20
	i guess i'm having trouble understanding git's 3 trees :)	13:21
	→ shiriru joined	13:21
DolphinDream	once you add the new submodule to the superproject.. it gets added to the index (if i'm correct) then when i commit it's no longer staged .. then when i commit new commit in the submodule nothing is staged in the superproject, so why would it be in the index?	13:22
	→ CustosL1men joined	13:23
	→ dadamssg joined	13:24
	→ mbrzuzy joined	13:25
	→ Zariel joined	13:25
daynaskully	{Q} is it possible to change a commit message?	13:25
javaJake	Is there a way to tell git, when merging, to ignore certain branch-specific commits?	13:26
	→ MarkyC joined	13:26
javaJake	I'm dealing with a difficult upstream and had to make some changes that are incompatible with them, so I don't want them to see those changes specifically. I do want them to get the rest of it.	13:26
DolphinDream	moritz, what i don't understand i why git diff will tell me the difference of the submodule reference based on the information stored in the index. the way it would make sense to me is if the superproject would have a file that stores the information about the subproject current SHA.. then when i update the submodule with a new commit, the superproject's reference file would change to point to the new submodule's commi	13:27
	t. In this case a git diff in the superproject would show the diff of THAT particular file (as it is in the working directory, not in the index).	13:27
	→ bmilesp joined	13:28
	→ kl3 joined	13:30
kl3	How can I extract my changes to a patch file with git?	13:30
bremner	git diff or git format-patch	13:31
BtbN	git show the commit. It's a valid unified diff.	13:31
bremner	or that.	13:31
	← joo-_ left	13:31
	→ EduardoMartins joined	13:32
	→ joo-_ joined	13:33
	← aseidl left	13:33
	→ BigWillie joined	13:33
	→ sburgess joined	13:33
	→ jmckind joined	13:33
	→ nerd joined	13:33
	→ aseidl joined	13:34
	← nettoweb left	13:34
	← joo-_ left	13:34
	→ lindenle joined	13:35
	← SpaghettiCat left	13:35
	← lindenle left	13:36
	← endiruna left	13:37
	→ shuaib joined	13:37
	← Timvde left	13:38
	← shuaib left	13:38
	← nerd left	13:38
	→ nerd joined	13:39
	← nphard left	13:39
	→ javster joined	13:39
Peng	daynaskully: Yes, but it will change the ID, just like any other form of rewriting history.	13:40
	← javster_ left	13:40
	→ Manikandan joined	13:40
	→ Timvde joined	13:40
	→ nphard joined	13:41
	← nphard left	13:41
	→ lbv-user joined	13:42
	→ sheilong joined	13:43
	→ PCatinean joined	13:44
	→ themightyabby joined	13:44
	← DTekk left	13:44
	← LBV_User left	13:45
	← elsevero left	13:46
	→ Steadfast joined	13:46
	→ elsevero joined	13:47
	← s8321414 left	13:47
nedbat	I'm trying to understand reset --keep. The tables in the Discussion of this man page are very helpful: https://www.kernel.org/pub/software/scm/git/docs/git-reset.html But I'm trying "git reset --keep HEAD", and it is refusing to reset. According to the tables, if HEAD and target agree (which they must if HEAD is the target), then --keep will succeed. What am I missing?	13:47
	→ ghoti joined	13:47
	→ shinnya joined	13:48
	→ krawchyk_ joined	13:50
	← aseidl left	13:52
	← krawchyk left	13:53
	← Nizumzen left	13:53
	→ aseidl joined	13:54
	← mkoskar left	13:54
	→ lindenle joined	13:54
	← fracting left	13:56
	→ kadoban joined	13:56
	→ tristanp joined	13:56
	← jaafar left	13:56
	← dwmw2_gone left	13:57
	← NeverDie left	13:57
	← eGGsha left	13:58
	→ endiruna joined	13:59
	→ thiago joined	13:59
	→ dwmw2_gone joined	14:01
	→ roqvist joined	14:01
	← endiruna left	14:03
	← dwmw2_gone left	14:03
	→ dwmw2_gone joined	14:03
	gitinfo set mode: +v	14:05
roqvist	so after upgrading to git 2.5, gvim diff (gvim.exe -d file1 file2) stopped working when calling it from within git-bash.exe. anyone else having this problem?	14:05
	→ weox joined	14:05
	→ editshare-ericf joined	14:05
osse	define "stopped working"	14:05
	→ eGGsha joined	14:06
	← editshare-ericf left	14:06
	→ Spacew00t joined	14:07
	→ editshare-ericf joined	14:07
	← leatherface416 left	14:07
	→ Tyrannosaur joined	14:08
DolphinDream	submodules question still: is there a file in the superproject repo that stores the current SHA of the subproject ?	14:08
	→ leatherface416 joined	14:09
osse	.gitmodules	14:09
	← kl3 left	14:10
	→ cbonobo joined	14:11
	→ jaafar joined	14:12
	→ edaught joined	14:12
	→ mellernoia-work joined	14:12
	← mellernoia left	14:13
	→ Ahmed90 joined	14:13
	← roqvist left	14:14
	← eGGsha left	14:14
	→ xfbs joined	14:14
	→ ThomasLocke joined	14:14
	← Tyrannosaur left	14:15
	← aseidl left	14:15
	→ LBV_User joined	14:15
	→ darkbasic_ joined	14:15
DolphinDream	osse, the .gitmodules just stores the module name , path and URL.. but not the current SHA	14:16
milki	osse: DolphinDream: the SHA? its in the tree object, git ls-tree HEAD -- /parent/dir/of/submodule	14:16
	← darkbasic left	14:16
milki	it will be the commit object in the tree	14:16
	← dsdeiz left	14:16
milki	as opposed to a blob or another tree	14:17
	→ NeckBeardPrince joined	14:17
milki	.gitmodules is only glue to tell you where that sha came from	14:17
DolphinDream	milki, i know the command will tell me that, it's just i dont' understand where is that info stored ? where is that file? is it in .git folder somewhere in a particular file ?	14:17
milki	DolphinDream: !gitconcepts	14:17
	hmm	14:17
	DolphinDream: !concepts	14:17
gitinfo	DolphinDream: "Git Concepts Simplified" explains the basic structures used by git, which is very helpful for understanding its concepts. http://gitolite.com/gcs.html	14:17
milki	DolphinDream: read about tree objects	14:17
	→ aseidl joined	14:18
DolphinDream	ok	14:18
milki	DolphinDream: it is one of those long 40bit character git objects in the .git folder	14:18
	DolphinDream: but dont try to read or understand the file itself, read about what a tree object is	14:18
	← lg188 left	14:18
	→ NeverDie joined	14:18
	← lbv-user left	14:19
DolphinDream	so when you git submodule add submodulepath .. a new "tree object" is created in the .git folder to store that SHA information?	14:19
	← pratikmallya left	14:19
	→ Brain joined	14:19
milki	that + metainfo in .gitmodules	14:20
DolphinDream	sure	14:20
	← gfixler left	14:20
	← CustosL1men left	14:21
	← [Brain] left	14:22
	← arup_r_ left	14:23
	→ T3ng` joined	14:23
	→ DenBeke joined	14:24
	→ skorgon joined	14:25
	→ [Brain] joined	14:25
	→ cdown joined	14:26
	← shiriru left	14:27
	← diegoviola left	14:27
	→ interrobangd joined	14:28
	← linuxmint2 left	14:28
	← jalnt left	14:28
	← anth0ny left	14:28
	→ javlens joined	14:29
	← Brain left	14:29
	→ anth0ny_ joined	14:30
	← Zariel left	14:31
	→ otter768 joined	14:31
	→ Zariel joined	14:32
	← T3ng` left	14:32
	← skylite left	14:33
	→ nerd_ joined	14:33
DolphinDream	can a merge commit have more than 2 parents ?	14:34
osse	yes	14:34
DolphinDream	really? :)	14:34
	how so?	14:34
osse	from master: git merge feature1 feature2 feature3	14:34
DolphinDream	3 way merge ?	14:34
osse	4 way in this case	14:34
DolphinDream	oh .. i see now. i have never done that	14:34
osse	67-way in this case: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2cde51fbd0f3	14:35
	← nerd left	14:35
osse	i mean 66	14:35
DolphinDream	:) holy merge	14:35
	→ anjen joined	14:35
	→ dsdeiz joined	14:36
	← otter768 left	14:36
	→ nettoweb joined	14:36
Seveas	amosb: (sorry, had sudden visitors) then you should create branches with your changes. assume-unchanged is a horrible way of having local changes.	14:36
	→ tomog999_ joined	14:36
	← cdown left	14:37
	→ daito joined	14:37
	→ rubie joined	14:37
DolphinDream	it says here :http://gitolite.com/gcs.html#(17) .. HEAD is a symbolic ref that points to the current branch.. however, i know that if you checkout a specific SHA (detached HEAD) the head does not point to a specific branch.. but a specific SHA. Is the info on the gitolite imprecise ?	14:37
	→ cdown joined	14:37
osse	DolphinDream: it should say "HEAD is a symbolic ref that usually points to the current branch"	14:38
DolphinDream	yeah HEAD	14:38
	→ zana joined	14:38
Seveas	DolphinDream: http://marc.info/?l=linux-kernel&m=139052192416013&w=2	14:38
	← penna_ left	14:38
	← zana left	14:39
	← tomog999 left	14:39
DolphinDream	but if you checkout a specific SHA you are in detached HEAD.. so HEAD does not point to a particular branch anymore	14:39
	→ IrishPrime joined	14:39
osse	correct	14:39
DolphinDream	so sitaram's slides are somewhat incomplete :)	14:40
	→ Vwn joined	14:40
	← Vwn left	14:40
osse	if that minor issue is the only error I think he's done a pretty good job!	14:40
nedbat	no one knows how reset --keep works? :)	14:41
osse	_ikke_ does	14:41
	← daito left	14:42
	→ astockton joined	14:43
	← rchavik left	14:44
	nedbat waits for _ikke_	14:44
	← Alienpruts left	14:45
	→ penna_ joined	14:47
	→ keroro520 joined	14:47
	→ modocache joined	14:48
	→ reim joined	14:48
	← elsevero left	14:48
	← Suganthi left	14:48
	← cdown left	14:49
	→ jmpp joined	14:49
	→ cdown joined	14:49
	← cdown left	14:50
	← acolson left	14:50
	→ cdown joined	14:51
	→ devoldmx joined	14:51
	← modocache left	14:52
DolphinDream	osse :) sure sitaram has done a pretty good job :) i'm not blaming him for anything. just trying to get my grossly incomplete understanding of git straighten out	14:53
	← jmpp left	14:54
heftig	is there any way to increase git add/reset/checkout/stash -p hunk size?	14:54
	← reim left	14:54
heftig	i.e. lines of context	14:54
	← dwmw2_gone left	14:55
	→ pratikmallya joined	14:55
	← devoldmx left	14:55
	→ dwmw2_gone joined	14:56
	→ SimonNa joined	14:57
	← Manikandan left	14:57
	→ Brain joined	14:57
	→ CustosL1men joined	14:57
milki	heftig: if its not in config, then i dunno	14:58
	→ DTekk joined	14:58
	← interrobangd left	14:59
	← NeverDie left	14:59
	← jagob left	14:59
	← rscata left	15:00
	← [Brain] left	15:00
	→ [Brain] joined	15:00
	→ sinkensabe joined	15:00
	← Spacew00t left	15:00
	→ NeverDie joined	15:01
	← penna_ left	15:01
	→ cdown_ joined	15:01
	← Brain left	15:01
	← cdown left	15:02
	cdown_ → cdown	15:02
iwkse	hi, if I'm working on a local branch, can I pull changes from remote directly to this? or I have to switch to master, pull and merge?	15:02
osse	iwkse: yes	15:02
DolphinDream	are all the git object's files ? (e.g. blob, tree, commit, tag)	15:02
	← gua_ould left	15:03
	→ darkbit joined	15:03
osse	DolphinDream: Can be, but many will be combined and compressed into packs	15:03
	The packs are files	15:03
DolphinDream	so they are actual binary files (packed or not) that signify each type	15:03
	→ BBBThunda joined	15:03
osse	What do you mean by signify?	15:04
DolphinDream	meaning, the tree object (that can contain other trees and blobs) are not actually folders... but binary files holding this hierarchical structure	15:04
osse	yes	15:04
	→ tang^ joined	15:04
DolphinDream	got it	15:05
	← ironGiant left	15:05
DolphinDream	and the name of these files is the SHA itself, right ?	15:05
	minus first 2 characters of the SHA which are stored in the 2-char folder names	15:06
	→ sctskw joined	15:06
osse	yes	15:07
DolphinDream	what happens if two SHAs start with the same 2 characters? I assume there will be multiple files within the same 2-char folder	15:08
	yep. :) i just saw that	15:08
	← skorgon left	15:08
	→ njbair joined	15:09
amosb	Seveas: then how can I sync my work with others if I'm on this special branch	15:09
	→ r3g3x joined	15:09
	→ bendangelo joined	15:09
	→ penna_ joined	15:10
	← dwmw2_gone left	15:10
	→ reim joined	15:10
	← roelmonnens left	15:10
	← njbair left	15:10
	← r3g3x left	15:10
	→ Brain joined	15:11
	→ StuartMI joined	15:11
DolphinDream	submodule Q: why is it that when the submodule is updated with a new commit, the superproject git submodule update will reset the submodule to point to the previous commit without warning the user that the submodule's new commit may be lost ?	15:11
	→ fertorresf joined	15:11
	← Sceorem left	15:11
	→ dwmw2_gone joined	15:12
milki	DolphinDream: you didnt record the submodule update in the superproject	15:12
	← NeverDie left	15:12
DolphinDream	of what i read this is one of the caveats of using submodules, and I was wondering why git doesn't have any safeguards againts this	15:12
milki	DolphinDream: you need to git add that change	15:12
	→ njbair joined	15:12
DolphinDream	milki, yes i know.	15:12
	← jceb left	15:12
	← Zariel left	15:12
milki	once you've added and committed, submodule update will make sure the submodule is at the recorded sha	15:12
	→ oojacoboo joined	15:12
DolphinDream	but in case you have not done that just yet.. and accidentally do a git submodule update in the superclass you can loose your submodule changes without git warning you about it	15:12
	← denimsoft left	15:13
	→ ProT-0-TypE joined	15:13
DolphinDream	superclass = superproject	15:13
milki	DolphinDream: its a repo, the submodule commits are all still there	15:13
	→ diegoviola joined	15:13
milki	o, i dont know what it does for uncommitted changes though...	15:13
	← [Brain] left	15:13
	→ NeverDie joined	15:14
	← sinkensabe left	15:14
DolphinDream	i know you can still retrieve them until the garbage collection goes through.. but still, i think git should at least warn you about it before updating the submodule. Perhaps it shoudl be done in this case via a -f flag to enforce the update ?	15:14
	milki shrugs	15:14
milki	DolphinDream: maybe you are not using the submodule workflow correctly	15:14
DolphinDream	i think it does not do anyting since there is nothing to revert to..	15:15
milki	if you are guessing at the workflow, you should probably read about it first	15:15
	DolphinDream: submodules solve a workflow problem, not a git repo organization problem	15:15
	← Raging_Hog left	15:15
	← TomyWork left	15:15
DolphinDream	i'm learnign about it now.. not actually using it, but trying to figure out what are the possible gotchas. reading about it i see other people point out that this is an issue you have to be careful about.	15:15
	← reim left	15:16
	← bendangelo left	15:16
	← bonswouar left	15:16
	→ lpapp joined	15:16
	→ r3g3x joined	15:16
lpapp	hey, why is the merge conflict showing me differences that are not actual difference, as in:	15:16
	← Brain left	15:16
	→ Zariel joined	15:16
	← penna_ left	15:16
lpapp	both branches that I am trying to merge diveged from a common anchestor, but in the same way as the fix was cherry-picked from one branch to the other.	15:16
	I see no reason for this to be a merge conflict, so why is git telling me that?	15:17
	→ MechtiIde joined	15:17
milki	DolphinDream: if you dont follow the workflow precisely, you will hit those gotchas probably	15:17
DolphinDream	milki, since submodule is part of git .. i'd say that it is also a git organization problem IMO:)	15:17
	← cyphase left	15:17
	→ cyphase joined	15:17
milki	DolphinDream: no, thats not the intent of submodule	15:17
	DolphinDream: its got a lot of history behind it	15:17
	cyphase → Guest55234	15:17
DolphinDream	milki, agree. but i think there should be also some safeguards in place.	15:17
milki	mostly misuse and abuse	15:17
DolphinDream	misues and abuse ? how?	15:18
	→ skorgon joined	15:18
milki	by not following the workflow and complaining about it	15:18
	← skorgon left	15:18
	→ skorgon joined	15:18
	→ denimsoft joined	15:18
milki	it solves a very specific issue	15:18
	← darkbasic_ left	15:18
milki	if you dont have that issue, you shouldnt use it	15:19
	→ darkbasic joined	15:19
	← nerd_ left	15:19
	← dwmw2_gone left	15:19
DolphinDream	milki, i see. though if git offers the submodule option, and working with submodule can be somewhat cumbersome it should try to make using submodule a bit easier.. and safer.	15:20
milki	if you call it a repo organization issue, then you shouldnt use submodule cuz thats not what it solves	15:20
	→ spykins joined	15:20
	← thiago left	15:21
milki	DolphinDream: sure, thats valid. theres a lot of cases where failure modes arent captured properly still	15:21
DolphinDream	perhaps is not a repo organization issue. but it's a git/submodule as a tool issue.	15:21
qsuscs	submodules usually suck.	15:21
	→ King_Hual_ joined	15:22
qsuscs	they are actually a hack and, if i remember right, were to be replaced quickly	15:22
milki	o yeah, totally a hack	15:22
DolphinDream	by what ?	15:22
milki	lets shove a sha into the git tree	15:22
	DolphinDream: well, makefiles really	15:22
qsuscs	yo dawg i herd yu liek checksums	15:22
milki	DolphinDream: the problem can be solved entirely by proper build scripts	15:22
qsuscs	so we put a SHA1 in your SHA1d tree so that you can hash while you hash	15:22
	it’s usually for software dependencies	15:22
	→ agnitio joined	15:23
qsuscs	which should be solved by $packagemanager, like, python setuptools, haskell cabal, ruby gems, etc. pp.	15:23
DolphinDream	what if i want version A of an app to be linked to version B of a library (each in a different repo) ? submodules would freeze together a version A of the app with the version B of the library . what's wrong with that ?	15:23
milki	DolphinDream: you can use metadata to freeze your versions	15:23
	version dependencies!	15:23
	← Guest55234 left	15:23
milki	DolphinDream: theres are all solved issues >.>	15:24
	its just not all package managers support repositories as sources i suppose	15:24
DolphinDream	like separate files in the superproject that point to some versions for each library it uses ?	15:24
milki	but rather published packaged versions	15:24
	→ dreiss joined	15:25
milki	DolphinDream: e.g. python has setup.py requirements and tox has requirements.txt files	15:25
	bowser has bower.json	15:25
	er	15:25
	bower..	15:25
	and uh	15:25
	→ penna_ joined	15:25
milki	perl has... Build.PL	15:25
	java has pom.xml	15:25
	DolphinDream: btw, are you trying to solve a library versioning issue now?	15:26
DolphinDream	sort of	15:27
milki	DolphinDream: what language?	15:27
DolphinDream	c++	15:27
milki	o...	15:27
	→ crose joined	15:27
milki	i dont know c++ package management.....	15:27
	← Zariel left	15:27
milki	:P	15:27
	gl	15:27
	← rubie left	15:27
	← ntwari left	15:28
DolphinDream	migrating from CVS to git .. trying to reorganize my CVS modules in individual git repos but keep a better dependancy between the apps and the libraries as i move them to git.	15:28
	→ rubie joined	15:28
sitaram	DolphinDream: if you know what a detached HEAD is, you don't really need my doc. And if you don't, sldie seventeen is not the place to introduce it. Go on to slide forty-eight if you want to see what that page says about detached HEAD	15:28
	osse: ^	15:28
	DolphinDream: even the wording in slide 48 is significant, in the context of your comment about the slides	15:29
DolphinDream	sitaram, i'm still reading the slides :) i got it figured out though.	15:29
	→ Spacew00t joined	15:29
	← zacts left	15:29
sitaram	shrug	15:30
DolphinDream	sitaram, your slides are fine. my understanding has many gaps i'm still patching.	15:30
	← sctskw left	15:32
	← keroro520 left	15:32
	→ t3rm joined	15:32
	→ dwmw2_gone joined	15:33
	← nettoweb left	15:33
	→ nettoweb joined	15:33
	← str left	15:34
	→ bango2 joined	15:34
	→ zacts joined	15:35
	← dwmw2_gone left	15:35
	→ dwmw2_gone joined	15:35
	← denimsoft left	15:35
	← halfline left	15:36
	→ nerd joined	15:36
	← dwmw2_gone left	15:37
	→ dwmw2_gone joined	15:37
	→ abacuspowers joined	15:37
	← skorgon left	15:37
	← dsdeiz left	15:37
	→ cerulean__ joined	15:37
	→ halfline joined	15:38
	← halfline left	15:38
	← msankhala left	15:38
	← dwmw2_gone left	15:38
	→ reim joined	15:38
	→ dwmw2_gone joined	15:38
	← madewokherd left	15:38
	→ rmrrn joined	15:38
	← Balliad left	15:39
	← cerulean__ left	15:39
rmrrn	in .gitignore, is /foo/ equivalent to foo/** ?	15:39
scottg489	What is the best method for migrating a mercurial repo over to git? I've googled around but a lot of the stuff I get is a few years old.	15:39
DolphinDream	milki, so for dependencies you would have to have a specific file in your repo that lists all the dependent libraries together with their "frozen" versions ?	15:39
	→ halfline joined	15:39
qsuscs	scottg489: i’d use hg-git	15:40
	→ Manikandan joined	15:40
	→ unforgiven512 joined	15:40
qsuscs	scottg489: https://hg-git.github.io/	15:40
	← lpapp left	15:41
scottg489	qsuscs: I also saw this: git clone hg::/path/to/your/repo	15:41
	→ joo-_ joined	15:42
scottg489	Is that not recommended?	15:42
	← nnyk left	15:42
	→ jessu joined	15:42
qsuscs	scottg489: hg-git is better than git-remote-hg	15:42
	→ darkbasic_ joined	15:43
	→ Brain joined	15:43
jessu	Hello I am on widnows and it says	15:43
scottg489	ok	15:43
jessu	atal: unable to access 'https://github.com/jessu/Testing.git/': Couldn't resolve host 'github.com'	15:43
	fatal*	15:43
	its ssh key problem?	15:43
	how I set ssh keys on windows?	15:43
	← nerd left	15:43
	← darkbasic left	15:43
	→ nnyk joined	15:44
livcd	so i have a 2 local branches 1) a -> latest data 2) master -> test data, old (i'd like to keep them) and remote repository from the master branch that contains the new stuff from other branch	15:44
	how do i push the "a" branch to the master ?	15:45
	→ denimsoft joined	15:45
qsuscs	livcd: git push $remote a:master	15:45
	← shinnya left	15:46
DolphinDream	qsuscs, if submodules is a hack.. why was it added to git ?	15:46
scottg489	qsuscs: ii	15:46
qsuscs	DolphinDream: because it was needed, then	15:46
DolphinDream	then = ? and why not now ?	15:47
ToxicFrog	jessu: 'couldn't resolve host' means it can't do the DNS lookup. Check your net connection for workingness. Try 'ping github.com'.	15:47
	It's not a git problem.	15:47
livcd	qsuscs: thanks worked ;)	15:48
jessu	ToxicFrog: iys pinging git	15:49
	→ T3ng` joined	15:49
jessu	ToxicFrog: but I never gave me ssh anywhere	15:49
	that is not the problem??	15:49
	← oojacoboo left	15:49
	→ Dzejmskrokan joined	15:49
	→ m0ltar joined	15:50
	→ [Brain] joined	15:50
	← nettoweb left	15:51
	→ oojacoboo joined	15:51
	→ nettoweb joined	15:51
	→ devoldmx joined	15:51
	→ mkoskar joined	15:52
	← jiggerypokery left	15:52
jessu	can anyone help me please?	15:52
scottg489	qsuscs: Out of curiosity, why is hg-git better?	15:52
qsuscs	scottg489: shrug it is said to be more reliable, especially in corner cases	15:53
	← Brain left	15:53
DolphinDream	qsuscs, then = ? and why not now ?	15:53
scottg489	alright then	15:53
	← nnyk left	15:53
	dwmw2_gone → dwmw2	15:53
	← hahuang65 left	15:54
	← Guest32844 left	15:55
qsuscs	DolphinDream: do i look like a developer? ask the list	15:55
	→ juboba_ joined	15:55
	→ Zariel joined	15:56
	← devoldmx left	15:56
	← Zariel left	15:56
	← denimsoft left	15:56
	→ juboba joined	15:56
	→ Zariel joined	15:56
	← Zariel left	15:56
juboba	I just rolled back to another revisio	15:57
	n	15:57
	how can I go back to HEAD?	15:57
heftig	juboba: rolled back how?	15:57
qsuscs	juboba: you are always at !HEAD	15:57
gitinfo	juboba: HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	15:57
	→ Zariel joined	15:57
	← Zariel left	15:57
	← tristanp left	15:57
	→ Zariel joined	15:58
juboba	qsuscs: yeah, sorry. I meant go back to the last commit ^^	15:59
	← Dzejmskrokan left	15:59
	← amosb left	15:59
juboba	I'll just checkout the branch	15:59
	← Darcidride left	15:59
	← ThomasLocke left	16:00
	→ nemix joined	16:00
	← juboba_ left	16:00
jessu	qsuscs: can you please help me mod?	16:01
	← reim left	16:01
	→ blackpajamas joined	16:03
	→ Mannequin joined	16:03
	← abacuspowers left	16:04
rmrrn	Is anyone familiar with .gitignore rules? In theory 'foo/' and 'foo/**' should do the same thing, but it's not the case for me.	16:05
	I appreciate the latter ignores the contents, rather than the foo directory itself, but it seems the two are acting completely different for me.	16:06
	← howlymowly left	16:06
	→ thiago joined	16:06
rmrrn	'foo/' seems to ignore ANY path containing 'foo' whereas 'foo/**' seems to only ignore files in the root 'foo' directory.	16:06
	→ madewokherd joined	16:07
	← bahar_ left	16:07
	← chimay left	16:07
	→ bakers joined	16:08
	← mbrzuzy left	16:09
bakers	Let's say I clone a repo I know nothing about. How do I see which branch is the most recently updated?	16:09
	I'm trying to "guess" which branch is being actively worked on	16:09
	← Zariel left	16:09
Celelibi	Probably the first ones to appear in a git log.	16:10
	git log --oneline --decorate --graph --all	16:10
	→ reim joined	16:11
	→ pratikma_ joined	16:12
	→ irqq joined	16:12
	→ Zariel joined	16:12
	← Zariel left	16:12
	→ Zariel joined	16:13
	→ imachuchu joined	16:14
	← pratikmallya left	16:14
	← juboba left	16:15
	← diegoviola left	16:15
	→ abacuspowers joined	16:16
atrus	i know a ref that a remote has (i can ssh there and look at it), but i'd like my local repo to have that ref. the remote doesn't have any branches that point at it, so a normal fetch doesn't include it. is there a way to tell fetch (or similar) "pleaese grab this ref in particular"? http://stackoverflow.com/questions/18878489/retrieving-orphaned-commit-object-after-push-force seemed unoptimistic anyways	16:17
	→ modocache joined	16:18
atrus	and no, i can't just go to the remote and create a branch that points at it... unless i could create it locally somehow and push the branch, which i can't seem to do without the commit	16:18
_ikke_	atrus: do you mean ref or commit?	16:18
	You cannot fetch arbitrary commits	16:18
	→ donnib joined	16:18
atrus	i guess i'm not sure what the difference would be in this context	16:19
	→ Brain joined	16:19
_ikke_	a branch is a ref, which points to something	16:19
	a commit is an object, containing information about hte commit	16:19
	← ProT-0-TypE left	16:19
_ikke_	You seem to describe you want a commit that the remote has, but not reachable via any ref	16:20
atrus	ah, ok, then yeah, it's really the commit (including its sha) that i want locally	16:20
_ikke_	I'm afraid git does not allow that	16:20
atrus	_ikke_: right.	16:20
	i don't suppose i could push a ref to that commit without having the commit locally somehow?	16:21
_ikke_	nope	16:21
	← ilmgb_ left	16:21
	← [Brain] left	16:21
	→ ilmgb joined	16:22
	→ diego4 joined	16:22
	← reim left	16:22
	→ mbrzuzy joined	16:23
	← bb010g left	16:23
	→ ilmgb_ joined	16:23
	← ilmgb_ left	16:23
	← diego4 left	16:24
	→ diego4 joined	16:24
	diego4 → diegoviola	16:24
	← m0ltar left	16:24
	→ ilmgb_ joined	16:24
	← guampa left	16:25
	→ snowcycle joined	16:25
	→ nnyk joined	16:25
_ikke_	I wonder what in the git protocol would prevent this, if there is something at all?	16:25
	← ilmgb left	16:26
	→ daito joined	16:28
	← ilmgb_ left	16:29
	← lacrymology left	16:29
	→ lbv-user joined	16:30
	→ m0ltar joined	16:30
	→ reim joined	16:31
	→ guampa joined	16:31
	← m0ltar left	16:31
	← oojacoboo left	16:31
	← geoid left	16:31
	→ otter768 joined	16:32
	← daito left	16:32
	← LBV_User left	16:33
	← gecko19_ left	16:33
	← lbv-user left	16:34
	→ aretecode joined	16:34
	← nettoweb left	16:34
	← T3ng` left	16:34
	← mikecmpbll left	16:34
	→ nettoweb joined	16:35
	← kurkale6ka left	16:35
	→ Gama11 joined	16:35
	→ sbogg joined	16:36
	← donnib left	16:36
	← otter768 left	16:37
	← reim left	16:37
	→ jonmorehouse joined	16:37
	← astockton left	16:38
	→ MaceBewley joined	16:39
	← freimatz left	16:40
	← aswen left	16:41
	← mkoskar left	16:41
	→ denimsoft joined	16:42
	→ [Brain] joined	16:42
	← sonOfRa left	16:43
	→ sonOfRa joined	16:43
	→ LBV_User joined	16:44
ojacobson	You -can- push a ref for a commit you don't have, but git's tooling has no way to do so	16:45
	you'd have to cook something up that speaks the wire protocol, and even then you'd have to fake up the "so, which objects do you have" part of the conversation convincingly enough	16:45
	→ drewo joined	16:45
	← weox left	16:45
	→ Nizumzen joined	16:46
	← Brain left	16:46
_ikke_	ojacobson: Yeah, I figured so	16:46
	← joo-_ left	16:46
	← Zariel left	16:46
	→ astockton joined	16:47
_ikke_	ojacobson: Usually you only have to advertise heads, not?	16:47
	← darkbasic_ left	16:47
	→ darkbasic joined	16:47
ojacobson	_ikke_: you advertise the refs you're pushing; git-receive-pack doesn't care about refs/heads/ vs other namespaces	16:48
	← PaulCapestany left	16:51
	← dreiss left	16:51
	→ diego4 joined	16:51
	→ Zariel joined	16:52
_ikke_	Yeah, I meant refs	16:52
	→ PaulCapestany joined	16:53
	→ durham joined	16:53
	← diegoviola left	16:54
	← diego4 left	16:54
	→ joo-_ joined	16:55
	← nour left	16:55
	← chll left	16:56
	← Zariel left	16:57
	← spykins left	16:57
	→ diego4 joined	16:57
	← diego4 left	16:57
	→ diego4 joined	16:57
	→ hahuang65 joined	16:58
	→ keroro520 joined	16:58
	← keroro520 left	16:59
	← nettoweb left	16:59
	→ keroro520 joined	17:00
	← NeckBeardPrince left	17:01
	← agnitio left	17:03
	→ Brain joined	17:03
	→ pavster joined	17:03
	→ nettoweb joined	17:04
	← cdown left	17:05
	← [Brain] left	17:06
	→ bilb_ono joined	17:06
	← Ahmed90 left	17:06
	← heroux left	17:07
	← irqq left	17:07
	→ jmpp joined	17:07
	→ geoid joined	17:07
	← mbrzuzy left	17:08
	← leatherface416 left	17:08
	← denimsoft left	17:08
	← holodoc left	17:09
	→ holodoc joined	17:09
	← holodoc left	17:10
	→ mkoskar joined	17:10
	→ holodoc joined	17:11
	← CustosL1men left	17:11
	← holodoc left	17:11
	→ holodoc joined	17:12
	→ duckmaestro joined	17:12
	← duckmaestro left	17:12
	← jmpp left	17:12
	← bmilesp left	17:12
	← sanketdg left	17:13
	← blackpajamas left	17:13
	→ leatherface416 joined	17:13
	← holodoc left	17:14
	→ holodoc joined	17:14
	→ Manikandan_ joined	17:15
	← bongjovi left	17:15
	← xfbs left	17:16
ojacobson	Then, yeah, exactly :)	17:16
	→ xfbs joined	17:16
	→ jagob joined	17:16
	← Manikandan left	17:17
	→ Klausmeier joined	17:18
	→ denimsoft joined	17:19
	← nettoweb left	17:19
_ikke_	So you can basically just tell the remote you want to advertise a new ref with that commit	17:20
	← xfbs left	17:20
	→ T3ng` joined	17:20
	← multi_io left	17:21
_ikke_	But I guess there is more involved	17:21
	→ mbrzuzy joined	17:22
	→ bmilesp joined	17:22
	→ multi_io joined	17:23
	ChanServ set mode: +o	17:24
	Eugene changed the topic to: Welcome to #git, the place for git help and serious discussion \| Current stable version: 2.5.2 \| Start here: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Help wanted: https://madeitwor.se/git-jokes today!	17:24
	Eugene set mode: -o	17:24
	→ voodo joined	17:24
	← joo-_ left	17:24
	→ sanketdg joined	17:26
	→ ril joined	17:26
ojacobson	_ikke_: yeah, as far as I know git will still attempt to negotiate a minimal pack, even if it already has the commit	17:27
	the negotiation is very short in that case but still happens	17:27
	→ CustosL1men joined	17:27
bakers	Is there a way with gitignore to say "ignore everything in this directory EXCEPT these two files/dirs"	17:27
	→ dstarh joined	17:28
_ikke_	dir\n!file\n!file2	17:28
bakers	_ikke_: Ok I can try that	17:29
	→ icio joined	17:29
	← mkoskar left	17:30
	← mfonda left	17:30
	→ haskellberry_pie joined	17:30
haskellberry_pie	how do i gitignore executables?	17:30
	← tang^ left	17:31
	← skullcrasher left	17:31
	→ jceb joined	17:31
_ikke_	haskellberry_pie: gitignore works on paths, not on attributes	17:31
	← T3ng` left	17:31
	← voodo left	17:31
	← denimsoft left	17:32
	→ tang^ joined	17:32
	→ denimsoft joined	17:32
	← dstarh left	17:32
	← drewo left	17:33
	→ heroux joined	17:35
	→ NeckBeardPrince joined	17:35
	→ ilmgb joined	17:36
	→ cerkauskas joined	17:37
	→ [Brain] joined	17:37
Eugene	bakers - another thing to note is `git add -f` to add despite being ignored ;-)	17:38
	→ jteneyck joined	17:39
	← ilmgb left	17:40
Celelibi	Is there a way to have git to update the submodules whenever I checkout another revision of the main repository?	17:40
	← sanketdg left	17:40
	→ mjrcox joined	17:40
	← mjrcox left	17:41
Celelibi	I mean, it's like you checkout a revision and everything is updated except a given file.	17:41
	That doesn't make sens.	17:41
	→ mjrcox joined	17:41
	← Brain left	17:41
	← mjrcox left	17:41
	← Nizumzen left	17:42
qsuscs	haskellberry_pie: ignore "*". it will certainly, amongst some collateral damage, ignore executables.	17:43
	→ d5sx43 joined	17:43
	← d5sx43 left	17:45
	← jstimm left	17:45
	→ jstimm joined	17:45
	→ Sasazuka joined	17:46
	→ toothe joined	17:47
	→ snthsnth joined	17:47
	← bilb_ono left	17:48
	← [Brain] left	17:49
toothe	i just merged some code into my development branch. When I do `git push`, it says: refusing to update checked out branch: refs/heads/development By default, updating the current branch in a non-bare repository is denied, because it will make the index and work tree inconsistency..."	17:51
	I don't understand this error.	17:52
	→ drewo joined	17:52
_ikke_	!bare	17:52
gitinfo	an explanation of bare and non-bare repositories (and why pushing to a non-bare one causes problems) can be found here: http://bare-vs-nonbare.gitrecipes.de/	17:52
toothe	ohhh, i think i got it	17:52
	the repo was checking out development	17:52
	i just checked out master	17:52
	→ crayon joined	17:53
nedbat	I'm trying to understand reset --keep. The tables in the Discussion of this man page are very helpful: https://www.kernel.org/pub/software/scm/git/docs/git-reset.html But I'm trying "git reset --keep HEAD", and it is refusing to reset. According to the tables, if HEAD and target agree (which they must if HEAD is the target), then --keep will succeed. What am I missing?	17:53
	← nnyk left	17:54
	← leatherface416 left	17:55
	← snthsnth left	17:55
toothe	so, the central repo can ONLY have the master branch checked out?	17:55
	otherwise it'll cause an issue?	17:55
	← astockton left	17:56
	→ donnib joined	17:56
	→ leatherface416 joined	17:56
_ikke_	toothe: Read into bare repositories and what problems they solve	17:57
	toothe: git reset --keep HEAD is a noop	17:57
nedbat	_ikke_: hmm, i see, I think?	17:58
	← darkbit left	17:58
	← haskellberry_pie left	17:59
	→ dreiss joined	17:59
	→ elsevero joined	17:59
Eugene	toothe - you should not be using a non-bare repo for your central repo. Are you trying to !deploy ?	17:59
gitinfo	toothe: 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	17:59
	← NeverDie left	17:59
	→ ilmgb joined	18:01
	← kappy left	18:01
	→ T3ng` joined	18:02
toothe	Eugene: no, im just a noob.	18:02
Eugene	Aha, well there's your problem.	18:03
toothe	yeah, noobs shoudln't use git.	18:03
Eugene	You should be using a --bare repo for pushing-to ;-)	18:03
toothe	no, i got it. Bare repo.	18:03
Eugene	Far from it: git is just simpler than you think it is.	18:03
	→ joel_falcou joined	18:03
	← encod3 left	18:04
Eugene	I almost always recommend using a git service(eg, Github) instead of trying to host your own	18:04
_ikke_	or use gitolite	18:04
preaction	yes, gitolite	18:04
	→ joo-_ joined	18:05
	→ d5sx43 joined	18:05
	← dreiss left	18:05
	← d5sx43 left	18:06
	← DenBeke left	18:06
	← mbrzuzy left	18:07
	→ Manikandan__ joined	18:07
	← aard left	18:07
	← LBV_User left	18:08
	→ dionysus69 joined	18:09
	→ ncthom91 joined	18:09
	→ bampersand joined	18:09
	→ cluelessperson joined	18:09
	→ bilb_ono joined	18:10
	← Manikandan_ left	18:10
	← denimsoft left	18:11
	→ darkbit joined	18:11
	→ bb010g joined	18:11
	gitinfo set mode: +v	18:11
	← joki left	18:13
	→ Raging_Hog joined	18:14
	← Raging_Hog left	18:14
	→ mkoskar joined	18:16
	← linuxboytoo left	18:17
	→ linuxboytoo joined	18:18
	→ rpg joined	18:18
	→ mbrzuzy joined	18:18
	→ luksaur joined	18:18
	→ HarryHallman joined	18:18
	→ joki joined	18:18
	→ encod3 joined	18:18
	← holodoc left	18:19
	→ holodoc joined	18:19
	→ roelmonnens joined	18:19
	→ denimsoft joined	18:19
	← Mannequin left	18:20
	→ jrahmy joined	18:21
	← bakers left	18:22
	← denimsoft left	18:23
	→ jmpp joined	18:23
	→ elsevero_ joined	18:24
	→ jigjug joined	18:25
	← bampersand left	18:26
	→ gsingh93_ joined	18:26
	← elsevero left	18:26
	elsevero_ → elsevero	18:26
	→ Ahmed90 joined	18:28
	→ daito joined	18:28
	← encod3 left	18:30
	→ Joel joined	18:30
Joel	How do I hard revert (edit history)?	18:30
	→ Manikandan_ joined	18:30
Joel	well, I want to more than edit history, but I know why you don't hard commit typically.	18:30
	→ benkai joined	18:30
	→ User458764 joined	18:31
_ikke_	What do you want to achieve exactly?	18:31
Joel	take the repo back to a specific commit, not check in files from a specific commit	18:32
	→ skylite joined	18:32
	→ otter768 joined	18:33
benkai	topic on version controlling configuration files, does wrapping applications by selves in a repo make sense, or just initializing the entire folder that engulfs the main dir? what is everyones opinion? specifically version controlling httpd, splunk, and ansible that sit on the same host? everything under the ~/ dir.	18:33
	→ Balliad joined	18:33
Joel	looks like git reset --hard <sha> might od it?	18:33
	← daito left	18:33
preaction	Joel: yes. git reset is likely what you want. --hard also changes the working tree	18:33
	← Manikandan__ left	18:33
	← T3ng` left	18:33
benkai	multiple repositories versus one big one..	18:34
preaction	benkai: i tend to version control a configuration directory. ansible then deploys the httpd and splunk config files	18:34
	benkai: i would use one big one. that should be what ansible, puppet, chef, et. al. are for	18:34
Joel	preaction, yeah, that worked perfectly, thanks.	18:35
	→ ssarah joined	18:35
	← anth0ny_ left	18:35
Joel	preaction, benkai, configs live with my ansible code as templates, code lives off in it's own repos.	18:35
	← stamina left	18:35
Joel	s/code lives/app code lives/	18:35
	if an app can't handle multiple versions of a config O.o	18:36
	→ wwwald joined	18:36
	→ Manikandan__ joined	18:36
	→ anth0ny_ joined	18:36
	← otter768 left	18:37
preaction	for third-party apps, we have a single repo for all configuration. for our own apps, config mostly lives next to the app to be deployed alongside	18:37
	← Manikandan_ left	18:39
Hamled	is there a cli command to find the most recent shared ancestor for two commit refs?	18:39
_ikke_	man git merge-base	18:39
gitinfo	the git-merge-base manpage is available at http://jk.gs/git-merge-base.html	18:39
Hamled	htanks	18:40
	← ril left	18:41
	← jmckind left	18:41
	→ astockton joined	18:42
	← wwwald left	18:42
qsuscs	benkai: https://dotfiles.github.io/ has some ideas	18:42
Joel	In my case I use FPM to package aps, push them to S3 into an apt repo, and pull them down via ansible, so the config files are remote before ansible runs, thus why I keep them with ansible	18:42
qsuscs	benkai: or look at https://github.com/qsuscs/.dotfiles	18:43
	← unholycrab left	18:43
	← Manikandan__ left	18:44
	→ xfbs joined	18:44
	← keroro520 left	18:45
	← tvw left	18:45
	→ grafenmao joined	18:45
ELFrederich	I want to do a rebase but one of commits that'll get rebased is the head of another branch. Is it possible to rebase both branches at the same time?	18:45
	→ kpease joined	18:45
	→ m0ltar joined	18:46
	→ ManikM joined	18:46
_ikke_	no, do it in two steps	18:46
	→ jmckind joined	18:46
	← astockton left	18:46
	← bilb_ono left	18:47
ELFrederich	_ikke_, okay	18:47
	→ sinkensabe joined	18:48
	→ unholycrab joined	18:49
	← xfbs left	18:49
	← User458764 left	18:50
	→ bilb_ono joined	18:51
	← holodoc left	18:52
	→ holodoc joined	18:52
	← sinknode left	18:53
	← jwest left	18:54
	→ astockton joined	18:54
	← holodoc left	18:55
	→ User458764 joined	18:55
	→ nettoweb joined	18:55
	→ holodoc joined	18:55
	→ n00bdev joined	18:55
	← User458764 left	18:55
	← benkai left	18:55
	← nettoweb left	18:56
Hamled	for the -m option to git cherry-pick, where should I be looking to determine which parent is considered 1, which is 2, etc.	18:56
_ikke_	Hamled: most of the time it's 1	18:56
	→ modocach_ joined	18:58
	← drewo left	18:58
	← n00bdev left	18:58
	← dionysus69 left	18:59
	← joo-_ left	18:59
	← sfr^ left	18:59
	→ joo-_ joined	18:59
	→ T3ng` joined	19:00
	← modocache left	19:00
	→ pantsman_ joined	19:00
	← rancyd left	19:00
	← mbrzuzy left	19:01
	← {0xc6} left	19:01
	→ sfr^ joined	19:02
	→ sleungcy joined	19:02
	→ {0xc6} joined	19:02
	← spriz left	19:02
	← Spacew00t left	19:03
	← pantsman- left	19:04
	← teran left	19:04
	→ brucelee joined	19:05
	→ jiggerypokery joined	19:06
	→ spriz joined	19:06
	→ rancyd joined	19:06
	→ xfbs joined	19:06
	→ Spacew00t joined	19:07
	← ilmgb left	19:07
	← Dro__ left	19:07
	← darkbit left	19:07
	→ ilmgb joined	19:08
	← pavster left	19:10
	→ wastrel joined	19:11
	← jmpp left	19:11
	→ nour joined	19:11
	← roelmonnens left	19:11
	← ilmgb left	19:12
	→ mbrzuzy joined	19:13
	→ NeverDie joined	19:13
	→ Corosus__ joined	19:13
	→ ril joined	19:14
	← wastrel left	19:14
	← spriz left	19:15
	→ BullHorn joined	19:15
	diego4 → diegoviola	19:16
	← hahuang65 left	19:16
	→ nnyk joined	19:16
	← DTekk left	19:17
	← Corosauce left	19:17
	→ DTekk joined	19:18
	← T3ng` left	19:19
	← BullHorn left	19:19
	→ BullHorn joined	19:21
	→ roelmonnens joined	19:21
	← jceb left	19:22
	→ sq-one joined	19:24
	← ManikM left	19:28
	← abacuspowers left	19:29
	← paulweb515 left	19:30
	← leatherface416 left	19:30
	→ encod3 joined	19:31
	← darkbasic left	19:31
	→ darkbasic_ joined	19:31
	→ maletor joined	19:32
	→ astrozyk joined	19:32
	→ testerbit joined	19:32
	→ mizu_no_oto joined	19:33
	← khmarbaise left	19:33
	→ leatherface416 joined	19:33
	← donnib left	19:33
	← jiggerypokery left	19:33
testerbit	When pulling down a repo with submodules, after I do git submodule update --init, they are all on detached heads. How can I have them check out to their branch associated with their commit?	19:33
	→ ironGiant joined	19:34
preaction	that requires a more recent version of git, and i suspect everyone who's working on the repo has to be using it	19:34
	→ abacuspowers joined	19:34
preaction	1.8.2 looks like the version: http://stackoverflow.com/questions/1777854/git-submodules-specify-a-branch-tag	19:35
grawity	not necessarily – the repo format remains compatible	19:35
	but, on the other hand	19:35
preaction	for it to show up as the branch, you're going to need to track the branch	19:35
grawity	I guess older versions won't push to the submodule correctly	19:35
	← encod3 left	19:35
	← jost_ left	19:35
preaction	otherwise it's detached heads everywhere	19:35
	← roelmonnens left	19:36
	→ cmwslw joined	19:36
	← ki0 left	19:36
	→ durre joined	19:38
	→ darkbit joined	19:39
	← abacuspowers left	19:39
	← ironGiant left	19:40
	→ donnib joined	19:40
	→ ironGiant joined	19:40
	← anjen left	19:40
	← ironGiant left	19:41
	→ ironGiant joined	19:41
	← ironGiant left	19:41
	→ ironGiant joined	19:42
	← Balliad left	19:42
	← durre left	19:43
	→ gopar joined	19:43
	← testerbit left	19:44
	← BullHorn left	19:47
	← darkbasic_ left	19:47
	→ BullHorn joined	19:47
	→ cagedwisdom joined	19:47
	→ darkbasic joined	19:48
	→ blackpajamas joined	19:49
	← {0xc6} left	19:50
	← NeverDie left	19:53
	→ testerbit joined	19:54
	← EduardoMartins left	19:54
	→ drewo joined	19:55
	→ dreiss joined	19:55
	← sq-one left	19:55
	→ NeverDie joined	19:56
	← bilb_ono left	19:56
	→ hahuang65 joined	19:56
	→ encod3 joined	19:58
_ikke_	preaction: #nocontext :P	19:58
	→ irqq joined	19:58
	→ px1mp joined	19:59
preaction	what?	19:59
	→ oich joined	19:59
	→ dr3wo joined	19:59
	← cerkauskas left	19:59
_ikke_	your last reaction	19:59
	if seen without context	19:59
	→ [Brain] joined	19:59
	← darkbasic left	20:00
	→ Balliad joined	20:00
	← IrishPrime left	20:00
px1mp	hello, stupid question, is there some OS software package, that would give me similar functionality to github/bitbucket, but would be self hosted ?	20:00
_ikke_	!hosted	20:00
gitinfo	[!host_gui] There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !gitorious !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools	20:00
	→ bilb_ono joined	20:01
px1mp	_ikke_: thanks a lot !	20:01
	→ shinnya joined	20:01
	→ rpg_ joined	20:01
	← rpg_ left	20:01
	← drewo left	20:01
	→ darkbasic joined	20:02
	← r3g3x left	20:02
Hamled	what possible command would allow me to make a merge commit on the current branch that was merging HEAD and HEAD~1?	20:02
oich	For a pull request on github, I was asked to squash my branch into the main branch (develop). I did this. Now time has passed and my tracking branch (develop) now differs from the upstream branch. How should go about restoring things so that my fork's main branch tracks the upstream branch?	20:02
BtbN	Hamled, that makes no sense. HEAD and HEAD~1 are already in the same branch.	20:03
Hamled	BtbN, I'm aware! But I'm very much looking at a commit that is what	20:03
	*that	20:03
	← Repox left	20:03
	← livingstn left	20:03
	→ paulweb515 joined	20:03
	← paulweb515 left	20:03
	→ paulweb515 joined	20:03
oich	Hamled do you mean you want to consolidate the two commits into one commit?	20:04
	← jmckind left	20:04
	← rpg left	20:04
_ikke_	git merge HEAD~1 ?	20:04
Hamled	no, I mean I'm looking at a merge commit here, where the one parent is HEAD and the other parent is HEAD's immediate ancestor	20:04
	and I don't understand how you get that to happen since wouldn't git just fast-forward, if it did anything at all	20:04
	← brucelee left	20:05
	→ roelmonnens joined	20:05
_ikke_	HEAD cannot be a parent..	20:05
	→ Dro__ joined	20:05
_ikke_	That would mean a commit would be it's own parent	20:06
	← dsantiago left	20:06
_ikke_	!situation	20:06
gitinfo	Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	20:06
Hamled	okay, HEAD~1 and HEAD~2 then	20:06
	← mbrzuzy left	20:07
	← macabre left	20:07
	← darkbasic left	20:08
	→ whitby joined	20:08
	→ macabre joined	20:08
	→ darkbasic joined	20:08
	→ dsantiago joined	20:08
_ikke_	git would not allow you to make such a merge by default, though, it's not invalid	20:09
	← aseidl left	20:09
	← NeverDie left	20:09
Hamled	maybe this is me being confused by how GitHub is presenting things	20:09
	→ snthsnth joined	20:10
Hamled	this is the output of that command (the branch 'weirdness' is pointing at the merge commit) https://gist.github.com/Hamled/07a64f9b4b80e97d32b6	20:10
	→ abacuspowers joined	20:10
Hamled	but it looks like the two parents are each children of the same commit, it just doesn't show that in Github	20:10
	so that makes sense	20:11
_ikke_	I see no merges there	20:11
	oh, down below	20:11
Hamled	line 77	20:11
	→ aseidl joined	20:11
Hamled	and it also makes sense I guess that the merge commit would end up looking like an empty commit when I'm rebuilding this history by doing cherry-picking	20:11
	→ pikajude joined	20:11
_ikke_	This is just a normal merge	20:11
Hamled	because rather than have the two prior commits each have the same parent, one is applied ontop of the other	20:11
	yeah	20:12
pikajude	is there a way to automate the repeated "git mergetool; git rebase --continue" workflow during a pull --rebase?	20:12
	→ krlan joined	20:12
	→ darkbasic_ joined	20:12
_ikke_	no	20:13
pikajude	aww	20:13
	← darkbasic left	20:13
	→ paul424 joined	20:14
	→ sargas joined	20:15
	← roelmonnens left	20:15
	← MechtiIde left	20:16
	→ rockstar_ joined	20:16
	→ rockstar__ joined	20:16
	← aseidl left	20:16
	→ blimpse joined	20:17
	← PCatinean left	20:18
	→ badweather joined	20:18
	→ aseidl joined	20:18
	← tang^ left	20:19
	← blackpajamas left	20:20
	→ rmwdeveloper joined	20:20
	→ jmckind joined	20:22
	← astockton left	20:22
	← Kicer86 left	20:23
	→ khmarbaise joined	20:23
	← penna_ left	20:24
	→ redfish joined	20:25
	← sburgess left	20:25
oich	if I delete my branch that is a fork on github, then checkout and track the upstream branch that the fork forked from does this essentially reset my fork so that it is a clone of the upstream branch?	20:25
	← skylite left	20:26
oich	after pushing the branch to my github project	20:26
	ril → ril[away]	20:27
	→ NeverDie joined	20:28
	← rwb left	20:28
	← unholycrab left	20:28
	← ncthom91 left	20:29
	→ Zariel joined	20:29
	→ tikeitje joined	20:29
	→ daito joined	20:29
	→ Faylite joined	20:30
	← krlan left	20:30
	→ astockton joined	20:30
	← tikeitje left	20:30
	→ penna_ joined	20:30
oich	or, how do I fix my fork that has diverged from the main branch it is meant to be tracking?	20:31
	→ blackpajamas joined	20:31
	← darkbasic_ left	20:33
	→ darkbasic joined	20:33
	← daito left	20:33
	→ stamina joined	20:34
	← aseidl left	20:34
	→ otter768 joined	20:34
	→ ki0 joined	20:34
	← bilb_ono left	20:35
	← blackpajamas left	20:36
	→ aseidl joined	20:36
	→ blackpajamas joined	20:37
	← pratikma_ left	20:37
	→ dstarh joined	20:38
	← otter768 left	20:38
	← NeverDie left	20:39
Hamled	okay, so I know this is far from ideal... but is there any kind of "heuristic" method of taking two commits and comparing to see the symmetric difference between each commit's set of ancestors (not necessarily in any order)	20:39
	→ Brain joined	20:40
Hamled	like, if I have branches A and B, and I want to see all of the commits in B's history that aren't in A's history, using only the commit message to compare	20:41
	← darkbasic left	20:42
	→ chrisgeorge joined	20:42
	← pikajude left	20:42
	→ darkbasic joined	20:42
	← [Brain] left	20:42
	→ linuxboy_ joined	20:42
	→ teran joined	20:43
	← aseidl left	20:43
	← irqq left	20:43
Hamled	I guess just git log and some simple script for comparing them	20:44
	→ cdown joined	20:45
	→ aseidl joined	20:45
	← diegoviola left	20:46
	← linuxboytoo left	20:46
vishal	Hamled: did you check out !dots	20:46
gitinfo	Hamled: A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.	20:46
	← jigjug left	20:46
	← joel_falcou left	20:47
	→ diego2 joined	20:47
	← ELFrederich left	20:47
	→ shiriru joined	20:47
	← diego2 left	20:48
	→ diego2 joined	20:48
	→ ELFrederich joined	20:48
	← astrozyk left	20:48
	→ stevewellmann joined	20:48
synthmeat	my post-receive hook has a lot of "command not found" and comparing env through my ssh and env through githook (both same user) kind of differ	20:49
	← donnib left	20:49
synthmeat	is there a way to execute a script on post-receive with full user priviledges/environment or something?	20:49
	(both is through ssh)	20:49
	← shiriru left	20:50
	← blackpajamas left	20:50
	→ sinknode joined	20:50
	← zacts left	20:50
	→ Phoenixz joined	20:50
	→ KennyRayFL joined	20:52
	← leatherface416 left	20:52
Hamled	vishal, yeah normally that would be what I'd use, but the two branches I'm comparing have wildly differing histories because a couple of changes were applied to both branches at different times :/	20:53
	diego2 → diegoviola	20:53
	← BigWillie left	20:53
	← dr3wo left	20:54
	← linuxboy_ left	20:55
	→ linuxboytoo joined	20:55
	← dadamssg left	20:56
	→ livingstn joined	20:57
	← juvenal left	20:57
	← cavallari left	20:58
	→ zacts joined	20:58
	← Xethron left	20:58
	← anth0ny_ left	20:59
	← testerbit left	21:00
	→ anth0ny_ joined	21:00
	→ matthewhill joined	21:01
	→ TomyLobo joined	21:02
	← jteneyck left	21:02
	← dreiss left	21:02
	→ tpollard joined	21:02
	← aseidl left	21:03
	← jmckind left	21:04
	→ badfish129 joined	21:05
badfish129	I have a local file with a version number, say 1. The remote repo has the same file with version number 2. I want to keep my local version number at 1 when developing, and not have to delete the change everytime I want to commit and push up, how do I do this?	21:06
	← livingstn left	21:06
	← cdown left	21:07
	→ aseidl joined	21:07
	→ dr3wo joined	21:07
badfish129	adding it to the gitignore doesnt seem to work because thats also version controlled	21:07
	I also tried adding it to my global gitignore but that doesnt work either	21:07
	← rnsanchez left	21:08
	← hahuang65 left	21:08
	→ Impaloo joined	21:08
	→ livingstn joined	21:08
	← modocach_ left	21:08
	→ unholycrab joined	21:09
soerenb	badfish129, !ignore_tracked	21:09
gitinfo	badfish129: Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.	21:09
	← aretecode left	21:11
	→ drew0 joined	21:11
	← cmwslw left	21:12
	← dr3wo left	21:13
	← gsingh93_ left	21:14
	← MarkyC left	21:14
	← bmilesp left	21:15
	← Impaloo left	21:18
	← mizu_no_oto left	21:18
	→ theCole joined	21:18
	→ LBV_User joined	21:19
	← silenc3r left	21:19
	→ ki0_ joined	21:19
	→ Impaloo joined	21:19
	← ki0_ left	21:19
	← BullHorn left	21:20
	→ todd_dsm_wk joined	21:21
	→ BullHorn joined	21:21
	← madewokherd left	21:21
	← nemix left	21:21
synthmeat	hm. even sourcing entire .bash_profile at start of git hook doesn't fetch the envs of user :/	21:22
	→ hahuang65 joined	21:22
	→ nemix joined	21:22
	← ki0 left	21:22
	← NeckBeardPrince left	21:23
	← Balliad left	21:23
	ril[away] → ril	21:23
	← ssarah left	21:24
	← ril left	21:25
	→ jmpp joined	21:25
	← Dro__ left	21:26
	← fertorresf left	21:27
	← penna_ left	21:28
	← aseidl left	21:28
	→ jceb joined	21:29
	← chrisgeorge left	21:30
	→ aseidl joined	21:31
	← Gravitron left	21:31
	→ Gravitron joined	21:31
	← Lovich left	21:31
	→ Lovich joined	21:32
	← bb010g left	21:33
osse	synthmeat: which user?	21:33
	→ vertreko joined	21:34
	→ neataroni joined	21:35
	← Gama11 left	21:35
synthmeat	osse: only one, synthmeat. but nvm, i found what was causing it - i had "[ -z "$PS1" ] && return" at start of .bash_profile	21:36
vertreko	Have read several discussion of rebase vs merge. Not sure when it is safe to use rebase. What is best use case?	21:36
	← khmarbaise left	21:36
	→ penna_ joined	21:36
	← gopar left	21:36
	← CussBot left	21:37
	→ CussBot joined	21:37
	→ jmckind joined	21:38
osse	vertreko: none of those discussions told you? :p	21:38
	→ tristanseifert joined	21:38
	← dstarh left	21:39
vertreko	Have an idea, but no confidence in my understanding. For example, if I have already pushed local copy of feature branch, is it safe to rebase it?	21:39
	← jmpp left	21:39
	← nour left	21:39
osse	vertreko: short answer: no	21:39
	→ irqq joined	21:40
vertreko	OK	21:40
osse	vertreko: long answer: depends. has any one pulled/merged it? based their own work on it? if you're unsure then no.	21:40
	sometimes for a PR you might even get asked to do it, in that case of course you can do it	21:40
	→ SonikBoom joined	21:40
	← crose left	21:40
vertreko	I'm 99% sure I'm the only one working on it. I've pushed it solely in case my local drive crashes :)	21:41
	My motivation comes from super long push when I created a copy of my local branch on the remote. Wondering if a rebase would have been better, i.e. saved less crud	21:42
	← penna_ left	21:44
	← Spacew00t left	21:44
	→ bahar joined	21:44
	← bahar left	21:44
	→ bahar joined	21:44
	→ klivs joined	21:45
	→ espindol_ joined	21:47
	← BullHorn left	21:47
	← klivs left	21:47
	→ DrSlony joined	21:49
DrSlony	Hey	21:49
	→ BullHorn joined	21:49
	← nnyk left	21:49
	← livingstn left	21:50
	→ ril joined	21:52
	→ codeamend joined	21:52
codeamend	whats up folks	21:52
DrSlony	I have a commit on branch retinex and made some further changes after that, then i checked out a new branch applepie and applied a patch to test it, then i check out retinex again and deleted applepie, but "git status" still shows the files that patch changed as being modified. They shouldnt be modified as that was on a different branch, so how do I get them unmodified? https://dpaste.de/u4fm	21:52
codeamend	so I ran git clean -fdx and now wish I wouldnt have	21:52
	the x is what delted my project specific files	21:52
	is there a way to undo this?	21:53
bremner	not with git.	21:53
	→ nettoweb joined	21:53
bremner	you could use your backups.	21:53
codeamend	DrSlony: did you go "git push origin :name_of_branch"	21:53
	→ grill joined	21:53
codeamend	I think that deletes it from remote	21:54
	→ devoldmx joined	21:54
grill	is there a way to obtain a file from a previous commit without reverting everything?	21:54
	→ dsdeiz joined	21:54
soerenb	grill, git checkout <commit> -- <file>	21:54
codeamend	bremner: yeah.. I think I was just a bit impatient	21:54
	← espindol_ left	21:54
codeamend	bremner: know anything about intellij? think there is a way to rebuild the project files? I could just delete the project and make a new one in git repo	21:55
	i mean in project directory with .git	21:55
bremner	sorry, no intellij ideas.	21:56
	← ril left	21:56
grill	soerenb how do I see my commit history?	21:56
	← nemix left	21:56
soerenb	git log	21:56
	← Ahmed90 left	21:56
bremner	codeamend: I mean, your idea doesn't sound too crazy, but I have no experience with intellij	21:56
DrSlony	codeamend all these are local on my machine	21:57
	doesnt remote mean up there on the server?	21:57
	← jmckind left	21:57
	← BullHorn left	21:57
	→ nnyk joined	21:57
	→ penna_ joined	21:57
codeamend	bremner: ill just do it, I think it will work. I made a new project on another computer and pulled from git no proble	21:57
	DrSlony: yes	21:57
	what are you trying to do again?	21:57
	→ madewokherd joined	21:57
	← licensed` left	21:58
DrSlony	codeamend well read what i wrote again :)	21:58
	← jagob left	21:58
grill	soerenb is there a way to checkout the file and save it somewhere else?	21:58
codeamend	git branch -D / force deletes	21:58
	← devoldmx left	21:58
soerenb	grill, git show <commit>:<file> > somewhere_else	21:58
DrSlony	a friend asked me to test a patch while i was busy with something, so i tested it on a new branch, then i checkout out the original branch and deleted that testing branch, but the changes still seem to be there	21:58
	→ BullHorn joined	21:59
	← snthsnth left	21:59
DrSlony	codeamend you're not paying attention :/	21:59
	← Klausmeier left	21:59
DrSlony	i deleted taht testing branch	21:59
	→ durham_ joined	21:59
codeamend	yes but how did you delete it?	21:59
	← macabre left	21:59
DrSlony	-D	21:59
codeamend	it wont delete unless you force delete -D -d	21:59
	← blimpse left	22:00
	← dikiaap left	22:00
	← theCole left	22:00
codeamend	DrSlony: looks similar to my last situation which I am trying to figure out as well	22:00
	← durham_ left	22:00
DrSlony	$ git branch -D cherrypie	22:01
	Deleted branch cherrypie (was 03d7fe8).	22:01
	← victortyau left	22:01
	→ durham_ joined	22:01
	← durham left	22:01
	← neataroni left	22:01
Impaloo	DrSlony: did you git apply the patch?	22:02
	or cherry pick it	22:02
codeamend	in your root directory "git checkout ."	22:02
Impaloo	don't do that	22:02
	well, you could	22:02
grill	soerenb fatal: Path '/some_path/some_file' exists on disk, but not in some_commit	22:02
codeamend	this will revert all local uncommitted changes	22:02
	← bango2 left	22:02
Impaloo	codeamend: don't tell someone to do that, they might have other working changes	22:02
	gotta be more specific with limited information :P	22:03
codeamend	I really want to contribute, but I do not want to mess anyone up either. Ill be more careful.	22:03
	→ brucelee joined	22:03
	← pantsman_ left	22:04
grill	soerenb yeah. none of the previous commits are working	22:05
	← geoid left	22:05
soerenb	was the file committed?	22:05
	← drew0 left	22:05
	← jrahmy left	22:05
	← encod3 left	22:05
codeamend	DrSlony: the changes as in the modified, non-commited files?	22:06
grill	soerenb yes	22:06
	← editshare-ericf left	22:06
	→ encod3 joined	22:06
	← nnyk left	22:06
soerenb	what is the command you're using?	22:06
	← penna_ left	22:06
	← encod3 left	22:06
grill	t show <commit>:<file> > somewhere_else	22:06
	*git	22:06
	← irqq left	22:07
grill	where <commit> is the commit string, <file> is the canonical file path, and somwhere_else is some other path	22:07
	→ drew0 joined	22:07
soerenb	you need to specify the path within the repo, not within the file system	22:08
	← TomyLobo left	22:08
	→ [Brain] joined	22:09
	→ ril joined	22:09
grill	could you provide an example	22:09
	→ vF3hNGxc47h8 joined	22:10
soerenb	pretend the repo top level is /	22:10
grill	not working	22:11
	← elsevero left	22:11
DrSlony	Impaloo git apply	22:11
grill	fatal: Path '/repository/cookbooks/mail/recipes/mail-install.rb' does not exist in '5d8007ca60db0cbbaa5a53c0b0404e926bbe6e1e'	22:11
	← nettoweb left	22:11
	→ nemix joined	22:11
	→ pratikmallya joined	22:11
	→ nettoweb joined	22:12
DrSlony	codeamend you're really not paying attention, I did write I had local uncommitted changes. Please be careful giving advice which goes against what was described.	22:12
	→ daivyk joined	22:12
	← luksaur left	22:12
	← Brain left	22:12
soerenb	hmm, i thought that wokred. remove the leading /	22:12
DrSlony	Impaloo i was on branch retinex, then git checkout -b newbranch, git apply, compiled, tested, works, git checkout retinex, delete newbranch, git status still shows the files the patch touched as modified	22:13
grill	soerenb no	22:14
Impaloo	DrSlony: git-apply will only make changes in your working directory (which will transcend across branches), to discard those changes do a `$ git checkout -- path/to/your/file`	22:14
	→ mikecmpbll joined	22:14
DrSlony	Impaloo for each file individually?	22:14
	→ moriko joined	22:14
Impaloo	DrSlony: If you don't want to keep any working changes, you can do as codeamend did and `$ git checkout .`	22:15
	and if any new files were added, a `$ git clean -f`	22:15
DrSlony	Impaloo i do want to keep uncommitted changes	22:15
Impaloo	then `$ git checkout .` does it	22:15
DrSlony	i did that for each file, problem solved, but i still dont understand what i did wrong that i could not abandon changes made by some patch in some branch	22:16
	how should i test someone's patches in the future if im busy working on something as well?	22:16
preaction	stash what you're working on	22:16
Impaloo	no	22:17
	git-worktree	22:17
	introduced in 2.4 or 2.5	22:17
	← moriko left	22:17
Impaloo	git-worktree will let you get a fresh working copy on a separate location on your file system	22:17
DrSlony	I'm on 2.4.6	22:17
	no worktree here	22:17
	→ bilb_ono joined	22:18
Impaloo	ok 2.5 then	22:18
	← hahuang65 left	22:18
	Faylite → SithLite	22:18
DrSlony	so "stash" is my 2.4 solution?	22:18
	→ hahuang65 joined	22:18
Impaloo	yeah I suppose	22:18
soerenb	or commit	22:19
	← abacuspowers left	22:19
	← mellernoia-work left	22:19
DrSlony	ok, thank you	22:19
soerenb	commit and checkout what ever you want to test on	22:19
	← darkbasic left	22:20
	→ waspinator joined	22:21
	→ darkbasic joined	22:21
oich	I have a borked fork on github. The branch that tracks the upstream repo has changes in it from a merge. If I reset --hard to a commit before I screwed up the branch, commit, then merge from the upstream branch and push -f, does that seem like it will restore my branch to have it's history match the upstream branch?	22:21
	→ moriko joined	22:24
	SithLite → Faylite	22:24
	→ jalnt joined	22:24
	← aseidl left	22:24
	← [Brain] left	22:24
Impaloo	oich: You could simply just do `$ git fetch [email@hidden.address] master && git reset --hard FETCH_HEAD`	22:25
	to bring your local branch up to par with upstream master	22:25
oich	thanks	22:25
	→ aseidl joined	22:25
	→ toothrot joined	22:27
	→ abacuspowers joined	22:28
	← px1mp left	22:28
	→ s8321414 joined	22:29
	← paul424 left	22:30
	→ daito joined	22:30
	← badfish129 left	22:30
	← xfbs left	22:30
Impaloo	oich: then you'll need to `$ git push --force` to update your fork on github of course	22:30
	→ Wetmelon joined	22:31
	← holodoc left	22:31
	→ holodoc joined	22:31
	← krawchyk_ left	22:32
	→ MMukherjee joined	22:33
	← icio left	22:34
	← daito left	22:34
	→ otter768 joined	22:34
	← Impaloo left	22:35
	→ Impaloo joined	22:35
	→ ollien joined	22:36
	← moriko left	22:36
	→ gopar joined	22:36
	← cbonobo left	22:36
	→ darkbasic_ joined	22:37
	← darkbasic left	22:37
	← dsdeiz left	22:38
	→ jmpp joined	22:38
	← sleungcy left	22:39
	← ncd\|leeN left	22:39
	← otter768 left	22:40
	← holodoc left	22:40
	→ holodoc joined	22:40
	← jmpp left	22:43
	← holodoc left	22:45
	→ holodoc joined	22:45
	← aseidl left	22:46
	← edaught left	22:46
	← nettoweb left	22:47
	← ckinniburgh_ left	22:47
	← holodoc left	22:48
	→ holodoc joined	22:49
	→ aseidl joined	22:49
	← unholycrab left	22:50
	← chitopunk left	22:50
	ril → ril[away]	22:51
	← m0ltar left	22:51
	← LBV_User left	22:52
	← ril[away] left	22:53
	← rmwdeveloper left	22:53
	→ devoldmx joined	22:54
	← matthewhill left	22:54
	→ howens3 joined	22:55
	← t3rm left	22:56
	← D-Boy left	22:56
	→ unholycrab joined	22:56
	← durham_ left	22:57
	← brucelee left	22:57
	→ m0ltar joined	22:58
	→ durham joined	22:58
	← devoldmx left	22:59
	← howens3 left	22:59
	→ jeffreylevesque joined	23:00
	→ badfish129 joined	23:00
	→ Keridos joined	23:02
Keridos	question, if I accidentally did a git reset to a previous commit	23:02
	how can i restore the removed commits?	23:02
	← hahuang65 left	23:02
preaction	git !reflog might have them	23:03
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`	23:03
	← temmi_hoo left	23:03
qsuscs	Keridos: did you reset --hard?	23:03
Keridos	yes	23:03
qsuscs	Keridos: if you did not commit or so in the meantime, git reset --hard @{1} (again with all --hard brings)	23:03
	← sinknode left	23:03
	← drew0 left	23:04
	← codeamend left	23:04
	→ sinknode joined	23:04
	← sinknode left	23:05
Keridos	thanks got it	23:05
	I accidentally did a reset when i just wanted to revert	23:05
	→ devoldmx joined	23:06
	← grill left	23:06
qsuscs	that's why you should not work at one o'clock in the night :p	23:06
	→ cdown joined	23:06
	→ encod3 joined	23:07
	→ dreiss joined	23:07
	→ chrisb joined	23:08
	→ D-Boy joined	23:09
	→ modocache joined	23:09
	← CheckDavid left	23:09
	← rockstar__ left	23:09
	← neunon left	23:10
	← negaduck left	23:10
	→ ncd\|leeN joined	23:10
	← rockstar_ left	23:10
	→ neunon joined	23:10
	← aseidl left	23:11
	→ negaduck joined	23:11
	← Faylite left	23:11
	← Impaloo left	23:11
	← encod3 left	23:12
	→ aseidl joined	23:12
	← modocache left	23:13
	← SonikBoom left	23:14
	→ Impaloo joined	23:14
	→ snthsnth joined	23:15
	← fscala left	23:17
	→ fscala joined	23:18
	← addshore left	23:19
	← stevewellmann left	23:19
	→ nettoweb joined	23:20
Keridos	^^	23:20
	→ stevewellmann joined	23:21
	← diegoviola left	23:21
	← nemix left	23:22
	→ nemix joined	23:22
	→ diego2 joined	23:23
	← diego2 left	23:23
	→ diego2 joined	23:23
	→ theCole joined	23:24
	diego2 → diegoviola	23:24
	← pratikmallya left	23:24
	→ cavallari joined	23:27
	→ kukks joined	23:28
	← kukks left	23:28
	→ kukks joined	23:28
	→ brucelee joined	23:29
	← a3Dman left	23:31
	← stamina left	23:32
jeffreylevesque	could someone using travis with git help me with my .travis.yml?	23:32
	https://github.com/jeff1evesque/machine-learning/blob/98249e695a3ff217c66443844608650af694202e/.travis.yml	23:33
	← Literphor left	23:35
	→ hexagoxel_ joined	23:35
	→ Literphor joined	23:35
	← Literphor left	23:35
jeffreylevesque	build failed - https://travis-ci.org/jeff1evesque/machine-learning/builds/80541586	23:35
	→ t3rm joined	23:38
	← Telvana left	23:38
	← s8321414 left	23:39
	→ ckinniburgh_ joined	23:39
	→ s8321414 joined	23:39
	← hexagoxel left	23:39
	hexagoxel_ → hexagoxel	23:39
	→ dsdeiz joined	23:40
	→ Telvana joined	23:41
	← chrisb left	23:41
	← badfish129 left	23:42
	→ wxg joined	23:42
	→ badfish129 joined	23:42
salparadise	I am extra paranoid, just changed my remote tracking branch using "git push -u origin local_branch:remote_branch"	23:42
	when I change something in local_branch and do a "git push" it goes into the remote_branch, right?	23:43
	not master	23:43
	anyway to verify that? besides git branch -vv, git remote show origin, doesn't actually say it	23:43
	git branch -vv is better, but doesn't say "push"	23:44
scottg489	Is there a specification anywhere I can read for gits diff format? Specifically the diff headers	23:44
Hamled	_ikke_, I just wanted to say thanks for the help earlier	23:46
qsuscs	scottg489: git:kernel:git/git::Documentation	23:47
gitinfo	scottg489: Git web link: https://git.kernel.org/cgit/git/git.git/tree/Documentation?h=HEAD	23:47
qsuscs	if there is any, it's in there	23:47
	← aseidl left	23:47
	→ Lyqyd joined	23:47
	→ bendangelo joined	23:48
	← astockton left	23:48
scottg489	ok thanks	23:48
	← enleeten left	23:49
	→ aseidl joined	23:49
	→ enleeten joined	23:50
	← ckinniburgh_ left	23:51
	← cavallari left	23:51
	→ macabre joined	23:53
	← GT4066 left	23:54
	← sargas left	23:54
	← crayon left	23:58
	← cigarshark left	23:59
	← fstd left	23:59
	→ fstd joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation