IRCloggy #git 2024-05-23

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-05-23

← jim left00:00
← chiselfuse left00:01
→ chiselfuse joined00:02
← tirnanog left00:04
→ systemdlete joined00:04
→ delay joined00:04
← systemdlete left00:04
→ systemdlete joined00:06
← tomboy64 left00:06
← systemdlete left00:07
→ systemdlete joined00:08
← systemdlete left00:08
→ systemdlete joined00:10
← delay left00:11
→ delay joined00:12
← systemdlete left00:12
← delay left00:14
→ blacknova joined00:18
← Lord_of_Life left00:18
→ leon joined00:19
→ Lord_of_Life joined00:19
→ systemdlete joined00:20
← systemdlete left00:21
→ systemdlete joined00:22
→ hritik joined00:23
← vrach left00:26
→ EvgenyK joined00:27
← systemdlete left00:27
← JordiGH left00:28
→ systemdlete joined00:28
← hritik left00:28
← systemdlete left00:30
→ systemdlete joined00:30
← systemdlete left00:31
← EvgenyK left00:32
→ systemdlete joined00:34
→ eggbean joined00:36
← systemdlete left00:36
→ systemdlete joined00:36
← henry40408 left00:40
→ henry40408 joined00:40
→ Gary_Sinise joined00:42
→ JordiGH joined00:45
jensen → a0At00:46
← cdown left00:47
→ EvgenyK joined00:48
← EvgenyK left00:53
→ reset joined00:56
← guru_ left00:56
→ hritik joined00:58
← hritik left01:03
→ LiENUX joined01:04
← LiENUS left01:04
← bloody_ left01:07
← SharpHammer18 left01:18
→ EvgenyK joined01:21
← EvgenyK left01:26
→ NeilRG joined01:29
→ junyx joined01:33
→ hritik joined01:34
← uuuuu left01:35
← toralf_ left01:39
← hritik left01:39
→ toralf joined01:40
← gast0n left01:47
→ EvgenyK joined01:49
→ gasbag joined01:50
← dsrt^ left01:51
← gasbag left01:53
→ delay joined01:53
← EvgenyK left01:54
→ gsi_ joined01:59
← gsi left02:03
← printfdebugging left02:03
→ dsrt^ joined02:04
→ tomboy64 joined02:04
→ causasui joined02:16
← systemdlete left02:16
→ EvgenyK joined02:21
← EvgenyK left02:26
→ uuuuu joined02:27
← navi left02:29
→ e204 joined02:32
→ stolen joined02:44
← spikemaster left02:50
→ EvgenyK joined02:50
← grogu left02:50
→ grogu joined02:51
← defjam left02:51
← EvgenyK left02:55
← thiago left02:56
→ pebble joined02:59
→ fofoni joined03:00
← pebble left03:03
→ EvgenyK joined03:03
→ defjam joined03:04
← fofoni left03:05
← cpackham left03:05
← ash_worksi left03:06
→ cpackham joined03:07
← defjam left03:09
← LiENUX left03:11
← bn_work left03:11
← JordiGH left03:13
→ LiENUS joined03:14
→ hritik joined03:14
← dsrt^ left03:16
← delay left03:19
← hritik left03:20
← Gary_Sinise left03:21
← hbautista left03:25
→ dsrt^ joined03:30
← LiENUS left03:32
→ LiENUS joined03:36
→ Ali_nz joined03:37
Ali_nz Would someone be prepared to help me. I tried to pull a commit to my GH account to local, it involved a merge and a commit back, and now I have add my changes to the GH - I really want to make the current working version (local and remote) to be what the changes were that the other contributor made.03:37
In the interests of complete disclosure before anyone offers to help, I am a complete newbie and not feeling much love for GH right now03:37
← NeilRG left03:44
← dsrt^ left03:50
→ JordiGH joined03:50
→ defjam joined03:57
← defjam left04:03
← JordiGH left04:04
← Rodney_ left04:05
→ dsrt^ joined04:08
→ EvgenyK_ joined04:16
→ sjoshi joined04:17
← c0dehu1k left04:18
← EvgenyK left04:19
← cmc left04:25
← gildasio left04:25
← sgm left04:25
← dsrt^ left04:25
→ GNUmoon2 joined04:26
← EvgenyK_ left04:26
→ sgm joined04:26
→ gildasio joined04:26
→ cmc joined04:27
← blacknova left04:27
→ EvgenyK joined04:27
→ hritik joined04:29
← EvgenyK left04:32
→ defjam joined04:33
← hritik left04:34
Ali_nz Anyone?04:35
chuanshi_ What's the GH?04:35
Ali_nz github04:35
→ fofoni joined04:37
← defjam left04:37
→ haxalot joined04:38
chuanshi_ Ali_nz: Was the remote code changed after you pulled code from GH?04:39
Ali_nz 1.another contrinutor wrote a commit to github04:40
2. I want the code as it is from this commit04:40
3. I used VSCode to try to pull down this commit, but it wanted to merge04:40
4. Now it looks like I have commited some sort of hybrid (read a mess) of what I had locally and what was in the commit04:41
5. I want to completely erase my commit04:41
(and then pull down the Github version of the code)04:41
← fofoni left04:41
chuanshi_ Ali_nz: first, git log, have a look to your commits.04:42
Ali_nz https://bpa.st/A5MA04:44
→ Gary_Sinise joined04:44
Ali_nz wait04:44
thats not even showing all commits04:44
→ EvgenyK joined04:44
← Gary_Sinise left04:45
chuanshi_ git reset --hard to a commit SHA-1 before your certain commit.04:45
Ali_nz This is more relevant: https://bpa.st/VZRA04:45
The last two commits are by Al Grant - I think those can be deleted04:46
chuanshi_: is this answer wrong? : https://stackoverflow.com/questions/448919/how-can-i-remove-a-commit-on-github04:47
chuanshi_ It's easy : git reset --hard 65574e7b6244cdfcf2bbd84d3be28af895df354804:47
Ali_nz So before I do this, I would like to understand what I am doing better04:47
1. I presume this command just affects local (git) not github?04:48
chuanshi_ If you want to keep these two commits in github, you do not push to remote, or make a new branch from this branch then do git reset --hard04:50
Ali_nz No - I want those commits also gone from github please04:50
← EvgenyK left04:51
chuanshi_ git reset --hard 65574e7b6244cdfcf2bbd84d3be28af895df3548 ,then git push04:52
→ hritik joined04:52
Ali_nz https://bpa.st/VX4Q04:53
chuanshi_ Ali_nz: Is this approach right?04:53
→ cdown joined04:53
Ali_nz it doesnt like the git push after the reset04:53
chuanshi_ Before git push, use git pull04:54
→ Mooncairn_ joined04:54
chuanshi_ No04:54
Ali_nz that did not work04:54
the commands ran of04:55
OK04:55
chuanshi_ The information said, after your commits,there are new commits from others.04:55
← Mooncairn left04:55
Ali_nz Well I dont know - I pasted the information - the git log04:55
← stolen left04:56
Ali_nz ?04:56
chuanshi_ Ali_nz: we talked out here.04:57
Ali_nz we talked out here?? what does that mean?04:57
chuanshi_ leave here, talk personally.04:58
Ali_nz sure04:58
discord?04:58
chuanshi_ ok04:58
→ EvgenyK joined04:58
← hritik left04:59
→ defjam joined05:00
← EvgenyK left05:04
← defjam left05:07
→ dsrt^ joined05:08
→ hritik joined05:11
→ zmt00 joined05:13
→ EvgenyK joined05:14
← fundatillus left05:14
→ fundatillus joined05:15
→ ash_worksi joined05:15
→ defjam joined05:18
← hritik left05:18
← dsrt^ left05:20
→ jim joined05:20
← EvgenyK left05:21
← defjam left05:24
→ EvgenyK joined05:25
→ hritik joined05:30
← cpackham left05:32
→ Guru_DE joined05:32
→ defjam joined05:36
← hritik left05:37
← fundatillus left05:40
→ fundatillus joined05:40
← defjam left05:42
→ defjam joined05:45
← EvgenyK left05:47
← defjam left05:51
→ hritik joined05:55
← hritik left06:01
← jpw left06:01
→ defjam joined06:03
→ jpw joined06:04
← jpw left06:04
→ jpw joined06:04
← yuljk left06:06
← defjam left06:09
← Nick left06:10
→ Nick joined06:10
← Nick left06:10
→ Nick joined06:10
→ lolok joined06:10
← junyx left06:11
← Oksana left06:11
← seds left06:11
← limon left06:12
→ seds joined06:12
→ johncs3 joined06:12
→ The_Blode joined06:12
← Ali_nz left06:12
→ batrick joined06:13
← EvilDMP left06:13
→ EvilDMP joined06:13
→ Oksana joined06:14
← cbreak left06:15
→ cbreak joined06:17
→ Mardroemmar joined06:18
→ Ali_nz joined06:18
→ zetef joined06:19
→ larryv_ joined06:20
→ defjam joined06:21
← haxalot left06:23
← larryv left06:24
← alfredb left06:25
← defjam left06:28
→ limon joined06:30
← larryv_ left06:31
→ defjam joined06:41
← EvilDMP left06:43
← reset left06:44
→ peirik_ joined06:48
← jmjl left06:48
← skapata left06:51
← defjam left06:51
→ MrCryo joined06:52
← a0At left06:53
← rustyshackleford left06:53
→ EvilDMP joined06:56
→ gandhibobandhi joined06:56
→ becm joined06:58
← EvilDMP left07:02
→ aminvakil joined07:02
← Betal left07:03
→ defjam joined07:05
→ rfuentess joined07:06
→ EvilDMP joined07:06
→ ssserpent joined07:07
← defjam left07:13
← ash_worksi left07:14
→ RiFo joined07:15
→ dsrt^ joined07:16
← dsrt^ left07:17
← EvilDMP left07:20
→ defjam joined07:25
→ gandhibobandhi_ joined07:26
← GNUmoon2 left07:29
← gandhibobandhi left07:29
→ GNUmoon2 joined07:30
← defjam left07:31
← matheusmoreira left07:32
→ Edward_Brown joined07:34
← becm left07:37
← sihloo left07:39
→ sihloo joined07:39
→ defjam joined07:43
← zetef left07:49
→ danse-nr3 joined07:50
← defjam left07:52
→ EvilDMP joined07:55
→ printfdebugging joined08:01
→ zetef joined08:03
→ defjam joined08:06
→ blatant joined08:07
→ PlasmaHH joined08:07
← EvilDMP left08:09
PlasmaHH Hi, we read about possible problems with the new security features and git lfs in 2.45.1 ... does anyone have more information about the exact circumstances this can happen? all I could find so far was "sometimes when cloning an lfs enable repo" ... I would like to know more before we roll out that version within the company...08:10
← defjam left08:11
← printfdebugging left08:11
bookworm ehr, what more do you need?08:13
do you use lfs? Yes? It'll break, No? No difference08:13
← leon left08:13
→ EvilDMP joined08:16
PlasmaHH bookworm: the thing is, it doesn't break in my local tests and I don't want to roll out the version and have it break for everyone08:16
← EvilDMP left08:16
← kurahaupo left08:17
← cdown left08:18
bookworm it doesn't prevent the hook from executing after a clone in a lfs enabled repo?08:20
PlasmaHH bookworm: you mean the post-checkout hook? no it runs08:21
→ defjam joined08:23
bookworm the commit message of the revert explains the details, but you should already be hitting those I think08:25
it's the hook writing to .git that's the problem during a clone op08:26
the revert is already queued though, so if I were you I'd just wait for the next point release08:26
→ xx joined08:29
← defjam left08:29
→ leon joined08:35
PlasmaHH bookworm: hm, maybe my distro fumbled something with the package, just tried within my company environment which copies a lot of stuff into .git via post-checkout and that works fine... guess I have to try it on windoze which most other people use08:39
→ defjam joined08:40
→ criswell joined08:42
→ StucKman joined08:43
→ EvilDMP joined08:43
← defjam left08:46
← bodiccea_ left08:48
→ defjam joined08:48
→ drew joined08:48
← chuanshi_ left08:49
→ chuanshi joined08:50
← peirik_ left08:50
← defjam left08:55
← YuGiOhJCJ left09:00
→ Guest10 joined09:00
← Edward_Brown left09:01
Guest10 → Tigero09:02
→ becm joined09:03
← xdminsy left09:03
→ peirik_ joined09:04
→ defjam joined09:07
← Tigero left09:07
→ Guest10 joined09:08
Guest10 → Birdie09:08
Birdie → Birdy09:09
Birdy → Bluebird09:09
Bluebird → Guest922609:09
Guest9226 → SlowSnake09:10
← chiselfuse left09:11
→ chiselfuse joined09:12
← SlowSnake left09:13
→ SlowSnake joined09:13
← defjam left09:13
← chiselfuse left09:19
→ chiselfuse joined09:20
→ Left_Turn joined09:22
← chiselfuse left09:22
← seasharp left09:24
Tobbi I just updated a git submodule URL. Yet git persists on the old URL...Any idea?09:24
grawity .gitmodules is not used directly, it's imported into the repo's local config when you do `git submodule init` or similar09:25
→ chiselfuse joined09:25
→ defjam joined09:26
chuanshi Is this git's new feature?09:26
→ hritik joined09:29
← hritik left09:31
→ hritik joined09:32
← defjam left09:32
chuanshi It's old feature, I'm reading it in the book: Pro git09:33
Tobbi grawity: I found git submodule sync09:34
which worked09:34
← peirik_ left09:40
→ seasharp joined09:42
→ defjam joined09:45
→ peirik_ joined09:48
← memset left09:48
→ gas51627 joined09:49
← gandhibobandhi_ left09:53
← defjam left09:55
← weaksauce left09:55
← SlowSnake left09:56
→ memset joined09:56
→ weaksauce joined09:56
← FinnElija left10:00
→ FinnElija joined10:00
← Ali_nz left10:01
→ vrach joined10:03
← FinnElija left10:04
→ FinnElija joined10:05
→ defjam joined10:08
← defjam left10:14
→ defjam joined10:25
← cation left10:25
→ rustyshackleford joined10:25
→ cation joined10:29
← defjam left10:31
→ gandhibobandhi_ joined10:31
PlasmaHH for git config is there something like --add which only adds if not already there?10:32
← peirik_ left10:32
→ navi joined10:36
mort How did you push the first N git commits again10:40
if you, say, have a repository with a million commits and pushing them all in one go times out10:41
PlasmaHH mort: master~10:master or so?10:42
→ defjam joined10:42
PlasmaHH never had that much unpushed commits ^^10:42
mort maybe I should start in the other end10:43
selckin google "git push batches" find a stackoverflow with something that looks like it should work10:43
mort how do I fork the Linux kernel repo and put the fork on my own git host10:43
where git clone + git remote add blah + git push blah times out10:44
why doesn't git push just have a --batched option10:46
PlasmaHH because nobody normally realy needs it10:46
mort anyone who's dealing with the Linux repo kinda needs it10:47
nedbat mort: maybe you need a more capable git host.10:47
← defjam left10:48
mort it's capable enough as long as you don't push 1.15M commits in one go10:48
← memset left10:49
mort it's a self hosted gitlab thing, so "more capable" really just means "spend more money on a bigger VPS" and that's kind of a big ask when it's fine for literally everything other than pushing over a million commits in one push10:49
PlasmaHH if its your own just increase the timeout?10:50
→ defjam joined10:50
selckin no its gitlab being designed to prevent abuse, and having strict quota and limits and time, memory, cpu usage of single actions10:51
mort I don't know how to do that, and it seems unnecessary when just batching the commits works10:51
← FinnElija left10:51
← bindu left10:51
← gildasio left10:51
→ memset joined10:52
→ FinnElija joined10:52
→ gildasio joined10:54
→ JordiGH joined10:56
← defjam left10:56
← hritik left10:57
→ hritik joined10:57
← FinnElija left10:58
← danse-nr3 left10:59
→ bindu joined10:59
→ peirik_ joined11:01
→ FinnElija joined11:02
→ xdminsy joined11:04
← EvilDMP left11:05
→ Dotz0cat_ joined11:08
→ defjam joined11:08
← Dotz0cat left11:08
Dotz0cat_ → Dotz0cat11:10
→ otisolsen70 joined11:13
← defjam left11:13
← daru left11:14
← Dotz0cat left11:15
→ defjam joined11:15
→ Dotz0cat joined11:15
← gildasio left11:16
→ gildasio joined11:17
→ jensen joined11:18
jensen → aS1h11:18
← otisolsen70 left11:19
→ otisolsen70 joined11:22
→ daru joined11:22
← xdminsy left11:26
→ xdminsy joined11:27
← hritik left11:29
→ hritik joined11:29
← otisolsen70 left11:29
← defjam left11:35
→ defjam joined11:38
→ arahael joined11:39
← becm left11:41
← dsimic left11:42
→ dsimic joined11:43
← peirik_ left11:46
→ m257 joined11:48
→ printfdebugging joined11:49
PlasmaHH bookworm: I figure it out why it didnt error out for me. We use a setup with a template dir that has its own post-checkout hook11:50
→ EvilDMP joined11:50
← hritik left12:02
← de-facto left12:04
→ de-facto joined12:05
→ junyx joined12:19
→ hritik joined12:19
→ yuljk joined12:19
← JordiGH left12:20
← printfdebugging left12:21
→ printfdebugging joined12:24
→ ferdna joined12:25
→ thiago joined12:33
← aS1h left12:34
→ tirnanog joined12:34
← printfdebugging left12:36
→ fofoni joined12:36
← konsolebox left12:38
→ jensen joined12:42
← jensen left12:42
→ jensen joined12:43
← jensen left12:44
← defjam left12:46
→ pickanick joined12:46
→ jmjl joined12:50
→ defjam joined12:54
← zetef left12:55
→ becm joined12:59
← RiFo left13:00
→ lucasta joined13:02
→ cdown joined13:02
→ hbautista joined13:04
← junyx left13:07
← fofoni left13:13
→ fonini joined13:14
← fonini left13:14
← defjam left13:14
→ JordiGH joined13:15
→ fonini joined13:15
← uuuuu left13:15
← fonini left13:15
→ fonini joined13:16
← m257 left13:17
→ konsolebox joined13:19
Mooncairn_ → Mooncairn13:20
← squealingcode left13:20
← EvilDMP left13:21
→ Rodney_ joined13:21
← hritik left13:22
→ hritik joined13:22
→ defjam joined13:23
← iffraff left13:25
← zmt00 left13:26
← sjoshi left13:29
→ konsolebox_ joined13:29
← konsolebox left13:30
→ m257 joined13:31
→ c0dehu1k joined13:33
← c0dehu1k left13:33
← JordiGH left13:35
→ c0dehu1k joined13:39
→ uuuuu joined13:40
→ JordiGH joined13:42
← drew left13:44
← memset left13:47
← henry40408 left13:47
→ memset joined13:48
→ danse-nr3 joined13:50
→ rinkydink joined13:50
← FinnElija left13:51
← tirnanog left13:51
rinkydink → tirnanog13:51
→ FinnElija joined13:52
← thiago left13:54
→ thiago joined13:55
← uuuuu left13:59
← JordiGH left14:00
← davidsenk left14:02
→ junyx joined14:03
→ uuuuu joined14:03
→ gandhibobandhi__ joined14:05
→ davidsenk joined14:05
→ EvilDMP joined14:06
← gandhibobandhi_ left14:08
← StucKman left14:10
→ pebble joined14:15
← junyx left14:15
← hritik left14:16
→ hritik joined14:16
→ JordiGH joined14:16
← Aminda left14:18
→ Aminda joined14:19
← vrach left14:23
← pebble left14:23
← JordiGH left14:23
← m257 left14:26
→ m257 joined14:26
→ jensen joined14:32
jensen → antm14:32
→ gast0n joined14:32
→ itaipu joined14:33
→ gh34 joined14:41
→ skapata joined14:45
← gvg_ left14:48
← m257 left14:48
← gvg__ left14:49
← paddymahoney left14:52
→ m257 joined14:53
→ paddymahoney joined14:55
→ JordiGH joined14:56
→ cixx joined14:56
← cdown left14:59
→ Masklin__Gurder joined15:01
← JordiGH left15:03
→ JordiGH joined15:04
→ bloody joined15:04
← defjam left15:04
→ vrach joined15:05
→ Mooncairn_ joined15:06
→ SharpHammer joined15:06
← danse-nr3 left15:07
→ danse-nr3 joined15:08
← Mooncairn left15:08
Masklin__Gurder → Masklin15:09
→ ash_worksi joined15:10
→ defjam joined15:10
Mooncairn_ → Mooncairn15:11
← JordiGH left15:13
← hritik left15:14
→ hritik joined15:15
← lucasta left15:17
→ JordiGH joined15:19
← ferdna left15:21
→ printfdebugging joined15:24
← EvilDMP left15:28
← JordiGH left15:30
← printfdebugging left15:33
→ printfdebugging joined15:34
→ EvilDMP joined15:40
← cixx left15:43
← hritik left15:46
→ hritik joined15:46
← EvilDMP left15:47
→ pebble joined15:50
← Dotz0cat left15:55
← pebble left15:55
← gas51627 left15:58
← fonini left16:03
← so-offishul left16:06
→ so-offishul joined16:07
← rfuentess left16:08
→ pebble joined16:09
← pebble left16:11
← so-offishul left16:11
← hritik left16:14
← blatant left16:15
→ junyx joined16:15
→ hritik joined16:15
← samuelb left16:19
→ cyber_heretic joined16:20
← barak left16:20
← becm left16:23
→ printfdebugging2 joined16:24
→ Guest95 joined16:25
← Guest95 left16:25
→ Guest95 joined16:26
← printfdebugging2 left16:26
← printfdebugging left16:26
← printfdebugging1 left16:27
→ printfdebugging1 joined16:28
← dviola left16:28
← junyx left16:29
→ becm joined16:29
← defec7ed left16:30
→ Lunatrius joined16:31
← Guest95 left16:33
← thiago left16:33
← atrus` left16:36
→ atrus` joined16:36
→ Guest32 joined16:36
atrus` → atrus16:36
← danse-nr3 left16:38
→ danse-nr3 joined16:39
→ fonini joined16:41
→ EvilDMP joined16:45
← hritik left16:45
→ hritik joined16:45
← EvilDMP left16:45
→ russh joined16:46
→ pebble joined16:46
→ samuelbernardo joined16:47
← pebble left16:48
→ Juesto joined16:48
russh → russhdev16:49
→ cousteau joined16:50
← russhdev left16:50
→ russhdev joined16:50
cousteau Hello16:50
How can I pass --find-renames=20% to gitk?16:50
← cyber_heretic left16:51
→ junyx joined16:51
cousteau Or make gitk use that parameter when calling git status?16:51
Or git diff or whatever it calls internally?16:51
← Juest left16:51
← lachesis left16:52
→ bagatur joined16:53
← Juesto left16:53
selckin think you can pass it gitk as-is16:53
← skapata left16:53
cousteau I tried adding that to the "extra command line options for git log" without success16:53
selckin: like gitk --find-renames=20% ?16:54
selckin yea16:54
→ pedahzur joined16:54
selckin at least it doesn't error, but it does with --moo, the manual says it accepts some diff options16:54
→ JordiGH joined16:54
→ Juest joined16:55
cousteau Well, it takes the option, but seems to be ignoring it16:56
For the "green ball" (index), at least16:56
→ EvilDMP joined16:56
cousteau gitk --find-renamesames=20% did complain16:57
→ cdown joined16:57
cousteau (yeah I couldn't think of a better invalid command line option)16:57
← Guest32 left16:59
→ john_johnk joined16:59
← russhdev left16:59
→ bloody_ joined17:02
→ duxsco joined17:02
← duxsco left17:03
← bloody left17:04
← gandhibobandhi__ left17:05
→ barak joined17:06
← ssserpent left17:07
← john_johnk left17:08
→ cdown_ joined17:13
← cdown left17:13
← hritik left17:16
→ hritik joined17:16
← cdown_ left17:17
→ visualshock joined17:21
→ vysn joined17:28
→ lachesis joined17:35
← barak left17:36
→ jamiejackson joined17:38
← Mooncairn left17:39
← lachesis left17:40
→ lachesis joined17:42
→ barak joined17:43
← cousteau left17:49
← hritik left17:53
→ larryv joined17:53
→ blatant joined17:55
← Juest left17:56
→ Juest joined17:58
← BrianBlaze left18:02
← EvilDMP left18:02
→ BrianBlaze joined18:07
← lachesis left18:08
← defjam left18:09
→ lachesis joined18:11
→ hritik joined18:16
← hritik left18:16
→ wootehfoot joined18:16
→ hritik joined18:16
← junyx left18:17
→ junyx joined18:18
→ skapata joined18:19
→ reset joined18:20
← m257 left18:22
← SuperLag left18:30
→ SuperLag joined18:30
← antm left18:32
← thelounge689748 left18:35
→ thelounge689748 joined18:35
← barak left18:36
→ barak joined18:36
→ defjam joined18:38
← hritik left18:40
→ hritik joined18:40
← defjam left18:44
← hritik left18:49
→ cixx joined18:56
→ defjam joined18:56
→ jensen joined18:59
→ linux_dream joined18:59
hadronized I’m thinking about that authorship thing I mentioned some days ago and thought about something19:00
what is the limitation of sending commits by email?19:00
i.e. why is it a patch and not a commit?19:01
the asymmetry between email-patches and PR-commits is weird to me19:01
← LiENUS left19:01
← whatsupdoc left19:01
← defjam left19:02
← linux_dream left19:04
→ LiENUS joined19:04
← cixx left19:04
← blatant left19:05
← danse-nr3 left19:07
← junyx left19:07
→ junyx joined19:09
BtbN What do you mean, not a commit?19:12
How would you send a commit via plain text, if not as a patch?19:12
Encoding the entire state of the repo isn't very practical19:12
→ user_____ joined19:12
→ defjam joined19:14
→ hritik joined19:17
→ thiago joined19:17
ossifrage_ → ossifrage19:18
→ qeez joined19:21
← hritik left19:22
→ JeffH joined19:22
→ Ali_nz joined19:25
← junyx left19:25
← qeez left19:26
→ cmdrtallen joined19:29
→ junyx joined19:36
→ kjartan joined19:43
← becm left19:43
cbreak BtbN: I remember there being a streaming format for commits, but it's not usually used by humans, mainly for tools like svn importing19:43
← lostlazy left19:44
→ m0viefreak joined19:44
→ lostlazy joined19:45
cbreak patches don't really send commits, more like cherry-picks19:45
→ pebble joined19:46
→ newpy joined19:46
← pebble left19:47
newpy I added a .gitignore file to a sub-directory thinking it would ignore all files/subdirs inside, is that not right?19:47
I still see them as green/untracked in vscode, usually it becomes grey19:47
← user_____ left19:47
→ user_____ joined19:47
ikke newpy: you need to add '*' to it19:47
just an empty file ignores nothing19:48
newpy ah that makes sense19:48
→ pebble joined19:48
→ pmcnabb joined19:50
→ hritik joined19:53
→ oxox joined19:55
→ cabalcrow joined19:57
← hritik left19:58
cabalcrow what is the proper way to rebase if I just want to get all the commits I made in one branch & make them into a seperate branch?19:58
→ EvilDMP joined19:58
nedbat cabalcrow: you can create a branch from the tip commit. you don't need to rebase.20:00
cabalcrow tip?20:00
you mean the HEAD20:00
nedbat cabalcrow: yes20:00
← bagatur left20:00
nedbat cabalcrow: you can have two branches referencing the same commit.20:01
cabalcrow the point is I was working on main, but I want to remove the commits from main & just have the commits in another branch20:01
so do I just make the new branch & then drop the main commits?20:02
nedbat cabalcrow: you make a branch from HEAD, then you reset main to an earlier commit.20:03
cabalcrow: often i find myself in that situation, and I want to set main back to where it is on the server, for example.20:03
cabalcrow I see thanks20:03
← cmdrtallen left20:04
nedbat cabalcrow: there's a short notation for the server version of a branch that you can use20:04
→ cmdrtallen joined20:05
nedbat `git switch -c my_new_branch; git switch main; git reset --hard @{u}` be careful, this could be dangerous20:05
cabalcrow oops I removed too much20:07
→ leftyfb joined20:07
cabalcrow I guess I need to pull main now20:07
I'm a bit unsure about the naming convention20:10
nedbat cabalcrow: what naming convention?20:10
cabalcrow is origin supposed to be the remote that I use20:10
and is upstream the place I would want to PR?20:10
larryv look at git remote -v20:11
← leftyfb left20:11
→ leftyfb joined20:11
cabalcrow no I know where I setup the remotes20:12
← frumon left20:12
cabalcrow but what I mean is, is this the convention20:12
weaksauce upstream is the place you would try to get your patch landed yeah20:12
cabalcrow thanks!20:13
weaksauce origin defaults to the upstream unless you fork it20:13
and then origin is your fork20:13
cabalcrow ok I have it set up correctly then - thanks!20:13
weaksauce np20:13
cabalcrow figured out how to fetch & pull stuff as well to deal with changes to upstream20:14
that is quite nice20:14
← junyx left20:16
← pebble left20:23
← JeffH left20:23
→ hritik joined20:23
→ chexum joined20:24
← Flow left20:26
← LiENUS left20:28
→ Flow joined20:29
← hritik left20:31
← kjartan left20:31
← cabalcrow left20:31
← pmcnabb left20:33
→ pmcnabb joined20:34
→ cpackham joined20:35
→ junyx joined20:37
→ LiENUS joined20:37
← wootehfoot left20:39
← user_____ left20:39
← MrCryo left20:40
→ hritik joined20:44
← reset left20:45
← Flow left20:46
→ Flow joined20:46
→ hbautista_ joined20:46
← ash_worksi left20:47
← hbautista left20:48
→ ash_worksi joined20:49
← gast0n left20:49
← hritik left20:50
→ john_johnk joined20:50
→ gast0n joined20:55
← john_johnk left20:55
→ hritik joined21:03
← osc4rpt left21:03
→ osc4rpt joined21:05
← travisghansen left21:08
→ travisghansen joined21:08
← EvilDMP left21:08
← SharpHammer left21:09
← gh34 left21:10
→ haxalot joined21:10
→ Dotz0cat joined21:10
→ SharpHammer joined21:10
→ lxbeermug joined21:11
← lxbeermug left21:12
→ EvilDMP joined21:14
← hritik left21:17
→ hritik joined21:17
→ pick joined21:22
← pickanick left21:24
← hritik left21:29
→ off^ joined21:30
→ ferdna joined21:32
→ squealingcode joined21:35
← squealingcode left21:35
← LiENUS left21:36
→ user_____ joined21:38
→ LiENUS joined21:39
← junyx left21:41
→ cluelessperson joined21:43
→ hritik joined21:43
← Vonter left21:44
← cpackham left21:48
← off^ left21:49
→ off^ joined21:49
Ali_nz Anyone here want to talk about git / github? I am interested in the way commits between the two systems are tracked. They both seem to have UIDs for each commit - are they the same UIDs across both systems??21:49
← hritik left21:50
j416 Ali_nz: github is a hosting service for git repositories.21:51
Ali_nz: git is software for your local computer21:51
→ cpackham joined21:51
j416 Ali_nz: you can put your git repository on github if you want, the "UID"s (we call them commit hashes) stay the same.21:52
→ delay joined21:58
circuitbone Ali_nz: yonks back I mentioned having a test_all_the_things repo. did you set it up by chance?21:59
it helps answer lots of issues faster than irc daily cycle time loop22:00
← PlasmaHH left22:01
← cpackham left22:02
→ hritik joined22:03
← visualshock left22:05
← thiago left22:07
← hritik left22:08
← user_____ left22:09
→ ferdna_ joined22:10
→ cpackham joined22:10
← LiENUS left22:12
← ferdna left22:12
← fonini left22:14
← pvxe left22:17
→ pvxe joined22:17
→ LiENUS joined22:17
→ hritik joined22:18
← Ali_nz left22:22
→ user_____ joined22:24
← hritik left22:25
← pedahzur left22:26
→ Guest88_ joined22:26
← Guest88_ left22:27
→ cdown joined22:30
→ rinkydink joined22:35
← tirnanog left22:38
→ hritik joined22:38
→ mailman joined22:43
← hritik left22:44
← joako left22:49
→ hritik joined22:58
← ferdna_ left22:59
← hritik left23:03
← cmdrtallen left23:03
← vysn left23:04
→ cmdrtallen joined23:05
→ karabaja4 joined23:07
→ joako joined23:08
← cdown left23:08
← aminvakil left23:14
→ hritik joined23:15
→ aminvakil joined23:16
← delay left23:19
← hritik left23:19
← mailman left23:20
← user_____ left23:21
← ash_worksi left23:23
→ ash_worksi joined23:25
→ shabius joined23:27
← xx left23:40
→ junyx joined23:41
→ hritik joined23:50
→ mailman joined23:54
← hritik left23:58

Logs Search ←Prev date Next date→ Channels Documentation