IRCloggy #git 2022-04-04

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-04-04

→ clime joined00:00
→ thebombzen joined00:02
← Soni left00:04
→ krokodil joined00:05
← spacenautx left00:06
← krokodil left00:07
→ krokodil joined00:10
← krokodil left00:13
→ krokodil joined00:13
← jclsn1007 left00:16
← krokodil left00:16
→ igemnace joined00:19
→ jclsn1007 joined00:22
→ krokodil joined00:29
← jclsn1007 left00:29
← krokodil left00:29
← wakeup left00:30
→ jclsn1007 joined00:34
← jclsn1007 left00:39
← oriba left00:39
→ jclsn1007 joined00:45
← bambanxx left00:48
← steam left00:48
→ bambanxx joined00:54
mns .5/4700:56
← jclsn1007 left00:57
→ roadie joined01:00
→ sa0 joined01:01
→ humanBird joined01:01
→ jclsn1007 joined01:03
← humanBird left01:03
→ cdown_ joined01:04
← sa0 left01:05
→ sa0 joined01:05
← cdown left01:07
cdown_ → cdown01:07
← bambanxx left01:09
← jclsn1007 left01:09
→ vicfred joined01:10
→ bambanxx joined01:10
← cdown left01:11
→ cdown joined01:11
← bambanxx left01:12
← roadie left01:14
→ jclsn1007 joined01:15
→ cdown_ joined01:15
← rgrinberg left01:17
← cdown left01:18
cdown_ → cdown01:18
→ bkhl joined01:19
→ vysn joined01:19
← jclsn1007 left01:20
→ jclsn1007 joined01:25
→ bambanxx joined01:28
← jclsn1007 left01:32
→ jclsn1007 joined01:33
← Yruama left01:38
← pretty_dumm_guy left01:41
← jclsn1007 left01:41
→ jclsn1007 joined01:47
← jclsn1007 left01:53
← chenqisu1 left01:56
→ jclsn1007 joined01:57
→ Guest5 joined01:58
← Guest5 left01:58
→ Guest68 joined01:59
← Guest68 left02:00
← jclsn1007 left02:02
→ morph joined02:03
← lemonsnicks left02:03
← JanC left02:05
← Gustavo6046 left02:06
→ Gustavo6046 joined02:06
→ jclsn1007 joined02:08
← Gustavo6046 left02:09
→ Gustavo6046 joined02:09
← cloaker left02:13
→ jclsn10074 joined02:14
← jclsn1007 left02:16
← Sulky left02:17
→ lemonsnicks joined02:18
← OnkelTem left02:18
← jclsn10074 left02:21
→ Soni joined02:22
← morph left02:23
← wonko-th1-sane left02:23
→ duxco joined02:24
← duxsco left02:24
duxco → duxsco02:24
→ morph joined02:25
← hololeap left02:25
→ hololeap joined02:27
→ jclsn10074 joined02:28
← coaxing left02:28
→ xyz1234 joined02:36
← jclsn10074 left02:37
← xyz1234 left02:37
← bambanxx left02:38
→ bertvvvs joined02:41
→ jclsn10074 joined02:42
→ roadie joined02:43
→ bambanxx joined02:44
← jclsn10074 left02:48
→ jclsn10074 joined02:52
← roadie left02:57
← Sazhen86 left02:58
← bertvvvs left03:00
← jclsn10074 left03:02
→ walter_whip joined03:03
→ jclsn10074 joined03:03
← morph left03:09
← Gustavo6046 left03:13
← bambanxx left03:14
← bin101 left03:14
← gast0n left03:15
← nuttingd left03:16
→ nuttingd joined03:16
→ bin101 joined03:19
→ saroy joined03:21
← thebombzen left03:23
→ gnoo_ joined03:24
← ChmEarl left03:25
→ auri joined03:32
→ walter_whip_ joined03:33
← auk left03:35
← walter_whip left03:36
← walter_whip_ left03:36
→ walter_whip_ joined03:36
← auri left03:38
→ auri joined03:39
→ donofrio joined03:42
→ cloaker joined03:43
→ inceptionflywho joined03:44
← cloaker left03:48
← tyson2 left03:51
← donofrio left03:52
← AbleBacon left03:53
← funhouse left03:53
→ donofrio joined03:55
← auri left04:00
→ auri joined04:00
← bloody left04:01
→ funhouse joined04:02
← zebrag left04:08
← Murr left04:10
→ Murr joined04:10
← tejr left04:20
→ tejr joined04:20
← thiago left04:23
← duxsco left04:24
→ seifeslimene_ joined04:24
← seifeslimene left04:25
→ thiago joined04:26
← donofrio left04:27
← nuttingd left04:28
→ nuttingd joined04:28
← The_Blode left04:33
→ roadie joined04:40
saroy → bytehackr04:44
→ lukedashjr joined04:45
← luke-jr left04:45
lukedashjr → luke-jr04:46
← subopt left04:47
← cerill left04:48
→ The_Blode joined04:50
← Guest2493 left04:55
→ carl- joined05:04
← carl- left05:07
→ madewokherd` joined05:09
← madewokherd left05:13
→ mncheck joined05:14
← gnoo_ left05:16
← mncheck left05:18
← lpapp left05:19
← mic4ael left05:21
→ mic4ael joined05:23
← xkuru left05:34
← mic4ael left05:39
→ mic4ael joined05:41
← great_taste left05:42
← causasui left05:43
← roadie left05:44
→ lpapp joined05:45
lpapp hi, if I set submodule.recurse, I no longer need to update submodules explicitly after pulling, right? E.g. if someone in our team has changed submodule references to newer version of the submodule?05:46
→ Jong joined05:54
→ rsx joined05:58
→ srinidhi joined06:05
→ feriman joined06:09
→ coot joined06:13
→ zeenk joined06:13
Jonno_FTW I've made a commit which changed line endings, I then reverted this commit, but the revert did not change the line endings06:14
I have the offending commit hash in .git-blame-ignore-revs but the github PR viewer still shows that line endings where changed06:14
← thiago left06:18
→ vanessa joined06:23
→ mexen joined06:25
→ palasso joined06:28
parsnip can you reproduce the issue with a new repo?06:29
how did you know you changed line endings both times?06:29
or rather, the first time. what did you see?06:29
this is on Windows?06:30
provide steps?06:36
← dharrigan left06:39
← wilz left06:39
← seds left06:39
← MrMagic left06:39
← bboles left06:39
← rewt left06:39
← bloodElk left06:39
Rhvs → Rhys06:39
→ MrMagic joined06:39
→ Rondom joined06:39
→ kapil joined06:39
→ pulec joined06:39
→ mackerman joined06:39
→ joj joined06:39
→ lcn joined06:39
→ limon joined06:39
→ gajus joined06:39
→ foo joined06:39
→ Oddly joined06:39
→ RichiH joined06:39
→ mingdao joined06:39
→ ndorf joined06:39
→ ch joined06:39
← lcn left06:40
→ lcn joined06:40
→ williewillus8 joined06:40
→ wacko joined06:40
← mingdao left06:40
→ mingdao joined06:40
→ Malin joined06:40
→ wilz joined06:40
→ rewt joined06:40
→ kristjansson joined06:40
→ zx2c4 joined06:40
→ elichai2 joined06:40
→ seds joined06:40
→ nightstrike joined06:40
← zx2c4 left06:40
→ zx2c4 joined06:40
← seds left06:40
→ seds joined06:40
← wacko left06:40
→ wacko joined06:40
→ bboles joined06:40
→ packet_lozenge joined06:41
→ dharrigan joined06:41
→ wgrant joined06:41
→ bloodElk joined06:41
← packet_lozenge left06:41
→ packet_lozenge joined06:41
→ con3 joined06:41
→ simon816 joined06:41
→ sunyibo joined06:41
→ oztunan joined06:41
→ Karyon joined06:41
→ sangy joined06:41
→ quesker joined06:41
→ Albright joined06:41
→ ColdKeyboard joined06:41
→ themill joined06:41
→ gothicserpent joined06:41
→ kgz joined06:41
→ warthog9 joined06:42
← Quietus left06:43
← obiwahn left06:43
← Ugrastil277 left06:43
→ Kingsy joined06:43
→ sitaramc joined06:43
→ ecs joined06:43
→ Argorok joined06:43
→ MrC joined06:43
→ grantbow joined06:43
→ eqw joined06:43
→ madduck joined06:43
→ fury_ joined06:43
→ Ugrastil277 joined06:43
← madduck left06:43
→ madduck joined06:43
→ fakuve joined06:43
→ NiKaN joined06:43
→ ThiefMaster joined06:43
→ ljharb joined06:43
→ celphi joined06:43
→ circuitbone joined06:43
→ flupe joined06:43
→ obiwahn joined06:43
→ Quietus joined06:43
→ gumnos joined06:43
← ljharb left06:43
→ ljharb joined06:43
← obiwahn left06:43
→ obiwahn joined06:43
→ Exa joined06:43
→ mcfrdy joined06:44
→ deepy joined06:44
→ led_belly joined06:44
→ gitinfo joined06:44
ChanServ set mode: +o06:44
→ ringo__ joined06:44
→ koolazer joined06:44
→ cmn joined06:45
→ leon joined06:45
← gxt left06:46
→ gxt joined06:46
→ roadie joined06:46
→ Celelibi joined06:48
← lpapp left06:52
→ otisolsen70 joined06:54
→ rfuentess joined06:56
← mat001 left06:59
← m_ left06:59
← chexum left07:01
→ chexum joined07:02
← feriman left07:03
← palasso left07:03
→ Rashad joined07:05
← Misotauros left07:11
→ wonko-the-sane joined07:12
← pulec left07:15
→ pulec joined07:15
→ feriman joined07:17
→ chenqisu1 joined07:18
← igemnace left07:18
→ iomari891 joined07:23
← coot left07:24
→ coot joined07:26
← reset left07:27
← coot left07:30
→ coot joined07:31
← drbeco left07:35
→ drbeco joined07:36
→ masber joined07:36
→ palasso joined07:39
→ geowiesnot joined07:40
→ donofrio joined07:42
→ masber31 joined07:45
← masber31 left07:45
← km left07:50
← donofrio left07:52
← zeenk left07:53
→ AnapodoPsalidaki joined07:54
→ km joined07:54
← km left07:54
← Willtech left07:56
→ Willtech joined07:56
→ Misotauros joined08:00
→ RiFo joined08:01
→ mat001 joined08:01
→ jazzy joined08:01
→ km joined08:01
→ m_ joined08:03
→ Sulky joined08:06
→ dionysus69 joined08:12
→ Haohmaru joined08:14
→ igemnace joined08:14
← skapata left08:15
→ TheCatBehemoth joined08:15
→ thebombzen joined08:17
→ AnapodoPsalidi joined08:17
→ Andy_Kw joined08:18
← AnapodoPsalidaki left08:20
← fling left08:20
→ fling joined08:22
→ MajorBiscuit joined08:24
← dionysus69 left08:28
→ dionysus69 joined08:29
← Natrick left08:31
→ jimklimov1 joined08:36
→ eroux joined08:39
← jimklimov left08:39
williewillus8 → williewillus108:43
→ distantsail joined08:44
← Misotauros left08:49
→ ramblebamble joined08:49
→ mattil joined08:56
← Murr left08:56
→ Murr- joined08:57
Murr- → Murr08:57
← clime left08:58
→ gurkenglas joined08:58
→ cerill joined09:00
← iomari891 left09:02
→ OnkelTem joined09:02
→ donofrio joined09:04
→ Natrick joined09:05
→ tuskkk____ joined09:09
tuskkk____ Hello, I need to open source a repo, but before doing so, I will have to remove specific authors in the commit history and replace them with a generic name and email address. Any suggestions to do this in the most straightforward way?09:10
selckin !filter-branch09:11
← wonko-the-sane left09:11
→ _vanessa_ joined09:12
osse yeah, with a --commit-filter that checks GIT_AUTHOR_NAME etc. there's an example in the man page09:12
that, or filter-repo, but I don't know how to use that for this09:12
← vanessa left09:15
mrtnt_ Is there a difference which merge strategy(fast-forward, true merge) to use if the remote has always a single branch and there are never local commits?09:16
tuskkk____ cool, let me try that, I am curious on what will happen to unmerged branches if there are any09:16
→ DNH joined09:17
← donofrio left09:19
← roadie left09:23
← distantsail left09:27
→ humanface joined09:29
davve how do you set a default origin/branch so i dont have to specify it all the time? typing it is gettin gold09:32
getting old*09:32
like me09:32
i do like being explicit though. maybe i just need some git aliases?09:32
ramblebamble davve, you mean pushing, commiting, on the remote server?09:33
← _xor left09:33
selckin you can set the upstream/tracking branch, think thats what you mean09:33
davve pushing rebasing09:33
yeah that sounds about right selckin09:34
-u09:35
with git branch and git push09:35
is that all?09:35
→ donofrio joined09:41
osse davve: if you use -u once with push then it's set and you don't have to use it again09:43
← donofrio left09:43
→ roadie joined09:49
→ donofrio joined09:50
ramblebamble davve, sry afk for a bit, you can see the remote branch being pushed to via `git branch -vvv`09:52
osse mrtnt_: merge will fast-forward if it can, and in your case it sounds like it always will09:55
← Visne left09:55
osse fast-forward isn't really a merge strategy. it's more a "avoid a merge altogether" strategy09:55
ikke osse: gitlab calls it a strategy :P09:57
→ pretty_dumm_guy joined09:57
ikke or rather, method09:57
← pretty_dumm_guy left09:57
← Willtech left09:57
→ pretty_dumm_guy joined09:58
← _vanessa_ left09:59
← km left10:00
→ km joined10:01
→ Visne joined10:02
→ dionysus70 joined10:02
← dionysus69 left10:03
dionysus70 → dionysus6910:03
← dionysus69 left10:09
← jazzy left10:11
→ DibbTubberOne joined10:13
← feriman left10:13
→ feriman joined10:14
→ iomari891 joined10:19
parsnip i'm not sure "one branch" implies "fast-forward". and i don't know what "no local branches" means10:19
selckin think svn10:20
← t0mm13b left10:21
→ t0mm13b joined10:21
osse who said no local branches ?10:27
← humanface left10:28
→ humanface joined10:28
← Rashad left10:30
→ t0mm13b_ joined10:35
← vishal left10:35
← t0mm13b left10:36
→ vishal joined10:37
← cambrian_invader left10:41
→ Flooo joined10:45
← Andy_Kw left10:47
Kartagis is there a way to remove something from tracking but still keep it in the codebase?10:50
osse rm --cached10:51
Kartagis thanks10:52
→ jaggz joined10:57
jaggz I have my git project, and a submodule that's my fork of someone else's project10:57
if I "cd ad7705-esp8266 && git remote show origin" it shows my own github fork10:57
but on github that subdir goes to the original10:58
how do I update that?10:58
https://github.com/jaggzh/ecg-wifi-ad8232-esp8266/tree/adc10:58
Baphomet Maybe the submodule config is wrong?10:58
jaggz i'm in my adc branch here, and in my "optional-pins" branch in the submodule10:58
Baphomet, hm10:58
→ jinsun joined10:58
jaggz yeah, it had their repo in .gitmodules10:58
parsnip oh, misread, "there are never local commits"10:59
Baphomet https://github.com/jaggzh/ecg-wifi-ad8232-esp8266/blob/adc/.gitmodules10:59
Your .submodules in GH points to another user10:59
parsnip don't know what that is either10:59
← samuelbernardo left10:59
jaggz Okay, I just edited that just now. is it sufficient to add and push .gitmodules?10:59
Baphomet It should, I guess11:00
jaggz heh11:00
trying11:00
Baphomet The latest commit in that file seems to be 8 hours ago11:00
jaggz okay, that works :) thanks11:01
← t0mm13b_ left11:01
→ samuelbernardo joined11:02
Baphomet Quite interesting project, by the way11:03
Do you work with cognitive/neuroscience research, jaggz?11:03
(Ohhh, I apologize, I'm barely awake here, it'c ECG not EEG)11:06
→ chenqisu12 joined11:07
← chenqisu1 left11:09
→ t0mm13b joined11:10
jaggz :)11:10
Baphomet, https://live.staticflickr.com/65535/51980879681_d66e354c77_k.jpg11:11
that mess11:11
inexpensive ECG that, so far, is able to handle very nice wifi transmission of the EKG data11:12
(for efficiency, I bundle up the data to fit into individual TCP packets, to reduce packet overhead)11:12
Baphomet Very cool!!11:12
jaggz with a little server in .c that just logs it11:13
the recent change was to add that little ADC (analog to digital converter) which can sample faster than my wifi board11:13
these wifi boards are like $311:14
→ coaxing joined11:14
jaggz you can see graphs a few screens down: https://www.flickr.com/photos/32284628@N05/with/51980879681/11:15
of a capture I did on myself (although this is for my wife/her doctor)11:15
the more recent graphs were me working with the 60hz noise "from the air" (from all the AC power around us)11:16
since the thing is battery operated.. I thought switching to battery would resolve it, but there's too much noise in the air11:16
Baphomet Quite interesting!!11:17
→ stenno joined11:18
stenno can there ever be merge conflict when i merge a branch unto another? there shouldn't be, right?11:18
sorry, rebase11:18
← malteger left11:19
jaggz Baphomet, with a 3d-printable enclosure for the whole thing: https://imgur.com/a/UQ0Eodb11:20
yellow thing is the battery holder11:20
(one of the most efficient cheapest batteries on amazon.. pretty thin and still powerful.. for some wifi hotspot+router)11:21
anyway, that can be changed, but I needed something for now.11:21
ikke stenno: surely you can have conflicts11:21
stenno hmm11:21
← cliluw left11:23
stenno so if we have main, and we derive F1 from main, and then commit to main, and in the meantime also commit to F1, i'd thought that during rebase, the changes of F1 were applied on top of the changes of main11:23
selckin they can both change the same line, then it can't know what todo11:24
stenno i don't see how there can be a conflict11:24
← geowiesnot left11:24
← feriman left11:25
stenno selckin: but if i replay the main change, and afterwards the feature change, i'd just expect that the changes of the feature branch would be overwriting the main changes11:25
→ cliluw joined11:25
← cliluw left11:25
stenno hm hm11:26
ikke no, that's not what git does11:26
stenno maybe i am too naive11:26
ikke Because that would mean if you fix a bug in main, and rebase, the bug would come back11:26
→ feriman joined11:27
→ tyson2 joined11:27
→ cliluw joined11:27
← rsx left11:32
← cliluw left11:33
← nuttingd left11:33
→ nuttingd joined11:34
← iomari891 left11:34
→ iomari891 joined11:35
→ cliluw joined11:37
→ awmv joined11:37
← cliluw left11:41
→ cliluw joined11:43
← cliluw left11:43
→ rsx joined11:44
→ vanessa joined11:45
→ cliluw joined11:45
← DibbTubberOne left11:45
→ geowiesnot joined11:45
← wgrant left11:47
→ Gustavo6046 joined11:49
← cliluw left11:49
← Oblomov left11:50
→ Yruama joined11:51
→ jianwu joined12:02
← geowiesnot left12:04
→ geowiesnot joined12:05
← omero left12:17
→ Oblomov joined12:18
→ mannequin joined12:20
← hoochmonger left12:20
← geowiesnot left12:21
→ AbleBacon joined12:23
→ Guest69 joined12:23
← stenno left12:25
→ omero joined12:25
→ FH_thecat joined12:26
← tuskkk____ left12:29
← vicecea left12:31
→ vicecea joined12:31
← dermoth left12:35
→ stenno joined12:38
→ dermoth joined12:47
→ csm3105 joined12:48
← cerill left12:50
→ zeenk joined12:53
→ thiago joined12:55
→ yourfate joined13:01
→ cdown_ joined13:02
← chenqisu12 left13:02
→ bloody joined13:04
← cdown left13:04
→ cdown joined13:06
← mattil left13:06
→ Willtech joined13:07
→ cdown__ joined13:09
← cdown_ left13:09
→ bertvvvs joined13:09
← stenno left13:10
Rhys → Guest412413:10
← Guest4124 left13:10
→ Rhvs joined13:11
← cdown left13:11
→ cdown joined13:11
→ geowiesnot joined13:12
← tejr left13:13
← cdown__ left13:14
← Strom left13:15
← Xenguy left13:16
→ Strom joined13:17
← ikwyl6 left13:20
→ nyah joined13:22
→ ikwyl6 joined13:25
→ dionysus69 joined13:32
→ wonko-the-sane joined13:33
→ stenno joined13:40
← stenno left13:45
← dionysus69 left13:46
→ gh34 joined13:47
Guest69 I have some changes that I don't want to commit yet, and I want to merge changes from another branch, but I would like to first test whether this merge would cause conflicts. Is there a way to test if a merge will cause conflicts without performing the merge?13:47
← troyt left13:51
jclsn10074 → jclsn13:51
→ cdown_ joined13:54
→ zebrag joined13:55
← coaxing left13:57
ramblebamble Guest69, git stash to secure the changes (later git stash pop to get them back) and then just do a `git checkout -b testing && git merge <the barnch>`13:57
← jimklimov1 left13:57
← cdown left13:57
cdown_ → cdown13:57
→ maxmur joined13:58
maxmur hey13:58
→ gast0n joined13:58
→ tejr joined13:58
→ stenno joined13:58
bertvvvs hey13:58
maxmur how to install git on my computer?13:58
on my windows laptop13:58
help me pls13:59
bookworm https://git-scm.com/13:59
maxmur my mouse have a window13:59
bookworm click the shiny download button, double click the exe, next, next, next done13:59
→ tulpa_ joined13:59
→ kaiseisei joined13:59
maxmur thank you, u meme dude13:59
it's a prank14:00
i have a git on my gentoo linux14:00
do you wanna play brawl stars?14:00
→ duxsco joined14:03
← maxmur left14:03
← Tobbi_ left14:04
→ Eustachy_Kapusta joined14:07
← geowiesnot left14:08
← gast0n left14:09
← Murr left14:09
→ Murr joined14:09
→ JanC joined14:10
→ gast0n joined14:10
→ maxmur joined14:11
→ EdFletcher joined14:11
← kaiseisei left14:11
← FH_thecat left14:11
→ dionysus69 joined14:12
→ malteger joined14:13
← maxmur left14:13
→ kaiseisei joined14:14
→ maxmur joined14:15
← maxmur left14:16
→ ChmEarl joined14:16
→ maxmur joined14:19
maxmur hey14:19
← stenno left14:21
← maxmur left14:22
← nuttingd left14:25
← tyson2 left14:25
← fling left14:25
← kaiseisei left14:25
→ nuttingd joined14:26
→ fling joined14:26
← gurkenglas left14:28
← awmv left14:33
→ Akiva joined14:34
→ stenno joined14:35
→ vladoski joined14:35
← very_sneaky left14:36
→ very_sneaky joined14:37
→ jimklimov joined14:39
→ Csm319_ joined14:40
← igemnace left14:40
→ Tobbi_ joined14:41
← bertvvvs left14:41
← csm3105 left14:43
→ v9fk joined14:44
→ geowiesnot joined14:49
→ lgc joined14:49
→ hqdruxn08_ joined14:51
→ madewokherd joined14:51
→ adanwan_ joined14:52
→ cm315 joined14:52
← adanwan left14:52
← lgc left14:53
← madewokherd` left14:53
→ gurkenglas joined14:53
→ vitali64 joined14:54
← Csm319_ left14:54
→ coaxing joined14:54
← hqdruxn08 left14:55
→ cambrian_invader joined14:59
← phox left15:01
→ fspax joined15:05
← YellowSuB left15:05
← v9fk left15:09
← geowiesnot left15:11
→ YellowSuB joined15:12
← Flooo left15:12
← nuttingd left15:16
→ nuttingd joined15:16
→ vodkra joined15:16
← ramblebamble left15:16
→ xkuru joined15:19
← cm315 left15:20
← fspax left15:20
← dionysus69 left15:21
→ dionysus69 joined15:23
← fling left15:29
→ dionysus70 joined15:29
→ fling joined15:30
← dionysus69 left15:31
dionysus70 → dionysus6915:31
→ geowiesnot joined15:34
→ kenanmarasli joined15:37
← iomari891 left15:37
→ szkl joined15:39
← madewokherd left15:40
← stenno left15:42
← jimklimov left15:42
→ tyson2 joined15:43
← nuttingd left15:45
→ nuttingd joined15:46
→ Misotauros joined15:47
← duxsco left15:48
→ duxsco joined15:49
← nuttingd left15:50
→ nuttingd joined15:51
→ ___nick___ joined15:52
→ jimklimov joined15:54
→ bertvvvs joined15:55
← duxsco left15:56
→ duxsco joined15:57
→ iomari891 joined15:57
← dionysus69 left15:58
← irelativism left16:00
→ subopt joined16:00
← duxsco left16:01
→ dionysus69 joined16:01
→ duxsco joined16:01
← vladoski left16:02
← duxsco left16:04
→ duxsco joined16:04
← nuttingd left16:05
→ nuttingd joined16:05
← mat001 left16:06
→ mat001 joined16:07
← nuttingd left16:07
zebrag Any cool synonym for "put under git"?16:07
→ nuttingd joined16:08
→ great_taste joined16:08
→ tuskkk____ joined16:09
← Murr left16:09
zebrag I've come with "git monitoring", that should do it.16:09
→ Murr joined16:09
tuskkk____ Hello, I was able to successfully remove quite some information from commits using git filter-branch, however the github profile image is still there, how can I remove it?16:09
← duxsco left16:09
→ madewokherd joined16:10
→ duxsco joined16:10
← gast0n left16:10
bookworm tuskkk____: git has no concept of a profile picture, it's not part of the repo16:12
← nuttingd left16:12
← YellowSuB left16:12
bookworm in other words, ask a GH channel16:12
tuskkk____ I see, thanks16:12
→ nuttingd joined16:12
→ YellowSuB joined16:12
mackerman Ask GitHub support or ##github channel16:12
← dharrigan left16:13
← duxsco left16:13
→ duxsco joined16:14
→ dharrigan joined16:14
→ dionysus70 joined16:15
← dionysus69 left16:15
dionysus70 → dionysus6916:15
← duxsco left16:16
→ duxsco joined16:17
← rfuentess left16:18
→ DibbTubberOne joined16:19
← duxsco left16:20
→ duxsco joined16:20
← duxsco left16:20
← ColdKeyboard left16:21
→ ColdKeyboard joined16:22
→ kix joined16:23
→ gast0n joined16:25
OnlineCop Is there a way to list only the number of changed files in each commit in a repo? Something like `commit_sha1: 12`, `commit_sha2: 5000`, `commit_sha3: 5000`, `commit_sha4: 8`, etc.16:27
← sudoforge left16:29
→ sudoforge joined16:30
BtbN write a pre-commit hook that enforces that16:31
But that's only for that specific repo. You can't force that onto everyone who clones from github16:31
OnlineCop A pre-commit hook that enforces what?16:32
← bytehackr left16:32
← fling left16:32
→ fling joined16:33
OnlineCop I've got a repo containing some support files, and many .json files. When we make changes, we either change the support files OR the .json files, but not both in the same commit.16:34
I'm hoping to see which commits contain the .json file updates, so I can skip those since my GUI takes a long time to load/render those 5k changes.16:35
← kenanmarasli left16:38
→ kenanmarasli joined16:38
← jclsn left16:39
→ machinehum joined16:40
→ duxsco joined16:44
← Haohmaru left16:45
← MajorBiscuit left16:49
→ joo-_ joined16:50
joo-_ I dont know if it is git related. but lets say i have a private repository that i am working on, it is very private in nature, but I would like to mark some of the files as "public" somehow, so that i can easily export them... are there any existing elegant solution, or should i just keep a manual list? I was thinking like some kind of source tree browser where i can mark them visually somehow16:51
← ___nick___ left16:52
← duxsco left16:53
→ duxsco joined16:53
← kix left16:53
→ ___nick___ joined16:54
→ jimklimov1 joined16:56
← DNH left16:56
← ___nick___ left16:57
furrymcgee maybe a public submodule16:57
← masber left16:57
← jimklimov left16:58
→ ___nick___ joined16:58
← nuttingd left17:00
← JanC left17:01
→ JanC joined17:01
→ constxd joined17:02
constxd hello17:02
git add isn't doing anything and i can't figure out why17:03
i'm running git add path/to/some/folder17:03
and then afterward git status says there's nothing to commit17:03
and it's not because of my .gitignore17:03
← vysn left17:03
constxd ok i lied it was because of my .gitignore (-f fixed it) ... but it shouldn't be ignored17:04
← duxsco left17:05
→ duxsco joined17:05
constxd nvm there's another .gitignore file in one of the subdirectories...17:06
OnlineCop constxd: You may have two .gitignore files: one global and one within a repo. If those files are ignored due to the local repo's .gitignore, you can either update that file, or just force those individual files into the project.17:06
Whoops: looks like you might have had three then. :P17:06
→ bambanxx joined17:08
← rsx left17:08
← mexen left17:12
→ nvmd joined17:12
tuskkk____ How do I edit the commiter information for a commit?17:13
→ john_johnk joined17:16
→ zer0bitz joined17:18
→ sobkas joined17:18
→ Guest12 joined17:21
← Guest12 left17:22
← LuKaRo left17:26
← dionysus69 left17:28
parsnip discussing with tuskkk____ on ##github17:29
i (we?) would like to know how to display author and committer metadata for a commit hash17:29
`git show <hash>` only shows author17:30
hmm, i'll check `man`17:30
ah, yeah `man git-show` should clarify17:30
gitinfo the git-show manpage is available at https://gitirc.eu/git-show.html17:30
parsnip one sec17:30
← duxsco left17:30
parsnip tuskkk____: try `git show <hash> --pretty=full`, that will show author and committer17:31
if you want it "quieter", you can use `--pretty` with custom characters17:32
`git show --pretty=format:"author: %an <%ae>; committer: %cn <%ce>" <hash>`17:33
i'm not sure how to add a newline yet17:33
oh, %n of course17:34
`git show --quiet --pretty=format:"author: %an <%ae>%ncommitter: %cn <%ce>" <hash>`17:34
→ whatsupdoc joined17:35
parsnip oh derp17:35
`git show --quiet --pretty=full <hash>` is pretty quiet17:35
`--pretty=fuller` if you want timestamps17:36
→ Jacques joined17:37
→ jclsn joined17:39
→ dionysus69 joined17:40
← vicfred left17:41
← DibbTubberOne left17:42
→ LuKaRo joined17:43
→ jstein joined17:49
→ kix joined17:50
→ kix_ joined17:52
← kix left17:53
kix_ → kix17:53
← kix left17:53
→ caveman joined17:57
tuskkk____ thanks parsnip17:58
I made it all work somehow17:58
I have another question now, how do I get rid of a merge commit from the history?17:58
I tried git rebase -i <sha of the commit just before the merge commits>, but don't see the merge commit in there17:59
do I have to edit all the commits and rebase each of them?17:59
→ romesrf joined18:01
parsnip someone here will know more, but i'm guessing if you do `rebase -i` over a divergent merge, it will linearize them, making the merge commit obsolete18:03
→ Tangent-Man joined18:04
tuskkk____ yeah, I think exactly that happened18:04
not sure how to preserve that though18:05
← tyson2 left18:05
← john_johnk left18:05
← zen_coder left18:05
← Tangent-Man left18:05
→ Tangent-Man joined18:06
→ causasui joined18:07
→ AnapodoPsalidaki joined18:08
← AnapodoPsalidi left18:10
parsnip i thought you said you want to get rid of a merge commit. now you want to preserve?18:10
→ zen_coder joined18:10
tuskkk____ there were still bunch of commit and a merge commit on top18:11
commits*18:11
parsnip you mean you want to preserve the divergence, and remove the merge?18:12
→ junktext joined18:12
tuskkk____ yes, the divergence can fall into the main history line18:12
← iomari891 left18:12
tuskkk____ also open to have a squash commit for all of them if that's easiers18:13
easier*18:13
← inceptionflywho left18:14
← zen_coder left18:15
→ zen_coder joined18:15
parsnip can you share the output of something like this:18:16
`git log --oneline --graph --all --pretty=format:"%h" > output`18:16
tuskkk____ https://usercontent.irccloud-cdn.com/file/hDAV5xO1/output18:18
this is so cool, see `cbccf09`18:21
← vitali64 left18:22
→ hololeap_ joined18:23
← hololeap left18:23
→ vitali64 joined18:24
← zen_coder left18:24
← bambanxx left18:27
→ MajorBiscuit joined18:27
tuskkk____ also now I am super confused with this behaviour, this merge commit is not there in `git log`18:27
parsnip it's there in git log --graph --all though, right?18:28
← YellowSuB left18:29
← roadie left18:29
parsnip maybe --graph is necessary18:29
← szkl left18:29
parsnip --all just means include commits reachable from other branch tips18:29
try `git log --oneline --graph`18:30
→ YellowSuB joined18:30
parsnip oh, you need --all18:30
tuskkk____ ok18:30
parsnip because that commit is reachable from the 7f49d3c tip18:31
it's not reachable from the 16800b3 tip18:31
→ rgrinberg joined18:31
tuskkk____ not fully understanding what happened here though https://usercontent.irccloud-cdn.com/file/tcfCF3c2/Screenshot%202022-04-04%20at%2020.31.26.png18:31
why is cbccf09 being part of another branch18:32
← seifeslimene_ left18:32
tuskkk____ or to rephrase, why its listed on a side line instead of the main line18:32
→ seifeslimene_ joined18:32
parsnip do the branch ref labels at the tips give a clue?18:33
seems like someone merged at c504cbc and 105610d18:33
that involves three commits, so you could look at the timestamps to consider who did that and why18:34
and the author/committer of the merge commit18:34
try `git show cbccf09 --pretty=fuller` maybe?18:35
seifeslimene_ I use rbenv18:35
What is 2.6.0 /home/seifeslimene/.rbenv/versions/2.6.2/lib/ruby/gems/2.6.018:35
← MajorBiscuit left18:35
seifeslimene_ and why not 2.6.218:35
?18:35
← dionysus69 left18:36
tuskkk____ ahh I see18:36
parsnip are you looking for #ruby?18:36
tuskkk____ so its all on timestamps18:36
→ vdamewood joined18:36
mackerman seifeslimene_: That is not a git question, try #ruby channel18:36
→ dionysus69 joined18:37
tuskkk____ I think I will give up, making a git history clean is a mess18:37
parsnip tuskkk____: all of what is on timestamps?18:37
tuskkk____ being on the leftmost line or with a space on the right18:37
in the graph I mean18:37
← gurkenglas left18:37
parsnip oh, i'm not sure18:37
→ gurkenglas joined18:38
parsnip there might be a notion of primary parent or something? i'm not fluent on this.18:38
tuskkk____ time to read the implementation of git I guess :D18:39
thanks for following along parsnip!18:39
parsnip :-)18:40
`--simplify-by-decoration` will abbreviate the graph, in a sense18:40
potentially https://git-scm.com/docs/git-log would clarify how the graph is shaped18:41
→ john_johnk joined18:46
← dionysus69 left18:54
→ roadie joined18:54
→ qpdb joined18:55
← qpdb left18:59
← roadie left19:00
← Jacques left19:02
← ano left19:04
→ ano joined19:04
→ cerill joined19:05
→ reset joined19:07
→ hbautista__ joined19:09
→ roadie joined19:11
→ qpdb joined19:12
← rgrinberg left19:13
← caveman left19:13
→ kenanmarasli_ joined19:14
← john_johnk left19:14
→ kevin_git joined19:15
← kenanmarasli left19:16
← roadie left19:17
→ roadie joined19:17
← tsdh left19:17
← TheCatBehemoth left19:19
→ TheCatBehemoth joined19:19
→ tsdh joined19:20
→ DNH joined19:24
kenanmarasli_ → kenanmarasli19:25
← Visne left19:28
→ Visne joined19:29
← Strom left19:30
← jstein left19:31
→ Strom joined19:32
← coot left19:35
← roadie left19:38
→ tyson2 joined19:39
← otisolsen70 left19:45
→ rgrinberg joined19:46
← cerill left19:46
kevin_git Hi, I'm on Windows 10, and trying to merge two branches. I'm getting an error that a certain file, which nothing abnormal that I can see, and is just a "text" file, cannot be merged because it is binary. The file command shows the file in both branches as : "Unicode text, UTF-16, little-endian text, with CRLF line terminators"19:47
I've done some googling and have tried a few things in the .gitattributes etc, but no luck so far. The file is a .sln file (Visual Studio "solution"). It looks normal in vscode.19:48
ikke UTF-16 can be considered binary if git is not aware it's UTF-1619:48
Because it contains 0-bytes19:49
→ stenno joined19:49
BtbN Yeah, a UTF-16 file will only cause pain and confusion. Better fix it before ever committing it19:50
→ skapata joined19:52
← skapata left19:52
→ skapata joined19:52
→ MajorBiscuit joined19:57
→ john_johnk joined19:58
← TheCatBehemoth left20:01
← MajorBiscuit left20:01
→ hololeap joined20:03
← ___nick___ left20:04
← hololeap_ left20:04
← stenno left20:06
kevin_git We have many such files, some of them are UTF-16LE, some are UTF-8. and some are even ascii text. Not sure why we haven't run into this issue previously.20:07
← gh34 left20:07
ikke maybe compare git ls-files --eol20:11
→ spacenautx joined20:12
← zer0bitz left20:13
osse i suggest converting them to utf-820:13
we have a lot of .sln at work and they work fine as utf-820:14
→ TheCatBehemoth joined20:14
ikke https://stackoverflow.com/questions/52472435/why-doesnt-git-natively-support-utf-1620:15
→ Lord_of_Life_ joined20:17
← Lord_of_Life left20:17
→ wonko-th1-sane joined20:20
Lord_of_Life_ → Lord_of_Life20:20
← wonko-the-sane left20:20
← romesrf left20:23
→ V joined20:27
→ stenno joined20:30
← stenno left20:30
← john_johnk left20:32
← nvmd left20:33
← geowiesnot left20:34
→ cerill joined20:35
→ romesrf joined20:36
← humanface left20:37
→ hololeap_ joined20:37
← hololeap left20:38
→ coot joined20:39
→ AbleBacon_ joined20:41
← bertvvvs left20:42
← AbleBacon left20:44
→ duxsco joined20:46
→ LuxuryMode joined20:49
→ dionysus69 joined20:52
→ hololeap joined20:53
← hololeap_ left20:54
← Sulky left20:54
← Tangent-Man left20:55
← dionysus69 left20:56
→ hololeap_ joined20:57
→ wgrant joined20:58
← hololeap left20:58
← lelux left21:04
← romesrf left21:09
← walter_whip_ left21:10
← srinidhi left21:11
← tulpa_ left21:11
→ Guest81 joined21:12
← madewokherd left21:12
← hololeap_ left21:13
← Guest81 left21:14
→ hololeap_ joined21:14
← vitali64 left21:16
→ lelux joined21:19
← rgrinberg left21:20
→ walter_whip_ joined21:23
← whatsupdoc left21:24
→ jazzy joined21:27
← hololeap_ left21:28
→ jmcb joined21:29
← jmcb left21:29
→ hololeap_ joined21:30
→ romesrf joined21:32
← kevin_git left21:32
← EvilDMP left21:37
← qpdb left21:39
← lelux left21:41
← romesrf left21:41
→ vicfred joined21:42
← palasso left21:42
→ madewokherd joined21:44
→ odoood joined21:44
→ nuttingd joined21:47
← coot left21:47
← DNH left21:51
→ romesrf joined21:56
→ hololeap joined21:56
← hololeap_ left21:57
← romesrf left22:00
← chemsmith left22:06
→ DNH joined22:06
→ chemsmith joined22:06
← funhouse left22:08
← Murr left22:09
→ Murr joined22:09
← kenanmarasli left22:13
← great_taste left22:15
AbleBacon_ → AbleBacon22:15
→ Xenguy joined22:16
← odoood left22:17
→ odoood joined22:18
→ hololeap_ joined22:20
→ rgrinberg joined22:21
← hololeap left22:21
← zumba_addict left22:22
← Xenguy left22:26
← hololeap_ left22:28
← cerill left22:28
← rgrinberg left22:29
→ hololeap_ joined22:29
→ romesrf joined22:30
← romesrf left22:35
→ w_lehinsun joined22:36
← TheCatBehemoth left22:37
← feriman left22:39
← causasui left22:39
← DNH left22:45
← Celeo left22:45
← odoood left22:46
← Guest69 left22:47
← nuttingd left22:47
← zeenk left22:48
→ Celeo joined22:51
← sobkas left22:52
→ jkl joined22:53
→ causasui joined22:54
← realies left22:56
← nyah left22:56
→ realies joined22:56
← walter_whip_ left22:57
→ romesrf joined22:57
→ madewokherd` joined22:58
→ nahcetan joined22:59
← n8chan left23:00
→ cx_ joined23:00
← madewokherd left23:01
← romesrf left23:03
→ pizdets joined23:03
← pizdets_ left23:04
← cx_ left23:04
→ Jacques joined23:05
← sa0 left23:09
→ sa0 joined23:10
← sa0 left23:15
→ Thanatermesis joined23:23
→ phox joined23:27
← phox left23:32
← Jacques left23:36
← frobnic left23:38
← Ionic left23:40
→ Ionic joined23:41
→ nuttingd joined23:41
→ chenqisu12 joined23:43
→ inversed joined23:48
← inversed_ left23:49
→ romesrf joined23:51
← nuttingd left23:51
→ nuttingd joined23:54
← romesrf left23:56
← duxsco left23:56
→ v9fk1yn3nu joined23:56
← thebombzen left23:58
seifeslimene_ → seifeslimene23:59

Logs Search ←Prev date Next date→ Channels Documentation