| 2024-06-07 |
| → pebble joined | 00: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 acc | 00:03 |
| ← Lord_of_Life left | 00:08 |
| → Lord_of_Life joined | 00:09 |
| ← memset left | 00:12 |
| → memset joined | 00:13 |
| ← FinnElija left | 00:13 |
| ← andonome left | 00:13 |
| → FinnElija joined | 00:14 |
| → guru_ joined | 00:18 |
| → guru__ joined | 00:20 |
| ← Guru_DE left | 00:21 |
| → Guru_DE joined | 00:22 |
| ← guru_ left | 00:23 |
| ← guru__ left | 00:25 |
| → guru_ joined | 00:29 |
| ← Guru_DE left | 00:31 |
| ← guru_ left | 00:33 |
| → stagas joined | 00:34 |
| ← jenia2 left | 00:36 |
| ← jenia2` left | 00:36 |
| ← kurahaupo left | 00:42 |
| ← stagas left | 00:44 |
| ← iomari891 left | 00:52 |
| → Minvera joined | 00:56 |
| → vadparaszt joined | 00:59 |
| ← Rodney_ left | 01:02 |
| → junyx joined | 01:06 |
| → gast0n joined | 01:08 |
| → chemsmith joined | 01:08 |
| → delay joined | 01:12 |
| ← CrunchyFlakes left | 01:16 |
| ← delay left | 01:18 |
| → CrunchyFlakes joined | 01:18 |
| → delay joined | 01:21 |
| ← junyx left | 01:26 |
| ← denysonique4 left | 01:27 |
| → gsi_ joined | 01:28 |
| → denysonique4 joined | 01:30 |
| ← dostoyevsky2 left | 01:31 |
| ← gsi left | 01:32 |
| ← delay left | 01:33 |
| ← Ocupado left | 01:33 |
| → delay joined | 01:33 |
| ← delay left | 01:34 |
| → delay joined | 01:39 |
| → Ocupado joined | 01:44 |
| → stats4647 joined | 01:46 |
| → dostoyevsky2 joined | 01:50 |
| ← stats4647 left | 01:51 |
| → junyx joined | 02:00 |
| ← navi left | 02:03 |
| ← lv8pv left | 02:04 |
| → lv8pv joined | 02:05 |
| ← daru left | 02:06 |
| ← delay left | 02:07 |
| → PteVallkas55Acti joined | 02:08 |
| ← pedahzur left | 02:08 |
| ← Ocupado left | 02:08 |
| ← rigid left | 02:10 |
| → rigid joined | 02:11 |
| ← dmj` left | 02:13 |
| ← junyx left | 02:17 |
| → Gary_Sinise joined | 02:17 |
| ← lucasta left | 02:24 |
| → daru joined | 02:36 |
| → junyx joined | 02:38 |
| → delay joined | 02:40 |
| ← PteVallkas55Acti left | 02:40 |
| ← pickanick left | 02:44 |
| → pickanick joined | 02:45 |
| ← delay left | 02:45 |
| → travisghansen2 joined | 02:47 |
| ← travisghansen left | 02:47 |
| travisghansen2 → travisghansen | 02:47 |
| ← grogu left | 02:53 |
| → grogu joined | 02:53 |
| ← hdh left | 02:54 |
| → PteVallkas55Acti joined | 02:58 |
| ← denysonique4 left | 03:02 |
| → denysonique4 joined | 03:02 |
| ← PteVallkas55Acti left | 03:04 |
| → stats4647 joined | 03:08 |
| ← pickanick left | 03:09 |
| → pickanick joined | 03:09 |
| ← bn_work left | 03:10 |
| ← pickanick left | 03:11 |
| → pickanick joined | 03:11 |
| ← stats4647 left | 03:12 |
| → delay joined | 03:14 |
| ← CrunchyFlakes left | 03:17 |
| ← junyx left | 03:17 |
| → CrunchyFlakes joined | 03:19 |
| ← delay left | 03:20 |
| → junyx joined | 03:23 |
| ← rockzx left | 03:24 |
| → rockzx joined | 03:25 |
| → delay joined | 03:30 |
| → BigShip joined | 03:32 |
| → PteVallkas55Acti joined | 03:34 |
| ← BigShip left | 03:36 |
| → BigShip joined | 03:36 |
| → wyclif joined | 03:40 |
| ← gast0n left | 03:43 |
| → bloody_ joined | 03:46 |
| ← bloody left | 03:47 |
| → stats4647 joined | 03:48 |
| ← dlh404 left | 03:52 |
| ← stats4647 left | 03:53 |
| ← rindolf left | 03:57 |
| → rindolf joined | 03:58 |
| ← travisghansen left | 04:00 |
| → travisghansen joined | 04:04 |
| → stats4647 joined | 04:23 |
| ← chexum left | 04:29 |
| → chexum joined | 04:30 |
| ← GNUmoon2 left | 04:34 |
| ← ghost43 left | 04:34 |
| ← memset left | 04:34 |
| → ghost43 joined | 04:35 |
| → GNUmoon2 joined | 04:35 |
| → memset joined | 04:35 |
| ← delay left | 04:37 |
| → celmor joined | 04:47 |
| ← iamtheranger left | 04:49 |
| → jmd joined | 04:50 |
| ← cpackham left | 04:50 |
| ← Gary_Sinise left | 04:56 |
| ← memset left | 04:56 |
| → memset joined | 04:57 |
| ← sentriz left | 05:00 |
| → zmt01 joined | 05:03 |
| ← jmd left | 05:04 |
| ← zmt00 left | 05:07 |
| → jmd joined | 05:09 |
| → RiFo joined | 05:09 |
| ← ZMarkGC left | 05:10 |
| PteVallkas55Acti → pausadd | 05:11 |
| ← jmd left | 05:11 |
| → jmd joined | 05:11 |
| ← jmd left | 05:12 |
| → jmd joined | 05:12 |
| ← Albright left | 05:13 |
| → Albright joined | 05:13 |
| ← rewt left | 05:17 |
| ← ChmEarl left | 05:17 |
| → rewt joined | 05:18 |
| ← thiago left | 05:25 |
| → duxsco joined | 05:29 |
| → dmj` joined | 05:29 |
| → sentriz joined | 05:41 |
| ← Minvera left | 05:43 |
| → GuestZero joined | 05:44 |
| ← skapata left | 05:48 |
| → peirik__ joined | 05:49 |
| ← peirik__ left | 05:50 |
| → peirik__ joined | 05:51 |
| ← peirik left | 05:52 |
| ← peirik__ left | 05:54 |
| → peirik joined | 05:55 |
| ← peirik left | 05:56 |
| → peirik joined | 05:57 |
| → andonome joined | 05:59 |
| ← junyx left | 06:05 |
| → peirik__ joined | 06:05 |
| ← GuestZero left | 06:06 |
| ← GNUmoon2 left | 06:07 |
| → GNUmoon2 joined | 06:08 |
| ← FinnElija left | 06:16 |
| ← chexum left | 06:16 |
| ← Lockesmith left | 06:16 |
| ← chiselfuse left | 06:16 |
| ← hussein1_ left | 06:16 |
| → chexum joined | 06:17 |
| → FinnElija joined | 06:17 |
| → Lockesmith joined | 06:17 |
| → chiselfuse joined | 06:17 |
| → hussein1_ joined | 06:17 |
|
geirha
| more like a git init followed by an initial git add && git commit to add some initial files | 06:23 |
| ← jmd left | 06:25 |
| ← hussein1_ left | 06:28 |
|
osse
| ... with all of that done on the server | 06:28 |
| → ZMarkGC joined | 06:28 |
| → user_oreloznog joined | 06:28 |
| → Crispy joined | 06:30 |
| → hussein1_ joined | 06:30 |
| ← hussein1_ left | 06:30 |
| → hussein1_ joined | 06:30 |
| → gsekulski joined | 06:33 |
| ← stats4647 left | 06:34 |
|
gsekulski
| Hey, how to actually mirror a repository? Is there a better way than old-school crontab + git pull? | 06:35 |
| → kurahaupo_ joined | 06:35 |
|
gsekulski
| (/fetch) | 06:35 |
| → GuestZero joined | 06:36 |
| kurahaupo_ → kurahaupo | 06:36 |
| → chao joined | 06:36 |
|
osse
| sounds perfect | 06:36 |
| → PlasmaHH joined | 06:36 |
|
osse
| especially if you make the initial mirror with git clone --mirror | 06:37 |
|
gsekulski
| yeah, of course | 06:37 |
| ← stenno left | 06:39 |
| ← pickanick left | 06:40 |
| → Guru_DE joined | 06:41 |
| ← luke-jr_ left | 06:44 |
| → luke-jr joined | 06:44 |
| → pickanick joined | 06:45 |
| → Traneptora_ joined | 06:47 |
| ← Traneptora left | 06:47 |
| → bloody joined | 06:51 |
| ← bloody_ left | 06:51 |
| ← duxsco left | 06:54 |
| → stats4647 joined | 06:54 |
| ← GuestZero left | 06:56 |
| → GuestZero joined | 06:58 |
| ← hyperair left | 06:58 |
| ← stats4647 left | 06:59 |
| → jmd joined | 06:59 |
| ← jmd left | 06:59 |
| ← aYiC left | 07:00 |
| → jmd joined | 07:01 |
| ← jmd left | 07:03 |
| → jmd joined | 07:04 |
| → gandhibobandhi joined | 07:06 |
| → xx joined | 07:07 |
| → becm joined | 07:10 |
| ← jmd left | 07:10 |
| ← andonome left | 07:11 |
| → rfuentess joined | 07:12 |
| ← brrm left | 07:13 |
| → user1____ joined | 07:16 |
| ← krumelmonster left | 07:18 |
| ← wyclif left | 07:28 |
| → iomari891 joined | 07:28 |
| → gandhibobandhi_ joined | 07:28 |
| → krumelmonster joined | 07:31 |
| ← gandhibobandhi left | 07:31 |
| → derpydoo joined | 07:35 |
| → wyclif joined | 07:45 |
| ← benaldo left | 07:50 |
| → benaldo joined | 07:50 |
| ← derpydoo left | 07:52 |
| ← pebble left | 07:52 |
| → stats4647 joined | 07:53 |
| → pebble joined | 07:55 |
| ← stats4647 left | 07:59 |
| ← lostbeard left | 08:00 |
| ← defec7ed left | 08:00 |
| → lostbeard joined | 08:02 |
| → defec7ed joined | 08:02 |
| → duxsco joined | 08:02 |
| ← chao left | 08:07 |
| ← memset left | 08:10 |
| ← iomari891 left | 08:10 |
| → memset joined | 08:10 |
| → printfdebugging joined | 08:14 |
| → davispuh joined | 08:14 |
| → Left_Turn joined | 08:16 |
| ← celmor left | 08:24 |
| ← Thanzex0 left | 08:25 |
| → printfdebugging1 joined | 08:25 |
| → hyperair joined | 08:27 |
| → critter joined | 08:28 |
| ← Betal left | 08:29 |
| ← duxsco left | 08:36 |
| → MGF_Fabio joined | 08:43 |
| → duxsco joined | 08:43 |
| ← wyclif left | 08:47 |
| ← hyperair left | 08:50 |
| ← GNUmoon2 left | 08:52 |
| ← fling left | 08:52 |
| ← memset left | 08:52 |
| ← hussein1_ left | 08:52 |
| ← FinnElija left | 08:52 |
| ← Lockesmith left | 08:52 |
| ← sgm left | 08:52 |
| ← chexum left | 08:52 |
| → chexum joined | 08:52 |
| → Lockesmith joined | 08:52 |
| → hussein1_ joined | 08:53 |
| → GNUmoon2 joined | 08:53 |
| → FinnElija joined | 08:53 |
| → memset joined | 08:53 |
| → sgm joined | 08:53 |
| ← kostkon_ left | 08:54 |
| ← GuestZero left | 08:55 |
| → iamtheranger joined | 08:58 |
| → stats4647 joined | 09:01 |
| ← stats4647 left | 09:05 |
| → tennisanders joined | 09:10 |
| ← duxsco left | 09:12 |
| ← theobjectivedad left | 09:13 |
| → hyperair joined | 09:15 |
| → theobjectivedad joined | 09:15 |
| → wyclif joined | 09:17 |
| → yourfate joined | 09:20 |
| ← wyclif left | 09:24 |
| → kostkon joined | 09:24 |
| ← gsekulski left | 09:25 |
| → jusski joined | 09:25 |
| ← hyperair left | 09:25 |
| → wyclif joined | 09:26 |
| → theoceaniscool joined | 09:27 |
| ← wyclif left | 09:30 |
| → ssserpent joined | 09:32 |
| ← printfdebugging left | 09:33 |
| printfdebugging1 → printfdebugging | 09:33 |
| → nrubsig joined | 09:35 |
| ← ssserpent left | 09:36 |
| → ssserpent joined | 09:37 |
| ← Flow left | 09:39 |
| ← printfdebugging left | 09:40 |
| → printfdebugging joined | 09:41 |
| ← printfdebugging left | 09:41 |
| → printfdebugging joined | 09:41 |
| → printfdebugging1 joined | 09:41 |
| → brrm joined | 09:46 |
| → Flow joined | 09:46 |
| ← hussein1_ left | 09:50 |
| → hussein1_ joined | 09:50 |
| → stats4647 joined | 09:55 |
| → wyclif joined | 10:00 |
| ← stats4647 left | 10:00 |
| → weko joined | 10:03 |
| ← wyclif left | 10:07 |
| → navi joined | 10:11 |
| ← pebble left | 10:18 |
| → wyclif joined | 10:18 |
| → hyperair joined | 10:19 |
| → pebble joined | 10:20 |
| ← wyclif left | 10:24 |
| ← mud left | 10:27 |
| → mud joined | 10:28 |
| ← gandhibobandhi_ left | 10:28 |
| → wyclif joined | 10:28 |
| ← ssserpent left | 10:28 |
| ← jfsimon1981 left | 10:30 |
| → jfsimon1981 joined | 10:31 |
| → xcm joined | 10:33 |
| ← hyperair left | 10:34 |
| ← xcm_ left | 10:34 |
| ← pgloor left | 10:34 |
| → pgloor joined | 10:34 |
| ← printfdebugging left | 10:34 |
| printfdebugging1 → printfdebugging | 10:34 |
| → denysonique46 joined | 10:35 |
| ← B4ckBOne left | 10:35 |
| ← denysonique4 left | 10:36 |
| denysonique46 → denysonique4 | 10:36 |
| ← qsx left | 10:37 |
| ← cebor left | 10:37 |
| → B4ckBOne joined | 10:38 |
| ← iokill left | 10:38 |
| → frojnd joined | 10:39 |
| ← dostoyevsky2 left | 10:39 |
| → ad__ joined | 10:40 |
| ← xdminsy left | 10:40 |
| → xdminsy joined | 10:40 |
| → sitaramc joined | 10:41 |
| → hritik joined | 10:41 |
| ← hritik left | 10:41 |
| → qsx joined | 10:42 |
| → hritik joined | 10:42 |
| ← weko left | 10:42 |
| ← Vonter left | 10:42 |
| → cebor joined | 10:42 |
| → derpydoo joined | 10:43 |
| → dostoyevsky2 joined | 10:43 |
| → iokill joined | 10:43 |
| ← hritik left | 10:47 |
| → Vonter joined | 10:47 |
| → hritik joined | 10:48 |
| → nullie joined | 10:49 |
| ← rfuentess left | 10:54 |
| → stagas joined | 10:56 |
| → savolla joined | 10:57 |
| ← hritik left | 10:59 |
| → hritik joined | 10:59 |
| ← thelounge689748 left | 11:00 |
| → thelounge689748 joined | 11:00 |
| → seanh1 joined | 11:01 |
| → rsx joined | 11:01 |
| seanh1 → seanh | 11:02 |
| ← stagas left | 11:02 |
| → stagas joined | 11:02 |
| ← becm left | 11:04 |
| ← savolla left | 11:06 |
| → savolla joined | 11:07 |
| ← savolla left | 11:07 |
| → savolla joined | 11:09 |
| ← stagas left | 11:09 |
| ← savolla left | 11:10 |
| ← peirik__ left | 11:12 |
| ← hritik left | 11:12 |
| → hritik joined | 11:12 |
| → becm joined | 11:14 |
| ← derpydoo left | 11:18 |
| ← wyclif left | 11:20 |
| ← Vonter left | 11:21 |
| → peirik__ joined | 11:21 |
| → savolla joined | 11:22 |
| → Vonter joined | 11:23 |
| → andonome joined | 11:25 |
| ← hritik left | 11:26 |
| → hritik joined | 11:26 |
| ← jusski left | 11:32 |
| → stagas joined | 11:32 |
| ← luke-jr left | 11:32 |
| → jusski joined | 11:32 |
| → luke-jr joined | 11:33 |
| ← critter left | 11:35 |
| ← Vonter left | 11:36 |
| ← hritik left | 11:39 |
| → hritik joined | 11:39 |
| → Vonter joined | 11:40 |
| ← Traneptora_ left | 11:42 |
| ← dsimic left | 11:43 |
| → dsimic joined | 11:45 |
| ← hritik left | 11:48 |
| → hritik joined | 11:48 |
| → wyclif joined | 11:49 |
| ← CrunchyFlakes left | 11:52 |
| → CrunchyFlakes joined | 11:54 |
| ← wyclif left | 11:56 |
| ← KnoP left | 12:00 |
| → ssserpent joined | 12:02 |
| → dlh404 joined | 12:08 |
| ← hritik left | 12:08 |
| → hritik joined | 12:08 |
| ← hritik left | 12:09 |
| → hritik joined | 12:09 |
| ← hritik left | 12:11 |
| → hritik joined | 12:12 |
| ← Murr left | 12:23 |
| ← hritik left | 12:23 |
| → hritik joined | 12:23 |
| ← hritik left | 12:24 |
| → hritik joined | 12:24 |
| → wyclif joined | 12:25 |
| → jmd joined | 12:28 |
| ← jmd left | 12:30 |
| → jmd joined | 12:30 |
| ← wyclif left | 12:32 |
| ← printfdebugging left | 12:34 |
| ← Flow left | 12:36 |
| ← hritik left | 12:36 |
| ← jkl left | 12:36 |
| → printfdebugging joined | 12:37 |
| → jkl joined | 12:37 |
| ← baltazar left | 12:39 |
| → Turn_Left joined | 12:40 |
| → Flow joined | 12:41 |
| ← jmd left | 12:42 |
| → wyclif joined | 12:42 |
| → jmd joined | 12:42 |
| ← Left_Turn left | 12:43 |
| → Murr joined | 12:47 |
| → stats4647 joined | 12:48 |
| ← printfdebugging left | 12:50 |
| → printfdebugging joined | 12:54 |
| ← stats4647 left | 12:54 |
| ← Flow left | 12:55 |
| → ferdna joined | 12:57 |
| → Flow joined | 12:58 |
| ← jmd left | 13:07 |
| ← jusski left | 13:07 |
| ← theoceaniscool left | 13:08 |
| digitcomp → fingercomp | 13:12 |
| → hritik joined | 13:22 |
| → fling joined | 13:24 |
| → hyperair joined | 13:25 |
| ← Guru_DE left | 13:25 |
| → stats4647 joined | 13:26 |
| → thiago joined | 13:26 |
| ← hyperair left | 13:27 |
| → Guru_DE joined | 13:28 |
| ← stats4647 left | 13:30 |
| ← Guru_DE left | 13:31 |
| → gsekulski joined | 13:32 |
| → Guru_DE joined | 13:32 |
| ← Guru_DE left | 13:34 |
| → Guru_DE joined | 13:35 |
| ← pgloor left | 13:35 |
| → pgloor joined | 13:36 |
| ← hritik left | 13:37 |
| → hritik joined | 13:37 |
| ← wyclif left | 13:41 |
| ← hritik left | 13:42 |
| → chocolate_ joined | 13:46 |
| → jusski joined | 13:49 |
| → stats4647 joined | 13:50 |
| ← thiago left | 13:52 |
| ← stats4647 left | 13:54 |
| → jensen joined | 13:55 |
| ← ferdna left | 13:55 |
| ← gsekulski left | 13:55 |
| → Ox7C5_ joined | 14:00 |
| → someone235 joined | 14:02 |
| ← chocolate_ left | 14:02 |
| → chocolate_ joined | 14:02 |
| → hritik joined | 14:04 |
| ← peirik__ left | 14:04 |
| ← pgloor left | 14:06 |
| → pgloor joined | 14:07 |
| ← hritik left | 14:08 |
| ← jusski left | 14:09 |
| → stef204 joined | 14:09 |
| → donofrio joined | 14:09 |
| → printfdebugging1 joined | 14:11 |
| → stats4647 joined | 14:15 |
| ← pebble left | 14:18 |
| ← stats4647 left | 14:20 |
| → pebble joined | 14:20 |
| → stenno joined | 14:21 |
| ← memset left | 14:25 |
| → memset joined | 14:26 |
| ← pebble left | 14:31 |
| → thiago joined | 14:32 |
| ← pgloor left | 14:32 |
| → pebble joined | 14:33 |
| jensen → aR4U | 14:36 |
| → pgloor joined | 14:38 |
| → hyperair joined | 14:43 |
| ← peirik_ left | 14:48 |
| → peirik_ joined | 14:49 |
| ← tennisanders left | 14:49 |
| → stats4647 joined | 14:50 |
| ← stats4647 left | 14:54 |
| → jmd joined | 15:04 |
| → theoceaniscool joined | 15:09 |
| ← stagas left | 15:10 |
| → stagas joined | 15:10 |
| ← stagas left | 15:12 |
| → stagas joined | 15:12 |
| ← stagas left | 15:14 |
| → stagas joined | 15:14 |
| → PantelicGR joined | 15:17 |
| → stewie925 joined | 15:23 |
| → donofrio_ joined | 15:28 |
| ← brw left | 15:30 |
| ← donofrio left | 15:31 |
| → brw joined | 15:31 |
| ← printfdebugging1 left | 15:32 |
| → stats4647 joined | 15:35 |
| → Thanzex0 joined | 15:36 |
| ← stats4647 left | 15:40 |
| → peirik__ joined | 15:41 |
| ← pickanick left | 15:42 |
| ← peirik__ left | 15:42 |
| → pickanick joined | 15:43 |
| → peirik__ joined | 15:43 |
| ← peirik left | 15:45 |
| ← pickanick left | 15:48 |
| → pickanick joined | 15:49 |
| → skapata joined | 15:56 |
| ← rsx left | 15:57 |
| ← donofrio_ left | 16:01 |
| → donofrio_ joined | 16:02 |
| → gh34 joined | 16:03 |
| ← theoceaniscool left | 16:03 |
| → gioele joined | 16:05 |
| ← printfdebugging left | 16: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 tells | 16:12 |
| → printfdebugging joined | 16:12 |
| ← printfdebugging left | 16:12 |
| → printfdebugging joined | 16: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 joined | 16:16 |
| ← Novi left | 16:19 |
| → Novi joined | 16:21 |
| ← someone235 left | 16:22 |
| → stats4647 joined | 16:22 |
| → weko joined | 16: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 way | 16:26 |
| → hdh joined | 16:26 |
| ← stats4647 left | 16:27 |
| → john_johnk joined | 16: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 joined | 16:37 |
| ← stats4647 left | 16:42 |
| → pedahzur joined | 16:43 |
| → junyx joined | 16:54 |
| ← john_johnk left | 16:58 |
| → iomari891 joined | 17:03 |
| → Betal joined | 17:04 |
| → printfdebugging1 joined | 17:12 |
| ← iomari891 left | 17: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..X | 17:16 |
| ← MGF_Fabio left | 17: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 rebase | 17:19 |
|
| And use that instead | 17:19 |
| ← intelfx left | 17:20 |
| → intelfx joined | 17:22 |
| → stats4647 joined | 17:24 |
| ← stats4647 left | 17:29 |
| ← peirik__ left | 17:30 |
| → peirik joined | 17:31 |
| ← peirik left | 17:33 |
| → peirik joined | 17:33 |
| ← hyperair left | 17:35 |
| → OverlordDuck joined | 17:35 |
| ← OverlordDuck left | 17:36 |
| ← junyx left | 17:37 |
| → Mardroemmar joined | 17:38 |
| → fonini joined | 17:40 |
| → iomari891 joined | 17:47 |
| → fofoni joined | 17:49 |
| → ___nick___ joined | 17:50 |
| ← ___nick___ left | 17:51 |
| ← iomari891 left | 17:51 |
| ← fonini left | 17:52 |
| → ___nick___ joined | 17:53 |
| ← thiago left | 17:56 |
| → iomari891 joined | 17:57 |
| → thiago joined | 17:59 |
| → hyperair joined | 18:02 |
| ← becm left | 18:05 |
| → stats4647 joined | 18:08 |
| ← mooz left | 18:10 |
| → mooz joined | 18:12 |
| ← stats4647 left | 18:12 |
| ← stewie925 left | 18:16 |
| ← stef204 left | 18: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_ joined | 18:25 |
| → junyx joined | 18:26 |
| ← bloody left | 18:26 |
| ← user_oreloznog left | 18:33 |
| → user_oreloznog_ joined | 18:33 |
| ← iomari891 left | 18:36 |
| → ChmEarl joined | 18:42 |
| ← davispuh left | 18:45 |
| ← pebble left | 18:47 |
| → stats4647 joined | 18:47 |
| ← printfdebugging1 left | 18:49 |
| → larryv joined | 18:49 |
| ← stats4647 left | 18:51 |
| → davispuh joined | 18:52 |
| → printfdebugging1 joined | 18:54 |
| → tirnanog joined | 18:56 |
| ← junyx left | 19:01 |
| → fo9 joined | 19:02 |
| ← chocolate_ left | 19:03 |
| ← fofoni left | 19:05 |
| ← OnkelTem left | 19:06 |
| ← davispuh left | 19:07 |
| → junyx joined | 19:13 |
| → peirik__ joined | 19:15 |
| ← memset left | 19:17 |
| ← peirik left | 19:17 |
| ← junyx left | 19:18 |
| → memset joined | 19:18 |
| → junyx joined | 19:18 |
| → stats4647 joined | 19:19 |
| ← peirik__ left | 19:20 |
| → TheCaptain8989 joined | 19:20 |
| ← TheCaptain898 left | 19:21 |
| TheCaptain8989 → TheCaptain898 | 19:21 |
| ← CrunchyFlakes left | 19:23 |
| ← stats4647 left | 19:24 |
| → CrunchyFlakes joined | 19:25 |
| ← Furai left | 19:27 |
| → GuestZero joined | 19:29 |
| → causasui joined | 19:30 |
| ← junyx left | 19:30 |
| ← thiago left | 19:38 |
| → chocolate_ joined | 19:38 |
| → peirik joined | 19:38 |
| → Furai joined | 19:39 |
| → printfdebugging2 joined | 19:40 |
| ← sgm left | 19:44 |
| → sgm joined | 19:45 |
| → peirik__ joined | 19:45 |
| → junyx joined | 19:46 |
| ← printfdebugging2 left | 19:49 |
| → thiago joined | 19:50 |
| ← peirik__ left | 19:52 |
| → printfdebugging2 joined | 19:56 |
| ← tirnanog left | 19:57 |
| ← printfdebugging left | 19:58 |
| ← junyx left | 19:58 |
| → stats4647 joined | 19:59 |
| → printfdebugging joined | 19:59 |
| ← printfdebugging1 left | 19:59 |
| ← printfdebugging2 left | 20:01 |
| ← causasui left | 20:01 |
| → causasui joined | 20:01 |
| ← GuestZero left | 20:02 |
| → bn_work joined | 20:02 |
| ← stats4647 left | 20:03 |
| ← thiago left | 20:04 |
| ← ___nick___ left | 20:04 |
| ← chocolate_ left | 20:06 |
| → chocolate_ joined | 20:06 |
| → gsekulski joined | 20:18 |
| → m0viefreak joined | 20:21 |
| → stats4647 joined | 20:26 |
| → tirnanog joined | 20:29 |
| ← peirik left | 20:30 |
| → peirik joined | 20:31 |
| → GuestZero joined | 20:33 |
| ← stats4647 left | 20:34 |
| ← gsekulski left | 20:35 |
| → jfsimon1981_b joined | 20:38 |
| ← jfsimon1981 left | 20:39 |
| ← Ox7C5_ left | 20:41 |
| ← savolla left | 20:41 |
| ← gh34 left | 20:44 |
| → junyx joined | 20:46 |
| ← junyx left | 20:48 |
| ← GuestZero left | 20:56 |
| ← iamtheranger left | 21:02 |
| → peirik__ joined | 21:02 |
| ← PlasmaHH left | 21:13 |
| → Guest30 joined | 21:19 |
| → quadrantoracle joined | 21:20 |
| ← Guest30 left | 21:23 |
| → thiago joined | 21:23 |
| → PlasmaHH joined | 21:26 |
| ← peirik__ left | 21:33 |
| ← quadrantoracle left | 21:35 |
| → kiruny joined | 21:35 |
| → quadrantoracle joined | 21:36 |
| ← sfenik9 left | 21:43 |
| → sfenik9 joined | 21:44 |
| → peirik__ joined | 22:02 |
| ← CrunchyFlakes left | 22:02 |
| → CrunchyFlakes joined | 22:04 |
| ← peirik__ left | 22:15 |
| ← xx left | 22:19 |
| → TheBuell joined | 22: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 help | 22: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 zer0 | 22:39 |
| ← quadrantoracle left | 22:40 |
|
TheBuell
| iv'e tried reflog it says not a .git folder | 22:40 |
|
| FETCH_HEAD seems intact | 22:40 |
|
| https://bpa.st/GODQ | 22:41 |
|
| listing of .git folder | 22:42 |
| ← printfdebugging left | 22:44 |
| → printfdebugging joined | 22:45 |
|
TheBuell
| now it says it is not a .git folder. | 22:50 |
|
weaksauce
| odd | 22:51 |
|
| what is in refs/heads | 22:51 |
|
TheBuell
| refs/head has three folders | 22:51 |
|
| .. version_0_1_4, version_0_1_3 and version_0_1.3 and main | 22:52 |
|
| four files actually | 22:52 |
|
weaksauce
| I do think you should make a backup before doing anything but you could try adding ref: refs/heads/main to your HEAD | 22:53 |
|
TheBuell
| k | 22:53 |
| ← Turn_Left left | 22:53 |
|
TheBuell
| now it knows it is a git folder | 22: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 broken | 22:54 |
|
| So I need to fix ORIG_HEAD next | 22:54 |
|
| it currently has a length of 0 | 22:54 |
|
mud
| Clone the remote repo somewhere new and copy the file from the new clone? | 22:55 |
|
TheBuell
| HEAD looks good now | 22:55 |
|
| what needs to go into ORIG_HEAD ? | 22:56 |
|
mud
| Whatever git puts there, in a new clone probably | 22:56 |
|
weaksauce
| probably something like ref: remotes/origin/main or something like that | 22:56 |
|
TheBuell
| right ... | 22:56 |
|
| i will try that next | 22:57 |
|
weaksauce
| what is in your remotes folder | 22:57 |
|
TheBuell
| https://bpa.st/47UQ | 22:57 |
|
| ref: remotes/origin/main I think that neesd to go into ORIG_HEAD | 22:58 |
|
| right? | 22:58 |
|
weaksauce
| i'm not sure | 22:58 |
| ← gioele left | 22:58 |
|
TheBuell
| Yay, that fixed it | 22:58 |
|
mud
| Can't you just clone it again and check what git puts in there? | 22:58 |
|
TheBuell
| thank you | 22:58 |
|
| i'nm out of the hole now | 22:58 |
|
weaksauce
| nice | 22:58 |
|
mud
| Nice | 22:58 |
|
TheBuell
| Linus know what he was doing when he put it together | 22:59 |
|
| *knew | 22:59 |
|
weaksauce
| yeah smart fellow that | 22:59 |
| ← printfdebugging left | 22:59 |
|
TheBuell
| Thanks once again.. cheers for now ;) | 23:00 |
| ← TheBuell left | 23:00 |
| ← gildasio left | 23:00 |
| → gildasio joined | 23:02 |
| → guardianxxx joined | 23:12 |
| ← guardianxxx left | 23:15 |
| ← gildasio left | 23:15 |
| → gildasio joined | 23:16 |
| ← thiago left | 23:20 |
| ← chocolate_ left | 23:23 |
| ← PantelicGR left | 23:26 |
| → junyx joined | 23:28 |
| → so-offish joined | 23:32 |
| ← skered left | 23:33 |
| → printfdebugging joined | 23:40 |
| → printfdebugging1 joined | 23:41 |
| ← so-offish left | 23:45 |
| → skered joined | 23:49 |
| → antranigv joined | 23: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, respectively | 23:56 |
| → peirik__ joined | 23:58 |