IRCloggy #git 2022-06-25

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.

2022-06-25

← dsrt^ left00:00
← fairuz left00:00
← andreas303 left00:01
← pyevery__ left00:04
→ w0ng joined00:06
→ fairuz joined00:14
→ tcurdt joined00:17
→ andreas303 joined00:18
→ bambanxx joined00:18
rewt OnlineCop, i've done that a few times: `vimdiff <( git diff aaaa bbbb ) <( git diff cccc dddd )` # but if you only want to compare the diffs of bbbb and dddd... if you want to include aaaa, use `aaaa^ bbbb` (and similarly for cccc)00:21
← bambanxx left00:22
OnlineCop Looks like what I'm after. Thanks, rewt!00:28
→ ProperN[out] joined00:29
williewillus1 → williewillus00:29
← ProperNoun left00:30
→ Murr- joined00:31
← Murr left00:32
Murr- → Murr00:32
← Yruama left00:33
→ rgrinberg joined00:36
← Rashad left00:40
← rgrinberg left00:42
→ gast0n joined00:42
← ripdog left00:44
→ ripdog joined00:47
← tcurdt left00:56
← fairuz left00:56
→ rgrinberg joined00:57
← andreas303 left00:57
→ CaCode_ joined01:02
← CaCode left01:04
→ realies5 joined01:07
← realies left01:08
realies5 → realies01:08
← vdamewood left01:13
← farzat left01:13
← rgrinberg left01:15
→ tcurdt joined01:15
→ farzat joined01:16
→ rgrinberg joined01:19
→ fairuz joined01:19
→ farzat1 joined01:24
← farzat left01:25
→ andreas303 joined01:25
← Sasazuka left01:25
→ junebug joined01:26
← mgedmin left01:30
→ geosmile joined01:31
→ mgedmin joined01:33
→ zumba_addict joined01:43
→ thiago joined01:44
zumba_addict Hi all. I have a pull request that I want to close. It's because there are many commits that I made where I don't like the messages. I want to create a new merge request with the original first message I created. What's the best approach?01:45
rewt you can probably just change the message(s) in your fork and force push, and as long as it's the same branch the PR should pick it up... but that may be a question for ##github01:49
← jazzy left01:50
zumba_addict gotcha01:50
or squash will work too right?01:51
→ jazzy joined01:51
zumba_addict it's just that I have to find my notes for squashing, I always forget it, haha01:51
← jazzy left01:52
← umbramalison left01:55
← gas51627 left01:55
→ umbramalison joined01:56
→ [RiFo] joined02:00
← CaCode_ left02:02
→ finn_elija joined02:17
← FinnElija left02:17
finn_elija → FinnElija02:17
→ nate4 joined02:27
→ leib joined02:30
← fling left02:31
→ realies8 joined02:32
← realies left02:32
realies8 → realies02:32
← EvilDMP left02:40
→ fling joined02:41
→ cvmn joined02:41
← tyson2 left02:43
← leib left02:48
← nate4 left02:51
← rgrinberg left02:57
→ haasn joined03:01
→ tirnanog joined03:03
→ CaCode_ joined03:03
→ leib joined03:04
→ jazzy joined03:04
→ CaCode- joined03:06
← money left03:07
→ money joined03:07
→ igemnace joined03:08
← ferdna left03:09
← CaCode_ left03:09
← igemnace left03:10
→ GNUmoon joined03:10
→ dsrt^ joined03:10
→ Sasazuka joined03:11
→ igemnace joined03:11
→ rootsghost joined03:12
← rootsghost left03:13
← gxt left03:14
← money left03:15
→ gxt joined03:15
← Sasazuka left03:15
← leib left03:20
← pulse left03:22
← zumba_addict left03:24
← sidy left03:25
→ money joined03:29
← magic_ninja left03:34
→ magic_ninja joined03:35
→ nate4 joined03:48
→ hasley joined03:53
← nate4 left03:54
← makara- left04:08
← ChmEarl left04:13
← geosmile left04:21
← cbreak left04:23
→ makara joined04:23
→ makara1 joined04:23
→ cbreak joined04:25
→ nate4 joined04:26
← nate4 left04:31
← money left04:31
← Albright left04:44
→ Albright joined04:44
← erarnitox left04:47
→ nate4 joined04:47
← igemnace left04:50
← junebug left04:51
→ igemnace joined04:51
→ erarnitox joined04:56
← nate4 left04:58
→ node1 joined04:58
← igemnace left05:02
→ igemnace joined05:02
← bloody left05:13
← gast0n left05:19
← thiago left05:31
← madewokherd left05:33
→ coot joined05:33
← Murr left05:51
→ money joined05:51
→ Murr joined05:51
← igemnace left05:52
← dsrt^ left05:53
→ hoochmonger joined05:55
→ Wh0 joined06:00
→ dsrt^ joined06:00
← great_taste left06:02
← FinnElija left06:03
→ FinnElija joined06:04
← jazzy left06:06
→ ash_worksi joined06:09
← money left06:37
→ theoceaniscool joined06:37
← reset left06:40
→ hex_ joined06:45
← node1 left06:46
→ FH_thecat joined06:47
→ feriman joined06:48
← cvmn left06:50
← hex_ left06:51
→ mattil joined06:53
→ Guest25 joined07:02
← Misotaur- left07:03
→ alfredb joined07:05
← alfredb left07:05
→ alfredb joined07:05
Guest25 8)07:06
anyone there07:07
← Guest25 left07:08
→ Guest25 joined07:08
← Guest25 left07:09
← The_Blode left07:12
← cdown left07:13
← Sulky left07:15
→ EvilDMP joined07:16
→ mbalmer joined07:19
→ skered joined07:21
← erarnitox left07:23
← mattil left07:24
→ Sasazuka joined07:24
← alfredb left07:25
→ erarnitox joined07:28
← Sasazuka left07:29
→ Murr- joined07:30
← Murr left07:33
Murr- → Murr07:33
← skapata left07:38
→ Misotauros joined07:42
→ The_Blode joined07:43
→ vitali64 joined07:48
→ Murr- joined07:48
← Murr left07:51
Murr- → Murr07:51
→ zeenk joined07:53
→ MiguelX4137 joined07:59
← MiguelX4137 left07:59
← MiguelX413 left08:01
→ MiguelX413 joined08:01
← j416 left08:04
← The_Blode left08:07
→ The_Blode joined08:09
→ kenanmarasli joined08:10
→ iomari891 joined08:12
→ Sasazuka joined08:13
→ dionysus69 joined08:14
← Sasazuka left08:18
→ jazzy joined08:25
→ Murr- joined08:25
→ jazzy2 joined08:26
← jazzy2 left08:26
→ jazzy2 joined08:27
← Murr left08:27
Murr- → Murr08:27
← jazzy left08:30
← OnkelTem left08:34
→ OnkelTem joined08:34
← hamburgler left08:34
jazzy2 → jazzy08:36
← vitali64 left08:39
→ vitali64 joined08:41
← coot left08:46
→ gurkenglas joined08:48
← The_Blode left08:55
→ The_Blode joined08:56
← dsrt^ left08:57
→ rLapz joined08:59
← rLapz left09:01
→ gas51627 joined09:02
← The_Blode left09:05
→ The_Blode joined09:06
→ ramblebamble joined09:10
→ alfredb joined09:18
← alfredb left09:18
→ alfredb joined09:18
← m1dnight left09:21
→ zPlus joined09:22
→ m1dnight joined09:23
zPlus when I use git send-email, it sends an email for every commit. For 10 commits, it's 10 emails. How can I group all 10 commits into a single patch and send only one email?09:23
ikke squash those commits in a single commit09:24
git relies on one e-mail per patch because the e-mail contains metadata for that commit09:26
→ vdamewood joined09:26
← Betal left09:26
← FinnElija left09:28
→ FinnElija joined09:29
bookworm it's also threaded... so any sane MUA can modify the whole thread as one thing anyhow, so don't worry09:31
← Wh0 left09:34
zPlus should I do git rebase -i <from-here> and then send the resulting commit?09:36
→ Swahili joined09:38
← zeenk left09:39
→ Sasazuka joined09:39
ikke git rebase -i <base>09:42
zPlus thank you a lot09:42
→ X-Scale` joined09:43
← Sasazuka left09:45
← X-Scale left09:45
X-Scale` → X-Scale09:45
→ coot joined09:48
→ mitrokov joined09:51
← gurkenglas left09:51
← alfredb left09:58
← ramblebamble left10:01
← makara1 left10:07
→ makara1 joined10:08
→ Sasazuka joined10:14
bremner you can also output to an mbox and attach that to your mail10:18
(--stdout iirc)10:18
← CYKS left10:19
← Sasazuka left10:19
→ Wh0 joined10:30
→ pretty_dumm_guy joined10:30
→ nate4 joined10:30
→ antani joined10:32
← f-a left10:38
→ G30RD13 joined10:39
← nate4 left10:40
→ Guest64 joined10:41
← vishal left10:50
← jazzy left10:51
→ vishal joined10:52
→ reset joined10:53
← coot left10:53
→ Narrat joined10:58
← Guest64 left10:59
← EvilDMP left11:03
→ Sasazuka joined11:03
← Sasazuka left11:07
← G30RD13 left11:09
→ node1 joined11:13
← GNUmoon left11:21
→ GNUmoon joined11:23
← FinnElija left11:26
→ FinnElija joined11:28
← kenanmarasli left11:30
← Wh0 left11:31
→ alfredb joined11:33
← alfredb left11:33
→ alfredb joined11:33
← lllh left11:38
→ EvilDMP joined11:46
→ tyson2 joined11:50
← Murr left11:51
→ Murr joined11:51
← crabbedhaloablut left11:52
→ rgrinberg joined11:52
→ crabbedhaloablut joined11:53
← cbreak left11:54
→ X-Scale` joined11:54
← X-Scale left11:55
X-Scale` → X-Scale11:55
← antani left11:56
← rgrinberg left12:01
→ money joined12:02
→ Murr- joined12:04
← Murr left12:05
Murr- → Murr12:05
→ coot joined12:05
← node1 left12:07
← gas51627 left12:07
← mbalmer left12:09
→ rgrinberg joined12:12
→ cbreak joined12:14
← thebombzen left12:15
→ llh joined12:26
→ G30RD13 joined12:27
→ Sasazuka joined12:27
→ ethrl_ joined12:28
← chexum left12:30
→ zeenk joined12:30
→ chexum joined12:31
← Sasazuka left12:32
← rgrinberg left12:34
← GNUmoon left12:35
→ pulse joined12:37
→ GNUmoon joined12:38
← indy left12:46
← The_Blode left12:53
→ indy joined12:54
← alfredb left12:58
→ dsrt^ joined12:58
→ KBar joined13:00
→ nate4 joined13:01
KBar i cloned. made changes in local repo, did `git commit -a`. now id like to push it to a completely new branch on the remote, how do i do that? it errors out: src refspec new/branch does not match any13:01
→ rgrinberg joined13:04
← nate4 left13:08
← money left13:08
→ The_Blode joined13:08
→ otisolsen70 joined13:11
KBar ah, `git push origin my-feature:feature` did the trick. source: https://devconnected.com/how-to-push-git-branch-to-remote/13:11
← G30RD13 left13:14
← KBar left13:17
→ money joined13:19
← zPlus left13:22
← dsrt^ left13:22
← FH_thecat left13:24
← tirnanog left13:27
← zeenk left13:29
→ kmerfeld joined13:33
→ dsrt^ joined13:34
kmerfeld Is there a way I can have git track just part of a file? I'd like to track my music collection in it, I don't care about the music data, just the filenames/tags some md5hash13:35
← dsrt^ left13:35
← fairuz left13:35
← andreas303 left13:36
← tcurdt left13:36
ikke Not without leaving files that only have the metadata afaik13:36
← GNUmoon left13:37
kmerfeld I guess It would be fine to generate that. Its probably simpler than whatever I would have tried to do. thanks!13:37
→ GNUmoon joined13:38
← rgrinberg left13:41
← EvilDMP left13:41
← cbreak left13:44
→ cbreak joined13:46
→ EvilDMP joined13:49
→ sidy joined13:50
← vdamewood left13:52
→ fairuz joined13:53
→ tcurdt joined13:55
→ thebombzen joined13:56
→ dig joined13:57
← fairuz left13:59
← tcurdt left13:59
← Ram-Z left14:00
→ Ram-Z joined14:02
→ Sasazuka joined14:10
→ Lunatrius joined14:11
← Sasazuka left14:15
→ gast0n joined14:16
← szkl left14:20
→ ChmEarl joined14:26
→ han-solo joined14:26
→ great_taste joined14:28
← DaNeenjah left14:30
→ arescorpio joined14:33
→ rgrinberg joined14:36
← feriman left14:36
ethrl_ → ethrl14:36
ethrl → Spirit14:37
Spirit → Ethrl14:37
← money left14:46
→ money joined14:48
← sidy left14:49
← moldorcoder7 left14:50
→ squirrel joined14:51
← mitrokov left14:55
← CaCode- left14:58
← very_sneaky_ left15:05
→ thiago joined15:05
← money left15:09
→ mitrokov joined15:10
hasley → mahler15:11
→ money joined15:12
→ very_sneaky_ joined15:14
→ m0viefreak joined15:16
← arescorpio left15:16
← Misotauros left15:16
← coot left15:18
→ hamburgler joined15:21
→ ShenMian joined15:23
← ShenMian left15:24
→ G30RD13 joined15:25
→ nate4 joined15:25
→ coot joined15:28
← dig left15:31
bremner kmerfeld: I do something like that with photo files, but the software I'm using supports seperate xmp "sidecar" files15:31
← coot left15:36
← jlc left15:38
← Narrat left15:39
← jab416171 left15:41
→ jlc joined15:41
← Ethrl left15:43
→ sidy joined15:44
← money left15:45
→ jab416171 joined15:45
→ money joined15:46
→ pgimeno joined15:48
pgimeno how do I remove ambiguous tags from a remote repository? should I use git push --tags -d <tag>?15:51
ikke refs/tags/<tagname>15:53
money → Polo15:54
pgimeno ike: with or without --tags?15:54
Polo → money15:54
money → polo15:54
ikke without15:55
→ alfredb joined15:55
← alfredb left15:55
→ alfredb joined15:55
pgimeno ah thanks15:55
→ Murr- joined15:56
← tyson2 left15:57
← Murr left15:57
Murr- → Murr15:57
← m0viefreak left15:58
← riposte left16:00
→ jinsun__ joined16:00
jinsun → Guest252816:00
← Guest2528 left16:00
jinsun__ → jinsun16:00
← polo left16:00
→ riposte joined16:02
→ geosmile joined16:13
← EvilDMP left16:19
→ EvilDMP joined16:20
→ Misotauros joined16:23
← sidy left16:29
→ Polo joined16:31
Polo → polo16:31
← polo left16:31
→ CaCode joined16:37
← jlc left16:38
→ CaCode_ joined16:39
← CaCode left16:42
← nate4 left16:45
→ junebug joined16:46
← cbreak left17:06
← cluelessperson_ left17:09
→ cluelessperson joined17:10
→ cbreak joined17:11
→ coot joined17:15
← adanwan left17:20
→ adanwan joined17:22
→ mrcoffee joined17:26
mrcoffee Hi17:26
Im editing a readme file in the git repository..17:27
Im putting that command curl -X POST -F "file=@filename" http://localhost:9000/upload-csv17:27
as info, documentation..17:27
What is the correct format for the filename placeholder, meaning filename could be any file the user chooses..17:28
like: <filename> or "filename" or 'filename'17:28
→ DibbTubberOne joined17:30
← DibbTubberOne left17:30
→ DibbTubberOne joined17:30
← coot left17:31
→ nate4 joined17:32
mrcoffee Ok, worked out readme.md is markdown, so i used: *`FILENAME`*17:33
Also, just to be sure.. Does this git channel apply to github?17:33
← geosmile left17:36
← nate4 left17:37
← junebug left17:38
← sa0 left17:39
→ sa0 joined17:39
← sa0 left17:39
bremner !github17:39
gitinfo GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features17:39
bremner sigh.17:39
anyway, there is ##github, which is more appropriate, but less busy17:40
→ sa0 joined17:41
→ kenanmarasli joined17:42
→ jlc joined17:44
→ tyson2 joined17:46
→ coot joined17:46
→ nate4 joined17:50
← Murr left17:51
→ Murr joined17:51
← pgimeno left17:51
→ Polo joined17:52
← tyson2 left17:52
mrcoffee Ok, thanks bremner.. Are there other options that you would recommend?17:52
bremner alternatives to github?17:53
mrcoffee Yes17:53
bremner !github alternative17:53
gitinfo GitHub is a !3rdparty commercial service offering freemium !hosting services for repositories & projects. https://github.com/features17:53
bremner grr. the bot hates me17:54
ikke It only knows single word commands17:54
bremner !hosting17:54
gitinfo There are many hosting options available for git repositories, including !github !gitlab !gitolite and many more: https://git.wiki.kernel.org/index.php/GitHosting17:54
nedbat mrcoffee: hy do you need an alternative to github? (not saying you don't, just would help us help you)17:54
*why17:54
mrcoffee Just wondering.17:55
Like the other day I used pastebin and was told its not cool anymore, was wondering if it was the same with github and there were better alternatives17:56
mackerman Every hosting service has their pros and cons, like everything else.17:56
Try some yourself and evaulate them.17:56
→ Sulky joined17:57
ikke github is still the most commonly used17:57
gitlab is an alternative, as well as bitbucket and codeberg17:57
and sr.ht, which is built around mailing list workflows17:59
← nate4 left17:59
mackerman Or Googe or Azure or AWS18:00
* Google Compute Platform18:00
← coot left18:01
→ chronon joined18:03
Polo → polo18:03
← polo left18:03
← gildasio left18:04
← squirrel left18:05
→ gildasio joined18:06
→ tyson2 joined18:09
← hoochmonger left18:12
← tyson2 left18:13
foo Is there a way to show git blame-like info during a git diff? Hmph.18:15
→ skapata joined18:16
← skapata left18:16
→ skapata joined18:16
← Celeo left18:16
← thebombzen left18:17
→ Celeo joined18:23
→ ferdna joined18:27
→ zumba_addict joined18:27
→ tyson2 joined18:29
← han-solo left18:29
← EvilDMP left18:29
← chronon left18:29
← DibbTubberOne left18:30
← txtsd left18:31
← Swahili left18:32
→ Polo joined18:32
→ feriman joined18:32
→ Swahili joined18:32
→ talismanick joined18:35
talismanick GitLab doesn't much like it when I substitute "ssh://git@gitlab.com/" with `insteadOf = https://gitlab.com/`18:36
another| how do you expect that to work? and to show what?18:36
→ sidy joined18:36
→ txtsd joined18:36
talismanick another|: What do you mean? `[url "ssh://git@github.com/"] \n insteadOf = https://github.com` is a template that works for every other forge18:37
to use SSH for remote git ops instead of HTTPS18:37
← G30RD13 left18:38
→ tia_ joined18:38
talismanick anyways, if I dropped the protocol prefix "ssh://" in the command line, it works, but I think I should have something there for posterity's sake in a config file18:39
another| talismanick: that was not directed at you18:40
talismanick oh18:40
← sidy left18:40
another| though i suspect path issues18:41
maybe ssh://git@gitlab.com/./18:41
talismanick "cloning into repo", ssh fingerprint miscellaneous, and then https://0x0.st/oSeJ.txt18:43
(adding the ./ doesn't change it)18:43
→ madewokherd joined18:43
← Jenna16bit left18:48
← Swahili left18:51
→ Swahili joined18:51
→ andreas303 joined18:53
→ fairuz joined18:55
← ferdna left18:55
→ opow242 joined18:57
← opow242 left18:57
→ Wh0 joined18:59
→ tcurdt joined18:59
→ powftw joined19:02
← theoceaniscool left19:03
→ nate4 joined19:05
← tia_ left19:07
→ sidy joined19:08
← tyson2 left19:10
← talismanick left19:11
← nate4 left19:11
→ coot joined19:12
← Swahili left19:15
→ Swahili joined19:16
→ talismanick joined19:16
← coot left19:30
→ zeenk joined19:35
← elastic_dog left19:40
→ elastic_dog joined19:46
← talismanick left19:53
→ talismanick joined19:53
← sidy left19:55
← txtsd left19:56
← Polo left19:58
→ tulpa_ joined19:59
← zumba_addict left19:59
→ zumba_addict joined20:06
← talismanick left20:09
← iomari891 left20:14
→ EvilDMP joined20:16
← tulpa_ left20:18
→ coot joined20:20
→ tyson2 joined20:21
← KlungelSmurf920 left20:29
← Sulky left20:30
→ V__ joined20:33
← vitali64 left20:34
← Wh0 left20:35
→ KlungelSmurf920 joined20:35
→ Polo joined20:39
← Polo left20:40
← coot left20:40
→ Polo joined20:43
← V__ left20:48
→ jazzy joined20:52
→ jinsun__ joined20:53
jinsun → Guest978120:53
jinsun__ → jinsun20:53
→ thebombzen joined20:54
← Guest9781 left20:57
→ bloody joined20:58
← otisolsen70 left21:02
→ hbautista_ joined21:04
← hbautista left21:05
← ano left21:06
← berndj left21:11
→ irc_user joined21:12
→ berndj joined21:13
→ Sasazuka joined21:13
← Sasazuka left21:18
← feriman left21:20
← powftw left21:22
← jinsun left21:25
→ jinsun joined21:25
← thebombzen left21:28
← jinsun left21:28
→ nate4 joined21:28
→ jinsun joined21:28
← rgrinberg left21:31
→ trace1918 joined21:32
← nate4 left21:33
← zumba_addict left21:39
← cbreak left21:41
→ ferdna joined21:43
→ cbreak joined21:44
→ Sulky joined21:45
← Polo left21:46
→ Sasazuka joined21:47
→ Polo joined21:49
→ rgrinberg joined21:50
← Murr left21:50
→ Murr joined21:51
← Polo left21:51
← Sasazuka left21:52
→ ano joined21:53
→ cdown joined21:54
← trace1918 left21:55
→ moldorcoder7 joined21:56
→ nate4 joined21:58
→ thebombzen joined21:59
→ solrize joined22:02
← nate4 left22:06
→ arescorpio joined22:12
→ Sasazuka joined22:20
← Sasazuka left22:24
→ BlessJah joined22:24
← mitrokov left22:29
→ mitrokov joined22:29
← mitrokov left22:34
← thiago left22:35
→ mitrokov joined22:37
→ cation joined22:39
← mitrokov left22:41
→ mitrokov joined22:43
← alfredb left22:47
→ gurkenglas joined22:47
→ Sasazuka joined22:53
← mitrokov left22:54
← arescorpio left22:55
→ opow242 joined22:55
→ mitrokov joined22:55
← Sasazuka left22:58
← rgrinberg left23:04
← opow242 left23:07
← sa0 left23:10
→ sa0 joined23:10
← berkay left23:14
← mitrokov left23:14
→ berkay joined23:15
← sa0 left23:16
→ forgotmynick joined23:22
← Lord_of_Life left23:25
← jab416171 left23:25
→ Lord_of_Life joined23:26
→ jab416171 joined23:31
→ mitrokov joined23:31
← RAMIII left23:31
→ tomhg joined23:32
← tomhg left23:36
← cdown left23:36
← xayto_ left23:38
→ TonyStone joined23:39
hexadecagram #git: I attempted a rebase (which succeeded), but I wanted to undo the rebase, so I attempted to do so with `git reset --hard`. `git status` didn't show any modified files, so I attempted to reset to a different point, which didn't show any modified files either. So I reset once more to the point after the rebase, and it *seems* my repo is in the state that it should be in. Here is my reflog:23:39
https://upaste.de/s5Q (all of the resets are --hard, which in hindsight, may not have been the right thing to do). I have a few questions about this: 1a. Will all that is in the reflog, as it stands, end up in the commit log if I `git push`? 1b. Is there any way to clean it up beforehand? 2. Is it even possible at this point to undo the rebase and attempt a merge instead?23:39
→ Polo joined23:40
→ xayto joined23:40
← gxt left23:42
→ gxt joined23:44
← Polo left23:46
hexadecagram The x and y commits diverged (hence the pull --rebase). Pretty sure HEAD@{9}, @{8} and @{6} were `git reset` with defaults (presumably --soft).23:46
Essentially, what I'd like to see is that HEAD@{5} through HEAD, inclusive, never happened. ;-)23:47
← mitrokov left23:48
← Murr left23:50
→ Murr joined23:51
← Swahili left23:57
← skapata left23:59

Logs Search ←Prev date Next date→ Channels Documentation