| 2023-12-29 |
| → zumba_addict joined | 00:00 |
| → Quack joined | 00:00 |
| → jklfds joined | 00:00 |
| ← gchound left | 00:03 |
| ← john_johnk left | 00:03 |
| ← bambanxx left | 00:09 |
| → bambanxx joined | 00:09 |
| ← bambanxx left | 00:10 |
| ← relipse left | 00:11 |
| ← liefer396 left | 00:11 |
| ← skapata left | 00:12 |
| → skapata joined | 00:12 |
| → bambanxx joined | 00:13 |
| ← khrbtxyz left | 00:18 |
| → hbautista joined | 00:19 |
| → khrbtxyz joined | 00:22 |
| ← bambanxx left | 00:22 |
| ← tomboy64 left | 00:23 |
| → Traneptora joined | 00:27 |
| ← hbautista left | 00:28 |
| → tomboy64 joined | 00:29 |
| → stuv joined | 00:45 |
| → drbeco joined | 00:46 |
| → nivag_2c joined | 00:51 |
| ← Sasazuka left | 00:53 |
| → bambanxx joined | 00:57 |
| ← jklfds left | 01:02 |
| → jklfds joined | 01:05 |
| ← rgrinberg left | 01:08 |
| ← jklfds left | 01:10 |
| ← Traneptora left | 01:10 |
| → Sasazuka joined | 01:15 |
| ← Lord_of_Life left | 01:17 |
| → Lord_of_Life joined | 01:18 |
| → Traneptora joined | 01:18 |
| → jklfds joined | 01:22 |
| ← jklfds left | 01:27 |
| → jklfds joined | 01:29 |
| → zoorat joined | 01:33 |
| → rosco joined | 01:34 |
| ← bambanxx left | 01:40 |
| ← nivag_2c left | 01:44 |
| ← zoorat left | 01:46 |
| ← m0viefreak left | 01:48 |
| → nivag_2c joined | 01:57 |
| → rgrinberg joined | 01:58 |
| → bambanxx joined | 02:02 |
| ← bambanxx left | 02:03 |
| → fdan joined | 02:08 |
|
fdan
| any idea what needs to be done. | 02:08 |
|
| the GH shows This branch cannot be rebased due to conflicts | 02:08 |
|
| it doesnt show any files that have conflicts | 02:08 |
| ← rgrinberg left | 02:11 |
| ← miigotu left | 02:12 |
| → miigotu joined | 02:30 |
| ← crabbedhaloablut left | 02:30 |
| ← jklfds left | 02:31 |
|
fdan
| ? | 02:34 |
|
waterkip
| checkout the branch locally | 02:40 |
|
fdan
| ok and then? | 02:41 |
|
waterkip
| and rebase it against whatever branch you want to | 02:41 |
|
| you'll get a conflict | 02:41 |
|
| solve it | 02:41 |
|
fdan
| how do you rebase | 02:41 |
|
| 'git rebase' is the command? | 02:41 |
|
waterkip
| rebase continue and be done | 02:41 |
|
| !man git-rebase | 02:41 |
|
gitinfo
| The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)? | 02:41 |
|
| the git-rebase manpage is available at https://gitirc.eu/git-rebase.html | 02:41 |
|
fdan
| when i do a git rebase, it says current branch <branchname> is up to date. | 02:41 |
|
waterkip
| git rebase remote/branch | 02:42 |
|
| git rebase without arguments does something different | 02:42 |
| ← ahmed left | 02:42 |
|
waterkip
| it rebases against whatever branch you are tracking and sets the forkpoint to true | 02:42 |
|
fdan
| it says fatal: invalid upstream 'remote/sc-342' | 02:42 |
|
waterkip
| remote being whatever remote you have | 02:43 |
|
| git remote -v | 02:43 |
|
fdan
| i tried doing git rebase remote/sc-342 | 02:43 |
|
waterkip
| it probably is origin or upstream | 02:43 |
|
fdan
| origin git@github.com:qlabs/stas-tf.git (fetch) | 02:44 |
|
| origin git@github.com:qlabs/stas-tf.git (push) | 02:44 |
|
| output of git remote -v | 02:44 |
|
waterkip
| origin it is | 02:44 |
| → jklfds joined | 02:45 |
|
waterkip
| does `git branch --all` show remotes/origin/sc-324 ? | 02:45 |
|
fdan
| yes | 02:45 |
|
| should it be git rebase remote/origin/sc-342 | 02:45 |
|
waterkip
| no, just origin/sc-342 | 02:46 |
| ← rosco left | 02:46 |
| ← nivag_2c left | 02:46 |
|
fdan
| it says current branch <branchname> is up to date. | 02:48 |
|
waterkip
| and you want to merge it into that branch? | 02:49 |
|
fdan
| i want to merge that branch into master | 02:50 |
|
waterkip
| can you do `git fetch`? | 02:50 |
|
fdan
| ok and? | 02:50 |
|
waterkip
| ok, so rebase it against origin/master (fetch first) | 02:50 |
| ← Vonter left | 02:51 |
|
fdan
| ok i fixed a conflict | 02:51 |
|
| then what i must do? | 02:51 |
|
| git rebase --continue | 02:52 |
|
waterkip
| you added it? | 02:52 |
|
fdan
| ok it said Successfully rebased and updated refs/heads/sc-342 | 02:52 |
|
waterkip
| cool | 02:52 |
|
| now push it | 02:52 |
|
| see the man-page of git push | 02:52 |
|
| !man git-push | 02:53 |
|
gitinfo
| The git man pages are available online at https://gitirc.eu/git.html. Or were you looking for the "man git-foo" syntax (without the !)? | 02:53 |
|
| the git-push manpage is available at https://gitirc.eu/git-push.html | 02:53 |
| → Vonter joined | 02:53 |
|
fdan
| cool thank you | 02:54 |
|
waterkip
| yw | 02:55 |
| ← chovy left | 02:57 |
| → chovy joined | 02:58 |
| ← AndOrMan left | 02:59 |
| → rgrinberg joined | 03:01 |
| ← navi left | 03:02 |
| → donofrio joined | 03:03 |
| ← cdown left | 03:07 |
| → finn_elija joined | 03:25 |
| ← FinnElija left | 03:25 |
| finn_elija → FinnElija | 03:25 |
| → fdan27 joined | 03:32 |
| ← FinnElija left | 03:33 |
| → FinnElija joined | 03:33 |
| ← Vonter left | 03:38 |
| → Vonter joined | 03:39 |
| ← jklfds left | 03:49 |
| → gsi_ joined | 03:51 |
| ← gsi left | 03:54 |
| → nivag joined | 03:59 |
| → relipse_ joined | 03:59 |
| ← bin101 left | 04:00 |
| ← Vonter left | 04:00 |
| ← FH_thecat left | 04:02 |
| → jklfds joined | 04:02 |
| ← miigotu left | 04:02 |
| → miigotu joined | 04:02 |
| → Vonter joined | 04:03 |
| → kristjansson joined | 04:05 |
| → xdminsy joined | 04:07 |
| → bin101 joined | 04:07 |
| ← jklfds left | 04:09 |
| ← thiago left | 04:09 |
| ← derpydoo left | 04:11 |
| → jklfds joined | 04:11 |
| ← donofrio left | 04:15 |
| ← jklfds left | 04:16 |
| ← miigotu left | 04:26 |
| → miigotu joined | 04:26 |
| → thiago joined | 04:29 |
| → jklfds joined | 04:29 |
| → LuckyMan joined | 04:32 |
| ← krushia left | 04:33 |
| ← miigotu left | 04:34 |
| ← LuxuryMode left | 04:35 |
| → miigotu joined | 04:35 |
| → FH_thecat joined | 04:40 |
| ← thiago left | 04:42 |
| → Gary_Sinise joined | 04:48 |
| ← SuperLag left | 04:48 |
| → SuperLag joined | 04:49 |
| → jonjanzen joined | 04:55 |
| ← nivag left | 04:58 |
| ← kristjansson left | 04:59 |
| ← Jaxef left | 05:00 |
| → Rashad joined | 05:01 |
| ← ZMarkGC left | 05:01 |
| → kristjansson joined | 05:02 |
| ← fdan27 left | 05:05 |
| ← kristjansson left | 05:05 |
| → nivag joined | 05:10 |
| → ZMarkGC joined | 05:19 |
| → zoorat joined | 05:26 |
| ← jklfds left | 05:38 |
| ← jonjanzen left | 05:41 |
| ← Rashad left | 05:46 |
| → jklfds joined | 05:50 |
| ← jklfds left | 05:55 |
| ← Ox7C5 left | 06:00 |
| → cpackham joined | 06:00 |
| → Rashad joined | 06:02 |
| ← Vonter left | 06:04 |
| ← cpackham left | 06:07 |
| → jklfds joined | 06:08 |
| ← jklfds left | 06:13 |
| → rbatty joined | 06:17 |
| → Vonter joined | 06:18 |
| → jklfds joined | 06:27 |
| ← jklfds left | 06:35 |
| ← nivag left | 06:39 |
| → jklfds joined | 06:50 |
| ← jklfds left | 06:55 |
| → HumbleGuy joined | 06:58 |
| → masoudd__ joined | 07:00 |
| ← Sasazuka left | 07:03 |
| ← dza left | 07:06 |
| → dza joined | 07:08 |
| ← HumbleGuy left | 07:08 |
| → jklfds joined | 07:17 |
| ← skapata left | 07:18 |
| → derfflinger joined | 07:22 |
| ← rgrinberg left | 07:23 |
| ← jklfds left | 07:23 |
| ← Gary_Sinise left | 07:24 |
| → nate4 joined | 07:27 |
| ← dza left | 07:27 |
| → jklfds joined | 07:28 |
| ← nate4 left | 07:32 |
| → dza joined | 07:39 |
| ← dza left | 07:46 |
| → rgrinberg joined | 07:48 |
| → Jantz joined | 07:54 |
| → Sasazuka joined | 07:57 |
| ← Crispy left | 08:04 |
| ← fdan left | 08:05 |
| → Crispy joined | 08:07 |
| ← kyshoc left | 08:17 |
| → kyshoc joined | 08:19 |
| → dza joined | 08:20 |
| → jmd joined | 08:24 |
| ← Betal left | 08:26 |
| → BigShip9 joined | 08:29 |
| ← BigShip left | 08:31 |
| BigShip9 → BigShip | 08:31 |
| ← Rashad left | 08:32 |
| → john_johnk joined | 08:44 |
| → StucKman54 joined | 08:45 |
| → MGF_Fabio joined | 08:46 |
| → rosco joined | 08:50 |
| ← rosco left | 08:56 |
| ← Jantz left | 08:58 |
| → warmana joined | 09:05 |
| → kachmar joined | 09:09 |
| ← StucKman54 left | 09:12 |
| → szkl joined | 09:16 |
|
amosbird
| Hello! How can I git blame a file of given commit? | 09:18 |
| ← lacrymol1gy left | 09:21 |
| → epicout joined | 09:22 |
| ← epicout left | 09:22 |
| → epicout joined | 09:22 |
| ← Sasazuka left | 09:22 |
| → lacrymology joined | 09:22 |
| → reset joined | 09:22 |
|
b0nn
| If you don't get the correct answer - I would check out to that commit and then blame | 09:22 |
| → Ox7C5 joined | 09:23 |
| → Guest24 joined | 09:24 |
|
gsish
| or see man git-blame and check which options and parameters are available? | 09:31 |
|
gitinfo
| the git-blame manpage is available at https://gitirc.eu/git-blame.html | 09:31 |
|
gsish
| if that wasn't the question then you gotta provide a little more detail what you tried and how it doesn't work for you | 09:31 |
| → epicout_ joined | 09:36 |
| ← epicout left | 09:39 |
| ← john_johnk left | 09:39 |
| → StucKman14 joined | 09:46 |
| → igemnace joined | 10:00 |
|
j416
| amosbird: git blame <commit> -- <file> | 10:01 |
| ← dsrt^ left | 10:02 |
| → epicout joined | 10:08 |
| → crabbedhaloablut joined | 10:08 |
| ← MGF_Fabio left | 10:10 |
| ← epicout_ left | 10:12 |
| ← zumba_addict left | 10:13 |
| → MGF_Fabio joined | 10:15 |
| ← rgrinberg left | 10:16 |
| → xx joined | 10:26 |
| ← Guest24 left | 10:29 |
| → nate4 joined | 10:30 |
| ← nate4 left | 10:35 |
| → iomari891 joined | 10:37 |
| ← epicout left | 10:41 |
| ← lacrymology left | 10:47 |
| → Ox7C5_ joined | 10:48 |
| ← yuckey2d left | 10:57 |
| → john_johnk joined | 10:57 |
| → yuckey2d joined | 10:59 |
| ← Night0wl3 left | 11:00 |
| ← jmd left | 11:02 |
| → k4ushik joined | 11:02 |
| → thiago joined | 11:04 |
| → Night0wl3 joined | 11:05 |
| → rainystorm joined | 11:17 |
| ← zoorat left | 11:19 |
| → coot joined | 11:21 |
| → stormshadow_ joined | 11:21 |
| → lacrymology joined | 11:22 |
| ← opal left | 11:22 |
| ← Vonter left | 11:23 |
| robo → roboirc | 11:25 |
| → opal joined | 11:25 |
| ← dsimic left | 11:25 |
| → dsimic joined | 11:27 |
| → Vonter joined | 11:30 |
| ← derfflinger left | 11:32 |
| → dnh joined | 11:44 |
| ← Vonter left | 11:45 |
| ← dnh left | 11:45 |
| → Vonter joined | 11:46 |
| → mane joined | 11:48 |
| ← stormshadow_ left | 11:49 |
| → dnh joined | 11:51 |
| ← shahab left | 11:53 |
| ← Vonter left | 11:58 |
| ← k4ushik left | 11:59 |
| ← coot left | 12:02 |
| → Vonter joined | 12:03 |
| → shahab joined | 12:11 |
| → humanface joined | 12:14 |
| → YuGiOhJCJ joined | 12:15 |
|
humanface
| how to add filetype to git lfs? | 12:15 |
|
j416
| humanface: what did you try so far and what happened? | 12:17 |
|
humanface
| j416 I'm a lazy programmer, I did absolutely NOTHING | 12:17 |
|
| j416 do you like the answer? | 12:17 |
|
j416
| heh. | 12:17 |
|
| I won't spend more of my time then. I hope you figure it out. | 12:17 |
| → kushal__ joined | 12:17 |
|
humanface
| pffff | 12:17 |
|
| there was a repository I f*cked up already a year ago | 12:18 |
|
gsish
| maybe try git lfs --help unless that's too obvious | 12:18 |
|
humanface
| so I just want to do everything in the correct way j416 | 12:18 |
| → wavesong joined | 12:18 |
|
j416
| makes sense. | 12:18 |
|
humanface
| gsish is there a single person in the whole earth who has read the git lfs --help? | 12:18 |
|
j416
| the reason I was asking was in part becasue I didn't understand what you are trying to achieve | 12:18 |
| ← john_johnk left | 12:19 |
|
humanface
| j416 I have >10mb fbx file I want to push into the repository I have | 12:19 |
|
| and a >10mb psd file | 12:19 |
|
j416
| googling 'git lfs how to add files' gives the answer you're looking for. | 12:20 |
|
| github docs. | 12:20 |
|
gsish
| as does that very --help output, which is why I wrote that | 12:20 |
| ← kus left | 12:21 |
|
j416
| ^ apparently, that too. | 12:21 |
|
humanface
| j416 and what if there's a meta file also near the fbx and the psd? do I need to commit those also as git lfs? | 12:21 |
|
j416
| humanface: I've hardly used LFS; I don't know. sorry. | 12:21 |
|
humanface
| ok... | 12:21 |
|
j416
| lfs is for storing large files | 12:22 |
|
| if your meta file is large, why not. | 12:22 |
|
gsish
| ISTR there was one video that essentially said "use a GUI, and everything is automatic and great" | 12:22 |
|
humanface
| no the meta file is small | 12:22 |
|
j416
| the whole point with lfs is to make it possible to store large files. | 12:22 |
|
| there's no need to store everything in lfs. | 12:22 |
|
humanface
| but for each fbx and psd file there's a meta file also which gets generated | 12:22 |
|
gsish
| there was one short blip of useful information to other users, but you should not blink or you missed it | 12:22 |
|
| the video could be found from the git lfs project's homepage, but it was kind of hidden, non-obvious to find even if you know it's there | 12:23 |
|
humanface
| gsish I use a gui | 12:23 |
|
gsish
| then everything should be great for you :-P it's what the git-lfs vendor said or strongly suggested | 12:24 |
|
| notice that git-lfs is third party software, not part of git the version control system | 12:25 |
| ← Quack left | 12:25 |
|
humanface
| gsish it isn't btw | 12:28 |
|
j416
| humanface: also !backup | 12:29 |
|
gitinfo
| humanface: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.io/GitBestPractices/#backups | 12:29 |
| → Quack joined | 12:29 |
|
humanface
| j416 version control is one of the things I would consider to decide whether leave programming or not | 12:30 |
|
| I just literally hate the whole thing | 12:30 |
|
j416
| maybe because you don't understand it well | 12:30 |
|
| spend some time learning | 12:31 |
|
humanface
| j416 its not really in my interests | 12:31 |
|
nedbat
| humanface: it's one of those things that sounds like it will be simple, and turns out to be more complicated than expected. | 12:31 |
|
humanface
| I'm extremely bored while dealing with that | 12:31 |
|
j416
| I feel the opposite; version control makes my life so much easier; I don't know how I'd stay sane without it. | 12:31 |
|
nedbat
| humanface: why do you use version control? | 12:31 |
|
humanface
| j416 I started programming, because I felt movie directing would be impossible in my country | 12:31 |
|
| and wanted to learn programming only to develop video games | 12:32 |
|
| tried out web development and robotics in university, both were extremely boring | 12:32 |
| → zer0bitz_ joined | 12:32 |
|
humanface
| I use programming only to express my digital "arts" | 12:32 |
|
| I work as a programmer though, but I want to be a game designer instead, much more interested in, than programming | 12:33 |
|
| but for game design, I need to do programming, so... | 12:33 |
|
| not really like the technical aspects of it | 12:33 |
|
| I mean in the programming area, most of the programmers love to read docs, love to use console commands, and so on | 12:34 |
|
| I literally suffer using those | 12:34 |
|
| I enjoy programming ONLY if I see the visual results, but it should be much more than printing out a text or a data | 12:35 |
|
gsish
| the parable might help you understand that alternative approaches make you end up with something that tries to do the same thing but is less useful | 12:36 |
|
| it's linked from the above best practices from a quick glimpse | 12:36 |
| ← zer0bitz left | 12:36 |
|
gsish
| try to avoid the tool that is so useful, or to work around it, and it will be a fight as you experience | 12:36 |
|
| embrace it, and it will help you, greatly so | 12:36 |
|
humanface
| gsish I just hate reading technical documentations | 12:37 |
|
| I love read fantasy books, horrors, etc. | 12:37 |
|
| so maybe I'm more of an artist than a programmer | 12:37 |
|
gsish
| the point is that you need not read that stuff cover to cover, learn to navigate it, there's a system to it | 12:37 |
|
humanface
| gsish git lfs track --filename [file path] | 12:38 |
|
gsish
| it's why learning to read in schools is more than learning the letters | 12:38 |
|
humanface
| tried to use this though, and doesn't work | 12:38 |
| ← Quack left | 12:38 |
|
humanface
| and have no idea why... it things the file name is a flag, since it has spaces, although I don't really want to rename it | 12:38 |
|
| *thinks | 12:39 |
| ← StucKman14 left | 12:39 |
|
gsish
| but that's not a git issue when you are not familiar with passing filenames to commands | 12:40 |
|
| and three is that GUI that you use, does that work for you instead? | 12:40 |
|
humanface
| gsish the GUI I use is a buggy trash, but I'm too lazy to learn a totally new one | 12:40 |
|
| I'm using Sourcetree | 12:40 |
|
| at least I have confidence in there about how to resolve conflicts and so on | 12:41 |
|
| and I have no desire to learn Github Desktop at all | 12:41 |
|
| although I heard its better | 12:41 |
|
gsish
| then learn how to pass filenames with spaces in them to commands, it's not hard | 12:41 |
|
| and this general knowledge is re-usable, helps you "fight less" every day that follows | 12:42 |
|
humanface
| yeah, I now see that --filename is just filename, its the flag to use, not the actual filename | 12:42 |
|
gsish
| the trick is to either escape or quote that which is unexpected | 12:42 |
| → Quack joined | 12:42 |
|
humanface
| gsish I would rather escape though :D | 12:43 |
| → dsrt^ joined | 12:43 |
|
gsish
| then do that, it's another option of yours | 12:43 |
|
humanface
| not really want to do programming in my holiday and free days | 12:43 |
|
| but if I don't program now, then my hobby projects will never get finished | 12:43 |
|
| I'm bit of burned out | 12:44 |
|
gsish
| but nobody here can decide that for you, up to you whether you want to or don't, really | 12:44 |
|
humanface
| I would rather rest in my holiday | 12:44 |
|
j416
| maybe do that then | 12:44 |
| → john_johnk joined | 12:44 |
|
humanface
| I don't want :) but its my only chance to become a game designer at once in my lifetime | 12:44 |
|
| instead of programming | 12:44 |
|
j416
| now you contradict yourself | 12:45 |
|
humanface
| its just weird that for a game designer portfolio I need to make my own game from A-Z and program every single bit of it | 12:45 |
|
j416
| sounds like what you describe is human nature; we don't _like_ reading documentation, but it makes life easier to know things, so we do it. | 12:45 |
|
humanface
| maybe | 12:46 |
|
| I'm completely depressed 90% of my time though | 12:46 |
|
j416
| runners don't _like_ to run all the time, sometimes they just need to get out and run even if not motivated | 12:46 |
|
humanface
| good to know :) | 12:46 |
| ← lacrymology left | 12:46 |
|
j416
| I think everyone is like that. | 12:46 |
|
humanface
| and I should not target huge hobby projects | 12:47 |
|
| but I always target huge hobby projects | 12:47 |
|
| because that's the only thing I'm motivated in | 12:47 |
| ← thiago left | 12:47 |
|
gsish
| maybe remember some wise words from other software projects and other fields where humans work? | 12:47 |
|
| "... [the thing] ... may suck, but it's the best that we got" | 12:47 |
|
| version control is nothing new, has been around for some fifty years now | 12:48 |
| → thiago joined | 12:49 |
|
gsish
| if it would not be so useful, it had vanished by now | 12:49 |
| ← drbeco left | 12:51 |
| ← john_johnk left | 12:51 |
|
humanface
| gsish https://imgur.com/a/vW8rxwF | 12:51 |
|
| I already tracked that in cmd | 12:51 |
|
| https://imgur.com/a/yH5H40h | 12:52 |
| → Guest24 joined | 12:53 |
| ← Quack left | 12:54 |
|
gsish
| in case you are looking for other options, there is mercurial (the command name is hg) | 12:56 |
|
| am to understand it's made for people who don't want to have or use git | 12:56 |
|
| not their official motto, but it "interfaces differently" to users, appears to be made for a very different audience | 12:57 |
| ← Guest24 left | 12:57 |
|
humanface
| gsish no, currently I want to figure out why Sourcetree things I don't track that file in git lfs | 12:57 |
|
gsish
| gets you started much faster, and is "not as complex" as git is, seems to remain simple after that quick start as well | 12:57 |
|
humanface
| *thinks | 12:57 |
|
| gsish I pretty much need to use git though, I have not really an option, because I use git also for work | 12:58 |
|
gsish
| one pain with lfs is that you should set it up before adding the large files to git | 12:59 |
|
| adding lfs to the mix after the file has been there is ... painful | 12:59 |
|
humanface
| gsish its a new file btw | 13:00 |
|
gsish
| but it seems to be important that you learn that lesson yourself, humans don't learn from "being told" | 13:00 |
|
humanface
| gsish can you help me with my current issue? | 13:02 |
| ← shahab left | 13:05 |
| → Quack joined | 13:05 |
| → ferdna joined | 13:06 |
| → AnXa joined | 13:09 |
|
gsish
| not sure why you highlight me specifically (and kept doing that above) | 13:09 |
|
| but when you request the computer to do something and it doesn't do what you expect | 13:10 |
|
| that's when you start checking whether it understood your request, how much of it it got, and what's missing | 13:10 |
|
nedbat
| humanface: do you have collaborators who are using the same tools as you? They could be good sources of help | 13:10 |
|
gsish
| in the specific case of git and lfs, you'd query the confguration of what's tracked, and check whether that thing you want tracked matches that configuration | 13:10 |
|
humanface
| nedbat nope, I would never ever invite collaborators to this repo :) | 13:11 |
|
| don't trust in people overall | 13:11 |
|
nedbat
| humanface: then why trust us? | 13:11 |
|
humanface
| anyway, I f*cked up this repo as well, so I reached the quota in here as well | 13:11 |
|
| great | 13:11 |
|
| nedbat because you won't stole my precious ideas I struggled to come up with for years of my free time | 13:12 |
|
nedbat
| humanface: i don't know how to help. I don't use Sourcetree or lfs. | 13:12 |
|
humanface
| nedbat you are a lucky person | 13:13 |
|
j416
| humanface: you also have the option of not using sourcetree | 13:14 |
|
| or lfs for that matter | 13:14 |
|
humanface
| j416 if I would need to learn any alternatives in my free time, then I would just finish my hobby project entirely, I'm too lazy to learn anything new for hobby | 13:15 |
|
j416
| you actually have to do work to make something. surprise. | 13:15 |
|
humanface
| j416 I already programmed a lot in released game titles, and I just don't know why do I need to develop a whole game to make game designer portfolio as well | 13:17 |
|
| but otherwise no one would believe I know how to design a game | 13:17 |
|
nedbat
| humanface: that's not a git question. and it sounds like you know the answer. | 13:17 |
|
humanface
| nedbat yeah, its not | 13:17 |
|
nedbat
| humanface: i know you don't trust people (!) but there are probably game developers out there who need to make a portfolio, and could use help with design. | 13:18 |
|
humanface
| nedbat I need to design this, not others :) | 13:19 |
|
nedbat
| humanface: yes, but you seem to not want to build the game. Maybe someone else would be glad to have that half of the work. | 13:20 |
|
humanface
| nedbat I can't pay them money though | 13:20 |
|
nedbat
| humanface: right, I didn't mention money. They need a portfolio. | 13:20 |
|
humanface
| nedbat and do you like to argue with people if they f*ck up the code of the game? :) | 13:21 |
|
nedbat
| humanface: i wish you well. We are well outside the git domain. | 13:21 |
|
humanface
| because I already have experience in code, I know how to do this, I just don't want :D | 13:21 |
|
j416
| humanface: he's giving you valid ways to solve your problem | 13:21 |
|
| humanface: and let's move back on topic | 13:21 |
|
humanface
| j416 I know | 13:21 |
| → h-erectus joined | 13:23 |
| → skapata joined | 13:24 |
| ← DPA2 left | 13:26 |
|
humanface
| nedbat then I don't know where to continue offtopic, but they could easily steal my whole project | 13:28 |
| → DPA joined | 13:29 |
|
j416
| to be fair, an idea is just that. | 13:29 |
|
nedbat
| humanface: you have everything in git: you can show people what you did. | 13:30 |
| ← thiago left | 13:31 |
|
humanface
| nedbat yeah, and others can easily steal my work | 13:32 |
|
| I have invested months of work in this | 13:32 |
|
| and want to get money for it at one point | 13:32 |
|
| I won't work for anybody for free :) | 13:32 |
|
nedbat
| humanface: i'm not going to be able to help you get past this. You will need to collaborate with people at some point. You have to find people you can trust. That is hard. | 13:32 |
|
ggGuest
| harder for some, than for others | 13:33 |
|
humanface
| currently I think I just fucked up my payment for github... | 13:33 |
|
| so I'm stressful because of this | 13:33 |
|
j416
| sounds like you need a break | 13:33 |
|
humanface
| j416 and when will this fucking project get developed? :) | 13:34 |
|
j416
| after the break. we're humans, not machines. | 13:34 |
|
humanface
| I can't work on this when I'm not on holiday | 13:34 |
|
| okay, tell that to my bosses :) I need to work 10 hours per day, when there's no holiday | 13:35 |
|
j416
| anyway, this is #git. If you have more questions related to that, ask away. | 13:36 |
| ← Quack left | 13:36 |
| → thiago joined | 13:36 |
|
humanface
| j416 so... I accidentally paid Github pro | 13:37 |
|
| I wanted to pay for increase github lfs quota | 13:37 |
|
| and it seems github pro doesn't contain that | 13:38 |
|
| it had the same price though, this is why I was confused | 13:38 |
|
| is there a way to revert that? | 13:38 |
|
j416
| contact github support | 13:38 |
| → rsx joined | 13:39 |
| → Quack joined | 13:41 |
|
humanface
| cool | 13:41 |
|
| I hate my life | 13:41 |
| ← h-erectus left | 13:43 |
| → derpydoo joined | 13:47 |
| ← YuGiOhJCJ left | 13:58 |
| → navi joined | 14:00 |
| → Timvde joined | 14:08 |
| → AAJC9J joined | 14:17 |
| → cdown joined | 14:21 |
| → Rashad joined | 14:22 |
| → shahab joined | 14:22 |
| ← dnh left | 14:31 |
| → nate4 joined | 14:32 |
| ← nate4 left | 14:37 |
| ← jas-maelstrom left | 14:44 |
| ← skapata left | 14:44 |
| → PantelicGR joined | 14:49 |
| ← FinnElija left | 14:51 |
| ← JeffH left | 14:51 |
| → FinnElija joined | 14:52 |
| ← thiago left | 14:52 |
| → epicout joined | 14:53 |
|
humanface
| nedbat I wouldn't share any income though | 14:59 |
|
| this is why I don't want to collaborate with anyone | 14:59 |
| → x57ef1 joined | 15:16 |
| ← mane left | 15:29 |
| ← bindu left | 15:29 |
| → bindu joined | 15:30 |
| ← Ox7C5 left | 15:31 |
| → mane joined | 15:35 |
| ← cdown left | 15:37 |
| ← wootehfoot left | 15:39 |
| → epicout_ joined | 15:43 |
| ← Rashad left | 15:44 |
| ← epicout left | 15:45 |
| → jas-maelstrom joined | 15:48 |
| → mane_ joined | 15:49 |
| ← mane left | 15:50 |
| ← Quack left | 15:52 |
| → redbool joined | 15:57 |
| ← iomari891 left | 15:59 |
| → wootehfoot joined | 16:00 |
| → Quack joined | 16:00 |
| → fstd_ joined | 16:02 |
| ← fstd left | 16:02 |
| fstd_ → fstd | 16:02 |
| → hbautista joined | 16:08 |
| ← Quack left | 16:10 |
| ← ferdna left | 16:12 |
| → Rashad joined | 16:14 |
| → Quack joined | 16:17 |
| → thiago joined | 16:21 |
| ← adanwan left | 16:22 |
| → adanwan joined | 16:23 |
| ← Rashad left | 16:23 |
| → Rashad joined | 16:25 |
| ← Quack left | 16:25 |
| ← SuperLag left | 16:28 |
| → SuperLag joined | 16:28 |
| ← xx left | 16:35 |
| ← miigotu left | 16:35 |
| → xx joined | 16:35 |
| → miigotu joined | 16:36 |
| ← dsrt^ left | 16:36 |
| → Quack joined | 16:38 |
| ← fling left | 16:44 |
| → coot joined | 16:45 |
| → cdown joined | 16:45 |
| → cyberpear joined | 16:50 |
| ← thiago left | 16:54 |
| ← phylaz left | 17:01 |
| ← hbautista left | 17:02 |
| ← rhe left | 17:05 |
| ← Quack left | 17:07 |
| → Quack joined | 17:09 |
| ← adanwan left | 17:11 |
| → adanwan joined | 17:11 |
| ← xdminsy left | 17:12 |
| ← warmana left | 17:13 |
| → rhe joined | 17:16 |
| → donofrio joined | 17:19 |
| → xdminsy joined | 17:21 |
| → Sasazuka joined | 17:25 |
| ← daemon left | 17:29 |
| ← xdminsy left | 17:36 |
| → xdminsy joined | 17:37 |
| mane_ → wsky | 17:41 |
| wsky → mane | 17:41 |
| → dsrt^ joined | 17:43 |
| → daemon joined | 17:47 |
| ← Quack left | 17:50 |
| ← szkl left | 17:50 |
| anotherXmas → anotherYearEnds | 17:59 |
| → kjartan joined | 18:00 |
| → skapata joined | 18:01 |
| → john_johnk joined | 18:01 |
| → rgrinberg joined | 18:04 |
| → masoudd_ joined | 18:04 |
| → Quack joined | 18:06 |
| ← masoudd__ left | 18:07 |
| ← john_johnk left | 18:10 |
| → john_johnk joined | 18:13 |
| ← Quack left | 18:16 |
| ← rgrinberg left | 18:21 |
| ← Vonter left | 18:22 |
| → Vonter joined | 18:24 |
| → user03 joined | 18:25 |
| user03 → gchound | 18:25 |
| → Chaser joined | 18:25 |
| ← john_johnk left | 18:28 |
| → john_johnk joined | 18:28 |
| → Chaser_ joined | 18:31 |
| ← Chaser_ left | 18:32 |
| → nate4 joined | 18:33 |
| ← Chaser left | 18:34 |
| ← kachmar left | 18:35 |
| → Chaser_ joined | 18:36 |
| → Quack joined | 18:36 |
| ← igemnace left | 18:37 |
| ← nate4 left | 18:38 |
| ← chexum left | 18:42 |
| ← Quack left | 18:47 |
| → krushia joined | 18:48 |
| → chexum joined | 18:48 |
| → Riptils joined | 18:48 |
|
Riptils
| Hi, I'm looking to make a public git repository but with a private part in it (visible/usable only by authorized members, so me). Can you help me ? | 18:50 |
| → lacrymology joined | 18:50 |
| ← john_johnk left | 18:50 |
| → jacobk joined | 18:51 |
|
kjetilho
| no, that is not possible. you may look at submodules which will help you a little. | 18:52 |
|
Riptils
| Okay, is this a feature under development or has no one thought of working on it yet? | 18:54 |
| → chexum_ joined | 18:55 |
| → x57ef1_ joined | 18:56 |
|
kjetilho
| it is just not possible | 18:56 |
|
Riptils
| why ? | 18:58 |
| ← adanwan left | 18:58 |
| → adanwan joined | 18:58 |
| ← chexum left | 18:59 |
| → Leonarbro joined | 18:59 |
| → fling joined | 18:59 |
| ← x57ef1 left | 18:59 |
|
kjetilho
| how can you very checksums and commits if you are not allowed to download all the data from the repo? | 19:00 |
|
| *verify | 19:00 |
| → x57ef1 joined | 19:00 |
| ← x57ef1 left | 19:01 |
|
Riptils
| For my personal example, I use git to manage my dotfiles on ArchLinux. So I make a git init in my home with a gitignore, then add the files I need, commit them and push them to the gitlab server. But I'd like to add files/folders containing private configurations to my dotfiles while keeping them private. | 19:01 |
| → bambanxx joined | 19:01 |
|
Riptils
| Do you understand? | 19:01 |
| ← epicout_ left | 19:02 |
|
gsish
| yes, do you? | 19:02 |
|
| when the answer is "no, won't work" this doesn't mean that others didn't get the question (need not ...) | 19:02 |
|
Riptils
| No, I don't really understand, I'm a git beginner... | 19:02 |
|
gsish
| in this specific case, it's because such an approach does not work by design | 19:02 |
| ← x57ef1_ left | 19:03 |
|
gsish
| it's not how git was made to work, it's the opposite of how git was designed to work | 19:03 |
|
| either your repo is public, or it is not, there is no in between | 19:03 |
|
| there was a suggestion above though, you may have missed it | 19:04 |
|
kjetilho
| I think there are workrarounds, using a layer of encryption on parts of the repository | 19:04 |
|
gsish
| you can combine several repos and put them side by side on your disk | 19:04 |
|
kjetilho
| thirdparty extensions | 19:04 |
| → rgrinberg joined | 19:05 |
|
kjetilho
| first hit on Duckduckgo: https://buddy.works/guides/git-crypt | 19:05 |
|
| (I have not tried it) | 19:06 |
| → Quack joined | 19:08 |
|
Riptils
| I had tried to make a private submodule in a public submodule but now I have to do git add/commit/push in several places rather than just once in the parent project. :/ | 19:08 |
|
| I'll try git-crypt, thanks! | 19:09 |
| ← cyberpear left | 19:09 |
| ← Chaser_ left | 19:12 |
| → JeffH joined | 19:16 |
| ← Quack left | 19:17 |
| ← dsrt^ left | 19:18 |
| → epicout joined | 19:19 |
| → Brottweiler joined | 19:19 |
| ← rgrinberg left | 19:21 |
| → dsrt^ joined | 19:22 |
| ← darkAffinity2368 left | 19:22 |
| → darkAffinity2368 joined | 19:23 |
| → Quack joined | 19:26 |
| ← bambanxx left | 19:31 |
| ← dsrt^ left | 19:36 |
| → john_johnk joined | 19:39 |
| → bambanxx joined | 19:43 |
| ← xdminsy left | 19:45 |
| → dsrt^ joined | 19:47 |
| ← Riptils left | 19:49 |
| ← LuckyMan left | 19:53 |
| ← Quack left | 19:54 |
| → rgrinberg joined | 19:56 |
| ← dsrt^ left | 20:00 |
| → Betal joined | 20:00 |
| → thiago joined | 20:00 |
| ← lacrymology left | 20:02 |
| → lacrymology joined | 20:02 |
| ← rsx left | 20:05 |
| → x57ef1 joined | 20:05 |
| ← rgrinberg left | 20:09 |
| ← Rashad left | 20:09 |
| ← john_johnk left | 20:11 |
| ← chilversc left | 20:14 |
| ← Guest1235 left | 20:17 |
| → Quack joined | 20:26 |
| ← gchound left | 20:27 |
| ← rainystorm left | 20:30 |
| → user03 joined | 20:33 |
| user03 → gchound | 20:34 |
| ← derpydoo left | 20:38 |
| → m0viefreak joined | 20:40 |
| ← Aminda left | 20:41 |
| → Aminda joined | 20:41 |
| → willayd joined | 20:42 |
| ← Quack left | 20:42 |
| ← willayd left | 20:43 |
| ← lacrymology left | 20:51 |
| → lacrymology joined | 20:51 |
| → masoudd__ joined | 21:01 |
| → Guest1235 joined | 21:01 |
| ← masoudd_ left | 21:03 |
| ← LuKaRo left | 21:12 |
| ← m_antis left | 21:15 |
| → _sa0sin_ joined | 21:17 |
| ← coot left | 21:20 |
| ← sa0 left | 21:20 |
| → LuKaRo joined | 21:21 |
| ← miigotu left | 21:31 |
| → miigotu joined | 21:31 |
| ← lacrymology left | 21:32 |
| → lacrymology joined | 21:33 |
| ← masoudd__ left | 21:34 |
| ← wavesong left | 21:40 |
| ← Nixkernal left | 21:43 |
| ← kjartan left | 21:43 |
| → Nixkernal joined | 21:45 |
| → john_johnk joined | 21:45 |
| ← bambanxx left | 21:47 |
| → rainn92675560720 joined | 21:47 |
| → Quack joined | 21:49 |
| ← lacrymology left | 21:52 |
| ← Quack left | 21:56 |
| ← skapata left | 22:00 |
| → Quack joined | 22:01 |
| → epicout_ joined | 22:06 |
| ← epicout left | 22:10 |
| ← john_johnk left | 22:11 |
| → PrestonL joined | 22:14 |
| ← gchound left | 22:14 |
| ← wyre left | 22:15 |
| ← Quack left | 22:24 |
| → Quack joined | 22:27 |
| ← MGF_Fabio left | 22:29 |
| → nate4 joined | 22:35 |
| → wyre joined | 22:36 |
| ← fflam left | 22:37 |
| ← Quack left | 22:38 |
| → fflam joined | 22:39 |
| ← nate4 left | 22:40 |
| → Quack joined | 22:50 |
| ← PantelicGR left | 23:07 |
| ← Quack left | 23:07 |
| → nivag_2c joined | 23:12 |
| ← Brottweiler left | 23:18 |
| → Gary_Sinise joined | 23:21 |
| → Quack joined | 23:22 |
| → bambanxx joined | 23:25 |
| ← jklfds left | 23:26 |
| → m_antis joined | 23:28 |
| ← bambanxx left | 23:28 |
| ← fflam left | 23:28 |
| → fflam joined | 23:30 |
| → Maxb0tbeep joined | 23:30 |
| ← Quack left | 23:32 |
| → jklfds joined | 23:35 |
| ← ghostwheel left | 23:36 |
| → ghostwheel joined | 23:37 |
| → XorMan joined | 23:38 |
| ← kushal__ left | 23:39 |
| ← jklfds left | 23:40 |
| → user03 joined | 23:41 |
| ← user03 left | 23:42 |
| → jklfds joined | 23:43 |
| → Quack joined | 23:43 |
| → user03 joined | 23:46 |
| ← m_antis left | 23:46 |
| → m_antis joined | 23:47 |
| → hbautista joined | 23:51 |
| ← m_antis left | 23:52 |
| → skapata joined | 23:53 |
| ← Quack left | 23:57 |
| ← mane left | 23:58 |
| → h-erectus joined | 23:58 |
| ← epony left | 23:58 |