IRCloggy #git 2017-10-22

Provider of IRC logs since 2005.

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

	2017-10-22
	← kozy left	00:00
	← goksinen left	00:00
	← fstd left	00:00
	← asphyxia left	00:00
	→ fstd joined	00:01
	← upperdeck left	00:01
	→ upperdeck joined	00:02
	← ofimaagha left	00:03
	← bc86 left	00:04
	→ IRPG joined	00:05
	← upperdeck left	00:06
	→ upperdeck joined	00:08
	→ dreiss joined	00:08
	→ fstd_ joined	00:08
	← valize left	00:09
	← blackmesa left	00:10
	← Munt left	00:11
	← fstd left	00:12
	→ tymczenko joined	00:12
	← upperdeck left	00:12
	← IRPG left	00:12
	→ upperdeck joined	00:14
	← orbyt_ left	00:15
	→ gotcha joined	00:19
	→ bc86 joined	00:20
	← dreiss left	00:21
	← wootehfoot left	00:21
	→ matsaman joined	00:21
	← Puffball_ left	00:25
	← upperdeck left	00:25
	→ goksinen joined	00:25
	← mikecmpbll left	00:25
	← jcbitter left	00:26
	→ upperdeck joined	00:26
	→ Puffball joined	00:27
	→ Munt joined	00:27
	→ steeze joined	00:28
	→ SwiftMatt joined	00:29
	→ azerus joined	00:29
	← steeze left	00:29
	← goksinen left	00:29
	→ mikecmpbll joined	00:30
	← cagedwisdom left	00:30
	i7c → i7c[	00:31
	→ goksinen joined	00:32
	→ venmx joined	00:32
	← xaxxon left	00:35
	← upperdeck left	00:35
	→ xaxxon joined	00:35
	← xaxxon left	00:36
	→ jcbitter joined	00:36
	← goksinen left	00:36
	→ xaxxon joined	00:36
	i7c[ → i7c	00:36
	→ upperdeck joined	00:36
	→ maheshpec joined	00:40
	← upperdeck left	00:41
	→ cagedwisdom joined	00:42
	→ upperdeck joined	00:42
	→ m0viefreak joined	00:43
	→ goksinen joined	00:44
	→ orbyt_ joined	00:45
	← upperdeck left	00:47
	← goksinen left	00:48
	→ peterbecich joined	00:49
	→ upperdeck joined	00:49
	→ asphyxia joined	00:50
	← rafasc left	00:50
	← overlord_tm left	00:53
	← asphyxia left	00:55
	← scientes left	00:58
	→ meadmoon joined	00:58
	← netj left	01:01
	← upperdeck left	01:01
	→ netj joined	01:01
	→ goksinen joined	01:02
	→ upperdeck joined	01:02
	← white_knight left	01:02
	← upperdeck left	01:07
	← goksinen left	01:07
	← j08nY left	01:09
	→ shinnya joined	01:09
	→ upperdeck joined	01:09
	← meadmoon left	01:13
	← upperdeck left	01:14
	→ goksinen joined	01:15
	← jstein left	01:16
	→ finalbeta joined	01:16
	→ dre_ joined	01:16
	→ h12o joined	01:16
	→ upperdeck joined	01:17
	← QualityAddict left	01:19
	← drodger left	01:19
	← goksinen left	01:20
	← h12o left	01:21
	← upperdeck left	01:22
	← Solvaring left	01:22
	→ gugah joined	01:22
	→ upperdeck joined	01:22
	← Murr left	01:22
	← fjasle left	01:23
	→ Murr joined	01:23
	→ fjasle joined	01:24
	→ drodger joined	01:25
	→ goksinen joined	01:27
	← d^sh left	01:30
	← Munt left	01:30
	→ gopar joined	01:30
	← demego left	01:31
	→ d^sh joined	01:31
	← dviola left	01:31
	← goksinen left	01:32
	← sunri5e left	01:33
	← upperdeck left	01:34
	→ upperdeck joined	01:35
	← upperdeck left	01:40
	← bc86 left	01:40
	→ upperdeck joined	01:41
	← zenirc369 left	01:41
	→ sunri5e joined	01:42
	← ShekharReddy left	01:43
	→ asphyxia joined	01:44
	← ilbot3 left	01:45
	→ goksinen joined	01:46
	← upperdeck left	01:47
	→ upperdeck joined	01:48
	← asphyxia left	01:49
	← goksinen left	01:50
	← MACscr left	01:51
	→ MACscr joined	01:53
	← gopar left	01:55
	→ ilbot3 joined	01:56
	→ neel joined	01:58
	← m0viefreak left	02:02
	→ FrostyBytes joined	02:02
FrostyBytes	is it possible to have several checkouts open on top of the same git "filesystem"? like have one set of .git objects but check out two different tags at the same time (in different directories I guess)	02:02
	?	02:02
	→ goksinen joined	02:04
	→ sammyo joined	02:07
	→ lagothrix joined	02:09
	McKraken → McKraken_zzzzz	02:09
	→ jason237 joined	02:09
	← jcbitter left	02:10
	← lagothri1 left	02:11
	← upperdeck left	02:12
	← goksinen left	02:12
	← matsaman left	02:14
	← Gustavo6046 left	02:14
	→ upperdeck joined	02:14
nedbat	FrostyBytes: look up the "worktree" feature: https://git-scm.com/docs/git-worktree	02:15
	→ goksinen joined	02:15
	→ zenirc369 joined	02:16
	← drodger left	02:16
	→ scientes joined	02:16
	McKraken_zzzzz → McKraken	02:16
	← spriz left	02:20
	← goksinen left	02:20
	← tunekey left	02:20
	→ chachasmooth_ joined	02:21
	→ drodger joined	02:21
	← chachasmooth left	02:22
	→ spriz joined	02:28
	← clickjack left	02:30
	→ goksinen joined	02:32
	← upperdeck left	02:36
	← maheshpec left	02:37
	← goksinen left	02:37
	→ white_knight joined	02:37
	white_knight → olat	02:37
	→ asphyxia joined	02:38
	→ upperdeck joined	02:38
	← tymczenko left	02:41
	← asphyxia left	02:43
	← lb1c left	02:44
	→ lb1c joined	02:44
	→ goksinen joined	02:45
	← kasual left	02:45
	← bigjazzsound left	02:48
	→ bigjazzsound joined	02:49
	← scientes left	02:49
	← goksinen left	02:50
	← zenirc369 left	02:51
	← upperdeck left	02:53
	← luckman212 left	02:53
	→ upperdeck joined	02:54
	→ fstd joined	02:54
	→ goksinen joined	02:55
	← fstd_ left	02:58
	← goksinen left	03:00
	→ matsaman joined	03:00
	← pks left	03:02
	← cdown left	03:04
	→ pks joined	03:04
	→ goksinen joined	03:08
	← upperdeck left	03:11
	← goksinen left	03:12
	→ upperdeck joined	03:13
	→ luckman212 joined	03:16
	← peterbecich left	03:17
	← Brando753-o_O_o left	03:24
	→ goksinen joined	03:28
	→ bambs joined	03:28
	← neel left	03:29
	→ neel joined	03:29
	← neel left	03:30
	→ str joined	03:30
	← yohnnyjoe left	03:30
	→ neel joined	03:30
	← bambs left	03:31
	→ asphyxia joined	03:32
	← Soni left	03:32
	← goksinen left	03:32
	← upperdeck left	03:33
	→ yohnnyjoe joined	03:35
	→ h12o joined	03:35
	→ upperdeck joined	03:36
	← asphyxia left	03:37
	← SwiftMatt left	03:37
	← Cabanossi left	03:39
	→ Cabanossi joined	03:40
	← upperdeck left	03:43
	→ upperdeck joined	03:44
	← matoro left	03:44
	→ matoro_ joined	03:44
	← yohnnyjoe left	03:47
	→ goksinen joined	03:47
	→ Mattiaslndstrm joined	03:49
	← goksinen left	03:52
	→ peterbecich joined	03:54
	← Mattiaslndstrm left	03:54
	← luckman212 left	03:57
	→ Mattiaslndstrm joined	03:58
	McKraken → McKraken_zzzzz	03:58
	← upperdeck left	03:59
	→ upperdeck joined	04:01
	← Mattiaslndstrm left	04:03
	→ Solvaring joined	04:06
	→ goksinen joined	04:07
	← safe left	04:08
	→ luckman212 joined	04:09
	→ Mattiaslndstrm joined	04:10
	← dre_ left	04:10
	← goksinen left	04:12
	← str left	04:12
	← luckman212 left	04:13
	→ luckman212 joined	04:18
	← upperdeck left	04:19
	→ upperdeck joined	04:22
	← gugah left	04:22
	← luckman212 left	04:22
	← Cabanossi left	04:23
matsaman	jim: hey, you	04:24
	jim: wtf?	04:24
	→ goksinen joined	04:25
	→ Cabanossi joined	04:25
	→ asphyxia joined	04:26
	→ luckman212 joined	04:27
	← goksinen left	04:30
	← asphyxia left	04:31
	→ quamtumslash joined	04:32
	← quamtumslash left	04:32
	→ quamtumslash joined	04:35
	← xaxxon left	04:38
	→ goksinen joined	04:40
	→ steeze joined	04:41
	← goksinen left	04:44
	→ govg joined	04:44
	← h12o left	04:44
	→ iamyask joined	04:44
	← Mattiaslndstrm left	04:48
	← matsaman left	04:50
	← quamtumslash left	04:51
	→ quamtumslash joined	04:51
	→ whyme joined	04:51
	← jfelchner left	04:54
	→ goksinen joined	04:55
	← whyme left	04:56
	→ whyme joined	04:57
	← quamtumslash left	04:58
	← Gurkenglas left	04:59
	← goksinen left	05:00
	→ quamtumslash joined	05:02
	→ goksinen joined	05:06
	← steeze left	05:07
	← quamtumslash left	05:08
	← boombatower left	05:10
	← goksinen left	05:10
	← upperdeck left	05:10
	← orbyt_ left	05:11
	→ upperdeck joined	05:12
	← piremi left	05:15
	← TinkerTyper left	05:17
	→ xaxxon joined	05:19
	→ TinkerTyper joined	05:19
	← jaggz left	05:19
	→ asphyxia joined	05:20
	→ jstimm joined	05:21
	← re1 left	05:21
	→ goksinen joined	05:23
	← Cabanossi left	05:24
	← asphyxia left	05:25
	→ Cabanossi joined	05:25
	→ jaggz_ joined	05:26
	→ virajturakhia joined	05:28
	← goksinen left	05:28
	← YuGiOhJCJ left	05:29
	→ YuGiOhJCJ joined	05:30
	← virajturakhia left	05:30
	→ jfelchner joined	05:32
	→ miki joined	05:33
	→ piremi joined	05:33
	miki → Guest28520	05:34
	→ goksinen joined	05:34
	← Guest28520 left	05:34
	→ _ng joined	05:34
	→ quamtumslash joined	05:37
	← goksinen left	05:38
	→ dreiss joined	05:39
	→ goksinen joined	05:51
	← quamtumslash left	05:52
	← Cabanossi left	05:55
	→ Cabanossi joined	05:55
	← goksinen left	05:56
	→ Murii\|osx joined	05:58
	→ goksinen joined	06:00
	← peterbecich left	06:00
	→ nd joined	06:02
	← nd- left	06:04
	→ nd- joined	06:04
	← luckman212 left	06:04
	→ clickjack joined	06:06
	← sns left	06:06
	← goksinen left	06:06
	← nd left	06:07
	← rt left	06:07
	→ sns joined	06:08
	→ rt joined	06:09
	→ dre_ joined	06:10
	→ luckman212 joined	06:11
	← d1b left	06:11
	→ d1b joined	06:14
	→ asphyxia joined	06:14
	← thinkpad left	06:15
	→ jcbitter joined	06:18
	← asphyxia left	06:19
	← dreiss left	06:19
	→ cdown joined	06:20
	→ robotroll joined	06:21
	→ goksinen joined	06:21
	jaggz_ → jaggz	06:22
	← Cabanossi left	06:24
	→ Cabanossi joined	06:26
	→ demego joined	06:26
	→ King_Hual joined	06:26
	← goksinen left	06:26
	← kfoonamalik left	06:30
	← ozcanesen left	06:30
	← kfoonama2ik left	06:30
	← kfoonama1ik left	06:30
	→ goksinen joined	06:32
	← goksinen left	06:37
	← mikecmpbll left	06:37
	← ZexaronS left	06:38
	→ ZexaronS joined	06:43
	→ goksinen joined	06:44
	← cdown left	06:44
	← ZexaronS left	06:44
	← chakra left	06:44
	← thiago left	06:46
	→ goksinen_ joined	06:47
	→ ZexaronS joined	06:47
	← goksinen left	06:48
	→ mattheweigand joined	06:49
	← goksinen_ left	06:51
	→ goksinen joined	06:52
	← mattheweigand left	06:53
	→ mattheweigand joined	06:55
	→ thinkpad joined	06:55
	← goksinen left	06:56
	→ d5sx43 joined	06:59
	→ schleppel joined	07:00
	← d5sx43 left	07:01
	← jfelchner left	07:02
	→ goksinen joined	07:07
	→ whyme1 joined	07:07
	→ asphyxia joined	07:08
	← thinkpad left	07:09
	← whyme left	07:10
	→ thinkpad joined	07:10
	← goksinen left	07:11
	→ quamtumslash joined	07:11
	← asphyxia left	07:13
	→ umundhe joined	07:17
	→ goksinen joined	07:20
	← Murr left	07:22
	→ Murr joined	07:23
	→ imack joined	07:23
	← imack left	07:24
	← goksinen left	07:24
	→ imack joined	07:25
	← imack left	07:25
	← drodger left	07:26
	→ imack joined	07:26
	← styx_ left	07:27
	← imack left	07:27
	→ styx_ joined	07:27
	← _ng left	07:27
	← umundhe left	07:28
	→ imack joined	07:28
	← neunon left	07:29
	→ neunon joined	07:31
	→ drodger joined	07:32
	← tango_ left	07:33
	← YuGiOhJCJ left	07:33
	← mattheweigand left	07:35
	← a3Dman left	07:35
	→ a3Dman joined	07:35
	← a3Dman left	07:35
	→ a3Dman joined	07:35
	→ mattheweigand joined	07:35
	→ YuGiOhJCJ joined	07:35
	→ goksinen joined	07:35
	→ dege joined	07:39
	→ opalepatrick joined	07:43
	← goksinen left	07:44
	← neel left	07:45
	← diogenese left	07:45
	→ diogenese joined	07:46
	← ZexaronS left	07:49
	← Lyqyd left	07:50
	← dave0x6d left	07:52
	← [Kid] left	07:54
	← Kidd left	07:55
	→ goksinen joined	07:55
	← goksinen left	08:00
	→ jfelchner joined	08:00
	→ asphyxia joined	08:02
	→ saedelaere joined	08:03
	→ ZexaronS joined	08:04
	← venmx left	08:05
	→ disperso joined	08:07
	← asphyxia left	08:08
	→ gtristan joined	08:09
gtristan	so the one thing I _always_ forget (and consequently try to avoid)... is how to resolve conflicts on `git stash pop`	08:10
	← quamtumslash left	08:10
	→ suy joined	08:10
selckin	'git meregetool'	08:11
gtristan	What I want for the given file, is to discard local changes and prefer the stash, and not create a commit	08:11
suy	Hi! I often end up doing 'git rebase -i`git merge-base HEAD master`' to amend the commits of a feature branch. Besides an alias, is there some shorter way to do this?	08:11
	← disperso left	08:11
	← robotroll left	08:11
	← saedelaere left	08:12
	→ saedelaere joined	08:12
gtristan	"The merge tool bc is not available as 'bcompare'"	08:12
	hrmmm, rather something brute force and not mergy anyway would be best	08:12
	→ ZexaronS-2 joined	08:12
gtristan	first, how can I back myself out of the unmerged state caused by `git stash pop` ?	08:13
selckin	install kdiff3 or the gnome one	08:13
	→ goksinen joined	08:13
gtristan	graphic UI ?	08:13
	ehhh	08:13
selckin	yes	08:13
	← saedelaere left	08:13
	→ saedelaere joined	08:14
gtristan	anything I can do without a GUI ?	08:14
	← ZexaronS left	08:14
selckin	they are insanely good to solve conflicts, you'll never go back, you can just checkout --theirs or --ours i believet to throw away one side	08:15
	→ Gurkenglas joined	08:15
	← madewokherd left	08:16
gtristan	ok so, checkout --theirs works, but now that I'm not in a regular merge (i.e. weird stash pop thing)... How do I `git stash pop --continue` ?	08:17
	So I can continue applying the stash after having solved that ?	08:17
	← saedelaere left	08:18
selckin	you remove the stash, or directly apply the one before it	08:18
	← goksinen left	08:18
selckin	they dn't get removed if they conflict	08:18
gtristan	ok so there was a conflict... so git stash aborted and the stash is still on the stack ?	08:18
selckin	yes git stash list	08:19
gtristan	Mhm, now if I `git pop stash` again, it will just conflict again ?	08:19
selckin	it will be the same stash	08:19
gtristan	eek, now it doesnt do the conflict, but says "needs merge"	08:19
	So the local state is changed after having done checkout --theirs	08:20
	But, git will desire so so so much to create a commit	08:20
	Which is exactly what I dont want :)	08:20
	← King_Hual left	08:20
	← upperdeck left	08:22
selckin	what does status say	08:22
	← Gurkenglas left	08:23
	→ blackmesa joined	08:24
selckin	think i always do git reset HEAD . after to unstage after	08:24
	→ upperdeck joined	08:25
	→ goksinen joined	08:25
	→ robinb joined	08:26
selckin	then git stash pop to remove the stash if you're sure	08:27
	rop	08:27
	*drop	08:27
	→ valize joined	08:28
	← energizer left	08:29
	← goksinen left	08:29
	← robinb left	08:31
	← jcbitter left	08:33
	Calinou → CALINOU	08:35
	→ simka_ joined	08:35
	→ Phylock joined	08:36
	→ goksinen joined	08:42
	← robin left	08:43
	← ki0_ left	08:43
	→ robin joined	08:43
	→ ki0_ joined	08:44
	← ZexaronS-2 left	08:44
	→ asphyxia joined	08:46
	← goksinen left	08:47
	→ simka joined	08:49
	whyme1 → whyme	08:52
	→ ZexaronS joined	08:52
	← Murii\|osx left	08:53
	→ goksinen joined	08:55
	← leah2 left	08:57
	← goksinen left	09:00
	→ SteffanW joined	09:00
	→ venmx joined	09:01
	← lupine left	09:03
	← aspiers left	09:03
	→ j08nY joined	09:04
	← iamyask left	09:04
	→ aspiers joined	09:04
	→ lupine joined	09:05
	← SteffanW left	09:07
	← nedbat left	09:07
	→ nedbat joined	09:08
	→ leah2 joined	09:10
	→ goksinen joined	09:13
	← simka left	09:14
	→ simka joined	09:14
	← goksinen left	09:18
	← Murr left	09:23
	→ Murr joined	09:23
	→ Tobbi joined	09:24
	→ tango_ joined	09:24
	← Cabanossi left	09:25
	→ h12o joined	09:25
	→ Cabanossi joined	09:26
	→ robotroll joined	09:27
	→ wootehfoot joined	09:27
	← dege left	09:28
	← simka_ left	09:28
	← h12o left	09:30
	← YuGiOhJCJ left	09:31
	← rkta left	09:31
	→ YuGiOhJCJ2 joined	09:31
	→ tmm88 joined	09:32
	← tmm88 left	09:32
	→ tmm88 joined	09:32
	← robotroll left	09:37
	→ rkta joined	09:37
	← tmm88 left	09:43
	← simka left	09:44
	→ simka joined	09:44
	← simka left	09:48
	→ simka joined	09:48
	→ jceb joined	09:54
	← jfelchner left	09:58
	← rkta left	10:00
	→ jungsubk joined	10:03
	→ mikecmpbll joined	10:03
	← asphyxia left	10:05
	→ rkta joined	10:05
	← catsup left	10:06
	← karelk left	10:06
	→ catsup joined	10:06
	→ h12o joined	10:06
	← catsup left	10:07
	→ catsup joined	10:08
	→ quamtumslash joined	10:09
	← h12o left	10:11
	→ str joined	10:17
	← quamtumslash left	10:21
	← ki0_ left	10:21
	→ asphyxia joined	10:22
	→ ki0 joined	10:22
	← ki0 left	10:22
	→ ki0 joined	10:23
	→ tmm88 joined	10:23
	← tmm88 left	10:23
	→ tmm88 joined	10:23
	→ SkyPatrol joined	10:26
	→ re1 joined	10:26
	← mda1 left	10:28
	← Solvaring left	10:33
	← blackmesa left	10:33
	→ nisseni joined	10:34
	→ Gurkenglas joined	10:34
	← nisseni left	10:40
	← thesquib left	10:42
	→ tarkus joined	10:43
	→ Murii\|osx joined	10:49
	← sarri left	10:49
	→ thesquib joined	10:50
	→ gloomy joined	10:52
gloomy	Hello :)	10:52
	I just noticed that I committed and pushed quite a lot of commit with a wrong email adress	10:52
	(on github)	10:52
	Is there a way to automatically fix ? I changed the setting locally so it's fine for future commits, but the ones on github haven't changed	10:53
	← jungsubk left	10:53
	→ fatihgenc joined	10:53
Seveas	gloomy: I don't think you'll be surprised that this is an FAQ. The answer is documented here: https://help.github.com/articles/changing-author-info/	10:54
_ikke_	gloomy: there is a way, but it involves rewriting history, which may be painful for other who already cloned your repo and worked on it	10:54
	→ wuseman joined	10:54
gloomy	Hmm, thanks for the link Seveas	10:55
	Alright, will do it when my coworkers are there so we don't end up in some rebasing nightmare	10:56
	thanks :)	10:56
Seveas	gloomy: if it's too much of a pain to change, have a look at mailmap to map the wrong address to the correct one in things like 'git log'	10:57
	← tango_ left	10:57
	→ Nizumzen joined	10:58
	→ tango_ joined	10:58
gloomy	Ok thanks :)	10:58
	← rkta left	10:59
	← nick123 left	11:00
	→ Soni joined	11:01
	→ rkta joined	11:04
	← albel727 left	11:05
	→ bc86 joined	11:07
	← jceb left	11:09
	→ albel727 joined	11:11
	← rkta left	11:14
	eb0t_ → eb0t	11:15
	→ human joined	11:16
	→ scorpiosec joined	11:16
	← human left	11:18
	→ nick123 joined	11:19
	→ rkta joined	11:19
	← Murr left	11:23
	→ Murr joined	11:23
	← rkta left	11:29
	→ robotroll joined	11:30
	← netj left	11:31
	→ netj joined	11:31
	← Tobbi left	11:33
	→ rkta joined	11:35
	← str left	11:36
	→ tunekey joined	11:37
	← scorpiosec left	11:38
	→ scorpiosec joined	11:39
	← asphyxia left	11:39
	← upperdeck left	11:43
	→ upperdeck joined	11:43
	→ asphyxia joined	11:44
	← rkta left	11:44
	← tombusby left	11:44
	→ Grun6 joined	11:47
	← re1 left	11:48
	← asphyxia left	11:49
	→ tombusby joined	11:49
	→ rkta joined	11:50
	→ valtih2 joined	11:51
	→ btree joined	11:51
	← Grun6 left	11:51
	← btree left	11:51
	→ highkix joined	11:52
	→ m0viefreak joined	11:54
	→ cdown joined	11:54
	← Cabanossi left	11:55
	→ Cabanossi joined	11:55
	← cdown left	11:55
	→ cdown joined	11:56
	→ cdown_ joined	11:58
	→ beastd joined	11:58
	← rkta left	12:00
	← cdown left	12:00
	cdown_ → cdown	12:00
	← beastd left	12:00
	→ rkta joined	12:05
	← vamiry left	12:07
	← wootehfoot left	12:07
	← shiva__ left	12:07
	← pbrewczynski left	12:07
	← j08nY left	12:09
	→ jceb joined	12:13
	→ in1t3r joined	12:14
	→ in1t3r_ joined	12:16
	← upperdeck left	12:17
	→ wootehfoot joined	12:17
	← m0viefreak left	12:18
	→ upperdeck joined	12:18
	← in1t3r left	12:19
	← xaxxon left	12:19
	→ vamiry joined	12:19
	→ overlord_tm joined	12:20
	→ elbeardmorez joined	12:22
	→ re1 joined	12:24
	← netj left	12:26
	→ netj joined	12:26
	→ opal joined	12:28
	→ diqidoq joined	12:28
	→ Tobbi joined	12:35
	→ quamtumslash joined	12:36
	← scorpiosec left	12:39
	← jceb left	12:41
	← rkta left	12:41
	→ rkta joined	12:47
	→ jnavila joined	12:51
	← quamtumslash left	12:53
	→ CheckDavid joined	12:54
	← YuGiOhJCJ2 left	12:55
	← highkix left	12:56
	← rkta left	12:56
	→ YuGiOhJCJ2 joined	12:57
	← cdown left	12:58
	← sparetire left	12:59
	→ rafasc joined	13:01
	→ Bhootrk_ joined	13:01
	→ sparetire joined	13:01
	← Bhootrk_ left	13:01
	→ rkta joined	13:02
	← gtristan left	13:02
	→ gtristan joined	13:05
	← Cabanossi left	13:08
	→ vetch joined	13:09
	→ Cabanossi joined	13:10
	← rkta left	13:11
	→ thecrooked joined	13:12
	← manuelschneid3r left	13:14
	→ blackmesa joined	13:14
	→ phluks joined	13:15
	→ jstein_ joined	13:15
	jstein_ → jstein	13:15
	← disi left	13:16
	→ rkta joined	13:17
	→ disi joined	13:19
	← thecrooked left	13:23
	→ ZenWalker joined	13:24
	← sparetire left	13:24
	← rkta left	13:26
	← SpeakerToMeat left	13:26
	→ rkta joined	13:27
	← duderonomy left	13:27
	← tarkus left	13:28
	← clickjack left	13:32
	noteness_ → noteness	13:33
	← jnavila left	13:37
	← dre_ left	13:37
	← tombusby left	13:39
	← Nizumzen left	13:39
	→ tombusby joined	13:40
	→ Gustavo6046 joined	13:42
	→ clickjack joined	13:42
	← Gustavo6046 left	13:42
	→ Gustavo6046 joined	13:43
	→ cdown joined	13:43
	→ cdown_ joined	13:46
	← blackmesa left	13:46
	→ jnavila joined	13:47
	← cdown left	13:48
	cdown_ → cdown	13:48
	← bc86 left	13:49
	→ SteffanW joined	13:50
	→ jimsio joined	13:50
	← SteffanW left	13:51
	→ SpeakerToMeat joined	13:54
	← jimsio left	13:55
	→ yohnnyjoe joined	13:55
	← Tobbi left	13:56
	← rkta left	13:58
	→ blackmesa joined	13:58
	← tmm88 left	13:59
	← fatihgenc left	14:00
	← govg left	14:03
	→ rkta joined	14:03
	← Gustavo6046 left	14:03
	← overlord_tm left	14:04
	← Cabanossi left	14:09
	← koell left	14:09
	→ Cabanossi joined	14:10
	→ sparetire joined	14:11
	← valtih2 left	14:14
	← shinnya left	14:14
	← wget left	14:15
	→ Gustavo6046 joined	14:17
	→ starter123 joined	14:17
	← rkta left	14:18
	→ rkta joined	14:18
	→ wget joined	14:20
	← wget left	14:20
	→ wget joined	14:20
	← cdown left	14:21
	→ fstd_ joined	14:22
	→ robW_HK joined	14:23
	→ OutreEE joined	14:23
	← fstd_ left	14:24
	→ fstd_ joined	14:25
	← fstd left	14:25
	fstd_ → fstd	14:25
	→ squirrel joined	14:25
squirrel	what's the best git tutorial for someone who tried and hated git? something that would make them love it	14:27
	← jstein left	14:30
	→ cdown joined	14:30
	→ dege joined	14:32
grawity	why bother, just let them use mercurial instead	14:33
squirrel	:s	14:33
	→ dave0x6d joined	14:34
	← drodger left	14:35
	→ borkr joined	14:36
	← starter123 left	14:36
	→ steeze joined	14:37
	→ Munt joined	14:38
	← Cabanossi left	14:40
	→ Oatmeal joined	14:40
	→ m0viefreak joined	14:40
	→ Cabanossi joined	14:41
	← Cabanossi left	14:42
	→ ankush joined	14:42
	→ Cabanossi joined	14:42
	→ quamtumslash joined	14:43
	← fstd left	14:45
	← planigan left	14:45
	← rkta left	14:48
	→ fstd joined	14:49
	← YuGiOhJCJ2 left	14:49
	← infinisil left	14:51
	← re1 left	14:53
	→ rkta joined	14:54
	→ gfixler joined	14:54
	→ infinisil joined	14:55
	← gfixler left	14:56
	← rkta left	14:59
	→ planigan joined	15:00
	→ neel joined	15:01
	← planigan left	15:01
	← CheckDavid left	15:03
	← Munt left	15:03
	← cdown left	15:04
	→ rkta joined	15:05
	← infinisil left	15:06
	→ samtheknife joined	15:07
	→ infinisil joined	15:08
	→ Munt joined	15:09
	→ planigan joined	15:09
	→ highkix joined	15:10
	→ cdg joined	15:10
	← sammyo left	15:10
	← cagedwisdom left	15:11
	→ Tobbi joined	15:13
	← rkta left	15:13
	→ rkta joined	15:14
	→ BSaboia joined	15:15
	← neel left	15:17
	→ neel joined	15:17
	← rkta left	15:19
	← rafasc left	15:19
	→ karelk joined	15:20
	← ankush left	15:20
	→ cdown joined	15:21
	→ ankush joined	15:22
	← jnavila left	15:23
	→ jnavila joined	15:24
	ChanServ set mode: +o	15:26
	Eugene changed the topic to: Welcome to #git, the place for git help and poltergits \| Public logs at https://gitirc.eu/log \| First visit? Read: https://gitirc.eu \| Current stable version: 2.14.2 \| Getting "cannot send to channel"? /msg gitinfo .voice \| 9 days until the skeleton war	15:26
	Eugene set mode: -o	15:26
	→ drodger joined	15:26
	→ gugah joined	15:28
	← ghost43 left	15:28
	← phluks left	15:29
	→ goksinen joined	15:29
	← jnavila left	15:30
	← infinisil left	15:30
	← steeze left	15:31
	→ infinisil joined	15:32
	← quamtumslash left	15:32
	← Munt left	15:32
	← sim590 left	15:34
	← blackmesa left	15:34
	→ Munt joined	15:35
	← elbeardmorez left	15:35
	→ ghost43 joined	15:36
	→ jnavila joined	15:36
	→ sim590 joined	15:36
	→ blackmesa joined	15:38
	← infinisil left	15:38
	→ infinisil joined	15:39
	← jnavila left	15:40
	→ jnavila joined	15:40
	← infinisil left	15:42
	→ orbyt_ joined	15:42
	← cdown left	15:43
	→ infinisil joined	15:43
	← robW_HK left	15:44
	← jnavila left	15:44
	← Munt left	15:44
	→ robW_HK joined	15:46
	← Masber_080 left	15:46
	← orbyt_ left	15:50
	→ jnavila joined	15:51
	→ fstd_ joined	15:51
	← fstd left	15:51
	fstd_ → fstd	15:52
	→ Munt joined	15:52
	← olat left	15:58
	← Munt left	16:02
	→ mjuszczak joined	16:05
oprypin	what, then they'll come back saying "maybe git is not so bad"	16:06
	← ghost43 left	16:07
	→ ghost43 joined	16:08
	← gotcha left	16:08
	→ orbyt_ joined	16:08
	← blackmesa left	16:09
	← m0viefreak left	16:10
	→ maheshpec joined	16:11
	→ Raed\|Laptop joined	16:11
	→ Nizumzen joined	16:13
	← ankush left	16:14
	→ meadmoon joined	16:15
	→ raynold joined	16:19
	→ raulp joined	16:20
tgummerer	''	16:20
	ls	16:20
	whoops sorry wrong window	16:21
	← gugah left	16:22
	← tgummerer left	16:22
	→ tgummerer joined	16:23
	→ fstd_ joined	16:25
	← fstd left	16:26
	← ghost43 left	16:26
	← Murii\|osx left	16:26
	→ ghost43 joined	16:26
	← upperdeck left	16:28
	→ upperdeck joined	16:29
	→ fstd joined	16:30
	← fstd_ left	16:30
	→ thiago joined	16:31
	← mjuszczak left	16:31
	← goksinen left	16:33
	→ goksinen joined	16:33
	← upperdeck left	16:34
	→ nisseni joined	16:34
Seveas	oprypin: in that case we should make them use svn	16:35
	← neel left	16:36
	→ tmm88 joined	16:36
	← tmm88 left	16:36
	→ tmm88 joined	16:36
	← a3Dman left	16:37
	→ upperdeck joined	16:37
	← highkix left	16:38
	← raulp left	16:39
	→ a3Dman joined	16:39
	← Cabanossi left	16:39
	→ Cabanossi joined	16:41
	← goksinen left	16:43
	→ goksinen joined	16:44
	← brokensyntax left	16:47
	← goksinen left	16:48
	→ goksinen joined	16:48
Eugene	squirrel - do they hate `git`, or do they hate version control in general? I think !designers is a good read for the latter	16:50
gitinfo	squirrel: 'Git for Web Designers' is a quick "Who why what when how" on VCS and git: http://www.webdesignerdepot.com/2009/03/intro-to-git-for-web-designers/	16:50
Eugene	git isn't great, but neither is any tool set. You have to learn to use the thing, which is not as easy as advertised	16:50
	→ [[thufir]] joined	16:51
	← Raed\|Laptop left	16:51
	← whyme left	16:52
	← brandonw left	16:52
	← goksinen left	16:53
	→ goksinen joined	16:53
	→ nitin59 joined	16:57
	→ SteffanW joined	16:58
	← upperdeck left	17:01
	→ baxx joined	17:02
	→ gugah joined	17:02
	← gugah left	17:02
	→ upperdeck joined	17:03
	→ rkta joined	17:04
	← Puffball left	17:04
	← mattheweigand left	17:05
	← robW_HK left	17:06
	→ xender joined	17:07
	→ ag4ve joined	17:08
	← goksinen left	17:08
xender	Hello. Is creating a git worktree inside the main working tree of the repository (as opposed to using an external directory) asking for trouble, or is it going to be fine?	17:08
	← upperdeck left	17:08
	→ dviola joined	17:09
	→ goksinen joined	17:09
	→ upperdeck joined	17:10
	← Cabanossi left	17:10
	→ kfoonamalik joined	17:11
	→ Cabanossi joined	17:11
	→ kfoonama1ik joined	17:11
	→ kfoonama2ik joined	17:11
	→ elbeardmorez joined	17:12
oprypin	xender, you mean having nested repository folders? that works just fine	17:12
	→ jceb joined	17:13
	← nitin59 left	17:14
	← goksinen left	17:14
	→ nitin59 joined	17:15
	← Oatmeal left	17:15
	→ GPenguin_ joined	17:15
	← GPenguin_ left	17:16
oprypin	nevermind, it's actual 'git worktree' that i have never heard about	17:16
	→ [Kid] joined	17:17
xender	oprypin: Actually it's git worktree's manual which states that "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."	17:17
	← upperdeck left	17:17
xender	I want to use it nevertheless for the purpose of creating a controlled build environment separate from the main working tree	17:17
	← infinisil left	17:18
	→ upperdeck joined	17:19
	→ infinisil joined	17:19
	→ madewokherd joined	17:21
	→ dreiss joined	17:22
	← Murr left	17:22
	→ Murr joined	17:23
	→ fmcgeough joined	17:23
	← nitin59 left	17:25
	→ nitin59 joined	17:26
	→ GPenguin_ joined	17:29
	← GPenguin_ left	17:30
	→ rafasc joined	17:32
	← imack left	17:32
	← dviola left	17:33
	← SteffanW left	17:36
	← tunekey left	17:37
	→ lkolstad joined	17:37
	← baxx left	17:38
	→ Rodya_ joined	17:38
	→ tunekey joined	17:39
	→ sat-aton joined	17:41
	← sat-aton left	17:41
	→ sat-aton joined	17:41
	← finalbeta left	17:43
	← kfoonama2ik left	17:44
	← kfoonamalik left	17:44
	← maheshpec left	17:44
	→ finalbeta joined	17:44
	← kfoonama1ik left	17:44
	← satifant left	17:45
	← yohnnyjoe left	17:48
	← tombusby left	17:48
	→ tombusby joined	17:50
	← BSaboia left	17:50
	→ tarkus joined	17:51
	→ plongshot joined	17:52
	← dreiss left	17:56
	→ jungsubk joined	17:56
	← upperdeck left	18:00
	→ pbandark joined	18:01
	→ upperdeck joined	18:01
	→ peterbecich joined	18:02
	→ koell joined	18:02
	← qaz left	18:03
	← Toba left	18:09
	→ Disgeae joined	18:09
	→ xnca joined	18:10
	→ qaz joined	18:11
	← upperdeck left	18:12
	→ CheckDavid joined	18:12
	← xnca left	18:12
	→ jrgilman joined	18:13
	→ upperdeck joined	18:14
jrgilman	Let's say I made a pull request (with only a single commit), and it got denied by the maintainer, would the best course of action be to rollback to the HEAD on the upstream and then just make the said fixes to my commit and then make another pull request, or make another commit fixing the previous commit	18:15
	make the said fixes on a new commit*	18:15
oprypin	jrgilman, i don't get this notion of "denied"	18:19
	← jungsubk left	18:19
jrgilman	?	18:19
	https://github.com/laravel/docs/pull/3793	18:19
oprypin	does it mean that your change will never get accepted no matter what? if so, your comment makes no sense	18:19
jrgilman	no	18:19
	He just believes I was too wordy	18:19
oprypin	I think closing the pull request for that reason was uncalled for	18:19
	it's not what normally happens. normally you just fix and rework it in the same branch / pull request	18:20
	→ laertus joined	18:20
	← BenderRodriguez left	18:20
jrgilman	okay	18:20
	well in this case how should i proceed i guess	18:20
	just rollback and make the small change	18:20
	or make a commit ontop of my commit?	18:20
	← spacemud left	18:20
jrgilman	what would be the better way	18:20
oprypin	jrgilman, you can make a commit on top of your commit.	18:21
jrgilman	okay	18:21
	thanks	18:21
laertus	using 'git checkout -b foo' i created a new branch in my git repo, then made some changes and committed them on the branch, and did a 'git push -u origin --all' which asked for my github un/pw and it pushed the changes, telling me 'Branch foo set up to track remote branch foo from origin.'	18:21
oprypin	jrgilman, GitHub UI has an option to squash and merge. make sure to mention that if they have objections	18:21
laertus	but the magit status window tells me 'Merge: origin/foo is missing'	18:21
	← upperdeck left	18:21
oprypin	jrgilman, actually you know what? seems like they abstain from squash and merge feature in that repository	18:21
	→ Guest22424 joined	18:21
jrgilman	hmm	18:21
oprypin	jrgilman, so yeah, maybe would be safer to commit --amend and push --force	18:21
jrgilman	okay	18:22
	i will do that then	18:22
oprypin	you can also open a new pull request with the very same branch, i guess	18:22
jrgilman	I also should have branched my change	18:22
	but i forgot to do that like a derp	18:22
	→ upperdeck joined	18:23
	→ dviola joined	18:23
	← jnavila left	18:23
oprypin	jrgilman, ok, with all these issues accumulated, at this point probably best to also make a new branch and a new pull request	18:24
jrgilman	yeah	18:24
	→ GrailKn1ght joined	18:24
jrgilman	i agree	18:24
	→ paul424 joined	18:24
jrgilman	thank you for the help btw	18:24
	← Guest22424 left	18:27
	→ yohnnyjoe joined	18:28
	→ Munt joined	18:28
	→ Mattiaslndstrm joined	18:29
laertus	using 'git checkout -b foo' i created a new branch in my git repo, then made some changes and committed them on the branch, and did a 'git push -u origin --all' which asked for my github un/pw and it pushed the changes, telling me 'Branch foo set up to track remote branch foo from origin.'	18:29
	→ Sven_vB joined	18:30
parsnip	hello #git, recommended laertus to try here, he's got `foo` on remote, and `foo` on local, but can't get `origin/foo` to show up on local.	18:30
	← upperdeck left	18:30
rewt	what's the output of `git branch -a`	18:30
Sven_vB	hi :)	18:30
	→ upperdeck joined	18:31
laertus	rewt: 'git branch -a' shows http://bpaste.net/show/34bbacde4596	18:31
	→ jnavila joined	18:32
rewt	and the output of `git fetch`	18:32
	← Munt left	18:33
	→ Mike1967GER_ joined	18:33
laertus	rewt: the output of "git fetch": http://bpaste.net/show/1b2293d5bd14	18:34
rewt	is it listed in `git branch -a` now?	18:34
	← Mike1967GER_ left	18:34
Sven_vB	I'm trying to copy files between 2 git-annex repos but nothing happens. on closer inspection, both have the same UUID, so git-annex probably thinks the files are already there. how do I change one of the UUIDs with least damage?	18:34
	→ blackmesa joined	18:34
laertus	rewt: there is no difference between the "git branch -a" output now from what it was before	18:35
	← meadmoon left	18:35
laertus	the thing is i can see the branch i created in my github repo, along with the commits i made and pushed	18:36
	and 'git push -u origin --all' did report 'Branch foo set up to track remote branch foo from origin.'	18:36
rewt	which versino of git do you have?	18:37
laertus	2.13.6	18:37
	← Cabanossi left	18:38
rewt	did you change any configs?	18:38
rafasc	from the output, foo doesn't seem to be tracking origin.	18:39
	→ cur8or joined	18:39
rafasc	Maybe because it was used with --all?	18:39
rewt	because your local repo doesn't know about origin/foo	18:39
	→ Loula joined	18:40
	← ShockingIsntIt2 left	18:40
	← upperdeck left	18:40
rafasc	which is weird, if git gave you 'Branch foo set up to track remote branch foo from origin'	18:40
	→ Cabanossi joined	18:40
	← Loula left	18:40
parsnip	`git branch -r` shows foo, iiuc.	18:41
	not sure if red herring.	18:41
rewt	it doesn't; if it did, `git branch -a` would too	18:42
laertus	rewt: here's my ~/.git/config http://bpaste.net/show/2d368e714eb7	18:42
parsnip	laertus: does `git branch -r` show foo?	18:42
laertus	no	18:42
	→ upperdeck joined	18:43
laertus	it just shows "origin/HEAD -> origin/master" and "origin/master"	18:43
rewt	laertus, how about `git remote -v`	18:43
	→ nikklik joined	18:44
	← nikklik left	18:44
laertus	rewt: "git remote -v" shows "origin https://github.com/me/myrepo.git (fetch)" and "origin https://github.com/me/myrepo.git (push)"	18:44
rewt	same url for both?	18:44
laertus	yep	18:44
	→ energizer joined	18:45
	← Nizumzen left	18:45
	→ mizu_no_oto joined	18:46
rafasc	are you doing $git fetch origin; or $git fetch origin foo; ?	18:46
	← nsc[m] left	18:47
	← reactormonk[m] left	18:47
	→ dreiss joined	18:47
	← horpoppy[m] left	18:47
	→ Bookie01721 joined	18:47
	← Bookie01721 left	18:47
	← torarne left	18:47
	→ QualityAddict joined	18:47
	← colonelkrud[m] left	18:47
	→ Munt joined	18:47
	← upperdeck left	18:47
laertus	in the course of troubleshooting this i've tried: "git fetch foo", "git fetch origin/foo" and "git fetch --all"	18:47
	← mark_c left	18:47
rafasc	you should do git fetch origin.	18:47
	← nappy[m] left	18:47
	← energizer left	18:48
	→ jungsubk joined	18:48
	→ energizer joined	18:48
rewt	did you not try just `git fetch` ?	18:48
rafasc	or just fetch as rewt said. But git fetch --all should have worked in your case.	18:48
	→ upperdeck joined	18:49
rafasc	after that, check if the branch is present on git branch -a	18:49
	← Munt left	18:49
	→ Nizumzen joined	18:49
laertus	rafasc: "git fetch origin" reported: http://bpaste.net/show/ad0d2474bd50	18:49
	"git branch -a" shows: http://bpaste.net/show/8413239f80fc	18:50
	← justanotheruser left	18:50
	← Demos[m] left	18:50
	← spinningarrow[m] left	18:50
	← aspiers[m] left	18:50
	← waltervargas[m] left	18:50
	← koell left	18:51
	← swalladge[m] left	18:51
	← Guest38590 left	18:51
	← acme[m] left	18:51
	← jayaura left	18:51
	← CedaEI[m] left	18:51
	← MeTheFlea left	18:51
	← sphalerite left	18:51
	← UncleCJ left	18:51
	← Orbixx[m] left	18:51
	← am2on left	18:51
	← patrickr[m] left	18:51
	← cdg left	18:51
	← autrilla left	18:51
	← dikiaap left	18:51
	← cverna left	18:51
	← aidalgol left	18:51
	← dreadful[m] left	18:51
	← cicada3307[m] left	18:51
rewt	laertus: `git config --list`	18:51
	← olbat[m] left	18:52
	← Remramm left	18:52
	← equalunique[m] left	18:52
	← dyce[m] left	18:52
rafasc	rewt: I think the problem is that he has a local branch named foo, which is not tracking remote branch foo.	18:52
	← primeos[m] left	18:52
	← unclechu left	18:52
	← ushaNg6i[m] left	18:52
	← Techie[m] left	18:52
	← KevinMGranger left	18:52
	← hiq[m] left	18:52
	← Miguelngel[m] left	18:52
	← abithvijayan[m] left	18:52
rafasc	So, when we try to git fetch, git doesn't know that those two are related.	18:53
	← yanbbyan left	18:53
rewt	even so, fetch should still fetch the remote branch	18:53
	← aviraldg left	18:53
	← c0ff33[m] left	18:53
rafasc	I am pulling this out of my ass without testing.	18:53
	← pvn[m] left	18:53
	← flo[m] left	18:53
	← upperdeck left	18:53
	← sw1m left	18:54
Sven_vB	I think I managed to recover it. for anyone reading the log later: each repo has annex.uuid in its git config. I changed that to a new independent one (uuidgen -r), removed the remote UUIDs from the git remotes in the configs, then ran the fsck/sync/get git-annex tasks repeatedly on all hosts. I then fixed each repo's name with git-annex init, and synced again.	18:54
	← mizu_no_oto left	18:55
	→ upperdeck joined	18:56
rafasc	laertus: what happens if you do git branch --set-upstream-to origin/foo	18:57
	!backup	18:57
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	18:57
	→ j08nY joined	18:58
laertus	rafasc: i got an error: "error: the requested upstream branch 'origin/foo' does not exist"	18:58
	→ sw1m joined	18:58
	← tarkus left	19:00
	← Rodya_ left	19:00
	← upperdeck left	19:01
	→ mizu_no_oto joined	19:01
	→ upperdeck joined	19:02
	← mizu_no_oto left	19:02
squirrel	Eugene: thanks, link forwarded	19:03
	← Sven_vB left	19:03
	→ kiim joined	19:03
parsnip	laertus: does your .git/config have something like `fetch = +refs/heads/:refs/remotes/<name of remote>/`	19:04
	← yohnnyjoe left	19:04
rafasc	parsnip: was about to ask that.	19:04
	→ yohnnyjoe joined	19:04
laertus	parsnip: here's my ~/.git/config http://bpaste.net/show/2d368e714eb7	19:05
	← doener left	19:05
	← ZexaronS left	19:05
parsnip	that's all?!	19:05
	← vetch left	19:05
laertus	yep	19:05
rewt	laertus: `git config --list`	19:05
parsnip	wait, ~/.git/config?	19:05
laertus	yep	19:05
rafasc	git config -l --show-origin.	19:05
parsnip	you're backing up your whole home directory? yikes	19:05
	→ svm_invictvs joined	19:05
	→ ZexaronS joined	19:06
rafasc	I meant $git config --list --show-origin	19:06
	← yohnnyjoe left	19:06
	← nitin59 left	19:06
	→ morgoth88 joined	19:06
	← morgoth88 left	19:07
parsnip	how does git know what the remote is if it's not in .git/config?	19:07
	→ yohnnyjoe joined	19:07
	← kiim left	19:08
	← upperdeck left	19:08
rafasc	he must have it on the global config I guess	19:08
	that's why I asked for $git config --list --show-origin	19:09
	← jceb left	19:10
	→ upperdeck joined	19:10
	← squirrel left	19:10
	← glebihan left	19:10
	→ Raed\|Laptop joined	19:12
	→ overlord_tm joined	19:12
	→ cici joined	19:13
	→ glebihan joined	19:13
	← cici left	19:13
	→ tarkus joined	19:14
	← yohnnyjoe left	19:14
	← svm_invictvs left	19:15
	← opalepatrick left	19:15
	← upperdeck left	19:15
	→ upperdeck joined	19:16
	→ czart_ joined	19:16
	← jungsubk left	19:16
	→ Error403 joined	19:16
	← Error403 left	19:17
	← glebihan left	19:18
	← sunri5e left	19:19
	← czart__ left	19:19
	→ sedrosken__ joined	19:20
	← plongshot left	19:21
	→ sunri5e joined	19:21
	→ plongshot joined	19:21
	← Murr left	19:22
	→ Murr joined	19:23
	← sedrosken__ left	19:23
	→ justanotheruser joined	19:23
	← upperdeck left	19:25
	← overlord_tm left	19:25
	→ upperdeck joined	19:25
laertus	rafasc and parsnip: the output of "git config --list --show-origin" is http://bpaste.net/show/e9a57705c809	19:26
parsnip	fetch looks hard-coded to master.	19:27
	← nisseni left	19:27
	→ TOTO47925 joined	19:27
rafasc	yep.	19:27
	← GrailKn1ght left	19:28
	→ koell joined	19:28
parsnip	i don't understand why it says `file:.git/config` but there's no such lines in ~/.git/config	19:28
	laertus: which directory did you call config from?	19:28
	→ dpower joined	19:29
rafasc	it also doesn't agree with previous pastes.	19:29
	← TOTO47925 left	19:29
rafasc	!privmsg !censor	19:29
gitinfo	You can get gitinfo keyword expansion (e.g. !doc or this one) sent directly to you by sending a private message to me: /msg gitinfo !doc. This avoids spamming the channel. Also see https://gitirc.eu/bot/trigger.php	19:29
	[!obfuscate] Please do not elide, obfuscate, or otherwise hide information from !repro pastes. This invariably leads to pastes that hide the actual issue or (worse) are not consistent, sending the investigation down false paths. See !secret.	19:29
	← upperdeck left	19:30
rafasc	obfuscate was what I meant.	19:30
	→ glebihan joined	19:30
	→ nisseni joined	19:31
	→ Darcidride joined	19:31
parsnip	laertus: can you check `cat ~/.git/config`? maybe you misrepresented what is in there?	19:31
	→ upperdeck joined	19:31
	← justanotheruser left	19:32
	→ justanotheruser joined	19:32
	← cur8or left	19:32
	→ basiclaser joined	19:34
parsnip	laertus: maybe change it so it says `fetch = +refs/heads/:refs/remotes/origin/`, instead of hard-coding `master` in there, then try `git branch -r`, see if `foo` is listed.	19:35
	← glebihan left	19:35
	← upperdeck left	19:36
	→ upperdeck joined	19:37
laertus	parsnip: "cat ~/.git/config" -> http://bpaste.net/show/6678a8c0fe09	19:37
	that's literally all there is in there	19:37
	← demego left	19:37
laertus	i didn't change anything but pasted it directly to bpaste	19:37
	← QualityAddict left	19:37
parsnip	laertus: where is remote set?	19:37
	← gtristan left	19:38
laertus	i don't know git well enought to know how to answer that question	19:38
rafasc	where is this repo located?	19:38
laertus	in a subdirectory in my home directory	19:38
	and on github	19:38
parsnip	subdirectory?!	19:39
laertus	like in /home/foo/bar	19:39
	← nisseni left	19:39
parsnip	like /home/laertus/bar?	19:39
	→ blackmesa1 joined	19:39
laertus	more like /home/laertus/foo/bar/baz	19:39
parsnip	so is remote set in `~/bar/.git/config`?	19:39
	← dreiss left	19:39
parsnip	so is remote set in `~/foo/bar/baz/.git/config`?	19:39
rafasc	do you have a repo with your /home/me files? Or did you accidentally set a repo there?	19:40
parsnip	yeah, why do you have a ~/.git/config	19:40
	or, a ~/.git/ for that matter	19:40
	← [[thufir]] left	19:41
laertus	the contents of ~/foo/bar/baz/.git/config are http://bpaste.net/show/952a8d4cdece	19:41
	← upperdeck left	19:42
	← blackmesa left	19:42
laertus	i have a ~/.git because i wanted to put some of the dotfiles in my home directory under version control	19:42
	→ Feral_Cat joined	19:42
parsnip	in fetch, change `master` to `*`	19:42
	→ autrilla joined	19:42
	→ cdg joined	19:42
laertus	these days i use stow for that, but i still have a ~/.git because i haven't bothered to get rid of it	19:42
rafasc	do what parsnip mentioned. Or alternatively remove the remote and add it again.	19:43
	→ upperdeck joined	19:43
	→ [[thufir]] joined	19:43
parsnip	what set it to master? some old default?	19:43
laertus	parsnip: so under the '[remote "origin"]' section in ~/foo/bar/baz/.git/config i should change "fetch = +refs/heads/master:refs/remotes/origin/master" to "fetch = +refs/heads/:refs/remotes/origin/" ?	19:44
	← Disgeae left	19:44
rafasc	laertus: yes	19:44
laertus	ok	19:44
	→ dreiss joined	19:45
laertus	now what?	19:45
rafasc	now fetch	19:45
parsnip	or `git branch -r`	19:45
	→ yohnnyjoe joined	19:45
rafasc	parsnip: I think you have to fetch first.	19:45
laertus	"git branch -r" still shows "origin/HEAD -> origin/master" and "origin/master"	19:46
parsnip	oh yeah, you're right	19:46
	i just learned this 15 minutes ago and forgot	19:46
laertus	after "git fetch origin" i now see "origin/foo" :)	19:46
	→ Disgeae joined	19:46
laertus	yay	19:46
parsnip	woooooot	19:46
	→ cur8or joined	19:46
parsnip	nice job everybody	19:46
rafasc	!next	19:47
gitinfo	Another satisfied customer. NEXT!	19:47
laertus	ok... so can someone help me understand what "fetch = +refs/heads/master:refs/remotes/origin/master" means and why changing it to "fetch = +refs/heads/:refs/remotes/origin/" fixed it?	19:47
thiago	it meant "download refs/heads/master and save it in refs/remotes/origin/master"	19:47
	← cdg left	19:47
thiago	now it means "download refs/heads/* and save all those in refs/remotes/origin/"	19:47
rafasc	thiago, what's your wpm?	19:48
	→ spacemud joined	19:48
laertus	why didn't "git checkout -b foo" followed by changes and commits followed by "git push -u origin --all" do this for me?	19:48
	← upperdeck left	19:48
laertus	what should i have done instead to push a new branch to github?	19:48
thiago	rafasc: what's wpm?	19:48
laertus	words per minute	19:48
	→ sdnv joined	19:48
laertus	he means you type fast	19:48
parsnip	laertus: --all probably only saw master	19:48
thiago	no, I copy & paste fast	19:49
laertus	what's the right way to push a new local branch to github?	19:49
rafasc	oh, ok. I'll set up my own expansions. Note taken.	19:49
thiago	laertus: git push github branchname	19:50
	← adv_ left	19:50
	→ upperdeck joined	19:50
laertus	thiago: i should literally write "github" in that command? not "orgin" or something?	19:51
thiago	laertus: you should write the remote name that you want to push to	19:51
	→ krz joined	19:51
	← diogenese left	19:51
thiago	I call mine related to github "github"	19:51
	you may call them differently	19:51
laertus	ah	19:51
	krz → Guest29027	19:51
	← Guest29027 left	19:53
laertus	thank you, i think i got it	19:53
	and thanks everyone	19:53
	→ astrofog joined	19:54
	← dreiss left	19:55
	← laertus left	19:56
	→ diogenese joined	19:56
	← pbandark left	19:57
	→ Pedagodiche joined	19:57
	→ m0viefreak joined	19:58
	← cur8or left	19:58
	← upperdeck left	20:00
	→ upperdeck joined	20:00
	→ stonebat joined	20:01
	→ glebihan joined	20:04
	← schleppel left	20:04
	← glebihan left	20:05
	← Pedagodiche left	20:05
	← upperdeck left	20:05
	← paul424 left	20:05
	← borkr left	20:06
rafasc	does anyone knows where I can add Makeflags on git's makefiles?	20:06
	→ pbandark joined	20:06
	→ upperdeck joined	20:06
	← bambams left	20:08
	kadoban → mud	20:08
	← peterbecich left	20:08
	→ goksinen joined	20:09
	← jnavila left	20:09
	→ peterbecich joined	20:10
	← Raed\|Laptop left	20:10
	→ Slayerr joined	20:10
	← pbandark left	20:10
	← upperdeck left	20:11
	→ pbandark joined	20:11
	← Slayerr left	20:12
	→ upperdeck joined	20:12
	← peterbecich left	20:12
	← goksinen left	20:13
	→ peterbecich joined	20:14
	← lexruee left	20:15
rafasc	was just interested in adding -j8 by default.	20:15
	← peterbecich left	20:15
	← ahrs left	20:15
	→ ahrs joined	20:17
	→ peterbecich joined	20:17
	→ cur8or joined	20:18
	→ whoisit joined	20:18
	← whoisit left	20:19
	→ primeos[m] joined	20:20
	→ olbat[m] joined	20:20
	→ equalunique[m] joined	20:20
	→ cverna joined	20:20
	→ reactormonk[m] joined	20:20
	→ flo[m] joined	20:20
	→ hiq[m] joined	20:20
	→ dikiaap joined	20:20
	→ spinningarrow[m] joined	20:20
	→ aspiers[m] joined	20:20
	→ UncleCJ joined	20:20
	→ nappy[m] joined	20:20
	→ Techie[m] joined	20:20
	→ patrickr[m] joined	20:20
	→ torarne joined	20:20
	→ unclechu joined	20:20
	→ Miguelngel[m] joined	20:20
	→ abithvijayan[m] joined	20:20
	→ dyce[m] joined	20:20
	→ acme[m] joined	20:20
	→ waltervargas[m] joined	20:20
	→ Guest56088 joined	20:20
	→ Orbixx[m] joined	20:20
	→ pvn[m] joined	20:20
	→ MeTheFlea joined	20:20
	→ aviraldg joined	20:20
	→ Demos[m] joined	20:20
	→ aidalgol joined	20:20
	→ yanbbyan joined	20:20
	→ horpoppy[m] joined	20:20
	→ cicada3307[m] joined	20:20
	→ dreadful[m] joined	20:20
	→ Guest62224 joined	20:20
	→ sphalerite joined	20:20
	→ am2on joined	20:20
	→ swalladge[m] joined	20:20
	→ c0ff33[m] joined	20:20
	→ Remramm joined	20:20
	→ mark_c joined	20:20
	→ KevinMGranger joined	20:20
	→ ushaNg6i[m] joined	20:20
	→ CedaEI[m] joined	20:20
	→ colonelkrud[m] joined	20:20
	→ nsc[m] joined	20:20
	← CheckDavid left	20:21
	→ jnavila joined	20:21
	→ jcbitter joined	20:22
	→ glebihan joined	20:22
	← upperdeck left	20:22
	← idlemind left	20:23
	← tarkus left	20:24
	→ upperdeck joined	20:24
	→ safe joined	20:24
	→ idlemind joined	20:25
	← stonebat left	20:27
	→ jstein_ joined	20:28
	jstein_ → jstein	20:28
	← wootehfoot left	20:30
	→ jungsubk joined	20:31
	← upperdeck left	20:31
	→ Ren13 joined	20:31
	← jstein left	20:32
	← Ren13 left	20:33
	→ upperdeck joined	20:34
	← koell left	20:35
	← plongshot left	20:35
	→ Gigam joined	20:36
	← Gigam left	20:36
	→ duderonomy joined	20:37
	→ Darren_ joined	20:38
	← upperdeck left	20:38
	→ aksdf_ joined	20:39
	→ pbrewczynski joined	20:40
	→ upperdeck joined	20:41
	→ plongshot joined	20:45
	← jungsubk left	20:46
	← upperdeck left	20:48
	→ sombercomber joined	20:50
	→ upperdeck joined	20:50
ag4ve	any reason git tries to sign a stash?	20:52
thiago	probably something in your config	20:52
ag4ve	i mean, i make it sign commits/tags/merges, but it's kinda weird it's signing a stash	20:52
thiago	a stash sis just a commit	20:53
	← NightMonkey left	20:53
ag4ve	orly?	20:53
thiago	ok, it's in fact two commits	20:53
ag4ve	i mean, it's stored as an object?	20:53
	errr two...	20:53
thiago	what else would it be stored as?	20:53
ag4ve	idk, a structure for submodules and the like	20:54
	i figured it'd be something like that	20:54
	→ Six-Degrees-Inne joined	20:54
thiago	it has nothing to do with other modules, it's this module	20:54
	no, it's just a commit	20:54
ag4ve	also, notes are different, right?	20:54
thiago	notes are different	20:54
parsnip	annotated tags?	20:54
	→ lnlnl joined	20:54
thiago	I don't know what they are	20:55
	I've never used them	20:55
ag4ve	that's fair	20:55
	it just surprised me	20:55
	ag4ve goes to get my hsm :)	20:55
parsnip	oh neat	20:55
	that one guy that wanted the author changed on an old commit, maybe could have just used a note.	20:55
	← blackmesa1 left	20:56
	→ kfoonamalik joined	20:56
	→ kfoonama1ik joined	20:56
	→ blackmesa joined	20:57
	← jnavila left	20:57
	← chamunks left	20:57
	← freekevin left	20:57
	→ mjuszczak joined	20:57
	→ NightMonkey joined	20:59
	← linuxdaemon left	20:59
	→ ZexaronS-2 joined	20:59
	← upperdeck left	21:00
ag4ve	stash asks for me to sign it 2x.... that's messed up :(	21:00
	one of these days, i'm going to have to go spelunking through that code....	21:00
	← Six-Degrees-Inne left	21:00
	← ZexaronS left	21:01
thiago	$ file /usr/lib/git/git-stash	21:01
	/usr/lib/git/git-stash: POSIX shell script, ASCII text executable	21:01
	→ upperdeck joined	21:01
	→ kfoonama2ik joined	21:01
	← mjuszczak left	21:02
ag4ve	yeah, they're either bash or python (generally), just not overly interested atm - trying to get something out	21:02
thiago	there's only one Python script and that's git-p4	21:04
	← kfoonama1ik left	21:05
	← kfoonamalik left	21:06
	← kfoonama2ik left	21:06
	← StephenS left	21:07
	→ Rodya_ joined	21:07
	← upperdeck left	21:08
	→ stan_man_can joined	21:10
stan_man_can	how do you revert to an old commit?	21:10
	like i've made a few commits, pushed a couple to github, but i want to go back to an older commit and kinda re-start from there	21:10
	→ upperdeck joined	21:10
parsnip	stan_man_can: well...	21:11
	→ samfoobarbaz joined	21:11
parsnip	stan_man_can: i think that can be answered two ways	21:11
	the brute force do what you want way	21:11
stan_man_can	parsnip not sure if it makes a difference but i'm the only developer on this project too	21:11
parsnip	and the polite, "i'm sharing history" way.	21:11
	well, imagine that git is really just a commit graph, with divergences, convergences, etc, and branches are really just pointers to commits on the graph.	21:12
stan_man_can	parsnip i dno't really care, it was jsut me trying to figure some composer thing out, so it's just a few different messed up versions of composer.json and composer.lock	21:12
	→ durham joined	21:12
parsnip	then you could rephrase as, "how do i move this branch pointer to another commit?"	21:12
	McKraken_zzzzz → McKraken	21:13
parsnip	if you check `git log --oneline --graph --all`, you might note the hash of the commit where you'd like your branch pointer to point to.	21:13
	if HEAD is pointing to your branch (pointer), then you can use `git reset --hard <hash>` to move the branch ref to that commit.	21:14
	← Mattiaslndstrm left	21:14
	← samtheknife left	21:14
stan_man_can	parsnip thanks!	21:14
parsnip	:)	21:14
	→ tlaxkit joined	21:14
	→ Mattiaslndstrm joined	21:15
parsnip	if you had to do the polite way, you can sort of flip the inverse of those commits over your position to extend the branch with reversals.	21:15
	→ nisseni joined	21:16
parsnip	maybe it's `git revert` or something	21:16
rafasc	there's the nuke it version: git reset --hard commit; git push --force-with-lease.	21:17
stan_man_can	parsnip how do I handle the fact that the remote is "ahead"	21:18
rafasc	and the git revert A..B, where A and B are the first and last commits you want to revert.	21:18
stan_man_can	i did the revert, and then a new commiit and pushed but now it says that the crrent tip of the branch is behind it's remote counterpart	21:18
	--force ?	21:19
parsnip	stan_man_can: revert? i think you mean reset, no?	21:19
rafasc	did you use the range of commits?	21:19
	because if you did git revert <commit> that only reverts the changes brought by that specific commit.	21:19
stan_man_can	sorry yes I did reset	21:20
	← upperdeck left	21:20
stan_man_can	I did get reset --hard commit	21:20
parsnip	he says remote is ahead, so suggests reset.	21:20
	you have to convince the remote to move the ref backwards	21:20
	i think rafasc might have given that command	21:20
rafasc	if you reset --hard, yes, the only option is to force push.	21:20
stan_man_can	made my changes, commit them, but then it says it's behind, so I guess i want to do a git push origin beta --force ?	21:20
	kk	21:20
rafasc	!backup	21:20
gitinfo	Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups	21:20
parsnip	this is the "rewriting history" part	21:21
	→ upperdeck joined	21:21
parsnip	because now commits will diverge and old remote tip will be "unreachable", etc.	21:21
stan_man_can	so essentially the reset --hard it saying those comits i did didn't exist and they kind of disappear ?	21:21
parsnip	sort of	21:21
rafasc	you can still get it under some conditions. But yeah.	21:22
stan_man_can	thanks guys	21:22
	→ lxnr joined	21:22
rafasc	It will also cause major pains to everyone who cloned your repo. :)	21:22
	← Murr left	21:22
parsnip	they are unreachable for about 2 weeks or 3 months, depending on defaults, type, etc, then they might be eligible to be garbage collected at some point.	21:23
	→ Murr joined	21:23
parsnip	unreachable means you can't start from a branch ref and follow parent commits to it.	21:23
	← lnlnl left	21:23
	→ lnlnl joined	21:23
rafasc	in cause of github, they're stored forever.	21:23
	← lnlnl left	21:23
rafasc	if you know the commit hash, you can get it.	21:24
parsnip	really?	21:24
	← sword` left	21:24
rafasc	yeah.	21:24
	← durham left	21:24
parsnip	that's a special github thing? i though in general git fetch is about branch refs.	21:24
	*thought	21:24
rafasc	there's an answer on stackoverflow where people say: github runs git gc periodically.	21:24
	→ durham joined	21:25
rafasc	but the commit is still available. 8 years later.	21:25
	→ QualityAddict joined	21:25
	← netj left	21:25
	← lxnr left	21:25
	→ lnlnl joined	21:25
rafasc	only way to get rid of it is deleting your repo.	21:25
	(or contacting support I guess)	21:26
parsnip	interesting	21:26
	yeah, the urls are kind of object organized.	21:26
	→ netj joined	21:26
parsnip	i only recently realized that.	21:26
	for years i was like, "why is blob in the url?"	21:26
rafasc	also, github keep copies of branches for pull requests. stuff like that	21:27
	← upperdeck left	21:28
	← mooasaurus left	21:29
	→ CheckDavid joined	21:29
	→ upperdeck joined	21:30
rafasc	do a git ls-remote on a repo with pull requests	21:30
	you'll see a bunch of refs under /refs/pull	21:30
	← wuseman left	21:31
mud	Those refs are super useful. If you change your fetch spec, you can make it easy to see pull requests locally.	21:31
	← bronson_ left	21:31
	→ bronson joined	21:31
rafasc	mud: I guess nothing stops you from merging them locally too.	21:32
	not sure if gihub will like it though. Never tried myself.	21:32
mud	It doesn't mind	21:32
canton7	it won't mark the pr as 'merged', but that's all	21:33
rafasc	I guess you could try to make refs/pull/58/merge and push it	21:33
	or does it reject pushes from that namespace?	21:34
	← Darcidride left	21:34
	→ wuseman joined	21:34
mud	canton7: Are you sure? I thought it did	21:34
canton7	it never has when I've merged stuff manually, but then I might well have always tweaked something	21:34
	← cur8or left	21:34
	← wuseman left	21:35
	→ wuseman joined	21:35
rafasc	My guess is that it needs refs/pull/58/merge for marking it as merged.	21:35
	because that points too the commit the PR was merged	21:35
	where refs/pull/58/head points to the head of the branch	21:36
	← upperdeck left	21:37
	→ upperdeck joined	21:38
	→ cagedwisdom joined	21:38
	→ boombatower joined	21:38
	→ cur8or joined	21:39
	← Peng left	21:39
	→ Peng joined	21:39
	→ kfoonamalik joined	21:42
	→ justkitsu joined	21:42
	→ kfoonama1ik joined	21:42
	← Feral_Cat left	21:44
	gitinfo set mode: +v	21:44
justkitsu	Hey! For now I have a tree that before every merge (let say to A) it's ensured that branch is rebased onto A	21:44
	← Peng_ left	21:44
	→ Peng_ joined	21:45
	← dpower left	21:45
justkitsu	so then I'd like to merge (same way) A to B (the last one also have updates)	21:45
	← upperdeck left	21:45
	← tmm88 left	21:45
	→ Solvaring joined	21:45
	← mikecmpbll left	21:46
justkitsu	so have can I do that w/o much pain? I tried git rebase --preserve-merges B, but that for some reason don't work that good (some commits are missing)	21:46
	→ kfoonama2ik joined	21:47
	← samfoobarbaz left	21:48
	→ upperdeck joined	21:48
	→ sammyo joined	21:48
parsnip	can you share !situation	21:50
gitinfo	Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)	21:50
	→ SwiftMatt joined	21:52
	← upperdeck left	21:52
	→ diqidoq_ joined	21:54
	← ZexaronS-2 left	21:55
	→ upperdeck joined	21:55
Rodya_	so i renamed some files on my local computer with `mv` (e.g. `mv src/utils.js -> src/Utils.js`) - these files are in repo. when i push this repo up to github, these files retain their old file name, and i'm not sure why	21:55
	← diqidoq left	21:56
mud	Rodya_: Presumably because you didn't stage the changes with git. What's 'git status' say?	21:57
	← gloomy left	21:57
Rodya_	mud: up-to-date with 'origin/master'	21:57
mud	That's almost certainly not all that it said.	21:58
Rodya_	i made some other changes alongside said name changes - these changes are up on the upstream repo	21:58
	On branch master	21:58
	Your branch is up-to-date with 'origin/master'.	21:58
	nothing to commit, working tree clean	21:58
mud	Oh are all of the changes just changes in capitalization of the filename?	21:59
Rodya_	mud: yes they are	21:59
mud	What OS are you on? Some have weird behavior with respect to capitalization, and I think there's some setting to tell git how to handle that.	22:00
Rodya_	mud: OSX El Capitan	22:00
	looking at the relevant commit on github, it looks as though the file changes were propagaated but the file name changes were not	22:00
	← simka left	22:00
mud	Hm. I'm not sure how OSX handles filename capitalization. Does it treat 'blah' and 'Blah' as different files, or does either work?	22:01
Rodya_	but the renaming was successful on my local computer	22:01
	i only found this problem as my travis tests are breaking, as they are unable to find the new file names i specify in the files	22:01
	→ Deltanic_ joined	22:01
Deltanic_	anyone knows if its possible to split a folder from a git repo to a new repo retaining only the history of that folder in new repo?	22:02
	← upperdeck left	22:02
demize	`git subtree`	22:03
mud	Rodya_: https://stackoverflow.com/questions/17683458/how-do-i-commit-case-sensitive-only-filename-changes-in-git has some information. It sound like just doing 'git mv src/utils.js src/Utils.js' might stage the changes, then you just have to make a commit like that and etc.	22:03
	→ freekevin joined	22:03
demize	Lets you both split the subtree into a separate branch and then pull from that, or just push the subtree directly to a different repo.	22:03
	→ upperdeck joined	22:03
	← safe left	22:04
Rodya_	mud: thank you, exactly what i was googling... i'll try it out	22:04
Deltanic_	demize, doesnt subtree already assume i have 2 repos?	22:04
demize	Deltanic_: Nope.	22:04
	→ chamunks joined	22:04
	← blackmesa left	22:05
	→ overlord_tm joined	22:05
mud	Rodya_: Also, a hint: if your filesystem is actually case-insensitive (I think it is), changing that one setting that's mentioned is usually not a good idea (core.ignorecase). It seems tempting, but I'd avoid it unless you really can't.	22:05
demize	`git subtree push` would require it, but `git subtree split` just spits out a new commit ID that you can then pull from after initializing a new repo.	22:05
Deltanic_	aha!	22:06
	alright, thanks, will look into that then :)	22:06
mud	Deltanic_: By the way, if it's a one-time split and they'll have no further sharing of commits between them, you can just copy the repo and do a filter-branch. That can be simpler. But subtree is usually better.	22:06
demize	I can't see filter-branch being simpler honestly	22:07
Rodya_	mud: OSX is case INsensitive - you're saying don't alter git config? is this to just avoid problems for any collaborators	22:07
	← Disgeae left	22:07
	→ Goplat joined	22:08
m0viefreak	Rodya_: no, core.ignorecase = false on OSX will cause you problems locally, so don't do that	22:08
mud	demize: Well, I see subtree as being more complicated because there's more around it, it's a whole system of how you push, pull, split, etc. and you have to figure out what it all means. Nuking a repo down to a subdirectory with filter-branch has a lot less protocol to it.	22:08
Deltanic_	mud, yeah it's going to be a one time split, no submodules needed either. just developing a project in a monorepo currently so i can pull deps directly from a sibling directory, and publish as an independent package when im confident enough	22:08
mud	Rodya_: Ya, I'd avoid changing it. It'll annoy you (and probably others)	22:08
demize	mud: I mean you just need `git subtree split -P foo` then just git-init and git-pull that commit.	22:09
m0viefreak	Rodya_: if ignorecase=true (which it should on osx), case-only changes will not automatically picked up if you rename them manually, so you need to use "git mv", to manually tell it	22:09
	→ blackmesa joined	22:09
demize	mud: And most git "users" I know would not really know how to use filter-branch, so they'd end up googling and copy-pasting some random command off of StackOverflow :p	22:09
mud	demize: Everything is easy if you just give the commands, usually the hard part is figuring out what anything means. Even that assumes a fair bit of savvyness with git, like fetching specific commits into a new repo.	22:10
	demize: They won't know how to do your thing either, so same problem.	22:10
	← valize left	22:10
Deltanic_	demize, about filter-branch, that'd be my approach if i didnt go here hahe - i found some article on github, but wasnt sure if it retains history	22:10
	fwiw, https://help.github.com/articles/splitting-a-subfolder-out-into-a-new-repository/	22:10
demize	It's much easier to explain mine quickly though, but sure. ;)	22:11
Deltanic_	i dont mind either solution, if subtree is as easy as you explain, it's cool. it's a one-off thing anyway, but just want to be sure that the possibility is there for when i split off the repo	22:12
demize	Well, to be honest they're pretty close in easiness of explanation, but I find git-subtree to be easier to explain in contexts like these.	22:12
	→ blackmesa1 joined	22:12
Deltanic_	yeah it makes sense	22:13
	thanks :)	22:13
	← plongshot left	22:13
	← blackmesa left	22:15
	→ plongshot joined	22:15
	→ robattila256 joined	22:16
	→ linuxdaemon joined	22:17
	← Phylock left	22:17
	← kfoonama1ik left	22:18
	← upperdeck left	22:18
	← kfoonamalik left	22:18
	→ BenderRodriguez joined	22:18
	→ thecrooked joined	22:19
	→ upperdeck joined	22:19
	← kfoonama2ik left	22:19
	← Rodya_ left	22:23
	← upperdeck left	22:24
	→ upperdeck joined	22:24
	→ Rodya_ joined	22:25
	→ koell joined	22:27
	← cur8or left	22:28
	← luckman212 left	22:28
	← upperdeck left	22:29
	→ upperdeck joined	22:31
	← SerusWor1 left	22:33
	→ luckman212 joined	22:34
	→ SerusWor1 joined	22:34
	← SerusWor1 left	22:34
	→ SerusWor1 joined	22:34
	→ Oatmeal joined	22:35
	← peterbecich left	22:37
	← diogenese left	22:38
	← upperdeck left	22:38
	→ mooasaurus joined	22:38
	← Cabanossi left	22:39
	→ cdg joined	22:40
	→ upperdeck joined	22:40
	→ Cabanossi joined	22:41
	← nisseni left	22:42
	← upperdeck left	22:47
	← cagedwisdom left	22:47
	→ upperdeck joined	22:47
	→ maheshpec joined	22:49
	→ Bobdude joined	22:50
	→ ZexaronS joined	22:53
	→ dre_ joined	22:53
	← upperdeck left	22:57
	→ mellernoia joined	22:57
	→ upperdeck joined	22:58
	→ cagedwisdom joined	23:00
	← upperdeck left	23:03
	CALINOU → Calinou	23:03
	← finalbeta left	23:03
	→ Kaisyu joined	23:04
	→ nick123_ joined	23:04
	← jrgilman left	23:05
	→ upperdeck joined	23:05
	← Acerific left	23:05
	← nick123 left	23:06
	→ aw1 joined	23:07
	← aw1 left	23:07
	→ peterbecich joined	23:09
	→ nick123 joined	23:09
	← nick123_ left	23:09
	← upperdeck left	23:10
	→ upperdeck joined	23:10
	← Deltanic_ left	23:11
	← justkitsu left	23:12
	→ einnjo joined	23:14
	← upperdeck left	23:15
	← j08nY left	23:16
	→ upperdeck joined	23:16
	← sunri5e left	23:17
	→ sunri5e joined	23:19
	← mellernoia left	23:19
	← upperdeck left	23:21
	→ gugah joined	23:21
	← gugah left	23:21
	← Gustavo6046 left	23:21
	← Murr left	23:22
	→ Murr joined	23:23
	→ upperdeck joined	23:23
	→ Jode joined	23:23
	→ aimelajeunesse1 joined	23:23
	← upperdeck left	23:28
	← dege left	23:28
	→ quirk joined	23:29
	→ goksinen joined	23:29
quirk	what's the best way for deleting a bunch of files from the remote repo?	23:29
	they all end in `.un~`	23:29
	→ Fudge joined	23:29
	→ upperdeck joined	23:30
parsnip	for the next commit?	23:30
rafasc	git rm them on your local repo and push?	23:30
Fudge	any support people in here for the irc gitter? having trouble getting my token	23:30
quirk	they don't exist on local repo, though	23:30
	will it still work?	23:30
	← aimelajeunesse1 left	23:30
parsnip	if a tree falls in the woods, and noone is there to hear it, does it make a sound?	23:30
rafasc	if they're tracked by your repo, they must exist locally too.	23:31
	check the branch out, delete and push.	23:31
	← whitby left	23:31
quirk	ah, they weren't showing because they're all dot files	23:32
	→ whitby joined	23:32
rafasc	there you go :)	23:32
	→ Gustavo6046 joined	23:32
rafasc	!next	23:32
gitinfo	Another satisfied customer. NEXT!	23:32
	← maheshpec left	23:32
	→ dadhadme- joined	23:32
	← dadhadme- left	23:34
	← upperdeck left	23:34
	← goksinen left	23:35
	← fscala left	23:35
rafasc	The only other reason your worktree could be different from your repo is if you have something like sparse checkouts configured.	23:35
	→ fscala joined	23:35
	→ goweol joined	23:36
rafasc	only other I know of, at least.	23:36
	→ upperdeck joined	23:37
	← koell left	23:37
	→ deck joined	23:38
	← Cabanossi left	23:38
	→ fission6 joined	23:39
	← deck left	23:40
	→ Cabanossi joined	23:41
	← upperdeck left	23:41
	→ ShockingIsntIt joined	23:42
	→ upperdeck joined	23:42
	→ cdown joined	23:42
	← Bobdude left	23:43
	→ TikityTik joined	23:43
	← piremi left	23:43
	→ goksinen joined	23:44
	→ Lyqyd joined	23:46
	→ sarri joined	23:47
	← sarri left	23:47
	→ sarri joined	23:47
	← goksinen left	23:48
	← peterbecich left	23:49
	← upperdeck left	23:49
	→ upperdeck joined	23:50
	← nick123 left	23:50
	→ peterbecich joined	23:52
	← Sonderblade left	23:53
	← Fudge left	23:54
	← ShockingIsntIt left	23:54
	→ Bobdude joined	23:55
	→ unine joined	23:56
	→ ShockingIsntIt joined	23:57
unine	hey guys, I've used an email I shouldn't for a commit, is there a way to somehow delete that commit from history along with that information? I know about bfg but I guess it doesn't do that, it only remove files	23:57
	→ goksinen joined	23:58
	← CheckDavid left	23:58
	← upperdeck left	23:59
parsnip	are you sharing the repo? do you care about messing with people that are working with that history?	23:59

Logs Search ←Prev date Next date→

Channels Documentation