IRCloggy #git 2023-02-08

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.

2023-02-08

← omethe left00:00
→ omethe joined00:01
← gildasio1 left00:02
→ Xenguy joined00:05
← The_Blode left00:06
→ peirik_ joined00:11
← roadie` left00:16
← datascraper left00:18
← tdwdiod^ left00:24
→ sqrl joined00:31
← YuGiOhJCJ left00:31
← luckman212 left00:32
→ luckman212 joined00:34
→ YuGiOhJCJ joined00:38
→ SuperLag joined00:39
← nyah left00:40
← selve left00:42
← NeatNit left00:42
→ selve joined00:43
→ NeatNit joined00:48
← BigShip left00:54
→ BigShip joined00:55
← Hi-Angel left00:55
← peirik_ left00:57
← YuGiOhJCJ left00:58
→ YuGiOhJCJ joined01:00
→ datascraper joined01:05
→ lucasta joined01:06
→ lolok joined01:08
← m0viefreak left01:09
← R2robot left01:11
→ R2robot joined01:11
→ dsrt^ joined01:14
← ferdna left01:20
← moha left01:20
← infernix left01:22
→ juno__ joined01:23
→ peirik_ joined01:25
← lucasta left01:25
→ madjones joined01:28
→ roadie` joined01:31
← cbreak left01:34
→ cbreak_ joined01:34
← juno__ left01:35
→ gsi joined01:35
→ lucasta joined01:35
→ infernix joined01:38
← gsi_ left01:38
← rama left01:38
← cbreak_ left01:42
→ gizmore|2 joined01:43
→ rama joined01:44
← madjones left01:44
← zeroes left01:46
→ zeroes joined01:46
← gizmore left01:46
→ cbreak joined01:47
← rama left01:48
← roadie` left01:50
← Oblomov left01:54
→ bywaterloo_ joined01:54
← kurbus left01:55
→ rama joined01:55
← gas51627 left01:56
← Leonarbro left01:56
← SANTAman left01:57
← bywaterloo left01:58
← pabs3 left01:58
← peirik_ left01:58
← germ_ left02:00
→ hayaliali joined02:01
→ germ joined02:02
← rama left02:05
→ Oblomov joined02:17
→ Lord_of_Life_ joined02:23
← Lord_of_Life left02:23
Lord_of_Life_ → Lord_of_Life02:25
← datascraper left02:30
← lucasta left02:33
→ gast0n joined02:35
→ rama joined02:36
← rama left02:41
→ lucasta joined02:43
→ peirik_ joined02:44
← ___nick___ left02:45
→ jacobk joined02:45
→ ___nick___ joined02:47
← ___nick___ left02:47
→ rama joined02:48
→ ___nick___ joined02:49
← rama left02:52
← peirik_ left02:54
→ lucasta_ joined02:55
→ rama joined02:59
← cronos left03:03
← Oblomov left03:04
→ cronos joined03:04
← rama left03:04
← YuGiOhJCJ left03:07
← bywaterloo_ left03:08
→ bywaterloo joined03:09
→ rama joined03:11
← lucasta left03:13
← rama left03:15
→ YuGiOhJCJ joined03:16
→ roadie` joined03:18
→ lucasta joined03:26
Abrax → |_03:27
|_ → Abrax03:27
→ Oblomov joined03:28
← Abrax left03:29
← plocket left03:29
→ Abrax joined03:30
→ finn_elija joined03:34
← FinnElija left03:34
finn_elija → FinnElija03:34
← jacobk left03:38
→ peirik_ joined03:40
← terrorjack left03:41
← roadie` left03:41
→ rama joined03:41
→ terrorjack joined03:42
← bywaterloo left03:45
← peirik_ left03:45
← rama left03:46
→ Jong joined03:50
→ rama joined03:52
← rama left03:57
→ jacobk joined04:01
← FinnElija left04:03
→ rama joined04:04
→ FinnElija joined04:06
← gast0n left04:07
→ falafel joined04:07
← c0dehu1k left04:08
← rama left04:09
← Flow left04:09
← lucasta left04:12
→ lucasta joined04:16
→ rama joined04:16
→ SunClonus joined04:20
← rama left04:20
← SunClonus left04:23
→ Flow joined04:23
→ rama joined04:27
← constxd left04:28
→ constxd joined04:30
← rama left04:32
→ rama joined04:34
← omethe left04:34
← constxd left04:35
→ omethe joined04:36
→ constxd joined04:36
← lucasta_ left04:38
← rama left04:38
← lucasta left04:41
→ rama joined04:45
→ lucasta joined04:48
← GNUmoon left04:49
← rama left04:49
→ GNUmoon joined04:51
← lucasta left04:54
← Maxattax97 left04:55
→ rama joined04:56
← farzat left05:00
← rama left05:01
→ roadie` joined05:02
→ farzat joined05:02
→ lucasta joined05:05
← lucasta left05:09
← bket left05:09
→ bket joined05:12
→ han-solo joined05:14
← trafficjam left05:19
→ lucasta joined05:20
← roadie` left05:22
→ madjones joined05:25
← madjones left05:28
→ rama joined05:32
← rama left05:36
← lucasta left05:36
→ rama joined05:37
← rama left05:42
→ The_Blode joined05:43
← chexum left05:53
← YuGiOhJCJ left05:53
→ chexum joined05:54
→ YuGiOhJCJ joined05:54
← chexum left05:58
→ chexum joined05:59
← thiago left05:59
→ otisolsen70 joined05:59
→ roadie` joined06:00
← roadie` left06:04
← weko_ left06:06
→ weko joined06:07
→ roadie` joined06:12
→ rama joined06:12
← rama left06:17
→ rama joined06:18
→ Saloframes joined06:22
← Saloframes left06:22
← rama left06:22
→ Saloframes joined06:22
→ grub-reinstall joined06:23
→ rama joined06:29
← roadie` left06:33
← rama left06:34
→ rama joined06:36
→ grub-reinstall_ joined06:37
← falafel left06:38
← rama left06:40
← grub-reinstall left06:41
grub-reinstall_ → grub-reinstall06:41
← sqrl left06:42
→ rama joined06:47
← faceface_ left06:49
→ yuesbeez joined06:51
← rama left06:52
← konsolebox left06:52
→ EvgenyK joined06:52
← jacobk left06:56
→ roadie` joined06:56
← EvgenyK left06:57
→ Hi-Angel joined06:58
→ rama joined06:58
← grub-reinstall left07:03
← rama left07:03
→ grub-reinstall joined07:05
← Saloframes left07:06
← grub-reinstall left07:07
→ lucasta joined07:07
→ V-T60 joined07:07
V-T60 hello07:07
bookworm o/07:08
how can we help?07:08
→ Saloframes joined07:08
V-T60 bookworm: i broke something on my project with git07:09
just look at these weird looking words07:09
https://bpa.st/raw/XNY5M07:09
<<<<<<< HEAD07:09
bookworm that isn't breakage, jsut a merge conflict marker07:09
you need to resolve it so that it makes sense07:09
V-T60 >>>>>>> master07:10
do i need to edit this file right now?07:10
bookworm V-T60: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line07:10
yes07:10
→ rama joined07:10
bookworm https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts is better, even07:10
V-T60 but why on earth this commit is the last one? i've just done yet another commit on my local computer07:11
and wanted to push that to remote07:11
commit 2671d29f9d53d7d14931dfead551678267d7ecf3 (HEAD, origin/master, origin/HEAD)07:11
bookworm and then you called merge or some such07:11
you don't get merge conflicts without doing a rebase / merge or reshuffling of commits07:12
V-T60 it complained about need of one of those07:12
bookworm read the atlassian link, preferably also a few others in the series07:12
well, yes. Because your remote diverged from your local stae07:12
V-T60 and i edited a config to automatically rebase, probably...07:12
or did some other commands, randomly07:13
bookworm randomly is usually a bad approach, yes ;)07:13
→ c0dehu1k joined07:14
V-T60 though, this situation is mostly for learning. i didn't do much useful in the hypothetical case of losing something07:14
just wanted to understand how to synchronize07:14
bookworm sure07:14
git told you where the conflicting things are, so now just fix those up and commit again07:14
git status should tell you that too07:15
← c0dehu1k left07:15
bookworm or well, rebase --continue, depending on what state you are in exactly07:15
← rama left07:15
bookworm but again, git status will tell you07:15
→ grub-reinstall joined07:15
→ c0dehu1k joined07:15
V-T60 interactive rebase in progress; onto 2671d2907:16
this one is red: both added: ZPDG.sh07:16
bookworm did you read the atlassian link yet?07:17
→ irrgit__ joined07:18
V-T60 i'm doing that at the moment07:19
→ EvgenyK joined07:19
← irrgit_ left07:21
→ rama joined07:22
← rubbadovedove left07:25
← rama left07:26
→ zeroes_ joined07:26
→ duxsco joined07:27
V-T60 yeah, that situation is exactly like what i have07:28
do i have to just remove all unnecessary line out of there? according to the documentation07:29
← zeroes left07:29
← EvgenyK left07:31
→ rubbadovedove joined07:31
→ rama joined07:33
V-T60 that works07:34
← rubbadovedove left07:35
→ rubbadovedove joined07:37
← rama left07:38
grub-reinstall → HugoH07:39
bookworm well, just fix it up so that it makes sense in the context you're in07:39
→ rama joined07:40
→ coot joined07:41
HugoH hey07:41
V-T60 hello07:42
HugoH why my commits made on my pc are not compatible with github while I am connected with github with visual studio code07:43
https://i.imgur.com/Wn26d61.png07:43
V-T60 bookworm: now every repository is synchronized https://git.shapovalov.tech/ZPDG/log.html07:44
HugoH my git config is that07:44
← rama left07:44
V-T60 now i'm going to find one of the previous documentation pages that was sent before07:45
and clean commit history07:45
→ EvgenyK joined07:45
→ mexen joined07:46
V-T60 does anyone know what is Unnamed repository; edit this file 'description' to name the repository.07:46
where do i specify this?07:46
← Aminda left07:48
→ Aminda joined07:49
V-T60 is that git specific at all? stagit gave me such output07:49
← FinnElija left07:49
→ FinnElija joined07:50
→ rama joined07:51
→ moha joined07:51
← whatsupdoc left07:52
→ iomari891 joined07:54
← rama left07:55
grawity that comes from the .git/description file07:57
edit it directly07:57
V-T60 grawity: nice. isn't very good to sed all files07:58
.html07:58
→ onizu joined07:59
← [twisti] left08:00
V-T60 $ git push home master08:01
Everything up-to-date08:01
why is that so?08:01
i edited .git/description file08:01
grawity the description is not synchronized between repos08:02
V-T60 that's not good08:03
do i need to edit that manually everywhere?08:03
grawity does it matter everywhere?08:04
probably the only place it matters is your cgit or gitweb server or similar08:04
can't think of any other tools that would show the description08:04
→ rfuentess joined08:06
← rubbadovedove left08:10
→ rubbadovedove joined08:12
→ zeenk joined08:12
← farzat1 left08:16
← Bardon left08:18
→ VaniaPy joined08:20
← zeroes_ left08:24
→ zeroes_ joined08:24
← dustinm left08:25
← wyre left08:27
← han-solo left08:27
→ dustinm joined08:27
→ wyre joined08:28
→ han-solo joined08:29
→ dustinm` joined08:31
← HugoH left08:31
→ rama joined08:32
← dustinm left08:32
← jkl left08:33
→ jkl joined08:34
← lacrymology left08:35
→ nevyn joined08:36
← rama left08:36
→ prime joined08:37
← dermoth left08:38
→ LW joined08:39
→ derfflinger joined08:40
→ DrowningElysium joined08:41
← GoGi left08:42
→ rama joined08:43
← Betal left08:45
→ sa0 joined08:46
→ GoGi joined08:46
← GoGi left08:46
→ GoGi joined08:46
← rama left08:48
→ EvgenyK_ joined08:48
← Nintendo left08:48
→ Bardon joined08:49
← EvgenyK left08:49
→ EvgenyK joined08:50
← iomari891 left08:50
→ dermoth joined08:51
→ peirik_ joined08:53
→ Nintendo joined08:53
← EvgenyK_ left08:53
← llh left08:54
← skapata left08:55
→ rama joined08:55
← roadie` left08:56
→ roadie` joined08:56
→ llh joined08:56
→ TomyWork joined08:56
→ MajorBiscuit joined08:57
← mnathani left08:57
→ mnathani joined08:58
→ HugoH joined08:58
→ farzat1 joined08:58
→ EvgenyK_ joined08:58
← rama left09:00
← ackyshake left09:00
→ filePeter joined09:01
← EvgenyK left09:01
hayaliali → alip09:01
→ jaredce joined09:02
← escherial left09:07
← peirik_ left09:07
→ theoceaniscool joined09:09
← jb1277976 left09:09
→ jb1277976 joined09:09
→ f_ joined09:13
→ bgs joined09:14
→ iomari891 joined09:17
← dviola left09:23
→ dviola joined09:23
→ EvgenyK joined09:23
→ feriman joined09:24
→ peirik_ joined09:24
← iomari891 left09:25
← EvgenyK_ left09:26
→ Masklin__Gurder joined09:27
→ iomari891 joined09:27
← Masklin left09:27
Masklin__Gurder → Masklin09:28
→ dionysus69 joined09:29
← lucasta left09:30
→ Aule joined09:32
→ rama joined09:35
← warmana left09:35
← feriman left09:36
→ feriman joined09:37
→ irrgit_ joined09:38
← rama left09:41
← irrgit__ left09:41
← feriman left09:43
← duxsco left09:45
→ rama joined09:47
← rama left09:52
← yuesbeez left09:55
→ stenno joined09:57
→ nyah joined09:58
← hamburgler left09:58
stenno good day, way back we did not have a proper development branch - we had a big feature branch big_feature which was our de-facto dev branch. So back in the day, hundreds of commits ago, i derived my own some_feature branch from big_feature and happily coded away09:58
recently, we decided to create an actual development branch: so we derived a branch 'development' from our branch big_feature, and locked the big_feature branch09:59
now i am a bit confused... if i was to finally create a pull request for my some_feature branch to development, -10:00
damn i am confused, i cannot even properly formulate my question10:01
→ powftw joined10:01
stenno sorry for the noise, i will think about this a bit more before asking concrete questions lol10:01
← XV8 left10:03
← The_Blode left10:03
→ XV8 joined10:04
→ rama joined10:05
← peirik_ left10:06
→ mobidrop joined10:08
← rama left10:09
→ gtdg joined10:10
← gtdg left10:11
→ gtdg joined10:11
Aule stenno if you were to create a PR to the development branch, because it is branched off of big_feature, you should be able to create a PR no problem, but because you've been branched off for so long, you'll likely run into merge conflicts, if you branch off of your feature branche to a test one, and try a rebase onto development, that'll let you see conflicts before going through a PR. Just to let you get a lay of the things to fix before creating a PR10:14
stenno yes, that is exactly what i am doing right now :D thanks!10:15
i planned that after successful rebasing , that i will just rename this test branch to the actual feature branch10:16
→ rama joined10:16
→ unixaos joined10:19
→ dinkus joined10:20
← rama left10:20
← gxt left10:24
← roadie` left10:26
→ roadie joined10:27
→ fstd_ joined10:27
← wolfdale83 left10:27
→ drogas joined10:27
→ pconst167 joined10:27
→ wolfdale83 joined10:27
← fstd left10:30
fstd_ → fstd10:30
← umbramalison_alt left10:30
← BlessJah left10:31
→ umbramalison joined10:31
→ lucasta joined10:32
→ BlessJah joined10:34
→ peirik_ joined10:34
← reset left10:36
stenno damn i did it, all is well again10:43
thanks again Aule !10:43
Aule You're welcome stenno, glad you're sorted, I'd say it's maybe a good idea to rebase your branch somewhat frequently, otherwise you're coding without awareness of other features, saves the pain of a lot of conflicts10:46
→ rama joined10:46
stenno yeah i usually try to do that but in this specific case somehow i didn't10:47
← peirik_ left10:47
Aule It happens, I'm well into trunk based development now, so I avoid long term feature branches, saves the headache tbh, but you need to be more careful when working on long features10:49
← rama left10:51
→ unluckyshrubbery joined10:52
→ rama joined10:53
← otisolsen70 left10:55
← dionysus69 left10:55
← rama left10:57
→ rama joined10:59
Abrax → BD11:00
BD → Abrax11:01
← rfuentess left11:01
← HugoH left11:02
→ feriman joined11:03
← rama left11:03
→ peirik_ joined11:05
→ dionysus69 joined11:07
→ unixaos1 joined11:09
→ rama joined11:11
← unixaos left11:11
← lolok left11:11
→ lolok joined11:14
← rama left11:16
← coot left11:19
← peirik_ left11:20
→ rama joined11:22
← gtdg left11:26
← rama left11:27
→ rama joined11:28
→ irrgit__ joined11:30
← rama left11:33
← irrgit_ left11:33
→ irrgit_ joined11:34
← irrgit__ left11:35
← tirnanog left11:41
← unixaos1 left11:41
← f_ left11:42
→ coot joined11:42
→ f_ joined11:44
→ peirik_ joined11:46
← dob1 left11:47
← randm left11:54
→ randm joined11:54
→ roadie` joined11:55
← Ingvix left11:57
← pconst167 left11:58
← roadie left11:58
→ Ingvix joined11:58
→ pconst167 joined11:58
→ dob1 joined12:02
→ rama joined12:04
→ rfuentess joined12:06
← rama left12:08
← feriman left12:12
→ feriman joined12:12
→ rama joined12:12
← rama left12:17
← lucasta left12:19
← peirik_ left12:20
gizmore|2 → gizmore12:23
→ rama joined12:24
← rama left12:28
← jdarnley left12:28
← c0dehu1k left12:30
→ J_Darnley joined12:31
← f_ left12:31
→ arch_angel joined12:31
← dinkus left12:32
→ dinkus joined12:32
→ peirik_ joined12:34
→ rama joined12:35
← rama left12:40
← Holz left12:40
→ bewees joined12:41
bewees Hi, if I rebased branch A to master, and then checkout master, what would be the difference, if I then `git rebase A` or `git merge A`. I think there is no difference, because the first rebase implies that the A's commits are rewritten to the branch tip of master, and then you could aswell just do `merge` from master? https://bpa.st/PPQVO12:41
→ gxt joined12:42
selckin everything sounds right, not sure what the question is, do that merge instead of what?12:43
→ rosco joined12:47
→ Holz joined12:47
← rustyshackleford left12:47
bewees selckin, I wonder if it matters if I do `git checkout feature; git rebase master; git checkout master; git rebase A` vs `git checkout feature; git rebase master; git checkout master; git merge A`, I was on youtube videos that people sometimes first or second option12:49
/s/was/saw/12:49
+did12:49
selckin they are basically the same since hte merge will do a fast forward since you only have new commits on top of master12:51
bewees Gotcha, thank you! So could use either in that situation12:52
← peirik_ left12:54
→ peirik_ joined12:58
← roadie` left13:00
→ HugoH joined13:01
← HugoH left13:01
→ blackhawk joined13:01
→ HugoH joined13:01
→ gryffus joined13:02
← peirik_ left13:03
← VaniaPy left13:04
→ peirik_ joined13:04
→ clime joined13:08
→ xheimlich joined13:09
← peirik_ left13:09
→ rama joined13:11
→ bywaterloo joined13:11
← rama left13:15
→ rama joined13:16
← rama left13:20
→ lucasta joined13:22
→ peirik_ joined13:23
← YuGiOhJCJ left13:23
→ halting joined13:24
← halting left13:24
→ rama joined13:27
← peirik left13:28
← feriman left13:29
→ peirik joined13:30
← dsrt^ left13:31
← rama left13:32
← lolok left13:33
→ rama joined13:34
→ lucasta_ joined13:34
← rama left13:39
← jaredce left13:41
→ rama joined13:45
← xeelad left13:47
→ xeelad joined13:47
← rama left13:50
→ jdarnley joined13:50
← J_Darnley left13:50
← bywaterloo left13:52
→ kaisyu joined13:53
→ gildasio1 joined13:53
← lucasta left13:53
← peirik_ left13:57
→ rama joined13:57
← coot left13:59
← HugoH left13:59
→ jaredce joined13:59
← rama left14:01
← KimK_ left14:02
→ KimK joined14:05
← arch_angel left14:08
→ rama joined14:08
← mexen left14:12
← rama left14:13
→ maret joined14:17
→ Guest78 joined14:17
← Xenguy left14:17
→ rama joined14:20
→ VaniaPy joined14:20
→ cdown joined14:20
← rama left14:25
← maret left14:27
→ coot joined14:30
← derfflinger left14:31
→ agowa338 joined14:33
→ megox joined14:33
→ d[-_-]b joined14:34
→ causasui joined14:35
← epony left14:37
← stenno left14:37
← powftw left14:41
→ feriman joined14:42
→ derfflinger joined14:43
→ epony joined14:44
→ kkawg joined14:45
← VaniaPy left14:45
← pconst167 left14:46
→ pconst167 joined14:47
→ rustyshackleford joined14:49
← pconst167 left14:53
← blackhawk left14:53
→ kurbus joined14:54
→ rama_ joined14:55
→ zeroes joined14:56
→ blackhawk joined14:57
← kurbus left14:58
→ kurbus31 joined14:58
kurbus31 → kurbus14:58
← zeroes_ left14:58
← rama_ left14:59
← gryffus left15:00
→ VaniaPy joined15:01
← xheimlich left15:03
→ peirik_ joined15:05
→ rama_ joined15:06
← rama_ left15:11
→ thiago joined15:11
→ xheimlich joined15:12
← mei left15:13
d[-_-]b → stenno15:15
→ arch_angel joined15:17
← VaniaPy left15:17
← feriman left15:18
← xheimlich left15:27
← derfflinger left15:29
→ derfflinger joined15:30
→ lgc joined15:32
← lgc left15:33
← zeroes left15:33
→ briian joined15:33
→ zeroes joined15:33
→ rama_ joined15:36
← peirik_ left15:38
← rama_ left15:40
← mobidrop left15:45
→ rama_ joined15:47
← xeelad left15:48
→ xeelad joined15:48
→ codaraxis joined15:49
← codaraxis left15:50
→ mei joined15:50
→ codaraxis joined15:50
← codaraxis left15:51
→ sedzcat joined15:51
→ codaraxis joined15:52
← rama_ left15:52
← nattiestnate left15:52
→ madjones joined15:53
→ nattiestnate joined15:53
→ DEEPAKs joined15:54
← DEEPAKs left15:54
OMGOMG when editing the commit message, can the content of the commit be shown as a comment, in addition to the status?15:55
→ osprey joined15:58
→ rama_ joined15:59
← derfflinger left15:59
← blackhawk left16:01
osse OMGOMG: git commit -v16:02
git config commit.verbose true16:02
← kaisyu left16:03
← rama_ left16:04
→ derfflinger joined16:05
→ cdown_ joined16:05
→ rama_ joined16:05
→ bywaterloo joined16:05
→ xheimlich joined16:05
OMGOMG i swear i rt entire fm except for that bit16:06
thanks16:06
← cdown left16:07
cdown_ → cdown16:07
← rama_ left16:10
→ peirik_ joined16:12
→ cdown_ joined16:16
← peirik_ left16:17
← kurbus left16:18
← derfflinger left16:18
← cdown left16:18
cdown_ → cdown16:18
← gildasio1 left16:19
→ gildasio1 joined16:21
← madjones left16:21
← chexum left16:25
← zeroes left16:25
← jdarnley left16:25
→ zeroes joined16:25
→ chexum joined16:25
→ sqrl joined16:28
→ anarchat joined16:30
→ duxsco joined16:31
→ rama_ joined16:31
← osprey left16:32
← redbool left16:33
← kkawg left16:35
← rama_ left16:35
→ rama_ joined16:35
← anarchat left16:36
→ peirik_ joined16:37
← chexum left16:38
← rfuentess left16:39
→ chexum joined16:39
→ J_Darnley joined16:39
→ redbool joined16:39
→ gast0n joined16:45
→ lucasta joined16:46
← chexum left16:47
→ unixaos joined16:47
← J_Darnley left16:47
→ chexum joined16:47
← duxsco left16:49
→ duxsco joined16:50
osse You retweeted the entire fucking magnet?16:51
→ f_ joined16:52
gizmore howto delete a commit all between the blockchain?16:53
→ gh34 joined16:53
← unixaos left16:55
← lxsameer left16:55
→ kurbus joined16:55
→ vmonteco joined16:56
← lucasta left16:57
→ J_Darnley joined16:57
← cdown left16:58
→ kurbus27 joined17:00
kurbus → Guest238917:01
kurbus27 → kurbus17:01
→ maret joined17:01
← Guest2389 left17:01
← dinkus left17:02
→ dinkus joined17:02
← kurbus left17:06
→ kurbus joined17:07
← arch_angel left17:09
← peirik_ left17:10
← Hi-Angel left17:10
← kurbus left17:11
→ lucasta joined17:16
→ f3n1x joined17:17
→ c0dehu1k joined17:17
→ Leonarbro joined17:17
← duxsco left17:19
f3n1x i might be missing some very basics here ... ? why is git not honouring my [user]17:19
email = [email@hidden.address]17:19
name = Fenix17:19
~/.config/git/config parameters file but prompting me to manually setup them when git pushing ?17:19
← xheimlich left17:19
f3n1x thanks, thanks, thanks17:19
← lucasta left17:20
ikke f3n1x: user.name is not used for pushing (it's not authentication)17:20
Those are only used to set the author / commiter field in commits17:21
← DrowningElysium left17:21
→ matni1 joined17:21
f3n1x ah, ikke --- nice to know, how setup it not manually but programmatically ?17:22
→ TheCatBehemoth joined17:22
acidbong define programmatically?17:23
f3n1x i mean, so that next time for whatever reason i change to another PC and/or operating system and have this already pre-configured in the future ?17:23
acidbong or do you mean `git config user.name "Fenix"`17:24
← han-solo left17:24
acidbong ?17:24
f3n1x yeah, of course i can type that command... in other words, in which config file is git storing those settings i wonder ?17:25
acidbong if you wanna back up your git ID, you have to set them up with `git config --global`17:25
they're gonna be saved to `~/.gitconfig`17:26
← MajorBiscuit left17:26
f3n1x nice to know ! thanks, thanks, thanks17:26
acidbong and then you use whichever backup solution you know or like17:26
including git itself17:27
→ peirik_ joined17:27
f3n1x okey !... a symlink to ~/.config/git/.gitconfig may do the job ?17:28
gitinfo [!dots] A..B = stuff that happened between A and B (if A and B are related; otherwise refer to "man gitrevisions"), A...B = (a) in history viewers: stuff that isn't in both A and B yet; (b) in "git diff": stuff that happened in B since the two diverged; (c) in "git checkout": the merge base of A and B. "master.." is the same as "master..HEAD" and "..master" is the same as "HEAD..master", and so forth.17:28
→ lucasta joined17:29
← Aule left17:30
← peirik_ left17:31
→ roadie joined17:35
← filePeter left17:39
acidbong f3n1x, sorry for confusion17:39
the docs say both paths are valid, just ~/.gitconfig is the one that's created automatically17:39
← rama_ left17:40
← lucasta left17:40
acidbong ah, the longer one should be ~/.config/git/config, you got it right first time17:40
→ lacrymology joined17:46
→ rama_ joined17:48
stenno huh how strange17:50
i am on branch foo, from there i did `git fetch bar`, it fetched bar: * brach bar -> FETCH_HEAD17:51
→ lucasta joined17:51
stenno now i try `git checkout bar` but i get 'did not match any files known to git'17:51
didn't i just fetch the branch from origin?17:51
→ warmana joined17:56
→ xheimlich joined17:58
→ peirik_ joined17:59
← dionysus69 left18:00
← peirik_ left18:04
← dinkus left18:05
→ dinkus joined18:05
← thebombzen left18:08
→ Betal joined18:08
← lucasta left18:17
← f_ left18:22
→ lucasta joined18:28
← iomari891 left18:30
osse stenno: what does git remote print?18:34
stenno 'origin'18:35
osse stenno: do just 'git fetch' and try again18:35
stenno oh sorry, above i said i did `git fetch bar`, but i did `git fetch origin bar`18:36
ok lemme try18:36
it worked just fine18:37
maybe something else was wrong there18:37
osse That other version of fetch is a bit weird. It only stores the result of the fetch in FETCH_HEAD, so the information that the thing that was fetch is named bar is sort of lost18:38
stenno noted18:38
thanks for clarification18:38
osse The friendly version of git fetch creates/updates origin/bar (and origin/foo and...)18:38
← igemnace left18:49
→ derpydoo joined18:49
→ mven1 joined18:50
← mven left18:51
mven1 → mven18:51
→ The_Blode joined18:53
← lucasta left18:58
→ peirik_ joined19:01
← Holz left19:05
← jgalt79 left19:06
→ Hi-Angel joined19:06
← J_Darnley left19:08
→ lucasta joined19:09
→ J_Darnley joined19:09
← gast0n left19:11
← Milos left19:14
→ Milos joined19:15
← TomyWork left19:19
→ kurbus joined19:20
← gildasio1 left19:22
→ so-offish joined19:28
← kurbus left19:30
← J_Darnley left19:30
→ J_Darnley joined19:32
← rosco left19:32
→ rosco joined19:32
← rosco left19:33
← peirik_ left19:36
← TheCatBehemoth left19:40
→ gildasio joined19:42
→ mexen joined19:42
← so-offish left19:44
→ thebombzen joined19:46
→ hectopascal joined19:48
← coot left19:51
← sqrl left19:52
← dinkus left19:52
→ duxsco joined19:53
← rama_ left19:54
→ rama_ joined19:55
lmat_ /quit20:00
← lmat_ left20:01
← lucasta left20:04
← duxsco left20:11
← jaredce left20:12
→ lucasta joined20:14
← J_Darnley left20:18
→ ZacSharp joined20:19
→ J_Darnley joined20:23
← Coop left20:24
→ otisolsen70 joined20:25
→ peirik_ joined20:26
→ igemnace joined20:29
→ halting joined20:29
← peirik_ left20:31
→ reset joined20:33
→ codaraxis__ joined20:34
← halting left20:34
← codaraxis left20:38
← mexen left20:41
→ tirnanog joined20:43
← tomhg left20:46
→ tomhg joined20:46
← J_Darnley left20:48
← lucasta left20:49
→ kurbus joined20:49
→ J_Darnley joined20:52
→ lucasta joined20:52
→ m0viefreak joined20:53
← riposte left20:55
→ riposte joined20:55
← rama_ left20:56
→ rama_ joined20:56
← kurbus left20:57
→ peirik_ joined20:58
← lucasta_ left21:00
← ___nick___ left21:04
→ odoood joined21:06
← rama_ left21:08
→ rama_ joined21:08
→ edgimar joined21:10
→ VaultTec joined21:10
edgimar Our team commits directly to master for smaller series of commits. Is there a way to track (preferably within the git repo itself, maybe automatically in some text file) groups of commits that belong to a particular feature *after* rebasing onto master? (or something that can automatically modify commit messages to indicate what feature they all belonged to)21:13
→ duxsco joined21:13
ikke Not without manual tracking21:14
or merging with no-ff21:14
edgimar Even w/ no-ff, you would just get a single merge commit that wouldn't tell you where the group of commits starts, right?21:15
ikke The start would be the merge base21:18
edgimar Hm. Ok, so would the right way to do this be to rebase onto master locally, then merge --no-ff <other branch>?21:20
ikke or even better use short lived feature branches that you merge with --no-ff into master21:21
if you rebase onto upstream master, there is no distinction anymore21:22
(without separate branch)21:22
→ jacobk joined21:22
ikke no, that's incorrect21:22
upstream/master origin/master) would still point to base21:23
← duxsco left21:27
← zeenk left21:27
edgimar yeah, that could work. I feel like github / gitlab have some kind of setting that will allow you to rebase and do some kind of --ff-only merge that still has a (pseudo-?) merge commit. But in that case maybe you don't get the base commit recorded?21:27
ikke gitlab has a semi-linear workflow mode21:28
you have to rebase before merging, and merging created a non-ff merge21:29
← zer0bitz left21:29
→ ozoned joined21:30
→ zer0bitz joined21:31
← peirik_ left21:32
← sedzcat left21:32
← lucasta left21:32
← odoood left21:33
→ dsrt^ joined21:33
← zer0bitz left21:34
← omethe left21:34
→ omethe joined21:36
→ escherial joined21:37
← thebombzen left21:40
→ zer0bitz joined21:41
→ lucasta joined21:43
← bgs left21:46
→ odoood__ joined21:46
odoood__ → odoood21:46
→ lucasta_ joined21:47
← odoood left21:48
← ozoned left21:48
← zer0bitz left21:50
→ arescorpio joined21:51
← lucasta left21:52
← igemnace left21:55
→ lucasta joined21:56
→ lxsameer joined21:56
→ alfredb joined21:58
← rama_ left21:59
→ rama_ joined21:59
→ ferdna joined21:59
→ TheCatBehemoth joined22:01
← jacobk left22:01
← otisolsen70 left22:03
← krushia left22:03
← rama_ left22:04
→ rama_ joined22:04
→ coot joined22:05
→ chexum_ joined22:07
edgimar ok thanks, I'll give that a try.22:08
← chexum left22:08
← roadie left22:19
← warmana left22:21
← bewees left22:21
→ gryffus joined22:22
→ warmana joined22:24
→ roadie joined22:28
← lucasta left22:29
← clime left22:29
← briian left22:32
← roadie left22:32
→ junebug joined22:32
← edgimar left22:33
← zeroes left22:34
→ Coop joined22:34
→ zeroes joined22:34
→ XV9 joined22:35
→ rosco joined22:36
← XV8 left22:38
← junebug left22:40
→ junebug joined22:41
← arescorpio left22:41
← kostkon left22:44
← gh34 left22:45
→ roadie joined22:46
→ YuGiOhJCJ joined22:46
→ kostkon joined22:46
← LW left22:47
→ LW joined22:48
← junebug left22:49
← alfredb left22:49
← matni1 left22:50
← roadie left22:51
→ junebug joined22:52
→ ackyshake joined22:54
← rosco left22:55
← Jong left22:55
→ adelfino joined22:57
← TheCatBehemoth left22:57
← Dreadnaught left22:59
→ Intel8086 joined23:01
← coot left23:01
drew is there a way to see the commit hash with git blame?23:02
it shows the committer and the time but not the commit hash23:03
← derpydoo left23:03
→ TheCatBehemoth joined23:03
← Ranhir left23:05
← LW left23:07
→ LW joined23:08
→ Ranhir joined23:08
→ Xenguy joined23:08
adelfino drew: git 2.34.1 shows it by default23:08
Are you using a previous version? Perhaps you have a configuration set?23:08
drew the version on our build servers is 2.17.123:09
we only just got 'restore' lol23:09
→ feriman joined23:09
adelfino Let me try that version23:09
→ hamburgler joined23:10
← f3n1x left23:10
→ roadie joined23:11
← LW left23:11
→ LW joined23:12
← zulutango left23:12
→ peirik_ joined23:19
← bywaterloo left23:20
acidbong hi there, hello23:21
last week i shallow-cloned (depth 1) kernel sources, resulting in ~260M of them. now that several updates came out, regular `git pull` fetches me at least a gig (I interrupted mid-fetch) of new commits (and since most version bump commits there are merges, it also fetches the side branches as well).23:21
on the side I'm having a personal branch with manually applied Gentoo patches23:21
how can i reduce the size? can i `git pull --depth=1` the master branch and not break patched one?23:21
*the size of fetches23:21
← junebug left23:21
acidbong or should i have done a deeper clone in first place?23:22
→ g2anj joined23:22
← LW left23:22
→ jaredce joined23:23
← m0viefreak left23:23
← ZacSharp left23:24
← roadie left23:24
→ Supavisah joined23:26
← lxsameer left23:27
Supavisah What's the probability of being impacted from the CVEs fixed in 2.39.11 as a git client user, not a repository server. It seems highly improbable and if someone can execute arbitrary code on your machine to trigger the CVEs, you've already lost.23:27
→ jacobk joined23:28
→ arch_angel joined23:28
← theoceaniscool left23:29
→ trafficjam joined23:29
→ LW joined23:30
← jaredce left23:31
← LW left23:31
→ LW joined23:31
trafficjam hey guys, if I have a branch 'foo' currently checked out (with some commits already made), and then I make some changes which are not related to that branch, should I just checkout a new branch off 'foo' (`git checkout -b bar`), add the changes (`git add .`) and commit them?23:31
or should I first checkout of foo back to master, and then create a new branch off master?23:32
← jacobk left23:34
← YuGiOhJCJ left23:36
→ YuGiOhJCJ joined23:36
→ ___nick___ joined23:42
adelfino acidbong: I don't think git pull --depth=1 will break the patched one23:42
Can you clone the repository and try it?23:43
trafficjam: ideally you would branch from foo, and rebase the commits related to the second branch on top of master23:44
So the new branch doesn't have the changes from foo23:44
And remove the commits from foo23:45
← vsynthese left23:45
hectopascal drew: noob here, but how about finding the hash with git log, filtering by author/date?23:45
← thiago left23:46
trafficjam adelfino: but the new branch shouldn't have the commits from foo if I checkout from master surely?23:46
adelfino trafficjam: right, but you would have to make the changes manually, again23:46
trafficjam adelfino: oh so running `git checkout master` (from foo) will remove the current unstaged changes?23:47
adelfino git will never do that23:47
Checkout out -> having a removal done23:47
*Checking23:47
→ kkawg joined23:47
adelfino Unless you use -f23:48
← arch_angel left23:48
trafficjam adelfino: but if i merge foo back into master, then checkout bar from master, and stage the changes, wouldn't that be the same thing?23:48
hectopascal drew: something like git log --author=<author> --since=<date> --before=<date> --no-merges23:49
adelfino trafficjam: yes, it depends on how you are using branches23:50
Why the original question?23:50
You can always commit to the base branch directly if you want23:50
When you branch, you can have all kinds of changes in the same commit, if you want23:50
trafficjam basically that, i have a feature branch open, made the changes i wanted and committed them, but then went on a tangent to implement another feature before merging back into master23:51
so now I want to separate them into two different feature branches23:51
adelfino Right, that's what I understood23:51
So you want to remove all commits not related to feature A from feature A branch23:52
*After* you make a branch contaning those commits23:52
← peirik_ left23:52
adelfino Then, you would have two branches that can be merged to master, each one with their own objetive23:53
trafficjam adelfino: nope, i haven't made any commits to foo that aren't related to A23:53
A's commits are purely related to A, and the unstaged files are related to B23:53
adelfino Ahh23:53
So you haven't commited them23:53
→ vsynthese joined23:53
trafficjam correct23:53
adelfino Either way, I think it's the same solution23:54
trafficjam so [git checkout master; git merge foo; git checkout -b bar; git add .; git commit -m "done"; git checkout master; git merge bar;] should work right?23:54
adelfino I believe you can get away with it if B doesn't change stuff changed in A23:54
→ falafel joined23:54
adelfino Then you can checkout master23:54
← omethe left23:54
→ omethe joined23:55
adelfino I'd try checkout master23:55
It's safe, when not using -f23:55
You will end up in master with your changes unstaged, or an error23:55
The error happening if you change files in A changed by B23:55
trafficjam awesome, thanks for the clarity, will give that a try23:56
adelfino *files in B changed by A23:56
trafficjam adelfino: ok yeah I got the error lol23:58
adelfino :)23:58
What you *can* do is git checkout -b feature_b; git commit23:59
And then rebase on top of master, skipping commits from feature_a23:59
Conflicts may arise23:59

Logs Search ←Prev date Next date→ Channels Documentation