| 2024-03-09 |
| → jklfds joined | 00:00 |
| ← cjoke left | 00:02 |
| ← jklfds left | 00:05 |
| → C0MMIE joined | 00:06 |
| ← sa0 left | 00:10 |
| → sa0 joined | 00:10 |
| → rbatty joined | 00:13 |
| → jklfds joined | 00:16 |
| ← henry40408 left | 00:19 |
| → gast0n joined | 00:19 |
| → henry40408 joined | 00:20 |
| ← jklfds left | 00:22 |
| → igemnace joined | 00:22 |
| ← duuuude left | 00:23 |
| ← opal left | 00:24 |
| → opal joined | 00:25 |
| ← sa0 left | 00:32 |
| → jklfds joined | 00:33 |
| → duuuude joined | 00:33 |
| ← kurahaupo left | 00:33 |
| → stats4647 joined | 00:37 |
| ← skapata left | 00:38 |
| → skapata joined | 00:38 |
| → pedrowiski joined | 00:39 |
| ← gh34 left | 00:40 |
| ← jklfds left | 00:42 |
| ← stats4647 left | 00:42 |
| → jklfds joined | 00:44 |
| ← igemnace left | 00:46 |
| ← jklfds left | 00:49 |
| → peirik joined | 00:50 |
| ← weko left | 00:51 |
| ← Guest2635 left | 00:53 |
| → brandonld joined | 00:55 |
| → sa0 joined | 00:59 |
| ← davispuh left | 01:01 |
| ← miigotu left | 01:01 |
| → jklfds joined | 01:02 |
| → weko joined | 01:03 |
| → miigotu joined | 01:03 |
| ← eocwzdenn^ left | 01:04 |
| ← dsrt^ left | 01:05 |
| ← jklfds left | 01:06 |
| ← sa0 left | 01:07 |
| → jklfds joined | 01:08 |
| ← jklfds left | 01:13 |
| ← brw left | 01:14 |
| → sa0 joined | 01:21 |
| ← navi left | 01:22 |
| → jklfds joined | 01:23 |
| ← cpackham left | 01:26 |
| ← brandonld left | 01:27 |
| ← jklfds left | 01:30 |
| ← gsi_ left | 01:32 |
| → gsi joined | 01:34 |
| ← cmc_ left | 01:36 |
| ← gildasio left | 01:36 |
| ← chexum left | 01:36 |
| ← hussein1_ left | 01:36 |
| ← fling left | 01:36 |
| → fling joined | 01:36 |
| → hussein1_ joined | 01:37 |
| → chexum joined | 01:37 |
| → cmc_ joined | 01:37 |
| → jklfds joined | 01:37 |
| → gildasio joined | 01:37 |
| ← mitrokov left | 01:40 |
| → guru_ joined | 01:43 |
| ← Guru_DE left | 01:46 |
| ← m0viefreak left | 01:50 |
| ← duuuude left | 01:50 |
| → pvxe6 joined | 01:54 |
| ← sa0 left | 01:55 |
| ← pvxe left | 01:56 |
| pvxe6 → pvxe | 01:56 |
| → MarkT- joined | 01:58 |
| ← gast0n left | 01:58 |
|
MarkT-
| How do I find out which branch changed a particular idenetifier that I don't seem to have in master? | 01:59 |
|
| git blame only shows me lines that exist in the branch not lines that were removed. | 01:59 |
| ← Lord_of_Life left | 02:00 |
| ← Ishmael left | 02:00 |
| → Lord_of_Life joined | 02:01 |
| → duuuude joined | 02:01 |
| → Ishmael joined | 02:02 |
| → Jaxef joined | 02:02 |
| ← Ragnor left | 02:05 |
| ← miigotu left | 02:06 |
| → Ragnor joined | 02:07 |
| ← jklfds left | 02:09 |
| → sa0 joined | 02:09 |
| ← pvxe left | 02:09 |
| → pvxe joined | 02:12 |
| ← sa0 left | 02:15 |
| → jklfds joined | 02:20 |
| ← rustyshackleford left | 02:25 |
| ← jklfds left | 02:25 |
| → miigotu joined | 02:31 |
| → sa0 joined | 02:31 |
| → ghost43 joined | 02:32 |
| ← ghost43_ left | 02:33 |
| → jklfds joined | 02:39 |
| → stats4647 joined | 02:39 |
| ← raffaele left | 02:43 |
| → raffaele joined | 02:44 |
| ← stats4647 left | 02:44 |
| ← jklfds left | 02:45 |
| ← sa0 left | 02:49 |
| ← johnmcnuggets left | 02:50 |
| → eocwzdenn^ joined | 02:53 |
| → jklfds joined | 02:56 |
| ← FinnElija left | 03:01 |
| ← jklfds left | 03:02 |
| → FinnElija joined | 03:02 |
| ← fflam left | 03:06 |
| → fflam joined | 03:07 |
| ← MarkT- left | 03:08 |
| ← fflam left | 03:12 |
| ← duuuude left | 03:12 |
| → fflam joined | 03:14 |
| → jklfds joined | 03:16 |
| ← miigotu left | 03:21 |
| ← jklfds left | 03:22 |
| → miigotu joined | 03:22 |
| ← Jaxef left | 03:25 |
| ← rbatty left | 03:29 |
| → jklfds joined | 03:35 |
| ← jklfds left | 03:41 |
| → rbatty joined | 03:47 |
| → kurahaupo_ joined | 03:48 |
| → jklfds joined | 03:53 |
|
mud
| MarkT-: git log with -G <whatever> or -S can help you find when <whatever> was added or removed, sounds like it might do what you want | 03:58 |
| ← jklfds left | 03:59 |
|
mud
| If that for some reason doesn't work, I've used git bisect for things like that. It's too heavyweight if it's just a line being removed though. But you just treat "bad" as "thing I'm looking for is gone" and good as the opposite and run it as usual. | 03:59 |
| ← travisghansen left | 04:01 |
| → travisghansen joined | 04:02 |
| ← bin101 left | 04:02 |
| → duuuude joined | 04:05 |
| → jklfds joined | 04:05 |
| ← henry40408 left | 04:06 |
| → henry40408 joined | 04:06 |
| ← thuna` left | 04:06 |
| → bin101 joined | 04:09 |
| ← jklfds left | 04:16 |
| ← JayBeeFOSS left | 04:18 |
| ← weko left | 04:19 |
| → ferdna joined | 04:19 |
| → JayBeeFOSS joined | 04:19 |
| ← defjam left | 04:20 |
| → defjam joined | 04:23 |
| ← defjam left | 04:28 |
| → weko joined | 04:29 |
| → jklfds joined | 04:29 |
| ← jklfds left | 04:34 |
| → stats4647 joined | 04:41 |
| → foul_owl joined | 04:42 |
| ← duuuude left | 04:43 |
| ← hbautista left | 04:45 |
| ← stats4647 left | 04:45 |
| → jklfds joined | 04:46 |
| ← jklfds left | 04:51 |
| → igemnace joined | 04:59 |
| → duuuude joined | 04:59 |
| → ferdna_ joined | 05:01 |
| ← miigotu left | 05:01 |
| → defjam joined | 05:01 |
| → miigotu joined | 05:01 |
| ← ferdna left | 05:04 |
| → jklfds joined | 05:06 |
| ← defjam left | 05:07 |
| → zanetti joined | 05:08 |
| ← jklfds left | 05:17 |
| → defjam joined | 05:18 |
| ← pedahzur left | 05:20 |
| ← elastic_dog left | 05:21 |
| ← defjam left | 05:24 |
| → jklfds joined | 05:26 |
| ← PantelicGR left | 05:28 |
| → elastic_dog joined | 05:29 |
| → jmd joined | 05:29 |
| ← jklfds left | 05:32 |
| → defjam joined | 05:35 |
| → Chaser joined | 05:39 |
| ← defjam left | 05:41 |
| → jklfds joined | 05:45 |
| ← jklfds left | 05:51 |
| → defjam joined | 05:54 |
| ← defjam left | 06:00 |
| → jklfds joined | 06:04 |
| ← jklfds left | 06:09 |
| ← miigotu left | 06:10 |
| → miigotu joined | 06:11 |
| ← Chaser left | 06:11 |
| → defjam joined | 06:11 |
| ← tejr left | 06:16 |
| ← defjam left | 06:17 |
| ← akibageek left | 06:21 |
| → tejr joined | 06:21 |
| → jklfds joined | 06:21 |
| → Gary_Sinise joined | 06:24 |
| → Chaser joined | 06:28 |
| → defjam joined | 06:29 |
| ← weko left | 06:31 |
| ← duuuude left | 06:34 |
| ← defjam left | 06:35 |
| → akibageek joined | 06:35 |
| ← jklfds left | 06:36 |
| ← Gary_Sinise left | 06:38 |
| ← theobjectivedad left | 06:38 |
| → weko joined | 06:39 |
| → theobjectivedad joined | 06:41 |
| ← skapata left | 06:42 |
| → stats4647 joined | 06:43 |
| → defjam joined | 06:47 |
| → rustyshackleford joined | 06:47 |
| ← stats4647 left | 06:47 |
| → Jaxef joined | 06:48 |
| → vysn joined | 06:48 |
| → jklfds joined | 06:50 |
| ← vysn left | 06:51 |
| ← m1dnight left | 06:52 |
| ← defjam left | 06:54 |
| → larryv_ joined | 06:54 |
| ← thiago left | 06:55 |
| ← jklfds left | 06:55 |
| ← Jaxef left | 06:55 |
| ← hyperair left | 06:57 |
| ← larryv left | 06:57 |
| → duuuude joined | 07:04 |
| → vysn joined | 07:06 |
| → defjam joined | 07:06 |
| → jklfds joined | 07:07 |
| larryv_ → larryv | 07:09 |
| ← miigotu left | 07:10 |
| → miigotu joined | 07:10 |
| ← jklfds left | 07:13 |
| ← zanetti left | 07:16 |
| → zanetti joined | 07:17 |
| ← defjam left | 07:18 |
| ← rbatty left | 07:25 |
| ← larryv left | 07:26 |
| → jklfds joined | 07:26 |
| ← vysn left | 07:26 |
| → rbatty joined | 07:26 |
| ← rbatty left | 07:26 |
| ← miigotu left | 07:27 |
| → rbatty joined | 07:27 |
| ← rbatty left | 07:27 |
| → miigotu joined | 07:27 |
| → rbatty joined | 07:28 |
| → defjam joined | 07:31 |
| ← jklfds left | 07:31 |
| ← defjam left | 07:37 |
| ← weko left | 07:41 |
| ← rbatty left | 07:41 |
| ← Chaser left | 07:42 |
| → jklfds joined | 07:44 |
| → defjam joined | 07:47 |
| → zetef joined | 07:48 |
| ← jinsun left | 07:49 |
| → weko joined | 07:49 |
| ← jklfds left | 07:50 |
| → bheko joined | 07:52 |
| ← zetef left | 07:53 |
| → zetef joined | 07:53 |
| ← defjam left | 07:53 |
| ← OnkelTem left | 07:55 |
| → sahil_ joined | 07:56 |
| → jinsun joined | 07:58 |
| → jklfds joined | 08:00 |
| ← guru_ left | 08:01 |
| → guru_ joined | 08:01 |
| → defjam joined | 08:06 |
| ← defjam left | 08:12 |
| → defjam joined | 08:14 |
| ← jklfds left | 08:16 |
| → Chaser joined | 08:24 |
| ← defjam left | 08:25 |
| → jklfds joined | 08:26 |
| → m1dnight joined | 08:27 |
| ← Chaser left | 08:29 |
| ← guru_ left | 08:35 |
| ← jklfds left | 08:35 |
| → guru_ joined | 08:35 |
| → defjam joined | 08:37 |
| → stats4647 joined | 08:38 |
| → davispuh joined | 08:39 |
| ← weko left | 08:40 |
| ← jmd left | 08:40 |
| ← guru_ left | 08:42 |
| → guru_ joined | 08:43 |
| ← defjam left | 08:44 |
| ← kurahaupo_ left | 08:44 |
| → jklfds joined | 08:47 |
| → kjartan joined | 08:47 |
| ← stats4647 left | 08:49 |
| → weko joined | 08:50 |
| → t0mm13b joined | 08:50 |
| ← jklfds left | 08:53 |
| ← guru_ left | 08:53 |
| → guru_ joined | 08:54 |
| ← howdoi left | 08:55 |
| → stats4647 joined | 08:56 |
| → mitrokov joined | 08:56 |
| → wootehfoot joined | 08:56 |
| → defjam joined | 08:56 |
| → Ox7C5_ joined | 08:59 |
| ← stats4647 left | 09:00 |
| ← guru_ left | 09:01 |
| → guru_ joined | 09:01 |
| ← Mardroemmar left | 09:05 |
| → Mardroemmar joined | 09:05 |
| ← defjam left | 09:06 |
| → jklfds joined | 09:06 |
| → xx joined | 09:07 |
| → Chaser joined | 09:08 |
| → defjam joined | 09:09 |
| ← jklfds left | 09:12 |
| ← Chaser left | 09:12 |
| → Chaser joined | 09:14 |
| ← Chaser left | 09:16 |
| ← defjam left | 09:20 |
| → jklfds joined | 09:24 |
| ← xx left | 09:30 |
| → xx joined | 09:30 |
| ← jklfds left | 09:33 |
| → Guest0 joined | 09:35 |
| ← Guest0 left | 09:36 |
| → sa0 joined | 09:36 |
| → jklfds joined | 09:36 |
| → stats4647 joined | 09:40 |
| ← bheko left | 09:41 |
| ← jklfds left | 09:42 |
| ← sahil_ left | 09:45 |
| ← stats4647 left | 09:45 |
| → CheckMyBrain joined | 09:51 |
| → defjam joined | 09:52 |
| → jklfds joined | 09:54 |
| ← sa0 left | 09:55 |
| ← defjam left | 09:57 |
| → raffaele__ joined | 10:01 |
| ← mooz left | 10:02 |
| ← jklfds left | 10:02 |
| ← raffaele left | 10:04 |
| → defjam joined | 10:06 |
| → sa0 joined | 10:12 |
| ← sa0 left | 10:13 |
| → jklfds joined | 10:14 |
| → sa0 joined | 10:15 |
| ← jklfds left | 10:18 |
| → Chaser joined | 10:19 |
| ← defjam left | 10:28 |
| → jklfds joined | 10:28 |
| → defjam joined | 10:32 |
| ← jinsun left | 10:32 |
| ← jklfds left | 10:34 |
| ← mitrokov left | 10:45 |
| → jklfds joined | 10:47 |
| ← jklfds left | 10:53 |
| → jklfds joined | 10:56 |
| → theoceaniscool joined | 10:58 |
| ← jklfds left | 11:02 |
| ← Chaser left | 11:08 |
| ← igemnace left | 11:10 |
| ← duuuude left | 11:13 |
| → jklfds joined | 11:14 |
| → stats4647 joined | 11:17 |
| ← ferdna_ left | 11:17 |
| → john_johnk joined | 11:18 |
| ← jklfds left | 11:20 |
| ← stats4647 left | 11:21 |
| ← weko left | 11:26 |
| → igemnace joined | 11:27 |
| → jklfds joined | 11:29 |
| → m0viefreak joined | 11:30 |
| ← Zumo_pt left | 11:30 |
| ← Zumo left | 11:31 |
| → Zumo joined | 11:31 |
| → YuGiOhJCJ joined | 11:31 |
| → mitrokov joined | 11:33 |
| → bitoff joined | 11:33 |
| ← dsimic left | 11:33 |
| → weko joined | 11:35 |
| → dsimic joined | 11:35 |
| ← akibageek left | 11:36 |
| → jmd joined | 11:38 |
| → Nixkernal joined | 11:39 |
| ← jklfds left | 11:39 |
| → duuuude joined | 11:45 |
| ← john_johnk left | 11:49 |
| → jklfds joined | 11:51 |
| ← YuGiOhJCJ left | 11:51 |
| → YuGiOhJCJ joined | 11:52 |
| ← jklfds left | 11:56 |
| ← defjam left | 11:59 |
| → defjam joined | 12:01 |
| → ferdna joined | 12:02 |
| ← FinnElija left | 12:04 |
| → jklfds joined | 12:06 |
| → FinnElija joined | 12:06 |
| ← davispuh left | 12:08 |
| → stats4647 joined | 12:09 |
| → davispuh joined | 12:14 |
| ← stats4647 left | 12:14 |
| ← jklfds left | 12:16 |
| ← defjam left | 12:16 |
| ← BlessJah left | 12:18 |
| → BlessJah joined | 12:20 |
| ← opal left | 12:21 |
| → opal joined | 12:22 |
| → jklfds joined | 12:28 |
| → Chaser joined | 12:28 |
| → defjam joined | 12:30 |
| ← bookworm left | 12:32 |
| ← m0viefreak left | 12:32 |
| → bookworm joined | 12:33 |
| ← jklfds left | 12:33 |
| ← defjam left | 12:34 |
| ← Chaser left | 12:35 |
| → stats4647 joined | 12:36 |
| ← stats4647 left | 12:40 |
| → Betal joined | 12:40 |
| → defjam joined | 12:45 |
| → jklfds joined | 12:45 |
| ← mitrokov left | 12:46 |
| ← YuGiOhJCJ left | 12:49 |
| ← jklfds left | 12:50 |
| → ZMarkGC joined | 12:52 |
| ← defjam left | 13:04 |
| → jklfds joined | 13:04 |
| → defjam joined | 13:07 |
| ← Nixkernal left | 13:09 |
| ← jklfds left | 13:10 |
| → Nixkernal joined | 13:11 |
| ← LuKaRo left | 13:15 |
| → k4ushik joined | 13:17 |
| → jklfds joined | 13:20 |
| ← defjam left | 13:25 |
| ← jklfds left | 13:25 |
| ← duuuude left | 13:26 |
| → duuuude joined | 13:27 |
| → jklfds joined | 13:30 |
| ← jklfds left | 13:36 |
| → defjam joined | 13:37 |
| ← defjam left | 13:41 |
| ← ferdna left | 13:47 |
| → jklfds joined | 13:49 |
| → stats4647 joined | 13:50 |
| ← jklfds left | 13:53 |
| ← stats4647 left | 13:55 |
| → defjam joined | 13:58 |
| → sahil_ joined | 14:02 |
| → h-erectus joined | 14:02 |
| → dnh joined | 14:02 |
| → navi joined | 14:03 |
| → mitrokov joined | 14:04 |
| → jklfds joined | 14:05 |
| ← duuuude left | 14:09 |
| ← jklfds left | 14:10 |
| → gast0n joined | 14:13 |
| ← theobjectivedad left | 14:13 |
| → LuKaRo joined | 14:14 |
| ← sfenik left | 14:15 |
| → sfenik joined | 14:15 |
| → theobjectivedad joined | 14:16 |
| → duuuude joined | 14:21 |
| ← guru_ left | 14:22 |
| → jklfds joined | 14:22 |
| → guru_ joined | 14:22 |
| ← davidsenk left | 14:22 |
| ← weko left | 14:25 |
| ← dnh left | 14:27 |
| ← jklfds left | 14:28 |
| → jklfds joined | 14:31 |
| → Chaser joined | 14:32 |
| ← h-erectus left | 14:33 |
| ← mitrokov left | 14:34 |
| → weko joined | 14:35 |
| ← jklfds left | 14:36 |
| ← Chaser left | 14:44 |
| ← causasui left | 14:45 |
| → jklfds joined | 14:45 |
| → BrainB0ne joined | 14:47 |
| → causasui joined | 14:49 |
| ← jklfds left | 14:51 |
| → hbautista joined | 14:52 |
| ← LuKaRo left | 14:52 |
| → kurahaupo joined | 14:53 |
| → pac1 joined | 14:57 |
| ← defjam left | 14:58 |
| → PlasmaHH joined | 15:00 |
|
quesker
| in my branch I did git fetch; git rebase origin/main and it just says successful. how do I know if something was merged? like do I have <<< >>>> all over the place now? | 15:01 |
|
j416
| quesker: it won't finish if there are conflicts until you resolve them. | 15:03 |
|
quesker
| oh ok thanks | 15:03 |
|
j416
| but that doesn't mean it didn't merge anything | 15:03 |
| → stats4647 joined | 15:03 |
|
quesker
| how can I see what it did? | 15:03 |
|
j416
| git log | 15:03 |
| → jklfds joined | 15:03 |
| → thiago joined | 15:03 |
|
j416
| git diff | 15:03 |
|
| git range-diff | 15:03 |
| ← jklfds left | 15:09 |
| → defjam joined | 15:09 |
| ← stats4647 left | 15:12 |
| ← sahil_ left | 15:14 |
| ← defjam left | 15:14 |
| → sahil_ joined | 15:14 |
| ← thiago left | 15:14 |
| ← sahil_ left | 15:15 |
| → sahil_ joined | 15:15 |
| ← sahil_ left | 15:16 |
| → defjam joined | 15:17 |
| → mitrokov joined | 15:18 |
| → jklfds joined | 15:22 |
| ← defjam left | 15:22 |
| → skapata joined | 15:25 |
| ← JanC left | 15:26 |
| ← mitrokov left | 15:27 |
| → cjoke joined | 15:28 |
| ← skapata left | 15:28 |
| → skapata joined | 15:29 |
| → JanC joined | 15:30 |
| ← skapata left | 15:30 |
| → skapata joined | 15:30 |
| ← skapata left | 15:31 |
| → skapata joined | 15:32 |
| → sahil_ joined | 15:33 |
| ← duuuude left | 15:34 |
| ← weko left | 15:36 |
| → weko joined | 15:39 |
| → thiago joined | 15:40 |
| ← guru_ left | 15:43 |
| → guru_ joined | 15:43 |
| ← BrainB0ne left | 15:45 |
| → defjam joined | 15:51 |
| ← jklfds left | 15:54 |
| → jklfds joined | 15:54 |
| ← jfsimon1981 left | 15:55 |
| ← llh left | 15:55 |
| → stats4647 joined | 15:56 |
| → duuuude joined | 15:57 |
| ← defjam left | 15:58 |
| ← chuanshi left | 16:00 |
| ← stats4647 left | 16:00 |
| ← jklfds left | 16:02 |
| → llh joined | 16:04 |
| → jklfds joined | 16:04 |
| → adanwan_ joined | 16:05 |
| ← chiselfuse left | 16:05 |
| ← adanwan left | 16:05 |
| → chuanshi joined | 16:05 |
| ← Lockesmith left | 16:05 |
| → lnm joined | 16:06 |
| → chiselfuse joined | 16:07 |
| → Lockesmith joined | 16:07 |
| → defjam joined | 16:09 |
| ← thiago left | 16:10 |
| → mitrokov joined | 16:10 |
| ← jklfds left | 16:11 |
| ← defjam left | 16:15 |
| ← mitrokov left | 16:16 |
| → defjam joined | 16:18 |
| → Dinudinu joined | 16:20 |
| ← duuuude left | 16:21 |
| → stats4647 joined | 16:22 |
| → agrosant joined | 16:24 |
| ← defjam left | 16:24 |
| → thiago joined | 16:26 |
| ← stats4647 left | 16:27 |
| ← PlasmaHH left | 16:27 |
| ← Dinudinu left | 16:28 |
| → jklfds joined | 16:33 |
| → oncall-pokemon joined | 16:35 |
| → defjam joined | 16:36 |
| ← jklfds left | 16:38 |
| ← Jck_true left | 16:45 |
| → stats4647 joined | 16:50 |
| → BrainB0ne joined | 16:52 |
| → jklfds joined | 16:52 |
| → pedrowiski_ joined | 16:54 |
| ← stats4647 left | 16:54 |
| ← Zumo left | 16:54 |
| ← pedrowiski left | 16:57 |
| ← jklfds left | 16:57 |
| → mitrokov joined | 16:58 |
| ← hbautista left | 17:05 |
| ← thiago left | 17:08 |
| → jklfds joined | 17:08 |
| → john_johnk joined | 17:09 |
| ← jklfds left | 17:14 |
| → thiago joined | 17:20 |
| ← nopjmp left | 17:22 |
| → nopjmp joined | 17:22 |
| ← welder left | 17:23 |
| → welder joined | 17:24 |
| → pedrowiski__ joined | 17:25 |
| ← defjam left | 17:26 |
| ← pedrowiski_ left | 17:27 |
| → jklfds joined | 17:28 |
| ← thiago left | 17:30 |
| ← eocwzdenn^ left | 17:30 |
| → Nigthknight joined | 17:33 |
| ← Nigthknight left | 17:33 |
| ← jklfds left | 17:33 |
| → jklfds joined | 17:34 |
| ← weko left | 17:35 |
| → Chaser joined | 17:35 |
| → defjam joined | 17:37 |
| ← jklfds left | 17:40 |
| → Nigthknight joined | 17:43 |
| → weko joined | 17:45 |
| ← C0MMIE left | 17:46 |
| → fling_ joined | 17:48 |
| ← fling left | 17:48 |
| → jklfds joined | 17:53 |
| → stats4647 joined | 17:53 |
| fling_ → fling | 17:57 |
| ← a51 left | 17:57 |
| ← stats4647 left | 17:58 |
| ← jklfds left | 17:59 |
| → subopt joined | 18:09 |
| → jklfds joined | 18:11 |
| ← jklfds left | 18:17 |
| ← defjam left | 18:19 |
| → weko_ joined | 18:19 |
| → defjam joined | 18:21 |
| ← Chaser left | 18:22 |
| ← weko left | 18:22 |
| → Chaser joined | 18:24 |
| → stats4647 joined | 18:28 |
| ← miigotu left | 18:29 |
| ← mitrokov left | 18:30 |
| → miigotu joined | 18:30 |
| → thuna` joined | 18:30 |
| → jklfds joined | 18:30 |
| ← stats4647 left | 18:33 |
| → derpydoo joined | 18:36 |
| ← llh left | 18:36 |
| ← miigotu left | 18:39 |
| ← jklfds left | 18:40 |
| → Jck_true joined | 18:42 |
| → miigotu joined | 18:43 |
| ← defjam left | 18:47 |
| ← john_johnk left | 18:47 |
| → V_ joined | 18:50 |
| ← Vonter left | 18:52 |
| ← igemnace left | 18:53 |
| → manin891 joined | 18:53 |
| → Vonter joined | 18:54 |
| → jklfds joined | 18:54 |
| ← miigotu left | 18:55 |
| → miigotu joined | 18:55 |
| ← jklfds left | 18:59 |
| → epicout_autochto joined | 19:00 |
| ← V_ left | 19:05 |
| → V__ joined | 19:05 |
| ← weko_ left | 19:06 |
| ← Traneptora left | 19:06 |
| → Traneptora joined | 19:08 |
| ← miigotu left | 19:09 |
| ← FH_thecat left | 19:09 |
| → miigotu joined | 19:10 |
| → jklfds joined | 19:11 |
| → mitrokov joined | 19:14 |
| → defjam joined | 19:15 |
| → weko joined | 19:16 |
| ← jklfds left | 19:17 |
| ← manin891 left | 19:17 |
| → manin891 joined | 19:18 |
| ← defjam left | 19:21 |
| → Tobbi joined | 19:23 |
| → stats4647 joined | 19:27 |
| → jklfds joined | 19:29 |
| → HiccupJul joined | 19:30 |
|
HiccupJul
| I was stupid and ran "git-filter-repo --mailmap my-mailmap --force" without making a backup first. Doing this seems to have lost the original commit dates. Is there any way I can get them back? | 19:31 |
| ← stats4647 left | 19:32 |
| ← Jck_true left | 19:32 |
| → Jck_true joined | 19:33 |
| → defjam joined | 19:33 |
| → dsrt^ joined | 19:36 |
|
j416
| HiccupJul: I would guess that that tool creates some form of backup. | 19:36 |
| ← Vonter left | 19:36 |
|
j416
| HiccupJul: I've never used it, but if it's anything like filter-branch, you might find refs under refs/original/ | 19:37 |
| → Vonter joined | 19:37 |
| ← subopt left | 19:38 |
|
HiccupJul
| j416: doesn't seem like it, unfortunately | 19:39 |
|
j416
| oh no. | 19:39 |
|
HiccupJul
| not the end of the world, losing the dates | 19:39 |
|
| but would be nice to get them back | 19:39 |
|
j416
| I suppose there's no remote copy of the repo? | 19:40 |
|
HiccupJul
| i don't think i ever pushed it anywhere | 19:40 |
| → pedrowiski_ joined | 19:40 |
|
j416
| unfortunate. | 19:40 |
|
HiccupJul
| looking at the history using git gui,i see there's lots of "replace/[hash]" entries | 19:40 |
|
| but i guess those just function as redirects of the old commit hashes? | 19:41 |
| ← defjam left | 19:41 |
|
HiccupJul
| rather than an indication that the old data is still there | 19:41 |
|
j416
| HiccupJul: what does 'git replace -l' say? | 19:41 |
|
HiccupJul
| k | 19:41 |
|
| ignore last message | 19:42 |
|
| it lists a bunch of hashes | 19:42 |
|
j416
| alright | 19:42 |
|
| those are temporary, if you will, replacements | 19:42 |
|
| log and friends will use them instead of the real commits | 19:43 |
| → m0viefreak joined | 19:43 |
|
HiccupJul
| ah, so no data left | 19:43 |
| ← pedrowiski__ left | 19:43 |
|
j416
| what do you mean? | 19:43 |
|
HiccupJul
| like, the actual commit data for those hashes isn't here anymore, i guess | 19:43 |
|
j416
| those replacements mean "when you see this commit, pretend it's this other one instead" | 19:43 |
|
| sure it is | 19:43 |
|
HiccupJul
| i mean the old metadata | 19:44 |
|
| like what date each commit had | 19:44 |
|
| as i understand it, those are basically like symlinks | 19:44 |
| ← Chaser left | 19:44 |
|
j416
| I'm not sure if there are flags to ignore those replacements, but you could (maybe in a copy of your repo) delete them and see. | 19:45 |
|
| disclaimer, I have no idea what filter-repo does, or if that's what put them there | 19:45 |
| ← miigotu left | 19:45 |
|
j416
| I've only tried filter-repo for a few minutes, that's all. | 19:45 |
|
HiccupJul
| i tried that and it seems like the current date was still set for all commits | 19:46 |
|
| so i'm probably out of luck | 19:46 |
|
| basically its a tool for rewriting history. my fault for not making a backup before using it | 19:46 |
|
ikke
| HiccupJul: did you look at the author dates vs the commit dates? | 19:46 |
| → miigotu joined | 19:46 |
|
j416
| ah, I know what it is, I just don't know what it does in detail. | 19:46 |
|
HiccupJul
| ah | 19:46 |
|
| no, good idea | 19:46 |
|
j416
| git log --format=fuller | 19:47 |
|
HiccupJul
| those match, unfortunately | 19:47 |
|
| all today | 19:47 |
| ← elastic_dog left | 19:51 |
| → defjam joined | 19:53 |
|
HiccupJul
| i have an idea when the project started anyway, so i can note that down | 19:53 |
|
gsish
| is the reflog still kept, covers the rewrite, and reaches back far enough? | 19:54 |
| ← manin891 left | 19:54 |
|
gsish
| got a terminal scrollback that goes back far enough? | 19:54 |
|
| all you need is just one hash of the tip of the branch before the modification, all its parents go from there transparently | 19:54 |
|
| and you would not necessarily have to backup all of the repo, just reference what you want to keep (have another branch name point there before heavy manipulation) | 19:55 |
|
HiccupJul
| i'm not sure that works in this case, as i rewrote history | 19:56 |
|
| unless i'm misunderstanding | 19:57 |
|
| but i have the old hashes from the "replace" entries | 19:57 |
|
| you're saying i can restore the repo from just one of those hashes? not sure how that'd work | 19:57 |
|
gsish
| you probably are (and everybody else who thinks there'd be "rewrite" in the sense that the previous one "never happened") :) | 19:58 |
|
| try doing a log on that old hash, for the fun of it | 19:58 |
|
| the worst that can happen is that it got collected due to too many recent changes | 19:58 |
|
| the best that can happen is that it's usable to you, then just reference it | 19:58 |
| ← defjam left | 19:59 |
| ← weko left | 20:00 |
|
HiccupJul
| i ran git log on a commit from before i did the history rewrite | 20:01 |
|
| what am i looking for? | 20:01 |
|
| i did `git log [hash]` | 20:01 |
|
gsish
| you look for ... the old data? you should know ... | 20:02 |
| → elastic_dog joined | 20:02 |
|
HiccupJul
| all the commits listed still have todays date and the new author tag | 20:03 |
|
| new author, ignore the word tag | 20:03 |
|
gsish
| then it wasn't an old hash | 20:03 |
|
| because that'd resolve to old commits | 20:04 |
| ← Nigthknight left | 20:04 |
|
j416
| HiccupJul: did you remove the replaces, or no? | 20:05 |
|
HiccupJul
| no | 20:05 |
|
| not yet | 20:05 |
|
| well i did it in a copy just to test it, which i deleted | 20:06 |
| → llh joined | 20:06 |
|
j416
| then many commands will show you the replacing commit instead | 20:06 |
|
| including git log | 20:06 |
| ← derpydoo left | 20:06 |
|
j416
| in case that wasn't clear from above. | 20:07 |
|
| i.e., what gsish suggests with log might still show whatever the commits that replace the old ones have | 20:07 |
|
HiccupJul
| ah | 20:09 |
|
j416
| if you do "git show <oldhash"> but that commit has a replacing commit, the replacing commit will be shown | 20:09 |
|
HiccupJul
| but there might be a way to make it ignore replaces? | 20:09 |
|
j416
| see above | 20:10 |
|
| that's why I suggested you remove them | 20:10 |
|
HiccupJul
| oh i see | 20:10 |
|
| okay i'll make a copy and try that | 20:10 |
|
| `git filter-repo --replace-refs delete-no-add`? | 20:11 |
|
| that's what i find from googling | 20:11 |
|
j416
| turns out you can do git --no-replace-objects | 20:11 |
|
| and it'll not honour those | 20:11 |
| → defjam joined | 20:11 |
| ← bloody left | 20:12 |
|
j416
| (e.g., git --no-replace-objects log, or git --no-replace-objects show <commit>) | 20:12 |
|
| HiccupJul: I don't understand your question | 20:12 |
|
HiccupJul
| ah, thanks | 20:13 |
|
j416
| you don't need git-filter-repo to remove replace refs | 20:13 |
|
HiccupJul
| yeah i probably wasn't looking at the right thing | 20:13 |
|
j416
| s/refs/objects/ | 20:13 |
|
| ah, they are actually refs, til. | 20:13 |
|
HiccupJul
| `git --no-replace-objects log` lists commits with the new author and date, unfortunately | 20:14 |
|
j416
| HiccupJul: even if you feed it an old commit from the reflog as gsish suggested? | 20:14 |
| ← Tabmow left | 20:14 |
| → weko joined | 20:14 |
|
HiccupJul
| from git replace -l? | 20:15 |
|
| if i do that: fatal: bad object | 20:15 |
| → Tabmow joined | 20:16 |
|
j416
| from your reflog | 20:16 |
|
| also interesting; I wonder if filter-repo removed the original commits entirely | 20:16 |
|
HiccupJul
| my reflog? | 20:17 |
|
| but yeah maybe | 20:17 |
|
gsish
| the tool's doc should say (it comes with a manpage, does it not?) | 20:17 |
| ← defjam left | 20:17 |
|
HiccupJul
| yeah it deletes the old history | 20:18 |
|
| and i used --force, which says its an irreversible operation | 20:19 |
|
| so yeah, i think that's it | 20:19 |
| → larryv joined | 20:19 |
| → zetef_ joined | 20:22 |
| ← zetef_ left | 20:23 |
| ← tmz left | 20:24 |
| ← HelloShitty left | 20:25 |
|
gsish
| had to dig around a bit, wan't obvious how serious the "delete" old history was, but | 20:25 |
|
| the INTERNALS section of the user manual suggests that GC is done, aggressively | 20:25 |
| ← zetef left | 20:25 |
|
gsish
| how I got there, and how others can get therer: git --filter-branch --help, SEE ALSO -> git filter-repo project page, user manual link early in the README | 20:26 |
| → defjam joined | 20:29 |
|
j416
| that's not how you got there >.> | 20:30 |
| → tmz joined | 20:31 |
|
gsish
| you know how I got there instead? interesting :-P | 20:32 |
|
| but seriously, the git filter-branch manpage references the https://github.com/newren/git-filter-repo/ homepage in the SEE ALSO section | 20:32 |
| ← llh left | 20:33 |
| ← nopjmp left | 20:33 |
|
gsish
| of course you could git filter-repo --help or similar when the tool is locally available, isn't here | 20:33 |
|
j416
| I don't know how you got there, I just know you didn't get there by "git --filter-branch --help" :D | 20:34 |
|
gsish
| but I just told you that I did, and how to do that | 20:35 |
|
| which part is missing? | 20:35 |
| → nopjmp joined | 20:36 |
|
j416
| --filter-branch is not an option | 20:36 |
|
gsish
| man git-filter-branch | 20:36 |
|
gitinfo
| the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html | 20:36 |
|
gsish
| aw that, yeah was writing from flaky memory | 20:36 |
|
j416
| obviously, and I wouldn't ahve pointed it out if you hadn't suggested that others can get there using that | 20:36 |
|
| :D | 20:37 |
|
gsish
| well the above shall have made it clickable now | 20:37 |
|
j416
| mm nope, but if I hold down a key I can | 20:37 |
| ← defjam left | 20:40 |
| ← epicout_autochto left | 20:40 |
| ← jklfds left | 20:40 |
| → jklfds joined | 20:42 |
| → smug_tux joined | 20:50 |
| → defjam joined | 20:52 |
| ← sahil_ left | 20:52 |
| ← jklfds left | 20:52 |
| → srp31 joined | 20:56 |
| ← srp31 left | 20:57 |
| ← defjam left | 20:58 |
| ← cweiss0765321241 left | 20:59 |
| ← pac1 left | 20:59 |
| → jklfds joined | 21:00 |
| → sahil_ joined | 21:00 |
| → sahil1_ joined | 21:01 |
| → stats4647 joined | 21:03 |
| → tirnanog joined | 21:03 |
| ← jklfds left | 21:08 |
| ← stats4647 left | 21:08 |
| → dnh joined | 21:08 |
| → defjam joined | 21:09 |
| ← dnh left | 21:10 |
| → bloody joined | 21:14 |
| ← bindu left | 21:15 |
| ← defjam left | 21:15 |
| ← HiccupJul left | 21:16 |
| → akibageek joined | 21:16 |
| → bindu joined | 21:17 |
| → FH_thecat joined | 21:18 |
| ← riposte left | 21:19 |
| → jklfds joined | 21:19 |
| → defjam joined | 21:20 |
| ← defjam left | 21:25 |
| ← jklfds left | 21:25 |
| ← jmd left | 21:26 |
| ← weko left | 21:26 |
| → weko joined | 21:28 |
| ← theoceaniscool left | 21:29 |
| → jmd joined | 21:34 |
| → n01d joined | 21:39 |
| ← akibageek left | 21:40 |
| → akibageek joined | 21:40 |
| ← akibageek left | 21:42 |
| → stats4647 joined | 21:42 |
| → akibageek joined | 21:43 |
| ← pedrowiski_ left | 21:43 |
| ← akibageek left | 21:43 |
| ← n01d left | 21:45 |
| ← stats4647 left | 21:47 |
| ← przemoc left | 21:49 |
| → defjam joined | 21:52 |
| ← agrosant left | 21:53 |
| → jklfds joined | 21:54 |
| → akibageek joined | 21:57 |
| ← defjam left | 21:59 |
| ← jklfds left | 21:59 |
| → jklfds joined | 22:01 |
| → a51 joined | 22:04 |
| ← jklfds left | 22:06 |
| ← itaipu left | 22:09 |
| → defjam joined | 22:11 |
| ← k4ushik left | 22:16 |
| ← defjam left | 22:16 |
| → jklfds joined | 22:19 |
| ← jmd left | 22:20 |
| → stats4647 joined | 22:21 |
| ← BrainB0ne left | 22:23 |
| → itaipu joined | 22:24 |
| ← ectospasm left | 22:24 |
| ← jklfds left | 22:25 |
| ← stats4647 left | 22:26 |
| → BrainB0ne joined | 22:26 |
| → ectospasm joined | 22:27 |
| → defjam joined | 22:29 |
| → jklfds joined | 22:29 |
| → Gary_Sinise joined | 22:29 |
| → jfsimon1981 joined | 22:33 |
| ← Ox7C5_ left | 22:36 |
| → ZacSharp92 joined | 22:42 |
| ← kurahaupo left | 22:44 |
| ← jklfds left | 22:44 |
| → kurahaupo joined | 22:44 |
| ZacSharp92 → ZacSharp | 22:46 |
| → jklfds joined | 22:47 |
| ← wootehfoot left | 22:52 |
| ← jklfds left | 22:55 |
| ← Vonter left | 22:57 |
| → Vonter joined | 22:58 |
| ← V__ left | 23:01 |
| ← defjam left | 23:03 |
| ← zanetti left | 23:05 |
| ← mitrokov left | 23:06 |
| → jklfds joined | 23:07 |
| → defjam joined | 23:16 |
| ← ZacSharp left | 23:16 |
| ← lnm left | 23:18 |
| ← Gary_Sinise left | 23:21 |
| → duuuude joined | 23:22 |
| ← defjam left | 23:22 |
| → ZacSharp joined | 23:22 |
| → defjam joined | 23:23 |
| ← kurahaupo left | 23:24 |
| ← defjam left | 23:29 |
| → stats4647 joined | 23:32 |
| → defjam joined | 23:33 |
| → treyton joined | 23:35 |
| ← treyton left | 23:36 |
| ← stats4647 left | 23:36 |
| → trey joined | 23:36 |
| → agrosant joined | 23:38 |
| ← duuuude left | 23:38 |
|
trey
| trying to install git and per instructions when I run this command $ cd C:/Users/user/my_project but I get this response bash: cd: /home/user/my_project: No such file or directory | 23:39 |
| → thiago joined | 23:39 |
| → duuuude joined | 23:41 |
| ← trey left | 23:49 |
| → FTBlazer joined | 23:49 |
| ← ZacSharp left | 23:50 |
| → kurahaupo joined | 23:51 |
|
larryv
| per which instructions? | 23:52 |
| → cweiss0765321241 joined | 23:53 |