IRCloggy #git 2016-02-03

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-02-03
phroa`	check out the master branch locally then run "git checkout -b newbranchname" then "git checkout master" then "git reset --hard <commit-hash-you-want-to-reset-to>" then "git push -f origin master"	00:00
	!rewrite applies but it looks like you're past that anyway	00:01
gitinfo	Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum	00:01
	→ MattMaker joined	00:01
	→ Rodya_ joined	00:01
	→ pewu joined	00:02
	→ BeatrixKiddo joined	00:04
	← jwmann left	00:04
	← diegoaguilar left	00:05
	← raijin left	00:06
	← tottiq left	00:06
	→ tzero joined	00:06
victor-	kadoban: ah, you’re right. it was a pre-commit hook. thanks!	00:07
	← kpease left	00:08
	← davidosomething left	00:09
	→ hexagoxel_ joined	00:10
	→ mischat joined	00:11
	← tzero left	00:11
	← jimi_ left	00:12
jtri	phroa`: thanks! that worked great	00:12
	← hexagoxel left	00:14
	hexagoxel_ → hexagoxel	00:14
	← mischat left	00:16
	← kaiza left	00:17
	→ kaiza joined	00:18
	→ Noldorin joined	00:18
	→ jteneyck joined	00:20
	→ diegoaguilar joined	00:20
	← jteneyck left	00:20
	→ jteneyck joined	00:21
	→ livingstn joined	00:21
	→ nettoweb joined	00:22
	→ tzero joined	00:22
	← mrk left	00:23
	← chitopunk left	00:25
	← jfelchner left	00:25
	→ rominronin joined	00:26
	← astockton left	00:27
	→ raijin joined	00:27
	→ Primer joined	00:27
	→ s8321414 joined	00:29
Primer	Hi, I occasionally commit to a dev branch (git commit -am "WIP") in order to get updates in that branch from one development environment to another. Thing is, git seems to lose track of renamed files when I sometimes reset those commit. I'm on Debian Stale which has git 1.9 and I'm wondering if I'm missing out on this "feature".	00:29
	← blckbit10 left	00:29
Primer	By having such an old version of git	00:30
	→ blckbit10 joined	00:30
	← tzero left	00:30
Primer	Actually, I'm on Debian 7, which is close to EOL	00:30
	← rominronin left	00:31
	← uri_ left	00:32
Primer	So for example, on machine 1 I: git mv file1 file2, git commit -am "WIP", git push (-f as needed), then on machine 2 I: git co -b branch origin/branch, git reset HEAD~1, and the mv is now deleted: file1, untracked: file2	00:32
	← nikio_ left	00:32
	→ tzero joined	00:35
	→ hahuang65 joined	00:35
	← jbudz_ left	00:36
	→ mostlybadfly joined	00:37
	→ nikio_ joined	00:37
	← uber left	00:38
	→ uber joined	00:38
	→ Jusle joined	00:38
	→ nikooio joined	00:38
	← t0by left	00:38
	← jtri left	00:39
	→ tanimislam joined	00:39
	← tanimislam left	00:39
	← hahuang65 left	00:40
	→ tanimislam joined	00:40
	← nikooio left	00:41
	← nikio_ left	00:42
	← mwhooker left	00:42
	← jaguarmagenta2 left	00:43
	→ nitin_ joined	00:45
	← King_Hual left	00:45
	→ samw joined	00:47
	← douglascorrea left	00:48
	← kaiza left	00:49
	← victor- left	00:49
	← livingstn left	00:49
	→ douglascorrea joined	00:50
	← codeman left	00:50
	→ nickadam joined	00:52
	→ avgn5 joined	00:53
	→ madebymarkca joined	00:54
	→ undRzr joined	00:54
	→ jaguarmagenta joined	00:55
	← arooni left	00:55
	→ Outsider__ joined	00:58
	← fstd left	00:59
	→ fstd joined	00:59
	→ LeeXiaolan joined	00:59
	← kilo_bravo left	00:59
	→ AtnevRed joined	00:59
	← nitin_ left	00:59
	← mattfoo left	01:00
	← douglascorrea left	01:00
	← LeeXiaolan left	01:00
	← hyperair left	01:01
	← lolmac left	01:01
	← jottr_ left	01:01
	← Garibaldi0 left	01:03
	← AtnevRed left	01:04
	← imachuchu left	01:04
	→ mattfoo joined	01:05
	← The_Woodsman left	01:06
	← jaguarmagenta left	01:06
	→ nitin__ joined	01:06
	→ jaguarmagenta joined	01:08
	← Gsham left	01:09
	← al-damiri left	01:09
	→ bronson joined	01:09
	← kfoonamalik left	01:09
	→ Poppa\|2 joined	01:10
	← bitkiller left	01:11
	← dances-with-cats left	01:11
	→ dances-with-cats joined	01:12
	→ mischat joined	01:12
	← harish left	01:12
	← Rodya_ left	01:12
	→ Rodya_ joined	01:13
	← bronson left	01:14
	← Poppabear left	01:14
	→ arooni joined	01:15
	→ Sucks joined	01:15
	→ Gsham joined	01:16
	→ dfrey joined	01:16
	← gfixler1 left	01:17
	← Rodya_ left	01:17
	← Poppa\|2 left	01:17
	← clemf_ left	01:17
	→ Rodya_ joined	01:18
	← Gsham left	01:18
	← nettoweb left	01:18
dfrey	Hi. I am trying to build git from source (long story) and I have noticed that contrib/completion/git-prompt.sh never ends up in my installation target directory. I ran make all doc && make install install-doc install-html. Is there something I missed? Or are these scripts never installed?	01:18
	← dances-with-cats left	01:19
	→ jfelchner joined	01:19
	← MattMaker left	01:19
	← Rodya_ left	01:20
	→ Rodya_ joined	01:21
	← keltvek left	01:22
	← Rodya_ left	01:23
	→ jam_ joined	01:24
	← TobyP left	01:24
	→ Rodya_ joined	01:24
	→ Gsham joined	01:25
	→ astockton joined	01:27
	→ rominronin joined	01:27
	← mizu_no_oto left	01:27
	→ lambainsaan_ joined	01:27
	← jam_ left	01:28
	← SimonNa left	01:28
	→ Lyqyd joined	01:29
	← felixjet left	01:29
	← nitin__ left	01:30
	→ felixjet joined	01:30
	← astockton left	01:31
	← rominronin left	01:31
	← EvilPenguin left	01:32
	← jaguarmagenta left	01:33
	→ jaguarmagenta joined	01:33
	→ uri_ joined	01:34
PryMar56	dfrey, /usr/share/git-core/contrib/completion/git-prompt.sh	01:34
	→ jacksparrow007 joined	01:35
	← msonntag left	01:35
	← invisbl left	01:35
	→ invisbl joined	01:36
PryMar56	it show up twice in my package set. I rebuilt the Fedora src rpm	01:36
	→ hahuang65 joined	01:36
	← jkoudys left	01:36
	← Rodya_ left	01:38
	← jaguarmagenta left	01:38
	→ Rodya_ joined	01:39
	← uri_ left	01:39
	← mezod left	01:39
	← jacksparrow007 left	01:39
	← hahuang65 left	01:41
	→ devth_ joined	01:41
	← jteneyck left	01:42
	→ Puhe joined	01:42
	← devth left	01:43
	← shinnya left	01:43
	← ferr left	01:44
	Uptime → Downtime	01:44
	→ mkelly joined	01:47
	← blackwind_123 left	01:48
	→ livingstn joined	01:51
	kolobyte → kolobyte_	01:53
	→ gfixler1 joined	01:53
	← lmatteis left	01:53
	→ uri_ joined	01:53
	← uri_ left	01:56
	→ colwem joined	01:56
	← ajm203_ left	01:57
	← gfixler1 left	01:57
	→ jottr_ joined	01:58
	← MassiveSubtlety left	01:58
	→ MassiveSubtlety joined	01:58
	← diogenese left	01:59
	→ hahuang65 joined	01:59
	→ diogenese joined	01:59
	→ douglascorrea joined	02:00
	← jaafar left	02:01
	← undRzr left	02:01
	← livingstn left	02:01
	→ livingstn joined	02:02
	→ michelangelo joined	02:02
	→ tottiq joined	02:02
	→ dances-with-cats joined	02:02
	← MassiveSubtlety left	02:02
	← thiago left	02:04
	→ uri_ joined	02:05
	← douglascorrea left	02:05
	← donmichelangelo left	02:05
	→ bb010g joined	02:07
	gitinfo set mode: +v	02:07
	← uri_ left	02:08
	← samw left	02:09
	← Sample left	02:10
milki	dfrey: contrib probably needs manual steps to move to the correct places	02:10
	← jottr_ left	02:10
	→ daito joined	02:11
	→ King_Hual joined	02:11
	← Gsham left	02:11
	→ Gsham joined	02:11
	→ harish joined	02:12
	← tottiq left	02:13
	← livingstn left	02:16
	→ ilmgb_ joined	02:17
	→ drodger_ joined	02:18
	→ livingstn joined	02:18
	← drodger left	02:19
	← ilmgb left	02:20
	← BeatrixKiddo left	02:22
	→ Garibaldi0 joined	02:22
	→ TobyP joined	02:23
	→ uri_ joined	02:24
	→ tyll_ joined	02:24
	← King_Hual left	02:26
	← uri_ left	02:26
	← TobyP left	02:26
	← tyll left	02:27
	→ astockton joined	02:27
	→ rominronin joined	02:28
	→ Vampire0_ joined	02:28
	← mischat left	02:28
	← blckbit10 left	02:29
	← radsy left	02:29
	→ clemf joined	02:29
	← rpdprd left	02:30
	→ rpdprd joined	02:30
	→ King_Hual joined	02:31
	← King_Hual left	02:31
	→ King_Hual joined	02:31
	← Vampire0 left	02:31
	← jfelchner left	02:32
	← astockton left	02:32
	← rominronin left	02:33
	← Treio left	02:33
	→ rkazak joined	02:34
	→ Wetmelon joined	02:34
	→ blckbit10 joined	02:36
	→ jkoudys joined	02:37
	← King_Hual left	02:38
	← govg left	02:38
	← clemf left	02:38
	→ nilsi joined	02:38
	→ mablae__ joined	02:39
	→ vkngpmhc joined	02:40
	← mablae_ left	02:42
	← kazantip left	02:43
	→ skorgon joined	02:43
	← dfrey left	02:44
	→ arescorpio joined	02:45
	← Noldorin left	02:45
	→ dfrey joined	02:45
	→ kfoonamalik joined	02:45
	wpkeg → kegstr	02:45
	kegstr → kegster	02:45
	← kegster left	02:45
	→ kegster joined	02:45
	← tanimislam left	02:46
	← pks left	02:46
	← codedmart left	02:46
	← Garibaldi0 left	02:46
	← vkngpmhc left	02:46
	→ jteneyck joined	02:47
	→ vkngpmhc joined	02:47
	← kfoonamalik left	02:47
	→ mizu_no_oto joined	02:48
	→ pks joined	02:49
	← Ahmed90 left	02:50
	→ ome joined	02:50
	← mellernoia-work left	02:50
	← skorgon left	02:51
	← xnull left	02:51
	← mallocthis left	02:52
	→ radsy joined	02:52
	← weox left	02:53
	→ jaguarmagenta joined	02:55
	→ mallocthis joined	02:56
	← durham left	02:56
	→ thiago joined	02:57
	→ kaiza joined	02:57
	← livingstn left	02:58
	→ donmichelangelo joined	03:00
	→ AtnevRed joined	03:00
	← netj left	03:00
	→ netj joined	03:01
	← michelangelo left	03:02
	→ clemf joined	03:03
	→ Goplat joined	03:03
	← AtnevRed left	03:05
	← [Saint] left	03:05
	← mkelly left	03:07
	← Jusle left	03:07
	→ [Saint] joined	03:07
	← d4rklit3 left	03:09
	← jteneyck left	03:09
	→ livingstn joined	03:09
	← rafalcpp left	03:10
	→ rafalcpp joined	03:11
	← yqt left	03:11
	→ yrter_ joined	03:11
	← yrter left	03:12
	← frem left	03:12
	→ terminal_echo joined	03:14
	→ Limes_ joined	03:15
harleypig	Is there an android client for git that allows for ssh passkey push/pull?	03:15
	← elementalest left	03:16
	← m0viefreak left	03:16
	← radsy left	03:17
	← livingstn left	03:17
thiago	besides git + ssh?	03:19
	→ livingstn joined	03:21
	→ uri_ joined	03:21
	→ drupald joined	03:21
	← Limes_ left	03:23
	← dreiss left	03:24
	→ jam_ joined	03:24
	← dances-with-cats left	03:25
	→ reim joined	03:26
	← chachasmooth left	03:26
	← kegster left	03:26
	← uri_ left	03:27
	→ samw joined	03:27
	→ kegster joined	03:27
	→ uri_ joined	03:27
	→ chachasmooth joined	03:27
	← arooni left	03:28
	→ astockton joined	03:28
	← jam_ left	03:29
	→ rominronin joined	03:29
	← uri_ left	03:31
	← tkeith left	03:32
	← astockton left	03:33
	← rominronin left	03:34
	→ uri_ joined	03:35
	→ jacksparrow007 joined	03:36
	→ watabou joined	03:36
	← uri_ left	03:37
	→ uri_ joined	03:37
	→ jackspar_ joined	03:40
	← jacksparrow007 left	03:40
	→ dances-with-cats joined	03:41
	← rkazak left	03:41
	→ dreiss joined	03:41
	← presto left	03:42
	→ [Saint_] joined	03:43
	← [Saint] left	03:43
	→ gfixler1 joined	03:43
	← Sasazuka left	03:44
	→ BeatrixKiddo joined	03:44
	→ presto joined	03:44
	→ jeffreylevesque joined	03:45
harleypig	thiago: no, git+ssh is fine, I was just wondering if there was a git client for the android that could be used to develop. I use termux, so I'm happy with my setup. But my son wants to use a more gui centric environment.	03:46
thiago	why would you develop on Android, as opposed to a laptop?	03:48
	← diegoaguilar left	03:48
	← nilsi left	03:48
	← uri_ left	03:49
	→ davidosomething joined	03:50
	← mallocthis left	03:50
	← livingstn left	03:52
	→ michaelrice joined	03:52
	← Gsham left	03:52
	→ tmcmahon joined	03:53
	→ mallocthis joined	03:53
	→ nnyk_ joined	03:53
	→ ShapeShifter499 joined	03:54
	← mizu_no_oto left	03:55
	→ tinajohnson__ joined	03:56
	← tmcmahon left	03:57
	→ tmcmahon joined	03:57
	← tmcmahon left	03:57
	← s8321414 left	03:57
	→ xaxxon joined	03:58
	← Mentos left	03:58
	← clemf left	03:58
	← michaelrice left	03:59
xaxxon	I added some really big binary files to my repo and later realized I didn't need them ever again. but they still get downloaded every time there's a clone, right? any way to completely remove them? I understand that there are hashes in the tree that rely on those things existing, so this may not be possible, but I figured I'd ask	03:59
	→ diegoaguilar joined	04:00
xaxxon	http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-git-repo <== maybe this?	04:01
	→ michaelrice joined	04:01
	← dreiss left	04:02
xaxxon	git-filter-branch.. sounds right, but make a backup first, right?	04:03
	→ douglascorrea joined	04:03
	← harish left	04:03
	← vkngpmhc left	04:03
	→ harish joined	04:03
	← \|node left	04:05
	→ jottr_ joined	04:06
	→ nnyk joined	04:06
	← douglascorrea left	04:07
	→ dopeddude joined	04:07
	← lindenle left	04:08
	← nnyk_ left	04:09
	← aidalgol left	04:11
	← jottr_ left	04:12
	→ User458764 joined	04:12
	← hyphenated left	04:13
	← presto left	04:13
	→ Manikandan joined	04:13
	← michaelrice left	04:14
	→ nbdy joined	04:15
	→ d4rklit3 joined	04:16
	→ arooni joined	04:16
	← nbdy left	04:16
	← daito left	04:17
	← diegoaguilar left	04:17
	← d4rklit3 left	04:18
	← Rodya_ left	04:19
	→ d4rklit3 joined	04:19
	← d4rklit3 left	04:19
	→ clemf joined	04:19
	← PryMar56 left	04:21
	→ King_Hual joined	04:23
	→ Lyqyd_ joined	04:24
	← Lyqyd left	04:24
	→ mischat joined	04:25
	← terminal_echo left	04:25
	← mallocthis left	04:26
	→ dreiss joined	04:26
	← colwem left	04:26
	← jackspar_ left	04:27
	→ jacksparrow007 joined	04:28
	→ astockton joined	04:29
	← mischat left	04:29
	→ rominronin joined	04:30
harleypig	j!nx4#vmt	04:32
	← jacksparrow007 left	04:32
	→ Silenced joined	04:32
	← Silenced left	04:32
	→ Silenced joined	04:32
	→ Pulp joined	04:33
	← astockton left	04:34
	← bbbthunda left	04:35
	← samw left	04:35
	← User458764 left	04:35
	← rominronin left	04:35
	→ mallocthis joined	04:35
	← harish left	04:37
xaxxon	harleypig, time to change your passwor	04:42
	I suggest hunter2	04:42
harleypig	it certainly is	04:42
	→ harish joined	04:42
harleypig	O	04:43
	I'll go to ***********	04:43
	→ codedmart joined	04:43
	← modocache left	04:43
	→ vkngpmhc joined	04:43
xaxxon	ghost harleypig j!nx4#vmt	04:44
	Invalid password for HarleyPig	04:44
	rats	04:44
harleypig	heh ... separate passwords for every account	04:45
xaxxon	oh.. I usually end up saying my password when I'm trying to identify and a new window pops up.. so it IS my irc apss	04:45
	← jkoudys left	04:46
harleypig	I have too many windows open ...	04:47
	→ squiddle joined	04:48
	← Silenced left	04:49
	→ ensyde joined	04:49
	← codedmart left	04:50
	← dfrey left	04:52
	← nnyk left	04:54
	← 17WABPBLQ left	04:54
	→ eli joined	04:55
	← eli left	04:55
	→ samw joined	04:57
	← squiddle left	04:57
	← fracting left	04:58
	← ygeLN left	04:58
	← vkngpmhc left	04:58
	← xaxxon left	04:58
	→ vkngpmhc joined	04:58
	→ fracting joined	05:00
	→ Silenced joined	05:00
	→ AtnevRed joined	05:01
	→ jam_ joined	05:02
	→ xaxxon joined	05:02
	← Sucks left	05:02
	→ dfrey joined	05:03
	→ mkelly joined	05:03
	← joki left	05:03
	→ douglascorrea joined	05:03
	← mkelly left	05:04
	← arescorpio left	05:05
	→ ygeLN joined	05:05
	← AtnevRed left	05:05
	← sparetire left	05:06
	→ Sucks joined	05:07
	→ mkelly joined	05:07
	← ome left	05:07
	→ circ-user-TFDGm joined	05:07
	← dfrey left	05:07
	→ joki joined	05:08
	← douglascorrea left	05:08
	→ lindenle joined	05:09
	← sdothum left	05:09
	→ bronson joined	05:10
	← s00pcan left	05:11
	→ nilsi joined	05:11
	← Silenced left	05:11
	→ Silenced joined	05:11
	← circ-user-TFDGm left	05:11
	→ elementalest joined	05:12
	← elementalest left	05:12
	→ elementalest joined	05:12
	← hahuang65 left	05:12
	→ croc joined	05:13
	→ rchavik joined	05:13
	← lindenle left	05:13
	← bronson left	05:15
	→ jwmann joined	05:17
	→ daito joined	05:17
	← daito left	05:19
	← CheckDavid left	05:19
	→ daito joined	05:19
	→ astockton joined	05:19
	← Lyqyd_ left	05:19
	→ dfrey joined	05:21
	→ duderonomy joined	05:22
	← fscala left	05:23
	→ michaelrice joined	05:23
	→ rkazak joined	05:25
	→ fscala joined	05:25
	→ mischat joined	05:26
	← ensyde left	05:26
	→ ensyde joined	05:27
	→ Sample joined	05:27
	← blckbit10 left	05:28
	← rkazak left	05:28
	← arooni left	05:30
	→ blckbit10 joined	05:30
	← mischat left	05:30
	→ rominronin joined	05:31
	← dfrey left	05:33
	← ensyde left	05:35
	← rominronin left	05:36
	← mkelly left	05:37
	← Sucks left	05:37
	← Cabanossi left	05:38
	→ banana_pancakes joined	05:39
	→ apotry joined	05:39
	← Pulp left	05:39
	→ Xethron joined	05:39
	→ Cabanossi joined	05:39
	→ Sucks joined	05:41
	← rossome left	05:41
	→ moei joined	05:42
	mniip → phy17Z9	05:42
	← kadoban left	05:45
	phy17Z9 → mniip	05:45
	← dances-with-cats left	05:47
	→ msonntag joined	05:47
	← astockton left	05:48
	→ dfrey joined	05:50
	← Sucks left	05:51
	→ Sucks joined	05:54
	→ nilg joined	05:55
	→ mohabaks joined	05:56
	→ kazantip joined	05:56
	→ rossome joined	05:56
	→ astockton joined	05:57
	thomas → tdubellz	05:58
	← xaxxon left	05:58
	← banana_pancakes left	05:58
	← mallocthis left	05:59
	← Sample left	06:00
	→ kiloreux joined	06:01
	← kiloreux left	06:01
	→ mallocthis joined	06:02
	→ kiloreux joined	06:02
	→ daito_ joined	06:02
	← astockton left	06:02
	← kiloreux left	06:02
	→ mariuscc joined	06:03
	← samw left	06:04
	← jam_ left	06:04
	← daito left	06:05
	← Silenced left	06:05
	→ jaguarmagenta2 joined	06:05
	→ douglascorrea joined	06:07
	← dfrey left	06:07
	← mohabaks left	06:07
	← jaguarmagenta left	06:08
	← dsantiag_ left	06:08
	→ Sample joined	06:08
	→ jottr_ joined	06:08
	→ freimatz joined	06:09
	→ nidr0x joined	06:09
	→ dsantiago joined	06:09
	→ RobertWindows joined	06:09
	→ terminal_echo joined	06:09
RobertWindows	is this for git as in github/git revision?	06:09
	is it possible here to ask for help with git in another project?	06:10
	← douglascorrea left	06:11
	← vkngpmhc left	06:11
	→ s8321414 joined	06:12
	← rodarmor left	06:12
	→ MutantMahesh joined	06:12
thiago	RobertWindows: you can ask for help with git, whichever project you're using it for	06:12
	← nidr0x left	06:13
RobertWindows	thank goodneeds	06:13
	i was trying to branch this project called lateralgm and start a stable branch	06:13
	← jottr_ left	06:13
RobertWindows	but oddly enough, the history is wildly different	06:13
	https://github.com/IsmAvatar/LateralGM/commits/master?page=23	06:13
	4fa0748 is what i checked out in my new branch	06:13
thiago	how did you try to do it?	06:14
RobertWindows	but instead of giving me the history of the master branch behind that time	06:14
	→ govg joined	06:14
RobertWindows	git checkout 4fa which was a pr from someone else	06:14
	and instead i got his history on the branch instead of master's history	06:14
	→ n00bdev joined	06:14
thiago	is 4fa the name of the branch or a SHA-1?	06:14
RobertWindows	yes i didn't feel like typing it out again, i typed the whole	06:15
	https://github.com/IsmAvatar/LateralGM/commits/master?page=24	06:15
	https://github.com/IsmAvatar/LateralGM/commits/stable?page=2	06:15
	we can see the wildly different history of the two branches i created	06:15
thiago	which one is it?	06:15
	the SHA-1 or the name of the branch?	06:15
RobertWindows	the sha-1	06:15
thiago	ok, so you are at that SHA-1	06:16
RobertWindows	but the worse thing is i added all my fixes on this wrong history, so what i want to do is take my stack of changes on stable	06:16
thiago	then you ran git log. What did you expect to see? And what did you see?	06:16
RobertWindows	and rebase it to the same point, except from master and not some random contributors commit history	06:16
	← BekN left	06:16
	→ xaxxon joined	06:16
thiago	ok, so let's address that problem	06:16
RobertWindows	thiago, currently i'm actually at stable head, after all my recent changes	06:16
	→ nidr0x joined	06:16
RobertWindows	and i want to do this carefully to not lose my changes	06:17
thiago	are you at your most recent commit?	06:17
RobertWindows	yes i am	06:17
thiago	and you want to rebase those changes onto a different branch, correct?	06:17
RobertWindows	i aborted a rebase though because i'm certain i'm not sure how to do it	06:17
	yes	06:17
	again i tried with that same sha-1 from that pr and it was still rebasing on the same history too	06:17
thiago	you need to identify two things for this:	06:17
RobertWindows	thus why i aborted	06:17
	→ rinwa_ joined	06:17
RobertWindows	ok	06:17
	→ rscata joined	06:18
thiago	the first commit in your current history that you don't want to rebase. That's your current base.	06:18
	and the new base	06:18
	→ dfrey joined	06:18
RobertWindows	ok	06:18
	← nidr0x left	06:18
	→ rodarmor joined	06:18
RobertWindows	the new base i want to be right when the pr #36 was pulled to master	06:18
thiago	if you said you worked on stable, the first commit you don't want to rebase is the stable branch (probably origin/stable or upstream/stable)	06:18
	→ daito joined	06:19
thiago	don't tell me, just find them	06:19
	when you're done, run: git rebase --onto newbase currentbase	06:19
	→ nnyk joined	06:19
RobertWindows	https://github.com/IsmAvatar/LateralGM/commits/master?page=23	06:20
	https://github.com/IsmAvatar/LateralGM/commits/stable?page=1	06:20
	at the verry bottom of these two pages, can you see where #36 is merged?	06:20
	i want the history on stable before #36 to look exactly like master	06:20
	thiago, how do i find them?	06:20
thiago	git log or a web tool	06:20
	it's up to you	06:20
RobertWindows	see cuz all i was doing was grabbing the sha-1 of #6	06:20
	ok hrm	06:20
	→ nidr0x joined	06:20
RobertWindows	thiago, would i rewind to #36?	06:20
thiago	why do you want to do that?	06:21
	and what's "#36" ?	06:21
RobertWindows	at the very bottom, it's a pr from an early dev who isn't around anymore	06:21
	from that point, is when i want all the stable changes i retroactively imported	06:21
thiago	the command line does not understand "some commit I can see in a web page"	06:21
	and nor can I	06:22
RobertWindows	i want to take the top of the stable page and stick on the bottom of master's page basically if that makes sense?	06:22
	→ rkazak joined	06:22
RobertWindows	hang on	06:22
	https://github.com/IsmAvatar/LateralGM/pull/36	06:22
thiago	you need either the commit's SHA-1 or the name of a branch/ref that might be pointing to it	06:22
	don't give me the link	06:22
RobertWindows	4fa0748 is in there too	06:22
thiago	ok	06:22
RobertWindows	yeah like i said i tried using that but it gave me his forks history instead of masters	06:22
	which i find really odd?	06:22
	← daito_ left	06:23
thiago	why do you find it odd?	06:23
	← rinwa_ left	06:23
RobertWindows	i guess i don't because i guess the sha-1's are based off of his commits which start in his fork	06:23
thiago	if that's not the correct commit, then find the correct one	06:24
RobertWindows	oh it is	06:24
thiago	why do you want to start off a particular commit? Most people start on top of a branch.	06:24
RobertWindows	what else would i use? the thing is the sha-1 there gives me his history	06:24
thiago	explain why you don't want to start on top of one of your project's branches	06:24
RobertWindows	it didn't have very many branches haha, and this master was the only one being maintained	06:24
	so i retroactively decided to create a stable branch	06:24
thiago	ok, so your project has only one branch	06:25
	why do you want to start your work from anything other than the upstream's only branch?	06:25
	← meloc left	06:25
RobertWindows	technically it has 4 but it's complicated, the one branch is for a threading problem but both of those two are too far outdated	06:25
	thiago, i am the only upstream contributor basically	06:25
	and i hate most of my changes	06:25
	i was rather inexperienced when i started working on it	06:25
thiago	choose the branch that will have the changes once you're done	06:25
RobertWindows	that's what i plan on doing long into the future not right now though	06:26
	→ squiddle joined	06:26
RobertWindows	i'm planning on overwriting master with stable, once i get there	06:26
thiago	why not?	06:26
	so your target branch is stable	06:26
RobertWindows	well there's quite a few people using master that like a lot of my changes but	06:26
	→ mischat joined	06:27
RobertWindows	i didn't even follow the projects styleguide because i didn't know what one was	06:27
thiago	I need simply the name of the branch or the SHA-1 on top of which your new changes should appear	06:27
RobertWindows	so the code is a complete mess, i really didn't know what i was doing	06:27
	→ govg_ joined	06:27
thiago	find it or choose it	06:27
RobertWindows	that's where i'm stuck because i want it to be right after #36	06:27
	← govg left	06:27
RobertWindows	but #36 gives me someone else's history if i use it's sha-1	06:27
thiago	find the last commit that is good	06:27
RobertWindows	that's why i suggested to rewind	06:27
	ok	06:27
thiago	sorry, to be clear: in git log, that's the first commit	06:28
	youngest, most recent	06:28
RobertWindows	ok that would be	06:28
	https://github.com/IsmAvatar/LateralGM/pull/251	06:28
	this one that i just pulled which is	06:28
	→ jacksparrow007 joined	06:28
RobertWindows	8d0d903	06:28
thiago	ok, git log. Confirm that it is the commit you want.	06:29
	← dgaleano left	06:29
RobertWindows	and the oldest on stable by me that is good is 7a1acc1	06:29
thiago	make sure that it has everything you want and that nothing you want is missing	06:29
	← michaelrice left	06:29
	← Sucks left	06:29
RobertWindows	git log is not showing me any sha-1's but the description of the commit is correct	06:30
	i know it's good	06:30
	← blckbit10 left	06:30
	← BeatrixKiddo left	06:30
thiago	git log shows SHA-1s	06:30
	→ blckbit10 joined	06:30
RobertWindows	i can't see it, it's also verbose	06:30
	when i typed it a second ago it wasn't... odd	06:30
thiago	it's always visible	06:30
	→ durham joined	06:30
RobertWindows	oh sorry git-bash i couldn't see it in poop brown haha	06:30
	← xaxxon left	06:31
	← mischat left	06:31
RobertWindows	91f3fe0a	06:31
	is the start of it	06:31
thiago	do a git log 91f3fe0a	06:31
	confirm that everything you see, you want	06:31
	then do a git log 91f3fe0a.. (including the two dots)	06:31
	confirm that everything you see you want to discard	06:31
RobertWindows	hold up first	06:31
	https://github.com/IsmAvatar/LateralGM/pull/251	06:31
	thiago, can you tell me why it shows a different sha-1 than the pr?	06:32
	→ thierryp joined	06:32
	← thierryp left	06:32
RobertWindows	even though the description is correct	06:32
thiago	no, I cannot. That's a webpage.	06:32
	it can show anything it wants	06:32
RobertWindows	oh hang on	06:32
	RobertBColton merged commit 8d0d903 into IsmAvatar:stable 4 hours ago	06:32
	→ rominronin joined	06:32
RobertWindows	i guess a separate sha-1 is made for pr's?	06:32
	it looks like it	06:32
	← rkazak left	06:33
RobertWindows	ok now to do what you said	06:33
thiago	I don't like github's workflow, so I don't use it	06:33
	I don't like it because it always creates a merge, for each PR	06:33
	← Puhe left	06:33
thiago	not to mention that their interface is horrible if you want to review a PR that was changed. Horrible as in "impossible, not supported"	06:33
	so when you use their web interface, you get their commits, plus one	06:34
	← durham left	06:34
	→ samw joined	06:34
	→ ThomasLocke joined	06:34
RobertWindows	yeah i understand linus torvalds hates it too	06:34
thiago	you may need to choose that "plus one" commit (the merge commit), depending on what the state of the contribution was before being merged	06:34
RobertWindows	heh either way git is pretty complicated	06:34
	→ durham joined	06:35
RobertWindows	thiago, git log with the two dots.. shows me nothing	06:35
	just exactly like that	06:35
	do i need the full sha-1?	06:35
	← squiddle left	06:35
thiago	no	06:35
	← tpollard left	06:35
thiago	empty means there's nothing to show	06:36
	→ Raging_Hog joined	06:36
thiago	that means you're not excluding anything from your current position	06:36
RobertWindows	i don't want to just take all my commits and throw them on masters history	06:36
	*i want to just	06:37
	← rominronin left	06:37
thiago	are you in the exact state you want master to be?	06:37
RobertWindows	no	06:38
	i am on stable, i want to go back and take masters history and replace it with the history on stable	06:38
	so stable will look like i had masters history and was building on it	06:38
thiago	rephrasing the question:	06:38
	if the current state were in master, would you be done?	06:38
RobertWindows	if all these commits i did in stable were in stable, but with master's history	06:39
	→ scoobertron joined	06:39
RobertWindows	i'd be done	06:39
	← samw left	06:39
	→ squiddle joined	06:39
thiago	ok	06:39
	so there is a number of commits that are in stable and you want to transfer them to master	06:39
	is there anything on master you don't want?	06:39
RobertWindows	no i want master left completely alone	06:40
	just to import its history to stable	06:40
	stable is where i want stuff gone	06:40
thiago	plus your current commits	06:40
	correct?	06:40
RobertWindows	yup	06:40
	exactly	06:40
thiago	I need you to find the first of the commits you want transplanted	06:40
	first as in "oldest"	06:40
RobertWindows	4fa0748 is the first i made	06:41
thiago	git log 4fa0748~..	06:41
	do you see only the commits you want transplanted?	06:41
	→ atmosx joined	06:42
RobertWindows	i want between those translate on masters history	06:42
thiago	yes or no?	06:42
	→ zeroed joined	06:42
RobertWindows	yeah i see the one's i want REPLACED	06:43
	what i see with that git log is what i want to be replaced with master's history	06:43
thiago	did you include the dots?	06:43
RobertWindows	sorry i did git log 4fa0748-	06:43
	hang on	06:43
thiago	copy/paste the command exactly	06:44
	don't forget the dots or the tilde	06:44
RobertWindows	i see all of my commits plus #36 from that guy	06:44
	so all of the one's i want transposed to the head of master	06:45
thiago	so there is one commit you don't want, correct?	06:45
RobertWindows	yeah that guys that was merged	06:45
	there's two, the commit and the merge	06:45
	← rchavik left	06:45
RobertWindows	i want them gone so we have just mine	06:45
	→ rchavik joined	06:45
thiago	did you merge his PR after you began your work?	06:45
RobertWindows	because #36/his will also be in masters history, there's no reason for us to copy that	06:46
	thiago, BEFORE	06:46
	not after	06:46
	and i didn't merge it someone else did, that's just the part wher ei started in master	06:46
thiago	it's showing up in your git log, so git says it was after	06:46
	← salamanderrake_ left	06:46
RobertWindows	decided i didn't want my changes, created a branch and started trying to work at that same point again	06:46
thiago	do you see any merge commits in that git log?	06:46
RobertWindows	yes by author ismavatar the repo owner	06:47
	merged #36	06:47
thiago	what's the Merge line?	06:47
RobertWindows	987b108 b74036a	06:47
	Merge: 987b108 b74036a	06:47
thiago	neither is 4fa0748	06:48
	anyway, git says you merged after you began your work, not before	06:48
RobertWindows	it says 4fa on Commit	06:48
thiago	here's what you'll do instead:	06:48
RobertWindows	in poopy brown just the line before Merge	06:48
thiago	git checkout -b newstable master	06:48
	→ localuser- joined	06:48
	ec → ELLIOTTCABLE	06:48
thiago	find the SHA-1 of each of the commits you want to transplant. Then in the order of oldest to most recent, run:	06:48
	git cherry-pick <sha1>	06:49
	one by one	06:49
	→ hahuang65 joined	06:49
	← squiddle left	06:52
	→ foobarn1 joined	06:52
	← hahuang65 left	06:54
	← durham left	06:54
	→ durham joined	06:55
osse	FYI you can do cherry-pick <sha1> <sha1> <sha1>...	06:55
	→ Layzie joined	06:55
osse	I was pretty close to writing cherry-pretty <sha1> <sha2> <sha3>	06:55
thiago	osse: I'm not sure if that won't reorder the commits basedon actual order	06:56
	← freimatz left	06:56
	← harish left	06:57
	← Layzie left	06:57
	→ TomyLobo joined	06:57
thiago	not to mention that sha2 and sha3 are different algorithms :-)	06:57
	→ mohabaks joined	06:57
	→ LucaTM joined	07:00
osse	it doesn't reorder	07:01
	→ AtnevRed joined	07:02
	← zarubin left	07:02
	→ astockton joined	07:03
	→ harish joined	07:03
	→ troulouliou_div2 joined	07:03
thiago	right, thanks	07:04
	→ jyjon joined	07:04
	← harish left	07:05
	← localuser- left	07:05
	→ localuser- joined	07:05
	← durham left	07:05
	→ tvw joined	07:05
	← dfrey left	07:06
	→ durham joined	07:06
	← jolts left	07:07
	← AtnevRed left	07:07
	→ PCatinean joined	07:08
	← daito left	07:08
	← astockton left	07:08
	→ durham_ joined	07:09
	← durham left	07:09
	→ blackwind_123 joined	07:10
	← foobarn1 left	07:10
	→ zarubin joined	07:12
	← zarubin left	07:12
	→ lamppid joined	07:13
	← nnyk left	07:13
	→ roelmonnens joined	07:14
	→ infra-red joined	07:14
	← dopeddude left	07:14
	→ daito joined	07:14
	→ squiddle joined	07:14
	← daito left	07:14
	→ daito joined	07:15
	→ thierryp joined	07:15
	← thierryp left	07:16
	→ thierryp joined	07:16
	← terminal_echo left	07:16
	→ SimonNa joined	07:17
	→ vkngpmhc joined	07:18
	→ acolson joined	07:18
	→ samw joined	07:19
	→ twb joined	07:20
	→ foobarn1 joined	07:20
twb	You know how git log --stat gives a line like .../wobble/gator.algol \| 10 +-	07:20
	← rchavik left	07:20
twb	Is there a way to say "give the full path please, I don't care if it's long"	07:20
	→ sheilong joined	07:21
	← mohabaks left	07:22
	→ freimatz joined	07:22
	→ rchavik joined	07:23
	← samw left	07:24
	→ muthu joined	07:28
	→ JeroenT joined	07:29
	← foobarn1 left	07:29
	← Wetmelon left	07:30
	→ circ-user-TFDGm joined	07:30
	← infra-red left	07:32
	→ infra-red joined	07:32
	← Gamecubic left	07:32
	→ dfrey joined	07:33
	→ Alienpruts joined	07:33
	← mallocthis left	07:33
	→ Sceorem joined	07:33
	→ rominronin joined	07:33
	→ mohabaks joined	07:34
	← TomyLobo left	07:35
	→ jnavila joined	07:35
	← raijin left	07:37
	← Goplat left	07:38
	← rominronin left	07:38
	tdubellz → thomas	07:39
	← squiddle left	07:39
	← jacksparrow007 left	07:40
	→ foobarn1 joined	07:40
	→ jacksparrow007 joined	07:40
	→ mischat joined	07:42
	← durham_ left	07:44
	→ pantsman- joined	07:44
	→ durham joined	07:44
	← ShapeShifter499 left	07:46
	← mischat left	07:46
	← JeroenT left	07:47
	→ JeroenT_ joined	07:47
	← pantsman- left	07:47
	→ StormLrd joined	07:48
	→ p1k joined	07:48
	→ nnyk joined	07:49
	← heftig left	07:49
	→ heftig joined	07:50
	→ petersr joined	07:50
	→ eGGsha joined	07:50
	← petersr left	07:50
	→ howdoi joined	07:53
	→ rominronin joined	07:53
	← roelmonnens left	07:53
	→ akmoilt joined	07:54
	← pewu left	07:54
osse	twb: --stat-name-width=9999999	07:56
	or --stat=45,45 or whatever. see the man	07:56
	→ rominron_ joined	07:57
	→ baris_ joined	07:57
	→ ShapeShifter499 joined	07:57
	→ fees joined	07:58
	← rominronin left	07:58
	← akmoilt left	07:58
	← justanotheruser left	07:58
	→ tomog999 joined	08:00
	→ akmoilt joined	08:00
	← scoobertron left	08:00
	→ xaa joined	08:01
	→ dan2k3k4 joined	08:02
	← daito left	08:02
	← tomog999_ left	08:03
	→ David1977 joined	08:03
	→ Zenrium joined	08:03
	→ astockton joined	08:04
	→ pewu joined	08:05
	← akmoilt left	08:05
	→ jam_ joined	08:05
	← dfrey left	08:06
	→ irqq joined	08:06
	← StormLrd left	08:06
	← kfunk left	08:06
	← mohabaks left	08:07
	← dreiss left	08:07
	→ exarch joined	08:07
	← rchavik left	08:08
	→ douglascorrea joined	08:08
	← astockton left	08:09
	→ rchavik joined	08:09
	→ TomyWork joined	08:09
	→ jottr_ joined	08:09
	← tinajohnson__ left	08:09
	← jam_ left	08:09
	→ nilsi_ joined	08:11
	rominron_ → rominronin	08:12
	→ flobin joined	08:12
	→ roelmonnens joined	08:12
	← douglascorrea left	08:13
twb	Thanks	08:13
	→ PHPanos joined	08:13
	← jottr_ left	08:14
	→ alanwill joined	08:14
	→ eijk joined	08:14
	← jnavila left	08:14
	← n00bdev left	08:15
	← nilsi left	08:15
	→ hyphenated joined	08:16
	→ cripsy joined	08:18
	← rMdes left	08:20
	← cripsy left	08:21
	→ cripsy joined	08:21
	← thomas left	08:21
	← durham left	08:21
cripsy	hi i need help with understanding how tags are used in projects	08:21
	→ mrkat joined	08:21
	← RobertWindows left	08:21
twb	depends on the project	08:22
	tagging each release is common	08:22
	→ daito joined	08:22
	→ kfunk joined	08:22
	← nnyk left	08:23
	→ nilsi joined	08:23
	→ dfrey joined	08:24
	→ User458764 joined	08:24
	→ harish joined	08:24
cripsy	are tags specific to branches? Right now im working on lets say development branch and want to create a tagged release and at some point I want to merge this branch to my master branch. I want to know what happens to the tags that I make in development branch	08:25
	→ jceb joined	08:25
	→ Balliad joined	08:25
osse	tags don't belong to branches	08:25
	they are global	08:25
twb	AIUI a tag is just a name for a particular commit hash	08:25
cripsy	ok	08:26
twb	like v4.3~alpha4 = gDEADBEE	08:26
	→ _noblegas joined	08:26
twb	Because humans suck at memorizing hashes	08:26
osse	a tag can also have its own "author" (tagger) and its own timestamp	08:27
	and be signed	08:27
twb	ohhhh yeah	08:27
	← foobarn1 left	08:27
cripsy	like annoted tags?	08:27
	← nilsi_ left	08:27
cripsy	annotated*	08:27
osse	they're called annotated tag,s yes	08:28
	← flobin left	08:28
ronny	hi	08:28
	← boombatower left	08:29
ronny	is there a good way to prevent me from commiting to certain branches and/or have pull only remotes?	08:29
	→ nnyk joined	08:29
cripsy	ok thanks osse, twb i got my doubts clear :D	08:29
osse	ronny: the git:// protocol is read-only so you can use that as the URL	08:30
grawity	ronny: gitolite has per-branch access control	08:30
	→ Macaveli joined	08:30
	← alanwill left	08:31
	→ mauricio joined	08:31
ronny	grawity: im not looking at remote, but local	08:31
grawity	man githooks	08:31
gitinfo	the githooks manpage is available at http://jk.gs/githooks.html	08:31
ronny	osse: does that fit with github?	08:31
grawity	or, don't create local branches – check out the remote-tracking branches only	08:32
thiago	ronny: are you pushing to this repository?	08:32
	→ alanwill joined	08:32
thiago	ronny: or do you mean you want to prevent a commit?	08:32
osse	ronny: i think so	08:33
thiago	ronny: or do you mean you want github to prevent pushing to certain branches?	08:34
	← dfrey left	08:36
	← sim642 left	08:36
	← clemf left	08:36
ronny	thiago: i want to prevent local comit to certain branches, and i want to disable pushing branches to a certain repo from my side	08:37
	→ dfrey joined	08:37
ronny	(i still wanto to push tags, jusst no branches)	08:37
thiago	ronny: ok, two things	08:38
ronny	we adapted a workflow where all cahnges are brought in via pull requests, and i want to remove the possibility of making misstakes (since i did make one on occasion)	08:38
thiago	to prevent commits to local branches, you can use the pre-commit hook	08:38
	just make it fail if the branch is prohibited	08:38
	if you want to disable pushing to certain branches, you need to configure the remote server	08:39
	since you said it's github, your question is answered in #github	08:39
ronny	thiago: is not a feature of the service, bascially i want to restrict git on certain remotes to only push tags	08:40
	← circ-user-TFDGm left	08:40
thiago	ronny: so, a feature of the service	08:40
	ronny: if you want to restrict what the server accepts, it's a server config	08:40
ronny	i want to restrict what my client does, since i dont have enough control over the server and its not sustainable to make a own server	08:41
thiago	you cannot	08:41
	→ mischat joined	08:43
	→ circ-user-TFDGm joined	08:46
	← watabou left	08:47
	← alanwill left	08:47
	← mauricio left	08:47
	→ alanwill joined	08:48
	→ Corosus joined	08:49
	← bjoe2k4_ left	08:50
	← mischat left	08:50
	→ acetakwas joined	08:51
	← Corosauce left	08:51
	← sheilong left	08:51
	→ Kicer86 joined	08:51
	← jacksparrow007 left	08:51
	→ nettoweb joined	08:53
	→ bjoe2k4 joined	08:53
	→ lindenle joined	08:56
	← circ-user-TFDGm left	08:57
	→ squiddle joined	08:58
	← gfixler1 left	08:59
	← Macaveli left	08:59
	→ t0by joined	09:00
	← lindenle left	09:00
	→ aleksandar2810 joined	09:01
	→ encod3 joined	09:01
	← thierryp left	09:01
	→ circ-user-TFDGm joined	09:01
	→ luke_penn joined	09:01
	→ sagittarian joined	09:02
	→ thierryp joined	09:02
	→ Macaveli joined	09:02
	→ AtnevRed joined	09:03
	← alanwill left	09:03
	→ astrofog joined	09:03
	→ doener joined	09:04
	→ alanwill joined	09:04
	→ Jellyg00se joined	09:04
	→ astockton joined	09:05
	← dfrey left	09:06
	→ lmat joined	09:06
	→ arnatal joined	09:06
	← Sample left	09:06
lmat	When I 'git status;', I get "fatal: Not a git repository"	09:07
	← AtnevRed left	09:07
	→ kurkale6ka joined	09:07
lmat	when I ls -d .*; it shows "./ ../ .git/"	09:07
	The repository worked within the last couple days. the .git folder looks convincing...	09:08
moritz	do other git commands work?	09:08
lmat	branches/ COMMIT_EDITMSG config description HEAD hooks/ index info/ logs/ objects/ refs/ ...	09:08
	moritz: no.	09:08
	→ dfrey joined	09:08
	← ShapeShifter499 left	09:08
moritz	lmat: restore from backup?	09:08
osse	lmat: env \| grep GIT	09:08
moritz	oh, good thinking	09:08
lmat	osse: nothing.	09:08
	→ TalkToMe joined	09:09
	← squiddle left	09:09
	← astockton left	09:10
	→ ahmedelgabri joined	09:11
	→ tinajohnson__ joined	09:12
lmat	I wonder for what git is looking...	09:12
	→ PinkPonyOfDeath joined	09:12
	← harish left	09:12
	→ Viewtiful joined	09:12
lmat	I would assume it's just looking for .git/. I would think that if anything in there was amiss, the error would be different.	09:12
moritz	lmat: you can always run "strace git status" to find out what it tries	09:13
	← Xethron left	09:13
lmat	moritz: not a bad idea! Installing strace. I'm on archlinux, so that means I'm updating the whole system...I'll let you know in 5 minutes how it went :-/	09:15
	← nnyk left	09:15
	→ thomas joined	09:17
moritz	lmat: 5 miinutes for a whole-system update doesn't sound too bad :-)	09:17
	← alanwill left	09:19
	← TalkToMe left	09:19
	→ alanwill joined	09:20
	→ ShapeShifter499 joined	09:21
	← daito left	09:21
	← rvsjoen_ left	09:23
	→ rvsjoen joined	09:24
lmat	:-)	09:24
	← User458764 left	09:24
lmat	ah...	09:25
	cat .git/HEAD; says "Input/output error"!	09:25
	→ elisa87 joined	09:25
lmat	moritz: (got that from strace)	09:25
	→ zadock joined	09:26
elisa87	why do I receive this error after git status? fatal: Not a git repository (or any parent up to mount point /afs)	09:26
lmat	elisa87: DUDE!	09:26
moritz	lmat: so, broken disk or corrupted file system	09:26
lmat	moritz: yup. I'll try remounting. as should elisa87	09:26
	← thiago left	09:26
	← circ-user-TFDGm left	09:26
elisa87	lmat: moritz I am not really following can you help please?	09:26
lmat	elisa87: It's because you use Apple Macintosh!	09:26
elisa87	I am running this command in Red Hat Linux machines using SSH lmat	09:27
	← luke_penn left	09:28
	→ JeroenT joined	09:29
	← JeroenT left	09:30
	← JeroenT_ left	09:30
lmat	elisa87: Iza just kiddin!	09:30
	→ JeroenT joined	09:30
	→ sylario joined	09:30
	→ marcogmonteiro joined	09:31
	→ sbasso joined	09:31
	→ localuser joined	09:33
	→ clmsy joined	09:34
	← alanwill left	09:35
	→ alanwill joined	09:36
	← localuser- left	09:37
	← dsantiago left	09:39
	← blckbit10 left	09:39
	→ blckbit10 joined	09:39
	→ ftoulemon joined	09:39
	← clmsy left	09:40
	← neunon left	09:42
	→ luke_penn joined	09:43
	← fees left	09:43
	→ mkoskar joined	09:44
	← madduck left	09:44
	→ sgambino joined	09:47
	→ mezod joined	09:48
	← quenode left	09:48
	→ alexex joined	09:48
	← s8321414 left	09:48
alexex	Hey guys, can I configure a difftool for git add -p? or is that impossible? And if I can: how?	09:48
	I researched a little, but I couldnt find anything about this	09:49
	→ quenode joined	09:49
	→ t4nk873 joined	09:49
	→ madduck joined	09:50
	→ neunon joined	09:51
	← alanwill left	09:51
	→ scoobertron joined	09:52
	→ alanwill joined	09:52
Seveas	alexex: interesting idea, but I don't think you can	09:52
	→ User458764 joined	09:53
lmat	elisa87: oh yeah	09:53
	elisa87: Try something like cat .git/HEAD; ?	09:53
Seveas	lmat: no. Never poke in .git manually.	09:53
lmat	you're joking...?	09:54
	← hyphenated left	09:54
Seveas	I'm not. The contents of .git are an implementation detail that's subject to change. Use git's commands to get to the data you want (e.g. git rev-parse HEAD)	09:54
lmat	It seems like a joke, but you're a moderator here? And it might be believable that someone would say that...	09:54
	Seveas: The data I'm seeking is whether .git/HEAD is readable ^_^	09:55
	→ mischat joined	09:55
lmat	Seveas: And maybe what the error is when attempting to read it.	09:55
	→ mase-tech joined	09:56
alexex	Seveas: too bad, because it also presents you diffs, right? Why shouldnt they display in your favorite tool?	09:56
	→ guampa joined	09:56
lmat	elisa87: I did strace git status; and it suggested that the files aren't readable. I'm re-mounting my mount point	09:56
Seveas	lmat: it having become unreadable can only be a result of poking in .git manually, so don't do that :)	09:56
	alexex: that's why I said "interesting idea" :)	09:57
osse	or file system corruption, or hardware faults, or...	09:57
lmat	Seveas: Not at all! I think my mounted drive had a problem, or the mount failed or something	09:57
	→ jacksparrow007 joined	09:57
	→ squiddle joined	09:57
lmat	Seveas: I just removed some drywall in that room... perhaps I git the drive (which is pretty close to the ceiling) :-o	09:57
	→ leonarth joined	09:58
Seveas	git drywall --crumble	09:58
	→ n00bdev joined	09:58
osse	if cat can't read .git/HEAD then Git probably can't eiter	09:58
lmat	Seveas: ^_^	09:59
	Seveas: In short, I would agree with you if you said "never modify anything 'manually' in .git". since cat is only reading, no problem.	09:59
	→ rnsanchez joined	10:00
	→ victortyau joined	10:00
	→ Guest96230 joined	10:01
alexex	Seveas: okay, so thanks anyways :-)	10:01
	← Guest96230 left	10:01
	→ Guest96230 joined	10:01
	→ TalkToMe joined	10:02
	Guest96230 → aidalgol`	10:02
	aidalgol` → aidalgol	10:02
	← alexex left	10:02
	← mezod left	10:03
	→ Urcju joined	10:04
	← Urcju left	10:05
	→ spinningarrow joined	10:05
	→ astockton joined	10:05
	gitinfo set mode: +v	10:06
	→ ferr joined	10:06
	→ jam_ joined	10:06
	→ localuser- joined	10:07
	← sgambino left	10:07
	← alanwill left	10:07
	→ alanwill joined	10:08
	→ josue joined	10:10
	← vkngpmhc left	10:10
	→ jottr_ joined	10:10
	→ Hounddog joined	10:10
	← astockton left	10:10
	→ douglascorrea joined	10:10
	← localuser left	10:10
	← jam_ left	10:10
	→ woev joined	10:11
	← woev left	10:11
	→ jnavila joined	10:12
	→ flavi0 joined	10:14
	→ fees joined	10:14
	← User458764 left	10:14
	← douglascorrea left	10:15
	← blackwind_123 left	10:15
	← jottr_ left	10:15
	← josue left	10:15
	→ josue joined	10:16
	← josue left	10:16
	→ totte joined	10:16
	→ hyphenated joined	10:17
	← Macaveli left	10:17
	← squiddle left	10:17
	← dsdeiz left	10:18
	→ josue joined	10:18
	← nilsi left	10:19
	← n00bdev left	10:19
	← jyjon left	10:20
	→ jnavila_ joined	10:20
	← josue left	10:21
	← jnavila left	10:21
	← Atm0spher1c left	10:21
	→ daito joined	10:22
	→ josue joined	10:22
	← thierryp left	10:23
	→ circ-user-JJNIJ joined	10:23
	← alanwill left	10:24
	→ alanwill joined	10:25
	→ notebox joined	10:25
	← josue left	10:26
	← daito left	10:27
	← madebymarkca left	10:27
	→ josuebrunel joined	10:29
	← josuebrunel left	10:31
	→ samskiter joined	10:32
	→ dancinggrass joined	10:33
	gitinfo set mode: +v	10:33
	→ powered joined	10:33
	← ferr left	10:34
	← Hounddog left	10:36
	→ Peng_ joined	10:36
	→ josuebrunel1 joined	10:37
	← josuebrunel1 left	10:37
	→ bollullera joined	10:38
	← astrofog left	10:38
	→ josuebrunel joined	10:38
	← josuebrunel left	10:38
	→ Talk_To_Me joined	10:40
	← spinningarrow left	10:40
	← alanwill left	10:40
	→ tlaxkit joined	10:40
	→ bitkiller joined	10:40
	→ josuebrunel joined	10:40
	← Peng_ left	10:40
	→ alanwill joined	10:41
	→ durham joined	10:41
	← TalkToMe left	10:41
	← nettoweb left	10:44
	→ nettoweb joined	10:45
	← Talk_To_Me left	10:45
	→ sgambino joined	10:46
	→ TalkToMe joined	10:46
	← TalkToMe left	10:47
	← victortyau left	10:47
	→ TalkToMe joined	10:48
	→ dsantiago joined	10:50
	← TalkToMe left	10:50
	→ dgriffi joined	10:50
	→ clmsy joined	10:50
	→ junw joined	10:51
	← t4nk873 left	10:51
	→ muthu_ joined	10:51
	← muthu left	10:52
	← aidalgol left	10:52
	→ harish joined	10:53
	→ Wetmelon joined	10:54
	→ courrier joined	10:55
	← tvw left	10:55
	← alanwill left	10:56
	← acetakwas left	10:56
	← dan2k3k4 left	10:56
	→ ac3takwas joined	10:56
	← diogenese left	10:57
	→ alanwill joined	10:57
	→ lindenle joined	10:57
	← ac3takwas left	10:58
	← Jellyg00se left	10:58
	→ ac3takwas joined	10:58
	← aleksandar2810 left	10:58
	← ac3takwas left	10:59
	→ ac3takwas joined	11:00
	→ marscher joined	11:00
	→ aleksandar2810 joined	11:01
	← ac3takwas left	11:01
dgriffi	I've used git rebase to remove some commits, but even after doing git push origin -f, those commits are still being referenced in a Github issue. how do I delete those once and for all?	11:01
	→ ac3takwas joined	11:02
	← lindenle left	11:02
	← ac3takwas left	11:02
	→ AtnevRed joined	11:04
powered	these commits are removed from the repository, but still referenced by the github issue?	11:04
	sounds like a github issue	11:04
	a issue issue	11:04
	→ samw joined	11:05
	← hyphenated left	11:06
	← aleksandar2810 left	11:06
	→ astockton joined	11:06
	← dfrey left	11:07
	← elisa87 left	11:07
	← AtnevRed left	11:08
	← fees left	11:08
	← twb left	11:09
	→ fees joined	11:09
	← samw left	11:09
	→ harish_ joined	11:09
	← harish left	11:09
	← harish_ left	11:09
	→ infra-re_ joined	11:09
	→ harish joined	11:10
	← Zenrium left	11:11
	→ User458764 joined	11:11
	→ denn1s_ joined	11:12
	← alanwill left	11:12
	← astockton left	11:12
	← infra-red left	11:13
	← JeroenT left	11:13
	→ bronson joined	11:13
	→ jorj joined	11:13
	→ xvx joined	11:13
	→ StormLrd joined	11:14
	← fracting left	11:14
	→ fracting joined	11:15
	→ interrobangd joined	11:16
	← cannonball left	11:17
	→ aleksandar2810 joined	11:18
	← bronson left	11:18
	→ kristofferR joined	11:18
	→ diogenese joined	11:18
	→ dfrey joined	11:19
	← mkoskar left	11:19
	→ akushner joined	11:19
	→ m0ltar joined	11:20
	→ n00bdev joined	11:20
	→ codeman joined	11:21
	→ infra-red joined	11:22
	← zadock left	11:22
	← leeN left	11:23
	→ raijin joined	11:24
	← akushner left	11:24
	← denn1s_ left	11:24
	← n00bdev left	11:24
	← infra-re_ left	11:24
	→ denn1s_ joined	11:24
	→ akushner_ joined	11:25
	→ et0r joined	11:25
	← leonarth left	11:25
dgriffi	powered: is there a way I can also remove these commits from my local repo without simply deleting it and doing "git clone" of my stuff on github?	11:25
	→ leonarth joined	11:26
osse	dgriffi: if you did what you said then they are gone from your local repo	11:26
powered	didn't you delete these commits in the local repo to begin with?	11:26
	or a different local repo?	11:26
	→ akushner joined	11:29
	← akushner_ left	11:29
	→ akushner__ joined	11:29
	← Guest59176 left	11:30
	← akushner__ left	11:30
dgriffi	osse: I can still get to them by their SHA1	11:30
osse	dgriffi: git gc	11:30
	→ infra-re_ joined	11:30
dgriffi	osse: didn't get rid of them	11:30
osse	gti reflog expire --all --expire=all && git gc --prune=all	11:30
_ikke_	Note that you loose your reflog with this	11:31
osse	but I don't see the point. Either they will go away eventually, or they will and should never go away	11:31
	→ Fijit joined	11:31
	← atmosx left	11:31
	→ akushner_ joined	11:31
	← aleksandar2810 left	11:32
powered	yes only if you deliberately bring them back	11:32
_ikke_	and git clone will not send those objects	11:32
	neither will git fetch	11:32
	← scoobertron left	11:33
	← infra-red left	11:33
dgriffi	can someone deliberately clone or fetch those SHA1s?	11:33
osse	no	11:33
powered	but you said they were referenced from github? that means they're already out there in the wild	11:34
osse	depends on how github references them	11:34
	→ acetakwas joined	11:34
dgriffi	at this point being referenced from github is a minor irritation.	11:34
_ikke_	Executing gc locally will not expire them on github either	11:34
osse	if there is an actual ref (in git terms) for the issue then it won't go away.	11:34
	← blckbit10 left	11:34
_ikke_	I think it's just a link	11:35
osse	if it's just a direct link to a blob or whatever then that link might become invalid soon	11:35
dgriffi	I imagine this is something the github admins can manually fix	11:35
osse	I assume github purges crap quite often	11:35
	→ zarubin joined	11:35
dgriffi	well, here's the issue that's annoying me: https://github.com/DavidGriffith/inform6lib/issues/25	11:35
powered	I meant there was a point in time where these commits were in the public repository, so anyone could've downloaded them	11:36
	→ aleksandar2810 joined	11:36
	← dfrey left	11:36
dgriffi	powered: there's no security problem. I just don't want people asking me about those commits.	11:36
_ikke_	I don't know whether github sees that as an active reference	11:36
	← acetakwas left	11:37
powered	ok in that case you've got nothing to worry about anymore	11:37
	→ Jusle joined	11:37
	→ acetakwas joined	11:37
dgriffi	so I'll just do the fix the Right Way locally and then wait for the github admins to fix the mess in my commit?	11:38
osse	i cloned the repo and that commit is not in it	11:38
dgriffi	osse: right. I want to avoid the potential annoyance of you looking at Issue 25 and pestering me about commit 33255271f5aca093597f080f12df7d03ca128823	11:39
	← et0r left	11:39
osse	can't you delete that comment fro mthe issue thread or something like that?	11:39
_ikke_	dgriffi: That you have to arrange with github	11:39
dgriffi	osse: tried already	11:40
	osse: like _ikke_ suggested, I sent a message to the admins to help me out.	11:40
	I guess I'm done	11:41
	thanks guys.	11:41
osse	my guess is that link will be a 404 pretty soon	11:41
	← _rgn left	11:41
	→ blckbit10 joined	11:41
	← User458764 left	11:42
_ikke_	The link to the comment you mean?	11:42
	← hackel left	11:42
_ikke_	commit*	11:42
	https://github.com/DavidGriffith/inform6lib/commit/33255271f5aca093597f080f12df7d03ca128823	11:42
osse	yes	11:43
	← pewu left	11:43
	← kristofferR left	11:44
	← akushner left	11:44
	← acetakwas left	11:45
	← HanClinto__ left	11:46
	→ User458764 joined	11:46
	← lambainsaan_ left	11:46
	→ pewu joined	11:47
	← neanderslob left	11:48
	→ JeroenT joined	11:48
	← KennosiS left	11:48
	← akushner_ left	11:48
	→ akushner_ joined	11:49
	← samskiter left	11:49
	→ akushner joined	11:50
	→ tvw joined	11:51
	← Vile left	11:52
	→ dfrey joined	11:52
	→ cxz joined	11:53
	→ askhat joined	11:54
	→ Vile joined	11:54
	← cxz left	11:54
	← Vile left	11:55
	← sgambino left	11:57
	→ KennosiS joined	11:57
	→ mauricio joined	11:59
	→ samskiter joined	11:59
	← askhat left	12:00
	→ lambainsaan_ joined	12:00
	→ HanClinto__ joined	12:01
	← lambainsaan_ left	12:01
	→ lambainsaan_ joined	12:02
	← KennosiS left	12:02
	← lambainsaan_ left	12:02
	→ dsdeiz joined	12:03
	→ mellernoia joined	12:04
	→ zzz joined	12:04
	zzz → Guest52305	12:04
	→ cxz joined	12:05
	→ lambainsaan_ joined	12:05
	← dfrey left	12:05
	← lambainsaan_ left	12:06
	→ jottr_ joined	12:06
	→ lambainsaan_ joined	12:07
	→ jam_ joined	12:07
	← raijin left	12:07
	← lambainsaan_ left	12:07
	→ lambainsaan_ joined	12:08
	← lambainsaan_ left	12:09
	→ lambainsaan_ joined	12:09
	← StormLrd left	12:10
	← lambainsaan_ left	12:10
	→ lambainsaan_ joined	12:11
	← jam_ left	12:11
	← User458764 left	12:11
	← lambainsaan_ left	12:11
	← Viewtiful left	12:15
	→ _rgn joined	12:16
	← _rgn left	12:16
	→ _rgn joined	12:16
	← blckbit10 left	12:17
	→ blckbit10 joined	12:17
	← fracting left	12:19
	← deltab left	12:20
	→ Viewtiful joined	12:20
	→ n00bdev joined	12:20
	→ acetakwas joined	12:21
	→ fracting joined	12:22
	→ dfrey joined	12:22
	→ localuser joined	12:23
	→ daito joined	12:23
	→ Juzzika joined	12:23
	→ ferr joined	12:24
	← ahmedelgabri left	12:24
	← acetakwas left	12:25
	← Manikandan left	12:25
	← n00bdev left	12:25
	← localuser- left	12:27
	→ deltab joined	12:27
	← daito left	12:27
	→ Viewtifu_ joined	12:28
	→ sbasso_ joined	12:29
	← localuser left	12:29
	→ sylario_ joined	12:30
	← oliva left	12:30
	→ s8321414 joined	12:30
	→ jottr joined	12:30
	→ codedmart joined	12:30
	→ KaibaCorp joined	12:30
	→ justanotheruser joined	12:31
	→ mohabaks joined	12:33
	→ mostlybadfly_ joined	12:33
	← sylario left	12:34
	← nidr0x left	12:34
	← kaiza left	12:34
	← Viewtiful left	12:34
	← sbasso left	12:34
	← davidosomething left	12:34
	← mase-tech left	12:34
	← Sceorem left	12:34
	← mostlybadfly left	12:34
	← iera left	12:34
	← SirCmpwn left	12:34
	← jottr_ left	12:34
	← Guest52305 left	12:34
	← mariuscc left	12:34
	sylario_ → sylario	12:34
	→ iera joined	12:34
	→ SirCmpwn joined	12:34
	→ mase-tech joined	12:34
	mostlybadfly_ → mostlybadfly	12:34
	← SimonNa left	12:34
	→ davidosomething joined	12:35
	→ oliva joined	12:36
	→ KennosiS joined	12:37
	← dfrey left	12:37
	→ Arsonide joined	12:39
	← Raging_Hog left	12:39
	← cagedwisdom left	12:40
	→ dfrey joined	12:40
	→ mariuscc joined	12:41
	← cebor left	12:41
	← HanClinto__ left	12:41
	← David1977 left	12:41
	← KennosiS left	12:42
	→ acetakwas joined	12:42
	→ David1977 joined	12:43
	→ Raging_Hog joined	12:43
	→ ahmedelgabri joined	12:43
	→ KennosiS joined	12:44
	→ cebor joined	12:45
	→ simonlinj joined	12:47
	← Arsonide left	12:48
	→ rnsanchez_ joined	12:50
	→ mizu_no_oto joined	12:50
	← dsdeiz left	12:50
	→ dsdeiz joined	12:50
	← jottr left	12:51
	← MutantMahesh left	12:52
	→ jottr joined	12:52
	→ FunkyAss joined	12:52
	← rnsanchez left	12:53
	→ ki0 joined	12:54
	→ douglascorrea joined	12:54
	← Juzzika left	12:54
	→ Juzzika joined	12:54
	← diogenese left	12:56
	← durham left	12:56
	→ zzz joined	12:58
	zzz → Guest11070	12:58
	← fstd left	12:59
	← mohabaks left	12:59
	→ fstd joined	13:00
	→ fahadash joined	13:01
	← fahadash left	13:01
	→ fahadash joined	13:01
	← fahadash left	13:01
	→ fahadash joined	13:01
	← clmsy left	13:02
	→ hobodave joined	13:03
	→ raijin joined	13:04
	→ AtnevRed joined	13:05
	→ localuser- joined	13:05
	← dfrey left	13:06
	← jacksparrow007 left	13:06
	→ rclanan joined	13:06
	→ jacksparrow007 joined	13:06
	← Juzzika left	13:07
	← jnavila_ left	13:07
	→ mahendra_ joined	13:08
	→ rwb joined	13:09
	→ astockton joined	13:09
	← AtnevRed left	13:09
	← localuser- left	13:09
	→ localuser- joined	13:09
	← mizu_no_oto left	13:10
	← rclanan left	13:11
	← jeffreylevesque left	13:13
	← astockton left	13:14
	→ mkoskar joined	13:14
	→ nilsi joined	13:17
	→ dfrey joined	13:18
	← Viewtifu_ left	13:20
	→ n00bdev joined	13:21
	← the_cybersphinx left	13:21
	→ the_cybersphinx joined	13:22
	→ Viewtiful joined	13:22
	← Viewtiful left	13:22
	→ Viewtiful joined	13:22
	→ synthroid joined	13:23
	→ hyperair joined	13:24
	→ Jellyg00se joined	13:24
	← n00bdev left	13:27
	→ jkoudys joined	13:27
	← aleksandar2810 left	13:28
	→ tomog999_ joined	13:28
	← tomog999 left	13:31
	→ cbruegge joined	13:31
	→ circuitCarre joined	13:31
	→ jeffreylevesque joined	13:32
	→ mezod joined	13:33
	← AndChat\|262656 left	13:33
	← notebox left	13:34
	← oxsyn left	13:34
	← sonOfRa left	13:35
	← BtbN left	13:35
	← Sephyros left	13:35
	← denn1s_ left	13:35
	→ BtbN joined	13:35
	→ sonOfRa joined	13:35
	← cbruegge left	13:36
	← dfrey left	13:36
	← croc left	13:36
	← bloony left	13:36
	→ croc joined	13:36
	→ ahmed_elgabri joined	13:37
	← ferr left	13:37
	→ ash_workz joined	13:37
	← croc left	13:38
	→ denn1s_ joined	13:38
	→ croc joined	13:38
	→ presto joined	13:39
	← denn1s_ left	13:39
	← luke_penn left	13:39
	← ahmedelgabri left	13:39
	→ jaguarmagenta joined	13:43
	← samskiter left	13:44
	← fscala left	13:44
	→ denn1s_ joined	13:44
	→ samskiter joined	13:44
	→ liranp joined	13:45
	← jaguarmagenta2 left	13:45
	→ fscala joined	13:46
	→ sdothum joined	13:46
	← circuitCarre left	13:46
	← denn1s_ left	13:46
	→ bellxs joined	13:46
	→ mblack joined	13:47
	→ StormLrd joined	13:49
	→ Rodya_ joined	13:50
	← samskiter left	13:51
	← s8321414 left	13:51
	→ denn1s_ joined	13:51
	← circ-user-JJNIJ left	13:52
	→ jimi_ joined	13:52
	→ circ-user-15GfU joined	13:52
	→ infra-red joined	13:52
	→ dfrey_ joined	13:52
	→ algae joined	13:52
	→ samskiter joined	13:52
	← jimi_ left	13:53
	→ mohabaks joined	13:53
	→ shekhar_ joined	13:53
	→ cachwir joined	13:53
	← denn1s_ left	13:54
	← infra-re_ left	13:54
	→ ag4ve joined	13:55
	← acetakwas left	13:55
cachwir	Hi ! I'm new on git and I'm trying to clone a project using ssh. I created my public key and a config file in the .ssh directory with the informations about the host where I want to clone the repository from. However, when I try to use git clone repositoryurl, I get the error ssh: connect to host **************** port 22: Connection timed out	13:56
	fatal: Could not read from remote repository.	13:56
	← eGGsha left	13:56
	← Rodya_ left	13:56
	→ jimi_ joined	13:57
	→ Juzzika joined	13:57
cachwir	The project manager told me he created an account for me on git, gave me the login and added that I didn't need any password because the key would authenticate me. However, I don't really know what he means by creating an account on git (did he mean github ?) and I don't know what to do to connect to that account through git. :/	13:57
canton7	cachwir, your repositoryurl is wrong	13:58
	... or something's blocking port 22	13:58
	← m0ltar left	13:58
	→ linfaimom joined	13:58
	chris_wot → chris_wot_away	13:59
cachwir	Don't I need to connect somewhere ? Or give a login ? :/	13:59
	Are you sure it's a problem with the repositoryurl or the port ?	14:00
canton7	"ssh: connect to host"	14:00
	← localuser- left	14:00
canton7	ssh could not establish a connection with the machine you specified	14:00
	→ lindenle joined	14:00
canton7	git's completely irrelevant at this point	14:00
	→ localuser- joined	14:00
canton7	bit like saying "google's broken" because your wifi's died and you can't connect to the internet :P	14:00
cachwir	lol ok. That's before even checking account permissions. ^^	14:01
canton7	yep. it couldn't even establish a connection	14:01
cachwir	Thanks canton7, I understand a bit more now. :)	14:02
canton7	:)	14:02
	← cripsy left	14:03
cachwir	canton7, I just realized something	14:03
	in the config file, the writte port isn't 22	14:03
	→ notebox joined	14:04
cachwir	written*	14:04
	→ Rodya_ joined	14:04
	→ jbudz joined	14:04
cachwir	How come git clone uses the port 22 ?	14:04
	→ jabular joined	14:04
	← lindenle left	14:04
canton7	I'll need to see both the config file and the 'git clone' command you're using	14:04
	(edit out stuff if you need to)	14:04
	← Juzzika left	14:05
	← Raging_Hog left	14:05
cachwir	Well, I can't show you everything, but I can at least show you what it looks like	14:05
	← rchavik left	14:05
	→ denn1s_ joined	14:05
cachwir	Host *************	14:05
	User git	14:05
	HostName **********	14:05
	Port ****	14:05
	PreferredAuthentications publickey	14:05
	IdentityFile /home/cachwir/.ssh/id_rsa	14:05
canton7	pastebin, please	14:05
	← jacksparrow007 left	14:05
cachwir	oh sorry, yes	14:05
canton7	please don't just use *'s for everything - I'm looking for if particular strings in the config file and 'git clone' match	14:06
	and it's hard to do that with '*'s :P	14:06
	→ oxsyn joined	14:07
	← mohabaks left	14:07
	→ zenpac joined	14:07
	→ jam_ joined	14:08
cachwir	Well, I can tell you that the git clone command looks like something like that : sudo -i git clone git@Host:games/somegame.git	14:08
	→ lj1102 joined	14:08
	← jbudz left	14:08
cachwir	where Host is the same as the Host name in the config file	14:08
canton7	where 'Host' is literally 'Host', and not 'some.host.com'?	14:08
	→ livingstn joined	14:08
cachwir	it's writtent like some.host.com	14:08
	← dfrey_ left	14:08
cachwir	written*	14:08
	→ Tropit joined	14:08
canton7	this is hopeless	14:09
zenpac	In a feature/xyz branch created by user Joe, Then Joe creates a Pull Request on github. Can another user add to that feature and have it show up in the PR?	14:09
	← dsdeiz left	14:09
zenpac	I suppose that is Github-centric question?	14:09
canton7	cachwir, the 'Host' line in the ssh-config file needs to match the url you're cloning from. Does it?	14:09
cachwir	yes, it does	14:09
	← tinajohnson__ left	14:09
	→ astockton joined	14:10
canton7	and in the error " error ssh: connect to host ************** port 22: Connection timed out", is the ********* equal to the HostName value in the ssh-config file?	14:10
	→ daito joined	14:10
	← denn1s_ left	14:10
cachwir	yes, but not the port. However, the file is just called config, not ssh-config	14:11
canton7	.ssh/config, yeah	14:11
	← blckbit10 left	14:11
	→ cdg joined	14:11
canton7	is it a debian-based system?	14:12
cachwir	Yes	14:12
	I'm on Linux Mint	14:12
canton7	ah no, the bug I found wasn't relevant	14:12
	try 'ssh Host' - does that connect?	14:12
	→ blckbit10 joined	14:12
	← jam_ left	14:13
	→ denn1s_ joined	14:13
	→ sgambino joined	14:13
	→ acetakwas joined	14:13
cachwir	yes, it does	14:13
	← hobodave left	14:13
	→ dances-with-cats joined	14:13
	← Code_Bleu left	14:14
canton7	ooh I missed the sudo	14:14
	why sudo?	14:14
	← denn1s_ left	14:14
canton7	does 'sudo -i ssh Host' work?	14:14
	← daito left	14:15
cachwir	Oh, that's because I'm in a protected folder	14:15
	← astockton left	14:15
	→ rkazak joined	14:15
	→ Code_Bleu joined	14:15
	→ chll joined	14:16
canton7	..?	14:16
	← interrobangd left	14:16
	→ t4nk190 joined	14:16
cachwir	Weird. When I go sudo -i ssh Host, it does nothing	14:17
	do*	14:17
	← powered left	14:17
canton7	yeah, 'cos that sudo command runs the login shell of the target user	14:17
	which changes $HOME, which changes where it looks for .ssh/config	14:18
	← jottr left	14:18
cachwir	Ooooh I see	14:18
	→ mizu_no_oto joined	14:18
canton7	So the answer to "<canton7> and in the error " error ssh: connect to host ************** port 22: Connection timed out", is the ********* equal to the HostName value in the ssh-config file?" is probably actually "no", not "yes"	14:18
	→ bbbthunda joined	14:19
cachwir	Well, I just tried in another folder with just git clone (no sudo -i) and I still get the same error	14:19
	wait no	14:19
canton7	so we've got to a point where 'git clone user@Host' fails to connect, but 'ssh user@Host' does connect?	14:20
cachwir	I get this error this time	14:20
	GitLab: The project you were looking for could not be found.	14:20
	fatal: Could not read from remote repository.	14:20
	Please make sure you have the	14:20
canton7	right, completely different	14:20
	it's now connected, but either you don't have access to that repo, or the repo doesn't exist	14:20
	← rkazak left	14:20
canton7	(I can't tell since you truncated the message)	14:20
cachwir	(and the repository exists.	14:20
	)	14:20
canton7	"Please make sure you have the (and the repository exists)"?	14:21
	← Joel left	14:21
cachwir	oh sorry	14:21
	→ dfrey_ joined	14:21
cachwir	The correct access rightds	14:22
canton7	ok, so like I said	14:22
	wrong repo, or bad key	14:22
cachwir	When you say key, would it be my public key I gave him ?	14:22
	→ tropit_ joined	14:23
canton7	so you're not providing the private part to the public key you gave him. or you're giving the wrong repo name. or he set things up wrong.	14:23
	→ n00bdev joined	14:23
	rnsanchez_ → rnsanchez	14:24
	← qpdb left	14:25
	→ modocache joined	14:26
	← Ph_ left	14:26
	gitinfo set mode: +v	14:26
	→ moriko joined	14:26
	→ sparetire joined	14:27
	← localuser- left	14:27
	→ subhojit777 joined	14:28
	→ qpdb joined	14:28
tropit_	Hey, somone maybe know how i can apply stash and pass over conflicts?	14:28
	← n00bdev left	14:28
cachwir	Ok. Thanks a lot canton7. :)	14:28
	You helped a bunch	14:28
canton7	one trick is to run 'ssh -vvv git@Host' and see what keys it gives	14:29
	ChanServ set mode: +o	14:29
	qsx set mode: +v	14:29
qsx	you have the same amount of letters in your nick and get the same color here. i can’t distinguish you.	14:29
	+v-o qsx qsx	14:30
	qsx set mode: +v	14:30
	qsx set mode: -o	14:30
	ChanServ set mode: -v	14:30
	→ victortyau joined	14:30
canton7	I don't like being marked as one of those non-registered peasants ;)	14:31
	← codeman left	14:31
	→ CheckDavid joined	14:32
	← eijk left	14:32
qsx	:<	14:32
	→ happy-dude joined	14:33
	ChanServ set mode: +v	14:34
	ChanServ set mode: +v	14:34
	→ Joel joined	14:35
	← dfrey_ left	14:36
	→ Ph_ joined	14:36
	← mostlybadfly left	14:37
	→ JohnBat26 joined	14:38
	← jwmann left	14:39
	← ruskie left	14:39
	← PaulCapestany left	14:40
	→ PaulCapestany joined	14:41
	→ samw joined	14:41
	→ Dougie187 joined	14:41
	→ al-damiri joined	14:41
	→ Gsham joined	14:42
	→ dfrey_ joined	14:42
	→ Treio joined	14:42
	→ IdanM joined	14:43
	← samw left	14:46
	→ cyan__ joined	14:46
	← Gsham left	14:46
	→ codeman joined	14:48
	→ Gamecubic joined	14:48
	← simonlinj left	14:49
	→ Juzzika joined	14:49
	← xvx left	14:49
	→ squiddle joined	14:51
	← sbasso_ left	14:52
	← codeman left	14:52
	→ localuser- joined	14:52
	→ simonlinj joined	14:52
	← dances-with-cats left	14:52
	← acetakwas left	14:53
	→ ruskie joined	14:54
	→ ianclark joined	14:54
	→ AaronMT joined	14:56
	← squiddle left	14:57
	→ grc joined	14:57
	→ achadwick joined	14:58
	← marscher left	14:58
	← nettoweb left	14:58
	← rscata left	15:00
	← MeltedLux left	15:00
	← mauricio left	15:01
	→ alanwill joined	15:02
	← David1977 left	15:03
	→ mohabaks joined	15:03
	→ starsinmypockets joined	15:03
	→ BigWillie joined	15:03
	← Code_Bleu left	15:04
	← JanC left	15:05
	← ag4ve left	15:05
	→ AtnevRed joined	15:05
	← glebihan left	15:06
	→ dances-with-cats joined	15:06
starsinmypockets	I have kaleidoscope set up with ksdiff which is great but... does anyone know if there is a way to see merge conflicts (>>>> ==== <<<<) in a single file in a comparison view?	15:06
	→ Code_Bleu joined	15:07
	→ Gsham joined	15:07
	→ s00pcan joined	15:07
	→ jacksparrow007 joined	15:08
	→ lmatteis joined	15:08
	← infra-red left	15:08
	← hyperair left	15:09
starsinmypockets	Oh fu%k it I'm just gonna learn vimdiff	15:10
	→ localuser joined	15:10
	← AtnevRed left	15:10
	← githogori left	15:10
j416	starsinmypockets: in a single file? just open the conflicted file.	15:11
	→ astockton joined	15:11
	← JeroenT left	15:11
	→ hyperair joined	15:13
	← localuser- left	15:14
	→ jottr joined	15:15
	← astockton left	15:15
	← douglascorrea left	15:15
	→ RedShift joined	15:16
	→ JeroenT joined	15:16
	← alanwill left	15:17
	→ nofacade joined	15:18
	→ alanwill joined	15:18
	→ dixvagon joined	15:18
	← freimatz left	15:18
	← bb010g left	15:18
	← sgambino left	15:19
	→ phaleth joined	15:19
	→ sgambino joined	15:19
	→ JanC joined	15:20
	→ The_Phoenix joined	15:21
	← lj1102 left	15:21
	← ki0 left	15:22
	→ freimatz joined	15:23
	← nilg left	15:24
	→ n00bdev joined	15:24
	← dixvagon left	15:25
	← jottr left	15:26
	→ samskiter_ joined	15:27
	← samskiter left	15:27
	samskiter_ → samskiter	15:27
	→ dixvagon joined	15:28
	→ acetakwas joined	15:29
	← n00bdev left	15:29
	→ User458764 joined	15:29
	← jeffreylevesque left	15:30
	← cachwir left	15:30
	← dixvagon left	15:30
	→ dixvagon joined	15:31
	→ coderMe joined	15:31
	→ jeffreylevesque joined	15:31
	← dances-with-cats left	15:31
	← rominronin left	15:32
	← acetakwas left	15:32
	← starsinmypockets left	15:32
	→ diegoaguilar joined	15:33
	← alanwill left	15:33
	→ acetakwas joined	15:33
	→ alanwill joined	15:34
	← acetakwas left	15:34
	→ douglascorrea joined	15:35
	← diegoaguilar left	15:35
	→ diegoaguilar_ joined	15:35
	← linfaimom left	15:35
	← t4nk190 left	15:36
	← tropit_ left	15:36
	→ GaboFDC joined	15:36
	→ MissWeb joined	15:36
	← Tropit left	15:37
	→ shinnya joined	15:38
	← dixvagon left	15:38
	← sgambino left	15:42
	→ sgambino joined	15:42
	→ aleksandar2810 joined	15:42
	→ cbonobo joined	15:44
	← aleksandar2810 left	15:44
	→ italoacasas joined	15:44
	← jacksparrow007 left	15:44
	← mohabaks left	15:45
	← italoacasas left	15:45
	← Alienpruts left	15:45
	→ jacksparrow007 joined	15:45
	→ geoid joined	15:45
	→ italoacasas joined	15:46
	→ aleksandar2810 joined	15:46
	→ ferr joined	15:46
	← coderMe left	15:46
	← ash_workz left	15:46
	→ endiruna joined	15:47
	← alanwill left	15:49
	→ Ahmed90 joined	15:49
	← jacksparrow007 left	15:49
	← Treio left	15:49
	→ linfaimom joined	15:50
	→ alanwill joined	15:50
	← nd left	15:51
	← The_Phoenix left	15:51
	← mase-tech left	15:51
	→ hackel joined	15:51
	← muthu_ left	15:53
	← MissWeb left	15:53
	→ MisterWeb joined	15:54
	→ in3xes joined	15:54
	← JohnBat26 left	15:54
	← lamppid left	15:54
	← bellxs left	15:55
	gitinfo set mode: +v	15:55
MisterWeb	Instead of submodules, can I just have a repository within a repository, and ignore the "sub-repository" using .gitignore of the parent repository? Then I could just maintain the two repositories separately, and use Gulp tasks to install the sub-repository as necessary when deploying. Thoughts?	15:55
	→ Noldorin joined	15:55
osse	it's doable	15:55
	I have done so in the past	15:55
	→ squiddle joined	15:55
	← JeroenT left	15:56
	→ sheilong joined	15:56
	← nofacade left	15:56
	→ Sucks joined	15:57
	→ kilo_bravo joined	15:57
	→ devth joined	15:58
	→ kpease joined	15:59
	→ jacksparrow007 joined	15:59
	← IdanM left	15:59
	→ weox joined	16:00
	← acolson left	16:00
	→ dmto joined	16:00
	← devth_ left	16:01
	→ bango2 joined	16:03
	← bango2 left	16:03
	← Guest72094 left	16:03
	→ Guest72094 joined	16:03
	Guest72094 → kenansulayman	16:03
	→ bango2 joined	16:04
	← leprechau left	16:04
	← aleksandar2810 left	16:04
	← reim left	16:04
	← alanwill left	16:05
	→ dixvagon joined	16:05
	→ editshare-ericf joined	16:06
	→ alanwill joined	16:06
	← mkoskar left	16:07
	→ denisMone joined	16:07
	→ jason237 joined	16:08
	→ jam_ joined	16:08
	→ acetakwas joined	16:09
	← kazantip left	16:09
	→ leprechau joined	16:10
Eugene	MisterWeb - yup, just gitignore the inside one. !subrepos even suggests it ;-)	16:10
gitinfo	MisterWeb: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.	16:10
	→ nnyk joined	16:10
	→ infra-red joined	16:11
	→ daito joined	16:11
	← shinnya left	16:12
	→ eijk joined	16:12
	→ astockton joined	16:12
	→ aranea joined	16:13
	← jam_ left	16:13
	→ keltvek joined	16:13
	→ blackwind_123 joined	16:13
	→ pjh joined	16:13
	← pjh left	16:14
	← acetakwas left	16:14
	→ pjh joined	16:14
	← daito left	16:15
	← roelmonnens left	16:16
	← p1k left	16:16
	← beerandpizza left	16:17
	→ Es0teric joined	16:17
	← mrkat left	16:17
	← ferr left	16:17
	→ IrishPrime joined	16:18
	→ dreiss joined	16:18
pjh	Hi all, I'm trying to use tags for different versions of my co-workers source code. This paragraph of the git-scm docs is confusing me. "Of course if you do this and do a commit, your version2 branch will be slightly different than your v2.0.0 tag since it will move forward with your new changes, so do be careful."	16:18
	← leprechau left	16:19
pjh	Does anyone know what that means? If I tag a commit as version2, I wont ever get that version back?	16:19
osse	yes	16:19
	but that commit will become version2	16:19
	→ aleksandar2810 joined	16:19
pjh	So what are the point of tags in that case?	16:19
osse	if you make further commits those will version3-beta	16:20
	← UTAN_dev_ left	16:20
pjh	Hmm, sorry I must have the context in my head wrong. I'm still not understanding.	16:20
osse	tags are for when you are done. the code is released. the CDs made. the manual written. the packaging shipped.	16:20
	don't create a tag named version2 until version2 is done.	16:21
	← squiddle left	16:21
	← alanwill left	16:21
osse	tags work this way so that in ten years when you're working on version14 and the app has been rewritten five times you can still get version2 exactly the way it was way back when.	16:22
pjh	Lets say I have a commit ed1235, I tag that v1.0. then I make a number of commits later and I want to call commit 3dxh1, v2.0. Can I ever reach the same commit state as the tag v1.0? As in if I checkout v1.0, I will have the same files as I did in that commit?	16:22
	→ qyjxmx joined	16:22
	→ alanwill joined	16:22
pjh	I see.	16:22
osse	if you git checkout v1.0 you get the files as they are in ed1235	16:23
pjh	okay. thanks for confirming.	16:23
	that line I quoted threw me off	16:23
	← Juzzika left	16:23
osse	pjh: it sounds like the quote is talking about a branch named version2 and then you at some point create a tag v2.0.0	16:24
	→ leprechau joined	16:24
	→ mrkat joined	16:24
osse	and it's completely true that if you create the tag, and then afterwards create new commits they won't be part of the contents that were tagged	16:24
pjh	+osse: Ah, sorry. The context of that quote was at the bottom of this page. https://git-scm.com/book/en/v2/Git-Basics-Tagging	16:24
	→ nofacade joined	16:25
	→ cagmz joined	16:25
osse	yeah if you create a branch at the point of an existing tag the usual case is for when you need to fix a bug or create some sort of hotfix	16:25
	→ n00bdev joined	16:25
pjh	so its essentially saying " If you checkout a tag into a new branch, make changes to that branch. the new branch will still have the tag but it wont be the original commit"	16:25
	so the tag will stay attached to the branch?	16:26
osse	no	16:26
	tags aren't attached to branches	16:26
	you attach them directly onto commits	16:26
pjh	sorry, I meant commits. but I assume the answer is still no.	16:26
osse	there is no way to modify a tag or modify what is tagged once the tag has been created	16:27
	→ clemf joined	16:27
pjh	lets say the commit is ed1235 tagged v1.0. I checkout a new branch from that tag, make a commit. the tag v1.0 is still on commit ed1235 right?	16:27
osse	yes	16:27
pjh	okay. thanks!	16:27
osse	forever and ever	16:27
	unless you delete it of course	16:28
pjh	my coworker has never used git. he asked me to put his project into a git repo.	16:28
	← MisterWeb left	16:28
pjh	it looks like this:	16:28
	← madewokherd left	16:28
pjh	Folder/	16:29
	version 1/	16:29
	version 1.1/	16:29
	→ nd joined	16:29
pjh	all the way to 2.40/	16:29
	=(((((((((((	16:29
	← synthroid left	16:29
osse	I have only once in my life seen anything worse than that. I believe it was called "tubgirl"	16:29
	→ mallocthis joined	16:30
	→ samw joined	16:30
pjh	haha	16:30
	← n00bdev left	16:30
osse	Just kidding. git init; copy all files from 1, commit it, tag it. then wipe the dir. copy files from 1.1. commit it, tag it. repeat.	16:30
	no biggue	16:30
	← User458764 left	16:30
	→ hobodave joined	16:31
pjh	i was thinking tags are the best way of doing this. but he was telling me about using a branch for each version	16:31
osse	yeah... no.	16:31
pjh	I wonder if I could write a bash script for tagging it.	16:31
	← Balliad left	16:33
	→ EdwardIII joined	16:34
	→ grc` joined	16:34
osse	mkdir repo; cd repo; git init; for v in 1 1.1 1.2 ... 2.40; do cp -R "/somewhere/Folder/version $v"/* .; git add --all; git commit -m "Import of version $v"; git tag -a "$v" -m "Version $v"; git rm -r .; done; git checkout master	16:34
	pjh: you mean like that?	16:34
EdwardIII	hrm i'm going nuts. i can do 'git format-patch sha1^..sha1' and it works fine. i do 'git format-patch sha1..sha1^' it outputs nothing	16:34
	← samw left	16:34
EdwardIII	i just want to reverse a change from a commit ages ago, temporarily	16:35
pjh	+osse: yes, but I have to grab the correct version numbers they dont increment consistently, there is version 1.1 then 1.15 then 1.2 then 1.3	16:36
	things like that	16:36
	very strange	16:36
	← aranea left	16:37
	← jceb left	16:37
osse	pjh: no problem. for x in a b 453 hello world sgfaeg cupboard 69 1337; do echo "$x"; done	16:37
pjh	so I have to store the folder name in some variable then grep it for the version number	16:37
	← gmichael left	16:37
	← grc left	16:37
pjh	sorry, regex	16:37
osse	ah. I think i'd "hard-code" that part	16:37
	→ thiago joined	16:37
osse	unless there are 250 of them	16:37
pjh	there are almost that number	16:37
	← courrier left	16:37
	← alanwill left	16:38
	→ courrier joined	16:38
	← courrier left	16:38
	← jacksparrow007 left	16:38
	→ courrier joined	16:38
	→ leeN joined	16:38
	→ jacksparrow007 joined	16:38
	→ UTAN_dev joined	16:38
	→ NeverDie joined	16:38
osse	all_versions=("/somewhere/Folder/version "); version_numbers=( "${all_versions[@]##version }" ); for v in "${version_numbers[@]]}"; do cp ... git ...; done	16:38
	← grc` left	16:39
osse	ask #bash for more	16:39
pjh	will do, thanks +osse	16:39
	→ frem joined	16:39
osse	if you ls \| grep so help me god I will hunt you down	16:39
	→ gmichael joined	16:39
pjh	hahahaha, noted!	16:39
	→ chitopunk joined	16:40
	← geoid left	16:40
osse	pjh: anyway, I guess you don't have any more meaningful history of the project than this, so I'd create one commit for each chunk of code. Then I would create a tag for each. For the tag message I guess you can put in some useful information if you have any	16:41
chris2	would changing GIT_WORK_TREE and using git -A be easier?	16:42
osse	if you really want to pour your heart into it you can even make it so the commits have sensible dates and author and such	16:42
	→ michelangelo joined	16:42
	← brandonw left	16:42
osse	chris2: that is the best idea I've heard in mylife	16:42
	that's MUCH easier	16:42
courrier	Hey guys, I'm using the command below to get rid definitely of the history of some files (pruning resulting empty commits):	16:42
	← joki left	16:42
	→ joki joined	16:42
chris2	osse: untested	16:42
courrier	git filter-branch --tag-name-filter cat --index-filter "git rm -r --cached --ignore-unmatch $FILES_TO_DELETE" --prune-empty -f -- --all	16:43
chris2	osse: but i wanted such a script too for a long time	16:43
courrier	but how to also delete the history of files already deleted? --ignore-unmatch should avoid returning an error but then filter-branch does not suppress the history of the old file...	16:43
osse	chris2: could even use a temporary GIT_INDEX so there's no need to do the git rm mess to clean either.	16:43
	→ diegoviola joined	16:43
	← yrter_ left	16:43
	← SirFunk left	16:43
	← nnyk left	16:43
osse	my code isn't tested to begin with either. I wrote it on the spot	16:43
	← PHPanos left	16:43
pjh	chris2: what is that?	16:43
	← Novitsh left	16:44
	← synthmeat left	16:44
	← spriz left	16:44
	→ yrter_ joined	16:44
	← mallocthis left	16:44
osse	pjh: it's an env var to make git consider a different location as the working directory	16:44
	← leeN left	16:45
	→ liamonade joined	16:45
	→ brandonw joined	16:45
	→ Novitsh joined	16:45
	→ cybersphinx joined	16:45
pjh	ah, so its skips the whole deleting and copying part	16:45
	← karstensrage left	16:45
pjh	thats pretty cool!	16:45
	→ leeN joined	16:45
	→ SirFunk joined	16:45
	← diegoviola left	16:45
	→ spriz joined	16:45
	← donmichelangelo left	16:45
chris2	https://github.com/git/git/blob/master/contrib/fast-import/import-directories.perl looks a bit clumsy, but perhaps nicest idea	16:46
	← endiruna left	16:46
	← sgambino left	16:46
	← the_cybersphinx left	16:46
	← Ranhir left	16:46
	→ toogley joined	16:47
osse	all hail	16:47
	← chll left	16:47
	→ chll joined	16:47
	← ahmed_elgabri left	16:47
	→ MutantMahesh joined	16:48
	← srcerer left	16:48
	← moriko left	16:48
	← Kobaz left	16:49
	→ synthmeat joined	16:49
	→ Ranhir joined	16:49
	← ChrisWarrick left	16:49
	→ Kobaz joined	16:49
	→ ChrisWarrick joined	16:50
	→ srcerer joined	16:51
osse	this is brilliant	16:51
	→ ki0 joined	16:51
	→ ash_workz joined	16:51
	← baris_ left	16:52
	→ infra-re_ joined	16:53
osse	courrier: !sensitiv	16:54
gitinfo	courrier: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	16:54
	← PinkPonyOfDeath left	16:55
	→ mkoskar joined	16:55
	→ mallocthis joined	16:55
	← infra-red left	16:56
	← joshc_ left	16:56
courrier	osse: this is exactly what I do, read the question again :)	16:56
	← Gsham left	16:57
courrier	in their case the sensitive file is stille in the working tree	16:57
	← GaboFDC left	16:57
courrier	in my case a lot of files have been deleted in old commits	16:57
	I want to clean all the them	16:57
	all of them*	16:57
	→ madewokherd joined	16:58
	← nilsi left	16:58
osse	i don't see why it shouldn't work	16:58
	git rm operates through the index filter. shouldn't matter whether it already exists or not	16:58
	ehh, whether it still exists I mean	16:59
	→ jaafar joined	16:59
	→ samw joined	17:00
courrier	I get a lot of warnings like these /usr/lib/git-core/git-filter-branch: 980: eval: domains/blocks/blocks_reward.s: not found while the file existed in the path and I can actually find a revision where it exists, and then git show still returns the file :/	17:01
	← bollullera left	17:01
	→ Tropit joined	17:01
	← s00pcan left	17:03
osse	hmm	17:03
	← astockton left	17:03
osse	!repro	17:03
gitinfo	[!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://gist.github.com/2415442 ) of your terminal session.	17:03
	→ infra-red joined	17:03
	← tlaxkit left	17:04
	← subhojit777 left	17:04
	→ s00pcan joined	17:04
	← Viewtiful left	17:05
	→ astockton joined	17:05
	→ AtnevRed joined	17:06
	← infra-re_ left	17:06
	← leprechau left	17:07
	→ jottr joined	17:08
courrier	Ok I'm trying to produce a transcript speaking for itself :P	17:08
	← Guest11070 left	17:08
	→ User458764 joined	17:09
	→ leprechau joined	17:09
	→ d4rklit3 joined	17:10
	← mahendra_ left	17:11
	← AtnevRed left	17:11
	→ kadoban joined	17:12
	← scorphus left	17:12
	→ scorphus joined	17:12
	→ alanwill joined	17:13
	← jottr left	17:13
	← PCatinean left	17:13
	→ David1977 joined	17:15
	← notebox left	17:15
	Timvde\| → Timvde	17:15
	← tomog999_ left	17:15
	→ bronson joined	17:16
	→ imachuchu joined	17:16
	← imachuchu left	17:16
	← Code_Bleu left	17:16
	← Tropit left	17:17
	→ sgambino joined	17:18
	→ Code_Bleu joined	17:19
	→ imachuchu joined	17:19
	→ subhojit777 joined	17:20
	← bronson left	17:21
	← dreiss left	17:22
	← t0by left	17:22
	→ t0by joined	17:23
	← liamonade left	17:24
	← ThomasLocke left	17:25
	→ diegoviola joined	17:25
	→ iLembus joined	17:25
	← dixvagon left	17:26
	← localuser left	17:26
	→ n00bdev joined	17:26
	← thiago left	17:27
	→ jteneyck joined	17:27
	→ The_Phoenix joined	17:27
	← Code_Bleu left	17:28
	← alanwill left	17:28
	← d4rklit3 left	17:28
	→ Code_Bleu joined	17:29
	→ alanwill joined	17:29
	← alanwill left	17:29
	← User458764 left	17:29
	← Sucks left	17:30
	→ Sucks_ joined	17:30
	→ mscia joined	17:30
	→ synthroid joined	17:30
	← mscia left	17:30
	→ notebox joined	17:30
	← n00bdev left	17:31
	← kurkale6ka left	17:31
	→ IWishIKnew joined	17:32
	← cagmz left	17:33
	→ madebymarkca joined	17:34
	→ d4rklit3 joined	17:34
	→ localuser- joined	17:35
	← synthroid left	17:35
	← astockton left	17:35
	→ ferr joined	17:36
	Forkk_ → Forkk	17:36
	← fees left	17:37
courrier	osse: OK, so by writing the transcript I understood than some \r\n polluted the list of files I was passing to git rm, so this is fixed and filter-branch works	17:37
	now I have to understand how it is possible that some files are not present on disk (i.e. deleted) without any "delete" entry in the history, cause I'm using this to tell filter-branch what files to forget	17:37
	← encod3 left	17:37
courrier	DELETED=`git log --find-renames --diff-filter=D --summary \| grep delete \| cut -d' ' -f 5\|sed ':a;N;$!ba;s/\n/ /g'`	17:37
	→ colwem joined	17:38
courrier	This is how I get the list of files to pass to filter-branch	17:38
	← TomyWork left	17:38
courrier	I ask it to delete the history of all previously deleted files	17:38
osse	some delete entries might be obscured by the --find-renames	17:38
courrier	but some deleted files are not returned in this list	17:38
	osse: but even with git log I have no track from the deletion :/	17:39
	→ vkngpmhc joined	17:39
courrier	Ah, wait	17:39
	For the specific file I'm watching the last git log entry was a renaming	17:39
osse	there you go	17:40
courrier	osse: mmmmh but I've added this cause I'm afraid to delete the entry of a file that has been renamed but still in my working tree :/	17:41
osse	yes	17:42
	so don't delete it then	17:42
	what's the problem?	17:42
	You have taken care to avoid deleting files that shouldn't be deleted ,but is then surprised when they aren't deleted	17:42
	→ tomog999_ joined	17:43
	→ ahmed_elgabri joined	17:43
	→ fedexo joined	17:44
courrier	This file has actually been moved, causing git to record a delete, and later on actually deleted, so it must be present in the DELETED var	17:44
	But other files have also been moved, causing git to record a delete, and are still present in the working tree, so they must not be in the DELETED var	17:44
	For the second case I've added --find-renmaes, but then I miss some files in the first case :/	17:44
	← Code_Bleu left	17:44
	→ Code_Bleu joined	17:45
	→ lindenle joined	17:45
osse	to fix the first you have to run several times...	17:46
	← freimatz left	17:48
	→ geoid joined	17:48
	← geoid left	17:48
	→ MutantMa_ joined	17:49
courrier	This distrurbs me: if I delete a file on purpose it should have a "delete" entry as well, right? While in my case the last entry of this deleted file is a renaming, so where is the "delete" entry of the actual deletion, then? This one shoudl have caused filter-branch to forget this file	17:49
	→ alanwill joined	17:50
osse	there is no delete entry	17:51
	because you asked git to detect renames	17:51
	← samw left	17:51
	← MutantMa_ left	17:52
	← MutantMahesh left	17:52
osse	courrier: if a file has been renamed then deleted, then the new file name will have a "deleted" entry. so that file is gone when you run git filter-branch. After that, the old file name will have a "deleted" entry, because the new one has been removed from the history	17:53
	your case is weird. either handle special cases by hand, or run filter-branch multiple times	17:53
	→ ttbakiatwoam joined	17:54
	→ tang^ joined	17:54
	→ denis_M joined	17:55
	← ttbakiatwoam left	17:55
	→ samw joined	17:55
	← dfrey_ left	17:55
	← fscala left	17:56
	← pikajude left	17:57
	→ xnil joined	17:57
	← gfixler left	17:57
courrier	osse: Ah yeah, I guess I get it, and running multiple times ensures that the second pass won't recognize the old file as a renaming...	17:58
	So I should run this n times, with n being the maximal number of renamings for a single file =)	17:58
	← denisMone left	17:58
	→ fscala joined	17:59
	→ karstensrage_ joined	17:59
	← rwb left	17:59
	← samw left	18:00
	← josuebrunel left	18:00
	← phaleth left	18:01
	→ mohabaks joined	18:01
	← IWishIKnew left	18:01
devhost	I have a new hire who made commits before I could see her diff (over the shoulder review); all I want to do is review those commits on my computer before she pushes.	18:02
	Is it easy to send a patch for review via email?	18:02
grawity	yeah, git send-email	18:02
devhost	I'll check it out	18:02
_ikke_	yes, but do read the submittingpatches doc first	18:02
grawity	but you could 'git fetch' the branch as well	18:02
	→ freimatz joined	18:03
devhost	She didn't make a branch.	18:03
grawity	could make one now	18:03
pfloyd	Is it possible in pre-commit or another hook to annotate/update a commit message? I want to pre-pend information each time a commit is made automatically and would like to avoid having to call git commit --amend if possible	18:03
devhost	We can't delete branches we publish to origin.	18:03
grawity	wut	18:03
devhost	(yeah)	18:03
	→ phaleth joined	18:03
kadoban	For me doing git via email is kind of a last resort when there's no other workflow that'll work. But it is possible, and it vaguely works okay.	18:03
devhost	There is a lot wrong with how we use git here.	18:03
grawity	a bit silly, that	18:03
devhost	And I don't want to get into the specifics.	18:04
kadoban	pfloyd: Yeah there's a hook for that, it's not pre-commit, one of the other ones looks	18:04
devhost	It kills me inside anyways.	18:04
pfloyd	kadoban: thanks!	18:04
	→ roelmonnens joined	18:04
	← subhojit777 left	18:04
kadoban	pfloyd: 'prepare-commit-msg', it's documented in man githooks	18:04
gitinfo	pfloyd: the githooks manpage is available at http://jk.gs/githooks.html	18:04
pfloyd	kadoban: thanks, will do some reading	18:05
	→ rwb joined	18:05
kadoban	It looks a tiny bit complicated in terms of the inputs you get, but … not too bad hopefully. Good luck.	18:05
	← sgambino left	18:05
	← mohabaks left	18:05
	→ samw joined	18:05
	→ mohabaks joined	18:06
	→ thiago joined	18:06
	→ EvilPenguin joined	18:06
	← karstensrage_ left	18:07
pfloyd	kadoban: hmm looks like commit-msg might be promising, too	18:07
	→ maxxe joined	18:08
mariuscc	someone in my team commit some changes on master. over those we commit it other changes.what would be the easiest way to remove those changes ?	18:09
	→ jam_ joined	18:09
	→ astockton joined	18:09
_ikke_	rebase	18:09
	or revert	18:09
	→ dfrey_ joined	18:10
	→ localuser joined	18:10
mariuscc	ok but without losing those changes. I mean I want to keep those changes in another branch for fixing bugs and releasing later	18:10
	→ mahendra_ joined	18:11
maxxe	a question on tags: if I tagged something as v1.2 and pushed it to a remote repo. can I re-tag it?, delete the v1.2 tag, and tag a later commit as v1.2, and push it?	18:11
	→ daito joined	18:12
_ikke_	With difficulty	18:12
	tags are not supposed to change	18:12
	→ postsneakernet joined	18:12
maxxe	ok. then I know.	18:12
	→ elastix joined	18:13
	→ squiddle joined	18:13
_ikke_	What you describe is just a branch	18:13
	← ferr left	18:13
	← jam_ left	18:13
	→ roygbiv joined	18:14
kadoban	pfloyd: Ah, yes does look like it.	18:14
_ikke_	maxxe: I solve this by using rcs	18:14
	rc	18:14
	← localuser- left	18:14
	← Jellyg00se left	18:16
	← zeroed left	18:16
	← daito left	18:16
maxxe	_ikke_: ok. I better include the changes in the next release, nothing fatal anyways. just wanted to know if it was possible, but since tags aren't supposed to change, I don't care :)	18:16
	← ahmed_elgabri left	18:17
grawity	releasing different code under the same version tends to incur the wrath of packagers and users	18:17
	"is this the old 1.2 or the new 1.2?"	18:18
maxxe	ye	18:18
	→ Guest63991 joined	18:18
grawity	do a 1.2.1 and be done with jt	18:18
_ikke_	Someone speaks out of experience	18:18
	← qyjxmx left	18:18
	← nofacade left	18:18
maxxe	grawity: yes. that's better	18:18
	← EvilPenguin left	18:19
	→ flavius joined	18:19
	← astockton left	18:19
	→ Karkus joined	18:20
	← liranp left	18:20
	→ salamanderrake joined	18:20
	← chll left	18:21
	← Guest63991 left	18:21
pfloyd	kadoban: I'm just full of crazy questions today, but what about a way via a hook to merge to master automatically? i.e. if someone is on branch X and makes a commit what would be the easiest way to ensure that commit is merged to master, too withot them having to do it manually?	18:21
	→ SimonNa joined	18:22
pfloyd	client side, not server side	18:22
_ikke_	What's the goal of that?	18:22
	Why have a separate branch then?	18:22
	← mezod left	18:22
pfloyd	it's a long story	18:22
	← roygbiv left	18:23
	→ n00bdev joined	18:23
	→ TalkToMe joined	18:23
_ikke_	automatic mering only causes pain for the uses	18:24
	merging*	18:24
	→ synthroid joined	18:24
	→ xvx joined	18:24
	→ hahuang65 joined	18:25
	→ sgambino joined	18:25
	→ TomyLobo joined	18:25
	→ mischat_ joined	18:25
	→ nofacade joined	18:25
	← nofacade left	18:25
	← roelmonnens left	18:26
	→ astockton joined	18:27
	→ diego2 joined	18:27
	→ The_Phoenix1 joined	18:27
	← diego2 left	18:27
	→ diego2 joined	18:27
kadoban	pfloyd: That's a pretty bad idea unfortunately. Merging is a manual process and has to be.	18:27
	→ EvilPenguin joined	18:28
	← The_Phoenix left	18:28
	diegoviola → Guest31848	18:28
	← squiddle left	18:28
	diego2 → diegoviola	18:28
	← madebymarkca left	18:28
	← mischat left	18:28
	← Guest31848 left	18:28
	→ Sasazuka joined	18:29
	→ AtnevRed joined	18:29
	← notebox left	18:29
	← mischat_ left	18:29
	← flavi0 left	18:29
	← shekhar_ left	18:30
	← Noldorin left	18:32
pfloyd	yeah true	18:33
	← freimatz left	18:34
	→ vise890 joined	18:34
	← localuser left	18:35
	→ localuser- joined	18:36
	→ jjensen joined	18:36
	→ mezod joined	18:37
	← ianclark left	18:38
	← troulouliou_div2 left	18:40
	→ lungaro joined	18:40
	← jjensen left	18:40
lungaro	I got a weird one here. I'm renaming a repo and its a submodule. I jsut edited .gitmodules in the workspace and renamed the directory and repo. Now when I git status it is trying to chdir to the old name	18:41
	→ roygbiv joined	18:41
	→ scoobertron joined	18:42
	← fedexo left	18:44
	← Es0teric left	18:44
	← EvilPenguin left	18:45
	→ EvilPenguin joined	18:45
	← n00bdev left	18:45
	→ baris_ joined	18:47
milki	you probably missed a step. maybe its easier to remove the submodule completely and then add it	18:47
	milki shrugs	18:47
	← Andre_work left	18:48
	← howdoi left	18:48
	← imachuchu left	18:49
	← mallocthis left	18:49
ojacobson	the way submodules are glued together is kind of terrible, milki's suggestion is the best way to do it	18:49
	→ AndreSomers joined	18:49
	→ durham joined	18:49
ojacobson	(the work tree for the submodule contains a ref to a repo inside the outer work tree's .git dir, which in turn contains config pointing at the directory of the submodule's work tree)	18:50
	→ arooni joined	18:50
	← crose left	18:51
	← vkngpmhc left	18:52
	→ vkngpmhc joined	18:52
	→ madebymarkca joined	18:52
	→ Darcidride joined	18:53
	← HelloAtMega left	18:53
	→ HelloAtMega joined	18:53
	← achadwick left	18:53
	→ nettoweb joined	18:54
irqq	I have a big object file in my .git/objects and its contents printed by git cat-file -p shows me that it is an unnecessary stuff, committed just accidentally and no longer existing in my workspace.How can I identify its filename and with which commit it was commited?	18:55
	→ Pulp joined	18:55
	→ infra-re_ joined	18:55
	← leonarth left	18:55
_ikke_	There is no easy way to do that	18:55
	→ squiddle joined	18:55
irqq	... and how to remove it from .git ?	18:56
	→ leonarth joined	18:56
irqq	does the object represent just one file?	18:56
	← yrter_ left	18:56
	← madewokherd left	18:57
Eugene	irqq - !filter_sensitive applies to big files as well as Secret ones	18:57
gitinfo	irqq: You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/	18:57
osse	irqq: git rev-list --all \| while read -r commit; do if git ls-tree -r $commit \| grep $blob; then echo found in commit $commit; break; fi; done	18:57
	← infra-red left	18:57
	→ madewokherd joined	18:57
	← AtnevRed left	18:58
	← Gitzilla left	18:58
osse	irqq: blob=abc1232452	18:58
	where that thing in .git/objects is .git/objects/ab/c1232452	18:58
	→ iota_pi joined	18:59
	→ Treio joined	18:59
	← ki0 left	18:59
	← r00tWearsRedHats left	19:00
	← astockton left	19:00
	→ crose joined	19:00
	← leonarth left	19:00
	→ gpyh joined	19:01
gpyh	Hi	19:01
gitinfo	gpyh: 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:01
	→ User458764 joined	19:02
	→ bollullera joined	19:02
	← govg_ left	19:02
gpyh	Say I want to squash two commits in a branch "mybranch", but I have already merge mybranch into master, how can I squash those commits in the two branches and make sure they stay the same?	19:02
	← italoacasas left	19:02
	← diegoaguilar_ left	19:03
	→ infra-red joined	19:04
	← mohabaks left	19:04
	← EvilPenguin left	19:04
	→ bb010g joined	19:05
	gitinfo set mode: +v	19:05
	← myhau left	19:05
	→ myhau joined	19:06
	← infra-re_ left	19:06
	← Code_Bleu left	19:06
	→ neanderslob joined	19:06
	← roygbiv left	19:06
	→ mahendrak joined	19:06
	→ JohnBat26 joined	19:07
	→ Code_Bleu joined	19:07
	← mariuscc left	19:08
	→ karstensrage_ joined	19:08
	→ infra-re_ joined	19:08
	→ jottr joined	19:10
	← mahendra_ left	19:10
	→ italoacasas joined	19:10
	→ colwem_ joined	19:11
	← infra-red left	19:12
	← squiddle left	19:12
	→ paddyez joined	19:12
	← arnatal left	19:12
	→ faheem joined	19:13
	→ EvilPenguin joined	19:13
	← David1977 left	19:13
	← colwem left	19:13
	→ elsevero joined	19:13
	→ jost joined	19:14
	← raijin left	19:14
	← jottr left	19:14
	← Code_Bleu left	19:14
irqq	osse: ooops! the object in question does not seem to be referenced by any commit. What then?	19:15
osse	irqq: try adding --reflog to the rev-list command	19:16
	→ diegoaguilar_ joined	19:17
	→ Code_Bleu joined	19:18
ronny	hi	19:18
	how can i make git use gpg2 ?	19:18
milki	ronny: man git config gpg.program	19:18
gitinfo	ronny: the git-config manpage is available at http://jk.gs/git-config.html	19:18
irqq	osse: still nothing ...	19:19
	← iLembus left	19:20
	→ _kfpratt joined	19:20
irqq	osse: ... but git fsck lists this as a dangling blob	19:20
osse	ugh	19:20
	irqq: git gc	19:20
	gone	19:20
	irqq: in fact. you can just delete it by hand probably	19:21
ronny	milki: i did set gpg.program is set to gpg2 - i have a key in gpg2, but git seems to run gpg	19:21
	→ mallocthis joined	19:21
	→ Talk_To_Me joined	19:21
	← Talk_To_Me left	19:22
	← kfpratt left	19:23
	milki shrugs	19:23
	← mallocthis left	19:23
ronny	milki: when i run gpg2 --clearsign it uses my key, if i run git -S i get a gpg error telling me there is no secret key	19:23
	← TalkToMe left	19:25
	← sdothum left	19:25
	→ mallocthis joined	19:26
irqq	osse: done. But my corresponding origin des have the same errors too. How do I deal with that?	19:26
	→ localuser joined	19:27
	← cdg left	19:27
	← editshare-ericf left	19:27
	→ sdothum joined	19:27
	← Code_Bleu left	19:28
ojacobson	Unless you have a pressing reason to fiddle with it (low on disk space, eg.) just leave it	19:28
	→ Code_Bleu joined	19:29
ojacobson	as you push to the repo, it'll get periodically repacked and garbage-collected; the offending object will disappear eventually	19:29
	← doener left	19:29
	→ editshare-ericf joined	19:30
	← nettoweb left	19:30
irqq	can I eventually go directly to the origin (bare repo) directory location and do git gc there?	19:30
	→ uri_ joined	19:30
	← mallocthis left	19:30
	← localuser- left	19:30
	← diegoaguilar_ left	19:30
	← User458764 left	19:32
	← tyreld left	19:32
	→ mwhooker joined	19:33
	→ Jackneill joined	19:33
	→ User458764 joined	19:33
	← FunkyAss left	19:34
	→ yrter joined	19:34
	→ nettoweb joined	19:34
	← Code_Bleu left	19:34
	← courrier left	19:35
	→ ianclark joined	19:35
ojacobson	If you have shell access to it, yes, you can manually expire the reflog, repack the repository, and gc any remaining loose objects.	19:35
irqq	... the origin seems to be the one which accumulated gatbage whixh then got propagated to clones. Seems I shold have git gc my initial local repo before cloning it as bare master origin.	19:35
	→ Code_Bleu joined	19:36
	→ ahmed_elgabri joined	19:36
irqq	Yes, I have shekk access	19:36
	s/shekk/shell/	19:36
ojacobson	You generally don't have to, though; the default behaviour repacks the repo whenever there are more than 10 pack files, and discards loose objects that aren't reachable after a while	19:36
	→ tyreld joined	19:39
	← ianclark left	19:39
	← jkoudys left	19:40
	→ ianclark joined	19:41
	← fahadash left	19:41
	← baris_ left	19:42
	← Jackneill left	19:42
	→ MacWinne_ joined	19:42
	→ mischat joined	19:44
	→ radsy joined	19:44
	← devth left	19:46
	→ namikr joined	19:46
irqq	ojacobson: but should git clone behave in the way that it clones dangling objects too?	19:46
ojacobson	no	19:46
	← alanwill left	19:46
irqq	I just checked it does	19:47
ojacobson	it does that locally (since it uses hard links)	19:47
	→ alanwill joined	19:47
	← neanderslob left	19:47
	→ leonarth joined	19:47
ojacobson	when clone has to pass through upload-pack, though, it gets a fresh back containing only the interesting objects	19:47
	→ JSharpe joined	19:47
	→ mallocthis joined	19:47
	→ raijin joined	19:48
irqq	yes, the origin is in the same filesystem in my case	19:48
	→ avaz joined	19:48
	← namikr left	19:48
	← lactose left	19:49
	← avaz left	19:49
	← Pulp left	19:49
	→ infra-red joined	19:49
	→ squiddle joined	19:49
	← arooni left	19:50
	← sgambino left	19:50
	← mallocthis left	19:50
	← localuser left	19:51
	→ cagedwisdom joined	19:52
	← infra-re_ left	19:52
	← simonlinj left	19:52
	→ arooni joined	19:53
irqq	... but I just tried cloning to another filesystem on the same machine with the same result, and hardlinks do not work across different filesystems	19:53
	← NeverDie left	19:53
	→ aranea joined	19:53
	→ nilg joined	19:54
	← mizu_no_oto left	19:55
	← algae left	19:55
	→ badLuckJoe joined	19:55
	→ MattMaker joined	19:57
	→ knownasilya joined	19:57
	→ simonlinj joined	19:58
	← Sucks_ left	19:58
ojacobson	It still copies the repo rather than using upload-pack in that case. Try file://localhost/path/to/repo instead of /path/to/repo	19:59
	→ neanderslob_ joined	19:59
ojacobson	(file:// URLs are handled via upload-pack)	19:59
	← neanderslob_ left	19:59
	→ neanderslob joined	20:00
	→ astockton joined	20:01
	← EvilPenguin left	20:01
	→ sgambino joined	20:01
	→ gfixler1 joined	20:04
	→ Viewtiful joined	20:04
	← Karkus left	20:04
	→ diogenese joined	20:05
	← elsevero left	20:05
	← ribasushi left	20:05
	→ elsevero_ joined	20:05
	→ m0viefreak joined	20:05
	← astockton left	20:05
	→ rnsanchez_ joined	20:06
	→ aidalgol joined	20:06
	→ geekbri joined	20:07
	→ jottr joined	20:07
	→ devth joined	20:08
	← rnsanchez left	20:08
	→ astockton joined	20:09
	← circ-user-15GfU left	20:09
	→ ribasushi joined	20:09
	→ jam_ joined	20:10
	→ ahmedelgabri joined	20:10
	← italoacasas left	20:10
	→ italoacasas joined	20:11
	← Viewtiful left	20:11
	← Treio left	20:11
	← synthroid left	20:12
	→ daito joined	20:12
	← ahmed_elgabri left	20:13
	← lmatteis left	20:13
	→ circ-user-15GfU joined	20:13
	→ mizu_no_oto joined	20:14
	← jam_ left	20:15
	← marcogmonteiro left	20:15
	← daito left	20:17
	→ Imek joined	20:18
	← badLuckJoe left	20:18
	← gfixler1 left	20:21
	→ ki0 joined	20:21
	→ mkelly joined	20:21
	→ Treio joined	20:22
	→ NeverDie joined	20:22
	← arooni left	20:23
	← mkelly left	20:27
	→ hyphenated joined	20:28
	→ Limes_ joined	20:28
	→ mkelly joined	20:28
	→ denn1s_ joined	20:28
	← rnsanchez_ left	20:29
	← astockton left	20:29
	← samw left	20:33
	→ localuser- joined	20:34
	→ Gitzilla joined	20:36
	→ devth_ joined	20:37
	← mkelly left	20:37
	→ lmek joined	20:37
	→ devth__ joined	20:38
	→ mkelly joined	20:38
	→ baris_ joined	20:38
	← Imek left	20:39
	← devth left	20:40
	→ felixn joined	20:40
	→ jkoudys joined	20:41
	← devth_ left	20:41
	→ zeroed joined	20:42
	→ Sod joined	20:42
	→ toothe joined	20:42
toothe	after doing a commit, do I merge it back into head (if its good) ?	20:43
	→ astockton joined	20:43
	← madebymarkca left	20:43
	→ flavi0 joined	20:44
_ikke_	HEAD is the current commit	20:44
	→ Es0teric joined	20:44
_ikke_	You usually don't merge after every commit	20:44
	toothe: read a bit about !workflow	20:45
gitinfo	toothe: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.	20:45
	→ Faylite joined	20:46
toothe	yeah....i totally forgot what my workflow was	20:46
	blah	20:46
	← MattMaker left	20:46
toothe	i haven't coded or used git in about 6 months.	20:46
	→ arooni_ joined	20:47
	→ samw joined	20:47
	← vkngpmhc left	20:47
	→ yoh_ joined	20:48
	← arooni_ left	20:48
	← jkoudys left	20:48
yoh_	is there a way to force a new merge commit to be generated even if regular merge attempt results in "Already up-to-date"?	20:48
	→ cdg joined	20:48
_ikke_	no	20:48
	→ jkoudys joined	20:49
	← toogley left	20:49
yoh_	:-/ pity... there must be some lower level though I bet	20:49
_ikke_	yoh_: It usually means you have to verify that there actually is something to merge	20:49
	yoh_: why do you want to 'force' a merge?	20:49
yoh_	;-) I agree usecase is obscure...	20:50
	← crose left	20:50
_ikke_	You can perhaps create a commit yourself having 2 parents	20:50
yoh_	it is to complement my other obscure strategy -- "theirs", where I have git merge -s ours --no-commit $1 && git read-tree -m -u $1	20:50
	to initiate a merge from another branch, content of which I filter out, and then commit	20:51
	← simonlinj left	20:51
yoh_	then imagine I decided to correct out the cleanup I have done in previous 'merge'	20:51
	← samw left	20:51
yoh_	so I need to initiate another merge but it wouldn't work out since according to git "up-to-date"	20:52
_ikke_	yeah, git needs diverged history for having something to merge	20:52
	→ arooni_ joined	20:52
	← mkelly left	20:52
	→ mkelly joined	20:53
yoh_	so hence the question -- what low operation actually creates 'merge' commit (pretty much just stating that this commit has those multiple parents)?	20:53
	← arooni_ left	20:53
	→ IWishIKnew joined	20:53
yoh_	I guess, besides all the merge resolutions etc magic which I don't need in this case, merge is just a call to that low level command	20:54
	← irqq left	20:54
jast	there's always git commit-tree	20:54
	← pjh left	20:54
	← Darcidride left	20:55
	→ synthroid joined	20:55
ribasushi	yoh_: git branch mynewbranch $( echo "my commit msg" \| git commit-tree some_commit_whose_contents_you_want: -p <parent1> -p <parent2> .... )	20:55
	→ infra-re_ joined	20:55
	→ crose joined	20:55
ribasushi	yoh_: the ':' at the end of "commit you want" is importnat	20:55
yoh_	jast: thanks... I Guess it is the one... thanks ribasushi ! ;)	20:55
jast	still, if a merge tells you "already up-to-date", the resulting merge won't actually have any effect	20:55
	→ mohabaks joined	20:55
jast	*resulting merge commit	20:55
yoh_	I will make it have an effect by having different content ;)	20:56
	← geekbri left	20:56
jast	oh, you're creating an evil merge	20:56
	may FSM have mercy on your soul	20:56
qsx	and eris.	20:56
yoh_	amen	20:57
jast	I'm not entirely certain who all is responsible for souls	20:57
	→ arooni_ joined	20:58
	← infra-red left	20:58
	→ AtnevRed joined	20:58
	← jteneyck left	20:59
	← kpease left	20:59
qsx	jast: your mother.	21:00
	→ astockto_ joined	21:00
	→ jagob joined	21:00
jast	I... don't think so	21:00
	→ jteneyck joined	21:00
	→ kpease joined	21:01
yoh_	ok -- everyone hide from the next question of a git-insides newbee!	21:01
	← raijin left	21:02
	← elsevero_ left	21:02
yoh_	for that commit-tree I need a tree associated with a commit	21:02
	→ mostlybadfly joined	21:02
	← mahendrak left	21:03
_ikke_	of course	21:03
	→ elsevero joined	21:03
	← AtnevRed left	21:03
jast	given commit abc123: git rev-parse abc123^{tree}	21:03
	→ Ademan joined	21:03
yoh_	jast: thanks!	21:03
jast	see man git-rev-parse :)	21:04
gitinfo	the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html	21:04
	← astockton left	21:04
	← elsevero left	21:05
yoh_	yeay!!! everything worked out	21:05
	thanks guys! now just need to code it in ;)	21:05
	→ jnavila joined	21:06
	← mkelly left	21:06
	→ ferr joined	21:06
	← denis_M left	21:06
	← steve left	21:06
	→ elsevero joined	21:07
ferr	My git freezes on git push command, any advices?	21:07
_ikke_	check your network	21:07
	Where are you pushing to? What protocol?	21:07
	What OS are you on?	21:07
ferr	I'm pushing to bitbucket, arch linux	21:07
	→ strayPuppy joined	21:08
	← t0by left	21:08
yoh_	bear with me a bit mroe -- is there a 'tree' for current index (so if I added changes to index and want to commit-tree it)?	21:08
ferr	Network is fine since it works with heroku but not bitbucket	21:08
Ademan	I have a file generated by git format-patch which contains the information corresponding to a single commit. I tried to apply it using git am foo.patch but git reports "patch does not apply". What is baffling me is as best I can tell, the parent commit of my patch is identical to the current HEAD where I'm applying the patch, and there are no unstaged or staged changes...	21:08
	→ liranp joined	21:08
_ikke_	yoh_: There actually, is, although, I cannot remember how to refer to it	21:08
	ferr: same protocol?	21:08
	← unreal left	21:08
	← jrm left	21:09
ferr	_ikke_: I believe so	21:09
	→ jrm joined	21:09
_ikke_	git remote -v show	21:09
	verify it	21:09
	→ t0by joined	21:09
ferr	Nope, heroku is https and bitbucket ssh	21:09
_ikke_	ferr: can you try ssh -T [email@hidden.address] ?	21:10
ferr	Freezes as well	21:10
_ikke_	So it's an ssh issue	21:11
	Have you checked your firewall?	21:11
	→ years joined	21:11
_ikke_	freezing usually indicates blocked ports	21:11
	← jnavila left	21:12
	→ mkelly joined	21:12
	← phaleth left	21:12
	← arooni_ left	21:12
	← infra-re_ left	21:12
	→ arooni_ joined	21:13
	→ vkngpmhc joined	21:13
	← localuser- left	21:13
	→ monk12 joined	21:13
ferr	_ikke_: thanks, somehow it worked, it might be the issues with the network	21:13
_ikke_	:-)	21:14
monk12	hey all, have a git question... I didn't feel comfy messing with our main git bitbucket repo. so i copied a project and worked on it on git hub (i didn't clone it, just checking in the files into github as a new repo, so lost revision history)... I made a 10 commits to that github repo... but I'	21:15
	but I'd like to merge them into the main rep (and preserve the 10 commit history appended onto the hundreds of commits of the main bitbucket repo)	21:15
	→ unreal joined	21:15
_ikke_	monk12: !git_graft	21:15
	!graft	21:15
gitinfo	[!grafts] Grafts are an obscure feature allowing distinct histories to be joined together; see https://git.wiki.kernel.org/index.php/GraftPoint	21:15
	← JSharpe left	21:16
monk12	cool thanks _ikke_. I'll take a look, sounds already promising based on desc	21:16
	← _noblegas left	21:16
	← TomyLobo left	21:16
	→ TomyLobo joined	21:16
kadoban	Wouldn't a rebase be less obscure, and still work?	21:16
_ikke_	grafts aren't obscure	21:16
	← squiddle left	21:16
_ikke_	Don't know why somebody would describe them as obscure	21:17
	kadoban: rebase might result in lots of conflicts	21:17
	← a3Dman left	21:17
	→ samw joined	21:17
kadoban	_ikke_: That seems kind of inevitable based on the goal, but maybe I'm missing something.	21:18
	← liranp left	21:18
	← JohnBat26 left	21:18
Ademan	If anyone's curious, git am --keep-cr foo.patch succeeded	21:18
_ikke_	kadoban: not with grafts	21:18
	→ a3Dman joined	21:18
_ikke_	Ademan: Ah, so a line-ending issue?	21:18
	← astockto_ left	21:19
	→ astockton joined	21:19
_ikke_	kadoban: With grafts, you just place the commits on top of another commit, without merging anything	21:19
Ademan	_ikke_: apparently so, I've run into a couple of issues with CRLF in this project already, but I didn't expect it with git-am shrug	21:19
kadoban	Hmm, interesting. I'll have to look at how that works I guess.	21:20
	← infernix left	21:20
_ikke_	kadoban: Just a simple text-file saying this commit has that parent or these parents	21:20
	You have to use filter-branch to make it permanent / sharable though	21:20
	→ steve joined	21:21
jast	grafts are a pretty convenient, if slightly archaic way, to do exactly this kind of thing	21:21
	← mblack left	21:21
	← vise890 left	21:21
jast	never really got into git-replace (which was meant to replace them)	21:21
	→ dsdeiz joined	21:21
	← a3Dman left	21:22
	← samw left	21:22
_ikke_	For this case, git grafts is good and simple enough	21:22
	→ Mono2000 joined	21:22
	← alanwill left	21:22
	← mkelly left	21:23
	→ a3Dman joined	21:23
_ikke_	git replace creates a special ref that tells git it should look at object y instead of object x	21:24
	with the right refspec, these can be shared I guess	21:25
	← samskiter left	21:27
	→ ensyde joined	21:27
	→ samw joined	21:27
	← denn1s_ left	21:27
monk12	yeh i did see a reference to also look at 'git replace' but would you say git grafts are easier to use?	21:27
	← rwb left	21:28
	← bb010g left	21:28
	→ EvilPenguin joined	21:30
	→ mkelly joined	21:30
_ikke_	I think it's comparable	21:30
	← mkelly left	21:30
_ikke_	git replace --graft <commit> <parent>	21:31
	← NeverDie left	21:31
	→ cyrus_mc_ joined	21:31
	← Nes_To left	21:32
	→ nwkj86 joined	21:32
	← ensyde left	21:33
	← Code_Bleu left	21:33
	→ Code_Bleu joined	21:33
	← cyrus_mc_ left	21:35
	→ baxx joined	21:35
	→ squiddle joined	21:36
	→ tpollard joined	21:36
	→ zumba_addict joined	21:36
baxx	if i have a repo that I've forked so that i can implement changes what's the best way to ensure that next time I come to make a change I've got the latest code from the main repo (rather than the repo on my github)?	21:36
	← clemf left	21:37
	→ clemf joined	21:37
	← astockton left	21:38
	→ astockton joined	21:38
	→ NeverDie joined	21:38
	← akushner left	21:39
	← akushner_ left	21:39
	→ akushner joined	21:40
	→ akushner_ joined	21:40
	← BigWillie left	21:40
	← cbonobo left	21:40
	← astockton left	21:40
	→ BigWillie joined	21:40
	→ astockton joined	21:40
	← squiddle left	21:40
Eugene	baxx - !upstream_pull	21:41
	!pull_upstream	21:41
gitinfo	To pull changes from an "upstream" repository(or any other repo that is not "origin") into your repo, use: git remote add upstream $URL; git fetch upstream; git merge upstream/$BRANCH	21:41
	← zeroed left	21:41
Eugene	.trigger_edit upstream_pull @!pull_upstream	21:41
gitinfo	Eugene: Okay.	21:41
	← junw left	21:42
	← s00pcan left	21:42
	← devth__ left	21:42
	→ squiddle joined	21:43
	→ devth joined	21:43
Ademan	ergh, I can't seem to get this third patch applied with the same SHA1, I'm providing --keep-cr --committer-date-is-author-date (which has made the first two patches SHA1 match the patch provider's)	21:43
	← nilg left	21:43
	→ BigWilli_ joined	21:44
	← jost left	21:44
	← akushner left	21:44
	← akushner_ left	21:44
ojacobson	(that may be a fluke.)	21:44
	If the original patch was ever rewritten or had a committer date different from its author date for any other reason (rebase being the most likely), then you'd need to set the committer date to that exact second to get the same SHA1	21:45
	← BigWillie left	21:45
ojacobson	since it's not included in the patch, that's likely impossible	21:45
	or at least wildly impractical	21:45
	← jeffreylevesque left	21:46
	← RedShift left	21:46
	→ bronson joined	21:47
	← d4rklit3 left	21:47
Ademan	ojacobson: hrm, fair enough, thanks	21:47
	← squiddle left	21:47
	← synthroid left	21:50
	← IrishPrime left	21:51
	← arooni_ left	21:52
	← rossome left	21:52
	← User458764 left	21:54
	← elsevero left	21:54
	← Es0teric left	21:54
	← baris_ left	21:54
	← dfrey_ left	21:54
	→ hosttor joined	21:55
	← jteneyck left	21:55
	← ferr left	21:55
	→ alanwill joined	21:56
	→ lhunath joined	21:56
	← lhunath left	21:56
	→ lhunath joined	21:56
	→ infernix joined	21:56
	→ ahr3n joined	21:56
	← jimi_ left	21:57
	← bollullera left	21:57
	← dsdeiz left	21:58
lhunath	I have two commits, A and B, I know somewhere in the future, the branches that these commits are on get merged together. How can I find the last commit in a branch B that has both A and B as ancestor?	21:58
	→ junw joined	21:58
	→ mallocthis joined	21:58
lhunath	s/branch B/branch/	21:59
ojacobson	git-am doesn't promise to retain hashes anyways (it's meant for patch-based workflows, where contributors may not have anywhere to publish a git repo containing their changes)	21:59
	→ Es0teric joined	21:59
	← BigWilli_ left	21:59
	← crose left	21:59
_ikke_	lhunath: git merge-base A B	21:59
lhunath	_ikke_: that sounds like it'll give me the common ancestor of A and B.	22:00
	the ancestor of A and B doesn't have A or B as ancestor.	22:00
	← astockton left	22:00
	← mallocthis left	22:00
_ikke_	lhunath: Confusing when using the same letter for a commit and branch	22:00
ojacobson	the last commit in a branch that has both A & B as an ancestor is either the branch itself (if it contains both commits) or nothing (if the branch doesn't contain both)	22:01
lhunath	Yeah, I shouldn't have named the branch.	22:01
	ojacobson: last as in, first :-)	22:01
	← AaronMT left	22:01
lhunath	as in, the farthest back in time. since I can't English well.	22:01
	→ astockton joined	22:02
lhunath	s/time/git commit ordering/	22:02
	← victortyau left	22:02
	← ahr3n left	22:03
ojacobson	I don't think there's a built-in tool for that class of topology problem	22:03
	you can script it with rev-list or bisect, though	22:04
_ikke_	Doesn't that also have to do that you can only travel to parents, not to children?	22:04
lhunath	http://ix.io/o7k	22:04
	I know A, B and E. I want to find C, not D.	22:04
	→ lmatteis joined	22:04
_ikke_	What direction is history going?	22:05
	← Sod left	22:05
lhunath	E is the (tip of the) branch.	22:05
_ikke_	right	22:05
	← unreal left	22:05
_ikke_	There is no easy way to find this out through git	22:05
	→ mallocthis joined	22:05
	→ PsionTheory joined	22:05
	→ BRODUS joined	22:05
_ikke_	because from A and Bs point of view, C does not exist	22:06
lhunath	I guess I could do a git log B..E and A..E and find the first common commit.	22:06
	← kpease left	22:06
	→ dfrey_ joined	22:06
	← clemf left	22:06
BRODUS	i want my blog in a git repo, i want to "ignore" the output directory, but I want the output directory to be its own git repo that I can push to my github pages repo. Are submodules the easiest solution to this?	22:07
yoh_	eh -- can't find how to get the tree object for the index. thought to avoid going through some temporary commit for my evil merge via commit-tree	22:07
	→ clemf joined	22:07
BRODUS	I tried symlinking the output folder but git doesn't track changes in that	22:07
jast	yoh_: git write-tree	22:08
	→ unreal joined	22:08
yoh_	jast: awesome!	22:08
	thanks!	22:09
	→ rossome joined	22:09
	← leonarth left	22:09
	← strayPuppy left	22:10
	→ jam_ joined	22:11
	→ ferr joined	22:11
	← astockton left	22:11
_ikke_	BRODUS: correct	22:11
	→ junw_ joined	22:11
_ikke_	BRODUS: is there a connection between the blog and the output dir?	22:12
	← mizu_no_oto left	22:12
yoh_	just for the record -- full recipe to "fake" a merge of branch b2 with content of current index is : git reset --hard $(echo "doing merge via write-tree" \| git commit-tree `git write-tree` -p HEAD -p b2)	22:12
BRODUS	the blog compiles templates and dumps it into the output dir	22:12
	← tobias left	22:13
	→ akushner_ joined	22:13
	← apotry left	22:13
	→ daito joined	22:13
_ikke_	Do you want to tie versions of the blog together with the output dir?	22:13
	→ Balliad joined	22:14
	→ akushner joined	22:14
	← junw left	22:14
BRODUS	_ikke_: hmm, i dont think so. Why would that be useful ?	22:15
	← jam_ left	22:15
_ikke_	BRODUS: That's what submodules do	22:15
	← Cihan left	22:15
	← Es0teric left	22:15
	← italoacasas left	22:15
	→ leonarth joined	22:16
	← jkoudys left	22:16
BRODUS	so if I tag a version to the parents most recent submodule gets tagged at the most commit too?	22:16
	*most recent commit	22:16
	← Kicer86 left	22:16
	← a3Dman left	22:16
	← elastix left	22:17
	→ Cihan joined	22:17
_ikke_	Nothing to do with tags	22:17
	← daito left	22:18
	← leonarth left	22:19
	← EvilPenguin left	22:20
	→ s00pcan joined	22:20
	→ jottr_ joined	22:21
	← vkngpmhc left	22:21
	← madewokherd left	22:21
	→ namikr joined	22:21
	→ vkngpmhc joined	22:22
	→ a3Dman joined	22:22
	← IWishIKnew left	22:22
	→ astockton joined	22:23
	→ jkoudys joined	22:23
	→ glebihan joined	22:23
	← jottr left	22:23
	→ phree joined	22:24
	← ash_workz left	22:25
	← TomyLobo left	22:25
	→ baris_ joined	22:26
	← t0by left	22:28
	→ arooni_ joined	22:29
	→ jeffreylevesque joined	22:29
	← s00pcan left	22:29
	← years left	22:30
	→ years joined	22:30
	→ mizu_no_oto joined	22:31
	→ dsdeiz joined	22:31
	→ s00pcan joined	22:32
	zequence_ → zequence	22:33
	← xnil left	22:33
	→ xnil joined	22:33
	← The_Phoenix1 left	22:34
	← ki0 left	22:34
	← namikr left	22:34
j416	ooh there's finally recursive theirs!	22:35
	hm wait.. was that always there	22:35
_ikke_	yes	22:35
	it was the merge strategy theirs that is 'missing'	22:35
j416	aaah, right	22:35
_ikke_	not the recursive option theirs	22:35
j416	_ikke_++	22:36
_ikke_	You had surprised for a sec :P	22:36
j416	:D yes	22:36
	revolutionary, I thought	22:36
	← aranea left	22:37
jast	as it is, poor man's '-s theirs' is still three lines	22:38
	← livingstn left	22:38
j416	fortunately there are few use-cases for it	22:38
	← nettoweb left	22:39
	→ govg joined	22:40
_ikke_	non I would say :P	22:41
	But who am I	22:41
	→ nnyk joined	22:43
	→ kazantip joined	22:44
	← samw left	22:44
	← years left	22:44
	← mohabaks left	22:44
	→ cbonobo joined	22:44
	← Dougie187 left	22:44
jast	I've missed it a few times	22:44
	→ mkelly joined	22:45
	→ sargas joined	22:45
	→ nnyk_ joined	22:47
	thiago wonders how to solve a rename/rename conflict that isn't about renaming	22:48
	← nnyk left	22:48
thiago	it's a copy/rename conflict that Git is confused about: one file was copied, the other was renamed. It doesn't know how to apply the change.	22:48
_ikke_	so one file copied from A to B, and another moved from B to C?	22:49
thiago	there was a file called A, which I renamed to B	22:49
	in the meantime, someone copied A to C	22:49
	when I rebased, Git is complaining about rename/rename conflict	22:49
	← sargas left	22:50
	→ t0by joined	22:50
thiago	no, bad diagnosis. The problem is slightly different.	22:51
	I'm rebasing some changes on top of the same changes...	22:52
	→ akiva joined	22:52
	← tvw left	22:52
	→ lenovouser joined	22:52
	← Wetmelon left	22:52
	← uri_ left	22:53
	← hobodave left	22:54
_ikke_	hmmm	22:54
	← SimonNa left	22:55
thiago	the correct fix was git rebase --skip	22:55
	→ years joined	22:55
	← mallocthis left	22:56
	→ MattMaker joined	22:56
	← aleksandar2810 left	22:56
	← Fijit left	22:57
	→ victortyau joined	22:57
	→ madewokherd joined	22:58
	← cbonobo left	22:58
	← clemf left	22:59
	← lmek left	22:59
_ikke_	let's ignore it	22:59
thiago	yes	22:59
	→ AtnevRed joined	22:59
	→ yqt joined	23:01
	← devth left	23:02
	→ jstimm joined	23:02
	→ devth joined	23:03
	→ strayPuppy joined	23:03
	→ diegoaguilar joined	23:03
	→ samw joined	23:04
	← AtnevRed left	23:05
	← t0by left	23:05
	← Balliad left	23:05
	← bango2 left	23:05
	← cdg left	23:07
	→ Es0teric joined	23:09
	← zumba_addict left	23:09
	← mwhooker left	23:10
	← jstimm left	23:10
	→ Che-Anarch joined	23:10
	← diegoviola left	23:12
	← cagedwisdom left	23:13
	← s00pcan left	23:13
	→ eijk_ joined	23:13
	→ s00pcan joined	23:14
	← Treio left	23:14
	→ Atm0spher1c joined	23:14
	→ jstimm joined	23:16
	← eijk left	23:16
	← astockton left	23:16
	← Faylite left	23:17
	← editshare-ericf left	23:17
	← gpyh left	23:17
	→ raijin joined	23:17
	[Saint_] → [Saint]	23:18
	← MrWoohoo left	23:20
	→ IWishIKnew joined	23:20
	→ astockton joined	23:20
	← nnyk_ left	23:21
	← sgambino left	23:22
	← astockton left	23:24
	→ astockton joined	23:25
	← Es0teric left	23:25
	→ cagedwisdom joined	23:25
	→ gfixler1 joined	23:26
	→ Treio joined	23:27
	→ m1dnight1 joined	23:27
	← m1dnight_ left	23:28
	→ EvilPenguin joined	23:28
	← LucaTM left	23:28
	→ clemf joined	23:28
	← paddyez left	23:29
monk12	another quick question... is there a way for Eclipse to ignore changes in Line Endings/whitespace? I tried Team->General->Compare/Patch->Ignore WS setting, Team->Workspace->New text line delimiter setting to Unix, Team->Git->Config->core.autocrlf=true and false and i still see line ending issues in my Git Staging area	23:30
	m1dnight1 → m1dnight_	23:30
monk12	I'd like to commit these files without them showing up in Git Staging, was hoping I dont need to individually check and change the line ending (dos or unix) file, and Eclipse/Git can just smartly know and not ask to check it in	23:31
	jottr_ → jottr	23:31
	← nwkj86 left	23:31
	→ jteneyck joined	23:32
thiago	monk12: Eclipse questions don't belong in #git	23:32
monk12	thiago: gotcha. just thought it was something git people also familiar with and could help out with. Line Endings seems to be a very common issue in git so thought i'd ask based on articles I've googled	23:33
thiago	yes, line endings are a problem	23:33
	which is why I don't program on Windows and, whenever I do, I force everything to LF	23:34
	← ianclark left	23:34
	← astockton left	23:34
	→ astockton joined	23:35
	← Limes_ left	23:36
	← NeverDie left	23:37
monk12	eh, i'll do that now via dos2unix and maybe check those files in as unix line endings.	23:37
	sitaram_ → sitaram	23:37
	← modocache left	23:38
	← astockton left	23:38
	→ modocache joined	23:38
	← samw left	23:40
	← KaibaCorp left	23:41
	→ dsdeiz_ joined	23:42
	→ samw joined	23:42
	← baris_ left	23:42
	← dsdeiz left	23:44
	→ squiddle joined	23:44
	← MattMaker left	23:44
	→ ICantCook joined	23:45
	→ pwnz0r joined	23:45
	→ years_ joined	23:45
pwnz0r	anyone here good at manipulating history? i have a pull request merge commit in history, that was later reverted by using the pull request revert feature. now I need to merge that code back again, but since it is already in history, i cannot merge. I am not sure how to fix this, and the branch is public	23:45
	← diogenese left	23:45
	← years left	23:45
preaction	pwnz0r: revert the revert	23:46
pwnz0r	it won't revert automatically	23:46
	due to another much larger merge commit taking place	23:46
	i want to revert the revert now and fix conflicts but I'm not sure how	23:47
	← samw left	23:47
preaction	git revert <revert commit id>; then !eekaconflict	23:47
gitinfo	Merge conflicts are a natural part of collaboration. When facing one, don't panic. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II	23:47
	← squiddle left	23:49
ICantCook	I need some help with reverting a merge. Someone merged a different repository into master and pushed, and I am trying to undo this.	23:50
	← mizu_no_oto left	23:50
ICantCook	I understand the merge has 2 parents	23:50
Eugene	ICantCook - !fixup	23:50
gitinfo	ICantCook: 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!	23:50
	← devth left	23:50
	← Treio left	23:50
pwnz0r	preaction: ill read the man page on revert	23:51
	→ NeverTired joined	23:51
preaction	pwnz0r: it's literally that command, that's it. if it fails, it's like any other merge fail, and it dumps you out into the working tree with an admonishment to resolve the conflicts	23:51
pwnz0r	ok cool	23:52
	→ astockton joined	23:53
	← astockton left	23:53
ghoti	I've got a working gitolite environment where I'd like devs to be able to create and delete branches, but I don't want to grant RW+ to everyone. Is there a way to permit branch deletion only, or perhaps to permit RW+ to branches that are not master?	23:53
	→ diegoviola joined	23:53
ICantCook	Eugene: What I'm trying to do isn't on that page	23:53
	I'm trying to revert to a specific parent (I think)	23:54
	but I've tried both parents, and neither looks right	23:54
	(as per http://stackoverflow.com/questions/3240230/git-revert-merge-to-specific-parent)	23:54
Eugene	You've got something merged+pushed that shouldn't have?	23:54
	← mkelly left	23:54
ICantCook	Eugene: yeah	23:54
pwnz0r	preaction: since it was a merge commit i need the -m option	23:54
Eugene	You're trying to "go back to" the parent then, not revert it	23:54
ICantCook	and when I revert or reset to just before that merge, I lose ~1 year worth of commits	23:54
Eugene	!revert	23:54
gitinfo	That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?	23:54
pwnz0r	do i give a branch name or a hash?	23:54
Eugene	You want e)	23:55
preaction	pwnz0r: you're reverting a revert. that revert wasn't a merge commit	23:55
pwnz0r	well there are two commits	23:55
	there is the revert	23:55
	and the merge commit for the revert	23:55
	← el_seano left	23:55
	← IWishIKnew left	23:55
Eugene	You don't want a new, "undo" commit(which is what revert does), you want to rewind to a point where the merge didn't ever exist	23:55
pwnz0r	should i just revert the commit and leave the merge commit as is?	23:56
preaction	pwnz0r: the revert reverted the merge commit. so the merge commit is A, the revert is the opposite of A, which means reverting the opposite of A is A again	23:56
Eugene	Because this is going-back-in-time you will need to `git push -f` the new point	23:56
pwnz0r	awesome haha thnaks so much	23:56
	→ el_seano joined	23:57
	→ samw joined	23:57
ghoti	Can I configure gitolite with only RW permissions on "master", but still permit devs full access to their branches (to rebase or delete them) with this?	23:57
	repo @repolist	23:57
	RW master = @devs	23:57
	RW+ . = @devs	23:57
	→ astockton joined	23:57
	← dmto left	23:57
Eugene	You should put it under a namespace/, rather than a regex at the top-level like that(which won't work, incidentally. That will grant + ro master, I believe)	23:58
	→ NeverDie joined	23:58
	→ leonarth joined	23:58
Eugene	The special USER keyword bay be of interest	23:58
ghoti	Eugene, doesn't the word between permissions and '=' get matched to the branch?	23:59
Eugene	master would match .	23:59

Logs Search ←Prev date Next date→

Channels Documentation