| 2023-09-16 |
| → CharleyBates joined | 00:04 |
| → stats4647 joined | 00:06 |
| ← stats4647 left | 00:10 |
| → ThorMojito joined | 00:12 |
| ← ThorMojito left | 00:13 |
| → C0MMIE joined | 00:16 |
| → ThorMojito joined | 00:21 |
| → cdown joined | 00:22 |
| → ThorMojito1 joined | 00:22 |
| ← ThorMojito left | 00:26 |
| ← skapata left | 00:27 |
| → skapata joined | 00:28 |
| ← navirc left | 00:35 |
| ← duderonomy left | 00:38 |
| → jklfds joined | 00:40 |
| → d1b_ joined | 00:42 |
| ← nickoe25 left | 00:45 |
| → nickoe25 joined | 00:45 |
| ← jklfds left | 00:49 |
| ← grumbler left | 00:50 |
| ← ThorMojito1 left | 00:55 |
| → nanobot567 joined | 00:58 |
| ← nanobot567 left | 00:58 |
| → nate2 joined | 00:59 |
| → xeelad joined | 01:00 |
| ← xeelad left | 01:00 |
| → nanobot567 joined | 01:01 |
| ← mataga left | 01:03 |
| ← nate2 left | 01:04 |
| ← nanobot567 left | 01:06 |
| ← vdamewood left | 01:07 |
| → mataga joined | 01:08 |
| ← mataga left | 01:08 |
| → mataga joined | 01:08 |
| → ThorMojito joined | 01:11 |
| ← omero left | 01:12 |
| → omero joined | 01:14 |
| → duderonomy joined | 01:17 |
| → jklfds joined | 01:17 |
| ← Vonter left | 01:20 |
| ← jklfds left | 01:22 |
| → piwu1 joined | 01:22 |
| → Vonter joined | 01:22 |
| ← powderhorn left | 01:33 |
| → Jaxef joined | 01:35 |
| → nanobot567 joined | 01:35 |
| ← nanobot567 left | 01:36 |
| ← gsi left | 01:40 |
| → wootehfoot joined | 01:41 |
| → gsi joined | 01:41 |
| → jklfds joined | 01:41 |
| ← Jaxef left | 01:42 |
| ← wootehfoot left | 01:46 |
| ← jklfds left | 01:46 |
| → wootehfoot joined | 01:47 |
| ← ketas left | 01:49 |
| → ferdna_ joined | 01:50 |
| → ketas joined | 01:52 |
| ← wootehfoot left | 01:53 |
| ← ferdna left | 01:53 |
| → jklfds joined | 02:00 |
| ← cbreak left | 02:02 |
| → cbreak joined | 02:03 |
| ← jklfds left | 02:04 |
| ← m0viefreak left | 02:05 |
| ← feriman left | 02:05 |
| → vysn joined | 02:10 |
| ← PantelicGR left | 02:12 |
| → BrianBlaze joined | 02:14 |
| → jklfds joined | 02:17 |
| ← jklfds left | 02:21 |
| ← FinnElija left | 02:31 |
| → jklfds joined | 02:33 |
| ← jklfds left | 02:38 |
| ← cdown left | 02:47 |
| → hrtk joined | 02:55 |
| → lunatiq joined | 02:56 |
| ← lunatiq left | 02:56 |
| → lunatiq joined | 02:56 |
| ← hrtk left | 03:00 |
| → FinnElija joined | 03:00 |
| ← ThorMojito left | 03:03 |
| ← omero left | 03:04 |
| → omero joined | 03:06 |
| → jklfds joined | 03:07 |
| ← Gary_Sinise left | 03:10 |
| ← jklfds left | 03:11 |
| ← vysn left | 03:12 |
| → wonko-the-sane joined | 03:13 |
| ← gast0n left | 03:19 |
| → Peng_ joined | 03:32 |
| → jklfds joined | 03:33 |
| ← jklfds left | 03:37 |
| → Jaxef joined | 03:49 |
| ← ferdna_ left | 03:58 |
| ← wonko-the-sane left | 03:59 |
| → wonko-the-sane joined | 04:01 |
| → Gary_Sinise joined | 04:02 |
| ← jacobk left | 04:03 |
| → agd85120101 joined | 04:04 |
| → jklfds joined | 04:05 |
| → CaCode joined | 04:06 |
| ← jklfds left | 04:09 |
| → jklfds joined | 04:10 |
| ← larryv left | 04:10 |
| ← CharleyBates left | 04:12 |
| → jacobk joined | 04:14 |
| ← jklfds left | 04:15 |
| → CharleyBates joined | 04:18 |
| → nanobot567 joined | 04:28 |
| ← nanobot567 left | 04:29 |
| ← Minvera left | 04:29 |
| ← Leonarbro left | 04:30 |
| → Fischmiep joined | 04:34 |
| → jklfds joined | 04:45 |
| → wyre joined | 04:46 |
| → stolen joined | 04:48 |
| ← jklfds left | 04:51 |
| ← nickoe25 left | 04:55 |
| → nickoe25 joined | 04:55 |
| ← Gary_Sinise left | 04:56 |
| → nate2 joined | 05:00 |
| → jklfds joined | 05:03 |
| ← nate2 left | 05:05 |
| ← CaCode left | 05:05 |
| → qqq joined | 05:05 |
| → genesis1523 joined | 05:06 |
| ← bloody left | 05:08 |
| ← jklfds left | 05:08 |
| ← techietrash left | 05:12 |
| → techietrash joined | 05:12 |
|
gsi
| regarding that "inconsistent newlines" (https://pastebin.com/E3Gt371e referenced above) -- is it really the protocol that inconsistently handles line termination, or is it your traffic which does not match the protocol? announcing lengths that don't match the payload of the text line's remainder | 05:13 |
| → Gary_Sinise joined | 05:14 |
| → Noisytoot joined | 05:14 |
|
gsi
| am guessing here, as the paste does not visually represent what the end-of-lines look like, could not spot other differences from a quick glance | 05:14 |
|
| and is line termination required even? or does the length just specify the remaining text's length which allows reliable consumption without a line requirement? | 05:18 |
|
| that git-run discussion sounds like a lot of assumed policy and feels rather project specific to me, would not be surprised if something so special has not been done before because it's hardly generically applicable in many places | 05:22 |
|
| sure there are ways to query the repo's starting location, so remaining in the root dir or changing to subdirectories can be dealt with, but it always feels like these should be local scripts not common git tooling | 05:23 |
|
| I'd even go as far as suggesting that your build or deploy or other tools should not depend on a specific version control system, and should keep working regardless where you got the source files from (any other VCS, or tarball, or sneaker net) | 05:24 |
|
| invoke them in any way you like, don't expect your VCS to do that (why should it? just because you happen to use this one today?) | 05:25 |
| ← theobjectivedad left | 05:28 |
| ← Noisytoot left | 05:29 |
| → theobjectivedad joined | 05:29 |
| → jklfds joined | 05:32 |
| → Noisytoot joined | 05:32 |
| ← jklfds left | 05:37 |
| ← wonko-the-sane left | 05:41 |
| → Guest47 joined | 05:42 |
| ← tomboy64 left | 05:49 |
| ← Gary_Sinise left | 05:51 |
| ← Guest47 left | 05:52 |
| → crabbedhaloablut joined | 05:53 |
| → berkay joined | 05:54 |
| ← bket_ left | 05:57 |
| → bket joined | 06:00 |
| → tomboy64 joined | 06:02 |
| → jklfds joined | 06:03 |
| ← omero left | 06:12 |
| → omero_o1 joined | 06:12 |
| omero_o1 → omero | 06:12 |
| ← crabbedhaloablut left | 06:18 |
| ← thiago left | 06:19 |
| → crabbedhaloablut joined | 06:19 |
| → Wooski joined | 06:27 |
| ← Wooski left | 06:27 |
| ← jklfds left | 06:34 |
| → Gary_Sinise joined | 06:38 |
| → jklfds joined | 06:38 |
| ← jklfds left | 06:52 |
| → jklfds joined | 06:52 |
| ← jklfds left | 06:57 |
| ← nickoe25 left | 06:59 |
| → nickoe25 joined | 06:59 |
| → gblfxt__ joined | 07:00 |
| → jmd joined | 07:00 |
| → coot joined | 07:03 |
| → jklfds joined | 07:06 |
| ← elastic_dog left | 07:07 |
| → tejr joined | 07:10 |
| → Rashad joined | 07:11 |
| ← jklfds left | 07:11 |
| → jklfds joined | 07:12 |
| ← tejr left | 07:13 |
| → tejr joined | 07:15 |
| → elastic_dog joined | 07:15 |
| ← hbautista_ left | 07:15 |
| ← jklfds left | 07:16 |
| → hrtk joined | 07:17 |
| → jrm joined | 07:17 |
| ← omero left | 07:23 |
| → omero joined | 07:24 |
| → jklfds joined | 07:31 |
| → resamvi joined | 07:32 |
| → Nei joined | 07:33 |
| ← jklfds left | 07:35 |
| ← hrtk left | 07:38 |
| → jklfds joined | 07:39 |
| → wonko-the-sane joined | 07:40 |
| → rgrinberg joined | 07:43 |
| ← jklfds left | 07:44 |
| → jklfds joined | 07:45 |
| ← jklfds left | 07:50 |
| ← Gary_Sinise left | 07:56 |
| → navirc joined | 07:58 |
| ← resamvi left | 08:02 |
| → Stooge joined | 08:10 |
| → epicout joined | 08:15 |
| ← epicout left | 08:15 |
| → epicout joined | 08:15 |
| → jklfds joined | 08:15 |
| → Jck_true joined | 08:15 |
| → michelem joined | 08:16 |
|
michelem
| hello folks! Please help me understand what to do in this case: | 08:16 |
|
| I spawned "feature1" and "feature2" from the "main" branch. Feature2 is now completed and merged back into "main". Feature1 is still ongoing, and would like to use "feature2" in it (it improved CICD). | 08:17 |
| ← wonko-the-sane left | 08:18 |
|
michelem
| I am confused now as to how I should best do that. Last time, in a similar scenario, I cherry picked some commits of Feature2 into Feature1's branch. That gave me hell when I later tried to rebase Feature1 into main. | 08:18 |
| ← jklfds left | 08:19 |
| → iomari891 joined | 08:22 |
| ← dviola left | 08:24 |
| → dviola joined | 08:26 |
| → cafkafk joined | 08:27 |
|
mjt0k
| michelem: cherry-picks from main usually does not affect future rebase, unless the same place(s) are modified several times | 08:28 |
|
| (unless the same commits are modified later in main) | 08:28 |
|
| but I'd say you can rebase your in-progress feature onto main now | 08:28 |
|
michelem
| mjt0k: rebase the in-progress feature onto main? | 08:34 |
|
gsi
| +1, considering that a rebase is a series of cherry picks, it's unlikely that your pain originated from that activity | 08:34 |
|
michelem
| the in-progress feature is not ready for that. The goal was to therefore incorporate new changes into it | 08:35 |
|
gsi
| maybe it could have been an improper sequence of picking, changing contexts and resulting in conflicts when picking more? | 08:35 |
|
| should not happen if you just rebase | 08:35 |
|
| which keeps the sequence | 08:35 |
|
| re-read the above, the suggestion was to rebase the incomplete feature1 onto main, not merge it into main | 08:36 |
|
mjt0k
| yea, that's what I mean mentioning other patches modifying the same place | 08:36 |
|
michelem
| I thought of rebasing feature2 into feature1. That gives me 2 problems: 1) I deleted the branch of feature2 already when I merged it (rebased) into "main". 2) I suppose that would give me problems when I rebase feature1 into main, because the patches of feature2 would be re-attempted. | 08:36 |
|
| I did read it multiple times. I'm not sure I understand. By "rebasing into main" you mean that main would be changed to now include (preliminary) changes from incomplete feature1, correct? I cannot do that. That would break production. | 08:38 |
|
mjt0k
| rebasing "on top" of main if that's easier | 08:38 |
|
| right now your incomplete feature is based on some old version of main | 08:39 |
|
| rebasing it on top of your current main - so it will be main+feature, without affecting main itself - is what the talk's about | 08:39 |
| → kiruny joined | 08:40 |
|
michelem
| ok, that shows I should understand that better. What does "rebasing on top of main" mean? You mean take the new patches come into main (from feature2) and apply them to "feature1" – do I understand correctly? | 08:40 |
|
mjt0k
| which means picking up all commits between that old version of main and current main righht before first commit of your feature | 08:40 |
|
gsi
| well, rebase is not _into_ but _onto_, let this sink in for a moment | 08:41 |
|
michelem
| so main stays unchanged and feature1 takes its heap of patches | 08:41 |
| → ursa joined | 08:41 |
|
michelem
| yes, onto. | 08:41 |
|
| mjt0k nods at gsi | 08:41 |
|
mjt0k
| michelem: the diff between your explanation and mine is that your version assumes commits from main comes on top of feature1, while mine means that commits from feature1 comes on top of main and stays on feature1 branch | 08:42 |
|
| your feature1 is a branch from some old version of main. You cut off that branch and move it to current top of main | 08:43 |
|
| think of real-life tree. You cut off a branch and move it elsewhere | 08:43 |
|
michelem
| that's the part I could not fathom. I'll take 10' to read again Git Rebase docs to understand. | 08:44 |
| → jklfds joined | 08:44 |
|
gsi
| make sure to not watch youtube videos which explain it terribly and keep getting it backwards :) | 08:45 |
|
michelem
| ah ah ah ah :) | 08:45 |
|
| I'm on git-scm | 08:45 |
|
gsi
| can't remember which one I've seen, but it was really confusing and did a dis-service to its audience | 08:46 |
| ← jklfds left | 08:49 |
|
michelem
| ok, understood. That helped me. Thank you mjt0k and gsi for your patience and clarity. | 08:50 |
|
| gsi: Yes, lots of that on YouTube. It's a marveling platform which unleased individual creativity. And at the same time a lot of junk comes along with the good stuff. Like "news" on social media, which lack any check by an institution that has its reputation at stake of what they publish. | 08:52 |
| → cadmio joined | 08:53 |
|
cadmio
| I'm using a script to automatically update the repository as git add .; git commit -m "update all"; git push Is there way to inster the authentication part in the script? | 08:54 |
|
gsi
| use a transport for the remote which does not involve manual interaction? (that's all which can be said given this amount of information in the question) | 08:56 |
|
| check your remote's documentation on the subject, others don't know what your setup looks like | 08:56 |
|
cadmio
| isnt' there a git authentication my_user or something similar | 08:57 |
| → ccx joined | 08:59 |
| → wonko-the-sane joined | 09:00 |
| → nate2 joined | 09:02 |
| → resamvi joined | 09:03 |
| → humanface joined | 09:05 |
| ← nate2 left | 09:07 |
| → wootehfoot joined | 09:08 |
| → theoceaniscool joined | 09:08 |
| → erty joined | 09:10 |
| → m0viefreak joined | 09:12 |
| ← Inline left | 09:14 |
| ← rgrinberg left | 09:15 |
| ← pulec left | 09:18 |
| → Inline joined | 09:18 |
| → jklfds joined | 09:19 |
| → pulec joined | 09:19 |
| ← pulec left | 09:23 |
| → pulec joined | 09:23 |
| ← jklfds left | 09:24 |
| → Guest5975 joined | 09:24 |
| ← Guest5975 left | 09:25 |
| ← Jaxef left | 09:25 |
| → Guest5975 joined | 09:25 |
| ← Guest5975 left | 09:30 |
| → ferdna joined | 09:32 |
| → f_ joined | 09:33 |
| → noord joined | 09:35 |
| → m_ben joined | 09:37 |
|
bombastick
| cadmio: if you use SSH for authentication instead of username and password, it's by definition non-interactive | 09:41 |
| ← humanface left | 09:41 |
|
bombastick
| otherwise, you can use the "credentials timeout" option (forgot what it was) to remember the username/password | 09:41 |
|
cadmio
| bombastick: how can I modify the script to use ssh? | 09:41 |
| → humanface joined | 09:42 |
| → jklfds joined | 09:43 |
|
bombastick
| you can usually do this on Github/Bitbucket/etc and they provide all instructions. But the summary of the steps is: 1) create a new encryuption key pair (one private, one public). 2) upload the public one to Github/Bitbucket/whoewver your host is. 3) Put the private one in the appropriate location on your computer (on Liunux ~/.ssh/id_rsa). 4) From then on can just clone using the SSH URL | 09:44 |
|
| Github/BB/etc gives you (different from https) | 09:44 |
|
| and 'git push' automatically uses the ssh auth if you cloned your repo that way | 09:44 |
|
| meaning if your script doesn't clone, just adds and updates...you dont have to modify your script at all. | 09:45 |
| ← Lunatrius left | 09:45 |
|
bombastick
| just pre-clone it via SSH | 09:45 |
| ← resamvi left | 09:46 |
| ← jklfds left | 09:48 |
|
cadmio
| and for the time delay? | 09:48 |
|
bombastick
| what time delay? | 09:49 |
| → Lunatrius joined | 09:50 |
|
cadmio
| after I run the script it asks for user & pwd | 09:51 |
|
| (without the ssh) | 09:51 |
|
bombastick
| not if you use SSH auth. | 09:51 |
|
| oh, you mean the credentials timeout thing | 09:51 |
|
cadmio
| yeah | 09:51 |
|
bombastick
| git config --global credential.helper store you lazy bum | 09:51 |
|
| this caches HTTP auth | 09:51 |
| → hrtk joined | 09:53 |
| ← cadmio left | 09:59 |
| → Jaxef joined | 10:01 |
| ← skapata left | 10:06 |
| ← hrtk left | 10:06 |
| → jklfds joined | 10:10 |
| → dskull joined | 10:10 |
| ← michelem left | 10:10 |
| ← Jaxef left | 10:13 |
| ← jklfds left | 10:14 |
| → hrtk joined | 10:14 |
| ← Lunatrius left | 10:17 |
| ← erty left | 10:19 |
| ← hrtk left | 10:22 |
| ← Bombe left | 10:24 |
| → Bombe joined | 10:24 |
| ← omero left | 10:25 |
| → omero joined | 10:26 |
| ← dskull left | 10:27 |
| → anselmschueler joined | 10:27 |
| → hrtk joined | 10:27 |
| → vysn joined | 10:27 |
|
anselmschueler
| What exactly is the difference between `git add -A` and `git add -u`? They seem to do the same thing (when there are no pathspecs) | 10:28 |
|
| Is the only difference that `git add -u <pathspec>` and `git add -A <pathspec>` are different? | 10:28 |
| → feriman joined | 10:31 |
| → dskull joined | 10:32 |
| → jklfds joined | 10:36 |
| → thuna` joined | 10:36 |
| ← stolen left | 10:37 |
| ← hrtk left | 10:38 |
| → psukys joined | 10:41 |
| ← jklfds left | 10:41 |
| → Lunatrius joined | 10:44 |
|
osse
| anselmschueler: -A will add *new* files as well. -u doesn't do that | 10:45 |
| ← Lunatrius left | 10:46 |
| ← anselmschueler left | 10:47 |
| → anselmschueler joined | 10:48 |
| → Lunatrius joined | 10:49 |
| → hrtk joined | 10:50 |
| ← Rashad left | 10:51 |
| ← hrtk left | 10:54 |
| → Suchiman joined | 10:56 |
| ← anselmschueler left | 10:57 |
| → rgrinberg joined | 10:58 |
| ← ario left | 11:00 |
| → ario joined | 11:00 |
| → stolen joined | 11:00 |
| → jklfds joined | 11:05 |
| ← humanface left | 11:06 |
| → hrtk joined | 11:06 |
| ← nickoe25 left | 11:08 |
| → nickoe25 joined | 11:08 |
| ← hrtk left | 11:10 |
| ← jklfds left | 11:11 |
| → Leonarbro joined | 11:12 |
| → krumelmonster joined | 11:12 |
| ← dsimic left | 11:14 |
| → hrtk joined | 11:14 |
| → dsimic joined | 11:15 |
| → stats4647 joined | 11:16 |
| ← omero left | 11:22 |
| → omero joined | 11:24 |
| → jklfds joined | 11:28 |
| → jonosterman joined | 11:29 |
| → cdown joined | 11:29 |
| ← epicout left | 11:29 |
| ← jklfds left | 11:34 |
| → canton7 joined | 11:35 |
| → linus045 joined | 11:36 |
| ← m0viefreak left | 11:37 |
| → epicout joined | 11:38 |
| ← epicout left | 11:38 |
| → epicout joined | 11:38 |
| ← linus045 left | 11:42 |
| ← hrtk left | 11:42 |
| ← feriman left | 11:47 |
| → jklfds joined | 11:48 |
| → hrtk joined | 11:49 |
| → Tobbi joined | 11:51 |
| ← dskull left | 11:51 |
| ← jklfds left | 11:52 |
| → vdamewood joined | 11:55 |
| → jklfds joined | 11:58 |
| → grumbler joined | 11:59 |
| ← jacobk left | 11:59 |
| ← cdown left | 12:00 |
| ← m_ben left | 12:01 |
| ← jklfds left | 12:03 |
| → jklfds joined | 12:05 |
| ← mingdao left | 12:06 |
| → mingdao joined | 12:06 |
| ← omero left | 12:12 |
| → omero joined | 12:13 |
| → konsolebox joined | 12:14 |
| ← jklfds left | 12:15 |
| ← stats4647 left | 12:16 |
| ← epicout left | 12:19 |
| ← wonko-the-sane left | 12:22 |
| → jklfds joined | 12:22 |
| ← rgrinberg left | 12:25 |
| ← hrtk left | 12:29 |
| ← jklfds left | 12:31 |
| → linus045 joined | 12:32 |
| ← CharleyBates left | 12:35 |
| → jklfds joined | 12:36 |
| → bagatur joined | 12:36 |
| → hu85nk4bnd joined | 12:38 |
| → CharleyBates joined | 12:40 |
| ← jklfds left | 12:42 |
| ← mane left | 12:42 |
| ← hu85nk4bnd left | 12:42 |
| → jklfds joined | 12:42 |
| ← wootehfoot left | 12:43 |
| → weko joined | 12:46 |
| ← jklfds left | 12:49 |
| → hu85nk4bnd joined | 12:49 |
| → wootehfoot joined | 12:52 |
| → jklfds joined | 12:58 |
| ← jklfds left | 13:03 |
| → jklfds joined | 13:03 |
| → nate2 joined | 13:04 |
| → feriman joined | 13:07 |
| ← stolen left | 13:07 |
| ← nate2 left | 13:09 |
| ← konsolebox left | 13:12 |
| ← jklfds left | 13:12 |
| ← nickoe25 left | 13:13 |
| → nickoe25 joined | 13:13 |
| ← coot left | 13:14 |
| → jklfds joined | 13:17 |
| ← wootehfoot left | 13:17 |
| → ThorMojito joined | 13:20 |
| → wonko-the-sane joined | 13:20 |
| ← jklfds left | 13:22 |
| → bindu joined | 13:22 |
| → hrtk joined | 13:23 |
| ← ThorMojito left | 13:23 |
| → rgrinberg joined | 13:28 |
| → jklfds joined | 13:33 |
| → guy_frm_yogaland joined | 13:34 |
| ← jklfds left | 13:38 |
| ← ursa left | 13:40 |
| ← FinnElija left | 13:40 |
| → ursa joined | 13:40 |
| → FinnElija joined | 13:40 |
| ← omero left | 13:41 |
| → omero joined | 13:42 |
| ← Vonter left | 13:45 |
| → keypusher joined | 13:46 |
| → Vonter joined | 13:47 |
| → jklfds joined | 13:47 |
| ← jonosterman left | 13:48 |
| → flom84 joined | 13:48 |
| ← jklfds left | 13:54 |
| → Traneptora joined | 13:57 |
| ← hrtk left | 13:59 |
| → jklfds joined | 14:00 |
| → resamvi joined | 14:01 |
| → delay joined | 14:02 |
| ← delay left | 14:03 |
| ← jklfds left | 14:05 |
| ← harleypig left | 14:06 |
| → harleypig joined | 14:06 |
| → jacobk joined | 14:07 |
| → hrtk joined | 14:11 |
| → jklfds joined | 14:13 |
| → delay joined | 14:15 |
| ← jklfds left | 14:17 |
| → jklfds joined | 14:18 |
| → navidr joined | 14:20 |
| ← jklfds left | 14:23 |
| → bird_ joined | 14:24 |
| ← hrtk left | 14:27 |
| ← hu85nk4bnd left | 14:30 |
| → wootehfoot joined | 14:31 |
| → jklfds joined | 14:35 |
| ← ecs left | 14:36 |
| → ecs joined | 14:36 |
| ← jklfds left | 14:40 |
| → stolen joined | 14:43 |
| ← wootehfoot left | 14:43 |
| ← ferdna left | 14:50 |
| → wootehfoot joined | 14:51 |
| → thiago joined | 14:56 |
| → peeps[work] joined | 14:57 |
| ← flom84 left | 15:08 |
| ← FinnElija left | 15:08 |
| → FinnElija joined | 15:09 |
| → m_ben joined | 15:19 |
| ← wootehfoot left | 15:21 |
| → oriba joined | 15:22 |
| → jklfds joined | 15:22 |
| ← jklfds left | 15:27 |
| → ThorMojito joined | 15:35 |
| → cdown joined | 15:37 |
| → jklfds joined | 15:39 |
| ← blop_ left | 15:40 |
| → blop_ joined | 15:41 |
| ← cdown left | 15:41 |
| → cousteau joined | 15:43 |
|
cousteau
| How do I remove a worktree in ye olde git 2.9? | 15:43 |
| ← jklfds left | 15:43 |
|
cousteau
| I happily did `git worktree add`, was pleasantly surprised by the fact that it worked in such an old version, but now I can't remove it | 15:44 |
|
| TL;DR: I climbed a tree and now I can't get down. | 15:44 |
|
| Meow. | 15:44 |
|
| I really should update git in this machine... | 15:45 |
| → skapata joined | 15:48 |
|
ikke
| cousteau: probably by removing .git/worktrees/<name> | 15:49 |
| ← mingdao left | 15:49 |
| → mingdao joined | 15:50 |
|
cousteau
| Ah, found it. First delete the worktree, then git worktree prune | 15:50 |
| → jklfds joined | 15:50 |
|
cousteau
| Which doesn't remove ALL the worktree information for ALL worktrees as one may interpret from the doc, but only that of nonexistent worktrees | 15:51 |
|
| This knowledge courtesy of git worktree -n | 15:51 |
| ← ThorMojito left | 15:51 |
| ← jklfds left | 15:55 |
| → delay_ joined | 16:00 |
| ← delay left | 16:02 |
| ← feriman left | 16:05 |
| ← cousteau left | 16:07 |
| ← m_ben left | 16:10 |
| → Tabmow joined | 16:11 |
| → srinidhi joined | 16:16 |
| ← xnox left | 16:21 |
| → xnox joined | 16:22 |
| → feriman joined | 16:25 |
| → jklfds joined | 16:25 |
| ← C0MMIE left | 16:26 |
| ← psukys left | 16:28 |
| ← Vonter left | 16:28 |
| → Vonter joined | 16:29 |
| ← jklfds left | 16:29 |
| → Gary_Sinise joined | 16:34 |
| ← FinnElija left | 16:41 |
| → Elliria joined | 16:41 |
| → jklfds joined | 16:42 |
| → FinnElija joined | 16:43 |
| ← jklfds left | 16:47 |
| ← navirc left | 16:54 |
| ← iomari891 left | 17:05 |
| → bloody joined | 17:05 |
| → nate2 joined | 17:05 |
| → iomari891 joined | 17:06 |
| ← nate2 left | 17:11 |
| ← superice left | 17:15 |
| → superice joined | 17:15 |
| → jklfds joined | 17:17 |
| ← jrm left | 17:20 |
| ← jklfds left | 17:21 |
| ← nickoe25 left | 17:22 |
| → grumbler_ joined | 17:22 |
| → nickoe25 joined | 17:22 |
| ← stolen left | 17:23 |
| ← grumbler_ left | 17:23 |
| → wootehfoot joined | 17:24 |
| ← grumbler left | 17:25 |
| ← Novi left | 17:25 |
| → Novi joined | 17:26 |
| → coot joined | 17:30 |
| → grumbler joined | 17:30 |
| ← grumbler left | 17:34 |
| → grumbler joined | 17:37 |
| ← Gary_Sinise left | 17:38 |
| → dskull joined | 17:39 |
| ← wootehfoot left | 17:43 |
| → wootehfoot joined | 17:46 |
| ← iomari891 left | 17:49 |
| ← grumbler left | 17:50 |
| → jklfds joined | 17:52 |
| ← srinidhi left | 17:53 |
| ← oriba left | 17:53 |
| → grumbler joined | 17:54 |
| → Gary_Sinise joined | 17:54 |
| ← wonko-the-sane left | 17:56 |
| ← jklfds left | 17:56 |
| ← Elliria left | 18:00 |
| ← jacobk left | 18:05 |
| ← delay_ left | 18:11 |
| ← nickoe25 left | 18:21 |
| → nickoe25 joined | 18:21 |
| → jklfds joined | 18:27 |
| → wonko-the-sane joined | 18:28 |
| ← jklfds left | 18:31 |
| → jklfds joined | 18:32 |
| ← xmachina left | 18:36 |
| ← jklfds left | 18:37 |
| ← wootehfoot left | 18:40 |
| → epicout joined | 18:41 |
| ← epicout left | 18:41 |
| → humanface joined | 18:43 |
| ← vdamewood left | 18:45 |
| → xmachina joined | 18:45 |
| → m_ben joined | 18:47 |
| → jklfds joined | 18:49 |
| ← jklfds left | 18:53 |
|
myappie
| https://gist.github.com/basicfeatures/c36821ae92e117e0d4ac49ecc974cbdc just finished - WARNING: Backup your project. Rewrites history and modifies files. | 18:55 |
| → delay joined | 18:57 |
| ← agd85120101 left | 19:02 |
| ← theoceaniscool left | 19:04 |
| ← wonko-the-sane left | 19:05 |
| → xcm joined | 19:05 |
| → jklfds joined | 19:06 |
| ← jklfds left | 19:11 |
| → jklfds joined | 19:12 |
| ← jklfds left | 19:16 |
| → agd85120101 joined | 19:19 |
| → PantelicGR joined | 19:23 |
| ← bagatur left | 19:25 |
| ← agd85120101 left | 19:26 |
| ← xmachina left | 19:27 |
| → xmachina joined | 19:29 |
| → agd85120101 joined | 19:31 |
| ← j416 left | 19:39 |
| → j416 joined | 19:39 |
| → jklfds joined | 19:41 |
| ← delay left | 19:41 |
| → delay joined | 19:42 |
| ← delay left | 19:42 |
| → jacobk joined | 19:43 |
| ← jklfds left | 19:45 |
| → derpydoo joined | 19:49 |
| ← xmachina left | 19:54 |
| ← kiruny left | 19:56 |
| ← Coop left | 19:57 |
| → theoceaniscool joined | 19:58 |
| ← Vonter left | 20:01 |
| → Vonter joined | 20:03 |
| → jklfds joined | 20:05 |
| ← jklfds left | 20:09 |
| → lostlazy joined | 20:20 |
| ← f_ left | 20:21 |
| ← nickoe25 left | 20:25 |
| → nickoe25 joined | 20:26 |
| ← AciD` left | 20:27 |
| → jklfds joined | 20:27 |
| → AciD joined | 20:27 |
| ← jklfds left | 20:31 |
| ← tuxifreund left | 20:36 |
| → tuxifreund joined | 20:37 |
| ← jmd left | 20:37 |
| ← agd85120101 left | 20:42 |
| → agd85120101 joined | 20:44 |
| → ferdna joined | 20:45 |
| ← aminvakil left | 20:50 |
| → aminvakil joined | 20:50 |
| → cpackham joined | 20:51 |
| → wootehfoot joined | 20:54 |
| → LowTech joined | 20:55 |
| ← jacobk left | 20:58 |
| ← cpackham left | 21:00 |
| → jklfds joined | 21:00 |
| → BinarySavior joined | 21:01 |
| ← crabbedhaloablut left | 21:02 |
| → jacobk joined | 21:03 |
| → genesis152341 joined | 21:05 |
| → jrm joined | 21:06 |
| ← jklfds left | 21:06 |
| ← feriman left | 21:06 |
| → nate2 joined | 21:07 |
| ← genesis1523 left | 21:08 |
| ← nate2 left | 21:12 |
| → jklfds joined | 21:19 |
| → abubakarsadiq joined | 21:19 |
| ← jklfds left | 21:24 |
| → terminalpusher joined | 21:27 |
| → tirnanog joined | 21:28 |
| ← resamvi left | 21:32 |
| → jklfds joined | 21:37 |
| ← guy_frm_yogaland left | 21:38 |
| → guy_frm_yogaland joined | 21:39 |
| → Coop joined | 21:39 |
| ← wootehfoot left | 21:40 |
| ← jklfds left | 21:41 |
| → codaraxis__ joined | 21:41 |
| ← coot left | 21:43 |
| ← codaraxis left | 21:45 |
| → NightMonkey_ joined | 21:49 |
| ← terminalpusher left | 21:52 |
| NightMonkey_ → NightMonkey | 21:53 |
| → countach202020 joined | 21:55 |
| → jake1 joined | 21:57 |
| ← jacobk left | 22:06 |
| ← Novi left | 22:07 |
| → Novi joined | 22:08 |
| jake1 → sybariten | 22:09 |
| ← genesis152341 left | 22:11 |
| → jklfds joined | 22:11 |
| → ThorMojito joined | 22:11 |
| → genesis152341 joined | 22:12 |
| ← omero left | 22:14 |
| ← m_ben left | 22:16 |
| ← jklfds left | 22:16 |
| → Jaxef joined | 22:17 |
| → omero[slincho] joined | 22:18 |
| → gast0n joined | 22:22 |
| omero[slincho] → omero | 22:24 |
| ← PantelicGR left | 22:29 |
| ← humanface left | 22:29 |
| ← jrm left | 22:30 |
| ← nickoe25 left | 22:30 |
| → nickoe25 joined | 22:30 |
| ← guy_frm_yogaland left | 22:31 |
| → guy_frm_yogaland joined | 22:32 |
| → w4 joined | 22:34 |
| ← LowTech left | 22:36 |
| → codaraxis___ joined | 22:38 |
| → jacobk joined | 22:40 |
| ← guy_frm_yogaland left | 22:41 |
| ← codaraxis__ left | 22:42 |
| → jklfds joined | 22:45 |
| → oshertail joined | 22:48 |
| ← jklfds left | 22:50 |
| ← oshertail left | 22:50 |
| → jrm joined | 22:51 |
| ← ThorMojito left | 23:01 |
| ← theoceaniscool left | 23:05 |
| ← Bilge left | 23:06 |
| → Bilge joined | 23:06 |
| ← rgrinberg left | 23:07 |
| → codaraxis__ joined | 23:09 |
| ← genesis152341 left | 23:11 |
| ← codaraxis___ left | 23:13 |
| ← chexum left | 23:17 |
| → chexum joined | 23:17 |
| → jklfds joined | 23:18 |
| ← jklfds left | 23:23 |
| → przemoc joined | 23:23 |
| ← Vonter left | 23:27 |
| → Vonter joined | 23:28 |
| ← countach202020 left | 23:29 |
| ← vysn left | 23:30 |
| ← thuna` left | 23:41 |
| → ferdna_ joined | 23:44 |
| ← ferdna left | 23:47 |
| → jklfds joined | 23:51 |
| → ThorMojito joined | 23:52 |
| ← jklfds left | 23:56 |
| → Lord_of_Life_ joined | 23:58 |
| ← Lord_of_Life left | 23:58 |
| Lord_of_Life_ → Lord_of_Life | 23:59 |