| 2021-11-26 |
| → chenqisu1 joined | 00:00 |
| ← jimklimov1 left | 00:01 |
| ← merv left | 00:02 |
| → cdown_ joined | 00:04 |
| ← hgl left | 00:04 |
| → hgl joined | 00:04 |
| ← ThorMojito left | 00:05 |
| → thiago joined | 00:05 |
| ← cdown left | 00:07 |
| cdown_ → cdown | 00:07 |
| ← humanface left | 00:12 |
| ← hgl left | 00:13 |
| → jimklimov1 joined | 00:15 |
| ← DoofusCanadensis left | 00:15 |
| ← Rashad left | 00:16 |
| → ThorMojito joined | 00:16 |
| → hgl joined | 00:16 |
| ← jimklimov left | 00:17 |
| ← bindu left | 00:18 |
| → bindu joined | 00:19 |
| ← hgl left | 00:20 |
| → hgl joined | 00:21 |
| ← jonosterman left | 00:21 |
| ← Murr left | 00:21 |
| → Murr joined | 00:22 |
| → Trieste joined | 00:22 |
| → jonosterman joined | 00:22 |
| ← ZacSharp left | 00:23 |
| ← noord left | 00:23 |
| ← ThePhilgrim left | 00:26 |
| ← oriba left | 00:28 |
| ← jimklimov1 left | 00:30 |
| → jimklimov joined | 00:32 |
| ← Lord_of_Life left | 00:34 |
| ← thiago left | 00:35 |
| → Lord_of_Life joined | 00:36 |
| ← luke-jr left | 00:36 |
| ← Lunatrius left | 00:38 |
| → luke-jr joined | 00:39 |
| → BSaboia joined | 00:39 |
| ← BSaboia left | 00:41 |
| ← GNUmoon left | 00:41 |
| ← gast0n left | 00:42 |
| → Lunatrius joined | 00:43 |
| ← jimklimov left | 00:44 |
| ← hgl left | 00:46 |
| → hgl joined | 00:47 |
| → roadie joined | 00:47 |
| ← Lunatrius left | 00:48 |
| → jwillikers joined | 00:49 |
| → Lunatrius joined | 00:52 |
| ← betelgeuse left | 00:52 |
| → gast0n joined | 00:55 |
| → nomn joined | 00:57 |
| ← roadie left | 00:58 |
| → roadie joined | 00:58 |
| → causaui1 joined | 00:58 |
| ← hgl left | 01:00 |
| → hgl joined | 01:00 |
| → GNUmoon joined | 01:02 |
| → jimklimov joined | 01:04 |
| ← roadie left | 01:04 |
| → roadie joined | 01:11 |
| ← TJ- left | 01:14 |
| ← roadie left | 01:15 |
| → lionkor joined | 01:17 |
| ← lkor left | 01:18 |
| → roadie joined | 01:29 |
| ← causaui1 left | 01:31 |
| ← jetchisel left | 01:33 |
| ← roadie left | 01:38 |
| ← hgl left | 01:43 |
| → hgl joined | 01:45 |
| ← lionkor left | 01:48 |
| ← skapata left | 01:49 |
| → roadie joined | 01:51 |
| ← jim left | 01:52 |
| ← jwillikers left | 01:54 |
| → hqdruxn08__ joined | 01:55 |
| ← roadie left | 01:55 |
| → Xenguy joined | 01:56 |
| ← bloody left | 01:57 |
| ← hqdruxn08_ left | 01:59 |
| ← zulutango left | 01:59 |
| → skapata joined | 02:02 |
| → roadie joined | 02:02 |
| → zulutango joined | 02:02 |
| ← zulutango left | 02:06 |
| ← roadie left | 02:07 |
| → zulutango joined | 02:09 |
| ← ChmEarl left | 02:10 |
| ← ThorMojito left | 02:13 |
| ← zulutango left | 02:15 |
| → jetchisel joined | 02:15 |
| → jim joined | 02:16 |
| ← qpdb left | 02:17 |
| → zulutango joined | 02:18 |
| → roadie joined | 02:19 |
| → euouae joined | 02:20 |
| ← zulutango left | 02:21 |
| ← Murr left | 02:21 |
| ← AsenMx left | 02:22 |
| → Murr joined | 02:22 |
| ← epolanski left | 02:22 |
| ← Maxattax97 left | 02:23 |
| → causaui1 joined | 02:24 |
| → zulutango joined | 02:25 |
| ← jim left | 02:27 |
| ← roadie left | 02:27 |
| ← causaui1 left | 02:28 |
| → qpdb joined | 02:31 |
| ← hgl left | 02:34 |
| → hgl joined | 02:35 |
| → BSaboia joined | 02:45 |
| → ThorMojito joined | 02:45 |
| ← chenqisu1 left | 02:46 |
| ← mat001 left | 02:48 |
| ← zebrag left | 02:49 |
| → riposte joined | 02:50 |
| → roadie joined | 02:54 |
| ← hgl left | 02:59 |
| ← ThorMojito left | 03:02 |
| → hgl joined | 03:02 |
| ← roadie left | 03:03 |
| → saroy joined | 03:05 |
| → roadie joined | 03:05 |
| → chenqisu1 joined | 03:08 |
| ← roadie left | 03:09 |
| → DoofusCanadensis joined | 03:13 |
| ← hgl left | 03:17 |
| → hgl joined | 03:17 |
| → ThorMojito joined | 03:19 |
| → mat001 joined | 03:19 |
| ← BSaboia left | 03:20 |
| ← hgl left | 03:22 |
| → causaui1 joined | 03:23 |
| ← mat001 left | 03:24 |
| → hgl joined | 03:24 |
| ← hgl left | 03:25 |
| → hgl joined | 03:27 |
| ← causaui1 left | 03:27 |
| ← nyah left | 03:28 |
| → roadie joined | 03:29 |
| ← euouae left | 03:33 |
| → whatsupdoc joined | 03:33 |
| → jim joined | 03:36 |
| ← GNUmoon left | 03:37 |
| ← hgl left | 03:38 |
| ← roadie left | 03:38 |
| → hgl joined | 03:39 |
| ← chenqisu1 left | 03:40 |
| → chenqisu1 joined | 03:40 |
| ← jonosterman left | 03:42 |
| → jonosterman joined | 03:42 |
| → roadie joined | 03:50 |
| ← igemnace left | 03:52 |
| ← hgl left | 03:59 |
| → hgl joined | 04:00 |
| ← hgl left | 04:06 |
| → hgl joined | 04:08 |
| ← jim left | 04:08 |
| ← Dr-007 left | 04:10 |
| ← hgl left | 04:11 |
| → hgl joined | 04:12 |
| → ferdna joined | 04:12 |
| → average joined | 04:15 |
| ← hgl left | 04:19 |
| ← DoofusCanadensis left | 04:21 |
| → hgl joined | 04:22 |
| ← hgl left | 04:23 |
| → hgl joined | 04:23 |
| ← jonosterman left | 04:31 |
| ← skapata left | 04:33 |
| → jonosterman joined | 04:34 |
| ← ThorMojito left | 04:38 |
| ← chenqisu1 left | 04:38 |
| → GNUmoon joined | 04:39 |
| ← hgl left | 04:42 |
| → hgl joined | 04:42 |
| → chenqisu1 joined | 04:43 |
| → skapata joined | 04:48 |
| ← skapata left | 04:48 |
| → skapata joined | 04:48 |
| ← roadie left | 04:49 |
| → pyevery__ joined | 04:49 |
| ← causasui left | 04:49 |
| ← sudoforge left | 04:51 |
| ← hgl left | 04:55 |
| ← pyevery__ left | 04:56 |
| → hgl joined | 04:57 |
| ← sgn left | 04:57 |
| → sgn joined | 04:57 |
| → DoofusCanadensis joined | 05:04 |
| ← Xenguy left | 05:09 |
| → FH_thecat joined | 05:13 |
| ← hgl left | 05:22 |
| ← jonosterman left | 05:22 |
| → hgl joined | 05:23 |
| ← luizfrds left | 05:23 |
| → jonosterman joined | 05:24 |
| ← DoofusCanadensis left | 05:25 |
| → roadie joined | 05:26 |
| ← chenqisu1 left | 05:26 |
| → chenqisu1 joined | 05:28 |
| ← roadie left | 05:35 |
| ← hgl left | 05:36 |
| → hgl joined | 05:37 |
| ← hgl left | 05:39 |
| → hgl joined | 05:39 |
| ← great_taste left | 05:41 |
| ← hgl left | 05:41 |
| → hgl joined | 05:44 |
| ← gast0n left | 05:47 |
| → aniruddha joined | 05:48 |
| ← bket_ left | 05:48 |
| → emf joined | 05:49 |
| → bket joined | 05:53 |
| ← bket left | 05:53 |
| ← hgl left | 05:58 |
| → hgl joined | 05:59 |
| → roadie joined | 06:00 |
| → bket joined | 06:00 |
| ← roadie left | 06:05 |
| ← jonosterman left | 06:11 |
| → jonosterman joined | 06:13 |
| ← m1dnight_ left | 06:15 |
| → roadie joined | 06:15 |
| ← hgl left | 06:16 |
| → danielsousaio[m] joined | 06:16 |
| → txtsd joined | 06:16 |
| → m1dnight joined | 06:16 |
| → hgl joined | 06:16 |
| ← ferdna left | 06:21 |
| ← roadie left | 06:22 |
| → causaui1 joined | 06:24 |
| ← hbautista_ left | 06:24 |
| ← xkuru left | 06:26 |
| ← xx left | 06:27 |
| ← causaui1 left | 06:28 |
| ← hgl left | 06:29 |
| → hgl joined | 06:29 |
| ← hgl left | 06:32 |
| → hgl joined | 06:32 |
| ← emf left | 06:40 |
| ← hgl left | 06:40 |
| → roadie joined | 06:40 |
| → hgl joined | 06:40 |
| ← hgl left | 06:45 |
| → hgl joined | 06:45 |
| → Doraemon joined | 06:46 |
| ← NeoCron left | 06:49 |
| ← GNUmoon left | 06:49 |
| → gordonfish- joined | 06:52 |
| → jusski joined | 06:52 |
| ← gordonfish left | 06:54 |
| ← jonosterman left | 07:01 |
| → jonosterman joined | 07:03 |
| → GNUmoon joined | 07:03 |
| → kenanmarasli joined | 07:04 |
| → refwef joined | 07:04 |
| → jim joined | 07:11 |
| ← vdamewood left | 07:15 |
| ← hgl left | 07:17 |
| → emf joined | 07:17 |
| ← rgrinberg left | 07:18 |
|
rapha
| j416: 2>&1 loses you the distinction between info and problem entirely. | 07:19 |
| ← Xaldafax left | 07:19 |
| → rgrinberg joined | 07:20 |
| → hgl joined | 07:21 |
| ← stenno left | 07:23 |
| ← emf left | 07:23 |
| ← rgrinberg left | 07:25 |
| ← luke-jr left | 07:26 |
| → thiago joined | 07:28 |
| → luke-jr joined | 07:28 |
| → cdown_ joined | 07:29 |
| → rfuentess joined | 07:30 |
| ← hgl left | 07:31 |
| ← cdown left | 07:32 |
| cdown_ → cdown | 07:32 |
| ← jetchisel left | 07:33 |
| → hgl joined | 07:33 |
| → pyeveryt_ joined | 07:34 |
| ← jusski left | 07:35 |
| ← pyeveryt_ left | 07:38 |
| → theoceaniscool joined | 07:41 |
| ← hgl left | 07:44 |
| → hgl joined | 07:46 |
| → hans_ joined | 07:46 |
| → spare joined | 07:47 |
| → palasso joined | 07:51 |
| ← aniruddha left | 07:58 |
| ← hgl left | 08:02 |
| → john_johnk joined | 08:03 |
| → hgl joined | 08:04 |
| ← unluckyshrubbery left | 08:04 |
| ← hgl left | 08:05 |
| → hgl joined | 08:05 |
| → euouae joined | 08:06 |
| ← hans_ left | 08:07 |
| → Sulky joined | 08:10 |
| → stenno joined | 08:11 |
| → gloomy joined | 08:11 |
| → pyeveryt_ joined | 08:15 |
| → mjbatty joined | 08:17 |
| ← thiago left | 08:18 |
| → furrymcgee joined | 08:19 |
| ← hgl left | 08:23 |
| → hgl joined | 08:23 |
| → elkalamar joined | 08:23 |
| ← pyeveryt_ left | 08:24 |
| ← txtsd left | 08:25 |
| → EvilDMP joined | 08:26 |
| → causaui1 joined | 08:26 |
| ← hgl left | 08:26 |
| → hgl joined | 08:28 |
| ← hgl left | 08:29 |
| → hgl joined | 08:30 |
| ← cluelessperson left | 08:30 |
| ← causaui1 left | 08:31 |
| → cluelessperson joined | 08:31 |
| ← jim left | 08:31 |
| → hans_ joined | 08:32 |
|
j416
| rapha: yes. | 08:35 |
|
| rapha: that's why there's stderr and stdout to begin with? | 08:35 |
| ← af left | 08:35 |
| ← euouae left | 08:37 |
|
ikke
| git uses stderr also for progress output | 08:37 |
| → RiFo joined | 08:37 |
| → otisolsen70 joined | 08:37 |
| ← hgl left | 08:37 |
| → hgl joined | 08:37 |
| ← Betal left | 08:39 |
| ← cluelessperson left | 08:42 |
| ← jonosterman left | 08:42 |
| → ubique joined | 08:44 |
| → rgrinberg joined | 08:44 |
| → jonosterman joined | 08:45 |
| ← hgl left | 08:46 |
| ← john_johnk left | 08:47 |
| → hgl joined | 08:48 |
| → af joined | 08:48 |
| ← skapata left | 08:53 |
| ← rgrinberg left | 08:54 |
| → nyah joined | 08:54 |
| ← luke-jr left | 08:58 |
| → hans__ joined | 09:00 |
| ← imp left | 09:00 |
| → imp_ joined | 09:01 |
| → luke-jr joined | 09:01 |
| ← hans_ left | 09:01 |
| imp_ → imp | 09:01 |
| ← AbleBacon left | 09:07 |
| → Ecophobia joined | 09:18 |
| → carl- joined | 09:20 |
| ← hgl left | 09:25 |
| → hgl joined | 09:26 |
| ← chenqisu1 left | 09:28 |
| ← Ecophobia left | 09:30 |
| ← hans__ left | 09:31 |
| ← jonosterman left | 09:31 |
| → cluelessperson joined | 09:33 |
| → jonosterman joined | 09:34 |
| ← hgl left | 09:37 |
| → AnapodoPsalidaki joined | 09:38 |
| → hgl joined | 09:38 |
| → hans joined | 09:39 |
| ← AnapodoPsalidi left | 09:40 |
| → elkalamar_ joined | 09:43 |
| ← Lord_of_Life left | 09:43 |
| ← Thomas25_ left | 09:43 |
| ← hgl left | 09:44 |
| ← refwef left | 09:44 |
| → hgl joined | 09:45 |
| ← elkalamar left | 09:45 |
| → Thomas25 joined | 09:48 |
| ← roadie left | 09:49 |
| ← elkalamar_ left | 09:50 |
| → jim joined | 09:50 |
| → elkalamar_ joined | 09:51 |
| ← EvilDMP left | 09:54 |
| → jetchisel joined | 09:54 |
| → berndj-blackout joined | 09:55 |
| → Guest27 joined | 09:56 |
| ← RiFo left | 09:57 |
| ← jim left | 09:58 |
| → inceptionflywho joined | 09:59 |
| → Lord_of_Life joined | 09:59 |
| berndj-blackout → berndj | 10:00 |
| ← imp left | 10:02 |
| ← luke-jr left | 10:07 |
| → luke-jr joined | 10:09 |
| ← hgl left | 10:12 |
| → rgrinberg joined | 10:13 |
| → hgl joined | 10:14 |
|
hendry
| i know in some text file in some past revision (since removed) there was a word, "null-ls", how do i search the history and files for that word like a grep? | 10:15 |
| → roadie joined | 10:16 |
|
selckin
| git log -S null-ls | 10:16 |
| ← whatsupdoc left | 10:18 |
| ← rgrinberg left | 10:18 |
| → lionkor joined | 10:18 |
| → unluckyshrubbery joined | 10:18 |
| ← Murr left | 10:21 |
| → Murr joined | 10:21 |
| ← jonosterman left | 10:21 |
| → EvilDMP joined | 10:24 |
| → jonosterman joined | 10:24 |
| → lkor joined | 10:25 |
| ← lionkor left | 10:25 |
| ← vimal left | 10:27 |
| → EvilDMP_ joined | 10:27 |
| ← relight left | 10:28 |
| ← roadie left | 10:28 |
| → relight joined | 10:28 |
| → roadie joined | 10:28 |
| → DoofusCanadensis joined | 10:29 |
| ← EvilDMP left | 10:31 |
| → mexen joined | 10:34 |
| ← kevr left | 10:34 |
| ← DoofusCanadensis left | 10:34 |
| → kevr joined | 10:34 |
| → rgrinberg joined | 10:35 |
| ← srinidhi left | 10:36 |
|
hendry
| selckin: thank you! | 10:37 |
| → gerwand joined | 10:37 |
| ← bindu left | 10:45 |
| ← rgrinberg left | 10:46 |
| → zer0bitz joined | 10:46 |
| ← EvilDMP_ left | 10:47 |
| → bindu joined | 10:51 |
| → EvilDMP joined | 10:52 |
| ← hgl left | 10:52 |
| → hgl joined | 10:52 |
| → rgrinberg joined | 10:58 |
| ← hgl left | 10:58 |
| → hgl joined | 10:59 |
| ← rgrinberg left | 11:02 |
| ← EvilDMP left | 11:02 |
| ← hgl left | 11:05 |
| → hgl joined | 11:05 |
| → jim joined | 11:08 |
| ← hgl left | 11:11 |
| → hgl joined | 11:12 |
| → elkalamar joined | 11:14 |
| ← elkalamar_ left | 11:14 |
| → EvilDMP joined | 11:17 |
| ← elkalamar left | 11:19 |
| ← furrymcgee left | 11:19 |
| → rgrinberg joined | 11:20 |
| → elkalamar joined | 11:24 |
| → BSaboia joined | 11:24 |
| → DibbTubberOne joined | 11:25 |
| → furrymcgee joined | 11:26 |
| → srinidhi joined | 11:27 |
| ← EvilDMP left | 11:31 |
| → jusski joined | 11:32 |
| ← rgrinberg left | 11:36 |
| ← mjbatty left | 11:39 |
| ← roadie left | 11:39 |
| → elkalamar_ joined | 11:41 |
| ← elkalamar left | 11:43 |
| ← hgl left | 11:44 |
| → hgl joined | 11:46 |
| → roman2 joined | 11:46 |
| → jinsun__ joined | 11:46 |
| → analpaper__ joined | 11:46 |
| → tchan1 joined | 11:46 |
| → aLeSD_ joined | 11:47 |
| → blmt2 joined | 11:47 |
| → vikonen8 joined | 11:47 |
| → cweiss07653 joined | 11:47 |
| → dhch2 joined | 11:47 |
| → ouzel8___ joined | 11:47 |
| ← elkalamar_ left | 11:48 |
| → robertparkerx_ joined | 11:48 |
| → bradyt- joined | 11:48 |
| → tonitch_ joined | 11:48 |
| → brettgilio3 joined | 11:48 |
| → gajus_ joined | 11:48 |
| → Fabricio20 joined | 11:48 |
| → bingos_ joined | 11:48 |
| → ksynwa_ joined | 11:48 |
| → seanBE_ joined | 11:48 |
| → bkhl_ joined | 11:48 |
| ← rewt left | 11:48 |
| → dysfigured joined | 11:48 |
| → bookworm_ joined | 11:48 |
| → MeatNit joined | 11:48 |
| → amosbird- joined | 11:48 |
| → jkl1337 joined | 11:48 |
| → YoungFrawg joined | 11:48 |
| → dodo__ joined | 11:48 |
| → greyrat_ joined | 11:48 |
| → h4x0riz3d joined | 11:48 |
| → celphi_ joined | 11:48 |
| → rewt joined | 11:48 |
| → zopsi_ joined | 11:48 |
| → Techcable_ joined | 11:49 |
| → dminuoso_ joined | 11:49 |
| → Piraty_ joined | 11:49 |
| → wagle_ joined | 11:49 |
| → Trieste_ joined | 11:49 |
| → brw6 joined | 11:50 |
| → fjmorazan_ joined | 11:50 |
| → glider_ joined | 11:50 |
| → starfarer_ joined | 11:50 |
| → unluckyshrubber- joined | 11:50 |
| → w1bble_ joined | 11:50 |
| → DvdKhl joined | 11:50 |
| → bond_ joined | 11:50 |
| → bboles_ joined | 11:50 |
| → multi_io_ joined | 11:50 |
| → arand_ joined | 11:51 |
| → d1b_ joined | 11:51 |
| → m1dnight_ joined | 11:51 |
| → foo_ joined | 11:51 |
| → nyuszika7h_ joined | 11:51 |
| → rwp_ joined | 11:51 |
| → grantbow_ joined | 11:51 |
| → LuKaRo_ joined | 11:51 |
| → betterOn1 joined | 11:51 |
| → harv_ joined | 11:51 |
| → Murr- joined | 11:51 |
| → brunosaboia_ joined | 11:51 |
| → supernov1h joined | 11:51 |
| → bin101_ joined | 11:51 |
| → BlessJah_ joined | 11:51 |
| → sgn_ joined | 11:51 |
| → unCork joined | 11:51 |
| dminuoso_ → dminuoso | 11:51 |
| ← dminuoso left | 11:52 |
| → dminuoso joined | 11:52 |
| → The_Blode joined | 11:52 |
| → cbreak_ joined | 11:52 |
| → ElimGarak joined | 11:52 |
| ← jetchisel left | 11:53 |
| bookworm_ → ghost | 11:53 |
| ghost → bookworm | 11:53 |
| → elkalamar joined | 11:54 |
| → Square joined | 11:54 |
| → indy_ joined | 11:54 |
| → haymawk_ joined | 11:54 |
| → tmz_ joined | 11:54 |
| → jetchisel joined | 11:55 |
| → dustinm- joined | 11:55 |
| → Lord_of_Life_ joined | 11:55 |
| → masber joined | 11:55 |
| → eblip joined | 11:55 |
| → lantech11 joined | 11:55 |
| → webstran- joined | 11:55 |
| lantech11 → lantech19446 | 11:55 |
| ← gajus left | 11:55 |
| ← bkhl left | 11:55 |
| ← celphi left | 11:55 |
| ← bradyt left | 11:55 |
| ← unluckyshrubbery left | 11:55 |
| ← tonitch left | 11:55 |
| ← LuKaRo left | 11:55 |
| ← tchan left | 11:55 |
| ← ksynwa left | 11:55 |
| ← bin101 left | 11:55 |
| ← seanBE left | 11:55 |
| ← BSaboia left | 11:55 |
| ← Murr left | 11:55 |
| ← m1dnight left | 11:55 |
| ← sgn left | 11:55 |
| ← Trieste left | 11:55 |
| ← rahl left | 11:55 |
| ← analpaper_ left | 11:55 |
| ← wagle left | 11:55 |
| ← rundown left | 11:55 |
| ← foo left | 11:55 |
| ← nyuszika7h left | 11:55 |
| ← BUSY left | 11:55 |
| ← BlessJah left | 11:55 |
| ← phundrak left | 11:55 |
| ← brw left | 11:55 |
| ← arand left | 11:55 |
| ← BinGOs left | 11:55 |
| Rhvs → Rhys | 11:55 |
| ← indy left | 11:55 |
| ← beencubed left | 11:55 |
| ← Timvde left | 11:55 |
| ← betterOne left | 11:55 |
| gajus_ → gajus | 11:55 |
| ← leachim6 left | 11:55 |
| ← Lord_of_Life left | 11:55 |
| ← qpdb left | 11:56 |
| ← geirha left | 11:56 |
| ← The_Blode_ left | 11:56 |
| ← blmt left | 11:56 |
| ← aLeSD left | 11:56 |
| ← jinsun left | 11:56 |
| ← dhch left | 11:56 |
| ← ouzel8_ left | 11:56 |
| ← Masklin_Gurder left | 11:56 |
| ← cweiss0765 left | 11:56 |
| ← haymawk left | 11:56 |
| ← fjmorazan left | 11:56 |
| ← Techcable left | 11:56 |
| ← Arokh left | 11:56 |
| ← iokill left | 11:56 |
| ← supernovah left | 11:56 |
| ← starfarer left | 11:56 |
| Murr- → Murr | 11:56 |
| brw6 → brw | 11:56 |
| ElimGarak → dgw | 11:56 |
| dhch2 → dhch | 11:56 |
| YoungFrawg → YoungFrog | 11:56 |
| brettgilio3 → brettgilio | 11:56 |
| Trieste_ → Trieste | 11:56 |
| harv_ → harv | 11:56 |
| vikonen8 → vikonen | 11:56 |
| unCork → Cork | 11:56 |
| blmt2 → blmt | 11:56 |
| DvdKhl → Arokh | 11:56 |
| MeatNit → NeatNit | 11:56 |
| ← jim left | 11:56 |
| → rektide_ joined | 11:56 |
| → Masklin_Gurder joined | 11:56 |
| → rahl joined | 11:56 |
| nyuszika7h_ → nyuszika7h | 11:56 |
| ← hgl left | 11:57 |
| → hgl joined | 11:57 |
| indy_ → indy | 11:57 |
| Lord_of_Life_ → Lord_of_Life | 11:58 |
| → iokill joined | 11:58 |
| → ThePhilgrim joined | 11:59 |
| → Timvde joined | 12:01 |
| → Moult joined | 12:01 |
| → phundrak joined | 12:02 |
| → snappy joined | 12:02 |
| → geirha joined | 12:02 |
| Rhys → Guest8952 | 12:02 |
| ← Guest8952 left | 12:02 |
| → BUSY joined | 12:02 |
| → Dragoon joined | 12:02 |
| → beencubed joined | 12:02 |
| → i7c joined | 12:02 |
| → Rhvs joined | 12:02 |
| → dmc joined | 12:03 |
| → qpdb joined | 12:03 |
| → leachim6 joined | 12:03 |
| → gerwando joined | 12:05 |
| tchan1 → tchan | 12:05 |
| ← gerwando left | 12:06 |
| → gerwando joined | 12:06 |
| ← gerwand left | 12:09 |
| → Swahili joined | 12:10 |
| → rgrinberg joined | 12:10 |
| bingos_ → BinGOs | 12:11 |
| ← BinGOs left | 12:11 |
| → BinGOs joined | 12:11 |
| ← Tobbi_ left | 12:13 |
| → Tobbi_ joined | 12:14 |
| → Jong joined | 12:14 |
| ← rgrinberg left | 12:15 |
|
j416
| note that -S searches for commits that added or removed this string, which is a bit different from just grepping the files in each commit | 12:16 |
|
| -S will probably give you want you want in this case, but it's useful to know of the distinction | 12:17 |
|
selckin
| is there an option for the other? seems less useful | 12:20 |
| → jwillikers joined | 12:21 |
| ← Murr left | 12:21 |
| → Murr joined | 12:21 |
| ← jwillikers left | 12:22 |
| → noord joined | 12:24 |
|
j416
| other than looping revisions and running git grep on each, I don't know | 12:24 |
|
| (something like git rev-list <rev> | xargs -n1 | git grep <pattern>, maybe with pager off and some better output formatting) | 12:26 |
| ← hgl left | 12:29 |
|
rapha
| j416: yes, what ikke says. also it uses it for infos like "fetching this submodule, bro". which is not helpful when you're writing scripts running via cron. | 12:31 |
| → hgl joined | 12:31 |
| ← hgl left | 12:37 |
| → hgl joined | 12:38 |
| ← mannequin left | 12:39 |
| ← hgl left | 12:39 |
| → hgl joined | 12:40 |
| ← DibbTubberOne left | 12:41 |
| → EvilDMP joined | 12:42 |
| ← FH_thecat left | 12:43 |
| ← llh left | 12:46 |
| ← brunosaboia_ left | 12:46 |
| → llh joined | 12:48 |
| → rgrinberg joined | 12:49 |
| ← wolfdale left | 12:50 |
| ← hgl left | 12:50 |
| → hgl joined | 12:50 |
| → wolfdale joined | 12:51 |
| ← jonosterman left | 12:51 |
| ← rgrinberg left | 12:54 |
| → jonosterman joined | 12:54 |
| → AnapodoPsalidi joined | 12:56 |
| ← EvilDMP left | 12:57 |
| ← hgl left | 12:58 |
| ← AnapodoPsalidaki left | 12:59 |
| → hgl joined | 12:59 |
| → rgrinberg joined | 13:00 |
| ← gerwando left | 13:01 |
| ← bindu left | 13:01 |
| ← hgl left | 13:02 |
| → bindu joined | 13:03 |
| → hgl joined | 13:04 |
| ← rgrinberg left | 13:05 |
| ← SirRippovMaple34 left | 13:08 |
| Piraty_ → Piraty | 13:10 |
| → AnapodoPsalidaki joined | 13:11 |
| → Gaboradon joined | 13:12 |
| → mat001 joined | 13:12 |
| → SirRippovMaple34 joined | 13:13 |
| → RiFo joined | 13:13 |
| ← AnapodoPsalidi left | 13:14 |
| → Vonter joined | 13:16 |
| → TJ- joined | 13:20 |
| → rgrinberg joined | 13:28 |
| → yeirr joined | 13:34 |
| ← rgrinberg left | 13:38 |
| ← hgl left | 13:39 |
| → hgl joined | 13:40 |
| ← hgl left | 13:41 |
| ← jonosterman left | 13:41 |
| → hgl joined | 13:42 |
| ← masber left | 13:43 |
| → jonosterman joined | 13:43 |
| → EvilDMP joined | 13:45 |
| → jwillikers joined | 13:47 |
| jinsun__ → jinsun | 13:47 |
| dodo__ → dodo | 13:48 |
| ← JanC left | 13:49 |
| → JanC joined | 13:49 |
| → atrigent joined | 13:50 |
| ← robertparkerx_ left | 13:53 |
| → hqdruxn08_ joined | 13:54 |
| → robertparkerx joined | 13:54 |
| ← HumanG33k left | 13:55 |
| tonitch_ → tonitch | 13:55 |
| → ThorMojito joined | 13:56 |
| ← hqdruxn08__ left | 13:58 |
| → HumanG33k joined | 13:58 |
| ← hgl left | 14:00 |
| → hgl joined | 14:00 |
| → causaui1 joined | 14:01 |
| → rgrinberg joined | 14:01 |
| ← rgrinberg left | 14:12 |
| → causasui joined | 14:16 |
| ← mat001 left | 14:16 |
|
atrigent
| can the commit --fixup=amend:<commit> thing be used to change the first line of the commit message? | 14:17 |
|
| oh I think I see how it works | 14:19 |
| → Guest41 joined | 14:20 |
| ← Guest41 left | 14:20 |
| → pyeveryt_ joined | 14:22 |
| ← ubique left | 14:24 |
| → gast0n joined | 14:25 |
| bond_ → bond | 14:26 |
| → ckeshav joined | 14:26 |
| ← pyeveryt_ left | 14:26 |
|
atrigent
| for the rebase "exec" command, is there a way/idiom to make it ignore the exit status of the command? | 14:27 |
| ← justache left | 14:27 |
| → fuzzybear3965 joined | 14:28 |
|
osse
| You can add ||: | 14:28 |
|
| aka. || true | 14:28 |
| ← eblip left | 14:28 |
|
atrigent
| thx | 14:28 |
|
osse
| The audience is listening | 14:28 |
| → justache joined | 14:28 |
| → MinionCoder231 joined | 14:30 |
| → aniruddha joined | 14:31 |
| ← jonosterman left | 14:31 |
| → durham joined | 14:32 |
| MinionCoder231 → miniontoby2 | 14:33 |
| → jonosterman joined | 14:33 |
| ← durham left | 14:37 |
| ← hgl left | 14:39 |
| → hgl joined | 14:39 |
| ← miniontoby2 left | 14:43 |
| ← magic_ninja left | 14:44 |
| → miniontoby2 joined | 14:44 |
| → magic_ninja joined | 14:45 |
| → rgrinberg joined | 14:46 |
| ← magic_ninja left | 14:49 |
| → pyevery__ joined | 14:49 |
| sgn_ → sgn | 14:50 |
| → magic_ninja joined | 14:51 |
| ← jwillikers left | 14:52 |
| ← miniontoby2 left | 14:53 |
| ← magic_ninja left | 14:53 |
| ← hgl left | 14:53 |
| → hgl joined | 14:55 |
| → jwillikers joined | 14:58 |
| ← hgl left | 15:00 |
| → hgl joined | 15:00 |
| → magic_ninja joined | 15:00 |
| ← causaui1 left | 15:04 |
| ← magic_ninja left | 15:04 |
| → magic_ninja joined | 15:04 |
| → sudoforge joined | 15:06 |
| → dcpc007 joined | 15:09 |
| ← hgl left | 15:11 |
| → hgl joined | 15:11 |
| ← hans left | 15:11 |
| → bjs joined | 15:11 |
| → hans joined | 15:19 |
| → rsx joined | 15:19 |
| → lacrymology joined | 15:21 |
| ← jetchisel left | 15:21 |
| ← jonosterman left | 15:21 |
| ← hgl left | 15:22 |
| → Xaldafax joined | 15:23 |
| → jonosterman joined | 15:23 |
| ← jwillikers left | 15:23 |
| → jwillikers joined | 15:24 |
| → junktext__ joined | 15:24 |
| ← noord left | 15:24 |
| → hgl joined | 15:24 |
| ← hgl left | 15:24 |
| → hgl joined | 15:25 |
| ← hgl left | 15:27 |
| → hgl joined | 15:27 |
| → great_taste joined | 15:31 |
| ← elkalamar left | 15:32 |
| ← hgl left | 15:37 |
| → Nei joined | 15:38 |
| → hgl joined | 15:39 |
| → igemnace joined | 15:40 |
|
Nei
| hi, I want to create a new commit which adds some files starting from some point in the history of my project. for a simple case, I could do this with git checkout $somehash; git add/commit; git checkout mybranch; git rebase $newcommit | 15:41 |
| ← hgl left | 15:41 |
|
Nei
| but when I try to do this in a complex projects with merges and (previously resolved) merge conflicts it stops on some merge conflicts | 15:41 |
| ← lkor left | 15:42 |
|
Nei
| can someone recommend a way to consistently rewrite the history of all those branches and merges and slip in that commit there in the past? | 15:42 |
| → hgl joined | 15:42 |
| ← Guest27 left | 15:42 |
| ← fuzzybear3965 left | 15:44 |
|
bookworm
| why do you want to rebase it in the first place? You could just add the file on top of the history | 15:46 |
| ← hans left | 15:47 |
| ← pyevery__ left | 15:48 |
| ← hgl left | 15:49 |
| → hgl joined | 15:49 |
| → jwillikers_ joined | 15:49 |
|
selckin
| Nei: generally no easy way to rewrite history that involves keeping merges | 15:49 |
| ← hgl left | 15:50 |
|
selckin
| there are some tools that try, but be prepared to spend a lot of time | 15:50 |
|
Nei
| :/ | 15:50 |
| → hgl joined | 15:51 |
|
ikke
| git rebase --rebase-merges :P | 15:52 |
| ← hgl left | 15:52 |
| → hgl joined | 15:53 |
| ← jwillikers left | 15:53 |
| jwillikers_ → jwillikers | 15:53 |
|
Nei
| well, even that stops on merge conflicts | 15:53 |
| → ChmEarl joined | 15:55 |
| ← hgl left | 15:56 |
| → hgl joined | 15:59 |
| → madewokherd` joined | 16:04 |
| ← hgl left | 16:06 |
| ← madewokherd left | 16:07 |
| ← kenanmarasli left | 16:07 |
| → hgl joined | 16:07 |
| ← jonosterman left | 16:11 |
| → jonosterman joined | 16:12 |
| ← ThorMojito left | 16:13 |
| ← hgl left | 16:14 |
| ← Albright_ left | 16:15 |
| → hgl joined | 16:15 |
| → Albright joined | 16:15 |
| → ThorMojito joined | 16:15 |
| ← TomyWork left | 16:15 |
| ← dsrt^ left | 16:16 |
| → XV8 joined | 16:16 |
| → hbautista_ joined | 16:16 |
| → Betal joined | 16:17 |
| → jetchisel joined | 16:17 |
| ← hgl left | 16:18 |
| → hgl joined | 16:21 |
| ← rahl left | 16:28 |
| → thiago joined | 16:28 |
| ← XV8 left | 16:28 |
| → rahl joined | 16:29 |
| → lkor joined | 16:30 |
| → lionkor joined | 16:34 |
| ← lkor left | 16:35 |
| ← hgl left | 16:36 |
| → hgl joined | 16:37 |
| ← rgrinberg left | 16:38 |
| → rgrinberg joined | 16:39 |
|
bookworm
| and that got removed in recent git no? | 16:40 |
|
| least there was a patch on the ML | 16:40 |
| foo_ → foo | 16:40 |
|
ikke
| That was an old deprecated option that got replaced with --rebase-merges | 16:42 |
| → skapata joined | 16:42 |
| ← skapata left | 16:42 |
| → skapata joined | 16:42 |
| → elkalamar joined | 16:42 |
|
bookworm
| ah | 16:42 |
| → elkalamar_ joined | 16:44 |
| → pyevery__ joined | 16:44 |
| ← elkalamar left | 16:46 |
| → drogas joined | 16:46 |
| ← elkalamar_ left | 16:48 |
| → lkor joined | 16:49 |
| ← lionkor left | 16:49 |
| ← pyevery__ left | 16:49 |
| ← hgl left | 16:50 |
| ← EvilDMP left | 16:51 |
| → hgl joined | 16:52 |
| ← madewokherd` left | 16:53 |
| → john_johnk joined | 16:53 |
| → noord joined | 16:54 |
| → m0viefreak joined | 16:55 |
| ← hgl left | 16:58 |
| → hgl joined | 16:58 |
| → dsrt^ joined | 16:59 |
| ← RiFo left | 17:00 |
| ← jonosterman left | 17:01 |
| → jonosterman joined | 17:03 |
| ← Jong left | 17:04 |
| ← john_johnk left | 17:04 |
| → cvmn joined | 17:05 |
| ← hgl left | 17:06 |
| → hgl joined | 17:06 |
| ← hgl left | 17:07 |
| → hgl joined | 17:08 |
| ← drogas left | 17:11 |
| → kenanmarasli joined | 17:11 |
| ← saroy left | 17:12 |
| → drogas joined | 17:15 |
| ← lkor left | 17:15 |
| → lionkor joined | 17:15 |
| ← ThorMojito left | 17:17 |
| ← ckeshav left | 17:21 |
| ← Vonter left | 17:24 |
| ← aLeSD_ left | 17:24 |
| → aLeSD_ joined | 17:25 |
| ← aLeSD_ left | 17:25 |
| ← rfuentess left | 17:25 |
| → meator joined | 17:25 |
| ← carl- left | 17:28 |
| ← hgl left | 17:29 |
| → hgl joined | 17:29 |
| ← Peng left | 17:31 |
| → elkalamar joined | 17:32 |
| ← mehwork left | 17:32 |
| ← hgl left | 17:33 |
| ← mexen left | 17:33 |
| → hgl joined | 17:33 |
| ← cvmn left | 17:35 |
| ← elkalamar left | 17:36 |
| → Vyrus joined | 17:38 |
| → causaui1 joined | 17:41 |
| → madewokherd joined | 17:41 |
| → hans joined | 17:43 |
| ← causaui1 left | 17:45 |
| ← hgl left | 17:45 |
| → hgl joined | 17:47 |
| ← gast0n left | 17:48 |
| gordonfish- → gordonfish | 17:48 |
| ← jonosterman left | 17:51 |
| → jonosterman joined | 17:53 |
| ← hgl left | 17:57 |
| → hgl joined | 18:00 |
| ← hbautista_ left | 18:04 |
| → hbautista joined | 18:05 |
| ← hgl left | 18:05 |
| → hgl joined | 18:05 |
| ← hgl left | 18:07 |
| → hgl joined | 18:07 |
| ← hgl left | 18:09 |
| → hgl joined | 18:10 |
| ← Vyrus left | 18:13 |
| → jim joined | 18:13 |
| → dextercd joined | 18:18 |
| → AbleBacon joined | 18:18 |
| → cvmn joined | 18:19 |
| rwp_ → rwp | 18:20 |
| ← Murr left | 18:21 |
| → Murr joined | 18:21 |
| ← rsx left | 18:25 |
| bkhl_ → bkhl | 18:28 |
| ← hgl left | 18:30 |
| ← SirRippovMaple34 left | 18:31 |
| → SirRippovMaple34 joined | 18:31 |
| → hgl joined | 18:32 |
| ← average left | 18:34 |
| → EvilDMP joined | 18:36 |
| ← meator left | 18:37 |
| ← EvilDMP left | 18:39 |
| → hqdruxn08__ joined | 18:40 |
| → EvilDMP joined | 18:40 |
| ← EvilDMP left | 18:40 |
| ← Sulky left | 18:41 |
| ← hqdruxn08_ left | 18:44 |
| ← hgl left | 18:45 |
| → hgl joined | 18:46 |
| → pyeveryt_ joined | 18:46 |
| → elkalamar joined | 18:49 |
| ← rgrinberg left | 18:55 |
| ← fstd left | 18:59 |
| → fstd joined | 18:59 |
| ← elkalamar left | 19:00 |
| ← pyeveryt_ left | 19:00 |
| → Vyrus joined | 19:02 |
| ← aniruddha left | 19:08 |
| → DoofusCanadensis joined | 19:17 |
| ← spare left | 19:19 |
| ← hgl left | 19:24 |
| ← yeirr left | 19:25 |
| ← thiago left | 19:26 |
| → hgl joined | 19:28 |
| → ThorMojito joined | 19:28 |
| → ferdna joined | 19:28 |
| ← ThorMojito left | 19:29 |
| → gordonfish- joined | 19:30 |
| → terminalpusher joined | 19:30 |
| ← hgl left | 19:32 |
| → hgl joined | 19:32 |
| ← gordonfish left | 19:32 |
| → ThorMojito joined | 19:33 |
| gordonfish- → gordonfish | 19:35 |
| ← mven- left | 19:35 |
| ← mven left | 19:36 |
| → mannequin joined | 19:38 |
| ← Swahili left | 19:38 |
| → causaui1 joined | 19:42 |
| ← causaui1 left | 19:47 |
| → reset joined | 19:49 |
| ← jwillikers left | 19:52 |
| ← ferdna left | 19:54 |
| → whatsupdoc joined | 19:55 |
| ← hans left | 19:57 |
| ← cvmn left | 19:57 |
| → hans joined | 19:58 |
| ← hans left | 19:59 |
| → jstein joined | 20:01 |
| → jimklimov1 joined | 20:05 |
| → rgrinberg joined | 20:05 |
| ← SirRippovMaple34 left | 20:07 |
| → jimklimov2 joined | 20:07 |
| → SirRippovMaple34 joined | 20:07 |
| ← jimklimov left | 20:07 |
| ← jimklimov1 left | 20:09 |
| → ZacSharp joined | 20:19 |
| → vdamewood joined | 20:20 |
| ← Murr left | 20:20 |
| → Murr joined | 20:21 |
| → coder joined | 20:24 |
| → Vyrusxx joined | 20:24 |
|
coder
| Trying to setup a server for --filter option. The client can get clone but always fail to checkout with the following error | 20:25 |
|
| fatal: the remote end hung up unexpectedly | 20:25 |
|
| fatal: protocol error: bad pack header | 20:25 |
|
| warning: Clone succeeded, but checkout failed. | 20:25 |
|
| Anybody has any ideas? | 20:25 |
|
ikke
| What version is the server? | 20:26 |
|
coder
| I have tried 2.27.0 and 2.30.0 | 20:27 |
|
| have done these. git config --global uploadpack.allowFilter true | 20:27 |
|
ikke
| seems like a memory issue | 20:27 |
|
| https://confluence.atlassian.com/fishkb/git-indexing-fails-due-to-bad-pack-header-371360062.html | 20:28 |
|
| I assume you have a large repo | 20:28 |
| ← Vyrus left | 20:28 |
|
coder
| Very small. My own project with about 1/2 dozen test files, few kb each | 20:29 |
|
ikke
| hmm, strange | 20:29 |
| ← vdamewood left | 20:30 |
|
coder
| I thought it might have something to do with ssh, go I got gitbucket running. Same problem. | 20:30 |
|
| ?so I got... | 20:31 |
| → vdamewood joined | 20:31 |
| wagle_ → wagle | 20:31 |
| ← cbreak_ left | 20:32 |
|
coder
| ikke, I tried the above suggestion of setting the mem limits to 100m. Still the same thing | 20:33 |
| ← jusski left | 20:33 |
|
ikke
| Yeah, if the repo is small, those settings should not matte | 20:33 |
| → durham joined | 20:33 |
|
ikke
| matter* | 20:33 |
|
coder
| Just a data point, can run against github.com just fine. | 20:34 |
| → cbreak joined | 20:36 |
| → jonosterman1 joined | 20:36 |
| ← furrymcgee left | 20:37 |
|
coder
| ikke, thank you for the help. Will do more digging around to see if I can find anything. | 20:37 |
|
ikke
| success | 20:37 |
| ← durham left | 20:38 |
| ← jonosterman left | 20:39 |
| ← coder left | 20:39 |
| h4x0riz3d → antto | 20:41 |
| → jast joined | 20:50 |
|
jast
| whoops, looks like I was disconnected from libera for >3 weeks without noticing... | 20:50 |
|
ikke
| heh | 20:50 |
|
| wb | 20:51 |
|
lantech19446
| jast: how do you not realize that lol | 20:51 |
|
jast
| I wasn't on IRC much | 20:52 |
|
| or rather, when I was looking at my client I didn't actually think about how unlikely it is that there'd be no activity in the #git window :> | 20:53 |
| ← brettgilio left | 20:56 |
| ← riposte left | 20:57 |
| → coder joined | 21:02 |
| ← coder left | 21:02 |
| → xx joined | 21:06 |
| ← drogas left | 21:11 |
| ← jonosterman1 left | 21:12 |
| ← yasht01[m] left | 21:13 |
| → yasht01[m] joined | 21:13 |
| → jonosterman joined | 21:14 |
| → pyeveryt_ joined | 21:15 |
| ← irrgit left | 21:16 |
| → BSaboia joined | 21:17 |
| ← rgrinberg left | 21:19 |
| → betelgeuse joined | 21:20 |
| → elkalamar joined | 21:21 |
| → rgrinberg joined | 21:21 |
| → AnapodoPsalidi joined | 21:22 |
| ← rgrinberg left | 21:22 |
| ← magic_ninja left | 21:23 |
| ← pyeveryt_ left | 21:23 |
| ← AnapodoPsalidaki left | 21:24 |
| → magic_ninja joined | 21:26 |
| ← lacrymology left | 21:31 |
| ← peterhil left | 21:38 |
| → peterhil joined | 21:39 |
| ← jcbjoe2021_ left | 21:39 |
| → EvilDMP joined | 21:40 |
| ← magic_ninja left | 21:40 |
| → magic_ninja joined | 21:42 |
| ← ThorMojito left | 21:44 |
| → EvilDMP_ joined | 21:48 |
| ← EvilDMP_ left | 21:48 |
| ← EvilDMP left | 21:48 |
| → jwillikers joined | 21:49 |
| ← jwillikers left | 21:50 |
| → rgrinberg joined | 21:51 |
| ← dcpc007 left | 21:53 |
| → EvilDMP joined | 21:54 |
| ← zer0bitz left | 21:54 |
| → jwillikers joined | 21:55 |
| → xkuru joined | 21:56 |
| → mven joined | 21:58 |
| ← madewokherd left | 21:59 |
| → Peng joined | 22:00 |
| ← jonosterman left | 22:02 |
| ← jwillikers left | 22:03 |
| → jwillikers_ joined | 22:03 |
| ← mven left | 22:03 |
| → mven` joined | 22:03 |
| → jonosterman joined | 22:04 |
| ← Vyrusxx left | 22:05 |
| → ThorMojito joined | 22:08 |
| ← peterhil left | 22:09 |
| → mven joined | 22:10 |
| ← mven` left | 22:10 |
| ← EvilDMP left | 22:16 |
| ← kenanmarasli left | 22:18 |
| → EvilDMP joined | 22:18 |
| ← EvilDMP left | 22:20 |
| → EvilDMP_ joined | 22:20 |
| ← ZacSharp left | 22:29 |
| → ZacSharp joined | 22:29 |
| → Smashcat joined | 22:32 |
| ← FinnElija left | 22:32 |
|
Smashcat
| Hi - anyone know how I can just pull from theorigin/master and replace anything on my local copy after already doing a git pull? Ended up with a bunch of conflicts that are impossible to fix. Is it easier to just delete everything and checkout again? | 22:33 |
|
noord
| Smashcat: did you committed? | 22:35 |
| → durham joined | 22:35 |
| → madewokherd joined | 22:35 |
|
Smashcat
| Yes I commited locally, so it's all messed up now. Just need to reset it to match the master | 22:35 |
|
rawtaz
| reset --hard perhaps | 22:36 |
| → FinnElija joined | 22:36 |
|
noord
| do you care changes you do? | 22:36 |
|
| check last stable commit id | 22:36 |
|
Smashcat
| No, I don't want the local changes, as I've made other changes on another machine. | 22:36 |
|
noord
| then reset --hard <commit-id> | 22:36 |
|
Smashcat
| I tried reset --hard but that throws an error | 22:36 |
|
rawtaz
| then act on the error | 22:36 |
|
| it's there for a reason | 22:37 |
|
Smashcat
| Yeah, I think it's easier to just delete it all and clone again. It'll take hours to clean it up :) | 22:37 |
| → roadie joined | 22:38 |
|
Smashcat
| The problem was that object/elf/hex files got added to the git repo, so when the software was built on the other machine they were all checked in too, so the conflicts are impossible to fix in that case. | 22:39 |
| ← durham left | 22:39 |
| ← Misotauros left | 22:40 |
|
rawtaz
| hum | 22:40 |
|
| but what error did you get when trying to reset --hard your branch? | 22:41 |
| ← EvilDMP_ left | 22:41 |
|
Smashcat
| Not an error, but after doing that, then git pull afterwards it just downloaded the same updates and created the conflicts again. So it didn't fix anything | 22:41 |
| → jazzy joined | 22:42 |
|
bookworm
| reset just resets your local repo, it doesn't modify the remote | 22:42 |
|
rawtaz
| well one would have to look closer at what your actual commit history looks like to tell you what you're doing wrong lol | 22:42 |
|
bookworm
| fix it up locally, then force push | 22:42 |
|
| (after warning whomever else is on the team that you did so) | 22:43 |
|
rawtaz
| ^that :) | 22:43 |
|
Smashcat
| Yeah, I wouldn't want to push updates from an older version. It would overwrite all the other updates :) | 22:43 |
| → causaui1 joined | 22:44 |
|
Smashcat
| Whenever I've had this problem previously I've just deleted the local repo and cloned again to fix it. I have a fast connection normally, so downloading a few GBs is no problem. But my main internet is down tonight, so downloading from my phone hotspot will take a few hours :) | 22:45 |
|
bookworm
| that's just stupid | 22:45 |
|
noord
| thats why vcs invented | 22:46 |
|
bookworm
| https://imgs.xkcd.com/comics/git_2x.png | 22:46 |
| ← terminalpusher left | 22:46 |
|
Smashcat
| Quickest way usually. | 22:46 |
|
bookworm
| no | 22:46 |
|
| the quickest way would be for you to learn git | 22:47 |
|
Smashcat
| Haha, that's exactly what I do :) | 22:47 |
|
bookworm
| learn how your tools work | 22:47 |
|
Smashcat
| My main internet connection is 800Mb/sec - it takes like 30 seconds to re-download. Going through 10 files to fix conflicts would take much longer. | 22:48 |
| → elkalamar_ joined | 22:48 |
|
rawtaz
| Smashcat: ill have you know, that while git can seem like a little hurdle ti get over before you start understanding the commands and what to do a bit more, it's very rewarding to just take a little time to read up on what to do when you encounter a problem :) | 22:48 |
|
| it takes a few seconds, but it doesnt make you know how to use your tool :P | 22:48 |
| ← causaui1 left | 22:49 |
|
noord
| Smashcat: it seems you have more than one problem, why some add binaries into source | 22:50 |
|
Smashcat
| rawtaz: It's only me that works on my repos - so any conflicts are an error on my part, usually when I do work on my laptop/desktop. So I just delete whichever is the oldest version and clone again :) I have trried hard resets etc in the past, and it always ends up a complete mess anyway :) | 22:50 |
|
bookworm
| typing my alias for "pristine fresh new clone" (aka git nuke) takes me approximately 1/100 of that time | 22:50 |
| ← elkalamar left | 22:50 |
|
rawtaz
| Smashcat: you told us that several times now. and thats wrong. learn your shit, or stop trying to be a real developer.. | 22:50 |
|
bookworm
| including the "are you sure" prompt | 22:50 |
|
Smashcat
| I am I real developer :) I just don't really spend much time with git except push and pull. | 22:51 |
|
rawtaz
| you arent a real dev if you dont even know how to use git at its very basics. but whatever | 22:51 |
|
bookworm
| and that's not a good thing you should be proud of | 22:51 |
| ← jonosterman left | 22:51 |
|
rawtaz
| i dont have a problem with that part, what i have a problem with is that you dont seem to care the least about wanting to do it right. thats a pity | 22:51 |
|
bookworm
| it means you are lacking expertise necessary for your work | 22:52 |
|
rawtaz
| but thats just my two cents, and it doesnt matter to you :) | 22:52 |
|
Smashcat
| rawtaz: Well, I get paid a six figure salary for my work, which is in some pretty well known companies - so kind of am a real developer - haha! | 22:52 |
|
rawtaz
| Smashcat: salary is not a measure of developer quality :) | 22:52 |
|
bookworm
| apparently the hiring process is lacking as well ;P | 22:52 |
|
noord
| It is about messing simple git operation | 22:52 |
|
Smashcat
| rawtaz: You've never seen my code, and you're insulting me. If my code was bad, people wouldn't keep hiring me back to work for them. | 22:53 |
|
| My code has nothing to do with how I use git though. | 22:53 |
|
bookworm
| To be honest, having the ability to quickly prototype stuff and roll back will really make your own life easier, so it's actually the lazy way | 22:53 |
|
rawtaz
| Smashcat: anyway heres the bottom line; people here are suggesting you learn a bit more about git, and it would indeed be good for your work and your skills if you did take the arguably little time it takes. so its just a word of advice. use it or not, thats up to you of course! | 22:53 |
| → jonosterman joined | 22:53 |
|
rawtaz
| Smashcat: i never once talked about your code | 22:53 |
|
| Smashcat: have a nice day, im putting you on ignore now so you dont have to hear my ramblings :) | 22:54 |
|
Smashcat
| rawtaz: Probably the reason I've never spent any time learning git, aside from clone/push/pull is that I spend almost all my time using svn, which I know pretty well. | 22:54 |
|
bookworm
| bet on the wrong horse ;P | 22:54 |
|
Smashcat
| You have a nice day too. | 22:54 |
|
bookworm
| svn is a mess too | 22:55 |
|
Smashcat
| bookworm: Clients use it. I just check in code there. | 22:55 |
|
bookworm
| there's a reason it fell out of favor | 22:55 |
|
Smashcat
| <Shrug> It's always worked fine for me. | 22:56 |
|
rawtaz
| i actually know people who still use svn and think it works fine :D | 22:56 |
|
| of course it does work for them, but they dont know how much better it can be i guess | 22:56 |
|
bookworm
| ^^ | 22:56 |
|
| the hg/dark people want to have a word too | 22:56 |
|
| or whatitsname? | 22:57 |
|
| darcs* | 22:57 |
|
noord
| Smashcat: how do you release and version your software? what kind of branching strategy do you use? | 22:57 |
|
Smashcat
| noord: That's handled by the client. My work doesn't need branching - I mainly work on event installations (OpenGL/WebGL, games, interations, robotics, custom electronics, and FPGA designs). | 22:59 |
|
noord
| how you find a bug in source without binary search on log? | 22:59 |
|
Smashcat
| Some of my installations have been running for years, but most only run for a few weeks. | 23:00 |
|
| noord: A versioning system isn't a debugging tool :) | 23:00 |
|
ZacSharp
| and you can always do a manual binary search | 23:00 |
|
| good tools with good methods | 23:01 |
|
| Smashcat it is not a debugging tool, but knowing in which change a bug was introduced is useful information | 23:01 |
|
Smashcat
| I use the compiler/debugger/simulator/ERC/DRC for finding bugs or errors in designs. | 23:02 |
| ← pizdets left | 23:02 |
| → pizdets joined | 23:03 |
|
Smashcat
| ZacSharp: A versioning tool won't help at all with that. I do know how to check out an earlier version of the code if I need to, but that's pretty rare, | 23:04 |
|
ZacSharp
| I did not tell you to replace your debugger with git (however that should work) | 23:05 |
|
Smashcat
| noord asked how I found bugs in my source without it. Then you jumped in :) | 23:06 |
| ← ThePhilgrim left | 23:07 |
| → ThePhilgrim joined | 23:08 |
| ← lemonsnicks left | 23:08 |
| → EvilDMP joined | 23:09 |
| → lemonsnicks joined | 23:09 |
|
noord
| Smashcat: it is better take time to learn basics of git. | 23:10 |
|
| and RTFM is normal thing on irc | 23:10 |
|
| showing off not | 23:10 |
| ← jwillikers_ left | 23:11 |
|
noord
| do you have another question? | 23:11 |
|
Smashcat
| For some people I guess. It's not something I enjoy though, and probably won't make me any more productive. | 23:11 |
|
| No, I'm just waiting for the clone to finish now. It's pretty slow on my phone though - haha! | 23:11 |
| ← FinnElija left | 23:11 |
| → FinnElija joined | 23:11 |
|
Smashcat
| That xkcd commit has got me intrigued though. I wonder how many others do the same as me to "fix" conflicts with git. Might try a reddit thread about it. | 23:14 |
|
| s/commit/comic | 23:14 |
|
bookworm
| too many sadly | 23:20 |
| ← m0viefreak left | 23:20 |
|
noord
| bookworm: why they insist on using git? | 23:20 |
|
bookworm
| everyone else is using it | 23:21 |
|
ZacSharp
| and if you know what you are doing it's great | 23:21 |
| → lkor joined | 23:22 |
|
bookworm
| granted, git has some UX problems, but it's also not *that* complicated... least the basics (modifying history, commits etc) | 23:22 |
| ← lionkor left | 23:22 |
| ← thekingofbandit left | 23:22 |
|
bookworm
| if you drop to the plumbing commands it's a different story | 23:23 |
|
DoofusCanadensis
| what, delete the repo and clone again? | 23:23 |
| ← ThorMojito left | 23:23 |
| ← rgrinberg left | 23:23 |
|
DoofusCanadensis
| yeah, I used to do that when I first started with Git | 23:23 |
|
Smashcat
| I don't think I've ever worked in a team where people enjoyed using the VCS (mostly SVN in my case). It was just an annoyance that had to be dealt with. I like to code/designhardware. the VCS is just a necessary evil I want to use as little as possible. Preferably just to push/pull code, as a kind of backup. | 23:23 |
|
bookworm
| that's the "my vcs isn't actually working" mindset | 23:23 |
|
| git actually workd | 23:23 |
|
| works* | 23:24 |
|
| it was designed explicitly because other VCS weren't working for the kernel | 23:24 |
|
Smashcat
| It does what I need it to, same as any VCS, but I don't want to use it more than once a day. Usually to back up my work at the end of the day. That's all it needs to do for me. | 23:24 |
|
| rawtaz wonders how the balance between git and hg has developed over the last five or so years - are they still about the same market share each or has hg declined in use? | 23:25 |
|
Smashcat
| A LOT of people I work with use it the same way. | 23:25 |
|
| rawtaz heads over to google to know | 23:25 |
|
bookworm
| and you do your horse riding any way you please, godspeed. For everyone else there's the automobile | 23:25 |
|
DoofusCanadensis
| hg has declined a LOT | 23:25 |
|
| bitbucket started life as a hg host... I don't think they support it anymore | 23:25 |
|
| java moved their source from hg to git | 23:26 |
| ← roadie left | 23:26 |
| → roadie joined | 23:26 |
|
rawtaz
| i see. i dont see that much of a decline on google trends though. just a slow trend downwards: https://trends.google.com/trends/explore?date=all&geo=SE&q=git,hg,mercurial | 23:27 |
|
| bur yeah might not be the best search terms :D | 23:27 |
| → _Smashcat joined | 23:27 |
|
DoofusCanadensis
| could be lots of "how do I migrate from hg to git" | 23:27 |
|
rawtaz
| hehe | 23:28 |
| → Vyrusxx joined | 23:28 |
| ← hololeap left | 23:29 |
| ← Smashcat left | 23:30 |
| → Misotauros joined | 23:30 |
| → hololeap joined | 23:30 |
| ← roadie left | 23:32 |
|
noord
| bookworm: why does everyone treat git as centralized vcs? | 23:32 |
| → thekingofbandit joined | 23:32 |
| ← qwedfg left | 23:33 |
| ← R2robot left | 23:33 |
|
apo
| _Smashcat: urgh, you're reminding me of a coworker whose SVN history is just weeks and weeks of commits with the comment "daily backup" | 23:34 |
|
rawtaz
| :D | 23:34 |
|
| oh i hate bad commit msgs | 23:34 |
|
_Smashcat
| apo: Haha, I do actually document the changes I made for each day. | 23:34 |
| → qwedfg joined | 23:34 |
| → R2robot joined | 23:35 |
| → lionkor joined | 23:35 |
|
rawtaz
| nooo! stop trying to evade my sophisticated ignore list | 23:35 |
| ← junktext__ left | 23:36 |
|
| apo dodges rawtaz | 23:36 |
| ← lkor left | 23:36 |
|
_Smashcat
| I got DC'd! My phone hotspot isn't doing well cloning this repo :) | 23:36 |
|
ZacSharp
| if you know how to check out specific commits you know how to reset as well | 23:37 |
|
| if you insist on recloning that's deserved I'd say | 23:37 |
| ← betelgeuse left | 23:37 |
| ← stenno left | 23:38 |
|
_Smashcat
| ZacSharp: I just know when I clone it's exactly in sync, and I don't have to mess about with anything afterwards. | 23:38 |
|
rawtaz
| this guy really dont get it | 23:39 |
| ← EvilDMP left | 23:40 |
|
rawtaz
| _Smashcat: do you realize that you can get that stuff easily 100% in sync without cloning the repo anew? | 23:40 |
| → EvilDMP joined | 23:40 |
|
rawtaz
| or are you simply not understanding this simple fact? | 23:40 |
| → emf joined | 23:40 |
| → ThorMojito joined | 23:41 |
|
_Smashcat
| Well, is the alternative a single command, as easy as "git clone..." ? | 23:41 |
| ← jonosterman left | 23:41 |
| ← emf left | 23:42 |
|
ZacSharp
| "git pull ..." and your branch is synced, unless you have worked on both ends | 23:42 |
|
noord
| git pull is shorter If it is your point | 23:42 |
| ← ThorMojito left | 23:42 |
|
ZacSharp
| git fetch and then git reset and you have discarded all local changes | 23:43 |
|
_Smashcat
| ZacSharp: Yes, the problem is when I work on both my laptop and PC and push from the laptop. Then there are conflicts. That's not something git pull fixes. | 23:43 |
|
noord
| thats why you shouldn't commit binary files | 23:43 |
|
_Smashcat
| I have to commit binary files. I also have PCB designs and production files versioned. | 23:44 |
|
bookworm
| you only have conflicts if you modify the same code parts... and no VCS can spare you from resolving it manually | 23:44 |
| → jonosterman joined | 23:44 |
|
_Smashcat
| (and FPGA designs for that matter) | 23:44 |
|
bookworm
| the choices git gives you is either their side or your side or a merge | 23:44 |
|
| simply tell git which one you want | 23:45 |
|
| for binary stuff a merge is out of the question, so pick a side | 23:45 |
|
_Smashcat
| bookworm: cloning is quicker than trying to resolve lots of conflicts when I don't want any local changes kept though. | 23:45 |
|
bookworm
| considering your reclone strategy that means theirs | 23:45 |
|
| it's really not | 23:45 |
|
| git reset --hard origin/master | 23:46 |
|
_Smashcat
| What's the one-liner then | 23:46 |
|
bookworm
| done | 23:46 |
|
| add afetch obviously | 23:46 |
|
_Smashcat
| bookworm: No, that doesn't do it on its own | 23:46 |
|
bookworm
| it does | 23:46 |
|
_Smashcat
| That's two lines | 23:46 |
|
| ...and a pull afterwards | 23:46 |
|
bookworm
| no, it's one | 23:46 |
|
DoofusCanadensis
| don't need to pull if you reset to origin/master | 23:46 |
|
bookworm
| gir fetch && git reset--hard @{u} | 23:47 |
|
| see? single line | 23:47 |
|
DoofusCanadensis
| considering that pull is git fetch + git merge (or rebase if you've configured it as such) | 23:47 |
|
rawtaz
| _Smashcat: that is completely irrelevant. is the answer yes or no? | 23:47 |
|
_Smashcat
| That's cheating, you just used the shell to combine two different statements :) | 23:47 |
|
bookworm
| so? | 23:47 |
|
ZacSharp
| you don't need to pull after resetting | 23:47 |
|
| and how is rm -rf . and git clone one command? | 23:48 |
| → jimklimov joined | 23:48 |
|
bookworm
| ^ that | 23:48 |
|
_Smashcat
| I clone to a new directory :) | 23:48 |
|
mannequin
| dangerous commands pasted | 23:48 |
|
| don't do that | 23:48 |
|
bookworm
| so still cd .. and git clone | 23:48 |
|
DoofusCanadensis
| no, cd ..; rm -rf <project>; git clone <project> | 23:48 |
|
_Smashcat
| So you wouldn't cd before your two commands? hmmmm | 23:49 |
|
mannequin
| use a file manager like mc to delete directories recursively | 23:49 |
|
bookworm
| mannequin: nothing is dangerous about that, grow up | 23:49 |
|
mannequin
| rmfr is dangerous, grow up | 23:49 |
|
ZacSharp
| it is dangerous to delete . recursively | 23:49 |
| ← llh left | 23:49 |
|
mannequin
| use a file manager to do that | 23:49 |
|
bookworm
| your shell is a file manager love | 23:49 |
|
DoofusCanadensis
| why would I use a file manager when I'm already on the cli? | 23:49 |
|
mannequin
| mc will do | 23:49 |
|
ZacSharp
| accidentially used a terminal open in home and chaos | 23:49 |
| → pretty_dumm_guy joined | 23:49 |
| → forgotmynick joined | 23:49 |
|
mannequin
| yeah and shell has history | 23:50 |
|
bookworm
| if you don't see your working directory in your PS1 you're doing it wrong | 23:50 |
|
mannequin
| don't never, ever do that | 23:50 |
|
| use a file manager | 23:50 |
|
| instead | 23:50 |
|
bookworm
| no | 23:50 |
| ← BSaboia left | 23:50 |
|
mannequin
| your choice | 23:50 |
|
bookworm
| I can handle my shell, thanks for your input | 23:50 |
|
mannequin
| that's russian rulette | 23:50 |
|
DoofusCanadensis
| consider too, that git clone is effectively "mkdir <project>; cd <project>; git init; git remote add origin <url>; git fetch; git checkout" | 23:51 |
|
_Smashcat
| I'm going to deliberately push from my laptop and desktop to see if "git fetch --all" then "git reset --hard" are the only two commands needed... | 23:51 |
| ← jimklimov2 left | 23:51 |
| → BSaboia joined | 23:51 |
|
bookworm
| --all is only useful if you have multiple remotes, chamces are you don't | 23:52 |
|
| considering that you barely manage a single remote | 23:52 |
|
ZacSharp
| and the reset needs to know what to reset to | 23:52 |
|
| just as bookworm said gir fetch && git reset--hard @{u} are the two you need | 23:53 |
|
_Smashcat
| I've just compiled a random piece of code on the laptop, and just pushed. Now I'll make some local changes and commit, then try to push (usually what happens when I forget I pushed from the laptop) | 23:53 |
| ← theoceaniscool left | 23:53 |
|
bookworm
| fetch fetches the remote, reset will nuke your changes to be the same as the remote | 23:53 |
| → danielsousaio[m4 joined | 23:53 |
|
bookworm
| it's as simple as that, you *will* loose work | 23:54 |
|
noord
| haha | 23:54 |
|
_Smashcat
| Ok cool, now I have lovely conflicts after I attemtped to push, then pulled . Same as usual. Now I'll try the two commands. | 23:54 |
|
bookworm
| or at leat you need to hunt for it in the reflog | 23:54 |
|
| why do you pull? | 23:54 |
|
| in which of my instructions did I say pull? | 23:54 |
|
| you don't want to pull | 23:54 |
|
| pull is fetch && merge | 23:54 |
|
| (by default) | 23:55 |
|
| rawtaz never pulls | 23:55 |
|
ZacSharp
| not even if its a ff merge? | 23:55 |
|
rawtaz
| its too magic for me :) | 23:55 |
|
| no. i always fetch if i need to get updates and merge with --ff-only unless i need something else | 23:55 |
|
DoofusCanadensis
| I always fetch, but after review I might pull | 23:55 |
|
bookworm
| you want "state of the remote" that's not a merge _Smashcat | 23:55 |
|
rawtaz
| i guess i just want to be in control :o | 23:55 |
|
_Smashcat
| Ok, so did "git fetch --all", then "git reset --hard". Now have "Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded.(use "git pull"...) So that's 3 commands :) | 23:55 |
|
DoofusCanadensis
| no | 23:56 |
| ← glik22 left | 23:56 |
|
DoofusCanadensis
| you were supposed to git reset --hard origin/main | 23:56 |
|
bookworm
| _Smashcat: missing target, you reset to HEAD | 23:56 |
|
DoofusCanadensis
| ^ | 23:56 |
|
_Smashcat
| Yeah see, this is how you start down the rabbit hole | 23:56 |
|
bookworm
| literally, `git fetch && git reset --hard @{u}` | 23:57 |
|
| there's no rabbit hole, you've been spoonfed the command now 4 times | 23:57 |
| ← DoofusCanadensis left | 23:57 |
|
rawtaz
| bookworm: is @{u} representing the remote tracking branch? | 23:58 |
|
_Smashcat
| I thought that @[u] was a typo :) Not exactly obvious is it? | 23:58 |
|
ZacSharp
| @{u} | 23:58 |
|
| you used [] instead of {} | 23:58 |
|
rawtaz
| _Smashcat: noone would accidentally type @{u} | 23:58 |
|
bookworm
| you can use origin/master but I don't know what your branch nor ypur remote is called | 23:59 |
|
| it can be work/main for all I know | 23:59 |
|
ZacSharp
| so it's easier to just use @{u}, which is the remote tracking branch if your repo is set up properly | 23:59 |
|
bookworm
| hence @{u} which always means the remote tracking branch | 23:59 |
|
ZacSharp
| and since git clone does that part of the setup it should really be | 23:59 |
|
bookworm
| ^ | 23:59 |
