| 2022-05-27 |
| ← atrigent left | 00:00 |
| → atrigent joined | 00:01 |
| → zebrag joined | 00:02 |
| → Ajax14612 joined | 00:04 |
| ← cbreak left | 00:04 |
| → gildasio joined | 00:05 |
| ← Ajax1461 left | 00:06 |
| Ajax14612 → Ajax1461 | 00:06 |
| → pmwals09 joined | 00:06 |
| ← pmwals09 left | 00:06 |
| → pmwals09 joined | 00:07 |
| ← dionysus69 left | 00:07 |
| → cbreak joined | 00:08 |
| → bob518 joined | 00:10 |
| ← pflanze left | 00:18 |
| → troyt joined | 00:19 |
| ← Yruama left | 00:19 |
| → sa0 joined | 00:23 |
| ← hoochmonger left | 00:29 |
| ← vysn left | 00:29 |
| ← Lord_of_Life left | 00:40 |
| → Lord_of_Life joined | 00:41 |
| → kaiseisei joined | 00:42 |
| ← wroo^ left | 00:46 |
| ← pretty_dumm_guy left | 00:47 |
| ← vicfred left | 00:47 |
| ← jaggz left | 00:51 |
| ← Betal left | 00:55 |
| ← sa0 left | 00:57 |
| → wroo^ joined | 01:04 |
| ← Sasazuka left | 01:10 |
| → gurkenglas joined | 01:14 |
| → adelver joined | 01:15 |
| ← adelver left | 01:15 |
| → ade1ver joined | 01:15 |
| ← ade1ver left | 01:15 |
| → adelver joined | 01:16 |
| ← pmwals09 left | 01:17 |
| → pmwals09 joined | 01:18 |
| → ColdKeyboard joined | 01:20 |
| ← pmwals09 left | 01:23 |
| → pmwals09 joined | 01:23 |
| ← skered left | 01:27 |
| → ferdna joined | 01:28 |
| → skered joined | 01:28 |
| ← bob518 left | 01:32 |
| ← pmwals09 left | 01:34 |
| → pmwals09 joined | 01:34 |
| ← pmwals09 left | 01:39 |
| ← gurkenglas left | 01:41 |
| ← pulse left | 01:50 |
| ← lt-dd left | 01:56 |
| → lt-dd joined | 01:56 |
| ← terminaldweller left | 01:59 |
| ← atrigent left | 02:02 |
| → atrigent joined | 02:03 |
| → terminaldweller joined | 02:05 |
| → pmwals09 joined | 02:06 |
| → hoochmonger joined | 02:11 |
| → yeirr joined | 02:16 |
| ← gco_ left | 02:16 |
| ← bloody left | 02:22 |
| ← Murr left | 02:22 |
| → Murr joined | 02:22 |
| ← irc_user left | 02:23 |
| ← k_sze left | 02:25 |
| → k_sze joined | 02:27 |
| ← elastic_dog left | 02:27 |
| → elastic_dog joined | 02:34 |
| → howdoi joined | 02:34 |
| ← wroo^ left | 02:34 |
| ← EdFletcher left | 02:40 |
| → mikkel joined | 02:43 |
| ← ramblebamble left | 02:46 |
| → opow joined | 02:46 |
| ← opow left | 02:47 |
| → bytehackr joined | 02:50 |
| → dvanloon4 joined | 02:51 |
| ← bytehackr left | 02:51 |
| ← dvanloon left | 02:51 |
| dvanloon4 → dvanloon | 02:51 |
| → bytehackr joined | 02:52 |
| → emico joined | 02:52 |
| → EdFletcher joined | 02:54 |
| ← FinnElija left | 02:54 |
| → finn_elija joined | 02:54 |
| finn_elija → FinnElija | 02:54 |
| ← pmwals09 left | 02:55 |
| → pmwals09 joined | 02:55 |
| → sa0 joined | 02:55 |
| → dsrt^ joined | 03:07 |
| → saroy joined | 03:10 |
| ← bytehackr left | 03:10 |
| ← saroy left | 03:10 |
| ← bindu left | 03:13 |
| → bindu joined | 03:13 |
| ← FinnElija left | 03:15 |
| → FinnElija joined | 03:16 |
| ← adelver left | 03:22 |
| ← Guest77 left | 03:24 |
| ← sa0 left | 03:27 |
| ← dsrt^ left | 03:30 |
| ← tyson2 left | 03:32 |
| → dsrt^ joined | 03:34 |
| ← ash_worksi left | 03:35 |
| → coot joined | 03:39 |
| → boka joined | 03:39 |
| ← ChmEarl left | 03:41 |
| → adelver joined | 03:45 |
| ← pmwals09 left | 03:46 |
| → pmwals09 joined | 03:46 |
| → nate1 joined | 03:46 |
| ← gast0n left | 03:50 |
| ← nate1 left | 03:52 |
| → saroy joined | 03:52 |
| saroy → bytehackr | 03:52 |
| ← pmwals09 left | 03:52 |
| ← The_Blode left | 03:59 |
| ← dsrt^ left | 04:01 |
| → Ajax14614 joined | 04:04 |
| ← Ajax1461 left | 04:06 |
| Ajax14614 → Ajax1461 | 04:06 |
| ← yeirr left | 04:07 |
| ← ferdna left | 04:13 |
| → Guest580 joined | 04:17 |
| ← great_taste left | 04:21 |
| → caef^ joined | 04:22 |
| → lzgmc joined | 04:24 |
| ← dtux left | 04:24 |
| → The_Blode joined | 04:26 |
| ← sudoforge left | 04:29 |
| ← dob1 left | 04:29 |
| → great_taste joined | 04:30 |
| ← lzgmc left | 04:34 |
| ← led_belly left | 04:39 |
| → Murr- joined | 04:42 |
| ← Murr left | 04:44 |
| Murr- → Murr | 04:44 |
| → irc_user joined | 04:46 |
| → dob1 joined | 04:47 |
| ← coot left | 04:54 |
| → gco_ joined | 04:54 |
| → coot joined | 04:56 |
| ← zebrag left | 04:58 |
| ← Guest69 left | 04:59 |
| → led_belly joined | 05:06 |
| ← skapata left | 05:07 |
| ← caef^ left | 05:13 |
| ← hoochmonger left | 05:13 |
| ← Guest580 left | 05:13 |
| → hoochmonger joined | 05:14 |
| ← shailangsa left | 05:14 |
| ← Xenguy left | 05:14 |
| → Xenguy joined | 05:15 |
| ← indy left | 05:16 |
| ← Lord_of_Life left | 05:16 |
| → indy joined | 05:16 |
| → madewokherd` joined | 05:18 |
| → Lord_of_Life joined | 05:19 |
| ← madewokherd left | 05:21 |
| ← howdoi left | 05:24 |
| → derfflinger joined | 05:25 |
| → Guest6540 joined | 05:33 |
| ← rindolf left | 05:35 |
| ← Guest6540 left | 05:39 |
| → vysn joined | 05:41 |
| → shailangsa joined | 05:42 |
| → bket joined | 05:45 |
| ← igemnace left | 05:46 |
| → rindolf joined | 05:52 |
| ← great_taste left | 05:53 |
| → dtux joined | 05:53 |
| ← thiago left | 05:54 |
| → ackyshake joined | 05:56 |
| → KnoP joined | 05:58 |
| ← gco_ left | 06:02 |
| → gildasio1 joined | 06:10 |
| ← gildasio left | 06:12 |
| ← jazzy left | 06:17 |
| → Natrick joined | 06:17 |
| → Rashad joined | 06:19 |
| → yeirr joined | 06:23 |
| → arch_angel joined | 06:25 |
| → john_johnk joined | 06:26 |
| ← irc_user left | 06:27 |
| → mexen joined | 06:28 |
| ← john_johnk left | 06:29 |
| → palasso joined | 06:42 |
| → theoceaniscool joined | 06:42 |
| → baffodoro joined | 06:42 |
| ← terminaldweller left | 06:50 |
| → hstct joined | 06:50 |
| → terminaldweller joined | 06:50 |
| ← coot left | 06:56 |
| → coot joined | 06:56 |
| → dionysus69 joined | 06:56 |
| → Sulky__ joined | 07:04 |
| → revoltingPeasant joined | 07:06 |
| ← Sulky_ left | 07:07 |
| ← gxt left | 07:16 |
| → gxt joined | 07:18 |
| → sa0 joined | 07:25 |
| → feriman joined | 07:28 |
| → iomari891 joined | 07:30 |
| ← Sulky__ left | 07:31 |
| ← vicecea left | 07:33 |
| → vicecea joined | 07:33 |
| → DibbTubberOne joined | 07:34 |
| ← chexum left | 07:37 |
| ← GNUmoon left | 07:37 |
| → chexum joined | 07:37 |
| → ice99 joined | 07:37 |
| → GNUmoon joined | 07:37 |
|
ice99
| how to run private git server? | 07:37 |
|
farzat
| https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols | 07:38 |
|
| Of course that's assuming you mean pure git, not something like gitlab | 07:39 |
| → machaddr joined | 07:39 |
|
ice99
| yeah | 07:40 |
| → lgc joined | 07:40 |
| ← lgc left | 07:41 |
| → EvilDMP joined | 07:45 |
| ← coot left | 07:45 |
| → nate1 joined | 07:48 |
| → ___nick___ joined | 07:49 |
|
j416
| ice99: tl;dr, just ssh access is enough if it's your personal one. | 07:49 |
|
ice99
| j416, I want to allow collaborators use it too | 07:50 |
|
mpldr
| give them accounts | 07:50 |
|
| otherwise gitea has a script to redirect their login | 07:50 |
|
j416
| then I'd lean towards gitolite or gitlab or similar | 07:51 |
|
| ...or just use github | 07:51 |
|
| (i.e. regular github) | 07:51 |
|
mpldr
| or Sourcehut | 07:51 |
|
| or any other hosted Forge | 07:51 |
|
j416
| .. | 07:51 |
| → drogas joined | 07:51 |
|
mpldr
| don't just recommend the oligopolists anyone knows in the first place. if someone asks how to do X, the existing seems not to be satisfactory | 07:52 |
|
j416
| I don't think I did | 07:53 |
| ← nate1 left | 07:53 |
| ← GNUmoon left | 07:55 |
| → GNUmoon joined | 07:55 |
| → Sulky joined | 07:56 |
| → jazzy joined | 07:58 |
| ← sa0 left | 07:59 |
| → coot joined | 08:02 |
| → Ajax14612 joined | 08:04 |
| ← Masklin left | 08:06 |
| ← Ajax1461 left | 08:06 |
| Ajax14612 → Ajax1461 | 08:06 |
| → kenanmarasli joined | 08:09 |
| → csm3105 joined | 08:10 |
| → Sazhen86 joined | 08:17 |
| → startime[m] joined | 08:20 |
| ← DibbTubberOne left | 08:22 |
| ← Murr left | 08:22 |
| → Murr joined | 08:22 |
| → caef^ joined | 08:23 |
| ← adelver left | 08:27 |
| → Masklin joined | 08:28 |
| ← revoltingPeasant left | 08:29 |
| → Ajax14618 joined | 08:32 |
| ← Ajax1461 left | 08:34 |
| Ajax14618 → Ajax1461 | 08:34 |
| → aidalgol_ joined | 08:34 |
| ← aidalgol left | 08:34 |
| → littlebobeep joined | 08:35 |
| → vlado joined | 08:35 |
| ← caef^ left | 08:39 |
| → vladoski joined | 08:39 |
| → t0mm13b_ joined | 08:40 |
| ← vlado left | 08:41 |
| ← t0mm13b left | 08:41 |
| → avar joined | 08:42 |
| ← littlebobeep left | 08:47 |
| → revoltingPeasant joined | 08:47 |
| ← momomo_ left | 08:49 |
| → momomo joined | 08:50 |
| ← revoltingPeasant left | 08:50 |
| → littlebobeep joined | 08:50 |
| → revoltingPeasant joined | 08:50 |
| → zeenk joined | 08:50 |
| ← hstct left | 08:50 |
| → hstct joined | 08:51 |
| ← Tobbi_ left | 08:53 |
| → joe joined | 08:54 |
| → Tobbi_ joined | 08:54 |
| → oxymoron93 joined | 08:54 |
| → joe1 joined | 08:56 |
| ← revoltingPeasant left | 08:56 |
| ← gxt left | 08:57 |
| ← joe left | 08:59 |
| → gxt joined | 09:01 |
| ← momomo left | 09:01 |
| ← mexen left | 09:03 |
| → gas51627 joined | 09:03 |
| → littlebo1eep joined | 09:04 |
| ← littlebobeep left | 09:06 |
| → vlado joined | 09:08 |
| ← vladoski left | 09:10 |
| ← Shentino left | 09:12 |
| aidalgol_ → aidalgol | 09:12 |
| ← EvilDMP left | 09:17 |
| → EvilDMP joined | 09:18 |
| ← littlebo1eep left | 09:30 |
| → pflanze joined | 09:32 |
| → menace joined | 09:41 |
| ← menace left | 09:42 |
| → menace joined | 09:42 |
| menace → Deknos | 09:42 |
| → littlebobeep joined | 09:45 |
| ← txtsd left | 09:46 |
| → Csm319_ joined | 09:48 |
| → txtsd joined | 09:49 |
| ← derfflinger left | 09:49 |
| ← vlado left | 09:49 |
| → mexen joined | 09:49 |
| → haise01 joined | 09:49 |
| → Azem joined | 09:50 |
| ← csm3105 left | 09:51 |
| ← Sazhen86 left | 09:51 |
| → squirrel joined | 09:53 |
| → EmetSelch joined | 09:53 |
| → machaddr_ joined | 09:54 |
| ← haise01 left | 09:54 |
| → haise01 joined | 09:55 |
| ← haise01 left | 09:55 |
| ← machaddr left | 09:57 |
| → sa0 joined | 09:57 |
| ← Azem left | 09:57 |
| ← oxymoron93 left | 09:58 |
| → EvilDMP_ joined | 09:58 |
| ← EmetSelch left | 09:58 |
| ← EvilDMP left | 09:58 |
| ← rindolf left | 10:00 |
| ← yeirr left | 10:01 |
| machaddr_ → machaddr | 10:03 |
| ← baffodoro left | 10:06 |
| arch_angel → arch-angel | 10:12 |
| → gurkenglas joined | 10:17 |
| → Xenguy_ joined | 10:17 |
| ← ackyshake left | 10:17 |
| → rindolf joined | 10:18 |
| ← Xenguy left | 10:19 |
| ← sa0 left | 10:29 |
| ← drogas left | 10:29 |
| ← R2robot left | 10:31 |
| → roadie joined | 10:32 |
| ← littlebobeep left | 10:32 |
| → vitali64 joined | 10:33 |
| ← Rashad left | 10:40 |
| ← Jong left | 10:40 |
| → AirOnSkin joined | 10:41 |
| → littlebobeep joined | 10:42 |
| → drogas joined | 10:43 |
| → Thanzex joined | 10:47 |
| → ice9 joined | 10:48 |
| ← OnkelBlade left | 10:49 |
| ← ice99 left | 10:50 |
| → OnkelBlade joined | 10:51 |
| → cdown joined | 10:51 |
| → otisolsen70 joined | 10:54 |
| → mncheckm joined | 10:54 |
| ← mncheck left | 10:56 |
|
Thanzex
| Hi there! I am working with a local repository meant for training. I was cleaning up some old commits and files with `rebase` but accidentally split my history, originally i was meant to look something like this: https://upaste.de/PB7 | 10:56 |
|
| but I ended up like this https://upaste.de/fCy | 10:56 |
|
| As you can see I now have the 'k8s' and 'compose' branches pointing to the old master while the new master sits detached and alone. | 10:56 |
|
| How can i recover from this? | 10:56 |
|
| Thanks! | 10:56 |
| → cm315 joined | 10:57 |
| ← Ajax1461 left | 10:58 |
| → Ajax14618 joined | 10:58 |
| → R2robot joined | 10:59 |
| ← kaiseisei left | 10:59 |
| ← Csm319_ left | 11:00 |
| → luckman212_ joined | 11:02 |
| ← luckman212 left | 11:03 |
| luckman212_ → luckman212 | 11:03 |
| ← vodkra left | 11:05 |
|
mpldr
| Thanzex: try rebasing it again | 11:09 |
| → pretty_dumm_guy joined | 11:10 |
| → Lope joined | 11:10 |
|
mpldr
| first rebase new master on old master, rebase both branches on the combined master, fixup smaller issues with git rebase -i | 11:10 |
| ← AirOnSkin left | 11:10 |
|
Lope
| hey guys, on SVN that I've administered, I could limit which users can read specific directories etc. | 11:10 |
|
| Does git have the same capability? | 11:10 |
|
Thanzex
| mpldr could you give me some more guidance? I'd like not to screw the repo too much. Should i rebase the master root onto the old root? | 11:11 |
|
Lope
| On github I've split our repo into 2 repos, one for devs, the other for testers and devs. | 11:11 |
|
| So when a UI issue comes up, it must be created on the testing repo. | 11:12 |
|
| But then it breaks some of the ease of development, like a PR can't automatically resolve an issue, etc. | 11:12 |
|
mpldr
| Lope: Couldn't you just limit their push access in the Contributors section? | 11:13 |
|
Lope
| And also a tester can't see the status of a PR on dev repo. Like they can't see if the mentioned PR is merged or not. | 11:13 |
| ← littlebobeep left | 11:13 |
|
Lope
| mpldr, no, we want to prevent the testers getting the source code. | 11:13 |
|
| We already had a developer run off with our code once and steal a few clients. | 11:13 |
|
mpldr
| Thanzex: then you're probably out of luck and have to do with multiple repos… maybe some workflow can sync the issues | 11:14 |
|
Lope
| Well, my best guess is to create a technical issue on the dev repo, and a non-techical issue on the testing repo. | 11:15 |
|
| Then I could code a bot that makes the testing issue close when the dev issue closes. | 11:15 |
|
| That makes the most sense to me. | 11:15 |
|
| Cos the testing repo doesn't need technical details. Just needs to describe what is wrong and how to reproduce the issue. | 11:16 |
|
mpldr
| Thanzex: put new master on it's own branch, git rebase master new-master, git reset --hard master new-master, git rebase master k8s, git rebase master compose | 11:16 |
|
Lope
| Then the technical repo can discuss code etc. | 11:16 |
|
mpldr
| or something along those lines | 11:16 |
| → littlebobeep joined | 11:16 |
| → sa0 joined | 11:17 |
|
mpldr
| Lope: Maybe in this case some external bug tracker like http://flyspray.org/ would be a better solution here | 11:17 |
| ← boka left | 11:17 |
| → zer0bitz joined | 11:17 |
| → sudoforge joined | 11:25 |
|
Thanzex
| mpldr: rebasing new-master onto master just swapped the pointer for me, shouldn't I rebase master onto new-master and drop the old-master commits? | 11:27 |
|
| swapped the pointer while leaving the situation unchanged * | 11:28 |
|
mpldr
| let me try something for a second | 11:28 |
| → Rashad joined | 11:29 |
| ← vitali64 left | 11:30 |
| → boka joined | 11:30 |
|
mpldr
| yup, worked. you can just pull your local branch… git pull . new-master | 11:31 |
|
| damn I was overthinking this | 11:31 |
| → tyson2 joined | 11:32 |
|
mpldr
| you may also want to do it the other way around, since this way, the old master commits are rebased to be near HEAD | 11:32 |
| ← shailangsa left | 11:34 |
|
mpldr
| or just rebase -i afterwards and reorder them to your liking | 11:35 |
|
Thanzex
| mpldr: Sorry, git is still somewhat of a black magic for me, what do you mean with "git pull . new-master" ? which branch should i have checked out? | 11:36 |
|
mpldr
| i am assuming that you are on master | 11:36 |
|
| pull the newer commit from your other branch | 11:37 |
|
| oh, and add --rebase to the pull command if you don't have it set in your config | 11:37 |
| → pulse joined | 11:38 |
| ← jazzy left | 11:40 |
| → humanface joined | 11:49 |
| → nate1 joined | 11:49 |
| → machaddr_ joined | 11:54 |
| ← nate1 left | 11:55 |
| ← machaddr left | 11:56 |
| ← fps left | 11:57 |
| ← boka left | 12:00 |
| → shailangsa joined | 12:01 |
| ← hoochmonger left | 12:01 |
| → vladoski joined | 12:03 |
| → Ajax146181 joined | 12:03 |
| ← txtsd left | 12:05 |
| → wootehfoot joined | 12:05 |
| ← Ajax14618 left | 12:06 |
| Ajax146181 → Ajax14618 | 12:06 |
| → txtsd joined | 12:07 |
| pmcnabb5 → pmcnabb | 12:09 |
| ← cm315 left | 12:10 |
| → boka joined | 12:12 |
| → Ajax146182 joined | 12:12 |
| ← Ajax14618 left | 12:14 |
| Ajax146182 → Ajax14618 | 12:14 |
| ← EvilDMP_ left | 12:15 |
| gildasio1 → gildasio | 12:15 |
| → forgotmynick joined | 12:16 |
| ← littlebobeep left | 12:17 |
| ← sa0 left | 12:19 |
| ← Murr left | 12:22 |
| → Murr joined | 12:22 |
| → EvilDMP joined | 12:24 |
| ← EvilDMP left | 12:26 |
| → EvilDMP joined | 12:26 |
| → Xaldafax joined | 12:26 |
| ← machaddr_ left | 12:27 |
|
Thanzex
| mpldr: Alright, I managed to kind of make it work, Thank you for the help. | 12:29 |
|
| One more question, if I wanted to edit some commit back in master, would using "rebase -i master" work properly and rewrite the history of the attached branches later on or whould I have to re-rebase the branches? | 12:29 |
| ← adanwan left | 12:29 |
| ← fling left | 12:29 |
| → fling joined | 12:29 |
| ← vladoski left | 12:30 |
| → adanwan joined | 12:32 |
| → vodkra joined | 12:35 |
|
mpldr
| Thanzex: you have to rebase them again. You based them on a commit that's no longer part of the master branch. | 12:36 |
| ← boka left | 12:41 |
| ← hololeap left | 12:45 |
| → MajorBiscuit joined | 12:48 |
| → bloody joined | 12:49 |
| → hololeap joined | 12:50 |
| → jusski joined | 12:51 |
| → gh34 joined | 12:52 |
| → pflanze_ joined | 13:00 |
| ← pflanze left | 13:03 |
| ← gildasio left | 13:11 |
| ← _xor left | 13:12 |
| ← weyhmueller left | 13:13 |
| → gildasio joined | 13:13 |
| ← KnoP left | 13:14 |
| → vicfred joined | 13:15 |
| → yeirr joined | 13:18 |
| → hoochmonger joined | 13:18 |
|
Lope
| mpldr, thanks for the idea, will consider it. | 13:21 |
| → weyhmueller joined | 13:24 |
| ← pflanze_ left | 13:25 |
| → ChmEarl joined | 13:26 |
| ← MajorBiscuit left | 13:27 |
| ← gas51627 left | 13:30 |
| ← Xenguy_ left | 13:34 |
| ← iomari891 left | 13:34 |
| → iomari891 joined | 13:35 |
| → ethrl joined | 13:36 |
|
noord
| git-send-email insisting on adding CC although I add suppresscc = self, here is whole story https://gist.github.com/Noord/208e8120eca6569942f57f11fda7f1f2 | 13:36 |
| ← ethrl left | 13:37 |
| ← vysn left | 13:41 |
| ← GNUmoon left | 13:42 |
| → GNUmoon joined | 13:44 |
|
waterkip
| noord: do you sign off your commits? | 13:44 |
|
noord
| waterkip: no | 13:46 |
| → pflanze joined | 13:48 |
|
waterkip
| ok, perhaps use self,author as suppress cc option? | 13:48 |
|
| I think I may know what it is.. You set the from as [email@hidden.address] and the e-mail user that get's added is "User [email@hidden.address] which is different | 13:53 |
| ← feriman left | 13:55 |
| ← lt-dd left | 14:02 |
|
noord
| waterkip: checked user name and email address twice, they are same but I found the solution, my git a little bit outdated, updating it fixed the problem | 14:03 |
|
waterkip
| ahh | 14:04 |
| ← joe1 left | 14:06 |
| → lt-dd joined | 14:10 |
| → schne1der joined | 14:16 |
| ← Murr left | 14:22 |
| → Murr joined | 14:22 |
| → thiago joined | 14:24 |
| ← rindolf left | 14:26 |
| → sandipan joined | 14:27 |
| → rindolf joined | 14:28 |
| ← bytehackr left | 14:29 |
| ← EvilDMP left | 14:31 |
| → EvilDMP joined | 14:32 |
| ← TonyStone left | 14:36 |
| → TonyStone joined | 14:38 |
| ← AnapodoPsalidaki left | 14:41 |
| → vitali64 joined | 14:46 |
| ← coot left | 14:47 |
|
bambams
| git checkout - . # This printed: Updated 52 paths from c7a0a54e42; what the hell did I tell it to do? | 14:48 |
| ← atrigent left | 14:48 |
| → coot joined | 14:48 |
|
mpldr
| bambams: my assumption would be everything (.) from the branch you were on before (-)… I am not certain whether or not "-" as a standin for the previous branch works in checkout though | 14:52 |
| → atrigent joined | 14:53 |
| → madewokherd joined | 14:55 |
| ← madewokherd` left | 14:58 |
| → OnkelTem joined | 15:06 |
| ← OnkelBlade left | 15:07 |
|
bambams
| It's a nasty typo. :) I'm lucky I didn't have many changes. | 15:11 |
|
| Well, I guess not lucky since I was trying to wipe the working directory anyway.. | 15:11 |
| → joe1 joined | 15:13 |
| ← coot left | 15:22 |
| → gogi[m] joined | 15:24 |
| ← jusski left | 15:26 |
| → great_taste joined | 15:29 |
| → boka joined | 15:38 |
| → marink joined | 15:41 |
|
sudoforge
| after cloning a repo and changing the default refspec to only track a single branch (the remote HEAD), how can i remove references to the other remote refs which are not being tracked? git-prune and git-remote-prune do not see those as deleted or missing refs that need to be deleted. | 15:42 |
| → vysn joined | 15:44 |
|
sudoforge
| i tend to take a manual approach for cleaning this up (by just removing .git/packed-refs) and re-fetch, but i'm wondering if there's a better way to go about it | 15:44 |
|
| for clarity, i change the default `remote.origin.fetch` from `+refs/heads/*:refs/remotes/origin/*` to `+refs/heads/foo:refs/remotes/origin/foo` | 15:48 |
| → feriman joined | 15:49 |
| → nate1 joined | 15:51 |
| ← atrigent left | 15:52 |
| → inflikted joined | 15:53 |
| ← nate1 left | 15:56 |
| ← hololeap left | 15:57 |
| → atrigent joined | 15:59 |
| → Ajax146188 joined | 16:04 |
| ← madewokherd left | 16:05 |
| ← theoceaniscool left | 16:06 |
| ← Ajax14618 left | 16:06 |
| Ajax146188 → Ajax14618 | 16:06 |
| → sa0 joined | 16:10 |
| ← dvanloon left | 16:11 |
| → biapy joined | 16:11 |
| → dvanloon joined | 16:12 |
|
biapy
| hi, what could cause git add and git status to stop listing directory contents after two entries ? i'm creating a new hugo website on ubuntu jammy, and git add . only add archetypes directory and config.yaml folder, and ignore the rest of the new folders. | 16:13 |
| ← forgotmynick left | 16:15 |
| ← marink left | 16:16 |
| → otisolsen70_ joined | 16:17 |
| ← otisolsen70 left | 16:20 |
|
biapy
| never mind. empty folders . | 16:21 |
| ← Murr left | 16:22 |
| → L0k1ky3 joined | 16:22 |
|
biapy
| would be a good idea to add an information message about untracked empty folders to git add and git status | 16:22 |
| → Murr joined | 16:22 |
| ← m0viefreak left | 16:24 |
| → zebrag joined | 16:25 |
| → ash_worksi joined | 16:25 |
| ← gurkenglas left | 16:26 |
| ← jmabr left | 16:27 |
| ← Lope left | 16:27 |
| → cyberpear joined | 16:28 |
| → howdoi joined | 16:29 |
| ← drogas left | 16:29 |
| → fantasia joined | 16:32 |
|
mjt0k
| biapy: git does not care about folders, it tracks files :) | 16:33 |
| → madewokherd joined | 16:33 |
| ← pflanze left | 16:36 |
| → pflanze joined | 16:44 |
| ← sa0 left | 16:44 |
| ← Rashad left | 16:47 |
| ← palasso left | 16:51 |
| ← cahoots left | 16:55 |
| ← joe1 left | 16:57 |
| → sh0ne joined | 16:57 |
| → palasso joined | 16:59 |
| ← schne1der left | 17:06 |
| → Rashad joined | 17:06 |
| → cahoots joined | 17:07 |
| → junebug joined | 17:10 |
| → gast0n joined | 17:10 |
| ← OnkelTem left | 17:11 |
| → OnkelTem joined | 17:12 |
| → coralgoat joined | 17:13 |
| ← fantasia left | 17:16 |
|
coralgoat
| I was reading <https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work>. | 17:18 |
|
| Can commits and tags be retroactively signed? | 17:18 |
| ← tyson2 left | 17:19 |
| → kjetilho joined | 17:19 |
|
bookworm
| yes but that's the same as if you rebase everything | 17:19 |
|
| you don't have to though, signing a tag at the top of your graph pretty much signs everything below it | 17:20 |
|
| that's also why the maintainers can just sign the tag, rather than every single commit | 17:21 |
|
kjetilho
| hi! I wonder how I can make git filter-repo include history from *old* filenames, ie. when code was refactored into a different directory some time ago. | 17:22 |
|
coralgoat
| bookworm, thanks | 17:22 |
| ← dionysus69 left | 17:22 |
| ← Deknos left | 17:24 |
|
nedbat
| i have a new file, i want to add just half of it. git add -p doesn't seem to do it. | 17:26 |
| ← txtsd left | 17:27 |
|
nedbat
| found it: git add -N the_file; then add -p | 17:29 |
| ← arch-angel left | 17:30 |
| → txtsd joined | 17:32 |
| ← mexen left | 17:33 |
|
kjetilho
| my bad - I was used the wrong paths (I was working on a repo which had already been filtered, and it had rewritten some of the original paths) | 17:34 |
|
| s/was// | 17:35 |
| ← iomari891 left | 17:35 |
| → iomari891 joined | 17:36 |
| → jab416171 joined | 17:36 |
| ← yeirr left | 17:37 |
| → mikrosis joined | 17:38 |
| ← coralgoat left | 17:40 |
| ← L0k1ky3 left | 17:40 |
| ← vitali64 left | 17:41 |
| → vitali64 joined | 17:43 |
| → DibbTubberOne joined | 17:46 |
| vitali64 → wiitali64 | 17:50 |
| wiitali64 → vitali64 | 17:51 |
| → joe1 joined | 17:51 |
| ← sandipan left | 17:52 |
| → julie_pilgrim joined | 17:52 |
|
julie_pilgrim
| -part | 17:53 |
| ← julie_pilgrim left | 17:53 |
| ← ice9 left | 17:53 |
|
ikke
| dramatic exit | 17:54 |
| ← junebug left | 17:54 |
| → Pouicky joined | 17:54 |
| ← Pouicky left | 17:55 |
| → Pouicky joined | 17:57 |
| ← Pouicky left | 17:57 |
| ← mncheckm left | 17:58 |
| → junebug joined | 17:58 |
| ← Sulky left | 17:59 |
| stoned → Hash | 18:02 |
| → tyson2 joined | 18:05 |
| ← vysn left | 18:06 |
| → gas51627 joined | 18:08 |
| → gurkenglas joined | 18:18 |
| → rickygee joined | 18:20 |
| → Sazhen86 joined | 18:20 |
|
rickygee
| Messed up seriously. Hoping someone can help | 18:20 |
| → baine101 joined | 18:20 |
|
rickygee
| I've had a project that I've spent 2 weeks on | 18:21 |
| ← Murr left | 18:21 |
| → Murr joined | 18:22 |
|
rickygee
| I've created a git init in the project added every file, then realized I've added the node_modules by mistake. So I disregard all changes and now every file is deleted | 18:23 |
|
| I'm hoping someone can tell me how to get them back | 18:23 |
|
| There has been no precious commits or any commits made so I'm pretty fearful | 18:23 |
|
cbreak
| rickygee: what do you mean? | 18:26 |
|
| just git reset node_modules, then commit, done | 18:26 |
|
rickygee
| So these are the command I've run from start. | 18:27 |
|
| Git init | 18:27 |
|
| Git add . | 18:27 |
| ← junebug left | 18:27 |
| ← baine101 left | 18:27 |
|
rickygee
| Then after realizing I've added node_modules I've discarded all changes | 18:27 |
|
| I've fucked up major | 18:28 |
|
ikke
| rickygee: at least you did git add . | 18:29 |
|
| so that means, the contents of all files are present in the .git dir | 18:29 |
| → skapata joined | 18:29 |
| ← skapata left | 18:29 |
| → skapata joined | 18:29 |
|
ikke
| (assuming you did not discard that) | 18:29 |
|
| git fsck --lost-found | 18:30 |
| ← iomari891 left | 18:30 |
|
cbreak
| rickygee: how did you discard the changes? | 18:30 |
|
| with git reset? | 18:30 |
|
| (that's what you should do: git reset) | 18:31 |
|
rickygee
| I used vscode UI | 18:31 |
|
cbreak
| is your data still there? | 18:31 |
|
rickygee
| It is not | 18:31 |
|
cbreak
| ... then what ikke wrote might help you :/ | 18:32 |
|
rickygee
| Just tried and nothing | 18:32 |
| → coot joined | 18:32 |
|
ikke
| did you check .git/lost-found? | 18:32 |
|
cbreak
| it will not restore the files | 18:32 |
|
| it might restore the file contents | 18:32 |
|
ikke
| git does not have the filenames, only the contents | 18:32 |
| ← kenanmarasli left | 18:32 |
|
rickygee
| At this point I'm just wondering if there's a way of recovering the files as if they where permanently deleted by accident | 18:33 |
|
| cbreak doesn't use git UIs, the command line is much more straight-forward | 18:33 |
|
ikke
| rickygee: we are telling you what is possible | 18:33 |
|
cbreak
| rickygee: once git knows about state, that state is stored within git's database. It is possible to get that data out again. Like ikke wrote. | 18:34 |
|
| it's easier to get it out when you commit it. | 18:34 |
|
| -> commit early, commit often | 18:34 |
|
rickygee
| How do I access .git/lost-found | 18:34 |
|
cbreak
| rewriting history in git is easy, you don't have to get your commits correct from the start. | 18:34 |
|
| it's a directory | 18:34 |
|
| you can use a terminal, or your file system browser tool of your platform | 18:35 |
|
| or maybe visual studio code can also show files | 18:35 |
|
rickygee
| How do I rewrite git history? | 18:35 |
|
| Just be aware there was never any commits | 18:36 |
|
ikke
| rickygee: that whas hypothetical | 18:36 |
|
| for the future | 18:36 |
|
cbreak
| that's a problem for later... and there are many solutions. git commit --amend, git rebase, git cherry-pick, git filter-branch, ... | 18:36 |
| ← rindolf left | 18:36 |
|
rickygee
| How do I use some of these? | 18:37 |
|
ikke
| That's for the future, it will not help you right now | 18:38 |
|
rickygee
| The situation is there is no git repo as I was about to make one | 18:39 |
|
ikke
| rickygee: you said you did 'git add .' | 18:39 |
|
rickygee
| I did yeah | 18:39 |
|
ikke
| That implies there is a git repo | 18:39 |
|
rickygee
| Locally I think there is yes | 18:40 |
|
| But no commits | 18:40 |
|
ikke
| did you check the .git/lost-found dir? | 18:40 |
|
rickygee
| I'm not sure where that is | 18:41 |
|
ikke
| In the directory where you ran git init | 18:41 |
|
rickygee
| Ahh yeah.. that folder doesn't exist in the .git | 18:42 |
|
ikke
| did you ran git fsck --lost-found? | 18:42 |
|
rickygee
| One sec | 18:42 |
| → sa0 joined | 18:43 |
|
rickygee
| Okay... That outputs a bunch of Dangling blob | 18:43 |
| ← tyson2 left | 18:43 |
| → cataton1a joined | 18:46 |
| → rindolf joined | 18:47 |
| ← joe1 left | 18:50 |
| ← rickygee left | 18:52 |
| → rickygee joined | 18:52 |
| → junebug joined | 18:53 |
|
rickygee
| Anyway to recover files from a discard all changes when there has been no commits to the repo? | 18:53 |
|
cbreak
| try git fsck --lost-found | 18:53 |
|
rickygee
| Tried that | 18:54 |
|
cbreak
| see man git-fsck for details | 18:54 |
|
gitinfo
| the git-fsck manpage is available at https://gitirc.eu/git-fsck.html | 18:54 |
|
cbreak
| that's your only hope. | 18:54 |
|
| (other than backups outside of git, like zfs snapshots or backups via timemachine or what ever | 18:54 |
|
rickygee
| I got a bunch of Dangling blob data | 18:54 |
| → hololeap joined | 18:55 |
|
cbreak
| good. | 18:55 |
|
| that's your stuff. | 18:55 |
|
rickygee
| No idea what to do with it now | 18:56 |
|
cbreak
| give the files names that make sense to you, and move them where they used to be | 18:56 |
|
| as said before, the files should end up inside .git/lost-found/ | 18:57 |
|
| look at every file in that directory, and try to find those you care about | 18:57 |
|
rickygee
| Omg.... Thank you so much 😂🤣 | 19:00 |
|
| Just opened them in vscode | 19:00 |
| ← roadie left | 19:02 |
| → forgotmynick joined | 19:03 |
| ← boka left | 19:03 |
| ← DibbTubberOne left | 19:05 |
| ← EvilDMP left | 19:05 |
| → EvilDMP joined | 19:05 |
| → sobkas joined | 19:07 |
| ← rickygee left | 19:08 |
| ← cataton1a left | 19:13 |
| ← sa0 left | 19:14 |
| → dionysus69 joined | 19:17 |
| → Jong joined | 19:17 |
| → Leonarbro joined | 19:19 |
| ← zeenk left | 19:21 |
| ← Sazhen86 left | 19:23 |
| ← Jck_true left | 19:23 |
| ← EvilDMP left | 19:23 |
| → Jck_true joined | 19:23 |
| → Sazhen86 joined | 19:27 |
| → node1 joined | 19:30 |
| → EvilDMP joined | 19:32 |
| → bambanxx joined | 19:33 |
| → Sulky joined | 19:33 |
| ← hololeap left | 19:34 |
| → money joined | 19:40 |
| → hololeap joined | 19:42 |
| → Shentino joined | 19:44 |
| ← KlungelSmurf left | 19:48 |
| → KlungelSmurf joined | 19:48 |
| → tyson2 joined | 19:50 |
| → nate1 joined | 19:52 |
| ← dvanloon left | 19:53 |
| → dvanloon6 joined | 19:53 |
| ← nate1 left | 19:57 |
| ← thebombzen left | 19:59 |
| ← jab416171 left | 20:00 |
| → jab416171 joined | 20:00 |
| → thebombzen joined | 20:01 |
| ← ___nick___ left | 20:04 |
| → Ajax146187 joined | 20:04 |
| ← Ajax14618 left | 20:05 |
| Ajax146187 → Ajax14618 | 20:05 |
| ← led_belly left | 20:07 |
| → led_belly joined | 20:15 |
| → Polo joined | 20:18 |
| ← otisolsen70_ left | 20:24 |
| ← bambanxx left | 20:29 |
| → jazzy joined | 20:31 |
| ← Polo left | 20:32 |
| ← Vonter left | 20:33 |
| ← wootehfoot left | 20:35 |
| → Guest7798 joined | 20:35 |
| ← Guest7798 left | 20:36 |
| → Guest7798 joined | 20:36 |
| → wootehfoot joined | 20:38 |
| ← pretty_dumm_guy left | 20:39 |
| → pretty_dumm_guy joined | 20:40 |
| ← pretty_dumm_guy left | 20:40 |
| ← Celeo left | 20:42 |
| ← Guest7798 left | 20:45 |
| ← peirik left | 20:45 |
| → Guest5803 joined | 20:46 |
| → nate1 joined | 20:47 |
| Guest5803 → POLO | 20:47 |
| ← node1 left | 20:49 |
| → Celeo joined | 20:52 |
| money → Guest4355 | 20:53 |
| ← Guest4355 left | 20:53 |
| POLO → money | 20:53 |
| → theoceaniscool joined | 20:53 |
| ← thebombzen left | 20:57 |
| → vysn joined | 20:58 |
| → thebombzen joined | 21:01 |
| → m0viefreak joined | 21:01 |
| → joe1 joined | 21:02 |
| ← vitali64 left | 21:02 |
| → Guest4355 joined | 21:06 |
| ← Guest4355 left | 21:07 |
| → Guest4355 joined | 21:07 |
| → Digit joined | 21:07 |
| Guest4355 → polo | 21:09 |
| ← junebug left | 21:09 |
| ← madewokherd left | 21:10 |
| → sa0 joined | 21:13 |
| ← joe1 left | 21:14 |
| ← Sazhen86 left | 21:17 |
| ← vysn left | 21:21 |
|
Digit
| hi, what's a good git boot-camp to get using it properly? ("properly" = as version control (branches, regressions, mergers, etc), cli, graphical/tui version trees, ...). also, http://git-scm.com/doc/ext seems have some duff links (iirc, ~ exhausted from looking before finding, what might aughta be a big "Learn" link on git homepage that took straight to first git command example, expediting like a tldr in big text and code blocks, | 21:26 |
|
| and more dense info in small text throughout to delve into. | 21:26 |
|
j416
| Digit: dunno but, I'd learn about the git object model first (what are refs, commits, trees, blobs, how do they relate), spend a day or two using git locally, then learn about remotes. | 21:28 |
| ← coot left | 21:33 |
| ← gh34 left | 21:36 |
| → inflikt3d joined | 21:36 |
|
nedbat
| Digit: for another view: i don't find understanding trees and blobs useful for day-to-day work in git. | 21:37 |
| → inflikted_ joined | 21:39 |
| ← inflikted left | 21:40 |
| ← inflikt3d left | 21:43 |
| → madewokherd joined | 21:44 |
| ← sa0 left | 21:45 |
| ← nate1 left | 21:48 |
|
nedbat
| I like the look of the Git Immersion tutorial, though it's unfortunate that they use Ruby when just editing text files would probably have been enough. | 21:49 |
| ← kjetilho left | 21:53 |
| → littlebobeep joined | 21:59 |
| ← crabbedhaloablut left | 22:00 |
| → crabbedhaloablut joined | 22:00 |
| ← money left | 22:00 |
| ← GNUmoon left | 22:01 |
| → GNUmoon joined | 22:02 |
| ← littlebobeep left | 22:04 |
| → Guest5473 joined | 22:04 |
| ← gas51627 left | 22:05 |
| ← wootehfoot left | 22:08 |
| ← Sulky left | 22:09 |
|
jazzy
| what would a scenario look like where the fetch and push URLs are different? | 22:12 |
| → kgdn joined | 22:13 |
| ← kgdn left | 22:14 |
| → pulse_ joined | 22:21 |
| ← pulse left | 22:24 |
| ← Guest5473 left | 22:24 |
| ← cation left | 22:24 |
| → cation joined | 22:26 |
| → pretty_dumm_guy joined | 22:28 |
| pulse_ → pulse | 22:29 |
| ← hstct left | 22:30 |
| → whatsupdoc joined | 22:31 |
| ← squirrel left | 22:32 |
| ← thebombzen left | 22:33 |
| → thebombzen joined | 22:35 |
| → Guest6629 joined | 22:36 |
| ← Koeniz left | 22:37 |
| → Koeniz joined | 22:37 |
| ← winter left | 22:37 |
| → winter joined | 22:37 |
| ← Guest6629 left | 22:39 |
| → Guest6629 joined | 22:39 |
| ← m1dnight left | 22:40 |
| → m1dnight joined | 22:42 |
| ← mikkel left | 22:44 |
| → mikkel joined | 22:44 |
| ← carl-- left | 22:46 |
| ← Koeniz left | 22:46 |
| → Koeniz joined | 22:47 |
| → littlebobeep joined | 22:53 |
| → Lunatrius` joined | 22:53 |
| ← Lunatrius left | 22:54 |
| Lunatrius` → Lunatrius | 22:54 |
| ← anddam left | 22:55 |
| ← dionysus69 left | 22:56 |
| ← feriman left | 22:56 |
| → hbautista joined | 23:02 |
| ← polo left | 23:02 |
| Guest6629 → POLO | 23:02 |
| → anddam joined | 23:04 |
| → Lunatrius` joined | 23:07 |
| ← troyt left | 23:08 |
| ← Lunatrius left | 23:09 |
| Lunatrius` → Lunatrius | 23:09 |
| → hbautista_ joined | 23:10 |
| → kgdn joined | 23:12 |
| ← hbautista left | 23:12 |
| ← kgdn left | 23:12 |
| ← R2robot left | 23:13 |
| ← humanface left | 23:14 |
| → troyt joined | 23:14 |
| → zeenk joined | 23:18 |
| ← zeenk left | 23:19 |
| ← skered left | 23:20 |
| ← POLO left | 23:20 |
| ← forgotmynick left | 23:22 |
| ← Rashad left | 23:25 |
| ← thebombzen left | 23:25 |
| → thebombzen joined | 23:28 |
| ← EvilDMP left | 23:33 |
| → Guest6329 joined | 23:34 |
| ← Guest6329 left | 23:34 |
| → Guest6329 joined | 23:34 |
| Guest6329 → POLO | 23:34 |
| ← hoochmonger left | 23:35 |
|
jazzy
| why aren't `git remote` commands generally preceded by hyphens? | 23:38 |
|
| bit confusing | 23:38 |
| → Saloframes joined | 23:38 |
| → Guest5485 joined | 23:41 |
| ← Guest5485 left | 23:43 |
| → Gambino joined | 23:44 |
| POLO → Guest3250 | 23:44 |
| → skered joined | 23:45 |
| → nate1 joined | 23:45 |
| → njt_ joined | 23:47 |
| njt_ → njt | 23:48 |
|
mackerman
| man git remote calls them "subcommands". Its just the syntax of how to call it. | 23:50 |
|
gitinfo
| the git-remote manpage is available at https://gitirc.eu/git-remote.html | 23:50 |
| ← nate1 left | 23:50 |
|
mackerman
| If you symlink git-remote to git binary, I think you can run git-remote add | 23:51 |
|
| But everybody knows it as git remote add | 23:51 |
|
nedbat
| jazzy: options use hyphens, commands don't | 23:52 |
| ← palasso left | 23:54 |
| → roadie joined | 23:54 |
| ← foul_owl left | 23:55 |
| ← sobkas left | 23:57 |
| → dfip^ joined | 23:59 |