IRCloggy #git 2024-02-26

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2024-02-26

→ Aminda joined00:01
← fossdd left00:02
← cptaffe left00:05
→ cptaffe joined00:05
← cptaffe left00:06
→ cptaffe joined00:06
→ fossdd joined00:08
← trafficjam left00:09
→ trafficjam joined00:09
← henry40408 left00:16
→ henry40408 joined00:16
→ Unode joined00:19
← chexum left00:25
→ chexum joined00:26
← trafficjam left00:26
→ trafficjam joined00:27
← trafficjam left00:27
← fossdd left00:27
← Gary_Sinise left00:35
← kurahaupo left00:37
→ fossdd joined00:39
← xx left00:42
← SharpHammer left00:48
→ SharpHammer joined00:49
← fossdd left00:58
→ RoyalYork joined01:06
→ fossdd joined01:11
→ guru_ joined01:12
→ rsrx joined01:13
← cjoke left01:14
← Guru_DE left01:15
← cptaffe left01:19
← bf_ left01:19
→ jacobk joined01:20
→ cptaffe joined01:20
← cptaffe left01:23
→ cptaffe joined01:23
← drocan left01:23
→ drocan joined01:30
← fossdd left01:33
→ fossdd joined01:34
← h-erectus left01:36
← davispuh left01:36
← john_johnk left01:46
← Xlusive left01:49
← jacobk left01:51
← cptaffe left01:52
→ cptaffe joined01:52
← Lord_of_Life left01:53
→ gsi joined01:53
→ Lord_of_Life joined01:54
← SharpHammer left01:55
→ jacobk joined01:55
← gsi_ left01:56
→ SharpHammer joined01:56
→ Gary_Sinise joined01:56
→ Anarchic joined01:57
← Anarchic left01:58
← rsrx left01:59
→ rsrx joined01:59
→ Anarchic joined02:00
→ Xlusive joined02:00
← Anarchic left02:00
→ Anarchic joined02:01
→ lolok joined02:02
→ Xlusive_ joined02:05
← Xlusive left02:05
Xlusive_ → Xlusive02:05
← fossdd left02:06
← tirnanog left02:08
→ rgrinberg joined02:11
→ fossdd joined02:12
← akibageek left02:12
← rsrx left02:13
JanC → Guest785702:16
← Guest7857 left02:16
→ JanC joined02:16
← JayBeeFOSS left02:21
← Xlusive left02:21
← falafel left02:22
← defjam left02:23
→ Xlusive joined02:23
← Noisytoot left02:24
→ Noisytoot joined02:25
← Xlusive left02:27
→ Xlusive joined02:30
← fossdd left02:31
→ defjam joined02:36
→ fossdd joined02:37
← Xlusive left02:37
← lolok left02:39
→ JayBeeFOSS joined02:40
← defjam left02:41
→ Xlusive joined02:43
→ brezanac joined02:44
← SharpHammer left02:49
← brezanac left02:50
→ SharpHammer joined02:50
← cdown left02:51
→ defjam joined02:52
← Gary_Sinise left02:52
→ lolok joined02:55
→ brezanac joined02:56
← JanC left02:57
← defjam left02:58
← Lockesmith left03:01
← navi left03:01
→ Lockesmith joined03:02
← brezanac left03:03
← bin101 left03:04
→ brezanac joined03:04
→ JanC joined03:05
→ bin101 joined03:06
← jacobk left03:07
→ jacobk joined03:08
← fossdd left03:08
→ defjam joined03:09
→ akibageek joined03:10
→ fossdd joined03:10
← defjam left03:14
→ hbautista joined03:15
← SharpHammer left03:18
→ defjam joined03:26
← defjam left03:31
← akibageek left03:32
← jwpapi_ left03:34
→ tirnanog joined03:35
← brezanac left03:40
← Betal left03:50
← hbautista left03:52
→ Gary_Sinise joined03:54
→ defjam joined03:54
→ ayodude joined03:56
← ayodude left03:56
→ mud joined03:57
→ ayodude joined03:57
← ayodude left03:57
→ hbautista joined04:00
← defjam left04:01
← mrpops2ko left04:03
→ stats4647 joined04:11
→ defjam joined04:12
→ lemuria joined04:15
→ Ali_nz joined04:16
→ sahil_ joined04:23
→ mrpops2ko joined04:23
← SJrX left04:28
← defjam left04:31
← cpackham left04:40
→ insidesources joined04:41
→ defjam joined04:43
← defjam left04:48
→ trafficjam joined04:50
← hbautista left04:52
← Ali_nz left04:54
→ igemnace joined04:59
→ defjam joined05:01
← stats4647 left05:02
← defjam left05:07
→ falafel joined05:12
→ wavesong joined05:14
→ defjam joined05:16
← falafel left05:17
← defjam left05:22
→ falafel joined05:22
← trafficjam left05:25
← sahil_ left05:27
← jacobk left05:29
→ sahil_ joined05:33
→ defjam joined05:33
← mud left05:35
← lolok left05:36
← falafel left05:37
→ jacobk joined05:38
→ slayer joined05:39
→ Ox7C5 joined05:39
← defjam left05:43
→ pedahzur joined05:45
→ defjam joined05:56
← sahil_ left05:58
← pedahzur left05:58
← defjam left06:05
→ jmd joined06:11
← stuv1 left06:16
← busybusybusy left06:16
→ defjam joined06:17
← BUSY left06:17
→ thiago joined06:19
→ maryo joined06:20
← maryo left06:21
→ maryo joined06:21
← defjam left06:23
→ zetef joined06:25
← maryo left06:26
← slayer left06:27
→ kjartan joined06:35
→ defjam joined06:35
→ mitrokov joined06:35
← defjam left06:41
← Gary_Sinise left06:45
→ vysn joined06:46
→ YuGiOhJCJ joined06:46
← thiago left06:49
→ fdan joined06:51
← jacobk left06:51
← zetef left06:52
→ defjam joined06:52
← Aminda left06:55
→ Aminda joined06:56
← tirnanog left06:58
← defjam left06:58
← YuGiOhJCJ left06:59
→ YuGiOhJCJ joined06:59
← wavesong left07:07
→ linfax joined07:09
→ Nigthknight joined07:10
→ defjam joined07:11
← defjam left07:17
← rgrinberg left07:17
→ defjam joined07:18
→ SJrX joined07:23
← defjam left07:24
→ rgrinberg joined07:24
← fdan left07:27
← rgrinberg left07:29
→ rgrinberg joined07:31
← jmd left07:31
← YuGiOhJCJ left07:32
← rgrinberg left07:36
→ defjam joined07:36
→ danse-nr3 joined07:40
→ rgrinberg joined07:40
← defjam left07:43
← skapata left07:44
→ YuGiOhJCJ joined07:45
← rgrinberg left07:46
→ sahil_ joined07:49
← sahil_ left07:53
→ sahil_ joined07:54
→ rgrinberg joined07:55
→ defjam joined07:56
← rgrinberg left08:00
← defjam left08:02
→ cpackham joined08:02
→ sahil_1 joined08:03
← Ox7C5 left08:04
→ rfuentess joined08:04
← sahil_ left08:04
sahil_1 → sahil_08:04
→ EvgenyK joined08:05
→ jacobk joined08:08
→ defjam joined08:13
→ RiFo joined08:14
→ gandhibobandhi joined08:15
→ gandhibobandhi_ joined08:15
← gandhibobandhi left08:20
→ MGF_Fabio joined08:22
→ rbatty joined08:24
← larryv left08:24
← defjam left08:25
→ coot joined08:26
→ davispuh joined08:30
→ defjam joined08:39
← cpackham left08:40
→ gandhibobandhi__ joined08:41
← rbatty left08:42
← weko left08:43
← defjam left08:44
jfsimon1981 → jfs08:44
jfs → jfsimon08:44
← gandhibobandhi_ left08:45
← danse-nr3 left08:50
→ danse-nr3 joined08:50
→ vcxza joined08:51
→ weko joined08:52
vcxza Hello. I'm rebasing branch1 on branch2. There's a conflict on some_file. But if I do git checkout --theirs some_file, it checkouts an old version of it. Why? How can if fix it so to checkout the last version of this file?08:52
osse vcxza: when rebasing --theirs means branch1 and --ours means branch208:53
you can always be explicit and check out the file from a specific hash08:53
→ cjoke joined08:53
vcxza osse: this is misleading! why theirs is the current branch?08:54
instead of the opposite?08:54
osse vcxza: because technicalities on how rebase works under the hood leaks into the user interface08:57
→ defjam joined08:57
osse vcxza: roughly speaking it works like this: branch2 is checked out and each commit on branch1 is cherry-picked.08:58
vcxza vcxza: is there a way to automatically do git checkout --ours for all the files that conflict?08:58
osse: ^08:58
osse git checkout --ours -- $(git diff --name-only --diff-filter=U) should do the trick, provided all the filenames play nice08:59
vcxza thanks osse09:01
osse vcxza: but not that this doesn't just resolve the conflict in favor of "our" version. It literally takes "our" version wholesale, undoing any sections of the file that were able to be merged09:02
*but note09:02
if that's what you want that's cool. just letting you know09:02
vcxza osse: yes, it's what I was searching for09:03
→ cyber_heretic joined09:03
vcxza anyway, I think that the ours/theirs issue is pretty misleading09:03
osse So do just about everyone09:04
→ john_johnk joined09:06
← john_johnk left09:12
→ john_johnk joined09:14
vcxza osse: after doing git checkout --ours -- $(git diff --name-only --diff-filter=U); git add . ; git rebase --continue, it found other conflicts. I repeated the operations, the rebase succeeded but at the end, some_file (which was listed in the conflict list during rebase) does not correspond to the last version in branch209:19
→ bf_ joined09:20
osse maybe there was a conflict in that file only on some of the commits09:20
← JayBeeFOSS left09:21
vcxza osse: it has been listed twice, in the conflict list, during the rebase09:21
osse how many commits were there to rebase?09:22
vcxza how can I check them?09:22
← cyber_heretic left09:22
osse rebase prints it09:23
[2/10] or whatever09:23
git log branch2..branch1 will list them09:23
→ thiago joined09:24
vcxza osse: git log branch2..branch1 lists 28 commits09:25
osse then there are 26 other commits that could have modified some_file in non-conflicting ways09:26
vcxza so there's no way to accept incoming changes automatically09:27
?09:27
osse Now I don't follow09:28
git rebase applies commits one by one. that a particular file conflicted when applying a particular commit doesn't mean that all the other commits magically don't modify that file any more09:29
vcxza I see, thanks09:29
← danse-nr3 left09:30
→ danse-nr3 joined09:34
→ squealingcode joined09:44
→ masoudd joined09:45
← thiago left09:51
→ mkoskar joined09:51
→ theoceaniscool joined09:53
← RiFo left09:54
→ rgrinberg joined09:54
→ gandhibobandhi_ joined09:55
→ RiFo joined09:57
→ thiago joined09:57
← gandhibobandhi__ left09:59
← rgrinberg left10:00
← ackyshake left10:03
→ navi joined10:04
→ OnkelTem joined10:06
→ TomyWork joined10:09
← qqq left10:11
← theobjectivedad left10:13
→ theobjectivedad joined10:14
← RiFo left10:15
← reset left10:16
→ lacrymology joined10:18
→ EvgenyK_ joined10:19
← EvgenyK left10:22
← danse-nr3 left10:24
→ danse-nr3 joined10:25
→ epicout_autochto joined10:26
← szkl left10:27
← theobjectivedad left10:30
→ DeltaBFX joined10:30
→ theobjectivedad joined10:31
← thiago left10:34
→ mx08 joined10:37
← sahil_ left10:38
← defjam left10:47
← DeltaBFX left10:53
← weko left10:54
→ defjam joined11:00
→ weko joined11:04
← defjam left11:04
→ rgrinberg joined11:08
→ sahil_ joined11:08
← rgrinberg left11:08
← _qw left11:10
← eqw left11:10
← weko left11:19
→ delay joined11:21
→ xx joined11:21
→ weko joined11:22
← JanC left11:22
← m1dnight left11:24
→ lojik joined11:25
→ defjam joined11:27
→ JanC joined11:28
← dsimic left11:33
→ dsimic joined11:34
→ ssserpent joined11:48
→ PlasmaHH joined11:53
← gandhibobandhi_ left11:53
← crabbedhaloablut left11:54
PlasmaHH hi, when I use the same repo for a submodule multiple times, will git notice that and on a "fetch --recurse-submodules" do that fetch only really once? or will it do that every time, leading too a good idea of the performance impact of multiple submodules?11:55
mjt0k it will treat them as separate repositories each in its own subdir11:56
PlasmaHH thanks, so I will use just the same repo always for a benchmark...11:59
→ gandhibobandhi joined11:59
→ crabbedhaloablut joined12:02
← GNUmoon left12:12
← squealingcode left12:13
← weko left12:15
← deltab left12:15
→ weko joined12:18
→ gandhibobandhi_ joined12:21
→ m1dnight joined12:21
← sahil_ left12:23
→ sahil_ joined12:23
← gandhibobandhi left12:24
→ masber joined12:24
→ deltab joined12:26
← masber left12:32
← weko left12:32
→ squealingcode joined12:32
← igemnace left12:41
← john_johnk left12:41
→ john_johnk joined12:41
→ weko joined12:42
← MGF_Fabio left12:45
→ MGF_Fabio joined12:46
→ sahil_1 joined12:51
← sahil_ left12:52
sahil_1 → sahil_12:52
← danse-nr3 left12:56
→ brezanac joined12:57
→ igemnace joined12:59
← thuna` left13:01
← llh left13:02
← rafspiny left13:04
→ rafspiny joined13:05
→ randall joined13:10
→ Ox7C5 joined13:19
→ rgrinberg joined13:20
← defjam left13:22
→ defjam joined13:23
→ danse-nr3 joined13:28
← rgrinberg left13:30
← weko left13:30
→ thuna` joined13:31
→ weko joined13:41
→ OMGOMG joined13:46
→ skapata joined13:46
→ blatant joined13:47
← OMGOMG left13:50
→ cdown joined13:53
→ init joined13:54
→ gandhibobandhi__ joined13:57
← gandhibobandhi_ left14:00
← sahil_ left14:02
esc23 hi14:07
can I use something like a git attribute to tell git to use `git blame` with -C on a given file14:08
← dd213 left14:08
randall -wc14:11
woops, sorry14:11
← randall left14:11
← EvgenyK_ left14:12
PlasmaHH hm, now I have 30 submodules and for benchmarking I would like to tell git fetch --recurse-submodules to only use a subset of them ... is there a possibility?14:13
→ alexherbo2 joined14:13
← ssserpent left14:13
→ EvgenyK joined14:15
→ hsv_ joined14:19
← EvgenyK left14:19
← hsv left14:20
← Tabmow left14:20
→ Tabmow joined14:21
→ OMGOMG joined14:21
→ chair1 joined14:22
→ szkl joined14:33
← MGF_Fabio left14:34
→ MGF_Fabio joined14:34
→ SharpHammer joined14:45
← YuGiOhJCJ left14:48
← mitrokov left14:55
→ dnh joined14:56
→ gast0n joined14:58
→ sahil_ joined14:59
← rigid left15:01
→ rigid joined15:03
→ rbatty joined15:03
← SharpHammer left15:05
→ eqw joined15:06
→ _qw joined15:06
→ SharpHammer joined15:12
← elastic_dog left15:14
→ chair16 joined15:22
← linfax left15:22
← chair1 left15:25
→ elastic_dog joined15:25
← skapata left15:31
welder I've ammended my local changes to the most recent commit but now I'm thinking I should've created a new one... How can i recover from that?15:40
new one - new commit with these changes15:40
← rafspiny left15:41
← chair16 left15:41
→ newpy joined15:41
→ rafspiny joined15:41
← squealingcode left15:42
newpy hi, I created a branch my_branch off of dev branch, and then feature off of my_branch15:42
I'd like to just merge feature branch directly onto dev, can I just `rebase dev` on feature branch and push/merge/etc?15:42
welder well I can git diff with the pre-ammended commit in reflog, that works15:43
newpy honestly my_branch was sort of a mistake/unnecessary, I think I can even just delete it and feature branch will still be safe15:43
→ rgrinberg joined15:48
pick → pickanick15:48
→ Gary_Sinise joined15:49
← rgrinberg left15:52
← JanC left15:55
→ JanC joined15:55
← sahil_ left15:58
← gandhibobandhi__ left16:00
→ sahil_ joined16:00
← blatant left16:04
← Nigthknight left16:05
← danse-nr3 left16:06
← alexherbo2 left16:07
→ alexherbo2 joined16:07
j416 welder: git reset --soft HEAD@{1} && git commit16:07
newpy: it doesn't matter if you started a branch off of another; the branch isn't based on that branch16:09
→ stats4647 joined16:09
j416 newpy: the branch name you create refers to a commit, regardless of what other branches may exist16:10
→ mud joined16:13
→ DeltaBFX joined16:22
← OnkelTem left16:23
→ gh34 joined16:29
→ rgrinberg joined16:34
← rafspiny left16:34
→ rafspiny joined16:35
newpy j416, ty that's what I thought just wanted to make sure16:35
j416 o/16:36
← DeltaBFX left16:36
← sahil_ left16:40
→ sahil_ joined16:41
← alexherbo2 left16:41
→ alexherbo2 joined16:42
← rfuentess left16:43
← sahil_ left16:43
← rafspiny left16:44
← rgrinberg left16:44
→ rafspiny joined16:44
[twisti] i made a bunch of changes, which logically should go into three commits (fix spelling, fix documentation, fix code). going through the changes with git -p means ill have to reject all non-doc, non-code changes, make the spelling commit, then go through all changes again and reject all code changes, then go through it a third time for the code changes. is there a workflow like git -p where i can say 'this change goes to this commit,16:48
this change to that, this to the first again ...' ?16:48
j416 [twisti]: I'd probably reset all three and re-create them one by one16:52
[twisti] reset them from what ?16:53
j416 [twisti]: i.e., git reset HEAD~3 && git add -p && git commit -m 'first commit' && git add -p && git commit -m 'second commit' && ...16:54
← weko left16:54
← theoceaniscool left16:54
j416 [twisti]: perhaps I misread what you said; I assumed you had three commits already.16:55
[twisti]: in either case, resetting away what you have and creating new commits I think wouldn't be a terrible solution16:56
[twisti] ah, no. im asking how to best commit them without having to go over each change multiple times16:56
j416 git add -p.16:56
[twisti] right, thats what i asked about16:56
j416 the number of changes will obviously go down as you make commits with them16:56
→ tirnanog joined16:57
j416 git provides no way out of the box to go over hunks in one pass and map them to commits16:57
would have been kind of neat.16:57
← TomyWork left16:58
→ Leonarbro joined17:00
← redbool left17:02
→ jmd joined17:04
← thuna` left17:05
→ weko joined17:07
← fossdd left17:09
← Leonarbro left17:09
→ EvgenyK joined17:11
→ fossdd joined17:11
→ wavesong joined17:12
→ chair1 joined17:14
← EvgenyK left17:16
← MGF_Fabio left17:24
← fossdd left17:24
→ wootehfoot joined17:27
→ fossdd joined17:27
← epicout_autochto left17:30
→ epicout_autochto joined17:30
← alexherbo2 left17:39
→ azed joined17:42
→ raffaele joined17:46
← technoloG1 left17:47
← wootehfoot left17:47
→ rscastilho2024 joined17:49
← rafspiny left17:49
← igemnace left17:52
← rscastilho2024 left17:52
← masoudd left17:53
→ mattt_ joined17:55
→ pedahzur joined17:58
→ technoloG joined18:00
← chair1 left18:00
→ wootehfoot joined18:00
→ chair1 joined18:02
→ cdown_ joined18:02
→ cyhyraeth joined18:02
← cyhyraeth left18:03
→ realies9 joined18:03
→ rapmoc_ joined18:04
→ remedan_ joined18:04
→ adhawkins_ joined18:04
→ ZMarkC joined18:05
← mattt_ left18:05
→ mgedmin_ joined18:05
→ dustinm- joined18:06
→ gast0n_ joined18:06
→ Ragnor joined18:07
← fossdd left18:07
→ germ- joined18:08
→ gnooo joined18:08
→ drew` joined18:10
← wootehfoot left18:10
← raffaele left18:11
← jmd left18:11
← eqw left18:11
← rbatty left18:11
← gast0n left18:11
← init left18:11
← cdown left18:11
← bin101 left18:11
← ikwyl6 left18:11
← niyawe left18:11
← Non-ICE left18:11
← aminvakil left18:11
← canton7 left18:11
← donofrio left18:11
← ZMarkGC left18:11
← tomboy64 left18:11
← chemsmith left18:11
← DaTa left18:11
← f451 left18:11
← gvg left18:11
← realies left18:11
← Furai left18:11
← ju left18:11
← ccx left18:11
← mgedmin left18:11
← cation left18:11
← adhawkins left18:11
← tureba left18:11
← Teacup left18:11
← myme left18:11
← remedan left18:11
← plantroon left18:11
← khrbtxyz left18:11
← dustinm left18:11
← ueberall left18:11
realies9 → realies18:11
cdown_ → cdown18:11
mgedmin_ → mgedmin18:11
adhawkins_ → adhawkins18:11
→ fossdd joined18:11
← iamtheranger left18:11
← germ- left18:12
→ EvgenyK joined18:12
→ gvg joined18:12
← twice left18:12
→ mattt_ joined18:13
← gxt_ left18:13
→ gxt_ joined18:14
drew` → drew18:14
→ f451 joined18:14
→ chemsmith joined18:14
→ germ_ joined18:15
← gxt_ left18:15
→ gxt_ joined18:16
→ thuna` joined18:16
→ donofrio joined18:16
→ raffaele joined18:16
→ twice joined18:16
→ ajfriesen joined18:16
→ samuelbernardo joined18:16
→ mcfrdy joined18:16
→ LuKaRo joined18:16
← EvgenyK left18:17
→ ccx joined18:17
→ jmd joined18:17
→ cation joined18:17
→ adder joined18:17
→ aminvakil joined18:17
→ khrbtxyz joined18:17
→ ueberall joined18:17
→ wootehfoot joined18:18
→ tureba joined18:18
raffaele → 078AAM65K18:19
→ multi_io joined18:19
→ raffaele joined18:19
→ AAODON joined18:19
→ eqw joined18:19
→ init joined18:19
→ bin101 joined18:19
→ ikwyl6 joined18:19
→ niyawe joined18:19
→ AAN4J3 joined18:19
→ canton7 joined18:19
→ DaTa joined18:19
→ AAM8OE joined18:19
→ Teacup joined18:19
→ plantroon joined18:19
→ AALQY5 joined18:19
→ stutz joined18:19
→ tkazi joined18:19
→ Furai joined18:19
→ synthmeat joined18:19
→ selckin joined18:19
→ myme joined18:19
→ tomboy64 joined18:19
→ daurnimator joined18:19
← raffaele left18:19
← niyawe left18:19
→ niyawe joined18:19
→ skapata joined18:20
→ natewrench joined18:20
natewrench hello i am having issue, i try putting in the command "git gud" but all i get is a syntax error18:20
→ Non-ICE joined18:21
← Non-ICE left18:21
ikke Are you trolling, or is this serious?18:22
→ Non-ICE joined18:23
← Non-ICE left18:23
natewrench ikke, im trolling18:23
← natewrench left18:23
→ ju joined18:23
→ restoration joined18:24
restoration hello18:24
→ oerheks joined18:25
restoration hello18:25
→ mefistofeles joined18:25
restoration i need help for 10 minutes anyone free18:25
mefistofeles we like graphs? why is that?18:25
restoration: I guess just ask18:25
→ squealingcode joined18:26
→ KindOne joined18:26
restoration oh yes mefistofeles : baiscally i have a .gitmodules file containing around 100 modules how do i import this file into my project18:26
i mean i want to same git modules at same location from another repo to mine18:26
← plantroon left18:27
restoration do i have to rely on shell scripting18:27
← fossdd left18:27
ikke git submodule init18:27
← KindOne left18:28
restoration ikke: do i just put the .gitmodules in my project root and paste the command?18:28
mefistofeles that should work, as long as the relative paths (path structure) is the same18:28
ikke Well, without the corresponding references in the repository, it won't do much18:28
restoration oh thank you soo much for helping me people on irc are saving me from becoming unemployed18:29
i think it's not working though18:29
ikke Yeah, just adding a .gitmodules file to a repo won't do much18:30
restoration well what do i do then ? ikke18:30
ikke You'd have to git submodule add each of them18:30
→ plantroon joined18:30
← lacrymology left18:31
← mattt_ left18:31
→ wgrant joined18:31
restoration i guess gotta sit here and write a shell script for that ig then ikke18:31
osse mefistofeles: because git history is a (directed acyclic) graph18:31
restoration also how do i add submodules at a particular path18:31
mefistofeles osse: ah fair18:31
ikke restoration: git submodule add <url> <path>18:31
restoration i mean if i have a folder temp inside temp1 then how do i add a submodule named foo inside temp18:31
oh so i do git submodule add git..... ./temp/temp1/foo18:32
where foo doesn't exist but when the file is cloned it is renamed to foo? am i right18:32
ikke yes, it will be the directory that git creates when cloning the submodule repo18:33
restoration oh okay18:34
← vcxza left18:34
restoration also18:34
→ lacrymology joined18:34
restoration [submodule "first/third"] path = first/second url = https://linkishere.com18:35
which command should i execute for following entry to appear in .gitmodules18:36
← defjam left18:36
restoration Note:- it is first/third in submodule and first/second in path part18:36
→ Non-ICE joined18:36
→ sahil_ joined18:37
← delay left18:37
ikke The path and url is what matters18:38
restoration: fyi, you can get git to parse that file18:38
git config --file .gitmodules --list18:38
restoration ikke: but i know that matters but i want to create generalized file i have read about something called a name field in git submodule add --name first/third ...18:40
← brezanac left18:41
restoration ikke: is this how i make the submodule part have first/third because the path is first/second but the submodule is first/third idk why my company wants them to be different but it is how it is18:41
also thank you soo much for helping me ikke you are a true saviour for me right now18:41
ikke Yes, you'd provide --name18:41
restoration git submodule add --name first/third https://linkishere.com ./first/second18:42
so this is the final command i have to execute to solve this18:43
am i right?18:43
ikke yes18:43
restoration you have no idea how much of my stress you've relived with just this conversation now i at least have a definition to solve this18:43
ikke I'm glad I can help18:43
→ mcepl joined18:43
restoration i know at least a way to solve it i didn't know anything about this before :) thank you soo much ikke18:43
mcepl when I run git fetch on non-existing repo on Github, git tries to authenticate. I would love to persuade it not to try, just fail. How to do it?18:44
Kobaz so... i have a merge issue... not sure exactly how to explain it... We have branch A and branch B... I merged new stuff that happened in Branch A into Branch B... but not all of it came in?18:45
mcepl The easiest solution is to rebase A on the top B and then merge.18:46
Kobaz i run git log on a specific file... and the last commit (after the merge into B).. is June 12... but There is teo more commits Jan 15 and Jan 29 that are missing from the merge from A->B18:46
ah18:46
any idea why some commits are skipped and some arent?18:46
had to fix a lot of conflicts on the merge... and then after all that was fixed up. i'm seeing like a whole history of stuff is missing18:47
ikke mcepl: The problem is that github does not want to disclose whether the repo exists or not18:48
mcepl: so github asks you to authenticate18:48
← john_johnk left18:48
Kobaz mcepl: save your authentication? and then if you request it and it fails... then it doesn't exist18:49
→ defjam joined18:49
mcepl Kobaz: hmm, that's probably the easiest one.18:50
← defjam left18:54
← restoration left18:54
→ rgrinberg joined18:55
kjetilho hmm - I have a really old system here where git clone (git-remote-https) just says "gnutls_handshake() failed: Handshake failed" - how can I get more debug info about this, or is there a workaround?18:59
curl and wget on the same system are happy...18:59
→ fossdd joined18:59
→ EvgenyK joined18:59
→ leah2 joined19:00
← SharpHammer left19:00
→ SharpHammer joined19:00
← whosthis left19:02
ikke kjetilho: GIT_CURL_VERBOSE=1 git clone <..> perhaps19:03
← EvgenyK left19:04
kjetilho interesting, thanks19:06
→ defjam joined19:07
kjetilho it made me realise I should debug this using gnutls-cli instead :)19:08
← Xlusive left19:10
→ Xlusive joined19:11
← defjam left19:12
→ Leonarbro joined19:15
→ ackyshake joined19:20
→ defjam joined19:24
← defjam left19:30
← gildasio left19:34
→ cpackham joined19:34
→ gildasio joined19:34
→ defjam joined19:41
→ a51 joined19:47
→ larryv joined19:47
← defjam left19:47
← fossdd left19:49
→ fossdd joined19:51
← opal left19:54
→ opal joined19:55
→ defjam joined19:59
→ oriba joined20:00
← peeps[work] left20:00
→ EvgenyK joined20:01
← defjam left20:05
← fossdd left20:05
→ peeps[work] joined20:06
← EvgenyK left20:06
← wavesong left20:07
← coot left20:09
← epicout_autochto left20:09
← JanC left20:09
→ fossdd joined20:11
→ defjam joined20:11
← sahil_ left20:14
← defjam left20:17
→ JanC joined20:19
→ llh joined20:23
← azed left20:24
← fossdd left20:24
← JanC left20:25
→ JanC joined20:25
→ sahil_ joined20:26
→ PantelicGR joined20:28
→ defjam joined20:28
← jacobk left20:29
→ thiago joined20:34
← defjam left20:34
→ fossdd joined20:35
← squealingcode left20:38
→ squealingcode joined20:40
→ defjam joined20:46
← thiago left20:49
→ Nixkernal joined20:49
← fossdd left20:49
← defjam left20:52
← mud left20:54
→ Jaxef joined20:54
→ mud joined20:54
→ alexherbo2 joined20:56
→ KnoP joined20:59
← weko left21:01
→ john_johnk joined21:02
→ t0mm13b joined21:03
→ defjam joined21:04
← jmd left21:07
→ zetef joined21:08
← defjam left21:10
→ fossdd joined21:10
← chair1 left21:11
→ MapMan joined21:12
← MapMan left21:12
→ MapMan joined21:12
← KnoP left21:15
→ weko joined21:15
← krushia left21:18
→ defjam joined21:21
→ thiago joined21:23
← zetef left21:24
→ zetef joined21:25
← weko left21:26
← fossdd left21:26
← squealingcode left21:28
← zetef left21:29
← thiago left21:30
→ thiago joined21:33
→ fossdd joined21:33
← kjartan left21:34
← brw left21:38
→ brw joined21:38
← Jaxef left21:40
← PlasmaHH left21:46
← rgrinberg left21:48
← thiago left21:49
← kostkon left21:51
mcepl Hmm, is there a way how to show whether commits are signed in gitk?21:52
→ kostkon joined21:52
← SharpHammer left21:54
← wootehfoot left21:54
→ SharpHammer joined21:55
← plantroon left21:56
→ krushia joined21:56
← fossdd left21:58
→ PlasmaHH joined21:59
→ plantroon joined22:00
← vysn left22:04
→ weko joined22:08
→ kurahaupo joined22:14
← Leonarbro left22:15
← alexherbo2 left22:15
→ alexherbo2 joined22:15
→ fossdd joined22:16
← sahil_ left22:17
→ Leonarbro joined22:18
← oriba left22:21
← realies left22:23
← Ox7C5 left22:29
← SharpHammer left22:31
← warthog9 left22:32
→ realies joined22:32
→ SharpHammer joined22:32
→ rgrinberg joined22:32
→ warthog9 joined22:34
← fossdd left22:34
← plantroon left22:36
→ plantroon joined22:41
→ fossdd joined22:42
← cjoke left22:46
→ jacobk joined22:48
← dnh left22:51
← dsrt^ left22:54
← rgrinberg left22:54
→ dsrt^ joined22:54
← DPA left22:55
→ dnh joined22:55
→ DPA joined22:59
← henry40408 left23:00
→ henry40408 joined23:01
← fossdd left23:03
← plantroon left23:05
← fling left23:07
→ fling joined23:07
← JanC left23:10
→ plantroon joined23:10
→ JanC joined23:10
← trashbox left23:12
→ JanC_ joined23:12
→ fossdd joined23:12
JanC → Guest476723:13
JanC_ → JanC23:13
← Guest4767 left23:13
← technoloG left23:13
← gh34 left23:14
→ __jmcantrell__ joined23:17
← __jmcantrell__ left23:17
→ rgrinberg joined23:17
→ thiago joined23:18
→ __jmcantrell__ joined23:19
jmcantrell → Guest69223:20
← Guest692 left23:20
__jmcantrell__ → jmcantrell23:20
→ jmcantrell_ joined23:20
← PlasmaHH left23:20
→ kus joined23:21
← thiago left23:23
← dnh left23:24
← kushal__ left23:25
← kus left23:25
→ dnh joined23:26
← dnh left23:28
→ thiago joined23:28
← fossdd left23:32
← henry40408 left23:35
→ henry40408 joined23:35
← alexherbo2 left23:40
→ alexherbo2 joined23:41
→ fossdd joined23:44
← a51 left23:44
← JanC left23:48
→ JanC joined23:48
← john_johnk left23:50
← rgrinberg left23:53
← stuv left23:55
→ stuv joined23:56
← Leonarbro left23:59

Logs Search ←Prev date Next date→ Channels Documentation