IRCloggy #git 2017-12-30

Logs Search ←Prev date Next date→ Channels Documentation

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-12-30

← sanscoeur left00:01
← houami left00:02
← finalbeta left00:04
← spacefan2 left00:06
→ Amanas joined00:06
← xaa left00:06
→ FoxRocks joined00:07
→ houami joined00:07
→ safe joined00:08
→ vampire_vorador joined00:08
The_Woodsman avar: ah. that makes... a lot of sense00:10
← VoradorPT left00:10
← zivester left00:10
→ zivester joined00:11
← cdown left00:12
← houami left00:12
→ Copenhagen_Bram joined00:14
← Teremy left00:14
→ houami joined00:17
← hattkunskapz left00:19
brainpro1 → brainproxy00:19
← The_Woodsman left00:20
→ Munt_ joined00:21
← houami left00:22
Munt_ → Munt00:22
← belmoussaoui left00:22
→ belmoussaoui joined00:23
← PaulCapestany left00:24
← dege left00:24
→ Shah1 joined00:24
← juv left00:24
→ adamretter joined00:25
→ PaulCapestany joined00:26
→ houami joined00:27
← db8093246 left00:28
← shiva__ left00:28
← PaulCapestany left00:29
← Tobbi left00:29
← bkxd left00:29
→ in1t3r joined00:29
← adamretter left00:30
→ PaulCapestany joined00:31
→ bkxd joined00:32
← houami left00:32
← bkxd left00:32
→ bkxd joined00:33
← dsdeiz left00:33
← bkxd left00:33
→ bkxd joined00:33
→ dsdeiz joined00:33
← bkxd left00:34
→ bkxd joined00:34
← bkxd left00:35
→ bkxd joined00:35
← bkxd left00:35
→ bkxd joined00:36
← bkxd left00:36
→ duderonomy joined00:37
→ houami joined00:37
← ok91 left00:39
→ mikecmpbll joined00:39
← xxMatiasxx left00:40
← belmoussaoui left00:41
→ belmoussaoui joined00:42
← houami left00:42
← gugah left00:45
→ houami joined00:47
← vilez left00:51
← houami left00:52
← belmoussaoui left00:52
→ cdg joined00:53
← xPucTu4 left00:56
→ houami joined00:57
← Murr left00:57
→ Murr joined00:57
← cdg left00:58
→ troulouliou_div2 joined01:01
→ xPucTu4 joined01:01
← brainproxy left01:01
← houami left01:02
← Cabanossi left01:02
← hotpancakes left01:04
→ Cabanossi joined01:04
← Amanas left01:07
→ houami joined01:07
→ brainproxy joined01:07
→ hotpancakes joined01:08
← houami left01:11
→ houami joined01:17
← spongedob left01:17
→ synthetic11000 joined01:20
← Graypup_ left01:20
← yohnnyjoe left01:20
→ Graypup_ joined01:21
← houami left01:22
← troulouliou_div2 left01:23
← jason237 left01:24
→ brainpro1 joined01:25
→ houami joined01:27
← brainproxy left01:28
← Barrt left01:28
→ agowa338 joined01:28
← NightStrike left01:28
← houami left01:31
← mikecmpbll left01:34
← dsdeiz left01:34
→ dsdeiz joined01:35
→ deltam joined01:36
→ houami joined01:37
→ adamretter joined01:40
← sparr left01:41
← houami left01:41
← Shah1 left01:42
→ belmoussaoui joined01:43
← adamretter left01:45
→ houami joined01:47
← agowa338 left01:47
← ahrs left01:48
perrier-jouet hi all01:48
→ ahrs joined01:49
perrier-jouet in remote -v I have spacemacs pusn and fetch but I wanted to add it to my local on pc dotfiles like git add spacemacs ...it says fatal pathsec01:50
← houami left01:51
→ gugah joined01:52
→ shinnya joined01:52
→ houami joined01:56
← zivester left01:58
→ LichtMacher joined01:59
← gxt left01:59
← _ADN_ left02:00
→ jstimm joined02:00
← houami left02:01
thiago perrier-jouet: the question doesn't make sense02:01
perrier-jouet: please rephrase02:02
→ gxt joined02:02
→ houami joined02:06
← Orbitrix left02:09
← infinisil left02:10
→ infinisil joined02:11
← houami left02:11
→ Orbitrix joined02:11
→ robattila256 joined02:16
→ houami joined02:16
← justanotheruser left02:18
→ justanotheruser joined02:20
→ JustAnotherIdiot joined02:20
← LiftLeft left02:20
← philosaur left02:21
← tombusby left02:21
← houami left02:21
→ tombusby joined02:21
→ philosaur joined02:21
JustAnotherIdiot → LiftLeft02:22
perrier-jouet thiago: I succefully forked a git repo and added it to my local dotfiles dwm is the fork in question, but now for spaemacs I can't add it to my dotfiles02:25
thiago: I forked an original dwm repo on github and did all the necessary stuff to add it to my local dotfiles, but I forgot some steps02:26
→ houami joined02:26
← hotpancakes left02:28
→ hotpancakes joined02:29
→ finalbeta joined02:29
← houami left02:31
← JoshuaD left02:32
← hotpancakes left02:32
→ hotpancakes joined02:33
← Hello71 left02:33
perrier-jouet I just want to add a submodule02:33
← TomyLobo left02:34
← tombusby left02:34
→ tombusby joined02:34
perrier-jouet nm git submodule add did it02:35
→ houami joined02:36
→ awkwardpenguin joined02:37
→ Hello71 joined02:37
← FoxRocks left02:38
← awkwardpenguin left02:40
← thiago left02:41
← houami left02:41
← kvik left02:42
→ kvik joined02:43
→ houami joined02:46
← ilbot3 left02:47
→ awkwardpenguin joined02:47
← awkwardpenguin left02:47
← houami left02:51
→ Shah1 joined02:51
→ adamretter joined02:54
→ houami joined02:56
← johnzorn left02:56
← adamretter left02:59
→ ilbot3 joined02:59
← houami left03:01
← ajb-linaro left03:03
→ houami joined03:06
← robattila256 left03:07
→ ajb-linaro joined03:07
← kp__ left03:07
→ gxt_ joined03:09
→ dave0x6d joined03:10
← al-damiri left03:10
→ str joined03:10
← gxt left03:10
← houami left03:10
→ lagothri1 joined03:12
→ Raed|Laptop joined03:15
← lagothrix left03:16
→ houami joined03:16
← shinnya left03:18
← str left03:20
lagothri1 → lagothrix03:20
← houami left03:21
← gugah left03:22
← Munt left03:22
→ houami joined03:26
→ dimi1947 joined03:30
← houami left03:31
← Mike11 left03:32
→ chachasmooth_ joined03:34
→ Sleepy63 joined03:34
← chachasmooth left03:34
→ houami joined03:36
→ cdg joined03:38
← houami left03:40
← cdg left03:43
← Case_Of left03:43
→ Case_Of joined03:43
Case_Of → Guest8251003:44
→ houami joined03:46
→ cdg joined03:46
← Gurrz left03:48
← Guest82510 left03:48
→ Guest82510 joined03:48
← Copenhagen_Bram left03:49
← Guest82510 left03:50
← dsdeiz left03:50
← dimi1947 left03:50
← houami left03:50
→ dsdeiz joined03:51
→ awkwardpenguin joined03:51
→ Copenhagen_Bram joined03:52
← Copenhagen_Bram left03:54
→ houami joined03:56
→ thiago joined03:56
← awkwardpenguin left03:56
← houami left04:00
→ Copenhagen_Bram joined04:00
← dviola left04:03
→ houami joined04:05
← thiago left04:06
→ openthesky joined04:08
→ kus_ joined04:10
← houami left04:10
→ houami joined04:15
← vampire_vorador left04:18
← houami left04:20
→ adamretter joined04:24
→ houami joined04:25
← adamretter left04:27
→ FoxRocks joined04:30
← houami left04:30
→ lyxus joined04:31
→ Case_Of joined04:33
Case_Of → Guest220604:34
→ houami joined04:35
← houami left04:40
→ houami joined04:45
← houami left04:50
← Cabanossi left04:53
← a3Dman left04:55
→ houami joined04:55
→ Cabanossi joined04:56
← drewmcmi_ left04:56
← houami left05:00
→ Gurrz joined05:01
← pks left05:02
← IanLiu left05:03
→ pks joined05:04
→ houami joined05:05
→ justan0theruser joined05:08
← Noldorin left05:09
← houami left05:10
← justanotheruser left05:10
← nimbleark left05:11
← MACscr left05:12
→ a3Dman joined05:14
← dsdeiz left05:14
→ dsdeiz joined05:15
← dsdeiz left05:15
→ dsdeiz joined05:15
→ houami joined05:15
← dave0x6d left05:16
← cdg left05:18
→ yohnnyjoe joined05:18
→ gfixler joined05:19
← houami left05:19
← Raed|Laptop left05:20
→ cdg joined05:20
→ adamretter joined05:22
← yohnnyjoe left05:23
← upperdeck left05:24
→ houami joined05:25
← adamretter left05:26
→ upperdeck joined05:27
← Orbitrix left05:27
→ Orbitrix joined05:28
← synthetic11000 left05:30
← houami left05:30
← |ifei5g00d left05:33
→ bkxd joined05:33
→ houami joined05:35
← houami left05:36
← FoxRocks left05:36
→ houami joined05:36
← bkxd left05:36
→ sparr_ joined05:38
← sparr_ left05:39
← katiex7 left05:44
← boombatower left05:44
→ durham joined05:45
← durham left05:47
→ nidr0x joined05:49
← belmoussaoui left05:50
← houami left05:56
→ houami joined05:57
← Sarge945 left06:01
← houami left06:01
← lyxus left06:05
← m0viefreak left06:06
→ houami joined06:07
← houami left06:08
→ houami joined06:08
← pirocks left06:09
→ bkxd joined06:12
← kvik left06:14
→ kvik joined06:16
← bkxd left06:18
→ re1 joined06:19
→ bkxd joined06:19
← houami left06:20
→ Lyqyd joined06:21
← bkxd left06:22
← cdg left06:29
→ houami joined06:30
→ awkwardpenguin joined06:32
← houami left06:35
→ adamretter joined06:36
← PioneerAxon left06:36
← awkwardpenguin left06:36
→ cdg joined06:37
→ PioneerAxon joined06:37
→ cdg_ joined06:40
→ houami joined06:40
← adamretter left06:41
← cdg left06:42
← cdg_ left06:44
← houami left06:45
→ bkxd joined06:48
→ houami joined06:50
→ cdg joined06:50
→ pirocks joined06:51
→ fatalhalt joined06:54
← cdg left06:55
← houami left06:55
← because left06:57
→ dviola joined06:57
← orbyt_ left06:57
→ because joined06:58
→ houami joined07:00
← pirocks left07:02
→ LocaMocha joined07:05
← houami left07:05
→ staafl joined07:06
→ cdg joined07:09
← Copenhagen_Bram left07:10
← a3Dman left07:10
→ zumba_addict joined07:10
→ houami joined07:10
← energizer left07:12
← staafl left07:12
→ a3Dman joined07:14
← cdg left07:14
← houami left07:15
→ robattila256 joined07:16
→ yohnnyjoe joined07:19
→ houami joined07:20
← yohnnyjoe left07:24
← houami left07:25
← madewokherd left07:29
→ houami joined07:30
→ MACscr joined07:33
← zumba_addict left07:34
← houami left07:35
← njbair left07:38
← LichtMacher left07:39
→ houami joined07:40
→ njbair joined07:41
← jimmyrcom left07:42
← nevodka left07:44
← houami left07:44
→ nevodka joined07:45
← Arcaelyx left07:45
← kadoban left07:45
← nidr0x left07:47
→ nidr0x joined07:48
← masuberu left07:48
→ houami joined07:50
← Wetmelon left07:51
← houami left07:55
→ ArcaTech joined07:57
→ houami joined08:00
← hotpancakes left08:02
→ sjoshi joined08:03
← houami left08:04
← Lyqyd left08:05
→ houami joined08:10
→ imack joined08:12
→ ok91 joined08:12
→ Phylock joined08:12
→ t0adst00l joined08:13
← houami left08:14
→ masuberu joined08:16
→ houami joined08:20
← houami left08:24
← nidr0x left08:25
← phinxy left08:26
→ nidr0x joined08:28
→ houami joined08:29
→ schleppel joined08:33
← houami left08:34
← t0adst00l left08:37
← UTAN_dev_ left08:39
→ houami joined08:39
← ghost43 left08:40
← safe left08:40
→ ghost43 joined08:40
→ UTAN_dev joined08:41
← houami left08:44
→ houami joined08:49
← Shah1 left08:51
← bkxd left08:51
← houami left08:54
← leeN left08:58
→ dave0x6d joined08:59
→ houami joined08:59
→ bkxd joined09:02
→ Gurkenglas joined09:04
← houami left09:04
→ t0adst00l joined09:05
← maqbool_ left09:05
← Gurkenglas left09:05
→ SteffanW joined09:05
→ Gurkenglas joined09:06
→ Shah1 joined09:06
→ King_Hual joined09:09
→ houami joined09:09
← Gurrz left09:10
← houami left09:14
← g00s left09:14
← dviola left09:15
→ houami joined09:19
→ yohnnyjoe joined09:20
→ YuGiOhJCJ joined09:22
← ok91 left09:23
← opalepatrick left09:24
← houami left09:24
← yohnnyjoe left09:24
← fatalhalt left09:26
← sjoshi left09:27
→ houami joined09:29
→ opalepatrick joined09:31
← t0adst00l left09:32
← houami left09:34
← ArcaTech left09:35
← YuGiOhJCJ left09:35
← bkxd left09:36
→ bkxd joined09:36
→ YuGiOhJCJ joined09:36
→ houami joined09:39
→ cdown joined09:41
→ sjoshi joined09:41
← bkxd left09:41
→ schooner joined09:41
→ bkxd joined09:41
← bkxd left09:42
→ bkxd joined09:42
← cdown left09:42
← bkxd left09:42
→ cdown joined09:43
→ bkxd joined09:43
← bkxd left09:43
→ bkxd joined09:44
← schooner left09:44
→ Sasazuka joined09:44
← houami left09:44
← bkxd left09:44
→ bkxd joined09:45
← bkxd left09:45
→ CheckDavid joined09:46
← Sasazuka left09:48
→ katiex7 joined09:48
→ houami joined09:49
← YuGiOhJCJ left09:49
← babyflakes left09:49
→ babyflakes joined09:49
→ lyxus joined09:50
← nidr0x left09:52
← houami left09:53
← Shah1 left09:54
→ ZyX-I joined09:57
→ houami joined09:59
→ borkr joined10:02
← houami left10:04
← sjoshi left10:04
→ sjoshi joined10:05
→ houami joined10:09
← re1 left10:10
→ nidr0x joined10:11
← houami left10:13
← gxt_ left10:17
→ houami joined10:19
→ Mike11 joined10:20
→ mikecmpbll joined10:21
← houami left10:23
→ chaosruler joined10:28
← nidr0x left10:28
→ houami joined10:29
← robattila256 left10:31
← Sigma left10:31
→ belmoussaoui joined10:33
→ nidr0x joined10:33
→ re1 joined10:33
← houami left10:33
→ Sigma joined10:35
→ houami joined10:39
← lyxus left10:41
← houami left10:43
→ Himanshujha19964 joined10:44
→ houami joined10:48
→ jnavila joined10:50
→ thiago joined10:51
← houami left10:53
→ houami joined10:58
→ mikecmpb_ joined11:03
← houami left11:03
← mikecmpbll left11:03
→ tunekey joined11:06
← bibek22 left11:07
← dave0x6d left11:08
→ houami joined11:08
← nidr0x left11:09
→ nidr0x joined11:10
→ jceb joined11:12
← houami left11:13
→ adamretter joined11:13
→ TomyLobo joined11:15
→ robattila256 joined11:15
→ houami joined11:18
→ lyxus joined11:19
→ yohnnyjoe joined11:21
← mikecmpb_ left11:22
← houami left11:23
← yohnnyjoe left11:25
→ houami joined11:28
← belmoussaoui left11:30
→ belmoussaoui joined11:31
→ belmoussaoui_ joined11:32
← houami left11:33
← belmoussaoui left11:36
belmoussaoui_ → belmoussaoui11:36
→ houami joined11:38
→ Darcidride joined11:42
← houami left11:43
adamretter Halfway through a rebase, I accidentally `git rebase --abort`, I then undid that by consulting the reflog and running `git reset --hard HEAD@{1}`. I finsihed working through all the commits in my rebase, but when I got to the last one `git rebase --continue` reports: "fatal: cannot resume: .git/rebase-apply/final-commit does not exist.". Is there someway I can resolve this?11:44
_ikke_ adamretter: No, git rebase --abort removes all the state it stores11:45
so it does not know how to continue11:45
adamretter: you can manually cherry-pick the remaining commits and update the ref11:45
adamretter _ikke_: okay, but I was able to get back into the rebase (with the reset based on the reflog), and continued resolving merge conflicts through the remaining 100 or so commits. I now have a history that looks perfect, but the final git rebase --continue won't complete11:46
← masuberu left11:46
→ houami joined11:48
← houami left11:53
adamretter _ikke_: It looks like I could use the new `git rebase --quit`11:53
→ navidr joined11:54
← nidr0x left11:55
→ Shah2 joined11:56
← akushner left11:57
→ houami joined11:58
→ nidr0x joined11:59
← houami left12:03
→ maheshpec joined12:03
→ phluks joined12:03
→ Tobbi joined12:07
→ houami joined12:08
adamretter _ikke_: Yup that seems to have done what I wanted :-)12:08
← borkr left12:12
← houami left12:12
→ Gurrz joined12:13
← imack left12:15
← jnavila left12:17
→ houami joined12:18
← bergice_ left12:20
← pbrewczynski left12:20
← houami left12:22
→ houami joined12:28
→ masuberu joined12:28
← houami left12:32
← Gurrz left12:35
← Mike11 left12:37
→ houami joined12:38
← houami left12:42
→ drewmcmillan joined12:47
→ houami joined12:48
→ Gurrz joined12:50
→ m0viefreak joined12:50
← houami left12:52
← ZyX-I left12:55
→ houami joined12:57
← nidr0x left12:59
← houami left13:02
→ nidr0x joined13:04
← CheckDavid left13:04
→ jnavila joined13:06
→ narendraj9 joined13:06
← lyxus left13:07
← adamretter left13:07
→ lyxus joined13:07
→ houami joined13:07
← kvik left13:07
→ kvik joined13:08
→ theoceaniscool joined13:09
← houami left13:12
→ narendra` joined13:12
← Darcidride left13:12
← katiex7 left13:12
← narendraj9 left13:13
← unlord left13:13
← Guest2206 left13:14
← salamanderrake left13:15
→ Case_Of joined13:15
→ houami joined13:17
→ yohnnyjoe joined13:21
← houami left13:22
← drewmcmillan left13:23
← Gurkenglas left13:24
→ sarp joined13:25
← narendra` left13:26
← yohnnyjoe left13:26
→ jimmyrcom joined13:27
→ houami joined13:27
→ narendra` joined13:28
→ linuxmodder joined13:29
← chaosruler left13:30
← Case_Of left13:30
→ Case_Of joined13:30
→ chaosruler joined13:30
← Case_Of left13:31
→ linuxmodder- joined13:31
← houami left13:32
← linuxmodder- left13:32
→ linuxmodder- joined13:32
← linuxmodder- left13:32
→ linuxmodder- joined13:32
→ Case_Of joined13:33
← linuxmodder- left13:34
← Case_Of left13:34
→ linuxmodder- joined13:34
← linuxmodder- left13:34
→ linuxmodder- joined13:34
← linuxmodder left13:35
← linuxmodder- left13:35
← belmoussaoui left13:35
→ linuxmodder- joined13:35
← linuxmodder- left13:35
→ linuxmodder- joined13:35
→ ArcaTech joined13:36
← nidr0x left13:36
→ drewmcmillan joined13:37
← linuxmodder- left13:37
→ belmoussaoui joined13:37
→ linuxmodder- joined13:37
← linuxmodder- left13:37
→ linuxmodder- joined13:37
→ houami joined13:37
← linuxmodder- left13:38
← houami left13:42
→ nidr0x joined13:42
← jimmyrcom left13:44
→ houami joined13:47
→ zivester joined13:49
← chaosruler left13:50
→ chaosruler joined13:51
← doug16k left13:51
← houami left13:52
→ kadoban joined13:52
← nidr0x left13:53
→ overlord_tm joined13:56
→ houami joined13:57
← lyxus left13:59
→ adamretter joined13:59
← houami left14:01
← cdown left14:02
→ mikecmpbll joined14:03
← adamretter left14:04
→ doug16k joined14:05
→ houami joined14:07
← houami left14:11
→ MoziM joined14:12
→ jason237 joined14:12
→ UTAN_dev_ joined14:14
→ endiruna joined14:16
← ArcaTech left14:16
← UTAN_dev left14:17
→ ArcaTech joined14:17
→ houami joined14:17
← archheretic left14:20
← houami left14:21
→ nidr0x joined14:23
← maheshpec left14:25
← doug16k left14:25
→ Amanas joined14:27
→ houami joined14:27
← openthesky left14:27
← ArcaTech left14:28
← Shah2 left14:29
← houami left14:31
← kus_ left14:34
← jnavila left14:36
→ houami joined14:37
→ Gustavo6046 joined14:40
→ doug16k joined14:40
← Gustavo6046 left14:41
→ Gustavo6046 joined14:41
← houami left14:41
← kadoban left14:42
← vrc414 left14:42
→ vrc414 joined14:43
← LocaMocha left14:46
→ houami joined14:47
→ xxMatiasxx joined14:48
→ raijin joined14:49
← SteffanW left14:51
← gurrkiin left14:51
→ gurrkiin joined14:51
← houami left14:51
← nidr0x left14:52
→ houami joined14:57
→ xeno_ joined15:00
← houami left15:01
← sarp left15:01
← xeno left15:02
→ adamretter joined15:03
→ nidr0x joined15:04
→ houami joined15:06
→ livingstn joined15:07
← adamretter left15:08
← Gurrz left15:08
← nanga left15:09
← houami left15:11
→ nanga joined15:12
← nanga left15:12
→ nanga joined15:12
← phluks left15:13
← xxMatiasxx left15:13
→ xxMatiasxx joined15:13
McKraken_zzzzz → McKraken15:14
→ houami joined15:16
← narendra` left15:18
← Gustavo6046 left15:18
← opalepatrick left15:18
→ opalepatrick joined15:20
→ gareppa joined15:20
← houami left15:21
← gareppa left15:22
→ yohnnyjoe joined15:22
→ houami joined15:26
← yohnnyjoe left15:27
← xxMatiasxx left15:29
→ cdg joined15:29
→ xxMatiasxx joined15:29
← xxMatiasxx left15:29
→ phluks joined15:29
← nidr0x left15:30
← houami left15:31
→ xxMatiasxx joined15:31
→ nidr0x joined15:33
← cdg left15:34
← raijin left15:34
← mikecmpbll left15:34
→ houami joined15:36
← tango_ left15:39
← houami left15:41
← phluks left15:44
→ imack joined15:45
→ zumba_addict joined15:46
← imack left15:46
→ houami joined15:46
← houami left15:51
→ imack joined15:51
→ mophys joined15:51
→ mikecmpbll joined15:51
← mophys left15:52
← imack left15:53
→ houami joined15:56
→ imack joined15:58
← mlopezviedma left16:00
← houami left16:00
→ paradoxspiral joined16:01
paradoxspiral Hey, why can't I sometimes split a hunk in git add -p? If I do a split and it's still too much the option disappears sometimes16:02
← nidr0x left16:02
← luckman212 left16:03
bremner dunno, but various front-ends can get down to single line changes16:03
→ ZyX-I joined16:05
paradoxspiral what's the least worst cli front-end?16:06
→ KeyJoo joined16:06
grawity pressing 'e' (edit) can give you single-line changes as well16:06
→ tango_ joined16:06
→ houami joined16:06
paradoxspiral that'll work16:06
→ luckman212 joined16:08
← houami left16:11
← mikecmpbll left16:12
← ojdo left16:15
→ sarp joined16:16
→ houami joined16:16
← nanga left16:20
→ jnavila joined16:20
← houami left16:21
← Himanshujha19964 left16:21
→ ojdo joined16:21
← xxMatiasxx left16:22
→ nanga joined16:22
← nanga left16:22
→ nanga joined16:22
→ kus_ joined16:23
← xeno_ left16:24
→ cdg joined16:24
→ metts joined16:24
→ cdg_ joined16:25
→ houami joined16:26
→ xeno joined16:26
→ cdg__ joined16:28
← cdg left16:29
← zumba_addict left16:29
← cdg_ left16:30
→ schooner joined16:30
← houami left16:30
→ troulouliou_div2 joined16:31
→ nidr0x joined16:31
→ beco joined16:32
→ VoradorPT joined16:32
← cdg__ left16:32
→ zumba_addict joined16:32
← because left16:32
→ cdg joined16:35
→ because joined16:35
→ houami joined16:36
→ cdg_ joined16:36
← masuberu left16:38
← cdg_ left16:38
→ Gustavo6046 joined16:38
→ cdg_ joined16:38
← cdg left16:39
← houami left16:40
→ imnothreat joined16:41
→ kp__ joined16:41
← NightMonkey left16:43
← nidr0x left16:44
← raynold left16:44
→ houami joined16:46
← imack left16:48
→ FoxRocks joined16:49
→ NightMonkey joined16:49
→ shantytown joined16:50
← houami left16:51
→ Arcaelyx joined16:52
→ LocaMocha joined16:52
← finalbeta left16:54
→ finalbeta joined16:55
→ houami joined16:56
← sostenuto left16:56
→ sostenuto joined16:58
→ D630 joined16:58
← endiruna left16:58
← houami left17:00
← schooner left17:00
← ghost43 left17:02
→ ghost43 joined17:02
← D630 left17:03
← peepsalot left17:03
← zumba_addict left17:04
← chaosruler left17:05
→ houami joined17:06
→ zumba_addict joined17:06
← troulouliou_div2 left17:09
← houami left17:10
→ cdown joined17:12
← FoxRocks left17:13
→ howdoi joined17:14
→ nidr0x joined17:15
→ houami joined17:16
← dsdeiz left17:16
→ dsdeiz joined17:16
← dsdeiz left17:16
→ dsdeiz joined17:16
→ peepsalot joined17:16
→ orbyt_ joined17:17
← livingstn left17:17
← nidr0x left17:19
← houami left17:21
← zumba_addict left17:21
→ chrysa joined17:23
→ yohnnyjoe joined17:23
← cdown left17:24
→ khmarbaise joined17:24
→ nidr0x joined17:25
→ houami joined17:25
→ endiruna joined17:25
dmj` Hi so I rebased my git history and changed a few commit messages17:26
→ cdown joined17:26
← peepsalot left17:26
← shantytown left17:26
→ shantytown joined17:27
← sjoshi left17:27
← yohnnyjoe left17:28
← nidr0x left17:29
← houami left17:30
← cdown left17:31
← shantytown left17:31
→ peepsalot joined17:32
← peepsalot left17:32
← overlord_tm left17:32
→ peepsalot joined17:33
→ houami joined17:35
→ cdown joined17:38
→ livingstn joined17:39
→ sjoshi joined17:40
← houami left17:40
← xeno left17:41
← sjoshi left17:41
→ xeno joined17:42
nedbat dmj`: yes?17:42
→ sjoshi joined17:42
→ houami joined17:45
→ nidr0x joined17:45
→ wandering_vagran joined17:47
→ solaris joined17:48
← sjoshi left17:49
→ sjoshi joined17:49
← houami left17:50
← nidr0x left17:50
→ houami joined17:55
← livingstn left17:58
← kvik left17:59
→ kvik joined18:00
→ dviola joined18:00
← houami left18:00
← dsdeiz left18:00
→ dsdeiz joined18:01
← dsdeiz left18:01
→ dsdeiz joined18:01
→ Sarge945 joined18:03
← sjoshi left18:04
→ sjoshi joined18:04
→ houami joined18:05
← Sarge945 left18:07
→ Sarge945 joined18:08
← jstimm left18:10
→ JoshuaD joined18:10
← houami left18:10
← Gustavo6046 left18:13
← sjoshi left18:13
→ Wetmelon joined18:15
→ houami joined18:15
→ schooner joined18:16
→ brainproxy joined18:18
← schooner left18:18
← brainpro1 left18:18
→ Mikasi joined18:20
→ SteffanW joined18:20
← houami left18:20
← opalepatrick left18:21
→ Himanshujha19964 joined18:22
→ nidr0x joined18:23
→ sjoshi joined18:24
→ BSaboia joined18:24
osse paradoxspiral: Splitting only works when there are unchanged lines between two separate sections with + and - lines.18:25
← Tobbi left18:28
→ Tobbi joined18:29
← drewmcmillan left18:29
← Ducky^^ left18:30
→ phinxy joined18:30
→ rosco_y joined18:31
→ dave0x6d joined18:31
rosco_y I have created a branch "aBranch" and am happy with it. Now I want to merge it with my master branch and delete "aBranch". Can anyone tell me the steps to do this?18:32
I'm not sure what I did last time, but it seemed to me that I wound up physically deleting all the work I did "aBranch"18:33
→ linuxmodder joined18:33
→ zmt00 joined18:33
← zmt00 left18:33
← linuxmodder left18:34
← King_Hual left18:34
nedbat rosco_y: git checkout master; git merge aBranch18:34
rosco_y: that will get the changes onto master18:34
→ linuxmodder joined18:34
← linuxmodder left18:34
→ linuxmodder joined18:34
rosco_y nedbat: Thank you!18:35
← rosco_y left18:37
ski7777 hi18:38
I have a really advanced git question18:38
nedbat ski7777: i thought you were having a meal? :)18:38
ski7777 nedbat: it is over18:38
← Sarge945 left18:38
ski7777 I have this folder: https://github.com/ski7777/ftcommunity-TXT/tree/bl-pwm/board/fischertechnik/TXT/rootfs/opt/ftc Now I want to move it to a new git repository. Normally I would just mv. But I want to keep all changes as commits. How to solve this?18:39
And I dont want to have the other commits in the new repository18:40
thiago just that folder?18:40
ski7777 thiago: yes18:40
thiago you want git filter-branch with the subdirectory filter18:40
→ sbeyer joined18:41
thiago make that in a copy of your repository18:41
it'll move the folder to the top-level, then exclude all commits that did not touch it18:41
← sarp left18:41
ski7777 thiago: How to export it to an external repository?18:43
thiago the copy of your repository will be that repository18:45
ski7777 ah ok18:45
← kus_ left18:48
← wandering_vagran left18:48
ski7777 thiago: thiago: How to save the contents to a subdirectory in the new repo?18:49
→ tmm88 joined18:49
thiago no, it will be the root of your new repo18:50
hh, how18:51
ok, once it's done, create the new folder, git mv all the contents into it, commit18:51
← zivester left18:51
thiago then pull that commit into your existing repo. It'll complain that they have no common ancestor. That's ok.18:52
your repo will now have two roots.18:52
ski7777 thiago: now step by step18:53
I am now in my old repo and I have created a new branch, where all the changes which I need there will be applied to18:54
Waht to do next?18:54
thiago delete the branch18:54
← sjoshi left18:55
← cdown left18:55
thiago *copy* the repository, git clone or rsync or something18:55
ski7777 thiago: ?18:55
thiago you don't need that branch18:55
nedbat ski7777: if you don't mind me asking, why do you want to separate this from the original repo?18:55
→ sjoshi joined18:55
← tmm88 left18:55
ski7777 I want to chnage it to a buildroot package18:55
thiago in the clone, git filter-branch --subdirectory-filter=path/to/become/new/root18:56
let it finish18:56
→ tmm88 joined18:56
← tmm88 left18:56
→ tmm88 joined18:56
thiago then mkdir path/where/it/will/be, git mv everythignelse path/where/it/will/be18:56
git commit18:56
cd ../finalrepo; git pull ../tmprepo master18:56
nedbat ski7777: you don't think the original authors would be interested in that?18:56
ski7777 nedbat: They may be interested when I have finished it18:57
→ schooner joined18:57
← schooner left18:57
nedbat ski7777: so you'll have to move it all back?18:57
ski7777 I will make a Pull Request18:57
thiago no, you won't18:58
nedbat ski7777: but your changes will be in a repo that isn't a clone, and that has a different structure.18:58
ski7777 ah18:58
now I know what you mean18:58
→ schooner joined18:58
ski7777 The new repository will be pushed to github18:58
thiago not only that, you'll have duplicated commits under a different history18:58
← schooner left18:58
nedbat (if i understand what you are trying to do)18:59
ski7777 Now I have the new repo19:01
← endiruna left19:01
→ schooner joined19:01
← schooner left19:02
→ dpl joined19:02
ski7777 How to remove the folder from the old repo?19:03
just rm and then commit?19:03
thiago yes19:04
← tmm88 left19:05
→ tmm88 joined19:05
nedbat ski7777: i still don't understand why you would want to remove the folder from the old repo if you hope to eventually make a pull request?19:06
ski7777 nedbat: I want to clean up19:06
← tmm88 left19:06
ski7777 Maybe the vendor will release a new device in the next months19:06
→ tmm88 joined19:06
nedbat ski7777: the original repo owner will take these clean ups?19:06
ski7777 We want to support it as fast as possible19:07
So We should have a cleaned repo fo an easy migration19:07
thiago you're going about it the wrong way19:07
ski7777 nedbat: hopefully19:07
thiago I see no need to do what you're trying to do19:07
nedbat ski7777: you should coordinate with them before you make huge changes19:07
thiago just operate on the original repository19:07
← tmm88 left19:09
→ tmm88 joined19:09
← tmm88 left19:09
→ tmm88 joined19:09
← tmm88 left19:11
→ tmm88 joined19:11
← tmm88 left19:11
→ tmm88 joined19:11
→ sarp joined19:11
← tmm88 left19:13
→ tmm88 joined19:13
← tmm88 left19:13
→ tmm88 joined19:13
← jceb left19:14
→ energizer joined19:15
← tmm88 left19:15
→ tmm88 joined19:15
← tmm88 left19:15
→ tmm88 joined19:15
→ staafl joined19:15
→ _ADN_ joined19:16
→ texasmynsted joined19:18
texasmynsted I am not recalling this correctly19:18
→ jceb joined19:19
→ drewmcmillan joined19:19
texasmynsted if I have repoA and then want a totally separate repo, that will never be directly associated with repoA, then I should be able to create a subdirectory repoB in repoA19:19
→ fatalhalt joined19:20
texasmynsted then add repoB/ into the .gitignore19:20
← kvik left19:20
→ yohnnyjoe joined19:20
texasmynsted I did this but inside repoB git seems to still pay attention to it.19:20
thiago you need to git init the repository outside of repoA, then you can mv it inside19:20
texasmynsted I have not git init repoB yet19:20
← mattcen left19:20
texasmynsted ok19:21
→ kvik joined19:21
→ adamretter joined19:21
→ livingstn joined19:22
← xPucTu4 left19:24
texasmynsted hmm. Did that. I added repoB to .git/info/exclude like repoB/ but the directory still shows as Untracked19:26
→ xPucTu4 joined19:26
texasmynsted should it not be completely ignored?19:26
← Tobbi left19:26
← randomstrangerb left19:27
← belmoussaoui left19:27
Zarthus you don't track directories, you track files19:27
thiago but you can ignore entire directories19:27
→ randomstrangerb joined19:27
thiago the issue though is that this is not just a directory. It's a submodule.19:27
Zarthus ah19:27
texasmynsted hmm19:28
Zarthus wouldn't git be smart enough to recognize it as a submodule and not commit all of the contents?19:28
→ brainpro1 joined19:28
texasmynsted I do not want them associated in any way but proximity19:28
→ dreiss joined19:28
Zarthus maybe if you try gitignoring `/repoB/` it will work19:29
texasmynsted rather than just exclude?19:30
Zarthus I don't know how .git/info/exclude works with paths19:30
← brainproxy left19:30
Zarthus I mean the leading slash19:30
it will be the root of your repository, rather than relative position19:30
← arecacea1 left19:30
thiago .git/info/exclude and .gitignore are the same19:30
one is part of the repo (committed) and the other isn't. That's all.19:30
← cdg_ left19:30
thiago useful if you want to ignore stuff you have but other people don't19:30
→ arecacea1 joined19:30
Zarthus yes, but my suggestion is to add a leading slash and see if it works19:30
texasmynsted adding the exact thing to .gitignore worked, but did not work in .git/info/exclude19:31
→ cdg joined19:31
Zarthus with leading slash?19:31
texasmynsted I do not want this committed to .gitignore19:31
no leading slash19:31
I will try that19:31
Zarthus i am talking about exclude19:31
→ Tobbi joined19:31
← kp__ left19:32
Zarthus My assumption (and it's probably wrong) is that .git/info/exclude's `repoB/` expands to ignoring .git/info/exclude/repoB/19:32
texasmynsted leading slash in .git/info/exclude also did not work19:32
thiago yes, it'swrong19:32
Zarthus then i dunno ;D19:32
→ mattcen joined19:35
← konsolebox left19:35
← cdg left19:37
→ floatleft joined19:39
← ewitz left19:39
← re1 left19:39
texasmynsted hmm19:39
If I do git check-ignore -v repoB19:40
I see it is NOT ignored19:40
← tanuki left19:40
→ tanuki_ joined19:40
→ ewitz joined19:40
→ maheshpec joined19:40
→ konsolebox joined19:41
texasmynsted facepalm19:41
texasmynsted I had a typo in the directory name in .git/info/exclude19:41
← waveclaw left19:41
texasmynsted slowly backs out of the room19:41
→ waveclaw joined19:42
→ roygbiv joined19:42
→ kadoban joined19:42
← dpl left19:44
→ HuskyApocalypse joined19:45
← HuskyApocalypse left19:46
→ drewmcmi_ joined19:46
← drewmcmillan left19:47
← maheshpec left19:47
→ db8093246 joined19:48
← texasmynsted left19:48
← vrc414 left19:56
← kvik left19:56
→ kvik joined19:57
→ belmoussaoui joined19:59
→ shantytown_ joined20:01
← BSaboia left20:02
← belmoussaoui left20:03
← shantytown_ left20:03
← orbyt_ left20:03
→ vrc414 joined20:05
← ZyX-I left20:05
← solaris left20:06
→ shantytown_ joined20:06
→ mikecmpbll joined20:07
← db8093246 left20:07
← randomstrangerb left20:08
→ randomstrangerb joined20:08
← shantytown_ left20:09
← Himanshujha19964 left20:09
→ pbrewczynski joined20:10
→ xeno_ joined20:16
→ Chaosruler joined20:17
→ cdown joined20:18
← xeno left20:18
← pelegreno left20:19
← _ADN_ left20:23
← livingstn left20:26
→ pelegreno joined20:27
→ chaosruler2 joined20:29
→ nd_ joined20:31
← nd left20:31
← Chaosruler left20:32
→ livingstn joined20:34
→ HuskyApocalypse joined20:35
→ chaosruler joined20:35
← sarp left20:35
← pelegreno left20:37
→ TomyLobo2 joined20:38
← roygbiv left20:38
← chaosruler2 left20:39
← chaosruler left20:39
← HuskyApocalypse left20:39
→ pelegreno joined20:39
← livingstn left20:40
← TomyLobo left20:41
→ orbyt_ joined20:43
← imnothreat left20:43
→ xxMatiasxx joined20:44
→ sarp joined20:47
→ cdg joined20:47
← nidr0x left20:48
← JanC left20:48
← orbyt_ left20:48
→ JanC joined20:48
← beerdrop left20:49
← albel727 left20:52
← cdg left20:52
← kvik left20:52
→ kvik joined20:53
← sjoshi left20:54
→ beerdrop joined20:54
→ albel727 joined20:55
← Murr left20:57
→ ZyX-I joined20:57
→ Murr joined20:57
→ kus_ joined20:58
→ causasui joined20:59
← causasui left21:00
→ causasui joined21:00
→ belmoussaoui joined21:00
← xxMatiasxx left21:01
→ xxMatiasxx joined21:01
→ katiex7 joined21:01
← xxMatiasxx left21:03
← PioneerAxon left21:04
← belmoussaoui left21:06
← Tobbi left21:06
→ troulouliou_div2 joined21:06
→ PioneerAxon joined21:08
→ fstd_ joined21:10
→ Anticom joined21:11
← sarp left21:12
← fstd left21:14
fstd_ → fstd21:14
→ f3r70rr36f joined21:14
→ dpl joined21:15
← cdown left21:15
→ cdown joined21:15
→ dege joined21:16
→ sarp joined21:16
← dreiss left21:16
← theoceaniscool left21:17
→ ArcaTech joined21:17
← perrier-jouet left21:18
← mattcen left21:18
← randomstrangerb left21:18
→ perrier-jouet joined21:18
→ randomstrangerb joined21:18
← f3r70rr36f left21:19
→ bergice_ joined21:20
← Anticom left21:20
→ xxMatiasxx joined21:22
→ ResidentBiscuit joined21:23
→ cahoots joined21:26
cahoots hi, i'd like git's nice color diffing, instead of /usr/bin/diff, for two random files unrelated to any repos. how can i do this?21:26
→ mattcen joined21:27
→ theoceaniscool joined21:30
→ meesles joined21:31
→ linuxmodder- joined21:32
← linuxmodder- left21:32
→ linuxmodder- joined21:32
← troulouliou_div2 left21:33
← linuxmodder left21:35
grawity `git diff`21:37
yes really21:37
→ raynold joined21:37
grawity there are also programs "colordiff" and "diff-so-fancy"21:37
→ fission6 joined21:38
→ livingstn joined21:41
← xxMatiasxx left21:42
→ xxMatiasxx joined21:42
cahoots grawity, let's say the two files are named file1 and file2, what exact command would i run?21:43
grawity git diff file1 file221:43
possibly with --no-index if inside a repo21:43
← floatleft left21:44
← sarp left21:44
← Amanas left21:44
← livingstn left21:46
← wcpan left21:47
→ wcpan joined21:47
← beco left21:49
→ floatleft joined21:50
← jokajak left21:50
cahoots ah nice, thanks21:51
← Sleepy63 left21:51
→ pirocks joined21:53
→ beco joined21:54
→ jokajak joined21:55
← xcm left21:56
→ xcm joined21:57
← fission6 left21:57
← dfect left21:58
→ Rr4sT joined22:03
← floatleft left22:03
→ floatleft joined22:04
→ livingstn joined22:05
← SteffanW left22:05
← cahoots left22:05
← jnavila left22:06
← sw1m left22:06
→ sw1m joined22:07
mfiano Are there any existing tools that help with any or all of the following? I have a few hundred projects that I need to keep track of in a directory, recursively. 1) show me repositories that haven't been commited to in X amount of days. 2) show me repositories that have commited but unpushed changes. 3) show me repositories with dirty working directories that need to be commited.22:07
→ nidr0x joined22:08
_ikke_ mfiano: I'm not aware of any existing projects tha tdo this22:09
mfiano Bummer, thanks.22:12
← tmm88 left22:12
← livingstn left22:13
→ shodan` joined22:13
→ zivester joined22:15
← shodan` left22:16
← jceb left22:16
→ phluks joined22:17
→ awkwardpenguin joined22:20
← a3Dman left22:21
← yohnnyjoe left22:21
→ Amanas joined22:24
→ _ADN_ joined22:25
← awkwardpenguin left22:25
→ a3Dman joined22:26
→ brainproxy joined22:27
← brainpro1 left22:29
← pbrewczynski left22:30
← schleppel left22:30
← zivester left22:31
← bathtub_shark left22:31
→ brainpro1 joined22:32
→ belmoussaoui joined22:32
→ bathtub_shark joined22:32
← brainproxy left22:32
→ tmm88 joined22:33
← tmm88 left22:33
→ tmm88 joined22:33
← ArcaTech left22:34
← silverdu1t left22:36
→ g00s joined22:36
← a3Dman left22:39
← matoro left22:40
→ a3Dman joined22:40
← xcm left22:41
← meesles left22:42
→ xcm joined22:42
← Amanas left22:42
→ MoziM_ joined22:48
→ cdg joined22:48
← albel727 left22:48
→ dreiss joined22:49
→ darshak joined22:49
← ResidentBiscuit left22:50
→ zivester joined22:52
→ albel727 joined22:52
→ orbyt_ joined22:52
← cdown left22:52
← dsdeiz left22:52
→ dsdeiz joined22:53
← cdg left22:53
→ cdown joined22:55
→ justanotheruser joined22:55
→ Amanas joined22:55
← unreal left22:56
← sasheto left22:56
← jokajak left22:57
← Murr left22:57
→ Murr joined22:57
← justan0theruser left22:57
→ unreal joined22:57
→ Gurkenglas joined22:58
← tmm88 left22:59
→ xaxxon joined22:59
→ jokajak joined23:00
→ sasheto joined23:00
← dreiss left23:00
← cdown left23:02
← oojacoboo left23:03
→ Anticom joined23:04
→ matoro joined23:05
← matoro left23:06
→ matoro joined23:07
→ kus__ joined23:07
→ BigMHere joined23:08
← BigMHere left23:09
← kus_ left23:09
← randomstrangerb left23:10
→ randomstrangerb joined23:11
← linuxmodder- left23:11
fxrs_ are there recommendations whether to create a dedicated gpg key to sign in git?23:12
← Amanas left23:13
fxrs_ is it common to use the same key as the one for mails?23:13
← theoceaniscool left23:14
← mattcen left23:14
→ Sleepy63 joined23:15
← sasheto left23:15
→ mattcen joined23:16
← khmarbaise left23:18
→ Case_Of joined23:19
→ sasheto joined23:21
foo Random question: I'm looking at moving my Evernote stuff into a git repo with mkdocs. Anyone else done something like this?23:22
← kvik left23:22
→ kvik joined23:23
← m0viefreak left23:26
→ m0viefreak joined23:26
→ converge joined23:27
← m0viefreak left23:27
→ m0viefreak joined23:27
→ fission6 joined23:33
← xcm left23:35
→ xcm joined23:36
← dpl left23:36
→ schooner joined23:38
→ cdown joined23:39
← Anticom left23:39
→ solaris joined23:40
→ theoceaniscool joined23:41
← albel727 left23:42
→ raijin joined23:42
← markus-k left23:49
→ markus-k joined23:49
← tunekey left23:51
← beco left23:52
← phluks left23:52

Logs Search ←Prev date Next date→ Channels Documentation