IRCloggy #git 2024-01-09

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.

2024-01-09

j416 git isn't even running00:01
what00:01
what ch said.00:03
j416 -> z.00:03
← miigotu left00:04
→ miigotu joined00:04
owuser The git-rebase man page says, The apply backend has safety problems with an ill-timed interrupt pressing Ctrl-C at the wrong time to abort the rebse.00:07
→ jklfds joined00:09
→ linus045 joined00:12
← linus045 left00:13
← miigotu left00:14
← z1haze left00:14
→ miigotu joined00:15
← jklfds left00:16
→ jklfds joined00:25
→ z1haze joined00:26
← kantlivelong left00:27
← z1haze left00:30
→ nivag_2c joined00:32
← jklfds left00:33
← swing left00:38
← GNUmoon2 left00:38
→ fling joined00:39
→ GNUmoon2 joined00:39
← fling left00:39
→ fling joined00:40
← igemnace left00:41
← Misotauros left00:42
→ jklfds joined00:44
← nivag_2c left00:46
← jklfds left00:48
← m0viefreak left00:50
← kurahaupo left00:52
← JayBeeFOSS left00:53
→ jklfds joined00:57
→ stats4647 joined00:59
← jklfds left01:02
→ Gary_Sinise joined01:03
→ JayBeeFOSS joined01:06
← miigotu left01:07
→ miigotu joined01:08
← rgrinberg left01:10
→ gchound joined01:15
→ jklfds joined01:16
→ Rashad joined01:18
← miigotu left01:22
→ lucasta joined01:23
→ miigotu joined01:23
→ Lord_of_Life_ joined01:24
← gchound left01:25
← Lord_of_Life left01:25
Lord_of_Life_ → Lord_of_Life01:25
→ rgrinberg joined01:26
→ meritamen joined01:26
← jklfds left01:31
← thiago left01:35
← n1kx left01:39
→ thiago joined01:39
← miigotu left01:42
← Kulrak left01:43
→ miigotu joined01:43
→ Kulrak joined01:44
→ jklfds joined01:45
→ Night0wl3 joined01:47
→ puff joined01:48
puff Evening.01:48
→ Misotauros joined01:49
← jklfds left01:51
← Grace left01:51
→ ju3rga joined01:53
→ likogan joined01:54
likogan how can I pull from git and overwrite local files with a single command?01:55
← oriba left01:56
likogan i have crontab setup to pull from a repository, and I want it to completely ignore local changes everytime01:56
← rgrinberg left01:59
← Night0wl3 left01:59
← Ragnor left02:00
→ Ragnor joined02:02
→ jklfds joined02:05
← Rashad left02:05
b0nn yeah you can do this, you stash as part of the workflow - then unstash, I'm trying to think where I was doing this because that's where my notes are :)02:07
← stats4647 left02:08
b0nn dammit - I remember now - I was doing it at a previous empl;oyer (we had multiple repos and I needed to run a thing to get them all no matter what state my local was in02:09
→ stats4647 joined02:10
b0nn likogan: rebase.autostash02:11
→ Night0wl3 joined02:11
b0nn https://stackoverflow.com/questions/30208928/can-git-pull-automatically-stash-and-pop-pending-changes02:12
git pull --rebase --autostash02:13
← jklfds left02:14
← stats4647 left02:15
← lucasta left02:15
← Night0wl3 left02:20
← Gary_Sinise left02:22
← cappy left02:23
→ Night0wl3 joined02:23
→ jklfds joined02:28
← Night0wl3 left02:32
← jklfds left02:33
← navi left02:35
→ irrgit__ joined02:38
← irrgit_ left02:42
→ rosco joined02:45
→ jklfds joined02:47
← jklfds left02:52
→ rgrinberg joined02:54
→ jklfds joined02:57
likogan thanks :)02:58
← [codemonkey] left03:02
← jklfds left03:02
→ [codemonkey] joined03:03
→ Gary_Sinise joined03:13
← keypusher left03:14
→ jklfds joined03:15
→ keypusher joined03:15
← rgrinberg left03:20
← jklfds left03:21
← meritamen left03:22
← bloody left03:26
→ rgrinberg joined03:27
→ gsi joined03:29
→ jklfds joined03:29
← ju3rga left03:31
← gsi_ left03:31
← zeka left03:34
← jklfds left03:34
→ zeka__ joined03:35
d3vil stash will store local changes, why not git fetch and git reset --hard origin?03:35
← rossome left03:35
← cdown left03:37
→ lolok joined03:37
→ rossome joined03:38
← lolok left03:38
← rgrinberg left03:42
→ jklfds joined03:47
← jklfds left03:52
← itaipu left03:52
← hyperair left03:53
→ stats4647 joined03:54
← thiago left03:58
→ meritamen joined03:58
← stats4647 left03:59
→ hyperair joined04:04
→ jklfds joined04:05
← jklfds left04:16
→ Night0wl3 joined04:17
← pac1 left04:19
→ rgrinberg joined04:26
→ jklfds joined04:29
→ OpenSaned joined04:32
OpenSaned .04:33
← masoudd__ left04:34
← jklfds left04:35
→ nivag_2c joined04:35
→ jklfds joined04:36
→ hbautista joined04:36
puff Hm, is there a way to use difftool with "git log --all filename"?04:38
I like using meld as my difftool.04:38
The obvious thing to try did not work: git difftool log -alll <filename>04:38
← makara left04:39
← makara1 left04:39
← jklfds left04:41
→ makara joined04:41
→ makara1 joined04:42
← cpackham left04:48
← OpenSaned left04:51
← dsrt^ left04:51
→ OpenSaned joined04:51
→ jklfds joined04:51
→ dsrt^ joined04:52
← tirnanog left04:52
← jklfds left04:57
← ZMarkGC left05:01
← foul_owl left05:03
← OpenSaned left05:06
← rosco left05:08
← chiselfuse left05:15
← FinnElija left05:15
← reset left05:15
→ jklfds joined05:15
→ FinnElija joined05:15
→ chiselfuse joined05:16
← Night0wl3 left05:19
→ ZMarkGC joined05:21
← jklfds left05:21
→ Chaser joined05:21
→ Night0wl3 joined05:24
← chiselfuse left05:31
→ chiselfuse joined05:31
→ jklfds joined05:33
osse puff: You want to open meld for every commit?05:34
GIT_EXTERNAL_DIFF='meld "$2" "$5" && :' git log -p --ext-diff05:36
Should work, I think05:36
← hbautista left05:37
← jklfds left05:39
→ cpackham joined05:44
→ jklfds joined05:50
← xandris left05:58
← cpackham left05:59
← rgrinberg left06:05
← skapata left06:09
→ xdminsy joined06:10
→ xandris joined06:18
→ rgrinberg joined06:20
→ xzed joined06:21
← rgrinberg left06:22
→ irrgit_ joined06:23
← irrgit__ left06:26
→ Ox7C5_ joined06:26
→ LuckyMan joined06:27
→ igemnace joined06:35
→ xzed2 joined06:38
← xzed left06:40
→ Guest58 joined06:46
← Jaxef left06:46
→ rgrinberg joined06:46
← jklfds left06:54
← Guest58 left06:55
← stagas left06:56
→ Jaxef joined06:56
→ foul_owl joined06:56
→ stagas joined06:57
→ jklfds joined06:59
← jklfds left07:04
→ jklfds joined07:07
← hexology left07:08
← nivag_2c left07:10
→ schne1der joined07:12
← jklfds left07:12
← RiFo left07:15
→ jklfds joined07:17
→ RiFo joined07:20
← jklfds left07:26
→ nivag_2c joined07:27
← miigotu left07:27
← Betal left07:29
← Jaxef left07:33
← nivag_2c left07:34
← jas-maelstrom left07:37
← tykling left07:38
→ jklfds joined07:39
← jklfds left07:44
→ xx joined07:44
← xx left07:46
→ EvgenyK joined07:46
→ xx joined07:47
← foul_owl left07:48
→ jklfds joined07:56
→ miigotu joined07:58
← realies left08:00
→ foul_owl joined08:01
→ realies joined08:02
← jklfds left08:06
→ jklfds joined08:11
→ MGF_Fabio joined08:12
← EvgenyK left08:16
→ tykling joined08:17
← Vonter left08:24
← Gary_Sinise left08:24
→ Vonter joined08:25
← rgrinberg left08:27
→ EvgenyK joined08:30
→ rgrinberg joined08:32
→ YuGiOhJCJ joined08:37
→ cloaker joined08:46
← a51 left08:48
j416 likogan: what you want is fetch + reset + possibly clear08:53
→ coot joined08:54
→ stats4647 joined08:55
← stats4647 left08:59
← rgrinberg left09:02
→ r2ro joined09:13
← R2robot left09:14
→ mane_ joined09:18
← mane_ left09:24
← EvgenyK left09:31
→ clime joined09:34
→ EvgenyK joined09:43
→ gandhibobandhi joined09:53
→ owuser1 joined09:53
→ jmd joined09:54
← owuser left09:56
→ StucKman joined09:57
→ nivag_2c joined10:00
← OnkelTem left10:00
← xdminsy left10:05
→ xdminsy joined10:06
→ danse-nr3 joined10:06
← meritamen left10:12
→ gandhibobandhi_ joined10:14
← gandhibobandhi_ left10:15
→ gandhibobandhi_ joined10:15
← igemnace left10:16
← gandhibobandhi left10:16
← EvgenyK left10:17
→ rosco joined10:18
→ meritamen joined10:23
→ igemnace joined10:34
← Chaser left10:38
→ n1kx joined10:38
← de-vri-es left10:40
→ de-vri-es joined10:40
→ Chaser joined10:42
← StucKman left10:46
→ hans__ joined10:49
← Ox7C5_ left10:53
→ theoceaniscool joined11:04
← de-vri-es left11:05
← meritamen left11:05
→ de-vri-es joined11:05
→ thiago joined11:09
← jmd left11:15
→ rainystorm joined11:27
← dsimic left11:27
→ EvgenyK joined11:27
→ dsimic joined11:28
← stagas left11:31
← RiFo left11:37
→ RiFo joined11:39
← thiago left11:42
→ weaksauce joined11:42
→ meritamen joined11:42
→ thiago joined11:43
← weaksauc_ left11:43
← thiago left11:51
← danse-nr3 left12:00
← xzed2 left12:13
← gandhibobandhi_ left12:19
→ jmd joined12:19
→ gandhibobandhi_ joined12:19
← khrbtxyz left12:24
→ khrbtxyz joined12:27
→ ChemicalRascal joined12:29
← erry left12:33
→ erry joined12:34
→ stagas joined12:44
← epony left12:46
→ navi joined12:53
← theoceaniscool left13:03
→ cdown joined13:13
Chipzz 13:16
← GNUmoon2 left13:33
← EvgenyK left13:33
← gandhibobandhi_ left13:34
osse 13:36
→ warmana joined13:36
← cdown left13:37
→ m257 joined13:38
← hans__ left13:38
→ ferdna joined13:39
→ alexherbo2 joined13:43
← m257 left13:45
← khrbtxyz left13:46
→ tirnanog joined13:53
← warmana left13:53
← RiFo left13:54
→ khrbtxyz joined13:58
igemnace 13:58
→ Rashad joined13:58
← owuser1 left14:01
← r2ro left14:02
→ Chaser_ joined14:06
→ m257 joined14:06
← Chaser left14:06
→ danse-nr3 joined14:08
← llh left14:08
→ R2robot joined14:12
→ reset joined14:19
→ skapata joined14:24
→ llh joined14:30
← m257 left14:30
→ GNUmoon2 joined14:31
← donofrio left14:46
→ theoceaniscool joined14:55
→ vysn joined14:59
→ rsx joined15:03
← rosco left15:04
→ a51 joined15:06
← SuperLag left15:11
→ SuperLag joined15:11
← alexherbo2 left15:16
← jaythepirate left15:19
→ cdown joined15:19
← Chaser_ left15:19
→ ph88 joined15:25
ph88 i made some changes and then did git pull. then i get the message "error: Your local changes to the following files would be overwritten by merge". Is there any way i can use my merge tool ?15:26
selckin you have uncommitted changes, remove them, stash them, or commit them, see git status15:26
→ donofrio joined15:27
ph88 what if i stash them, then pull, then pop. It will be just regular changes, can i launch a mergetool on my local changes compared to last commit ?15:28
selckin yes15:28
ph88 nice :)15:29
← szkl left15:33
→ alexherbo2 joined15:38
← skapata left15:40
→ skapata joined15:40
→ Jaxef joined15:41
← YuGiOhJCJ left15:43
← khrbtxyz left15:47
→ khrbtxyz joined15:49
← a51 left15:53
→ kurahaupo joined15:56
← liminal left15:56
← rsx left16:01
→ stats4647 joined16:06
← ferdna left16:06
← ph88 left16:07
← MGF_Fabio left16:08
→ MGF_Fabio joined16:09
→ gh34 joined16:13
→ Guest27 joined16:17
← Guest27 left16:18
← nivag_2c left16:23
← meritamen left16:24
→ a51 joined16:29
← Rashad left16:40
→ EvgenyK joined16:42
→ kjartan_ joined16:42
← llh left16:45
← EvgenyK left16:47
← theoceaniscool left16:48
← vysn left16:49
← stats4647 left16:51
→ llh joined16:52
← danse-nr3 left17:01
→ rgrinberg joined17:04
← MGF_Fabio left17:10
→ EvgenyK joined17:11
→ thiago joined17:12
→ epony joined17:13
← rainystorm left17:14
→ Chaser joined17:15
← thiago left17:15
← cloaker left17:16
→ m257 joined17:18
→ jas-maelstrom joined17:20
→ thiago joined17:22
← m257 left17:23
→ yo0O0o joined17:26
← Night0wl3 left17:28
← agd85120101022 left17:28
→ agd85120101022 joined17:28
← mkosmo2 left17:31
← JanC left17:31
→ Night0wl3 joined17:33
→ JanC joined17:33
→ epicout joined17:33
← epicout left17:33
→ epicout joined17:33
← rgrinberg left17:33
← EvgenyK left17:34
← Chaser left17:35
← coot left17:35
← miigotu left17:37
→ m257 joined17:37
← yuljk left17:38
← m257 left17:38
→ m257 joined17:39
→ Chaser joined17:39
→ miigotu joined17:39
→ yuljk joined17:39
→ mkosmo2 joined17:40
← cdown left17:41
← khrbtxyz left17:42
→ rgrinberg joined17:43
← agd85120101022 left17:47
→ theoceaniscool joined17:47
→ agd85120101022 joined17:47
← Jaxef left17:49
← cmc_ left17:54
← gxt left17:54
← goblin left17:55
→ goblin joined17:55
← igemnace left17:56
→ cmc_ joined17:57
→ gxt joined17:57
← Artea left17:57
← berkay left17:57
← ws2k3 left17:57
← antto left17:57
← moviuro left17:57
→ shahab_ joined17:57
→ ws2k3 joined17:57
→ antto joined17:57
→ masterkorp1 joined17:58
← shahab left17:58
→ berkay joined17:58
← Thanzex left17:58
→ Thanzex joined17:58
← masterkorp left17:58
← AlexKalopsia1945 left17:59
→ moviuro joined17:59
→ AlexKalopsia1945 joined17:59
→ epicout_ joined18:00
→ masterkorp joined18:00
→ stats4647 joined18:01
← masterkorp1 left18:02
→ EvgenyK joined18:02
← adanwan left18:02
→ m0norail- joined18:02
→ Artea joined18:02
← FinnElija left18:02
← Aminda left18:02
← m0norail_ left18:02
← chexum left18:03
→ Aminda joined18:03
→ FinnElija joined18:03
→ chexum joined18:04
← epicout left18:04
← m257 left18:04
→ adanwan joined18:04
← stats4647 left18:05
← Aminda left18:05
→ Aminda joined18:06
← theoceaniscool left18:06
← EvgenyK left18:06
→ theoceaniscool joined18:07
→ Gary_Sinise joined18:08
← alexherbo2 left18:13
← MetaEd left18:13
← yuljk left18:14
→ EvgenyK joined18:14
→ stuv joined18:15
→ stats4647 joined18:19
→ khrbtxyz joined18:19
← adanwan left18:20
→ adanwan joined18:21
→ epicout joined18:23
← EvgenyK left18:25
← irrgit_ left18:25
← theoceaniscool left18:25
← miigotu left18:27
← epicout_ left18:28
→ miigotu joined18:28
← stats4647 left18:32
→ JordiGH joined18:33
→ mexen joined18:34
← FinnElija left18:36
→ FinnElija joined18:37
← jklfds left18:37
← rgrinberg left18:38
← FinnElija left18:42
→ FinnElija joined18:43
→ alexherbo2 joined18:44
← JordiGH left18:48
→ theoceaniscool joined18:48
→ jklfds joined18:49
← alexherbo2 left18:53
→ alexherbo2 joined18:54
← alexherbo2 left18:54
→ EvgenyK joined18:54
→ alexherbo2 joined18:54
→ Narrat joined18:56
← EvgenyK left18:58
← alexherbo2 left18:59
→ cs-student joined19:00
← skapata left19:02
→ yuljk joined19:02
→ EvgenyK joined19:03
→ cpackham joined19:06
→ alexherbo2 joined19:11
→ Betal joined19:16
← EvgenyK left19:17
← theoceaniscool left19:19
← Vonter left19:19
→ Vonter joined19:20
← theobjectivedad left19:23
→ theobjectivedad joined19:25
→ coot joined19:27
→ theoceaniscool joined19:31
→ JanC_ joined19:32
← JanC left19:32
JanC_ → JanC19:32
← fling left19:33
→ PantelicGR joined19:34
→ cdown joined19:35
→ fling joined19:36
← cs-student left19:37
← coot left19:39
→ john_johnk joined19:40
← john_johnk left19:46
→ john_johnk joined19:47
→ szkl joined19:48
← jklfds left19:53
← epicout left19:56
→ jklfds joined20:05
← alexherbo2 left20:05
← thomas_D8 left20:08
← Chaser left20:11
← preisi left20:13
→ thomas_D8 joined20:21
← jfsimon1981_c left20:23
→ cjoke joined20:28
→ ___nick___ joined20:29
← thiago left20:30
→ preisi joined20:31
→ alexherbo2 joined20:33
← john_johnk left20:39
← theoceaniscool left20:39
← cmc_ left20:45
→ cmc_ joined20:46
← jklfds left20:49
← gh34 left20:52
→ gh34 joined20:53
→ jklfds joined20:54
→ oriba joined20:54
← jklfds left20:58
← stuv left21:03
→ jklfds joined21:05
→ john_johnk joined21:07
→ willayd joined21:09
← willayd left21:11
← alexherbo2 left21:14
→ hexology joined21:18
→ bloody joined21:19
← fling left21:23
→ fling joined21:23
→ ZacSharp joined21:24
← Vonter left21:25
← krumelmonster left21:25
→ stats4647 joined21:26
→ Vonter joined21:26
← fling left21:26
→ fling joined21:27
← jlc left21:28
→ x__ joined21:31
← ___nick___ left21:33
→ ___nick___ joined21:35
← ___nick___ left21:37
→ krumelmonster joined21:38
→ ___nick___ joined21:39
→ bierchen joined21:46
← Narrat left21:48
← yo0O0o left21:49
← bierchen left21:51
→ bierchen joined21:51
← kjartan_ left22:00
← jklfds left22:08
→ jklfds joined22:09
→ skapata joined22:09
← jklfds left22:13
← xdminsy left22:17
→ xdminsy joined22:17
← Flow left22:24
→ jklfds joined22:25
← jklfds left22:31
← schne1der left22:31
← squealingcode left22:31
→ jklfds joined22:39
← jmd left22:39
← LuckyMan left22:41
← shored left22:45
← fling left22:46
← myme left22:48
→ myme joined22:48
← stats4647 left22:49
→ stats4647 joined22:50
← clime left22:51
← jklfds left22:51
→ shored joined22:53
→ fling joined22:55
← stats4647 left22:55
→ jklfds joined23:01
→ JordiGH joined23:03
← ___nick___ left23:03
← lcn left23:04
← jklfds left23:05
← gh34 left23:08
→ Flow joined23:08
→ cappy joined23:10
→ jklfds joined23:16
← jklfds left23:21
→ user03 joined23:29
← user03 left23:29
→ user03 joined23:29
→ stats4647 joined23:29
← PantelicGR left23:29
user03 → gchound23:29
← treefrob left23:30
← gchound left23:32
→ jklfds joined23:33
→ Guest33 joined23:34
← Guest33 left23:35
← foul_owl left23:38
← jklfds left23:38
→ foul_owl joined23:38
→ lcn joined23:41
→ treefrob joined23:43
← a51 left23:44
← Saloframes left23:46
→ IguanaBob joined23:47
← n1kx left23:48
→ jklfds joined23:51
→ user03 joined23:54
user03 → gchound23:54
← jklfds left23:57
← tirnanog left23:58

Logs Search ←Prev date Next date→ Channels Documentation