IRCloggy #git 2016-01-07

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-07
	← rubyonrailed left	00:00
	← mischat left	00:00
	← junw_ left	00:00
	→ juvenal joined	00:00
	→ ochorocho joined	00:01
	← phil22 left	00:01
	→ mischat joined	00:01
	← samw left	00:01
	← killa_kyle left	00:01
	→ lucasmezencio joined	00:02
	← lucasmezencio left	00:02
	→ samw joined	00:02
	→ filisko joined	00:02
	← alanwill left	00:03
	← lindenle left	00:03
	→ alanwill joined	00:04
	← mischat left	00:05
	← FrostCandy left	00:05
	← ochorocho left	00:05
	← willmafh left	00:06
	→ lindenle joined	00:07
	← chitopunk left	00:07
	← samw left	00:07
	← c0ded left	00:08
	→ c0ded joined	00:08
	← pneuma left	00:10
	← fahadash left	00:11
	→ rubyonrailed joined	00:12
	← mellernoia left	00:12
	← namikr left	00:12
	→ junw joined	00:15
	← gaen left	00:15
	→ otter768 joined	00:16
	→ mellernoia joined	00:16
	← lindenle left	00:16
	← shinnya left	00:17
	gitinfo set mode: +v	00:18
	→ felher_ joined	00:18
	→ thiago joined	00:18
	kornbluth.freenode.net set mode: +v	00:18
	← zivester left	00:18
	→ gaen joined	00:18
	→ jam_ joined	00:19
	→ sfan786 joined	00:19
	← sfan786 left	00:20
	→ buffal0 joined	00:20
	← otter768 left	00:21
	→ lindenle joined	00:21
	← filisko left	00:23
	← jam_ left	00:23
	← blackwind_123 left	00:25
	→ blackwind_123 joined	00:27
	→ daito joined	00:27
	→ AtnevRed joined	00:29
	← HelloAtMega left	00:29
Gfurst	remembered another issue with git-annex I had	00:30
	→ Ekho_ joined	00:30
	← quenode left	00:30
	→ quenode joined	00:30
	← hashpuppy left	00:30
	← Ekho left	00:31
	← gaen left	00:31
Gfurst	it always interfaces with remote repositories even though I told it to ignore, eg repos that had git-annex, github or other without access, for example 'git annex unused' checked them as well and reported ok even though there were unused files	00:31
	← mattfoo left	00:31
	← daito left	00:32
	← lindenle left	00:32
bremner	yes, it's not a simple tool. it takes some time to learn.	00:33
	← AtnevRed left	00:33
	→ lindenle joined	00:34
	← Aboba left	00:35
	→ gaen joined	00:35
	← s8321414 left	00:36
	→ tvw joined	00:36
	→ sr____ joined	00:37
	→ mattfoo joined	00:38
	← lindenle left	00:40
	→ lindenle joined	00:41
	→ otter768 joined	00:41
	← tvw left	00:41
	→ ilmgb joined	00:43
	→ tvw joined	00:44
	← jottr left	00:45
	← BSaboia left	00:45
	← znabavi left	00:46
	→ Lyqyd joined	00:47
Gfurst	funny, the custom lfs requires to pass the config to .gitconfig, I wonder if its mistyped .git/config or there could be repo tracked config like that	00:48
	← Guest14655 left	00:49
	→ Guest14655 joined	00:50
	← lindenle left	00:51
	← Guest14655 left	00:52
	→ Guest14655 joined	00:52
	← Guest14655 left	00:53
	→ lindenle joined	00:53
	← mellernoia left	00:54
	← hexagoxel left	00:54
	→ hexagoxel joined	00:55
	→ znabavi joined	00:55
	← juvenal left	00:55
bremner	there's already .gitattributes and .gitignore and .gitmodules	00:56
	← rewt left	00:56
	→ rewt`` joined	00:56
	→ jagob joined	00:56
bremner	I don't think core git looks at .gitconfig, but maybe something changed recently	00:56
	rewt`` → rewt	00:56
	← lindenle left	00:59
	← fstd left	00:59
	← kilo_bravo left	00:59
	→ fstd joined	00:59
	← harish_ left	00:59
	← jagob left	00:59
	← govg left	01:01
	→ mischat joined	01:01
	→ lindenle joined	01:01
	→ ochorocho joined	01:02
	→ MarkyC joined	01:02
	→ samw joined	01:02
	← paddyez left	01:03
	→ dling joined	01:03
	← sanscheese left	01:03
	→ jimi_ joined	01:04
Gfurst	awesome, the git-lfs serve worked alright, though it needs authentication	01:04
	← Gamecubic left	01:04
	→ Gamecubic joined	01:05
	→ dyonroot joined	01:05
	← MarkyC left	01:05
	← znabavi left	01:05
	← ochorocho left	01:06
	← samw left	01:07
	← mischat left	01:08
	← dharrigan left	01:09
	→ csd_ joined	01:09
	→ ome joined	01:09
	← lindenle left	01:10
	← liamonade left	01:11
	→ italoacasas joined	01:12
	→ tomog999_ joined	01:13
	→ steverandy joined	01:14
	← Gfurst left	01:14
	← tomog999 left	01:15
	→ lindenle joined	01:15
	→ Vgr joined	01:15
	→ dharrigan joined	01:18
	→ DuckHuntDog joined	01:18
	→ jottr joined	01:19
	→ znabavi joined	01:20
	← dyonroot left	01:21
	→ githogori joined	01:22
	→ lbf1121 joined	01:23
	→ jam_ joined	01:24
	← lbf1121 left	01:24
	Guest10159 → murph	01:24
	→ gitnoob joined	01:26
	→ jeffreylevesque joined	01:28
	→ daito joined	01:28
	← buffal0 left	01:29
	← HanClinto left	01:29
	← lindenle left	01:29
	→ highsen joined	01:29
	← gitnoob left	01:30
	→ lindenle joined	01:31
DuckHuntDog	Hi, I'm new to the concept of git branching and merging. I've created a feature branch with some unit tests (lets call it B1) and sent a pull request to push it to main.	01:31
	← dreiss left	01:31
DuckHuntDog	Now I wanna worki on a new unrelated test but still keep the code from B1 so that I can continue running them	01:32
	*them = tests I created in B1	01:32
	So the question is : should I fork B1 into B2 and start building my new tests?	01:32
	And in that case what would happen if I sent a pull request to push B2 into master when B1 hasn't been accepted?	01:33
	← daito left	01:33
	← gaen left	01:33
DuckHuntDog	there are no dependencies between B1 and B2	01:34
	→ gaen joined	01:34
	→ aapaal joined	01:34
milki	DuckHuntDog: if theres no dependency, then your reason to keep B1 is not very strong	01:36
DuckHuntDog	Yeah there's no reason the branches should have any connection to eachother	01:38
	← thiago left	01:38
DuckHuntDog	but it will make it a lot harder to develop if I cant develop B2 while having the B1 code in the same project to use for comparisons etc	01:38
	→ beneter joined	01:39
milki	DuckHuntDog: checkout B1 into a different directory then	01:39
	← lindenle left	01:39
DuckHuntDog	Guess that's the only reasonable way to do it	01:39
	← tvw left	01:40
	← dansan_ left	01:40
milki	develop an ide that can peek at previous revisions of files	01:40
	→ Aboba joined	01:40
milki	actually... thats not a bad idea	01:40
	→ lindenle joined	01:41
milki	i wonder if any git plugins do that already	01:41
	→ jottr_ joined	01:41
	← Lyqyd left	01:41
tang^	IDEA will let you log changes to your file	01:41
	so it's pretty easy to peek backwards	01:42
DuckHuntDog	So in general if you have a branch with a pending pull request - there's no reason to fork that branch until you are sure the pr will be accepted	01:42
	cause if that pr is rejected...	01:43
	→ cmkkc joined	01:43
	← cmkkc left	01:44
DuckHuntDog	it would be kind of tricky to correct it and then push those corrections to the fork, right?	01:44
	← jottr left	01:44
DuckHuntDog	*or pull i mean	01:44
	maslen1 → maslen	01:45
	← benlieb left	01:47
	← lindenle left	01:49
	→ rchavik joined	01:49
	→ daivyk joined	01:51
	→ reim joined	01:51
	← aapaal left	01:52
DuckHuntDog	As a git rookie the term "pull request" never made sense to me in the start. Sounds like asking if it's ok to pull someone elses stuff into your own	01:52
	→ lindenle joined	01:53
	→ fairuz joined	01:53
tang^	github pioneered that term, I think	01:53
DuckHuntDog	To me it should be "push request" - cause what I am doing is trying to push MY stuff into someone elses	01:54
	Doesn't like the terminology uses the subject and object consistently	01:54
tang^	nah, you're asking somebody to pull your changes into their repo	01:55
DuckHuntDog	but isn't that the same thing as asking if they approve my request to push my code into their repo	01:55
	← codedmart left	01:56
	gitinfo set mode: +v	01:56
	← fracting left	01:57
beneter	no. you don't get the permission to push	01:57
	→ pozitrono joined	01:57
tang^	pull request presumes that their repo is the master that you cloned from	01:57
	← jottr_ left	01:59
	← fairuz left	01:59
DuckHuntDog	yeah, ok	02:01
	thinking about it and it makes sense	02:01
	← csd_ left	02:01
DuckHuntDog	but I think many beginners have the same issue :)	02:01
	← tang^ left	02:01
	→ csd_ joined	02:01
	← znabavi left	02:02
	← weox left	02:02
	← lindenle left	02:02
	→ ochorocho joined	02:02
	← DuckHuntDog left	02:03
	← junw left	02:03
	← wgrant left	02:03
	→ wgrant joined	02:04
	← Ahmed90 left	02:04
	→ mischat joined	02:04
	→ marko joined	02:05
	← csd_ left	02:05
	← marko left	02:06
	→ lindenle joined	02:07
	→ skorgon joined	02:07
	← skorgon left	02:07
	→ skorgon joined	02:07
	← ochorocho left	02:07
	← wgrant left	02:07
	→ arescorpio joined	02:08
	→ fairuz1 joined	02:08
	→ wgrant joined	02:08
	→ jottr_ joined	02:09
	← jimi_ left	02:12
	← lindenle left	02:15
	← fairuz1 left	02:15
	→ fahadash joined	02:16
	← fahadash left	02:16
	→ fahadash joined	02:16
	← fahadash left	02:16
	→ fahadash joined	02:16
	→ LeeXiaolan joined	02:17
	← LeeXiaolan left	02:18
	→ jagob joined	02:19
	← Wetmelon left	02:19
	→ lindenle joined	02:19
	← gaen left	02:21
	→ gaen_ joined	02:21
	→ boombatower joined	02:22
	← Sample left	02:23
	→ harish_ joined	02:23
	→ tyll_ joined	02:24
	← Aboba left	02:25
	← akushner left	02:26
	← lindenle left	02:26
	← phrozensilver left	02:26
	← tyll left	02:27
	→ durham_ joined	02:27
	→ dreiss joined	02:28
	→ znabavi joined	02:28
	← msonntag left	02:28
	→ lindenle joined	02:29
	→ msonntag joined	02:29
	→ daito joined	02:29
	→ AtnevRed joined	02:29
	← durham left	02:31
	→ phrozensilver joined	02:31
	→ whomp joined	02:31
	← durham_ left	02:32
whomp	so i made a bunch of changes and now i want to split them into 2 prs. i've figured out 1 of the two, how can i make the other pr be all of the changes that weren't included in the first pr?	02:32
	← dreiss left	02:32
	← daito left	02:33
	→ juvenal joined	02:34
	← AtnevRed left	02:34
	→ ice9 joined	02:36
ice9	how to clone repo using the latest commit version only?	02:36
	and ignoring all the previous history	02:37
bremner	!shallow	02:38
gitinfo	A shallow clone will clone a repository to a certain "depth", which sounds like a good idea for only obtaining the latest revision of a given repo. However, they often don't work as-advertised(breaking on fetch and push operations). Instead you should consider git-archive's --remote feature, or perhaps you're really encountering a !binary problem	02:38
	← m0viefreak left	02:38
	← lindenle left	02:38
	← pks left	02:40
	→ lindenle joined	02:41
	← frem left	02:42
	← gaen_ left	02:42
	→ gaen joined	02:42
	→ pks joined	02:43
	→ skylite joined	02:43
	← gaen left	02:43
	← looper left	02:44
	← g105b left	02:45
	→ gaen joined	02:45
	← skylite left	02:46
	→ looper joined	02:46
	→ HanClinto joined	02:46
	→ mizu_no_oto joined	02:47
	→ g105b joined	02:47
	→ Gsham joined	02:49
	← algae left	02:49
	← ril left	02:49
	← lindenle left	02:49
	← justanotheruser left	02:51
	→ fracting joined	02:52
	← Guest45789 left	02:52
	→ \|nodux joined	02:53
	→ justanotheruser joined	02:53
	→ ril joined	02:54
	→ lindenle joined	02:54
	← znabavi left	02:55
	← beneter left	02:55
	← mischat left	02:55
	→ jimi_ joined	02:55
	← discipline left	02:56
	← fracting left	02:57
	→ joufflu joined	02:58
	→ discipline joined	02:58
	→ Vampire0 joined	02:58
	→ watabou joined	02:59
	← d4rklit3 left	03:00
	← jottr_ left	03:00
	← LBV_User left	03:00
	← lindenle left	03:00
	← Vampire0_ left	03:01
	→ LeeXiaolan joined	03:02
	← peoliye left	03:03
	← skorgon left	03:04
	→ ochorocho joined	03:04
	← rubyonrailed left	03:04
	→ pneuma joined	03:05
	→ lindenle joined	03:06
	→ BillCriswell joined	03:06
	← ochorocho left	03:08
	→ DolpheenDream joined	03:09
	← canine left	03:10
	← weltall left	03:10
	→ znabavi joined	03:11
	← boudiccas left	03:11
	→ rubyonrailed joined	03:12
	→ weltall joined	03:14
	→ canine joined	03:14
	→ speaker123 joined	03:14
	→ NeverDie joined	03:14
speaker123	hi all, i'm trying to run 'git status' from a Python shell. i would like the output to be colored, as it would be if the user were running it in their own shell.	03:15
	← ice9 left	03:15
speaker123	but when i run from the python shell (using subprocess.Popen), it does not return back ANSI escape sequences. is there something I should be doing to get the color?	03:15
	→ boudiccas joined	03:17
	← lindenle left	03:17
	← Sleepy63 left	03:17
	→ pneuma_ joined	03:17
	← justanotheruser left	03:17
	→ fairuz joined	03:18
	→ lindenle joined	03:19
	← pneuma left	03:19
	pneuma_ → pneuma	03:19
	← ahr3n left	03:21
	→ crayon joined	03:24
	→ cyphase joined	03:24
	← cyphase left	03:24
	→ cyphase joined	03:24
	→ thiago joined	03:25
	→ pneuma_ joined	03:26
	→ gfixler joined	03:27
	→ peoliye joined	03:27
	← lindenle left	03:27
	← ril left	03:27
	← pneuma left	03:29
	pneuma_ → pneuma	03:29
	→ daito joined	03:30
	→ lindenle joined	03:30
	→ justanotheruser joined	03:30
	← woodruffw left	03:30
	→ Sleepy63 joined	03:30
	← alanwill left	03:31
	← Gsham left	03:32
	← phrozensilver left	03:33
	→ Lyqyd joined	03:33
	← daito left	03:34
kadoban	speaker123: 'git -c color.status=always status'	03:37
	← ome left	03:37
	← fscala left	03:37
	→ Goplat joined	03:37
	→ Wetmelon joined	03:39
	→ fscala joined	03:39
speaker123	thanks	03:39
	→ Motoko joined	03:40
	← lindenle left	03:40
	← mizu_no_oto left	03:40
	→ SkoalBanditExpr joined	03:42
	→ lindenle joined	03:43
	← italoacasas left	03:44
	← gaen left	03:44
	→ gaen joined	03:45
	→ Gsham joined	03:45
	← wethu left	03:46
	← fairuz left	03:48
	← Sonicbit left	03:48
	→ Dougie187 joined	03:49
	← lindenle left	03:50
	← mezod left	03:51
	→ ril joined	03:51
	→ lindenle joined	03:53
	→ wethu joined	03:54
	→ Sonicbit joined	03:55
	← gaen left	03:55
	→ gaen joined	03:55
	← jagob left	03:58
	← faux___ left	03:59
	← Faylite left	03:59
	← happy-dude left	03:59
	→ Faylite joined	03:59
	← serapath_ left	04:00
	→ faux___ joined	04:01
	← lindenle left	04:01
	→ ensyde joined	04:02
	→ italoacasas joined	04:04
	← italoacasas left	04:04
	→ lindenle joined	04:05
	→ phrozensilver joined	04:05
	→ ochorocho joined	04:05
	→ checkItOut joined	04:07
	← checkItOut left	04:07
	→ checkItOut joined	04:07
	← ochorocho left	04:10
	← lindenle left	04:12
	→ dreiss joined	04:14
	→ lindenle joined	04:15
	← Ekho_ left	04:16
	→ zivester joined	04:17
	→ arup_r joined	04:18
	→ daito joined	04:19
	← Dougie187 left	04:19
	→ s8321414 joined	04:20
	→ s8321414_ joined	04:22
	← s8321414 left	04:22
	← rubyonrailed left	04:22
	← s8321414_ left	04:22
	← ril left	04:24
	← lindenle left	04:24
	→ lykinsbd joined	04:25
	← yqt left	04:25
	→ d4rklit3 joined	04:25
	← dreiss left	04:26
	← lykinsbd left	04:26
	→ lindenle joined	04:27
	← otter768 left	04:28
	← jam_ left	04:28
	→ rkazak joined	04:28
	← daito left	04:28
	→ rubyonrailed joined	04:29
	→ Sasazuka joined	04:30
	← gaen left	04:30
	→ MattMaker joined	04:31
	← Sasazuka left	04:31
	→ gaen joined	04:32
	→ regedit joined	04:35
	← lindenle left	04:35
	→ Manikandan joined	04:35
regedit	halp! my diff patch i've been playing around with (uncommitted...) for some time now between 2 computers suddenly refuses to apply anymore :(	04:36
	after a pull from origin	04:36
	← joki left	04:37
	→ lindenle joined	04:38
	→ HNY_ joined	04:41
	← rubyonrailed left	04:42
	← gaen left	04:42
regedit	is there any way to proceed with the apply anyway, and resolve conflicts?	04:42
	→ joki joined	04:44
	→ gaen joined	04:45
	← lindenle left	04:45
	→ alanwill joined	04:46
	← jimi_ left	04:46
	→ samw joined	04:49
	→ lindenle joined	04:50
	← faux___ left	04:50
	→ faux___ joined	04:51
	← sdothum left	04:53
	← samw left	04:54
	→ Es0teric joined	04:55
	→ rubyonrailed joined	04:55
	← gaen left	04:55
	← UTAN_dev_ left	04:55
	← DolpheenDream left	04:55
	→ gaen joined	04:55
	← MattMaker left	04:56
	→ UTAN_dev joined	04:56
	← daivyk left	04:58
	← pigeon left	04:58
	→ csd_ joined	04:58
	← dsdeiz left	04:59
	→ dsdeiz joined	04:59
	← lindenle left	04:59
	← dermoth left	05:00
	→ lindenle joined	05:00
	← Sonicbit left	05:00
	→ dermoth joined	05:00
	← csd_ left	05:03
	← lindenle left	05:03
	→ lindenle joined	05:04
	← Gsham left	05:05
	← SkoalBanditExpr left	05:05
	→ ochorocho joined	05:06
	← lindenle left	05:07
	← alanwill left	05:07
	← ensyde left	05:08
	← rewt left	05:08
	→ lindenle joined	05:08
	← cyphase left	05:08
	→ ensyde joined	05:08
	← rkazak left	05:09
	→ BeatrixKiddo joined	05:11
	← BeatrixKiddo left	05:11
	→ BeatrixKiddo joined	05:11
	← the_cybersphinx left	05:11
	← ochorocho left	05:11
	→ nnyk_ joined	05:11
	← crayon left	05:12
	→ rewt joined	05:16
	→ amdi_ joined	05:16
	← arescorpio left	05:17
	← peoliye left	05:19
	→ alanwill joined	05:20
	→ cyphase joined	05:20
	→ woodruffw joined	05:20
	← blackwind_123 left	05:20
	→ blackwind_123 joined	05:22
	← phrozensilver left	05:22
	→ nnyk joined	05:23
	← nnyk_ left	05:24
	→ crayon joined	05:26
	← whomp left	05:26
	→ MattMaker joined	05:27
	← FireArrow133 left	05:27
	→ Genome36 joined	05:27
Genome36	hello ! long time no see	05:27
	im wondering, i need to do a diff on two files that have never been committed	05:28
	is that possible ?	05:28
	data.log and data.log.orig	05:28
	← nnyk left	05:28
preaction	use the regular diff tool	05:28
	← GT left	05:28
	← marlinc left	05:29
Genome36	how ?	05:30
preaction	diff <file1> <file2>	05:30
Genome36	yes but both never existed in repo	05:30
	ah cool	05:30
preaction	not "git diff", just "diff"	05:30
Genome36	yes	05:30
	does it give similar output to git diff ?	05:30
	like red and green changes ?	05:30
	← d4rklit3 left	05:31
preaction	git diff is generally unified by default, so you want "diff -u" likely	05:31
	→ samsamsam joined	05:31
preaction	man diff if you want colors	05:31
Genome36	ty	05:31
	← MattMaker left	05:31
Genome36	oh nice	05:32
	so if i understand correctly, git depends on diff as a lib ?	05:32
	or is diff a lib loaded by git when you install it ?	05:32
	Genome36 is curious	05:32
	← checkItOut left	05:33
	→ peoliye joined	05:34
	→ marlinc joined	05:34
	← crayon left	05:34
	→ guru107 joined	05:34
	← arup_r left	05:34
samsamsam	I am having trouble with symlinks and git add. The symlink points to another symlink which points to the file. Got add throws "fatal: pathspec 'xxx' is beyond a symbolic link"	05:34
Genome36	apparently diff has no color but there is a workaround -> sudo apt-get install colordiff	05:34
	← sweatsuit left	05:34
Genome36	samsamsam: you have to link to the original	05:35
	make sure to not do the mistake i made	05:35
	→ keldwud joined	05:35
	→ sweatsuit joined	05:36
samsamsam	@Genome36 I am not sure how to do that	05:36
Genome36	you have to point symbolic links relatively else other users cloning your repo will end up with broken links as they will only work on your machine	05:36
	samsamsam: what os do you use ?	05:36
samsamsam	linux mint	05:36
Genome36	yay good	05:36
	← Cabanossi left	05:36
Genome36	cd to directory you need the symlink	05:36
	les say its dir a	05:36
	and dir b is the original file	05:37
	ln -s ../../../../path/to/dir/b/file ./file	05:37
	the ../ is a way to say to linux to go back one directory	05:37
	→ Cabanossi joined	05:38
Genome36	else if your file link depends on a linux bin or other installed file you can just point directly to /usr/bin/file (file being an example of course)	05:38
	→ bannakaffalatta joined	05:39
	→ Chilley joined	05:40
	→ rkazak joined	05:42
	← lindenle left	05:42
	← rubyonrailed left	05:42
	← blackwind_123 left	05:45
Genome36	ty again preaction	05:48
	later guys !	05:48
	← Genome36 left	05:48
	→ johan_sun joined	05:49
	← CheckDavid left	05:49
	→ rubyonrailed joined	05:49
	→ samw joined	05:49
	← knownasilya left	05:50
	→ nnyk joined	05:50
	→ PCatinean joined	05:50
	→ durham joined	05:53
	← samw left	05:54
	→ arup_r joined	05:56
	← Lyqyd left	05:57
	← arup_r left	05:58
	← durham left	05:58
	→ durham joined	05:59
	← pneuma left	05:59
	← highsen left	05:59
	→ arup_r joined	06:00
	→ jam_ joined	06:00
	→ Imek joined	06:01
	→ jam___ joined	06:02
	← arup_r left	06:03
	← BillCriswell left	06:05
	→ arup_r joined	06:05
	← jam_ left	06:06
	← Es0teric left	06:06
	→ Error404NotFound joined	06:07
	→ ochorocho joined	06:07
	← tpollard left	06:08
	← rubyonrailed left	06:11
	← ochorocho left	06:11
	→ regedit_ joined	06:12
	→ rubyonrailed joined	06:12
	→ settermjd joined	06:13
	← regedit left	06:13
	regedit_ → regedit	06:13
	→ rscata joined	06:16
	→ SimonNa joined	06:17
	← Motoko left	06:17
	← steverandy left	06:23
	← BeatrixKiddo left	06:23
	← Wetmelon left	06:25
	→ daito joined	06:25
	← Manikandan left	06:27
	← HNY_ left	06:28
	→ otter768 joined	06:29
	← daito left	06:30
	→ AtnevRed joined	06:31
	← \|nodux left	06:31
	→ lindenle joined	06:33
	→ CorySimmons joined	06:33
	← otter768 left	06:33
	→ Manikandan joined	06:34
	← thierryp left	06:35
	← AtnevRed left	06:36
	→ lindenle_ joined	06:38
	← PsionTheory left	06:38
	← lindenle left	06:38
	→ codedmart joined	06:39
	← ensyde left	06:40
	→ Sample joined	06:40
	→ ensyde joined	06:40
	← robbyoconnor left	06:41
	← lindenle_ left	06:41
	→ robbyoconnor joined	06:41
	→ petersr joined	06:42
	← amdi_ left	06:42
	→ lindenle joined	06:42
	← petersr left	06:43
	← durham left	06:44
	← ensyde left	06:46
	→ ensyde joined	06:46
	← dsantiago left	06:47
	← nnyk left	06:47
	→ lindenle_ joined	06:47
	← lindenle left	06:47
	→ dreiss joined	06:48
	→ ThomasLocke joined	06:49
	← speaker123 left	06:52
	← Cata\|Work left	06:52
	→ InfoTest joined	06:52
	→ Cata\|Work joined	06:52
	→ psk17_ joined	06:52
	← peoliye left	06:52
	→ lindenle joined	06:52
	→ peoliye joined	06:53
	→ ryez joined	06:53
	→ Es0teric joined	06:53
	← lindenle_ left	06:53
	← d0nn1e left	06:54
	→ dsantiago joined	06:54
	→ faux____ joined	06:54
	→ NateAGeek joined	06:54
	← robbyoconnor left	06:54
	← faux___ left	06:54
	← buMPnet left	06:54
	→ robbyoconnor joined	06:54
	→ fairuz joined	06:54
	← joufflu left	06:55
	→ buMPnet joined	06:56
	→ felixn joined	06:56
	← leeN left	06:56
	→ d0nn1e joined	06:56
	→ nnyk joined	06:56
	← lindenle left	06:58
	← Faylite left	06:59
	← znabavi left	06:59
	Tronsha → [UPA]Stefan	07:00
	← zivester left	07:01
	→ znabavi joined	07:01
	← guru107 left	07:02
	→ justanot1eruser joined	07:02
	← justanotheruser left	07:02
	← arup_r left	07:02
	→ dopesong joined	07:03
	← gopar left	07:03
	← codedmart left	07:05
	← jokajak left	07:05
	← psk17_ left	07:06
	→ ochorocho joined	07:07
	→ arup_r joined	07:07
	← rubyonrailed left	07:08
	→ nilg joined	07:09
	← phantombeta left	07:09
	← rchavik left	07:10
	→ jceb joined	07:10
	→ gmichael joined	07:10
	→ nnyk_ joined	07:10
	→ lamppid joined	07:11
	→ BSaboia joined	07:11
	← nnyk left	07:11
	← jceb left	07:11
	→ phantombeta joined	07:11
	← ochorocho left	07:12
	→ happy-dude joined	07:12
	→ mariuscc joined	07:12
	← dreiss left	07:12
	← phroa left	07:15
	→ vdv joined	07:16
	← justanot1eruser left	07:16
	→ justanotheruser joined	07:16
	← justanotheruser left	07:16
	→ justanotheruser joined	07:16
	→ dreiss joined	07:17
	← Manikandan left	07:17
	← znabavi left	07:17
	→ roelmonnens joined	07:17
	→ d4rklit3 joined	07:19
	→ znabavi joined	07:19
	← vdv left	07:20
	← dreiss left	07:21
	← phantombeta left	07:21
	→ Yeomra joined	07:21
	← d4rklit3 left	07:21
	→ SOLDIERz joined	07:22
	→ freimatz joined	07:23
	→ zeroed joined	07:23
	→ _nadim joined	07:24
	← Es0teric left	07:25
	→ csd_ joined	07:25
	→ acolson joined	07:26
	→ daito joined	07:26
	→ Manikandan joined	07:29
	← csd_ left	07:29
	← Error404NotFound left	07:30
	← felixn left	07:30
	→ dan2k3k4 joined	07:30
	→ Error404NotFound joined	07:30
	→ phantombeta joined	07:31
	← daito left	07:31
	→ crayon joined	07:31
	← Gamecubic left	07:32
	← acolson left	07:35
	→ felixn joined	07:37
	← alanwill left	07:38
	→ dimi1947 joined	07:38
	→ Macaveli joined	07:39
	← Macaveli left	07:39
	← CorySimmons left	07:39
	→ mohammed64 joined	07:39
	→ thierryp joined	07:40
	→ CausaMortis joined	07:41
	← znabavi left	07:41
	← akiva left	07:46
	← NateAGeek left	07:46
	→ alanwill joined	07:47
	→ ciampix joined	07:49
	← fscala left	07:49
	→ bollullera joined	07:49
	→ MattMaker joined	07:51
	→ acolson joined	07:51
	→ fscala joined	07:52
	→ felixn_ joined	07:55
	← felixn_ left	07:55
	← felixn left	07:56
	→ lindenle joined	07:56
	← MattMaker left	07:56
	→ emmajane joined	07:57
	→ JeroenT joined	07:57
	← mingwandroid left	07:57
	→ french-buget joined	07:57
	← zeroed left	07:58
	← ilmgb left	07:58
	→ Fijit joined	07:58
	→ zeroed joined	07:58
	← nnyk_ left	07:58
	→ ilmgb joined	07:59
	← BSaboia left	07:59
	→ otter768 joined	08:00
	← lindenle left	08:01
	→ jokajak joined	08:01
	← jokajak left	08:01
	→ jokajak joined	08:01
	→ jnavila joined	08:02
	→ otter768_ joined	08:02
	← gzoo left	08:03
	← boombatower left	08:03
	← mohammed64 left	08:04
	→ otter76__ joined	08:04
	→ abs25 joined	08:04
	← otter768 left	08:04
abs25	can git show all branches that edited that file ? sorted by date?	08:05
	→ jagob joined	08:05
	→ BSaboia joined	08:05
	← otter76__ left	08:06
	→ demirgokhan joined	08:06
	→ otter768 joined	08:06
	← jagob left	08:06
	← otter768_ left	08:06
	→ sbasso joined	08:07
	→ mahendra_ joined	08:07
	→ fairuz1 joined	08:08
	→ Sceorem joined	08:08
	→ otter768_ joined	08:08
	← otter768 left	08:08
	→ ochorocho joined	08:08
	→ [Brain] joined	08:09
	← JeroenT left	08:09
	← ilmgb left	08:10
	→ otter768 joined	08:10
	← otter768_ left	08:10
	← fairuz left	08:10
	← alanwill left	08:11
	→ David1977 joined	08:11
	← Error404NotFound left	08:12
	→ otter768_ joined	08:12
	← ochorocho left	08:13
	← regedit left	08:13
	← chhaci left	08:13
	← Sleepy63 left	08:13
	← uranellus left	08:13
	← otter768_ left	08:13
	→ otter768_ joined	08:14
	→ memoryleak joined	08:14
	← otter768 left	08:14
	→ Alienpruts joined	08:14
	→ xaa joined	08:14
	← otter768_ left	08:15
	→ otter768 joined	08:15
	← samsamsam left	08:16
	← Imek left	08:17
	→ otter768_ joined	08:17
	← otter768 left	08:17
	→ znabavi joined	08:18
	← otter768_ left	08:19
	→ otter768 joined	08:19
	← gaen left	08:20
	→ uranellus joined	08:20
	→ otter768_ joined	08:21
	← otter768 left	08:21
	← mahendra_ left	08:21
	← arup_r left	08:22
	← otter768_ left	08:23
	→ mykespb joined	08:23
	→ otter768 joined	08:23
	→ mahendra_ joined	08:25
	→ otter768_ joined	08:25
	← sparetire_ left	08:25
	→ TomyWork joined	08:25
	← jam___ left	08:25
	→ lolmac joined	08:27
	→ otter76__ joined	08:27
	→ bonswouar joined	08:27
	→ skylite joined	08:27
	← otter768 left	08:28
	→ Balliad joined	08:28
	→ otter768 joined	08:29
	→ jay-m joined	08:29
	→ cvanball joined	08:30
	← watabou left	08:30
	← otter768_ left	08:30
	→ otter768_ joined	08:31
	← otter76__ left	08:31
	→ joel_falcou joined	08:31
	← Balliad left	08:32
	→ AtnevRed joined	08:32
	→ otter76__ joined	08:33
	→ rominronin joined	08:33
	← InfoTest left	08:33
	← otter768 left	08:33
	→ Balliad joined	08:34
	→ otter768 joined	08:34
	← otter76__ left	08:35
	← crayon left	08:35
	← otter768_ left	08:36
	→ otter768_ joined	08:36
	← AtnevRed left	08:36
	← otter768 left	08:37
	← harish_ left	08:37
	→ harish joined	08:37
	← otter768_ left	08:38
	→ otter768 joined	08:38
mrk	hi someone knows this: ! [rejected] master -> master (non-fast-forward)	08:39
	i cant push my project	08:39
	← otter768 left	08:40
	→ otter768 joined	08:40
	→ fairuz joined	08:41
	→ regedit joined	08:41
	← reim left	08:41
	← fairuz left	08:41
	→ otter768_ joined	08:42
	→ Hounddog joined	08:43
	← fairuz1 left	08:43
	→ otter76__ joined	08:44
	← otter768 left	08:44
	← d0nn1e left	08:44
	→ JeroenT joined	08:45
	← wethu left	08:46
	← tHEMtZ left	08:46
	← otter76__ left	08:46
	→ d4rklit3 joined	08:46
	→ otter768 joined	08:46
	← otter768_ left	08:47
	→ d0nn1e joined	08:47
	→ otter768_ joined	08:48
	← harish left	08:48
	← otter768 left	08:48
	→ Lor_ joined	08:48
	← Lor_ left	08:48
	← demirgokhan left	08:49
	→ skcin7 joined	08:49
	→ otter768 joined	08:50
	→ otter76__ joined	08:52
	← otter768 left	08:52
	← otter768_ left	08:52
	← otter76__ left	08:53
	→ otter768 joined	08:53
	→ rubyonrailed joined	08:54
	← znabavi left	08:54
	→ inamoriti joined	08:55
	→ otter768_ joined	08:56
	← otter768 left	08:57
	→ otter76__ joined	08:58
	→ french-buget1 joined	08:58
	← french-buget1 left	08:59
	← french-buget left	08:59
	→ fees joined	08:59
	← rubyonrailed left	08:59
	→ otter768 joined	08:59
	→ french-buget joined	08:59
	← otter76__ left	08:59
Seveas	mrk: if you read the entire output of the push command, you'll know what to do next	09:00
	← french-buget left	09:00
	← otter768_ left	09:01
	→ french-buget joined	09:01
	→ otter768_ joined	09:01
	→ otter76__ joined	09:03
	← otter768_ left	09:03
	← otter768 left	09:04
	→ dreiss joined	09:04
	← scampbell left	09:04
	→ otter768 joined	09:05
	← otter76__ left	09:05
	→ HowardwLo joined	09:05
HowardwLo	holy shit! i need help	09:06
	I tried getting fancy with branches	09:06
	so i made a test branch with my test changes while my master branch had its own changes	09:06
	i tried merging my test branch into my master branch because #developer	09:06
	→ g00se_ joined	09:06
	→ kurkale6ka joined	09:07
HowardwLo	but now…it seems i may have merged my master into my test?	09:07
	→ {AS} joined	09:07
	→ otter768_ joined	09:07
HowardwLo	http://snag.gy/pfa6A.jpg !	09:07
	→ Klawsy joined	09:07
HowardwLo	how do i….fix it	09:07
grawity	would be nice if your app thing could show commit IDs next to the graph	09:09
	← d4rklit3 left	09:09
	→ otter76__ joined	09:09
grawity	but anyway:	09:09
	← otter768_ left	09:09
	← JeroenT left	09:09
grawity	1) git checkout test	09:09
	← zeroed left	09:09
grawity	2) throw away the merge commit, with `git reset --hard HEAD^`	09:09
	← french-buget left	09:09
	→ marcogmonteiro joined	09:09
HowardwLo	i have to do it in terminal? :)	09:10
grawity	(not sure if HEAD^ is right here, you could use the commit ID of that "no message" commit instead)	09:10
	← dopesong left	09:10
Stummi	"no message" - hehe	09:10
grawity	if you're asking here in #git, you're going to get terminal answers	09:10
	← otter768 left	09:10
	← Sample left	09:10
grawity	since most of us know the Git CLI but much fewer know that specific app you use	09:10
Stummi	HowardwLo, we don't know the application you are using, so we can't tell you how to use it	09:10
	→ craigp joined	09:11
	→ otter768 joined	09:11
	← otter76__ left	09:11
grawity	yeah I don't even know its name so I can't even google and pretend I know how to use it	09:11
Stummi	also, he already pushed the merge	09:11
HowardwLo	its sourcetree if that helps	09:11
grawity	that's fine, it's a "test" branch anyway	09:11
	some history rewriting probably won't cause any problems in a branch named that	09:11
HowardwLo	ok, is there a 3)?	09:12
grawity	3) check out master	09:12
	4) git merge test	09:12
	→ encod3 joined	09:12
	→ zeroed joined	09:12
	← zeroed left	09:12
	→ zeroed joined	09:12
grawity	err, hmm	09:12
	your local master is a bit behind origin/master	09:12
	→ bongjovi joined	09:13
	← otter768 left	09:13
	→ otter768_ joined	09:13
grawity	so normally you'd first get the new stuff from origin – `git merge origin/master`	09:13
	→ JeroenT joined	09:13
HowardwLo	so i would merge first?	09:14
grawity	you should end up with both [master] and [origin/master] at the same "overflow for <code>" commit	09:14
	and then you `git merge test`	09:14
HowardwLo	so…1-4 still applies?	09:14
	→ otter768 joined	09:14
	← otter768_ left	09:15
	→ Gottox joined	09:15
	→ josuebrunel joined	09:15
	← otter768 left	09:16
	→ ilmgb joined	09:16
	gitinfo set mode: +v	09:16
HowardwLo	grawity: do i still do 1-4 ?	09:17
	→ otter768 joined	09:17
	← twem2 left	09:17
grawity	yes	09:17
	← dimi1947 left	09:17
grawity	well 1-3, then merge from origin/master, then 4	09:17
HowardwLo	ok after i did git checkout master, it says it’s behind by 3 commits	09:18
	← otter768 left	09:18
HowardwLo	so now i do git merge origin/master ?	09:18
grawity	yeah	09:18
	→ otter768 joined	09:18
HowardwLo	omg its worse	09:19
	grawity: http://snag.gy/MLQyc.jpg	09:19
	i also include the commit id :D	09:20
	i did git merge test	09:20
	was that suppose to be origin/test instead?	09:20
grawity	no	09:20
	→ otter768_ joined	09:20
	← otter768 left	09:20
grawity	there's this dropdown, "Show Remote Branches"	09:20
	does it have an option to just show local ones?	09:21
HowardwLo	hide remote branches?	09:21
grawity	yeah	09:21
HowardwLo	http://snag.gy/y9GNK.jpg	09:21
	here it is	09:21
grawity	right, looks fine	09:21
HowardwLo	push?	09:21
grawity	yes	09:21
	git push origin master; git push --force origin test	09:21
	or the GUI equivalent of that	09:21
HowardwLo	ok	09:22
	done	09:22
	← otter768_ left	09:22
	→ otter768 joined	09:22
grawity	with "show remote branches" it should now look the same	09:22
HowardwLo	yup!	09:23
	thanks	09:23
	whew	09:23
	can i delete test branch and never speak of it again?	09:23
grawity	yeah	09:23
	(and push --delete test, as well)	09:23
	→ courrier joined	09:23
	→ french-buget joined	09:23
HowardwLo	git push —delete test ?	09:24
	← otter768 left	09:24
	→ otter768_ joined	09:24
jast	you need to include the name of the remote	09:24
	if it's called origin: git push --delete origin test	09:24
Gottox	Hi! Maybe s/o got a hint for me: We have a project with a simple line based file which is changed fairly often in different branches.	09:25
	← otter768_ left	09:25
	→ clmsy joined	09:26
	→ otter768 joined	09:26
Gottox	To the consistency of the file neither the order nor the context of a line is important.	09:26
	think of it as a file as fstab.	09:26
	→ demirgokhan joined	09:26
Gottox	is there an optimized merge strategy, that won't create a merge conflict if two branches concat the file concurrently?	09:27
	and just concat both?	09:27
	→ daito joined	09:28
	→ otter768_ joined	09:28
	← otter768 left	09:28
	← ryez left	09:29
	→ otter768 joined	09:30
	← otter768_ left	09:30
	← fahadash left	09:31
	← cagedwisdom left	09:31
	→ otter768_ joined	09:32
	← daito left	09:32
	← synthmeat left	09:33
	→ tlaxkit joined	09:33
	← diogenese left	09:33
	→ synthmeat joined	09:33
	→ otter76__ joined	09:34
	← freimatz left	09:34
	← otter768 left	09:34
	→ Sleepy63 joined	09:35
	← JeroenT left	09:35
osse	Gottox: you can define your own "merge driver" for specific (or all) files. That's the best I can think of	09:35
	Gottox: ah, maybe you want the "union" built in merge driver. man gitattributes	09:35
gitinfo	Gottox: the gitattributes manpage is available at http://jk.gs/gitattributes.html	09:35
	→ otter768 joined	09:35
	← otter76__ left	09:35
	→ JeroenT joined	09:36
	→ csd_ joined	09:36
	← regedit left	09:36
	← otter768_ left	09:36
	→ dopesong joined	09:36
Gottox	osse: ah, thx! :)	09:37
	← AwchinBruh left	09:37
	→ otter768_ joined	09:37
	french-buget → fbwnd	09:38
	← dr_lepper left	09:38
	← demirgokhan left	09:38
	← kadoban left	09:39
	→ dr_lepper joined	09:39
	← otter768_ left	09:39
	→ otter76__ joined	09:39
	← otter768 left	09:40
	→ VespaQQ joined	09:40
	← dopesong left	09:41
	→ fbwnnd joined	09:41
	← otter76__ left	09:41
	← csd_ left	09:41
	→ otter768 joined	09:41
	← fbwnnd left	09:42
	→ alanwill joined	09:42
	← fbwnd left	09:42
	→ fbwnd joined	09:42
	→ twem2 joined	09:43
	→ otter768_ joined	09:43
	← otter768 left	09:43
	← Alienpruts left	09:45
	→ dopesong joined	09:45
	→ otter768 joined	09:45
	← JeroenT left	09:46
	→ fbwnnd joined	09:46
	→ acetakwas joined	09:46
	→ JeroenT joined	09:46
	← fbwnd left	09:46
	← fbwnnd left	09:46
	→ Alienpruts joined	09:47
	→ fbwnd joined	09:47
	→ otter76__ joined	09:47
	← otter768_ left	09:48
	→ chll joined	09:48
	→ otter768_ joined	09:49
	← otter76__ left	09:49
	→ variable joined	09:50
	← otter768 left	09:50
	→ tobeplugged joined	09:50
	← otter768_ left	09:51
	→ otter768 joined	09:51
	→ csd_ joined	09:52
	← variable left	09:52
	→ otter768_ joined	09:53
	→ samw joined	09:53
	← ensyde left	09:54
	→ otter76__ joined	09:55
	→ rubyonrailed joined	09:55
	← otter768 left	09:56
	← csd_ left	09:56
	→ otter768 joined	09:56
	← otter76__ left	09:57
	← otter768_ left	09:57
	← TomyWork left	09:57
	→ TomyWork joined	09:57
TomyWork	can one push to an ssh server without Git installed on the remote?	09:57
	← samw left	09:58
	→ otter768_ joined	09:58
grawity	only via sshfs, and that'll be much slower than a regular push (among other problems)	09:59
TomyWork	ok so not a good idea	09:59
	← BSaboia left	09:59
TomyWork	i'm trying to get someone to give me mirror storage and i want to reduce the requirements on their side to a minimum :)	10:00
grawity	it used to be a little more common with HTTP (via WebDAV), but git-http-backend has replaced it there as well	10:00
TomyWork	so far it's SSH, Git and some space	10:00
grawity	pushing via rsync is still supported to	10:00
	← rubyonrailed left	10:00
grawity	too*	10:00
	← otter768_ left	10:00
	→ otter768_ joined	10:01
grawity	but in the end, if you can get Git installed there (even manually compiled to ~/bin), it's better to do that	10:01
	← rkazak left	10:01
	← otter768 left	10:01
	← acetakwas left	10:01
	→ otter768 joined	10:02
	← otter768_ left	10:02
	→ diogenese joined	10:04
	→ otter768_ joined	10:04
	← otter768 left	10:04
	← [Brain] left	10:04
	→ acetakwas joined	10:05
	← otter768_ left	10:05
	→ otter768 joined	10:06
	→ dimi1947 joined	10:06
	← otter768 left	10:08
	← asd6a left	10:08
	→ otter768 joined	10:08
	← The-Compiler left	10:08
	→ dodoododo joined	10:08
	→ asd6a joined	10:08
	→ roxlu joined	10:09
	← roxlu left	10:09
	→ ochorocho joined	10:09
	→ otter768_ joined	10:10
	→ FrameFever joined	10:10
	← Shentino left	10:10
FrameFever	can I merge a branch, without all the commits in the branch?	10:10
	→ ryez joined	10:11
	→ AwchinBruh joined	10:11
osse	FrameFever: merge --squash	10:11
	← otter768_ left	10:11
	→ otter768_ joined	10:12
FrameFever	osse: I didn't found an docu to it	10:12
	I have made 100 commit in my branch	10:12
	← otter768 left	10:13
	← Gottox left	10:13
FrameFever	and I wan to merge basically only the last commit to the master branch	10:13
	→ Shentino joined	10:13
jast	then you can't use merge, but you can use 'git cherry-pick' which applies (copies) individual commits	10:13
	← ochorocho left	10:13
	← mykespb left	10:13
	→ otter768 joined	10:14
	← otter768_ left	10:14
	→ szblcs joined	10:15
	gitinfo set mode: +v	10:15
szblcs	hello	10:15
gitinfo	szblcs: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	10:15
	← otter768 left	10:16
	→ otter768_ joined	10:16
FrameFever	jast: do you have a command for me?	10:16
	← staafl left	10:16
osse	I have a feeling this is a job for merge --squash. Do the 99 other commits accomplish nothing?	10:16
	Don't the 100th commit depend on them ?	10:16
	← JeroenT left	10:17
	→ DARSCODE joined	10:17
	← otter768_ left	10:17
	→ harish_ joined	10:17
szblcs	Please help me with Git, I'm a n00b. I've got a site running on Joomla! 3.4.7. And I have an older (J2.5) copy of this site in GitLab. The new J3.4.7 is not in GitLab. How do I update the GitLab repository with the new J3.4.7 site?	10:17
	→ otter768 joined	10:17
szblcs	I know the very basics: SSH key is configured and I'm more than familiar with CLI. I'm just not familiar with version controlling and Git.	10:18
	→ JeroenT joined	10:19
	← otter768 left	10:19
FrameFever	jast: I am on master now	10:19
	→ mischat joined	10:19
FrameFever	git cherry-pick 6bfd4cd => error: could not apply 6bfd4cd...	10:19
	← happy-dude left	10:19
osse	then you need the 99 other	10:19
	→ otter768 joined	10:19
	← acetakwas left	10:20
osse	git cherry-pick --abort; git merge --squash 6bfd4cd	10:20
FrameFever	mhm looks good	10:21
	→ goTAN joined	10:21
	→ otter768_ joined	10:21
	← otter768 left	10:21
	← otter768_ left	10:23
	→ otter768 joined	10:23
	← goTAN left	10:24
	← aidalgol left	10:24
	→ otter768_ joined	10:25
mariuscc	I added in the past some images into git. I realized that it became too big and I've deleted them, but I think that didn't made the repository smaller ( and I kind of understand why )	10:26
	is there a way to regain that space ?	10:26
	← otter768 left	10:26
	← otter768_ left	10:27
	→ otter768 joined	10:27
	← dan2k3k4 left	10:28
	→ dan2k3k5 joined	10:28
	← otter768 left	10:28
	→ daito joined	10:29
	→ otter768 joined	10:29
	← _nadim left	10:30
	→ arup_r joined	10:30
	→ otter768_ joined	10:31
	→ Repox joined	10:31
	← otter768 left	10:31
	← AwchinBruh left	10:31
	→ s8321414 joined	10:32
	← frdmn left	10:32
	→ t0by joined	10:32
	→ AtnevRed joined	10:33
	← daito left	10:33
	→ frdmn joined	10:33
	← frdmn left	10:33
	→ frdmn joined	10:33
	→ junw joined	10:34
ryez	git gc	10:35
richard_maw	assuming you've already purged the history that contained those files	10:35
	if not you may want to look at filter branch or squash	10:35
	← otter768_ left	10:36
	← AtnevRed left	10:37
	→ Flyers joined	10:38
	← xaa left	10:39
ryez	ah, right, need to rewrite history and remove all references of those deleted files	10:39
	→ goTAN joined	10:40
	← Goplat left	10:42
	← FrameFever left	10:42
	→ weox joined	10:42
weox	I used to have socks4 proxy, right now I don't have any proxy. but I am getting "Failed to receive SOCKS4 connect request ack", and there is no proxy related config in my .git config. how can I fix this?	10:43
	→ AwchinBruh joined	10:43
	← ryez left	10:44
canton7	weox, checked both ~/.gitconfig and .git/config? Are you using ssh or https?	10:44
weox	canton7: nothing! I am sure I don't have any proxy setting. (I used to have)	10:45
canton7	Are you using ssh or https?	10:45
	presumably https?	10:45
	check for any curl config files	10:46
weox	I am using "go get" command which at the end I think it uses https . okay let me check curlrc	10:46
	← HanClinto left	10:46
	← dimi1947 left	10:46
	→ dimi1947 joined	10:47
	← blckbit10 left	10:48
	→ blckbit10 joined	10:48
	→ BSaboia joined	10:49
weox	canton7: nothing , I noticed it's not only working when I am using https.	10:50
canton7	"not only working" = does work with https, or doesn't? :P	10:50
	→ nitesh` joined	10:51
	← tobeplugged left	10:51
	← peoliye left	10:52
	← clmsy left	10:52
	→ HNY_ joined	10:53
weox	canton7: it does not work only with https (sorry for the delay) .	10:54
canton7	ok, so only https is broken? that suggests it is something curl-y	10:54
	can you request anything at all using curl?	10:55
weox	canton7: exactly	10:55
	→ lss joined	10:55
	← lss left	10:55
weox	I have to try , I use aria and axel for my downloads all the time , I am not so familiar with curl	10:55
canton7	also, anything in your env?	10:55
	← berndj left	10:56
	← g00se_ left	10:56
	→ acetakwas joined	10:57
	→ berndj joined	10:58
	← berndj left	10:58
	→ berndj joined	11:00
	← berndj left	11:00
	→ berndj joined	11:00
	→ phrozensilver joined	11:00
TomyWork	grawity thanks for the info	11:01
weox	canton7: curl does work perfectly , I used $curl URL -o tem_file	11:02
	canton7: start downloading without any problem	11:02
TomyWork	is it possible to restrict the bandwidth of a push maybe? so far the best idea i have is having a GIT_SSH that does some rate limiting or connecting to a local socket that's proxied via socat with a rate limit, if socat supports that	11:03
PCatinean	I made a pull and a file of mine is very outdated and the changes from upstream are all that I need	11:03
	I do not want to manually delete ALL changes loally and leave the HEAD changes	11:03
	isn't there like a fast command for that?	11:03
TomyWork	git reset --hard	11:03
	← pozitrono left	11:03
TomyWork	if you're referring to your local HEAD	11:03
canton7	weox, weird. fun. anything in your env?	11:04
weox	canton7: nothing related to http_proxy or curl_ proxy or anything related .	11:04
	→ LBV_User joined	11:05
	→ lss joined	11:05
TomyWork	http://linux.die.net/man/1/throttle hah!	11:05
	← phrozensilver left	11:07
PCatinean	TomyWork, for just one file?	11:07
	One I want to manually merge by solving the conflict the other I just want to leave everything from upstream	11:08
	Not sure if it works with git reset --hard	11:08
TomyWork	PCatinean git checkout -- filename	11:08
	← ThomasLocke left	11:09
PCatinean	what's the --?	11:09
TomyWork	separator between two types of arguments	11:09
	not filenames and filenames	11:09
	in this case	11:09
	← BSaboia left	11:10
PCatinean	It worked for the first file but for the second it says it is unmerged	11:10
	→ Jackneill joined	11:11
weox	My git does not work , not at all , does not let me to clone any repo with https . and I get "Failed to receive SOCKS4 connect request ack." for every cloen on every https repo I have tried .	11:12
TomyWork	PCatinean so merge it and then git add it	11:12
PCatinean	Ok this one I actually needed to merge manually	11:12
TomyWork	or "merge" it :)	11:12
PCatinean	but for the ones where I want to disregard everything, I assume it should work every time	11:13
guardian	which page of the man should I read to get a full description of the refspec format please?	11:13
canton7	man git rev-parse I think?	11:13
gitinfo	the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html	11:13
TomyWork	PCatinean this sounds less and less like a merge	11:13
	→ stevenm joined	11:13
PCatinean	a rebase	11:13
TomyWork	so you're using git rebase?	11:13
PCatinean	Where a few files need to be disregarded	11:13
	yes	11:13
TomyWork	or are you just calling it a rebase? :)	11:13
	"git rebase --skip" skips an entire commit, if that helps you	11:14
	← dimi1947 left	11:14
stevenm	Hey I've been asked to set up RANCID -- it's this thing that pulls configs from routers/switches via telnet/ssh and dumps them in to either CVS or SVN... but I'd much rather use Git. Is there some handy proxy from CVS or SVN to Git which I can use? (it needs only to be one direction)	11:14
	→ kesenai joined	11:15
	← synthmeat left	11:15
grawity	routers → RANCID → SVN → `git svn` → Git	11:15
canton7	(there are gotchas. two 'git svn clones' of an svn repo won't be identical, for example)	11:15
grawity	people can just `git clone` the central git-svn clone, though	11:16
	← JeroenT left	11:16
stevenm	hmm I was hoping not really to have an actual SVN set up - i.e. not clone/duplicate in two places	11:16
	just have SVN proxy to Git	11:16
grawity	hmm	11:16
stevenm	essentially translate the very basic requests it'll have to push things in	11:16
grawity	if you can host the repo on Github, they support SVN access	11:17
stevenm	nah this is internal - we're an ISP, putting it on Github might be very bad :)	11:17
grawity	I'm not sure if their bridge is open-source though	11:17
	→ codeman joined	11:17
grawity	make it a private repo >_> :D	11:17
ohcibi	alias 'svn commit'='git add . && git commit && git push'	11:17
grawity	hmm actually	11:17
	Git itself has (or used to have) a CVS bridge	11:17
	→ synthmeat joined	11:17
grawity	man git cvsserver	11:18
gitinfo	the git-cvsserver manpage is available at http://jk.gs/git-cvsserver.html	11:18
grawity	I kinda feel like it'd be easier to trick RANCID into running git commands though	11:18
stevenm	ooh that looks good - there is actually far more people using RANCID with CVS anyway... barely anyone uses it with SVN	11:18
	→ alexander__b joined	11:18
	← alexander__b left	11:19
	→ alexander__b joined	11:19
	alexander__b → bernalex	11:19
grawity	https://github.com/dotwaffle/rancid-git	11:19
	(https://dotwaffle.github.io/rancid-git/)	11:19
	← inamoriti left	11:19
PCatinean	Now it says resolve all conflicts then git rebase --continue but git status shows only untracked files, nothing else	11:20
	← synthmeat left	11:20
	← acetakwas left	11:20
stevenm	grawity, looks promising - but my gut would just feel better using the official version from shrubbery which is packed in debian	11:21
	→ synthmeat joined	11:21
stevenm	grawity, you never know when something like that project might get abandoned in the future	11:21
	← berndj left	11:21
	← synthmeat left	11:21
	→ berndj joined	11:21
	→ ryez joined	11:22
	← Nikoli left	11:23
	→ King_Hual joined	11:23
	→ stamina joined	11:23
	← berndj left	11:23
	→ berndj joined	11:23
	→ synthmeat joined	11:24
	← berndj left	11:25
	→ mellernoia joined	11:25
	→ berndj joined	11:25
	← Klawsy left	11:27
TomyWork	a private repo is still in the cloud. dont put your customer data in the cloud if you can help it	11:28
	← PCatinean left	11:28
stevenm	TomyWork, I was never even considering it :)	11:28
	→ leksster joined	11:29
	← s00pcan left	11:29
	→ [Brain] joined	11:29
	→ daito joined	11:29
	← berndj left	11:30
	→ berndj joined	11:30
	→ s00pcan joined	11:30
	→ freimatz joined	11:33
	→ Nikoli joined	11:34
	← daito left	11:34
	→ tobeplugged joined	11:35
	→ Macaveli joined	11:37
	← t0by left	11:40
	← Nikoli left	11:40
	→ Nikoli joined	11:42
	→ rubyonrailed joined	11:44
	← zeroed left	11:45
	← dsdeiz left	11:46
	← rubyonrailed left	11:48
	← cvanball left	11:49
	→ zeroed joined	11:49
	← zeroed left	11:49
	→ zeroed joined	11:49
	→ wrilain joined	11:51
guardian	canton7: ref-parse doesn't explain refspec. fetch man page tells a bit about it, the git book describes it but I wanted to know whether the manual did so as well	11:52
canton7	oops, mis-read you	11:52
guardian	s/ref-parse/rev-parse	11:53
	→ circ-user-SrhUV joined	11:53
	→ JeroenT joined	11:53
canton7	I think the stuff in git-fetch might be it	11:54
	that's what git-config references, anyway	11:54
guardian	k	11:54
canton7	there's not much to say about them anyway	11:54
guardian	I'm exploring backuping git repositories with git fetch remote_url +refs/:refs/	11:55
	← JeroenT left	11:56
guardian	if I do that instead of starting over with git clone --mirror, are refs no longer existing on the remote removed locally?	11:56
	→ JeroenT joined	11:56
	← Manikandan left	11:56
	→ Ice_Strike joined	11:57
	← circ-user-SrhUV left	12:00
	→ Sendoushi joined	12:01
	→ _nadim joined	12:02
	→ samw joined	12:02
	← JeroenT left	12:02
	← fscala left	12:02
	→ csd_ joined	12:03
	→ fscala joined	12:05
	→ jost joined	12:06
	← samw left	12:06
	← csd_ left	12:07
	← arup_r left	12:09
	→ ochorocho joined	12:10
	→ fracting joined	12:10
	→ PCatinean joined	12:13
	← King_Hual left	12:13
	← ochorocho left	12:14
	← [UPA]Stefan left	12:14
	→ King_Hual joined	12:15
	← King_Hual left	12:15
	→ King_Hual joined	12:15
	← Ademan left	12:15
	← mahendra_ left	12:15
	← _nadim left	12:16
	→ Ademan joined	12:17
	gitinfo set mode: +v	12:17
	→ japro joined	12:17
	→ mizu_no_oto joined	12:18
japro	i'm trying to clone a repository that requires a password on a remote machine. and apparently git wants to ask for the password via some Gtk box? which fails since there x forwarding or so	12:19
	→ csd_ joined	12:19
japro	any way to have it ask for the password on the command line?	12:19
	→ arup_r joined	12:20
	→ toogley joined	12:20
japro	ah found it "unset SSH_ASKPASS" does the trick i found that first but misstyped the name	12:21
	→ Sonicbit joined	12:21
	→ JeroenT joined	12:22
	→ PortaLu joined	12:23
	← doebi left	12:24
	→ mahendra_ joined	12:24
	← csd_ left	12:24
	← Lucretia left	12:24
	← in3xes left	12:25
	→ jimi_ joined	12:25
	→ doebi joined	12:26
	→ jhasse joined	12:27
	← alanwill left	12:28
	→ alanwill joined	12:29
	→ daito joined	12:30
	→ diegoviola joined	12:30
	→ talin joined	12:30
talin	hello. if i git mv a dir, do i need to git add all files contained within the dir i rename?	12:31
	→ dsdeiz joined	12:31
	→ otter768 joined	12:32
	→ netcarver joined	12:32
	PortaLu → Lucretia	12:33
	→ Calrik joined	12:33
	← Calrik left	12:33
	→ AtnevRed joined	12:33
	← jimi_ left	12:34
	← duderonomy left	12:34
	← encod3 left	12:35
	← daito left	12:35
	→ encod3 joined	12:35
	→ Bennux joined	12:35
	← Sceorem left	12:36
	← otter768 left	12:37
	← AtnevRed left	12:38
	← yohnnyjoe left	12:39
	→ Sceorem joined	12:40
	→ _nadim joined	12:40
	→ sjohnsen joined	12:41
	← sjohnsen left	12:41
	← dopesong left	12:42
	→ dopesong joined	12:42
	← dopesong left	12:42
	→ dopesong joined	12:43
	→ Ceber joined	12:45
	← netcarver left	12:45
	← skcin7 left	12:47
	← szblcs left	12:49
	gitinfo set mode: +v	12:50
HNY_	.	12:50
Zarthus	Good point.	12:50
	← bongjovi left	12:50
	→ jost_ joined	12:53
	→ tvw joined	12:54
	→ golum joined	12:54
golum	Hello	12:54
gitinfo	golum: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	12:54
golum	how could i remove certain commit that i see in "git status" ?	12:55
	→ aapaal joined	12:55
	← Hounddog left	12:55
	→ Hounddog joined	12:55
	← diegoviola left	12:56
	← jost left	12:56
	→ diego2 joined	12:56
	← HNY_ left	12:57
osse	you don't see commits in git status. can you clarify?	12:57
	← goTAN left	12:57
	→ utanapischti joined	12:58
	→ m8 joined	12:58
	→ goTAN joined	12:58
	← fstd left	12:59
	→ fstd joined	12:59
	← diego2 left	12:59
	→ diego2 joined	12:59
	← goTAN left	13:01
	← drawkula left	13:01
	→ drbean_ joined	13:02
	← a3Dman left	13:02
golum	osse, sorry for my explain	13:03
	in fact i see a lot of commit (before push) with git status command	13:03
	i want to delete certain commit, how can i do that ?	13:03
osse	do you mean it says you are "ahead of origin/master" or something like that?	13:04
	show the git status output	13:04
	← drbean left	13:04
	diego2 → diegoviola	13:05
	→ drbean joined	13:06
golum	osse, it is a french return, but ok	13:06
	Sur la branche master	13:06
	Votre branche est à jour avec 'origin/master'.	13:06
	Modifications qui seront validées :	13:06
	(utilisez "git reset HEAD <fichier>..." pour désindexer)	13:06
	nouveau fichier : ../puppet/modules/kafka/files/check_isr_kafka	13:06
	nouveau fichier : ../puppet/modules/kafka/files/check_isr_kafka.cfg	13:06
	modifié : ../puppet/modules/kafka/manifests/init.pp	13:06
	modifié : ../puppet/modules/nagios/files/conf.d/commands_nagios2.cfg	13:06
	supprimé : mongo_control_primary.sh	13:06
	nouveau fichier : monitor_kafka_isr.sh	13:06
	→ a3Dman joined	13:06
golum	before push it, i want to remove "modifié : ../puppet/modules/kafka/manifests/init.pp"	13:07
osse	je parle französisch	13:07
golum	osse, you understand ?	13:07
osse	yes	13:07
golum	lol	13:07
	← drbean_ left	13:07
golum	:)	13:07
	→ rwb joined	13:07
osse	utilisez "git reset HEAD <fichier>..." pour désindexer	13:07
	that's the clue	13:07
	git reset HEAD ./puppet/modules/kafka/manifests/init.pp	13:07
	← _nadim left	13:08
osse	oops	13:08
	git reset HEAD ../puppet/modules/kafka/manifests/init.pp	13:08
	← fees left	13:09
golum	osse, thankyou very much	13:10
	→ ochorocho joined	13:11
	→ dimi1947 joined	13:11
osse	de rien	13:11
	← Bennux left	13:11
	→ sdothum joined	13:12
	→ noteness joined	13:13
golum	osse, how to remove a file and push it ?	13:13
	the best way ?	13:13
osse	git rm file; git commit -m 'Remove a file'; git push	13:13
	← noteness left	13:13
	→ roygbiv joined	13:14
	→ synthroid joined	13:14
qsx	golum: just for the record: in future, prepend e.g. LANG=en_US.UTF-8 or so to make it english, and !paste	13:14
gitinfo	golum: Please use a pastebin for snippers longer than one line. https://gist.github.com and https://vomitb.in both work well.	13:14
	← ochorocho left	13:15
osse	ah, good idea	13:15
	← Tee_Pee left	13:16
	← emmajane left	13:16
	← dopesong left	13:17
	← kesenai left	13:17
	← memoryleak left	13:17
	← andyr left	13:17
	← aalawlx left	13:17
	→ dopesong joined	13:17
	← encod3 left	13:17
	→ aalawlx joined	13:17
	← Zoddo left	13:17
	← ashka left	13:17
	→ andyr joined	13:18
	← jhasse left	13:18
	→ encod3 joined	13:18
	← Cerise left	13:18
	← sleezd left	13:18
	← AivarasK left	13:18
	← GingerGeek_ left	13:18
	→ jhasse joined	13:18
	← ruduran left	13:19
	→ ashka joined	13:19
	← vigilvindex left	13:19
	→ ruduran joined	13:20
	→ vigilvindex joined	13:20
	→ sleezd joined	13:20
	→ GingerGeek joined	13:20
	← GingerGeek left	13:20
	→ GingerGeek joined	13:20
	→ kesenai joined	13:21
	→ AivarasK joined	13:21
	← jeffreylevesque left	13:21
	→ bongjovi joined	13:21
	→ Zoddo joined	13:21
	← stamina left	13:22
	→ mischat_ joined	13:22
	← mischat left	13:25
	→ jsparks joined	13:28
	← mizu_no_oto left	13:29
	→ fees joined	13:29
	→ sgambino joined	13:30
	→ MarkyC joined	13:31
	→ daito joined	13:31
torbjorn	im trying to pull from git://anongit.freedesktop.org/drm-intel , but I keep getting merge conflicts. why is that, can't i just pull in whatever is on that repo without having to worry? im not doing local comits, and im not editing any of the files, if so ill gladly discard anything i do locally	13:33
	→ littlebit joined	13:34
bremner	torbjorn: sounds like you don't want pull, but fetch (or fetch+reset)	13:35
torbjorn	possibly	13:35
	← daito left	13:35
torbjorn	whats the difference here	13:36
	← King_Hual left	13:36
	← mischat_ left	13:36
	→ mischat joined	13:37
	→ King_Hual joined	13:38
	← King_Hual left	13:38
	→ King_Hual joined	13:38
	→ gtzht joined	13:38
torbjorn	anayway, now it says i have diverged, how can i just make it so that my local dir is what is on the central repo?	13:38
	← jsparks left	13:38
	→ knownasilya joined	13:38
	→ feliwir_ joined	13:39
	← gtzht left	13:40
	→ jeffreylevesque joined	13:40
	→ ehynds joined	13:40
	→ faedw joined	13:42
	← jhasse left	13:42
	→ mkoskar joined	13:42
	→ jeffreylevesque_ joined	13:42
	→ paulweb515 joined	13:43
	→ govg joined	13:44
	← lolmac left	13:44
	← rpdprd left	13:44
	← tobeplugged left	13:44
	→ ajf- joined	13:45
	← jeffreylevesque left	13:45
	→ dstarh joined	13:46
	→ rpdprd joined	13:49
	← BlaXpirit left	13:49
	← rpdprd left	13:49
	→ sanketdg joined	13:49
	→ frank__ joined	13:54
	← frank__ left	13:54
	← Macaveli left	13:55
	→ strozyka joined	13:55
	→ Macaveli joined	13:55
	← s8321414 left	13:56
	→ Guest26366 joined	13:58
	← faedw left	13:58
	← ash_workz left	13:58
	← Guest26366 left	13:58
	← [Brain] left	13:58
	→ _nadim joined	13:59
	→ Anderson69s joined	13:59
	← tobiasvl left	13:59
	→ algae joined	13:59
	→ zivester joined	14:00
	→ showaz joined	14:01
	← settermjd left	14:01
	← logikos left	14:02
	← link0802 left	14:03
	← aapaal left	14:03
	→ incredible joined	14:04
	← Peng left	14:04
	→ Peng joined	14:04
	→ GT joined	14:04
	← roelmonnens left	14:05
	← dsdeiz left	14:05
	→ charlieWONG joined	14:05
	→ MattMaker joined	14:09
	→ codedmart joined	14:10
	← Peng left	14:10
	→ krawchyk joined	14:11
	← roygbiv left	14:11
	→ HanClinto joined	14:12
	→ rpdprd joined	14:13
	→ noteness joined	14:13
	← MattMaker left	14:13
	→ roelmonnens joined	14:13
	← charlieWONG left	14:13
	← dserodio left	14:13
	→ dserodio joined	14:14
	→ charlieWONG joined	14:15
	→ regedit joined	14:15
	→ jimi_ joined	14:16
	→ rsmarshall joined	14:17
	← dserodio left	14:19
	→ dserodio joined	14:21
	← fbwnd left	14:21
	← charlieWONG left	14:22
	→ charlieWONG joined	14:23
	← ajf- left	14:23
	→ Peng joined	14:23
	← abs25 left	14:24
	→ InfoTest joined	14:24
	→ Gamecubic joined	14:24
	← dopesong left	14:25
	→ t0by joined	14:25
	→ dopesong joined	14:26
	→ Chilley_ joined	14:26
	← charlieWONG left	14:26
	← bannakaffalatta left	14:26
	→ charlieWONG joined	14:26
	→ NJ1996 joined	14:27
	→ happy-dude joined	14:27
	→ mohammed64 joined	14:27
	← strozyka left	14:28
	← mohammed64 left	14:28
	← cmoneylulz left	14:28
	→ BlaXpirit joined	14:28
	→ cmoneylulz joined	14:28
	← charlieWONG left	14:29
	→ charlieWONG joined	14:29
	→ mohammed64 joined	14:30
	→ rubyonrailed joined	14:30
	→ Ed_141541 joined	14:30
	→ zotherstupidguy joined	14:30
	← charlieWONG left	14:31
	← sulky left	14:31
	→ charlieWONG joined	14:31
	← elementalest left	14:31
	→ BigWillie joined	14:31
	→ mezod joined	14:31
	→ daito joined	14:32
	← charlieWONG left	14:32
	→ charlieWONG joined	14:32
	→ Vgr_ joined	14:32
	→ otter768 joined	14:32
	← Vgr left	14:33
	→ sulky joined	14:33
	→ Gsham joined	14:34
	→ fbwnd joined	14:34
	→ AtnevRed joined	14:35
	← charlieWONG left	14:35
	→ charlieWONG joined	14:36
	← rubyonrailed left	14:36
	← rwb left	14:36
	← daito left	14:36
	→ buffal0 joined	14:37
	← otter768 left	14:38
	→ absk007 joined	14:38
	← absk007 left	14:38
	→ absk007 joined	14:39
	← AtnevRed left	14:39
	← absk007 left	14:40
jimi_	I think my workflow might be off. I am using continuous integration environment to deploy source code on push to the development branch upstream to a QA environment. I am running the affected files in git through a linter in php and making sure it adheres to code standards, etc and if it doesn't, then the files aren't sent to the QA server for that commit. If they do pass, they are rsync'd to the QA webroot, and everything is fine. However, if there is a fa	14:40
	iling commit and then a passing one, everything is rsync'd on the pass anyhow.... so how should i handle this? should we switch to pull requests?	14:40
	→ pozitron joined	14:40
	← charlieWONG left	14:40
	→ absk007 joined	14:40
	→ charlieWONG joined	14:40
moritz	jimi_: the typical approach is to use quality gating like tests: if they fail, the deployment stops	14:41
jimi_	moritz, we are running unit testing as well, but also checking with phpcs that it adheres to a coding standard like PRS2 etc	14:41
	utanapischti → drawkula	14:41
	← absk007 left	14:41
	← charlieWONG left	14:41
	→ mbrzuzy joined	14:41
moritz	jimi_: so, treat the two the same: if either fails, don't deploy	14:41
	→ absk007 joined	14:42
	← PCatinean left	14:42
	→ leeN joined	14:42
moritz	jimi_: it's the only way to make developers pay attention to them	14:42
	→ chitopunk joined	14:42
moritz	(shameless plug: I'm writing a book on automating deployments: http://perlgeek.de/en/book/automating-deployments )	14:42
	→ a3Dman_ joined	14:42
jimi_	moritz, yeah, i am only running the coding standards against the files that were modified in that commit though, so the 2nd commit if its fine, acts like all is fine and thats not what i want.... but i also don't want to run the coding standards against the entire code set, as I'm trying to apply it to legacy code	14:42
	← absk007 left	14:43
	jimi_ clicks the link	14:43
	← a3Dman left	14:43
	→ absk007 joined	14:43
	← jbondhus left	14:43
	← rxo left	14:43
moritz	jimi_: try running them against all the files that were changed since the last successful quality check	14:44
	← absk007 left	14:44
jimi_	moritz, thanks, thats a good idea. i will look into that, to see if there is a way to keep track of that in jenkins and using git history/diff logs	14:44
	→ absk007 joined	14:45
	→ daivyk joined	14:45
moritz	jimi_: (re link) there's nothing on there for your specific problem, but maybe the general direction is interesting to you?	14:45
	→ rxo joined	14:45
	→ jbondhus joined	14:45
jimi_	reading it now	14:45
	← absk007 left	14:46
	→ crayon joined	14:46
jimi_	Would pull requests solve this issue? like everyone worked in their own branch, and then when ready to commit they did it as a pull request that could run unit tests and listing and if it failed, reject it	14:46
	linting*	14:46
	→ elementalest joined	14:46
	→ strozyka joined	14:46
moritz	jimi_: sounds like a viable approach, yes	14:46
	← elementalest left	14:46
	→ elementalest joined	14:46
	→ AaronMT joined	14:47
	← CussBot left	14:47
	→ CussBot joined	14:47
	← InfoTest left	14:47
	→ mellernoia-work joined	14:48
	← mellernoia left	14:48
	→ lindenle joined	14:48
	← Macaveli left	14:49
	← lindenle left	14:49
	← dslevin_ left	14:50
	→ BillCriswell joined	14:51
	→ rwb joined	14:51
	→ lindenle joined	14:51
	→ kpease joined	14:52
	← NJ1996 left	14:52
jimi_	moritz, thanks. I'm going to investigate those options and also talk to the #jenkins guys and see if they have some thoughts.... maybe just sync only the files from the passing commits etc	14:53
	← dopesong left	14:54
	← theskillwithin left	14:54
torbjorn	bremner: if i want my local branch to reflect the changes in the remote branch, won't i have to merge?	14:54
	a3Dman_ → a3Dman	14:54
	→ Es0teric joined	14:55
torbjorn	like i said, i just want my local copy to be what is on the branch im tracking centrally	14:56
	→ dopesong joined	14:56
moritz	jimi_: the only working approach (IMHO) is having a branch that's only built when stuff is clean; then either make a policy to clean it up immediately if it starts to fail, or to check everything for cleanliness before it goes in	14:56
	← BlaXpirit left	14:56
torbjorn	nm think i got it	14:57
	← glebihan_ left	14:59
	→ BlaXpirit joined	14:59
	→ phrozensilver joined	14:59
	← BlaXpirit left	15:00
	→ Wetmelon joined	15:00
	→ BlaXpirit joined	15:01
	← lindenle left	15:03
	→ settermjd joined	15:03
	→ [Brain] joined	15:03
	← leeN left	15:06
	← dopesong left	15:06
	→ bannakaffalatta joined	15:06
	→ lindenle joined	15:07
	→ drose joined	15:08
	→ Dougie187 joined	15:08
	→ leeN joined	15:08
	gitinfo set mode: +v	15:10
drose	Hi	15:10
gitinfo	drose: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:10
	→ CheckDavid joined	15:10
drose	I'm tasked at my company with moving to Git, from Subversion (yay!)	15:11
	→ ochorocho joined	15:11
drose	And I'd like to keep the commit history as far as is possible	15:11
	← Repox left	15:13
drose	The thing is, we've been using svn:externals somewhat extensively to have the (mostly) same code for diferent customers	15:13
	→ noname joined	15:13
	→ namiR joined	15:13
drose	But as part of the migration we realized that there's no need to do so.	15:13
	← Sonicbit left	15:13
	← rewt left	15:14
drose	So my question is how to migrate this best	15:14
	→ PCatinean joined	15:14
drose	Should I try removing the svn:externals in the subversion side, and then import into git	15:14
	or the other way around?	15:14
	← dan2k3k5 left	15:15
	→ dan2k3k4 joined	15:15
	← ochorocho left	15:15
	← codedmart left	15:15
	← mbrzuzy left	15:16
	← mischat left	15:17
	← kdehl left	15:17
	gitinfo set mode: +v	15:17
	→ mischat joined	15:17
	gitinfo set mode: +v	15:18
	← mischat left	15:18
	→ krawchyk_ joined	15:18
namiR	hi	15:18
gitinfo	namiR: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	15:18
	→ dopesong joined	15:18
	→ mischat joined	15:19
namiR	wt is the best git desktop client?	15:19
	→ nnyk_ joined	15:19
richard_maw	Linux	15:20
	richard_maw is only partially joking	15:20
	richard_maw finds the command-line with a good terminal emulator and window manager to be the best for development	15:20
Zarthus	I am personally am a fan of SmartGit when I don't use the terminal	15:21
	→ kdehl joined	15:21
	← krawchyk left	15:21
	← GT left	15:21
	← zivester left	15:21
Zarthus	SourceTree is also popular, and my fanboyism is based on the fact I hadn't used anything else.	15:21
	→ rubyonrailed joined	15:21
	→ zivester joined	15:22
	← phrozensilver left	15:22
namiR	i feel github desktop version GUI isn't user-friendly	15:23
	→ cbonobo joined	15:23
	← lindenle left	15:24
	→ InfoTest joined	15:25
	→ cvanball joined	15:25
	← JeroenT left	15:25
	→ mbrzuzy joined	15:25
	→ crose joined	15:26
	← rwb left	15:26
	← mezod left	15:26
	← arup_r left	15:27
	← toogley left	15:27
	→ rewt joined	15:29
	← namiR left	15:29
	← rscata left	15:30
	← zotherstupidguy left	15:30
	→ rwb joined	15:31
	← cmoneylulz left	15:31
	→ SomeRandom joined	15:32
	← mohammed64 left	15:32
	→ phaleth joined	15:32
	→ daito joined	15:32
	← skylite left	15:33
	← modin left	15:34
	→ csd_ joined	15:35
	← g105b left	15:35
	→ modin joined	15:35
	→ IlNominePatre joined	15:35
	→ Cassiopaya joined	15:35
	← ciampix left	15:36
	← daito left	15:37
	→ g105b joined	15:38
	← IlNominePatre left	15:38
	← Cassiopaya left	15:38
	→ roygbiv joined	15:38
	→ ciampix joined	15:38
	← zivester left	15:39
	← Yeomra left	15:39
	← bongjovi left	15:40
	→ acetakwas joined	15:40
roygbiv	hey all, i edited some files on my master branch, and realize now i really should have done this work in its own branch. can i keep my changes but somehow backpedal a little and create a new branch for them?	15:41
	← David1977 left	15:41
	→ JeroenT joined	15:41
	→ mrgrieves joined	15:42
qsx	roygbiv: if you have not comitted yet, !float	15:42
gitinfo	roygbiv: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	15:42
	→ bango2 joined	15:42
qsx	drose: i'd say get rid of the externals first and !svn2git then	15:43
gitinfo	drose: For a one-time conversion of SVN to git, svn2git should be used instead of git-svn. There are many tools with this name. Probably the best is the KDE one at https://github.com/svn-all-fast-export/svn2git. To analyze the SVN repo history upfront for building up proper rules for svn2git, you might use svneverever from here: http://blog.hartwork.org/?p=763	15:43
roygbiv	gitinfo, yes i’ve not yet commited them. thanks for the help!	15:43
gitinfo	roygbiv: you're welcome, but please note that I'm a bot. I'm not programmed to care.	15:43
roygbiv	gitinfo, you need an emotion chip	15:44
	they’re all the rage!	15:44
mrgrieves	hi, so when I do git log I have a commit that correspond to a Merge, how can I see the diffs of this merge?	15:44
qsx	roygbiv: PRs welcome at git:github:jast/gitinfo	15:44
gitinfo	roygbiv: Git web link: https://github.com/jast/gitinfo	15:44
drose	@qsx thanks. I've been reading up on git submodules vs. svn:externals, and it seems like a lot of work for something which i want to kill off anyway	15:45
qsx	mrgrieves: which diffs do you mean?	15:45
	← blueyed left	15:45
qsx	drose: there's a thumb rule whether you want submodules: you do not.	15:45
	→ blueyed joined	15:45
	← blueyed left	15:46
	→ blueyed joined	15:46
qsx	when you know what griefs they bring and can work around them, or just don't use them for what they were not intended, it's okay ... i use them in git:github:qsuscs/.dotfiles extensively	15:46
gitinfo	Git web link: https://github.com/qsuscs/.dotfiles	15:46
	← blueyed left	15:46
	← acetakwas left	15:46
	← joel_falcou left	15:46
	→ blueyed joined	15:46
	← Alienpruts left	15:47
	→ mischat_ joined	15:47
	← thiago left	15:47
	← incredible left	15:47
	→ arup_r joined	15:48
drose	so you suggest svn2git? according to the web, reposurgeon is also good	15:48
	→ mezod joined	15:49
qsx	yes. suggest, but not recommend ;)	15:49
	← mischat left	15:50
	→ mattp_ joined	15:50
	← JeroenT left	15:51
	→ bongjovi joined	15:51
	← mattp__ left	15:51
	← mkoskar left	15:51
	← modin left	15:52
	→ modin joined	15:53
	→ acetakwas joined	15:54
	← buffal0 left	15:54
	← wrilain left	15:56
mrgrieves	qsx: I mean like log -p output so I can see what changed	15:58
	← jay-m left	15:59
qsx	mrgrieves: yes, compared to what?	15:59
	Ceber → Tronsha	16:00
	→ jay-m joined	16:00
	→ codedmart joined	16:00
	→ Macaveli joined	16:02
	→ cerkauskas joined	16:02
	← freimatz left	16:02
	→ kilo_bravo joined	16:02
	→ achadwick joined	16:03
	→ rubyonra_ joined	16:04
mrgrieves	I see, to HEAD	16:04
	← acolson left	16:04
	← SOLDIERz left	16:06
	← roelmonnens left	16:06
	← regedit left	16:06
	→ Spacew00t joined	16:07
	← rubyonrailed left	16:07
	← catsup left	16:07
	← spacepluk left	16:07
	→ spacepluk joined	16:07
	← bongjovi left	16:07
	← rasto left	16:07
	← craigp left	16:09
	→ catsup joined	16:09
	← codedmart left	16:09
	← littlebit left	16:09
	→ dimi1979 joined	16:10
	← VespaQQ left	16:10
	← rewt left	16:10
	← guampa left	16:11
	← MarkyC left	16:11
	← thalleralexander left	16:13
	→ calamari joined	16:13
qsx	git diff $commitish..	16:13
	→ bongjovi joined	16:13
	← dimi1947 left	16:14
	→ rewt joined	16:14
	→ kadoban joined	16:15
	→ Rodya_ joined	16:15
	← noname left	16:15
	→ ochorocho joined	16:15
	← Macaveli left	16:16
	→ guampa joined	16:16
calamari	our team has been working on items in branches, then merging the branches into master once it has been decided to include the fix in the next release. this has been working great, until a fix failed QA testing and it was realized it needs months of work. In retrospect, it seems like maybe we shouldn't have merged it into master until after QA, but I'm curious if there are any best practices for this	16:16
	→ imachuchu joined	16:18
canton7	calamari, that's fine. just revert the merge commit that introduced the feature	16:18
	calamari, then later on, read "reverting a faulty merge", linked from man git-revert iirc	16:18
gitinfo	calamari: the git-revert manpage is available at http://jk.gs/git-revert.html	16:18
canton7	jast, the link to revert-a-faulty-merge How-To is broken on that page ^	16:19
calamari	canton7: I was curious about that, so I tried it experimentally. the problem was that when I then merged master into my personal branch, my code changes were reverted as well	16:19
canton7	calamari, don't have "personal branches"	16:19
calamari	which makes sense because the revert to master was a new commit	16:19
	→ MarkyC joined	16:19
calamari	canton7: the whole point of git is having your own branches	16:19
canton7	no, the point is to have feature branches	16:20
	one branch per feature, not one long-lived branch per person	16:20
calamari	thats what we qre doing	16:20
	*are	16:20
canton7	so what is your personal branch?	16:20
	← cvanball left	16:20
calamari	sorry I named it correctly	16:20
	forget I said personal branch and pretend I said feature branch	16:21
canton7	for which feature?	16:21
calamari	the feature that I'm working on	16:21
canton7	which feature are you working on? the one that failed QA, or another one?	16:21
calamari	I think of it as my personal branch because I'm the only one working on the feature	16:21
	let me start all over sorry	16:22
	I have a feature in branch feature_a. I merged it into master. I reverted the merge commit. I then merge master into feature_a, and feature_a loses all the changes I made	16:23
	→ mohammed64 joined	16:23
canton7	read https://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt	16:23
	← sbasso left	16:23
	← mohammed64 left	16:23
canton7	I think there's a bit on reverting reverts in there	16:24
mrgrieves	qsx: thanks! now, how can I do the diff between the commit and whatever was the HEAD just before the merge?	16:24
canton7	... but you probably want to merge master into feature_a, then revert the revert commit	16:24
	← LBV_User left	16:24
canton7	that will restore the feature, and mean that when it's next introduced into master, it will "take"	16:24
qsx	mrgrieves: $commitish^!	16:24
calamari	okay so there's a way to revert the revert, cool	16:24
canton7	yeah, just 'git revert' the commit that the previous 'git revert' created	16:25
	→ lindenle joined	16:25
	→ iateadonut joined	16:25
calamari	canton7: thank you, that's exactly what I needed to know	16:25
canton7	:)	16:25
	another option would be to rebase the feature back onto master	16:25
	(that doc talks about that as well)	16:26
mrgrieves	qsx: Bravo!	16:26
iateadonut	i started modifying an unmerged file. i want the original unmerged file back with <<<<< HEAD ===== and everything	16:26
mrgrieves	so what are the head + bang charaters doing here?	16:26
	← neurodrone_ left	16:27
osse	iateadonut: git checkout --merge file	16:27
	← johan_sun left	16:27
osse	mrgrieves: man gitrevisions	16:28
gitinfo	mrgrieves: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html	16:28
osse	mrgrieves: it's shorthand	16:28
	→ johan_sun joined	16:28
	← drose left	16:28
	→ neurodrone_ joined	16:29
	← lindenle left	16:29
	→ cvanball joined	16:31
	← dodoododo left	16:31
	→ zivester joined	16:31
	→ lindenle joined	16:31
	← JanC left	16:31
	← TomyWork left	16:32
	→ daito joined	16:33
	→ otter768 joined	16:33
	← BigWillie left	16:34
	← thierryp left	16:34
	→ amdi_ joined	16:34
	→ \|nodux joined	16:35
	← dimi1979 left	16:35
	← lindenle left	16:36
	← acetakwas left	16:36
	→ thalleralexander joined	16:36
richard_maw	weird, unless I specify --no-tags, it doesn't just consider objects that it downloaded to opportunistically create refs for, it also creates refs for commits that I have left danging in my object store	16:36
	→ littlebit joined	16:37
	← bonswouar left	16:37
	← daito left	16:38
	← otter768 left	16:38
	← littlebit left	16:39
richard_maw	looks like I'll have to manually purge my object store if the set of tags I care about changes, otherwise the next fetch will anchor them again and I'll never be rid of the objects	16:39
	→ LBV_User joined	16:39
richard_maw	or just remember to always set --no-tags	16:39
	← CausaMortis left	16:40
	→ littlebi1 joined	16:40
	← madewokherd left	16:40
	← thalleralexander left	16:41
	→ thalleralexander joined	16:42
	← PCatinean left	16:42
	← littlebi1 left	16:42
	← japro left	16:43
	→ raijin joined	16:44
	→ wrilain joined	16:44
	← mbrzuzy left	16:44
	← harish_ left	16:44
	← Gsham left	16:45
	→ JanC joined	16:46
	→ akushner joined	16:47
	→ user_ joined	16:47
	← user_ left	16:47
	← rubyonra_ left	16:47
	← synthroid left	16:49
	→ Toooooth12 joined	16:51
	→ Iexs joined	16:51
	→ Gsham joined	16:52
	← rsmarshall left	16:52
	← Ed_141541 left	16:52
	→ littlebit joined	16:53
	← mischat_ left	16:53
	→ frankie64 joined	16:53
	→ mischat joined	16:54
	← bannakaffalatta left	16:54
	→ codedmart joined	16:54
littlebit	hi poeple, I have the following git-log-tree http://pastebin.com/z3KSXVWx and i would like to delete the merge commit '2793c45', how can I do that safely?	16:54
_ikke_	littlebit: And what do you want the end result to be?	16:54
	Just as if the merge never happened?	16:54
littlebit	_ikke_: yes, so that the git log tree would look like a fork	16:55
	_ikke_: the merge i did was too early	16:55
	← Balliad left	16:55
	← nilg left	16:56
	→ mbrzuzy joined	16:56
	← wrilain left	16:56
	← Iexs left	16:56
	→ shuaib joined	16:57
	→ harish_ joined	16:57
_ikke_	git reset --hard HEAD~1 should do	16:57
	→ ilmgb_ joined	16:57
_ikke_	if you are on the merge commit now that is	16:57
littlebit	_ikke_: and at what commit should I be before executing that command?	16:58
	→ dslevin_ joined	16:59
	→ hobodave joined	16:59
_ikke_	littlebit: The branch that points to 2793c45	16:59
	→ krawchyk joined	17:00
	→ NateAGeek joined	17:00
	→ wrilain joined	17:00
	← krawchyk left	17:00
	gitinfo set mode: +v	17:00
frankie64	so here is a newbie question....I have a git server running on an ubuntu box and i was able to convert our main tree from cvs to git, and it all looks good, how can i check out files from my windows desktop from this git server running on .69	17:00
	← ilmgb left	17:00
	→ krawchyk joined	17:01
	← apiarian left	17:01
	← ilmgb_ left	17:02
_ikke_	How are you serving git? Through ssh, http, git-daemon?	17:02
	→ french-buget joined	17:02
	→ apiarian joined	17:02
	← french-buget left	17:02
	← krawchyk_ left	17:03
	→ french-buget joined	17:03
	← jnavila left	17:03
frankie64	_ikke_: not sure, i have the repo installed, but i am trying to figure out how to get the next step	17:03
	← french-buget left	17:03
	→ fbwnnd joined	17:03
	→ Oebele joined	17:04
_ikke_	Are you comfortable with ssh?	17:05
	→ dimi1947 joined	17:05
	← NeverDie left	17:06
	→ gaen joined	17:06
jast	canton7: the manpage are auto-updated from git iirc	17:06
	→ nnyk joined	17:06
frankie64	so would the following be the ways to serve it up? http://www.jedi.be/blog/2009/05/06/8-ways-to-share-your-git-repository/	17:07
	← tlaxkit left	17:07
	← fbwnnd left	17:07
	← bollullera left	17:08
	→ fbwnnd joined	17:08
_ikke_	frankie64: Yes, but it conflates hosted services with protocols	17:08
	But it covers the basic options	17:08
	But gitolite is missing	17:08
	→ Karkus joined	17:08
	→ madewokherd joined	17:08
_ikke_	which is an authorization layer on top of ssh	17:08
	← kfunk left	17:09
	← nnyk_ left	17:09
	→ toogley joined	17:09
	→ MattMaker joined	17:10
canton7	jast, presumably you're not generating that how-to though?	17:10
	→ Ed_141541 joined	17:10
	← Gsham left	17:11
	← sdothum left	17:11
	→ samw joined	17:12
	→ thiago joined	17:12
	→ craigp joined	17:13
	→ bannakaffalatta joined	17:14
	→ duderonomy joined	17:14
	→ sdothum joined	17:14
	← MattMaker left	17:14
	← InfoTest left	17:14
	← jost_ left	17:15
	← Toooooth12 left	17:15
littlebit	another question, I made a branch at the wrong commit (it is a commit too late), how do I shift that branch to start one commit earlier?	17:15
	← dopesong left	17:15
	→ the_cybersphinx joined	17:15
	← tgies left	17:16
	← dan2k3k4 left	17:16
	gitinfo set mode: +v	17:16
soerenb_	littlebit, git rebase <too late commit> --onto <too_late_commit>^	17:16
	soerenb_ → soerenb	17:16
kadoban	littlebit: You can rebase it. Or you mean you just did it and there's no added commits in it yet?	17:16
	← [Brain] left	17:17
kadoban	Well actually it'll probably work anyway, so my question is probably useless.	17:17
	→ postsneakernet joined	17:17
	→ rubyonrailed joined	17:17
littlebit	kadoban: this is my git tree http://pastebin.com/RpQdUJFv , I want the branch to start at 46730c5	17:18
maslen	I accidentally made code changes as two commits instead of one. How can I merge the two commits together?	17:18
_ikke_	littlebit: did you already undo that merge?	17:18
littlebit	_ikke_: yes	17:19
_ikke_	maslen: git reset --soft HEAD^ && git commit --amend	17:19
hide	I've been working on a large rebase, and I just accidentally hit ESC while doing conflict resolution which caused my tool to close and mark the file as resolved. How can I get back to it being unresolved and go back to fixing conflicts?	17:19
soerenb	maslen, git rebase --interactive HEAD~2 and then squash/fixup the second into the first	17:19
maslen	erm, which of those two should I be doing ?	17:20
soerenb	either	17:20
	→ Gsham joined	17:20
	← johnnyfive left	17:20
hide	normally I'd just: git rebase --abort and start again, but this rebase has been going on for days	17:20
	← varesa left	17:21
	→ shinnya joined	17:23
	→ Aboba joined	17:23
_ikke_	Hmm, good questing?	17:23
	good question*	17:23
	→ kfunk joined	17:24
hide	little deeper googling -- git checkout --conflict merge filename.txt	17:24
	→ synthroid joined	17:24
_ikke_	Does that work in this case?	17:24
	← Anderson69s left	17:24
hide	I've got the file back in a both modified state	17:24
_ikke_	Ok, good to know	17:24
	→ TomyLobo joined	17:25
_ikke_	I though that git add <file> (which you use to mark the conflict as solved), would remove all merge state	17:25
	→ David1977 joined	17:26
_ikke_	(I was just about the suggest that though)	17:26
	← Karkus left	17:27
hide	cool :) it's back in the state it was prior to my starting resolution, but that's better than restarting everything	17:27
	← Hounddog left	17:27
_ikke_	yup	17:27
	← ciampix left	17:28
	→ johnnyfive joined	17:28
maslen	_ikke_, soerenb: Thanks!	17:28
	→ aapaal joined	17:29
	← encod3 left	17:30
	→ benlieb joined	17:30
	→ noname joined	17:30
	← ochorocho left	17:31
	← craigp left	17:32
	→ craigp joined	17:32
maslen	I spent an hour playing around last night and wasn't able to squash the commits.	17:32
	← Sceorem left	17:32
	→ ilmgb joined	17:32
	ilmari notes there are no spectests for file times	17:33
	← mahendra_ left	17:34
	→ daito joined	17:34
	← mbrzuzy left	17:34
	→ ash_workz joined	17:35
	← raijin left	17:35
	→ hobodave_ joined	17:35
_ikke_	..	17:35
ilmari	at least not in spec/S32-io/file-tests.t	17:35
	← aapaal left	17:36
	← mischat left	17:36
ilmari	oh, it's in S16-filehandles/filestat.t	17:36
_ikke_	you are aware this is #git?	17:36
ilmari	of course	17:36
	oh,	17:36
	damn	17:36
	sorry, that was meant for #perl6	17:36
	← Rodya_ left	17:37
	← hobodave left	17:37
	← daito left	17:39
	← kurkale6ka left	17:39
	→ Uwfo joined	17:39
	← Uwfo left	17:39
	→ yqt joined	17:40
	← shuaib left	17:40
	→ jberkus joined	17:41
	→ varesa joined	17:41
jberkus	I need to clobber my local fork with upstream for one repo. What's the easiest way to do that? Other than deleting my fork entirely and starting over?	17:41
	→ subhojit777 joined	17:41
_ikke_	clobber?	17:41
osse	jberkus: fetch and reset --hard	17:41
	→ durham joined	17:42
jberkus	fetch from where? upstream?	17:42
	← mellernoia-work left	17:42
osse	yes	17:42
	durham → 21WAAP7FT	17:42
osse	_ikke_: https://www.youtube.com/watch?v=eg8DTgLhUdc	17:42
jberkus	aha, thanks	17:42
	→ dopesong joined	17:43
	→ mischat joined	17:43
	→ BigWillie joined	17:43
	← holodoc left	17:44
	→ jay-m1 joined	17:44
	← jay-m left	17:44
	jay-m1 → jay-m	17:44
	→ ascarter joined	17:45
	← littlebit left	17:45
	→ d4rklit3 joined	17:46
	← dopesong left	17:47
	← calamari left	17:48
	→ dopesong joined	17:48
	← ehynds left	17:49
	← craigp left	17:49
	→ Karkus joined	17:50
	→ craigp joined	17:51
	← Ed_141541 left	17:52
	→ debug0x1 joined	17:52
	→ phrozensilver joined	17:53
	← zeroed left	17:54
	← Gamecubic left	17:55
	→ lindenle joined	17:55
	→ Chilley- joined	17:56
	→ Chilley__ joined	17:56
	→ CausaMortis joined	17:57
	→ axl_ joined	17:57
	← Chilley left	17:57
	← krawchyk left	17:58
	← Chilley_ left	17:58
	← josuebrunel left	17:58
	← settermjd left	17:58
	→ troulouliou_div2 joined	17:59
qsx	osse: !pusher	17:59
gitinfo	osse: I am the pusher robot. I shove around the code. http://youtu.be/7E0ot9iJm_k?t=34s	17:59
	→ gopar joined	17:59
	← BigWillie left	18:00
ojacobson	master is protected, master has gone down the stairs	18:00
	→ BigWillie joined	18:00
	→ holodoc joined	18:01
	→ calamari joined	18:01
	→ Gamecubic joined	18:01
	← blackjid left	18:01
	→ Limes_ joined	18:02
	← zivester left	18:02
	← ash_workz left	18:02
	← jay-m left	18:03
	← ilmgb left	18:03
_ikke_	https://www.youtube.com/watch?v=kKO9h-gG4Qg	18:04
	→ blackjid joined	18:04
	→ DTekk joined	18:05
	→ aleksandar2810 joined	18:05
	→ nilg joined	18:06
	← nnyk left	18:06
	← nickthetait left	18:07
	← samw left	18:07
	← sarri left	18:07
qsx	why am i not surprised that the dutch one posts the most weird music	18:07
	... Seveas, your turn.	18:07
	← mischat left	18:07
	← rubyonrailed left	18:09
	→ sarri joined	18:10
	→ Sample joined	18:10
	→ ash_workz joined	18:10
	← pozitron left	18:11
	→ astrofog joined	18:11
_ikke_	"fasten your beltseats"	18:12
	→ blackwind_123 joined	18:12
	← lindenle left	18:13
	→ theverbg joined	18:13
	← theverbg left	18:14
	← iateadonut left	18:14
	→ lindenle joined	18:15
	→ alezandro joined	18:15
qsx	you mean, https://www.youtube.com/watch?v=bWXo8Ttwg8E?	18:15
	← irc-5225225 left	18:15
	← tubuliferous_ left	18:15
	→ zivester joined	18:16
	← crose left	18:16
	← ascarter left	18:16
	→ rubyonrailed joined	18:16
	→ nickthetait joined	18:16
	→ irc-5225225 joined	18:17
	← Chilley- left	18:18
	→ Slyde joined	18:18
	→ vdv joined	18:20
	→ tubuliferous_ joined	18:21
	→ encod3 joined	18:21
	← encod3 left	18:21
	→ encod3_ joined	18:21
	← calamari left	18:22
	→ glebihan_ joined	18:22
	→ samw joined	18:24
	← rominronin left	18:24
	← shinnya left	18:24
	→ bsanford joined	18:27
	→ t-mart joined	18:27
	← t-mart_ left	18:29
	→ crose joined	18:29
	← dreiss left	18:29
	→ ajf- joined	18:30
	← arup_r left	18:30
	→ krawchyk joined	18:30
	→ dasginganinja joined	18:30
	→ Gfurst joined	18:31
	→ whomp joined	18:31
Gfurst	hey peeps,	18:31
	← CausaMortis left	18:31
	← lindenle left	18:31
	← ajf- left	18:31
_ikke_	ahola	18:31
Eugene	Zlad isn't even that weird	18:32
Gfurst	lemme ask you, how do you clean up repo size? only way is to rewrite history?	18:32
osse	Vlad	18:32
	→ ajf- joined	18:32
	→ mahendra_ joined	18:33
	← kfunk left	18:33
	→ HelloAtMega joined	18:33
	← ajf- left	18:34
	→ calamari joined	18:34
	→ otter768 joined	18:34
	← Slyde left	18:34
	→ daito joined	18:35
	← zivester left	18:35
	→ ajf- joined	18:35
	→ AtnevRed joined	18:36
	→ lindenle joined	18:36
	→ n00bdev joined	18:37
	← n00bdev left	18:37
	→ reim joined	18:37
	← bsanford left	18:37
	→ zotherstupidguy joined	18:38
	→ rodarmor joined	18:38
	← subhojit777 left	18:39
	gitinfo set mode: +v	18:39
	← daito left	18:39
	← otter768 left	18:39
	→ bsanford joined	18:40
dasginganinja	I just inherited a project that had no repository. In the document root I just ran `git init` and then `git add .` and `git commit -a -m "initial commit"`. Some of the subfolders were cloned from other respositories originally and were evidently added as submodules in my new repository at the root. I've removed the .git folders from the subfolders since I just want to house the files, not the other repositories. How do I go about	18:40
	← cvanball left	18:40
dasginganinja	and add it in a normal folder?	18:40
	Thanks in advance.	18:40
	→ cvanball joined	18:41
	← AtnevRed left	18:41
	← yqt left	18:41
rodarmor	dasginganinja: I think your question was a little garbled, what's between "How do I go about" and "and add it in a normal folder?"?	18:41
	← troulouliou_div2 left	18:41
dasginganinja	How do I go about removing the existing "submodule" and add it in a normal folder?	18:42
	→ doener joined	18:42
Seveas	qsx: weird german music: https://www.youtube.com/watch?v=xd847TfxgCc	18:42
dasginganinja	thanks rodarmor	18:42
	I had a feeling that the interface was going to truncate my message.	18:42
rodarmor	dasginganinja: So you committed a .git folder in a subfolder, and now you'd like to undo that?	18:43
	← crose left	18:43
dasginganinja	root/sub/folder1/.git and root/sub/folder2/.git was the setup. I did `rm -rf root/sub/folder1/.git` but my git status isn't showing any changes.	18:44
	← dimi1947 left	18:44
	← Gsham left	18:44
Seveas	qsx: better german music: https://www.youtube.com/watch?v=B1XstCH4Ft8	18:45
dasginganinja	rodarmor: I'd like to have just the original folder structure committed to the root repository.	18:45
	← jberkus left	18:45
dasginganinja	rodarmor: not the submodule	18:45
rodarmor	I just tried it out, and I think that `git add .` will ignore the .git folders in subdirectories.	18:46
dasginganinja	I'm on Git 1.7.9.5 -- an older system.	18:46
	→ frem joined	18:46
rodarmor	dasginganinja: So I think you might be okay, and the reason that git isn't showing any changes when you rm -rf the sub .git folders is because they aren't actually committed.	18:46
	You can make sure by cloning the repo 'git clone root root-new' and making sure that the .git folders aren't in root-new	18:47
	dasginganinja: Ahh, okay, I'm on 2.5.4, so maybe the behavior is different.	18:47
	→ nour joined	18:48
	← fbwnnd left	18:48
dasginganinja	Ah alright. Thanks rodarmor	18:48
qsx	Seveas: needs it be christian music? :<	18:48
rodarmor	dasginganinja: You're very welcome ^_^	18:48
Seveas	qsx: yes. You need more god in your life, you sinner.	18:49
	→ zivester joined	18:49
qsx	i do still know the ave maria and our father by heart.	18:49
	welp. i know many things by heart.	18:49
Seveas	in german and latin?	18:49
qsx	nah, only german	18:49
dasginganinja	rodarmor: Simple: I just removed the root .git folder and the submodule git folders. I created a new root repo, deleted the existing one in bitbucket, and then pushed it all back up. It's good now. Thanks again	18:50
qsx	i'd love to have learnt latin, but french seemed more useful to me.	18:50
Seveas	I used to know it. We recited it before every dinner	18:50
qsx	LOL	18:50
	→ Gsham joined	18:50
Seveas	back when my parents thought religion was important :)	18:50
	← tvw left	18:51
Seveas	(dutch only though, no latin)	18:51
qsx	heh.	18:51
	i remember when my grandma told my brother and me that "all that" doesn't really make sense	18:51
Seveas	I did do latin in high school, but dropped it. Guess what I did instead?	18:51
qsx	she was >90 then :D	18:51
	german?	18:51
Seveas	yup	18:51
qsx	GUT	18:51
Seveas	herr Goebbels	18:51
	← Gsham left	18:52
	ChanServ set mode: +o	18:52
qsx	cough	18:52
	← kdehl left	18:52
Seveas	yes, my german teacher was named Goebbels	18:52
qsx		18:52
	qsx set mode: -o	18:52
qsx	must have been fun for him to go through all that jokes.	18:52
	← lindenle left	18:53
Seveas	we didn't dare make jokes. He was terrifying	18:53
qsx	:D	18:54
	→ EduardoMartins joined	18:54
Seveas	he also started every first lesson of the day with a short prayer :)	18:54
	← CihanKaygusuz left	18:54
	→ elastix joined	18:54
rodarmor	Question: I'd like to reset my index and working tree to the state of a previous commit, without change the branch head, is there a way to do that?	18:54
	→ kfunk joined	18:54
	→ tvw joined	18:55
	→ sparetire_ joined	18:55
	→ mizu_no_oto joined	18:55
Gfurst	rodarmor: you can just checkout, your branch will remain with same HEAD and you will be in headless state	18:55
Seveas	rodarmor: git checkout sha1-of-commit	18:55
	← roygbiv left	18:55
	→ hobodave joined	18:56
qsx	Gfurst: branches don't have a !HEAD	18:56
gitinfo	Gfurst: HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	18:56
qsx	note that HEAD /= head	18:56
	→ kdehl joined	18:56
rodarmor	Gfurst: Okay, interesting, so HEAD isn't a per-branch pointer to the current commit. So it's okay that i'm in "detached head state"?	18:57
Gfurst	qsx: oh yeah, what I meant is, the same tip	18:57
Seveas	rodarmor: as long as you're not planning to make commits, sure.	18:57
	→ lindenle joined	18:57
Gfurst	rodarmor: in detached you can do commits but they won't belong to any branches per say,	18:57
Seveas	s/ per say,//	18:58
Gfurst	Seveas: exactly?	18:58
	← hobodave_ left	18:58
rodarmor	Seveas: Ahh, yeas, the thing is it that I want to now make a few changes and then 'commit -a --amend' and have that be reflected in the commit that I started on.	18:58
Gfurst	so if you checkout to other branchs those commits can be lost, but you can create a new branch from your headless state too	18:59
Seveas	rodarmor: git checkout sha1-of-commit -- .	18:59
	→ josuebrunel joined	19:00
Gfurst	rodarmor: maybe what you want is to redo certain commit, might be better with "reset --soft"	19:00
Seveas	that checks out all files, but keeps you on the current branch and doesn't detach HEAD	19:00
	← bannakaffalatta left	19:00
Seveas	reset --soft will change HEAD, do NOT do that.	19:00
	← synthmeat left	19:00
Gfurst	but if you just want to undo a certain commit and make changes, 'revert' is the way to go	19:01
Seveas	that's in fact the opposite of what you want, it doesn't touch files/index, but only changes HEAD	19:01
Gfurst	yeah, perhaps its best for rodarmor to tell exactly what he wants to do	19:02
rodarmor	I would totally 'reset --soft', but to satisfy phabricator (code review tool on top of git) I need to make sure I don't nuke the commit that already exists.	19:02
Seveas	he did. You just gave him bad advice :)	19:02
rodarmor	I think that "git checkout sha1-of-commit -- ." is doing what I want	19:02
	gaen → gaen[away]	19:03
	→ bannakaffalatta joined	19:03
	→ synthmeat joined	19:03
	← bsanford left	19:03
	← BigWillie left	19:03
	→ Balliad joined	19:03
	← achadwick left	19:03
Gfurst	rodarmor: actually no, if you want to revert certains files you can 'checkout commit ..files' or 'revert commit ..files' to revert what a certain commit did without changing history	19:03
	← luksaur left	19:04
Seveas	Gfurst: no, that's spelled the way I said it, and the way rodarmor already did it.	19:04
Gfurst	the 'checkout commit files' will get what files were in certain commit without changing HEAD, changes will be available for a new commit	19:04
	← chitopunk left	19:05
	→ hobodave_ joined	19:05
	← m8 left	19:05
Seveas	rodarmor: more undoing recipes are here for future reference: https://git.seveas.net/undoing-all-kinds-of-mistakes.html	19:05
rodarmor	I'm a little confused, because I think ""git checkout sha1-of-commit -- ." is doing what I want, set the contents of the working tree to the state of a previous commit.	19:05
Seveas	rodarmor: that is correct. I don't know what Gfurst is smoking... :)	19:05
rodarmor	Why does it change the index though? (i.e. those changes are ready to commit without 'git add'ing them)	19:05
	← junw left	19:05
	← bongjovi left	19:06
Seveas	because that's what checking out a file does by definition	19:06
	rodarmor: you can try a reset --mixed afterwards to un-add the changes from the index	19:07
	← hobodave left	19:07
	gaen[away] → gaen	19:08
	← Oebele left	19:08
	← jeffreylevesque_ left	19:08
rodarmor	Seveas: Still a little confused, from the git checkout man page on the 'git checkout <tree-ish> -- <pathspec>...' form:	19:08
ojacobson	rodarmor: well, mostly. (`git checkout <commitish> …any arguments…` always updates the index)	19:08
rodarmor	"updates the named paths in the working tree from the index file or from a named tree-ish"	19:09
ojacobson	rodarmor: to fully set the tree and index to <commitish> you need `git rm -rf :/ && git checkout <commitish> -- :/`	19:09
	`git checkout <committish> -- <path…>` won't remove files if they exist in the index but do not exist in <committish>	19:09
Seveas	ojacobson: ooh, good one	19:09
ojacobson	this bites me _all the time_ in refactors :)	19:10
	→ groton joined	19:10
	← govg left	19:10
	← dslevin_ left	19:10
	← dasginganinja left	19:11
	← EduardoMartins left	19:11
groton	why the .git/refs/heads does not contain all the remote branches? only after i do a checkout i get the ref in there. Why only after a checkout? Is there a way to get all the remote branches tracked by local branches?	19:11
	→ BigWillie joined	19:11
	← Balliad left	19:11
	→ ninsei joined	19:11
	← LiENUS left	19:12
Gfurst	ojacobson: if you just 'checkout <commit>' won't it just switch to the state of the commit (plus untracked files at the time), like switching branches?	19:12
ojacobson	yep.	19:12
qsx	groton: you have them, they are packed in .git/packed-refs	19:12
ojacobson	`git checkout <commitish>` and `git checkout <commitish> -- <paths…>` do different things, though.	19:12
qsx	groton: you should not poke around in .git (and in most cases neither peek), use the git toolset.	19:12
	← chll left	19:12
ojacobson	groton: it doesn't contain _any_ remote branches. refs/heads/* are _local_ branches.	19:12
Gfurst	the '<commit> -- <paths>' is actually checking out those files remaining in current HEAD no?	19:12
	← BigWillie left	19:13
qsx	… that, too.	19:13
rodarmor	qsx: Well, I dunno, peeking can often be quite instructive :)	19:13
	← cvanball left	19:13
Seveas	groton: because refs can also be stored in different places	19:13
	groton: git for-each-ref is your friend	19:13
rodarmor	qsx: And poking can be destructive in an instructive way	19:13
groton	ok, thanks a lot, now it makes sense	19:13
qsx	shrug	19:14
	rodarmor: say that once you've lost irreplacable work.	19:14
rodarmor	qsx:	19:14
	qsx: "can be", always make backups/push before poking	19:15
qsx	and remember to pop your registers in the right order	19:15
rodarmor	ojacobson: I'm still a little confused as to why the index is changed, because of what it says in the man page, it's in the description for this form "git checkout [-p\|--patch] [<tree-ish>] [--] <pathspec>..." is that the right oen?	19:16
	← ryez left	19:16
	→ mbrzuzy joined	19:17
	→ LiENUS joined	19:17
Seveas	rodarmor: the manpage could be a bit more explicit about this	19:18
	but basically the index is changed because that's what the git developers decided git should do.	19:18
rodarmor	Okay, cool. Thanks all for the help	19:19
	ojacobson: Is github.com/ojacobson/git-aliases yours?	19:19
	It's very instructive reading	19:19
	→ kiloreux joined	19:19
	← lindenle left	19:20
Gfurst	rodarmor: this syntax is like this it grabs the file from point in history, you're still the HEAD of the branch you were, but the files changed so you'd need to commit them...	19:20
	← Fijit left	19:20
	← nydel07 left	19:21
	→ pantsman- joined	19:21
	→ dreiss joined	19:22
Gfurst	but yeah the fact that it automatically adds to staging area is just a fact, probably because its expecting you to commit anyway	19:22
	← marcogmonteiro left	19:22
Gfurst	been reading this yesterday too, pretty simple but easy to grasp https://www.atlassian.com/git/tutorials/undoing-changes/git-checkout	19:22
	→ Balliad joined	19:22
	← Balliad left	19:22
	→ ochorocho joined	19:22
	→ govg joined	19:23
	→ nydel07 joined	19:23
	→ rominronin joined	19:25
	→ BSaboia joined	19:25
	← 21WAAP7FT left	19:26
	→ durham joined	19:26
	← cerkauskas left	19:27
	← ochorocho left	19:27
Gfurst	by the way, anyone using git-lfs around? is it my impression or does it only need to be installed once in the machine? 'git lfs install'	19:27
	→ dslevin_ joined	19:28
	→ lindenle joined	19:29
	→ Musok joined	19:29
	→ tristanp_ joined	19:30
	→ osxi_ joined	19:30
	← kiloreux left	19:30
	← rominronin left	19:30
	→ net2014_ joined	19:30
	← mmlb left	19:30
	→ synthmea1 joined	19:31
	→ WaReZ joined	19:31
	→ DANtheBE- joined	19:31
	→ mattp__ joined	19:31
	→ _richardJ joined	19:31
	← rewt left	19:31
	→ rewt`` joined	19:31
	← wave left	19:31
	→ Balliad joined	19:31
	→ BlaXpirit_ joined	19:31
	→ lbv-user joined	19:32
	→ someara_ joined	19:32
	rewt`` → rewt	19:32
	→ kadoban_ joined	19:32
	→ cantor_ joined	19:32
	→ neanderslob_ joined	19:33
	← WaReZ left	19:33
	→ dsteplight_ joined	19:33
	→ chitopunk joined	19:33
	→ case39_ joined	19:33
	→ frobnic_ joined	19:33
	→ Burgerz joined	19:33
	→ sickn3ss_ joined	19:33
	← sickn3ss_ left	19:33
	→ sickn3ss_ joined	19:33
	→ Kad--_ joined	19:33
	← Musok left	19:33
	→ abyss43 joined	19:33
	→ PublicSu_ joined	19:33
	→ faux___ joined	19:34
	→ kwmiebach_ joined	19:34
	→ comps_ joined	19:34
	→ richard_1aw joined	19:34
	→ heroux_ joined	19:34
	← BlaXpirit left	19:34
	BlaXpirit_ → BlaXpirit	19:34
	→ mroth_ joined	19:34
	→ mmlb joined	19:34
	→ rideh- joined	19:34
	← aleksandar2810 left	19:34
Seveas	Gfurst: read its manpage again.	19:34
	→ aleksandar2810 joined	19:34
	→ Zarthus_ joined	19:35
	→ cebor_ joined	19:35
	→ GameGamer43_ joined	19:35
	→ sr_____ joined	19:35
	→ Cabanoss- joined	19:35
	→ daito joined	19:36
	→ paddyez joined	19:36
	← paddyez left	19:36
	→ paddyez joined	19:36
	← dstarh left	19:36
	→ intgr_ joined	19:36
Gfurst	Seveas: yup, ah there it is, its global	19:36
	→ angelsl_ joined	19:36
	→ pcarrier_ joined	19:36
	→ lmatteis_ joined	19:36
Seveas	Gfurst: read its manpage again. And now really read it.	19:36
	→ Musok joined	19:36
	← mmlb left	19:36
Gfurst	Seveas: ... ?	19:37
	→ edenist_ joined	19:37
	← d4rklit3 left	19:37
	→ Lea2 joined	19:37
	→ n-st_ joined	19:37
	← sarri left	19:37
	→ neunon_ joined	19:37
	→ constantinexvi_ joined	19:37
	→ SirCmpwn_ joined	19:37
	← TomyLobo left	19:37
	→ TakumoKatekari joined	19:37
	← TakumoKatekari left	19:37
	→ TakumoKatekari joined	19:37
	→ abh- joined	19:37
	→ xirdtegmezkfoyom joined	19:37
	xirdtegmezkfoyom → ihfablkucnskbfib	19:37
	→ themill_ joined	19:37
	ihfablkucnskbfib → TomyLobo	19:37
	→ alip joined	19:37
	→ SirFunk_ joined	19:37
	→ bket1 joined	19:37
	→ fscala_ joined	19:37
Seveas	Gfurst: under desription, second bullet point.	19:37
	→ peoliye joined	19:38
	→ varesa- joined	19:38
	→ martinbjeldbak joined	19:38
	← Zarthus left	19:38
	Zarthus_ → Zarthus	19:38
	→ matth1askrgr joined	19:38
	← synthmeat left	19:38
	← varesa left	19:39
	← toogley left	19:39
	← LBV_User left	19:39
	← kadoban left	19:39
	← modin left	19:39
	← mattp_ left	19:39
	← Es0teric left	19:39
	← BillCriswell left	19:39
	← fscala left	19:39
	← Sendoushi left	19:39
	← faux____ left	19:39
	← Cabanossi left	19:39
	← sr____ left	19:39
	← _ikke_ left	19:39
	← creppe left	19:39
	← haaja left	19:39
	← tristanp left	19:39
	← mroth left	19:39
	← lmatteis left	19:39
	← neanderslob left	19:39
	← _joes_ left	19:39
	← net2014 left	19:39
	← meloc_ left	19:39
	← bket left	19:39
	← troyt left	19:39
	← tzero left	19:39
	← PublicSubnet left	19:39
	← Kad-- left	19:39
	← VampiricPada left	19:39
	← jason237 left	19:39
	← richard_maw left	19:39
	← Internet13 left	19:39
	← sybariten left	19:39
	← Keridos left	19:39
	← heroux left	19:39
	← bionicrm left	19:39
	← Meow-J left	19:39
	← roflin left	19:39
	← Trieste left	19:39
	← tazle_ left	19:39
	← dsteplight left	19:39
	← nwf left	19:39
	← Nothing4You left	19:39
	← matthiaskrgr left	19:39
	← sickn3ss left	19:39
	← kalz left	19:39
	← cebor left	19:39
	← osxi left	19:39
	← GameGamer43 left	19:39
	← malide left	19:39
	← goezz left	19:39
	← intgr left	19:39
	← sublimate left	19:39
	← pcarrier left	19:39
	← kwmiebach left	19:39
	← SirFunk left	19:39
	← neunon left	19:39
	← rom1504 left	19:39
	← Takumo left	19:39
	← rideh left	19:39
	← johnny56 left	19:39
	← constantinexvi left	19:39
	← WakiMiko left	19:39
	← quizzi left	19:39
	← comps left	19:39
	← roknir left	19:39
	← flebron left	19:39
	← SirCmpwn left	19:39
	← slixpk left	19:39
	← edenist left	19:39
	← cantor left	19:39
	← martinbjeldbak_ left	19:39
	← themill left	19:39
	← Learath2 left	19:39
	← gkatsev left	19:39
	← someara left	19:39
	← DANtheBEASTman left	19:39
	← Derega left	19:39
	← ArmOrAttAk left	19:39
	← toogy left	19:39
	← case39 left	19:39
	← mattcen left	19:39
	← linuxmodder left	19:39
	← frobnic left	19:39
	← devster31 left	19:39
	← kriskropd left	19:39
	← parrhesiastes left	19:39
	← abyss43_ left	19:39
	← n-st left	19:39
	← Nevik left	19:39
	← abh left	19:39
	← RichardJ left	19:39
	← angelsl left	19:39
	← timewalker left	19:39
	← avtobiff left	19:39
	Cabanoss- → Cabanossi	19:39
	themill_ → themill	19:39
	heroux_ → heroux	19:39
	lmatteis_ → lmatteis	19:39
	fscala_ → fscala	19:39
Gfurst	yup, though I did install in the repo only but the config was global	19:39
	matth1askrgr → Guest86549	19:39
	n-st_ → n-st	19:39
	neunon_ → neunon	19:39
	→ BillCriswell_ joined	19:39
	→ _joes_ joined	19:39
	← lindenle left	19:39
Seveas	...	19:39
	I give up.	19:39
	→ Nevik joined	19:39
	→ Internet13 joined	19:39
	→ tazle_ joined	19:39
	→ gkatsev joined	19:39
	→ mattcen joined	19:39
	→ BigWillie joined	19:39
	→ bionicrm joined	19:39
	← BigWillie left	19:40
	→ cerkauskas joined	19:40
	→ Keridos joined	19:40
	← Sample left	19:40
	→ _ikke_ joined	19:40
	varesa- → varesa	19:40
	angelsl_ → angelsl	19:40
	→ toogy joined	19:40
	→ creppe joined	19:40
	→ mmlb joined	19:40
	→ devster31 joined	19:40
	→ modin joined	19:40
	→ BigWillie joined	19:40
	→ johnny56_ joined	19:40
	→ WakiMiko joined	19:40
	→ troyt joined	19:40
	→ Trieste joined	19:40
Gfurst	-_- ... I'm saying, I just installed from within repo, but configuration went global instead	19:40
	← daito left	19:40
	→ sarri joined	19:40
	mroth_ → mroth	19:40
	→ slixpk joined	19:40
	→ VampiricPada joined	19:41
	→ andres joined	19:41
	→ haaja joined	19:41
	← noteness left	19:41
	→ arup_r joined	19:41
	→ ArmOrAttAk joined	19:41
	← ArmOrAttAk left	19:41
	→ ArmOrAttAk joined	19:41
	→ roflin joined	19:41
	→ meloc_ joined	19:41
	← arup_r left	19:41
	← Guest86549 left	19:41
	→ Guest86549 joined	19:41
	← Guest86549 left	19:41
	→ Guest86549 joined	19:41
	→ jason237 joined	19:41
	→ roknir joined	19:41
	← M-ixi1 left	19:41
	→ Meow-J_ joined	19:42
	→ toogley joined	19:42
	→ malide joined	19:42
	→ Nothing4You joined	19:42
	Guest86549 → matthiaskrgr_	19:42
	→ quizzi joined	19:42
	→ Derega joined	19:42
	← M-mistake left	19:42
	→ tzero joined	19:43
	← zivester left	19:43
	→ sublimate joined	19:43
	→ rom1504 joined	19:43
	→ flebron joined	19:43
	GameGamer43_ → GameGamer43	19:43
	→ nwf joined	19:43
	→ timewalker joined	19:44
	→ eggoez joined	19:44
	→ pantsman_ joined	19:44
	→ lindenle joined	19:45
	SirCmpwn_ → SirCmpwn	19:45
	→ avtobiff joined	19:45
	→ kukks joined	19:45
	← kukks left	19:45
	→ kukks joined	19:45
	→ Es0teric joined	19:45
	kadoban_ → kadoban	19:45
	→ kriskropd joined	19:45
	someara_ → someara	19:46
	comps_ → comps	19:46
	kwmiebach_ → kwmiebach	19:46
	→ wave joined	19:48
	← uranellus left	19:48
	→ uranellus joined	19:48
	→ arup_r joined	19:48
	← pantsman- left	19:48
	→ luksaur joined	19:49
	Meow-J_ → Meow-J	19:49
	← Musok left	19:49
	← Limes_ left	19:49
	→ jonno11 joined	19:50
	← noname left	19:50
	pcarrier_ → pcarrier	19:50
	← jonno11 left	19:51
	← \|nodux left	19:51
	→ M-ixi joined	19:51
	→ noteness joined	19:51
	→ kalz joined	19:51
	→ sybariten joined	19:52
	→ giddles joined	19:52
	← gopar left	19:53
	→ mohammed64 joined	19:53
giddles	hello	19:53
gitinfo	giddles: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.	19:53
	← sanketdg left	19:53
	← cschneid left	19:55
	← luksaur left	19:55
	← Sleepy63 left	19:55
	→ Limes_ joined	19:56
	← lindenle left	19:56
	→ t4nk241 joined	19:56
	→ WaReZ joined	19:56
	→ cvanball joined	19:56
frankie64	ok we have run a conversion , (trial run) of our CVS , what we are looking to do now is use it at least like CVS, ie we ran tortoiseCVS and each workstation could check in or out etc. I gather SSh does not do this, what do you people recommend on the server side?	19:57
	→ bsanford joined	19:57
	→ zivester joined	19:57
	→ cschneid joined	19:57
	← cerkauskas left	19:57
	→ radsy joined	19:57
	← nickthetait left	19:57
	→ thierryp joined	19:57
	← M-ixi left	19:58
	← zivester left	19:58
Seveas	frankie64: ssh is a suitable transport for git	19:59
	← NateAGeek left	19:59
Seveas	very suitable even. It's the original transport :)	19:59
frankie64	yes, but the user has to load git up on there workstation? and then do ssh pushes or am i understanding this wrong	20:00
giddles	how can i download from github with my rpi ;)	20:00
	← kane77 left	20:01
giddles	i want to use https://github.com/DASPRiD/DASBiT , but have noe idea how to get it	20:01
	git clone <- and then i stuck	20:01
Seveas	frankie64: the user will have to install git locally, just like you would have had to with cvs. They can den do git clone / git pull / git push so sync commits. All of these can use a variety of transports transparently, of which ssh is one.	20:01
	← thierryp left	20:01
	→ kpease_ joined	20:02
Seveas	giddles: that url would come next.	20:02
giddles	and then? @ [options] and [--]	20:02
	← elastix left	20:02
Seveas	then nothing.	20:02
	just enter	20:02
	← synthroid left	20:02
giddles	hmk	20:03
	← radsy left	20:03
	← wrilain left	20:03
	→ Oog joined	20:03
giddles	i need a username for github	20:03
	?	20:03
	x	20:03
_ikke_	not for cloning public repositories with http	20:03
frankie64	Seveas: i didnt have CVS on my machine but tortoisecvs, or is that as much the same thing?	20:03
	← gaen left	20:03
giddles	works ok	20:03
	done	20:04
	→ gaen joined	20:04
	← kpease left	20:04
_ikke_	frankie64: that's just a client	20:04
	→ Sample joined	20:04
	← Exagone313 left	20:04
	← Mannequin left	20:05
frankie64	ok is there an equivalent client for git?	20:05
	→ elastix joined	20:05
Seveas	frankie64: tortoisecvs is one of many cvs clients. There's a tortoisegit as well, but it really helps to learn the CLI.	20:05
	← DANtheBE- left	20:06
giddles	thks!	20:07
	← giddles left	20:07
	← mohammed64 left	20:07
	→ synthroid joined	20:07
	→ lindenle joined	20:07
	→ luksaur joined	20:07
	← t4nk241 left	20:07
	→ M-ixi joined	20:08
	→ DANtheBEASTman joined	20:08
	← David1977 left	20:08
	→ Sleepy63 joined	20:09
	→ radsy joined	20:09
	← gaen left	20:09
	← cbonobo left	20:10
	→ gaen joined	20:10
	kpease_ → kpease	20:10
	← peoliye left	20:11
	← craigp left	20:11
	→ gargola joined	20:12
	← sdothum left	20:12
	← mahendra_ left	20:13
	→ EvilPenguin joined	20:14
	← Oog left	20:14
	→ nickthetait joined	20:14
	← t0by left	20:14
	→ yqt joined	20:14
	→ M-mistake joined	20:15
	→ sdothum joined	20:15
	← luksaur left	20:16
	← Ice_Strike left	20:16
	→ peoliye joined	20:17
	→ chrisgeorge joined	20:18
	frobnic_ → frobnic	20:18
	→ jeffreylevesque joined	20:19
	← codeman left	20:20
	← HanClinto left	20:21
Seveas	ojacobson: there's a better way than rm/checkout: git checkout -b temp commitish; git merge -s ours master; git checkout master; git merge --ff-only temp. Something for your aliases :)	20:21
	← kpease left	20:22
	← paulweb515 left	20:22
	← EvilPenguin left	20:22
Seveas	I think it's better because the merge indicates where the old commit came from	20:22
	s/commit/code/	20:22
	→ mischat joined	20:23
	→ mohammed64 joined	20:26
	→ rominronin joined	20:26
	← durham left	20:27
	← M-mistake left	20:27
	→ GT joined	20:27
	→ pozitrono joined	20:29
	→ Pankhurst joined	20:30
	→ dsdeiz joined	20:30
	→ CJ_ joined	20:31
CJ_	Is there a good guide to working with submodules? I am trying to determine how the various projects are linked.	20:32
	← elastix left	20:32
	← rominronin left	20:32
	← pozitrono left	20:32
	→ luksaur joined	20:32
	← nilg left	20:33
	← lindenle left	20:34
	→ thierryp joined	20:34
	← phaleth left	20:34
	→ m0viefreak joined	20:34
	→ otter768 joined	20:35
alezandro	hi all, i used git filter-branch to remove some tar.gz files out of my repo, it worked well, my .git dir is a lot smaller now.	20:36
	but how do i push it to origin? git status there is nothing to commit, and push says "everything up to date".	20:36
	→ Exagone314 joined	20:36
alezandro	would like to delete those tar.gz's from origin too.	20:36
	→ elastix joined	20:36
	← elastix left	20:36
	← vdv left	20:36
	→ daito joined	20:36
	← calamari left	20:37
	← peoliye left	20:38
	← nickthetait left	20:38
Seveas	CJ_: the very brief guide is "don't do it" :)	20:38
	there are very few good reasons to use submodules, and many more instances of using submodules for the wrong reasons.	20:39
	← ribasushi left	20:39
	→ bb010g joined	20:39
	gitinfo set mode: +v	20:39
	← mariuscc left	20:39
	→ btree joined	20:39
	→ Gsham joined	20:40
	← otter768 left	20:40
	→ M-mistake joined	20:41
	→ ril joined	20:41
	→ lindenle joined	20:41
	← daito left	20:41
CJ_	Seveas, That was my thought, but I am starting work a project that is using submodules.	20:42
	I have never worked with them before.	20:42
	← postsneakernet left	20:42
gaen	The funny thing about submodules is how to remove a submodule. It requires 7 simple steps, you can google it (:	20:43
Seveas	gaen: that's only one of the bad parts of it.	20:44
	→ crose joined	20:44
CJ_	Right now I just did a clone without --recursive and then did a symlink.	20:44
gaen	elaborate?	20:44
Seveas	also, it's only 5 steps :) https://git.seveas.net/getting-rid-of-submodules.html#getting-rid-of-submodules	20:44
gaen	ok my bad)	20:44
	← samw left	20:45
	→ CorySimmons joined	20:45
	← Exagone314 left	20:45
Seveas	you could say 7 steps though, if you include the cleanup after committing the removal	20:45
gaen	yeah, I see it	20:46
	→ samw joined	20:46
gaen	bumped into a problem with submodules when tried to rearrange a project whose repos were summary about 30G	20:47
	← M-ixi left	20:47
	← M-meznak left	20:48
	← ril left	20:48
	→ zeroed joined	20:48
	→ Ahmed90 joined	20:49
	→ acetakwas joined	20:49
	→ gopar joined	20:49
	→ sq-one joined	20:50
	→ calamari joined	20:51
	→ Exagone314 joined	20:51
	← samw left	20:51
	→ dan2k3k4 joined	20:51
	← Chilley__ left	20:52
	→ kpease joined	20:52
	→ durham joined	20:53
	→ skcin7 joined	20:53
	← kesenai left	20:53
	→ kesenai joined	20:54
	← kesenai left	20:54
	→ ensyde joined	20:54
	← encod3_ left	20:54
	→ peoliye joined	20:55
	← BigWillie left	20:55
	← mohammed64 left	20:55
	← acetakwas left	20:55
	← Exagone314 left	20:55
	← tvw left	20:56
	← arup_r left	20:56
	← asnoehu left	20:56
	→ arup_r joined	20:56
	→ mohammed64 joined	20:58
	→ ribasushi joined	20:58
	← arup_r left	20:59
	→ Sendoushi joined	20:59
	→ tpollard joined	20:59
	→ samw joined	20:59
	← peoliye left	20:59
	← lindenle left	21:00
	→ znabavi joined	21:00
	← samw left	21:00
	→ peoliye joined	21:00
	→ Exagone314 joined	21:00
	← rubyonrailed left	21:01
	← dan2k3k4 left	21:01
	→ ril joined	21:02
	← krawchyk left	21:02
	← gopar left	21:03
	← lbv-user left	21:03
	← imachuchu left	21:03
	→ krawchyk joined	21:04
	→ lindenle joined	21:04
	← krawchyk left	21:04
	→ dan2k3k4 joined	21:04
	→ rangergord joined	21:05
	→ krawchyk joined	21:05
	← M-mistake left	21:05
	→ M-ixi joined	21:06
	← durham left	21:08
	→ samw joined	21:09
	← ensyde left	21:09
	← Exagone314 left	21:11
	→ cbonobo joined	21:11
	→ durham_ joined	21:11
	→ M-meznak joined	21:11
	→ balau joined	21:11
	← lindenle left	21:11
	→ Macaveli joined	21:12
	← znabavi left	21:12
alanjf	I'm currently using gitweb and it is nice, but I'm wondering if there is a an interface that looks more like github.com's that one can install on their own server? I find I really prefer it's way of browsing repos, their commits, their files, tags, branches, etc.	21:12
	← mattcen left	21:12
	→ sangy joined	21:13
	← Gsham left	21:13
alanjf	(Preferably something free that one can play around with on their own box or LAN server for jsut their own private needs, that sort of thing.)	21:13
	→ mattcen joined	21:14
	← cbonobo left	21:14
	→ lindenle joined	21:14
	→ znabavi joined	21:14
	← HelloAtMega left	21:14
	← guampa left	21:14
	→ vdv joined	21:14
joshc	alanjf: you might be interested in GitLab (although, I don't have much experience with it)	21:15
kadoban	alanjf: gitlab maybe? I generally just use gitolite though.	21:15
	→ diegoaguilar joined	21:15
preaction	there are dozens of them	21:15
	→ Exagone314 joined	21:15
diegoaguilar	I just pulled and got merge conflicts, how can I tell git, please ignore anything I have on this branch and just make it look like the full stuff I pulled	21:15
_ikke_	Why do you want to merge then?	21:16
preaction	diegoaguilar: use reset instead perhaps?	21:16
alanjf	Do any of them have a similar look and feel as github.com though? (I wouldn't mind a darker theme though.)	21:16
	→ acetakwas joined	21:16
	← mbrzuzy left	21:16
	← acetakwas left	21:16
kadoban	Depends on your judgement of "similar" I guess.	21:17
	→ ac3takwas joined	21:17
	→ nnyk joined	21:17
	→ acetakwas joined	21:17
	← groton left	21:17
	← acetakwas left	21:17
	→ nickthetait joined	21:18
	← Exagone314 left	21:18
	← gaen left	21:18
preaction	look at them and see	21:19
	← dan2k3k4 left	21:19
preaction	gitbucket gogs gitlab gitprep are the 4 i know of	21:19
	← go1111111 left	21:19
	← CorySimmons left	21:19
	← MarkyC left	21:20
	← courrier left	21:20
	→ dan2k3k4 joined	21:20
rangergord	alanjf: bitbucket	21:20
	← Balliad left	21:21
rangergord	pretty sure they're going for the github feature list	21:21
	→ Exagone313 joined	21:21
	→ gaen joined	21:21
	→ lindenle_ joined	21:22
	← dan2k3k4 left	21:22
	← balau left	21:22
	← lindenle left	21:22
_ikke_	!hosted	21:23
gitinfo	[!host_gui] There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !gitorious !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools	21:23
	← btree left	21:23
	→ guampa joined	21:23
	→ dan2k3k4 joined	21:23
	→ paulweb515 joined	21:24
	→ rominronin joined	21:25
	→ DolpheenDream joined	21:25
	← M-meznak left	21:27
	→ Darcidride joined	21:27
	← rwb left	21:27
	osxi_ → osxi	21:28
	← vdv left	21:28
	→ killa_kyle joined	21:30
	← rominronin left	21:30
	← samw left	21:30
qsx	.trigger_edit host_gui There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools	21:30
gitinfo	qsx: You must be logged into NickServ in order to use this command.	21:30
alanjf	Thanks for all the tips. What I guess I'm really looking for is something like gitweb that looks more like github (especially the look/feel of the file/commit/branch/tag browsing.)	21:30
qsx	your mother must be logged in	21:30
	qsx → qsuscs	21:30
	← gaen left	21:31
qsuscs	.trigger_edit host_gui There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools	21:31
gitinfo	qsuscs: Okay.	21:31
	qsuscs → qsx	21:31
	← killa_kyle left	21:31
qsx	jast: fix pls :<	21:31
	← krawchyk left	21:31
	→ nour_ joined	21:31
qsx	alanjf: gitlab has, though i can't understand why people want such a pile of shit	21:31
	→ krawchyk joined	21:32
	alanjf wonders if any such themes exist for gitweb.	21:32
	← thierryp left	21:33
	← nickthetait left	21:33
	→ gaen joined	21:34
	→ nickthetait joined	21:34
	← nnyk left	21:34
	→ mbrzuzy joined	21:34
	← jason237 left	21:34
	← nour left	21:35
	← noteness left	21:35
	← marlinc left	21:36
	prosody → drosodv	21:36
	← ac3takwas left	21:36
	← krawchyk left	21:36
	→ daito joined	21:37
	← lindenle_ left	21:37
	← dr_lepper left	21:37
	→ [Saint] joined	21:37
	→ t0by joined	21:38
	← nickthetait left	21:38
	← mohammed64 left	21:38
[Saint]	Here's a git-ish question, using the Android tool 'repo', by default all the repositories that are pulled down come in a state where there is no branch, and there's no origin set by default.	21:39
	→ cbonobo joined	21:39
	→ dr_lepper joined	21:39
[Saint]	So, with this in mind, how would one go about getting out of a detached head state?	21:39
	→ vdv joined	21:39
	← M-ixi left	21:39
Seveas	alanjf: gitweb isn't themeable	21:39
[Saint]	I can't, for example, do 'git checkout master', as there's no branches at all, let alone a master branch.	21:40
Seveas	[Saint]: !repo	21:40
gitinfo	[Saint]: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html	21:40
[Saint]	Nor can I do 'git reset origin/mater', as there's no origin.	21:40
Seveas	we don't support that pile of [redacted]	21:40
	← daito left	21:41
sangy	[Saint]: if there are no branches or remotes... are there at least .git/objects?	21:41
Eugene	[Saint] - `git branch -vva` should give you something to start with.	21:42
	← diegoaguilar left	21:42
	← synthroid left	21:42
	→ ochorocho joined	21:43
	← zeroed left	21:43
	→ zeroed_ joined	21:43
[Saint]	* (no branch) <commit-short-ID> <commit-descript>	21:44
	→ MattMaker joined	21:44
	← zeroed_ left	21:44
Eugene	Does it not list any branches from the remote?	21:44
	→ zeroed joined	21:44
[Saint]	It does not, which confused me greatly.	21:44
Eugene	Woo, Google.	21:44
Seveas	Eugene: it probably just does fetch $url and merge FETCH_HEAD	21:44
Eugene	Well, try `git checkout -b mybranch short-SHA`	21:44
[Saint]	I do know what the remotes are, however.	21:45
Eugene	That sounds familiar. I haven't used it in literal years	21:45
	Just make a `git clone` of the remote URL, outside of repo's control ;-)	21:45
Seveas	I haven't used it, ever. I only hear complaints about it :)	21:45
	→ hpe joined	21:45
	← hpe left	21:45
	← jeffreylevesque left	21:45
[Saint]	It's not terrible, ...until things like this happen.	21:45
	It's certainly easier in some regards.	21:46
Eugene	It works fine if you're working with a repo/gerrit-managed project	21:46
[Saint]	Manual checkout of some ~300 repos wouldn;t be fun without 'repo'.	21:46
	and, yes, yes it does.	21:46
Seveas	you're never working on 300 repos at once	21:46
	← Karkus left	21:47
[Saint]	I fail to see why that is relevant. Whether or not I'm working with them directly doesn't immeidately matter when it comes to having all the build dependencies available.	21:48
	I've even trimmed out about 3 dozen repositories that my builds never touch.	21:48
	The Android source is pretty huge.	21:49
Seveas	you need 300 repos to build android?	21:49
	dayum	21:49
[Saint]	And when you need to build for a couple of dozen targets, it adds up. All I was saying is that I would most certainly not like to check the necessary requirements out manually.	21:50
	← durham_ left	21:50
	← cschneid left	21:50
	← bsanford left	21:50
	← cvanball left	21:50
	← wave left	21:50
	← kukks left	21:50
	← eggoez left	21:50
	← roknir left	21:50
	← roflin left	21:50
	← matthiaskrgr_ left	21:50
	← martinbjeldbak left	21:50
	← constantinexvi_ left	21:50
	← angelsl left	21:50
	← intgr_ left	21:50
	← paddyez left	21:50
	← Zarthus left	21:50
	← comps left	21:50
	← PublicSu_ left	21:50
	← dreiss left	21:50
	← spacepluk left	21:50
	← mezod left	21:50
	← CussBot left	21:50
	← rpdprd left	21:50
	← feliwir_ left	21:50
	← Tronsha left	21:50
	← asd6a left	21:50
	← justanotheruser left	21:50
	← lamppid left	21:50
	← discipline left	21:50
	← tyll_ left	21:50
	← quenode left	21:50
	← pablo left	21:50
	← PasiFist left	21:50
	← Pookz left	21:50
	← tchan left	21:50
	← AustinMatherne left	21:50
	→ EvilPenguin joined	21:50
	→ AustinMatherne joined	21:50
	→ jonno11 joined	21:50
Seveas	agreed	21:50
[Saint]	errrr, 476, to be precise.	21:50
	→ gopar joined	21:50
	← Burgerz left	21:50
	← blackwind_123 left	21:51
	→ justanotheruser joined	21:51
	→ durham_ joined	21:51
	→ cschneid joined	21:51
	→ bsanford joined	21:51
	→ cvanball joined	21:51
	→ wave joined	21:51
	→ kukks joined	21:51
	→ eggoez joined	21:51
	→ roknir joined	21:51
	→ roflin joined	21:51
	→ matthiaskrgr_ joined	21:51
	→ constantinexvi_ joined	21:51
	→ angelsl joined	21:51
	→ intgr_ joined	21:51
	→ paddyez joined	21:51
	→ Zarthus joined	21:51
	→ comps joined	21:51
	→ PublicSu_ joined	21:51
	→ dreiss joined	21:51
	→ spacepluk joined	21:51
	→ mezod joined	21:51
	→ CussBot joined	21:51
	→ rpdprd joined	21:51
	→ feliwir_ joined	21:51
	→ Tronsha joined	21:51
	→ asd6a joined	21:51
	→ lamppid joined	21:51
	→ discipline joined	21:51
	→ tyll_ joined	21:51
	→ quenode joined	21:51
	→ pablo joined	21:51
	→ PasiFist joined	21:51
	→ Pookz joined	21:51
	→ tchan joined	21:51
[Saint]	I do somewhat prefer this setup as opposed to one giant monolithic repository.	21:51
	→ martinbjeldbak joined	21:51
[Saint]	...in some ways.	21:51
	← quenode left	21:51
	← constantinexvi_ left	21:51
	← spacepluk left	21:51
	← mezod left	21:51
	← eggoez left	21:51
	← cschneid left	21:51
	← roknir left	21:51
	← justanotheruser left	21:51
	← Tronsha left	21:51
	← PublicSu_ left	21:51
	→ constantinexvi joined	21:52
	→ cschneid joined	21:52
Seveas	at least it doesn't do them as 476 submodules	21:52
	→ roknir joined	21:52
	→ lindenle joined	21:52
	← dsdeiz left	21:52
	→ quenode joined	21:52
	→ nour__ joined	21:52
	→ Chilley joined	21:53
	→ PublicSubnet joined	21:53
	→ eggoez joined	21:53
	→ marlinc joined	21:53
	→ krawchyk joined	21:53
	← jimi_ left	21:53
	→ mezod joined	21:53
	→ spacepluk joined	21:54
	← krawchyk left	21:54
	← DolpheenDream left	21:54
	← da5id left	21:54
	← ryanhiebert left	21:54
	→ krawchyk joined	21:55
	← krawchyk left	21:55
	→ justanotheruser joined	21:55
	← Jackneill left	21:55
	← gaen left	21:55
	→ ryanhiebert joined	21:55
	→ da5id joined	21:56
	← rangergord left	21:56
	gitinfo set mode: +v	21:56
	← dopesong left	21:56
	→ krawchyk joined	21:56
ojacobson	Eugene: have we done a `git-pusheen` /topic joke yet?	21:56
	→ Tronsha joined	21:56
	→ gaen joined	21:56
	← nour_ left	21:56
	ChanServ set mode: +o	21:56
Eugene	Patches welcome	21:56
ojacobson	ha. ok.	21:57
	← mizu_no_oto left	21:57
	← Chilley left	21:57
	→ krawchyk_ joined	21:57
	→ anchorite joined	21:57
	→ dopesong joined	21:58
	← mischat left	21:59
	← thiago left	21:59
	← krawchyk_ left	21:59
	→ acetakwas joined	22:00
	← krawchyk left	22:00
	→ IWishIKnew joined	22:00
	← sgambino left	22:00
qsx	Seveas: subtree	22:01
	:>	22:01
	→ ilmgb joined	22:01
	← {AS} left	22:01
	→ thiago joined	22:02
	← skcin7 left	22:02
	→ Ed_141541 joined	22:03
	← gaen left	22:03
	→ cbonobo_ joined	22:04
[Saint]	Eugene: Seveas: ...well, I "fixed" it.	22:04
	cd working directory; rm -rf /path/to/asshole/repository; repo sync	22:04
	→ gaen joined	22:04
Eugene	Always a good idea to know the path to your ashsole.	22:04
	That would have been funnier without the typo.	22:04
	→ ChainTheory joined	22:05
Eugene	(he says, typoing half thw rods)	22:05
[Saint]	Annoys the hell out of me when something like this breaks the expected flow of working with git.	22:05
	Deleting a repository smacks of defeat to me.	22:05
	→ CihanKaygusuz joined	22:05
[Saint]	But it was either that or get annoyed at it more and pull out more of my hair that I can't really afford to pull out. ;)	22:05
	→ Fullma joined	22:05
	→ jason237 joined	22:06
	← gaen left	22:06
	→ gaen joined	22:07
	← cbonobo left	22:07
	→ vegy joined	22:09
	← ajf- left	22:09
	← Cihan left	22:09
	← gargola left	22:10
	← acetakwas left	22:10
	← ochorocho left	22:11
	→ Cihan joined	22:11
	→ daedeloth joined	22:13
	← felixjet left	22:13
	→ felixjet joined	22:15
	→ skcin7 joined	22:15
vegy	hi, can someone explain to me why when i do git clone https://whatever/myrepo.git i cant edit/add files unless im root?	22:15
	← felixjet left	22:15
	→ Tee_Pee joined	22:16
	→ zmachine joined	22:16
	← anchorite left	22:16
	→ felixjet joined	22:17
	← holodoc left	22:17
_ikke_	sounds like broken umask	22:17
	→ krawchyk joined	22:17
	← calamari left	22:17
_ikke_	what does ls -l return?	22:17
	← mbrzuzy left	22:18
vegy	r to all except root has w	22:18
	→ go1111111 joined	22:18
_ikke_	is it owned by root?	22:19
	← CheckDavid left	22:19
vegy	yes	22:19
_ikke_	Then don't clone the project as root..	22:19
	→ samw joined	22:20
ojacobson	...or in a directory with the setuid bit set o	22:20
_ikke_	right	22:20
	← Macaveli left	22:20
Dougie187	If you're doing a multi branch merge, how do you do `git checkout --theirs` from one of the branches?	22:21
	← sq-one left	22:21
	← felixjet left	22:21
ojacobson	`git checkout <branch> -- <paths…>`, but don't	22:21
Dougie187	Well, I know that's what I want in this case.	22:21
ojacobson	octopus merges should be trivial, if you ever want to make sense of the conflict resolutions after the fact	22:22
Dougie187	I understand the merge conflicts, and know that I want to throw one side away	22:22
vegy	hmm does it always let u clone without root? im newbie with permissions so i thought that adding root doesnt change anything with files that i get (+ i always thought that i must have had some problems in the past cloning without sudo)	22:22
ojacobson	IIRC octopus merges abort outright if there are conflicts, what did you do	22:22
Dougie187	This just stopped to give me conflicts to resolve.	22:22
_ikke_	vegy: When you clone as root, the files / directories will be owned by root	22:23
	→ noteness joined	22:23
	→ holodoc joined	22:23
Dougie187	Most of them were easy, but this one file (which I knew would have conflicts) had more than I wanted to deal with, but I made all three of the branches I was merging.	22:23
	so I knew which file I wanted.	22:23
_ikke_	vegy: git requires no root at all, just permissions in the current directory	22:23
Dougie187	To be fail, it said: `fatal: merge program failed`	22:23
	but it just stopped for me to fix the conflicts.	22:24
	→ troulouliou_div2 joined	22:24
	← jonno11 left	22:24
	← Limes_ left	22:24
vegy	_ikke_: ty very much, much clearer now, although i still need to learn a lot about them	22:24
	← nour__ left	22:25
	→ dsdeiz joined	22:26
vegy	_ikke_: but even if i had changed the repo with root and then push it, that wouldnt hurt others would it? (just theoretically, i know i shouldnt do that)	22:26
	→ rominron_ joined	22:26
	→ daito joined	22:26
	→ s8321414 joined	22:27
_ikke_	No	22:28
	← pantsman_ left	22:29
vegy	ok ty again	22:29
	← SimonNa left	22:29
	→ calamari joined	22:31
	← rominron_ left	22:32
	← WaReZ left	22:33
	→ apprentice joined	22:33
	→ satifant joined	22:33
	→ zivester joined	22:34
	← lindenle left	22:35
	← daito left	22:36
	→ otter768 joined	22:36
	→ pozitrono joined	22:36
	← zeroed left	22:36
	→ lindenle joined	22:37
	→ AtnevRed joined	22:37
	→ linux-modder joined	22:37
	← linux-modder left	22:37
	→ linux-modder joined	22:37
	← King_Hual left	22:38
ash_workz	so right now we're set up like, I have to commit to local repo, commit to the server repo and pull from the server repo to production...	22:39
	I know there are more ideal ways to do this but right now what I'd like to know is, if I commit to a branch on the server and that messes everything up, how can I move the branch back to the last commit and pull again?	22:40
	← skapunker left	22:40
	← otter768 left	22:40
	→ skapunker joined	22:41
	→ fatalhalt joined	22:41
ash_workz	like, I know master shouldn't move ahead without you commiting, but that's not what we're doing, it seems like.	22:41
	I mean	22:41
	shouldn't move ahead unless you're satisfied	22:41
	← AtnevRed left	22:42
	← lindenle left	22:42
_ikke_	sorry, it's not clear what it is what you're asking	22:43
	→ lindenle joined	22:45
	← jason237 left	22:46
	← skcin7 left	22:46
ash_workz	well, it seems like I am fortunate enough not to have to do that anyway	22:47
	_ikke_: I didnt' make a new branch before I started committing to master and then when I pulled to the live site it broke everything	22:47
	so I was like, last time, someone just made another commit which undid the changes	22:47
	_ikke_: but I though, why not just move back 1 commit?	22:48
	_ikke_: but I didn't know how to do that... git reset maybe?	22:48
	Idk... I wanted to make a new branch on the current commit and move master back 1 commit	22:48
	but right now it looks like I haven't committed to the server repo yet	22:49
	← Sendoushi left	22:49
	→ felixjet joined	22:49
	← felixjet left	22:49
	← Es0teric left	22:49
	← lindenle left	22:50
	→ felixjet joined	22:50
	← felixjet left	22:51
	→ nfk\|laptop joined	22:51
	→ wethu joined	22:51
_ikke_	Ok, right	22:51
	git reset can be used for this, indeed	22:52
	!fixup	22:52
gitinfo	So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!	22:52
	→ felixjet joined	22:52
ash_workz	_ikke_: so what I think I need to do, since i've created a new branch on the server, I need to sync up my push and pulls correctly	22:53
	_ikke_: I read this in the documentation but I forgot where it is	22:53
	→ fahadash joined	22:53
	← felixjet left	22:53
	← Exagone313 left	22:53
ash_workz	_ikke_: you have to do something like git branch [arg] [arg]	22:53
	I think	22:53
	← krawchyk left	22:53
	→ lindenle joined	22:53
ash_workz	or git remote ?	22:53
	→ felixjet joined	22:54
	← tubuliferous_ left	22:54
	→ thierryp joined	22:55
	← felixjet left	22:55
	→ skcin7 joined	22:56
	← gaen left	22:56
	→ felixjet joined	22:56
	← linux-modder left	22:57
	← znabavi left	22:57
	← bannakaffalatta left	22:57
	→ gaen joined	22:57
	→ NeverDie joined	22:57
	→ Exagone313 joined	22:57
_ikke_	git fetch; git checkout <branch> should work if I understand you correctly	22:57
	← Pankhurst left	22:57
	← bango2 left	22:58
	← AaronMT left	22:58
	← opdavies left	22:58
	→ opdavies joined	22:58
	← felixjet left	22:59
ash_workz	_ikke_: okay so right now, locally, when i do git remote show origin it says that master pushes to remote master	22:59
	after doing what you just said	23:00
	← hyperair left	23:00
ash_workz	how would I push ash_m to remote ash_m?	23:00
	git push ash_m ash_m ?	23:00
	→ Limes_ joined	23:00
_ikke_	Do you have a branch with the same name as a remote?	23:01
	← ilmgb left	23:02
	→ Imaginativeone joined	23:03
ash_workz	_ikke_: yeah	23:03
	→ felixjet joined	23:03
Imaginativeone	I'm doing a tutorial...	23:03
	and I'm stuck	23:03
	how do I checkout the master branch?	23:03
	← madewokherd left	23:04
	← apprentice left	23:04
ash_workz	Imaginativeone: is it a remote branch?	23:04
	← Dougie187 left	23:04
Imaginativeone	git is forcing me to remove a file first	23:04
	← felixjet left	23:04
	→ znabavi joined	23:05
	→ felixjet joined	23:05
Seveas	then remove the file.	23:05
	← felixjet left	23:05
ash_workz	_ikke_: or git push origin ash_m	23:06
	?	23:06
Imaginativeone	it "can't find the file"	23:06
	→ acetakwas joined	23:06
Imaginativeone	even though I'm using the correct name	23:06
	← zotherstupidguy left	23:06
Seveas	Imaginativeone: !repro	23:06
gitinfo	Imaginativeone: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	23:06
	← calamari left	23:07
	→ felixjet joined	23:07
	→ ochorocho joined	23:07
ash_workz	_ikke_: yeah, git push ash_m ash_m didn't work	23:07
	← felixjet left	23:07
ash_workz	_ikke_: fatal: 'ash_m' does not appear to be a git repository	23:08
	fatal: Could not read from remote repository.	23:08
Imaginativeone	what do I do to sanitize my paste?	23:08
_ikke_	ash_workz: git remote show	23:15
ash_workz	_ikke_: origin	23:15
	→ felixjet joined	23:15
_ikke_	git pull origin ash_m	23:15
Seveas	Imaginativeone: nothing. Just pastebin the lot.	23:15
	← felixjet left	23:15
_ikke_	ash_workz: although	23:15
daurnimator	is there a way to stash only some untracked files?	23:15
	← ChainTheory left	23:15
	← lindenle left	23:15
_ikke_	ash_workz: git fetch; git checkout ash_m	23:15
Seveas	daurnimator: mv is your friend	23:15
daurnimator	Seveas: huh? howso?	23:15
ash_workz	_ikke_: I did that already :\	23:15
	← Exagone313 left	23:15
daurnimator	oh you mean move the files out? stash, and mv them back?	23:15
Seveas	daurnimator: no just move them out, then you don't need to stash	23:15
	← ochorocho left	23:15
	← mezod left	23:15
	← fees left	23:15
ash_workz	I'm very confused	23:15
daurnimator	Seveas: well I still want them in my directory	23:15
satifant	daurnimator, iirc, you could add changes you want to keep to the index and use git stash --keep-index	23:15
daurnimator	satifant: ah, nice idea	23:15
Seveas	daurnimator: stash would take them out too. So what do you actually want to achieve?	23:15
daurnimator	Seveas: I want to stash some of my many untracked files.	23:15
_ikke_	ash_workz: what does git branch say, on which branch are you now?	23:15
daurnimator	(some untracked files are only relevant to the current branch; but others are relevant to all branches)	23:15
Seveas	and why is stash a good solution, but moving them out of the way not? It has the same effect...	23:15
	← d0nn1e left	23:15
daurnimator	Seveas: because I want them 'attached' to the current commit	23:15
	← waspinator_ left	23:15
Seveas	then commit them...	23:15
Imaginativeone	https://gist.github.com/anonymous/a4cd23ce4a40c9ab17e5	23:15
	→ editshare-ericf joined	23:15
daurnimator	I don't want to commit them; I want to stash them.	23:15
Imaginativeone	My Terminal Session	23:15
ash_workz	_ikke_: okay, so before doing that, I did, (locally) "git checkout master; git branch -d ash_m; git fetch; git checkout ash_m; and it says: error: pathspec 'ash_m' did not match any file(s) known to git.	23:15
daurnimator	anyway, satifant's solution works	23:15
	→ d0nn1e joined	23:15
	→ felixjet joined	23:15
	← felixjet left	23:15
	→ Exagone313 joined	23:15
_ikke_	ash_workz: git checkout -b origin/ash_m ash_m	23:15
daurnimator	satifant: btw, you just have to stage them; then stash. no need to --keep-index	23:17
ash_workz	_ikke_: wait... maybe the remote doesn't have that branch.... how can I check to make sure of that?	23:17
Seveas	Imaginativeone: rm -r .idea	23:17
	→ lindenle joined	23:17
Seveas	git can't delete untracked files with git rm.	23:17
ash_workz	_ikke_: you're previous command resulted in: fatal: Cannot update paths and switch to branch 'origin/ash_m' at the same time.	23:17
	← _nadim left	23:17
Imaginativeone	Seveas: thanks a MILLION	23:18
	→ CLMN joined	23:18
_ikke_	ash_workz: Then origin does not have a branch called ash_m	23:18
	← neanderslob_ left	23:18
ash_workz	_ikke_: so just git push origin ash_m ?	23:19
	← hobodave_ left	23:19
	← CLMN left	23:19
	→ neanderslob joined	23:19
	→ postsneakernet joined	23:19
	← gaen left	23:20
satifant	daurnimator, hm ok... manpage doesn't read like that, or its to late for me to understand it ;)	23:20
	→ gaen joined	23:20
	← znabavi left	23:20
	← showaz left	23:21
	← pozitrono left	23:21
daurnimator	satifant: stashing always stashes the index. --keep-index means stash it, but don't clear the index after (i.e. now the staged changes are in 2 places!)	23:21
	← cbonobo_ left	23:21
	→ cbonobo joined	23:22
ash_workz	_ikke_: okay, now there's a remote branch	23:22
	_ikke_: ash_m pushes to ash_m	23:22
satifant	yeah, i thought that was what you wanted... to keep the changes...	23:22
ash_workz	so I jumped on the server	23:23
	and it says the same thing now when I do git remote show origin	23:23
satifant	but nevermind... if you're satisfied, i'm going to bed ;)	23:23
ash_workz	_ikke_: so can I just do git pull devon ?	23:23
	ash_m	23:23
	→ jason237 joined	23:23
	← Limes_ left	23:23
	← IWishIKnew left	23:24
	→ gnu_d joined	23:24
_ikke_	ash_workz: Try to know what the situation is, instead of guessing it	23:24
	← ril left	23:24
ash_workz	_ikke_: very sound advice	23:24
gnu_d	Hi, I got one local git repo, I want to make copy of it for production releases, how do I copy it and the link with the original with remote url or something ?	23:25
_ikke_	use commands like git branch -r to see which branches you have from remotes	23:25
	git branch to see what local branches you have	23:25
	← thierryp left	23:26
ash_workz	_ikke_: git branch -r shows origin/ash_m	23:26
	← cbonobo left	23:27
	← satifant left	23:27
_ikke_	On what repository is that?	23:27
	← BSaboia left	23:27
	← csd_ left	23:28
	← NeverDie left	23:28
ash_workz	_ikke_: but when I do git pull origin/ash_m ash_m it says "origin/ash_m" does not appear to be a git repository	23:28
	this is on the server now	23:28
_ikke_	ash_workz: the command is: git pull <remote> <branch>	23:28
	you specified a ref in the place of remote	23:28
	→ pnorman joined	23:28
	→ rominron_ joined	23:29
	→ elastix joined	23:29
	gitinfo set mode: +v	23:29
_ikke_	ash_workz: Where is the original ash_m branch?	23:29
	→ znabavi joined	23:30
ash_workz	_ikke_: like, when I first created the branch? on my local computer	23:30
	→ NeverDie joined	23:30
	← gaen left	23:30
	→ sbasso joined	23:31
	→ gaen joined	23:31
	← raek left	23:31
pnorman	I'm trying to figure out what's changing in a commit, https://github.com/osmlab/editor-imagery-index/commit/b400d229e38c38706008f9104707599b32effd60. When I look at the .patch on github or look at it locally with git show b400d22 I see + something and - something, with no apparent difference between what's being added and removed	23:31
	→ raek joined	23:31
	← josuebrunel left	23:32
	← elastix left	23:32
	→ daito joined	23:32
kadoban	Possibly line endings. Is it the whole file that it's saying changed basically?	23:32
pnorman	yes.	23:33
	actually, not quite the whole file. some lines appear unchanged	23:33
	→ Gsham joined	23:34
	← rominron_ left	23:34
_ikke_	And you want the branch on your server?	23:34
kadoban	If nothing looks different it's almost certainly whitespace changes. The usual culprit would be line endings, though it's possible you have an editor that decided to change spaces to tabs or the other way.	23:34
_ikke_	ash_workz: ^^	23:34
	→ mellernoia joined	23:34
	← acetakwas left	23:34
	→ cdg joined	23:34
	← BillCriswell_ left	23:35
pnorman	the files are generated with a python script, so I'll ask what OS they were using	23:35
	← nanga left	23:36
	← daito left	23:37
	→ mischat joined	23:37
	→ ril joined	23:37
	→ nanga joined	23:38
	→ bannakaffalatta joined	23:39
pnorman	git deals well with the large files, being able to compute diffs against objects which aren't the immediately previous ones, so the .git directory is only 3MB with hundreds of diffs like this, but it makes code review a pain	23:40
	← neanderslob left	23:40
	→ neanderslob_ joined	23:40
	← Slush- left	23:40
	→ Sonicbit joined	23:40
	→ cdg_ joined	23:40
	→ madewokherd joined	23:41
	→ Slush- joined	23:41
	→ Ekho joined	23:41
	← lindenle left	23:42
ash_workz	_ikke_: okay, I am just so confused... I really though I was getting it down to. So I was able to pull using git pull origin ash_m	23:42
	→ jimi_ joined	23:42
ash_workz	oh waiut	23:43
	is it possible that my local master branch has moved ahead of server	23:43
	← samw left	23:43
	← crayon left	23:43
	→ mezod joined	23:44
	← gaen left	23:44
	→ M-ixi joined	23:44
	← cdg left	23:44
	→ giddles joined	23:44
giddles	hello again	23:44
	← cdg_ left	23:44
	→ gaen joined	23:45
giddles	how can i deinstall a mailfunction programme?	23:45
	→ cdg joined	23:45
	→ lindenle joined	23:45
ojacobson	What's your git question?	23:45
	→ zhiwliu joined	23:45
giddles	i got some programme von github wich i want to deinstall	23:45
	← leksster left	23:46
giddles	the git clone command displays me a fatal of cause because the programm is already installed	23:46
	← zhiwliu left	23:46
giddles	is there a command howto deinstall that package?	23:46
	← gnu_d left	23:47
	← troulouliou_div2 left	23:47
giddles	or only delete the file?	23:47
ojacobson	!transcript	23:48
gitinfo	Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	23:48
	→ meLon joined	23:48
ash_workz	yeah, git remote show origin on the server says master is out of date	23:49
	_ikke_:	23:49
	^	23:49
	← t0by left	23:49
	← mezod left	23:49
ash_workz	but I don't want to move that yet	23:49
	interestingly	23:49
	when I do git checkout ash_m on the server	23:49
	it does not appear to make my changes	23:49
	← mellernoia left	23:50
kadoban	giddles: git has nothing to do with installing or uninstalling programs.	23:50
	→ cdg_ joined	23:51
giddles	ok	23:51
	← cdg_ left	23:51
	← editshare-ericf left	23:51
	→ cdg_ joined	23:52
	→ M-shine joined	23:52
	→ M-meznak joined	23:52
	→ M-mistake joined	23:52
	→ cagedwisdom joined	23:53
	→ mehola joined	23:53
ash_workz	yeah, git checkout isn't working like I want it to	23:53
	the server serves the page like it was on the master branch	23:53
	→ Chilley joined	23:53
	→ mellernoia joined	23:54
ash_workz	and for some reason doing git fetch + git checkout ash_m didn't update the files either	23:54
	← cdg left	23:54
	← Imaginativeone left	23:55
	← lindenle left	23:55
ash_workz	nor did git pull origin ash_m	23:55
	oh no	23:55
	that did work actually	23:55
	← chitopunk left	23:55
ash_workz	but doing so still did not change the behavior of the server	23:56
	← cdg_ left	23:56
	← causasui left	23:57
	→ d5sx43 joined	23:58
	← Chilley left	23:58
	← dan2k3k4 left	23:58
	→ mezod joined	23:59

Logs Search ←Prev date Next date→

Channels Documentation