IRCloggy #git 2016-08-09

Provider of IRC logs since 2005.

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

	2016-08-09
	→ durham_ joined	00:00
	← mweshi left	00:03
	← BSAlb left	00:03
	← dreiss left	00:04
	→ tesuji_ joined	00:05
	← tesuji left	00:05
	→ BSaboia joined	00:06
	→ _sjs joined	00:07
	→ patrick-sartent joined	00:08
	spongar → polyzen	00:08
	→ jimi_ joined	00:09
	→ mweshi joined	00:09
	← tesuji_ left	00:09
	→ tesuji joined	00:09
	← mweshi left	00:10
	→ NightStrike joined	00:10
	→ mweshi joined	00:11
NightStrike	Help.... I just did a "git rebase -k" instead of "git rebase -i" (typo...) It did a bunch of stuff and I don't know what. Is this bad?	00:11
	→ hahuang61 joined	00:12
	→ medeirosthiiago joined	00:12
	→ Derperperd joined	00:13
	→ csd_ joined	00:13
	← MattMaker left	00:14
	← ahr3n left	00:14
	← mweshi left	00:16
	← hahuang61 left	00:16
	← mohabaks left	00:17
	→ button joined	00:17
	← crayon left	00:17
	→ MattMaker joined	00:17
	← button left	00:17
	→ button joined	00:17
	button → crayon	00:18
	← abyx left	00:18
	→ livingstn joined	00:22
	→ KnightsOfNi joined	00:22
ReenignE	NightStrike: -k doesn't appear to be a flag that git rebase accepts so it likely just rebased.	00:24
	NightStrike: Check git reflog	00:24
NightStrike	The docs say that k makes it keep empty commits	00:24
ReenignE	That's --keep-empty, didn't see shorthand for it though -k would make sense.	00:24
	If your reflog says there was a rebase you can 'git reset --hard HEAD@{1}' assuming no other updates have happened since that was ran.	00:25
	← justanotheruser left	00:26
	→ akiva joined	00:28
	← livingstn left	00:28
ReenignE	Being familiar with 'git reflog' is quite useful. In a situation like this it allows you to see what actions have changed where your HEADs at and to get an idea of what happened while also providing the HEAD@{#} ref syntax to use in commands.	00:28
	Is there a git-joke with "Where's your HEAD at" yet?	00:29
	← Rodya_ left	00:29
	→ Rodya_ joined	00:30
	→ therealGent joined	00:30
	← therealGent left	00:30
	→ therealGent joined	00:30
bremner	many	00:30
	→ justanotheruser joined	00:30
	← ansimation left	00:32
	← dsantiago left	00:33
	→ b1tchcakes joined	00:34
	← sangy left	00:35
	← pioiytr_ left	00:36
	→ pioiytr_ joined	00:36
	→ hahuang61 joined	00:37
	← nitric left	00:38
	→ Electrometro joined	00:38
	← thiago left	00:38
	← _sjs left	00:40
	← BSaboia left	00:41
	← hahuang61 left	00:42
	→ BSaboia joined	00:43
	→ dhollinger joined	00:43
	← Darren_ left	00:44
	← Sasazuka left	00:45
	← crayon left	00:49
	← BSaboia left	00:50
	← madebymarkca left	00:51
	→ NeXTSUN joined	00:51
	← jimi_ left	00:52
	→ veilig2000 joined	00:53
	← cdown left	00:53
	← sebascar left	00:53
	→ jimi_ joined	00:54
	→ livingstn joined	00:55
	← a3Dman left	00:56
	→ a3Dman joined	01:00
	→ crayon joined	01:00
	→ Anderson69s_Pi joined	01:01
	← therealGent left	01:01
	← crayon left	01:01
	→ crayon joined	01:01
	← MattMaker left	01:02
	← Anderson69s_Deb left	01:04
	→ zivester joined	01:04
	→ MattMaker joined	01:04
	← bjpenn left	01:08
	→ mellernoia joined	01:09
	→ jeffreylevesque joined	01:10
	← diogenese left	01:11
	← cqi left	01:12
	← zacts left	01:12
	→ cqi joined	01:14
	← shinnya left	01:14
	→ zacts joined	01:14
	→ al-damiri joined	01:14
	→ diogenese joined	01:16
	← carif left	01:17
	→ jantje joined	01:20
	← jimi_ left	01:22
	← fahadash left	01:23
	→ thiago joined	01:23
	← pks left	01:26
	→ pks joined	01:27
	← medeirosthiiago left	01:28
	← jantje left	01:28
	→ jantje joined	01:29
	→ sagerdearia joined	01:29
	→ ytl joined	01:29
	← blackwind_123 left	01:31
	→ arescorpio joined	01:31
	→ HanClinto joined	01:31
	→ Mannn joined	01:32
	← spudowiar left	01:32
	← mikecmpbll left	01:34
	← drbean left	01:34
	← akiva left	01:35
	→ akiva joined	01:35
	← akiva left	01:36
	→ jost_ joined	01:38
	→ akiva joined	01:38
	→ durham joined	01:38
	← akiva left	01:39
	← SwiftMatt left	01:39
	← mellernoia left	01:39
	← jost left	01:41
	← MattMaker left	01:41
	→ rkazak joined	01:42
	← durham_ left	01:42
	← cqi left	01:42
	→ SwiftMatt joined	01:43
	← durham left	01:43
	← d4rklit3 left	01:44
	→ MattMaker joined	01:45
	← ilbot3 left	01:46
	← d^sh left	01:48
	→ ilbot3 joined	01:48
	→ d^sh joined	01:49
	← EvilPeng1 left	01:50
	← inflames left	01:51
	→ vassagus joined	01:51
	→ red^ joined	01:55
	← razieliyo left	01:55
ShekharReddy	hello anyone here :)	01:57
	← vassagus left	01:57
ShekharReddy	I have deleted a file locally and when I push the repository is not getting updated	01:57
	→ israelzuniga joined	02:00
	← Derperperd left	02:00
	→ Derperperd joined	02:01
	→ cqi joined	02:02
	← adambrenecki left	02:04
	← romerocesar left	02:06
	← cyphase left	02:06
	← dhollinger left	02:11
	← harish_ left	02:12
	→ fish3485 joined	02:12
	→ kanyeezy joined	02:12
	→ fahadash joined	02:14
	← Derperperd left	02:15
	→ cyphase_eviltwin joined	02:16
	→ romerocesar joined	02:16
	→ Dougie187 joined	02:16
	← fish3485 left	02:17
	→ fish3485 joined	02:18
	← fish3485 left	02:19
	← romerocesar left	02:21
	← HoierM left	02:21
	← govg left	02:22
	→ drupald joined	02:22
	← MattMaker left	02:23
	→ MattMaker joined	02:24
	← crayon left	02:24
	← patrick-sartent left	02:26
	← veilig2000 left	02:26
	→ interne7y joined	02:30
	→ dhollinger joined	02:30
ryez	ShekharReddy: what have you done? steps? did each succeed?	02:33
	→ blockzombie joined	02:34
	← interne7y left	02:34
	→ nyexpress joined	02:35
	→ Goplat joined	02:35
	← nyexpress left	02:36
	→ nyexpress joined	02:38
	← rkazak left	02:38
	← Dougie187 left	02:39
	← csd_ left	02:40
	← NeXTSUN left	02:42
	← j416 left	02:43
	← hexagoxel left	02:43
	→ j416 joined	02:44
	→ lagothrix joined	02:45
	→ Portable joined	02:47
	→ rkazak joined	02:48
	← lagothri1 left	02:48
	→ Brain joined	02:49
	→ hexagoxel joined	02:49
	← MattMaker left	02:50
	← skylite_ left	02:50
	→ MattMaker joined	02:51
	← [Brain] left	02:51
	→ skylite joined	02:51
ShekharReddy	ryez: got it	02:52
	Thanks	02:52
	← chachasmooth left	02:55
	→ omegaenigma joined	02:59
	→ chachasmooth joined	02:59
	← nyexpress left	03:00
	→ troyt joined	03:00
	← radsy left	03:00
	→ ytl_ joined	03:01
	← ahmedelgabri left	03:03
	→ aavrug joined	03:04
	← ytl left	03:04
	← aavrug left	03:04
	→ aavrug joined	03:05
	→ dreiss joined	03:11
	→ bjpenn joined	03:12
	→ therealGent joined	03:13
	← therealGent left	03:13
	→ therealGent joined	03:13
	→ harish joined	03:13
	→ durham joined	03:15
	→ asdofindia joined	03:16
	→ romerocesar joined	03:17
	→ veilig2000 joined	03:18
	→ _sjs joined	03:19
	→ fstd_ joined	03:20
	← romerocesar left	03:21
	→ dhanush joined	03:22
	← bjpenn left	03:23
	← fstd left	03:24
	fstd_ → fstd	03:24
	← durham left	03:24
	→ Derperperd joined	03:25
	→ durham joined	03:25
	← zacts left	03:25
	← livingstn left	03:25
	← elementalest left	03:27
	→ elementalest joined	03:27
	← elementalest left	03:27
	→ elementalest joined	03:27
	← robogoat left	03:30
	→ robogoat joined	03:31
	→ chamunks joined	03:32
	← Rodya_ left	03:33
	← MattMaker left	03:35
	→ MattMaker joined	03:38
	→ SonicJam joined	03:41
	← dsdeiz left	03:42
	→ dsdeiz joined	03:42
	← dsdeiz left	03:42
	→ dsdeiz joined	03:42
	← dreiss left	03:45
	← HanClinto left	03:48
	→ carif joined	03:49
	← MattMaker left	03:51
	→ cagmz joined	03:53
	→ MattMaker joined	03:54
	→ danslo joined	03:54
	→ dsantiago joined	03:54
	→ blackwind_123 joined	03:56
	→ mwlang joined	03:56
	← cagmz left	03:57
	→ cagomez joined	03:57
	← cagomez left	03:57
	→ cagomez joined	03:57
	→ shgysk8zer0 joined	03:59
	← danslo left	03:59
	→ zmachine joined	03:59
	← thecomedian left	04:00
	← dhollinger left	04:00
	← mwlang left	04:00
	← Ph_ left	04:00
	→ thecomedian joined	04:01
	← beyertech left	04:02
	→ dhollinger joined	04:02
	→ Ph_ joined	04:04
	← cagomez left	04:04
	→ neca joined	04:05
	← SwiftMatt left	04:06
	→ romerocesar joined	04:07
	→ beyertech joined	04:08
	← Maple__ left	04:08
	→ mischat joined	04:08
	← israelzuniga left	04:09
	→ dreiss joined	04:09
	boshhead_ → boshhead	04:09
	← ryez left	04:10
	→ chris_ joined	04:10
	→ bjpenn joined	04:10
	→ a_thakur joined	04:10
	→ FelixVi joined	04:11
	→ SwiftMatt joined	04:11
	← romerocesar left	04:12
	← cqi left	04:13
	→ chris___ joined	04:13
	→ phanimahesh joined	04:13
	← mischat left	04:13
	← chris___ left	04:14
	← chris_ left	04:14
	→ israelzuniga joined	04:15
	← dreiss left	04:17
	→ romerocesar joined	04:18
	← israelzuniga left	04:20
	← romerocesar left	04:22
	← phanimahesh left	04:22
	← madewokherd left	04:22
	← attente left	04:22
	← fahadash left	04:23
	→ phanimahesh joined	04:24
	← sylario left	04:26
	← daynaskully left	04:27
	→ Rodya_ joined	04:28
	← Cabanossi left	04:29
	← veilig2000 left	04:31
	→ interne7y joined	04:31
	← Gamecubic left	04:31
	→ NeXTSUN joined	04:32
	→ Cabanossi joined	04:32
	← Rodya_ left	04:33
	→ govg joined	04:34
	← MattMaker left	04:34
	← interne7y left	04:35
	→ cqi joined	04:36
	← skasturi left	04:36
	← sulky left	04:36
	→ MattMaker joined	04:37
	← noteness left	04:37
	← shgysk8zer0 left	04:42
	→ romerocesar joined	04:45
	→ howdoi joined	04:45
	cyphase_eviltwin → cyphase	04:46
	← rkazak left	04:48
	← durham left	04:49
	→ israelzuniga joined	04:50
	← Kulrak left	04:51
	← israelzuniga left	04:51
	→ leeN joined	04:52
	← arescorpio left	04:52
	← therealGent left	04:53
	→ Limes__ joined	04:55
	→ sulky joined	04:55
	→ noteness joined	04:55
	→ skasturi joined	04:56
	← NeXTSUN left	04:57
	→ subhojit777 joined	04:57
	→ NeXTSUN joined	04:57
	← xlegoman left	04:59
	← robogoat left	04:59
	← al-damiri left	05:00
	← azerus left	05:00
	← aidalgol left	05:02
	→ Kulrak joined	05:05
	← Kulrak left	05:05
	→ Kulrak joined	05:05
	→ inflames joined	05:08
	← rbern left	05:08
	← NeXTSUN left	05:12
	→ vassagus joined	05:13
	← sin3t left	05:13
	← pR0Ps left	05:14
	→ romerocesar_ joined	05:15
	→ pR0Ps joined	05:15
	← MattMaker left	05:16
	→ pwnz0r joined	05:16
	← sdothum left	05:16
	← romerocesar left	05:17
	← vassagus left	05:18
	← pwnz0r left	05:18
	→ rbern joined	05:18
	→ stuh84 joined	05:19
	→ nilg joined	05:19
	→ MattMaker joined	05:20
	← Urbany left	05:22
	← flopsec left	05:22
	← arand left	05:23
	← WizJin left	05:23
	← satbyy left	05:24
	→ Raging_Hog joined	05:25
	→ Rodya_ joined	05:29
	← johnny56 left	05:31
	→ johnny56_ joined	05:32
	→ LeMike joined	05:34
	← TinkerTyper left	05:34
	→ ome joined	05:35
	← Rodya_ left	05:35
	→ zeroed joined	05:38
	← zeroed left	05:38
	→ zeroed joined	05:38
	→ robogoat joined	05:39
	→ slayerjain joined	05:39
	← SonicJam left	05:39
	→ satya4ever joined	05:39
	← stuh84 left	05:42
	← CheckDavid left	05:43
	← LeMike left	05:43
	→ a_thakur_ joined	05:45
	← a_thakur left	05:45
	→ rscata joined	05:47
	→ bocaneri joined	05:48
	→ azerus joined	05:48
	← ShekharReddy left	05:49
	← nilg left	05:51
	← neca left	05:52
	→ alfy joined	05:52
	→ jceb joined	05:53
	→ Codfection joined	05:54
	→ mweshi joined	05:54
	→ danslo joined	05:55
	← mweshi left	05:55
	← claudiop left	05:56
	→ mweshi joined	05:56
	← alfy left	05:58
	→ apprentice joined	05:59
	→ xlegoman joined	06:00
	← Codfection left	06:00
	← danslo left	06:00
	← zivester left	06:01
	← bjpenn left	06:01
	→ Codfection joined	06:03
	← kanyeezy left	06:03
	← MattMaker left	06:03
	← dhollinger left	06:04
	→ MattMaker joined	06:07
	← johnny56_ left	06:08
	→ LeBlaaanc joined	06:10
	← sagerdearia left	06:11
	← LeBlaaanc left	06:12
	→ LeBlaaanc joined	06:13
	← LeBlaaanc left	06:15
	→ LeBlaaanc joined	06:15
	→ johnny56_ joined	06:16
	← rewt left	06:17
	→ hanthings joined	06:19
	→ seishun joined	06:20
	→ kanyeezy joined	06:21
	← jaafar left	06:23
	← apprentice left	06:25
	← nights left	06:25
	→ nights joined	06:25
	← MacWinner left	06:26
	← Timvde left	06:26
	← AlHafoudh left	06:26
	← apipkin_ left	06:26
	→ apipkin_ joined	06:26
	← moumitude left	06:27
	→ freimatz joined	06:27
	→ rchavik joined	06:27
	← jorj left	06:27
	← pdgwien left	06:27
	← TomyLobo left	06:27
	← iokill left	06:27
	→ moumitude joined	06:27
	→ pdgwien joined	06:28
	→ rcn joined	06:28
	→ jabular joined	06:28
	→ AlHafoudh joined	06:28
	→ iokill joined	06:28
	→ Timvde joined	06:28
	→ star_prone joined	06:30
	→ jknetl joined	06:30
	→ t-mart__ joined	06:31
	→ interne7y joined	06:32
	→ roelmonnens joined	06:32
	← t-mart_ left	06:34
Seveas	ReenignE: https://github.com/EugeneKay/git-jokes/blob/lulz/Jokes.txt	06:35
	looks like no. Fix it :)	06:35
	→ dhollinger joined	06:35
	→ mariuscc joined	06:35
	← interne7y left	06:36
	← dhollinger left	06:36
	← noteness left	06:39
	← LeBlaaanc left	06:39
	→ roelmonn_ joined	06:39
	← jknetl left	06:40
	← skasturi left	06:41
	→ Sceorem joined	06:41
	→ noteness joined	06:42
	← FelixVi left	06:42
	← roelmonnens left	06:42
	→ tvw joined	06:43
	→ ryez joined	06:43
	← tyreld left	06:44
	← roelmonn_ left	06:44
	→ skasturi joined	06:45
	→ TinkerTyper joined	06:47
	→ roelmonnens joined	06:47
	→ ShekharReddy joined	06:47
	← MattMaker left	06:48
	→ t0by joined	06:48
	→ danslo joined	06:49
	→ MattMaker joined	06:50
	→ abyx joined	06:51
	→ settermjd joined	06:52
	← l4v2 left	06:53
	→ submitnine joined	06:53
	→ gfixler joined	06:54
	→ fahadash joined	06:55
	← johnny56_ left	06:56
	→ ki0 joined	06:58
	← abyx left	06:58
	← mweshi left	06:59
	← Pulp left	07:00
	← xlegoman left	07:00
	→ vmiklos joined	07:01
	→ johnny56_ joined	07:01
	← romerocesar_ left	07:01
	← star_prone left	07:02
	← a_thakur_ left	07:07
	→ rewt joined	07:09
	→ jguillen joined	07:11
	→ romerocesar joined	07:11
	→ sagerdearia joined	07:12
	← moumitude left	07:12
	→ moumitude joined	07:12
	→ vassagus joined	07:13
	→ PCatinean joined	07:14
	→ Softeisbieger joined	07:15
	→ bjpenn joined	07:16
	← romerocesar left	07:17
	← saidelike_ left	07:17
	← thiago left	07:18
	← vassagus left	07:19
	→ a_thakur joined	07:20
	→ saidelike joined	07:21
	→ romerocesar joined	07:22
	→ Darcidride joined	07:23
	→ d4rklit3 joined	07:24
	→ pitastrudl joined	07:25
	→ Balliad joined	07:25
	← ytl_ left	07:25
	← romerocesar left	07:26
	← SwiftMatt left	07:26
	→ watabou joined	07:29
	← wxg left	07:30
	→ ahmedelgabri joined	07:32
	← ryez left	07:33
	← Derperperd left	07:35
	← tvw left	07:35
	→ csd_ joined	07:36
	→ star_prone joined	07:38
	← Goplat left	07:39
	← csd_ left	07:40
	← red^ left	07:41
	← DevAntoine left	07:43
	→ tinajohnson___ joined	07:44
	→ LiohAu joined	07:47
	→ aidalgol joined	07:48
	→ rubyonrailed joined	07:49
	← Anderson69s_Pi left	07:51
	→ DevAntoine joined	07:52
	→ davidbz joined	07:52
	← mkoskar left	07:54
	← Codfection left	07:55
	→ mikecmpbll joined	07:55
	→ NeXTSUN joined	07:56
	← johnny56_ left	07:56
	← seishun left	07:56
	→ johnny56 joined	07:56
	← grift left	07:57
	→ GavinMagnus joined	07:59
	→ grift joined	08:00
	← a_thakur left	08:04
	→ Anderson69s_Pi joined	08:06
	← harish left	08:06
	← nilsi left	08:08
	← piling left	08:08
	→ garethdaine joined	08:09
	→ nilsi joined	08:09
	→ piling joined	08:09
	→ MrWoohoo joined	08:09
	→ mibr0 joined	08:09
	→ harish_ joined	08:10
	← maxorator left	08:10
	← happy-dude left	08:11
	← star_prone left	08:12
	→ maxorator joined	08:13
	→ tomog999 joined	08:13
	→ marcogmonteiro joined	08:14
	→ davisonio joined	08:15
	← tomog999_ left	08:15
	→ bongjovi joined	08:17
	→ chll_ joined	08:17
	← ome left	08:20
	← synthmeat left	08:23
	→ synthmeat joined	08:24
	← synthmeat left	08:26
	→ synthmeat joined	08:26
	← NeXTSUN left	08:28
	← bjpenn left	08:29
	← aidalgol left	08:29
	→ eijk_ joined	08:31
	← d4rklit3 left	08:32
	→ star_prone joined	08:32
	→ interne7y joined	08:32
	→ fees joined	08:33
	→ eijk joined	08:34
	← liuzhen left	08:35
	→ a_thakur joined	08:37
	← a_thakur left	08:37
	← interne7y left	08:37
	→ a_thakur joined	08:37
	← eijk_ left	08:38
	← nilsi left	08:39
	← watabou left	08:39
	→ interrobangd joined	08:40
	→ nilsi joined	08:40
	← darkbit left	08:44
	→ eott joined	08:48
	→ nikitasius joined	08:51
	← Balliad left	08:51
	← mattsl left	08:51
	→ Balliad joined	08:52
	← jabular left	08:52
	→ jabular joined	08:52
	gitinfo set mode: +v	08:53
	→ aidalgol joined	08:53
	← rubyonrailed left	08:54
eott	is this the right place to ask for help concerning 'huge mistakes done using git'? we have trouble undoing a huge fast-forward merge	08:54
kadoban	Seems like a good place for it, sure.	08:55
eott	okay, thanks. a bit of backstory:	08:55
	→ arand joined	08:55
eott	we have a "Core" repository and over the years "Custom" repos forked off of the core. both the core and the custom repos have been developed over the years. now someone accidentally merged a custom branch into the core master by way of a fast-forward merge. so now we have 11000 commits over three years interspersed with the commits to the core repo in the commit history. so we can't see a single point to where we could reset th	08:57
kadoban	eott: You got cut off after "... to where we could reset th"	08:58
eott	point to where we could reset the master.	08:59
kadoban	eott: Have you checked the reflog? 'git reflog master' should show you previous states of master, and why they changed.	08:59
	← j416 left	08:59
eott	unfortunately I can only see the reflog of my local copy, which only shows me "git pull origin master"	09:00
	→ LeBlaaanc joined	09:00
kadoban	eott: Surely there must be some version of the repo somewhere that has the old versions?	09:01
	→ UncleCJ joined	09:01
	→ j416 joined	09:01
	← ribasushi left	09:01
eott	probably. our current proposes solution involves deleting the remote master, pushing an older version from a local copy, then remerging the "core" branches that have been merged since then	09:02
	however that doesn't seem like "the git way"	09:02
	→ Ezzy joined	09:02
	← leeN left	09:03
kadoban	Well, the other option is some huge revert.	09:03
	← fahadash left	09:03
eott	wouldn't that require identifying the 11k commits for the revert?	09:03
	→ leeN joined	09:04
kadoban	You can specify ranges, and if you have a local copy that knows both the old "good" version of master in the reflog that saw the mistaken merge, that's easy to specify. I have no godly idea how long it'll take to revert 11k commits though ...	09:05
	It's really up to you if you want to change history, which has its own issues, or do that.	09:05
	If you change history, everyone needs to make sure they also start using your changed history. Which is kind of tedious and confusing, but not particularly hard. Depending on how many people are basing work off of it anyway, or have a copy.	09:06
	← jguillen left	09:06
	← LeBlaaanc left	09:06
eott	eugh, yeah that is not an appealing option. we'll probably do the reset to an older version, then ask everyone to push their branches of the last X days again	09:06
	← Sceorem left	09:06
eott	thanks for the help	09:06
kadoban	'welcome	09:07
	→ Juzzika joined	09:11
	→ vassagus joined	09:14
	← nivag left	09:17
	← boombatower left	09:18
	← vassagus left	09:19
	→ encod3 joined	09:20
	→ Muzer joined	09:20
	→ lss8 joined	09:21
	→ mattsl joined	09:21
	→ xaa joined	09:23
	→ nuc joined	09:24
	→ Sceorem joined	09:25
	→ Rish joined	09:25
	← nuc left	09:25
	→ djb-irc joined	09:25
	← GavinMagnus left	09:26
	→ linuxmint joined	09:27
	→ neca joined	09:28
	← mibr0 left	09:31
	→ lugzer joined	09:32
	← Rish left	09:36
	→ Rish joined	09:37
	→ GavinMagnus joined	09:37
	← UncleCJ left	09:40
	← star_prone left	09:41
	← roelmonnens left	09:43
	→ roelmonnens joined	09:43
	← phoenix301 left	09:43
	→ Anticom joined	09:44
	← sagerdearia left	09:44
	→ Ardethian\work joined	09:47
	→ iomari joined	09:48
	← zmachine left	09:48
	← netj left	09:49
	→ netj joined	09:49
	→ ondrejs joined	09:50
	← hamster left	09:51
	→ nivag joined	09:52
	→ star_prone joined	09:52
	← EgS left	09:53
	← jceb left	09:54
	→ sdothum joined	09:55
	→ phoenix301 joined	09:56
	← kadoban left	09:56
	← ondrejs left	09:56
	→ sagerdearia joined	09:58
	→ flopsec joined	09:59
	→ nilg joined	10:00
	← dsdeiz left	10:01
	← DevAntoine left	10:01
	← davisonio left	10:02
	← mablae__ left	10:02
	→ mablae__ joined	10:03
	← ahmedelgabri left	10:03
	→ UncleCJ joined	10:04
	→ IIT joined	10:05
IIT	can we clone all the repos under a specific organization ?	10:06
	← Rikairchy left	10:06
	→ jceb joined	10:07
	→ alipoor90 joined	10:07
	→ davisonio joined	10:07
alipoor90	Is there any difference between `git gc` and `git repack -ad`?	10:08
	→ Rikairchy joined	10:09
	→ ahmedelgabri joined	10:10
	→ zack_s_ joined	10:11
	→ thebloggu joined	10:12
	← thebloggu left	10:13
	← alipoor90 left	10:14
	← GavinMagnus left	10:16
	← UncleCJ left	10:17
zack_s_	I have a commit-msg hook, which should extract from the branch name the jira ID	10:17
	https://paste.ee/p/YGTqE	10:17
	→ thebloggu joined	10:17
zack_s_	however, it doesnt work to attach the extracted id AFTER the message	10:18
	→ satifant joined	10:18
	← ahmedelgabri left	10:18
	← danslo left	10:19
	← MattMaker left	10:20
	→ MattMake_ joined	10:20
	← djb-irc left	10:22
	→ mcqr joined	10:23
	→ ribasushi joined	10:24
	← jeffreylevesque left	10:25
	→ ahmedelgabri joined	10:25
	← docnvk left	10:25
	← IIT left	10:29
	← howdoi left	10:29
	← star_prone left	10:30
canton7	zack_s_, define "it doesn't work to ..."? does it actually execute line 19?	10:30
	→ sin3t joined	10:31
	→ Ranhir joined	10:31
	→ IIT joined	10:33
	→ interne7y joined	10:33
	→ NeXTSUN joined	10:33
	Xandaros_ → Xandaros	10:34
	← sin3t left	10:34
	→ rik316 joined	10:34
	→ selckin joined	10:34
	→ sin3t joined	10:34
	← NeXTSUN left	10:34
	← interne7y left	10:38
	→ rockitude joined	10:41
	→ cdown joined	10:42
	← eott left	10:42
	← ahmedelgabri left	10:44
	← sin3t left	10:44
	← blockzombie left	10:44
	← sagerdearia left	10:44
	→ sin3t joined	10:44
	→ Izabia joined	10:45
	← Izabia left	10:45
	→ gajus joined	10:46
	← gajus left	10:46
	→ gajus joined	10:46
	→ ahmedelgabri joined	10:47
	← nilg left	10:48
	→ fuchstronaut joined	10:48
	← fuchstronaut left	10:48
	→ fuchstronaut joined	10:48
	← jceb left	10:49
	→ veilig2000 joined	10:50
	← sin3t left	10:53
	→ rns joined	10:54
	← rns left	10:54
	→ danslo joined	10:54
	→ sin3t joined	10:54
	← rik316 left	10:55
	← zack_s_ left	10:59
	← roelmonnens left	11:01
	→ roelmonnens joined	11:01
	→ Maple__ joined	11:02
	← Rish left	11:03
	→ jeffreylevesque joined	11:03
	← sin3t left	11:03
	→ sin3t joined	11:04
	→ cyan__ joined	11:05
	→ mithenks joined	11:05
	→ selceeus joined	11:06
	← cdown left	11:08
	← danslo left	11:10
	→ danslo joined	11:11
	← ojdo left	11:11
	→ zack_s_ joined	11:11
zack_s_	canton7: yes it does	11:11
	→ abatwork joined	11:12
zack_s_	it get this output: "New commit message: [TTS-2336] test"	11:12
	← abatwork left	11:12
	← sin3t left	11:13
	→ sin3t joined	11:14
	→ choki joined	11:14
	← johnmilton left	11:14
	→ vassagus joined	11:15
	→ rik316 joined	11:15
	← aidalgol left	11:15
	→ ojdo joined	11:17
	← veilig2000 left	11:18
	← vassagus left	11:20
	← sin3t left	11:23
	→ sin3t joined	11:24
	→ UncleCJ joined	11:24
fuchstronaut	is there a way to count the number of commits from a sha hash on until the latest commit on a certain branch?	11:25
	→ jceb joined	11:28
selckin	git log \| sed '/sha.*$/,$d' \| wc -l	11:28
	hacky hacky	11:28
fuchstronaut	git rev-list hash..HEAD shows me a list of all hashes but how do i count them?	11:29
selckin	\| wc -l	11:29
fuchstronaut	aaah	11:30
	so the \| takes what rev-list returns and wc -l counts the number of new lines?	11:30
	→ star_prone joined	11:30
	→ p4trix joined	11:31
selckin	\| pipes the stdout of the left side to the stdin of the program on the right	11:31
	wc is wordcound, and -l counts lines	11:31
	← Dreamer3 left	11:32
	← MattMake_ left	11:32
	← xaa left	11:33
	→ GavinMagnus joined	11:33
	→ MattMaker joined	11:33
	→ anuxivm joined	11:33
	← sin3t left	11:33
	→ sin3t joined	11:34
fuchstronaut	thanks selckin	11:34
	← star_prone left	11:35
	→ csd_ joined	11:36
	← Sceorem left	11:37
	← ahmedelgabri left	11:37
	→ livingstn joined	11:37
	← Ardethian\work left	11:39
	→ Ardethian\work joined	11:39
zack_s_	canton7: are you there?	11:40
	← csd_ left	11:40
	→ ahmedelgabri joined	11:41
	← MattMaker left	11:41
	→ circ-user-Y1dra joined	11:43
	← sin3t left	11:43
	→ sin3t joined	11:44
	→ romerocesar joined	11:44
	← livingstn left	11:46
	→ str joined	11:46
	→ medeirosthiiago joined	11:47
	→ star_prone joined	11:49
	← romerocesar left	11:49
	← artgoeshere left	11:50
	← rik316 left	11:50
fuchstronaut	having a branch that is behind ~1300 commits, is there a way I can TRY to rebase it and abort and revert back in case I fail? Im afraid I might screw up either the branch or master	11:51
	← ec\ left	11:52
	← star_prone left	11:52
	→ ec\ joined	11:52
	→ sanketdg joined	11:53
	← sin3t left	11:53
danslo	fuchstronaut: you can always 'git rebase --abort', that said, just back up the folder before you start doing that stuff	11:54
	→ sin3t joined	11:54
	→ star_prone joined	11:54
	← theskillwithin left	11:55
	← LiohAu left	11:55
	→ rubyonrailed joined	11:55
	← flaguy48 left	11:55
	→ artgoeshere joined	11:56
	← rubyonrailed left	11:56
	← davisonio left	12:00
	→ MattMaker joined	12:02
	→ kc8wxm joined	12:03
	→ davisonio joined	12:03
	← kc8wxm left	12:04
	→ Sceorem joined	12:04
fuchstronaut	danslo: what do you mean, backup the folder? just copy/paste it?	12:05
	→ donnib joined	12:05
donnib	hi	12:06
	→ johnmilton joined	12:06
fuchstronaut	shouldn't git rebase --abort restore everything?	12:06
	← jeffreylevesque left	12:06
danslo	fuchstronaut: it should, and I do it all the time :) but why risk it?	12:06
	← ahmedelgabri left	12:06
donnib	i am working both on Mac and Windows and i have problems with Line endings, if i run core.autocrlf input on mac and core.autocrlf true on windows then how should the line endings be when files reside in git ?	12:07
fuchstronaut	ok, so backing up is just for peace of mind.. will backing up screw up anything git-related? or is it all inside .git?	12:08
	→ mischat joined	12:08
	→ ahmedelgabri joined	12:09
	→ flaguy48 joined	12:10
	← ahmedelgabri left	12:11
	→ LiohAu joined	12:11
	→ ahmedelgabri joined	12:11
	← mischat left	12:13
	→ LeBlaaanc joined	12:14
	→ rwb joined	12:15
	→ dsdeiz joined	12:15
	← MattMaker left	12:15
	→ TooLmaN joined	12:16
	→ ujan joined	12:17
	→ synthroid joined	12:18
	→ abdul joined	12:18
	← govg left	12:20
	← leeN left	12:20
	→ xaa joined	12:21
	← a_thakur left	12:21
	→ a_thakur joined	12:21
	→ fmcgeough joined	12:23
	→ D[4]ni_ joined	12:23
	← sin3t left	12:23
	→ sin3t joined	12:23
	← selceeus left	12:24
	← davisonio left	12:24
	→ tabrez joined	12:27
	→ tlaxkit joined	12:28
fuchstronaut	if I checkout a feature branch and 'git rebase master', the feature branch will be rebased onto master, right?	12:29
	now I have a merge conflict and I wonder if the code in between '<<<<<<< HEAD' and '=======' is the code on top of master	12:29
	← davis left	12:29
	← jstimm left	12:30
	← aavrug left	12:30
	→ Rodya_ joined	12:31
	← Rodya_ left	12:32
	→ docnvk joined	12:33
	← sin3t left	12:33
	→ sin3t joined	12:33
	← LeBlaaanc left	12:33
	← b1tchcakes left	12:34
	← cqi left	12:34
	→ tvw joined	12:36
	→ kc8wxm joined	12:36
	→ daniel_rose joined	12:36
	← kc8wxm left	12:36
	← iomari left	12:37
	← tvw left	12:39
	→ davisonio joined	12:40
	← HappyLoa- left	12:42
	← sin3t left	12:43
	← a_thakur left	12:43
	→ sin3t joined	12:43
	→ fahadash joined	12:44
	→ livingstn joined	12:44
	← phoenix301 left	12:44
	→ MattMaker joined	12:45
	→ Rodya_ joined	12:45
	← slayerjain left	12:48
osse	fuchstronaut: it's the code from the current branch	12:48
fuchstronaut	and the lower part is code from master?	12:49
	→ zivester joined	12:50
fuchstronaut	behind '<<<<<<' there is the commit message from a commit in my branch i am trying to rebase onto master and the only line that was commited is part of the second block	12:50
	← MattMaker left	12:50
fuchstronaut	but the second block contains way more lines than only that line	12:50
	← subhojit777 left	12:51
	→ perlpilot joined	12:51
osse	ah rebase	12:52
	then it's the other way around	12:52
m1dnight1	:(	12:52
fuchstronaut	So, in a conflict while rebasing A onto master, the first block is code from master's head and the second block is code from the commit of A that is causing a conflict?	12:53
	→ HappyLoa- joined	12:53
	← perlpilot left	12:53
	← sin3t left	12:53
	← D[4]ni_ left	12:53
	→ jeffreylevesque joined	12:53
	→ sin3t joined	12:53
	← quenode left	12:54
	← tinajohnson___ left	12:55
	→ codeman joined	12:59
	→ Sasazuka joined	12:59
	→ jimi_ joined	13:00
	← zeroed left	13:00
	← medeirosthiiago left	13:01
	← Rodya_ left	13:02
	← IIT left	13:02
fuchstronaut	riiiight=	13:03
	← sin3t left	13:03
	→ sin3t joined	13:03
	→ MattMaker joined	13:04
	← Gitzilla left	13:05
	→ sebascar joined	13:06
	← sebascar left	13:08
	→ HanClinto joined	13:08
	← anuxivm left	13:08
	← Juzzika left	13:09
	← daniel_rose left	13:09
	→ cdown joined	13:10
	← tlaxkit left	13:11
	← tlolczyk left	13:12
	→ cdown_ joined	13:12
	→ topolinux joined	13:13
	← sin3t left	13:13
	→ sin3t joined	13:13
	← danslo left	13:14
	← cdown left	13:14
	cdown_ → cdown	13:14
	← MattMaker left	13:14
	→ loulou123546 joined	13:15
	→ FilipNortic__ joined	13:15
	→ JanC_ joined	13:15
	→ vassagus joined	13:16
	JanC → Guest75507	13:16
	← Guest75507 left	13:16
	JanC_ → JanC	13:16
	→ MattMaker joined	13:16
	← BrianJ left	13:16
	← FilipNortic_ left	13:17
	→ cdg joined	13:17
	← cdg left	13:18
	→ veilig2000 joined	13:18
	← loulou123546 left	13:18
	→ cdg joined	13:18
	→ danslo joined	13:18
osse	fuchstronaut: that should be it, yes	13:19
	→ crose joined	13:19
	← danslo left	13:20
	→ ksolv joined	13:20
	← vassagus left	13:20
	→ daniel_rose joined	13:20
	→ danslo joined	13:21
	← sin3t left	13:23
	→ sin3t joined	13:23
	→ rik316 joined	13:23
	→ jstimm joined	13:24
	→ Finnoloid joined	13:25
	← fuchstronaut left	13:26
	← fmcgeough left	13:27
	← MattMaker left	13:28
	→ ExoUNX joined	13:28
	→ DevAntoine joined	13:29
	→ playfullyExist joined	13:29
	← star_prone left	13:29
	← linuxmint left	13:30
	← zivester left	13:30
	← codeman left	13:30
	→ ash_workz joined	13:30
	→ achadwick joined	13:33
	← sin3t left	13:33
	→ sin3t joined	13:33
	→ Rodya_ joined	13:33
	← topolinux left	13:34
	← Rodya_ left	13:34
	→ govg joined	13:34
	→ MattMaker joined	13:34
	← cdown left	13:34
	→ BSaboia joined	13:34
	→ Rodya_ joined	13:35
	→ CheckDavid joined	13:36
	← Raging_Hog left	13:37
	→ jaafar joined	13:37
	→ arooni joined	13:40
	← govg left	13:41
	→ LBV_User joined	13:42
	← synthmeat left	13:42
	← sin3t left	13:43
	← ujan left	13:43
	→ LionsMane joined	13:43
	→ sin3t joined	13:43
	← MattMaker left	13:44
	→ rubyonrailed joined	13:44
	← Rodya_ left	13:45
	→ BSAlb joined	13:45
	→ phaleth joined	13:49
	← jost_ left	13:50
	→ AaronMT joined	13:50
	← rubyonrailed left	13:50
	← BSaboia left	13:50
	← ksolv left	13:50
	→ star_prone joined	13:50
	← bongjovi left	13:50
	→ JeremyM joined	13:51
	← ahmedelgabri left	13:52
	→ sarbs joined	13:52
	← sin3t left	13:52
	→ MattMaker joined	13:53
	→ sin3t joined	13:53
	← spriz left	13:54
	→ Shadow6363 joined	13:54
	→ Dougie187 joined	13:55
	→ fracting joined	13:55
	→ SourTrout joined	13:56
	← fracting left	13:58
	→ Rodya_ joined	13:59
	→ bongjovi joined	14:00
	→ BrianJ joined	14:00
	→ slayerjain joined	14:02
	← sin3t left	14:02
	→ sin3t joined	14:03
	→ dhollinger joined	14:04
Shadow6363	Not sure if this is the right channel for design questions, but I have a remote repo with a tag, latest-stable that might switch branches. I only care about the latest-stable code; however, I need to apply a patch to that code. Is there a good way to do this such that I have a latest-stable that tracks their latest-stable while also having my patch applied?	14:04
	→ airdisa joined	14:04
	→ Uat joined	14:05
	→ LeBlaaanc joined	14:07
	← playfullyExist left	14:07
	← MattMaker left	14:07
	→ rubyonrailed joined	14:07
	→ z_ joined	14:08
	→ jguillen joined	14:08
	z_ → Guest28998	14:08
	→ rahtgaz joined	14:09
	← Guest28998 left	14:10
	→ gargola joined	14:10
	← jstimm left	14:11
	→ kbs` joined	14:11
	→ GodGinrai joined	14:11
	← sin3t left	14:12
	← rik316 left	14:13
	← LeBlaaanc left	14:13
	→ al-damiri joined	14:13
	→ sin3t joined	14:13
	→ Rish joined	14:15
	← Rish left	14:15
	→ codeman joined	14:15
	→ codeman_ joined	14:16
	→ Darren_ joined	14:16
	→ subhojit777 joined	14:19
	→ mohabaks joined	14:20
	← _sjs left	14:20
	→ kaldoran joined	14:21
	← Uat left	14:21
	← sin3t left	14:22
	→ sin3t joined	14:23
	→ MattMaker joined	14:25
	→ Enyo1 joined	14:25
	→ claudiop joined	14:25
DevAntoine	hi	14:26
	→ fuchstronaut joined	14:27
DevAntoine	I've did a stash pop resulting in lot of conflict. If I understand the doc correctly if I do "git reset --hard HEAD" the stash pop will be reverted but I'll keep all the files in the stash?	14:27
	← daniel_rose left	14:28
	→ cdg_ joined	14:28
	→ csd_ joined	14:28
	← Enyo1 left	14:28
	→ jorj joined	14:29
	→ quenode joined	14:29
	← star_prone left	14:30
moritz	DevAntoine: did you have uncommitted changes before doing the 'git stash pop'?	14:30
DevAntoine	moritz: all the files in the stash	14:31
	→ stamina joined	14:31
	→ star_pro_ joined	14:31
moritz	DevAntoine: was that a "no"?	14:31
	→ leeN joined	14:31
DevAntoine	moritz: except the unstashed files, no	14:31
	← MattMaker left	14:31
	← cdg left	14:31
danslo	“Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call git stash drop manually afterwards.”. - So, yes, you will keep the changes in your stash. But like moritz said, a reset will also reset all non-committed stuff that wasn’t stashed. Just so you’re aware.	14:32
	→ ResidentBiscuit joined	14:32
	← sin3t left	14:32
	← Sasazuka left	14:32
	← Ardethian\work left	14:33
	→ sin3t joined	14:33
moritz	DevAntoine: I'm still not sure what your answer to a simple yes/no question is :/	14:33
	→ Ardethian\work joined	14:33
moritz	anyway, I think danslo answered sufficiently	14:34
	← fuchstronaut left	14:34
DevAntoine	ok, then I think I can reset to head	14:35
	→ ahmedelgabri joined	14:35
	→ interne7y joined	14:35
DevAntoine	When you ask me about uncomittted changes I'm not sure if I should include stashed files in it. Because what I have in the stash is not committed	14:35
	← omegaenigma left	14:37
	← submitnine left	14:37
	→ daniel_rose joined	14:37
	→ dlaboratory joined	14:38
	← danslo left	14:39
	→ subscope joined	14:39
	← cyphase left	14:39
	← interne7y left	14:40
	→ ripero joined	14:40
	→ l4v2 joined	14:40
	← ahmedelgabri left	14:41
	← rchavik left	14:41
	← dsdeiz left	14:42
	← HappyLoa- left	14:42
ripero	while fixing conflicts in a merge, I have rm'd a file I had been working on; what is the best way to recover the partially merged file with conflicts?	14:42
	← sin3t left	14:42
	← UncleCJ left	14:43
	→ sin3t joined	14:43
	← star_pro_ left	14:44
DevAntoine	thanks btw moritz and danslo	14:44
	→ cyphase joined	14:45
	← Softeisbieger left	14:45
	→ shinnya joined	14:45
	→ star_prone joined	14:45
	→ Gitzilla joined	14:45
	→ danslo joined	14:45
moritz	DevAntoine: there are no "stashed files"	14:47
	→ zmachine joined	14:47
moritz	DevAntoine: at any point in time, either you have changes to files in the working directory, or you don't	14:47
	← roelmonnens left	14:47
moritz	ripero: there's a git checkout option for that	14:48
	ripero: --merge if I remember correctly	14:48
	→ eivarv joined	14:49
	← star_prone left	14:49
	→ HappyLoa- joined	14:50
	← crose left	14:50
	→ fuchstronaut joined	14:51
	← rscata left	14:51
	→ ahmedelgabri joined	14:51
NightStrike	Somehow I screwed up a branch on github such that it has two duplicate sets of the same 5 commits	14:51
	← choki left	14:51
NightStrike	how do I fix that?	14:51
	← sin3t left	14:52
	→ sin3t joined	14:53
	→ thiago joined	14:54
	← mikecmpbll left	14:55
	→ mikecmpb_ joined	14:55
	→ madewokherd joined	14:56
	→ fmcgeough joined	14:59
	← stephanie left	14:59
	→ Derperperd joined	14:59
ripero	moritz: thank you, that's the option I was looking for; in the conflict regions it changes the branch names to "ours" and "theirs", but the rest is as expected	15:00
	→ guardian joined	15:00
	→ fate_ joined	15:00
	← danslo left	15:01
	→ MattMaker joined	15:01
	← mohabaks left	15:01
	→ stephanie joined	15:02
	→ abyx joined	15:02
	← sin3t left	15:02
	← settermjd left	15:02
	→ sin3t joined	15:03
	← rahtgaz left	15:03
	→ nilg joined	15:05
	→ romerocesar joined	15:05
	← fate_ left	15:05
	→ Lvjasha joined	15:06
	← HappyLoa- left	15:06
	← jceb left	15:07
	→ chigang_ joined	15:07
	→ Flowinho joined	15:09
	← Sceorem left	15:10
	← MattMaker left	15:10
	← Lvjasha left	15:10
	→ tinajohnson___ joined	15:10
	→ mikecmpbll joined	15:11
	← mikecmpb_ left	15:12
	→ rahtgaz joined	15:12
	→ playfullyExist joined	15:12
	→ choki joined	15:12
	→ Lvjasha joined	15:12
	← sin3t left	15:12
	← thiago left	15:13
	→ cdown joined	15:13
	→ sin3t joined	15:13
	← fahadash left	15:13
	→ zivester joined	15:13
	← daniel_rose left	15:13
	→ dmto joined	15:13
	← Lvjasha left	15:13
	→ nettoweb joined	15:14
	← Derperperd left	15:14
	→ grill joined	15:14
	→ spriz joined	15:14
	→ kedare joined	15:15
	→ IWishIKnew joined	15:15
	← kedare left	15:15
	→ dufus joined	15:15
	→ kedare joined	15:15
	→ Lvjasha joined	15:15
	← Lvjasha left	15:16
	→ fate_ joined	15:16
	→ vassagus joined	15:16
	← fate_ left	15:17
	← faux___ left	15:17
	→ faux___ joined	15:18
	→ Rodya__ joined	15:18
	→ HappyLoa- joined	15:18
	→ tyreld joined	15:18
	← Flowinho left	15:18
	← Rodya_ left	15:18
	→ fractalizator joined	15:19
ripero		15:20
_ikke_		15:20
	← cdg_ left	15:20
qsx		15:20
	← vassagus left	15:21
	→ kpease joined	15:21
	← Rodya__ left	15:22
	→ cdg joined	15:22
	← harish_ left	15:22
	← synthroid left	15:22
	← playfullyExist left	15:22
	← cdg left	15:22
	← fractalizator left	15:23
	→ fractalizator joined	15:23
	← dlaboratory left	15:23
	→ cdg joined	15:23
	→ harish_ joined	15:23
	← satya4ever left	15:25
	→ ams__ joined	15:28
	→ burtons joined	15:29
	→ synthmeat joined	15:29
	→ Derperperd joined	15:29
	← jguillen left	15:29
	← fuchstronaut left	15:29
	← burtons left	15:29
	← BrianJ left	15:30
	→ aard_ joined	15:30
osse	c-c-c-c-combo breaker!!!!	15:30
	ChanServ set mode: +o	15:31
	→ cdg_ joined	15:31
	qsuscs kicked osse (insolent little …)	15:31
	← GavinMagnus left	15:31
	qsx set mode: -o	15:31
	← zack_s_ left	15:32
	→ MattMaker joined	15:32
	← sin3t left	15:32
	← madewokherd left	15:32
	→ sin3t joined	15:32
	← interrobangd left	15:32
	→ burtons joined	15:34
	→ fate_ joined	15:34
	→ a_thakur joined	15:34
	← cdg left	15:34
	→ daniel_rose joined	15:35
	→ Rodya_ joined	15:35
	← cdg_ left	15:36
	← dufus left	15:37
	← Anticom left	15:37
	→ osse joined	15:38
	→ zack_s_1 joined	15:39
	← zack_s_1 left	15:39
	← fractalizator left	15:39
	← daniel_rose left	15:40
	→ fractalizator joined	15:40
	← MattMaker left	15:40
	→ watabou joined	15:40
	fractalizator → Guest25219	15:40
	← watabou left	15:40
	← Balliad left	15:41
	← a_thakur left	15:41
	← Guest25219 left	15:41
	→ a_thakur joined	15:41
	→ fractalizator_ joined	15:42
_ikke_	qsx: Do you have to change your nick to become op?	15:42
	← ahmedelgabri left	15:42
	← sin3t left	15:42
	→ sin3t joined	15:42
	fractalizator_ → help	15:43
	help → Guest18642	15:44
	→ MattMaker joined	15:45
	← a_thakur left	15:45
	→ a_thakur joined	15:46
	→ GavinMagnus joined	15:46
	← Guest18642 left	15:46
	← circ-user-Y1dra left	15:47
	→ govg joined	15:47
	→ hahuang61 joined	15:48
	← mcqr left	15:49
	→ fractalizator_ joined	15:49
	← a_thakur left	15:50
	fractalizator_ → fractalizator__	15:51
	← sin3t left	15:52
	→ sin3t joined	15:52
	→ clemf joined	15:52
	← fractalizator__ left	15:53
	→ fractalizator_ joined	15:53
	← hahuang61 left	15:53
	→ Bunk joined	15:55
	fractalizator_ → fractalizator2	15:55
	fractalizator2 → fractalizator2_	15:55
	fractalizator2_ → fractalizator2__	15:55
	← Mannn left	15:56
Bunk	I had an error updating zsh: can not execute "pull" with "rebase". Does anybody know what that means ?	15:56
	← timvishe` left	15:57
	← fate_ left	15:57
vktec	Bunk: Updating zsh?	15:57
	→ fuchstronaut joined	15:57
	→ timvisher joined	15:57
timvisher	what's the right way to check whether a set of files is dirty?	15:57
Bunk	Yes, when i start zsh, i get the error update msg. the colleagues from the zsh channel have sent me here	15:58
vktec	timvisher: What do you mean by "dirty"?	15:58
	Bunk: Do you use oh-my-zsh?	15:58
	timvisher: Do you mean "changed"?	15:59
Bunk	vktec: Correct oh-my-zsh	15:59
timvisher	vktec: yes. preferably whether or not git currently knows about them should be irrelevant, but that's just a +1	15:59
	fractalizator2__ → fractalizator_	15:59
	← MattMaker left	16:00
	← fractalizator_ left	16:00
timvisher	no, forget i said anything about whether or not git currently knows about them. that just confuses things	16:00
vktec	timvisher: Do you want to know about added and removed files too?	16:00
	→ EgS joined	16:00
	→ le_melomane joined	16:00
timvisher	in this instance i have a file `foo` and `bar`. i want to test whether or not running a command changes them at all	16:00
	they are both added to git	16:01
vktec	What about git diff?	16:01
timvisher	so my test was going to be, run the command, and see if they were changed by using `git x`	16:01
vktec	Or git status	16:01
_ikke_	git diff --quiet <file>	16:01
timvisher	i didn't want to bother trying to parse git status	16:01
	git diff is a good candidate i think	16:01
	← kedare left	16:02
vktec	Yes, _ikke_'s solution is probably the best one	16:02
osse	it's the best there is	16:02
	← fuchstronaut left	16:02
	← Darcidride left	16:02
	← sin3t left	16:02
timvisher	sounds perfect then :)	16:02
	`git diff --quiet -- foo bar`	16:02
	→ fractalizator joined	16:02
	→ sin3t joined	16:02
	→ daniel_rose joined	16:03
	← choki left	16:03
	fractalizator → Guest98228	16:03
	← Guest98228 left	16:03
	→ LeBlaaanc joined	16:03
	→ alsaher joined	16:03
osse	timvisher: just make sure to interpret it right: it succeeds when there aren't any changes	16:04
	if git diff --quiet; then echo there are no changes bruh; fi	16:05
timvisher	osse: yup	16:05
	← DJ_Spies left	16:05
	← freimatz left	16:05
	← LeBlaaanc left	16:06
	→ synthroid joined	16:06
	← ash_workz left	16:06
	→ Guest10414 joined	16:07
	← Guest10414 left	16:07
	← daniel_rose left	16:07
	→ thiago joined	16:08
	← thiago left	16:08
	→ thiago joined	16:08
	→ fractalizator_ joined	16:08
	→ MattMaker joined	16:09
	← p4trix left	16:09
	→ synthroi_ joined	16:09
	← synthroid left	16:11
	← veilig2000 left	16:11
	← ki0 left	16:11
	→ EvilPeng1 joined	16:11
	← sin3t left	16:12
	→ hahuang61 joined	16:12
	→ sin3t joined	16:12
	← Rodya_ left	16:13
	→ zacts joined	16:13
	→ LeBlaaanc joined	16:14
	← fractalizator_ left	16:15
	→ Flowinho joined	16:17
	→ DJ_Spies joined	16:17
	← hahuang61 left	16:17
	← MattMaker left	16:18
	→ whyme joined	16:20
	gitinfo set mode: +v	16:20
	← Flowinho left	16:20
whyme	HELLO	16:20
gitinfo	whyme: 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.	16:20
	← mithenks left	16:20
whyme	I have a question	16:20
	about projects	16:21
	HOW come everytime I create something, Usually no one checks out my project.	16:21
	Im mean whats the use of developin	16:21
	if no one sees your project	16:21
	?	16:21
	← sin3t left	16:22
canton7	whyme, if you have something that's very popular, maybe someone will do some work on it	16:22
	→ cdg joined	16:22
	→ sin3t joined	16:22
	← LeBlaaanc left	16:22
canton7	whyme, but in general, people aren't going to find some random project on github (assuming you're talking about github)	16:22
whyme	well see its a big project, but no one can find it	16:22
Dougie187	whyme: A lot of people start projects because of a personal need / want.	16:22
	← cdg left	16:22
Dougie187	whyme: The purpose of them putting it up there is to allow other people to use it, not to expect them to.	16:23
canton7	developing something with the intention that other people will use it is usually a waste of time :P	16:23
whyme	Well I been working on a project for years. Ive worked on 13.	16:23
	nothin	16:23
	→ cdg joined	16:23
whyme	not 1 person	16:23
	!!!	16:23
canton7	sure, but is it useful to other people? have you told those people who might find it useful about it?	16:23
whyme	Ya I have and they have installed it	16:24
	→ a_thakur joined	16:24
Dougie187	Then, people have cloned it.	16:24
	or downloaded it	16:24
	→ Rodya_ joined	16:24
canton7	are they developers? are there things they want to fix, or improvements they want to make?	16:24
whyme	but how am i supposed to tell people about it if Im just goin to get banned/kicked on the channels.	16:24
	Whats the use?	16:24
canton7	there's a huge difference between people who use your project, and people who will contribute back	16:24
	for my projects, I get about one contributer per 5000 users	16:24
whyme	ya	16:24
Dougie187	Because IRC is not the right place to be publicizing your projects.	16:24
canton7	it depends, of course, on whether your users are developers	16:25
	→ MattMaker joined	16:25
whyme	because see, if i were to advertise here i would 99.9% be banned	16:25
	or kicked	16:25
	← sanketdg left	16:25
Dougie187	Of course, because it's the wrong place.	16:25
whyme	whats better, github or bitbukkit	16:25
	?	16:25
canton7	yes, and if you went into the street and shouted about it, people would ignore you	16:25
Bunk	so what is this zsh error about ?	16:25
canton7	they both have their own merits. github is arguably more popular, but bitbucket has free private repos	16:25
whyme	canton7: yes lol	16:25
canton7	sometimes there are lists of useful projects for a language. Sometimes languages have their own package managers you can put libraries onto. If you've written something for a particular community, they might have a message board or mailing list	16:26
	if you just write something random, chances are noone's going to care	16:26
	because everyone's writing random stuff	16:26
whyme	But it is not random	16:26
	THats the THING	16:26
canton7	what is it?	16:27
	also, how good are your docs? how readable is the code?	16:27
Dougie187	You had to ask...	16:27
whyme	if i say, probably banned	16:27
	or kick	16:27
	← le_melomane left	16:27
canton7	I won't kick you for pasting a link to it because I asked you to	16:27
whyme	You shure	16:27
	sure	16:27
	last time i did it	16:27
Dougie187	He'll kick you if you ask again. :P	16:27
whyme	I got banned/kick	16:27
	ok	16:27
	let me get the link	16:27
	brb	16:27
canton7	yeah, if you go randomly advertising people won't like it, but if someone actually asks you... PM me if you're concerned	16:28
whyme	https://github.com/alwaysontop617/easySITE	16:28
	Here is the link	16:28
	← MattMaker left	16:29
	→ dcg joined	16:29
	→ le_melomane joined	16:29
	← beyertech left	16:29
	← mikecmpbll left	16:29
canton7	well, first off, I've read the README and I've no idea what it is	16:29
	← Darren_ left	16:29
Dougie187	Same here	16:30
	And you have no other documentation	16:30
	→ daniel_rose joined	16:30
canton7	so you might want to improve your README	16:30
	← tabrez left	16:30
	→ nitric joined	16:30
Dougie187	Something to do with wordpress, but it seems like it's specific to wordpress.	16:30
	← achadwick left	16:30
whyme	no	16:30
	here	16:30
	is more info	16:30
	→ a_thakur_ joined	16:30
whyme	it can interate with wordpress, but it works best with pure html code	16:31
Dougie187	canton7: you should hold a "How to advertise your project" seminar. :P	16:31
whyme	Ya	16:31
	great idea	16:31
	:D	16:31
canton7	heh, I'm hardly one to talk. I have read some good blog posts in the past	16:31
	← a_thakur_ left	16:32
	← sin3t left	16:32
	→ seishun joined	16:32
	→ sin3t joined	16:32
	→ a_thakur_ joined	16:32
whyme	So	16:33
	ANY IDEAS	16:33
	?	16:33
canton7	yep, we told you	16:33
Dougie187	We gave you some.	16:33
canton7	no need to shout	16:33
	← a_thakur left	16:33
Dougie187	I still don't have a clue what your project is or what it does.	16:33
	So, you should work on your readme to make it more clear	16:33
whyme	ok	16:33
Dougie187	Improve your documentation some	16:34
canton7	there's a repository of wordpress plugins isn't there? if your thing is a wordpress plugin, list it there	16:34
whyme	Its not	16:34
	← daniel_rose left	16:34
	→ MattMaker joined	16:34
Dougie187	well, it's definitely related to webpages.	16:35
	So, you probably should go find a forum or something where people discuss this kind of stuff	16:35
	And try to see if your project would meet someones need, and then tell them about it.	16:35
canton7	the code's also pretty hard to read. I wouldn't want to touch it if I was a potential contributer	16:35
	→ beyertech joined	16:35
	→ interne7y joined	16:36
	→ Flowinho joined	16:37
canton7	you're using CI (I think?), but there's no separation between views and controllers (there's one controller, and all of the controller logic is in the views). The indentation is all over the place. You're using things like $_POST and $_SESSION instead of CI's wrappers. I can't follow the intention in a lot of places.	16:37
	← LionsMane left	16:37
canton7	it looks like a beginner's learning project. That's fine as a learning experience, but it's unlikely that other people will build on it	16:38
	you should absolutely be writing that stuff, as a means to practice and improve. You shouldn't intend for other people to use it, because they almost certainly won't	16:38
	→ ack_inc joined	16:38
whyme	Here is a better Readme	16:38
	← nilg left	16:38
whyme	https://github.com/alwaysontop617/easySITE/blob/master/README.md	16:38
Dougie187	But, it's perfectly fine to host that stuff on github still.	16:38
whyme	ok	16:39
	→ Lvjasha joined	16:39
canton7	whyme, I still don't know what it does, or why I would want to use it	16:39
whyme	ok so your saying i should improve the style of my code	16:39
	READ THE readme file	16:39
canton7	also the commit messages are "finalfix", "trackle", etc. They give no information	16:39
Dougie187	Or "p" and "f	16:39
	"	16:39
	← Flowinho left	16:40
canton7	whyme, I did. "Lets make the IOT a better place.". Still no idea what it actually does	16:40
	you need to pretend you know nothing about it, then try and read the README as if you were looking at the project for the first time	16:40
	← ripero left	16:40
whyme	you did not see this	16:40
	Our software can integrate with almost every platform, even if you just have a plain html website. This project will improve your site by adding many features. The best part about our script is we will generate an htaccess best for your site to make your site very fast. We also have a maintainance mode page, and a full blown plugin system allowing	16:40
	you to expand your features.	16:40
	If you have a wordpress site you can also use easySITE, we are currently releasing support for joomla next. Our system will not act like a pluin for wordpress, it completely rewrites the index.php of that wordpress site. easySITE can be imported into any website, its fast and light weight.	16:40
Dougie187	I read that.	16:40
whyme	Thats what it does	16:41
preaction	it integrates with a platform, it adds "many" features, but what are those features?	16:41
	← interne7y left	16:41
canton7	whyme, yeah, and it explains nothing about those. How does it improve my site? What features does it add? How does it make it faster? Will it do something stupid and screw up my system?	16:41
SirFunk	How does one deal with a "BUG: There are unmerged index entries:" on a merge?	16:41
canton7	SirFunk, report it to the mailing list? Looks like a bug :)	16:41
	!list	16:41
gitinfo	[!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	16:41
canton7	you'll need a way to reproduce it	16:41
	or a transcript of what happened and a snapshot of the repo that other people can use to see what's happened	16:42
	← sin3t left	16:42
	→ sin3t joined	16:42
SirFunk	canton7: it's a fairly large private repo. And not on a branch I was working on. I don't know who did what with what versions of git	16:42
	← Lvjasha left	16:42
Dougie187	whyme: Your best bet is to read some good readmes.	16:42
	And try to duplicate those.	16:42
canton7	gather as much information as you can, then. Maybe search the archives first, see if anyone else reported it	16:42
whyme	Thank You guys	16:43
	ill edit	16:43
	it more	16:43
	add more information	16:43
	THX	16:43
SirFunk	Is there anything I can do in the meantime to continue working?	16:43
	The files that It is complaining about are not important. Can I skip them or something?	16:43
canton7	not sure what state your repository is in. It's probably OK, and if not a reset should get rid of whatever state is hanging around in your index	16:43
	without knowing what happened, I can't guess at what's going on	16:43
SirFunk	it's happening when merging master into a branch	16:44
	← encod3 left	16:44
	→ Sdas_it joined	16:44
	→ mikecmpbll joined	16:44
qsx	_ikke_: no. i was a bit dumb.	16:45
	← a_thakur_ left	16:46
	→ madewokherd joined	16:46
	→ a_thakur joined	16:46
Dougie187	SirFunk: are these public repos?	16:47
SirFunk	nope	16:47
	sadly	16:47
Dougie187	:/	16:47
_ikke_	SirFunk: What action did you do to cause this error?	16:47
	← a_thakur left	16:47
	← MattMaker left	16:47
	← burtons left	16:48
	← TomyWork left	16:48
	→ drewo joined	16:48
	← DevAntoine left	16:48
	→ daniel_rose joined	16:48
	← damjan left	16:49
	→ MattMaker joined	16:49
	→ a_thakur_ joined	16:49
SirFunk	_ikke_: git checkout some branch; git merge mastere	16:49
	*master	16:49
_ikke_	Is that the only thing it outputs, or more information?	16:49
	← Sdas_it left	16:50
	→ paul424 joined	16:50
	→ burtons joined	16:51
	← subscope left	16:51
	← cjbrambo left	16:51
	← GavinMagnus left	16:52
	← sin3t left	16:52
	→ Flowinho joined	16:52
	→ daynaskully joined	16:52
	← a_thakur_ left	16:52
	→ tabrez joined	16:52
	← Flowinho left	16:52
SirFunk	_ikke_: a few lines like these: BUG: 1 mogile-node/mogdata/dev1/0/000/000/0000000108.fid BUG: 3 mogile-node/mogdata/dev1/0/000/000/0000000186.fid	16:52
	→ veilig2000 joined	16:52
	→ sin3t joined	16:52
SirFunk	and fatal: Bug in merge-recursive.c	16:52
	← MattMaker left	16:53
	→ a_thakur joined	16:53
	← zacts left	16:55
	→ pwnz0r joined	16:55
	→ cjohnson joined	16:56
	→ ki0 joined	16:56
cjohnson	I've got an issue with prod I'm solving. I merged a PR into master, then later reverted that merge, and recently deployed master to prod	16:56
	→ ToBeCloud joined	16:57
	gitinfo set mode: +v	16:57
	→ cdg_ joined	16:57
cjohnson	The issue is, github's compare feature says the branches are in sync	16:57
	← drewo left	16:57
cjohnson	Is this because I reverted? And the question is, if I want to fully merge the branch, will rebasing be an issue?	16:57
	or should I do a merge	16:57
Dougie187	cjohnson: Yeah, in the past what I've done after that setup, is rebase it onto the same base, just to change the hashes	16:58
	and then the merge works fine.	16:58
cjohnson	oh merge says nothing to merge	16:58
_ikke_	SirFunk: Right	16:58
	← cdg_ left	16:58
Dougie187	Yeah, because the branches are in sync	16:58
cjohnson	Dougie187: so I should rebase master onto branch?	16:58
	or other way around	16:58
	→ drewo joined	16:58
_ikke_	SirFunk: Can you reproduce it?	16:58
	→ durham joined	16:58
Dougie187	The other way around, but you rebase it onto the same base it has currently.	16:58
	So, something like:	16:58
	→ cdg_ joined	16:58
	→ fuchstronaut joined	16:58
	→ MattMaker joined	16:58
Dougie187	`git checkout branch; git rebase -i ${git merge-base master branch}`	16:58
cjohnson	interesting	16:59
	← a_thakur left	16:59
Dougie187	I can't remember if you have to re-order the commits to get new hashes, or if you just get them as a side effect	16:59
osse	Dougie187: just about anything will produce new hashes	17:00
	← durham left	17:00
Dougie187	osse: Does just the act of that rebase (with no actions) cause new hashes?	17:00
	Or do you need at least one action?	17:00
	← grill left	17:00
	← cdg left	17:00
osse	Dougie187: git is smart enough to figure out that it doesn't have to do anything	17:01
	=> no new hashes	17:01
	← ki0 left	17:01
Dougie187	I thought the act of that rebase would update the commiter info in the first commit, and cause all of them to have a new hash.	17:01
	Oh ok	17:01
	← drewo left	17:01
Dougie187	So, you need at least one action then	17:01
	You could just swap the first two commits, and that would do it.	17:01
	→ drewo joined	17:01
osse	yep, or edit the message of the first one	17:01
Dougie187	cjohnson: Is there an easier way to re-merge a branch, after a revert?	17:01
	← sin3t left	17:01
Dougie187	Yeah, that's true. that's a good idea (better than mine)	17:02
	→ choki joined	17:02
Dougie187	Since swapping them isn't guaranteed to apply cleanly.	17:02
	err, osse: Is there an easier way to re-merge a branch, after a revert?	17:02
	→ sin3t joined	17:02
osse	undo the revert and merge it again I think	17:02
	← Ezzy left	17:03
	← phanimahesh left	17:03
	← cdg_ left	17:03
	← veilig2000 left	17:03
	← fuchstronaut left	17:03
	← lugzer left	17:04
	→ kadoban joined	17:04
osse	no, that's wrong	17:04
	→ lugzer joined	17:04
	→ durham joined	17:04
osse	!revert_merge	17:05
gitinfo	[!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt	17:05
	← blackwind_123 left	17:05
cjohnson	yeah I figured haha. I just hit the "revert" button from the github PR interface	17:07
	I knew I shouldn't have	17:07
	← drewo left	17:07
cjohnson	Ok so when I run the git rebase -i command with the merge-base commit passed, all I see is "noop"	17:07
	no commits listed	17:07
osse	then that commit is HEAD	17:08
	→ Darren_ joined	17:08
	← MattMaker left	17:08
	→ drewo joined	17:08
SirFunk	_ikke_: reproduce? It happens every time I try to merge master to that branch. I have no idea how to make another branch have that problem though	17:09
	→ LeBlaaanc joined	17:09
	← GlenK left	17:10
	← mikecmpbll left	17:11
	→ spudowiar joined	17:11
	gitinfo set mode: +v	17:11
	→ mikecmpbll joined	17:11
	→ SteffanW2 joined	17:11
	← sin3t left	17:11
	← venmx left	17:12
	← stasmakarov left	17:12
	→ sin3t joined	17:12
_ikke_	Alright	17:13
	← lugzer left	17:13
	→ MattMaker joined	17:14
	← IWishIKnew left	17:14
_ikke_	SirFunk: Looking a bit through the code if I can find what's going on	17:16
SirFunk	thanks	17:16
	If there is some way I can have it ignore those files that would be cool, They are generated files and I can regenrate them	17:16
	← BSAlb left	17:17
	→ dances-with-cats joined	17:17
	→ TomyLobo joined	17:17
_ikke_	I don't think so	17:17
	→ BSaboia joined	17:17
_ikke_	What does git status say afterwards?	17:17
	→ vassagus joined	17:17
	→ bjpenn joined	17:17
	← zmachine left	17:18
SirFunk	no changes	17:18
	Vaelatern → gtk	17:19
	gtk → Vaelatern	17:19
_ikke_	So nothing is merged at all?	17:19
	← mmlb left	17:21
	← MattMaker left	17:21
	→ ash_workz joined	17:21
	← sin3t left	17:21
	← vassagus left	17:22
	← dances-with-cats left	17:22
	→ sin3t joined	17:22
	→ MattMaker joined	17:22
	→ dances-with-cats joined	17:22
SirFunk	_ikke_: it doesn't merege anything, no	17:23
	→ Vinnie_win joined	17:24
	→ InfoTest joined	17:27
	← subhojit777 left	17:27
	→ ki0 joined	17:27
	← choki left	17:28
	→ dreiss joined	17:29
	→ eight58 joined	17:29
	→ rymurphy joined	17:30
rymurphy	Hello, is there a way to clone a repo at a specific commit?	17:30
	Or, could I checkout a commit without downloading the full history?	17:30
GodGinrai	rymurphy: you just want the files? Is this a project on github?	17:31
rymurphy	I just want the files, and it's for a local repo	17:32
	← durham left	17:32
	← eivarv left	17:32
	→ mohabaks joined	17:32
	← MattMaker left	17:32
GodGinrai	rymurphy: a local repo? Then don't you already have the files?	17:32
	→ durham joined	17:32
rymurphy	It's for a program call	17:33
	command --from-repo /path/to/repo --commit foo12bar takes the repo at the commit, tars it in a temp directory, and sends it to a server	17:34
cjohnson	osse, Dougie187: I had to revert the revert	17:35
GodGinrai	rymurphy: I think you want `git archive`	17:35
rymurphy	I'm trying to move the repo to a temp directory for tar-ing with clone	17:35
cjohnson	I couldn't get a rebase to play nicely	17:35
	fortunately I only had to to resolve 2 small conflicts from the revert	17:35
rymurphy	GodGinrai: :P That's what we were doing, but someone had issues with submodules	17:35
Dougie187	cjohnson: Too bad. :P I've had the rebase work in the past though, so maybe next time try it again. :P	17:36
	← marcogmonteiro left	17:36
cjohnson	yeah I'm quite positive this was my fault	17:36
GodGinrai	rymurphy: unfortunately, that's the only way through git to get "just the files". I'd suggest using `cp` if you need something else.	17:36
cjohnson	I'm moving from a one-man dev operation to a team so my old workflow I think was causing headaches	17:36
	← durham left	17:36
cjohnson	rymurphy: github offers an option to download a zip of a branch	17:37
	I bet you could specify a commit id	17:37
	if you're on github	17:37
	→ MattMaker joined	17:37
GodGinrai	cjohnson: he said it was local. I already asked that	17:37
cjohnson	oh missed it, sorry. that totally works though	17:37
rymurphy	GodGinrai: Could I clone the repo with a depth of 1, and checkout to the commit, or would I need the full history for that?	17:37
Dougie187	cjohnson: Though, I guess another way to do it is something like `git revert <revert> --no-commit; git merge <branch>` or something, to get all the changes back in.	17:37
	→ hellyeah joined	17:38
rymurphy	GodGinrai: Or maybe create an empty one, and fetch the commit?	17:38
cjohnson	Dougie187: interesting. I'll have to tuck that away for the next fire	17:38
	lol	17:38
Dougie187	Anyway, that situation is annoying. :P	17:38
cjohnson	yeah	17:38
GodGinrai	rymurphy: you are overcomplicating it. just use `cp`	17:38
rymurphy	GodGinrai: I can't assume that the user has the commit checked out	17:39
	← Bunk left	17:40
GodGinrai	rymurphy: `git checkout <commit>; cp . /tmp/gitfolder; find . -name '.git' -exec rm {} \;`	17:41
	→ byteflame joined	17:41
	← Rodya_ left	17:41
GodGinrai	^ need to cd to /tmp/gitfolder before running that find	17:41
	← sin3t left	17:41
GodGinrai	or use /tmp/gitfolder instead of "." in find	17:41
	→ sin3t joined	17:42
GodGinrai	also, the rm would be rm -r, I guess	17:42
	→ lugzer joined	17:42
	→ eivarv joined	17:46
	← MattMaker left	17:47
	← pwnz0r left	17:48
	→ jaequery joined	17:48
	← nettoweb left	17:48
cjohnson	or use rsync with an exclude	17:48
	→ MattMaker joined	17:49
	← lugzer left	17:49
	← whyme left	17:49
	← SourTrout left	17:49
	→ cdg joined	17:50
	← abyx left	17:50
	→ SourTrout joined	17:50
hellyeah	knowing git seems good on my cv?	17:50
	← cdg left	17:51
	→ nettoweb joined	17:51
	← sin3t left	17:51
	→ fractalizator joined	17:51
	→ cdg joined	17:51
	→ whyme joined	17:51
GodGinrai	cjohnson: that works, too. But when copying on the same system, I find rsync to be a little unneeded	17:52
	→ sin3t joined	17:52
SirFunk	_ikke_: any idea?	17:52
	→ SourTrou_ joined	17:53
	← SourTrout left	17:53
GodGinrai	hellyeah: It's worth it to put on there, IMO.	17:53
	← SourTrou_ left	17:55
	← burp87 left	17:56
cjohnson	GodGinrai: I like that it preserves permissions and such, even on the same system it's nice	17:56
	but yeah not strictly required	17:56
	→ alansaul joined	17:56
alansaul	Hey everyone, I have a bit of a odd question. I have a fork of a repository, and I think I made some edits. Someone else has made a fork of the same repository, I basically want to use theres, but want to make sure I am not throwing away any edits I made without knowing what they are	17:57
	How can I see what edits I have made to a fork since I forked?	17:57
	← whyme left	17:57
	→ Lvjasha joined	17:57
alansaul	I mean commits sorry not 'edits' obviously	17:57
	→ b1tchcakes joined	17:57
alansaul	I guess I could diff upstream, but ideally I only want to diff with the upstream from the commit I forked it at. Is there a way of getting the hash of the commit when the fork was made easily?	17:58
	→ fuchstronaut joined	17:59
kadoban	alansaul: 'git log yourbranch ^origin/whateverbranch' ?	17:59
fractalizator	alansaul: if you didn't merge your stuff:	17:59
	← ki0 left	18:00
alansaul	I don't think I merged my stuff, maybe sent a pull request	18:00
fractalizator	alansaul: git log origin/master..yourbranch	18:00
	→ hahuang61 joined	18:00
	← MattMaker left	18:00
	← chigang_ left	18:01
	→ whyme joined	18:01
fractalizator	and if your want to find the last common commit of two unmerged branches: git merge-base branch1 branch2	18:01
	← LeBlaaanc left	18:01
	← rubyonrailed left	18:01
	← daniel_rose left	18:01
alansaul	git log yourbranch ^origin/whateverbranch doesn't give me any commits	18:01
	← sin3t left	18:01
	→ UncleCJ joined	18:01
alansaul	should I replace origin with my upstream?	18:01
	→ rubyonrailed joined	18:01
	→ sin3t joined	18:02
	→ pignaniel joined	18:02
fractalizator	alansaul: of course you need to use your branches and upstreams names	18:02
	← pignaniel left	18:02
	← whyme left	18:02
fractalizator	and also 'git log AAA..BBB' = 'git log ^AAA BBB' = 'git log BBB ^AAA', just different syntax	18:03
	that means "show me commits that are reachable from BBB, but not reachable from AAA"	18:04
alansaul	Hmm I think I am a bit confused. I am trying: git log master ^upstream/master	18:04
	Which I thought should find the commits between my local master branch, and the upstreams master branch?	18:04
	← fuchstronaut left	18:04
	← UncleCJ left	18:04
alansaul	But I get a fatal: bad revision ^upstream/master	18:05
	← rivarun left	18:05
	← nettoweb left	18:05
	← davidbz left	18:05
	← Lvjasha left	18:06
	← rubyonrailed left	18:06
fractalizator	alansaul: what does git branch -a say?	18:06
	→ medeirosthiiago joined	18:07
alansaul	Sorry just to be clear, I was running: git log devel ^upstream/devel before	18:07
	and git branch -a gives me:	18:07
	* devel	18:07
	master	18:07
	remotes/origin/HEAD -> origin/master	18:07
	→ whyme joined	18:07
alansaul	remotes/origin/devel	18:07
	And then some other branches I don't care about	18:07
	→ YourTheBombNow23 joined	18:08
fractalizator	and git remote?	18:08
kadoban	alansaul: Where did the "upstream" name come from?	18:08
alansaul	I have a feeling it has something to do with the HEAd?	18:08
	I just added the remote called upstream, with git remote add upstream "blah".git	18:08
	where blah is the url	18:08
	git remote, lists both origin and upstream	18:09
kadoban	alansaul: You need to fetch then. 'git fetch --all'	18:09
fractalizator	alansaul: you need git fetch upstream then	18:09
	← whyme left	18:09
	← rahtgaz left	18:09
	→ nettoweb joined	18:09
alansaul	Okay, thats like a pull without merging right?	18:09
	→ perlpilot joined	18:09
fractalizator	alansaul: and then you'll get your "upstream/stuff" branches	18:09
	← solrize left	18:09
	→ mischat joined	18:09
fractalizator	alansaul: right	18:09
	→ lifeforms joined	18:10
alansaul	Okay, now git log devel..upstream/devel lists lots of commits, but they are commits made on the upstream	18:10
	I want it the other way, commits I have made, that aren't on upstream.	18:10
	→ UncleCJ joined	18:10
alansaul	Is that possible?	18:10
fractalizator	alansaul: didn't you want upstream/master?	18:10
	oops, nevermind	18:10
alansaul	No sorry, I made that confusing in my first message, I actually want to diff devel and upstream/devel	18:11
fractalizator	alansaul: do git log upstream/devel..devel	18:11
alansaul	And get the commits I have made, but that aren't upstream	18:11
	Excellent	18:11
	→ durham joined	18:11
alansaul	Thats exactly what I want, thanks, I was being dumb not thinking to change it around	18:11
	← govg left	18:11
	← durham left	18:11
	← sin3t left	18:11
	→ durham joined	18:12
	→ sin3t joined	18:12
	← shinnya left	18:12
	← UncleCJ left	18:13
	→ whyme joined	18:13
	→ veilig2000 joined	18:14
	→ rivarun joined	18:14
	→ settermjd joined	18:14
	← settermjd left	18:14
	← mischat left	18:14
_ikke_	SirFunk: Your best option is the !mailing_list	18:15
gitinfo	SirFunk: The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist	18:15
	← PCatinean left	18:15
	← Patrick- left	18:15
	← drewo left	18:16
	→ danimal2 joined	18:16
	→ _Patrick_ joined	18:17
lifeforms	hey all, I want to purge a big file from a dev branch (for instance using BFG), I'm fine with having devs do a new clone on their workstations, but will this also hurt people who are tracking the master branch (which does not have the file)?	18:17
alansaul	Another stupid question (that I can google if you tell me I am being stupid). When I merge, its often the case that the merge becomes one big commit, that I am then blamed for, is there any way around this?	18:17
	→ daniel_rose joined	18:17
_ikke_	alansaul: No, this should only affect the dev branch	18:17
lifeforms	_ikke_: <3	18:17
alansaul	Seems weird, that sometimes when I merge something in, if there is any edits, everything gets blamed on me.	18:17
_ikke_	lifeforms: sorry I meant you of course :P	18:17
	← jimi_ left	18:18
lifeforms	;) I detected it anyway. thanks, this is my big worry (well except destroying the universe)	18:18
	→ settermjd joined	18:19
	← rivarun left	18:20
	→ UncleCJ joined	18:20
nitric	alansaul: that's not how git merge works (unless you're auto-squashing or doing something weird)	18:20
	← whyme left	18:20
alansaul	It's happening when I pull	18:20
osse	pull = fetch + merge	18:21
	← sin3t left	18:21
osse	sounds like you're talking about the merge commit	18:21
	and yes, those are fairly large when you diff it	18:21
	→ MattMaker joined	18:21
alansaul	Like if someone has made lots of commits, and I pull the commits, a window opens with something along the lines of "Merge remote-tracking branch 'upstream/devel' into devel", if I just save and close that commit message, I get blamed for everything I've just pulled in	18:21
	Even though I never touched them.	18:22
osse	but if you're blamed (in real life in the human sense) because of that commit then the accusers are morons	18:22
	→ sin3t joined	18:22
	← daniel_rose left	18:22
	→ rivarun joined	18:22
danimal2	hi guys, confused on a few things.when i fork a project on git, i create my own repo.if i want to be able to keep the master in sync with the original repo, do i have to create my own branch? id like to be able to do pull requests, work on my own code and keep it up to date with the original repo.	18:22
alansaul	Yes a merge commit is probably the correct terminology	18:22
	← chll_ left	18:23
danimal2	sorry meant github not git	18:23
osse	alansaul: http://sprunge.us/CSTT	18:23
perlpilot	danimal2: do you mean "fork on github"? If so, they have lots of good documentation on this very topic	18:23
	→ whyme joined	18:23
danimal2	perlpilot yes sorry	18:23
	← LBV_User left	18:23
	← eijk left	18:23
osse	alansaul: the M's will have your name on them, and that's ok	18:23
	gitinfo set mode: +v	18:24
whyme	hu	18:24
alansaul	but if I did a git diff M^! then it has everything that happened	18:24
whyme	so	18:24
	← spudowiar left	18:24
alansaul	all through E F G H unless I'm mistaken?	18:24
whyme	So i improved my code	18:24
	Is there a reason that no one is downloading	18:24
	it	18:24
	← UncleCJ left	18:25
	← unreal left	18:25
	← FilipNortic left	18:25
	← whyme left	18:26
	→ UncleCJ joined	18:26
osse	alansaul: yes	18:26
	→ FilipNortic joined	18:27
	→ daniel_rose joined	18:27
alansaul	that seems odd, so that if people did a git blame, my name will be next to anything happened in E F G and H?	18:27
	← rymurphy left	18:27
	← bocaneri left	18:27
alansaul	I could be wrong :)	18:27
osse	have you tried? :) I think git blame skips merges	18:27
	→ ki0 joined	18:27
cjohnson	I believe it does. the actual commit that caused the change in the file is not the same as the merge that merged it into the branch	18:27
osse	looking at the diff of a merge usually isn't very interesting, because of what you see. it'	18:28
	it's huge	18:28
	→ whyme joined	18:28
	← UncleCJ left	18:29
	→ SwiftMatt joined	18:29
cjohnson	https://i.imgur.com/pHOMceO.png	18:30
	← MattMaker left	18:30
	→ Spacew00t joined	18:30
	← whyme left	18:30
cjohnson	the commit id on line 3 is from the commit that changed the file from dev, not from my merge commit	18:30
	→ LionsMane joined	18:30
	← sin3t left	18:31
osse	alansaul: it maketh sense: git blame shows how a line came to be in a file. If a particular line is present in one of the ancestors of the merge commit then it did not originate from the merge.	18:31
danimal2	so my question is after i created my own fork and move files into a folder called htdocs will that cause my fork to not stay in sync with the original?	18:31
cjohnson	Oh maybe git merge actually did a rebase though. that might not be a valid test	18:31
	← thebloggu left	18:32
cjohnson	I don't see a merge commit	18:32
	→ sin3t joined	18:32
osse	alansaul: if, however, the line is not present in either of the ancestors then it will be attributed to the merge commit itself, and rightly so	18:32
	→ whyme joined	18:32
osse	I mean parents, not ancestors.	18:32
moritz	danimal2: git repos don't magically stay in sync. You have to pull changes in	18:32
lifeforms	_ikke_: it seems to have worked, cheers :)	18:33
moritz	danimal2: pull = fetch + merge, usually merge across renamed files works pretty well in git	18:33
	gitinfo set mode: +v	18:33
lifeforms	I feel I have leveled up in git	18:33
	← kfunk left	18:33
	→ YourTheB_ joined	18:33
whyme	https://github.com/devmachine321/easySITE <-- Can someone look at my git repo	18:33
	→ Dyonisos joined	18:33
cjohnson	danimal2: I have done what you are attempting to do and I can say that it was definitely a lot more hassle that way	18:33
_ikke_	whyme: sure, look at what?	18:34
cjohnson	especially if you ever want to merge back up	18:34
whyme	my readme is it good	18:34
	← ack_inc left	18:34
	← Manuel15 left	18:34
cjohnson	whyme: only you can tell. does it adequately describe the system and repo to a new user?	18:34
danimal2	cjohnson thats what i was thinking...so dont commit a change like that..will cause headaches it seems	18:34
whyme	hmm	18:35
	brb	18:35
	→ kfunk joined	18:35
	→ jimi_ joined	18:35
	→ MattMaker joined	18:35
cjohnson	depends also on who the readme is for. is it for a dev or for a user?	18:35
	← cdg left	18:36
danimal2	moritz, thanks for that..understand	18:36
_ikke_	whyme: "This has nothing to do with wordpress"	18:36
	whyme: Not the best way to start describing your product	18:36
whyme	well	18:36
	hmm	18:36
	I need someone who is great at writin Readme files	18:37
	→ lugzer joined	18:37
	→ interne7y joined	18:37
_ikke_	Not me	18:37
	← settermjd left	18:37
whyme	how do i get op	18:38
	I want op	18:38
lifeforms	some things never change	18:38
	← whyme left	18:38
osse	like war	18:38
Seveas	war is peace	18:38
APic	True.	18:38
Seveas	freedom is slavery	18:38
APic	⁵	18:38
nitric	france is bacon	18:38
osse	ignorance is strength	18:39
Seveas	ignorance is strength	18:39
	heh	18:39
_ikke_	nitric: :D	18:39
Seveas	git is version control	18:39
osse	rebase -i	18:39
	← mikecmpbll left	18:39
APic	Francis?	18:40
	← YourTheBombNow23 left	18:40
	→ YourTheBombNow23 joined	18:40
_ikke_	APic: https://www.reddit.com/r/AskReddit/comments/dxosj/what_word_or_phrase_did_you_totally_misunderstand/c13pbyc	18:40
	APic opens	18:41
	← johnmilton left	18:41
	← YourTheBombNow23 left	18:41
APic	Yay, rReddit.	18:41
	o/	18:41
	-r	18:41
	← sin3t left	18:41
	→ sin3t joined	18:41
	← interne7y left	18:41
	→ Rodya_ joined	18:42
	→ up_the_irons joined	18:42
	→ gmh joined	18:42
	← lugzer left	18:42
APic	Uh oh.	18:42
	Seen enough Reddit for today, i guess. B-)	18:43
Seveas	reddit, bludat, greenwat..	18:43
	→ rubyonrailed joined	18:44
	← MattMaker left	18:45
	→ mikecmpbll joined	18:45
	← Rodya_ left	18:46
	← YourTheB_ left	18:46
	← heroux left	18:47
	→ YourTheBombNow23 joined	18:47
	→ unreal joined	18:47
	← YourTheBombNow23 left	18:48
	← alansaul left	18:48
	→ abyx joined	18:48
	← beyertech left	18:48
	→ Manuel15 joined	18:48
	← Manuel15 left	18:48
	→ Manuel15 joined	18:48
	← neca left	18:48
	→ YourTheBombNow23 joined	18:49
	← kbs` left	18:50
	→ qpdb joined	18:51
	← sin3t left	18:51
	→ govg joined	18:51
	→ sin3t joined	18:51
	→ YourTheB_ joined	18:51
	← YourTheB_ left	18:52
	→ mmlb joined	18:52
	→ heroux joined	18:52
	→ NeXTSUN joined	18:52
	→ nopea joined	18:53
	→ alansaul joined	18:53
	← tjone270 left	18:54
nopea	I have a WordPress server that I have setup git with (just my theme child dir), and I was thinking that I might move my WordPress to a new server. This could be done by simply zipping up the Wordpress dir. But I am wondering, would the .git directory also get included in that (and if I am to unzip to a new server)	18:55
_ikke_	nopea: That should just work	18:55
	→ MattMaker joined	18:55
	→ nitin joined	18:55
nopea	perfect - I thought it should (as it just needs to copy the .git dir)	18:56
moritz	nopea: you can look into the .zip file and see if the .git dir is included	18:56
	→ fahadash joined	18:57
nopea	thanks guys - just wanted to make sure that it is not 'attached' any way to the server itself, and that it is just the files (again from the .git dir) that are needed.	18:57
_ikke_	yes, that's correct	18:57
	← LiohAu left	18:58
	← ki0 left	18:59
	← Derperperd left	19:01
	← sin3t left	19:01
	→ sin3t joined	19:01
	→ beyertech joined	19:02
	← nopea left	19:03
	← nitin left	19:03
DolphinDreamm	is there such thing as pulling --tags ?	19:03
i7c	git fetch --tags	19:04
	← MattMaker left	19:04
	→ Balliad joined	19:04
	← fractalizator left	19:05
	→ MattMaker joined	19:05
	← nettoweb left	19:05
_ikke_	tags should be fetched automatically	19:05
j416	fetched but not updated if they already exists	19:06
DolphinDreamm	but there is no --tags flag for pull i take	19:06
	→ Sasazuka joined	19:06
	← byteflame left	19:06
_ikke_	j416: by design	19:06
j416	(just adding to your comment)	19:06
	→ Gamecubic joined	19:07
	← SteffanW2 left	19:07
	← felher_ left	19:08
	→ felher joined	19:09
	→ nettoweb joined	19:09
	← nettoweb left	19:10
	← InfoTest left	19:10
	← sin3t left	19:11
	→ sin3t joined	19:11
	← mmlb left	19:12
danimal2	Created a branch called mywork, and in sourcetree i have that branch selected. when i commit a change it wont affect the master branch, just the mywork one, right?	19:12
	← Manuel15 left	19:12
	← clemf left	19:12
j416	if that branch is checked out, yes.	19:12
	it will only affect that branch.	19:12
	→ darkbit joined	19:13
danimal2	j416, yes that is the one checked out, ok thanks.. i need to keep master branch clean so it will pull updates from the original repo on github that i forked.	19:13
j416	sounds sane.	19:13
danimal2	awesome thanks!	19:14
	← MattMaker left	19:14
	→ johnmilton joined	19:14
j416	:)	19:14
	← daniel_rose left	19:14
	← tinajohnson___ left	19:15
	← Electrometro left	19:15
	→ daniel_rose joined	19:15
	→ star_prone joined	19:16
	→ EduardoMartins joined	19:17
	← eivarv left	19:18
	→ Mannn joined	19:18
	→ Manuel15 joined	19:18
	← Manuel15 left	19:18
	→ Manuel15 joined	19:18
	→ BrianJ joined	19:18
	← rockitude left	19:19
	← jeffreylevesque left	19:19
	← docnvk left	19:19
	← johnmilton left	19:19
	← daniel_rose left	19:19
	→ mymohsin joined	19:20
	→ docnvk joined	19:20
	← mymohsin left	19:21
	← star_prone left	19:21
	← sin3t left	19:21
	→ robotroll joined	19:21
	→ sin3t joined	19:21
	→ nettoweb joined	19:23
	← NeXTSUN left	19:24
	← MrWoohoo left	19:24
	→ MattMaker joined	19:24
	← veilig2000 left	19:24
	→ mmlb joined	19:25
	→ m0viefreak joined	19:25
	→ LiohAu joined	19:26
	← docnvk left	19:26
	→ sagerdearia joined	19:27
DolphinDreamm	ha	19:28
	→ docnvk joined	19:28
DolphinDreamm	it seems that git pull --tags does work.. it fetches --tags and merges remote into the current branch	19:28
	→ byteflame joined	19:28
	← burtons left	19:29
	→ burtons joined	19:29
	← claudiop left	19:29
	← sin3t left	19:31
	→ lugzer joined	19:31
	→ sin3t joined	19:31
	← burtons left	19:31
	→ _sjs joined	19:32
	→ johnmilton joined	19:32
	→ ki0 joined	19:34
	← paul424 left	19:34
	→ netcarver joined	19:35
	→ treehug88 joined	19:36
	← phaleth left	19:36
	← EduardoMartins left	19:36
	→ fuchstronaut joined	19:37
	← MattMaker left	19:38
	→ jeffreylevesque joined	19:40
	← lugzer left	19:40
	→ choki joined	19:42
	← hellyeah left	19:42
	→ dunpeal joined	19:42
	→ eivarv joined	19:42
dunpeal	Hi. We have a fairly large team and all our merges into master are done as feature branches merged via pull-requests (probably a common workflow?). How should we deal with the accumulation of merged, obsolete feature branches over time?	19:43
osse	dunpeal: delete them	19:44
dunpeal	osse: but isn't it up to every single developer to delete them? since they all get pulled automatically...	19:44
	← Balliad left	19:44
	← Ardethian\work left	19:44
osse	dunpeal: anyone with push access can delete them	19:44
	→ Ardethian\work joined	19:44
	← l4v2 left	19:45
GodGinrai	dunpeal: delete them once you confirm that the merged changes didn't negatively affect master	19:45
	which you should be doing anytime you merge master	19:45
	← TooLmaN left	19:45
dunpeal	right, but if you have N developers, and they all pull branch X, then once X gets merged, all N developers have to individually delete X from their local Git node...	19:45
GodGinrai	well yea	19:46
	that's to be expected	19:46
	→ veilig2000 joined	19:47
GodGinrai	I mean, you wouldn't want a file you downloaded to be deleted just because it doesn't exist online anymore, right? Same idea.	19:47
	If a dev wants to be rid of the branch they checked out, they must remove it themselves	19:47
	← cyan__ left	19:48
	← SpeakerToMeat left	19:48
	→ SpeakerToMeat joined	19:48
ResidentBiscuit	Don't think of it as a git node, think of it a git repo. Everybody has their own repo. It makes no sense for deletes to propogate to all the clones	19:49
	→ nilg joined	19:50
	→ paul424 joined	19:50
	→ clemf joined	19:51
osse	dunpeal: no. if it's deleted from the remote then they can fetch --prune	19:52
	← synthroi_ left	19:52
	→ p4trix joined	19:52
	→ IWishIKnew joined	19:54
	← clemf left	19:54
	← nilg left	19:55
	→ MafiaInc joined	19:56
	→ clemf joined	19:56
	← MafiaInc left	19:56
	→ cdg joined	19:57
	← mohabaks left	19:57
	← clemf left	19:57
	→ daniel_rose joined	19:58
	→ clemf joined	19:59
	← mar77i left	19:59
	← sin3t left	20:01
	→ sin3t joined	20:01
	→ Electrometro joined	20:01
	← robotroll left	20:02
	← daniel_rose left	20:02
	→ MattMaker joined	20:03
dunpeal	osse: looks like --prune would only remove remote references to branches, but not local branches?	20:04
	→ mar77i joined	20:04
osse	dunpeal: I'm confused. If they "pull branch X" then they will merge the remote one	20:04
dunpeal	i.e. if at any point I checked out branch-foo, `fetch --prune` won't remove it just because it's gone on the remote - I'd have to explicitly `brahcn -d` it	20:05
osse	yes	20:05
	← mrpackethead left	20:06
dunpeal	osse: I'm talking about two types of developers: 1) isn't involved in foo's development, so only pulls this branch incidentally, in which case `fetch --prune` will remove it	20:06
	2) was involved in foo's development, in which case it seems `branch -d` is necessary	20:06
	← MattMaker left	20:06
GodGinrai	dunpeal: As I said before. The server shouldn't be deleting local branches. Your devs need to take responsibility for the branches they check out and delete their local copies	20:07
	← clemf left	20:08
	← altendky left	20:08
osse	also: that one particular developer's local repo is a mess does not affect all the other developers	20:08
	→ clemf joined	20:08
	→ mablae joined	20:08
	→ mischat joined	20:08
	← ki0 left	20:09
	→ lugzer joined	20:10
	← clemf left	20:10
	← mablae left	20:11
	← sin3t left	20:11
dunpeal	osse: as a perfectionist, I'd rather they all be very neat.	20:11
	→ clemf joined	20:11
	→ sin3t joined	20:11
	← Darren_ left	20:11
	← clemf left	20:11
osse	dunpeal: unfortunately git lives and lets live, and you can't make it do stuff to other peoples own repos	20:12
	the main goal should be to keep the main/central/official repo clean.	20:12
	it's the only goal that's easily achievable	20:13
	→ Faylite joined	20:13
	← mischat left	20:13
	← eivarv left	20:14
	→ nwkj86 joined	20:14
	← SwiftMatt left	20:15
dances-with-cats	dunpeal: as long as the devs aren’t pushing their local copy of the branch back to the origin, it shouldn’t be an issue if they have a collection of dead branches on their local repo	20:15
	→ foist joined	20:15
	← durham left	20:15
	→ rahtgaz joined	20:15
GodGinrai	dunpeal: making the server do things to people's repos could have horrible problems. (example: someone deletes an unmerged branch from the server, now everyone who pulls loses that branch)	20:15
	→ unbalancedparen joined	20:15
	→ durham joined	20:15
	→ trewe joined	20:16
	→ shinnya joined	20:16
	→ zacts joined	20:16
	→ eivarv joined	20:16
	← aard_ left	20:16
dunpeal	osse: yeah, I'm just trying to establish best practices	20:17
	so far here's what I have:	20:17
	1) Once you've merged your PR, `git branch -d <merged-branch>`	20:17
	2) Then `git push origin --delete <merged-branch>`	20:17
osse	Agreed	20:17
dunpeal	3) Finally `git fetch --prune` to remove remote reference.	20:17
ResidentBiscuit	If you're on GitHub/Lab, you can just click "Delete merged branch" after the merge	20:18
	Who cares what devs have on their machine	20:18
dunpeal	Done. As long as everyone occasionally fetch --prune, they'd all have a clean local.	20:18
osse	dunpeal: if it's a PR-style workflow then (2) can be done by the guy who accepts the PR.	20:18
nitric	ResidentBiscuit: perfectionists, apparently	20:18
	← dreiss left	20:18
	→ daniel_rose joined	20:18
	→ mohabaks joined	20:18
osse	dunpeal: and (3) can be made automatic by doing ''git config fetch.prune true''	20:18
	← lugzer left	20:18
	← YourTheBombNow23 left	20:18
ResidentBiscuit	I never remember to delete my local branches. Every month or so I go on a cleaning spree	20:19
	← rivarun left	20:19
	← dances-with-cats left	20:19
	→ dances-with-cats joined	20:19
	→ diegoviola joined	20:20
	← sin3t left	20:21
	→ sin3t joined	20:21
	→ rivarun joined	20:21
	← perlpilot left	20:24
	← Electrometro left	20:25
	→ SwiftMatt joined	20:27
	← veilig2000 left	20:27
	← DolphinDreamm left	20:28
	← mohabaks left	20:28
	→ clemf joined	20:28
	← airdisa left	20:28
	← rwb left	20:29
	→ dreiss joined	20:29
	← rivarun left	20:29
	← sin3t left	20:30
	→ sin3t joined	20:31
danimal2	a repo i need to work with has one branch - master, and several tags. assume i only care about Tag A. do i check out Tag A into my own branch? i dont want to mess up the master branch. sourcetree states by checking out Tag A it will create a detached head, etc. is that what i should do? thanks!	20:33
	← alansaul left	20:34
p1k	hey so I have a submodule which I committed to	20:34
	→ daniel_r_ joined	20:34
_ikke_	danimal2: Yeah, just create another branch based on the tag	20:34
kadoban	danimal2: What does "check out Tag A into my own branch" mean?	20:34
p1k	so logically the outer repo should now have an untracked submodule ref, but it doesn't show up on git status	20:34
	← lifeforms left	20:34
cjohnson	p1k: you committed to the submodule from within the submodule as it sits on your parent repo's working copy?	20:34
	or, you have a clone of that submodule somewhere else, changed it somewhere else	20:34
danimal2	_ikke_ ok got it.	20:35
	← eivarv left	20:35
cjohnson	dunpeal: I would strongly recommend against auto-deleting anything. sometimes things happen and the only good backup is a dev's local repo	20:35
p1k	cjohnson: I have two of the same submodule they are both up to date with the remote master	20:35
danimal2	kadoban like he said i would be creating a branch based on the tag.	20:36
	← daniel_r_ left	20:36
cjohnson	p1k: your parent repo has two submodules both of which refer back to the same repo?	20:36
dunpeal	cjohnson: yeah, nobody is going to auto-delete anything (as others observed, there's no concept of centralized control in Git anyway), just posting some best practices for my fellow devs	20:36
p1k	cjohnson: they refer to the same other repo	20:36
	cjohnson: oh that's weird git status --verbose showed the untracked updates to submodules	20:37
cjohnson	p1k: you keep skipping parts of my questions	20:37
p1k	but regular git status did not	20:37
cjohnson	:P	20:37
	← daniel_rose left	20:37
	→ rivarun joined	20:37
cjohnson	if you have two submodules, they aren't going to know about new updates until you update those submodules	20:37
	← dances-with-cats left	20:37
	← bongjovi left	20:37
	← jimi_ left	20:38
	→ interne7y joined	20:38
	→ dances-with-cats joined	20:38
cjohnson	doesn't matter if htey point to the same remote	20:38
	← dances-with-cats left	20:39
	← rossome left	20:40
	← sin3t left	20:40
	→ sin3t joined	20:41
	→ eivarv joined	20:41
	← eivarv left	20:42
	← interne7y left	20:42
	→ Rodya_ joined	20:43
	← codeman_ left	20:43
	← abyx left	20:44
	→ Anoia joined	20:44
	← Anoia left	20:45
	→ Anoia joined	20:45
Anoia	hi all	20:45
	I have an issue at work were a named branch no longer seems to contain the changesets I;ve previously committed ont hat branch	20:46
_ikke_	Ok	20:46
Anoia	form what I;ve read, it's possible for people pushing to change where a branch name points to	20:46
	is that correct?	20:46
_ikke_	Yes, a branch is just a pointer, you can point it to whatever you want	20:46
	though you need to force push to the server when you point it to something not descending from what it currently is	20:47
Anoia	i.e. someone (force) pushes which "moves" the branch to another changeset	20:47
_ikke_	Anoia: Correct	20:47
Anoia	ok	20:47
	so it looks liek some idiot force pushed :(	20:47
_ikke_	But that does not affect your local history immediately	20:47
Anoia	great	20:47
	not until I git pulled and all my changes disappeared... :)	20:47
_ikke_	git pull just merges	20:47
	So, the commits are still there	20:48
Anoia	but no longer seem to be a descendant of that branch	20:48
	decenedant? predecessor reven	20:48
	-typos	20:48
	← hahuang61 left	20:49
	→ brandon joined	20:49
_ikke_	You should see the merge of the pull you did	20:49
osse	"ancestor" i think is the common term	20:49
Anoia	osse: that's the one	20:49
	brandon → Guest31238	20:49
Anoia	_ikke_: I don't, my repo was clean when I pulled	20:49
_ikke_	Anoia: Do you still have the terminal session?	20:49
Anoia	and all my changes were pushed	20:50
	sadly not at the moment, I will do tomorrow though	20:50
	I just wanted to check that my understanding was correct	20:50
_ikke_	Anoia: Did you set something up to rebase on pull instead of merge?	20:50
	Anoia: By default, git pull merges, which would merge the old history with the new history	20:51
	← Guest31238 left	20:51
Anoia	would it still do that if I didn;t have any local only history?	20:51
	everythign I had was on the server already	20:52
_ikke_	Yes, because of the rewriting you think happened	20:52
	← mikecmpbll left	20:52
	→ _sjs_ joined	20:52
	→ mikecmpbll joined	20:52
Anoia	rewrite? of the branch/bookmark	20:52
_ikke_	bookmark is an hg term :)	20:52
	→ Guest55 joined	20:52
	← Rodya_ left	20:52
Anoia	yeah, I'm an hg user normally :)	20:53
	new job uses git	20:53
_ikke_	6right	20:53
Anoia	(sorry!)	20:53
_ikke_	np	20:53
Anoia	we have some customisations to the workflow, but I don;t know to what extent	20:54
	→ dances-with-cats joined	20:54
	← _sjs left	20:54
	← ToBeCloud left	20:54
	→ mibr0 joined	20:55
Anoia	if there is a merge between my, and what is the new branch, is there a way to reinstate it?	20:55
	→ aidalgol joined	20:55
	→ irco joined	20:55
osse	the reflog can help	20:56
Anoia	if I check it out, it becomes detached	20:56
	← clemf left	20:56
_ikke_	Anoia: It helps to look at the history to see what actually happened	20:56
	← _sjs_ left	20:56
	→ alansaul joined	20:56
	← nikitasius left	20:57
Anoia	git log shows a number of merges from what is now the branch and what I thought it should have been (only if I do --all)	20:57
	I'll get more info when back in work though	20:57
	→ nidr0x joined	20:57
	→ abyx joined	20:57
_ikke_	ok	20:57
Anoia	if the git admins haven;t worted it by then	20:57
	(admin gits? :)	20:57
_ikke_	Anoia: like osse said, the reflog keeps track of HEAD and branches for 90 days	20:58
Anoia	thanks though, it gives me a bit more info	20:58
_ikke_	So everything is still in your local repository	20:58
Anoia	yeah, I can see it all in git show and in another branch	20:59
	→ Rodya_ joined	20:59
Anoia	just not the one I;m working on :)	20:59
	← sin3t left	21:00
Anoia	git reflog looks useful, I see what I can dig out of that too	21:00
	→ sin3t joined	21:01
	→ mohabaks joined	21:01
	→ NeXTSUN joined	21:01
	← seishun left	21:02
	→ Captain_Ramius joined	21:02
Captain_Ramius	OK, I give up.	21:02
	*Hi, how is everyone?	21:03
	← fmcgeough left	21:03
	→ dsdeiz joined	21:03
Captain_Ramius	I'm trying to push my code to github for peer review but I don't want to include certain parts of a file.	21:03
_ikke_	Those keys are like next to eachother	21:03
	:P	21:03
	← rubyonrailed left	21:03
Captain_Ramius	Is there an easy way to do that? Or should I put it in a separate file and include it (in PHP)?	21:04
	← LionsMane left	21:04
_ikke_	Captain_Ramius: Yes, the latter	21:04
	→ vassagus joined	21:04
	→ rubyonrailed joined	21:04
_ikke_	If you don't want to share certain information, don't commit it	21:04
Anoia	Captain_Ramius: bear in mind that it'll still be in the history	21:04
	← IWishIKnew left	21:04
Captain_Ramius	OK. It just occurred to me as I was asking the question. I did that with my DB credentials.	21:04
_ikke_	Right, that's the best way	21:04
Captain_Ramius	Yeah, I just reset the push and now I need to rollback the commit right?	21:04
	→ lugzer joined	21:05
Captain_Ramius	AHHHH!	21:05
	→ sangy joined	21:05
_ikke_	enlightenment	21:05
Captain_Ramius	My reset deleted my new files.	21:05
_ikke_	The commits are still there	21:06
Captain_Ramius	Yeah, my Notepad++ just said "this file is no longer in this folder; you can't edit it anymore"	21:06
	So how do I get my files back locally? I see that they're on my Github though.	21:07
_ikke_	use git reflog to find the commit, and reset your branch back to it	21:08
	← vassagus left	21:08
	← dsantiago left	21:08
Captain_Ramius	OK, I found the ID for the pre-reset commit	21:08
	← rubyonrailed left	21:09
Captain_Ramius	What do I do with it? "reset --commitID"?	21:09
_ikke_	git reset --keep <id>	21:10
Captain_Ramius	OK	21:10
	Captain_Ramius hopes he doesn't screw it up again	21:10
	→ rubyonrailed joined	21:10
	← sin3t left	21:10
Captain_Ramius	PHEW! Thanks!	21:10
	→ sin3t joined	21:11
Captain_Ramius	I have to admit: despite the heart palpitations, it is educational lose several hours of work.	21:11
	*to lose	21:11
_ikke_	git really makes it hard to loose any comitted work	21:11
Captain_Ramius	I like git reflog better than git log: the latter floods my screen.	21:12
_ikke_	Captain_Ramius: git log --oneline -10	21:12
	← lugzer left	21:13
Captain_Ramius	Boy, they thought of everything didn't they? It's nice to use tools that don't cut your hand off.	21:13
_ikke_	git reflog is something different though, it shows you the commits where HEAD has been	21:13
Captain_Ramius	OK, I just ran "log --oneline" and "reflog" to see the difference.	21:13
	To be honest, I'm still not sure what a HEAD even is.	21:14
_ikke_	!HEAD	21:14
gitinfo	HEAD is a 'pointer' to the currently checked out branch (or commit, if HEAD is !detached). In bare repositories it tells clients which branch to checkout initially after cloning. Unlike commonly believed, HEAD is not something that exists separately for every branch. It also is not necessarily the newest commit in the repo (that's hard to define in a DVCS, anyway...)	21:14
Captain_Ramius	Hmmm.	21:14
_ikke_	You use the reflog when you somehow lost commits	21:14
Captain_Ramius	HEAD is like saying "the paper right in front of me on the desk, not the stack over there"?	21:14
_ikke_	git symbolic-ref HEAD	21:15
	try to execute that	21:16
	← mariuscc left	21:16
Captain_Ramius	returns "refs/heads/master"	21:16
_ikke_	right	21:16
	← johnny56 left	21:16
_ikke_	That says that master is the currently checked out branch	21:16
	Any new commits will be appended to that branch	21:16
	→ johnny56_ joined	21:16
	← sangy left	21:17
Captain_Ramius	it's a sym-link, then. That makes sense: like the shortcuts in windows or alias in macOS or whateveritscalled in linux	21:17
	← LiohAu left	21:17
_ikke_	Yes, a symbolic ref is how git calls it	21:17
Captain_Ramius	got it.	21:17
	← livingstn left	21:17
	← rivarun left	21:17
	← fees left	21:17
_ikke_	When pointing to a commit instead of a branch, git calls it that HEAD is detached	21:17
Captain_Ramius	OK	21:18
	→ SilNc joined	21:19
	← paul424 left	21:19
Captain_Ramius	Thanks a bunch. My dull headache indicates I've learned a lot today. :-D	21:19
sonOfRa	http://classicprogrammerpaintings.com/post/144602205627/git-detached-head-state-gustave-moreau-1876 :)	21:19
_ikke_	:-)	21:19
	→ reim joined	21:20
	← sin3t left	21:20
	→ sin3t joined	21:21
	← GodGinrai left	21:23
	→ kbs joined	21:25
	ChanServ set mode: +o	21:25
	Eugene changed the topic to: Welcome to #git, the place for git help and doorbells \| Public logs at http://goo.gl/BuUi5o \| Current stable version: 2.9.2 \| First visit? Read: http://jk.gs/git \| Getting "cannot send to channel"? /msg gitinfo .voice \| Knock knock. Who's there? Git. Git-who? Sorry, 'who' is not a git command - did you mean 'show'?	21:25
	Eugene set mode: -o	21:25
	→ rivarun joined	21:26
_ikke_	The joke actually works	21:26
Eugene	Levenshtein functions, how do they work	21:26
	osse checks if its his	21:26
	← fuchstronaut left	21:27
	← Finnoloid left	21:27
	→ kappy joined	21:27
	← byteflame left	21:28
Eugene	I believe the git-blame for that one lies with me	21:29
osse	it does	21:29
	initial commit	21:29
	← p4trix left	21:30
	← sin3t left	21:30
	→ sin3t joined	21:31
	← ExoUNX left	21:32
	← abdul left	21:32
	→ fuchstronaut joined	21:33
dunpeal	So I can ask about doorbells and it would be ontopic here?	21:33
	→ clinth joined	21:33
_ikke_	PRobably, yes	21:34
	← Guest55 left	21:34
	← reim left	21:34
	→ pwnz0r joined	21:35
	→ rik316 joined	21:35
	← rahtgaz left	21:35
	← csd_ left	21:36
	← rik316 left	21:36
	← fuchstronaut left	21:38
	← SilNc left	21:39
	← doebi left	21:40
	← sin3t left	21:40
	→ sin3t joined	21:41
	→ GT4066 joined	21:41
	→ Derperperd joined	21:41
cjohnson	Captain_Ramius: it's called a symlink in linux :P	21:41
	windows has them too. shortcuts are different	21:41
	→ Samual joined	21:42
nevyn	are shortcuts first class in windows yet?	21:42
cjohnson	windows has first class sym links	21:42
	has for several versions	21:42
	shortcuts are something else	21:42
	← rivarun left	21:43
Captain_Ramius	cjohnson, that's ironic: I don't know what first class is	21:43
Nugget	symlinks with extra legroom and free booze	21:43
_ikke_	Fully supported, native	21:43
cjohnson	with a shortcut, you can't make a shortcut to some file called foo, then edit that shortcut in your favorite editor	21:43
	unless the editor knows how to read teh shortcut	21:43
nevyn	right it needs app side support	21:44
cjohnson	with a symlink, being first class supported from the OS, the editor doesn't have to know	21:44
	← dances-with-cats left	21:44
cjohnson	the OS just transparently links to the true file	21:44
	← tabrez left	21:45
	← abyx left	21:45
	→ abyx joined	21:46
	→ rivarun joined	21:47
	← irco left	21:48
	→ Guest55 joined	21:49
	→ uri joined	21:49
	← ikmaak left	21:50
	← sin3t left	21:50
	← kbs left	21:51
	→ sin3t joined	21:51
Captain_Ramius	Oh yeah, one more question:	21:51
	← Mannn left	21:51
Captain_Ramius	I'm trying to add a dummy version of a file to my Github account containing sensitive data.	21:51
	I think I just figured it out.	21:52
	← Dougie187 left	21:52
Captain_Ramius	Maybe not:	21:52
	How do I add a dummy version of a file like config.php?	21:52
	→ Doginal joined	21:53
Captain_Ramius	Just name it configDummy.php instead and push it to Github?	21:53
	(The other projects I see there have config.php but empty values for the credentials variables, like db_user etc.)	21:53
	→ rik316 joined	21:54
	← Spec-Chum left	21:54
kadoban	Captain_Ramius: !config	21:54
gitinfo	Captain_Ramius: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas	21:54
kadoban	Ignore most of that text, some of the link suggestions should help you out though.	21:55
	← clinth left	21:55
	← le_melomane left	21:55
	→ blockzombie joined	21:56
Captain_Ramius	It's a bit over my head. I'll see if I can slug through it.	21:56
cjohnson	Captain_Ramius: for sensitive data I keep a template file like you said and fill it out on the actual machines, if I don't have any other configuration management solution in place	21:56
	← Portable left	21:56
	→ Spec-Chum joined	21:56
cjohnson	for insensitive data I try to do as much as I can to ensure sane defaults and environment-selected values	21:57
	so per-server config files really just contain API keys and the like. anything else should be baked in in some fashion	21:57
Captain_Ramius	yeah, that makes sense conceptually. I just have trouble making it happen.	21:57
cjohnson	If your difference between prod and dev machines is debug = 1, don't keep debug in your per-machine file, put debug = 1 in dev.php, debug = 0 in prod.php	21:58
	and include relevant file based on environment	21:58
	← madewokherd left	21:58
Captain_Ramius	It's not a BIG deal in this case. I'm only using Github to share code with friends for peer review. They don't care if there's a dummy config file because they don't plan to RUN the code.	21:58
	It's the principle of the matter...and later, when I deploy, the server db credentials will be different than my dev environment.	21:59
	← rivarun left	21:59
	→ lugzer joined	21:59
Captain_Ramius	So, I don't think I actually need a dummy file right now.	21:59
	← davisonio left	22:00
	← sin3t left	22:00
	← ResidentBiscuit left	22:00
	→ sin3t joined	22:00
	→ rivarun joined	22:02
	→ chris2 joined	22:02
	→ dances-with-cats joined	22:03
	→ csd_ joined	22:05
	← lugzer left	22:08
	→ therealGent joined	22:08
	← therealGent left	22:08
	→ therealGent joined	22:08
	→ rahtgaz joined	22:08
	← rahtgaz left	22:08
	→ rahtgaz joined	22:08
	← rik316 left	22:08
	← zacts left	22:09
cjohnson	depending on your setup you can also just firewall the DB and have open access to allowed app servers	22:09
	then you don't have to put any credentials in	22:09
	← csd_ left	22:09
	→ Electrometro joined	22:09
cjohnson	that's what I try to do: everything I can to make the configuration consistent	22:09
	← dhollinger left	22:10
	← uri left	22:10
	← sin3t left	22:10
	→ sin3t joined	22:10
	← mikecmpbll left	22:12
cjohnson	I also use consistent host names between machines	22:12
	so the db's hostname is always just "percona-cluster" but on dev local, /etc/hosts points percona-cluster to 127.0.0.1	22:12
	← dances-with-cats left	22:13
	← therealGent left	22:15
	← rubyonrailed left	22:15
	→ rubyonrailed joined	22:16
	← mohabaks left	22:17
	← workkevin left	22:17
	→ dances-with-cats joined	22:17
dunpeal	What's the closest thing to Github that is OSS? Gitlab?	22:18
	← ShekharReddy left	22:19
	StarWarsFan → StarWarsFan\|afk	22:20
	← sin3t left	22:20
	→ mrpackethead joined	22:20
	→ sin3t joined	22:20
	← rubyonrailed left	22:20
	← AaronMT left	22:21
	→ clemf joined	22:21
nitric	dunpeal: gitlab calls itself "open core software", but basically yes, they're as close to github as you can get, feature-wise	22:25
	→ hahuang61 joined	22:25
	→ dsantiago joined	22:26
	→ splud joined	22:26
	← choki left	22:26
	→ d4rklit3 joined	22:26
splud	I’m in the process of scripting some corefile processing. To this end, I need to be able to check out the appropriate commit from a source repository. This much actually does work - but what I’m having some trouble with is restoring the repo to the commit it was at before the core analysis.	22:27
	← dances-with-cats left	22:28
	← Spacew00t left	22:28
splud	I can get the branch, and the current commit, but if I attempt to checkout the commit (which may in fact be the HEAD of master), I’m left in a detached head state.	22:28
cjohnson	splud: why can't you just git checkout original-branch ?	22:29
	← zivester left	22:29
splud	what if the repo wasn’t at that time at the HEAD of original-branch?	22:29
nitric	splud: if you're just doing exactly one checkout, "git checkout -" will get you back to the previous HEAD. or, save the output of "git rev-parse HEAD" before you detach	22:30
	← sin3t left	22:30
	← nwkj86 left	22:30
cjohnson	splud: sounds like a weird thing you're doing, this will be run on a dev machine?	22:30
	← hahuang61 left	22:30
	→ sin3t joined	22:30
	← mibr0 left	22:30
	← nettoweb left	22:31
splud	using the commit id from `git rev-parse HEAD` still leaves me wihe detached head.	22:32
	which is curious, because that commit is HEAD.	22:32
	← durham left	22:32
i7c	No it’s not.	22:32
nitric	you did "git rev-parse HEAD" before you checked out "the appropriate commit"?	22:33
splud	yes, on dev machine. Would rather not have to have a separate copy of the repos lingering about - eventually this may be on a server with clones of repos specifically for supporting analysis.	22:33
i7c	If you checkout a commit by its commit id you will always be in detached head.	22:34
	+mode	22:34
	→ fuchstronaut joined	22:34
splud	yes, in fact at shell: git checkout master then note commit from git rev-parse HEAD then checkout desired commit, then git checkout saved-sha, and still get detached HEAD.	22:34
nitric	whoops, i7c is totally right, ignore me	22:34
splud	hrm.	22:35
i7c	If you have several branches at the same commit, how should git know which one should be pointed to by HEAD if you just specify the commit id.	22:35
	→ jimi_ joined	22:35
kadoban	You're in "detached HEAD" anytime you've checked out something other than a local branch. The meaning is, when you commit, no branch pointer will be updated to include that new commit. That's why it's even noteworthy.	22:35
i7c	Indeed. It does no harm to be in detached head state. :)	22:36
splud	I’ll have to use - I guess.	22:36
kadoban	(because then if you switch away, you have no real reference to that commit, necessarily, and could lose it)	22:36
	← gargola left	22:36
	→ durham joined	22:36
	→ rkazak joined	22:37
	← NeXTSUN left	22:37
	→ IWishIKnew joined	22:38
	→ interne7y joined	22:39
ash_workz	.digraph a->b	22:39
gitinfo	.digraph: http://g.jk.gs/dv.png	22:39
	← dsantiago left	22:39
ash_workz	(sorry git, couldn't remember the url)	22:39
i7c	I'm highly offended.	22:39
	You used us!	22:39
	→ rlb joined	22:40
	← sin3t left	22:40
	→ sin3t joined	22:40
ash_workz	:P	22:41
	<3 i7c	22:41
i7c	<3 ash_workz	22:41
	→ rubyonrailed joined	22:41
	→ dsantiago joined	22:42
	← sin3t left	22:42
	→ spudowiar joined	22:42
	gitinfo set mode: +v	22:42
	→ sin3t joined	22:42
	← fuchstronaut left	22:42
	→ python903 joined	22:43
	← interne7y left	22:43
	← corebits left	22:43
	← t0by left	22:44
	← dsantiago left	22:44
vktec	How can I amend my second to last commit? I've not pushed yet, and I just want to change the message.	22:45
rlb	Is there a way to squash together two commits that precede a merge without having to redo the merge resolution (when the resolution was complicated)? My impression is that --preserve-merges wasn't likely to work, and in practice it doesn't just re-use the existing merge work, so I wondered if there was an alternative.	22:45
	→ ikmaak joined	22:45
	← abyx left	22:45
i7c	vktec, git rebase -i HEAD~2, put "reword" in the right line, save and close, edit message, save and close.	22:45
	→ dsantiago joined	22:45
i7c	vktec, meaning replace "pick" by "reword".	22:47
vktec	Okay	22:47
	So both instances of "pick" get replaced?	22:47
i7c	No	22:47
kadoban	rlb: I think --preserve-merges might work, I never use it though. One thing you could do would be, save a reference to the merge, go back in time before the merge and squash the commits, and then redo the merge. When it asks you to fix the conflicts, just checkout the stuff from the saved merge and commit that.	22:48
i7c	vktec, the lines represent the recent two commits. Just put reword in the line of the commit whose message you want to edit.	22:48
vktec	Okay	22:48
i7c	vktec, in your case that should be the upper line.	22:48
rlb	kadoban: doh - of course, I should have thought about that. Thanks!	22:48
vktec	Thanks i7c	22:48
i7c	If I'm not horribly mistaken. :)	22:48
	vktec, you're welcome.	22:48
kadoban	'welcome	22:49
	← sin3t left	22:50
vktec	i7c: Thanks, that worked perfectly	22:50
i7c	:)	22:50
	← dmto left	22:50
	→ tvw joined	22:50
	→ sin3t joined	22:50
	→ pwnz0r_ joined	22:51
	← Rodya_ left	22:52
	← pwnz0r left	22:53
	→ lugzer joined	22:54
	→ red_ joined	22:55
	← dsdeiz left	22:56
	→ abyx joined	22:57
	← cdown left	22:57
	→ corebits joined	22:58
	← inflames left	22:58
	→ inflames joined	22:59
	→ YourTheBombNow23 joined	22:59
	← sin3t left	22:59
	← Electrometro left	23:00
	→ Electrom_ joined	23:00
	→ sin3t joined	23:00
splud	okay, I’m obtaining current branch, and SHAs for HEAD and branch, and if the same, I just checkout the branch, otherwise I check out the branch, then perform a subsequent checkout of the specific commit #	23:01
	→ starkhalo joined	23:01
osse	splud: unless you're checking out specific files from a commit you don't have to checkout a branch then a commit	23:02
	splud: you can checkout any commit directly from any other	23:02
	← Dyonisos left	23:02
	← lugzer left	23:02
splud	okay, then if commits == then check out branchname, otherwise checkout SHA ?	23:03
osse	where are the values coming from?	23:03
	← ams__ left	23:04
splud	parsing ‘git branch	23:04
	→ vassagus joined	23:04
splud	for the marked line, and performing git rev-parse HEAD and git rev-parse branchname	23:05
	← rubyonrailed left	23:05
osse	why?	23:05
	← beyertech left	23:05
	→ beyertech_ joined	23:05
	→ veilig2000 joined	23:05
	→ rubyonrailed joined	23:05
	← garethdaine left	23:05
splud	so that I can uniquivocally restore the git tree to the state before checking it out for a scripted core analysis.	23:05
	unequivocally.	23:06
	damn, can’t type worth ....	23:06
osse	splud: I think the shortcut 'git checkout -' will handle all your requirements	23:06
splud	assuming there wasn’t some intermediate git operation in there.	23:07
	← satifant left	23:07
	→ cdown joined	23:07
osse	splud: if not I suggest you do 'git symbolic-ref HEAD' to get the current branch (if any), store that initially, then check it back out when you're done	23:07
	parsing 'git branch' is usually the wrong way of going about things	23:08
	if git symbolic-ref HEAD fails then you're already detached, so store the output of git rev-parse HEAD instead.	23:08
	← rkazak left	23:09
splud	Anyway, the SHA of the application repo is in our environment, so can be parsed from a coredump. I’m using that to establish a suitable snapshot for a cross-compiled gdb with sources and symbols, etc.	23:09
	← vassagus left	23:09
	← sin3t left	23:09
	← rubyonrailed left	23:10
	→ sin3t joined	23:10
	→ ResidentBiscuit joined	23:11
	← YourTheBombNow23 left	23:11
	← veilig2000 left	23:12
	→ kbs joined	23:12
	→ YourTheBombNow23 joined	23:12
	← durham left	23:13
	→ durham joined	23:14
splud	feck.	23:16
	“HEAD detached at refs/heads/master”	23:16
	→ veilig2000 joined	23:16
	← veilig2000 left	23:17
	→ rubyonrailed joined	23:17
splud	AND when I run ‘git symbolic-ref HEAD’ in this state, I’m advised HEAD isn’t a symbolic ref	23:18
	→ LeBlaaanc joined	23:18
	← YourTheBombNow23 left	23:18
	← kaldoran left	23:19
osse	splud: Ahhh, forgot about that	23:19
	← rubyonrailed left	23:19
	← d^sh left	23:19
	→ rubyonrailed joined	23:19
	← sin3t left	23:19
osse	splud: Either strip refs/heads from the string, or use symbolic-ref --short	23:19
	→ theskillwithin joined	23:20
	→ BinGOs joined	23:20
	→ sin3t joined	23:20
osse	Not sure why git checkout behaves this way. I find it frustrating	23:20
	← al-damiri left	23:20
	→ YourTheBombNow23 joined	23:21
	← a3Dman left	23:21
	← netj left	23:22
splud	okay, that’s working.	23:22
	→ netj joined	23:22
	← mablae__ left	23:23
	← rubyonrailed left	23:24
splud	thanks. Still have a bunch of other stuff to automate (sysroot and symbol grabbing, handling different platforms), but while tedious, that’s what scripting is for.	23:24
	When done, I’ll be able to either push a corefile to a server, or run the script locally on my workstation and have it belt out a report with stack frames, source and locals.	23:25
	It’s one thing when a core comes about during ones own testing, but from the field across multiple product versions, or with long term iterative testing, setting everything up to provide a proper core analysis involves a lot of manual steps.	23:26
	→ hahuang61 joined	23:26
	→ a3Dman joined	23:26
	→ csd_ joined	23:26
osse	I sense a lack of debug symbols	23:27
	← YourTheBombNow23 left	23:28
	→ d^sh joined	23:28
	← starkhalo left	23:28
	→ YourTheBombNow23 joined	23:28
	→ rkazak joined	23:28
	→ _toine joined	23:29
	← sin3t left	23:29
	→ sin3t joined	23:30
	→ madewokherd joined	23:31
	← hahuang61 left	23:31
	→ cjbrambo joined	23:31
	← _toine left	23:31
	← medeirosthiiago left	23:32
splud	Debug symbols are stripped from binaries that are packaged, but the symbols are retained for every sanity build.	23:32
	→ ws2k3 joined	23:32
	→ _toine joined	23:33
osse	I suppose you're not in a position to tell them "can you reproduce it with this? <link to a huuge archive>" :p	23:34
	→ dsdeiz joined	23:34
splud	So, I have a dir for each bug I handle, and in there are any cores for it, plus symlinks for sysroot, source (which needs to be checked out to the build commit), symbols, and binaries.	23:34
	→ _sjs joined	23:35
	← YourTheBombNow23 left	23:35
splud	It’s an embedded device. testers don’t diagnose, just report. End users don’t see internal workings.	23:35
	→ YourTheBombNow23 joined	23:36
	→ haaaay joined	23:36
splud	Anyway, I have the step-by-step process down, but I want to fully automate it - THEN testers as well as devs who don’t spend much time in gdb would be able to take a corefile and just post it somewhere and have the magic happen.	23:36
	→ l4v2 joined	23:36
splud	The git part is handled, so moving on. Thanks again.	23:37
	← mrpackethead left	23:37
	← romerocesar left	23:38
	→ fuchstronaut joined	23:39
	← sin3t left	23:39
	← a3Dman left	23:39
	← dsdeiz left	23:39
	→ dsdeiz joined	23:40
	→ sin3t joined	23:40
	gitinfo set mode: +v	23:42
	← YourTheBombNow23 left	23:42
haaaay	I created a repository, committed a script, made further modifications to the script, want to go back and run old script. I used git checkout <hash> which ( as expected ) put me in a detached head mode. What I don't understand is why the script currently in the directory is the modified one and not the old one...what happened? How do I see the old script so I can run it?	23:42
	Any help that can be provided would be wonderful	23:42
	→ tsteinholz joined	23:43
tsteinholz	hi	23:43
gitinfo	tsteinholz: 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.	23:43
osse	haaaay: !float	23:43
gitinfo	haaaay: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.	23:43
osse	This is probably what happened	23:43
tsteinholz	i cant clone from git, because it says my ssl cert :(	23:43
osse	If git status reports it as modified you may want to look into git stash	23:43
	← fuchstronaut left	23:44
	← Cata\|Work left	23:45
tsteinholz	I get this "curl: (77) error setting certificate verify locations: CAfile: /etc/ssl/certs/ca-certificates.crt CApath: none" error when I try to clone a repository	23:45
	→ a3Dman joined	23:45
haaaay	I moved to a previous commit using the hash rather than a branch. Does that change the answer at all? Again, only one commit total followed by modifications of the file.	23:45
	← dsdeiz left	23:46
	→ dsdeiz joined	23:46
	← alansaul left	23:47
	→ Mannn joined	23:47
	← rkazak left	23:48
osse	haaaay: I don't think it does	23:48
	What does git status say?	23:48
	← clemf left	23:49
	← Faylite left	23:49
	← sin3t left	23:49
	→ lugzer joined	23:50
	→ sin3t joined	23:50
haaaay	There (I think) should be a conflict between the two files given that git diff is reporting differences. I was able to successfully checkout to that past commit...which sounds like it shouldn't have been possible given that I had a modified file (the only file).	23:50
osse	haaaay: Did you commit those changes? Ie.	23:51
haaaay	Only one commit was ever made and then modifications made thereafter with no committing or staging.	23:51
	← Shentino left	23:51
	← a3Dman left	23:52
	← kpease left	23:52
haaaay	I'd show more detail on here, but I suspect it's probably poor ettiquette to copy and paste git status information on here...	23:52
	→ Rodya_ joined	23:52
osse	haaaay: Bad etiquette due to lots of text? Use a pastebin. Bad etiquette due to proprietary content? Either redact parts of it or explain ad best as you can	23:53
	← trewe left	23:54
haaaay	just due to lots (not that much though) of text. I'll pastebin then.	23:54
osse	haaaay: If you have uncommitted changes and you checkout a different commit git will let it slide if the files with the uncommitted changes in them don't have to change	23:55
	← Limes__ left	23:55
osse	If you want to get rid of changes git status will tell you how	23:56
	← harish_ left	23:56
	→ a3Dman joined	23:56
osse	If only one commit was ever made then it still fits	23:57
	← m0viefreak left	23:57
osse	Except that you check out the same commit, not a different one, and thus the files obviously don't have to change	23:57
	← lugzer left	23:58
osse	If you want to temporarily get rid of changes, man git-stash	23:58
gitinfo	the git-stash manpage is available at http://jk.gs/git-stash.html	23:58
haaaay	What are the rules for "letting it slide"? I have exactly one document here hello.cpp. Pastebin:http://pastebin.com/TtyDRHcc	23:58
	← Electrom_ left	23:58
	← Rodya_ left	23:59
osse	By letting it slide I mean that the file with still appear modified	23:59
	← sin3t left	23:59
haaaay	In this case the goal was just a simple experiment. Create a file, commit file, make modifications to file, go back to old file, run old file, go back to 'current with modifications state'	23:59

Logs Search ←Prev date Next date→

Channels Documentation