IRCloggy #git 2016-01-04

Provider of IRC logs since 2005.

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

	2016-01-04
	← sctskw left	00:00
	← schism__ left	00:02
	← solvaring left	00:03
PiBa-NL	hi got a question about git on Windows it looks like my files spontaniously change their status in git..	00:03
	i checkout a repository into a new directory.	00:03
	change some of those files.	00:03
	then run 'git status' and it shows me that the files i edited have been 'deleted'	00:04
	i still see them though.. and didnt tell git to remove anything..	00:04
qsx	is the repo in question publicly available?	00:04
PiBa-NL	yes	00:04
qsx	URL please	00:04
PiBa-NL	https://github.com/pfsense/FreeBSD-ports.git	00:05
	→ Daredel03 joined	00:05
qsx	umpf	00:06
	→ ncthom91 joined	00:06
qsx	it couldn't just be a small repo, eh	00:06
	← otter768 left	00:06
PiBa-NL	nope :)	00:06
	→ looper joined	00:06
	→ GaboFDC joined	00:07
PiBa-NL	there are several files with a colon : in there, that windows doesnt allow..	00:07
	← italoacasas left	00:07
qsx	indeed	00:07
	← ozcanesen left	00:07
qsx	as these files couldn't be created, they are not there	00:07
PiBa-NL	but i thought to work around that with a sparse checkout	00:07
qsx	thus git thinks them missing	00:07
PiBa-NL	for example : deleted: net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_stats.php	00:07
qsx	welp, if you can, ignore it	00:07
	if you need those files ... use something else than windows.	00:08
PiBa-NL	that file does exist. but if i edit it then the git status changes to 'deleted'	00:08
	← s8321414 left	00:08
qsx	doubt a bug report makes sense, those are freebsd ports, they'll likely say "windows? why should we care"	00:08
PiBa-NL	another one does work though..	00:08
	→ Gitzilla_ joined	00:08
PiBa-NL	modified: net/pfSense-pkg-haproxy-devel/files/usr/local/www/haproxy_listeners_edit.php	00:08
	← Daredel left	00:09
	← polyzen left	00:10
PiBa-NL	yea i get what your saying.. still i find it wierd..	00:10
	← Daredel03 left	00:10
	→ polyzen joined	00:11
	← GaboFDC left	00:11
PiBa-NL	and Windows is my main workstation from where i have been using git for several years to maintain the same pfsense-haproxy 'package'.. it was then not part of a freebsd ports tree..	00:12
	was wondering if anyone had seen it before, or possibly knew a workaround.. (other than not using windows.. ;) )	00:13
	← jonno11 left	00:13
	→ samw joined	00:13
	← filisko left	00:14
	← ncthom91 left	00:16
	← fscala left	00:17
	← samw left	00:18
	→ fscala joined	00:19
	← mellernoia left	00:20
	← kadoban left	00:20
	→ jonno11 joined	00:22
empedokles78	In git add --interactive what does the first number and the negative number mean? 39: unchanged +0/-31 j/templates/footer.html	00:22
rewt	lines added/removed	00:23
	→ kadoban joined	00:23
	← smw_ left	00:25
empedokles78	that's rather strange because it shows me numbers that can't be now: 7: unchanged +0/-428 j/models.py	00:25
	Also from files I haven't touched at all: 31: unchanged +0/-6478 j/static/js/materialize.js	00:26
	Ah wait, I've renamed j to app. That's probably why I got all these listed..	00:28
	→ italoacasas joined	00:32
	→ pigeon joined	00:34
	← Peng left	00:35
	← mattfoo left	00:35
	← jonno11 left	00:35
	→ StuartMI joined	00:35
	→ Peng joined	00:35
	← cagedwisdom left	00:35
	→ joufflu joined	00:36
	← joufflu left	00:36
	← Ahmed90 left	00:37
	→ joufflu joined	00:37
	→ Rodya_ joined	00:38
	← skirk left	00:38
	← Jackneill left	00:40
	← demirgokhan left	00:40
	→ mattfoo joined	00:41
	← harish left	00:41
	→ guampa joined	00:41
	→ dsdeiz joined	00:41
	← avgn5 left	00:44
	← MattMaker left	00:45
	← heroux left	00:46
	→ AriesClan joined	00:48
	← AriesClan left	00:48
	→ cagedwisdom joined	00:49
	← StuartMI left	00:49
	← ciampix left	00:50
	← thiago left	00:53
	← ajf- left	00:54
	→ daito joined	00:55
	→ otter768 joined	00:55
	→ StuartMI joined	00:56
	← StuartMI left	00:57
	← hexagoxel left	00:58
	← fstd left	00:59
	→ sburg_ joined	00:59
	→ fstd joined	00:59
	→ hexagoxel joined	00:59
	← daito left	00:59
	→ StuartMI joined	01:00
	→ skirk joined	01:03
	← sburg left	01:03
	→ phildemier joined	01:03
	← paul424 left	01:03
	→ CEnnis91 joined	01:03
	→ jeffreylevesque joined	01:03
	→ heroux joined	01:04
	→ thiago joined	01:04
	→ lindenle joined	01:04
	← StuartMI left	01:04
	→ Goplat joined	01:05
	← joufflu left	01:05
	← Gamecubic left	01:07
	qpdb → Guest77306	01:07
	→ qpdb joined	01:07
	→ Gamecubic joined	01:07
	← skirk left	01:08
	→ StuartMI joined	01:10
	→ pozitrono joined	01:10
	← sssilver left	01:10
	← Guest77306 left	01:10
	← BeatrixKiddo left	01:10
	← mizu_no_oto left	01:11
	← lindenle left	01:11
	→ lindenle joined	01:12
	← jeffreylevesque left	01:12
	← dsdeiz left	01:13
	→ tomog999 joined	01:13
	← StuartMI left	01:14
	← kasper93 left	01:16
	← seapatrol left	01:16
	← tomog999_ left	01:16
	← pneuma left	01:17
	Dev0n → Dev0n_	01:19
	← lindenle left	01:19
	Dev0n_ → Dev0n	01:20
	← codedmart left	01:20
	← phrozensilver left	01:21
	→ yrs joined	01:22
	→ lindenle joined	01:22
	← Noldorin left	01:27
	PortaLu → Lucretia	01:28
	→ variable joined	01:29
	← PiBa-NL left	01:31
	→ fahadash joined	01:34
	← lindenle left	01:36
	→ jimi_ joined	01:37
	← sburg_ left	01:38
	→ acetakwas joined	01:38
	← jimi_ left	01:39
	→ lindenle joined	01:39
	← cdown left	01:39
	← yrs left	01:39
	← m0viefreak left	01:42
	→ AtnevRed joined	01:43
	← lindenle left	01:45
	→ queglay_ joined	01:46
	← queglay left	01:47
	→ lindenle joined	01:47
	→ mezcan joined	01:47
	← AtnevRed left	01:48
	← alanwill left	01:49
	→ alanwill joined	01:50
	→ wxg joined	01:51
	→ harish joined	01:52
	← rkazak_ left	01:52
	→ rkazak joined	01:52
	→ yrs joined	01:54
	→ ixjlyons joined	01:55
	→ skcin7 joined	01:56
	← lindenle left	01:57
	← yrs left	01:58
	→ yrs joined	01:58
	← choki left	01:59
	← alanwill left	01:59
	→ DolpheenDream joined	02:00
	← yrs left	02:01
	→ yrs joined	02:01
	← yrs left	02:02
	→ icedwater joined	02:03
	→ years joined	02:03
icedwater	Hi folks, can I get some help with http://stackoverflow.com/questions/34583770/? Messed up my git history a little bit.	02:03
	→ Vampire0 joined	02:04
	→ alanwill joined	02:06
nevyn	icedwater: cherry-pick?	02:06
	→ lindenle joined	02:06
	← maestrojed left	02:06
	← Vampire0_ left	02:07
	← thiago left	02:07
	← mingwandroid left	02:08
icedwater	nevyn: cherry-pick the c commits over?	02:08
nevyn	you can use a commit range	02:09
	but yes	02:09
	→ jimi_ joined	02:09
	→ kermit joined	02:09
	← nadim left	02:12
nevyn	icedwater: I alos posed that on stacktrace	02:15
	→ nadim joined	02:15
	→ Calrik joined	02:16
	← gaen left	02:17
	← Shentino left	02:18
	← lindenle left	02:20
	← jimi_ left	02:23
	← EvilPenguin left	02:23
	← acetakwas left	02:23
	→ nutron joined	02:24
	→ tyll joined	02:24
	→ Salgat_ joined	02:25
	→ choki joined	02:25
	← Salgat left	02:26
	← Salgat_ left	02:26
	← tyll_ left	02:26
	→ Salgat_ joined	02:27
	→ rchavik joined	02:27
	← yqt left	02:29
	← defcon6 left	02:29
	← msonntag left	02:31
nevyn	icedwater: working?	02:31
	← Not_Whatever left	02:32
	← DolpheenDream left	02:32
	← netj left	02:32
	→ MattMaker joined	02:32
	→ netj joined	02:33
	→ msonntag joined	02:33
icedwater	I'm not crying yet, so yeah :)	02:36
	I deleted the branch and it seems OK	02:36
	Thanks nevyn. Do you have a stackoverflow account?	02:37
	← raijin left	02:38
nevyn	yep just answered it before your answer went in	02:38
	← nadim left	02:39
	→ nadim joined	02:40
icedwater	Oh, that's you? I'll credit you properly then :P	02:40
	← gdollaz left	02:43
	← DolphinDream left	02:43
	← phildemier left	02:43
	← looper left	02:47
	← pks left	02:47
	→ pks joined	02:49
	→ looper joined	02:49
	← Zamerick left	02:49
	→ Shentino joined	02:51
	← years left	02:51
	→ kukks joined	02:51
	← kukks left	02:51
	→ kukks joined	02:51
	← leeN left	02:53
	→ arescorpio joined	02:54
	→ justanotheruser joined	02:54
	→ daito joined	02:55
	→ phildemier joined	02:57
	← italoacasas left	02:58
	← daito left	03:00
	→ years joined	03:02
	← juvenal_ left	03:03
	→ phrozensilver joined	03:03
	→ juvenal joined	03:03
	← kfpratt left	03:06
	→ kfpratt joined	03:07
	← years left	03:08
	← toogley left	03:14
	→ devoldmx joined	03:18
	→ Rodya__ joined	03:19
	← mezcan left	03:19
	← Rodya_ left	03:20
	← rkazak left	03:20
	← phildemier left	03:26
	← Rodya__ left	03:26
	← mezod left	03:29
	→ phildemier1 joined	03:29
	← nfk left	03:34
	→ rkazak joined	03:34
	→ LiENUS joined	03:36
	→ Yaazkal joined	03:38
	← kukks left	03:41
Yaazkal	hello, is there a command or a tool that generates a "changelog" or a report about how many files (not lines) where added, edited, deleted between two tags?	03:42
	← phrozensilver left	03:42
	→ bb010g joined	03:47
	gitinfo set mode: +v	03:47
	→ LeBlaaanc joined	03:47
	→ pamplemousse joined	03:49
qsx	some mode of man git diff i suppose	03:53
gitinfo	the git-diff manpage is available at http://jk.gs/git-diff.html	03:53
	← icedwater left	03:53
	← kfpratt left	03:54
	← LeBlaaanc left	03:54
ojacobson	diff -u <(git ls-tree -r --name-only --full-name COMMIT-A) <(git ls-tree -r --name-only --full-name COMMIT-B)	03:55
	would be my starting point, at least	03:55
	← cmosguy left	03:56
	→ kfpratt joined	03:59
kolobyte	is it possible to control upload rate?	04:00
	→ lindenle joined	04:00
	→ peoliye joined	04:00
	→ LeBlaaanc joined	04:02
	← lindenle left	04:03
	→ nbdy joined	04:05
	→ phrozensilver joined	04:05
	→ khmarbaise joined	04:07
	→ phrozensilver_ joined	04:10
	← phrozensilver left	04:11
	← Tobarja left	04:11
	→ sebbel joined	04:11
	← LeBlaaanc left	04:11
	→ LeBlaaanc joined	04:12
	← Keridos left	04:13
	← kfpratt left	04:13
	← peoliye left	04:13
	→ Keridos joined	04:13
	← choki left	04:13
	← khmarbaise left	04:13
	← rkazak left	04:13
	← Keridos left	04:14
	→ s8321414 joined	04:15
	→ lindenle joined	04:16
	← LeBlaaanc left	04:17
	→ italoacasas joined	04:17
	→ kfpratt joined	04:19
	→ Keridos joined	04:19
	← FireArrow133 left	04:19
	→ seapatrol joined	04:19
	← Keridos left	04:20
	← PaulCapestany left	04:22
	← kfpratt left	04:22
	→ joufflu joined	04:22
	→ Keridos joined	04:23
	→ kam270 joined	04:23
	→ kfpratt joined	04:23
	→ PaulCapestany joined	04:23
	→ psk17_ joined	04:23
	← Keridos left	04:24
	← rxo left	04:24
	→ HNY joined	04:24
	→ Keridos joined	04:24
	← kam270 left	04:25
	→ kam270 joined	04:26
	← ra0 left	04:26
	← sebbel left	04:26
	← kam270 left	04:27
	→ rxo joined	04:27
	← dermoth left	04:27
	→ kam270 joined	04:27
	← joufflu left	04:27
	→ dermoth joined	04:28
	← wxg left	04:28
	← VladGh left	04:28
	← fscala left	04:28
	← strayPuppy left	04:29
Eugene	sitaram - I hope everything is alright this morning!	04:31
	→ fscala joined	04:31
	← Keridos left	04:31
Eugene	kolobyte - not in `git`; and if that's a problem then you're doing something.... questionable.	04:32
	(or need a 56K modem)	04:32
kolobyte	Eugene: i'm trying tos ee why my upload is so slow	04:32
	← devoldmx left	04:32
Eugene	Is this just a git problem, or your whole system?	04:32
phroa	kolobyte: you can do nefarious things to your interface with https://github.com/tylertreat/comcast but that's out of scope for git, methinks	04:32
	→ devoldmx joined	04:33
kolobyte	Eugene: i don't have the fastest upload in general, but it's not 200kb/s slow	04:33
Eugene	So... is only git being this slow? What are you uplaoding to? You're missing a lot of context.	04:33
kolobyte	Eugene: yes it's only git. i'm trying to upload a pretty heft batch of files	04:34
Eugene	To where?	04:34
kolobyte	8gb, 28k files	04:34
Eugene	And, if 200KB/s upload is.... ah	04:34
kolobyte	to my VPS	04:34
Eugene	This is inside a git repo?	04:34
kolobyte	yes	04:34
Eugene	!binary !annex	04:34
gitinfo	Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions	04:34
	git-annex, git-media, and Git LFS are some solutions to the !binary problem. They work by keeping the blobs outside of the repo, storing a reference to the blob in the repo instead. http://git-annex.branchable.com https://github.com/alebedev/git-media http://git.io/git-lfs	04:34
	← otter768 left	04:34
kolobyte	it's not very smart, but just backing up files essentialyl	04:35
Eugene	It's not recommended to have a git repo anywhere near that big	04:35
	!backup	04:35
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	04:35
Eugene	Not that one, bot.	04:35
	← joki left	04:35
	← CEnnis91 left	04:35
kolobyte	nonetheless, doesn't 200KB/s seem slow?	04:36
Eugene	!bup	04:36
gitinfo	"Highly efficient file backup system based on the git packfile format. Capable of doing fast incremental backups of virtual machine images." https://github.com/bup/bup	04:36
	→ arup_r joined	04:36
	→ yes`r joined	04:36
kolobyte	while it's not the best use of git, i'm not sure why it'd be going at 200KB/s. i do only plan to puill this repo very rarely	04:36
Eugene	That or some other actual backup tool should be used for anything "large"(which can mean a wide range).	04:36
	In any case.... 200KB/s is a bit slow, yes	04:36
	Is this over SSH://?	04:36
kolobyte	Yes it's SSH	04:37
phroa	kolobyte: you could zip up the repo and extract it on the server, if sending one file would be faster than sending them all over the git protocol, though I can't imagine why	04:37
Eugene	SSH can be very slow(CPU overhead). You can set an alternate(faster) cipher in your ssh_config	04:37
kolobyte	Eugene: i'll look into that	04:37
	phroa: perhaps. i'll give it a try	04:38
	→ SimonNa joined	04:38
kolobyte	is there a way to add to a git repo locally? perhaps it'd be faster if i just rsync, and then add the files when they're on the server already?	04:40
	locally defined as on the git server	04:41
Eugene	Sure. Rsync the .git/ to somewhere on the server, then set core.bare to true on that dir.	04:41
	→ daito joined	04:41
	→ joki joined	04:41
	← italoacasas left	04:44
	← daito left	04:46
	← yes`r left	04:47
	← harish left	04:48
	← barik left	04:48
	← JanC left	04:49
	→ peoliye joined	04:49
	← variable left	04:49
	→ lindenle_ joined	04:50
	← lindenle left	04:50
	→ rkazak_ joined	04:58
	← lindenle_ left	04:58
	← Ekho left	04:59
	→ lindenle joined	04:59
	← dermoth left	05:00
	← phrozensilver_ left	05:00
	→ dermoth joined	05:00
	→ Keridos joined	05:02
	→ Manikandan joined	05:03
	→ JanC joined	05:03
	← lindenle left	05:05
	→ shinnya joined	05:05
	← Keridos left	05:06
	→ Keridos joined	05:06
	→ lindenle joined	05:07
	→ akushner joined	05:07
	← Gitzilla_ left	05:08
	→ BeatrixKiddo joined	05:09
	← BeatrixKiddo left	05:09
	→ BeatrixKiddo joined	05:09
	→ Gitzilla_ joined	05:10
	← akushner left	05:10
	→ akushner joined	05:11
	← lindenle left	05:13
	→ DolphinDream joined	05:14
	→ lindenle joined	05:14
	→ ayaz joined	05:15
	← arescorpio left	05:17
	→ boombatower joined	05:18
	← lindenle left	05:19
	→ yes`r joined	05:19
	→ GT joined	05:20
	→ VladGh joined	05:21
dansan	I have a strange question I think. I have a local bare repo on my home machine that I've cloned localy and from my laptop, so that I can easily switch back and forth. However, this repo was cloned from upstream. What is the right way to update my bare repo with the upstream?	05:24
	From where I have it checked out, should I git pull my_upstream/master and then merge that back to my bare repo?	05:24
	← tristanp left	05:28
	← MattMaker left	05:32
	← the_cybersphinx left	05:32
	← Gitzilla_ left	05:32
	→ Gitzilla_ joined	05:32
	← akushner left	05:33
	← Lyqyd left	05:37
nevyn	dansan: you can do that. (push not merge)	05:40
	merge means something else.	05:40
	→ rnat joined	05:40
	← Cabanossi left	05:41
	→ Cabanossi joined	05:42
	← arup_r left	05:42
	→ AtnevRed joined	05:44
	→ sssilver joined	05:45
	← AtnevRed left	05:49
	← BeatrixKiddo left	05:50
	→ MattMaker joined	05:55
	← Arsonide left	05:55
	← MattMaker left	06:00
	→ tristanp joined	06:01
	→ arup_r joined	06:05
	← tpollard left	06:10
	→ LeBlaaanc joined	06:11
	→ m1dnight1 joined	06:15
	→ rscata joined	06:16
	← gopar left	06:16
	← m1dnight_ left	06:17
	m1dnight1 → m1dnight_	06:17
	← zivester left	06:17
	← kfpratt left	06:18
	← DolphinDream left	06:21
	← amdi_ left	06:28
	← s8321414 left	06:32
	→ otter768 joined	06:35
	← sparetire_ left	06:36
	← nadim left	06:36
	→ _nadim joined	06:36
	→ zeroed joined	06:39
	→ ThomasLocke joined	06:39
	← otter768 left	06:41
	→ DWestCoast joined	06:41
	→ Snuppe joined	06:41
	→ daito joined	06:42
	← _nadim left	06:42
	→ _nadim joined	06:42
	→ eka_ joined	06:43
	→ AtnevRed joined	06:43
	← nbdy left	06:43
	← eka left	06:43
	← rkazak_ left	06:45
	← daito left	06:46
	← nanga left	06:47
	← skcin7 left	06:47
	→ lamppid joined	06:47
	← AtnevRed left	06:48
	→ nanga joined	06:48
	← nanga left	06:48
	→ nanga joined	06:48
	← phildemier1 left	06:49
	← wethu left	06:52
	← LeBlaaanc left	06:52
	→ sbasso joined	06:54
	→ Junior joined	06:56
	→ howdoi joined	06:58
	Tronsha → [UPA]Stefan	07:00
	→ TomyLobo joined	07:01
	→ cdown joined	07:02
	← diegoviola left	07:02
	← Snuppe left	07:02
	→ jnavila joined	07:02
	← psk17_ left	07:04
	→ jay-m joined	07:08
	→ SOLDIERz joined	07:12
	→ PCatinean joined	07:15
	→ roelmonnens joined	07:18
	← arup_r left	07:20
	→ arup_r joined	07:20
	← geomyidae left	07:22
	→ acolson joined	07:22
	← Aboba left	07:22
	← roelmonnens left	07:23
	→ dsdeiz_ joined	07:23
	→ roelmonnens joined	07:23
	← roelmonnens left	07:23
	← dsdeiz_ left	07:24
	→ dsdeiz joined	07:24
	→ geomyidae joined	07:25
	← peedu_ left	07:26
	← Pie_Napple left	07:27
	→ Pie_Napple joined	07:28
	← TomyLobo left	07:30
	← sssilver left	07:31
	→ sssilver joined	07:32
	→ fees joined	07:32
	← acolson left	07:32
	← sssilver left	07:33
	→ InfoTest joined	07:34
	← geomyidae left	07:35
	← eka_ left	07:35
	→ geomyidae joined	07:35
	← Goplat left	07:35
	→ rominronin joined	07:35
	→ eka joined	07:35
	← eka left	07:36
	→ eka joined	07:37
	← sbasso left	07:38
	→ star_prone joined	07:38
	→ Aboba joined	07:38
	→ sbasso joined	07:40
	→ Sceorem joined	07:40
	← spriz left	07:40
	→ spriz joined	07:41
	→ dextorion joined	07:43
	← star_prone left	07:43
	← spriz left	07:44
	→ spriz joined	07:45
	→ JeroenT joined	07:45
	gitinfo set mode: +v	07:45
dextorion	Hello. I have a cloned repository. I am editing java file, and saving. I do "git status", and get Nothing to commit, working dir clean. I cant figure out why... Any tips?	07:45
	I have checked local .gitignore, global .gitignore, and exclude	07:46
	→ jonno11 joined	07:46
	→ Imek joined	07:47
	← Imek left	07:47
Stummi	dextorion, what does "git status JavaFile.java" say?	07:47
grawity	dextorion: does `git log <file>` show anything?	07:47
dextorion	I can create new files, they get tracked. But when im editing existing files gives me nothing.	07:48
	← spriz left	07:48
	→ mahendra_ joined	07:48
dextorion	Stummi: The same, nothing to commit...	07:49
	→ spriz joined	07:49
	→ pantsman- joined	07:49
Junior	yello ! :)	07:49
dextorion	grawity: date 22 dec, "last pushed commit message"	07:50
	→ star_prone joined	07:50
	→ vitquay1996 joined	07:51
dextorion	Its the same with every existing file.	07:51
Stummi	dextorion, can you double check if you are editing the correct file and it really has the changes you made? (just by cat <file>, and does ls -l <file> show a current timestamp?)	07:51
	→ mariuscc joined	07:52
dextorion	Stummi, yep. Cat shows my edit.	07:52
	Also, if i do "touch newFile.java". It pickes up a new untracked file.	07:52
ojacobson	What about `git status --ignored`? If the file doesn't appear there, then it's either not in the work tree at all, identical to both HEAD and the staged version, or on a filesystem that Git copes spectacularly badly with.	07:52
	Have you run any `git update-index` commands -at all-?	07:53
dextorion	Then, i do "git add newFile.java", files turns green. Then i do "vim newFile.java" and edit the file. Save...	07:53
	← Gamecubic left	07:53
dextorion	git status, only show the file ass Added(green), nothing more. Show i not get a red there as well, as in untracked edit?	07:54
Stummi	dextorion, whats the underlying filesystem?	07:54
	← JeroenT left	07:54
	← vitquay1996 left	07:55
	→ Coop joined	07:55
	→ ilmgb joined	07:55
	← Coop left	07:55
dextorion	Stummi, its Ntfs on windows 7	07:55
	← kadoban left	07:56
	← rnat left	07:56
	← ayaz left	07:56
dextorion	ojacobson: 'git status --ignored' does not show the file. no in changes or in ignore list	07:57
	ojacobson: yes, i have done git update-index	07:57
ojacobson	What, specifically, did you do?	07:58
	Transcript, ideally.	07:58
	← arex\\work left	07:58
	→ acolson joined	07:58
dextorion	it looks like it only is picking up new files. after adding the file, i can edit the file, but it doest track the change	07:59
	← pamplemousse left	07:59
	→ harish joined	08:01
	← jonno11 left	08:01
	→ JeroenT joined	08:02
dextorion	ojacobson: http://snag.gy/xwnXJ.jpg	08:05
	ojacobson: did that work?	08:05
	ojacobson: just an example..	08:05
ojacobson	I asked if you had ever run `git update-index`. I did not mean to ask you to run it now; I'm sorry I wasn't clear.	08:05
	Had you run that command, with any options, in the past?	08:05
	← pantsman- left	08:05
dextorion	ojacobson: ah sorry. nope.	08:05
	← devoldmx left	08:05
ojacobson	Ah, ok.	08:06
	Fortunately, no harm done here. :)	08:06
dextorion	ojacobson: It has been working fine though, up until now. So, from 1 december untill now, all good.	08:06
	ojacobson: good good! :)	08:07
	→ jaguarmagenta joined	08:07
	← watabou left	08:08
	→ Alienpruts joined	08:09
	← jaguarmagenta left	08:09
	→ jaguarmagenta joined	08:10
	← saidelike left	08:10
dextorion	ojacobson: I will try to clone the repo again in a different folder and try to edit. (You should have seen me just now... trying to type in gitbash... in my screenshot. wondering why thats not working. i need coffee! hehe)	08:10
	← arup_r left	08:10
	← star_prone left	08:10
	→ freimatz_ joined	08:10
	← NeverDie left	08:10
Stummi	you totally should add your target direcotry and the IDE metafiles to your .gitignore, just as side note :)	08:11
	*directories	08:11
	→ NeverDie joined	08:11
	← KettleCookedDude left	08:12
	← jaguarmagenta left	08:13
	→ jam_ joined	08:13
	→ cmosguy joined	08:14
	→ jaguarmagenta joined	08:15
	← NeverDie left	08:15
	→ saidelike joined	08:15
dextorion	I have done Stummi, those are the files displayed in "Ignored files" list.	08:15
	Stummi: the "git status --ignored" is displaying untracked changes and Ignored files, right?	08:16
Stummi	oh, yes, right. Sorry	08:16
dextorion	Stummi: No worries :)	08:16
	→ NeverDie joined	08:17
dextorion	Now, i've recloned... and it trackes my changes just fine...	08:17
	What is it with my repo?..	08:17
	→ star_prone joined	08:18
	→ freimatz joined	08:18
	gitinfo set mode: +v	08:19
freimatz	Hi	08:19
	← freimatz_ left	08:19
	→ bonswouar joined	08:19
	← jam_ left	08:19
	← PublicSubnet left	08:22
	← Pie_Napple left	08:22
Nevik	dextorion, possibly something you did, but no way to know for sure without seeing your entire command history since originally cloning ;)	08:22
dextorion	Nevik: i've must done something weird.. just want to know what.	08:23
	→ wxg joined	08:23
dextorion	Nevik: yeah.. i guess so.	08:23
Nevik	well, there's also always the possibility you were working in a different directory than you thought you were	08:23
	made a backup copy one time and then continued working in that	08:23
	(dont laugh, this is surprisingly often the problem for people whocome here)	08:23
dextorion	Nevik: Oh i know! :) i've done it a couple of times, im sure. shouldn't be this time though.. hehe	08:24
	God knows what i Haven't manage to do yet..	08:25
Nevik	well, it works now, so all's good for the moment :D	08:25
dextorion	Nevik: yees yes, its a reather new project so no problem recloning. Im just confused to what happened to the old one.	08:26
Nevik	i bet	08:26
	dextorion, time to start keeping a command log for the future!	08:26
	→ Balliad joined	08:27
dextorion	Nevik: gosh, that'll be a pretty big list in a some time.. but yeah, maybe I should do that.	08:27
	← gusnan left	08:28
Nevik	it's just text, it's not like it'll fill up your disk soon :P	08:28
dextorion	Nevik: true true	08:28
	← niko left	08:29
	→ gusnan joined	08:29
	→ nik0 joined	08:30
	→ shibly joined	08:31
	→ David1977 joined	08:31
	nik0 → niko	08:31
shibly	http://imgur.com/ZRMFiS3 , what does it mean by c0,c1,c2 ?	08:31
	https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging	08:31
dextorion	Anyway guys, thanks for your help!	08:31
grawity	nothing more than "commit #0", "commit #1", and so on	08:31
dextorion	Great to have some people to talk think through with :)	08:32
	← peoliye left	08:33
	→ WAALC65 joined	08:34
	← jagob left	08:34
	→ bernardio joined	08:35
shibly	If someone commits a file then what changes happen inside git?	08:35
	What is checksum?	08:35
	or hash?	08:35
	→ otter768 joined	08:36
	← dextorion left	08:37
	→ roxlu joined	08:38
	→ luxPerpetua joined	08:38
Stummi	just out of curiousity: can you consider a git commit hash as cryptographically secure? (As in, it is hard to nearly impossible to purposely create a specific commit hash valuee?)	08:38
	*value	08:38
Seveas	Stummi: until sha1 is broken, yes.	08:39
	← fscala left	08:41
	← otter768 left	08:41
	→ weox joined	08:41
	← yes`r left	08:42
	← shibly left	08:42
	→ daito joined	08:43
	→ PublicSubnet joined	08:43
grawity	in the preimage sense of broken, which might take a bit longer than collisions	08:44
	→ AtnevRed joined	08:44
	→ fscala joined	08:44
	→ Hounddog joined	08:45
	← luxPerpetua left	08:45
	→ aspiers joined	08:46
	→ sagittarian joined	08:46
	→ barduck joined	08:47
	← daito left	08:47
	→ reim joined	08:48
	→ josuebrunel joined	08:48
	← rasto left	08:48
	← AtnevRed left	08:49
	→ yes`r joined	08:50
	→ powered joined	08:51
	→ peoliye joined	08:52
	← bernardio left	08:52
	→ anchorite joined	08:53
	→ doener joined	08:53
	→ bernardio joined	08:55
	← bernardio left	08:56
	→ wrilain joined	08:58
	→ andyr joined	08:59
	→ rasto joined	09:01
	→ bernardio joined	09:01
	← d0nn1e left	09:02
	← bernardio left	09:02
	← JeroenT left	09:03
	→ d0nn1e joined	09:03
DevAntoine	hi	09:04
	I'm on an orphan branch. When checkouting another branch, git lists a bunch of files telling me they're going to be overriden. The thing is: those files are our source files not being tracked on the orphan branch	09:05
	what I'm supposed to do?	09:06
	← DWestCoast left	09:06
	→ jam_ joined	09:07
	→ marcogmonteiro joined	09:08
	← jay-m left	09:09
	→ encod3 joined	09:11
	← wrilain left	09:12
	→ rajrajraj joined	09:12
	→ netcarver joined	09:12
	→ br0kenman joined	09:13
sitaram	Eugene: ??	09:13
	10:01:22 < Eugene> sitaram - I hope everything is alright this morning! <====	09:14
	→ clmsy joined	09:14
	← rominronin left	09:14
	→ bernardio joined	09:14
	← reim left	09:14
	← roxlu left	09:15
	→ jay-m joined	09:16
	→ skylite joined	09:16
	→ satifant joined	09:17
	→ rominronin joined	09:19
	← star_prone left	09:20
	← rominronin left	09:20
	→ circ-user-xSi9o joined	09:21
	→ JeroenT joined	09:21
	→ eijk joined	09:22
Seveas	DevAntoine: rm those files. When creating the orphan branch, git doesn't do so, but they do become untracked in that branch. The checkout of the other branch will bring them back.	09:22
	→ courrier joined	09:23
	→ rominronin joined	09:23
	→ roxlu joined	09:24
DevAntoine	oh yes Seveas. Thanks!	09:25
	→ joel_falcou joined	09:25
	→ star_prone joined	09:25
	← rominronin left	09:25
	→ rominronin joined	09:25
	→ petersr joined	09:27
	→ dimi1947 joined	09:28
	← roxlu left	09:28
	← petersr left	09:29
	→ toogley joined	09:30
	→ Error404NotFound joined	09:31
	← Error404NotFound left	09:31
	→ jokoon joined	09:32
	← elementalest left	09:39
	← rominronin left	09:39
	→ elementalest joined	09:40
	← elementalest left	09:40
	→ elementalest joined	09:40
	← diogenese left	09:42
	← ilmgb left	09:43
	→ johnflux joined	09:43
johnflux	How can I tell if a file has changed?	09:43
	→ daito joined	09:43
	→ wiky joined	09:43
	→ ilmgb joined	09:44
johnflux	I have a shell file, and I'd like to know if the currently checked out file is different to the last time it was source'd	09:44
Bombe	johnflux, git-status shows modified files.	09:44
	← star_prone left	09:44
johnflux	so I'm thinking of getting the git sha of the last commit that changed the file	09:44
	→ rominronin joined	09:44
	← bonswouar left	09:45
johnflux	storing that in an environment variable. then I can check to see if that sha has changed	09:45
	→ bonswouar joined	09:45
	→ star_prone joined	09:45
johnflux	Can I get the sha of the last commit that was made to a file?	09:46
osse	johnflux: git log -1 -- file	09:46
	--format=%H	09:46
	← pozitrono left	09:46
johnflux	works thanks :)	09:47
	→ sybariten joined	09:47
osse	can't you use the hash of the file itself?	09:47
	i guess it doesn't really make a difference	09:48
	← daito left	09:48
	→ diogenese joined	09:48
johnflux	osse: that would be fine too - how do I do that?	09:48
grawity	I'd say it's faster to just compare the modification time...	09:49
	sha1sum, openssl sha1, stat -c %y/%Y	09:49
	← happy-dude left	09:49
	→ skcin7 joined	09:50
	← wiky left	09:50
	← rajrajraj left	09:51
johnflux	osse: ah git log is failing because I'm not in the right directory	09:51
	osse: can I get git to be smarter about using the git repo that the file is in	09:52
osse	hmm, now you have a reason to not rely on git for this	09:52
	git -C path/to/dir log	09:52
	← JeroenT left	09:52
	← Balliad left	09:52
	← netcarver left	09:53
	→ samw joined	09:53
	→ roxlu joined	09:54
	← jam_ left	09:54
	→ jam_ joined	09:55
	← diogenese left	09:57
	→ Sasazuka joined	09:57
	← peoliye left	09:57
	← wxg left	09:57
	→ diogenese joined	09:57
	← samw left	09:58
	→ Error404NotFound joined	09:59
	→ scarcry joined	10:00
	← jam_ left	10:00
	→ chll joined	10:00
	← jnavila left	10:01
	← star_prone left	10:01
	→ dimi1979 joined	10:02
	← diogenese left	10:02
	→ star_prone joined	10:03
	→ filisko joined	10:03
	← barduck left	10:04
	← dimi1947 left	10:04
	→ Balliad joined	10:04
	← star_prone left	10:06
	← rominronin left	10:06
	→ JeroenT joined	10:06
	→ star_prone joined	10:07
	→ diogenese joined	10:07
	→ rodrigo joined	10:07
	→ barduck joined	10:07
	rodrigo → Guest30459	10:08
	← star_prone left	10:09
	→ rominronin joined	10:10
	→ star_prone joined	10:11
	← star_prone left	10:12
	← dimi1979 left	10:12
	← Guest30459 left	10:12
	→ tvw joined	10:16
	→ WebsiteDeveloper joined	10:16
	→ memoryleak joined	10:18
	→ kurkale6ka joined	10:18
	← rominronin left	10:20
	← robbyoconnor left	10:20
	→ wrilain joined	10:21
	→ arup_r joined	10:23
	→ robbyoconnor joined	10:26
	← wrilain left	10:26
	← Nikhil_D left	10:28
	← diogenese left	10:28
	→ Nikhil_D joined	10:28
	← Sasazuka left	10:33
	→ reveredge joined	10:35
	→ leeN joined	10:36
	→ otter768 joined	10:37
	→ rominronin joined	10:38
	→ wrilain joined	10:38
	→ wxg joined	10:40
	← otter768 left	10:42
	→ mischat joined	10:43
	→ MattMaker joined	10:44
	→ lindenle joined	10:45
	→ Zamerick joined	10:48
	← lindenle left	10:49
	← MattMaker left	10:50
	← filisko left	10:51
	← rominronin left	10:51
	→ pozitron joined	10:51
	→ King_Hual joined	10:52
	← King_Hual left	10:52
	→ King_Hual joined	10:52
	→ diogenese joined	10:53
	→ mohammed64 joined	10:57
	→ rominronin joined	10:58
	→ phrozensilver joined	11:01
	→ codeman joined	11:01
	← weox left	11:02
	→ freimatz3 joined	11:02
	← Error404NotFound left	11:03
	← aidalgol left	11:04
	→ peff joined	11:04
	← freimatz left	11:04
	← paulweb515 left	11:04
	← phrozensilver left	11:07
	← rominronin left	11:08
	→ bollullera joined	11:10
	← JeroenT left	11:11
	← barduck left	11:11
	→ BeerBuddy joined	11:12
	← quenode left	11:14
	← BeerBuddy left	11:14
	← joel_falcou left	11:14
	→ Sasazuka joined	11:14
	← leeN left	11:17
	→ BeerBuddy joined	11:17
	← King_Hual left	11:19
	← peff left	11:19
	→ jojovem joined	11:19
	← mohammed64 left	11:20
	→ peff joined	11:20
	→ jnavila joined	11:23
	→ quenode joined	11:23
	← seapatrol left	11:23
	← dsdeiz left	11:24
	→ rominronin joined	11:25
	← Sasazuka left	11:26
	← rominronin left	11:27
	→ aranea joined	11:27
	→ stamina joined	11:28
	→ msankhala joined	11:29
	→ LeMike joined	11:29
	→ dimi1947 joined	11:30
	→ rominronin joined	11:31
	← rominronin left	11:31
	→ rominronin joined	11:34
	← peff left	11:34
	← bernardio left	11:34
	← InfoTest left	11:34
	← a3Dman left	11:35
	← jokoon left	11:35
	→ a3Dman joined	11:36
	→ thiago joined	11:39
	→ bernardio joined	11:39
	→ Noldorin joined	11:41
	→ mellernoia joined	11:43
	→ daito joined	11:44
	→ italoacasas joined	11:44
	→ Error404NotFound joined	11:46
	← italoacasas left	11:46
	← Error404NotFound left	11:47
	→ italoacasas joined	11:47
	→ JeroenT joined	11:47
	← daito left	11:49
	← italoacasas left	11:49
	→ s8321414 joined	11:49
	→ italoacasas joined	11:50
	← wxg left	11:50
	→ venmx joined	11:51
	← JeroenT left	11:51
	→ JeroenT joined	11:52
	→ Fijit joined	11:54
	← mahendra_ left	11:55
	→ jam_ joined	11:56
	→ MattMaker joined	11:56
	→ Sasazuka joined	11:59
	← Internet13 left	12:00
	→ shiriru joined	12:00
	← jam_ left	12:00
	← italoacasas left	12:01
	← MattMaker left	12:02
	→ netcarver joined	12:05
	← rominronin left	12:06
	→ italoacasas joined	12:07
	← italoacasas left	12:08
	→ gaen joined	12:09
	→ rominronin joined	12:09
	← cagedwisdom left	12:11
	→ mohammed64 joined	12:11
	← freimatz3 left	12:12
	← gusnan left	12:12
	→ freimatz joined	12:12
	← David1977 left	12:13
	→ gusnan joined	12:14
	← sleezd left	12:14
	→ David1977 joined	12:14
	→ sleezd joined	12:15
	← sleezd left	12:15
	← netcarver left	12:15
	→ dsdeiz joined	12:15
	→ italoacasas joined	12:16
	→ sleezd joined	12:17
	← italoacasas left	12:18
	→ italoacasas joined	12:18
	← boombatower left	12:20
	← aranea left	12:23
	← sleezd left	12:23
	← mrkat left	12:25
	→ Internet13 joined	12:25
	→ sleezd joined	12:26
	← skcin7 left	12:26
	→ mrkat joined	12:27
	→ mahendra_ joined	12:30
	← italoacasas left	12:32
	← Sceorem left	12:33
	→ joel_falcou joined	12:33
	→ otter768 joined	12:38
	→ italoacasas joined	12:39
	→ CheckDavid joined	12:40
	→ t0by joined	12:40
	← italoacasas left	12:41
	→ dopesong joined	12:41
	← NeverDie left	12:42
	→ achadwick joined	12:42
	→ mizu_no_oto joined	12:43
	← otter768 left	12:43
	← sleezd left	12:43
	→ leeN joined	12:43
	← clmsy left	12:44
	→ lindenle joined	12:45
	→ sleezd joined	12:45
	→ AtnevRed joined	12:46
	→ NeverDie joined	12:47
	→ blueyed joined	12:47
	← mizu_no_oto left	12:48
	→ mclement joined	12:49
	← sleezd left	12:50
	← lindenle left	12:50
	← tristanp left	12:50
	← JeroenT left	12:50
	← AtnevRed left	12:50
	→ tristanp joined	12:51
	→ phildemier joined	12:51
	→ sleezd joined	12:52
	→ Sceorem joined	12:54
	← NeverDie left	12:54
	← mohammed64 left	12:54
	→ mizu_no_oto joined	12:55
	← phildemier left	12:55
	← fscala left	12:56
	← sleezd left	12:56
	→ fscala joined	12:57
	→ freimatz3 joined	12:57
	→ ahille_ joined	12:58
	← fstd left	12:59
	→ sleezd joined	12:59
	→ fstd joined	12:59
	→ Karkus joined	13:00
	→ JeroenT joined	13:00
	← freimatz left	13:00
	← SHLV left	13:00
	→ ahille joined	13:00
	gitinfo set mode: +v	13:02
ahille	hey, can someone help me? i have a problem: some hours ago, i accidently commited something in a headless state, and lost it then when i went back to master, as i hadnt commited them anywhere else theese files are gone now. Is it possible to recover theese files?	13:02
grawity	the commits still exist, try finding them in `git reflog` (or `git log -g`)	13:03
	once you find the commit ID, you can checkout/merge/branch/cherrypick from headless commits like regular branches	13:04
	if the files are important I suggest creating a branch from the commit, to make it permanent	13:05
	← freimatz3 left	13:06
	→ freimatz joined	13:06
	→ mohammed64 joined	13:08
	← rchavik left	13:09
	← JeroenT left	13:09
ahille	thanks grawity, that helped	13:11
	→ rwb joined	13:12
	← rominronin left	13:13
	← mahendra_ left	13:13
	← arup_r left	13:14
	← BeerBuddy left	13:14
	→ InfoTest joined	13:15
	← ahille_ left	13:16
	→ krawchyk joined	13:17
	→ pantsman- joined	13:19
	← InfoTest left	13:19
	→ otter768 joined	13:20
	← dimi1947 left	13:20
	→ rominronin joined	13:20
	→ nnyk_ joined	13:21
	→ sgambino joined	13:22
	→ jokoon joined	13:23
	→ DWestCoast joined	13:23
	→ Aboba_ joined	13:27
	← Sasazuka left	13:27
	← krawchyk left	13:27
	ffledgli1g → ffledgling	13:28
	← Aboba left	13:29
	← rominronin left	13:30
	← mizu_no_oto left	13:31
	← anchorite left	13:31
	→ algae joined	13:32
	→ arup_r joined	13:32
	→ atmosx joined	13:32
atmosx	hello	13:32
	→ goTAN joined	13:35
	→ garga joined	13:35
	← otter768 left	13:35
	→ johan_sun joined	13:36
garga	I need some help :) I did a merge with a lot of conflicts, I resolved all of them and then ran 'git commit'. After that I noted one conflict was wrong resolved. Is there a way to reset my repo to the state it was just before git commit? with all conflicts resolved	13:36
	← arup_r left	13:36
	→ serapath_ joined	13:37
atmosx	Doing an interactive 'rebase'. There are some commits that are mine and I wanna squash them - then there are a few commits that belong to others, I don't wanna touch those. Is there any way I can tell git which 'pick' I wanna squash my commits too?	13:38
grawity	'squash' always uses the commit immediately below	13:39
	so just reorder the lines	13:39
	← sleezd left	13:39
grawity	(might want to do it in two steps – first rebase to reorder, then rebase to squash)	13:39
atmosx	grawity: I see, so I rebase just change the lines in vim, in the order the suits me, then rebase again to squash	13:40
	thanks grawity !	13:40
thiago	garga: no	13:40
grawity	it's possible to do it in one step, but my previous rebases have been conflict-y	13:41
thiago	atmosx: you should never rebase commits from other people	13:41
grawity	oh wait, that	13:41
	yeah, didn't notice that part.	13:41
atmosx	so I'm kinda toasted	13:41
	→ sleezd joined	13:41
thiago	atmosx: you can only rebase the topmost commits of yours that other people don't yet have	13:42
_ikke_	garga: git reset HEAD^	13:42
	→ arup_r joined	13:42
_ikke_	this will undo the commit, but keep the changes	13:42
garga	_ikke_: but this won't understand the merge	13:43
	← serapath_ left	13:43
garga	this was my first attempt	13:43
satifant	garga, can't you use git commit --ammend, to correct the mistake?	13:44
_ikke_	You can manually create MERGE_HEAD	13:44
	satifant: true	13:44
atmosx	thiago: So from the 7 commits I can rebase only the 2 last (which are mine)... what's the point of rebasing then heh	13:44
	okay	13:44
garga	satifant: can I do it if the change is on merge commit?	13:44
	← goTAN left	13:44
garga	git blame points the bad line to merge commit itself	13:44
thiago	atmosx: changing the base of your commits	13:45
	→ daito joined	13:45
	→ MattMaker joined	13:45
garga	_ikke_: hmmm, I don't know how to do it, is there any doc I should read to understand better MERGE_HEAD?	13:45
atmosx	thiago: so if there are commits by a third party in my history, (e.g. I choose to go 12 commits back, 5 commits in between are not mine) it's safer not do any rebase right?	13:46
satifant	garga, not sure, that's why I used "?" ;)	13:46
thiago	atmosx: !rewrite	13:46
gitinfo	atmosx: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	13:46
garga	satifant: I was just trying to keep sanity, probably it will be easy to do 2 commits after merge to fix bad things	13:46
atmosx	thiago: thanks for the heads up	13:46
garga	I'll try to understand the manual MERGE_HEAD idea and see if it helps	13:47
	→ Macaveli joined	13:47
	← irc-5225225 left	13:48
_ikke_	garga: if you fix your index, git commit --amend will update the commit accordingly	13:48
	that's the easiest way	13:48
garga	_ikke_: what do you mean by 'fix your index' ?	13:49
_ikke_	garga: Make sure the files are the way you want in the index / staging area	13:49
	← daito left	13:49
	→ goTAN joined	13:49
	→ CausaMortis joined	13:50
	← MattMaker left	13:50
	→ krawchyk joined	13:52
	← Gitzilla_ left	13:53
	→ strozyka joined	13:53
	→ irc-5225225 joined	13:54
	← ribasushi left	13:54
	→ anchorite joined	13:54
	irc-5225225 → Guest49259	13:54
	→ rominronin joined	13:54
	→ barduck joined	13:55
	→ rwb1 joined	13:55
	→ dserodio joined	13:55
	← nnyk_ left	13:56
	← Guest49259 left	13:57
	→ jam_ joined	13:57
	→ defcon6 joined	13:57
	← defcon6 left	13:57
	← rwb left	13:57
	→ gou joined	13:58
	← gou left	13:59
garga	_ikke_: sorry but I didn't get the workflow here. Last commit is the merge, what should I do? change necessary files first and then run --amend?	13:59
	→ rwb joined	13:59
_ikke_	yes, change the files, git add them, and then commit --amend	13:59
	← rwb1 left	14:00
	← atmosx left	14:00
	→ ribasushi joined	14:00
	← krawchyk left	14:01
	← jam_ left	14:01
	← DWestCoast left	14:02
	← Zamerick left	14:03
	← mariuscc left	14:03
	← strozyka left	14:03
	← dsdeiz left	14:03
	→ dstarh joined	14:03
	→ Jackneill joined	14:04
	← rominronin left	14:05
garga	_ikke_: \o/ THANK YOU!	14:05
	→ rominronin joined	14:05
	→ nickthetait joined	14:05
	← goTAN left	14:06
	djh_ → djh	14:06
	← s8321414 left	14:06
	→ goTAN joined	14:06
	← sleezd left	14:06
_ikke_	also thank satifant	14:06
	→ aranea joined	14:07
	← grawity left	14:08
	← blueyed left	14:08
	→ otter768 joined	14:08
	← otter768 left	14:08
	→ grawity joined	14:09
	→ jam_ joined	14:12
	→ buffal0 joined	14:12
	← joel_falcou left	14:13
	→ fracting joined	14:13
	→ mariuscc joined	14:13
	← pozitron left	14:13
	→ gaen_ joined	14:14
	→ sleezd joined	14:14
	→ atomicb0mb joined	14:15
	← jam_ left	14:15
	→ happy-dude joined	14:15
	→ ciampix joined	14:15
garga	satifant: thank you too :)	14:16
	it worked like a charm	14:16
	and I learnt something new	14:16
	→ skorgon joined	14:16
	← gaen left	14:16
	← skorgon left	14:16
	→ skorgon joined	14:16
	← fracting left	14:17
	→ mbrzuzy joined	14:17
	→ jam_ joined	14:17
	← jam_ left	14:17
	→ jimi_ joined	14:17
	→ fracting joined	14:20
	← a3Dman left	14:20
	→ rwb1 joined	14:20
	→ zivester joined	14:21
	← stamina left	14:21
	→ strozyka joined	14:21
satifant	garga: :)	14:23
	→ jam_ joined	14:23
	← rominronin left	14:23
	← mbrzuzy left	14:24
	← rwb left	14:24
	rwb1 → rwb	14:24
	→ nfk\|laptop joined	14:25
	→ a3Dman joined	14:26
	← bernardio left	14:26
	→ Salgat joined	14:27
	gaen_ → gaen	14:27
	← jam_ left	14:27
	← Macaveli left	14:27
	→ jaguarmagenta2 joined	14:29
sagittarian	where does git store the commit ID for a submodule?	14:29
_ikke_	in the tree	14:29
canton7	sagittarian, in the same place that it stores which file to checkout at a given path	14:29
	← Salgat_ left	14:29
	→ blueyed joined	14:30
sagittarian	which is where?	14:30
	← nfk\|laptop left	14:30
	→ makinen joined	14:30
	← buffal0 left	14:30
	→ Macaveli joined	14:30
makinen	How can I revert the changes I made on a file?	14:31
	→ CEnnis91 joined	14:31
	← jaguarmagenta left	14:31
	→ AaronMT joined	14:32
makinen	I didn't commit and I want to revert back to HEAD	14:32
_rgn	git checkout -- path/to/file	14:32
	→ subhojit777 joined	14:32
	← queglay_ left	14:33
makinen	thx	14:33
	→ queglay joined	14:33
	→ benjwadams joined	14:35
sagittarian	git keeps the submodule commit info in the tree object of the currently checked out commit?	14:35
	→ ash_workz joined	14:35
_ikke_	git ls-tree HEAD path/to/submodule	14:35
	→ paulweb515 joined	14:36
	→ rominronin joined	14:36
	← ciampix left	14:36
benjwadams	What's the most succinct way to both unstage a single file and discard working directory changes for it? `git reset --hard` doesn't work for paths. Is there anything shorter than `git reset HEAD file && git checkout -- file`?	14:37
	→ BigWillie joined	14:37
	← rominronin left	14:37
	→ demirgokhan joined	14:39
devster31	does anyone have a cheatsheet for revisions and revision ranges? like what's the difference between 2 and 3 dots or between HEAD~ and HEAD^	14:40
	← Peuc left	14:40
	← yes`r left	14:41
	→ killa_kyle joined	14:42
skorgon	!dots	14:42
gitinfo	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.	14:42
	← aboccia left	14:43
	→ the_cybersphinx joined	14:43
	→ kpease joined	14:44
	→ AugustoCesar joined	14:45
	→ krawchyk joined	14:45
	→ aboccia joined	14:45
	→ mezod joined	14:45
	← Karkus left	14:45
	← krawchyk left	14:46
	← jaguarmagenta2 left	14:46
	→ AtnevRed joined	14:46
	→ krawchyk joined	14:46
	→ DolphinDream joined	14:47
	← ash_workz left	14:47
	→ buffal0 joined	14:47
	→ LBV_User joined	14:48
	← goTAN left	14:49
	← Calrik left	14:49
	→ mbrzuzy joined	14:49
	→ goTAN joined	14:50
	← AugustoCesar left	14:50
	→ cbonobo joined	14:50
DolphinDream	git scritpting Q : how do you find out if a repo has something to fetch without actually fetching ?	14:51
	← AtnevRed left	14:51
	← Macaveli left	14:52
	← mellernoia left	14:52
	→ settermjd joined	14:53
	→ ash_workz joined	14:53
devster31	weird error, zsh: parse error near `}' when I try git reflog HEAD@{2 weeks ago}	14:54
	→ Es0teric joined	14:54
ilmari	DolphinDream: git fetch --dry-run	14:55
DolphinDream	ilmari, i'm assuming this will be faster than the actual fetch, right ? if it's equally fast to fetch instead of testing.. i'd rather just fetch	14:55
	← dopesong left	14:56
	← jokoon left	14:56
	→ BillCriswell joined	14:56
	← goTAN left	14:57
	→ MattMaker joined	14:57
	→ mellernoia joined	14:58
	→ ShapeShifter499 joined	14:58
	→ lindenle joined	14:58
ilmari	DolphinDream: from the output here it looked like it did all the work, just didn't update the refs	14:59
DolphinDream	does git fetch command fetch all branches from origin ? (not jus the currently checked out branch)	14:59
_ikke_	yes	14:59
ilmari	because it has to download and unpack the objects from the master to know what it contained	14:59
	s/master/remote/	14:59
	→ chitopunk joined	15:00
	→ kfpratt joined	15:00
DolphinDream	ilmari, so there is no difference in speed i guess. besides, if ther eis nothing to fetch i assume that git fetch is equally fast as git fetch --dry-run	15:00
	← rscata left	15:00
	→ King_Hual joined	15:01
	← King_Hual left	15:01
	→ King_Hual joined	15:01
	← lindenle left	15:01
DolphinDream	ilmari, so you say the git fetch --dry-run downloads the objects (if any) but it just does not update the local refs to point to the new objects dowloaded ?	15:01
ilmari	DolphinDream: looks like it from the output	15:02
	DolphinDream: http://paste.scsys.co.uk/503854	15:02
	← MattMaker left	15:02
DolphinDream	yeah.. you're right. just did a test	15:03
	← msankhala left	15:03
	← zivester left	15:03
DolphinDream	second run of the same command does not show the object download output	15:03
	→ JeroenT joined	15:04
DolphinDream	i wonder if there is a way thought to find out if there is something to fetch before you actually fetch it	15:04
	← Manikandan left	15:05
	← sleezd left	15:06
ilmari	that'd require special support in the protocol	15:08
	→ lindenle joined	15:08
qsx	you can check different refs with man git ls-remote	15:09
gitinfo	the git-ls-remote manpage is available at http://jk.gs/git-ls-remote.html	15:09
	← JeroenT left	15:09
	→ kadoban joined	15:09
	→ t4nk885 joined	15:10
	→ crose joined	15:10
	← barduck left	15:12
	→ MarkyC joined	15:13
	← ShapeShifter499 left	15:13
	→ Spacew00t joined	15:14
	← David1977 left	15:14
	→ barduck joined	15:15
	← HNY left	15:15
	→ mithenks joined	15:17
	← leeN left	15:18
	→ weox joined	15:18
	← lindenle left	15:19
	→ IrishPrime joined	15:20
	← t4nk885 left	15:20
	→ TomyWork joined	15:22
	← t0by left	15:24
	→ jaguarmagenta joined	15:25
	→ sleezd joined	15:25
	← Spacew00t left	15:25
	→ Spacew00_ joined	15:25
	← sleezd left	15:26
	← kdehl left	15:26
	← Aboba_ left	15:27
	→ sleezd joined	15:28
	→ sleezd_ joined	15:29
	← cbonobo left	15:30
	→ kdehl joined	15:30
	→ cbonobo joined	15:30
	→ axl_ joined	15:31
	→ Bpit joined	15:31
	← sleezd left	15:32
	sleezd_ → sleezd	15:32
	→ sleezd_ joined	15:33
	→ Dougie187 joined	15:33
	← mohammed64 left	15:33
	← crose left	15:34
	← cbonobo left	15:35
	→ irc-5225225 joined	15:35
	← sleezd_ left	15:36
	→ sssilver joined	15:36
	→ luksaur joined	15:37
	→ cbonobo joined	15:37
	→ govg joined	15:37
	→ rominronin joined	15:38
	→ Gitzilla_ joined	15:38
	→ mizu_no_oto joined	15:38
	→ aapaaal joined	15:39
	→ ellipsis753_ joined	15:39
	→ bjoernh joined	15:40
	← jnavila left	15:41
	→ sleezd_ joined	15:41
	→ ShapeShifter499 joined	15:42
	← aapaaal left	15:42
	← arup_r left	15:43
	→ phrozensilver joined	15:43
	← rominronin left	15:43
ellipsis753_	Hello. I'm afraid I've got a question less directly about git and more about the git workflow. Our team at work uses Mac and so can only run their code on a remote Linux server. They each have their own folder with their git clone on the server and mount that folder via sftp to their local machine. Therefore running git on the mounted copy is very slow. They seem to use GUIs so can't just ssh over and develop on the linux server. Has anyone else had a sim	15:43
	ilar issue and did you find a solution? Is it somehow possible to have git appear local but actually proxy the command across to run remotely etc? It seems like a really bad setup but I can't think of a solution.	15:43
	→ JeroenT joined	15:43
	→ Guest55 joined	15:44
rom1504	ellipsis753_: why can't it actually be local ?	15:45
	← aspiers left	15:45
	→ daito joined	15:46
	← skylite left	15:46
ellipsis753_	rom1504, Because code can only be run/tested on the linux server as the company only uses Macs.	15:46
	→ nfk\|laptop joined	15:46
rom1504	ah "so can only run their code on a remote Linux server."	15:46
	well that's ridiculous	15:46
	either work fully on the server or fully on the desktop	15:46
	or get optic fiber so you can ssh -YC but that's a bit silly too ;)	15:47
	→ lances101 joined	15:47
	→ mahendra_ joined	15:47
rom1504	(fully on the server would be using vim)	15:47
jor	ellipsis753_: let them push to the server	15:47
qsx	rom1504: or emacs.	15:47
ellipsis753_	rom1504, I think their codebase only runs on linux. But the higher-ups only want to use Mac. It does feel a bit silly.	15:47
qsx	or any other thing.	15:47
rom1504	yeah that would work but if you have to push every time you want to test it would be annoying	15:48
kadoban	ellipsis753_: If the only problem is that git is slow over the sshfs, just ssh in and do git that way, in addition to the sshfs directory you use for editing.	15:48
	← mbrzuzy left	15:48
rom1504	qsx: well I meant a console editor	15:48
jor	OK, then make them use docker/campagne on their macs	15:49
rom1504	(since their connection appear to be too slow for ssh -YC)	15:49
	← Pookz left	15:49
jor	docker/Kitematic i mean	15:49
ellipsis753_	kadoban, I think most of the developers can't/won't use the console and so have IDE interfaces to git, which don't support working on a remote git.	15:49
	← daito left	15:50
devster31	what's a good easy monitoring system for a couple aws machines and a few private ones? I'm mostly interested in checking basic metrics and a few services, it's nothign fancy or complicated, but it'd be nice to keep them all monitored in the same place	15:51
ellipsis753_	Would the reverse work any better? Having client rsync to the server or something? Sorry, I think this might be kind of an impossible task.	15:51
	→ ajeden joined	15:52
	← sbasso left	15:52
	← demirgokhan left	15:54
	← sssilver left	15:55
	← sleezd_ left	15:55
	→ aone joined	15:55
	← ShapeShifter499 left	15:55
	← axl_ left	15:56
kadoban	ellipsis753_: ick. IDE interfaces are really limited.	15:57
	← powered left	15:57
	→ sleezd_ joined	15:57
	← jojovem left	15:58
	← ajeden left	15:59
	→ mbrzuzy joined	15:59
	→ astrofog joined	15:59
devster31	in the case of git it's also very difficult to sausagemake with cli	15:59
	[UPA]Stefan → Tronsha	16:00
	→ buffffal00 joined	16:00
	← bjoernh left	16:00
	← King_Hual left	16:00
bremner	no it isn't.	16:01
	→ CorySimmons joined	16:01
bremner	git rebase -i is there for you.	16:01
	← sleezd_ left	16:01
	→ jojovem joined	16:01
	→ AtnevRed joined	16:02
	← roxlu left	16:02
	→ jason237 joined	16:03
	← buffal0 left	16:03
	← AtnevRed left	16:03
	→ sleezd_ joined	16:03
	← acolson left	16:04
	← lamppid left	16:04
	← netj left	16:04
	→ AtnevRed joined	16:04
	→ netj joined	16:05
	← thiago left	16:05
	← madewokherd left	16:05
	→ thiago joined	16:05
	← AtnevRed left	16:05
	→ arup_r joined	16:06
	→ petersr joined	16:06
	→ heath joined	16:07
	→ sparetire_ joined	16:07
heath	i'm pretty sure i've seen a method in the past where the team would reference issue numbers in the branch name, but it was a little more descriptive than "iss53" as shown at https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging#Basic-Branching	16:08
	anyone recall such a method?	16:08
	← petersr left	16:08
	← Sceorem left	16:09
	→ kappy joined	16:09
	→ otter768 joined	16:09
	→ bango2 joined	16:10
	← bango2 left	16:10
	→ Ice_Strike joined	16:11
	→ bango2 joined	16:11
canton7	heath, something like 'issue/53'?	16:11
	← ThomasLocke left	16:12
	← ahille left	16:13
	← jay-m left	16:13
	→ jay-m joined	16:13
	← otter768 left	16:13
	← LBV_User left	16:14
	← nfk\|laptop left	16:14
	→ ajf- joined	16:14
	← barduck left	16:15
ajf-	accidentally tracked a file that I was supposed to ignore	16:15
	what can I do ?	16:15
	I already commited	16:15
	← skorgon left	16:15
	→ mtt5 joined	16:16
kadoban	ajf-: Have you already published/shared the incorrect commit(s) somewhere?	16:16
ajf-	no	16:16
	← D-Boy left	16:16
kadoban	ajf-: !fixup should help you out then, you can undo the commit or amend it to fix the issue.	16:17
gitinfo	ajf-: So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	16:17
	→ kilo_bravo joined	16:18
ajf-	ok so git reset --hard HEAD^	16:18
	← howdoi left	16:18
ajf-	but then I will lose the things that were commited or will they stay as modified ?	16:18
	→ ShapeShifter499 joined	16:18
ajf-	ah, to keep them, remove "--hard"	16:19
	am I right ?	16:19
_ikke_	yes	16:19
kadoban	ajf-: Read the page more carefully and/or choose more carefully.	16:19
_ikke_	!reset_dem	16:19
gitinfo	[!reset] reset does two things! (1) without file/path argument: 'git reset [flags] [<commit>]' = make the current branch point to <commit> (default: HEAD). --soft = don't do anything else. --mixed (default) = overwrite the index to match. --hard = overwrite the working files to match. (2) 'git reset [<commit>] -- <path>' = overwrite the index entries for <path> with the content from <commit> (default: HEAD)	16:19
_ikke_	meh :-(	16:19
	ajf-: https://git-scm.com/blog/2011/07/11/reset.html	16:19
	← JeroenT left	16:20
	← sleezd_ left	16:21
	← LeMike left	16:22
	→ jam_ joined	16:24
	→ raijin joined	16:24
	← dstarh left	16:25
	→ sleezd_ joined	16:25
	← rishi left	16:26
	→ rishi joined	16:26
	→ tang^ joined	16:27
	← CorySimmons left	16:27
	→ Darcidride joined	16:28
	→ rzeka joined	16:28
	← rzeka left	16:28
	→ rzeka joined	16:28
	→ VampiricPadraig joined	16:28
	← VampiricPadraig left	16:28
	→ VampiricPadraig joined	16:28
	← jam_ left	16:28
	→ VampiricPada joined	16:28
	← CheckDavid left	16:29
	→ Stravy joined	16:29
	← luksaur left	16:29
	← reveredge left	16:32
	← br0kenman left	16:32
	← settermjd left	16:33
	→ DanZ3 joined	16:34
	← cdown left	16:34
	→ lances101_ joined	16:35
	← lances101_ left	16:35
	→ barduck joined	16:36
	→ Gamecubic joined	16:36
	→ leeN joined	16:36
	→ gargola joined	16:37
	→ madewokherd joined	16:37
	gitinfo set mode: +v	16:37
lances101	A git repo of an organization I'm working with has some files with CRLF line endings, after cloning, the files are in a modified state, because git forces the change from CRLF to LF. What's the way to go with this?	16:37
canton7	lances101, tell git not to force that change	16:38
	lances101, set core.autocrlf to 'false' for that repo	16:38
	→ S_J joined	16:38
S_J	how do I clone a specific part of a repo?	16:38
	https://github.com/libgdx/libgdx/blob/master/tests/gdx-tests-android/assets/data/uiskin.json	16:39
	like that one	16:39
canton7	S_J, you can't, git with alone	16:39
thiago	S_J: you clone the entire thing	16:39
canton7	if you want to download one file, use curl/wget	16:39
	← sleezd_ left	16:39
	→ konr joined	16:40
	→ Cata\|Work joined	16:40
	→ kumasura joined	16:40
S_J	ok ty that worked	16:40
	← CausaMortis left	16:40
	→ sleezd_ joined	16:41
	← Burgerz left	16:42
	← ilmgb left	16:42
lances101	canton7, `git settings core.autocrlf` returns false already, but it still tries to change the line endings	16:43
	→ Ahmed90 joined	16:43
canton7	lances101, what's in .gitattributes?	16:43
lances101	* i meant config	16:43
	sec	16:43
	← mithenks left	16:43
	→ zivester joined	16:43
lances101	canton7, * text=auto	16:44
_ikke_	That causes it	16:44
	'"When text is set to "auto", the path is marked for automatic end-of-line normalization. If Git decides that the content is text, its line endings are normalized to LF on checkin.'	16:45
	→ axl_ joined	16:45
thiago	remove that or correct the line-endings in the files	16:45
	← Balliad left	16:46
	→ MattMaker joined	16:46
	→ luksaur joined	16:46
	← Alienpruts left	16:46
	→ editshare-ericf joined	16:47
	← bonswouar left	16:48
lances101	_ikke_, thanks. But then I have a different question. Since I'm working with a remote repo and I PR into it from a fork that i've made, I would not like the .gitattributes file to be pushed with it, is there a way to ignore the changes in it so that overtime I call `git add .` it does not get staged?	16:48
	→ D-Boy joined	16:48
	← sleezd_ left	16:48
	← noteness left	16:49
	→ freimatz3 joined	16:49
	→ LeBlaaanc joined	16:49
	→ InfoTest joined	16:50
	← mclement left	16:50
	← wrilain left	16:51
	→ sleezd_ joined	16:51
	← MattMaker left	16:51
	← Guest55 left	16:51
	← Juzzika left	16:51
canton7	lances101, the project's got a borked .gitattributes :P	16:51
	→ yqt joined	16:51
canton7	lances101, you can modify .git/info/attributes (your local, untracked gitattributes file) and add exceptions for the problematic files	16:51
	← freimatz left	16:51
	→ dopesong joined	16:52
canton7	badfile eol=crlf	16:52
	← TomyWork left	16:52
	← dopesong left	16:53
	→ ilmgb joined	16:53
	→ dopesong joined	16:53
lances101	canton7, I will definitely try making local changes to .gitattributes, thanks! But the RIGHT way go with this would be to actually change .gitattributes on the remote repo side, right?	16:55
canton7	lances101, I suspect they added a .gitattributes file, but didn't bother to normalize everything when they did that	16:55
	in that case, the correct thing to do is to normalize all files, at once	16:55
	→ hobodave joined	16:56
canton7	search for "When text=auto normalization is enabled in an existing repository, any text files containing CRLFs should be normalized" in man gitattributes	16:56
gitinfo	the gitattributes manpage is available at http://jk.gs/gitattributes.html	16:56
_ikke_	A pull-request that does just that (and only that) might be acceptable	16:56
	→ kaictl_work joined	16:56
	← duderonomy left	16:56
_ikke_	(sometimes it isn't because of the noise it can add)	16:56
lances101	thanks a bunch! :)	16:56
canton7	(but if that file does need crlf for some reason, then the .gitattributes file needs updating, yes)	16:57
	← hobodave left	16:57
	← dopesong left	16:58
	← jay-m left	16:58
	→ hobodave joined	17:00
	← leeN left	17:01
	← fahadash left	17:01
	→ codedmart joined	17:02
	→ Peuc joined	17:02
	← zivester left	17:02
	→ exousia joined	17:02
	→ EvilPenguin joined	17:02
	→ todd_dsm_ joined	17:02
	→ jay-m joined	17:03
	← bollullera left	17:03
	→ dreiss joined	17:03
	← raijin left	17:04
	→ leeN joined	17:04
	→ lindenle joined	17:07
	← lindenle left	17:07
	→ lindenle_ joined	17:07
	← exousia left	17:07
	← zeroed left	17:07
	← ilmgb left	17:08
	← subhojit777 left	17:08
kaictl_work	If I run `git filter-branch --subdirectory-filter` on a repository, can I guarantee that, with no other history rewrites, the resulting repository from point A and point B will share the same commit hashes and data for all older commits? I did some small tests and that seems to be the case, just wanted to see if there was anything I was missing.	17:08
	← fscala left	17:09
	→ rubyonrailed joined	17:09
canton7	kaictl_work, what are A and B? What is an "older commit"?	17:09
kaictl_work	canton7: point A has 400 commits, point B has 200 more commits (600 total), touching possibly stuff in that directory.	17:10
	→ fscala joined	17:10
	→ lindenle joined	17:10
canton7	so you've only run --subdirectory-filter between commits A and B?	17:11
	what are "older commits"?	17:11
	← mahendra_ left	17:11
	← lindenle_ left	17:11
	← Hounddog left	17:11
	→ jceb joined	17:12
	← DevAntoine left	17:13
kaictl_work	no, i'm running the subdirectory-filter on the whole tree. "older commits," I guess I should have said "parent commits."	17:13
	→ incredible joined	17:13
kaictl_work	It's a weird, messed up workflow, we're pulling down a repository multiple times and splitting out the subdirectory each time something changes in the original repository. Basically want to know if I can keep doing that, then pushing to a repository without using --force.	17:14
canton7	parent commits of what?	17:14
kaictl_work	(yes, I would love to make it a submodule, but that's just not something upstream wants to do)	17:14
	canton7: any commits in the tree at all.	17:14
canton7	so the parent of B will be rewritten, because the parent of B is one of the commits between A and B	17:15
	so no, some "older commits" will be rewritten	17:15
	→ sdh joined	17:15
	sdh → steve	17:15
canton7	" any commits in the tree at all" <-- commits don't exist in the tree, so that doesn't make sense	17:15
	← SOLDIERz left	17:15
	→ zivester joined	17:15
	→ maletor joined	17:16
	→ StuartMI joined	17:16
	→ subhojit777 joined	17:18
	← maletor left	17:18
	← bb010g left	17:18
	← aone left	17:21
	→ TomyLobo joined	17:21
	← InfoTest left	17:22
	→ {AS} joined	17:23
	← kurkale6ka left	17:26
	→ akiva joined	17:26
	→ apprentice joined	17:26
	→ mahendra_ joined	17:27
	← zivester left	17:27
	← johnflux left	17:29
	→ luxPerpetua joined	17:29
	→ NeverDie joined	17:30
	→ Manikandan joined	17:31
	← apprentice left	17:31
	← Manikandan left	17:33
	→ Manikandan joined	17:33
	→ vdv joined	17:33
	← killa_kyle left	17:33
	→ Xe- joined	17:33
	→ mclement joined	17:33
	→ akushner joined	17:34
	← luksaur left	17:34
	→ King_Hual joined	17:36
	← King_Hual left	17:36
	→ King_Hual joined	17:36
	→ keldwud joined	17:37
	← keldwud left	17:37
	→ keldwud joined	17:37
	← ShapeShifter499 left	17:37
	← Xe- left	17:38
	→ rominronin joined	17:38
	→ sssilver joined	17:38
	→ Karkus joined	17:40
	→ zivester joined	17:41
	← achadwick left	17:41
	→ choki joined	17:41
	← jrnieder left	17:41
	→ duderonomy joined	17:42
	← lindenle left	17:42
	→ n00bdev joined	17:43
	← rominronin left	17:43
	→ rpd joined	17:43
	→ jrnieder joined	17:44
	← astrofog left	17:44
	→ victorgama joined	17:45
	← victorgama left	17:45
	→ victorgama joined	17:45
	← hobodave left	17:45
	← aranea left	17:46
	← victorgama left	17:46
	→ victorgama joined	17:46
	→ luksaur joined	17:46
	→ daito joined	17:46
	→ lindenle joined	17:47
	← a3Dman left	17:49
	→ samw joined	17:49
	← xelxebar left	17:49
	← Karkus left	17:49
	→ a3Dman joined	17:49
	← a3Dman left	17:49
	→ a3Dman joined	17:49
	→ ShapeShifter499 joined	17:50
	← Manikandan left	17:50
	→ killa_kyle joined	17:51
	← daito left	17:51
	← sagittarian left	17:52
	← encod3 left	17:52
	← Lucretia left	17:53
	← mbrzuzy left	17:54
	→ Lucretia joined	17:55
	← buffffal00 left	17:56
	→ roxlu joined	17:58
	← krawchyk left	17:59
	→ kiloreux joined	18:00
choki	damn those non-fast-forward push/pulls :/	18:01
	→ krawchyk joined	18:01
choki	i've them every time i try to push to my dotfiles	18:01
	← lances101 left	18:02
	← gaen left	18:02
	→ phaleth joined	18:02
	→ hobodave joined	18:02
	→ Limes_ joined	18:02
	← luxPerpetua left	18:02
	→ gaen joined	18:02
j416	choki: git pull --rebase	18:03
	← sarri left	18:03
	→ sarri joined	18:03
choki	why wouldnt git even push me, I mean the first thing I do always is to pull the latest dotfiles before I start working on them, then I do some changes and I always get this non-fast-forward thingy :"(	18:04
	→ Zamerick joined	18:04
	→ luxPerpetua joined	18:05
	← Sonicbit left	18:06
	→ mbrzuzy joined	18:06
	→ AtnevRed joined	18:06
	→ gopar joined	18:06
	← zivester left	18:07
	→ durham joined	18:08
	← netj left	18:09
	→ netj joined	18:09
	→ otter768 joined	18:10
	← NeverDie left	18:10
	→ uri_ joined	18:10
	← AtnevRed left	18:11
	← gaen left	18:13
	→ gaen_ joined	18:13
	← shiriru left	18:14
	← otter768 left	18:15
	→ peoliye joined	18:16
	← lindenle left	18:16
	→ Pookz joined	18:16
	← subhojit777 left	18:16
	→ NeverDie joined	18:18
	← sweatsuit left	18:18
	← mischat left	18:18
	→ sweatsuit joined	18:21
	→ Gfurst joined	18:21
	→ zivester joined	18:21
	→ mohammed64 joined	18:22
	→ Suos joined	18:24
	← Suos left	18:24
	→ DolpheenDream joined	18:24
	→ Burgerz joined	18:24
	→ jam_ joined	18:24
	→ aapaaal joined	18:25
	→ Udoa joined	18:25
	→ Imek joined	18:25
	← Imek left	18:25
	← Udoa left	18:25
	← nemix_ left	18:26
	← chitopunk left	18:26
	→ buffal0 joined	18:26
	→ tgunr joined	18:27
	→ chitopunk joined	18:28
	← jam_ left	18:29
	→ lindenle joined	18:30
	← gaen_ left	18:30
	← mahendra_ left	18:31
	← dreiss left	18:31
	→ gaen joined	18:31
	← jay-m left	18:33
	→ jay-m joined	18:33
	← tgunr left	18:33
	← chll left	18:34
	← arup_r left	18:34
	← kiloreux left	18:34
	→ tgunr joined	18:34
	← NeverDie left	18:35
	→ paddyez joined	18:36
	← paddyez left	18:36
	→ paddyez joined	18:36
	← josuebrunel left	18:37
	→ nour joined	18:37
	← tgunr left	18:39
	→ rominronin joined	18:39
	→ stamina joined	18:39
	← jimi_ left	18:39
	→ jimi_ joined	18:40
	← geomyidae left	18:42
	← gaen left	18:42
	→ tgunr joined	18:42
	→ gaen joined	18:43
	← mniip left	18:43
	→ mniip joined	18:43
	→ Bennux joined	18:43
	← rominronin left	18:44
	← zivester left	18:45
	← marcogmonteiro left	18:46
	← jceb left	18:47
	← mbrzuzy left	18:48
	→ kiloreux joined	18:48
	→ bjoernh joined	18:49
	→ mahendra_ joined	18:49
	→ ilmgb joined	18:53
	→ CausaMortis joined	18:54
	← gaen left	18:54
	→ gaen joined	18:54
	← n00bdev left	18:55
	→ n00bdev joined	18:57
	← yqt left	18:58
	→ mbrzuzy joined	18:58
	→ zivester joined	18:59
Yaazkal	+qsx @gitinfo ojacobson: thanks for lastnight answer. I'll check	19:00
gitinfo	Yaazkal: you're welcome, but please note that I'm a bot. I'm not programmed to care.	19:00
ojacobson	huh what	19:00
	← holodoc left	19:01
	← barduck left	19:01
qsx	i don’t remember but whatever	19:02
	!next	19:02
gitinfo	Another satisfied customer. NEXT!	19:02
thiago	Yaazkal: the bot is programmed to say that when it detects its name and "thank" in the same line	19:02
	→ Balliad joined	19:05
	→ holodoc joined	19:06
	→ zwa joined	19:07
	← kaictl_work left	19:07
	← ilmgb left	19:07
	→ encod3 joined	19:07
	→ ilmgb joined	19:08
Yaazkal	+qsx heheh	19:09
	thiago: it's ok, thanks	19:09
	→ cagedwisdom joined	19:10
	← a3Dman left	19:10
	→ Macaveli joined	19:10
	→ Motoservo joined	19:10
	← mariuscc left	19:10
	← Balliad left	19:10
	→ namikr joined	19:11
	→ hahuang61 joined	19:11
	← LeBlaaanc left	19:11
	→ asnoehu joined	19:12
	→ reim joined	19:12
	→ dreiss joined	19:12
	← ilmgb left	19:12
	→ dopesong joined	19:13
	→ a3Dman joined	19:13
	← PCatinean left	19:14
	← Bennux left	19:15
	← n00bdev left	19:16
	← krawchyk left	19:16
	← ShapeShifter499 left	19:17
	← dopesong left	19:17
	← CausaMortis left	19:18
_ikke_	ojacobson: You've never seen that before?	19:19
ojacobson	I was "huh what"ing at Yaazkal, 'cos I don't remember talking to them last night :)	19:20
	← chitopunk left	19:20
	← bjoernh left	19:20
_ikke_	ah ok	19:20
	→ krawchyk joined	19:21
	← krawchyk left	19:21
	→ krawchyk joined	19:22
	→ arup_r joined	19:23
	← zivester left	19:24
	→ pamplemousse joined	19:24
	← jay-m left	19:24
	← ktosiek left	19:26
	← namikr left	19:28
	→ Salgat_ joined	19:28
	→ ahr3n joined	19:28
	→ CausaMortis joined	19:29
	← stamina left	19:31
	← Salgat left	19:31
	→ ktosiek joined	19:32
	→ tonyj joined	19:32
	→ namikr joined	19:33
	→ Sadeukko joined	19:34
	→ radsy joined	19:38
	→ zivester joined	19:38
	← Kad-- left	19:39
	→ Kad-- joined	19:40
	→ rominronin joined	19:40
	→ barduck joined	19:40
	→ elastix joined	19:41
	→ dopesong joined	19:41
	→ buffffal00 joined	19:41
	← fees left	19:42
	← namikr left	19:42
	→ josuebrunel joined	19:42
	→ namikr joined	19:43
	← S_J left	19:43
	→ fees joined	19:43
	← CausaMortis left	19:43
	← buffal0 left	19:43
	← peoliye left	19:44
	← vdv left	19:45
	← rominronin left	19:46
	← victorgama left	19:47
	← namikr left	19:47
	→ daito joined	19:47
	→ Domhack joined	19:48
	← lindenle left	19:48
	→ buffal0 joined	19:50
	→ chitopunk joined	19:50
	→ raijin joined	19:52
	← encod3 left	19:52
	← zwa left	19:52
	← mclement left	19:52
	← daito left	19:52
	← konr left	19:52
	→ zwa joined	19:52
	→ CorySimmons joined	19:53
	← buffffal00 left	19:54
	→ peoliye joined	19:54
	→ CausaMortis joined	19:54
	→ mclement joined	19:56
	→ lindenle joined	19:56
	← raijin left	19:56
	→ encod3 joined	19:58
	← holodoc left	19:59
ash_workz	anyone know a good channel for graphviz discussion?	20:00
	← MarkyC left	20:00
	← _nadim left	20:00
	→ _nadim joined	20:01
_ikke_	Nope, not specifically	20:02
	← arup_r left	20:02
	→ LeBlaaanc joined	20:02
ash_workz	dang	20:02
	← sgambino left	20:03
	← EvilPenguin left	20:04
johnw	ash_workz: what did you need? I'll discuss it with you in #gitlib :)	20:04
	→ MarkyC joined	20:04
	→ EvilPenguin joined	20:05
	← sssilver left	20:05
	→ cleme1mp joined	20:06
	← discipline left	20:06
	→ sssilver joined	20:07
	→ AtnevRed joined	20:07
	← encod3 left	20:08
	← mclement left	20:08
	← CausaMortis left	20:08
	→ discipline joined	20:08
	→ otter768 joined	20:11
	← tyreld left	20:11
	→ bb010g joined	20:11
	gitinfo set mode: +v	20:11
	← AtnevRed left	20:12
	← CorySimmons left	20:12
	← luxPerpetua left	20:13
	← mohammed64 left	20:14
	→ holodoc joined	20:14
	→ sgambino joined	20:14
	→ ComputingLand joined	20:14
	← Fijit left	20:14
	→ namikr joined	20:14
	← zivester left	20:15
	← otter768 left	20:16
	← namikr left	20:16
	→ tyreld joined	20:17
	→ durham_ joined	20:17
	← atomicb0mb left	20:17
	← SimonNa left	20:17
	→ FireArrow133 joined	20:18
	← gaen left	20:18
	→ namikr joined	20:19
	→ Aboba joined	20:19
	← durham left	20:19
	→ victorgama joined	20:20
	→ CausaMortis joined	20:20
	jhass → jazz	20:20
	→ luxPerpetua joined	20:20
	jazz → Guest92640	20:21
	Guest92640 → jhass	20:21
	← victorgama left	20:21
	→ encod3 joined	20:22
	→ bollullera joined	20:22
	← namikr left	20:24
	→ skarm joined	20:25
	→ jam_ joined	20:25
	← skarm left	20:26
	← Guest94421 left	20:27
	→ m0viefreak joined	20:28
	← jojovem left	20:28
	→ zivester joined	20:28
	← EvilPenguin left	20:29
	← jam_ left	20:30
	← Darcidride left	20:31
	→ NeverDie joined	20:33
	→ dstarh joined	20:33
	← CausaMortis left	20:34
	← holodoc left	20:35
	← choki left	20:36
	→ EvilPenguin joined	20:37
	← Zamerick left	20:37
	→ pozitrono joined	20:41
	← lindenle left	20:41
	← PublicSubnet left	20:41
	→ rominronin joined	20:42
	→ Guest94421 joined	20:42
	→ PublicSubnet joined	20:43
	← akiva left	20:43
	← PublicSubnet left	20:44
	→ PublicSubnet joined	20:44
	→ CausaMortis joined	20:45
	← IrishPrime left	20:46
	→ dpomerantz joined	20:46
	→ t0by joined	20:46
	→ astrofog joined	20:47
	← barduck left	20:47
	← rominronin left	20:47
	gitinfo set mode: +v	20:47
dpomerantz	Does any one have a nifty script that would allow me to "combine" multiple directories (like SVN tags or branches) into a single directory, keeping track of all changes, insertions, and deletions?	20:48
	I've been working with a third party who has no idea how git works and every time they committed files for delivery, they did it in v1, v2, v3, etc directories. I eventually started to change one, and they kept going. Need it as a single directory.	20:48
	→ n_blownapart joined	20:48
	← phaleth left	20:49
	→ barduck joined	20:49
	→ jagob joined	20:50
n_blownapart	hello I cannot pull from my own repo...I've done it many times. this is the error : " ssh: Could not resolve hostname https: nodename nor servname provided, or not known "	20:50
	→ lindenle joined	20:50
	→ paul424 joined	20:50
n_blownapart	don't know git very well ^^	20:51
dpomerantz	blownapart: Is this a local repo or are you trying to pull from a remote?	20:51
madewokherd	dpomerantz: I've never used it myself and don't know the details, but that sounds like a job for git filter-branch ?	20:51
	← Macaveli left	20:52
n_blownapart	remote, it's my own account. dpomerantz	20:52
nedbat	dpomerantz: how many directories?	20:52
	← phrozensilver left	20:52
dpomerantz	made: Thanks. I'll look into it. I've not used it either:(	20:52
	→ bazz joined	20:53
_ikke_	n_blownapart: what does git remote -v show return?	20:53
	← a3Dman left	20:53
dpomerantz	nedbat: Five directories at this point. There may be more than one commit (like 2-3) in each.	20:53
	← rpdprd left	20:53
n_blownapart	_ikke_: checking thanks	20:53
	→ frem joined	20:53
	→ rpdprd joined	20:53
nedbat	dpomerantz: i would do it manually in that case: copy v1 into the master place, commit it. copy v2, commit it, etc.	20:53
dpomerantz	nedbat: I thought about that. Definitely possible, but I wanted to at least see if there was a quick script for it.	20:54
	→ a3Dman joined	20:54
n_blownapart	_ikke_: four lines of output http://pastie.org/10670006	20:55
dpomerantz	Basically, I want to cycle through a specific directory tree for a series of refs and merge the trees into one unique tree. Maybe I could do it with code.	20:55
	→ zl joined	20:55
	← incredible left	20:55
	← bazz left	20:55
n_blownapart	not certain what fetch means ^^	20:56
	→ akiva joined	20:56
	→ PsionTheory joined	20:56
	→ polto joined	20:56
	← tvw left	20:57
	→ bazz_ joined	20:57
	← EvilPenguin left	20:57
bazz_	Need advice: I have 6 commits, the 2nd commit broke a functionality that the 6 fixes.. I need to somehow integrate the 6th commit into the 2nd one, keeping the others as they are (they change different files). Anyone??	20:57
madewokherd	what was the command for info on rebase -i? !sausage ?	20:58
gitinfo	[!sausage_making] Some developers like to "hide the sausage making", transforming their commits before presenting them to the outside world. See http://sethrobertson.github.com/GitBestPractices/#sausage and !perfect	20:58
kadoban	bazz_: That's basically what rebase -i is for. Note that it changes history, which is pretty much required by the problem description.	20:58
	← zl left	20:59
	← roxlu left	21:00
	→ sepu joined	21:00
	← CausaMortis left	21:00
	→ skylite joined	21:00
dpomerantz	netbat: I'm doing the manual delete/move/commit to combine into a single directory now.	21:02
n_blownapart	sorry _ikke_: I was missing a forward slash. thanks kindly	21:02
	→ gaen joined	21:02
	← n_blownapart left	21:03
	← gaen left	21:03
	→ phrozensilver joined	21:04
	← bandroidx_ left	21:05
	← zivester left	21:06
	→ ghartz joined	21:06
	→ bandroidx joined	21:06
	→ dsdeiz joined	21:06
	← kumasura left	21:06
	← aapaaal left	21:06
	→ afuentes joined	21:07
	→ Merri joined	21:07
	→ tpollard joined	21:08
	→ wethu joined	21:08
	← GT left	21:09
bazz_	kadoban: I'm in the middle of a pull request -- the commits have already been pushed .. do you recommend I still try a rebase?	21:09
kadoban	bazz_: Depends on the protocol you consider correct for pull requests. But either you do that or what you request is impossible.	21:10
bazz_	What is the popular approach to such a circumstance?	21:10
_ikke_	usually it's not uncommon to update pull requests	21:11
	→ CausaMortis joined	21:11
	← t0by left	21:12
kadoban	I usually try to avoid rebasing pull requests until the end, if someone else is commenting on them or working on them with me. Otherwise I just rebase the crap out of them whenever I feel like it.	21:13
	→ holodoc joined	21:13
	→ crayon joined	21:14
	← bollullera left	21:15
	→ jokoon joined	21:16
	→ mintux joined	21:18
	→ zivester joined	21:19
	← jokoon left	21:20
	← Merri left	21:20
	← wethu left	21:20
	← tgunr left	21:20
	← {AS} left	21:21
	→ tgunr joined	21:21
	← thiago left	21:21
	→ thiago joined	21:23
	← durham_ left	21:24
	← todd_dsm_ left	21:24
	← algae left	21:24
	← lindenle left	21:25
	→ todd_dsm_ joined	21:25
	→ durham joined	21:25
	← durham left	21:25
	← jimi_ left	21:25
	← zivester left	21:25
	← CausaMortis left	21:25
	→ durham joined	21:26
	→ Arsonide joined	21:27
	← rwb left	21:28
	← crayon left	21:29
	→ crayon joined	21:30
	← freimatz3 left	21:30
	← bazz_ left	21:30
	→ lindenle joined	21:31
	→ joufflu joined	21:31
	← gmichael left	21:32
	→ gmichael joined	21:32
	→ EvilPenguin joined	21:32
	→ gaen joined	21:33
	← gaen left	21:34
devster31	if I edit a commit in a branch that has been merged how can I then rewrite history without making a huge mess? for example here: https://bpaste.net/show/b189be90c71f I'd need to rewrite the message for 3490608 since it doesn't have newlines, is it doable?	21:35
	← garga left	21:36
	← paulweb515 left	21:36
	→ CorySimmons joined	21:36
	→ Wetmelon joined	21:36
devster31	I'm the only one using this so it's not a problem to force push	21:36
	← tgunr left	21:37
	→ ItSANgo joined	21:37
	← mbrzuzy left	21:37
	→ CausaMortis joined	21:37
	→ MattMaker joined	21:38
	→ vdv joined	21:39
	→ zivester joined	21:39
	→ nvahalik joined	21:40
	→ tgunr joined	21:41
	→ Bennux joined	21:41
	← zwa left	21:42
	→ rominronin joined	21:43
	← polto left	21:45
	← dsdeiz left	21:45
	→ skcin7 joined	21:46
	→ netcarver joined	21:46
	← DolpheenDream left	21:47
	→ daito joined	21:48
	← rominronin left	21:48
	← MarkyC left	21:50
	← editshare-ericf left	21:51
	← a3Dman left	21:51
nedbat	devster31: why do you need to rewrite history? Why not just fix it on the tip?	21:52
	← CausaMortis left	21:52
	← daito left	21:52
	→ a3Dman joined	21:54
	← netcarver left	21:55
	← mezod left	21:56
	← thiago left	21:56
	→ kfoonamalik joined	21:57
	→ Steadfast joined	21:58
devster31	because I want to change a commit message and not a file	21:59
	→ mingwandroid joined	22:00
devster31	nedbat: by mistake it's a neverending line instead of multiple lines	22:00
	← codeman left	22:00
	← Bennux left	22:00
nedbat	oh, i see.	22:00
	devster31: sorry, i'm not sure what the best approach is for that. Maybe just linearize the entire thing you showed.	22:01
devster31	what does it mean?	22:02
	← mahendra_ left	22:02
	→ mezod joined	22:02
	→ jokoon joined	22:03
	→ CausaMortis joined	22:04
devster31	merge into one branch, delete the rest and then edit the message?	22:04
	← akushner left	22:04
	← BigWillie left	22:04
	→ gaen joined	22:05
	← kfoonamalik left	22:05
	→ abc123 joined	22:06
	← gaen left	22:06
nedbat	devster31: i think "git rebase -i 0eb32bf" will do it for you, and let you edit the one commit you need to. Not sure though.	22:06
	→ dsdeiz joined	22:07
	← uri_ left	22:09
	← felixjet left	22:11
	→ otter768 joined	22:12
	→ akushner joined	22:13
	← nour left	22:15
	← cleme1mp left	22:15
	← paul424 left	22:15
	← mezod left	22:15
	← otter768 left	22:17
	← CausaMortis left	22:18
	← CorySimmons left	22:18
	→ ciampix joined	22:18
	← mizu_no_oto left	22:18
	← barduck left	22:18
	→ Zamerick joined	22:20
	← akushner left	22:21
	← woodruffw left	22:23
	← zivester left	22:23
	→ tubuliferous_ joined	22:24
	← josuebrunel left	22:24
	→ yqt joined	22:25
	→ akushner joined	22:27
	← King_Hual left	22:28
	→ CausaMortis joined	22:29
	→ t0by joined	22:30
	← elastix left	22:30
	→ CorySimmons joined	22:31
	← zotherstupidguy left	22:31
	← madewokherd left	22:32
	← Dougie187 left	22:32
	→ paul424 joined	22:32
	← dstarh left	22:33
	← Bpit left	22:34
	→ wethu joined	22:36
	→ zivester joined	22:37
	→ s8321414 joined	22:37
	→ zotherstupidguy joined	22:38
	→ felixjet joined	22:38
	← dopesong left	22:39
	← lindenle left	22:41
	← CausaMortis left	22:43
	→ rominronin joined	22:44
	← rubyonrailed left	22:45
	← BillCriswell left	22:45
	→ barduck joined	22:45
	→ mischat joined	22:45
	→ minus4 joined	22:47
	← barduck left	22:50
	← rominronin left	22:50
	← d0nn1e left	22:50
dpomerantz	Manually folding 4 directories into a fifth (complete with a commit that had to be manually merged) is complete. Took about 2 hours.	22:51
	Does any one know a way to manually mark a commit as a merge operation?	22:51
	← Es0teric left	22:52
	→ d0nn1e joined	22:53
	→ lindenle joined	22:53
FireArrow133	What do I do again if I want to push the commits to a local repository (as in local disk)? I have "git remote add origin" already done I just need to know what do I do to add a URL for the file?	22:53
johnw	dpomerantz: all it needs is multiple parents	22:53
	← sgambino left	22:53
	← peoliye left	22:53
	← nvahalik left	22:54
	← ComputingLand left	22:54
dpomerantz	johnw: Thanks. May be more trouble than it's worth then. One of the parents was deleted. I suppose I COULD have made it happen on another branch, but what's done is done.	22:54
	→ CausaMortis joined	22:55
	→ uri_ joined	22:55
	← raven-au left	22:55
	→ rubyonrailed joined	22:56
	← hahuang61 left	22:57
	→ tvw joined	22:58
	← Ice_Strike left	22:58
	→ Orbitrix joined	22:59
	← Orbitrix left	22:59
	← encod3 left	22:59
	→ Orbitrix joined	22:59
	← CorySimmons left	22:59
	← sepu left	23:00
	← cagedwisdom left	23:00
	← Jackneill left	23:01
	→ zeroed joined	23:01
	→ hahuang65 joined	23:02
	← zeroed left	23:03
	→ zackf joined	23:03
	← data left	23:03
	← fees left	23:03
	← queglay left	23:03
	← dpomerantz left	23:04
	→ queglay joined	23:04
	← minus4 left	23:04
	→ CheckDavid joined	23:04
	→ peoliye joined	23:04
	← zackf left	23:05
	← pozitrono left	23:06
zotherstupidguy	i need someone to explain to me the bare repo?	23:06
	← bango2 left	23:07
johnw	a bare repo has no associated working tree	23:07
zotherstupidguy	from what i read it is centeralized so all developers must push to the bare repo and pull from it? is that correct!??	23:07
johnw	no, that is not correct	23:07
zotherstupidguy	yes please	23:07
johnw	a bare repo is just another repository like any other	23:07
	it can hold Git objects, have Git objects pushed to or pulled from it, etc.	23:07
zotherstupidguy	this guy got it wrong http://www.saintsjd.com/2011/01/what-is-a-bare-git-repository/	23:07
johnw	for servers, it is a considered optimal because there is no need for a working tree there	23:08
	← paul424 left	23:08
johnw	his initial description is right...	23:08
	→ minus4 joined	23:08
	← minus4 left	23:08
johnw	it's not wrong, you just don't HAVE to use them in any particular way	23:08
zotherstupidguy	but if you have a normal repo, and i have a normal repo, i can clone from you?	23:08
johnw	two developers could share changes through a Git repo, or they could push/pull directly to /from each other	23:08
	or both	23:08
	just think "bare = no working tree" and you'll be fine	23:09
zotherstupidguy	i can pull from you, and push to you?	23:09
johnw	other than that, they are the same as any other repo	23:09
zotherstupidguy	cool	23:09
johnw	yes	23:09
zotherstupidguy	ok, can i have a git server without a bare repo?	23:09
johnw	you can	23:10
	that is generally frowned up, though	23:10
	← zivester left	23:10
johnw	since pushing to a repository that has an associated working tree can lead to confusion and problems	23:10
	→ peoliye_ joined	23:10
	→ mezod joined	23:10
johnw	If the branch that's checked out on the server is different from the one you're pushing too then there is no problem, otherwise it would have to update the working tree to match your push	23:11
zotherstupidguy	i see, so two developers don't push to each other, they only pull from each other and resolve the conflicts	23:11
johnw	if two developers are directly communicating changes, they usually do it by sending one another patch files generated using git-format-patch	23:11
	← peoliye left	23:11
johnw	and then using "git am" to incorporate those changes	23:12
	pulling directly from the other developer is fine and safe	23:12
	pushing directly to him, not so good	23:12
	→ cagedwisdom joined	23:12
zotherstupidguy	very cool. not the usual way most people use git, everyone is just on github!	23:12
johnw	yeah, or that	23:12
	which again is using a third repository to mediate between the developers	23:12
	← gopar left	23:13
	← uri_ left	23:13
	← hobodave left	23:13
johnw	so there is a different bit of a difference here between what is typically done and what is possible	23:13
zotherstupidguy	yeah, its a solution, but it is centerlized not distrubted anymore	23:13
johnw	there are many topologies possible among repositories, but it's most typical for changes to be communicated through a common repository	23:13
	← pantsman- left	23:13
	→ _joes_ joined	23:14
zotherstupidguy	one idea that annoys me recently, if each blob got its own SHA, why git not use a bittorrent protocl to share blobs among developers?	23:15
	→ pozitron joined	23:15
johnw	the idea has come up before	23:15
zotherstupidguy	cool, and?	23:15
	→ uri_ joined	23:15
zotherstupidguy	isnt the purpose is to keep code alive, no matter what nodes die?	23:16
johnw	I'm not sure there is an implied purpose	23:16
	← eijk left	23:17
zotherstupidguy	to take it a bit futher, if blobs would be mixed with some RDF or similar, interesting things might be possible later on	23:17
	← t0by left	23:17
	→ madewokherd joined	23:18
	← pasky left	23:18
zotherstupidguy	it would be a live code graph, going from one library code to another, and each piece of code would be annotated for its purpose, if such data is out there, smarter people will figure out how to make use of it, in theory!	23:20
	→ pasky joined	23:20
	← krawchyk left	23:21
	→ nvahalik joined	23:21
	→ scwizard joined	23:21
scwizard	is there any way to edit the ref a submodule points to	23:22
	← Steadfast left	23:22
scwizard	the current ref is wrong which prevents me from checking it out which prevents me from changing the ref in a normal fashion	23:22
	→ Sonicbit joined	23:22
	← Spacew00_ left	23:22
	← _joes_ left	23:23
scwizard	oh i just cd into the submodule dir and checkout the correct ref	23:23
	← nvahalik left	23:25
	← jleclanche left	23:25
	→ data joined	23:25
	→ fragant joined	23:25
	← AaronMT left	23:26
	gitinfo set mode: +v	23:26
	← scwizard left	23:27
	← kpease left	23:28
	→ avgn joined	23:28
	← avgn left	23:29
	← ghartz left	23:29
	← gargola left	23:29
	← kiloreux left	23:29
	→ jimi_ joined	23:30
fragant	Hi! Does anybody know how to remove three Windows explorer context menu entries "Git Init Here", "Git Gui" and "Git Bash"?	23:30
	→ johnflux joined	23:31
fragant	For the client git-gui	23:31
tang^	disable integration during git for windows installation	23:31
	← cbonobo left	23:31
fragant	Is it possible after installing?	23:31
	→ alanjf joined	23:31
tang^	haven't tried	23:32
Seveas	probably some register entries somewhere	23:32
	← killa_kyle left	23:32
	← luxPerpetua left	23:33
fragant	Visual Studio installed it automaticly. Regedit can't find anything, Autoruns also and disable in CCleaner doesn't work :(	23:33
	← jokoon left	23:35
m0viefreak	HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Directory\shell\git_gui	23:35
	HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Directory\shell\git_shell	23:35
	HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Directory\background\shell\git_gui	23:35
	HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Directory\background\shell\git_shell	23:35
	← TomyLobo left	23:36
	← afuentes left	23:36
	← chitopunk left	23:36
	→ afuentes joined	23:36
fragant	Thanks, just in this moment i made a copy of this entrys	23:37
	It works! Thanks	23:37
	← rubyonrailed left	23:38
	→ nfk\|laptop joined	23:38
	← uri_ left	23:40
	← lindenle left	23:42
	→ editshare-ericf joined	23:42
	← jimi_ left	23:43
	← fragant left	23:43
	→ jalnt joined	23:44
	← tyreld left	23:44
	← tzero left	23:45
	→ rominronin joined	23:45
	← ciampix left	23:47
	→ lindenle joined	23:47
	← satifant left	23:47
	← mintux left	23:48
	→ daito joined	23:49
	→ jimi_ joined	23:50
	← ash_workz left	23:50
	← CausaMortis left	23:50
	← rominronin left	23:51
	→ fahadash joined	23:51
	← daito left	23:54
	→ ome joined	23:55
	← queglay left	23:56
	← lindenle left	23:57
	← johan_sun left	23:57
	→ gopar joined	23:57
	→ lindenle joined	23:58

Logs Search ←Prev date Next date→

Channels Documentation