IRCloggy #git 2018-04-09

Provider of IRC logs since 2005.

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

	2018-04-09
	← weez17 left	00:00
	← leeN left	00:00
	→ weez17 joined	00:00
	→ jready joined	00:00
	← Karyon_ left	00:02
	→ kus joined	00:04
	← jready left	00:05
	← mborgard left	00:07
	→ nahtnam joined	00:09
	← ferdna left	00:10
	→ mellernoia joined	00:10
	← asphyxia left	00:11
	→ xaxxon joined	00:11
	→ asphyxia joined	00:16
	→ threexc joined	00:17
	← diogenese left	00:18
	→ Qudit314159 joined	00:19
	→ andyhuzhill joined	00:22
modin	is there a way to have `text` in `git show :/text` treated case insensitive?	00:24
thiago	I don't think so	00:25
	never seen such an option	00:25
	→ solaris joined	00:25
Eugene	modin - does core.ignoreCase do what you want?	00:26
	git-config option	00:26
	That's the only thing that would come close. git is case-sensitive(well, any content-change sensitive)	00:26
	→ pity joined	00:26
Eugene	on purpose	00:26
modin	Eugene: that's for filesystems thou?	00:27
Eugene	!tryit ;-)	00:27
gitinfo	[!tias] Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.	00:27
	→ Karyon_ joined	00:27
modin	;)	00:28
	sadly it does not	00:28
Eugene	womp womp	00:28
	← peepsalot left	00:28
	← TomyLobo left	00:28
	→ cdown joined	00:29
modin	`git show :/[Tt][Ee][Xx][Tt]` does work thou :P	00:29
Eugene	!next	00:29
gitinfo	Another satisfied customer. NEXT!	00:29
modin	was hoping to append a flag to that regex somehow	00:29
	← Xiti left	00:29
modin	k. thanks anyhow.	00:29
Eugene	You're probably better at regex than I. Sorry, doesn't exist	00:30
	Patches welcome etc	00:30
	→ peepsalot joined	00:31
	→ adamantium joined	00:32
	← mansonet left	00:33
	→ Xiti joined	00:33
lrvick	Hey all. I am trying to add m-of-n signing to git. Would love any input in this interface/approach before I implement it: https://github.com/lrvick/git-signatures#implementation	00:34
	Well, you can just read the whole thing. but yeah	00:34
	← mel00010 left	00:34
	← peepsalot left	00:37
TikityTik	What's the safest way for me to remove a commit from my remote repo? I'm the only one that needs to worry about rebasing	00:40
lupine	git rebase ; git push	00:41
	-f as appropriate	00:41
	→ dsantiago joined	00:43
TikityTik	this commit is like at the beginning of my branch	00:44
	→ solaris_ joined	00:44
TikityTik	i still don't know how I delete it, it won't affect the work after it	00:44
	← solaris left	00:45
	solaris_ → solaris	00:45
	→ mel00010 joined	00:46
Eugene	TikityTik - !rewrite	00:47
gitinfo	TikityTik: 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	00:47
	→ mborgard joined	00:48
	→ cfoch joined	00:50
bremner	I'm in a git-svn repo, and there are some mysterious changes I can't "reset --hard" away: https://paste.debian.net/1019346/	00:51
	this prevents me from dcommiting	00:52
	ugh. looks like something windows related	00:52
	compiler/bin/stage3 -> '!<symlink>'$'\377\376''m'	00:52
	← Singmyr left	00:57
	→ safe joined	00:59
	← mel00010 left	01:00
	→ diogenese joined	01:04
	← nephyrin left	01:05
	→ finalbeta joined	01:07
	← sentriz left	01:08
	← mborgard left	01:08
	→ lucasem joined	01:08
	→ sentriz joined	01:08
	← lucasem left	01:09
	→ mel00010 joined	01:15
	→ nephyrin joined	01:16
	→ HuskyApo_ joined	01:18
	← jesst left	01:20
	← mellernoia left	01:25
	→ Codaraxis_ joined	01:28
	← Codaraxis left	01:29
	← Qudit314159 left	01:33
	← fuzzface left	01:34
	← nephyrin left	01:34
	← asphyxia left	01:34
	LiftLeft2 → LiftLeft	01:41
	← phinxy left	01:42
	→ nephyrin joined	01:44
	← solaris left	01:45
	→ PioneerAxon joined	01:45
	→ solaris joined	01:46
	→ asphyxia joined	01:47
	← ilbot3 left	01:48
	← solaris left	01:48
	← Guest18 left	01:50
	← mooasaurus left	01:50
	→ mooasaurus joined	01:50
	← aax left	01:51
	→ suzie joined	01:51
	← suzie left	01:53
	→ LoremIpsum joined	01:53
	→ freetlas joined	01:54
	← LoremIpsum left	01:55
	→ Suzie joined	01:55
	→ ilbot3 joined	01:58
freetlas	Hey guys. i'm currently using git with git Bitbucket. Now I just created a new account on Github and I added the same ssh key I have on Bitbucket. How do I know when I'm using which one? Thanks!	01:59
	Is there a way to set up this better?	01:59
	→ jmerizia joined	01:59
	← nephyrin left	02:01
	→ testnick123 joined	02:04
	← Suzie left	02:06
	→ fantasia joined	02:06
	← fantasia left	02:07
	→ PinkBash joined	02:08
	→ nephyrin joined	02:08
	← andyhuzhill left	02:09
	← LiftLeft left	02:09
	← xaxxon left	02:09
	→ andyhuzhill joined	02:09
	← asphyxia left	02:09
	← PinkBash left	02:10
	→ PinkBash joined	02:10
	→ asphyxia joined	02:14
	← HuskyApo_ left	02:15
	← freetlas left	02:17
	← PinkBash left	02:18
	→ PinkBash joined	02:18
	→ dirtyroshi joined	02:18
	← dsantiago left	02:18
	← PinkBash left	02:19
	→ PinkBash joined	02:19
	→ dsantiago joined	02:19
	→ steeze joined	02:20
	← a3Dman left	02:21
	← monokrome left	02:22
	← PinkBash left	02:24
	→ a3Dman joined	02:25
	→ testnick123_ joined	02:26
	→ monokrome joined	02:27
	← testnick123 left	02:27
	← dsantiago left	02:29
	→ dsantiago joined	02:30
palmtree	freetlas why using both? use just git	02:31
	→ LiftLeft joined	02:31
	→ xaxxon joined	02:32
	← Lipoly left	02:38
	→ ferdna joined	02:38
	→ Lipoly joined	02:38
	← dsantiago left	02:39
	← mel00010 left	02:39
	→ dsantiago joined	02:40
	← noobineer left	02:40
	→ ooxvoox joined	02:40
	← dsantiago left	02:43
	→ testnick123 joined	02:44
	→ dsantiago joined	02:44
	← netj left	02:44
	← kus left	02:44
	← testnick123_ left	02:45
	← jmerizia left	02:47
	← asphyxia left	02:47
	← dsantiago left	02:48
	→ netj joined	02:48
	→ lagothrix joined	02:49
	→ dsantiago joined	02:49
	← lagothri1 left	02:52
	← dsantiago left	02:52
	→ mel00010 joined	02:52
	← ooxvoox left	02:52
	→ dsantiago joined	02:53
	← ghal left	02:57
	← piggah left	02:57
	→ solaris joined	02:59
	→ vdamewood joined	03:02
	← a3Dman left	03:02
	← palmtree left	03:03
	← fr33domlover left	03:04
	← solaris left	03:08
	→ a3Dman joined	03:09
	← mel00010 left	03:13
	→ solaris joined	03:13
	← andyhuzhill left	03:21
	→ piggah joined	03:23
	← \void left	03:24
	→ andyhuzhill joined	03:24
	← solaris left	03:25
	← andyhuzhill left	03:26
	→ mel00010 joined	03:28
	→ canvon joined	03:30
	← canvon_ left	03:31
	← oskarkv left	03:33
	→ palmtree joined	03:35
	→ g00s joined	03:38
	→ ghal joined	03:40
	→ NERD-k joined	03:41
	← Copenhagen_Bram left	03:41
	→ Copenhagen_Bram joined	03:42
	← pity left	03:43
	→ pity joined	03:44
	→ Puffball joined	03:44
	← palmtree left	03:49
	← pp5mgt left	03:54
	→ pp5mgt joined	03:55
	← Noldorin left	03:59
	← Copenhagen_Bram left	03:59
	→ Copenhagen_Bram joined	04:00
	→ schleppel joined	04:02
	→ palmtree joined	04:03
	← dviola left	04:06
	→ govg joined	04:08
	← xaxxon left	04:11
	← piggah left	04:14
	→ HuskyApo_ joined	04:15
	← HuskyApo_ left	04:15
	→ HuskyApo_ joined	04:16
	← HuskyApo_ left	04:18
	← boombatower left	04:21
	← NERD-k left	04:22
	→ robotroll joined	04:25
	← finalbeta left	04:25
	→ finalbeta joined	04:25
	← weijin left	04:26
	← robotroll left	04:30
	→ Orbitrix joined	04:32
	← vdamewood left	04:32
	→ NERD-k joined	04:32
	← orbyt_ left	04:35
	→ piggah joined	04:36
	→ weijin joined	04:36
	← veegee left	04:38
	→ Raging_Hog joined	04:39
	← weijin left	04:41
	→ HuskyApo_ joined	04:42
	← a3Dman left	04:44
	← pp5mgt left	04:45
	→ weijin joined	04:46
	← Lyqyd left	04:46
	→ pp5mgt joined	04:46
	→ dga joined	04:46
	→ freimatz joined	04:47
	→ a3Dman joined	04:49
	← weijin left	04:50
	← dga left	04:54
	→ testnick123_ joined	04:54
	← testnick123 left	04:56
	→ weijin joined	04:59
	← HuskyApo_ left	04:59
	← NERD-k left	05:00
	→ asphyxia joined	05:00
	→ NERD-k joined	05:00
	← NERD-k left	05:00
	→ NERD-k joined	05:01
	← NERD-k left	05:01
	→ NERD-k joined	05:01
	← NERD-k left	05:02
	→ smallNERD joined	05:02
	← pks left	05:03
	→ HuskyApo_ joined	05:04
	→ pks joined	05:05
	→ jready joined	05:05
	→ B4S1L3 joined	05:07
	→ jay-m joined	05:08
B4S1L3	Aie, I cant get colors in Konsole anymore, in interactive mode.... any idea ? (FC27, latest stable git, tried everything with the settings,...)	05:09
	← jready left	05:09
B4S1L3	i never worked actually on FC27 but was okay on Leap 42.3	05:10
thiago	what did you do to get colours?	05:12
	and what interactive mode? git add -i ?	05:12
	← steeze left	05:13
	← a3Dman left	05:13
	← jay-m left	05:13
B4S1L3	in the past on Leap 42.3 it worked since setup. "git rebase -i master" for example and the verb [pick\|fixup\|squesh\| etc] was colorized	05:13
	(i'm asking on fedora-kde too since it could be a problem with their package or whatever)	05:15
	→ akushner joined	05:15
thiago	colourised in your editor?	05:15
	so not a Git problem	05:15
B4S1L3	colorised in Konsole (default terminal for KDE DE)	05:15
	→ a3Dman joined	05:15
thiago	after what command?	05:16
B4S1L3	"git rebase -i origin/master" for example	05:16
	which displays a table of commits under certain circumstances, but you should know that	05:17
thiago	that's your editor	05:17
	plase configure it properly	05:17
	← weijin left	05:18
B4S1L3	ah you speak about vim loaded in Konsole....	05:18
	i didn't thought to that. Was focused on the terminal	05:18
	← testnick123_ left	05:19
	← githubmgw left	05:21
	← HuskyApo_ left	05:24
	→ fguillot joined	05:29
	← smallNERD left	05:30
	← freimatz left	05:31
	← ferdna left	05:32
	→ githubmgw joined	05:32
	→ ferdna joined	05:32
	← githubmgw left	05:33
	→ HuskyApo_ joined	05:34
	← ferdna left	05:34
	← fguillot left	05:36
	→ ferr1 joined	05:39
	→ James0r2 joined	05:40
	→ Zedka29 joined	05:40
	→ James0r2_ joined	05:41
	← diogenese left	05:42
	→ rivalomega joined	05:42
	← HuskyApo_ left	05:43
	→ smallNERD joined	05:43
	← James0r left	05:44
	← B4S1L3 left	05:45
	← James0r2 left	05:45
	→ weijin joined	05:46
	← a3Dman left	05:46
	→ subhojit777 joined	05:47
	→ borkr joined	05:47
	← borkr left	05:47
	→ a3Dman joined	05:49
	→ fr33domlover joined	05:50
	→ diogenese joined	05:50
	→ KeyJoo joined	05:50
	→ kent\n joined	05:56
	→ widp joined	05:57
	← a3Dman left	05:57
	← palmtree left	05:57
	→ tt_ joined	05:58
	← cssko left	05:59
	→ cssko joined	05:59
	→ a3Dman joined	06:00
	← cssko left	06:01
	→ cam27 joined	06:02
	→ asphyxia_ joined	06:02
	→ cssko joined	06:03
	← drodger left	06:03
	← asphyxia left	06:03
	← cssko left	06:04
	→ cssko joined	06:05
	← cssko left	06:06
	← cam27 left	06:07
	→ cssko joined	06:08
	→ drodger joined	06:09
	← cssko left	06:10
	→ cssko joined	06:10
	← piggah left	06:12
	← a3Dman left	06:13
	← Raging_Hog left	06:13
	← solarjoe4 left	06:13
	→ a3Dman joined	06:14
	→ devbaka joined	06:16
	→ wandering_vagran joined	06:16
	← tt_ left	06:21
	→ tt_ joined	06:23
	→ NERD-k joined	06:25
	→ jfr joined	06:26
	→ abba joined	06:27
	→ rh10 joined	06:28
	← cfoch left	06:29
	→ escproxy joined	06:30
	← drodger left	06:30
	→ drodger joined	06:31
	→ tkore joined	06:32
	← tkore left	06:32
	→ tkore joined	06:32
	← g00s left	06:34
	← safe left	06:35
	→ JeroenT joined	06:35
	→ happy-dude joined	06:36
NERD-k	hello, I had set `git config --global proxy.https socks5://127.0.0.1:1080`, but it failed when I use git clone https://*, but it can work if I use git clone git@github*, what's going wrong???	06:36
	→ Tobbi joined	06:37
	← a3Dman left	06:39
	→ multi_io joined	06:40
_ikke_	git@github uses ssh, not http	06:40
NERD-k	Failed to receive SOCKS4 connect request ack.	06:41
	→ a3Dman joined	06:41
	← diogenese left	06:41
NERD-k	I am using PROXY(socks5) to through GFW(CHINA),	06:42
	→ diogenese joined	06:42
	← ferr1 left	06:42
	→ andyhuzhill joined	06:42
	← asphyxia_ left	06:42
	← tunekey left	06:43
	← Gurkenglas left	06:43
NERD-k	I don't why it give me that message. I am use socks5! And curl is got that message and failed too.	06:43
	→ asphyxia joined	06:44
	→ dreiss joined	06:44
	→ lalitmee joined	06:44
	→ CheckDavid joined	06:44
NERD-k	My web Broser can surf on the internet. I don't know what make it PROXY(socks5).	06:45
	→ zeroed joined	06:46
	→ tunekey joined	06:46
NERD-k	I don't know what PROXY it(socks4).	06:46
	← andyhuzhill left	06:46
	→ howlymowly joined	06:47
	→ andyhuzhill joined	06:47
	→ rokups joined	06:47
	← __rob left	06:47
	← a3Dman left	06:48
	← jimmyrcom_ left	06:49
	← PioneerAxon left	06:49
	← abba left	06:50
	← pp5mgt left	06:51
	→ __rob joined	06:51
	→ pp5mgt joined	06:51
	← NERD-k left	06:52
	← smallNERD left	06:52
	← subhojit777 left	06:53
	→ a3Dman joined	06:56
	→ abba joined	06:58
	→ jay-m joined	06:59
	→ seschwar joined	07:01
	→ BH23 joined	07:03
	← rivalomega left	07:04
	← BH23 left	07:04
	→ TomyWork joined	07:05
	← escproxy left	07:06
	→ BH23 joined	07:10
	→ fstd_ joined	07:10
	← a3Dman left	07:11
	→ xaxxon joined	07:11
	← fstd_ left	07:11
	→ fstd_ joined	07:11
	← fstd left	07:13
	fstd_ → fstd	07:13
	← BH23 left	07:13
	→ rfuentess joined	07:13
	→ blackmesa joined	07:15
	← duderonomy left	07:16
	→ a3Dman joined	07:17
	← Goplat left	07:18
	→ Phylock joined	07:19
	→ dzn joined	07:23
	← a3Dman left	07:25
	→ fuchstronaut joined	07:28
	← cssko left	07:31
	→ palmtree joined	07:31
	→ a3Dman joined	07:31
	→ cssko joined	07:33
	← cssko left	07:35
	→ cssko joined	07:36
cYmen_	Do you guys use any tools with git? Like gitk or gitkraken or whatever your IDE has...?	07:37
	← cssko left	07:38
	← thiago left	07:38
	→ escproxy joined	07:39
Stummi	cYmen_, smartgit here	07:39
	→ cssko joined	07:40
Stummi	I do most stuff on command line, but sometimes having an actual visualization beside it helps	07:40
	← dreiss left	07:41
	← cssko left	07:41
	← pp5mgt left	07:42
	← Impaloo left	07:43
dzn	i mostly use cli, git log is great	07:43
	→ pp5mgt joined	07:43
	→ cssko joined	07:43
	→ Impaloo joined	07:43
	← Impaloo left	07:43
	← ArcaTech left	07:43
	→ Impaloo joined	07:44
	← cssko left	07:45
	→ cam27 joined	07:45
	→ cssko joined	07:46
rudi_s	tig	07:46
	→ MrMojit0 joined	07:47
	← MrMojit0 left	07:47
	→ _Mental joined	07:48
	← cssko left	07:48
	← Impaloo left	07:49
	→ manuelschneid3r joined	07:49
	→ cssko joined	07:50
	→ naqued joined	07:50
	→ smallNERD joined	07:50
	→ NERD-k joined	07:51
	← cssko left	07:51
	→ floppydh joined	07:51
	← smallNERD left	07:51
	← NERD-k left	07:51
	→ jready joined	07:52
	→ Impaloo joined	07:53
	→ cssko joined	07:53
	→ tvw joined	07:55
	← cssko left	07:55
	→ bolovanos joined	07:56
	← jready left	07:57
	→ cssko joined	07:57
	← Impaloo left	07:58
	→ Impaloo joined	07:58
	← cssko left	07:59
	→ cssko joined	08:01
	← _ADN_ left	08:01
	→ MurkyLizard joined	08:02
	← cssko left	08:03
	← tunekey left	08:04
	→ cssko joined	08:05
	→ tunekey joined	08:05
	→ mikecmpbll joined	08:07
cYmen_	dzn: really? I can't seem to find anything with tha.	08:08
	← cssko left	08:08
cYmen_	Mind grepping your bash history for some examples? :)	08:08
	Stummi, rudi_s: Thanks! Will try those.	08:08
	→ dre_ joined	08:08
	← zeroed left	08:09
	→ cssko joined	08:09
	← tunekey left	08:09
	→ acidjnk joined	08:11
	→ tunekey joined	08:11
	→ Martin__ joined	08:13
	← Martin__ left	08:13
	← cssko left	08:13
	→ venmx joined	08:13
	→ axc joined	08:14
	→ cssko joined	08:14
	→ AmR\|EiSa joined	08:15
cYmen_	Is it possible to set user/mail per server instead of globally?	08:15
	I keep committing things under the wrong name. :/	08:15
AmR\|EiSa	I'm trying to get 5.11 from git and I got this errors Submodule path 'src/3rdparty/mapbox-gl-native': checked out '8c1be4ec01ef46bf453856531ebf53b48ce3dbe7' + git submodule init src/3rdparty src/3rdparty is dirty. Dirty submodule(s) present; cannot proceed.	08:15
	Any one know How I can fix this ?	08:16
	← cssko left	08:17
	→ fatalhalt joined	08:18
	→ cssko joined	08:19
	← birk0ff left	08:21
	→ birkh0ff joined	08:22
sonOfRa	cYmen_: for visualization I use tig. But actual operations I do on the command line. tig is nice because it's ncurses so I can even use it on headless machines	08:22
	← sim590 left	08:23
	→ zeroed joined	08:23
AmR\|EiSa	Any help please ?	08:23
	← cssko left	08:24
	← Bobdude left	08:24
	→ cssko joined	08:25
	← blackmesa left	08:26
	→ sim590 joined	08:27
	← cssko left	08:28
	→ mosab joined	08:28
	← zeroed left	08:28
	→ tvale joined	08:30
	← tvale left	08:30
	→ tvale joined	08:30
	→ cssko joined	08:30
	→ aax joined	08:32
	← cssko left	08:33
	← JeroenT left	08:33
	→ JeroenT joined	08:34
	→ Darcidride joined	08:34
	← netj left	08:34
	→ netj joined	08:35
	→ cssko joined	08:35
	← cssko left	08:38
	→ zeroed joined	08:38
	→ cssko joined	08:41
	→ cstratak joined	08:42
	→ Nirgal joined	08:42
	← zeroed left	08:43
	← cssko left	08:44
	← palmtree left	08:44
	→ brontosaurusrex joined	08:45
	→ cssko joined	08:46
	← lalitmee left	08:47
	← cssko left	08:49
	← Nirgal left	08:50
	← venmx left	08:50
	← Guest879 left	08:51
	→ cssko joined	08:51
	→ bubo joined	08:51
	→ ToBeCloud joined	08:52
	gitinfo set mode: +v	08:52
	← cssko left	08:54
AmR\|EiSa	Any help plz I got same error at windows and linux.	08:54
tobiasvl	AmR\|EiSa: what are you doing exactly? you're trying to get 5.11 of what from git? how? !repro	08:55
gitinfo	AmR\|EiSa: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	08:55
	← happy-dude left	08:55
	→ cssko joined	08:56
tobiasvl	AmR\|EiSa: what version of git are you on? maybe this will help https://stackoverflow.com/questions/4873980/git-diff-says-subproject-is-dirty?utm_medium=organic&utm_source=google_rich_qa&utm_campaign=google_rich_qa	08:56
	← cssko left	08:58
AmR\|EiSa	git version 2.16.2	08:58
	← andyhuzhill left	08:58
AmR\|EiSa	I got 5.10.0 and then try checkout to 5.11	08:59
tobiasvl	sorry for the google attributes on the url there...	08:59
	AmR\|EiSa: 5.10.0 of what??	09:00
	but yeah, that stackoverflow answer might help	09:00
	→ _ADN_ joined	09:00
AmR\|EiSa	tobiasvl: https://code.qt.io/qt/qt5.git	09:00
	→ cssko joined	09:01
tobiasvl	aha	09:01
	← bubo left	09:01
	→ mikecmpb_ joined	09:03
	← cssko left	09:03
	→ bubo joined	09:05
	← mikecmpbll left	09:05
	← Kulrak left	09:06
	→ cssko joined	09:06
	→ riemann joined	09:07
AmR\|EiSa	By git submodule foreach --recursive git checkout not fixing that error	09:09
	→ rvgate joined	09:12
	→ goweol1 joined	09:13
	← goweol left	09:14
	→ wombawomba joined	09:15
	→ goweol joined	09:16
wombawomba	I want to get a local checkout of an arbitrary ref (commit, branch, tag), up to date with a remote repo, via a script. What's the easiest way to accomplish this?	09:16
	If there are local changes, I want them to be overwritten, but I don't want to have to re-clone the repo every time.	09:17
	→ doev joined	09:18
	← goweol1 left	09:18
	← catsup left	09:18
wombawomba	AFAICT, if the ref is a commit id, I can just do `git reset --hard $ref`, but if the ref is a branch, I have to do `git reset --hard origin/$ref`. Not sure how to unify these two cases	09:18
	→ catsup joined	09:19
	→ venmx joined	09:19
	→ zeroed joined	09:19
	← catsup left	09:19
	→ chris_wo_ joined	09:19
	→ catsup joined	09:19
	← chris_wot left	09:21
	← jim left	09:21
tobiasvl	wombawomba: well, that depends what you mean by "a local checkout". you don't want a detached HEAD, it looks like? so you want one specific local branch to point to an arbitrary remote ref?	09:21
	→ pfleck joined	09:21
	→ mlopezviedma_ joined	09:22
wombawomba	tobiasvl: I'm totally cool with a detached head	09:22
osse	are you nearly headless nick ?	09:23
	← mlopezviedma left	09:23
wombawomba	:P	09:23
	→ Kulrak joined	09:23
	← Kulrak left	09:23
	→ Kulrak joined	09:23
	→ lalitmee joined	09:24
	← Orbitrix left	09:24
	→ Orbitrix joined	09:24
wombawomba	all I want is for my script to take a ref on the form `d942cb9` or `master` or `some-tag`, and a path to my local repo, and then make sure that the local repo points to the latest commit corresponding to the given ref on the remote	09:25
	← zeroed left	09:27
wombawomba	oh and by 'points to', I want to make sure that that ref is checked out	09:28
	→ zeroed joined	09:28
	← dre_ left	09:28
	→ pd2000 joined	09:30
	← beerdrop left	09:31
	← dzn left	09:31
	→ King_Hual joined	09:32
	← King_Hual left	09:32
	→ King_Hual joined	09:32
	→ hunterlabs joined	09:33
	← AmR\|EiSa left	09:34
	← xaxxon left	09:35
	→ afuentes joined	09:40
	← KeyJoo left	09:40
jast	wombawomba: git fetch; git checkout -f <thing> (e.g. 'origin/master' if you want origin's master)	09:43
nai	what's wrong with "git checkout -f $ref" ?	09:43
	^	09:43
	← cam27 left	09:44
jast	also, if this is for a deployment scenario, here's a comparison of approaches: !deploy	09:44
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	09:44
	→ beerdrop joined	09:45
wombawomba	jast: right, but how do I do that without knowing to insert 'origin/' if ref is a branch?	09:46
	the ref is provided by the user — I don't know if it's a branch or a commit	09:46
jast	are you actually using the local branches in that repository?	09:47
wombawomba	no	09:47
jast	if not, you can reconfigure fetch to directly fetch into your local branches	09:47
wombawomba	how?	09:47
	→ re1 joined	09:47
jast	remote.origin.fetch = '+refs/heads/:refs/heads/'	09:47
	→ dragoonis joined	09:47
	← dragoonis left	09:48
	→ dragoonis joined	09:48
wombawomba	sorry for being slow.. where do I put that? :)	09:48
jast	either by running this inside the repo: git config remote.origin.fetch '+refs........'	09:48
	or by editing the repo's .git/config and replacing the corresponding line	09:48
	the syntax is a bit different there but you should figure it out easily :)	09:48
wombawomba	okay	09:48
	cool	09:48
dragoonis	Hey! I have a pull request on Repo 1 and I have a new repo named Repo 2 .. I wish to take the code (and history of 5 commits) over. The gotcha is on Repo 1 the files are in the root of the repo. Repo 2 they're in a sub-dir named /back-end ... Can someone help me please?	09:49
wombawomba	and fetch will overwrite any local changes if I use that?	09:49
jast	yes, but not check them out. you'll still need the 'git checkout -f'.	09:49
wombawomba	awesome, I'll try that	09:49
	thanks!	09:49
jast	dragoonis: that's not perfectly straightforward, but try this when merging (can't promise it will work, but worth a try): 'git merge -Xsubtree=back-end'	09:50
	it will probably not work if the two repos don't have common history, though	09:50
dragoonis	They won't.	09:50
jast	then this will be quite a bit more work	09:51
dragoonis	What if I don't care about history, and just want to squash all 5 commits into 1 commit.	09:51
jast	does repo 2 have any changes in back-end that you need to keep?	09:51
dragoonis	Once I have the branch over on the new repo, even with merge conflicts, I can resolve them. As long it's merging to the correct path	09:51
	jast - yes	09:51
	→ tkore1 joined	09:52
dragoonis	I'd like the branch + commit onto Repo 2, then I could rebase on master and work on stuff.	09:52
	It's just the paths are different at the moment.	09:52
	← tkore left	09:52
	tkore1 → tkore	09:52
jast	okay... due to the branches not having common history, you'll have the entire file(s) marked as conflicted	09:52
	so that's going to suck :)	09:52
	but basically here's what you do:	09:52
dragoonis	... /file to /back-end/file	09:52
jast	1) in repo 2, add repo 1 as a remote.	09:53
	2) do a normal merge, probably use --no-commit to ensure it will let you fix things up	09:53
	→ Chaser joined	09:53
	→ flaviodesousa joined	09:53
	← _Mental left	09:54
jast	3) restore the state from repo 2 for now: git read-tree --reset -u HEAD	09:54
wombawomba	jast: I'm getting "fatal: Refusing to fetch into current branch refs/heads/master of non-bare repository" when doing `git fetch` after setting that setting	09:54
jast	now by far the easier way to do it is to discard your commit history from repo 1, here's how you'd do it that way:	09:54
	4) git read-tree -m -u --prefix=back-end/ <topmost commit ID from repo 1>	09:55
	5) fix conflicts, 'git add' and 'git commit' to finalize	09:55
	← john-34 left	09:56
jast	wombawomba: okay, yeah. just looked into this and there's no config option to bypass that check, but if you detach HEAD and also do that on each subsequent 'git checkout -f' you'll be fine	09:56
	← Karyon_ left	09:56
jast	to detach now: git checkout HEAD^0	09:57
	to detach your things later: git checkout -f <thing>^0	09:57
wombawomba	jast: actually it seems you can pass --update-head-ok to git fetch and it works	09:57
jast	oh, fun	09:57
	I looked at the code instead of at the docs, and didn't see it use any flag like that :)	09:58
wombawomba	hah	09:58
	← netj left	09:59
	→ netj joined	09:59
	→ Xiti` joined	09:59
	→ blackchalk joined	10:01
	→ xaxxon joined	10:02
	→ MarioBranco joined	10:02
	← Xiti left	10:03
	→ Raging_Hog joined	10:04
	→ john-34 joined	10:09
	→ Fernando-Basso joined	10:10
	→ rudi_s joined	10:14
	→ zefferno joined	10:15
	← Kaisyu left	10:16
	← blackchalk left	10:16
	→ kurkale6ka joined	10:16
	← dsantiago left	10:17
	← xaxxon left	10:17
	→ jimm joined	10:18
	→ blackchalk joined	10:19
	← blackchalk left	10:19
	← pity left	10:20
	→ blackchalk joined	10:21
	← blackchalk left	10:22
	→ blackchalk joined	10:22
	← wombawomba left	10:23
	← CheckDavid left	10:23
	→ leeN joined	10:27
	→ dsantiago joined	10:30
	← rvgate left	10:31
	← dsantiago left	10:32
	→ blackmesa joined	10:33
	→ dsantiago joined	10:34
	← tkore left	10:36
	→ tkore joined	10:36
	← blackmesa left	10:37
	→ rajpratik71 joined	10:39
	→ cdown_ joined	10:39
	→ Rr4sT joined	10:40
	← cdown left	10:41
	cdown_ → cdown	10:41
	← blackchalk left	10:44
	→ blackchalk joined	10:45
	← weijin left	10:46
	← tvale left	10:46
	→ blackmesa joined	10:46
	→ blackchalk_ joined	10:48
	← blackchalk_ left	10:50
	→ Gurkenglas joined	10:50
	← blackmesa left	10:51
	→ gareppa joined	10:52
	← blackchalk left	10:52
	→ dreiss joined	10:52
	jimm → jim	10:53
	→ jready joined	10:55
	← pp5mgt left	10:57
	→ tvale joined	10:58
	→ pp5mgt joined	10:58
	← jready left	10:59
	← rajpratik71 left	11:01
	← ToBeCloud left	11:02
	→ \void joined	11:03
	← Orbitrix left	11:05
	→ Orbitrix joined	11:07
	chris_wo_ → chris_wo	11:09
	chris_wo → chris_wo_	11:09
	chris_wo_ → chris_wot	11:10
tester	how can i ammend/fixup to the very first commit in the repository?	11:10
	trying to rebase -i very-first-commit^ errors with fatal: need a single revision	11:11
	→ wombawomba joined	11:11
tobiasvl	tester: --root	11:11
osse	tester: rebase -i --root	11:11
	← pd2000 left	11:12
	→ pd2000 joined	11:12
	← m1dnight_ left	11:14
tester	thanks	11:14
	← pp5mgt left	11:14
	→ Cavallari joined	11:16
	→ weijin joined	11:16
	← howlymowly left	11:17
	→ pp5mgt joined	11:18
	← dpyro left	11:18
	← cdown left	11:20
	← drodger left	11:21
	→ rasputozen joined	11:23
rasputozen	im reading the rebase manpage and im confused why one of the parameters is referred to as '<upstream>' when it can refer to any branch or commit. Excerpt: https://ptpb.pw/Ldl3	11:24
osse	because the branch you're rebasing on is usually an upstream branch	11:24
tester	is there something like .gitignore, but per-line? like git-only comments in a file?	11:24
osse	tester: no	11:25
	→ drodger joined	11:26
	chris_wot → ________________	11:26
	→ m1dnight_ joined	11:26
	________________ → chris_wot	11:26
rasputozen	i thought 'upstream' referred to a remote repo, what does rebasing have to do with a remote?	11:27
	i might be totally wrong about that, but thats what i always understood 'upstream' meant	11:29
tester	can i remove _any_ memory of a certain file throughout history and only keep its current state	11:30
	i can rebase from root and all, i'm working locally only	11:30
tobiasvl	rasputozen: well, "upstream" means a place from which code changes flow down to your repo/fork/whatever	11:31
	but yes, it usually refers to a remote repo if your repo is a fork	11:31
	← beerdrop left	11:31
	→ RougeR joined	11:31
	← RougeR left	11:31
	→ RougeR joined	11:31
tobiasvl	tester: yes, sure. you might want to look at !filter_sensitive	11:32
gitinfo	tester: You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	11:32
barq	I'm trying to migrate svn to git, but get an error at some point halfway: Auto packing the repository in background for optimum performance. See "git help gc" for manual housekeeping. error: The last gc run reported the following. Please correct the root cause and remove .git/gc.log. Automatic cleanup will not be performed until the file is removed.	11:32
	warning: There are too many unreachable loose objects; run 'git prune' to remove them.	11:32
tobiasvl	but rebase might work fine for you too depending on the nature of the changes	11:32
barq	How can I fix this? It's hard to prune while the import is in progress.	11:32
tester	tobiasvl remove a file completely	11:32
	the whole file, from first commit	11:33
	like it never existed	11:33
	i'll look into filter-branch	11:33
rasputozen	tobiasvl: so what would 'upstream' mean in a local context where no fork or clone has taken place?	11:33
	← \void left	11:35
tobiasvl	rasputozen: for rebase? what you're rebasing on top of	11:35
rasputozen	tobiasvl: i think i get it, so upstream is referring to the commit/branch on which the rebase is based on and will be 'upstream' after the rebase happens, is that correct?	11:36
	→ \void joined	11:36
tobiasvl	not sure I get that last part. a rebase doesn't change the upstream.	11:37
	→ dpyro joined	11:37
tobiasvl	a rebase changes a local branch, by basing it on upstream	11:37
	← dpyro left	11:37
barq	What options do I have to complete this migration if it fails with that message?	11:38
tester	filter-branch doesnt seem to work	11:39
bremner	barq: what tool are you using to migrate?	11:39
rasputozen	ok, why is the term 'upstream' used in this context? What about the word 'upstream' describes this type of commit in the context of a rebase?	11:39
barq	git svn	11:39
	git svn clone http://my-project.googlecode.com/svn/--authors-file=users.txt --no-metadata --prefix "" -s my_project	11:39
bremner	you might try https://github.com/svn-all-fast-export/svn2git	11:40
	it's _much_ faster on large repos	11:40
tester	i mean it does every everything but it also deleted the damn file	11:40
tobiasvl	rasputozen: not sure I understand the question. are you just asking why it's called "upstream"?	11:40
	← dreiss left	11:40
barq	thanks	11:40
tobiasvl	tester: what didn't seem to work?	11:40
rasputozen	tobiasvl: yes	11:40
tester	tobiasvl it changed history but literally removed the file afterwards..	11:41
	instead of leaving it as unstaged	11:41
	untracked even	11:41
tobiasvl	tester: that doesn't sound surprising, but it depends on what command you ran	11:41
	tester: did you not want to "remove a file completely" "like it never existed"? those were your words	11:41
osse	rasputozen: didn't i answer that?	11:42
rasputozen	osse: no, you used the word in the definition	11:42
tobiasvl	rasputozen: you have a local branch, and you have another set of changes that is authoritative. that kind of situation is usually described as an "upstream" and a "downstream" — changes flow down, like a river.	11:42
rasputozen	ok i see the analogy now	11:43
osse	rasputozen: I didn't attempt to define the word "upstream". I tried to explain why it says upstream there	11:43
rasputozen	was mixed up from the common usage referring to a remote repo	11:43
	osse: it wasnt clear to me, sorry	11:44
tobiasvl	rasputozen: https://en.wikipedia.org/wiki/Upstream_(software_development)	11:44
rasputozen	tobiasvl: ty	11:44
	← escproxy left	11:44
tobiasvl	upstream, downstream, fork. git history is a river :P	11:44
	delta, even! hehe. no, jk.	11:44
	→ escproxy joined	11:44
rasputozen	ah i never put together the fork analogy	11:45
	in relation to a river at least	11:46
tobiasvl	tester: if you didn't want to delete the file, don't panic. you can probably still find the commits where the file existed in the reflog.	11:46
	→ beerdrop joined	11:46
	→ phinxy joined	11:47
	→ jready joined	11:50
	→ Dreadnaught joined	11:52
	← Dreadnaught left	11:52
	→ Dreadnaught joined	11:52
	← lalitmee left	11:54
	→ lalitmee joined	11:54
barq	bremner: I need to compile that myself, right? I have problems finding all of the dependencies for svn2git	11:55
	← jready left	11:55
	← Kulrak left	11:55
bremner	barq: yes, it's a bit of work to get compiled. But most linux distros include it afaik	11:55
	you could always spin up a vm for the conversion...	11:56
	→ MrMojit0 joined	11:56
	→ pity joined	11:58
	→ eduardas_m joined	12:01
barq	I'm running fedora in a vm	12:01
	→ czart__ joined	12:01
	→ duderonomy joined	12:01
	→ piggah joined	12:02
	→ cdown joined	12:02
	← pity left	12:03
	← czart_ left	12:04
barq	It says qmake needs some parameters	12:05
	I don't see any in the docs though	12:05
	→ synthroid joined	12:05
	→ rvgate joined	12:06
	→ lalit joined	12:06
tester	last thing for today	12:06
	→ adbjesus joined	12:07
	→ pfleck1 joined	12:07
	← lalitmee left	12:07
tester	can i somehow "export" a git repository into some zip or tarball as a backup?	12:07
	something like pushing, but not to a remote repositoy	12:07
	← wombawomba left	12:08
	→ pity joined	12:08
bremner	barq: in debian it's called svn-all-fast-export. fedora probably has it already compiled as well.	12:09
	← lalit left	12:09
osse	tester: man git-bundle	12:09
gitinfo	tester: the git-bundle manpage is available at https://gitirc.eu/git-bundle.html	12:09
	→ lalit joined	12:10
barq	Can't find the package	12:10
	Not sure if it is still supported	12:10
	← adbjesus left	12:10
	→ adbjesus joined	12:10
	← Raging_Hog left	12:11
	← lalit left	12:11
	← adbjesus left	12:12
	→ lalit joined	12:12
	→ adbjesus joined	12:12
	← zeroed left	12:13
	← pp5mgt left	12:14
	→ pp5mgt joined	12:15
	→ shinnya joined	12:17
	← nahtnam left	12:19
	← mosab left	12:19
	← lalit left	12:19
	→ mosab joined	12:20
	→ Singmyr joined	12:20
	← pd2000 left	12:21
	→ jomofcw joined	12:23
jomofcw	Hello !	12:23
	I've rsync many repository from a previous server to another server. All is OK. But there, i try to "push" and it tells me that the repository isn't linked to a remote one. How can I rebuild the link, please ?	12:23
osse	jomofcw: git remote add <name> <url>	12:24
rasputozen	thats weird it wouldnt copy over the remote refs	12:25
	← pity left	12:25
jomofcw	osse both of the repository is on the same machine so I have no URL... can I just type a path instead of a URL ?	12:26
osse	jomofcw: on second thought, if you rsynced a whole repo then the config file should follow, so there should already be a remote	12:28
	jomofcw: what does git remote -v say in both the old and new repo?	12:28
	→ zeroed joined	12:28
jomofcw	osse I didn't rsync the "master" repo... :X my bad, i'm doing it ^^.	12:30
	← re1 left	12:31
	→ buggytom joined	12:32
	→ skisela joined	12:34
	← adbjesus left	12:35
	→ pity joined	12:35
	→ adbjesus joined	12:35
	← drodger left	12:36
	→ drodger joined	12:37
jomofcw	it works trully better now :D ! Thanks for your time osse :).	12:39
	→ lalit joined	12:39
	← pity left	12:40
	→ Raging_Hog joined	12:40
	→ githubmgw joined	12:40
	← pp5mgt left	12:44
	→ pp5mgt joined	12:45
	← yn left	12:45
	→ ProfMac joined	12:46
	→ yn joined	12:48
	lalit → lalitmee	12:49
	→ ghal_ joined	12:50
	← adbjesus left	12:50
	→ fission6 joined	12:52
	← finalbeta left	12:53
	→ finalbeta joined	12:53
	← nikivi left	12:57
	→ doev2 joined	12:57
	← Rr4sT left	12:59
	← ghal_ left	12:59
	← duderonomy left	12:59
	← drodger left	13:00
	← doev left	13:00
	→ mborgard joined	13:01
	← madewokherd left	13:02
	← eduardas_m left	13:02
	← buggytom left	13:02
barq	I tried migrating with svn2git but it looks for some folder repository/format. Not sure why it is looking for this format but it causes an error. Haven't found a solution. Someone had the same problem here https://stackoverflow.com/questions/37117624/svn2git-migration-rules Any ideas?	13:02
	← jcarpenter2 left	13:04
	→ jcarpenter2 joined	13:04
	→ pd2000 joined	13:04
	→ ghal_ joined	13:05
	→ rivalomega joined	13:05
	→ jready joined	13:05
	→ drodger joined	13:05
	→ kiero joined	13:06
	→ tjbp joined	13:07
	→ Karyon joined	13:10
	← NerdyPepper left	13:11
themill	barq: a real rules file and the real output would be helpful. (There are several iterations of problem on that page and there's insufficient information to know what they are doing)	13:11
	→ bolovanos_ joined	13:11
	→ NerdyPepper joined	13:12
barq	I'm using the standard-rules	13:12
	→ paxri01 joined	13:13
barq	This is the output: https://ghostbin.com/paste/bfxh2	13:13
themill	and the command?	13:14
barq	./svn-all-fast-export ~/repository/ --rules samples/standardlayout.rules	13:14
	← NerdyPepper left	13:14
themill	you need to give it a repo to act on	13:14
	→ jimmyrcom_ joined	13:15
	→ NerdyPepper joined	13:15
barq	I tried using a remote repo but got the same error	13:15
	← pd2000 left	13:15
themill	it needs to be a local repo (and a repo, not a checkout)	13:15
barq	Including all branches and tags?	13:16
	← mborgard left	13:16
barq	Not sure that fits on my drive	13:16
themill	repo not checkout	13:16
barq	so rsync it?	13:16
	→ cssko_ joined	13:16
themill	yes. often running it through svndumpfilter to trim it down as a first step, depending on what you've got in there	13:17
	← jcarpenter2 left	13:18
	→ jcarpenter2 joined	13:18
	→ rf` joined	13:18
	← weijin left	13:18
	→ weijin joined	13:18
	← weijin left	13:18
	← devbaka left	13:19
	← cssko left	13:20
	← rf left	13:20
barq	hmm, rsync doesn't work, since it's a remote repo	13:21
	→ duderonomy joined	13:22
	→ ewitz joined	13:23
	← ghal left	13:24
	ghal_ → ghal	13:24
jomofcw	As said previously I've moved my repositories from a server to another. All seems to work well, but when I try to push my master branch from a user (not root) it load, load and load... but never succeed. If I abort the operation, my push is not recorded. Any idea why ? Is there any logs I can find about that ?	13:25
	← rivalomega left	13:26
	→ mborgard joined	13:26
	← tvale left	13:26
	← jimmyrcom_ left	13:26
	← piggah left	13:27
	← mosab left	13:27
	← shinnya left	13:28
	→ CodeSlingerPaul joined	13:28
	→ mosab joined	13:28
jomofcw	Here are the displayed informations : https://gist.github.com/jomofcw/351321e1c0b39e231ff35e0d6c02954d (I have to press CTRL+C to escape it.	13:29
	← tvw left	13:29
	← ewitz left	13:29
	← manuelschneid3r left	13:29
	→ TSS_ joined	13:30
	→ manuelschneid3r joined	13:30
	→ miftestukas1 joined	13:31
	← miftestukas1 left	13:32
	→ iliakan joined	13:32
	gitinfo set mode: +v	13:32
iliakan	Normally, rebase skips merge commits, right? Does it also ignore changes brought in by these commits?	13:33
grawity	no; it flattens everything into a linear history	13:33
iliakan	strange	13:34
	I have an example where it looses those changes.	13:34
	I also wonder why	13:34
	https://gist.github.com/fafc4d0005c9f391b9717c9d8a64831b	13:35
	it creates a small git structure	13:36
	then "git rebase master" rebases feature, but looses changes from D	13:36
	I mean: cat x.txt -> MERGED; git rebase master; cat x.txt -> Y	13:36
	isn't that strange? how come?	13:36
	→ Es0teric joined	13:37
grawity	oh, you mean an evil merge in which the merge commit itself introduces unrelated changes?	13:38
	→ rosa joined	13:38
grawity	that's likely going to happen, yes	13:38
	→ miftestukas1 joined	13:38
	→ miftestinis joined	13:38
	← miftestinis left	13:39
jomofcw	Fixed, that was an access problem for user on my git repository	13:39
	→ oootteeer joined	13:39
	← miftestukas1 left	13:40
	← netj left	13:40
	← oootteeer left	13:40
	→ netj joined	13:41
iliakan	grawity: evil?	13:42
	← Karyon left	13:42
iliakan	grawity: it's evil only if introduces unrelated changes.	13:42
	otherwise it's not	13:42
	→ tvale joined	13:42
iliakan	it you add changes to correctly mix in the stuff, that's not evil	13:43
	anyway, why does it loose the changes?	13:43
	that's something not to be taken lightly ;)	13:43
osse	it loses the changes because it skips merges	13:44
	→ cdunklau joined	13:44
tobiasvl	this is intentional. to preserve merges, use --preserve-merges	13:44
	conflict resolution in a merge on an earlier base doesn't necessarily make sense on a new base	13:45
iliakan	tobiasvl: oh really?	13:46
	tobiasvl: and what if I say that --preserve-merges alsoo looses these changes? :)))	13:46
	osse: I thought it makes diffs of commits and applies them one by one	13:46
cdunklau	hi folks, is there a way to convice git to not make symlinks? I'd like to deploy static pages for a website using a post-receive hook, but i want to make sure that any symlinks in the repo don't get created in the webroot	13:46
	← tt_ left	13:46
	→ jedix joined	13:47
osse	iliakan: correct, that's what it does	13:47
iliakan	osse: if I just skip merge commit, then the next commit should have the changess	13:47
	sorry, my keyboard sometimes doubles the keys	13:47
osse	iliakan: no because the next commit doesn't have that in its associated diff	13:47
iliakan	osse: what do you mean "assosiated diff"?	13:47
	diff commit vs parent?	13:47
osse	wyes	13:47
	which I hope is the same you meant	13:48
	→ miftestinis joined	13:48
	← miftestinis left	13:49
	→ weijin joined	13:49
	← riemann left	13:49
	→ blackpajamas joined	13:49
	← martybr left	13:50
iliakan	here's the picture	13:50
	http://jmp.sh/x7SvHwN	13:50
	I thought, the diffs are:	13:50
	A vs X, X vs Y .. and then?	13:50
	(rebasing feature over master)	13:51
	→ Strepsils joined	13:51
osse	C vs B, E vs D	13:51
	→ martybr joined	13:51
	→ Flechette joined	13:51
iliakan	so, naturally what'ss done in D may be lost?	13:52
osse	yup	13:52
iliakan	that'ss only for "unnrelated changes"?	13:52
	D may have conflict solved	13:52
	some fixes	13:52
	→ miftesrinis joined	13:53
	← miftesrinis left	13:53
	← weijin left	13:54
tobiasvl	if there's a conflict, you'll have to resolve it. if you use rerere, it will probably remember how you resolved it last time and resolve it the same way	13:54
osse	what D does is jsut combine A vs X and X vs Y, and A vs B and B vs C. and all of those are already included individually	13:54
	→ madewokherd joined	13:54
	← mosab left	13:54
	← Strepsils left	13:54
tobiasvl	see man git rebase on --preserve-merges: "Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."	13:55
gitinfo	the git-rebase manpage is available at https://gitirc.eu/git-rebase.html	13:55
	← RougeR left	13:55
	→ mosab joined	13:55
	→ AndresInSpace joined	13:55
	← FortunaTP left	13:55
osse	btw that's a nice picture. how did you make it?	13:56
iliakan	preserve-merges alsoo looses that code!	13:56
	osse: manually	13:56
	I'm writing a big screencast about git	13:56
tobiasvl	iliakan: yes, "Merge conflict resolutions or manual amendments to merge commits are not preserved." that's from --preserve-merges	13:57
iliakan	there are some tricky things it myself rarely meet, so I'm trying to figure out those to know for sure	13:57
	← Raging_Hog left	13:57
	→ miftestukas joined	13:57
iliakan	well. So loossing conflict resolutionns and amendmends is normal for rebase	13:58
	← miftestukas left	13:58
	→ miftestukas joined	13:58
osse	yes, but rebasing branches that have merge commits on them is not as normal, I dare say	13:58
	← rosa left	13:59
	← duderonomy left	13:59
	→ rosa joined	13:59
	→ blackmesa joined	13:59
iliakan	btw do you know the cookinng --recreate-merges flag?	13:59
	I wonder if it has the same problem	14:00
	→ webstrand joined	14:00
	← miftestukas left	14:00
tobiasvl	what is cookinng?	14:00
	what flag is that?	14:00
	→ miftesa joined	14:01
	← miftesa left	14:01
iliakan	not yet in the main git branch	14:01
	→ miftesa joined	14:01
	→ Raging_Hog joined	14:01
	← miftesa left	14:01
	→ weijin joined	14:02
	← permalac left	14:02
tobiasvl	oh	14:02
	→ miftesa joined	14:02
iliakan	tobiasvl: I've read about it in the mailing list not sure if it ever comes to prod or will be of any importance	14:02
tobiasvl	hadn't heard of it. I assume it's meant to do what you want then, not sure what else it could do which -p doesn't already do	14:02
	→ Strepsils joined	14:04
	mlopezviedma_ → mlopezviedma	14:05
	← weijin left	14:06
	→ sarri joined	14:08
	← sarri left	14:08
	→ sarri joined	14:08
	← miftesa left	14:10
	→ PioneerAxon joined	14:12
	← sarri left	14:13
	← Raging_Hog left	14:14
	→ sarri joined	14:14
	← sarri left	14:14
	→ sarri joined	14:14
	→ weijin joined	14:14
	← pfleck1 left	14:15
	→ rafasc joined	14:17
	← weijin left	14:19
	← mlopezviedma left	14:19
	→ dendazen joined	14:19
	→ testnick123 joined	14:20
	→ linuxmodder joined	14:21
	← lalitmee left	14:21
	→ qu4ku joined	14:21
	← NonParity left	14:21
	→ jesst joined	14:22
	→ NonParity joined	14:22
	← rosa left	14:23
	→ rosa joined	14:24
	→ D5N_ch3ck joined	14:24
	← abba left	14:25
	→ Strepsil_ joined	14:27
	← seschwar left	14:27
	→ rivalomega joined	14:28
	→ weijin joined	14:28
	→ dzn joined	14:28
rypervenche	Quick question. I have a coworker who didn't do a pull before working on a branch.	14:29
	oops, didn't mean to hit enter just yet.	14:29
osse	I forgive you, my child.	14:30
	→ nast joined	14:30
Stummi	doesn't matter. The answer is rebase ;)	14:30
	← Strepsils left	14:30
	→ piggah joined	14:31
	← tkore left	14:31
	← doev2 left	14:31
	← iliakan left	14:31
	→ tkore joined	14:32
	← weijin left	14:32
	← rosa left	14:33
	← escproxy left	14:35
	← Flechette left	14:36
	→ Flechette joined	14:37
	← Zedka29 left	14:37
	→ mavrikant joined	14:37
	← testnick123 left	14:38
	→ igemnace joined	14:40
	← jesst left	14:40
	→ [Brain] joined	14:40
	← JeroenT left	14:41
	→ lalitmee joined	14:41
	← nast left	14:42
	→ AaronMT joined	14:43
	← pp5mgt left	14:45
	→ pp5mgt joined	14:46
	→ _Mental joined	14:47
	← sarri left	14:49
	→ Noldorin joined	14:49
	→ sarri joined	14:51
	← sarri left	14:51
	→ sarri joined	14:51
	← zefferno left	14:51
	→ contemno joined	14:52
	→ theoceaniscool joined	14:52
	→ amatas joined	14:52
	→ JJBby joined	14:52
	← amatas left	14:52
	→ amatas joined	14:53
JJBby	I am learning git/hub and have updated my .gitignore file, I would like to remove the files/folders that have been saved, do i just do that manually or is there a way to use the ignore file to retroactively change the files that want to be ignored?	14:54
	← contemno left	14:54
JJBby	also, where do i get parachute pants?	14:54
	→ contemno joined	14:54
	→ weijin joined	14:54
	← Nizumzen left	14:54
	← mattcen left	14:55
dzho	wat	14:55
	← blackmesa left	14:55
rvgate	JJBby, so... you checked in files/dirs that you later added to your .gitignore, and now you want to remove them from version control ?	14:56
dzho	JJBby: 'git rm --cached filename'	14:56
rvgate	JJBby, for the parachute pants: https://parachute-pants.com/	14:57
	→ BhaveshSGupta[m] joined	14:57
JJBby	rvgate, yes that is exactly what I did. I started coding, learned version control, added a repo, then learned virtual enviroments which also got saved to the repo. I would now like remove those files as they have been added to the ignore list.	14:58
	→ mattcen joined	14:58
	→ Wetmelon joined	14:58
JJBby	dzho, so a simple rm --chached...then I need to push that?	14:58
	git/hub is still a bit confusing	14:59
	→ pd2000 joined	14:59
rvgate	JJBby, git is not the same as github... git is the version control tool, github is service providing repository storage	14:59
	← surfist left	15:00
JJBby	rvgate, i do understand that. I know the local control is git. I am just synching with github.	15:00
rafasc	!remove_tracked	15:00
	← hph^ left	15:00
	← jready left	15:00
dzho	...	15:00
	→ surfist joined	15:01
osse	!ignore_tr	15:01
gitinfo	[!ignore_tracked] 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.	15:01
osse	and you need to commit after	15:01
dzho	ah, there we go	15:01
	→ jready joined	15:01
	→ boombatower joined	15:01
	→ al-damiri joined	15:02
	← weijin left	15:02
	→ texinwien joined	15:02
	← Cavallari left	15:02
	← akushner left	15:04
	→ Cavallari joined	15:05
	← lalitmee left	15:07
JJBby	OK, since I am prone to messing things up and would also like to learn this, should i make a fork or branch and save that repo before rm-ing files?	15:07
	and once everything looks good and works can delete that fork/branch?	15:08
	← jay-m left	15:08
	← sanscoeur left	15:08
	← synthroid left	15:10
	→ asgavar joined	15:13
	← skisela left	15:14
	→ nhh^ joined	15:14
	← tkore left	15:14
	← _Mental left	15:15
	→ IanLiu joined	15:15
	→ Nokurn joined	15:15
	← rfuentess left	15:16
	← Strepsil_ left	15:18
	← asgavar left	15:18
	→ mlopezviedma joined	15:22
	← James0r2_ left	15:22
rafasc	JJBby: if that gives you peace of mind, sure. !backup	15:23
gitinfo	JJBby: 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	15:23
	→ thiago joined	15:23
dzho	JJBby: you may wish to make practice repos and work with them.	15:23
	→ loginoob joined	15:23
rafasc	you don't need to fork/clone again. you can just copy it locally.	15:24
	→ escproxy joined	15:24
JJBby	dzho, rafasc, Thanks! I was just looking through things like that!	15:24
dzho	to some extent you can treat github as just another git remote. To learn the differences between a git remote and Github specific things you may wish to clone from one directory to another, using the parent directory as the remote for the second, or even to set them up as remotes for each other bidirectionally.	15:25
loginoob	There is a development branch and one branch from development on which I'm working. Now development branch has changed from the time i made my working branch from development. Now I want to commit the working bnrach and merge it on development	15:25
dzho	you can then fetch, push, pull, merge, rebase, etc etc between them	15:25
loginoob	Is there a way to do that without coflicts	15:25
	→ justinmrkva_ joined	15:26
loginoob	I'm new to git so pardon my newbie question	15:26
	→ jstimm joined	15:26
	→ ams__ joined	15:26
	justinmrkva_ → justinmrkva	15:26
dzho	loginoob: you may wish to rebase your changes onto the other branch.	15:26
	dzho isn't great at getting rebasing right so that might be where I should let someone else chime in	15:26
loginoob	dzho: by doing rebase will there be no conflicts	15:27
	→ synthroid joined	15:27
	← SpeakerToMeat left	15:27
	→ RougeR joined	15:27
	← RougeR left	15:28
	→ RougeR joined	15:28
rafasc	loginoob: you'll have to solve them in the rebase process.	15:28
dzho	whether or not there may be conflicts really depends on the changes in question	15:28
	→ iliakan joined	15:28
loginoob	I don't know how to solve conflicts and there has been a substantial amout of changes in development branch, like more than 7-8 files have changed and more than 1000 line of code	15:28
JJBby	why does that feel so good to tidy up the repo?!?!	15:28
dzho	loginoob: then my recommendation to JJBby applies to you, too: you may wish to set up a practice set of repos so you can create and then learn to resolve conflicts.	15:28
	← jready left	15:29
dzho	conflicts inhere from the files and changes in question, revision control can help you manage them, but it can't solve all of them for you.	15:29
rafasc	loginoob: !eek	15:29
gitinfo	loginoob: [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	15:29
loginoob	ok, will practice	15:30
	→ jready joined	15:30
	← dsantiago left	15:30
	→ mizu_no__ joined	15:30
	← jready left	15:30
	→ jready joined	15:30
dzho	rafasc++	15:31
rafasc	loginoob: are you using a mergetool?	15:31
dzho	that's at least what? 2 for 3 on the gitinfo factoids? eek, backup vs ignore_tracked.	15:31
	dzho watches and learns :-)	15:32
loginoob	rafasc: no, i don't know what that is	15:32
rafasc	loginoob: have you ever resolved a conflict?	15:32
loginoob	once i tried and my senior has to pull his hair	15:32
	since then I'm scared	15:33
	← mizu_no__ left	15:33
rafasc	dzho: make a backup of your repo and try to resolve.	15:34
	oops, wrong person.	15:34
dzho	:-)	15:34
loginoob	for me?	15:34
dzho	yes	15:34
loginoob	ok	15:34
	→ dsantiago joined	15:35
dzho	loginoob: make backups, but also keep in mind that you can do all sorts of things on local branches and if it doesn't work out you can delete them and no one will be the wiser	15:35
	← piggah left	15:35
dzho	no one has to know :-)	15:35
loginoob	ok :)	15:35
rafasc	when you're in the coflict state, you can call $git mergetool; which will open a tool to make resolution easier.	15:35
	you may want to configure which tool git will use first.	15:36
loginoob	vscode has something like HEAD>>>>>> incoming change<<<<< something like that. Is that the same as mergtool?	15:36
	→ akushner joined	15:37
dzho	those are markers made in the files themselves to show where the conflicts are and where they are coming from	15:37
rafasc	$git mergetool --tool-help;	15:37
	← floppydh left	15:37
dzho	(in the working copies of the files, that is)	15:37
loginoob	ok will look more into mergetool	15:37
	← linuxmodder left	15:38
rafasc	loginoob: you resolve them manually my editing the file into the appropriate state (by removing the <<< >>> lines and fixing the code involved in it)	15:39
	and mark the conflict as resolved by running git add <file>	15:39
	be sure to resolve all conflicts in the file before marking the file as resolved.	15:40
	← neunon left	15:40
	→ KeyJoo joined	15:40
dzho	but beware, you can add and commit a file that still has conflicts in it. This just asserts to git that you've done the right thing. Git can't actually read your code and tell whether you've done the right thing.	15:40
	yeah.	15:40
	← zeroed left	15:40
dzho	it will be happy to take your word for it. your senior probably won't :\	15:41
	→ phluks joined	15:42
	← pp5mgt left	15:43
	→ Myk267 joined	15:43
	← amatas left	15:43
	→ pp5mgt joined	15:43
loginoob	Will try after taking backup :)	15:45
	← loginoob left	15:45
	→ oojacoboo joined	15:45
	→ amatas joined	15:46
	→ SpeakerToMeat joined	15:47
	→ yaymukund joined	15:47
yaymukund	is there a nice way to sort the output of `git grep` by filesize?	15:48
_ikke_	not that I'm aware of	15:49
	→ hbautista joined	15:49
	→ Moistmelon joined	15:49
yaymukund	wish i had more cli fu ._.	15:49
_ikke_	git pays very little attention to file sizes	15:49
rafasc	yaymukund: tell us what are you trying to do, rather than how.	15:50
	→ dreiss joined	15:50
yaymukund	i'm trying to look at the smallest files in my repo containing a string?	15:51
	← Wetmelon left	15:52
yaymukund	basically, wanting to work on a giant refactor of some function and start with small examples and work my way up to bigger ones. ive had to do the opposite as well to find especially egregious uses of a function, because sometimes it makes more sense to start with the worst code	15:52
	→ MrBiogene joined	15:53
yaymukund	not very complicated. ive had this itch many times, which is why I thought to ask. I'll probably write a script at some point	15:54
	→ cagomez joined	15:55
	→ FortunaTP joined	15:55
rafasc	probably use blame to navigate back until you find a suitable place to branch out and refactor.	15:55
	git log -L is also nice for this kind of stuff.	15:56
	→ steeze joined	15:56
	← gareppa left	15:57
	→ kes joined	15:57
	← cagomez left	15:57
	→ cam27 joined	15:58
	→ happy-dude joined	15:58
	→ SweatyMalone joined	15:58
	→ cagomez joined	15:58
	→ ContessaTP joined	15:58
cYmen_	So, I accidentally added another repo to my git repo. Git tells me to rm --cached but that gives error: the following file has staged content different from both the	15:58
yaymukund	lol thanks, i guess i was approaching it all wrong	15:58
	→ alcohol joined	15:58
cYmen_	er ... file and the HEAD:	15:58
	→ neunon joined	15:59
	← Flechette left	15:59
rafasc	yaymukund: git grep -O'du -sh' 'help'; hacking the pager options for calculating the size. :D	16:00
	← FortunaTP left	16:00
	← steeze left	16:01
thiago	cYmen_: you need -f	16:01
cYmen_	thiago: can you explain what git is trying to tell me?	16:01
	← Moistmelon left	16:01
cYmen_	I don't get what seems to be in which state and why...	16:01
yaymukund	rafasc: ahahaha amazing!!	16:01
	→ piggah joined	16:05
	→ blackmesa joined	16:05
	← flaviodesousa left	16:05
rafasc	yaymukund: but keep in mind that git grep doesn't grep the history. Check man git grep; for details what's included.	16:05
gitinfo	yaymukund: the git-grep manpage is available at https://gitirc.eu/git-grep.html	16:05
	→ zeroed joined	16:06
	→ ki0 joined	16:08
	← jim left	16:10
	→ crtcji joined	16:10
	← crtcji left	16:10
	→ crtcji joined	16:11
	← escproxy left	16:11
yaymukund	rafasc: that makes sense. i'm only interested in the current state of the repo to get a lay of the land. thank you for the help -- that's a neat little trick xD	16:11
thiago	cYmen_: it means the file in the staging area is different from the one in the worktree	16:11
	cYmen_: you must have modified the file that you're trying to delete	16:11
	→ noobineer joined	16:11
	← noobineer left	16:12
	← TomyWork left	16:14
	← igemnace left	16:14
	→ noobineer joined	16:15
	← Es0teric left	16:16
	← piggah left	16:17
	← crtcji left	16:18
	→ Es0teric joined	16:18
	← zeroed left	16:18
	→ piggah joined	16:19
cYmen_	thiago: but the file in questions is the folder of the repo that I accidentally added and I definitely didn't change anything there ever, let alone since adding it :)	16:19
	← kiero left	16:19
	→ zeroed joined	16:20
	→ a--m joined	16:23
	← drodger left	16:24
	→ drodger joined	16:26
	← figurehe4d left	16:27
	← drodger left	16:27
	→ ki0_ joined	16:27
	← ki0_ left	16:27
	→ weijin joined	16:27
	→ ki0_ joined	16:27
	→ durham joined	16:28
	→ jost joined	16:28
	→ Zedka29 joined	16:30
awygle	so "git show" will show me the diff of a commit object	16:30
	and "git show <commit>:file" will show me the _contents_ of a file _at_ a commit	16:31
	← ki0 left	16:31
awygle	but how can i see the diff of a _file_ at a commit? the changes the commit made to the file?	16:31
tester	git blame i think	16:31
	it should show you which commit changed which line inside a file	16:31
	← weijin left	16:32
	← piggah left	16:32
	→ Moistmelon joined	16:32
	→ freimatz joined	16:32
rafasc	or git diff commit commit^ -- file-in-question	16:32
	← nowhereman_ left	16:32
	← acidjnk left	16:32
	← mosab left	16:33
	→ drodger joined	16:33
rafasc	reversed the order of commits there.	16:33
	→ Darcidride_ joined	16:33
	← mikecmpb_ left	16:33
	← MurkyLizard left	16:33
	← zeroed left	16:33
	awygle counts slowly to ten	16:34
awygle	rafasc's suggestion works, thank you.	16:34
	→ weijin joined	16:34
rafasc	awygle: you use the same idea with git flow	16:34
	git show*	16:34
	git show -- path-in-question	16:34
	← bubo left	16:35
	← SpeakerToMeat left	16:35
awygle	rafasc: oh that's much less infuriating, thanks!	16:35
	← SweatyMalone left	16:35
rafasc	awygle: how high did you count to?	16:35
	→ nahtnam joined	16:35
	→ beaky joined	16:35
	← Zedka29 left	16:35
	→ SpeakerToMeat joined	16:36
	→ piggah joined	16:36
	← thiago left	16:37
	→ AlienBlood joined	16:37
	← blackmesa left	16:37
	→ zeroed joined	16:38
	← weijin left	16:38
	← Lunatrius left	16:39
	→ SwiftMatt joined	16:39
	← jomofcw left	16:39
	← AlienBlood left	16:40
	→ Praxi joined	16:40
rypervenche	So is it my understanding that a git merge keeps all of the commits (I previously thought it did a squash) and then adds a new commit to show which commits belong to that merge? I can see it clearly in my git lg.	16:41
	→ igemnace joined	16:41
rypervenche	I'm asking because I would like to remove the merge, but turn it into a rebase, if that makes sense. Or just keep all of the commits from that merge without the merge commit. Is that possible?	16:42
	← fission6 left	16:42
awygle	so i have a commit which introduces some correct functionality changes but also a bunch of unnecessary reformatting. i'd like to "rewind" my branch back to that commit, undo all the formatting changes, then "fast foward" back to the "present". how can i do that? i suspect i need some kind of rebase, possibly rebase -i?	16:43
	← SwiftMatt left	16:44
	→ Lunatrius joined	16:45
	← marcerisson left	16:45
	→ orbyt_ joined	16:46
	← rokups left	16:46
rypervenche	awygle: git rebase -i <commit-id> should work. Use git log to go to the commit just before you the first commit you need to make changes to.	16:47
	awygle: You can use "edit" on the commits that you want to actually edit.	16:48
awygle	rypervenche: cool, thanks	16:48
rypervenche	Instead of "pick"	16:48
rafasc	rypervenche: careful about reverting a merge. !revert_merge	16:48
gitinfo	rypervenche: [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt	16:48
	→ TomyLobo joined	16:48
rafasc	if possible, you should be able to just reset the branch to a commit before the merge, then do the rebase as usual.	16:49
rypervenche	rafasc: I hate the guy who is writing the code in this repo ; ;	16:49
	He's commited other things after the fact, even though I told him to stop making changes.	16:49
	← zeroed left	16:49
	← tvale left	16:50
	→ sanscoeur joined	16:50
rafasc	well, sometimes it's easier to just live with a ugly merge.	16:51
	→ snappy joined	16:51
rypervenche	Yeah :/ I guess I might have to do that.	16:51
	← snappy left	16:51
	→ snappy joined	16:51
rypervenche	My OCD ... :(	16:52
awygle	rypervenche: hm i was hoping the changes that constituted the commit would be present, but unstaged, when i did this rebase. is there a way to make that happen?	16:52
	→ englishm_work joined	16:52
rypervenche	I would have been able to do that, had he not made consequent commits. Although I think I can manually recreate those without problem. So I think so, yes.	16:53
rafasc	awygle: you can copy them into your working directory in the middle of rebase. git checkout orig_commit -- file	16:53
	→ no_maam joined	16:53
awygle	rafasc: oh jeez. yeah okay i guess that works lol. thanks	16:53
	→ zeroed joined	16:54
	→ palmtree joined	16:55
awygle	rafasc: actually that doesn't seem to be working... do i need to check them out of the _next_ commit?	16:56
	← SpeakerToMeat left	16:56
awygle	git checkout <commit i'm currently on in the rebase> -- <file that's definitely changed in the original version of this commit> doesn't seem to do anything	16:57
rafasc	awygle: you need to checkout from the commit the files existed in the state you want.	16:57
awygle	ohhh these files _do_ already exist they just don't show up as modified in the index. okay.	16:58
	→ escproxy joined	16:58
rafasc	awygle: checking out from the current commit will just copy the files from the current commit. Discarding any uncommitted changed in your working directory.	16:59
	← afuentes left	16:59
awygle	yeah i just didn't mentally model the current commit as "existing" i guess	17:00
rafasc	awygle: I like to use -p. To have more fine control over what's being checked out.	17:00
	→ SpeakerToMeat joined	17:01
	→ Soni joined	17:01
	→ weijin joined	17:02
	← kurkale6ka left	17:02
	← D5N_ch3ck left	17:04
	→ btree joined	17:09
	← btree left	17:09
	→ Doginal_ joined	17:10
	→ fission6 joined	17:10
	← Doginal left	17:10
	Doginal_ → Doginal	17:10
	← weijin left	17:11
	← pd2000 left	17:11
	← naqued left	17:13
	← zeroed left	17:13
	→ zeroed joined	17:14
	→ thiago_ joined	17:15
	→ pd2000 joined	17:15
	← theoceaniscool left	17:15
	← piggah left	17:16
	→ dviola joined	17:18
	→ kgrimes joined	17:19
	← brontosaurusrex left	17:20
	← yaymukund left	17:21
	← zeroed left	17:22
	→ texinwien_ joined	17:24
	→ ferdna joined	17:25
	→ TomyLobo2 joined	17:26
	→ linuxmodder joined	17:27
	← texinwien left	17:27
	← _ADN_ left	17:27
	← linuxmodder left	17:27
rypervenche	Is there any reason to want to keep the same commit ID for a commit that I want to cherry-pick? I reset back to an old commit and fixed my issue, and now want to readd two commits. It works with cherry-pick, but is there a way to do it without rewriting the commit ID or am I just being silly?	17:28
	→ linuxmodder joined	17:28
	← ferdna left	17:28
	→ zeroed joined	17:29
	← linuxmodder left	17:29
grawity	it's impossible by definition of a "commit ID"	17:29
	← TomyLobo left	17:29
rypervenche	I was thinking how rebase does it.	17:30
grawity	it doesn't	17:31
rypervenche	Does it not keep the same commit ID?	17:31
grawity	no	17:31
	→ causasui joined	17:31
rypervenche	Oh. I learned something new then. That would explain a few things. Thanks :)	17:31
rafasc	rypervenche: cherry-pick -ff	17:31
grawity	if you change anything -- contents, parents, commit message, timestamp -- the commit ID will also change	17:31
	← causasui left	17:31
	→ causasui joined	17:31
rafasc	but only works on very specific circumstances.	17:31
	← King_Hual left	17:31
grawity	because the commit ID is a hash of all those contents	17:31
	← ki0_ left	17:32
rafasc	due the reasons grawity mentioned.	17:32
	← zeroed left	17:33
	→ linuxmodder joined	17:33
	← venmx left	17:33
	← freimatz left	17:34
	→ jnavila joined	17:34
	→ ki0 joined	17:35
	→ mikecmpbll joined	17:36
	← pd2000 left	17:43
	← dzn left	17:43
	→ duderonomy joined	17:44
	→ pd2000 joined	17:44
	← duderonomy left	17:44
	← rivalomega left	17:44
	→ rivalomega joined	17:45
	→ acidjnk joined	17:47
	→ Rodya_ joined	17:47
	← cdown left	17:48
	← Rodya_ left	17:48
	→ troulouliou_div2 joined	17:50
	→ bubo joined	17:50
	← rivalomega left	17:50
	→ g00s joined	17:50
rypervenche	rafasc: It's all good. I fixed it all. Thanks for everyone's help. :)	17:51
	→ freimatz joined	17:52
	← jnavila left	17:54
	→ rivalomega joined	17:55
	← cam27 left	17:56
	← dsantiago left	17:56
	→ gareppa joined	17:57
	→ jungsubk joined	17:57
	→ bongozig joined	17:57
	← widp left	17:58
	← linuxmodder left	17:59
	← pd2000 left	17:59
	→ pd2000 joined	18:00
	→ Sasazuka joined	18:02
	→ robotroll joined	18:03
	→ linuxmodder joined	18:03
	← qu4ku left	18:06
	← fr33domlover left	18:08
	← kes left	18:08
	→ Mike11 joined	18:09
	← MarioBranco left	18:10
	← pd2000 left	18:13
	→ pd2000 joined	18:13
	← linuxmodder left	18:13
	→ ghoti joined	18:14
	← pd2000 left	18:14
	← palmtree left	18:15
	→ pd2000 joined	18:15
	← pd2000 left	18:15
	→ applecrumble joined	18:19
	← dragoonis left	18:22
	← sauvin left	18:22
	← robotroll left	18:23
rafasc	anyone knows where I can find the scripts junio mentions here: git::../blob/master/Documentation/howto/maintain-git.txt#L138	18:24
gitinfo	Git web link: https://github.com/git/git/commits/../blob/master/Documentation/howto/maintain-git.txt#L138	18:24
avar	rafasc: in the todo branch	18:25
rafasc	thanks.	18:26
	→ buggytom joined	18:26
rafasc	i feel stupid. It's right below the line I linked.	18:30
	→ jnavila joined	18:32
	← rivalomega left	18:34
	← mikecmpbll left	18:36
	→ ferdna joined	18:39
	→ dimi1947 joined	18:39
	← dimi1947 left	18:39
	→ dimi1947 joined	18:40
	→ linuxmodder joined	18:40
	→ venmx joined	18:41
	← jready left	18:42
	→ CheckDavid joined	18:43
	← abra0 left	18:43
	→ ki0_ joined	18:43
	→ wootehfoot joined	18:43
	← ki0_ left	18:43
	→ abra0 joined	18:44
	← wandering_vagran left	18:45
	← jrm left	18:45
	← jnavila left	18:46
	← ki0 left	18:47
	→ dpyro joined	18:47
	→ wandering_vagran joined	18:49
	→ nielsk joined	18:50
	→ duderonomy joined	18:50
	← drodger left	18:50
	→ Dougie187 joined	18:51
	→ weijin joined	18:52
	← orbyt_ left	18:53
	← hbautista left	18:53
	← linuxmodder left	18:53
	→ hbautista joined	18:54
	→ ProfMorsa joined	18:54
	→ fr33domlover joined	18:55
	→ linuxmodder joined	18:56
	← mel00010 left	18:56
	→ drodger joined	18:56
	← applecrumble left	18:56
	← TinkerT left	18:56
	→ nd_ joined	18:57
	← weijin left	18:57
garo	I have a repo that until now is only used by me. Now I'm going to let others clone it.	18:57
	← cagomez left	18:58
garo	But the problem is that my code contained hardcoded passwords for a long time that were only removed a couple of commits ago	18:58
	← Es0teric left	18:58
	← nd left	18:58
	→ weijin joined	18:58
	→ MissMiew joined	18:58
	← MissMiew left	18:58
	→ jrm joined	18:58
	← madewokherd left	18:58
	→ cagomez joined	18:58
	→ applecrumble joined	18:59
	→ TinkerT joined	18:59
grawity	1) change those passwords on the service itself so that the old ones become useless	18:59
	2) !filter_sensitive	18:59
gitinfo	You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	18:59
	← duderonomy left	18:59
	→ badloop joined	18:59
garo	thanks ! ( is filter_sensitive and filter-branch the same ? )	19:00
	→ troyt joined	19:00
badloop	is there an accepted walkthrough for setting up git to work through an socks proxy? having some trouble getting it set up and there appear to be conflicting methods of making it work (none of which are working for me... lol)	19:00
	→ m0viefreak joined	19:01
	→ duderonomy joined	19:02
	← amatas left	19:02
	← weijin left	19:03
	← dreiss left	19:03
	← cagomez left	19:03
rafasc	garo: filter_sensitive is just the trigger for that message.	19:04
	← kgrimes left	19:04
grawity	badloop: are you proxying SSH, HTTP(S), or git:// connections?	19:04
	→ Es0teric joined	19:04
	→ rivalomega joined	19:04
	← dimi1947 left	19:05
	← duderonomy left	19:05
	← nanga left	19:08
	← rh10 left	19:10
	→ mel00010 joined	19:10
	→ retromode joined	19:13
	← mel00010 left	19:13
	→ bl0m1 joined	19:14
badloop	grawity: git://	19:17
retromode	hello. i have 2 commits i have that id like to create into a patch to email. when i use 'git format-patch -2' patch files are created for commits HEAD-1 and HEAD-2 rather than HEAD and HEAD-1. is there some option i need to specify to create a patch out of the latest commit?	19:19
	← SpeakerToMeat left	19:20
	→ mel00010 joined	19:21
	→ dege joined	19:21
	Moistmelon → Wetmelon	19:21
_ikke_	retromode: Are you sure? I would expect it to use HEAD and HEAD~1	19:21
retromode	pretty sure yep, using git log i see HEAD and HEAD~1, but when i try to create the patch files with that command i see the commit messages from HEAD~1 and HEAD~2 instead	19:22
	→ cdown joined	19:23
	← venmx left	19:25
_ikke_	Just verified it locally, and for me it used HEAD and HEAD~1	19:25
	← wandering_vagran left	19:25
	rafasc verified too. agrees with _ikke_	19:26
_ikke_	retromode: it would be very strange for git to skip HEAD in such a way	19:26
rafasc	$git rev-parse HEAD;	19:26
	← daurnimator left	19:26
rafasc	maybe HEAD is not where you think it is?	19:26
	← hbautista left	19:27
retromode	hmm	19:27
	→ MacWinner joined	19:27
	→ SwiftMatt joined	19:27
retromode	if i do 'git log', is the first commit HEAD	19:27
	HEAD?*	19:27
_ikke_	The top most	19:27
	← buggytom left	19:28
	← gareppa left	19:28
retromode	yep top most	19:28
	ah	19:28
	if its a merge, will that not create a patch out of that commit?	19:29
_ikke_	ah, that might explain it, yes	19:29
cYmen_	How do I show the changed files in a commit?	19:29
_ikke_	cYmen_: git show --name-only <commit>	19:29
retromode	_ikke_ whats weird is that HEAD~2 is also a merge	19:29
	→ cagomez joined	19:29
_ikke_	hmm	19:30
cYmen_	_ikke_: thank you	19:30
_ikke_	cYmen_: if you want the status as well, you can use --name-status\	19:30
	(without \)	19:30
rafasc	maybe it will skip merges that don't conflict.	19:31
	git log -p	19:31
	my guess is that the first won't have a diff, the second will.	19:31
	→ jnavila joined	19:32
	← jungsubk left	19:32
	← akushner left	19:32
	→ weijin joined	19:33
	→ nikivi joined	19:34
cYmen_	_ikke_: doesn't really make a difference, just wanted to find what people were working on	19:34
	← cagomez left	19:35
retromode	rafasc: that IS the case...	19:35
JJBby	any prefered sites in this IRC for screenshots?	19:35
	← Gurkenglas left	19:36
	→ nanga joined	19:37
	← nanga left	19:37
	→ nanga joined	19:37
	← Doginal left	19:37
	→ mckendricks joined	19:37
	← weijin left	19:38
	← LeMike left	19:40
	← mel00010 left	19:40
	→ LeMike joined	19:40
	→ Gurkenglas joined	19:40
	← bluepixel left	19:40
	← TomyLobo2 left	19:41
	→ Murr- joined	19:41
	← metts left	19:41
	→ madewokherd joined	19:41
	← ferdna left	19:41
	→ TomyLobo2 joined	19:42
	→ hbautista joined	19:42
	→ metts joined	19:42
	← ghost43 left	19:42
JJBby	I am struggling to set the Push to the github repository https://snag.gy/2BGi4T.jpg	19:42
	→ math-alpha joined	19:42
	→ Arcaelyx_ joined	19:42
	→ ghost43 joined	19:43
	→ TomyLobo3 joined	19:43
	→ Bobdude joined	19:43
	← infinisil left	19:43
	→ canvon_ joined	19:43
	← canvon left	19:44
	← Murr left	19:44
	→ testnick123 joined	19:45
	→ dakar joined	19:45
	← Arcaelyx left	19:45
	← SwiftMatt left	19:45
	→ infinisil joined	19:45
	→ cagomez joined	19:45
	→ steven joined	19:46
	← mckendricks left	19:46
	→ LeMike_ joined	19:46
	← pks left	19:46
	→ Nerdmind joined	19:46
	← TomyLobo2 left	19:46
	→ piggah joined	19:47
	→ gruetzkopf joined	19:47
	→ SpeakerToMeat joined	19:47
_ikke_	JJBby: Did you rewrite history (commit --amend, reset, rebase, or something like that)?	19:47
	Or did someone else push to that repo?	19:47
	→ TomyLobo joined	19:47
	→ bluepixel joined	19:47
	→ fk joined	19:47
	→ tang^ joined	19:47
	→ devilirium joined	19:48
	← LeMike left	19:48
	← TomyLobo3 left	19:49
JJBby	No one else has touched it. I have done a lot of dumb stuff to it i would guess trying to find help in forums	19:49
	← quizzi left	19:49
JJBby	I have rm origin.	19:49
	→ Cybergeek joined	19:49
	← MrMojit0 left	19:49
	→ Ragnor joined	19:50
	← cagomez left	19:50
	→ piggah_ joined	19:50
_ikke_	!transaction	19:51
	← nikivi left	19:51
_ikke_	!!transcript	19:51
	!transcript	19:51
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see	19:51
	→ pks joined	19:51
	← TomyLobo left	19:52
	← piggah left	19:52
	→ quizzi joined	19:52
	← netj left	19:53
	→ netj joined	19:53
	→ mel00010 joined	19:53
	→ phluks_ joined	19:53
	← phluks left	19:54
	→ vdamewood joined	19:54
	→ orbyt_ joined	19:54
JJBby	https://gist.github.com/JJBby/951424e9842d5fccbc7739fe148b08f3	19:54
	← Es0teric left	19:54
	← vdamewood left	19:55
	→ skisela joined	19:56
	← minionofgozer left	19:56
JJBby	I have to run an errand. Be back soon	19:56
	→ doubtful joined	19:57
	← Puffball left	19:57
	→ Es0teric joined	19:57
	← SpeakerToMeat left	20:00
	→ SpeakerToMeat joined	20:02
	→ pionen joined	20:02
	← axc left	20:02
	← hbautista left	20:02
	→ cagomez joined	20:03
	→ max3 joined	20:03
	→ kurkale6ka joined	20:03
	→ sometwo joined	20:03
	→ weijin joined	20:03
	← Darcidride_ left	20:04
	→ kgrimes joined	20:04
	→ minionofgozer joined	20:06
	→ dragoonis joined	20:07
	← retromode left	20:07
	← doubtful left	20:08
	← troulouliou_div2 left	20:08
	← weijin left	20:08
	→ theoceaniscool joined	20:09
	← Mike11 left	20:09
	→ jfr_ joined	20:10
	← jfr left	20:10
	← dragoonis left	20:12
	← ProfMorsa left	20:14
	← ProfMac left	20:15
	← math-alpha left	20:16
	→ doubtful joined	20:16
	→ utrack joined	20:20
	← minionofgozer left	20:21
	← kurkale6ka left	20:21
	← pp5mgt left	20:22
	gitinfo set mode: +v	20:22
Lipoly	I have a question about rebasing vs. merging. If we rebase, then I've read that we'll get a more linear version history. But, we'll also see every little commit that was made on a branch, correct? This is both good and bad, in my opinion. It is helpful for tools like bisect, but it really clutters the history when a lot of times a nice "squashed" commit message is more informative about the overall task which was completed...	20:22
	Are there any tools that allow viewing version history and collapsing a group of re-based commits? Or, am I perhaps just incorrect about how this will work?	20:22
	← githubmgw left	20:22
	→ pp5mgt joined	20:23
	→ qu4ku joined	20:23
	→ minionofgozer joined	20:23
_ikke_	Depending on how many commits it involves, but a squash commit can also clutter a lof changes togehter	20:24
	Lipoly: I usually use merge + rebase	20:24
	They're not mutually exclusive	20:24
	← ams__ left	20:25
	← _aeris_ left	20:25
	→ duderonomy joined	20:26
	← duderonomy left	20:26
	→ xaxxon joined	20:26
	→ _aeris_ joined	20:26
	→ theology joined	20:27
	← texinwien_ left	20:27
theology	if i have a file called password.txt and I put password.txt in my .gitignore, will git ignore my password.txt?	20:28
	→ cheater joined	20:28
cheater	hi	20:28
	← Fernando-Basso left	20:28
	→ Brilpikk3wyn joined	20:28
cheater	what is git -H on this page? https://docs.gitlab.com/ee/raketasks/backup_restore.html it's here: sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production	20:28
	← blackpajamas left	20:29
avar	theology: yes	20:31
theology	avar, hurray	20:31
avar	cheater: it's an option to sudo, "man sudo"	20:32
cheater	ah duh	20:32
avar	gitlab runs git stuff as the "git" user, that command isn't running git (except maybe indirectly through rake)	20:32
	→ texinwien_ joined	20:33
	← linuxmodder left	20:36
	← doubtful left	20:36
	← skisela left	20:37
	→ weijin joined	20:39
	← rafasc left	20:39
	← sat-aton left	20:39
	← qu4ku left	20:39
	→ rafasc joined	20:40
	→ doubtful joined	20:40
	→ linuxmodder joined	20:40
	← linuxmodder left	20:41
	→ linuxmodder joined	20:41
	← Phylock left	20:42
	→ kurkale6ka joined	20:42
	→ fmgt joined	20:42
	← fmgt left	20:43
	← weijin left	20:43
	→ troulouliou_div2 joined	20:44
	← troulouliou_div2 left	20:45
	← cstratak left	20:46
	← pp5mgt left	20:47
	← kurkale6ka left	20:47
	← doubtful left	20:47
	→ weijin joined	20:48
	→ pp5mgt joined	20:48
	← freimatz left	20:48
	→ Phylock joined	20:49
	→ esc joined	20:49
	← esc left	20:49
	→ esc joined	20:49
	← netj left	20:50
	→ netj joined	20:50
	→ doubtful joined	20:50
	← synthroid left	20:51
	← doubtful left	20:51
	← testnick123 left	20:51
	→ doubtful joined	20:52
	← CheckDavid left	20:52
	← weijin left	20:52
	→ sat-aton joined	20:53
	← sat-aton left	20:53
	→ sat-aton joined	20:53
	← paxri01 left	20:55
	→ troulouliou_div2 joined	20:56
	→ saml joined	20:56
saml	A - B - C - D -> A - C - D how do I do it? A - B is a different branch	20:57
	→ linuxmodder- joined	20:57
saml	git rebase --onto A C D didn't do what I wanted	20:57
_ikke_	git rebase --onto A B D	20:59
	← wootehfoot left	20:59
rafasc	or, rebase --onto A C^ D;	20:59
	← linuxmodder left	21:00
saml	ah i see. i had to go one commit back	21:00
	thanks	21:00
	→ hbautista joined	21:01
oprypin	gee just write git rebase -i and let it do its thign	21:01
	→ nowhereman_ joined	21:01
	← rebrec left	21:03
	→ rebrec joined	21:03
	→ widp joined	21:03
	← kgrimes left	21:04
	← dpyro left	21:05
	→ dpyro joined	21:06
	← jnavila left	21:06
	→ pawnshop joined	21:08
	→ kgrimes joined	21:08
	← foul_owl_ left	21:10
	← contemno left	21:12
	← kgrimes left	21:13
	← hbautista left	21:14
	→ hbautista_ joined	21:14
	→ weijin joined	21:14
	← dviola left	21:14
	← texinwien_ left	21:15
	← fission6 left	21:15
	→ texinwien_ joined	21:16
	← hbautista_ left	21:16
	→ hbautista_ joined	21:16
	← Cavallari left	21:18
	← weijin left	21:19
	→ mod joined	21:19
	← englishm_work left	21:20
mod	I had 3 files as pending renames. When I did a git add ., one of the renames became a delete/add, and the other 2 remained as renames. Any idea why the designation might have changed?	21:20
	→ cYmen joined	21:21
	→ kgrimes joined	21:22
	→ weijin joined	21:25
	→ cdown_ joined	21:26
	← phluks_ left	21:27
	← cdown left	21:29
	cdown_ → cdown	21:29
	← weijin left	21:29
	→ sostenuto joined	21:29
	→ fission6 joined	21:30
	← doubtful left	21:31
	→ z\|bandito joined	21:34
rafasc	mod: does it also contain changes other than the rename?	21:34
	git rename heuristic works best when the move is done separately from changes to the file.	21:35
	← iliakan left	21:35
	→ doubtful joined	21:36
	→ githubmgw joined	21:37
	← Es0teric left	21:38
	thiago_ → thiago	21:40
	→ ki0 joined	21:40
	← AndresInSpace left	21:40
	← doubtful left	21:41
	← texinwien_ left	21:41
	→ doubtful joined	21:41
	→ dreiss joined	21:41
	← doubtful left	21:42
	← Singmyr left	21:42
	→ linuxmodder joined	21:43
Timvde	mod: Git doesn't know renames, it compares file content and marks a delete/add as a rename if they are alike	21:43
	← linuxmodder left	21:44
	→ tec__ joined	21:44
Timvde	see git diff -M	21:44
	→ linuxmodder joined	21:44
	← linuxmodder- left	21:45
	← asphyxia left	21:45
	← manuelschneid3r left	21:45
	→ Fernando-Basso joined	21:46
	→ ProfMac joined	21:46
	← escproxy left	21:47
	→ doubtful joined	21:49
	→ weijin joined	21:51
	← linuxmodder left	21:53
	← weijin left	21:56
	← maryo left	21:56
mod	Timvde, hmmmm	21:57
	#renamed: Service/AenGuestMonthlyNotifier.php -> Service/AenGuestRecipientNotifier.php	21:57
	#renamed: Service/AenMcadDailyNotifier.php -> Service/AenMcadExpirerNotifier.php	21:57
	#deleted: Service/AenMcadMonthlyNotifier.php	21:57
	#new file: Service/AenMcadRecipientNotifier.php	21:57
	That's output from git status ...	21:58
	Whatever it does on the underside, it seem to understand the concept of renaming	21:58
	← Cork left	21:59
rafasc	mod: what Timvde said is true. It's just a heuristic. It doesn't actually record what happened was a rename.	22:00
	→ kurkale6ka joined	22:00
	→ maryo joined	22:00
	→ energizer joined	22:01
rafasc	if the content looks the same (up to some percentage) git says it's a rename.	22:01
	← dege left	22:05
	→ Cork joined	22:06
	→ Zedka29 joined	22:07
	→ mckendricks joined	22:08
mod	weird though, that 2 are called renames and one is called a delete/new?	22:08
rafasc	git diff --cached --name-status -M5%	22:09
	← orbyt_ left	22:09
rafasc	try with different percentage values. You'll see the designation will change.	22:09
	→ Guest21 joined	22:10
	→ foul_owl joined	22:10
rafasc	what's probably happening here is that your changes to the new/deleted pair, makes it less than the default 50% similarity index.	22:10
	→ axc joined	22:11
	← theoceaniscool left	22:11
	← ki0 left	22:12
	← SpeakerToMeat left	22:12
	← plexigras left	22:13
	← \void left	22:14
	→ linuxmodder joined	22:14
	← mborgard left	22:15
	→ ocds joined	22:16
	→ orbyt_ joined	22:16
	→ dragoonis joined	22:17
	← foul_owl left	22:17
	← xaxxon left	22:17
	← dragoonis left	22:17
	← linuxmodder left	22:18
	→ pfleck1 joined	22:19
mod	rafasc, ah intersting	22:19
	Thanks rafasc, Timvde	22:20
	← Guest21 left	22:20
mod	I won't sweat it :)	22:20
	← rivalomega left	22:20
mod	Speaking of complaining about rushing into things	22:21
	oops sorry ww	22:21
	← mattcen left	22:23
	← mckendricks left	22:23
	← doubtful left	22:24
	→ rivalomega joined	22:24
	← widp left	22:24
	→ mattcen joined	22:25
	← fission6 left	22:25
	→ weijin joined	22:26
	← rivalomega left	22:26
	→ rivalomega joined	22:26
	→ Tototiti joined	22:26
	← Tototiti left	22:27
	← bolovanos left	22:27
	← bolovanos_ left	22:27
	← weijin left	22:30
	→ foul_owl joined	22:31
	← Tobbi left	22:31
	→ xaxxon joined	22:31
	→ venmx joined	22:32
	→ weijin joined	22:32
	→ _Mental joined	22:33
	← Dougie187 left	22:33
	← foul_owl left	22:37
	← troulouliou_div2 left	22:37
	← weijin left	22:37
	→ de-vri-es joined	22:37
	→ dzn joined	22:37
	→ Raed\|Laptop joined	22:37
	→ mborgard joined	22:38
	→ mikecmpbll joined	22:39
	→ duderonomy joined	22:42
	← kurkale6ka left	22:43
	→ keegans joined	22:45
keegans	how can i download https://git.webkit.org/?p=WebKit.git;a=summary (WebKit) at a certain tag without downloading the entire repo	22:45
	like a shallow clone at a commit sha	22:45
	← schleppel left	22:46
	← duderonomy left	22:47
	→ solaris joined	22:49
	→ foul_owl joined	22:50
	→ Kaisyu joined	22:50
	← netj left	22:50
	→ netj joined	22:51
rafasc	check clone --shalow-exlcude	22:51
	keegans: git clone --shallow-exclude=v1.5 https://urls	22:52
	← AaronMT left	22:52
rafasc	this will clone the history after 1.5	22:52
	→ sz0 joined	22:52
	← _Mental left	22:53
	← orbyt_ left	22:53
keegans	rafasc: right-- but there is no branch/release or anything on webkit	22:55
	so if i'm going to lock it, it has to be at a commit sha	22:55
	i.e.: there are no branches or tags	22:56
rafasc	keegans: would shallow --shallow-since=<date> work for you?	22:57
keegans	well, then in two years the download is going to be 1gb again, right?	22:58
	→ Zialus joined	22:58
	← drodger left	22:58
keegans	can i shallow-since + depth 1 or something? hmm	22:58
	→ orbyt_ joined	22:58
	← xaxxon left	22:58
	→ kurkale6ka joined	22:58
	← Raed\|Laptop left	22:59
	→ drodger joined	23:00
	← orbyt_ left	23:00
	← applecrumble left	23:01
	← leeN left	23:01
	← hbautista_ left	23:01
	← nhh^ left	23:02
	← acidjnk left	23:02
	→ Vampire0 joined	23:03
	→ hph^ joined	23:03
	← Vampire0 left	23:03
	← xcm left	23:04
	← finalbeta left	23:04
	→ schleppel joined	23:04
	→ xcm joined	23:04
	→ weijin joined	23:05
	← _ikke_ left	23:08
	← weijin left	23:10
	← CodeSlingerPaul left	23:11
	← Phylock left	23:12
	← energizer left	23:13
	→ _ikke_ joined	23:13
	→ shinnya joined	23:19
	← venmx left	23:21
	→ rwb joined	23:22
	← axc left	23:26
	← _ikke_ left	23:28
	← rivalomega left	23:29
	→ SpeakerToMeat joined	23:29
	→ englishm_work joined	23:30
	→ weijin joined	23:31
	→ rivalomega joined	23:32
	← rafasc left	23:32
	← pp5mgt left	23:34
	→ pp5mgt joined	23:35
	← weijin left	23:35
	← phinxy left	23:36
	← mborgard left	23:37
	→ _ikke_ joined	23:37
	← pionen left	23:37
	→ rivalome_ joined	23:38
	→ duderonomy joined	23:38
	→ doubtful joined	23:40
	← ocds left	23:41
	← rivalomega left	23:42
	→ rivalomega joined	23:44
	→ rafasc joined	23:46
	→ mborgard joined	23:46
	← rivalome_ left	23:47
	→ flippedouttt joined	23:48
	← m0viefreak left	23:48
	→ serialoverflow joined	23:48
	Church- → MrBurns	23:49
	← doubtful left	23:51
	← kurkale6ka left	23:53
	→ kurkale6ka joined	23:53
	← Fernando-Basso left	23:55
Eugene	keegans - if you don't actually want history, you can use `git archive --remote=<repo>` to obtain a tarball	23:56
	Your remote will need to support this; I'm unsure if it works with gitweb / smart HTTP or if you'll need git:// or ssh:// access(ie, git-send-pack)	23:57
	See also: !deploy	23:57
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	23:57
	→ doubtful joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation