IRCloggy #git 2016-04-24

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-04-24
	← _rht left	00:00
	← stevenbenner left	00:03
	← lindenle_ left	00:03
	→ lindenle joined	00:03
	→ bronson joined	00:04
	→ fahadash joined	00:05
	← _wwwBukoLaycom left	00:05
	→ rolha joined	00:06
	← mwhooker left	00:06
	→ Saklovich joined	00:08
	← bronson left	00:08
	← iMiiTH left	00:08
Saklovich	My website pulls from the master branch on the local repo. I have pushed to master branch and the commit is showing in the log, but the changes are not reflected on the site. It is not a cache issue. Any ideas what the problem may be?	00:09
	→ Redfoxmoon joined	00:09
	← Redfoxmoon left	00:09
	← cdg left	00:09
	→ Rodya_ joined	00:09
kadoban	Saklovich: That would really depend how you're doing the deployment. By the way, git really isn't a deployment tool ...	00:10
dm7freek	Saklovich: how often does the website/server pull?	00:10
	gitinfo set mode: +v	00:10
joejoe	hello all	00:10
	→ cdg joined	00:10
	← Not_Whatever2 left	00:12
	← fscala left	00:13
Hello71	!deploy	00:13
gitinfo	Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html	00:13
kadoban	joejoe: hello	00:14
dm7freek	Hello71: is the gitinfo OSS?	00:14
	gitinfo bot*	00:14
kadoban	I don't think so, but I believe there's a way to edit its triggers. Why?	00:14
	→ fscala joined	00:15
	← Rodya_ left	00:15
	← wxg left	00:17
	← victortyau left	00:17
	→ iMiiTH joined	00:17
dm7freek	kadoban: just curious... i have a small python irc bot, nothing special, that i dont use much, and i have yet to come across one that is actually used that is python based	00:18
kadoban	Ahh. Yeah I'm not sure if it lists what it's based on	00:18
	← Padawan_ left	00:19
	→ SwiftMatt joined	00:19
	← hyperdrive left	00:19
	→ Padawan_ joined	00:19
kadoban	dm7freek: Oh it does, and it is OSS apparently, but it's in perl: https://jk.gs/git/bot/ (at the bottom)	00:19
	← ahmedelgabri left	00:20
	→ fedexo joined	00:21
dm7freek	ah, interesting	00:21
	→ sergio1234 joined	00:27
	← joako left	00:28
	→ joako joined	00:28
	← griotspeak left	00:29
	← staticshock left	00:30
	← afuentes left	00:32
	→ mwhooker joined	00:34
	→ mischat joined	00:36
	← sergio1234 left	00:36
	→ Rodya_ joined	00:36
	← Rodya_ left	00:38
	→ Rodya__ joined	00:38
	→ joe9 joined	00:39
joejoe	how do i add the openweatherapi to my library>	00:40
	→ staticshock joined	00:41
	→ xaa joined	00:41
joe9	need some advise, please? I have git installed with a prefix of /mnt/ on the remote machine. From here, I am trying to do "git clone ssh://<remote connection params>:/mnt/dir/ ./", but, git is not able to find the remote git executables.	00:41
	← mischat left	00:42
	← avarsh left	00:42
joe9	I tried setting --upload-pack=/mnt/usr/bin/git-upload-pack, but, git complains about not find pack-objects next.	00:42
	Is there any way to tell git to use a different remote location to search for its executables?	00:43
	→ tristanp joined	00:43
joe9	http://codepad.org/ejc93ITT is the actual error	00:43
	→ griotspeak joined	00:43
	← droids___ left	00:47
	← tristanp left	00:47
	← rbern left	00:48
	← Es0teric left	00:49
	→ Durin_ joined	00:51
	→ jeffreylevesque joined	00:52
	→ Not_Whatever2 joined	00:54
	← cagmz left	00:54
	← Durin_ left	00:55
	← cdg left	00:57
	→ AndroidVaan joined	00:58
	→ jeffreylevesque_ joined	00:58
	← jeffreylevesque left	00:58
	← myme left	01:00
	← nilg left	01:04
	→ rkazak joined	01:05
	← Gloomy left	01:07
	← Bruce_ left	01:08
	← acton left	01:13
	→ denimsoft joined	01:14
	→ acton joined	01:14
	← mwhooker left	01:14
	← jeffreylevesque_ left	01:16
	← jmpp left	01:16
	← rkazak left	01:17
	→ mwhooker joined	01:17
	← boombatower left	01:17
	← dreiss left	01:17
	→ diegoaguilar joined	01:19
	→ Padawan joined	01:20
	← Padawan_ left	01:20
	→ Goplat joined	01:21
	→ Bruce_ joined	01:24
	← Noldorin left	01:24
	← lindenle left	01:25
	→ lindenle joined	01:25
	← rolha left	01:27
	→ rolha joined	01:27
	gitinfo set mode: +v	01:29
	← Xaratas left	01:34
	→ lindenle_ joined	01:34
	← lindenle left	01:36
	→ mischat joined	01:37
	← mwhooker left	01:38
	→ mwhooker joined	01:38
	→ ome joined	01:41
	← joki left	01:41
	← lindenle_ left	01:42
	→ lindenle joined	01:42
	← polyzen left	01:44
	← ojdo left	01:45
	→ polyzen joined	01:46
	→ jaguarmagenta joined	01:47
	→ joki joined	01:47
	← joako left	01:50
	→ cdg joined	01:51
	← jaguarmagenta left	01:52
	→ lindenle_ joined	01:52
	← lindenle left	01:52
	→ joako joined	01:52
	→ ojdo joined	01:52
	← thiago left	01:52
	← pks left	01:53
	→ pks joined	01:54
	← fedexo left	01:56
	→ wgrant joined	01:57
	← cyphase left	01:58
	← griotspeak left	01:58
	← Rodya__ left	01:59
	→ Rodya_ joined	02:00
	→ jstimm joined	02:01
	← rolha left	02:02
	← nadare left	02:04
	← Rodya_ left	02:04
	→ bronson joined	02:06
	→ arescorpio joined	02:08
	← lindenle_ left	02:10
	← bronson left	02:10
	→ lindenle joined	02:11
	← fahadash left	02:12
	← ncd\|leeN left	02:12
	← AndroidVaan left	02:12
	→ jmpp joined	02:12
	→ cyphase joined	02:12
	← spriz left	02:15
	← lindenle left	02:18
	→ lindenle joined	02:18
	← mwhooker left	02:18
	→ rkazak joined	02:19
	→ mwhooker joined	02:20
	→ spriz joined	02:20
	← userx left	02:22
	→ userx joined	02:23
	← ffio left	02:23
	→ rkazak_ joined	02:24
	← rkazak left	02:24
	rkazak_ → rkazak	02:24
	→ tristanp joined	02:25
	→ ffio joined	02:25
	← cyphase left	02:27
	← wgrant left	02:28
	→ neonKow joined	02:28
	→ sanketdg joined	02:28
	→ The_Phoenix joined	02:32
	→ lindenle_ joined	02:32
	← johnwhitton left	02:32
	← lindenle left	02:33
	Padawan → Guest72234	02:33
	→ Padawan_ joined	02:33
	→ _rht joined	02:34
	→ AndroidVaan joined	02:34
	← AndroidVaan left	02:34
	→ AndroidVaan joined	02:34
	→ dreiss joined	02:34
	← Guest72234 left	02:35
	← staticshock left	02:35
	→ wgrant joined	02:37
	← juvenal left	02:41
	→ cyphase joined	02:41
	← bitkiller left	02:47
	→ staticshock joined	02:49
	← denimsoft left	02:49
	→ ygeLN_ joined	02:51
	← tristanp left	02:54
	← BenderRodriguez left	02:55
	→ ygeLN joined	02:55
	← hexagoxel left	02:56
	← ygeLN_ left	02:56
	→ Sleepy63 joined	02:56
	→ hexagoxel joined	02:57
	→ durham_ joined	02:59
	← jmpp left	03:00
	→ gluytium joined	03:01
	← durham left	03:01
	← chachasmooth left	03:01
	← madewokherd left	03:01
	← mellernoia left	03:03
	→ chachasmooth joined	03:03
	→ BenderRodriguez joined	03:05
	← BenderRodriguez left	03:05
	← user083 left	03:06
	→ BenderRodriguez joined	03:06
	→ itzme joined	03:07
joejoe	ndroid:id="@+id/editText"	03:08
	android:hint= @String/"Number1"	03:08
	android:layout_below="@+id/textView2"	03:08
	Whats wrong with the @string line	03:08
Peng_	What? The "S" is capitalized and shouldn't the " be farther to the left?	03:08
rewt	not sure where that's from, but my guess is that the " is in the wrong place	03:09
	← itzme left	03:09
	← Goplat left	03:09
joejoe	hold on ill get you a glist	03:09
	← joe9 left	03:10
joejoe	<script src="https://gist.github.com/anonymous/0df4f70ab3dd6422cb1de7a8c33e9db6.js"></script>	03:10
	https://gist.github.com/anonymous/0df4f70ab3dd6422cb1de7a8c33e9db6	03:11
	→ tinajohnson___ joined	03:11
rewt	how is this related to git?	03:12
	→ cagmz joined	03:12
joejoe	what is this chat room really for?? i must be using ir wrong. where are all these people that are supposed be on here	03:13
Eugene	!offtopic	03:13
gitinfo	From the #git website: it's okay to talk about anything (within general limits of reason), as long as you don't get in the way of people talking about on-topic things (mainly questions about git and using git). Accordingly, please consider pausing off-topic discussions to help people having trouble with git (if any).	03:13
joejoe	you right wrong topix	03:13
	← PryMar56 left	03:13
Eugene	Feel free to ask whatever you want, but we don't have to answer ;-)	03:13
joejoe	very well good day to you.	03:13
rewt	if the answers you got so far don't work for you, you might get better answers in a channel for whatever that is from	03:14
Eugene	Try #android-dev or friends	03:14
joejoe	is that on freenode eugene?	03:15
Eugene	I haven't been there in years, no idea	03:15
joejoe	i dont even know how to get there	03:15
Peng_	Similar to how you got here.	03:17
	→ johnwhitton joined	03:18
joejoe	i found the channel but it will not let me connect to it. i feel like im going at this all wrong	03:20
	← userx left	03:21
	→ SuperflyR6 joined	03:21
	→ jmpp joined	03:23
	← rkazak left	03:26
	→ voice_of_me joined	03:29
	→ bgamari joined	03:29
	← sdothum left	03:30
	← bgamari left	03:31
	← jmpp left	03:32
	→ stantonk joined	03:32
	→ bgamari joined	03:33
	← italoacasas left	03:34
	→ rkazak joined	03:36
	← stantonk left	03:37
	← aidalgol left	03:44
	← SwiftMatt left	03:45
	→ jaguarmagenta joined	03:48
	→ SwiftMatt joined	03:49
	→ tristanp joined	03:50
	← tristanp left	03:51
	← CheckDavid left	03:52
	← jaguarmagenta left	03:52
	→ diego1 joined	03:53
	← diego1 left	03:54
	→ diego1 joined	03:54
	← kolobyte left	03:54
	diegoviola → Guest81548	03:54
	diego1 → diegoviola	03:55
	→ kolobyte joined	03:55
	← kolobyte left	03:55
	→ kolobyte joined	03:55
	← Guest81548 left	03:57
	→ jmpp joined	04:02
	← rkazak left	04:03
	← Cabanossi left	04:04
	← Tylak left	04:04
	← mischat left	04:05
	→ Cabanossi joined	04:06
	→ fahadash joined	04:06
	→ bronson joined	04:08
	← bronson left	04:12
	→ boombatower joined	04:15
	→ Goplat joined	04:15
	← MattMaker left	04:16
	→ mylord joined	04:16
	← coredump\|br left	04:19
	← voice_of_me left	04:21
	→ m0j0 joined	04:22
	← fscala left	04:25
	→ gsingh joined	04:27
	→ fscala joined	04:27
	← Sleepy63 left	04:27
	→ Sleepy63 joined	04:29
	→ SebastianFlyte joined	04:32
	→ lindenle joined	04:33
	→ stantonk joined	04:33
	← lindenle_ left	04:33
	← The_Phoenix left	04:33
	← joejoe left	04:33
	← timmu left	04:35
	→ timmu joined	04:36
	← durham_ left	04:36
	← ome left	04:38
	→ The_Phoenix joined	04:40
	← The_Phoenix left	04:42
	→ languitar joined	04:47
	← arescorpio left	04:48
	→ vigilancer joined	04:49
	← vigilancer left	04:49
	→ phaleth joined	04:50
	→ crameth joined	04:55
	← crameth left	04:55
	→ crameth joined	04:56
	← crameth left	04:56
	← BenderRodriguez left	04:56
	→ tristanp joined	04:58
	← Cabanossi left	05:01
	→ fedexo joined	05:01
	→ MattMaker joined	05:01
	→ Cabanossi joined	05:04
	← MattMaker left	05:05
	→ BenderRodriguez joined	05:07
	← tristanp left	05:09
	← SwiftMatt left	05:10
	→ slappymcfry joined	05:12
	→ stevenbenner joined	05:12
	← cdg left	05:12
	← jmpp left	05:12
cagmz	if i have a directory "foo" with a .git inside, can I create a copy of "foo" called "bar", make commits to "bar", and later rename it "foo" if I want to? without losing commits	05:13
	← diegoaguilar left	05:16
skered	I would recommend reading git-branch	05:16
	← m0j0 left	05:17
	→ SwiftMatt joined	05:21
	← diegoviola left	05:21
	← OneSploit left	05:26
	← justanotheruser left	05:27
	→ tristanp joined	05:28
	← SebastianFlyte left	05:32
	← staticshock left	05:32
	→ nevodka joined	05:32
	← tristanp left	05:32
	← Bruce_ left	05:35
	→ tristanp joined	05:35
	← ffio left	05:37
	← tristanp left	05:37
	→ ffio joined	05:38
	→ voice_of_me joined	05:42
	← ffio left	05:43
	→ radsy joined	05:45
	→ ffio joined	05:46
	← timvisher left	05:46
	→ timvisher joined	05:47
	← sarbs left	05:48
	→ Bruce_ joined	05:48
	→ jaguarmagenta joined	05:48
	← stantonk left	05:50
	← jaguarmagenta left	05:53
	← ffio left	05:54
	← ash_workz left	05:57
	← Bruce_ left	05:58
	→ mariuscc joined	05:58
	→ Es0teric joined	06:00
	→ mischat joined	06:00
	→ lindenle_ joined	06:02
	← lindenle left	06:03
	→ The_Phoenix joined	06:03
	← dreiss left	06:03
	← mischat left	06:05
	→ MattMaker joined	06:06
	← SwiftMatt left	06:08
	→ rkazak joined	06:08
	→ FireArrow133 joined	06:09
	→ bronson joined	06:09
	← MattMaker left	06:10
	← rkazak left	06:13
	← The_Phoenix left	06:14
	← discopatrick left	06:14
	← bronson left	06:14
	← radsy left	06:15
	→ lindenle joined	06:15
	← lindenle_ left	06:15
	→ The_Phoenix joined	06:16
	← The_Phoenix left	06:17
	→ rkazak joined	06:17
	→ lindenle_ joined	06:17
	→ The_Phoenix joined	06:17
	← The_Phoenix left	06:18
	→ The_Phoenix joined	06:18
	← The_Phoenix left	06:18
	→ The_Phoenix joined	06:18
	← lindenle left	06:19
	→ tristanp joined	06:20
	→ stantonk joined	06:20
	→ nilg joined	06:20
	→ dreiss joined	06:20
	→ andrew_ joined	06:21
	← timvisher left	06:22
	← The_Phoenix left	06:23
	→ timvisher joined	06:23
	→ lindenle joined	06:29
	← lindenle_ left	06:31
	← wrouesnel1 left	06:31
	→ lucasem joined	06:33
	← CEnnis91 left	06:36
	← nilg left	06:36
	→ lindenle_ joined	06:36
	→ albioner joined	06:37
	← lindenle left	06:38
	→ ffio joined	06:38
	→ circ-user-m8dfI joined	06:39
	← lindenle_ left	06:43
	← johnwhitton left	06:43
	→ groton joined	06:44
	→ GT4066 joined	06:45
	← boombatower left	06:47
	← BenderRodriguez left	06:48
	← cagmz left	06:48
	→ atulhjp joined	06:50
	→ fris joined	06:51
	→ userx joined	06:52
	→ SebastianFlyte joined	06:56
	← fris left	06:57
	← dreiss left	06:59
	→ thiago joined	06:59
	→ atulhjp_ joined	06:59
	← atulhjp left	06:59
	→ mischat joined	07:01
	← fahadash left	07:02
	→ jmpp joined	07:06
	← mischat left	07:06
	→ Fijit joined	07:10
	→ apprentice joined	07:10
	→ atulhjp joined	07:11
	← atulhjp left	07:11
	→ zeRez joined	07:12
	← atulhjp_ left	07:13
	← groton left	07:13
	→ afuentes joined	07:14
	→ zeroed joined	07:17
	→ jaguarmagenta joined	07:17
	→ David1977 joined	07:21
	→ The_Phoenix joined	07:22
	← jagob left	07:22
	→ vdv joined	07:23
	→ a_thakur joined	07:23
	→ nadare joined	07:23
	← SuperflyR6 left	07:24
	→ teresko joined	07:28
	→ staticshock joined	07:29
	→ dopesong joined	07:29
	→ MattMaker joined	07:30
	→ klear joined	07:32
	← simpbrain left	07:32
	← staticshock left	07:34
	← stantonk left	07:34
	→ elastix joined	07:36
	→ jaguarma_ joined	07:37
	← jaguarmagenta left	07:39
	← zeroed left	07:42
	← neonKow left	07:42
	→ nnyk joined	07:43
	← thiago left	07:44
	→ radsy joined	07:45
	← rkazak left	07:46
	→ SteffanW joined	07:47
	→ pantsman- joined	07:49
	→ neonKow joined	07:50
	← kaiza left	07:51
	← dopesong left	07:52
	→ mablae joined	07:53
	→ Gloomy joined	07:58
	→ emPi joined	07:58
	← nnyk left	07:59
	→ simpbrain joined	07:59
	→ mischat joined	08:02
	→ Jackneill joined	08:05
	← mischat left	08:07
	← neonKow left	08:08
	→ Kicer86 joined	08:08
	← duderonomy left	08:10
	→ bronson joined	08:11
	← zeRez left	08:13
	→ Anderson69s_Deb joined	08:14
	→ jaguarmagenta joined	08:14
	→ duderonomy joined	08:15
	← bronson left	08:16
	← jaguarma_ left	08:16
	← SteffanW left	08:17
	← Goplat left	08:17
	← a_thakur left	08:17
	← klear left	08:17
	← nevodka left	08:18
	← jaguarmagenta left	08:18
	→ mohabaks joined	08:19
	← Gloomy left	08:20
	← neunon left	08:21
	→ Jellyg00se joined	08:21
	→ mischat joined	08:21
	→ neunon joined	08:22
	→ Lomex joined	08:23
	← fedexo left	08:25
	← mischat left	08:26
	→ subhojit777 joined	08:26
	→ zeRez joined	08:28
	← bannakaffalatta left	08:31
	← raijin left	08:31
	→ nilg joined	08:32
	← nilg left	08:33
	← gsingh left	08:34
	→ nilg joined	08:35
	→ stantonk joined	08:35
	← nilg left	08:35
	gitinfo set mode: +v	08:36
	→ nilg joined	08:37
	← mohabaks left	08:37
	← mehola left	08:38
	← mkoskar left	08:38
FireArrow133	Hey guys, I have a question. If I have a repo I forked from GitHub, and the master branch is about 1 change behind, I can "git pull" from the original repo into the master branch, yes. But what happens to the branch I have on the local copy? Does it get updated when I update the master branch or do I need to sync my changes with the master branch.	08:38
	→ nilg` joined	08:39
	← stantonk left	08:39
	→ dopesong joined	08:40
FireArrow133	(You guys do know you can speak in here by /msg gitinfo .voice right?)	08:40
	→ zarel joined	08:42
	→ ome joined	08:42
	← nilg left	08:42
	→ lindenle joined	08:42
Fissure	FireArrow133: pull only updates the current (local) branch	08:42
FireArrow133	So I'll have to git pull both branches Fissure ?	08:42
Fissure	yes	08:42
	← David1977 left	08:45
	← lindenle left	08:46
	← afuentes left	08:46
	→ spat joined	08:47
	→ userx_ joined	08:49
	← cglocke` left	08:49
	← userx left	08:50
spat	I have a webite in a git repository. I use a theme that is another git repository so it is nested. This is fine for development. I can update my website and update the theme individualy. However when I want to deploy to production the submodule gets ignored. How can I fix this deployment issue?	08:51
lucasem	how are you deploying?	08:52
spat	git push	08:52
	→ ahmedelgabri joined	08:52
	← subhojit777 left	08:52
lucasem	when you clone from your production machine, you can use --recursive to include submodules	08:53
	→ cntrl joined	08:54
lucasem	spat: and after you've cloned, later on, you may `git pull` followed by `git submodule update --recursive`	08:54
spat	lucasem: The cloning is not the problem. I will update the theme (submodule) on the development machine. Than I want to push it. I do not even need in in production	08:55
	← strk left	08:55
	← cntrl left	08:55
	→ slappymc1ry joined	08:56
	← nilg` left	08:56
	→ mkoskar joined	08:56
lucasem	if I understand correctly, you should go into your submodule directory, make sure git is looking at that repo (and not the parent), and commit/push your changes from there	08:57
	you'll also need to re-add the submodule, so it has the correct ref within its tree. you can just `git add s_dir` and commit	08:58
	spat: ^	08:58
	→ nilg` joined	08:59
	← slappymcfry left	08:59
	→ subhojit777 joined	08:59
	→ userx joined	09:02
spat	lucasem: I think this is all confusing and rather anoying. seems to me that It is better to simply remove the theme .git directory so my repository contains all files. Than simply remove and reclone the theme when I want to update it from upstream.	09:02
	→ droids___ joined	09:02
lucasem	spat: you don't have to re-clone, but I think you're seeing an important point:	09:03
	avoid submodules	09:03
	→ nnyk joined	09:03
	← nnyk left	09:03
	→ nnyk joined	09:03
	← userx_ left	09:04
	← r3c0d3x left	09:04
spat	lucasem: yeah I do not even want to use it but git sees it as a submodule just because it has a .git directory	09:04
	If it would just ignore it I would be all set	09:05
	→ r3c0d3x joined	09:05
lucasem	spat: yeah I think the thing to do then is to remove the .git directory. Just make sure you aren't violating any usage licenses if the code isn't yours	09:05
	→ davisonio joined	09:06
	← albioner left	09:08
spat	lucasem: Hmm never knew that repositories would be license boundaries. I still keep the entire theme incuding its license file in tact. What senario are you thinking about?	09:09
	→ isxek joined	09:09
	→ siaw joined	09:10
	→ toogley joined	09:12
lucasem	spat: if it's GPL, and you make a change — that change needs to be made available (as it says in the GPL license)	09:12
	→ Glooomy joined	09:12
	→ bronson joined	09:12
	← tinajohnson___ left	09:13
	← nnyk left	09:14
	← subhojit777 left	09:14
	← c0nfuseki left	09:15
	← ahmedelgabri left	09:16
	→ crameth joined	09:16
	← bronson left	09:17
	← catsup left	09:17
	← voice_of_me left	09:17
	→ catsup joined	09:17
	← catsup left	09:18
	→ subhojit777 joined	09:20
	← Lomex left	09:20
	→ nilg`` joined	09:21
	← nilg` left	09:21
spat	lucasem: Ah I see. thanks	09:21
	→ mischat joined	09:22
	→ arkin joined	09:23
	← mischat left	09:27
	→ staticshock joined	09:29
	→ Lomex joined	09:32
	→ mischat joined	09:33
	← mischat left	09:33
	← mylord left	09:34
arahael	That's a simplification, but is the basic summary.	09:35
	← staticshock left	09:35
	→ stantonk joined	09:37
	→ mdw joined	09:37
	← Not_Whatever2 left	09:39
	→ klear joined	09:40
	→ nnyk joined	09:41
	→ mohabaks joined	09:41
	← stantonk left	09:42
	→ lindenle joined	09:43
	→ ahmedelgabri joined	09:43
	→ ncd\|leeN joined	09:44
	boudicca → boudiccas	09:45
	← lindenle left	09:47
	→ MrWoohoo joined	09:49
	→ m0viefreak joined	09:52
	→ jost joined	09:53
	→ FireArrow133_ joined	09:53
	← Lomex left	09:54
	→ FireArrow133__ joined	09:56
	→ mar77i_ joined	09:56
	← FireArrow133 left	09:57
	→ slayerjain joined	09:57
	← FireArrow133_ left	09:58
	← mar77i left	09:58
	→ micechal joined	09:58
	→ FireArrow133 joined	09:59
	← Glooomy left	09:59
	→ ahmed_elgabri joined	10:00
	← nnyk left	10:01
	← FireArrow133__ left	10:01
	→ gsingh joined	10:02
	→ ronny joined	10:02
ronny	hi	10:02
	← duderonomy left	10:03
	← ahmedelgabri left	10:03
ronny	is there any way to do a complete rebase more simple? (my branch diverged a while back and there is multiple conflicts i cant solve easily at once)	10:03
	← zeRez left	10:03
	← ffio left	10:04
	← elastix left	10:10
	→ King_Hual joined	10:10
	→ mar77i joined	10:11
cbreak	ronny: rebases are step by step	10:13
	you don't have to solve conflicts at once, you can solve them one by one	10:13
	maybe rerere helps too	10:13
	← mar77i_ left	10:14
	→ jonesbusy joined	10:14
ronny	cbreak: they step by step move cahgnes from my branch to the top, what i need is bascially rebase n times, once for each conflict commit on the other side	10:14
	→ FireArrow133_ joined	10:14
	→ Uhebrybdh joined	10:14
cbreak	ronny: what's wrong with rebase?	10:14
	gitinfo set mode: +v	10:15
	← radsy left	10:15
Uhebrybdh	http://uhebrybdh.taledar.com/	10:16
	→ fuchstronaut joined	10:16
ronny	cbreak: bascailly i have multiple differently conflciting refacorings on the branch i want to rebase on top of, and ihave multiple of those in my branch as well	10:16
	cbreak: so things are a bit confusing	10:16
cbreak	ronny: git rebase is commit by commit	10:16
	you can't get it finer	10:16
	← FireArrow133 left	10:17
ronny	cbreak: i dont think you follow	10:17
	it puts commit by comit on top of the other branch	10:17
	→ ffio joined	10:17
cbreak	indeed.	10:17
ronny	what i needis more like a staircase walk of N rebases, each rebasing one comit further	10:18
preaction	you are in a maze of twisty rebases, all alike	10:18
Seveas	ronny: in that case forget about rebase, and just cherry-pick	10:18
	← AndyTechGuy left	10:18
preaction	did you bring a lamp? you are likely to be eaten by a merge conflict!	10:18
Bombe	ronny, all previous rebases will disappear by the time you finished the next rebase.	10:19
	→ AndyTechGuy joined	10:19
cbreak	ronny: why?	10:19
	ronny: rebase applies one single commit	10:19
	then, one more commit	10:20
	then one more. and one more	10:20
	every step applies one commit further	10:20
ronny	cbreak: please reread, you completely ignored what i asked for	10:20
cbreak	ronny: no	10:20
	I told you that rebase IS what you are asking for	10:20
	← FireArrow133_ left	10:20
ronny	cbreak: i also told you how i want to interact with rebase,	10:21
cbreak	you can do it with -i	10:21
	← nilg`` left	10:21
cbreak	but I doubt you'll need that	10:21
ronny	you left out that bit before, and you presumed about my needs without telling me, insted just telling me something else ...	10:23
cbreak	nope	10:23
	← Uhebrybdh left	10:23
cbreak	you really don't need what -i gives you	10:23
	it's for droping, reordering or otherwise rewriting history	10:23
	all you need is the normal command line rebase	10:23
	something like rebase --onto somecommit	10:23
	→ elastix joined	10:24
	← davisonio left	10:26
	→ xelxebar_ joined	10:26
	→ Lomex joined	10:31
	← elastix left	10:33
	→ davisonio joined	10:33
	← spat left	10:34
	slappymc1ry → slappymcfry	10:35
	→ elastix joined	10:35
	→ irqq joined	10:36
	← davisonio left	10:36
	← elastix left	10:36
	→ SuperflyR6 joined	10:40
	← SuperflyR6 left	10:40
	← ahmed_elgabri left	10:42
	→ ahmedelgabri joined	10:42
	→ davisonio joined	10:45
	← fuchstronaut left	10:45
_ikke_	ronny: We learned here by experience people not always ask what they need but think how to solve their problem	10:47
	→ Xaratas joined	10:47
	← davisonio left	10:47
	← arkin left	10:48
	← theskillwithin left	10:49
	← mdw left	10:52
	← ams_ left	10:53
	→ SteffanW joined	10:55
	→ kam270 joined	10:55
	← GT4066 left	10:56
	← kam270 left	10:56
	→ raijin joined	10:59
ronny	_ikke_: thats why i tried to state my problem and not jsut the solution im looking for	10:59
	→ mdw joined	10:59
	→ davisonio joined	11:00
_ikke_	ronny: Right, but your question described default behaviour in git, which cbreak tried to explain	11:00
	→ martinkl_ joined	11:01
	← martinkl_ left	11:01
_ikke_	So if that's not what you mean, you have to clarify what you want different from default behaviour	11:01
	git merge will do a three-way merge with the tips of the branches and the common ancester, which gives you al conflicts at once	11:03
	git rebase applies one commit after another, basically breaking the conflicts down to commit level instead of branch level	11:03
	-i does not change any of that	11:03
ronny	_ikke_: instead of "rebase target" i want to iterate on "rebase $first child of cmmon ancesor with target thats an ancestor of common target"	11:03
	- the second common	11:04
	→ mischat joined	11:05
	→ SonikBoom joined	11:05
_ikke_	I'm afraid this will require some visualisation..	11:05
cbreak	ronny: just tell rebase to do that...	11:06
	ronny: you can rebase onto which ever commit you want	11:06
	as I told you some time ago :P	11:06
_ikke_	yes, you can manually specify the rebase target if the common ancestor is not what you want	11:07
	← timvisher left	11:07
	← SteffanW left	11:07
	→ timvisher joined	11:08
	→ martinkl_ joined	11:08
ronny	imainge i based my branc on commit A, the origin added B , C, D, E, F, and G, now instead of rebasing all my commits on top of g, i want to iterate from B to G as targets (and try to go for merges of feature branches)	11:09
	← ahmedelgabri left	11:09
_ikke_	Right	11:09
cbreak	ronny: so do what I told you	11:10
_ikke_	That's a manual process of first rebasing onto B, then rebasing onto C	11:10
	Then rebase onto D	11:10
cbreak	rebase normally... --onto B	11:10
	and as I also told you some time ago: consider reading up on rerere	11:10
	← inflames left	11:11
	→ bollullera joined	11:12
_ikke_	rerere will only help if you try to apply the same commit multiple times, isn't it?	11:13
	← mofai left	11:13
cbreak	he wants to rebase the same commits several times	11:13
	first on B, then on C, and so on	11:13
_ikke_	he wants to reduce conflicts by doing that process	11:13
	← subhojit777 left	11:16
	→ mofai joined	11:17
	← Xaratas left	11:17
	← Lomex left	11:18
	← mohabaks left	11:20
	→ subhojit777 joined	11:21
	→ rolha joined	11:22
	← Jellyg00se left	11:23
	→ stonerfish joined	11:26
j416	ronny: I haven't tried this tool, but it looks as if it might help solve your problem https://www.youtube.com/watch?v=FMZ2_-Ny_zc	11:30
	← martinkl_ left	11:30
	← vdv left	11:31
	→ staticshock joined	11:32
	← phaleth left	11:35
_ikke_	I heard of it, but forget about it again	11:35
	→ phaleth joined	11:36
	← staticshock left	11:37
	→ ivan_on_trac joined	11:38
	→ aard_ joined	11:41
	← crameth left	11:41
	→ Not_Whatever2 joined	11:43
	→ spat joined	11:44
	→ lindenle joined	11:45
	← AndyTechGuy left	11:47
	→ AndyTechGuy joined	11:48
_ikke_	Interesting tool	11:49
	Something worth checking out	11:49
	→ roentgen joined	11:49
	← lindenle left	11:49
	→ ahmedelgabri joined	11:50
	→ tlaxkit joined	11:53
j416	yes, I heard about it some time ago but I've yet to stumble upon a use-case in which rebase or merge is not enough. Maybe one day. :)	11:53
_ikke_	hehe	11:53
	Even has an arch package :-)	11:55
	(AUR)	11:55
	← andrew_ left	11:55
	→ fuchstronaut joined	11:57
	← fstd left	11:59
	→ fstd joined	11:59
	← King_Hual left	12:00
	← rolha left	12:01
	→ crameth joined	12:02
	← lucasem left	12:02
j416	in os x brew as well; nice	12:02
	→ Cgee joined	12:02
	← Cgee left	12:03
	← subhojit777 left	12:03
	→ pflanze joined	12:04
pflanze	Hello. I'm an oldtime git user, but am very confused about this:	12:05
	→ nilsi joined	12:05
pflanze	I've got a project that uses a submodule. Not the first time either. Now when I clone that project and "git submodule init; git submodule update" then it puts the objects of the submodule into the main .git/ dir	12:06
	← davisonio left	12:06
cbreak	sounds reasonable	12:06
pflanze	Which is transparent except for when renaming the subfolder containing the subrepo (breaks it in 3 places instead of just 1),	12:06
	also, when I "git remote add" that submodule so that I can fetch changes I made there to another place, it won't work.	12:07
grawity	then use `git mv` to rename it	12:07
	→ diegoaguilar joined	12:07
pflanze	Does not report an error, just silently doesn't fetch the current head from there.	12:07
	← spat left	12:07
	→ Tee_Pee joined	12:07
	→ Oqu joined	12:07
	← Oqu left	12:08
cbreak	pflanze: you should add the submodule location	12:08
pflanze	So why do you think that's reasonable (I think it isn't). And how do I turn the subrepo back into a normal repository?	12:08
cbreak	path/to/repo/submodule	12:08
	← jon-mac left	12:08
cbreak	pflanze: not path/to/repo/.git/...	12:08
pflanze	creppe, this is what I did	12:08
cbreak	pflanze: git clone it	12:08
pflanze	k trying clone.	12:09
cbreak	but submodules are normal repositories	12:09
pflanze	why are you saying this?	12:09
cbreak	they just have an external .git (refered to via a file)	12:09
	pflanze: because they are	12:09
pflanze	yep, .git is a file	12:09
	← mdw left	12:09
pflanze	because they aren't with regards to git remote	12:09
cbreak	.git can be a file or directory, both are normal	12:09
pflanze	or perhaps you're saying that this is a bug	12:10
	← mwhooker left	12:10
	← bgamari left	12:11
	→ bgamari joined	12:11
pflanze	ok, that was because the HEAD is detached in the repo	12:11
cbreak	I'm saying it should work totally normal	12:11
	pflanze: that is also normal	12:11
pflanze	yes	12:11
cbreak	for submodules	12:11
pflanze	so my surprise earlier misled my thinking here.	12:11
	← MattMaker left	12:12
pflanze	my surprise earlier= with the folder rename	12:12
	← ahmedelgabri left	12:12
	→ ahmed_elgabri joined	12:12
	→ mwhooker joined	12:12
	→ passerby joined	12:13
	→ lirl joined	12:14
pflanze	I still find this surprising, and wonder what the reasoning behind this approach is?	12:14
	← lirl left	12:14
cbreak	which approach?	12:17
	external git?	12:17
	it wasn't that way in the old days, but that caused a lot of problems when submodules only existed in one branch	12:17
_ikke_	not having to complain when switching branches that don't have the submodule	12:17
	← mischat left	12:17
	← mwhooker left	12:18
	← NwS left	12:22
	← mrkat left	12:23
	→ Glooomy joined	12:24
	← Not_Whatever2 left	12:26
	→ jbitdrop joined	12:26
	→ digidog joined	12:26
	← diegoaguilar left	12:29
	→ mwhooker joined	12:29
	← slayerjain left	12:30
	← boudiccas left	12:30
	→ miklcct joined	12:30
	→ boudiccas joined	12:31
pflanze	Aha, accomodate to switching branches makes sense.	12:33
	← a3Dman left	12:33
pflanze	Although, does it remove the subdir then (even if it contains say compiled object files)?	12:33
_ikke_	It complained that it had to remove the directory	12:34
pflanze	Usually it doesn't remove files it doesn't know about. Couldn't it do the same with the subrepo?	12:34
_ikke_	Git want to remove the directory, but sees there is untracked content	12:34
pflanze	Yep	12:34
_ikke_	It prevents you from checking out that branch	12:34
pflanze	That's what I think I'd have expected.	12:34
	Only if the new branch conflicts with it?	12:35
_ikke_	Usually an older branch that does not contain the submodule	12:35
pflanze	yes, I understand.	12:35
	I thought if I switch branch or so, and there are files unknown in the current branch, git leaves them alone.	12:36
	← crameth left	12:36
	→ crameth joined	12:37
_ikke_	branch A has a submodule entry pointing to dir A, branch B does not have this entry. When you checkout, git sees the entry not there, and concludes that that directory should be removed (just default behaviour)	12:37
pflanze	if everything in the dir is tracked	12:38
_ikke_	That's the next step	12:38
	→ rolha joined	12:38
	→ stantonk joined	12:39
_ikke_	as a safety, git does check if there is anything in the dir, sees it's not empty, and aborts the checkout, giving the warning that the directory is not empty	12:39
	Note that git usually does not track directories	12:39
	only files inside directories	12:39
	→ AndChat728121 joined	12:40
pflanze	My point is that it doesn't abort the checkout (if the files are not a submodule but normal subdir):	12:41
	git init; mkdir a ; echo hello > a/world; git add .; git commit -m A; g-branch aaa; mkdir b; echo hello2 > b/world2; git add .; git commit -m B; echo hello3 > b/world3; g-checkout aaa	12:41
	→ diegoaguilar joined	12:41
pflanze	run this in an empty dir, and then issue git status	12:41
_ikke_	Like I said, git normally does not track directories in a normal situation	12:41
pflanze	it left b/world3 alone.	12:41
	My point is, if the above leaves b/world3 alone, why would it not leave b/.git/* alone?	12:42
	← jbitdrop left	12:42
_ikke_	boundaries. For the parent project, it only sees b	12:42
	→ a3Dman joined	12:43
_ikke_	The rest it basically ignores	12:43
pflanze	yes, exactly	12:43
	why would it not just ignore b/.git/ then?	12:43
	← stantonk left	12:43
pflanze	Looks like it special-cased dirs containing submodules in the past and failed the checkout as a special case.	12:43
	→ knighthawk joined	12:43
pflanze	(And then people said that this is bad and then the move to .git as a file was done, if I reconstructed the history right.)	12:44
	Anyway, I don't care all too much, now that I understand the .git as a file behaviour.	12:45
_ikke_	It's just, for the parent project, it sees a entry b in one commit, and that entry b is not there in the other commit (being oblivious that b also contains other things)	12:45
	so the default behaviour is to remove b	12:45
	So when removing the dir, git has an extra safety, seeing, hey, this dir is not empty	12:46
	← fscala left	12:46
	→ davisonio joined	12:46
pflanze	Yes, my point is why couldn't it have used the same code that runs for normal dirs for submodule dirs?	12:47
	So for a submodule, b/ would have been marked as a submodule in the tree, treat it as unremovable (right away since there are no entries in it to remove, and it's not empty, thus leave alone)	12:47
	and hence lead to the outcome that the older branch is checked out, but b/ including b/.git/ etc. is still there, untracked.	12:48
_ikke_	Yeah, it's more the lack of special casing, then special casing submodules	12:48
	→ mohabaks joined	12:48
_ikke_	But the prefered solution was to move the repository, so that it actually can be removed	12:49
	→ fscala joined	12:49
pflanze	I think my special case would have been smaller than the one that was implemented.	12:49
_ikke_	Yes, but not necessarily correct	12:49
	← mwhooker left	12:49
pflanze	Perhaps, although I don't currently see why.	12:49
_ikke_	The branch does not contain the submodule, so the correct result would be that that directory is gone	12:50
	← dopesong left	12:50
pflanze	It may have been a case that could have been dealt with.	12:50
	as a user.	12:50
	Just like if I've got a normal subdir with *.o files, git will leave it around.	12:51
	So as a user I already have such cases.	12:51
	→ mmlb joined	12:51
pflanze	I can git clean -fd it away if I want.	12:51
	→ mwhooker joined	12:51
_ikke_	sorry, I got 2 go	12:52
pflanze	Yeah, thanks for the discussion in any case.	12:52
	→ dopesong joined	12:54
	→ SteffanW joined	12:55
	→ nnyk joined	12:55
	← mmlb left	12:56
	→ NwS joined	12:57
	→ subhojit777 joined	13:00
	← doppo left	13:02
	← SteffanW left	13:03
	→ doppo joined	13:03
	→ SteffanW joined	13:03
	→ jbitdrop joined	13:05
	→ weox joined	13:06
	← miklcct left	13:06
	← AndChat728121 left	13:08
	← ome left	13:08
	→ miklcct joined	13:09
	← mwhooker left	13:09
	→ mwhooker joined	13:11
	→ nvee joined	13:12
	← mauzilla left	13:13
	← dopesong left	13:15
	→ bronson joined	13:16
	→ zeroed joined	13:16
	← rolha left	13:17
	→ rolha joined	13:17
	→ mauzilla joined	13:18
	← nvee left	13:19
	← grawity left	13:19
	← rolha left	13:19
	→ rolha joined	13:19
	→ grawity joined	13:19
	← knighthawk left	13:20
	← bronson left	13:20
	→ flaguy48 joined	13:21
	← miklcct left	13:22
	← zarel left	13:23
	← SteffanW left	13:23
	→ dopesong joined	13:23
	→ miklcct joined	13:25
	→ DubH joined	13:30
	→ madewokherd joined	13:30
	← dopesong left	13:31
	→ knighthawk joined	13:31
	→ staticshock joined	13:33
	← raijin left	13:33
	→ zarel joined	13:35
	← mwhooker left	13:35
	← DubH left	13:36
	→ dopesong joined	13:37
	→ mischat joined	13:37
	← staticshock left	13:37
	← passerby left	13:37
	← micechal left	13:38
	← dopesong left	13:40
	→ dopesong joined	13:40
	← davisonio left	13:42
	← zeroed left	13:42
	← simpbrain left	13:43
	→ ferr joined	13:45
	→ ahmedelgabri joined	13:46
	← daynaskully left	13:46
	← gsingh left	13:46
	→ mizu_no_oto joined	13:48
	← ivan_on_trac left	13:48
	← ahmed_elgabri left	13:48
	← diegoaguilar left	13:49
	→ gsingh joined	13:49
	→ bernardio joined	13:50
	→ SteffanW joined	13:50
	→ daynaskully joined	13:51
	← userx left	13:52
	→ userx joined	13:52
	← pwnawannab_ left	13:55
	← pwnawannab[NE] left	13:56
	← nebg left	13:56
	→ ochorocho__ joined	13:56
	→ cyan__ joined	13:58
	→ davisonio joined	14:02
	← klear left	14:04
	← ffio left	14:04
	← tchan left	14:06
	← xelxebar_ left	14:07
	← knighthawk left	14:07
	← slappymcfry left	14:07
	← jost left	14:08
	← subhojit777 left	14:10
	→ bruce_lee joined	14:10
	→ nessundorma joined	14:12
	← nnyk left	14:13
	← gluytium left	14:13
	→ shinnya joined	14:14
	← Es0teric left	14:15
	→ doener joined	14:16
	← cyan__ left	14:16
	← zarel left	14:16
	← rolha left	14:17
	→ sdothum joined	14:17
	→ bitkiller joined	14:17
	→ p1k joined	14:19
	→ gluytium joined	14:19
	→ unbalancedparen joined	14:20
	→ elastix joined	14:24
	← siaw left	14:24
	→ griotspeak joined	14:24
	→ Dyonisos joined	14:25
	→ chrisshattuck joined	14:25
	→ pld joined	14:25
	← pld left	14:26
	→ pld joined	14:26
pld	is there a way to separate body and subject when using git commit -m "message here" or do i need to use the verbose flag in that case?	14:26
preaction	pld: you could try \n\n or your shell's heredoc perhaps	14:27
	← chrisshattuck left	14:28
	→ zeRez joined	14:29
	← zeRez left	14:29
grawity	git commit -m foo -m bar	14:29
	or, git commit -m "foo	14:29
		14:29
	bar"	14:29
	→ zarel joined	14:29
	→ knighthawk joined	14:30
	xanadu → Guest60094	14:31
	→ siaw joined	14:31
	→ jon-mac joined	14:31
	→ fahadash joined	14:31
	→ dermoth joined	14:32
	→ topi` joined	14:32
	← fuchstronaut left	14:32
	← knighthawk left	14:32
topi`	I think I just screwed up my "cleanup" branch. I tried to git rebase the newest stuff from development on top of it, but some merge conflicts ensued, and I tried to fix them as well as I could. Now I cannot find my original cleanup commits any more. I wish I had backed up the directory tree before merge :(	14:33
	I had 4 nice commits there, "cleanup 1: foo...", "cleanup 2: bar..." etc and now only Cleanup 3 is to be found	14:34
	I guess there is no possibility of canceling a rebase, when it's already done?	14:34
	→ knighthawk joined	14:35
topi`	luckily, it is for cleanup, so no functionality just. I just have to redo my cleaning of the source code.	14:35
	← robotroll left	14:35
	→ King_Hual joined	14:35
	→ robotroll joined	14:36
	→ jonno11 joined	14:36
	← knighthawk left	14:36
	→ subhojit777 joined	14:37
	→ italoacasas joined	14:38
	← nessundorma left	14:39
	→ BenderRodriguez joined	14:40
	→ italoacasas1 joined	14:42
	← fracting1 left	14:42
	← italoacasas left	14:43
	← SteffanW left	14:43
	→ mellernoia joined	14:45
	→ PCatinean joined	14:46
	→ dreiss joined	14:47
	→ xlegoman joined	14:48
	→ lindenle joined	14:48
	← fscala left	14:48
	→ satifant joined	14:51
	→ fscala joined	14:51
	← lindenle left	14:52
	← mizu_no_oto left	14:53
	← dreiss left	14:54
	← griotspeak left	14:55
	→ shum joined	14:56
	← italoacasas1 left	14:56
	← ahmedelgabri left	14:56
	← ochorocho__ left	14:57
	← sdothum left	14:57
	→ ochorocho__ joined	14:57
	→ ahmedelgabri joined	14:57
	→ CheckDavid joined	14:57
	→ mdw joined	15:00
	→ SwiftMatt joined	15:01
	← ochorocho__ left	15:02
	→ ochorocho__ joined	15:02
	← fscala left	15:02
	← crameth left	15:03
	→ johnwhitton joined	15:03
	→ ams_ joined	15:03
	← ahmedelgabri left	15:03
	← davisonio left	15:04
	→ grayjoc joined	15:04
	→ fscala joined	15:05
	→ klear joined	15:06
	→ dreiss joined	15:07
	← ochorocho__ left	15:08
	→ ochorocho__ joined	15:08
	→ jaguarmagenta joined	15:09
	→ knighthawk joined	15:09
	→ tchan joined	15:09
	← ochorocho__ left	15:11
	← mikiones_ left	15:11
	→ mikiones joined	15:12
	→ ochorocho__ joined	15:12
	← tchan left	15:12
	← weox left	15:14
	→ tchan joined	15:15
	← bernardio left	15:15
	→ stantonk joined	15:16
	← SwiftMatt left	15:17
	→ rim-k joined	15:17
	→ ahmedelgabri joined	15:17
	→ bronson joined	15:18
	→ SwiftMatt joined	15:18
	→ victortyau joined	15:20
	← tchan left	15:20
	← stantonk left	15:20
	→ afuentes joined	15:20
	→ tchan joined	15:21
	← tchan left	15:21
	→ tchan joined	15:21
	→ nnyk joined	15:21
	→ Not_Whatever2 joined	15:22
	← bronson left	15:22
	→ reim joined	15:23
	← dermoth left	15:23
	→ CrypticGator joined	15:24
	← subhojit777 left	15:24
	→ cagmz joined	15:24
	→ rkazak joined	15:24
	← AndroidVaan left	15:26
	→ fuchstronaut joined	15:26
	→ ffio joined	15:27
	← fscala left	15:28
	→ discopatrick joined	15:28
	← ffio left	15:29
	→ mizu_no_oto joined	15:31
	→ staticshock joined	15:33
	→ mar77i_ joined	15:35
	← mar77i left	15:37
	→ nitesh joined	15:38
	← staticshock left	15:38
	→ nitesh` joined	15:38
	← nilsi left	15:39
	← nitesh`` left	15:40
	→ albioner joined	15:42
	← droids___ left	15:42
	← kini left	15:42
	← nitesh left	15:42
	← CrypticGator left	15:42
	← tvon left	15:43
	← mizu_no_oto left	15:43
	← ochorocho__ left	15:43
	→ ochorocho__ joined	15:44
	→ ariel_17 joined	15:45
	← Impaloo left	15:45
	→ Impaloo joined	15:46
	→ cdg joined	15:46
	← cdg left	15:46
	→ cdg joined	15:47
	← zarel left	15:47
	← mohabaks left	15:47
	← Impaloo left	15:50
	→ aspellip_ joined	15:51
	→ nebg joined	15:51
	→ bahar joined	15:51
	← bahar left	15:51
	→ bahar joined	15:51
	→ Impaloo joined	15:51
	→ kini joined	15:52
	← Not_Whatever2 left	15:52
	→ zarel joined	15:53
	← victortyau left	15:53
	→ subhojit777 joined	15:55
	→ aswen joined	15:56
	← reim left	15:56
	→ fscala joined	15:57
	→ Bruce__ joined	15:59
	← roentgen left	16:02
	← Bruce__ left	16:04
	→ ffio joined	16:05
	← ffio left	16:05
	← jaguarmagenta left	16:05
	← gsingh left	16:06
	← rim-k left	16:06
	→ rominronin joined	16:07
	→ davisonio joined	16:07
	→ mikiones_ joined	16:08
	← knighthawk left	16:10
	← ahmedelgabri left	16:10
	→ ffio joined	16:10
	← mikiones left	16:10
	← Jeroen left	16:11
	← fscala left	16:11
	→ Bruce__ joined	16:12
	← adamm_ left	16:13
	→ adrian_1908 joined	16:13
	→ Jeroen joined	16:14
	→ fscala joined	16:14
	← ochorocho__ left	16:14
	→ ochorocho__ joined	16:14
	← klear left	16:14
adrian_1908	hello. If I create a remote repository (e.g. on GitHub), shouldn't the .git folder be on there too? It contains the working history, no?	16:15
maxb	It is.	16:16
preaction	adrian_1908: .git folder is the database. github stores the .git folder, but also allows you to navigate the working tree, the same thing you look at	16:16
	→ reim joined	16:16
	→ staticshock joined	16:17
adrian_1908	preaction: Does git handle this folder in the background? I reckon tracking the git folder with git would probably be like dividing by 0, eh? :)	16:18
	→ bronson joined	16:19
preaction	yes, git handles the database in the background, which is why it's in a hidden folder .git	16:19
	← unbalancedparen left	16:19
adrian_1908	ok, thanks!	16:19
	→ CEnnis91 joined	16:20
	→ Shentino2 joined	16:21
	← Shentino left	16:22
	← bronson left	16:23
	← adrian_1908 left	16:23
	lolmac → Guest50942	16:25
	← Guest50942 left	16:25
	→ tehtraveler2321 joined	16:25
	← rkazak left	16:26
	→ ahmedelgabri joined	16:27
	→ klear joined	16:28
	→ skelterjohn joined	16:29
	→ unbalancedparen joined	16:31
	← mikiones_ left	16:31
	← subhojit777 left	16:32
	→ mikiones joined	16:32
	→ knighthawk joined	16:33
	← grayjoc left	16:34
	→ safinaskar joined	16:36
	← safinaskar left	16:36
	→ safinaskar joined	16:36
safinaskar	how to get list of files handled by git?	16:36
	i want to pass them to "grep"	16:36
	grep some_string $(get_files_handled_by_git)	16:37
	i. e. because i don't want to search in generated files	16:37
	→ jaguarmagenta joined	16:37
	← Matthew_ left	16:38
_ikke_	safinaskar: git ls-files	16:39
	this lists files in the index	16:39
	← Shentino2 left	16:40
	→ Shentino joined	16:40
	→ grayjoc joined	16:41
	← doppo left	16:41
	← knighthawk left	16:44
	→ mar77i joined	16:44
	→ doppo joined	16:44
	→ subhojit777 joined	16:44
	← mar77i_ left	16:46
	→ lindenle_ joined	16:46
	→ thinkwork joined	16:47
	→ catsup joined	16:47
	→ dsfreak93 joined	16:48
	→ victortyau joined	16:50
	→ fedexo joined	16:51
	← thinkwork left	16:52
	← ariel_17 left	16:53
	← The_Phoenix left	16:53
	→ Vardon3 joined	16:53
	← dsfreak93 left	16:54
	← Vardon3 left	16:54
	→ cagmz_ joined	16:55
	→ thinsoldier joined	16:55
thinsoldier	Hello?	16:55
gitinfo	thinsoldier: 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:55
	→ Vardon3 joined	16:55
	← Vardon3 left	16:56
	→ Vardon3 joined	16:56
thinsoldier	Question Background: I have a volum mapped to a drive on a server half a world away. I can ssh into the server but not allowed to install anything so I can’t install git. However from my system I can navigate to that volume and do git stuff, it’s just really slow. I can also ftp into the sever and access the same volume.	16:57
	← dreiss left	16:57
	← PCatinean left	16:58
	→ thiago joined	16:58
thinsoldier	Question: Trying to get fetch/pull from the git repo on my local laptop over to the remote volume fails because it is so slow. Is there a way to manually upload an existing .git folder to the server and tell git “hey, look a the folder you are in, all the files exactly match your latest master commit! Cold you just recognize that fact and work!?”	16:58
	← dopesong left	16:58
	← jonno11 left	16:58
	→ ariel_17 joined	16:58
thinsoldier	Instead of it having to extract files from within the .git just use the files that are already in the folder on the server.	16:59
	← Vardon3 left	17:00
	→ Vardon3 joined	17:00
	← stevenbenner left	17:01
	← Cabanossi left	17:01
cbreak	thinsoldier: you're not making any sense	17:01
	git needs a repository	17:01
	← Vardon3 left	17:02
	← cagmz_ left	17:02
	→ yarnfive8 joined	17:02
	← doener left	17:02
thinsoldier	Ok, master repository is on my laptop. Child repo is on this other server. I want a git repo on that server to pull from my laptop. but it fails because initial fetch of ALL 100 megs of data over slow connection fails	17:02
	I can ftp into the server	17:03
	All the files already on the server already match the latest commit on my laptop	17:03
	Could I just upload my local .git folder to the server	17:03
cbreak	sure	17:03
	it doesn't matter how the repository is transfered	17:03
thinsoldier	and have it just work without git needing to pull all the data over the network?	17:03
ojacobson	in fact "copy all the files" is a good approximation of how the dumb transport works	17:03
	→ Cabanossi joined	17:03
cbreak	you can zip it, put it on an usb stick and send it via air mail	17:04
	if you want that, consider man git-bundle	17:04
gitinfo	the git-bundle manpage is available at http://jk.gs/git-bundle.html	17:04
cbreak	but simply sending the .git is also ok	17:04
thinsoldier	But I’d have to change the .git/config once its on that other server right ?	17:04
cbreak	if you want	17:04
thinsoldier	To point its remotes to my laptop	17:04
cbreak	sure. git remote set-url	17:05
thinsoldier	wheras the git on the lapop has its remots pointed to bitbucket	17:05
cbreak	you can have multiple remotes	17:05
	→ SteffanW joined	17:06
thinsoldier	Ok. that sounds like it’ll work for my latest attempt at this. I have a question about my very first attempth though.	17:06
	Originally there already was a .git on the server pointed at my laptop but it was about 40 commits behind.	17:06
	Trying to do a git pull always failed because of network issues.	17:07
	← boudiccas left	17:07
thinsoldier	Should the same solution be the best for that situation, just replace the entire .git via ftp. Because what I had tried earlier was just copy the .git/objects/ folder	17:07
	→ boudiccas joined	17:08
cbreak	your choice	17:08
	thinsoldier: you should fix your network issues	17:08
	thinsoldier: try to use the internet instead	17:08
	I regularly transmit data around half the world, works fine	17:08
	→ OnBrokenWings joined	17:08
	← mkoskar left	17:09
	→ jagob joined	17:09
thinsoldier	Network at the office where the server is located is garbage and the server itself is kind of garbage and under heavy load aside from what I’m trying to do.	17:09
	I’ll go try this. Thanks people	17:09
safinaskar	_ikke_: thanks	17:10
	← safinaskar left	17:11
	→ mizu_no_oto joined	17:11
	← mizu_no_oto left	17:11
	← p1k left	17:12
	→ mizu_no_oto joined	17:13
	← OnBrokenWings left	17:13
	→ shymega joined	17:14
	← boudiccas left	17:18
	← lindenle_ left	17:19
	→ lindenle joined	17:19
	→ vdv joined	17:20
	→ boudiccas joined	17:20
	→ PryMar56 joined	17:21
	← ahmedelgabri left	17:21
	→ stevenbenner joined	17:22
	← fuchstronaut left	17:23
	← ams_ left	17:23
	← SwiftMatt left	17:23
	→ kaiza joined	17:25
	→ dermoth joined	17:26
	→ cdg_ joined	17:29
	← lindenle left	17:30
	→ lindenle joined	17:31
	← cdg left	17:32
	← cdg_ left	17:33
	← mizu_no_oto left	17:34
	← shinnya left	17:34
	→ ahmedelgabri joined	17:35
	→ arooni joined	17:36
	← davisonio left	17:37
	→ CrypticGator joined	17:38
	→ mehola joined	17:40
	← sto0pkid left	17:40
	← arooni left	17:40
	← aswen left	17:41
	→ dreiss joined	17:42
	← xelxebar left	17:43
thinsoldier	How do I make git pull forcefully overwrite all files in the directory. All current files match a commit from 5 commits ago so I know I won’t lose anything.	17:43
	→ SwiftMatt joined	17:43
	← ncd\|leeN left	17:44
_ikke_	git pull is not the command you want	17:44
	→ knighthawk joined	17:44
_ikke_	thinsoldier: Do you want to match the files as they are on your remote?	17:45
thinsoldier	Yes	17:45
	← mdw left	17:46
_ikke_	Only the files, or also your local branch?	17:46
	→ fuchstronaut joined	17:47
thinsoldier	Not sure what you mean.	17:47
	Hang on. How can I check if my local master is tracking origin/master or not?	17:47
	→ Balliad joined	17:47
_ikke_	git branch -vv would show	17:48
	← reim left	17:48
thinsoldier	Thanks. ok my local master is tracking origin master.	17:49
	← doppo left	17:49
	← knighthawk left	17:49
_ikke_	And you want your master to point to origin/master	17:49
thinsoldier	I want to fast forward my local master to match the origin master but git checkout origin/master and git pull both complain about some of the files presently in the directory.	17:49
ronny	hi	17:49
	← circ-user-m8dfI left	17:50
thinsoldier	Yes I want master to point to origin/master	17:50
ronny	im on branch a, - it has a common ancestor with branch b, how do i figure the oldest commit of b thats not part of a	17:50
_ikke_	thinsoldier: git reset --hard to get rid of the local changes, then just git merge origin/master	17:50
	(you almost never want to use checkout origin/master)	17:51
	→ jaguarma_ joined	17:51
	→ doppo joined	17:52
ojacobson	ronny: the last commit of git log a..b will be one such commit	17:52
	there may be more than one	17:52
	← CrypticGator left	17:52
	← jaguarmagenta left	17:52
	→ groton joined	17:53
	→ siaw_ joined	17:54
	← siaw left	17:55
	siaw_ → siaw	17:55
	→ reim joined	17:56
	← acton left	17:56
	← grayjoc left	17:56
	→ xelxebar joined	17:56
	← Someguy123 left	17:57
ronny	ojacobson: is there a plumbing way, i have a branch i want to rebase step by step one commit on the target branch a time due to the conflict matrix of both lines being a mess to resolve all at ocne for the complete move	17:57
	→ cagmz_ joined	17:57
ojacobson	git rev-list, then	17:57
	→ mdw joined	17:58
	→ acton joined	17:58
	← elastix left	17:58
ronny	ojacobson: is it sensible to always ise the last object id given by that command=	17:58
ojacobson	that will be a commit whose immediate ancestor is in b, yes	17:59
	er, in a	18:00
	→ aro joined	18:00
aro	No submodule mapping found in .gitmodules for path 'app/vendor/dereuromark/cakephp-data' - why am i getting that when i try to commit to my repo?	18:00
ojacobson	(the output is ordered topographically by default)	18:00
	→ Someguy123 joined	18:01
ronny	ojacobson: so if i go for rev_list a..b --first-parent i should be able to get a line of rebase targets?	18:01
	← glebihan left	18:02
thinsoldier	When I SSH into a server it says: Could not chdir to home directory - which means I have no idea where to put .gitconfig and .gitignore_global files	18:02
	← mellernoia left	18:02
	← cagmz_ left	18:02
thinsoldier	I put a .bash_profile in the root directory and that gets loaded automatically but putting .gitconfig in the same place does noting	18:02
	Any ideas?	18:03
ronny	thinsoldier: more details on the server needed	18:03
thinsoldier	Mac OSX 10.6	18:03
	I have an account I can ssh in with, but if you looked at the actual mac os user settings in the GUI you’d see only 1 real user who had a real user folder who is not me	18:04
	→ rim-k joined	18:05
	→ mellernoia joined	18:06
	→ SuperflyR6 joined	18:07
	→ sangy joined	18:07
	→ njbair joined	18:08
	→ jaguarmagenta joined	18:08
	→ davisonio joined	18:09
	← jaguarma_ left	18:10
	← ffio left	18:10
	← rominronin left	18:10
ronny	thinsoldier: you migth need an admin setting it up then, it sounds like the box you ssh to is by design unusable	18:11
	→ MattMaker joined	18:11
ronny	(which in some cases is done deliberately for security policies or something like that, the admins in charge should know	18:11
	→ ffio joined	18:12
	→ mizu_no_oto joined	18:13
	← xlegoman left	18:14
	→ xlegoman_ joined	18:14
	→ icio joined	18:14
	→ knighthawk joined	18:14
	← Balliad left	18:14
	→ mr-bravo joined	18:14
ronny	hmm, i would like to see one target branch commit as a time rebase iteration be added to git rebase directly, the conflixts where considerably less complicated to resolve than my earlier attempt	18:16
	in the end after that run of repeated rebases i had a working branch and every conflict was solved simple	18:16
	→ OnBrokenWings joined	18:16
	← fuchstronaut left	18:16
	→ circ-user-m8dfI joined	18:17
	→ tvon joined	18:17
	→ deadnull joined	18:19
	← apprentice left	18:19
	→ arooni joined	18:19
	← SuperflyR6 left	18:20
cbreak	ronny: man git-for-each-ref	18:20
gitinfo	ronny: the git-for-each-ref manpage is available at http://jk.gs/git-for-each-ref.html	18:20
cbreak	hmm... no	18:20
	← unbalancedparen left	18:20
	→ bronson joined	18:20
cbreak	ronny: man git-rev-list	18:20
gitinfo	ronny: the git-rev-list manpage is available at http://jk.gs/git-rev-list.html	18:20
cbreak	that one, + reverse + some scripting	18:21
	→ unbalancedparen joined	18:21
	← unbalancedparen left	18:21
	→ JanC_ joined	18:22
	→ unbalancedparen joined	18:22
	← zarel left	18:22
	← JanC left	18:23
	← dreiss left	18:23
	← arooni left	18:23
	→ nevodka joined	18:25
	← bronson left	18:25
	← daynaskully left	18:25
	→ stantonk joined	18:27
	JanC_ → JanC	18:27
	← unbalancedparen left	18:28
	→ unbalancedparen joined	18:28
	→ ahmed_elgabri joined	18:28
	← Glooomy left	18:29
	→ daynaskully joined	18:31
	← cagmz left	18:31
	→ dreiss joined	18:31
	← ahmedelgabri left	18:31
	← stantonk left	18:31
	← unbalancedparen left	18:32
	→ unbalancedparen joined	18:32
	← mdw left	18:32
	→ glebihan joined	18:33
	→ zarel joined	18:34
	← nadare left	18:36
	← subhojit777 left	18:36
	← reim left	18:37
	← userx left	18:38
	← Jeroen left	18:39
	→ userx joined	18:40
	← knighthawk left	18:40
	← rim-k left	18:41
	← klear left	18:41
	→ reim joined	18:41
	→ tos9 joined	18:43
	→ arooni joined	18:44
	← Peng__ left	18:44
tos9	I want to list all of the tracked + untracked files in a directory in my repo in a way similar to ls. I appear to be out of luck on doing that "easily", which is fairly surprising.	18:44
ojacobson	That would be `ls`, wouldn't it?	18:45
	→ jaguarma_ joined	18:45
tos9	No, sorry, to the exclusion of ignored files	18:45
	Which it doesn't appear to be easy to list either.	18:45
	g ls-files is recursive by default, and doesn't appear to be able to be non-recursive.	18:45
	g ls-tree --name-only HEAD <dir> doesn't support untracked, although I could add those myself, but it has really weird behavior, providing foo is different from foo/ for dirs, the former is useless and basically acts like ls -d	18:46
	← mizu_no_oto left	18:46
	← jaguarmagenta left	18:47
	→ mdw joined	18:47
	← arooni left	18:48
osse	tos9: a combination of "ls-tree --name-only HEAD ." and "ls-files --others --exclude-standard -x '/'" seems to give the correct results	18:52
	← reim left	18:52
	→ mizu_no_oto joined	18:53
tos9	osse: I've tried those I think.	18:53
	osse: Which of those are you using to list a directory within the repo	18:53
osse	tos9: the first lists tracked files in the current dir; the second lists untracked files in the current dir	18:54
	← deadnull left	18:54
tos9	osse: Right, now I want to list arbitrary paths in the repo	18:54
	osse: The first one works for that, but only if I know that the path is a directory	18:54
osse	i don't know, then	18:55
	what do you want this for	18:55
	→ Balliad joined	18:55
tos9	I'm implementing ls :)	18:56
_ikke_	Why not use ls? :P	18:56
	You don't want ignored files, right	18:56
tos9	Yes.	18:57
	→ mike_r_ joined	18:57
	← mizu_no_oto left	18:58
	→ ncd\|leeN joined	18:58
	← Balliad left	19:00
	→ acetakwas joined	19:01
	→ _W_ joined	19:01
	← victortyau left	19:02
	→ rubie joined	19:02
	→ cryptopsy joined	19:02
	→ inflames joined	19:03
cryptopsy	how can i get a log of incoming files on the remote server when i push files with git?	19:03
	basically i get a list of changes when i run it locally, but i need a list of that on the remote file. Like, to show on my website what new files were received	19:03
	simulate it first and then push that file with the others?	19:03
osse	tos9, _ikke_: there was a proposed patch that added "git ls"	19:05
tos9	osse: That would have been nice -- do you happen to have a link to it or just remember it flying by?	19:06
	→ nwkj86 joined	19:07
	→ victortyau joined	19:07
	← OnBrokenWings left	19:07
osse	tos9: thread.gmane.org/gmane.comp.version-control.git/265142	19:07
	i think this is the latest iteration. not sure.	19:08
	← acetakwas left	19:08
tos9	cool, thanks	19:09
	← multi_io left	19:10
	→ Joanna___ joined	19:11
	→ multi_io joined	19:12
	→ reim joined	19:13
cryptopsy	fuck it lets simulate	19:14
	→ pwnawannab_ joined	19:14
	→ pwnawannab[NE] joined	19:14
	← dreiss left	19:16
	← tlaxkit left	19:16
	→ fuchstronaut joined	19:17
	← userx left	19:17
	← bollullera left	19:17
	← groton left	19:17
	← reim left	19:18
cryptopsy	how can i see 'git diff --stat --cached origin/master' dump to stdout instead of opening a prompt?	19:18
	← shum left	19:18
	← sanketdg left	19:19
	→ durham joined	19:19
	→ sdothum joined	19:19
	→ userx joined	19:20
	→ justanotheruser joined	19:22
	← fuchstronaut left	19:22
	← Shentino left	19:23
	← sdothum left	19:23
tobiasvl	cryptopsy: git config diff.tool	19:23
	→ johnny56 joined	19:24
	→ nilg joined	19:24
	→ knighthawk joined	19:24
	→ dreiss joined	19:24
	→ Xaratas joined	19:25
bremner	opening a prompt? git diff shouldn't do that	19:25
rudi_s	Hi. It seems git status runs the clean filter when I change the ctime of a file. Is it possible to tell git only to run the smudge filter when the mtime of a file has changed?	19:26
	← robotroll left	19:26
	← afuentes left	19:27
tobiasvl	bremner: less maybe?	19:27
	it has a : prompt at the bottom...	19:27
	→ sdothum joined	19:27
bremner	!nopager	19:27
	cryptopsy: if you're complaining about less, use the --no-pager option to git	19:28
	→ Shentino joined	19:29
	← mariuscc left	19:29
	← dreiss left	19:30
	← McNozes left	19:30
	→ Rodya_ joined	19:31
	← mr-bravo left	19:31
	→ Kobaz joined	19:34
	← knighthawk left	19:34
rudi_s	Ah, found it. core.trustctime = false seems to work fine.	19:35
	→ JagaJaga joined	19:36
	→ knighthawk joined	19:36
	← sdothum left	19:37
	→ flash joined	19:38
	← nnyk left	19:40
	← knighthawk left	19:40
	← doppo left	19:41
	→ sdothum joined	19:41
	← SteffanW left	19:41
	← Rodya_ left	19:44
	← SwiftMatt left	19:44
	→ justanot1eruser joined	19:45
	← justanotheruser left	19:45
	← Strout left	19:45
	← AustinMatherne left	19:45
	→ AustinMatherne joined	19:45
	→ Rodya_ joined	19:47
	→ doppo joined	19:47
	→ WaReZ joined	19:47
	← davisonio left	19:48
	→ CrypticGator joined	19:48
	← lindenle left	19:52
	→ dsfreak93 joined	19:53
	→ lindenle joined	19:53
	→ McNozes joined	19:54
	→ cdg joined	19:54
	→ mar77i_ joined	19:54
	← Rodya_ left	19:55
	→ Rodya_ joined	19:55
	→ felher joined	19:56
	→ felixjet_ joined	19:56
	→ Strout joined	19:56
	← mar77i left	19:56
	← felixjet_ left	19:56
	→ felixjet joined	19:57
	← irqq left	19:58
	← dsfreak93 left	19:58
	← sdothum left	19:58
	→ bollullera joined	19:59
	→ ciampix joined	19:59
	← toogley left	19:59
	← nilg left	20:00
	→ sdothum joined	20:00
	→ acetakwas joined	20:00
	→ reim joined	20:01
	→ duderonomy joined	20:01
	→ nnyk joined	20:02
	← icio left	20:02
	← nevodka left	20:02
	← Strout left	20:02
	→ toogley joined	20:03
	← AustinMatherne left	20:03
	← zmachine left	20:03
	→ irqq joined	20:03
ronny	cbreak: that is what i did	20:04
	← mar77i_ left	20:04
	→ mar77i joined	20:05
	→ AustinMatherne joined	20:05
	← staticshock left	20:05
	← sdothum left	20:05
	→ zmachine joined	20:06
	→ jaguarmagenta joined	20:06
	→ justanotheruser joined	20:06
	← jaguarma_ left	20:07
	← justanot1eruser left	20:07
	→ boombatower joined	20:09
	← Kobaz left	20:12
	→ sdothum joined	20:12
	← irqq left	20:12
	→ Balliad joined	20:12
	← acetakwas left	20:13
	← rubie left	20:14
	← TomyLobo left	20:14
	← Shentino left	20:15
	→ apotry joined	20:16
	→ SwiftMatt joined	20:16
	← sdothum left	20:16
	→ cagmz joined	20:17
	→ Strout joined	20:17
	← apotry left	20:18
	→ thebloggu joined	20:18
	← Jackneill left	20:18
	→ Kobaz joined	20:18
	← ahmed_elgabri left	20:19
	→ acetakwas joined	20:20
	→ Yarne joined	20:20
	→ dopesong joined	20:20
	← durham left	20:21
	← acetakwas left	20:21
	→ acetakwas joined	20:22
	← Balliad left	20:22
	→ bronson joined	20:22
	→ sdothum joined	20:22
	← acetakwas left	20:23
	→ acetakwas joined	20:24
	← flash left	20:25
	→ dreiss joined	20:25
	→ Chunky_Ks joined	20:26
	← bronson left	20:27
	→ durham joined	20:27
Chunky_Ks	Hey all. I have what I think is a pretty good mental model of how git works. I'm regretting some things I did before, and would like advise on how to remedy stuff. On github, I forked a project, messed about on a branch of the same name as the upstream project, and pushed it. I now realise I should have used a feature branch for that. How do I "just make this thing like upstream, except with the stuff I did on a branch" ? Or am I asking completely the wrong que	20:28
	← Kicer86 left	20:28
	→ justanot1eruser joined	20:29
	← texasmynsted left	20:29
	→ Shentino joined	20:29
	→ cagedwisdom joined	20:30
	justanot1eruser → yolandivisser	20:30
	← justanotheruser left	20:30
	← Shentino left	20:31
Zarthus	Chunky_Ks: Has your upstream already gotten the new changes on master?	20:31
	or the branch you rather not have it at, at least	20:31
	→ mar77i_ joined	20:31
Chunky_Ks	I put in a pull request, but upstream decided they wanted a different approach, so made a bunch of different changes	20:31
	→ fuchstronaut joined	20:31
Chunky_Ks	so my branch-named-v6.0b and their branch-named-v6.0b have now diverged and never the twain shall meet	20:32
	→ Shentino joined	20:32
	← mar77i_ left	20:32
	← nnyk left	20:32
	← Shentino left	20:32
	← sdothum left	20:33
Zarthus	if nothing has been changed yet in the branch you'd like to change (on upstream), you can just checkout to a different branch. But I'm not sure how many changes there are between the two branches you're talking about.	20:33
	← mar77i left	20:33
Zarthus	from what it sounds like their branch has been updated to some degree, and you believe syncing with those chances is no longer feasable?	20:33
Chunky_Ks	Well, it's partially infeasible and partly pointless	20:33
	← toogley left	20:34
Chunky_Ks	The feature I want is implemented, but in a different way that obviates the need for my changes	20:34
	→ Shentino joined	20:34
Chunky_Ks	https://github.com/chunky/openmap/tree/v6.0b <-- this specifically	20:34
	← dopesong left	20:34
	← Shentino left	20:35
	← thebloggu left	20:35
	→ sdothum joined	20:35
	← mischat left	20:35
Zarthus	so you want to clean your changes, sync up with the main branch, and work on something new?	20:36
	← fuchstronaut left	20:36
Chunky_Ks	Exactly.	20:36
	→ fuchstronaut joined	20:36
	← fuchstronaut left	20:36
	→ fuchstronaut joined	20:36
	→ Shentino joined	20:36
Zarthus	you can git reset --hard to a previous commit (with git log), and then sync with upstream. Force push to your main branch to override your existing changes	20:36
	you may wish to make a backup or checkout your existing changes to a different branch first.	20:37
	git reset --hard sha is a destructive command; so make sure you're okay with losing your progress.	20:37
	(although none of it will be lost for the moment because GitHub still has it, but that will be gone once you force push your syncing)	20:37
	→ ToBeCloud joined	20:38
	gitinfo set mode: +v	20:38
Chunky_Ks	I'm totally ok with vaporising everything I have done, on this project	20:38
	→ wutf joined	20:38
	← JagaJaga left	20:39
wutf	does git checkout mybranch ensure that only the files for the branch will exist?	20:39
	← mdw left	20:40
	← sdothum left	20:40
tobiasvl	wutf: well uncommited changes will !float over	20:40
gitinfo	wutf: 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.	20:40
	→ knighthawk joined	20:41
wutf	i have a jenkins job that builds branches. i'm wondering if i can just checkout new branches (without rm -fr'ing) and have the guarantee that only the files for that branch will be in there	20:41
	→ sdothum joined	20:41
	← durham left	20:42
wutf	it sounds like i can do this	20:42
tobiasvl	wutf: look at git checkout -f maybe?	20:42
	if what you want is to throw away local changes	20:42
	not entirely sure what kind of files that don't belong to the branch you're expecting in the working directory	20:42
	← satifant left	20:43
wutf	if a file exists in branch a but not b and you switch to branch b, the file won't be there right?	20:43
	that's the basic thing, i think	20:43
	← s00pcan_ left	20:44
	→ s00pcan_ joined	20:44
	→ flash joined	20:44
tobiasvl	correct	20:44
wutf	cool, that will save some time	20:45
	← dreiss left	20:45
	→ diego1 joined	20:45
	← knighthawk left	20:46
	diego1 → diegoviola	20:46
j416	wutf: unless you have uncommitted changes or ignored files	20:48
	→ Saylen joined	20:48
j416	as tobiasvl mentioned above. not sure if that was conveyed.	20:49
tobiasvl	ignored files don't exist in any branch though. but yes	20:50
	→ yolandiv1sser joined	20:51
	→ userx_ joined	20:52
	→ durham joined	20:52
	← userx left	20:52
	← yolandivisser left	20:53
	← victortyau left	20:56
	← vdv left	20:58
	← fuchstronaut left	20:58
	← phaleth left	20:58
	→ elastix joined	21:01
	← flash left	21:03
	← sdothum left	21:04
	→ victortyau joined	21:04
	← pantsman- left	21:05
	→ sdothum joined	21:05
	← sdothum left	21:06
	→ tomog999_ joined	21:07
	← ciampix left	21:08
	→ sdothum joined	21:09
	→ weox joined	21:09
	→ mizu_no_oto joined	21:10
	← tomog999 left	21:10
	← teresko left	21:10
	← CheckDavid left	21:12
	→ afuentes joined	21:13
	→ yolandivisser joined	21:14
	← yolandiv1sser left	21:14
	yolandivisser → justanotheruser	21:14
	← sdothum left	21:16
	← cagmz left	21:16
	← durham left	21:16
	→ cagmz joined	21:16
	→ staticshock joined	21:16
	→ Es0teric joined	21:18
	← userx_ left	21:18
	← CrypticGator left	21:23
	→ userx joined	21:23
	→ durham joined	21:23
	← justanotheruser left	21:24
	→ dreiss joined	21:25
	← acetakwas left	21:26
	← elastix left	21:26
	→ Noldorin joined	21:27
	← jmpp left	21:27
	← isxek left	21:27
	→ SuperflyR6 joined	21:28
	← SuperflyR6 left	21:28
	← emPi left	21:29
	→ jmpp joined	21:30
	→ tematibr joined	21:32
	← userx left	21:35
	← durham left	21:35
	→ kaendfinger joined	21:36
	→ mischat joined	21:38
	← thinsoldier left	21:38
	→ LoganG joined	21:38
	← kaendfinger left	21:39
	→ kaendfinger joined	21:39
	→ userx joined	21:40
	→ mischat_ joined	21:41
	→ fuchstronaut joined	21:42
	→ sdothum joined	21:42
	← mischat left	21:43
	→ stantonk joined	21:45
	→ msafi joined	21:45
	← victortyau left	21:45
	→ mischat joined	21:45
	← Joanna___ left	21:46
	← dreiss left	21:46
	← Rodya_ left	21:47
	← ferr left	21:47
	← aard_ left	21:47
	← msafi left	21:47
	← mischat_ left	21:47
	← fuchstronaut left	21:47
	← userx left	21:48
	→ userx joined	21:50
	← mizu_no_oto left	21:52
	→ raijin joined	21:53
	← sebhoss left	21:54
	← nwkj86 left	21:54
	← King_Hual left	21:55
	← userx left	21:55
	← KnownSyntax left	21:56
	← barduck left	21:57
	→ KnownSyntax joined	21:57
	→ userx joined	21:58
	← SwiftMatt left	21:58
	→ fragMental joined	22:05
	→ nevodka joined	22:05
	→ Rodya_ joined	22:05
	← Rodya_ left	22:06
	→ Rodya_ joined	22:06
	→ watabou_ joined	22:07
	← watabou_ left	22:08
	→ nwkj86 joined	22:09
	← Fissure left	22:09
	← watabou left	22:10
	← reim left	22:10
	← Gitzilla left	22:10
	→ przemoc joined	22:11
	← pld left	22:12
	← Fijit left	22:12
	← userx left	22:12
	← circ-user-m8dfI left	22:13
	→ reim joined	22:13
	→ userx joined	22:13
	← sdothum left	22:14
	→ watabou joined	22:14
	← Es0teric left	22:14
	→ sdothum joined	22:15
	← przemoc left	22:17
	→ przemoc joined	22:18
	← Rodya_ left	22:20
	← stantonk left	22:21
	→ stantonk joined	22:22
	← reim left	22:23
	← userx left	22:24
	→ bronson joined	22:24
	← Dyonisos left	22:27
	← bollullera left	22:27
	→ userx joined	22:27
	← bronson left	22:29
	→ Fissure1 joined	22:29
	← Guest59517 left	22:31
	→ Guest59517 joined	22:31
	Guest59517 → nuck	22:31
	← cryptopsy left	22:31
	← tematibr left	22:31
wutf	does git checkout also invoke pull?	22:32
	ie if you checkout a branch you are already in, will it pull or is it a no-op?	22:32
cbreak	wutf: nope	22:32
	checkout is local only	22:32
wutf	ah	22:33
	← albioner left	22:34
	→ _wwwBukoLaycom joined	22:34
	← stantonk left	22:35
	→ SwiftMatt joined	22:35
	→ Jeroen joined	22:36
	← Xaratas left	22:36
	← userx left	22:37
	← cagmz left	22:37
	→ diego1 joined	22:38
	← diego1 left	22:38
	→ diego1 joined	22:38
	diegoviola → Guest65114	22:38
	diego1 → diegoviola	22:38
	→ rbr joined	22:38
	→ bronson joined	22:38
	← bronson left	22:40
	← dm7freek left	22:40
	← Guest65114 left	22:41
	→ userx joined	22:41
	→ choki joined	22:43
	→ fuchstronaut joined	22:43
	← tristanp left	22:45
	← _wwwBukoLaycom left	22:45
	→ tematibr joined	22:46
	← MattMaker left	22:47
	→ st0opkid joined	22:48
	← fuchstronaut left	22:49
	→ rkazak joined	22:50
	← st0opkid left	22:50
	← nevodka left	22:51
	→ st0opkid joined	22:51
	← rh775 left	22:51
	← st0opkid left	22:52
	→ st0opkid joined	22:52
	← userx left	22:53
	← st0opkid left	22:53
	→ st0opkid joined	22:54
	← Noldorin left	22:54
	→ userx joined	22:56
	→ ajf- joined	22:57
	← choki left	22:58
	→ jeffreylevesque joined	22:58
	← s00pcan_ left	23:00
	← nwkj86 left	23:01
	← diegoviola left	23:02
	→ diegoviola joined	23:02
	→ s00pcan_ joined	23:03
	→ voice_of_me joined	23:05
	→ Gamecubic joined	23:05
	→ mizu_no_oto joined	23:07
	← WaReZ left	23:08
	← noteness left	23:08
	→ livingstn joined	23:11
	← ajf- left	23:12
	← userx left	23:12
	← livingstn left	23:12
	← lindenle left	23:13
	→ thinkwork joined	23:13
	→ lindenle joined	23:13
	→ userx joined	23:13
	← thinkwork left	23:13
	→ thinsoldier joined	23:14
	← ffabi left	23:15
	→ noteness joined	23:15
	→ texasmynsted joined	23:16
	← KnownSyntax left	23:16
	← diegoviola left	23:16
	→ diegoviola joined	23:16
	← s00pcan_ left	23:16
	→ jaguarma_ joined	23:16
	→ KnownSyntax joined	23:17
	← mizu_no_oto left	23:17
	→ theskillwithin joined	23:18
	→ s00pcan_ joined	23:18
	→ ffabi joined	23:19
	← jaguarmagenta left	23:19
	→ postsneakernet joined	23:19
	← mischat left	23:19
	→ CrypticGator joined	23:19
	→ Rodya_ joined	23:20
	→ ensyde joined	23:22
	← noteness left	23:22
	→ ajf- joined	23:23
	← weox left	23:24
	← userx left	23:24
	← Rodya_ left	23:25
	← voice_of_me left	23:25
	← ajf- left	23:26
	← jbitdrop left	23:26
	→ Rodya_ joined	23:29
	→ noteness joined	23:29
	→ userx joined	23:30
	← cdg left	23:31
	← SporkWitch left	23:31
	→ livingstn joined	23:32
	← SonikBoom left	23:33
	← thinsoldier left	23:34
	← noteness left	23:36
	← lindenle left	23:36
	← timvisher left	23:36
	→ lindenle joined	23:37
	→ timvisher joined	23:37
	→ mwhooker joined	23:37
	→ Noldorin joined	23:38
	← st0opkid left	23:39
	→ st0opkid joined	23:40
	→ bronson joined	23:40
	→ dm7freek joined	23:41
	← ToBeCloud left	23:43
	← bronson left	23:45
	→ noteness joined	23:46
	→ MattMaker joined	23:48
	← mattfoo left	23:48
	← userx left	23:48
	→ kugel joined	23:49
	→ userx joined	23:50
	→ Gitzilla joined	23:51
	→ mattfoo joined	23:52
	← mwhooker left	23:52
	← MattMaker left	23:53
	← staticshock left	23:54
	← zarel left	23:54
	← SwiftMatt left	23:54
	← rbr left	23:54
	← harish left	23:55
	← afuentes left	23:58
	→ rbern joined	23:58
	← fstd left	23:59
	← userx left	23:59

Logs Search ←Prev date Next date→

Channels Documentation