| 2024-03-07 |
| ← phylaz left | 00:00 |
| ← iamtheranger left | 00:03 |
| → iamtheranger joined | 00:03 |
| ← qgnox left | 00:04 |
| ← daniel3 left | 00:14 |
| ← alexherbo2 left | 00:17 |
| → cdown joined | 00:17 |
| ← dostoyevsky2 left | 00:17 |
| → dnh joined | 00:22 |
| → jim joined | 00:24 |
| ← defjam left | 00:26 |
| → defjam joined | 00:27 |
| ← MGF_Fabio left | 00:27 |
| ← jacobk left | 00:31 |
| → dostoyevsky2 joined | 00:32 |
| ← henry40408 left | 00:35 |
| → henry40408 joined | 00:35 |
| ← cjoke left | 00:37 |
| ← PantelicGR left | 00:42 |
| ← intelfx left | 00:42 |
| → tirnanog joined | 00:43 |
| → intelfx_ joined | 00:43 |
| intelfx_ → intelfx | 00:47 |
| ← tbrowder__ left | 00:49 |
| → tbrowder__ joined | 00:50 |
| ← dnh left | 00:51 |
| ← john_johnk left | 00:54 |
| ← VJohn left | 00:57 |
| → versatile_ joined | 00:57 |
| ← bodiccea left | 00:58 |
| → john_johnk joined | 00:58 |
| → bodiccea joined | 00:58 |
| ← versatile left | 01:00 |
| ← john_johnk left | 01:02 |
| → jacobk joined | 01:04 |
| ← intelfx left | 01:14 |
| → intelfx_ joined | 01:14 |
| → kilobyte_ch joined | 01:16 |
| ← jacobk left | 01:17 |
| intelfx_ → intelfx | 01:19 |
| → R2 joined | 01:21 |
| → Xeroine joined | 01:21 |
| ← R2robot left | 01:22 |
| → hbautista joined | 01:23 |
| ← cousteau_ left | 01:24 |
| ← V_ left | 01:25 |
| ← R2 left | 01:28 |
| ← luke-jr left | 01:28 |
| → R2robot joined | 01:28 |
| → luke-jr joined | 01:30 |
| ← fling left | 01:32 |
| ← rbatty left | 01:32 |
| → fling joined | 01:35 |
| ← gsi left | 01:36 |
| → gsi joined | 01:37 |
| ← davispuh left | 01:46 |
| ← JanC left | 01:48 |
| → JanC joined | 01:50 |
| → phylaz joined | 01:53 |
| ← szkl left | 01:53 |
| ← miigotu left | 01:59 |
| → miigotu joined | 01:59 |
| → Lord_of_Life_ joined | 02:00 |
| ← Lord_of_Life left | 02:01 |
| Lord_of_Life_ → Lord_of_Life | 02:01 |
| ← cpackham left | 02:06 |
| → cpackham joined | 02:07 |
| ← bleb left | 02:15 |
| → bleb joined | 02:20 |
| ← kantlivelong left | 02:23 |
| ← pedahzur left | 02:25 |
| ← jimklimov left | 02:32 |
| → igemnace joined | 02:33 |
| ← cdown left | 02:33 |
| ← subopt left | 02:36 |
| → peirik joined | 02:36 |
| → subopt joined | 02:38 |
| ← subopt left | 02:39 |
| ← navi left | 02:43 |
| → jimklimov joined | 02:43 |
| ← thuna` left | 02:44 |
| ← tirnanog left | 02:47 |
| → kantlivelong joined | 02:51 |
| ← cpackham left | 02:57 |
| → cpackham joined | 03:03 |
| → maryo_87 joined | 03:06 |
| → donofrio joined | 03:10 |
| → duuuude joined | 03:13 |
| ← donofrio left | 03:16 |
| → jmd joined | 03:17 |
| → Gary_Sinise joined | 03:20 |
| ← gast0n left | 03:21 |
| ← pedrowiski left | 03:22 |
| ← igemnace left | 03:27 |
| → cyberpear joined | 03:28 |
| → eqw joined | 03:31 |
| → _qw joined | 03:31 |
| ← stuv left | 03:32 |
| → skapate joined | 03:34 |
| ← skapata left | 03:36 |
| ← henry40408 left | 03:37 |
| → henry40408 joined | 03:37 |
| → igemnace joined | 03:45 |
| ← weko left | 04:22 |
| ← cbreak left | 04:27 |
| → JamesMowery joined | 04:30 |
| → cbreak joined | 04:31 |
| → weko joined | 04:32 |
| ← bket left | 04:38 |
| → bket joined | 04:41 |
| ← mark_infinite left | 04:42 |
| ← cpackham left | 04:44 |
| ← CheckMyBrain left | 04:49 |
| → mkosmo266 joined | 04:52 |
| ← mkosmo26 left | 04:53 |
| mkosmo266 → mkosmo26 | 04:53 |
| → mkosmo267 joined | 04:59 |
| ← mkosmo26 left | 05:00 |
| mkosmo267 → mkosmo26 | 05:00 |
| → PaulWay[w] joined | 05:02 |
| ← Ishmael left | 05:03 |
|
PaulWay[w]
| Hi all - having a bit of difficulty finding the right way to ask Google for this, but: is there a way to get the git log since the last time a given file was touched? | 05:04 |
|
| Or is that a two-stage 'get last time the given file was touched' and then 'ask git for the log since that date string' process? | 05:04 |
|
ZLima12
| Well if you do git log <file>, it should show you all the commits that the file was touched in | 05:05 |
| → Ishmael joined | 05:05 |
|
ZLima12
| So if you then took the first commit you got out of that, and did `git log <that_commit>..HEAD`, I think that should work | 05:05 |
|
PaulWay[w]
| OK, interesting. Will try that. Thanks! | 05:06 |
|
ZLima12
| There might be a better way, but that's the first thing that comes to mind | 05:07 |
|
| Note that that uses HEAD, so whatever branch you're on will affect your output | 05:09 |
| ← mkosmo26 left | 05:16 |
| ← PaulWay[w] left | 05:17 |
| ← FH_thecat left | 05:21 |
| → mkosmo26 joined | 05:24 |
| → FH_thecat joined | 05:27 |
|
gsish
| the stat(1) command's help suggests that -c accepts formats, among them ctime/mtime/etc in human readable as well as epoch presentations, which shall suit as input for git log filter specs | 05:32 |
| ← knurd left | 05:32 |
|
gsish
| so yes, sounds like two step, regardless of whether you "press it" into a single line invocation :) | 05:33 |
|
| (was to understand that you wanted mtime not ctime) | 05:33 |
| ← crispy__ left | 05:38 |
| → crispy__ joined | 05:38 |
| ← qqq left | 05:39 |
| ← defjam left | 05:40 |
| ← miigotu left | 05:43 |
| → jacobk joined | 05:47 |
| → defjam joined | 05:47 |
| → sahil_ joined | 05:48 |
| ← cyberpear left | 05:48 |
| ← Gary_Sinise left | 05:48 |
| ← defjam left | 05:52 |
| → Chaser joined | 05:55 |
| ← jmd left | 05:57 |
| → jmd joined | 05:59 |
| → defjam joined | 06:04 |
| → miigotu joined | 06:06 |
| ← defjam left | 06:12 |
| ← jmd left | 06:13 |
| ← bn_work left | 06:19 |
| → defjam joined | 06:25 |
| ← zulutango left | 06:28 |
| → zulutango joined | 06:29 |
| ← defjam left | 06:31 |
| → maryo87 joined | 06:34 |
| ← sahil_ left | 06:36 |
| ← maryo_87 left | 06:36 |
| ← skapate left | 06:38 |
| → Jaxef joined | 06:44 |
| → defjam joined | 06:44 |
| → Nigthknight joined | 06:47 |
| ← miigotu left | 06:49 |
| → miigotu joined | 06:50 |
| ← defjam left | 06:50 |
| → slidercrank joined | 06:55 |
| → defjam joined | 07:01 |
| ← crispy__ left | 07:01 |
| ← Ishmael left | 07:04 |
| ← duuuude left | 07:05 |
| → Ishmael joined | 07:07 |
| ← ectospasm left | 07:07 |
| ← defjam left | 07:07 |
| → john_johnk joined | 07:11 |
| → RiFo joined | 07:13 |
| → Crispy joined | 07:14 |
| → duuuude joined | 07:15 |
| ← thiago left | 07:16 |
| → akibageek joined | 07:18 |
| ← john_johnk left | 07:18 |
| → defjam joined | 07:19 |
| ← guru__ left | 07:20 |
| → Guru_DE joined | 07:21 |
| → ectospasm joined | 07:22 |
| ← defjam left | 07:25 |
| ← akibageek left | 07:25 |
| → MGF_Fabio joined | 07:25 |
| → akibageek joined | 07:25 |
| → zetef joined | 07:27 |
| → john_johnk joined | 07:31 |
| → defjam joined | 07:32 |
| ← Jaxef left | 07:35 |
| ← defjam left | 07:38 |
| ← john_johnk left | 07:40 |
| ← weko left | 07:43 |
| → weko joined | 07:44 |
| → gandhibobandhi__ joined | 07:47 |
| → defjam joined | 07:51 |
| → john_johnk joined | 07:52 |
| ← hbautista left | 07:53 |
| → Jimmy2027 joined | 07:54 |
| → Gaboradon joined | 07:54 |
| → xx joined | 07:56 |
| ← defjam left | 07:56 |
| ← xx left | 08:00 |
| → xx joined | 08:00 |
| → stenno joined | 08:02 |
| → arch_angel joined | 08:05 |
| arch_angel → arch-angel | 08:05 |
| ← zetef left | 08:06 |
|
Jimmy2027
| hi, it often happens that I'm working on a big change that I want to break down into multiple pull requests. However they depend on each other sequentially. The first change is based on main, the next one is based on the first one and so on. When the first change gets accepted, squashed and merged into main, I have to rebase the next change on main and that often gives me conflicts. Is there any good | 08:08 |
|
| strategy for this? | 08:08 |
| → defjam joined | 08:08 |
| ← jas-maelstrom left | 08:13 |
| → theoceaniscool joined | 08:14 |
|
osse
| Jimmy2027: you can avoid some of the conflicts by using --onto | 08:15 |
|
| e.g. when on your pr2 branch do: git rebase --onto=master pr1 | 08:15 |
| → zetef joined | 08:15 |
| ← defjam left | 08:15 |
| → rbatty joined | 08:17 |
|
Jimmy2027
| oh very interesting, I think this is what I was looking for. Thanks! | 08:18 |
| → danse-nr3 joined | 08:22 |
| ← weko left | 08:26 |
| → weko joined | 08:26 |
| → gloomy_desktop joined | 08:27 |
| → defjam joined | 08:29 |
| ← miigotu left | 08:38 |
| → miigotu joined | 08:38 |
| ← defjam left | 08:38 |
| ← Ishmael left | 08:39 |
| ← kurahaupo left | 08:39 |
| → fling_ joined | 08:40 |
| ← fling left | 08:41 |
| → Ishmael joined | 08:41 |
| ← gxt_ left | 08:42 |
| → gxt_ joined | 08:42 |
| ← xx left | 08:47 |
| fling_ → fling | 08:47 |
| → xx joined | 08:47 |
| ← cs-student left | 08:49 |
| → defjam joined | 08:51 |
| ← akibageek left | 08:56 |
| ← defjam left | 08:57 |
| → Rashad joined | 08:58 |
| → franc joined | 08:59 |
| ← gxt_ left | 09:00 |
| → gxt_ joined | 09:00 |
| ← Ishmael left | 09:02 |
| → defjam joined | 09:08 |
| ← Rashad left | 09:12 |
| → LiENUS joined | 09:13 |
| → user1____ joined | 09:13 |
| → jas-maelstrom joined | 09:14 |
| ← defjam left | 09:14 |
| ← stenno left | 09:16 |
| → Rashad joined | 09:16 |
| → stenno joined | 09:17 |
| franc → francwalter | 09:20 |
| → defjam joined | 09:26 |
| → gandhibobandhi_ joined | 09:27 |
| ← gandhibobandhi__ left | 09:30 |
| → davispuh joined | 09:31 |
| ← defjam left | 09:32 |
| → defjam joined | 09:34 |
| → Ishmael joined | 09:34 |
|
rish
| grawity: Thanks I will try that | 09:34 |
| ← Vonter_ left | 09:35 |
| → Vonter joined | 09:35 |
| ← Rashad left | 09:37 |
| ← miigotu left | 09:37 |
| → miigotu joined | 09:38 |
|
rish
| works | 09:39 |
| ← duuuude left | 09:40 |
| ← defjam left | 09:40 |
| ← danse-nr3 left | 09:41 |
| ← zetef left | 09:42 |
| → danse-nr3 joined | 09:47 |
| ← daddy left | 09:48 |
| → daddy joined | 09:49 |
| → PlasmaHH joined | 09:50 |
| → szkl joined | 09:52 |
| → defjam joined | 09:52 |
|
PlasmaHH
| when using the filter mechanism, will the filter be called with the working directory git was executed in, or will it set it to the project root ( like for hooks?) | 09:52 |
| ← danse-nr3 left | 09:52 |
| ← adanwan left | 09:53 |
| → danse-nr3 joined | 09:53 |
| → adanwan joined | 09:53 |
| → duuuude joined | 09:54 |
| → Rashad joined | 09:54 |
| → cjoke joined | 09:57 |
| ← defjam left | 09:57 |
| ← weko left | 10:01 |
| → clarkk joined | 10:01 |
| ← john_johnk left | 10:01 |
| → zetef joined | 10:05 |
| → defjam joined | 10:09 |
| → weko joined | 10:09 |
| → morph joined | 10:10 |
| → john_johnk joined | 10:10 |
| ← JanC left | 10:13 |
|
osse
| PlasmaHH: You mean filters as specified in gitattributes? | 10:13 |
| → gandhibobandhi joined | 10:13 |
|
PlasmaHH
| indeed | 10:13 |
| → JanC joined | 10:13 |
| ← gandhibobandhi left | 10:15 |
| → gandhibobandhi joined | 10:15 |
| ← gandhibobandhi_ left | 10:16 |
|
osse
| Hmm the docs don't say... | 10:16 |
|
| Why do you need to know? | 10:16 |
| ← Rashad left | 10:17 |
|
osse
| Anything other than the root of the repo sounds strange to me, though. | 10:17 |
| → Flooo joined | 10:17 |
| → akibageek joined | 10:19 |
|
PlasmaHH
| well, since the filter works by passing stuff in and out stdin/stdout a "correct" pwd would not be necessary... I would like to install a per repository filter in .git/ | 10:20 |
|
osse
| PlasmaHH: make a filter that just writes the cwd to a file and runs cat | 10:24 |
|
| should do the trick | 10:24 |
|
| atm I can't find the code that starts the fitlers | 10:25 |
|
PlasmaHH
| yeah, can do that... | 10:25 |
| → masoudd joined | 10:25 |
|
PlasmaHH
| ok, seems to be in the repo root... | 10:28 |
|
| hopefully nobody will chaneg that ;) | 10:28 |
| ← zetef left | 10:32 |
| → zetef joined | 10:36 |
| ← henry40408 left | 10:37 |
| → henry40408 joined | 10:37 |
| ← iamtheranger left | 10:38 |
| ← morph left | 10:39 |
| → vladoski joined | 10:41 |
| ← yuesbeez left | 10:45 |
| ← john_johnk left | 10:46 |
| ← duuuude left | 10:52 |
| → [[PSYCHIATRIST joined | 10:56 |
| → dnh joined | 10:56 |
| ← clarkk left | 10:57 |
| ← dnh left | 11:00 |
| → duuuude joined | 11:02 |
| ← itaipu left | 11:02 |
| → masber joined | 11:02 |
| ← miigotu left | 11:08 |
| → Rashad joined | 11:09 |
| → miigotu joined | 11:09 |
| ← devslash left | 11:10 |
| → devslash joined | 11:10 |
| ← Juest left | 11:10 |
| → sahil_ joined | 11:17 |
| ← [[PSYCHIATRIST left | 11:17 |
| → john_johnk joined | 11:20 |
| ← masber left | 11:21 |
| → Juest joined | 11:21 |
| ← defjam left | 11:21 |
| → dnh joined | 11:23 |
| ← igemnace left | 11:25 |
| → a51 joined | 11:28 |
| ← dnh left | 11:28 |
| → duxsco joined | 11:30 |
| → TomyWork joined | 11:30 |
| → defjam joined | 11:31 |
| ← dsimic left | 11:34 |
| → ThiefMaster joined | 11:34 |
| → dsimic joined | 11:35 |
| ← MGF_Fabio left | 11:35 |
| → navi joined | 11:36 |
| ← duuuude left | 11:38 |
|
PlasmaHH
| playing around with filters a bit... now the gitattributes docs have as an example an indent filter... it seems to be supposed to "fix indenting" ... so you add, commit and now the file with the fixed indentation is in the repo... but you still have the one with "wrong" indentation on disk-... are you supposed to manually check out the file again? or am I missing some step in the filter? | 11:42 |
|
| should the filter create that local file? | 11:42 |
| ← danse-nr3 left | 11:43 |
| ← miigotu left | 11:43 |
| → igemnace joined | 11:43 |
| → miigotu joined | 11:44 |
| ← zetef left | 11:55 |
| ← elastic_dog left | 11:57 |
| → duuuude joined | 12:01 |
| → danse-nr3 joined | 12:05 |
| ← henry40408 left | 12:06 |
| → henry40408 joined | 12:06 |
| ← defjam left | 12:08 |
| → elastic_dog joined | 12:08 |
| ← Flooo left | 12:11 |
| → chao joined | 12:11 |
| stenno → Guest4204 | 12:12 |
| ← Guest4204 left | 12:12 |
| chao → stenno | 12:12 |
| ← cation left | 12:13 |
| ← miigotu left | 12:13 |
| → miigotu joined | 12:14 |
| → mccd joined | 12:18 |
| → Experimentalist joined | 12:22 |
| ← duuuude left | 12:22 |
| → dnh joined | 12:22 |
| → defjam joined | 12:22 |
| ← john_johnk left | 12:22 |
| ← Guru_DE left | 12:25 |
| ← dnh left | 12:26 |
| ← defjam left | 12:28 |
| → john_johnk joined | 12:32 |
| → defjam joined | 12:33 |
| → MGF_Fabio joined | 12:35 |
| ← Rashad left | 12:38 |
|
osse
| good question. I would think you need to check out it again manually | 12:49 |
|
| the filter should just write to stdout | 12:49 |
| ← theobjectivedad left | 12:49 |
| ← henry40408 left | 12:51 |
| → henry40408 joined | 12:51 |
| ← sahil_ left | 12:54 |
| → theobjectivedad joined | 12:54 |
| → sahil_ joined | 12:54 |
| → mark_infinite joined | 12:58 |
| → Guest67 joined | 13:02 |
| ← theobjectivedad left | 13:02 |
| → theobjectivedad joined | 13:03 |
|
Guest67
| hey | 13:03 |
| ← Guest67 left | 13:05 |
| → dnh joined | 13:08 |
| ← snoriman left | 13:10 |
| → cdown joined | 13:11 |
| ← duxsco left | 13:13 |
| ← defjam left | 13:13 |
|
PlasmaHH
| osse: yeah it does, its more like, whats the intended way to do it? like the documentation example shows how to integrate that indent fixing filter but not having it the same in the repo as in the working copy afterwards doesn't sound like its intended | 13:16 |
|
osse
| Your guess is as good as mine on that onbe | 13:18 |
| ← Chaser left | 13:18 |
| → Chaser joined | 13:19 |
| → kurahaupo joined | 13:20 |
| → KnoP joined | 13:20 |
| ← arch-angel left | 13:23 |
| → defjam joined | 13:23 |
| ← weko left | 13:24 |
| → stuv joined | 13:25 |
| → weko joined | 13:33 |
| → Flooo joined | 13:34 |
| ← EdFletcher left | 13:36 |
| → kristian_on_linu joined | 13:37 |
| → skapata joined | 13:38 |
| → tofran joined | 13:40 |
| → luckman212_ joined | 13:42 |
| ← luckman212 left | 13:43 |
| luckman212_ → luckman212 | 13:43 |
| → vlado joined | 13:44 |
| → dviola joined | 13:44 |
| ← vladoski left | 13:46 |
| → Rashad joined | 13:47 |
| ← Rashad left | 13:52 |
| ← danse-nr3 left | 13:54 |
| ← mccd left | 13:55 |
| → danse-nr3 joined | 13:55 |
| → Ingvix joined | 13:57 |
| → julian joined | 13:57 |
| → zetef joined | 13:57 |
| julian → jswagemakers | 13:57 |
|
PlasmaHH
| annoying thing when googling is that so many hits are for git-filter-repo | 14:04 |
| → alexherbo2 joined | 14:04 |
| → ferdna joined | 14:07 |
| → mccd joined | 14:08 |
| ← miigotu left | 14:14 |
| → miigotu joined | 14:14 |
| ← lacrymology left | 14:14 |
| → EdFletcher joined | 14:15 |
| → Rashad joined | 14:16 |
| → rfuentess joined | 14:19 |
| ← akibageek left | 14:23 |
| ← danse-nr3 left | 14:26 |
| → danse-nr3 joined | 14:28 |
| ← kristian_on_linu left | 14:28 |
| ← Chaser left | 14:30 |
| ← alexherbo2 left | 14:31 |
| → StucKman joined | 14:32 |
| → alexherbo2 joined | 14:33 |
| → Chaser joined | 14:36 |
| ← alexherbo2 left | 14:36 |
| ← slidercrank left | 14:38 |
| ← miigotu left | 14:38 |
| → miigotu joined | 14:38 |
| ← RiFo left | 14:39 |
| ← Experimentalist left | 14:43 |
| ← vlado left | 14:43 |
| → vlado joined | 14:44 |
| ← Rashad left | 14:45 |
| ← sahil_ left | 14:47 |
| → akibageek joined | 14:52 |
| ← john_johnk left | 14:54 |
| ← weko left | 14:55 |
| → belsirk joined | 14:56 |
| ← KnoP left | 14:56 |
| → RiFo joined | 14:57 |
| ← rfuentess left | 14:59 |
| → weko joined | 15:05 |
| → Rashad joined | 15:09 |
| ← masoudd left | 15:11 |
| ← Chaser left | 15:12 |
| → john_johnk joined | 15:14 |
| ← defjam left | 15:22 |
| ← jswagemakers left | 15:24 |
| → thiago joined | 15:27 |
| → sahil_ joined | 15:27 |
| ← JanC left | 15:29 |
| → sahil_1 joined | 15:31 |
| ← sahil_ left | 15:31 |
| sahil_1 → sahil_ | 15:31 |
| ← luke-jr left | 15:31 |
| → luke-jr joined | 15:32 |
| → defjam joined | 15:36 |
| → donofrio joined | 15:37 |
| ← Rashad left | 15:38 |
| → stolen joined | 15:39 |
| ← mccd left | 15:41 |
| → JanC joined | 15:41 |
| → thuna` joined | 15:48 |
| ← thiago left | 15:48 |
| ← Vonter left | 15:52 |
| → Vonter joined | 15:53 |
| ← kurahaupo left | 15:55 |
| → gast0n joined | 15:55 |
| → kurahaupo joined | 15:55 |
| ← gandhibobandhi left | 15:58 |
| → gandhibobandhi joined | 15:59 |
| ← jacobk left | 15:59 |
| ← chuanshi left | 16:00 |
| ← zulutango left | 16:00 |
| → chuanshi joined | 16:05 |
| ← danse-nr3 left | 16:05 |
| → danse-nr3 joined | 16:05 |
| ← skapata left | 16:08 |
| ← igemnace left | 16:11 |
| ← belsirk left | 16:11 |
| ← cdown left | 16:11 |
| → humanface joined | 16:13 |
| → Chaser joined | 16:16 |
| ← defjam left | 16:18 |
| → zulutango joined | 16:20 |
| ← maryo87 left | 16:21 |
| ← arahael left | 16:22 |
| ← cmc_ left | 16:23 |
| → thiago joined | 16:23 |
| ← miigotu left | 16:24 |
| → cmc_ joined | 16:24 |
| → miigotu joined | 16:24 |
| → jmd joined | 16:28 |
| → defjam joined | 16:33 |
| ← Flooo left | 16:35 |
| ← sahil_ left | 16:37 |
| ← StucKman left | 16:39 |
| ← humanface left | 16:42 |
| ← miigotu left | 16:43 |
| → miigotu joined | 16:44 |
| → cation joined | 16:45 |
| ← navi left | 16:49 |
| ← luke-jr left | 16:51 |
| ← ferdna left | 16:52 |
| → jacobk joined | 16:53 |
| → navi joined | 16:56 |
| ← gandhibobandhi left | 17:00 |
| ← lispmacs[work] left | 17:05 |
| → wavesong joined | 17:06 |
| ← defjam left | 17:07 |
| ← Chaser left | 17:11 |
| ← Nigthknight left | 17:16 |
| → mx08 joined | 17:16 |
| ← akibageek left | 17:19 |
| ← weko left | 17:19 |
| ← jacobk left | 17:21 |
| → defjam joined | 17:21 |
| ← danse-nr3 left | 17:23 |
| ← manwithluck left | 17:24 |
| ← mingdao left | 17:25 |
| → manwithluck joined | 17:25 |
| → mingdao joined | 17:26 |
| ← defjam left | 17:26 |
| → sahil_ joined | 17:27 |
| → weko joined | 17:28 |
| → Chaser joined | 17:29 |
| ← mingdao left | 17:32 |
| ← dnh left | 17:37 |
| → dnh joined | 17:37 |
| → defjam joined | 17:40 |
| ← zulutango left | 17:43 |
| ← dnh left | 17:45 |
| → mingdao joined | 17:45 |
| ← defjam left | 17:47 |
| ← vlado left | 17:49 |
| → zulutango joined | 17:50 |
| ← ZMarkGC left | 17:55 |
| ← batrick left | 17:55 |
| ← MGF_Fabio left | 17:58 |
| → defjam joined | 18:00 |
| → pedahzur joined | 18:02 |
| ← glozzom left | 18:04 |
| ← toast- left | 18:04 |
| ← defjam left | 18:04 |
| ← miigotu left | 18:06 |
| ← twice left | 18:07 |
| → twice joined | 18:07 |
| ← zetef left | 18:08 |
| ← stolen left | 18:08 |
| → seanh joined | 18:11 |
| → Elliria joined | 18:12 |
| → cytokine_storm joined | 18:17 |
|
cytokine_storm
| hi | 18:17 |
| ← stagas left | 18:17 |
| → defjam joined | 18:18 |
|
cytokine_storm
| so i cloned a repo which has tags. i checked out to tag x | 18:19 |
|
| then i needed to apply patches specific to that tag ie tag x. i use the command (git pull --no-edit _url_) | 18:20 |
|
| but the patch doesnt get for tag x. how do i get the patch for tag x using the command | 18:21 |
| ← defjam left | 18:23 |
|
ikke
| What is the patch for tag x? | 18:24 |
| → miigotu joined | 18:26 |
| → jed joined | 18:29 |
|
cytokine_storm
| ikke: https://paste.debian.net/plain/1309789 | 18:30 |
|
| this is the whole command list i did ^^ | 18:30 |
| → stagas joined | 18:30 |
|
ikke
| What patches are you expecting to be applied? | 18:31 |
|
cytokine_storm
| ah patch for v5.8 but patch for v6.6.0 gets applied | 18:32 |
|
| and when i run make menuconfig i get that its on v6.6.0 | 18:32 |
| → Pikk3wyn joined | 18:38 |
| ← jed left | 18:39 |
| → hbautista joined | 18:41 |
| ← Chaser left | 18:42 |
| → duuuude joined | 18:42 |
| → Chaser joined | 18:44 |
| → cdown joined | 18:48 |
| → defjam joined | 18:51 |
| ← Elliria left | 18:52 |
| ← miigotu left | 18:53 |
| → miigotu joined | 18:53 |
| → Jck_true3 joined | 18:54 |
| ← miigotu left | 18:54 |
| ← Jck_true left | 18:55 |
| Jck_true3 → Jck_true | 18:55 |
| ← jas-maelstrom left | 19:04 |
| ← gumnos left | 19:06 |
| ← thiago left | 19:07 |
| ← cytokine_storm left | 19:09 |
| → thiago joined | 19:14 |
| ← crabbedhaloablut left | 19:16 |
| → gumnos joined | 19:17 |
| → crabbedhaloablut joined | 19:18 |
| → itaipu joined | 19:25 |
| ← defjam left | 19:26 |
| ← weko left | 19:27 |
| → miigotu joined | 19:29 |
| → cpackham joined | 19:34 |
| ← cpackham left | 19:36 |
| → weko joined | 19:37 |
| → cpackham joined | 19:39 |
| ← Chaser left | 19:39 |
| ← miigotu left | 19:42 |
| → miigotu joined | 19:42 |
| → HiccupJul joined | 19:46 |
| ← HiccupJul left | 19:48 |
| → currenthandle joined | 19:52 |
| → duxsco joined | 19:52 |
| ← cdown left | 19:54 |
| → defjam joined | 19:54 |
| ← duuuude left | 19:56 |
| ← defjam left | 20:01 |
| → Deneb joined | 20:03 |
| ← Noisytoot left | 20:04 |
| → jacobk joined | 20:05 |
| ← thiago left | 20:06 |
| ← miigotu left | 20:06 |
| → miigotu joined | 20:07 |
| → dsrt^ joined | 20:08 |
| → jas-maelstrom joined | 20:08 |
| → Noisytoot joined | 20:11 |
| → duuuude joined | 20:13 |
| ← currenthandle left | 20:14 |
| → defjam joined | 20:14 |
| → wootehfoot joined | 20:16 |
| ← duxsco left | 20:18 |
| ← defjam left | 20:19 |
| ← zulutango left | 20:21 |
| → defjam joined | 20:22 |
| → dnh joined | 20:29 |
| → kjartan joined | 20:31 |
| → commiejoke29 joined | 20:32 |
| ← dnh left | 20:34 |
|
ColdKeybo[a]rd
| Anyone switching workstation often? How do you keep your code in sync? For example if you don't want to make a commit just to "backup" some work just so you could pull it on the other machine. Is there a better workflow that would allow for sharing of code spaces across multiple machines? | 20:35 |
| → zulutango joined | 20:35 |
|
ikke
| ColdKeybo[a]rd: well, I do make a commit and push it to share it | 20:36 |
|
| commits can be ephemeral | 20:36 |
|
ColdKeybo[a]rd
| But for example if I have a public repository... it would be silly if I made 2-3 commits every day that are like "Switching to PC B" or something like that | 20:38 |
|
selckin
| ColdKeybo[a]rd: i sync zfs snapshots between my dekstop & laptop | 20:38 |
|
ColdKeybo[a]rd
| I guess if the repo is private then I can rewrite history | 20:38 |
|
| selckin I assumed some semi-manual/automated backup/restore is the way | 20:39 |
| → m0viefreak joined | 20:39 |
|
ColdKeybo[a]rd
| Or maybe have a paralel private git server where I can commit push/pull as much as I want | 20:39 |
|
selckin
| only did it in the wrong direction once and lost a days work, not sure if that counts as a backup | 20:39 |
|
ColdKeybo[a]rd
| But I assume dealing with multiple origins might not be as fun :) | 20:39 |
|
ikke
| ColdKeybo[a]rd: I make them in a feature / topic branch and undo them / amend them | 20:41 |
| ← JanC left | 20:44 |
| → JanC joined | 20:44 |
|
ColdKeybo[a]rd
| ikke But it's still visible to everyone right? | 20:44 |
|
gsish
| so? | 20:45 |
|
ikke
| If they specifically look at that branch, yes | 20:45 |
|
Chipzz
| ColdKeybo[a]rd: you can push/ pull between your local repos without publishing to ie github or gitlab | 20:45 |
|
ikke
| But once undone, no longer | 20:45 |
|
ColdKeybo[a]rd
| Ok makes sense | 20:45 |
|
Chipzz
| ColdKeybo[a]rd: what I did in your situation was git push --force | 20:45 |
|
ColdKeybo[a]rd
| Chipzz That is what I'm thinking. Maybe setting up a docker for gitlab server or something and run it locally | 20:45 |
| ← duuuude left | 20:46 |
|
Chipzz
| But use with caution because it's rope with enough ammo to not just shoot you in the foot but blow away both feet at once :P | 20:46 |
|
selckin
| don't need something that complex to just host repos | 20:46 |
|
Chipzz
| ColdKeybo[a]rd: no need for a gitlab at all, you can just push via the ssh protocol between local PCs | 20:47 |
|
| ColdKeybo[a]rd: and in case of windows, git-daemon can help | 20:47 |
| → currenthandle joined | 20:48 |
| ← PlasmaHH left | 20:48 |
| ← chiselfuse left | 20:49 |
|
Chipzz
| ColdKeybo[a]rd: you can set receive.denyCurrentBranch=updateInstead in your repos configs, but like I said above, the thing with blowing away both feet at once. Use with caution | 20:49 |
|
selckin
| and if its $work make sure you're not breaking the law doing that | 20:49 |
| ← miigotu left | 20:50 |
| ← john_johnk left | 20:50 |
| → PlasmaHH joined | 20:50 |
|
ColdKeybo[a]rd
| Ok, so just to continue that analogy. If I have a local GIT server, it's more complex but at least I have the wheelchair ready if I blow both of my feet off? :) | 20:50 |
| → miigotu joined | 20:50 |
|
PlasmaHH
| ColdKeybo[a]rd: I had a coworker once who said he somehow did him a script that works with two remotes for that purpose... no idea about the details though | 20:50 |
|
ColdKeybo[a]rd
| Spinning up a docker image is fairly easy for me and I already have local servers that host bunch of stuff on the network | 20:51 |
| → chiselfuse joined | 20:51 |
|
Chipzz
| having a local git server will not make much of a difference | 20:51 |
| → akibageek joined | 20:51 |
|
Chipzz
| ColdKeybo[a]rd: you're thinking of the layout of your git repos like a tree. Think about it as a spider-web instead | 20:51 |
|
| PlasmaHH has no problems having sync commits in the history... | 20:51 |
|
selckin
| it's using an aircraft carrier when you needed a bicycle | 20:52 |
|
Chipzz
| ColdKeybo[a]rd: but you don't *need* a git server, and it will only complicate your use-case, because you first need to push to the git server from client A, and then pull from client B | 20:52 |
|
j416
| put the repo on a usb drive; problem solved? | 20:52 |
|
Chipzz
| ColdKeybo[a]rd: it's perfectly possible to exchange commits between A and B directly | 20:52 |
|
PlasmaHH
| j416: excruciatingly slow... | 20:53 |
|
j416
| PlasmaHH: why? | 20:53 |
|
ColdKeybo[a]rd
| Chipzz Sure. But I'm also thinking A might be offline or I might finish work on A and then go do something else without having B running | 20:53 |
|
| In that scenario server might be like a "proxy" of sorts | 20:54 |
|
Chipzz
| ColdKeybo[a]rd: my above warnings were because it's possible to do bad things, but only if you're being an idiot ;P | 20:54 |
|
ColdKeybo[a]rd
| Also, to be honest I was not aware that you could push from pc to pc. That is awesome! | 20:54 |
|
Chipzz
| or being careless | 20:54 |
|
PlasmaHH
| j416: because unless you use something really high end you rarely get very much about 100mb/s write speed | 20:54 |
|
ColdKeybo[a]rd
| I'm 2/2 on those :) | 20:54 |
|
Chipzz
| if you take care about what you do then you probably won't | 20:54 |
|
ColdKeybo[a]rd
| Ok, I'm really happy that I asked because I was clueless how powerful git is... you can push from PC to PC, that is wild to me :) | 20:55 |
|
| I might try it just for fun and then see which workflow works better | 20:55 |
|
j416
| PlasmaHH: I'm not sure what rock you live under but there are drives that are much faster than that | 20:55 |
|
Chipzz
| ColdKeybo[a]rd: what OS are your PCs running? Windows or Linux/ OSX? | 20:55 |
|
ColdKeybo[a]rd
| Windows and Linux | 20:55 |
|
| For setting up a server, is Gitlab, Gittea or something else recommended? | 20:56 |
|
PlasmaHH
| j416: sure there are but they are not that abundant and a bit costly and none of them reaches the 730mb/s I have on my laptop | 20:56 |
|
Chipzz
| ColdKeybo[a]rd: to push to/ pull from linux, just use the ssh protocol for git. For Windows, use git-daemon to push to it | 20:56 |
|
j416
| PlasmaHH: what unit is that? | 20:56 |
|
selckin
| PlasmaHH: iops much more important | 20:56 |
|
PlasmaHH
| selckin: possibly but I max out the 730 when building our company project so thats the important point for me | 20:57 |
|
Chipzz
| ColdKeybo[a]rd: I may (or may not) have a .bat file laying around to run git-daemon on windows, if you're interested | 20:57 |
|
j416
| PlasmaHH: also, reading/writing text files (which code usually is) often doesn't need extreme speed | 20:58 |
|
| does it? | 20:58 |
|
Chipzz
| j416: except the git objects aren't stored as text files | 20:58 |
|
j416
| Chipzz: the amount of data is the same | 20:58 |
|
PlasmaHH
| j416: no but building stuff does | 20:58 |
|
j416
| PlasmaHH: that depends a lot on the compiler, too | 20:59 |
|
| anyway, this is a side track. I wanted to suggest a valid option; USB drive is valid. | 20:59 |
| ← chiselfuse left | 21:01 |
| → zetef joined | 21:01 |
| → chiselfuse joined | 21:01 |
| → thiago joined | 21:04 |
| ← EvgenyK left | 21:05 |
|
gsish
| +1 for the drive, I believe nobody said that _the_ repo needs to reside there, nor a workspace | 21:06 |
|
| you can perfectly fine use the USB drive as "the transfer repo" aka "the server" if you want to | 21:06 |
|
| and do the math, "only" getting 100MiB/s throughput supposed to be an issue? which projects do you work on that one sync per day (transferring deltas) is more than a few seconds? | 21:07 |
|
| Chipzz intends to write up his experiences using git in spider-web configuration at some point. Gonna name it "Git worst practices" :P | 21:07 |
| → duuuude joined | 21:07 |
| → zetef_ joined | 21:08 |
| ← zetef left | 21:08 |
| → larryv joined | 21:08 |
| → alexherbo2 joined | 21:08 |
| → MGF_Fabio joined | 21:11 |
| → dmc joined | 21:11 |
| ← currenthandle left | 21:12 |
| ← miigotu left | 21:14 |
| ← Coop left | 21:14 |
| ← kjartan left | 21:15 |
| → PaulWay[w] joined | 21:20 |
| → jamiejackson joined | 21:22 |
| → currenthandle joined | 21:26 |
| ← currenthandle left | 21:26 |
| → miigotu joined | 21:26 |
| ← alexherbo2 left | 21:27 |
| → masoudd joined | 21:34 |
| → clarkk joined | 21:35 |
| ← wootehfoot left | 21:36 |
| → currenthandle joined | 21:37 |
| ← currenthandle left | 21:37 |
| ← miigotu left | 21:44 |
| → miigotu joined | 21:45 |
| ← miigotu left | 21:52 |
| → john_johnk joined | 21:54 |
| ← jacobk left | 21:56 |
| ← theoceaniscool left | 22:03 |
| ← yuljk left | 22:07 |
| → yuljk joined | 22:08 |
| ← PaulWay[w] left | 22:08 |
| ← Deneb left | 22:08 |
| → PaulWay[w] joined | 22:09 |
| ← gildasio left | 22:14 |
| → Coop joined | 22:14 |
| → gildasio joined | 22:16 |
| → duderonomy joined | 22:20 |
| ← sahil_ left | 22:20 |
| ← duderonomy left | 22:24 |
| → duderonomy joined | 22:25 |
| ← zetef_ left | 22:25 |
| ← duuuude left | 22:29 |
| → currenthandle joined | 22:31 |
| ← currenthandle left | 22:34 |
| → duuuude joined | 22:39 |
| ← commiejoke29 left | 22:41 |
| ← m0viefreak left | 22:43 |
| → miigotu joined | 22:46 |
| → skapata joined | 22:46 |
| → ZacSharp joined | 22:54 |
| ← thiago left | 22:56 |
| → plasma41 joined | 22:58 |
| ← opal left | 23:03 |
| ← miigotu left | 23:04 |
| → opal joined | 23:04 |
| ← cation left | 23:05 |
| → cation joined | 23:07 |
| ← AlexKalopsia1945 left | 23:08 |
| → AlexKalopsia1945 joined | 23:08 |
| ← insidesources left | 23:09 |
| ← thuna` left | 23:13 |
| → howdoi joined | 23:16 |
| → insidesources joined | 23:17 |
| → jacobk joined | 23:17 |
| ← aristaware44392 left | 23:22 |
| ← cjoke left | 23:23 |
| → aristaware44392 joined | 23:23 |
| ← xx left | 23:26 |
| → miigotu joined | 23:27 |
| ← PlasmaHH left | 23:28 |
| → Sasazuka joined | 23:29 |
| ← Sasazuka left | 23:34 |
| ← MGF_Fabio left | 23:42 |
| → thiago joined | 23:43 |
| ← TomyWork left | 23:43 |
| → Sasazuka joined | 23:47 |
| ← Pikk3wyn left | 23:50 |
| ← weko left | 23:54 |
| ← miigotu left | 23:58 |