IRCloggy #git 2022-07-31

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.

2022-07-31

← ag4ve left00:00
← nyah left00:04
→ bambanxx joined00:05
→ nate4 joined00:11
→ Murr- joined00:23
← m0viefreak left00:24
← Murr left00:25
← BlessJah left00:25
Murr- → Murr00:25
← nate4 left00:27
→ BlessJah joined00:27
→ av2156 joined00:31
← xx left00:35
→ vdamewood joined00:44
→ vinleod joined00:49
vdamewood → Guest705100:49
← Guest7051 left00:49
vinleod → vdamewood00:49
← LuKaRo left00:50
→ LuKaRo joined00:52
→ av2156_ joined00:55
← av2156 left00:57
← av2156_ left01:06
← zebrag left01:09
← keypusher left01:12
→ zebrag joined01:13
← pretty_dumm_guy left01:14
→ Xenguy joined01:25
← Yruama left01:32
← tyson2 left01:33
← umbramalison left01:34
→ umbramalison joined01:35
← jazzy left01:43
→ jazzy joined01:45
← Murr left01:47
→ Murr joined01:48
← tolot left01:48
← jazzy left01:50
→ JanC_ joined01:50
← JanC left01:51
JanC_ → JanC01:51
← jjakob left01:51
→ jazzy joined01:53
→ Murr- joined02:01
← Murr left02:03
Murr- → Murr02:03
← OnkelTem left02:12
→ OnkelTem joined02:14
← hexnewbie left02:15
→ hexnewbie joined02:21
← FinnElija left02:23
→ finn_elija joined02:23
finn_elija → FinnElija02:23
← ramblebamble left02:27
→ ramblebamble joined02:28
← tirnanog left02:29
← Sulky_ left02:37
← OnkelTem left02:42
→ Murr- joined02:44
← Murr left02:47
Murr- → Murr02:47
← bambanxx left02:48
→ OnkelTem joined02:55
→ Yruama joined03:04
← Guest72 left03:06
→ jjakob joined03:12
→ bambanxx joined03:15
→ Gambino_ joined03:19
→ nate4 joined03:20
← Yruama left03:20
← Gambino_ left03:22
→ Gambino_ joined03:22
Gambino_ → Gambino03:22
← bambanxx left03:28
→ bambanxx joined03:32
← zebrag left03:32
← wallabra left03:36
→ wallabra joined03:37
← nate4 left03:41
← Leonarbro left03:49
→ Leonarbro joined03:50
← ChmEarl left03:56
→ Murr- joined03:58
← Murr left04:00
Murr- → Murr04:00
→ thiago joined04:04
→ nate4 joined04:07
← nate4 left04:12
← chao left04:13
→ lgc joined04:13
← drbeco left04:14
← sudoforge left04:19
← lgc left04:21
→ nate4 joined04:24
← froyo left04:25
← lucasta left04:29
← foul_owl left04:34
← nate4 left04:37
← ferdna left04:51
→ foul_owl joined04:52
← thiago left04:54
→ Murr- joined05:09
→ madewokherd` joined05:10
← Murr left05:11
Murr- → Murr05:11
← madewokherd left05:12
← wallabra left05:15
→ Murr- joined05:17
→ wallabra joined05:17
← Murr left05:20
Murr- → Murr05:20
→ lolok joined05:20
→ maryo joined05:25
→ srinidhi joined05:27
← mon_aaraj left05:34
→ Murr- joined05:34
← maryo left05:36
← Murr left05:36
Murr- → Murr05:36
→ The_Blode joined05:39
← ramblebamble left05:43
→ froyo joined05:44
→ gas51627 joined05:46
→ mon_aaraj joined05:56
→ cdown joined05:59
→ Murr- joined05:59
← Murr left06:02
Murr- → Murr06:02
← jazzy left06:04
← lolok left06:18
→ lolok joined06:19
→ froyo3 joined06:22
← skapata left06:23
← myme1 left06:23
← dviola left06:23
→ myme1 joined06:24
← froyo left06:24
froyo3 → froyo06:24
→ GoGi joined06:26
← GoGi left06:26
→ GoGi joined06:26
→ Murr- joined06:26
← Murr left06:28
Murr- → Murr06:28
← bloody left06:41
← forgotmynick left06:48
→ ag4ve joined06:51
← mon_aaraj left06:57
← Natrick left06:59
→ mon_aaraj joined07:01
→ igemnace joined07:04
← Gambino left07:08
← froyo left07:09
→ EvilDMP joined07:09
← gildasio left07:10
→ froyo joined07:10
→ gildasio joined07:11
→ gunner joined07:12
→ Murr- joined07:17
→ Natrick joined07:17
← bambanxx left07:18
← Misotauros left07:19
← Murr left07:19
Murr- → Murr07:19
← smallville7123 left07:25
← lantech19446 left07:31
→ Murr- joined07:39
← Murr left07:41
Murr- → Murr07:41
← iop left07:42
← mon_aaraj left07:42
→ mon_aaraj joined07:44
→ Murr- joined07:44
← cdown left07:46
← Murr left07:46
Murr- → Murr07:46
→ lantech19446 joined07:48
→ Murr- joined07:50
← Murr left07:51
Murr- → Murr07:51
← gunner left07:52
← mon_aaraj left07:55
→ feriman joined07:56
→ mon_aaraj joined07:57
→ han-solo joined07:59
→ Zilch joined07:59
→ tolot joined08:00
→ Ajax1463 joined08:02
← Ajax146 left08:04
Ajax1463 → Ajax14608:04
← igemnace left08:06
← Zilch left08:07
→ Murr- joined08:08
← Murr left08:10
Murr- → Murr08:10
← gas51627 left08:15
← thebombzen left08:17
← srinidhi left08:17
→ srinidhi joined08:22
→ carl--- joined08:27
← carl--- left08:33
→ tirnanog joined08:36
→ bayesiananarchis joined08:48
→ Misotauros joined08:52
← sa0 left09:00
→ sa0 joined09:01
← bodiccea left09:01
→ kenanmarasli joined09:03
→ bodiccea joined09:05
→ Wuzzy joined09:08
← bodiccea left09:10
→ Qbit_ joined09:12
→ pulse joined09:14
← The_Blode left09:18
→ thebombzen joined09:19
→ bodiccea joined09:19
→ loulou joined09:19
← loulou left09:19
→ loulou joined09:19
→ masber joined09:22
→ hex_ joined09:38
← Qbit_ left09:40
→ lxsameer joined09:50
← bodiccea left09:51
→ bodiccea joined09:52
← tirnanog left09:55
← han-solo left09:58
← tuskkk____ left10:00
→ keypusher joined10:08
← runlevel_0 left10:10
→ chao joined10:16
← Wuzzy left10:19
← vishal left10:22
→ dionysus69 joined10:22
← hex_ left10:23
→ vishal joined10:24
← Trieste left10:32
← Welp left10:34
→ Trieste joined10:35
← bremner left10:49
← hoochmonger left10:57
→ xx joined10:59
→ bremner joined11:00
← tolot left11:08
← chao left11:09
→ MajorBiscuit joined11:11
→ chao joined11:17
→ han-solo joined11:26
← chao left11:29
→ Qbit_ joined11:31
→ chao joined11:37
→ G30RD13 joined11:37
→ Sulky joined11:41
→ wootehfoot joined11:43
← EvilDMP left11:44
← srinidhi left11:44
→ maryo joined11:53
→ pretty_dumm_guy joined11:59
→ cvmn joined12:00
← wootehfoot left12:03
← mon_aaraj left12:04
→ Ajax1468 joined12:05
← nexalam left12:05
← cweiss07653212 left12:07
← Ajax146 left12:07
Ajax1468 → Ajax14612:07
→ cweiss07653212 joined12:07
→ EvilDMP joined12:14
→ gunner joined12:17
← Qbit_ left12:18
← gunner left12:21
← dionysus69 left12:23
→ Guest92 joined12:25
→ srinidhi joined12:25
→ tolot joined12:26
← G30RD13 left12:26
→ mon_aaraj joined12:28
← Guest92 left12:29
← han-solo left12:29
← mon_aaraj left12:33
→ mon_aaraj joined12:34
→ nyah joined12:42
← bodiccea left12:44
→ Gambino_ joined12:50
← pulse left12:52
→ bodiccea joined12:59
→ rickybob joined13:00
← mon_aaraj left13:00
→ smallville7123 joined13:01
→ mon_aaraj joined13:02
← rickybob left13:05
→ wootehfoot joined13:11
→ dionysus69 joined13:13
← wootehfoot left13:18
← haritz left13:21
transhumanist thanks to both of you, much appreciated!13:21
osse and tirnanog I mean13:21
→ pulse joined13:23
→ han-solo joined13:24
← mon_aaraj left13:28
→ mon_aaraj joined13:30
→ lucasta joined13:31
← cvmn left13:40
→ forgotmynick joined13:47
← masber left13:47
→ powftw joined13:56
→ zebrag joined13:58
→ The_Blode joined14:04
→ ChmEarl joined14:10
→ Yruama joined14:13
← transhumanist left14:22
→ firewyre joined14:31
→ tirnanog joined14:32
→ sudoforge joined14:33
→ thiago joined14:35
← Gambino_ left14:36
→ Gambino_ joined14:36
← wallabra left14:40
← Yruama left14:41
→ TomyLobo joined14:44
→ Yruama joined14:46
→ wallabra joined14:47
→ derfflinger joined14:47
← Xenguy left14:55
← gildasio left15:03
→ gildasio joined15:04
→ m0viefreak joined15:18
← srinidhi left15:20
← gildasio left15:23
→ madewokherd joined15:24
→ gildasio joined15:25
→ atrigent joined15:26
← madewokherd` left15:27
← smallville7123 left15:27
← atrigent left15:31
← Gambino_ left15:35
← maryo left15:37
← mikrosis left15:45
→ arch_angel joined15:46
arch_angel → arch-angel15:46
→ transhumanist joined15:53
→ wootehfoot joined15:55
← dionysus69 left15:55
→ haritz joined15:58
← haritz left15:58
→ haritz joined15:58
→ maryo joined16:00
→ RatSalad joined16:02
→ ___nick___ joined16:02
← haritz left16:03
← ajfriesen left16:05
→ Ajax1462 joined16:05
← froyo left16:06
← Ajax146 left16:07
Ajax1462 → Ajax14616:07
→ ajfriesen joined16:09
← nyah left16:11
→ coot joined16:12
← RatSalad left16:12
→ jazzy joined16:16
→ skapata joined16:17
← skapata left16:17
→ skapata joined16:17
→ bloody joined16:20
← loulou left16:22
← powftw left16:25
→ av2156_ joined16:29
← YuGiOhJCJ left16:32
← Trieste left16:35
← ___nick___ left16:40
← wootehfoot left16:42
→ ___nick___ joined16:42
→ lucasta- joined16:42
→ bambanxx joined16:43
← ___nick___ left16:43
→ ___nick___ joined16:45
→ hamburgler joined16:45
→ Betal joined16:45
→ Trieste joined16:59
→ haritz joined17:00
← haritz left17:00
→ haritz joined17:00
→ rgrinberg joined17:01
→ nate4 joined17:01
← han-solo left17:03
→ tyson2 joined17:07
→ dvanloon2 joined17:07
← dvanloon left17:08
dvanloon2 → dvanloon17:08
← bodiccea left17:12
← derfflinger left17:15
→ han-solo joined17:15
← Visne left17:16
→ derfflinger joined17:16
→ Welp joined17:16
→ Visne joined17:18
← Yruama left17:18
→ dionysus69 joined17:21
→ lucasta_ joined17:22
← lucasta- left17:22
← rgrinberg left17:22
← bambanxx left17:24
→ bambanxx joined17:27
→ Yruama joined17:27
← lucasta_ left17:32
→ froyo joined17:33
→ otisolsen70 joined17:33
→ bubbac joined17:35
→ FH_thecat joined17:40
→ runlevel_0 joined17:42
→ froyo7 joined17:46
← Murr left17:46
→ Murr joined17:47
→ hoochmonger joined17:47
← froyo left17:47
froyo7 → froyo17:47
→ jinsun__ joined17:48
jinsun → Guest446617:48
← Guest4466 left17:48
jinsun__ → jinsun17:48
← tolot left17:48
→ jinsun__ joined17:54
← jinsun left17:54
jinsun__ → jinsun17:54
→ loulou joined17:55
← loulou left17:55
→ loulou joined17:55
← sudoforge left17:57
bubbac Ok, I know this is a dumb question, but i'm having a bit of trouble with merging. I've got a repo on a remote server with a few files, and I clone it with 'git clone git@server:/project'... I use git on my local machine, create a branch, commit some changes, switch back to master, git push, it gets sent to remote server. what is the proper way to now merge that back into master? it works fine if I do17:57
it locally on the remote repo, but if I try on the host I work on I get a long message, mainly '...updating the current branch in a non-bare repository is denied...'17:57
← loulou left18:00
→ squirrel joined18:02
→ Qbit_ joined18:02
← Lord_of_Life left18:03
tirnanog you can't push into a non-bare repo unless you enable a special option in said repo. one is generally expected to fetch/pull into non-bare repos (that have a working copy), rather than push to them.18:03
→ Lord_of_Life_ joined18:03
← nate4 left18:03
bubbac so the repo 'maintainer' would fetch/pull the branches that they would like to apply to that repo?18:04
Lord_of_Life_ → Lord_of_Life18:04
→ ferdna joined18:05
← subopt left18:06
tirnanog to their working copies, at any rate. for pushing, the usual approach would to have a remote that contains a bare repo.18:07
anyway, see receive.denyCurrentBranch in git-config(1). technically, it's possible to do what you're trying to do as long as the remote repo is clean. can't say I've ever tried it.18:09
→ rgrinberg joined18:10
bubbac i think i'm also missing git-request-pull18:10
← han-solo left18:11
→ jinsun__ joined18:11
jinsun → Guest505118:11
← Guest5051 left18:11
jinsun__ → jinsun18:11
← jinsun left18:12
← Sulky left18:13
tirnanog git request-pull, most likely.18:13
there is an executable by the name of git-request-pull but it's part of the plumbing and wouldn't be expected to be in PATH. you should be able to reach it with git itself.18:14
bubbac ah yes you're right, I just pulled the name from the top of the git-scm page18:15
← FH_thecat left18:18
tirnanog another way to replicate some changes between two working copies in a pinch could be to use git format-patch. the resulting patches can be applied with git am, commit messages and all.18:19
← av2156_ left18:22
← coot left18:24
← cation left18:24
← maryo left18:25
→ cation joined18:25
← transhumanist left18:31
→ FH_thecat joined18:31
→ transhumanist joined18:31
← transhumanist left18:32
← Qbit_ left18:33
→ transhumanist joined18:34
→ jinsun joined18:39
→ cdown joined18:41
→ Qbit_ joined18:47
← liberaguy101 left18:52
→ Sulky joined18:52
← ferdna left18:56
→ DibbTubberOne joined18:57
→ liberaguy101 joined18:57
→ coot joined18:59
← dionysus69 left19:07
← mon_aaraj left19:07
→ Common-Lisp joined19:14
← rgrinberg left19:17
← tyson2 left19:19
← lxsameer left19:19
→ bleb joined19:20
→ lxsameer joined19:21
→ dob1 joined19:23
→ rgrinberg joined19:24
← gumnos left19:26
← rgrinberg left19:27
→ mon_aaraj joined19:30
→ rgrinberg joined19:31
← runlevel_0 left19:32
→ Narrat joined19:32
← chao left19:33
← rgrinberg left19:37
← bleb left19:37
← FH_thecat left19:40
← bambanxx left19:42
← gxt__ left19:43
→ gxt__ joined19:43
→ cyrus_mc_ joined19:48
← cyrus_mc_ left19:49
→ bleb joined19:59
→ runlevel_0 joined20:00
← pulse left20:02
← ___nick___ left20:04
→ Ajax1463 joined20:04
→ chao joined20:05
← Ajax146 left20:06
Ajax1463 → Ajax14620:06
← DibbTubberOne left20:09
← mon_aaraj left20:11
← chao left20:20
→ chao joined20:27
→ tyson2 joined20:28
→ dionysus69 joined20:31
← Qbit_ left20:32
← otisolsen70 left20:33
→ lucas_ta joined20:33
← chao left20:33
← lucas_ta left20:34
← wallabra left20:37
← feriman left20:39
→ chao joined20:42
← Common-Lisp left20:44
→ john_johnk joined20:44
← crabbedhaloablut left20:49
← ghost43 left20:49
→ crabbedhaloablut joined20:49
→ ghost43 joined20:50
← gxt__ left20:55
← gildasio left20:55
← ghost43 left20:55
← FinnElija left20:55
← crabbedhaloablut left20:55
→ FinnElija joined20:55
→ gildasio joined20:55
→ ghost43 joined20:56
→ gxt__ joined20:56
← Misotauros left20:56
→ dnh joined20:58
→ crabbedhaloablut joined20:58
→ gunner joined21:01
← squirrel left21:02
→ karabaja4 joined21:03
← john_johnk left21:06
→ Rashad joined21:09
← gunner left21:12
→ gunner joined21:13
→ arescorpio joined21:13
← LuKaRo left21:14
← chao left21:16
← hamburgler left21:19
→ hamburgler joined21:20
← dnh left21:20
→ chao joined21:20
← gunner left21:22
→ gunner joined21:22
→ Guest47 joined21:24
← Guest47 left21:25
← arescorpio left21:25
← EvilDMP left21:25
→ wallabra joined21:31
→ Misotauros joined21:31
← lxsameer left21:32
← runlevel_0 left21:33
← gunner left21:36
← wallabra left21:37
← FinnElija left21:40
→ FinnElija joined21:43
→ Duckle joined21:44
← Narrat left21:45
→ rgrinberg joined21:46
← chao left21:47
→ ferdna joined21:48
← derfflinger left21:54
← Rashad left21:56
← dionysus69 left21:57
→ bambanxx joined21:58
→ Rashad joined21:58
← rgrinberg left22:00
→ oprypin joined22:04
← Sulky left22:05
← konrados left22:09
← coot left22:13
→ LuKaRo joined22:15
→ wallabra joined22:24
← haritz left22:27
← karabaja4 left22:30
→ runlevel_0 joined22:31
→ karabaja4 joined22:33
→ rgrinberg joined22:34
← MajorBiscuit left22:34
← bleb left22:34
← charly left22:44
→ charly joined22:51
← The_Blode left22:53
→ bleb joined22:57
← Rashad left22:58
→ atrigent joined23:02
→ k-man joined23:02
← atrigent left23:03
← rgrinberg left23:05
→ haritz joined23:09
← haritz left23:09
→ haritz joined23:09
← sa0 left23:09
→ sa0 joined23:10
← runlevel_0 left23:11
← kenanmarasli left23:11
→ rgrinberg joined23:11
← haritz left23:12
← sa0 left23:15
→ chao joined23:25
→ loulou joined23:29
← loulou left23:29
→ loulou joined23:29
→ lgc joined23:39
← lgc left23:42
→ sa0 joined23:45
→ haritzondo joined23:46
← crabbedhaloablut left23:48
→ crabbedhaloablut joined23:50
← haritzondo left23:50
→ haritz joined23:50
← haritz left23:50
→ haritz joined23:50
← lucasta left23:51
← loulou left23:52
→ dodobrain joined23:54
← m0viefreak left23:56
→ mx08 joined23:56
→ lucasta joined23:57

Logs Search ←Prev date Next date→ Channels Documentation