IRCloggy #git 2024-01-30

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2024-01-30

TheChinaskiBoy i have some changes in a file that's autogenerated, but the diff should apply to the template, is there a way to apply that? seems like git apply --directory=.. needs the filenames to match?00:00
→ Quack joined00:01
← EdFletcher left00:02
→ Thanzex joined00:02
→ anakimluke joined00:03
→ EdFletcher joined00:04
← bambanxx left00:10
← nyah left00:10
→ bambanxx joined00:12
← piwu11 left00:13
→ piwu11 joined00:14
← kurahaupo left00:17
← bambanxx left00:18
→ bambanxx joined00:21
← piwu11 left00:28
→ piwu11 joined00:28
← stats4647 left00:29
→ nivag_2c joined00:36
← piwu11 left00:39
→ piwu11 joined00:40
← TheChinaskiBoy left00:44
← igemnace left00:51
→ Gary_Sinise joined00:52
← piwu11 left00:53
→ piwu11 joined00:53
→ stats4647 joined01:00
← gchound left01:03
← piwu11 left01:03
→ piwu11 joined01:03
← stats4647 left01:05
→ ghost43 joined01:09
← ghost43_ left01:10
← alexherbo2 left01:15
← piwu11 left01:17
→ piwu11 joined01:17
← derpydoo left01:23
← bambanxx left01:24
← adgtl left01:25
← piwu11 left01:30
→ piwu11 joined01:30
← jmd left01:31
→ Lord_of_Life_ joined01:37
← Lord_of_Life left01:38
Lord_of_Life_ → Lord_of_Life01:39
→ bambanxx joined01:40
← piwu11 left01:43
→ piwu11 joined01:44
← TonyStone left01:47
← piwu11 left01:57
→ JanC_ joined01:58
→ piwu11 joined01:58
← JanC left01:58
JanC_ → JanC01:58
← cdown left02:06
← piwu11 left02:11
→ piwu11 joined02:11
← navi left02:11
← distant left02:16
→ distant joined02:16
→ hbautista joined02:18
→ SharpHammer96 joined02:22
← piwu11 left02:24
→ piwu11 joined02:25
← SharpHammer50 left02:26
← oriba left02:27
→ micah joined02:30
micah I found some places online the 'tag = v1.0.0' config that can be put into .gitmodules, but I do not find that this is a valid configuration option for git modules, am I wrong, or is the internet? :D02:31
← Ali_nz left02:32
← bambanxx left02:35
← piwu11 left02:37
→ piwu11 joined02:37
← anakimluke left02:39
→ stats4647 joined02:46
← piwu11 left02:49
→ piwu11 joined02:50
← gsi left02:50
→ donofrio joined02:50
→ gsi joined02:51
→ YuGiOhJCJ joined02:57
← micah left03:01
→ micah joined03:01
← stats4647 left03:02
← donofrio left03:02
← piwu11 left03:04
→ piwu11 joined03:04
← roboirc left03:04
→ robo joined03:05
→ pikapika joined03:05
← militantorc left03:05
← piwu11 left03:14
→ piwu11 joined03:15
← nivag_2c left03:18
→ nivag_3c joined03:18
← gxt left03:22
→ gxt joined03:23
← nivag_3c left03:23
← chiselfuse left03:24
→ chiselfuse joined03:24
← piwu11 left03:26
→ piwu11 joined03:26
→ stats4647 joined03:33
→ nivag_3c joined03:35
← stats4647 left03:38
← piwu11 left03:44
→ piwu11 joined03:44
← bindu left03:45
→ bindu joined03:45
← nivag_3c left03:52
← piwu11 left03:57
→ piwu11 joined03:58
→ nivag_3c joined04:05
← piwu11 left04:10
→ piwu11 joined04:11
quesker if you are in a branch and main changes you are screwed right?04:13
you can't just checkout main and git pull because now your branch is afu04:13
b0nn You can merge, or rebase your branch04:13
sh4 rebase is preferable04:14
b0nn and the pull will only affect main, in that your branch will still be from the commit it always was until you merge or rebase04:14
b0nn also prefers rebase, but just got "spoken to" because someone didn't want history screwed with04:15
quesker I am going to start doing dev somewhere else then copy in when ready. branches are crazy complicated04:15
b0nn quesker: well, topic branches do get tricky when they live for a long time, but doing dev somethwre else then trying to merge that change in will also have the same issues04:16
when you code somewhere else, you're effectively branching04:16
from HEAD04:16
jb1277976 How do I upload a copy of my repo to GitHub and keep it updated ? Example dwm is using gitweb meaning I can’t fork it and push it to my own repo so I have a copy. I only have a local repo and can pull from the remote repo. What can I do ?04:17
quesker I will just have to keep track of what I change I guess04:17
b0nn quesker: yeah - that's what git does for you04:17
← hinderaker left04:17
b0nn I mean - I know that merging and rebasing takes a bit to get your head around at first, but once that kool aid hits...04:18
quesker merge sticks random <<< >>>> all over breaking things much later04:18
and I played with rebase once and it was impossible to keep track of what is going on04:18
b0nn ok, but if there are breaking changes happening in the project whilst you are coding elsewhere, how do you reconcile them?04:18
quesker I keep my changes logged somewhere and add them immediately after a fresh git pull04:19
b0nn heh04:19
→ hinderaker joined04:19
b0nn oh, also, look at agraphical conflict resolution tool, like `meld`04:20
← Aminda left04:20
→ Aminda joined04:21
b0nn I presume Visual Studio also has something like that built in, if that's what you are using04:21
← bindu left04:21
→ bindu joined04:22
← piwu11 left04:22
← cpackham left04:22
→ piwu11 joined04:23
← dskull left04:23
← gast0n left04:24
→ dskull joined04:25
quesker ssh to a shell, vim in a terminal there04:32
← piwu11 left04:32
→ piwu11 joined04:32
b0nn vimdiff :P04:33
FTR I use vim exclusively, but I know that VS Code will work over SSH in some way that might help04:33
quesker gui is for having lots of terminals04:33
b0nn heh - tmux is my poison too04:34
i3wm/sway for my window manager means I have one terminal + one firefox + one chrome, and then I split the terminal up into (at least) 4 via tumx04:34
quesker maybe I can work in a branch, diff against a pulled main and then maybe make a new branch with my changes04:35
nice04:36
b0nn moving a branch is less painful when nobody is touching the same files (by moving I mean rebasing)04:36
quesker I am mostly adding files but I have to edit maybe one shared file so it shouldn't be too bad04:37
← bket left04:37
b0nn yeah - a conflict only happens when you and a colleague edit the same file04:38
JAA And even then only if the edits are on the same line or very close.04:39
→ bket joined04:39
→ igemnace joined04:40
b0nn So a trick is, if part of your change requires editing a heavily edited file in your repo - leave it to last, or make the change early and get it merged in FAST :)04:41
quesker but how do I get the latest one into my branch so I can quickly add my change?04:41
b0nn move your branch to HEAD often04:42
HEAD of main that is04:42
Unfortunately it's a practice thing04:43
Once you get the hang of it - it does get a bit easier - honest04:43
quesker so checkout main, git pull, checkout branch, git merge main?04:44
b0nn git rebase main, but yeah04:45
← piwu11 left04:45
→ piwu11 joined04:46
b0nn when you `git rebase main` in your branch, you are moving where your branch comes off of main04:46
← larryv left04:47
← tirnanog left04:47
b0nn Think of it like, main is A-B-C, and you create your branch, add D-E to your branch, then main is updated with F-G, when you rebase your branch D, which was previously coming from C) is now comfing from G04:48
merges make life ugly for someone trying to understand the history, and if there are multiple branches in flight at the same time - downright impossible04:49
→ SharpHammer49 joined04:49
quesker the doc basically says don't rebase if you don't know what you are doing04:49
b0nn which doc?04:51
I would argue that you should learn so that it's not a dark art04:51
I mean, engineering is all about enjoying learning, right?04:51
← SharpHammer96 left04:53
b0nn I **strongly** recommend the first 3 chapters of https://git-scm.com/book/en/v204:53
You can go further, but that's more for administration, using is just the first 304:53
quesker https://git-scm.com/book/en/v2/Git-Branching-Rebasing04:56
← piwu11 left04:57
quesker Do not rebase commits that exist outside your repository and that people may have based work on.04:57
how can anything be outside the repo04:57
b0nn yes04:57
→ piwu11 joined04:57
b0nn stuff that's not on your branch04:57
don't rebase main unless you have a valid reason04:58
quesker oh04:58
b0nn and tyou won't until you've rebased your branch a few times04:58
you rebase main when you accidentally include secrets into main, and ummmmm, the boss is looking....04:58
b0nn whistles innocently04:58
quesker heh04:58
b0nn When you rebase main, everyone who has a checked out copy is affected, and their branches are no longer referring to commits that exist05:00
it's not pretty05:00
→ mobivme joined05:00
b0nn But we're not encouraging you to do that, we're talking about you rebasing your branch05:00
that affects nobody but you05:00
quesker ok05:01
← hbautista left05:02
← nivag_3c left05:02
→ yoo joined05:04
← mobivme left05:06
quesker I tried stashing my changes to the common file, pulling main, then checked out the branch and tried rebase. now there is all the >>> <<< crap in the file05:08
← Vonter left05:08
quesker after git stash pop I mean05:08
it shoudn't be allowed to mess up files automatically like that05:09
→ EvgenyK joined05:10
← piwu11 left05:11
→ piwu11 joined05:11
→ Vonter joined05:11
b0nn heh05:13
stashing is putting the changes aside where git cannot see them, popping brings them back and git has to tell you where the conflicts are05:14
← yoo left05:14
b0nn the HEAD to === shows you one version, and tthe === to >>> branch shows you the other version05:14
→ yoo joined05:14
→ fling joined05:14
b0nn you just need to work out which bits to keep, which bits to delete, and which bits to edit so they appear in the final version as you want them to05:15
quesker if you don't notice that git had extra stuff in all those lines of output then the file is hosed05:18
and with my simple test here it is easy to see how to fix it but in real life I think it would be tough05:18
even if you and the other guy just added some stuff to the file05:19
b0nn have a look and see if `git status` tells you that a file is conflicted05:19
quesker it does05:20
← piwu11 left05:21
→ piwu11 joined05:21
b0nn yeah - so when git tels you theres a conflicted file it means that git itself cannot automagically fix it and it has marked where the changes that need attention are05:21
tells*05:22
quesker ok05:22
b0nn it's another practice thing05:22
→ ferdna_ joined05:22
b0nn I used to use `meld` a lot to help me jump to conflicts and figure out how to merge them, but now vim is enough and I can eyeball it05:22
← yoo left05:23
→ yoo joined05:23
b0nn eg yesterday I spent the whole day rebasing three branches that had code I was unfamiliar with, and it was painful because i had to keep backing out because I wasn't sure what the history was05:24
but, I got it done05:24
→ stats4647 joined05:27
b0nn and, for the record, I kept a clean backup locally in case the version I pushed to remote wasn't right05:28
← igemnace left05:31
← piwu11 left05:31
→ piwu11 joined05:31
← Vonter left05:35
→ Vonter joined05:38
← yoo left05:39
ikke b0nn: heh, I had something similar05:39
← stuv left05:40
→ stuv joined05:44
← piwu11 left05:45
→ piwu11 joined05:45
← SharpHammer49 left05:47
→ SharpHammer49 joined05:47
→ zetef joined05:49
b0nn lol, there's nothing like inheriting a project to develop some git related scars :)05:56
← piwu11 left05:59
→ piwu11 joined06:00
→ yoo joined06:07
← bloody left06:08
→ nivag_2c joined06:09
← SharpHammer49 left06:10
→ SharpHammer49 joined06:10
← crabbedhaloablut left06:10
→ crabbedhaloablut joined06:11
← piwu11 left06:11
→ piwu11 joined06:12
← yoo left06:13
← nivag_2c left06:13
← Gary_Sinise left06:15
→ schne1der joined06:18
← EvgenyK left06:19
→ yoo joined06:19
→ stolen joined06:20
→ nivag_2c joined06:21
← piwu11 left06:23
→ piwu11 joined06:23
← jjakob left06:25
→ jjakob joined06:28
← nivag_2c left06:28
jb1277976 What’s a good email app to send to the mailing list? Ios mail and outlook are getting rejected06:29
← stats4647 left06:30
ikke jb1277976: https://useplaintext.email/06:30
→ larryv_ joined06:30
→ EvgenyK joined06:31
← krushia left06:31
→ rosco joined06:32
← stuv left06:33
→ nivag joined06:35
← piwu11 left06:35
← yoo left06:35
→ piwu11 joined06:36
larryv_ → larry06:38
larry → larryv06:38
← Betal left06:45
→ fdan joined06:46
← piwu11 left06:47
→ piwu11 joined06:48
→ StucKman joined06:48
→ jmd joined06:49
jb1277976 Thanks06:49
← zetef left06:51
← wavesong left06:52
→ pretty_dumm_guy joined06:52
→ wavesong joined06:53
← nivag left06:53
→ krokos joined06:53
jb1277976 dam, ikke nothing for iphone!06:54
→ john_johnk joined06:55
← wavesong left06:56
→ duxsco joined06:57
→ stats4647 joined06:58
→ yoo joined06:58
← piwu11 left06:58
← zulutango left06:58
→ piwu11 joined06:59
→ zulutango joined07:01
→ miigotu joined07:02
← duxsco left07:02
← stats4647 left07:03
osse GMail works fine if you're a bit careful07:07
← larryv left07:07
← krokos left07:08
← piwu11 left07:10
→ piwu11 joined07:11
← jmd left07:14
← Lockesmith left07:14
→ Lockesmith joined07:15
osse oh it's mentioned there07:15
I usually write the email itself in an editor and then paste it in. I didn't know GMail would hardwrap correctly; that's cool07:15
← StucKman left07:17
← Vonter left07:19
→ rkta joined07:20
→ Jaxef joined07:21
← piwu11 left07:22
→ piwu11 joined07:22
→ Vonter joined07:33
→ Ox7C5_ joined07:34
→ stats4647 joined07:34
← fdan left07:35
← piwu11 left07:35
→ piwu11 joined07:35
→ KnoP joined07:36
→ filePeter joined07:38
← stats4647 left07:39
→ igemnace joined07:40
← EvgenyK left07:40
b0nn I use mutt with gmail :)07:40
→ rfuentess joined07:41
← yoo left07:44
→ nivag joined07:44
→ coot joined07:46
← piwu11 left07:46
← akibageek left07:47
→ piwu11 joined07:47
→ gandhibobandhi_ joined07:50
→ EvgenyK joined07:53
→ Gary_Sinise joined07:54
← ghost43 left07:55
→ ghost43 joined07:56
← piwu11 left07:58
→ piwu11 joined07:58
→ gandhibobandhi__ joined07:59
← Gary_Sinise left08:00
→ StucKman joined08:00
← KnoP left08:01
← ggGuest2 left08:01
← gandhibobandhi_ left08:02
→ rainystorm joined08:03
→ ggGuest joined08:04
← EvgenyK left08:07
← Pikk3wyn left08:07
← thiago left08:08
← piwu11 left08:10
→ piwu11 joined08:10
→ stats4647 joined08:12
→ RiFo joined08:13
← nivag left08:13
← skapata left08:13
→ theoceaniscool joined08:14
→ EvgenyK joined08:15
→ MGF_Fabio joined08:20
→ vysn joined08:20
robo → roboirc08:22
← piwu11 left08:23
← stats4647 left08:23
→ piwu11 joined08:23
← BigShip left08:24
→ Guest16 joined08:25
Guest16 test08:25
→ BigShip joined08:26
osse testin it up, gangnam style08:26
← vysn left08:27
← mooz left08:28
Guest16 haha, I'm just testing to see if I can connect to this channel. I might ask my colleague to come and ask some questions later on. Thanks08:29
→ sreve joined08:29
→ mooz joined08:30
b0nn Guest16: man, calling a test when none of has studied is soooooo mean08:31
← Guest16 left08:33
← piwu11 left08:33
→ piwu11 joined08:33
← elastic_dog left08:34
→ iomari891 joined08:35
→ zetef joined08:36
bf_ jb1277976: maybe you send as HTML email and the mailing list only accepts plain-text emails?08:38
→ elastic_dog joined08:46
← piwu11 left08:47
→ piwu11 joined08:47
→ vysn joined08:48
→ stats4647 joined08:55
← piwu11 left08:59
← stats4647 left08:59
→ piwu11 joined08:59
→ carl- joined09:00
← EvgenyK left09:01
→ lockna joined09:03
← crabbedhaloablut left09:04
→ crabbedhaloablut joined09:04
← lockna left09:08
→ lockna joined09:08
→ EvgenyK joined09:08
→ szkl joined09:09
← Ingvix left09:09
← SharpHammer49 left09:10
→ SharpHammer49 joined09:10
→ Ingvix joined09:10
← piwu11 left09:11
→ piwu11 joined09:12
← foul_owl left09:23
← piwu11 left09:24
→ piwu11 joined09:25
← Aminda left09:26
→ Feuermagier joined09:26
→ Aminda joined09:26
Feuermagier what exactly happens if I "git lfs track" a file? - Specifically, what is ".gitattributes" for?09:27
I see the tracked files listed there, but manually listing them in there does not seem enough09:27
→ danse-nr3 joined09:29
ikke It enables the clean/smudge filters for the lfs managed files09:30
Which is how lfs is integrated with git09:31
← piwu11 left09:34
→ piwu11 joined09:34
→ AmeliaMonaldo joined09:37
→ foul_owl joined09:40
← vysn left09:42
← StucKman left09:42
AmeliaMonaldo hey there09:42
how are you?09:43
Voglia di figa giovane?09:44
← reset left09:46
← piwu11 left09:46
→ piwu11 joined09:47
← danse-nr3 left09:47
AmeliaMonaldo Gratis sexcall09:47
ChanServ set mode: +o09:47
ikke kicked AmeliaMonaldo (AmeliaMonaldo)09:47
→ xx joined09:48
← stolen left09:49
→ reset joined09:51
anddam that was odd09:51
uncloaked too, I guess it's some zombie PC used as relay09:51
→ danse-nr3 joined09:53
← reinboar left09:54
← piwu11 left09:58
→ piwu11 joined09:59
← Feuermagier left09:59
← xx left10:00
→ Feuermagier joined10:00
→ stats4647 joined10:02
← zetef left10:03
← stats4647 left10:07
→ xx joined10:08
← Vonter left10:12
← piwu11 left10:12
← EvgenyK left10:13
→ piwu11 joined10:13
→ Vonter joined10:14
→ EvgenyK joined10:20
← piwu11 left10:24
→ piwu11 joined10:24
→ duxsco joined10:24
→ ferdna__ joined10:27
← Thanzex left10:28
→ Thanzex joined10:28
← ferdna_ left10:30
← eqw left10:31
→ eqw joined10:31
← piwu11 left10:37
→ piwu11 joined10:37
anddam credit where credit is due this vscod* plugin is pretty handy https://marketplace.visualstudio.com/items?itemName=mhutchie.git-graph10:38
→ stats4647 joined10:38
← deepy left10:40
← Jaxef left10:41
← Thanzex left10:43
→ Thanzex joined10:43
→ deepy joined10:44
← stats4647 left10:44
← limon left10:47
← piwu11 left10:51
→ piwu11 joined10:51
→ Jaxef joined10:57
→ cjoke joined10:58
← ferdna__ left11:05
← piwu11 left11:05
→ piwu11 joined11:06
← cjoke left11:06
→ StucKman joined11:08
→ cjoke joined11:08
→ j`ey joined11:16
j`ey can I git log '*.c' or something?11:16
← szkl left11:16
selckin that should work11:16
mjt0k can you try it or something?11:16
← piwu11 left11:17
j`ey well the or something is that I want it to be in any directory underneath11:17
→ piwu11 joined11:17
j`ey oh, maybe **/*.S, Im bad at shell!11:17
osse j`ey: '*.c' works as you want.11:18
**/*.S works less the way you want. It assumes at least one subdir11:18
j`ey osse: I want it in any subdir though11:18
osse Yes11:19
But does "any subdir" include "no subdir" ?11:19
j`ey ohhh11:19
ok so I really should have just tried that11:19
the '' were important11:19
selckin put echo in front, with and without the '11:20
osse Git understands glob-like syntax. But understands it a bit differently than your shell does11:20
mjt0k also \*.c11:20
j`ey selckin: that I understood, but didn't realise ^11:20
ok cool git log 'file/path/*.S' also works11:22
mjt0k unlike shell which has to work in each dir separately (using readdir et al), git works on whole pathname11:23
so sometimes it's difficult with git to match just the files in current dir not in any subdir :)11:24
→ ferdna joined11:25
← dsimic left11:28
osse Hah, I thought a ./ would take care of that but nope11:29
← rigid left11:29
← piwu11 left11:30
selckin gitignore /foo is in the root i think?11:30
does it use that same logic11:30
→ rigid joined11:30
→ piwu11 joined11:30
→ dsimic joined11:30
j416 prefix with slash locks it to the root11:31
← Jaxef left11:31
j416 (of the directory that contains the .gitignore file)11:31
← EvgenyK left11:32
→ nyah joined11:33
← piwu11 left11:40
→ piwu11 joined11:40
→ stats4647 joined11:43
← gandhibobandhi__ left11:47
← duxsco left11:47
← stats4647 left11:48
← piwu11 left11:52
→ piwu11 joined11:52
← ferdna left11:54
← thelounge68 left12:00
→ thelounge68 joined12:01
→ nivag joined12:02
← piwu11 left12:06
→ gandhibobandhi__ joined12:06
→ piwu11 joined12:07
→ Betal joined12:09
→ szkl joined12:09
← danse-nr3 left12:10
→ cxc joined12:16
← bodiccea left12:17
← piwu11 left12:19
→ piwu11 joined12:19
→ vysn joined12:21
→ bodiccea joined12:25
← bindu left12:28
→ bindu_ joined12:28
← epony left12:30
ross there's definitely no atomic pull-push combo, right? if I do `git pull --rebase && git push --force` there's always a risk that something might've pushed in between the two, which'll be destroyed by the force push?12:31
nedbat ross: --force-with-lease12:32
→ cdown joined12:32
← piwu11 left12:33
→ navi joined12:34
ross oh my god. incredible12:34
thank you nedbat12:34
→ piwu11 joined12:34
→ epony joined12:34
→ stats4647 joined12:36
osse Many moons ago I wrote a patch that implemented --force-with-tease12:36
I wonder if it still applies cleanly12:36
ikke Note that after a git fetch, --force-with-lease is effectifly --force12:36
osse ikke: not if you type very slowly12:37
ikke (pull implies fetch)12:37
← rosco left12:37
ross ikke: you can presumably do like `--force-with-lease=<branch name>:<ref before fetch>`?12:38
not that you'd have any reason to, that I can think of12:38
selckin tries to imagine what tease could do12:38
ross "fetch me the latest commits and then prove in a potentially destructive way that no commits were fetched"12:39
feels like a witch trial12:39
ikke ross: yes, that's how it's intended to be used12:39
but 99% of the time, just a plain `--force-with-lease` is provided12:40
osse selckin: it does a regular push and if it fails it does --force12:40
ross true!12:40
← stats4647 left12:40
← epony left12:40
ross osse: just reread (correctly this time) and that's really funny12:44
← piwu11 left12:45
→ piwu11 joined12:45
osse Maybe I just submit it to the list April 112:45
*I should submit12:45
→ qqq joined12:45
← cdown left12:57
← piwu11 left12:58
→ piwu11 joined12:58
→ danse-nr3 joined13:07
← piwu11 left13:10
← Lockesmith left13:11
→ piwu11 joined13:11
← vysn left13:11
→ Lockesmith joined13:11
→ EvgenyK joined13:15
← bf_ left13:15
→ bf_ joined13:17
← Lockesmith left13:19
← EvgenyK left13:20
→ Lockesmith joined13:20
← StucKman left13:21
← YuGiOhJCJ left13:22
← duszek left13:25
→ duszek joined13:25
← piwu11 left13:26
→ piwu11 joined13:26
→ stats4647 joined13:29
← stats4647 left13:33
→ EvgenyK joined13:33
→ StucKman joined13:36
← fcresende left13:38
← suki left13:38
← bagels left13:38
← lukeart left13:38
← miffi left13:38
← acetakwas left13:38
→ johncs7 joined13:39
← hannibal_ad_port left13:39
← ztrawhcse_ left13:39
← wilsonjholmes left13:39
← esensar left13:39
← Hobbyboy left13:39
← sa left13:39
← DreamweaverN left13:39
← coldmountain left13:39
→ Dreamwea- joined13:39
→ JumpinBa- joined13:39
← piwu11 left13:39
→ chrfle_ joined13:39
→ acetakwas joined13:39
→ piwu11 joined13:40
← txtsd left13:40
← sebboh left13:40
← b0o left13:40
← akelly left13:40
← jmcantrell left13:40
← tsujp left13:40
← chrfle left13:40
← braxas left13:40
← Manouchehri left13:40
← flowji left13:40
← superice_ left13:40
← Seveas_ left13:40
← ggherdov left13:40
chrfle_ → chrfle13:40
→ Hobbyboy joined13:40
→ wynn joined13:40
Dreamwea- → DreamweaverN13:40
← whereiseveryone left13:40
← SusanTheNerd left13:40
← wolf left13:40
← madduck left13:40
← preisi left13:40
← dmj` left13:40
← edwarnicke left13:40
← zx2c4 left13:40
← johncs left13:40
← JumpinBanana left13:40
← hays left13:40
johncs7 → johncs13:40
JumpinBa- → JumpinBanana13:40
→ txtsd joined13:41
→ ztrawhcse_ joined13:41
→ esensar joined13:41
→ sebboh joined13:41
→ tsujp joined13:41
→ hannibal_ad_port joined13:41
→ jmcantrell joined13:41
→ whereiseveryone joined13:41
→ wilsonjholmes joined13:41
→ SusanTheNerd joined13:41
→ akelly joined13:41
→ b0o joined13:41
→ Seveas joined13:41
→ flowji joined13:41
→ sa joined13:41
→ coldmountain joined13:41
→ ggherdov joined13:41
→ braxas joined13:42
→ zx2c4 joined13:42
→ Manouchehri joined13:42
→ edwarnicke joined13:42
→ madduck joined13:42
← EvgenyK left13:42
→ EvgenyK joined13:42
← astlep5504018 left13:43
→ dmj` joined13:43
wynn → wolf13:44
→ astlep5504018 joined13:44
→ superice joined13:45
← qsx left13:46
← danse-nr3 left13:46
→ qsx joined13:46
← igemnace left13:47
← Ox7C5_ left13:48
→ cdown joined13:48
← EvgenyK left13:51
← piwu11 left13:53
→ epony joined13:53
→ miffi joined13:53
→ bagels joined13:53
→ piwu11 joined13:53
→ suki joined13:53
→ lukeart joined13:53
→ fcresende joined13:53
← nivag left13:54
→ bloody joined13:54
→ preisi joined13:55
→ Dex_2x94 joined13:56
← cdown left14:04
→ igemnace joined14:04
→ EvgenyK joined14:04
→ stats4647 joined14:05
← piwu11 left14:07
→ nivag joined14:07
→ piwu11 joined14:07
→ cdown joined14:08
← stats4647 left14:09
← EvgenyK left14:12
← Juest left14:12
← stagas left14:16
← szkl left14:16
← kus left14:17
→ stagas joined14:17
→ kus joined14:17
← piwu11 left14:20
→ Juest joined14:20
→ JamesMowery joined14:20
→ piwu11 joined14:21
← gxt left14:22
← GNUmoon left14:23
→ gxt joined14:23
← rustyshackleford left14:29
← nivag left14:29
→ GNUmoon joined14:33
← piwu11 left14:34
→ piwu11 joined14:34
→ iamtheranger joined14:37
→ EvgenyK joined14:39
← GNUmoon left14:41
→ GNUmoon joined14:42
→ Gary_Sinise joined14:43
→ nivag joined14:43
→ derpydoo joined14:45
← EvgenyK left14:47
→ danse-nr3 joined14:47
← piwu11 left14:48
→ piwu11 joined14:48
→ gast0n joined14:56
→ donofrio joined14:58
← piwu11 left15:02
→ piwu11 joined15:02
→ rustyshackleford joined15:04
→ bloody_ joined15:11
← bloody left15:12
← miigotu left15:14
← piwu11 left15:15
→ EvgenyK joined15:15
→ piwu11 joined15:15
→ miigotu joined15:15
← cdown left15:15
→ szkl joined15:17
← SharpHammer49 left15:18
→ SharpHammer49 joined15:19
→ thiago joined15:20
← EvgenyK left15:23
← iomari891 left15:26
← xinming left15:28
← stagas left15:28
→ stagas joined15:29
→ cdown joined15:29
→ xinming joined15:29
← piwu11 left15:30
→ piwu11 joined15:30
→ cytokine_storm joined15:31
cytokine_storm https://paste.debian.net/1305785/ i get this error15:33
it works with other repos15:33
\:j #archlinux-offtopic what to do15:35
JamesMowery Question. I have all of my dotfiles in a bare git repo. A few weeks ago I created a branch so I could tinker around with creating my neovim config from scratch. A few weeks and hundreds of commits later to files all over my system, I now want to bring the changes I made to all the other files on my main branch in sync with the old neovim branch.15:36
But I still want my main branch and neovim branches to maintain their separate neovim configs (as my neovim branch is still a work in progress). How do I go about doing that?15:36
j`ey JamesMowery: git rebase15:36
JamesMowery j`ey So would I checkout my neovim branch, and then rebase my "neovim-branch" onto "main" or vice versa?15:38
j`ey checkout neovim and then 'git rebase main'15:39
← cytokine_storm left15:39
← piwu11 left15:43
→ piwu11 joined15:44
→ zitter joined15:49
← qqq left15:52
← piwu11 left15:54
→ piwu11 joined15:54
→ skapata joined15:55
← Dex_2x94 left15:57
welder_ I've got 20-something commits and in some (4-5) I've modified a file that should not be touched. How to reconstruct these commits and remove all modifications to the specified file?15:57
ikke welder_: with an interactive rebase15:58
welder_ is i did so, but i thought there is an easier way?15:58
i listed the commits with git log --name-only and checked where i modified them and ran interactive rebase15:59
but i thought there might be easier way15:59
→ vysn joined16:00
→ qqq joined16:04
← piwu11 left16:07
→ piwu11 joined16:07
← SharpHammer49 left16:10
→ SharpHammer49 joined16:10
→ mazamazine joined16:14
JamesMowery j`ey Thank you! That did it. It was kind of scary doing that for the first time (first time ever rebasing and I'm completely new to handling merge conflicts), but I think I figured it out. All is working now. :)16:14
j`ey JamesMowery: awesome. git rebase is great16:15
← nivag left16:15
bn_work hi, git 2.24.3, seeing a weird issue on a branch that is just tracking a remote whereby when I did a `git pull` it tried to FF then exited with RC=1 saying I have unstaged changes. When I do `git status` it shows a file I never touched and says to do ` (use "git restore <file>..." to discard changes in working directory)`, but when I do that, `git status` output does not change (I also checked and got RC=0 too?)16:19
← SharpHammer49 left16:19
JamesMowery j`ey So I'm probably going to be tweaking my Neovim configs quite a bit over the next few weeks. And I want to be able to swap between them until I finally settle on if I want to use LazyVim or use my own config. Doing this rebase thing so often maybe doesn't sound so wise. Do you think using a git submodule (which I believe will allow me to have a16:20
git repo within a git repo) would be a good solution for that?16:20
← piwu11 left16:20
→ piwu11 joined16:21
← rfuentess left16:22
→ tirnanog joined16:24
→ zetef joined16:24
← sreve left16:27
← piwu11 left16:29
→ piwu11 joined16:30
→ rbatty joined16:30
j`ey JamesMowery: no submodule would be more complicated16:32
← fling left16:33
→ hbautista joined16:36
→ fling joined16:36
← zetef left16:36
→ stats4647 joined16:39
← stats4647 left16:43
← piwu11 left16:43
→ piwu11 joined16:44
← justsomeguy left16:45
→ stats4647 joined16:54
← cxc left16:57
← piwu11 left16:58
→ piwu11 joined16:58
← zitter left17:01
← danse-nr3 left17:03
→ ferdna joined17:04
← gandhibobandhi__ left17:04
← hbautista left17:05
→ justsomeguy joined17:08
→ Gary_Sinise1 joined17:09
← JayBeeFOSS left17:10
← Gary_Sinise left17:10
Gary_Sinise1 → Gary_Sinise17:10
← piwu11 left17:11
→ piwu11 joined17:11
→ JayBeeFOSS joined17:12
→ actioninja7 joined17:12
→ jmd joined17:13
→ gsi_ joined17:15
← actioninja left17:15
actioninja7 → actioninja17:15
← gsi left17:15
← Teacup_ left17:15
← JamesMowery left17:15
← LuKaRo left17:15
→ JamesMowery8 joined17:15
→ Teacup joined17:15
← APic left17:16
← eqw left17:16
← hinderaker left17:16
→ hinderaker joined17:17
→ eqw joined17:17
← m_antis- left17:17
← dslegends left17:18
→ LuKaRo_ joined17:19
→ dslegends joined17:21
→ APic joined17:22
← piwu11 left17:22
→ piwu11 joined17:23
→ m__antis joined17:24
← pretty_dumm_guy left17:25
← theoceaniscool left17:25
← piwu11 left17:33
→ piwu11 joined17:33
→ krushia joined17:33
→ kurahaupo joined17:36
bn_work so anyone know what's up `git restore <file>`? is my .git repo corrupted?17:36
→ raffaele joined17:36
dodo well, what does the command output?17:36
j416 bn_work: welcome to mind reader evening, an event where we try to guess what other people think!17:37
← MGF_Fabio left17:37
bn_work j416: I shared what it returned, ie: RC=017:37
(there was no error message)17:37
it just doesn't change anything17:38
→ theoceaniscool joined17:38
← cdown left17:38
bn_work dodo ^^^17:38
j416 bn_work: ah, I didn't see your earlier message.17:38
← rafspiny left17:39
← john_johnk left17:40
j416 it sounds to me like you're not using 'git restore' properly17:41
but, I'm not familiar with this command so I can't give much assistance other than to point you at man git-restore17:41
gitinfo the git-restore manpage is available at https://gitirc.eu/git-restore.html17:41
← StucKman left17:42
jb1277976 How do you clone a repo that is only using gitweb ? i would like to clone it then upload it to my own repo so i can record my changes17:42
j416 jb1277976: find a url to clone from17:43
I don't think gitweb itself provides that but I could be wrong17:44
bn_work j416: is there more to this particular invocation VS just doing what the `git status` message says? PS: I even tried doing a `git checkout <file>` and it says `Updated 1 path from the index` (with RC=0) but still no difference, what gives?17:44
jb1277976 I cloned it how do i upload to my own personal repo ?17:44
← piwu11 left17:44
bn_work it's like this particular file is permanently in this "modified" state in the index17:44
s/index/staging area/17:44
→ piwu11 joined17:44
bn_work I've never seen git stuck like this before17:44
jb1277976 Found this j416 https://stackoverflow.com/a/9288410 does that look right ?17:45
j`ey bn_work: are you on a case insensitive file system, and maybe the repo has 2 files with different case?17:45
bn_work jb1277976: are you using github? if so, you should be able to just click the fork button17:45
← rainystorm left17:46
→ pretty_dumm_guy joined17:46
kurahaupo bn_work: if you have newline normalisation enabled, checked out files will appear to be different from their indexed versions17:46
bn_work j`ey: APFS, I think it's in case insensitive mode?17:46
j`ey bn_work: by default it's case sensitive17:47
j416 jb1277976: really, you'll save a lot of time with !book17:47
gitinfo jb1277976: There are several good books available about git; 'Pro Git' is probably the best: https://git-scm.com/book (free web version and downloads) but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable17:47
j416 jb1277976: specifically the part on clone https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository17:48
j`ey bn_work: if the repo is also online, check there, or on linux17:48
j416 j`ey: APFS is not case sensitive by default afaik17:48
bn_work j`ey: huh? https://swild.dev/dev/apfs-case-insensitive/#:~:text=Turns%20out%20APFS%20is%20case,path%2Fto%2Fsome%2Fdir17:49
j`ey uhhh17:49
yes sorry I messed up17:49
I meant it's case insensitive by default17:49
I had a double negative in my head17:49
j416 so your comment is valid that if this repo is one that was made on a case-sensitive system, there may be files that end up like that17:50
j`ey: figured :)17:50
bn_work: you can confirm that easily by checking what files you have in your work dir vs. what status says17:51
bn_work: another way is to just list the files using e.g. git-ls-files17:51
kurahaupo turns off the disable case insensitivity option17:51
j416 D:17:52
→ EvgenyK joined17:53
bn_work kurahaupo: I may, what setting are thinking of? https://www.irccloud.com/pastebin/rOOEbTPD/.gitconfigs17:55
← piwu11 left17:55
bn_work s/are/are you/17:55
→ piwu11 joined17:55
j416 bn_work: I think that was a joke17:55
(re: double negative)17:55
bn_work: there's no way to configure git to cause it to make your file system case-sensitive17:56
bn_work: you should check whether or not this is the issue before trying to solve it17:57
← Gary_Sinise left18:01
← SAJAT left18:02
→ SAJAT joined18:03
← raffaele left18:04
→ pretty_d1 joined18:07
← pretty_d1 left18:07
→ pretty_d1 joined18:08
← pretty_d1 left18:08
← piwu11 left18:08
← pretty_dumm_guy left18:09
→ piwu11 joined18:09
→ raffaele joined18:11
→ pretty_dumm_guy joined18:13
← EvgenyK left18:16
→ john_johnk joined18:19
← piwu11 left18:21
→ piwu11 joined18:22
← stagas left18:25
← raffaele left18:25
→ danse-nr3 joined18:27
← john_johnk left18:28
← JamesMowery8 left18:30
→ raffaele joined18:31
← piwu11 left18:31
→ piwu11 joined18:32
→ JamesMowery8 joined18:36
→ Wh0 joined18:38
→ sahil_ joined18:38
bn_work j416: I was referring to kurahaupo's earlier comment re. newline normalization18:38
j416: I originally created the repo and my system definitely wasn't case sensitive18:38
→ wh00 joined18:40
j416 ah.18:40
bn_work: what does 'git status' output exactly?18:40
← JamesMowery8 left18:41
jmd j416: It outputs the status of the working directory18:41
j416 bn_work: I'd also try turning of the autocrlf setting to see if that affects something18:41
jmd: can you give me the exact output?18:42
← ferdna left18:42
j416 (are you working together on this?)18:42
jmd Why don't you try it yourself?18:42
→ JamesMowery8 joined18:42
j416 jmd: I'm asking for the output, not about the command itself18:42
← Wh0 left18:44
jmd Well type it in, and you will see the output.18:45
j416 jmd: I'm trying to help bn_work.18:45
← piwu11 left18:46
→ piwu11 joined18:46
← JamesMowery8 left18:51
→ JamesMowery8 joined18:52
← tirnanog left18:53
→ tirnanog joined18:55
← justsomeguy left18:57
→ larryv joined18:58
← piwu11 left18:59
→ kjartan_ joined19:00
→ piwu11 joined19:00
← duszek left19:03
→ duszek joined19:03
← magic_ninja left19:06
j416 but it seems they left. :)19:11
← piwu11 left19:14
bn_work j416: sorry, got called away19:14
→ piwu11 joined19:14
← travisghansen left19:14
→ justsomeguy joined19:14
→ travisghansen joined19:15
→ PiRATA joined19:15
bn_work j416: would autocrlf cause this weird issue though?19:16
→ cpackham joined19:17
j416 bn_work: you tell me19:19
→ magic_ninja joined19:20
← Minvera left19:21
← thuna` left19:22
→ cyberpear joined19:22
← donofrio left19:23
→ donofrio joined19:24
← piwu11 left19:25
→ piwu11 joined19:25
→ thuna` joined19:26
← fling left19:34
← piwu11 left19:34
→ piwu11 joined19:34
→ fling joined19:36
← theoceaniscool left19:36
← lockna left19:39
→ lockna joined19:39
← lllh left19:41
← lockna left19:42
→ Gary_Sinise joined19:42
→ lockna joined19:43
← piwu11 left19:44
→ piwu11 joined19:45
← darkAffinity2368 left19:45
← din0 left19:45
→ llh joined19:45
→ din0 joined19:47
← danse-nr3 left19:53
→ darkAffinity2368 joined19:54
← coot left19:55
← piwu11 left19:57
→ piwu11 joined19:57
← jmd left20:00
← miigotu left20:01
← Rhonda left20:02
← SAJAT left20:03
→ SAJAT joined20:04
→ alexherbo2 joined20:04
→ Rhonda joined20:07
← darkAffinity2368 left20:07
← piwu11 left20:09
← krumelmonster left20:09
→ piwu11 joined20:09
→ Minvera joined20:11
← alexherbo2 left20:11
← keypusher left20:18
→ keypusher joined20:18
→ krumelmonster joined20:22
← piwu11 left20:22
← jfsimon1981 left20:22
→ piwu11 joined20:22
→ miigotu joined20:28
← pretty_dumm_guy left20:29
← derpydoo left20:31
→ mobivme joined20:31
← piwu11 left20:34
→ piwu11 joined20:35
→ m0viefreak joined20:35
→ danse-nr3 joined20:37
→ ___nick___ joined20:41
→ Ox7C5_ joined20:43
← piwu11 left20:45
→ piwu11 joined20:45
← dmc left20:50
← BlessJah left20:51
→ BlessJah joined20:54
← piwu11 left20:56
→ piwu11 joined20:56
← danse-nr3 left21:03
→ danse-nr3 joined21:03
← ___nick___ left21:04
← qqq left21:08
← piwu11 left21:09
→ piwu11 joined21:10
→ dmc joined21:10
bn_work j416: I wouldn't think it would21:11
→ V__ joined21:11
← wh00 left21:16
← Ox7C5_ left21:16
→ qqq joined21:17
← sahil_ left21:17
→ theoceaniscool joined21:19
← piwu11 left21:22
← magic_ninja left21:22
→ piwu11 joined21:22
← krushia left21:24
← stats4647 left21:30
← piwu11 left21:31
→ magic_ninja joined21:31
→ piwu11 joined21:31
← gast0n left21:31
→ gast0n joined21:34
← cpackham left21:35
j416 bn_work: then I wish you the best of luck with your problem :)21:37
← thuna` left21:40
← realies left21:40
→ coot joined21:41
→ realies joined21:43
← igemnace left21:45
← piwu11 left21:46
→ piwu11 joined21:46
← PiRATA left21:49
← danse-nr3 left21:50
← iamtheranger left21:51
← Feuermagier left21:51
→ Feuermagier joined21:51
← piwu11 left21:57
→ piwu11 joined21:58
← m0viefreak left22:00
→ igemnace joined22:02
← miigotu left22:06
→ miigotu joined22:07
← V__ left22:08
← piwu11 left22:08
→ piwu11 joined22:08
← cyberpear left22:12
→ sreve joined22:14
→ stats4647 joined22:20
← carl- left22:20
← vysn left22:23
← piwu11 left22:24
→ piwu11 joined22:24
← schne1der left22:25
→ h-erectus joined22:25
→ cpackham joined22:26
← stats4647 left22:26
→ thuna` joined22:26
← kjartan_ left22:31
JamesMowery8 → JamesMowery22:35
← coot left22:36
← piwu11 left22:37
→ piwu11 joined22:37
← miigotu left22:37
→ miigotu joined22:40
← gast0n left22:41
← miigotu left22:45
→ gast0n joined22:45
← GNUmoon left22:46
← gxt left22:48
← h-erectus left22:48
← fling left22:48
← cmc_ left22:48
← chiselfuse left22:48
← bindu_ left22:48
← FinnElija left22:48
← cpackham left22:48
→ fling joined22:48
→ chiselfuse joined22:48
→ gxt joined22:48
→ FinnElija joined22:48
→ h-erectus joined22:48
→ bindu joined22:48
→ cmc_ joined22:49
← bindu left22:49
← piwu11 left22:49
→ bindu joined22:49
→ piwu11 joined22:49
← plantroon left22:54
← reset left22:54
← sreve left22:56
→ stats4647 joined22:58
→ cpackham joined22:59
← Teacup left22:59
← stats4647 left23:01
← piwu11 left23:01
→ piwu11 joined23:02
→ stats4647 joined23:03
→ Teacup joined23:03
← duszek left23:05
→ duszek joined23:05
→ plantroon joined23:07
→ GNUmoon joined23:07
→ chair1 joined23:10
← tirnanog left23:12
← theoceaniscool left23:12
← piwu11 left23:14
→ piwu11 joined23:14
→ tirnanog joined23:18
← magic_ninja left23:19
← gast0n left23:21
→ shokohsc51081294 joined23:25
← piwu11 left23:26
→ gast0n joined23:26
→ piwu11 joined23:26
← gast0n left23:27
← stats4647 left23:32
← cjoke left23:34
→ stats4647 joined23:34
← krumelmonster left23:35
← piwu11 left23:38
→ piwu11 joined23:39
→ mud joined23:39
→ gast0n joined23:47
← plugwash left23:47
← piwu11 left23:50
→ piwu11 joined23:51
← kurahaupo left23:59

Logs Search ←Prev date Next date→ Channels Documentation