IRCloggy #git 2024-06-07

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-06-07

pebble joined00:00
aYiC https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template - how's this different than: git clone <repo> ? is it the same thing but this and gh are github-only ? i use git and private repo only, don't use a github acc00:03
Lord_of_Life left00:08
Lord_of_Life joined00:09
memset left00:12
memset joined00:13
FinnElija left00:13
andonome left00:13
FinnElija joined00:14
guru_ joined00:18
guru__ joined00:20
Guru_DE left00:21
Guru_DE joined00:22
guru_ left00:23
guru__ left00:25
guru_ joined00:29
Guru_DE left00:31
guru_ left00:33
stagas joined00:34
jenia2 left00:36
jenia2` left00:36
kurahaupo left00:42
stagas left00:44
iomari891 left00:52
Minvera joined00:56
vadparaszt joined00:59
Rodney_ left01:02
junyx joined01:06
gast0n joined01:08
chemsmith joined01:08
delay joined01:12
CrunchyFlakes left01:16
delay left01:18
CrunchyFlakes joined01:18
delay joined01:21
junyx left01:26
denysonique4 left01:27
gsi_ joined01:28
denysonique4 joined01:30
dostoyevsky2 left01:31
gsi left01:32
delay left01:33
Ocupado left01:33
delay joined01:33
delay left01:34
delay joined01:39
Ocupado joined01:44
stats4647 joined01:46
dostoyevsky2 joined01:50
stats4647 left01:51
junyx joined02:00
navi left02:03
lv8pv left02:04
lv8pv joined02:05
daru left02:06
delay left02:07
PteVallkas55Acti joined02:08
pedahzur left02:08
Ocupado left02:08
rigid left02:10
rigid joined02:11
dmj` left02:13
junyx left02:17
Gary_Sinise joined02:17
lucasta left02:24
daru joined02:36
junyx joined02:38
delay joined02:40
PteVallkas55Acti left02:40
pickanick left02:44
pickanick joined02:45
delay left02:45
travisghansen2 joined02:47
travisghansen left02:47
travisghansen2travisghansen02:47
grogu left02:53
grogu joined02:53
hdh left02:54
PteVallkas55Acti joined02:58
denysonique4 left03:02
denysonique4 joined03:02
PteVallkas55Acti left03:04
stats4647 joined03:08
pickanick left03:09
pickanick joined03:09
bn_work left03:10
pickanick left03:11
pickanick joined03:11
stats4647 left03:12
delay joined03:14
CrunchyFlakes left03:17
junyx left03:17
CrunchyFlakes joined03:19
delay left03:20
junyx joined03:23
rockzx left03:24
rockzx joined03:25
delay joined03:30
BigShip joined03:32
PteVallkas55Acti joined03:34
BigShip left03:36
BigShip joined03:36
wyclif joined03:40
gast0n left03:43
bloody_ joined03:46
bloody left03:47
stats4647 joined03:48
dlh404 left03:52
stats4647 left03:53
rindolf left03:57
rindolf joined03:58
travisghansen left04:00
travisghansen joined04:04
stats4647 joined04:23
chexum left04:29
chexum joined04:30
GNUmoon2 left04:34
ghost43 left04:34
memset left04:34
ghost43 joined04:35
GNUmoon2 joined04:35
memset joined04:35
delay left04:37
celmor joined04:47
iamtheranger left04:49
jmd joined04:50
cpackham left04:50
Gary_Sinise left04:56
memset left04:56
memset joined04:57
sentriz left05:00
zmt01 joined05:03
jmd left05:04
zmt00 left05:07
jmd joined05:09
RiFo joined05:09
ZMarkGC left05:10
PteVallkas55Actipausadd05:11
jmd left05:11
jmd joined05:11
jmd left05:12
jmd joined05:12
Albright left05:13
Albright joined05:13
rewt left05:17
ChmEarl left05:17
rewt joined05:18
thiago left05:25
duxsco joined05:29
dmj` joined05:29
sentriz joined05:41
Minvera left05:43
GuestZero joined05:44
skapata left05:48
peirik__ joined05:49
peirik__ left05:50
peirik__ joined05:51
peirik left05:52
peirik__ left05:54
peirik joined05:55
peirik left05:56
peirik joined05:57
andonome joined05:59
junyx left06:05
peirik__ joined06:05
GuestZero left06:06
GNUmoon2 left06:07
GNUmoon2 joined06:08
FinnElija left06:16
chexum left06:16
Lockesmith left06:16
chiselfuse left06:16
hussein1_ left06:16
chexum joined06:17
FinnElija joined06:17
Lockesmith joined06:17
chiselfuse joined06:17
hussein1_ joined06:17
geirha more like a git init followed by an initial git add && git commit to add some initial files06:23
jmd left06:25
hussein1_ left06:28
osse ... with all of that done on the server06:28
ZMarkGC joined06:28
user_oreloznog joined06:28
Crispy joined06:30
hussein1_ joined06:30
hussein1_ left06:30
hussein1_ joined06:30
gsekulski joined06:33
stats4647 left06:34
gsekulski Hey, how to actually mirror a repository? Is there a better way than old-school crontab + git pull?06:35
kurahaupo_ joined06:35
gsekulski (/fetch)06:35
GuestZero joined06:36
kurahaupo_kurahaupo06:36
chao joined06:36
osse sounds perfect06:36
PlasmaHH joined06:36
osse especially if you make the initial mirror with git clone --mirror06:37
gsekulski yeah, of course06:37
stenno left06:39
pickanick left06:40
Guru_DE joined06:41
luke-jr_ left06:44
luke-jr joined06:44
pickanick joined06:45
Traneptora_ joined06:47
Traneptora left06:47
bloody joined06:51
bloody_ left06:51
duxsco left06:54
stats4647 joined06:54
GuestZero left06:56
GuestZero joined06:58
hyperair left06:58
stats4647 left06:59
jmd joined06:59
jmd left06:59
aYiC left07:00
jmd joined07:01
jmd left07:03
jmd joined07:04
gandhibobandhi joined07:06
xx joined07:07
becm joined07:10
jmd left07:10
andonome left07:11
rfuentess joined07:12
brrm left07:13
user1____ joined07:16
krumelmonster left07:18
wyclif left07:28
iomari891 joined07:28
gandhibobandhi_ joined07:28
krumelmonster joined07:31
gandhibobandhi left07:31
derpydoo joined07:35
wyclif joined07:45
benaldo left07:50
benaldo joined07:50
derpydoo left07:52
pebble left07:52
stats4647 joined07:53
pebble joined07:55
stats4647 left07:59
lostbeard left08:00
defec7ed left08:00
lostbeard joined08:02
defec7ed joined08:02
duxsco joined08:02
chao left08:07
memset left08:10
iomari891 left08:10
memset joined08:10
printfdebugging joined08:14
davispuh joined08:14
Left_Turn joined08:16
celmor left08:24
Thanzex0 left08:25
printfdebugging1 joined08:25
hyperair joined08:27
critter joined08:28
Betal left08:29
duxsco left08:36
MGF_Fabio joined08:43
duxsco joined08:43
wyclif left08:47
hyperair left08:50
GNUmoon2 left08:52
fling left08:52
memset left08:52
hussein1_ left08:52
FinnElija left08:52
Lockesmith left08:52
sgm left08:52
chexum left08:52
chexum joined08:52
Lockesmith joined08:52
hussein1_ joined08:53
GNUmoon2 joined08:53
FinnElija joined08:53
memset joined08:53
sgm joined08:53
kostkon_ left08:54
GuestZero left08:55
iamtheranger joined08:58
stats4647 joined09:01
stats4647 left09:05
tennisanders joined09:10
duxsco left09:12
theobjectivedad left09:13
hyperair joined09:15
theobjectivedad joined09:15
wyclif joined09:17
yourfate joined09:20
wyclif left09:24
kostkon joined09:24
gsekulski left09:25
jusski joined09:25
hyperair left09:25
wyclif joined09:26
theoceaniscool joined09:27
wyclif left09:30
ssserpent joined09:32
printfdebugging left09:33
printfdebugging1printfdebugging09:33
nrubsig joined09:35
ssserpent left09:36
ssserpent joined09:37
Flow left09:39
printfdebugging left09:40
printfdebugging joined09:41
printfdebugging left09:41
printfdebugging joined09:41
printfdebugging1 joined09:41
brrm joined09:46
Flow joined09:46
hussein1_ left09:50
hussein1_ joined09:50
stats4647 joined09:55
wyclif joined10:00
stats4647 left10:00
weko joined10:03
wyclif left10:07
navi joined10:11
pebble left10:18
wyclif joined10:18
hyperair joined10:19
pebble joined10:20
wyclif left10:24
mud left10:27
mud joined10:28
gandhibobandhi_ left10:28
wyclif joined10:28
ssserpent left10:28
jfsimon1981 left10:30
jfsimon1981 joined10:31
xcm joined10:33
hyperair left10:34
xcm_ left10:34
pgloor left10:34
pgloor joined10:34
printfdebugging left10:34
printfdebugging1printfdebugging10:34
denysonique46 joined10:35
B4ckBOne left10:35
denysonique4 left10:36
denysonique46denysonique410:36
qsx left10:37
cebor left10:37
B4ckBOne joined10:38
iokill left10:38
frojnd joined10:39
dostoyevsky2 left10:39
ad__ joined10:40
xdminsy left10:40
xdminsy joined10:40
sitaramc joined10:41
hritik joined10:41
hritik left10:41
qsx joined10:42
hritik joined10:42
weko left10:42
Vonter left10:42
cebor joined10:42
derpydoo joined10:43
dostoyevsky2 joined10:43
iokill joined10:43
hritik left10:47
Vonter joined10:47
hritik joined10:48
nullie joined10:49
rfuentess left10:54
stagas joined10:56
savolla joined10:57
hritik left10:59
hritik joined10:59
thelounge689748 left11:00
thelounge689748 joined11:00
seanh1 joined11:01
rsx joined11:01
seanh1seanh11:02
stagas left11:02
stagas joined11:02
becm left11:04
savolla left11:06
savolla joined11:07
savolla left11:07
savolla joined11:09
stagas left11:09
savolla left11:10
peirik__ left11:12
hritik left11:12
hritik joined11:12
becm joined11:14
derpydoo left11:18
wyclif left11:20
Vonter left11:21
peirik__ joined11:21
savolla joined11:22
Vonter joined11:23
andonome joined11:25
hritik left11:26
hritik joined11:26
jusski left11:32
stagas joined11:32
luke-jr left11:32
jusski joined11:32
luke-jr joined11:33
critter left11:35
Vonter left11:36
hritik left11:39
hritik joined11:39
Vonter joined11:40
Traneptora_ left11:42
dsimic left11:43
dsimic joined11:45
hritik left11:48
hritik joined11:48
wyclif joined11:49
CrunchyFlakes left11:52
CrunchyFlakes joined11:54
wyclif left11:56
KnoP left12:00
ssserpent joined12:02
dlh404 joined12:08
hritik left12:08
hritik joined12:08
hritik left12:09
hritik joined12:09
hritik left12:11
hritik joined12:12
Murr left12:23
hritik left12:23
hritik joined12:23
hritik left12:24
hritik joined12:24
wyclif joined12:25
jmd joined12:28
jmd left12:30
jmd joined12:30
wyclif left12:32
printfdebugging left12:34
Flow left12:36
hritik left12:36
jkl left12:36
printfdebugging joined12:37
jkl joined12:37
baltazar left12:39
Turn_Left joined12:40
Flow joined12:41
jmd left12:42
wyclif joined12:42
jmd joined12:42
Left_Turn left12:43
Murr joined12:47
stats4647 joined12:48
printfdebugging left12:50
printfdebugging joined12:54
stats4647 left12:54
Flow left12:55
ferdna joined12:57
Flow joined12:58
jmd left13:07
jusski left13:07
theoceaniscool left13:08
digitcompfingercomp13:12
hritik joined13:22
fling joined13:24
hyperair joined13:25
Guru_DE left13:25
stats4647 joined13:26
thiago joined13:26
hyperair left13:27
Guru_DE joined13:28
stats4647 left13:30
Guru_DE left13:31
gsekulski joined13:32
Guru_DE joined13:32
Guru_DE left13:34
Guru_DE joined13:35
pgloor left13:35
pgloor joined13:36
hritik left13:37
hritik joined13:37
wyclif left13:41
hritik left13:42
chocolate_ joined13:46
jusski joined13:49
stats4647 joined13:50
thiago left13:52
stats4647 left13:54
jensen joined13:55
ferdna left13:55
gsekulski left13:55
Ox7C5_ joined14:00
someone235 joined14:02
chocolate_ left14:02
chocolate_ joined14:02
hritik joined14:04
peirik__ left14:04
pgloor left14:06
pgloor joined14:07
hritik left14:08
jusski left14:09
stef204 joined14:09
donofrio joined14:09
printfdebugging1 joined14:11
stats4647 joined14:15
pebble left14:18
stats4647 left14:20
pebble joined14:20
stenno joined14:21
memset left14:25
memset joined14:26
pebble left14:31
thiago joined14:32
pgloor left14:32
pebble joined14:33
jensenaR4U14:36
pgloor joined14:38
hyperair joined14:43
peirik_ left14:48
peirik_ joined14:49
tennisanders left14:49
stats4647 joined14:50
stats4647 left14:54
jmd joined15:04
theoceaniscool joined15:09
stagas left15:10
stagas joined15:10
stagas left15:12
stagas joined15:12
stagas left15:14
stagas joined15:14
PantelicGR joined15:17
stewie925 joined15:23
donofrio_ joined15:28
brw left15:30
donofrio left15:31
brw joined15:31
printfdebugging1 left15:32
stats4647 joined15:35
Thanzex0 joined15:36
stats4647 left15:40
peirik__ joined15:41
pickanick left15:42
peirik__ left15:42
pickanick joined15:43
peirik__ joined15:43
peirik left15:45
pickanick left15:48
pickanick joined15:49
skapata joined15:56
rsx left15:57
donofrio_ left16:01
donofrio_ joined16:02
gh34 joined16:03
theoceaniscool left16:03
gioele joined16:05
printfdebugging left16:11
gioele hi, I have three branches (X, Y, Z) stacked on a base branch (A): A→X→Y→Z. The base branch has been changed and contains a commit that conflicts with two commits in A..X. I enabled rerere, used `git rebase A` in X, fixed the conflicts and `git rebase --continue`d. Now, if I run `git switch Y; git rebase X` I would expect rerere to pick the recorded resolutions up, but it does not: git-rebase still tells16:12
printfdebugging joined16:12
printfdebugging left16:12
printfdebugging joined16:12
gioele me to manually fix the conflicts. What can I do to tell rerere (or rebase) to reuse the resolutions I already used for these commits?16:12
I assume git-rerere is not picking up the resolution because the conflicting commits have different IDs (pre rebase of X and post rebase of X). Can I somehow tell it to be "sloppier" when looking for possible recorded resolutions?16:15
fflam joined16:16
Novi left16:19
Novi joined16:21
someone235 left16:22
stats4647 joined16:22
weko joined16:23
osse gioele: I don't know the answer to your concrete question, but this might help in the future: On Z you can run git rebase --update-refs A. The option makes git also update X and Y along the way16:26
hdh joined16:26
stats4647 left16:27
john_johnk joined16:27
osse gioele: The problem is that git rebase X from Y will try to also apply the commits in the old X. You can get around that up front like I showed, or you can do git rebase --onto=X X@{1}16:29
stats4647 joined16:37
stats4647 left16:42
pedahzur joined16:43
junyx joined16:54
john_johnk left16:58
iomari891 joined17:03
Betal joined17:04
printfdebugging1 joined17:12
iomari891 left17:15
gioele osse: thanks for the hints. I'm halfway through, so I'd like to try your second suggestion (--onto). I tried `git switch Z; git rebase --onto=Y Y@{1}`, but I still got "questioned" about those two commits in A..X17:16
MGF_Fabio left17:18
osse gioele: Since you had to tinker with Y in the process Y@{1} may not be what we hoped. Check git reflog Y and see if you can find the commit Y was at prior to starting the rebase17:19
And use that instead17:19
intelfx left17:20
intelfx joined17:22
stats4647 joined17:24
stats4647 left17:29
peirik__ left17:30
peirik joined17:31
peirik left17:33
peirik joined17:33
hyperair left17:35
OverlordDuck joined17:35
OverlordDuck left17:36
junyx left17:37
Mardroemmar joined17:38
fonini joined17:40
iomari891 joined17:47
fofoni joined17:49
___nick___ joined17:50
___nick___ left17:51
iomari891 left17:51
fonini left17:52
___nick___ joined17:53
thiago left17:56
iomari891 joined17:57
thiago joined17:59
hyperair joined18:02
becm left18:05
stats4647 joined18:08
mooz left18:10
mooz joined18:12
stats4647 left18:12
stewie925 left18:16
stef204 left18:18
gioele osse: it's working now. Cool. I was confused by the fact that I created some branch to avoid losing the original situation. With the necessary adjustments everything is working fine. Thanks!18:22
bloody_ joined18:25
junyx joined18:26
bloody left18:26
user_oreloznog left18:33
user_oreloznog_ joined18:33
iomari891 left18:36
ChmEarl joined18:42
davispuh left18:45
pebble left18:47
stats4647 joined18:47
printfdebugging1 left18:49
larryv joined18:49
stats4647 left18:51
davispuh joined18:52
printfdebugging1 joined18:54
tirnanog joined18:56
junyx left19:01
fo9 joined19:02
chocolate_ left19:03
fofoni left19:05
OnkelTem left19:06
davispuh left19:07
junyx joined19:13
peirik__ joined19:15
memset left19:17
peirik left19:17
junyx left19:18
memset joined19:18
junyx joined19:18
stats4647 joined19:19
peirik__ left19:20
TheCaptain8989 joined19:20
TheCaptain898 left19:21
TheCaptain8989TheCaptain89819:21
CrunchyFlakes left19:23
stats4647 left19:24
CrunchyFlakes joined19:25
Furai left19:27
GuestZero joined19:29
causasui joined19:30
junyx left19:30
thiago left19:38
chocolate_ joined19:38
peirik joined19:38
Furai joined19:39
printfdebugging2 joined19:40
sgm left19:44
sgm joined19:45
peirik__ joined19:45
junyx joined19:46
printfdebugging2 left19:49
thiago joined19:50
peirik__ left19:52
printfdebugging2 joined19:56
tirnanog left19:57
printfdebugging left19:58
junyx left19:58
stats4647 joined19:59
printfdebugging joined19:59
printfdebugging1 left19:59
printfdebugging2 left20:01
causasui left20:01
causasui joined20:01
GuestZero left20:02
bn_work joined20:02
stats4647 left20:03
thiago left20:04
___nick___ left20:04
chocolate_ left20:06
chocolate_ joined20:06
gsekulski joined20:18
m0viefreak joined20:21
stats4647 joined20:26
tirnanog joined20:29
peirik left20:30
peirik joined20:31
GuestZero joined20:33
stats4647 left20:34
gsekulski left20:35
jfsimon1981_b joined20:38
jfsimon1981 left20:39
Ox7C5_ left20:41
savolla left20:41
gh34 left20:44
junyx joined20:46
junyx left20:48
GuestZero left20:56
iamtheranger left21:02
peirik__ joined21:02
PlasmaHH left21:13
Guest30 joined21:19
quadrantoracle joined21:20
Guest30 left21:23
thiago joined21:23
PlasmaHH joined21:26
peirik__ left21:33
quadrantoracle left21:35
kiruny joined21:35
quadrantoracle joined21:36
sfenik9 left21:43
sfenik9 joined21:44
peirik__ joined22:02
CrunchyFlakes left22:02
CrunchyFlakes joined22:04
peirik__ left22:15
xx left22:19
TheBuell joined22:35
TheBuell I accidentally truncated HEAD and ORGIN_HEAD how do I get myself out of that deep hole?22:36
(long story)22:36
weaksauce make a backup first and maybe the reflog will help22:39
i'm not sure what truncated means in the context of HEAD ... you truncated the hash?22:39
TheBuell they have a length of zer022:39
quadrantoracle left22:40
TheBuell iv'e tried reflog it says not a .git folder22:40
FETCH_HEAD seems intact22:40
https://bpa.st/GODQ22:41
listing of .git folder22:42
printfdebugging left22:44
printfdebugging joined22:45
TheBuell now it says it is not a .git folder.22:50
weaksauce odd22:51
what is in refs/heads22:51
TheBuell refs/head has three folders22:51
.. version_0_1_4, version_0_1_3 and version_0_1.3 and main22:52
four files actually22:52
weaksauce I do think you should make a backup before doing anything but you could try adding ref: refs/heads/main to your HEAD22:53
TheBuell k22:53
Turn_Left left22:53
TheBuell now it knows it is a git folder22:53
tried ot pull again and it says .. fatal: update_ref failed for ref 'ORIG_HEAD': cannot lock ref 'ORIG_HEAD': unable to resolve reference 'ORIG_HEAD': reference broken22:54
So I need to fix ORIG_HEAD next22:54
it currently has a length of 022:54
mud Clone the remote repo somewhere new and copy the file from the new clone?22:55
TheBuell HEAD looks good now22:55
what needs to go into ORIG_HEAD ?22:56
mud Whatever git puts there, in a new clone probably22:56
weaksauce probably something like ref: remotes/origin/main or something like that22:56
TheBuell right ...22:56
i will try that next22:57
weaksauce what is in your remotes folder22:57
TheBuell https://bpa.st/47UQ22:57
ref: remotes/origin/main I think that neesd to go into ORIG_HEAD22:58
right?22:58
weaksauce i'm not sure22:58
gioele left22:58
TheBuell Yay, that fixed it22:58
mud Can't you just clone it again and check what git puts in there?22:58
TheBuell thank you22:58
i'nm out of the hole now22:58
weaksauce nice22:58
mud Nice22:58
TheBuell Linus know what he was doing when he put it together22:59
*knew22:59
weaksauce yeah smart fellow that22:59
printfdebugging left22:59
TheBuell Thanks once again.. cheers for now ;)23:00
TheBuell left23:00
gildasio left23:00
gildasio joined23:02
guardianxxx joined23:12
guardianxxx left23:15
gildasio left23:15
gildasio joined23:16
thiago left23:20
chocolate_ left23:23
PantelicGR left23:26
junyx joined23:28
so-offish joined23:32
skered left23:33
printfdebugging joined23:40
printfdebugging1 joined23:41
so-offish left23:45
skered joined23:49
antranigv joined23:55
antranigv Hi all, can anyone explain what this means? On branch antranigv/wip/cut_w ; Your branch and 'code/antranigv/wip/cut_w' have diverged; and have 201 and 1 different commits each, respectively23:56
peirik__ joined23:58

Logs Search ←Prev date Next date→ Channels Documentation