IRCloggy #git 2022-09-20

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-09-20

→ philipp64 joined00:00
→ hoochmonger joined00:02
→ arescorpio joined00:03
← philipp64 left00:05
→ irc_user joined00:06
→ jole joined00:08
→ arch_angel joined00:11
→ philipp64 joined00:15
← szkl left00:29
→ dsrt^ joined00:31
← n1terr0rs left00:32
→ n1t3rr0r5 joined00:32
← tcurdt left00:33
← andreas303 left00:33
← magga left00:33
← n1t3rr0r5 left00:38
→ Xenguy_ joined00:44
← Xenguy left00:47
← blaklistd left00:49
→ n1t3rr0r5 joined00:49
→ blaklistd joined00:50
← rama left00:51
← KillerWasp left00:51
→ rama joined00:51
← blaklistd left00:57
→ jetchisel joined00:59
→ blaklistd joined00:59
← n1t3rr0r5 left01:06
→ n1t3rr0r5 joined01:07
→ tcurdt joined01:09
→ HRHF joined01:10
← Colere left01:10
→ Colere joined01:11
← madewokherd` left01:12
→ Furor joined01:13
← umbramalison left01:14
→ umbramalison joined01:15
← nyah left01:15
← Colere left01:16
← gsi left01:20
→ n1ghterr0rs joined01:20
→ gsi joined01:21
← n1t3rr0r5 left01:22
→ n1ght3rr0r5 joined01:24
← nighterrors left01:25
→ magga joined01:27
→ andreas303 joined01:28
← hoochmonger left01:36
→ lucasta joined01:38
← arescorpio left01:45
← HRHF left01:45
← n1ghterr0rs left01:46
→ n1ghterr0rs joined01:47
→ micmanos joined01:56
← aidalgol left01:58
→ StarlitMantis joined01:59
→ aidalgol joined01:59
← gas51627 left02:00
← thiago left02:01
← dviola left02:11
Xenguy_ → Xenguy02:11
→ thiago joined02:12
← micmanos left02:15
← irc_user left02:15
→ irc_user joined02:16
← hans_ left02:20
← Visne left02:36
→ junebug joined02:39
← FinnElija left02:39
→ finn_elija joined02:39
finn_elija → FinnElija02:39
→ rgrinberg joined02:41
← rama left02:41
→ niterrors joined02:41
← n1ghterr0rs left02:44
pflanze_ → pflanze02:45
→ loggervicky joined02:45
→ Visne joined02:50
← niterrors left02:53
→ niterrors joined02:54
← lucasta left02:57
← loggervicky left03:00
→ vdamewood joined03:02
→ vinleod joined03:04
← vdamewood left03:05
vinleod → vdamewood03:05
→ luffy joined03:06
→ bambanxx joined03:12
→ loggervicky joined03:13
← bn_work left03:22
← very_sneaky left03:22
→ very_sneaky joined03:23
← Murr left03:23
→ Murr joined03:24
← kilobyte_ch left03:24
→ lolok joined03:29
← epony left03:35
← rgrinberg left03:35
→ n1terr0rs joined03:38
→ epony joined03:38
→ kilobyte_ch joined03:39
← bloody left03:39
← niterrors left03:40
← daurnimator left03:46
→ daurnimator joined03:47
← gast0n left03:49
← tyson2 left03:52
← n1terr0rs left03:53
→ n1terr0rs joined03:53
← StarlitMantis left03:54
→ nate2 joined03:54
→ wilsonjholmes joined03:55
← nahcetan left03:55
→ nahcetan joined03:56
← nate1 left03:56
→ rgrinberg joined03:58
← n1terr0rs left04:00
→ n1terr0rs joined04:02
← lolok left04:06
← nate2 left04:08
← bambanxx left04:21
→ vyryls joined04:27
← Cleverness left04:31
← dob1 left04:31
← luffy left04:33
→ nate2 joined04:34
→ igemnace joined04:35
← loggervicky left04:38
← nate2 left04:38
→ dob1 joined04:41
→ maret joined04:45
← rgrinberg left04:46
← maret left04:47
← n1terr0rs left04:54
← junebug left04:55
→ coot joined04:56
→ n1terr0rs joined05:00
→ nate2 joined05:09
→ Sasazuka joined05:11
← nate2 left05:14
← Sasazuka left05:16
← FH_thecat left05:21
→ maret joined05:24
← thiago left05:25
← Xaldafax left05:30
→ otisolsen70 joined05:33
→ n1t3rr0r5 joined05:34
← otisolsen70 left05:34
→ manin891 joined05:34
← n1terr0rs left05:35
← arch_angel left05:35
← irc_user left05:35
→ otisolsen70 joined05:35
→ csm3105 joined05:38
← csm3105 left05:38
→ FH_thecat joined05:46
→ YuGiOhJCJ joined05:48
← maret left05:59
→ srinidhi joined06:01
→ nate2 joined06:02
← n1t3rr0r5 left06:02
→ regedit joined06:03
← skered left06:09
← nate2 left06:09
→ n1t3rr0r5 joined06:11
← moldorcoder7_ left06:12
→ zeenk joined06:16
→ moldorcoder7 joined06:18
← n1t3rr0r5 left06:21
→ n1t3rr0r5 joined06:23
← hbautista left06:24
← otisolsen70 left06:27
→ arch_angel joined06:29
→ nighterrors joined06:29
← extor left06:31
← arch_angel left06:31
← SuperLag left06:31
→ arch_angel joined06:31
← n1t3rr0r5 left06:32
→ dionysus69 joined06:32
→ csm3105 joined06:33
← arch_angel left06:34
→ arch_angel joined06:34
← arch_angel left06:34
← srinidhi left06:39
← nighterrors left06:42
→ nighterrors joined06:44
→ lgc joined06:47
← lgc left06:50
← skapata left06:50
← piwu left06:53
→ piwu joined06:53
→ MajorBiscuit joined06:53
← barometz left06:57
→ hans_ joined06:58
→ barometz joined06:59
← gildasio left07:00
→ micmanos joined07:00
micmanos → micmanos_AFAIK07:00
→ gildasio joined07:00
micmanos_AFAIK → micmanos07:02
← micmanos left07:03
→ rfuentess joined07:08
→ nate2 joined07:09
← nate2 left07:13
← gco left07:21
n1ght3rr0r5 → n1ghterr0rs07:27
→ pretty_dumm_guy joined07:29
← ikwyl6 left07:35
→ vladoski joined07:35
→ ikwyl6 joined07:36
← LuxuryMode left07:38
→ iomari891 joined07:44
→ theoceaniscool joined07:46
→ feriman joined07:47
→ dante-as joined07:47
← Masklin left07:54
← nighterrors left08:00
→ nighterrors joined08:02
← YuGiOhJCJ left08:08
← chexum left08:08
← kevr_ left08:08
→ srinidhi joined08:08
→ clime joined08:08
→ chexum joined08:08
← daurnimator left08:09
→ YuGiOhJCJ joined08:09
→ kevr joined08:09
→ skered joined08:17
← skered left08:18
→ cousteau joined08:19
→ skered joined08:19
← skered left08:19
← YuGiOhJCJ left08:19
cousteau What's going on with Google? I can't find the mailing list email I wrote about the bug with git rm --cached08:19
→ YuGiOhJCJ joined08:19
cousteau Either the mailing list was deindexed or I'm the worst at googling stuff08:20
→ skered joined08:20
← skered left08:20
→ skered joined08:22
← skered left08:22
→ skered joined08:23
← skered left08:23
→ john_johnk joined08:24
← Misotauros left08:25
→ skered joined08:25
← skered left08:25
→ skered joined08:26
← skered left08:27
→ skered joined08:28
← skered left08:28
← srinidhi left08:29
→ skered joined08:30
← vyryls left08:30
← skered left08:30
→ Masklin joined08:30
← john_johnk left08:31
→ skered joined08:32
← nighterrors left08:36
→ nighterrors joined08:37
→ enoq joined08:39
→ palasso joined08:40
osse have you tried searching here: https://public-inbox.org/git08:43
→ ProperN[out] joined08:48
← ProperNoun left08:48
→ Misotauros joined08:49
→ daurnimator joined08:49
→ n1ght3rr0r5 joined08:56
← nighterrors left08:58
← Betal left08:58
→ eroux joined08:59
→ tulpa_ joined09:02
← n1ght3rr0r5 left09:04
→ n1ght3rr0r5 joined09:06
→ gas51627 joined09:06
→ rapiz joined09:06
→ srinidhi joined09:10
← tulpa_ left09:12
→ Swahili joined09:13
→ vyryls joined09:14
→ arch_angel joined09:17
← rapiz left09:18
→ otisolsen70 joined09:19
← travisghansen left09:22
→ travisghansen joined09:23
← jrm left09:25
← srinidhi left09:27
→ jrm joined09:30
← rfuentess left09:33
← dante-as left09:34
→ vlado_ joined09:35
← vladoski left09:36
→ nyah joined09:37
→ vladoski joined09:38
← vlado_ left09:40
← vyryls left09:45
← cousteau left09:45
→ vyryls joined09:47
→ srinidhi joined09:49
→ szkl joined09:50
→ luffy joined09:54
← vyryls left09:54
→ vyryls joined09:55
opal http://man.9front.org/4/gitfs hm wonder how easy it would be for me to just have bare repos entirely and cause checkouts just to serve a virtual (CoW) fs so i can just deduplicate some data on-disk09:56
← luffy left09:56
opal or if there are efforts to that end09:57
well outside of plan909:57
→ luffy joined09:57
→ xx joined09:57
← dvanloon9 left10:00
← bgs left10:00
Walex opal: not clear what you mean here, but in principle a bare repo is just a collection of blobs, they can contain anything. You can have a single repo with blobs from many upstream repos for example. For example I use that to "deduplicate" various forks of the Linux kernel.10:01
→ dvanloon9 joined10:02
← vyryls left10:03
→ rapiz joined10:03
← rapiz left10:04
→ tulpa_ joined10:04
→ pulse joined10:08
→ Jong joined10:09
Jong Is it rude to write "fix" in a commit message?10:09
Marmotte "fix" alone is not self explaining what the commit fixes10:10
arch_angel → arch-angel10:10
← coot left10:14
nedbat Jong: it depends on the repo. Is it your own, and no one else will be looking, and you don't mind being confused in six months? go for it. Otherwise, write a real message.10:16
Jong not fix alone. I mean "Fix learning rate scheduler."10:16
→ soman joined10:17
nedbat Jong: why would it be rude to use the word "fix"?10:17
Jong I don't want to cross across as emphasizing that someone caused something to break and that I'm pointing fingers10:17
nedbat Jong: i think it's fine to fix things, and to say that you fixed them.10:17
Jong imagine someone's commit message is "Add learning rate schedular."10:18
And after, you write "Fix learning rate scheduler."10:18
→ vyryls joined10:18
Jong without the period. git messages shouldn't have periods :-)10:18
selckin fix ISSUE-324 learning ate scheduler10:18
← alfredb left10:18
← pulse left10:18
→ cousteau joined10:19
selckin i'm sure its still not entirely fixed10:20
cousteau osse: I searched the mailing list (lore.kernel.org) and found it, actually I found a mail that linked to it, but just searching for the issue / description in Google turned up nothing. I recall it used to be possible10:20
← YuGiOhJCJ left10:26
cousteau https://www.google.com/search?q=%22Removing+a+submodule+with+--cached+doesn%27t+stage+changes%22 says "0 results". I had never seen Google say anything had "0 results".10:28
→ vitali64 joined10:30
← cousteau left10:30
← adanwan_ left10:30
→ adanwan joined10:31
→ cousteau joined10:31
selckin google reported you to the fbi and redacting all your content10:31
← otisolsen70 left10:32
cousteau I wouldn't be surprised10:32
selckin ipv6 users can't be trusted10:32
→ pulse joined10:34
cousteau I tried switching to mobile data to see if it was something along those lines, but the only thing that did was disconnect me from irc >:(10:34
ikke "Your search - "Removing a submodule with --cached doesn't stage changes" - did not match any documents."10:34
same for me10:34
cousteau The thing is that those mails seem to have been wiped from Google... Maybe because they were old and nothing linked to them, so Google forgot about them?10:35
ikke duckduckgo has 1 result10:36
opal Walex basically i'd just like to experiment with the design approach, to eliminate the distinction between "normal" and bare repos, and to ideally clean up git's design a bit, because that distinction doesn't really make sense when you could just "mount" a git repo and work with it from there10:37
the filesystem driver could be lazy and only checkout what's accessed by the fs10:38
duckduckgo results just get worse10:38
→ mustardrat joined10:38
→ Major_Biscuit joined10:38
opal Jong i have tried getting into the habit of writing commit messages like emails10:39
← tcurdt left10:39
opal you have your short subject and your long rationale10:39
do it like you'd be sending someone this PR via email10:39
← vyryls left10:40
nedbat Jong: it might seem less rude if your message is more specific. The whole feature isn't broken, just one aspect needs improvement.10:40
← magga left10:40
opal if you're lazy and it's a personal repo, at least go for a descriptive enough subject10:40
bremner alas, few people actually know how to send an email these days10:40
opal it's a writing skill10:40
bremner so commit messages look like SMS10:40
or facebook messanger10:41
nedbat but at least we can have emoji in them!!1! :(10:41
← andreas303 left10:41
opal what's worse is when i see autocommits in e.g. ebuild overlays that don't even specify what they're adding/bumping/removing10:41
at least give me "bump foo to 1.2.3"10:41
→ vyryls joined10:42
→ tyson2 joined10:42
cousteau I remember the imagemagick repo had ALL commits with the message "..."10:43
opal that just ain't right10:44
Jong nedbat nah, the entire feature is broken accept for the line specifying the parse arg name.10:44
opal that's an overhaul of logic then10:44
possibly10:44
specify that if it fits10:44
Jong "Fix learning rate scheduler logic." better?10:44
cousteau (They no longer seem to do that, but they did back in the day)10:45
opal it sounds like a rewrite, not a fix10:45
"fix" is just imprecise here10:45
← mustardrat left10:45
selckin Jong: best thing is to check the log of previous commits and follow whats normal for that repo10:45
Jong how so?10:45
opal if you rewrote the feature, it's a rewrite10:45
if you fix the feature, it could be anything from 1 line to 100, and you dont know that in your git-log10:46
Jong no, the feature wasn't written right in the first place. The code doesn't do anything correct10:46
opal so it's a rewrite10:46
open `git log` for yourself and see how sparse the info is, that you get back10:46
you get summary, description, committer, date10:46
that's the info you're working with10:46
you don't get any diffs here10:47
so you don't know how big the commit is10:47
without using something other than git-log10:47
git-log is for humans10:47
Jong So when do you use the word fix? Every fix is a delete only, add only, or a "rewrite" (delete and add) of code10:47
opal you probably don't use the word fix in most cases, if there's a more-precise word for it10:47
i'd "fix" bug #12310:47
Rewrite code logic, fixes such-and-such10:48
← vyryls left10:48
→ vyryls joined10:48
← Major_Biscuit left10:48
Jong Do you exclude the word "the" from git messages, even if it makes you sound very choppy?10:51
ikke I do most of the time10:51
opal "the " is 4 extra characters that i could be using for something better10:51
cousteau A commit title is like a newspaper headline10:52
opal brevity has always been common in dev; in commits, in changelogs, in bug reports10:52
cousteau It's like pseudocode for what the commit does10:52
opal we talk a lot with computers and don't like to spend much time on humans, when we do dev10:52
Jong Without "the", it sounds like someone who just learned english or something. You know what I mean? I guess that's the tradeoff10:52
cousteau Then the commit body is more readable10:53
opal the best devs know english well enough to know they can have "artistic licence" to omit10:53
it's a different medium10:53
it isn't a book10:53
i still use oxford commas despite all this10:53
missing those actually throws me off hard, which is why i dont really read news10:54
→ J_Darnley joined10:54
opal well, for other reasons too10:54
selckin we can all see you're special no worries10:54
opal you're the only one here making it out to be an ego thing. i'm giving advice10:55
J_Darnley Is there a shortcut for referencing the upstream a branch is branched from?10:55
opal based off my experience, sorry if that relation to myself offends you10:55
cousteau I mean, have you ever read a newspaper headline in English? It's always like "Man bitten by crocodile in arm, leg"10:55
J_Darnley something like UPSTREAM_HEAD?10:55
opal origin/HEAD?10:55
J_Darnley Probably not because the repo isn't "origin"10:56
cousteau Not "A man was bitten by a crocodile on his arm and leg"... Basically cramming as much info in as few words as possible10:56
opal oh you want something general? sorry10:56
i don't know then10:56
J_Darnley thanks but yeah10:56
cousteau (the removal of "and" in headlines particularly annoys me)10:57
opal we have &10:57
cousteau Yeah but they don't use it10:57
They use a comma instead10:57
selckin J_Darnley: @{u} i believe10:57
J_Darnley selckin: thank you very much10:59
I doubt I'll remember that11:00
← enoq left11:00
J_Darnley lol11:00
at brace u brace11:00
cousteau Also, back to the commit message format; it is usual to use imperative in the title and past tense in the description, like "Fix figure alignment" - "Fixed the alignment of figures in documents containing blah blah blah..."11:01
nedbat cousteau: headline writing has traditions based on limited-width columns11:01
cousteau Which I guess also applies to "commit titles should be limited to 50 characters"11:02
← Harzilein left11:03
cousteau (otherwise, vim will highlight the extra characters differently, and GitHub will lecture you about proper titles being concise, oh no!)11:03
→ tcurdt joined11:09
→ magga joined11:10
→ nate2 joined11:10
→ andreas303 joined11:11
opal who recommends 50? always heard 72 myself11:14
← FinnElija left11:15
→ finn_elija joined11:15
finn_elija → FinnElija11:15
← hans_ left11:15
← nate2 left11:15
← vyryls left11:15
← vladoski left11:16
← Xenguy left11:17
→ vladoski joined11:17
← terrorjack left11:17
→ terrorjack joined11:18
cousteau opal: 50 for the title, 72 for the rest of the lines11:20
opal i've heard 72/8011:20
and default vim config seems to do this11:20
cousteau Then again, I've heard suggestions that 50 is the minimum11:20
→ vyryls joined11:20
opal that may be it yeah11:20
cousteau Huh? It does? Pretty sure it stops highlighting after the 50th title char11:21
opal nvim wowaname@mahin> find . -name *git* -exec grep 72 {} +11:21
./runtime/ftplugin/gitcommit.vim:setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=7211:21
huh11:21
← ghost43_ left11:21
cousteau And breaks lines when they reach 73 chars11:21
← relight left11:21
opal ok you're right, my apologies11:22
→ relight joined11:22
cousteau 72 chars as a width limit is common because of terminals and emails11:22
opal yeah because email likes 72 character capoff to adjust for quoting11:22
ok carry on :p11:22
closing irc before i have more brainfarts, happy tuesday11:23
cousteau Actually what I heard was that there was a git command that prints commit messages indented by 4 chars, so 4+72+4 leaves them beautifully centered in the 80 char terminal11:23
opal: see you!11:23
osse that mystical command sounds like git log11:24
→ ghost43 joined11:24
cousteau Yeah I think that was the one11:24
I just didn't remember which11:25
→ bambanxx joined11:26
Jong What do you call the course of changes that program's source code goes through? "Code evolution?"11:30
← gildasio left11:31
selckin sure, any more context?11:32
→ gildasio joined11:32
Jong I want to say something like: Prioritizing for minimal line changes all the time can cause the code to evolve into problematicness11:33
selckin if its well maintained and improves it matures, and otherwise it rots11:33
Jong it's like a tree that starts growing crooked and before you know it the tree is messed up in ways that's hard to fix11:33
← vitali64 left11:33
← clime left11:34
Furor → Colere11:36
← kevr left11:37
← opal left11:38
→ jole_ joined11:38
← pretty_dumm_guy left11:38
← vyryls left11:38
→ cweiss076532124 joined11:38
→ Noisytoot_ joined11:38
→ BukkitGerman043 joined11:38
← arch-angel left11:38
← ghost43 left11:39
→ kevr joined11:39
← arash left11:39
→ ghost43 joined11:39
← chexum left11:40
← Marmotte left11:40
← moviuro left11:40
← Kemikals left11:40
← kwizart left11:40
→ reinhardt joined11:40
→ torresjrjr_ joined11:40
→ NightMonkey_ joined11:41
→ chexum joined11:41
← phroa left11:41
← goblin left11:41
→ aisa_ joined11:41
← ws2k3 left11:41
← biapy left11:41
→ JeremyD joined11:41
← enimaloc left11:41
→ finalriposte joined11:41
→ mlaga97_ joined11:41
→ nightstrike_ joined11:42
← chymera left11:42
→ opal joined11:42
← berkay left11:42
→ scottgy joined11:42
→ jab416171_ joined11:42
→ nominal_value joined11:43
← nominal_value left11:43
→ nominal_value joined11:43
→ MRDPZK_ joined11:43
← Xat`_ left11:43
→ gjnoonan_ joined11:43
→ flying_sausages_ joined11:43
→ arch_angel joined11:44
→ Quaack joined11:44
← vishal left11:44
→ Kemikals joined11:44
→ Teacup_ joined11:44
→ nomn1 joined11:45
→ philipp64_ joined11:45
← relight left11:46
← nyah left11:46
← travisghansen left11:46
← kilobyte_ch left11:46
← jole left11:46
← Tobbi left11:46
← Fabricio20 left11:46
← nyuszika7h left11:46
← thomas25 left11:46
← tachoknight left11:46
← _sa0_ left11:46
← hexnewbie left11:46
← ag4ve left11:46
← torresjrjr left11:46
← stutz left11:46
← txtsd left11:46
← hwrd left11:46
← tsujp left11:46
← ztrawhcse left11:46
← gjnoonan left11:46
← bagels left11:46
← akelly left11:46
← aminvakil left11:46
← knolle left11:46
← pieguy128 left11:46
← Artea left11:46
← HelloShitty left11:46
← klopsch[m] left11:46
← k-man left11:46
← hepatocyte[m] left11:46
← jcgruenhage left11:46
← yuu[m] left11:46
← riposte left11:46
← jab416171 left11:46
← cronos left11:46
← mthall left11:46
← Rhonda left11:46
← cweiss07653212 left11:46
← LogicAside left11:46
gjnoonan_ → gjnoonan11:46
jole_ → jole11:46
torresjrjr_ → torresjrjr11:46
→ kaichiuchi_ joined11:46
← dka_ left11:46
→ dav1d5 joined11:46
→ tsujp joined11:46
← Lcawte left11:46
→ hrberg_ joined11:46
→ Leonarbro_ joined11:46
→ relight joined11:46
→ moviuro joined11:47
→ Lcawte joined11:48
← Lcawte left11:48
→ Lcawte joined11:48
→ slaughtr joined11:48
← andreas303 left11:49
→ leon_ joined11:49
→ ws2k3 joined11:49
→ theobjec- joined11:49
← pulse left11:51
← luffy left11:51
← ProperN[out] left11:51
← skered left11:51
← Masklin left11:51
← iomari891 left11:51
← barometz left11:51
← csm3105 left11:51
← moldorcoder7 left11:51
← Murr left11:51
← umbramalison left11:51
← dsrt^ left11:51
← jinsun left11:51
← cbreak left11:51
← hqdruxn08 left11:51
← BrianBlaze left11:51
← Lord_of_Life left11:51
← infogulch left11:51
← RiFo left11:51
← makara1 left11:51
← makara left11:51
← vanessa left11:51
← mat001_ left11:51
← berndj left11:51
← hexadecagram left11:51
← Thanzex left11:51
← haskl left11:51
← Natrick left11:51
← tkazi left11:51
← Novi left11:51
← Kangie left11:51
← shokohsc left11:51
← Ingvix left11:51
← Vonter left11:51
← wagle left11:51
← terminaldweller left11:51
← earthbreaker left11:51
← mw_ left11:51
← pmcnabb left11:51
← polyrob left11:51
← germ left11:51
← chimbosonic left11:51
← supernovah left11:51
← foul_owl left11:51
← matt0x6f left11:51
← lord| left11:51
← firewyre- left11:51
← llh left11:51
← jiffe left11:51
← tmz left11:51
← celphi left11:51
← mven left11:51
← taeaad left11:51
← dansan left11:51
← potash left11:51
← avar left11:51
← eqw left11:51
← przemoc left11:51
← karstensrage left11:51
← Dotz0cat left11:51
← littlebuddy left11:51
← Guest1698 left11:51
← nasamuffin left11:51
← mns left11:51
← CYKS left11:51
← corelax left11:51
← transhumanist left11:51
← GingerGeek left11:51
← cyberpear left11:51
← Spr0cket left11:51
← pikapika left11:51
← dslegends left11:51
← Echoz_ left11:51
← BinarySavior left11:51
← hexology left11:51
← ThiefMaster left11:51
← Square left11:51
← Zubin left11:51
← Learath2 left11:51
← Aleksejs left11:51
← hgl left11:51
← ripdog left11:51
← cxreg2 left11:51
← colona_ left11:51
← Chipzz left11:51
← Soliton left11:51
← robink_ left11:51
← barlas left11:51
← nullroute left11:51
← hashworks left11:51
← phryk left11:51
← ZachGibbens left11:51
← Frogging101 left11:51
← robertparkerx left11:51
← JumpinBanana left11:51
← sebastorama_ left11:51
← cfjk left11:51
← Furai left11:51
← ljharb left11:51
← Disconsented left11:51
← mx08 left11:51
← s1b1 left11:51
← ColdKeyboard left11:51
← cation left11:51
← truepassion left11:51
← anddam left11:51
← nomn left11:51
← BinGOs left11:51
← pedrocr left11:51
← cambrian_invader left11:51
← PocketKiller left11:51
← stevet left11:51
← ryjen left11:51
← selckin left11:51
← Kartagis left11:51
← rossome left11:51
← Seveas left11:51
← Riviera left11:51
← infernix left11:51
← parsnip left11:51
← ueberall left11:51
← Jenna16bit left11:51
← gordonfish left11:51
← jsatk left11:51
← soifou left11:51
← reda_ left11:51
← GyrosGeier left11:51
← Vesryn left11:51
← fury__ left11:51
← cozycactus left11:51
← Bilge- left11:51
← edwarnicke left11:51
← ross left11:51
← bjs left11:51
← fdv left11:51
← mattf left11:51
← Spydar007 left11:51
← Thaodan left11:51
← Duns_Scrotus left11:51
← newton left11:51
← kenyon left11:51
← silas left11:51
← redrambles left11:51
← Pr0phet_ left11:51
← chorduser25 left11:51
← BSaboia left11:51
← LadyLioness left11:51
← lf94 left11:51
← Fusl left11:51
← Ekho left11:51
← dzho left11:51
← magga left11:51
← palasso left11:51
← very_sneaky left11:51
← philipp64 left11:51
← TonyStone left11:51
← Noisytoot left11:51
← nivag left11:51
← Xeago left11:51
← Leonarbro left11:51
← BukkitGerman04 left11:51
← bremner left11:51
← analoq left11:51
← lemonsnicks left11:51
← luckman212 left11:51
← wilsonjholmes left11:51
← f451 left11:51
← daru left11:51
← magic_ninja left11:51
← phylaz left11:51
← nominal_value_ left11:51
← Erisa left11:51
← winter left11:51
← mackerman left11:51
← wolfshappen left11:51
← erry left11:51
← mahler left11:51
← ajfriesen left11:51
← dav1d left11:51
← Lunatrius left11:51
← gnoo left11:51
← cabazon left11:51
← Jck_true left11:51
← nightstrike left11:51
← aisa left11:51
← wgrant left11:51
← MRDPZK left11:51
← derfj left11:51
← kyshoc left11:51
← xkoncek left11:51
← Telgareith left11:51
← Teacup left11:51
← slaughter left11:51
← scottg489 left11:51
← sentriz left11:51
← leon left11:51
← BUSY left11:51
← hays left11:51
← theobjectivedad left11:51
← Dragoon left11:51
← austin_ left11:51
← Linkandzelda left11:51
← SleePy left11:51
← catern left11:51
← webstrand left11:51
← flying_sausages left11:51
← Quack left11:51
← alip left11:51
← ikonia left11:51
← tonitch left11:51
← MrC left11:51
← ajak left11:51
← farn left11:51
← phundrak left11:51
← NightMonkey left11:51
← CAT_S left11:51
← dharrigan left11:51
← GunArm left11:51
← hrberg left11:51
← rapmoc left11:51
← mlaga97 left11:51
← Oblomov left11:51
← frojnd left11:51
← kaichiuchi left11:51
← ndim left11:51
← lericson left11:51
← leah2 left11:51
NightMonkey_ → NightMonkey11:51
JeremyD → SleePy11:51
philipp64_ → philipp6411:51
dav1d5 → dav1d11:51
nightstrike_ → nightstrike11:51
MRDPZK_ → MRDPZK11:51
kaichiuchi_ → kaichiuchi11:51
→ arash joined11:51
← fstd_ left11:52
→ fstd joined11:52
→ HelloShitty joined11:52
→ soifou joined11:52
→ Marmotte joined11:52
→ Xat` joined11:52
→ goblin joined11:52
→ Vesryn joined11:52
→ Lunatrius joined11:52
→ kwizart joined11:52
→ berkay joined11:52
→ phroa joined11:52
→ ajfriesen joined11:53
→ k-man joined11:53
→ biapy joined11:53
→ chymera joined11:53
→ xkoncek joined11:54
→ andreas303 joined11:54
→ txtsd joined11:54
→ transhumanist joined11:54
→ mackerman joined11:54
→ dka joined11:54
→ MrBenC joined11:54
→ Bilge joined11:54
→ pulse joined11:54
→ luffy joined11:54
→ ProperN[out] joined11:54
→ palasso joined11:54
→ skered joined11:54
→ Masklin joined11:54
→ iomari891 joined11:54
→ barometz joined11:54
→ csm3105 joined11:54
→ moldorcoder7 joined11:54
→ wilsonjholmes joined11:54
→ Murr joined11:54
→ very_sneaky joined11:54
→ umbramalison joined11:54
→ dsrt^ joined11:54
→ jinsun joined11:54
→ cbreak joined11:54
→ hqdruxn08 joined11:54
→ BrianBlaze joined11:54
→ Lord_of_Life joined11:54
→ TonyStone joined11:54
→ ikonia joined11:54
→ infogulch joined11:54
→ RiFo joined11:54
→ nivag joined11:54
→ bremner joined11:54
→ makara1 joined11:54
→ makara joined11:54
→ analoq joined11:54
→ vanessa joined11:54
→ mat001_ joined11:54
→ luckman212 joined11:54
→ berndj joined11:54
→ hexadecagram joined11:54
→ Thanzex joined11:54
→ f451 joined11:54
→ haskl joined11:54
→ daru joined11:54
→ Natrick joined11:54
→ tkazi joined11:54
→ magic_ninja joined11:54
→ phylaz joined11:54
→ Novi joined11:54
→ Kangie joined11:54
→ shokohsc joined11:54
→ Ingvix joined11:54
→ Erisa joined11:54
→ Vonter joined11:54
→ winter joined11:54
→ wagle joined11:54
→ terminaldweller joined11:54
→ GingerGeek joined11:54
→ cyberpear joined11:54
→ earthbreaker joined11:54
→ mw_ joined11:54
→ pmcnabb joined11:54
→ wolfshappen joined11:54
→ polyrob joined11:54
→ erry joined11:54
→ mahler joined11:54
→ germ joined11:54
→ chimbosonic joined11:54
→ supernovah joined11:54
→ foul_owl joined11:54
→ cabazon joined11:54
→ matt0x6f joined11:54
→ lord| joined11:54
→ firewyre- joined11:54
→ llh joined11:54
→ jiffe joined11:54
→ tmz joined11:54
→ gnoo joined11:54
→ celphi joined11:54
→ mven joined11:54
→ taeaad joined11:54
→ Jck_true joined11:54
→ dansan joined11:54
→ potash joined11:54
→ avar joined11:54
→ eqw joined11:54
→ przemoc joined11:54
→ karstensrage joined11:54
→ Dotz0cat joined11:54
→ littlebuddy joined11:54
→ Guest1698 joined11:54
→ nasamuffin joined11:54
→ mns joined11:54
→ CYKS joined11:54
→ corelax joined11:54
→ lf94 joined11:54
→ wgrant joined11:54
→ derfj joined11:54
→ kyshoc joined11:54
→ Spr0cket joined11:54
→ pikapika joined11:54
→ GunArm joined11:54
→ truepassion joined11:54
→ sentriz joined11:54
→ BUSY joined11:54
→ hays joined11:54
→ dzho joined11:54
→ Ekho joined11:54
→ Fusl joined11:54
→ LadyLioness joined11:54
→ BSaboia joined11:54
→ chorduser25 joined11:54
→ Pr0phet_ joined11:54
→ redrambles joined11:54
→ silas joined11:54
→ kenyon joined11:54
→ newton joined11:54
→ Duns_Scrotus joined11:54
→ Thaodan joined11:54
→ Spydar007 joined11:54
→ mattf joined11:54
→ fdv joined11:54
→ bjs joined11:54
→ ross joined11:54
→ edwarnicke joined11:54
→ cozycactus joined11:54
→ fury__ joined11:54
→ GyrosGeier joined11:54
→ reda_ joined11:54
→ jsatk joined11:54
→ gordonfish joined11:54
→ Jenna16bit joined11:54
→ ueberall joined11:54
→ parsnip joined11:54
→ infernix joined11:54
→ Riviera joined11:54
→ Seveas joined11:54
→ rossome joined11:54
→ Kartagis joined11:54
→ selckin joined11:54
→ ryjen joined11:54
→ stevet joined11:54
→ PocketKiller joined11:54
→ cambrian_invader joined11:54
→ BinGOs joined11:54
→ cation joined11:54
→ ColdKeyboard joined11:54
→ s1b1 joined11:54
→ mx08 joined11:54
→ Disconsented joined11:54
→ anddam joined11:54
→ ljharb joined11:54
→ Furai joined11:54
→ pedrocr joined11:54
→ cfjk joined11:54
→ ZachGibbens joined11:54
→ JumpinBanana joined11:54
→ Frogging101 joined11:54
→ nullroute joined11:54
→ phryk joined11:54
→ sebastorama_ joined11:54
→ hashworks joined11:54
→ barlas joined11:54
→ robink_ joined11:54
→ Chipzz joined11:54
→ cxreg2 joined11:54
→ Soliton joined11:54
→ colona_ joined11:54
→ ripdog joined11:54
→ hgl joined11:54
→ robertparkerx joined11:54
→ Aleksejs joined11:54
→ Learath2 joined11:54
→ Zubin joined11:54
→ Square joined11:54
→ BinarySavior joined11:54
→ hexology joined11:54
→ Echoz_ joined11:54
→ ThiefMaster joined11:54
→ dslegends joined11:54
→ Dragoon joined11:54
→ austin_ joined11:54
→ Linkandzelda joined11:54
→ catern joined11:54
→ leah2 joined11:54
→ lericson joined11:54
→ ndim joined11:54
→ frojnd joined11:54
→ Oblomov joined11:54
→ dharrigan joined11:54
→ CAT_S joined11:54
→ phundrak joined11:54
→ farn joined11:54
→ ajak joined11:54
→ tonitch joined11:54
→ alip joined11:54
→ webstrand joined11:54
← hrberg_ left11:54
→ pikapika_lunar joined11:54
← pikapika left11:54
← phylaz left11:54
← BUSY left11:54
→ phylaz joined11:54
→ hrberg joined11:54
→ nyah joined11:54
→ kilobyte_ch joined11:54
→ Tobbi joined11:54
→ Fabricio20 joined11:54
→ ag4ve joined11:54
→ nyuszika7h joined11:54
→ thomas25 joined11:54
→ _sa0_ joined11:54
→ hexnewbie joined11:54
→ stutz joined11:54
→ hwrd joined11:54
→ aminvakil joined11:54
→ knolle joined11:54
→ pieguy128 joined11:54
→ Artea joined11:54
→ hepatocyte[m] joined11:54
→ jcgruenhage joined11:54
→ yuu[m] joined11:54
→ mthall joined11:54
→ Rhonda joined11:54
→ LogicAside joined11:54
← Byteflux left11:54
← adanwan left11:54
← thomas25 left11:55
← hwrd left11:55
← knolle left11:55
← LogicAside left11:55
← pieguy128 left11:55
← nyuszika7h left11:55
← mthall left11:55
← kyshoc left11:55
← dka left11:55
← MrBenC left11:55
← pulse left11:55
← luffy left11:55
← ProperN[out] left11:55
← skered left11:55
← Masklin left11:55
← iomari891 left11:55
← barometz left11:55
← csm3105 left11:55
← moldorcoder7 left11:55
← Murr left11:55
← umbramalison left11:55
← dsrt^ left11:55
← jinsun left11:55
← cbreak left11:55
← hqdruxn08 left11:55
← BrianBlaze left11:55
← Lord_of_Life left11:55
← infogulch left11:55
← RiFo left11:55
← makara1 left11:55
← makara left11:55
← vanessa left11:55
← mat001_ left11:55
← berndj left11:55
← hexadecagram left11:55
← Thanzex left11:55
← haskl left11:55
← Natrick left11:55
← tkazi left11:55
← Novi left11:55
← Kangie left11:55
← shokohsc left11:55
← Ingvix left11:55
← Vonter left11:55
← wagle left11:55
← terminaldweller left11:55
← earthbreaker left11:55
← mw_ left11:55
← pmcnabb left11:55
← polyrob left11:55
← germ left11:55
← chimbosonic left11:55
← supernovah left11:55
← foul_owl left11:55
← matt0x6f left11:55
← lord| left11:55
← firewyre- left11:55
← llh left11:55
← jiffe left11:55
← tmz left11:55
← celphi left11:55
← mven left11:55
← taeaad left11:55
← dansan left11:55
← potash left11:55
← avar left11:55
← eqw left11:55
← przemoc left11:55
← karstensrage left11:55
← Dotz0cat left11:55
← littlebuddy left11:55
← Guest1698 left11:55
← nasamuffin left11:55
← mns left11:55
← CYKS left11:55
← corelax left11:55
→ hwrd joined11:55
→ Xeago joined11:55
→ Byteflux joined11:55
→ pieguy128 joined11:55
→ knolle joined11:55
→ adanwan joined11:55
→ lemonsnicks joined11:55
→ akelly joined11:55
← nevyn_ left11:55
→ vishal joined11:56
→ BUSY joined11:56
→ enimaloc joined11:56
→ nyuszika7h joined11:57
→ nevyn joined11:57
→ rapmoc joined11:57
← hexnewbie left11:57
→ LogicAside joined11:57
← tuxayo left11:57
← morguldir left11:57
← Visor left11:57
← heftig left11:57
← jinsun_ left11:57
← paperino42[m] left11:57
→ ztrawhcse joined11:58
← netw[m] left11:58
← artemon left11:58
← Celmor[m] left11:58
← grahamperrin left11:58
→ bagels joined11:58
← tiziodcaio left11:58
← bluepenquin left11:58
← Fernando-Basso left11:58
← Helmholtz left11:58
← CarlFK left11:58
← ben[m]12345678 left11:58
← MassiveBox[m] left11:58
← r00ster91 left11:58
← DX099 left11:58
← jmcantrell left11:58
← underpantsgnome[ left11:58
→ magga joined11:58
← stdedos[m] left11:58
← kadoban left11:58
← dunpeal left11:58
← morguldir[m] left11:58
← vitali64[m] left11:58
← Jelmer[m] left11:58
← Aminda[m] left11:58
→ Visor joined11:58
← tgummerer[m] left11:58
← genba[m] left11:58
← Eryn83FL_Matrix[ left11:58
← ronny left11:58
← psydroid left11:58
← defolos left11:58
← vladoski left11:59
← Dyluster[m] left11:59
← matthewcroughan- left11:59
← stretch1 left11:59
← ForeverNoob[m] left11:59
← M6piz7wk[m] left11:59
← kuhilas left11:59
← nazarewk[m] left11:59
← graham left11:59
← T_UNIX[m] left11:59
→ vladoski joined11:59
← Raito_Bezarius left11:59
→ kyshoc joined12:00
→ mthall joined12:00
→ MrBenC joined12:00
→ pulse joined12:00
→ luffy joined12:00
→ ProperN[out] joined12:00
→ skered joined12:00
→ Masklin joined12:00
→ iomari891 joined12:00
→ barometz joined12:00
→ csm3105 joined12:00
→ moldorcoder7 joined12:00
→ Murr joined12:00
→ umbramalison joined12:00
→ dsrt^ joined12:00
→ jinsun joined12:00
→ cbreak joined12:00
→ hqdruxn08 joined12:00
→ BrianBlaze joined12:00
→ Lord_of_Life joined12:00
→ infogulch joined12:00
→ RiFo joined12:00
→ makara1 joined12:00
→ makara joined12:00
→ vanessa joined12:00
→ mat001_ joined12:00
→ berndj joined12:00
→ hexadecagram joined12:00
→ Thanzex joined12:00
→ haskl joined12:00
→ Natrick joined12:00
→ tkazi joined12:00
→ Novi joined12:00
→ Kangie joined12:00
→ shokohsc joined12:00
→ Ingvix joined12:00
→ Vonter joined12:00
→ wagle joined12:00
→ terminaldweller joined12:00
→ earthbreaker joined12:00
→ mw_ joined12:00
→ pmcnabb joined12:00
→ polyrob joined12:00
→ germ joined12:00
→ chimbosonic joined12:00
→ supernovah joined12:00
→ foul_owl joined12:00
→ matt0x6f joined12:00
→ lord| joined12:00
→ firewyre- joined12:00
→ llh joined12:00
→ jiffe joined12:00
→ tmz joined12:00
→ celphi joined12:00
→ mven joined12:00
→ taeaad joined12:00
→ dansan joined12:00
→ potash joined12:00
→ avar joined12:00
→ eqw joined12:00
→ przemoc joined12:00
→ karstensrage joined12:00
→ Dotz0cat joined12:00
→ littlebuddy joined12:00
→ Guest1698 joined12:00
→ nasamuffin joined12:00
→ mns joined12:00
→ CYKS joined12:00
→ corelax joined12:00
← hepatocyte[m] left12:01
→ hexnewbie joined12:01
← iomari891 left12:01
← mthall left12:01
← CYKS left12:01
← llh left12:01
← hexadecagram left12:01
← dsrt^ left12:01
← luffy left12:01
→ dsrt^ joined12:02
→ iomari891 joined12:02
→ CYKS joined12:02
← jcgruenhage left12:02
← yuu[m] left12:02
→ llh joined12:02
→ luffy joined12:02
← csm3105 left12:03
→ klopsch[m] joined12:04
→ mthall joined12:04
→ vyryls joined12:04
→ thomas25 joined12:04
← kevr left12:04
→ kevr joined12:05
→ dka joined12:05
← luffy left12:05
→ luffy joined12:06
→ artemon joined12:07
nomn1 → nomn12:09
← luffy left12:09
→ luffy joined12:09
pikapika_lunar → pikapika12:10
→ morguldir joined12:11
→ paperino42[m] joined12:12
→ grahamperrin joined12:12
→ tiziodcaio joined12:12
← luffy left12:12
→ Celmor[m] joined12:12
→ tgummerer[m] joined12:12
→ Dyluster[m] joined12:12
→ netw[m] joined12:12
→ tuxayo joined12:12
→ hexadecagram joined12:12
→ luffy joined12:13
→ jinsun_ joined12:13
→ heftig joined12:13
← dionysus69 left12:16
→ stretch1 joined12:22
→ r00ster91 joined12:22
→ M6piz7wk[m] joined12:22
→ stdedos[m] joined12:22
→ DX099 joined12:23
→ Raito_Bezarius joined12:23
→ vitali64[m] joined12:23
→ ronny joined12:24
→ Helmholtz joined12:24
→ bluepenquin joined12:25
→ T_UNIX[m] joined12:25
← Raito_Bezarius left12:26
→ matthewcroughan- joined12:27
← gildasio left12:27
→ niterrors joined12:27
→ genba[m] joined12:27
→ ForeverNoob[m] joined12:27
→ ben[m]12345678 joined12:27
→ Fernando-Basso joined12:27
→ underpantsgnome[ joined12:27
→ dunpeal joined12:27
→ kadoban joined12:27
→ morguldir[m] joined12:27
→ Eryn83FL_Matrix[ joined12:27
→ CarlFK joined12:27
→ defolos joined12:27
→ gildasio joined12:27
→ nazarewk[m] joined12:27
→ graham joined12:27
→ kuhilas joined12:28
→ Jelmer[m] joined12:28
→ Raito_Bezarius joined12:29
← n1ght3rr0r5 left12:29
→ jmcantrell joined12:30
→ n1terr0rs joined12:33
← Raito_Bezarius left12:33
← niterrors left12:33
← luffy left12:33
→ coot joined12:34
→ rfuentess joined12:39
← vladoski left12:40
→ vladoski joined12:40
→ luckman212_ joined12:41
← luckman212 left12:41
luckman212_ → luckman21212:41
→ mexen joined12:42
→ sympt3 joined12:48
→ delay joined12:49
→ Raito_Bezarius joined12:50
← sympt left12:50
sympt3 → sympt12:50
← tyson2 left12:53
← adanwan left13:00
→ adanwan_ joined13:00
→ hepatocyte[m] joined13:01
→ otisolsen70 joined13:04
← erry left13:05
← delay left13:05
→ bloody joined13:05
→ delay joined13:05
→ yuu[m] joined13:07
→ jcgruenhage joined13:09
← vyryls left13:09
MrBenC → MrC13:10
← vladoski left13:11
→ vladoski joined13:12
← delay left13:13
→ dionysus69 joined13:14
→ delay joined13:14
Leonarbro_ → Leonarbro13:16
→ MassiveBox[m] joined13:18
→ Aminda[m] joined13:18
← delay left13:20
→ epolanski joined13:22
→ gh34 joined13:24
→ luckman212_ joined13:24
← luckman212 left13:25
luckman212_ → luckman21213:25
→ alfredb joined13:26
→ delay joined13:28
→ pgnd joined13:29
pgnd i'm attempting to grab a git submodule (libinjection) for a parent (libmodsecurity), for eventual use in an srpm build. atm, I'm doing this: https://pastebin.com/raw/vGrudPiR , and failing to actually get the submod tree .13:30
→ psydroid joined13:31
pgnd pebkac, i'm sure ... what've i missed?13:31
→ thiago joined13:32
→ mven9 joined13:34
→ n1t3rr0r5 joined13:35
← mackerman left13:36
← mven left13:36
mven9 → mven13:36
← J_Darnley left13:36
cousteau pgnd: was the submodule added via `git submodule add`, or just written to .gitmodules?13:38
→ mackerman joined13:38
← n1terr0rs left13:38
pgnd cousteau: hi. thie .gitmodules comes with the parent pull, via `git clone https://github.com/SpiderLabs/ModSecurity`, or, in an rpm spec, unpacking the github branch tarball13:40
cousteau What does `git config submodule.others/libinjection.active` say?13:41
(hope I wrote that right, I'm on a phone)13:41
← n1t3rr0r5 left13:42
→ n1t3rr0r5 joined13:44
→ antani joined13:45
← Furai left13:46
pgnd cousteau: it returns empty ...13:46
pgnd googles ...13:46
→ hamburgler joined13:47
← transhumanist left13:47
→ transhumanist joined13:48
pgnd looks like (ACTIVE SUBMODULES) I need to 'activate' ... ?13:48
← bambanxx left13:48
→ Furai joined13:49
pgnd looks like s/git submodule update/git submodule update --init --recursive/ does the trick13:51
→ bambanxx joined13:51
→ travisghansen joined13:53
← Visne left13:56
← luckman212 left13:57
← delay left13:57
← bambanxx left13:57
→ Visne joined13:57
→ Masklin__Gurder joined13:58
← Masklin left13:59
Masklin__Gurder → Masklin14:00
→ Sasazuka joined14:00
← Sasazuka left14:00
→ vitali64 joined14:00
→ Sasazuka joined14:01
→ remyabel2 joined14:03
leon_ → leon14:03
→ joto joined14:04
← gildasio left14:04
joto Hi guys, I made a couple of branches. Now I want to cherry-pick certain commits and bring those commits over to the master branch. <-- Question: is this recommended or even possible to do? (am new to git)14:04
→ gildasio joined14:07
← dba left14:07
→ LuxuryMode joined14:10
another| man git-cherry-pick14:14
gitinfo the git-cherry-pick manpage is available at https://gitirc.eu/git-cherry-pick.html14:14
← remyabel2 left14:14
joto thanks!14:14
another| why not merge the branches instead?14:14
joto because I made a mess, I want to have cleaner commits14:15
e.g. commit a feature, then forgot to add things and commited that, then realized I did something wrong when commiting the feature comitted that again and so on.14:15
another| man git-rebase14:16
gitinfo the git-rebase manpage is available at https://gitirc.eu/git-rebase.html14:16
joto is that what git-rebase is for?14:17
mackerman rebase is for rewriting history14:17
← gildasio left14:17
joto alrightè14:18
thanks!14:18
mackerman Don't use it on history you shre with collaborators.14:18
joto no, this is a personal hobby project thankfully14:19
mackerman Note that nobody really cares what your commits look like, as long as the final result works.14:20
joto indeed, but for me it's a good way to learn. E.g. looking up a certain commit and taking notion of what the programmer did there.14:21
← pgnd left14:22
mackerman Which often is a few iterations. Attempt one. Fix typo. Attempt two, for real this time. Write documentation.14:23
joto yes that's true actually...14:24
although the previous programmer on this project seemed to be skilled enough and made clean commits14:25
now another question14:26
mackerman Of my example, only the typo seems like an obvious canidate to squash into the previous commit. Doesn't need explaination.14:27
joto ah yes14:27
that's a good example :)14:27
← darkstardevx left14:27
mackerman But don't do this rewriting to the primary branch. Or people who pull it will get a mess because of rewritten history.14:27
joto alright14:27
Is it possible to manipulate a commit itself? e.g. remove the (accidental) adding of a .png file14:27
but then keep all the other changes in that specific commit14:28
mackerman Recovering from upstream rebase in man git rebase is required reading for what this actually does14:28
gitinfo the git-rebase manpage is available at https://gitirc.eu/git-rebase.html14:28
mackerman Yes, but that also rewrites history14:29
joto one can also do that with git rebase? cool14:29
mackerman A simple case is to git rm the file and commit that.14:30
another| if it's the last commit you can also reset or amend14:30
→ dba joined14:30
→ cdown joined14:32
← cdown left14:34
→ cdown joined14:36
→ bambanxx joined14:39
→ skapata joined14:40
→ erry joined14:43
→ cdown_ joined14:48
→ akulbe joined14:49
← cdown left14:50
← akulbe left14:50
cdown_ → cdown14:50
→ akulbe joined14:51
→ nexalam joined14:51
akulbe → SuperLag14:52
← SuperLag left14:52
→ SuperLag joined14:52
→ ac0 joined14:53
← erry left14:53
→ erry joined14:54
→ lucasta joined14:56
← dsrt^ left14:57
← cdown left14:57
← erry left14:59
→ cdown joined15:00
→ erry joined15:00
→ gast0n joined15:05
← BtbN left15:06
→ BtbN joined15:06
← BtbN left15:09
→ BtbN joined15:10
→ nate2 joined15:11
← cdown left15:13
← ikwyl6 left15:13
→ cdown joined15:14
← vitali64 left15:14
← arch_angel left15:15
→ ikwyl6 joined15:15
← coot left15:16
→ arch_angel joined15:16
arch_angel → arch-angel15:16
→ vitali64 joined15:16
← nate2 left15:16
→ rama joined15:17
→ Torr joined15:20
Torr Hey15:21
→ freeman_h joined15:21
freeman_h hi all not sure if this is a composer or git issue however i rename a branch is we are pulling from vcs i change the url to the new one, also change it in the require. when i do composer update it says it could not found the required branch and the might be a typo. However if i use the old branch name, it works fine. I have clear the cache and did a require with --no-cache also still no luck, just wondering if anyone have any idea whats is15:21
up. Thank you15:22
Torr When signing commits, the author's email is enclosed between "<" and ">", e.g.: Signed-off-by: Torr [email@hidden.address]15:22
→ luckman212 joined15:22
Torr Where does that "<TEXT>" enclosure comes from? I know it's not exclusive to Git, but am curious about the origin.15:23
← Murr left15:23
→ Murr joined15:23
Torr I'm aware the key symbols ("<" and ">") are used to indicate substition for commands, functions and anything that receives a parameter. But that doesn't seem to be the case for commit signatures.15:24
ikke It's from the SMTP protocol15:26
mackerman Display name is a part of email standards.15:26
→ kenanmarasli joined15:27
← dionysus69 left15:28
Torr Hmmmm15:28
Thanks15:29
lantech19446 I've made changes to my local repo git status picks up those changes I stage them commit them but when I push it says everything up to date. What's going on15:29
mackerman Thankfully modern RFCs define email address spec much more rigoursly than the first attempts 40 years ago. https://www.rfc-editor.org/rfc/rfc5322#section-3.415:30
cousteau lantech19446: maybe you're pushing the wrong branch?15:32
→ coot joined15:32
Torr mackerman: Will read that one too.15:33
lantech19446 no for some reason it just didn't work when i did git add . but when i named the file explicitly it just worked15:33
cousteau Torr: as a side note, URIs can't include < > characters, so using them to delimit URLs and email addresses seems like a good idea15:34
Better than markdown's ( )15:34
→ nighterrors joined15:35
cousteau (since URLs may also contain ( ), so you don't know if the ) is part of the URL or a delimiter)15:36
Torr mackerman: A quick look indicates the symbol usage only for email, which I guess is the case for Git. Vim uses these characters for certain key mappings too, like "<cr>", "<PageUp>", etc. Gonna ask them if it has a similar purpose xD15:37
← n1t3rr0r5 left15:37
Torr cousteau: Indeed, I've seen that being used for URLs too.15:37
← otisolsen70 left15:38
Torr cousteau: Yeah man, Markdown is a pain sometimes. Specially with diverging parsers due to its spec absence.15:38
cousteau Re: using them for characters or keys... honestly I'd have used [ ] for those, except that may look like "optional argument"15:39
← gast0n left15:40
cousteau But e.g. Geany represents CR characters as a black box with the letters "CR" in it when you enable "show newline characters", so using [CR] seems like a reasonable ASCII alternative15:41
→ n1ght3rr0r5 joined15:42
← nighterrors left15:42
cousteau Basically you want to "draw a box" around the thing15:42
In plain text, other brackets are used often, when describing templates for letters and similar, like: "I, (your name here), would like to..."15:45
My guess is that they used < > as an arbitrary delimiter in the case of vim15:45
joto Hello, I created a total seperate folder for my project (without git). Am I right in that when I rm -v !("[.git]") my original project and copy over the files of the seperate folders that I can just create a new commit of it?15:46
cousteau once used <tabulator> in a command to explain someone how to tab-complete, and they ended up typing the actual angle brackets15:47
→ alien_lappy joined15:47
← Visor left15:47
← feriman left15:47
→ Visor joined15:48
Torr Found Vim's reasoning: 'Examples are often given in the <> notation. Sometimes this is just to make clear what you need to type, but often it can be typed literally, e.g., with the ":map" command.'15:49
← furrymcgee left15:50
Torr cousteau: Optional args or regex.15:50
→ redoc joined15:50
alien_lappy I have a weird question about flow: i have "master -- A -- B -- C -- topic1 -- D -- E -- topic2" branches; but everytime master changes and i wish both to rebase, i have to do this twice (once for each topic branch), is there a way to handle this only once? if i do it in topic1 (topic2 is unchanged and needs to redo it) if i do it on topic2, topic1 is unchanged, and i force it back to the rebased commit...15:51
Torr It's cool to discover the reasoning behind these choices.15:51
Torr contemplates the beauty of software.15:51
alien_lappy is there like a recursive action? or something? like rebase -R master topic1 and it rebases also the branches after topic1? or something?15:52
← epolanski left15:52
alien_lappy or an option to rebase the branches in between?15:52
→ feriman joined15:53
← vladoski left15:54
Torr Gonna have lunch, see ya folks15:54
← chexum left15:54
← Torr left15:55
→ chexum joined15:56
← lucasta left15:57
← genba[m] left16:00
← manin891 left16:01
alien_lappy O.o i found this exact case in the manual!16:01
git rebase --onto subsystem subsystem@{1}16:02
sheesh16:02
← feriman left16:02
← luckman212 left16:02
→ luckman212 joined16:03
→ feriman joined16:06
→ luckman212_ joined16:07
← xkoncek left16:07
← Sasazuka left16:08
← luckman212 left16:08
→ xkoncek joined16:08
→ cristiioan joined16:09
→ luckman212 joined16:11
← antani left16:11
← luckman212_ left16:12
← freeman_h left16:13
→ luckman212_ joined16:15
→ ramblebamble joined16:15
→ madewokherd joined16:15
→ lesihctej joined16:15
← luckman212 left16:16
← jetchisel left16:16
→ luckman212 joined16:19
→ OnkelTem joined16:19
cousteau Is there a command where you provide a tree and a repo, and it tries to see which commit in the repo most closely resembles the tree?16:19
← iomari891 left16:20
→ rgrinberg joined16:20
← luckman212_ left16:20
ikke https://github.com/ali1234/gitxref16:20
→ squirrel joined16:20
cousteau Like "OK so this dude copied the content of a repo, made a few changes, and committed the result to a different repo, again, even though I've tried to explain them MANY times that that breaks my git worlflow"16:21
Thanks, I'll have a look16:21
← OnkelTem left16:25
cousteau The Readme for that only contains an email from Linus complaining, and with good reason. I have to say I laughed for a minute.16:25
ikke It's not documented well, but the author used it for similar purposes16:26
→ iomari891 joined16:28
ramblebamble cousteau, you could also diff a list of commits present to see which commits are not present, couldn't you?16:28
← luckman212 left16:28
→ dionysus69 joined16:28
→ luckman212 joined16:28
cousteau ramblebamble: that's the issue, history got wiped16:28
They just grabbed the files and started a new repo from scratch16:28
In another situation, they were putting the files in a different repo (Perforce)16:29
No, they were not using git-p4. They were grabbing the files, modifying them as they saw fit, and dumping them on their Perforce repo.16:29
ramblebamble cousteau, good luck.... I hope what they offer is worth the pain..... I personally wouldn't bother,...but I am also interested in this tree commit shebang comparison thing.16:30
Some people really make me question common sense at times especially if it appearst o be not the first time they did it so you cannot explain it with they didn't know better16:31
cousteau In the p4 case I eventually ran away from the company so it's no longer my problem, but I still see situations that would benefit from it16:31
← dionysus69 left16:32
cousteau Even if it were as a mere "number of files that are preserved"16:32
slaughtr → slaughter16:36
← cyberpear left16:37
← rfuentess left16:38
ramblebamble cousteau, if it is in your own company, you do have leverage though, I would ask them to return a `ls -ald reponame/` on the cloned repository, that way you have a start date.16:38
and then the diff of that will be what they changed.16:38
cousteau My current issue is that the person who did the thing this time is on vacation and I don't want to bother them16:40
→ Sasazuka joined16:42
ramblebamble hmm great .... you could try git diff-tree16:42
also you can import a remote repository into a distinct part of your repository as an orphan branch16:42
that way you are operating on a single repository, and you can script things without cobbeling something together.16:43
→ luckman212_ joined16:44
← luckman212 left16:45
luckman212_ → luckman21216:45
ramblebamble gotta run good luck cousteau16:45
← ramblebamble left16:45
cousteau Thanks!16:45
← MajorBiscuit left16:46
→ furrymcgee joined16:47
cousteau ikke: where can I find more info on this gitxref tool?16:52
ikke cousteau: Not sure, it's just somethign someone made that was here in this channel16:53
so I suppose, look at the source16:53
→ rosco joined16:55
cousteau Like, I'd like to know if it modifies the repo (git bisect style), how to use it, what options it has, etc... Without browsing the whole code if possible, but I'm afraid it's not :(16:56
So browsing it is16:57
→ niterrors joined16:57
← luckman212 left16:58
ikke This is the entrypoint https://github.com/ali1234/gitxref/blob/master/gitxref/__main__.py16:59
I think it assumes you have a tarball though16:59
cousteau Meh, I'll copy the stuff on /tmp just I case16:59
← n1ght3rr0r5 left17:00
cousteau No no, I think it assumes the tarball is unzipped17:00
"Path to unpacked tarball"17:00
ikke right17:00
→ nate2 joined17:01
cousteau But like, why does everybody put that much effort into making nice things, and then zero effort into documenting them?17:01
mackerman Documentation is work, and the developer already knows how it works.17:04
→ lightstalker joined17:04
← niterrors left17:05
→ n1terr0rs joined17:05
→ Betal joined17:05
→ adanwan joined17:06
← adanwan_ left17:06
→ wootehfoot joined17:06
nedbat it's also hard for a developer to be in the user's mindset, to see what needs to be written, and then write it.17:07
← rosco left17:08
← terminaldweller left17:08
→ rosco joined17:09
← LuxuryMode left17:10
cousteau Instructions could contain catchphrases such as "You need to install tqdm in order to run this"17:10
← zan left17:12
→ terminaldweller joined17:15
← lightstalker left17:16
gsi let's put it this way: the first user to see the issue and solve it should be able to remember what it took, and provide something that helps improve the doc17:18
this is your chance, take it! :)17:18
this way the next user will be in a better situation, and can help improve starting from there17:19
→ n1t3rr0r5 joined17:19
← n1terr0rs left17:22
→ tyson2 joined17:23
← vitali64 left17:25
→ jinsun__ joined17:26
← jinsun left17:26
jinsun__ → jinsun17:26
← rosco left17:27
→ jinsun__ joined17:28
jinsun → Guest482217:28
jinsun__ → jinsun17:28
← fling left17:30
← Guest4822 left17:31
← bambanxx left17:33
→ cristiioan_ joined17:35
← cristiioan left17:37
cristiioan_ → cristiioan17:37
← theobjec- left17:38
cousteau ikke: well I'll be damned, the damn thing works17:39
→ theobjectivedad joined17:39
cousteau gsi: project seems dead anyway17:40
← feriman left17:40
cousteau And, I still don't know what it does, what it touches, what it breaks, how exactly I should and shouldn't use it, etc17:40
→ feriman joined17:40
→ dionysus69 joined17:41
ikke cousteau: it's something someone made for one occasion and put it in github17:42
they could have kept it for themselves, and you'd have to write it yourself17:42
→ derpydoo joined17:44
cousteau ikke: yeah, I know I should be grateful, it's just I wish it were documented, that's all17:45
← mexen left17:47
Noisytoot_ → Noisytoot17:51
cousteau I mean, at least the tool works and saved me some time, and was relatively easy to figure out how to use it. I've seen things that are supposed to be professionally developed that were much worse.17:52
I was just replying to gsi (who suggested that I could be the one writing the documentation) justifying why that might not be possible (I don't know enough from the program to write a proper documentation)17:54
→ Wh0 joined17:58
gsi was not implying that it's the users' job to provide the full and proper and most professional documentation that you'd expect from paid services17:58
but seeing a complete lack of any documentation, starting _something_ that helps your fellow users would already be beneficial17:59
→ luckman212 joined17:59
gsi even more so when you are a user, in a different position and at a different perspective than the developer, who had a hard time imagining what "newcomers to this tool" are wondering about18:00
cousteau Lol, at this stage I expect very little from paid services... in fact I tend to expect open source stuff to be better documented in general, since it was developed by users for users, not by a company that just wants to sell you something18:00
But well, as ikke pointed out this isn't as much of an "open source project" as it is "some quick and dirty code someone put together, and eventually decided to slap a GPLv3 license on it and ship it on GitHub because why the hell not"18:03
Or maybe they were aiming for a complete project, but when they got done with the functional part they got bored or had to move on to something else and eventually abandoned it18:04
← rgrinberg left18:08
← n1t3rr0r5 left18:10
→ n1t3rr0r5 joined18:10
← n1ghterr0rs left18:12
→ cdown_ joined18:12
← cdown left18:13
cdown_ → cdown18:13
← iomari891 left18:14
← derpydoo left18:15
→ bambanxx joined18:15
→ Narrat joined18:17
→ nighterrors joined18:19
← pkal left18:19
← tyson2 left18:20
← cdown left18:20
← szkl left18:22
→ cdown joined18:23
→ cdown_ joined18:26
← cristiioan left18:26
← cdown left18:29
→ cdown joined18:32
← cdown_ left18:33
← Visor left18:34
← zeenk left18:35
→ Visor joined18:35
→ derpydoo joined18:36
→ fling joined18:37
→ funhouse_ joined18:38
← kwizart left18:38
← Wh0 left18:38
← funhouse left18:39
→ mitrokov joined18:40
→ StarlitMantis joined18:41
→ bn_work joined18:42
→ Starlit joined18:44
→ Lord_of_Life_ joined18:50
← Lord_of_Life left18:51
← Coop left18:51
Lord_of_Life_ → Lord_of_Life18:52
← soman left18:53
← igemnace left18:55
← nate2 left19:01
← srinidhi left19:02
← Guest1698 left19:05
→ Guest1698 joined19:06
→ dhrv joined19:06
→ nate2 joined19:07
← dhrv left19:09
→ ThorMojito joined19:11
← nate2 left19:11
→ cyberpear joined19:13
→ srinidhi joined19:19
← coot left19:27
→ nate2 joined19:29
← Sasazuka left19:29
← Starlit left19:31
← StarlitMantis left19:31
← Swahili left19:33
← derpydoo left19:37
← bambanxx left19:42
cousteau If a branch adds 3 commits on top of commit A, and then the branch is merged --no-ff into commit A resulting in commit B, is commit B "4 commits ahead of A" or "1 commit ahead of A"?19:43
(I know the answer is "both" but I'd like to know what would be the "common sense" answer, if any)19:44
← squirrel left19:50
→ LuxuryMode joined19:51
← vdamewood left19:51
→ Swahili joined19:52
← kenanmarasli left19:54
→ coot joined19:56
← ThorMojito left19:59
gsi three20:01
← rama left20:01
→ rama joined20:02
rewt cousteau, I think it should be determined by order of parents; so if A is the first parent of B (with the branch the 2nd parent), then B should be 1 ahead of A20:02
← cousteau left20:03
→ SuperL4g joined20:11
← pulse left20:11
← nate2 left20:14
← wootehfoot left20:14
→ m0viefreak joined20:15
→ lionkor joined20:18
→ codaraxis joined20:25
→ Starlit joined20:30
→ StarlitMantis joined20:30
← Starlit left20:40
← StarlitMantis left20:40
→ nate2 joined20:40
→ arescorpio joined20:42
← cdown left20:43
← nate2 left20:45
← feriman left20:49
← gsi left20:53
→ clime joined20:55
→ nate2 joined20:56
→ junebug joined20:57
← coot left20:59
→ gsi joined21:00
→ YuGiOhJCJ joined21:02
← dionysus69 left21:04
← SuperL4g left21:04
→ gildasio joined21:11
← ac0 left21:13
← rama left21:18
→ rama joined21:18
← adanwan left21:20
→ adanwan joined21:21
← Murr left21:22
→ Murr joined21:23
← gh34 left21:24
→ peirik_ joined21:24
← m0viefreak left21:25
→ csm3105 joined21:26
← philipp64 left21:28
→ philipp64 joined21:29
→ SuperL4g joined21:29
← junebug left21:31
→ iomari891 joined21:32
← csm3105 left21:32
→ ThorMojito joined21:35
← ThorMojito left21:36
← iomari891 left21:38
← Colere left21:39
→ Colere joined21:40
← srinidhi left21:48
← nate2 left21:49
→ ThorMojito joined21:50
→ vaaleyard joined21:50
→ ThorMojito1 joined21:51
← ThorMojito left21:51
→ jaggz joined21:53
→ CaCode joined21:53
jaggz for some reason I keep getting stuck in rebases when updating my blender repository21:53
https://paste.debian.net/hidden/f80a3c17/21:53
← rama left21:53
jaggz I'm not sure what's causing it. "Initial work. WIP" should be on some other branch, not master.. and that is way in the past21:53
→ rama joined21:54
jaggz just earlier this month I did a git reset --hard origin/master to fix it.. and now it's doing it again21:54
→ thebombzen_ joined21:54
← thebombzen left21:55
→ nate2 joined21:56
← mitrokov left21:56
jaggz blender's "make update" causes it to happen again anyway.. here's its commands and output:21:56
https://paste.debian.net/hidden/7f847fc8/21:56
→ Cleverness joined21:57
→ tyson2 joined21:58
← ThorMojito1 left22:00
circuitbone `You are currently editing a commit while rebasing branch 'master' on '1f4dc51d09a' `22:02
← madewokherd left22:02
← rama left22:02
→ rama joined22:02
→ Mitozqli joined22:02
← Mitozqli left22:02
→ zeenk joined22:03
← tulpa_ left22:03
→ lucasta joined22:03
→ tulpa_ joined22:03
jaggz yeah, but I'm not doing it.. and I'm not editing anything in master22:05
like, this file it's showing changes in.. git diff doesn't show anything, but pulling shows it: CONFLICT (content): Merge conflict in source/blender/editors/space_outliner/outliner_ utils.cc22:05
so I abort the rebase being done by "make update" (from that paste), then I try to check out that file. that yields "Updated 0 paths from the index"22:06
I want to discard everything and just "be one" with origin/master22:06
okay.. finally got it to work. I went ahead and checkout -b'ed a new branch, (-b "delete-me")22:09
went back to master.. it still failed.. so I aborted the rebase it was doing, git reset --hard origin/master, then git pull'ed again..22:09
finally cleared up22:09
yeesh22:09
thanks22:09
← LuxuryMode left22:10
← funhouse_ left22:11
→ bambanxx joined22:11
← bambanxx left22:11
circuitbone o722:12
→ ferdna joined22:12
→ atrigent_ joined22:13
← atrigent left22:13
jaggz 7o22:13
/_22:13
walk like an egyptian o/~22:13
→ n1ghterr0rs joined22:17
← n1t3rr0r5 left22:17
← tyson2 left22:19
← zeenk left22:19
→ Xenguy joined22:19
circuitbone ¬ø¬22:21
→ n1ght3rr0r5 joined22:23
← n1ghterr0rs left22:23
→ tulpa__ joined22:23
← tulpa_ left22:25
← theoceaniscool left22:27
→ junebug joined22:29
→ niterrors joined22:30
← n1ght3rr0r5 left22:30
← LuKaRo left22:32
→ cleverness_ joined22:33
← crabbedhaloablut left22:34
← lucasta left22:34
→ madewokherd joined22:35
→ crabbedhaloablut joined22:35
← Cleverness left22:35
→ cleverness__ joined22:37
← Narrat left22:38
← rama left22:39
→ rama joined22:39
← cleverness_ left22:40
← palasso left22:40
→ hoochmonger joined22:41
← vaaleyard left22:44
← arch-angel left22:48
← junebug left22:48
→ Coop joined22:54
→ vyryls joined22:56
← irrgit_ left23:02
← xx left23:02
← crabbedhaloablut left23:08
← tulpa__ left23:12
← CaCode left23:13
→ crabbedhaloablut joined23:18
← adanwan left23:20
→ adanwan joined23:21
← umbramalison left23:21
→ tachoknight joined23:23
← clime left23:25
← Muzer left23:26
→ umbramalison joined23:27
→ vaaleyard joined23:38
← vaaleyard left23:54
→ Muzer joined23:54
→ vaaleyard joined23:57
→ EternalSunshine joined23:58

Logs Search ←Prev date Next date→ Channels Documentation