| 2024-03-28 |
| → pentaslote joined | 00:00 |
| ← kostkon left | 00:02 |
| ← lxsameer left | 00:02 |
| ← donofrio__ left | 00:03 |
| → kostkon joined | 00:03 |
| ← Zumo left | 00:04 |
| → Zumo joined | 00:06 |
| ← xx left | 00:07 |
| → vykt joined | 00:08 |
|
vykt
| I just received a pull request to the main branch. Is there a way for me to pull it into the indev branch instead? | 00:09 |
|
larryv
| vykt: take a look at this, although i'm not sure whether you can do this or whether the person who opened the PR has to do it https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request | 00:15 |
|
vykt
| ty | 00:15 |
| ← llh left | 00:17 |
| ← Gary_Sinise left | 00:20 |
|
vykt
| that worked, cheers larry | 00:27 |
| ← henry40408 left | 00:34 |
| → henry40408 joined | 00:35 |
| ← Rodney_ left | 00:35 |
| → ZachGibbens joined | 00:36 |
| ← cyberpear left | 00:39 |
| → duxsco joined | 00:42 |
| ← duxsco left | 00:42 |
| → duxsco joined | 00:42 |
| → llh joined | 00:43 |
| → swamp_ joined | 00:44 |
| → pascal_blaze joined | 00:44 |
| → chandash joined | 00:44 |
| ← zmt01 left | 00:47 |
| ← PantelicGR left | 00:47 |
| → PantelicGR joined | 00:48 |
| → zmt00 joined | 00:48 |
| → dnh joined | 00:49 |
| → zmt01 joined | 00:49 |
| ← swamp_ left | 00:50 |
| ← PantelicGR left | 00:50 |
| → swamp_ joined | 00:52 |
| ← Ox7C5_ left | 00:52 |
| ← gas51627 left | 00:52 |
| ← zmt00 left | 00:53 |
| → zmt00 joined | 00:53 |
| ← dnh left | 00:54 |
| ← gildasio left | 00:55 |
| ← zmt01 left | 00:55 |
| → gildasio joined | 00:55 |
| ← adanwan left | 00:55 |
| → adanwan joined | 00:56 |
| → zmt01 joined | 00:56 |
| ← swamp_ left | 00:56 |
| → swamp_ joined | 00:57 |
| ← swamp_ left | 00:59 |
| ← zmt00 left | 00:59 |
| ← duxsco left | 00:59 |
| → zmt00 joined | 00:59 |
| ← zmt01 left | 01:01 |
| ← zmt00 left | 01:01 |
| ← john_johnk left | 01:05 |
| ← defjam left | 01:05 |
| ← ph88 left | 01:08 |
| ← pedahzur left | 01:11 |
| ← Leonarbro left | 01:16 |
| → Leonarbro joined | 01:17 |
| → defjam joined | 01:18 |
| → System_Error joined | 01:19 |
| ← defjam left | 01:24 |
|
larryv
| vykt: np | 01:28 |
|
System_Error
| have I correctly got idea git can't really store "custom" file permissions and keeps things 100644 regardless of original permissions? | 01:29 |
| ← chandash left | 01:30 |
|
System_Error
| I've never really cared of this aspect but I've stumbled on some specific case where that could've been useful | 01:30 |
| → chandash joined | 01:31 |
| ← Guru_DE left | 01:32 |
| ← bindu left | 01:32 |
| → bindu joined | 01:33 |
| ← user1 left | 01:33 |
| → Guru_DE joined | 01:36 |
| → defjam joined | 01:36 |
| ← kurahaupo left | 01:37 |
| → jacobk joined | 01:37 |
| → kurahaupo joined | 01:37 |
|
qmzbux
| Is this the right place to discuss git server hosting? | 01:41 |
| ← CarlFK left | 01:48 |
| ← chandash left | 01:50 |
| ← jacobk left | 01:51 |
| ← navi left | 01:55 |
| → Sidlinger joined | 02:09 |
| ← Sidlinger left | 02:11 |
| → chandash joined | 02:14 |
| ← JanC left | 02:14 |
| → JanC joined | 02:14 |
| ← TonyStone left | 02:18 |
| ← bn_work left | 02:18 |
| ← chandash left | 02:20 |
| ← JanC left | 02:23 |
| → insidesources joined | 02:28 |
| → stats464_ joined | 02:30 |
| ← stats4647 left | 02:30 |
| → chandash joined | 02:34 |
| → JanC joined | 02:34 |
|
vykt
| A | 02:37 |
| → pedahzur joined | 02:37 |
| ← chandash left | 02:41 |
| ← skapata left | 02:41 |
| → skapata joined | 02:42 |
| → jacobk joined | 02:43 |
| ← henry40408 left | 02:50 |
| → henry40408 joined | 02:51 |
| → chandash joined | 02:52 |
| ← skapata left | 02:52 |
| ← chandash left | 02:57 |
| → igemnace joined | 03:01 |
| ← kurahaupo left | 03:02 |
| → kurahaupo_ joined | 03:03 |
| ← gast0n left | 03:03 |
| ← opal left | 03:04 |
| ← Jck_true left | 03:05 |
| ← qqq left | 03:05 |
| → Jck_true joined | 03:05 |
| ← chovy left | 03:07 |
| ← dslegends_ left | 03:07 |
| → chovy joined | 03:08 |
| → dslegends joined | 03:08 |
| ← cdown left | 03:15 |
| ← JanC left | 03:16 |
| ← jas-maelstrom left | 03:16 |
| → opal joined | 03:17 |
| ← ZachGibbens left | 03:26 |
| → chandash joined | 03:27 |
| → guru_ joined | 03:29 |
| ← jensen left | 03:29 |
| ← Guru_DE left | 03:29 |
| ← chandash left | 03:32 |
| ← DaTa left | 03:33 |
| → DaTa joined | 03:33 |
| → braxas joined | 03:33 |
| → sa joined | 03:35 |
| ← cpackham left | 03:35 |
| ← Foxboron left | 03:36 |
| ← guru_ left | 03:36 |
| → sahil_ joined | 03:36 |
| → guru_ joined | 03:37 |
| → Foxboron joined | 03:37 |
| ← bleb left | 03:37 |
| → bleb joined | 03:38 |
| → JanC joined | 03:41 |
| ← kurahaupo_ left | 03:42 |
| ← bloody_ left | 03:42 |
| → hrtk joined | 03:43 |
| ← jacobk left | 03:48 |
| ← Leonarbro left | 03:51 |
| → Leonarbro joined | 03:52 |
| ← hrtk left | 03:52 |
| → hrtk joined | 03:52 |
| ← sahil_ left | 03:53 |
| ← FinnElija left | 03:53 |
| → FinnElija joined | 03:55 |
| ← donofrio_ left | 03:59 |
| → Dillab joined | 04:01 |
| ← pedahzur left | 04:02 |
| → chandash joined | 04:03 |
| → cpackham joined | 04:05 |
| ← Dillab left | 04:05 |
| ← chandash left | 04:07 |
| ← cpackham left | 04:12 |
| ← theobjectivedad left | 04:19 |
| → jas-maelstrom joined | 04:20 |
| ← qgnox left | 04:21 |
| ← hrtk left | 04:22 |
| → hrtk joined | 04:22 |
| → theobjectivedad joined | 04:26 |
| → jacobk joined | 04:27 |
| ← thomas_D8 left | 04:31 |
| → thomas_D8 joined | 04:31 |
| ← pascal_blaze left | 04:33 |
| → pascal_blaze joined | 04:34 |
| ← Xaldafax left | 04:34 |
| ← igemnace left | 04:35 |
| → igemnace joined | 04:36 |
| ← chemsmith left | 04:40 |
| → chemsmith joined | 04:42 |
| ← Traneptora left | 04:42 |
| → sahil_ joined | 04:49 |
| → Traneptora joined | 04:49 |
| → gsi_ joined | 04:51 |
| ← defjam left | 04:51 |
| ← gsi left | 04:54 |
| → ngoclokk joined | 05:03 |
| → ZachGibbens joined | 05:05 |
| → jmd joined | 05:15 |
| → defjam joined | 05:15 |
| ← hbautista left | 05:25 |
| ← sahil_ left | 05:26 |
| ← pac1 left | 05:40 |
| hrtk → hritik | 05:44 |
| → chandash joined | 05:45 |
| ← hritik left | 05:49 |
| ← chandash left | 05:51 |
| → hrtk joined | 05:51 |
| hrtk → hritik | 05:51 |
| ← hritik left | 05:52 |
| → hritik joined | 05:52 |
| → jfsimon1981 joined | 05:57 |
| → larryv_ joined | 05:57 |
| ← larryv left | 06:01 |
| ← JayBeeFOSS left | 06:01 |
| → JayBeeFOSS joined | 06:02 |
| → dngray_ joined | 06:04 |
| ← dngray left | 06:05 |
| ← ngoclokk left | 06:05 |
| ← Foxboron left | 06:06 |
| ← ikke left | 06:06 |
| → Foxboron joined | 06:07 |
| → yang joined | 06:07 |
| ← bleb left | 06:07 |
| bleb_ → bleb | 06:07 |
| → bleb_ joined | 06:08 |
| dngray_ → dngray | 06:09 |
| ← stats464_ left | 06:10 |
| ← dakh7 left | 06:12 |
| → dakh7 joined | 06:13 |
| ← jmd left | 06:13 |
| → ikke joined | 06:18 |
| ← hritik left | 06:18 |
| → hritik joined | 06:18 |
| → jmd joined | 06:19 |
| larryv_ → larryv | 06:21 |
| → zetef joined | 06:24 |
| ← criswell left | 06:25 |
| ← osc4rpt left | 06:26 |
| → criswell joined | 06:27 |
| → osc4rpt joined | 06:28 |
| ← JanC left | 06:31 |
| → JanC joined | 06:32 |
| → King_julian joined | 06:36 |
|
cYmen_
| Does anybody have suggestions for tracking "local only" content in repositories? | 06:37 |
| → john_johnk joined | 06:39 |
|
gsish
| keep in it a branch that you don't push | 06:41 |
|
| rebase helps to keep it local and not spill it into branches that you push | 06:41 |
| ← thiago left | 06:45 |
| ← zetef left | 06:45 |
|
cYmen_
| Ah, sorry I was not clear enough. I want to find all repositories with local-only branches, things on the stash or uncommited working dir changes. | 06:47 |
|
| I want to avoid losing data. | 06:47 |
| → KnoP joined | 06:47 |
| ← FH_thecat left | 06:47 |
| ← davispuh left | 06:54 |
| ← hritik left | 06:56 |
| → hritik joined | 06:57 |
| ← JanC left | 06:57 |
| → fandre1986 joined | 06:57 |
| → JanC joined | 06:58 |
| ← defjam left | 07:00 |
| → JanC_ joined | 07:02 |
| JanC → Guest8427 | 07:02 |
| JanC_ → JanC | 07:02 |
| ← Guest8427 left | 07:03 |
| → sreve joined | 07:05 |
| ← jacobk left | 07:05 |
| ← ZachGibbens left | 07:06 |
| ← jfsimon1981 left | 07:09 |
| ← larryv left | 07:11 |
| → bagatur joined | 07:12 |
| → defjam joined | 07:12 |
| ← fandre1986 left | 07:15 |
| ← defjam left | 07:19 |
| → guru__ joined | 07:21 |
| ← guru_ left | 07:23 |
| → guru_ joined | 07:24 |
| → fabs joined | 07:25 |
| ← init left | 07:26 |
| ← fabs left | 07:26 |
| ← guru__ left | 07:27 |
| → defjam joined | 07:32 |
| → zetef joined | 07:33 |
| ← crabbedhaloablut left | 07:33 |
| ← bagatur left | 07:34 |
| → crabbedhaloablut joined | 07:35 |
| → bagatur joined | 07:36 |
| → fabs joined | 07:37 |
| ← defjam left | 07:38 |
| → gandhibobandhi joined | 07:51 |
| → defjam joined | 07:52 |
| ← defjam left | 07:58 |
| → rfuentess joined | 08:04 |
| → stagas joined | 08:07 |
| ← King_julian left | 08:10 |
| → defjam joined | 08:10 |
| → stenno joined | 08:16 |
| ← defjam left | 08:16 |
| → dnh joined | 08:16 |
| ← john_johnk left | 08:18 |
| → MGF_Fabio joined | 08:20 |
| ← dnh left | 08:21 |
| ← mrpops2ko left | 08:22 |
| → mrpops2ko joined | 08:24 |
| → john_johnk joined | 08:24 |
| → sia joined | 08:24 |
| ← vykt left | 08:25 |
| → defjam joined | 08:28 |
| → dnh joined | 08:30 |
| ← defjam left | 08:34 |
| → Jaxef joined | 08:34 |
| ← dnh left | 08:35 |
| → chandash joined | 08:38 |
| ← yxt left | 08:41 |
| → yxt joined | 08:41 |
| ← crabbedhaloablut left | 08:43 |
| ← chandash left | 08:43 |
| → crabbedhaloablut joined | 08:45 |
| → defjam joined | 08:46 |
| ← defjam left | 08:52 |
| → defjam joined | 08:53 |
| ← defjam left | 08:59 |
| → defjam joined | 09:00 |
| → theoceaniscool joined | 09:02 |
| → wootehfoot joined | 09:04 |
| ← defjam left | 09:08 |
| ← akibageek left | 09:14 |
| → zen_coder joined | 09:14 |
| → lxsameer joined | 09:15 |
| → squealingcode joined | 09:18 |
| ← hritik left | 09:18 |
| → StucKman joined | 09:19 |
| → defjam joined | 09:20 |
| ← SJrX left | 09:21 |
| → SJrX joined | 09:23 |
| → Rodney_ joined | 09:24 |
| → Hi-Angel joined | 09:25 |
| ← defjam left | 09:26 |
| ← JanC left | 09:27 |
|
Hi-Angel
| Any ideas, how to see commits done since specific tag? So e.g. I usually use `git log upstream/master..` to see new commits in the current branch. However, when I execute a `git log upstream/v23.08.5..` I get `fatal: ambiguous argument 'upstream/v23.08.5..': unknown revision or path not in the working tree.`. The `v23.0.5` exists, I can see its | 09:27 |
|
| commit, checkout to it — so the only reason it may not be working that I see seems that it is a tag. Any thoughts? | 09:27 |
|
| *The `v23.08.5` exists | 09:28 |
|
| Ah, that's because for me works `git log v23.08.5` | 09:29 |
|
| Without `upstream/` | 09:29 |
|
| Mistery solved, haha | 09:29 |
|
| Although I don't undestand why I see `v23.08.5` and not `upstream/v23.08.5` even though the tag belongs to upstream… | 09:29 |
| ← bindu left | 09:31 |
| → bindu joined | 09:31 |
| → King_julian joined | 09:32 |
| → dnh joined | 09:34 |
| ← troyt left | 09:34 |
| → defjam joined | 09:37 |
| → troyt joined | 09:38 |
|
Bombe
| Hi-Angel, tags do not belong to remotes. | 09:40 |
| ← defjam left | 09:44 |
| → Flooo joined | 09:46 |
|
Flooo
| Hu | 09:47 |
|
Hi-Angel
| Oh, so, like, if I have tags in my local repo and I fetched remote tags too, they are indistiguishable? | 09:48 |
| → gas51627 joined | 09:48 |
| ← tirnanog left | 09:49 |
| → alexherbo2 joined | 09:49 |
| → hritik joined | 09:50 |
|
Flooo
| In git log you can see branches, tags, HEAD. if the current repo is a submodule is it possible to mark/show the commit it points to? | 09:50 |
| → duxsco joined | 09:52 |
|
Bombe
| Hi-Angel, correct. | 09:53 |
| → danse-nr3 joined | 09:53 |
| → defjam joined | 09:54 |
| ← hritik left | 09:55 |
| ← danse-nr3 left | 09:57 |
| → danse-nr3 joined | 09:57 |
| ← defjam left | 10:02 |
|
Hi-Angel
| Bombe thanks! | 10:04 |
| ← pascal_blaze left | 10:04 |
| → xx joined | 10:06 |
| ← jmd left | 10:08 |
| → jmd joined | 10:08 |
| ← dnh left | 10:11 |
| → hritik joined | 10:11 |
| ← jmd left | 10:13 |
| → DrowningElysium joined | 10:13 |
| → jmd joined | 10:13 |
| → defjam joined | 10:14 |
| → Ox7C5_ joined | 10:14 |
| ← defjam left | 10:20 |
| → chandash joined | 10:22 |
| ← zetef left | 10:23 |
| ← theobjectivedad left | 10:25 |
| → Lord_of_Life_ joined | 10:26 |
| ← Lord_of_Life left | 10:27 |
| ← chandash left | 10:27 |
| Lord_of_Life_ → Lord_of_Life | 10:29 |
| ← Hi-Angel left | 10:29 |
| ← pentaslote left | 10:29 |
| → pascal_blaze joined | 10:30 |
| ← MGF_Fabio left | 10:31 |
| → defjam joined | 10:31 |
| ← deltab left | 10:31 |
| → pascal_blaze_ joined | 10:32 |
| → dnh joined | 10:32 |
| ← adhawkins left | 10:32 |
| ← pascal_blaze left | 10:35 |
| ← defjam left | 10:37 |
| ← duxsco left | 10:38 |
| ← dnh left | 10:40 |
| ← john_johnk left | 10:42 |
| → deltab joined | 10:43 |
| ← kostkon left | 10:44 |
| → kostkon joined | 10:44 |
| → defjam joined | 10:50 |
| → john_johnk joined | 10:53 |
| → pascal_blaze joined | 10:54 |
| → JanC joined | 10:55 |
| → navi joined | 10:56 |
| ← pascal_blaze_ left | 10:57 |
| ← bindu left | 10:59 |
| → rsx joined | 10:59 |
| → bindu joined | 11:00 |
| ← defjam left | 11:01 |
| → sahil_ joined | 11:01 |
| ← stagas left | 11:01 |
| → stagas joined | 11:01 |
| ← stenno left | 11:02 |
| → pentaslote joined | 11:08 |
| → defjam joined | 11:13 |
| → sahil_1 joined | 11:16 |
| ← sahil_ left | 11:18 |
| sahil_1 → sahil_ | 11:18 |
| ← defjam left | 11:19 |
| → flom84 joined | 11:19 |
| ← sahil_ left | 11:19 |
| ← fstd left | 11:19 |
| ← Flooo left | 11:24 |
| → user1____ joined | 11:25 |
| → fstd joined | 11:27 |
| ← flom84 left | 11:27 |
| ← hritik left | 11:27 |
| → defjam joined | 11:32 |
| → hritik joined | 11:33 |
| ← dsimic left | 11:36 |
| ← pascal_blaze left | 11:36 |
| → dsimic joined | 11:37 |
| ← gandhibobandhi left | 11:37 |
| ← defjam left | 11:39 |
| ← Xeroine left | 11:40 |
| → chandash joined | 11:41 |
| → sia_ joined | 11:42 |
| ← sia left | 11:42 |
| ← chandash left | 11:45 |
| ← hritik left | 11:48 |
| → cdown joined | 11:48 |
| → Flooo joined | 11:50 |
| → defjam joined | 11:50 |
| ← King_julian left | 11:52 |
| → sahil_ joined | 11:52 |
| ← zen_coder left | 11:57 |
| ← defjam left | 12:02 |
| → hritik joined | 12:03 |
| → supay joined | 12:07 |
|
supay
| is it a standard approach to use a monorepo for microservices? | 12:07 |
| → defjam joined | 12:09 |
| → skapata joined | 12:10 |
| ← thuna` left | 12:14 |
| → dnh joined | 12:15 |
| → duxsco joined | 12:17 |
| → King_julian joined | 12:17 |
| → sixfourtwelve joined | 12:21 |
| ← sixfourtwelve left | 12:26 |
| ← pentaslote left | 12:26 |
| → gandhibobandhi joined | 12:31 |
| ← cdown left | 12:34 |
| → cdown joined | 12:34 |
| → Celmor joined | 12:37 |
| ← Flooo left | 12:37 |
| ← Celmor left | 12:37 |
| ← cdown left | 12:39 |
| → jacobk joined | 12:39 |
| ← danse-nr3 left | 12:41 |
| → danse-nr3 joined | 12:41 |
| ← hritik left | 12:42 |
|
bookworm
| defeats the point | 12:49 |
| → ferdna joined | 12:49 |
|
bookworm
| as far as git is concerned, it won't matter though and for the general discussion this is the wrong chan | 12:50 |
| → lucasta joined | 12:50 |
| ← dinkus left | 12:53 |
| → mjoerg joined | 12:56 |
| ← henry40408 left | 12:57 |
| → henry40408 joined | 12:57 |
| ← mjoerg left | 12:57 |
| → hritik joined | 13:00 |
| ← nuala left | 13:00 |
| ← weko left | 13:01 |
| ← defjam left | 13:03 |
| ← King_julian left | 13:05 |
| → dinkus joined | 13:05 |
| ← System_Error left | 13:08 |
| ← danse-nr3 left | 13:08 |
| → System_Error joined | 13:13 |
| ← hritik left | 13:13 |
| → hritik joined | 13:14 |
|
supay
| bookworm: defeats the point how? and sorry, could you recommend a better channel for this conversation? | 13:14 |
| ← fstd left | 13:15 |
| ← hritik left | 13:15 |
|
ikke
| being able to develop and deploy each service independently | 13:15 |
| → hritik joined | 13:15 |
|
bookworm
| any programming channel | 13:15 |
|
| and yes, what ikke said | 13:15 |
| → defjam joined | 13:15 |
| → fstd joined | 13:16 |
| ← hritik left | 13:16 |
| → IguanaBob joined | 13:17 |
|
IguanaBob
| Hello there. I need to get back in the history of a base-branch and rewrite some code. What can I do that rebasing all "child-branches" does not become a merge-conflict hell? | 13:17 |
| → hritik joined | 13:18 |
| ← hritik left | 13:18 |
| → hritik joined | 13:19 |
|
ikke
| !filter_repo | 13:19 |
|
| !filter-repo | 13:20 |
|
gitinfo
| A third-party git add-on that can quickly rewrite git history. See https://github.com/newren/git-filter-repo. | 13:20 |
| ← hritik left | 13:20 |
| → hritik joined | 13:20 |
| ← hritik left | 13:21 |
| ← dinkus left | 13:21 |
|
supay
| ikke: i see. is that really a problem with a monorepo? | 13:22 |
| ← sreve left | 13:24 |
|
IguanaBob
| ikke: thanks, sounds good :) | 13:25 |
| → sreve joined | 13:25 |
| → hritik joined | 13:28 |
| → chandash joined | 13:28 |
| ← bindu left | 13:30 |
| → bindu joined | 13:31 |
| → pentaslote joined | 13:32 |
| → weko joined | 13:32 |
| ← chandash left | 13:34 |
| ← defjam left | 13:39 |
| → defjam joined | 13:40 |
| ← Jaxef left | 13:41 |
| → FH_thecat joined | 13:46 |
| ← YuGiOhJCJ left | 13:57 |
| → Xeroine joined | 13:58 |
| → chandash joined | 14:03 |
| → MGF_Fabio joined | 14:03 |
| → nic-robot joined | 14:04 |
| ← System_Error left | 14:04 |
| → thiago joined | 14:04 |
| → System_Error joined | 14:05 |
| ← nic-robot left | 14:05 |
| → gandhibobandhi_ joined | 14:05 |
| luke-jr_ → luke-jr | 14:06 |
| ← chandash left | 14:07 |
| ← gandhibobandhi left | 14:09 |
| ← duxsco left | 14:11 |
| ← jpw left | 14:12 |
| ← hritik left | 14:13 |
| → jpw joined | 14:14 |
| ← jpw left | 14:14 |
| → jpw joined | 14:14 |
| ← peirik left | 14:17 |
| ← john_johnk left | 14:17 |
| → peirik joined | 14:18 |
| ← System_Error left | 14:19 |
| → System_Error joined | 14:19 |
| → cdown joined | 14:24 |
| ← jpw left | 14:26 |
| ← thiago left | 14:28 |
| → akibageek joined | 14:29 |
| ← sreve left | 14:29 |
| ← JanC left | 14:30 |
| ← sahil_ left | 14:30 |
| → JanC joined | 14:32 |
| → Flooo joined | 14:34 |
| → jpw joined | 14:35 |
| ← jpw left | 14:35 |
| → jpw joined | 14:35 |
| → theobjectivedad joined | 14:37 |
| ← luke-jr left | 14:37 |
| → john_johnk joined | 14:38 |
| → luke-jr joined | 14:41 |
| ← mven97 left | 14:43 |
| ← JanC left | 14:43 |
| → mven97 joined | 14:43 |
| → JanC joined | 14:43 |
| ← mven97 left | 14:44 |
| ← jpw left | 14:45 |
| → mven97 joined | 14:46 |
| → kjartan joined | 14:48 |
| → qgnox joined | 14:50 |
| → jensen joined | 14:53 |
| → chandash joined | 14:59 |
| ← SuperLag left | 15:01 |
| → SuperLag joined | 15:01 |
| ← SuperLag left | 15:01 |
| → SuperLag joined | 15:01 |
| ← Vonter left | 15:03 |
| → Vonter joined | 15:03 |
| ← System_Error left | 15:05 |
| → System_Error joined | 15:06 |
| → JanC_ joined | 15:09 |
| JanC → Guest3663 | 15:09 |
| ← Guest3663 left | 15:09 |
| JanC_ → JanC | 15:09 |
| → fstd_ joined | 15:09 |
| ← R2robot left | 15:10 |
| ← dza left | 15:11 |
| ← fstd left | 15:11 |
| fstd_ → fstd | 15:11 |
| → dza joined | 15:13 |
| → jpw joined | 15:18 |
| ← jpw left | 15:18 |
| → jpw joined | 15:18 |
| ← alexherbo2 left | 15:19 |
| ← luke-jr left | 15:23 |
| ← jensen left | 15:24 |
| ← rfuentess left | 15:24 |
| → gh34 joined | 15:25 |
| → jensen joined | 15:25 |
| → nic-robot joined | 15:25 |
| → pedahzur joined | 15:26 |
| → rfuentess joined | 15:29 |
| ← defjam left | 15:30 |
| ← jpw left | 15:35 |
| → antonmosich joined | 15:36 |
| ← adanwan left | 15:37 |
| → adanwan joined | 15:37 |
| ← ferdna left | 15:37 |
| → jpw joined | 15:39 |
| ← jpw left | 15:39 |
| → jpw joined | 15:39 |
| → visualshock joined | 15:41 |
| → fstd_ joined | 15:41 |
| → defjam joined | 15:42 |
| → stats4647 joined | 15:42 |
| ← fstd left | 15:45 |
| → fstd joined | 15:45 |
| ← fstd_ left | 15:46 |
| ← defjam left | 15:48 |
| → fstd_ joined | 15:50 |
| ← nic-robot left | 15:51 |
| ← fstd left | 15:54 |
| → fstd joined | 15:54 |
| → sahil_ joined | 15:54 |
| ← System_Error left | 15:55 |
| ← fstd_ left | 15:55 |
| → System_Error joined | 15:55 |
| → defjam joined | 15:56 |
| ← lucasta left | 15:56 |
| ← chuanshi left | 16:00 |
| ← yxt left | 16:00 |
| → chuanshi joined | 16:00 |
| → luke-jr joined | 16:00 |
|
FH_thecat
| how can I keep colored output, when piping to more: | 16:01 |
|
| git diff | more | 16:01 |
|
mjt0k
| iirc `more' does not support color escape sequences to begin with. But less does with some option | 16:02 |
|
ikke
| git -c color.ui=always diff | less -R | 16:02 |
|
mjt0k
| less -R, yeah | 16:02 |
| → fstd_ joined | 16:02 |
|
mjt0k
| git diff --color=always too | 16:03 |
| ← fstd left | 16:03 |
| fstd_ → fstd | 16:03 |
| → yxt joined | 16:05 |
| ← intelfx left | 16:07 |
| → cdown_ joined | 16:08 |
| → joakimk joined | 16:09 |
| ← adanwan left | 16:10 |
| → adanwan joined | 16:10 |
| ← cdown left | 16:10 |
| cdown_ → cdown | 16:11 |
| → fstd_ joined | 16:14 |
| → R2robot joined | 16:14 |
| ← rfuentess left | 16:14 |
| → intelfx joined | 16:15 |
| ← stagas left | 16:16 |
| ← fstd left | 16:17 |
| → fstd joined | 16:17 |
| → imi joined | 16:18 |
| ← fstd_ left | 16:18 |
|
imi
| hi, can I make git to display git diff output in git mergetool ? | 16:19 |
|
selckin
| there is a difftool | 16:19 |
|
imi
| thanks | 16:20 |
| ← jacobk left | 16:24 |
| ← jmjl left | 16:25 |
| → jmjl joined | 16:27 |
| → zen_coder joined | 16:34 |
| → Achylles joined | 16:35 |
| ← StucKman left | 16:35 |
| ← DrowningElysium left | 16:43 |
| ← igemnace left | 16:44 |
| → zetef joined | 16:46 |
| ← mingdao left | 16:48 |
| → mingdao joined | 16:49 |
| ← MGF_Fabio left | 16:51 |
| ← zen_coder left | 16:53 |
| → Timmy|2 joined | 16:54 |
| ← fstd left | 16:56 |
| ← Traneptora left | 16:59 |
| → Traneptora joined | 16:59 |
| → igemnace joined | 17:01 |
| → Timmy|3 joined | 17:05 |
| ← igemnace left | 17:06 |
| ← Timmy|2 left | 17:07 |
| → alexherbo2 joined | 17:07 |
| → sia joined | 17:08 |
| ← sia_ left | 17:08 |
| → iomari891 joined | 17:09 |
| ← Timmy|3 left | 17:13 |
| → fstd joined | 17:14 |
| ← alexherbo2 left | 17:19 |
| ← iomari891 left | 17:24 |
| ← guru_ left | 17:30 |
| ← R2robot left | 17:31 |
| → R2robot joined | 17:37 |
| → hritik joined | 17:38 |
| ← hritik left | 17:43 |
| → larryv joined | 17:43 |
| ← polyrob left | 17:58 |
| → polyrob joined | 18:00 |
| ← PteVallkas55Acti left | 18:00 |
| → Rabote55xMamon joined | 18:01 |
| ← Flooo left | 18:02 |
| ← JanC left | 18:06 |
| → JanC joined | 18:10 |
| ← insidesources left | 18:12 |
| Rabote55xMamon → pausadd | 18:12 |
| → davispuh joined | 18:14 |
| ← supay left | 18:14 |
| ← pedahzur left | 18:16 |
| → pedahzur joined | 18:16 |
| → jacobk joined | 18:19 |
| ← JanC left | 18:19 |
| → JanC joined | 18:20 |
| ← stats4647 left | 18:20 |
| → stats4647 joined | 18:21 |
| ← sahil_ left | 18:22 |
| → insidesources joined | 18:22 |
| → duxsco joined | 18:24 |
| ← duxsco left | 18:24 |
| → duxsco joined | 18:25 |
| ← rsx left | 18:25 |
| → ___nick___ joined | 18:27 |
| ← lv8pv left | 18:29 |
| ← mingdao left | 18:30 |
| → lv8pv joined | 18:30 |
| → mingdao joined | 18:30 |
| ← cdown left | 18:31 |
| ← duxsco left | 18:33 |
| → duxsco joined | 18:33 |
| → thiago joined | 18:34 |
| ← duxsco left | 18:34 |
| → duxsco joined | 18:35 |
| → sgerry joined | 18:38 |
| ← mingdao left | 18:38 |
| → hritik joined | 18:39 |
| → mingdao joined | 18:39 |
| ← zetef left | 18:40 |
| ← gandhibobandhi_ left | 18:41 |
| ← hritik left | 18:44 |
| ← john_johnk left | 18:44 |
| ← IguanaBob left | 18:46 |
| ← chandash left | 18:50 |
| → kurahaupo joined | 18:51 |
| → stagas joined | 18:53 |
| → hritik joined | 18:54 |
| ← hritik left | 19:02 |
| → alexherbo2 joined | 19:04 |
| ← squealingcode left | 19:08 |
| → squealingcode joined | 19:08 |
| ← qgnox left | 19:09 |
| ← System_Error left | 19:11 |
| → System_Error joined | 19:12 |
| → hritik joined | 19:14 |
| → t0mm13b_ joined | 19:14 |
| ← t0mm13b left | 19:15 |
| → sahil_ joined | 19:16 |
| → chandash joined | 19:17 |
| → sgerry_ joined | 19:22 |
| ← sgerry left | 19:22 |
| → john_johnk joined | 19:25 |
| → delay joined | 19:28 |
| ← kurahaupo left | 19:37 |
| → kurahaupo joined | 19:37 |
| ← chandash left | 19:38 |
| → zetef joined | 19:38 |
| ← bitoff left | 19:42 |
| → bitoff joined | 19:44 |
| ← sahil_ left | 19:44 |
| hritik → hrtk | 19:48 |
| → cdown joined | 19:51 |
| ← john_johnk left | 19:51 |
| ← zetef left | 19:53 |
| → drocan joined | 19:53 |
| → sahil_ joined | 19:58 |
| ← jacobk left | 20:00 |
| → King_julian joined | 20:04 |
| ← JanC left | 20:05 |
| → qgnox joined | 20:05 |
| → JanC joined | 20:05 |
|
quesker
| can I undo this? git reset --soft main | 20:06 |
|
| so I did git fetch; git rebase origin/main then that. oops. should have been --soft origin/main I think | 20:07 |
|
| that or I shoud have pulled main first. or something | 20:07 |
| → john_johnk joined | 20:07 |
|
quesker
| can I just run it again against origin/main? | 20:08 |
|
mjt0k
| git reflog will show your last actions. You can do `git reset [--soft] COMMITID` of the commit you need | 20:09 |
|
| this probably is the 2nd line, if the last thing was `git reset` | 20:09 |
| → duxsco_ joined | 20:12 |
| → duxco joined | 20:13 |
| ← duxsco left | 20:15 |
| ← duxsco_ left | 20:17 |
|
quesker
| do I need the --soft? | 20:17 |
|
| sounds like it. do not touch the working tree | 20:18 |
| ← jmd left | 20:18 |
|
quesker
| whew. thanks | 20:19 |
|
| panic attack every time I do anything other than commit and push | 20:19 |
| ← thiago left | 20:20 |
|
qmzbux
| I currently am hosting a git server with multiple repositories with ssh access only. I am using ACL for read permission control and pre-receive hook for write permission control. What is a good way to deploy a web interface with access control without restructuring the ssh access I have right now? | 20:23 |
| ← dnh left | 20:26 |
|
quesker
| you are probably asking the experts here and not me but I have gitea in a docker container for my personal stuff and it is nice. I mostly use ssh but sometimes use the gitea web interface, like to make new repos. not sure if that is what you mean | 20:26 |
| ← JanC left | 20:27 |
| ← defjam left | 20:27 |
| ← duxco left | 20:27 |
| ← antonmosich left | 20:27 |
| → duxsco joined | 20:27 |
| ← visualshock left | 20:28 |
| ← King_julian left | 20:30 |
| → PantelicGR joined | 20:31 |
| ← mingdao left | 20:31 |
| → mingdao joined | 20:32 |
|
qmzbux
| Thanks. I've looked into gitea but unfortunately it requires all permissions of the bare repositories to be owned by user git and visible by user www-data. | 20:32 |
| → nic-robot joined | 20:33 |
|
qmzbux
| I used ACL to distribute permissions to different ssh users for a reason so ... My options are very limited now :/ | 20:33 |
|
mjt0k
| all UIs should be like this. At the very least, all repos owned by the same user who later can grant permissions | 20:35 |
|
| only owner can change permissions of files, or root | 20:35 |
|
sia
| I thought only root can change file permissions. | 20:37 |
| → JanC joined | 20:37 |
| ← kostkon left | 20:38 |
| → kostkon_ joined | 20:38 |
| kostkon_ → kostkon | 20:39 |
| → defjam joined | 20:40 |
| ← batrick left | 20:41 |
|
qmzbux
| Thanks. I will figure some ways out. My options are now cgit and gitweb. But the thing is I can't use gitolite because I have custom hooks and stuff for automation | 20:41 |
| ← defjam left | 20:45 |
| ← hrtk left | 20:48 |
| → TonyStone joined | 20:53 |
| → dnh joined | 20:54 |
| → defjam joined | 20:57 |
|
ZLima12
| cgit is pretty nice, as long as you don't need things like issues and merge requests | 21:02 |
| ← defjam left | 21:02 |
| → chandash joined | 21:02 |
| ← ___nick___ left | 21:04 |
| ← voker57 left | 21:06 |
| → voker57 joined | 21:06 |
| → xarvatium joined | 21:06 |
| → thiago joined | 21:07 |
| → thuna` joined | 21:10 |
| → defjam joined | 21:15 |
|
BtbN
| I didn't check, but I'd be shocked if gitolite wouldn't support all the usual git hooks | 21:16 |
| ← chandash left | 21:16 |
| → clarkk joined | 21:20 |
| → JanC_ joined | 21:24 |
| JanC → Guest2005 | 21:24 |
| ← Guest2005 left | 21:24 |
| JanC_ → JanC | 21:24 |
| ← agrmohit left | 21:24 |
| → agrmohit joined | 21:24 |
| ← thiago left | 21:27 |
| ← System_Error left | 21:28 |
| ← bagatur left | 21:28 |
| → System_Error joined | 21:30 |
| → jacobk joined | 21:35 |
| ← defjam left | 21:36 |
| → defjam joined | 21:37 |
| → riposte joined | 21:37 |
| ← qgnox left | 21:41 |
| ← Leonarbro left | 21:41 |
| ← Vonter left | 21:42 |
| → Leonarbro joined | 21:42 |
| → Vonter joined | 21:43 |
| → Guru_DE joined | 21:46 |
| → guru_ joined | 21:50 |
| ← imi left | 21:51 |
| → ate329 joined | 21:53 |
| ← Guru_DE left | 21:53 |
| ← ate329 left | 21:53 |
| → m0viefreak joined | 21:55 |
| ← clarkk left | 21:56 |
| ← filePeter left | 21:59 |
|
germ_
| o/ o/ | 22:00 |
|
| o/ ol o/ | 22:00 |
| ← alexherbo2 left | 22:01 |
| ← chemsmith left | 22:15 |
| → chemsmith joined | 22:16 |
| ← stagas left | 22:19 |
| → chandash joined | 22:19 |
|
germ_
| \o lo \o. | 22:23 |
|
| So for mergetool, under Windows.. | 22:23 |
| ← System_Error left | 22:24 |
| ← chandash left | 22:25 |
| → wurstwasser joined | 22:25 |
| ← JanC left | 22:25 |
| → System_Error joined | 22:25 |
| ← wootehfoot left | 22:26 |
|
germ_
| I cannot just slap-in `WinMerge' for it to plain work ? :\ | 22:26 |
| → tirnanog joined | 22:29 |
| → chandash joined | 22:29 |
| → guru__ joined | 22:30 |
| ← guru_ left | 22:30 |
|
germ_
| Yeah OK I see.. I can't install P4merge.., the problems are compounding ... | 22:31 |
| ← sahil_ left | 22:31 |
| ← deepy left | 22:31 |
| → sahil_ joined | 22:31 |
|
germ_
| (But still there should be a auto-WinMerge.. If anything it'd make more sense.. I mean aren't you people the open-source fanatics ? No disrespect meant to fanatics :p) | 22:34 |
| → ghostnote joined | 22:34 |
| → deepy joined | 22:34 |
| ← defjam left | 22:36 |
| → defjam joined | 22:38 |
| ← jas-maelstrom left | 22:41 |
| ← insidesources left | 22:41 |
| → JanC joined | 22:42 |
| → hritik joined | 22:43 |
| ← hritik left | 22:43 |
| → hritik joined | 22:44 |
| ← KnoP left | 22:46 |
| → zen_coder joined | 22:46 |
| → insidesources joined | 22:47 |
| ← sahil_ left | 22:47 |
| ← hritik left | 22:48 |
| ← gh34 left | 22:50 |
| ← JanC left | 22:51 |
| → ferdna joined | 22:51 |
| ← insidesources left | 22:52 |
| → oriba joined | 22:52 |
| → jas-maelstrom joined | 22:52 |
| → JanC joined | 22:52 |
| ← zen_coder left | 22:52 |
| ← foul_owl left | 22:52 |
| → qqq joined | 22:59 |
| ← System_Error left | 23:00 |
| → System_Error joined | 23:00 |
| → bloody joined | 23:01 |
| ← jas-maelstrom left | 23:06 |
| → foul_owl joined | 23:07 |
| ← intelfx left | 23:08 |
| ← delay left | 23:10 |
| → jas-maelstrom joined | 23:12 |
| ← user1____ left | 23:12 |
| → intelfx joined | 23:17 |
|
b0nn
| qmzbux: I control access to the git repos with the unix permissions and by making users part of groups that can access certain directories | 23:22 |
|
| That is, users access the repos using ssh keys, but linux will only allow them access to certain directories | 23:23 |
| → travisghansen joined | 23:24 |
| ← sfenik left | 23:28 |
| → sfenik joined | 23:30 |
| ← JanC left | 23:31 |
| → JanC joined | 23:33 |
| ← travisghansen left | 23:37 |
| ← chilversc left | 23:38 |
| → insidesources joined | 23:39 |
| → chilversc joined | 23:40 |
| ← dnh left | 23:40 |
| ← duxsco left | 23:41 |
| → pascal_blaze joined | 23:41 |
| → hritik joined | 23:45 |
| ← insidesources left | 23:45 |
| ← hritik left | 23:45 |
| ← pedahzur left | 23:47 |
| ← jacobk left | 23:47 |
| → pedahzur joined | 23:48 |
| → insidesources joined | 23:49 |
| ← Achylles left | 23:51 |
|
| germ_ will try `meld'. | 23:53 |
| → thiago joined | 23:54 |
|
germ_
| (`Unknown publisher.' Starts bad. ):'( :)) | 23:55 |
|
| well, What do you know: | 23:55 |
|
| --------------------------- | 23:55 |
|
| Git Gui (blender): error | 23:55 |
|
| --------------------------- | 23:55 |
|
| Could not start the merge tool: | 23:55 |
|
| couldn't execute "meld": no such file or directory | 23:55 |
|
| --------------------------- | 23:55 |
|
| OK | 23:55 |
|
| --------------------------- | 23:55 |
|
| :| | 23:55 |
|
| So I added the path to Meld in %PATH% (what an experience.) Yet still, BAM: | 23:59 |
|
| gdbus.exe - Entry Point Not Found | 23:59 |
| → OnkelTem joined | 23:59 |
|
germ_
| --------------------------- | 23:59 |
|
| The procedure entry point DllMain could not be located in the dynamic link library C:\Program Files\Meld\libgmodule-2.0-0.dll. | 23:59 |
|
| It (seems to) work, though :D | 23:59 |