| 2021-01-16 |
| → venmx joined | 00:00 |
| ← kerframil left | 00:02 |
| → gjergj_kastrioti joined | 00:03 |
| ← Guest81519 left | 00:04 |
| → Newami joined | 00:04 |
| ← shadear left | 00:05 |
| ← Newami left | 00:05 |
| ← venmx left | 00:05 |
| ← gjergj_kastrioti left | 00:05 |
| ← arcatech left | 00:05 |
| ← lungaro_ left | 00:05 |
| ← tiin57 left | 00:05 |
| → lungaro_ joined | 00:06 |
| → gjergj_kastrioti joined | 00:06 |
| → tiin57 joined | 00:06 |
| ← leeN left | 00:06 |
| ← mat001_ left | 00:10 |
| ← tiin57 left | 00:10 |
| → mat001 joined | 00:11 |
| ← calcul0n_ left | 00:11 |
| → bambanx joined | 00:13 |
| → tiin57 joined | 00:14 |
| → gavlee__ joined | 00:15 |
|
mehwork
| In gitignore, when would one use **/foo over just foo | 00:16 |
| ← j`ey left | 00:17 |
|
mehwork
| i guess you would only use it if it was **/foo/bar | 00:17 |
| → Notgnoshi joined | 00:20 |
| → blahboybaz joined | 00:21 |
| ← gigasu_shida left | 00:23 |
| ← Notgnoshi left | 00:23 |
| → arcatech joined | 00:23 |
| ← gavlee left | 00:25 |
| ← mowcat left | 00:26 |
| ← gavlee__ left | 00:27 |
| ← fax left | 00:27 |
| → djapo joined | 00:30 |
| ← arcatech left | 00:33 |
| → gigasu_shida joined | 00:33 |
| ← CleverChris left | 00:36 |
| ← tiin57 left | 00:40 |
| → viruscthulhu joined | 00:42 |
| → tiin57 joined | 00:44 |
| ← royal_screwup21 left | 00:45 |
| → royal_screwup21 joined | 00:45 |
| → veegee joined | 00:48 |
| ← qqx left | 00:48 |
| ← waveclaw left | 00:49 |
| ← masticass left | 00:49 |
| ← royal_screwup21 left | 00:50 |
| ← cbreak left | 00:51 |
| → orbyt_ joined | 00:53 |
| → qqx joined | 00:55 |
| ← AnAverageHuman left | 00:56 |
| → arcatech joined | 00:58 |
| ← arcatech left | 00:58 |
| ← Tuor left | 01:00 |
| → Tuor joined | 01:00 |
| → BUSY joined | 01:00 |
| ← cloud69 left | 01:03 |
| → irrgit joined | 01:05 |
| ← blahboybaz left | 01:05 |
| ← Wetmelon left | 01:06 |
| → venmx joined | 01:06 |
| ← tiin57 left | 01:11 |
| ← venmx left | 01:11 |
| → AnAverageHuman joined | 01:13 |
| → arcatech joined | 01:13 |
| → tiin57 joined | 01:14 |
| ← mat001 left | 01:15 |
| → mat001 joined | 01:16 |
| → Newami joined | 01:16 |
|
jaggz
| dexterfoo, thanks | 01:18 |
| → venmx joined | 01:19 |
| → Goplat joined | 01:21 |
| → dqx joined | 01:22 |
| ← venmx left | 01:24 |
| → goldstar joined | 01:25 |
| ← goldstar left | 01:25 |
| → goldstar joined | 01:25 |
| ← Newami left | 01:26 |
| → stats4647 joined | 01:29 |
| ← arcatech left | 01:32 |
| ← atrigent left | 01:33 |
| → arcatech joined | 01:34 |
| → rednaZ[m] joined | 01:35 |
| ← rednaZ[m] left | 01:35 |
| → waveclaw joined | 01:37 |
| → fmlatghor joined | 01:37 |
| ← Metalsutton left | 01:38 |
| ← stats4647 left | 01:38 |
| → Guest49348 joined | 01:40 |
| ← tiin57 left | 01:40 |
| → venmx joined | 01:41 |
| → tiin57 joined | 01:43 |
| ← wootehfoot left | 01:48 |
| ← goldstar left | 01:48 |
| → Muimi joined | 01:54 |
| ← dviola left | 01:56 |
| ← venmx left | 02:00 |
| ← thinkpad left | 02:07 |
| → thinkpad joined | 02:08 |
| ← F0rTex left | 02:08 |
| → F0rTex joined | 02:09 |
| → royal_screwup21 joined | 02:10 |
| ← tiin57 left | 02:10 |
| → tiin57 joined | 02:14 |
| ← royal_screwup21 left | 02:15 |
| ← cliluw left | 02:15 |
| → blahboybaz joined | 02:16 |
| ← Sonderblade left | 02:17 |
| → Sonderblade joined | 02:18 |
| → dviola joined | 02:20 |
| → nsc joined | 02:22 |
| nsc → Guest1855 | 02:22 |
| ← zebrag left | 02:22 |
| → zebrag joined | 02:23 |
| ← Guest68918 left | 02:23 |
| ← FH_thecat left | 02:24 |
| → digup joined | 02:28 |
| ← digup left | 02:31 |
| → digup joined | 02:31 |
| → venmx joined | 02:32 |
| → Xenguy joined | 02:34 |
| → steven joined | 02:35 |
| ← venmx left | 02:36 |
| → dansan joined | 02:38 |
| ← gjergj_kastrioti left | 02:40 |
| ← tiin57 left | 02:40 |
| → tiin57 joined | 02:43 |
| ← djapo left | 02:44 |
| ← dqx left | 02:50 |
| → Guest20 joined | 02:52 |
| → FH_thecat joined | 02:55 |
| ← tejr left | 03:00 |
| ← queip left | 03:00 |
| → tejr joined | 03:00 |
| ← FH_thecat left | 03:04 |
| ← bambanx left | 03:06 |
| → queip joined | 03:07 |
| ← Guest49348 left | 03:10 |
| ← tiin57 left | 03:10 |
| → Blkt joined | 03:11 |
| ← Blkt left | 03:12 |
| → Blkt joined | 03:12 |
| ← nomadicmathmo left | 03:12 |
| ← thinkpad left | 03:12 |
| → thinkpad joined | 03:13 |
| → tiin57 joined | 03:14 |
| ← Blkt left | 03:15 |
| → Blkt joined | 03:15 |
| → drbean joined | 03:15 |
| ← fmlatghor left | 03:21 |
| ← zebrag left | 03:22 |
| → zebrag joined | 03:23 |
| ← al3x271 left | 03:23 |
| ← mgedmin left | 03:30 |
| → mgedmin joined | 03:32 |
| → dqx joined | 03:33 |
| ← blahboybaz left | 03:37 |
| ← mirrorbird left | 03:37 |
| ← tiin57 left | 03:40 |
| → tiin57 joined | 03:44 |
| → Chex joined | 03:44 |
| ← geosmile left | 03:48 |
| ← benfelin left | 03:52 |
| → xirhtogal joined | 03:54 |
| lagothrix → Guest35012 | 03:54 |
| ← Guest35012 left | 03:54 |
| xirhtogal → lagothrix | 03:54 |
| → mirrorbird joined | 03:55 |
| ← zebrag left | 03:55 |
| → g2anj joined | 03:57 |
| ← dqx left | 04:00 |
| → dqx joined | 04:02 |
| → retrospe1tacus joined | 04:04 |
| ← rosco left | 04:04 |
| ← rosco_y left | 04:04 |
| ← retrospectacus left | 04:05 |
| → digup_ joined | 04:07 |
| ← digup left | 04:07 |
| → geosmile joined | 04:09 |
| → royal_screwup21 joined | 04:10 |
| ← tiin57 left | 04:10 |
| → mukesh joined | 04:11 |
| ← mukesh left | 04:12 |
| → tiin57 joined | 04:14 |
| ← royal_screwup21 left | 04:15 |
| ← nikivi left | 04:16 |
| ← POQDavid left | 04:16 |
| ← acetakwas left | 04:16 |
| → POQDavid joined | 04:16 |
| → nikivi joined | 04:17 |
| → acetakwas joined | 04:17 |
| ← digup_ left | 04:18 |
| → rumbler31_ joined | 04:19 |
| ← fling left | 04:20 |
| ← dviola left | 04:21 |
| ← heyitsrama left | 04:21 |
| → FH_thecat joined | 04:22 |
| → dviola joined | 04:22 |
| → fling joined | 04:24 |
| ← mindCrime left | 04:26 |
| ← FH_thecat left | 04:28 |
| ← fling left | 04:29 |
| → fling joined | 04:37 |
| ← Mattiaslndstrm left | 04:40 |
| ← tiin57 left | 04:41 |
| ← mat001 left | 04:42 |
| → mat001 joined | 04:43 |
| → tiin57 joined | 04:43 |
| → Mattiaslndstrm joined | 04:44 |
| → mindCrime joined | 04:46 |
| ← Peetz0r left | 04:49 |
| → Peetz0r joined | 04:53 |
| ← mindCrime left | 05:01 |
| ← ghoti_ left | 05:05 |
| ← gigasu_shida left | 05:06 |
| ← acercle left | 05:06 |
| → digup joined | 05:06 |
| → gigasu_shida joined | 05:06 |
| ← arcatech left | 05:06 |
| ← crose left | 05:10 |
| ← tiin57 left | 05:10 |
| → ghoti joined | 05:10 |
| → adlternative joined | 05:11 |
| pikapika_lunar_a → pikapika | 05:12 |
| → tiin57 joined | 05:14 |
| ← ghoti left | 05:15 |
| → ghoti joined | 05:16 |
| ← veegee left | 05:17 |
| ← cd left | 05:17 |
| ← viruscthulhu left | 05:18 |
| ← ghoti left | 05:21 |
| → ghoti joined | 05:22 |
| ← ghoti left | 05:27 |
| ← geosmile left | 05:29 |
| ← digup left | 05:29 |
| ← PJBoy left | 05:34 |
| → stats4647 joined | 05:35 |
| → digup joined | 05:37 |
| → arcatech joined | 05:38 |
| ← stats4647 left | 05:40 |
| ← tiin57 left | 05:41 |
| ← digup left | 05:42 |
| → digup joined | 05:42 |
| → shush joined | 05:43 |
| ← adlternative left | 05:43 |
| → adlternative joined | 05:44 |
| → tiin57 joined | 05:44 |
| ← thiago left | 05:45 |
| ← fling left | 05:47 |
| ← shush left | 05:47 |
| ← vicfred left | 05:49 |
| → vicfred joined | 05:49 |
| ← vicfred left | 05:50 |
| → ghoti joined | 05:58 |
| → digup_ joined | 06:00 |
| ← digup left | 06:00 |
| digup_ → digup | 06:00 |
| ← madewokherd left | 06:00 |
| ← ghoti left | 06:03 |
| → fling joined | 06:05 |
| ← digup left | 06:05 |
| ← tiin57 left | 06:10 |
| → royal_screwup21 joined | 06:11 |
| ← hamidnz89 left | 06:12 |
| → hamidnz89 joined | 06:13 |
| → tiin57 joined | 06:14 |
| ← adlternative left | 06:15 |
| ← royal_screwup21 left | 06:17 |
| ← mirrorbird left | 06:17 |
| → adlternative joined | 06:17 |
| ← xelxebar left | 06:19 |
| → xelxebar joined | 06:19 |
| ← faceface left | 06:20 |
| ← AnAverageHuman left | 06:33 |
| → ferdna joined | 06:36 |
| ← Fokst left | 06:38 |
| → Fokst joined | 06:39 |
| ← Distance_ left | 06:40 |
| ← tiin57 left | 06:40 |
| → tiin57 joined | 06:44 |
| ← thinkpad left | 06:47 |
| → thinkpad joined | 06:49 |
| ← thinkpad left | 06:59 |
| → ghoti joined | 06:59 |
| → KnoP joined | 07:01 |
| ← ghoti left | 07:04 |
| → ghoti joined | 07:05 |
| ← Betal left | 07:05 |
| ← ghoti left | 07:10 |
| ← tiin57 left | 07:10 |
| → ghoti joined | 07:11 |
| ← arcatech left | 07:13 |
| → tiin57 joined | 07:13 |
| ← alyawn left | 07:16 |
| ← ghoti left | 07:16 |
| → ghoti joined | 07:17 |
| ← TheConjurer left | 07:18 |
| → TheConjurer joined | 07:18 |
| ← r1ppa left | 07:19 |
| ← ghoti left | 07:22 |
| ← mat001 left | 07:23 |
| → mat001 joined | 07:24 |
| → rustyshackleford joined | 07:24 |
| → venmx joined | 07:27 |
| → ghoti joined | 07:28 |
| → pedahzur joined | 07:29 |
| ← mat001 left | 07:30 |
| ← venmx left | 07:32 |
| → gavlee joined | 07:32 |
| ← ghoti left | 07:33 |
| → ghoti joined | 07:34 |
| → digup joined | 07:34 |
| ← lawid left | 07:35 |
| → lawid joined | 07:36 |
| ← sudoforge left | 07:38 |
| ← ghoti left | 07:39 |
| → ghoti joined | 07:40 |
| ← tiin57 left | 07:40 |
| → tiin57 joined | 07:43 |
| ← ghoti left | 07:45 |
| ← pedahzur left | 07:45 |
| → nabil_ joined | 07:45 |
| → ghoti joined | 07:46 |
| ← nabil__ left | 07:48 |
| → nabil joined | 07:49 |
| ← nabil_ left | 07:50 |
| ← Goplat left | 07:51 |
| ← ghoti left | 07:51 |
| → vdamewood joined | 07:51 |
| → mat001 joined | 07:53 |
| ← howdoi left | 07:54 |
| → pedahzur joined | 07:54 |
| ← mat001 left | 07:58 |
| ← digup left | 07:59 |
| → digup joined | 07:59 |
| ← pedahzur left | 07:59 |
| ← p-core left | 07:59 |
| → pedahzur joined | 08:00 |
| → p-core joined | 08:00 |
| → darkbit joined | 08:00 |
| ← unluckyshrubbery left | 08:02 |
| ← hamidnz89 left | 08:04 |
| → nabil_ joined | 08:07 |
| → nabil__ joined | 08:09 |
| ← nabil left | 08:10 |
| ← tiin57 left | 08:11 |
|
Seveas
| finnb: manually, I'm afraid. | 08:11 |
| → filcab joined | 08:12 |
| → nabil joined | 08:12 |
| ← nabil_ left | 08:12 |
| filcab → Guest50642 | 08:12 |
|
Seveas
| jaggz: git merge-tree can give you a preview as a merge diff | 08:12 |
| → royal_screwup21 joined | 08:12 |
| → nabil_ joined | 08:14 |
| ← kalbasit left | 08:14 |
| ← nabil__ left | 08:14 |
| → tiin57 joined | 08:14 |
| ← royal_screwup21 left | 08:17 |
| ← nabil left | 08:17 |
| ← digup left | 08:22 |
| → digup joined | 08:23 |
| ← Guest20 left | 08:23 |
| → hamidnz89 joined | 08:24 |
| ← pedahzur left | 08:27 |
| ← tchan left | 08:30 |
| ← austin987 left | 08:35 |
| lambda_ → lambda | 08:35 |
| ← digup left | 08:35 |
| ← hamidnz89 left | 08:38 |
| → al3x271 joined | 08:38 |
| ← FRWB left | 08:40 |
| → sgn joined | 08:40 |
| ← tiin57 left | 08:40 |
| → tiin57 joined | 08:44 |
| → iskander- joined | 08:46 |
| ← iskander left | 08:47 |
|
jaggz
| hmmmm | 08:47 |
| → austin987 joined | 08:49 |
| ← drbean left | 08:51 |
| → rsx joined | 08:56 |
| → iskander joined | 09:00 |
| ← iskander- left | 09:01 |
| → Phase[m] joined | 09:01 |
| ← wallacer left | 09:02 |
| → bariscant joined | 09:03 |
| → wallacer joined | 09:07 |
| → feriman joined | 09:08 |
| ← bariscant left | 09:08 |
| → venmx joined | 09:10 |
| ← tiin57 left | 09:10 |
| → greyskull joined | 09:11 |
| ← wallacer left | 09:11 |
| → theoceaniscool joined | 09:12 |
| ← rumbler31_ left | 09:13 |
| → tiin57 joined | 09:14 |
| → manuelmrtz joined | 09:17 |
| → ghoti joined | 09:21 |
| ← feriman left | 09:22 |
| → feriman joined | 09:24 |
| ← staafl_r19 left | 09:26 |
| → herren joined | 09:26 |
| ← ghoti left | 09:26 |
| → wallacer joined | 09:27 |
| ← wallacer left | 09:29 |
| ← Xenguy left | 09:30 |
| ← venmx left | 09:30 |
| ← staafl_d17 left | 09:31 |
| ← fatalhalt left | 09:36 |
| ← orbyt_ left | 09:37 |
| ← adlternative left | 09:38 |
| ← dqx left | 09:40 |
| → mbalmer joined | 09:40 |
| ← tiin57 left | 09:40 |
| → wallacer joined | 09:41 |
| → jl4 joined | 09:41 |
| → unluckyshrubbery joined | 09:43 |
| → shush joined | 09:44 |
| → tiin57 joined | 09:44 |
| → dqx joined | 09:45 |
| → surfist joined | 09:45 |
| → FH_thecat joined | 09:47 |
| ← dqx left | 09:48 |
| ← shush left | 09:49 |
| → dqx joined | 09:49 |
| → adlternative joined | 09:51 |
| ← TheConjurer left | 09:54 |
| → venmx joined | 09:57 |
| → bolovanos_ joined | 10:02 |
| ← venmx left | 10:02 |
| → ghoti joined | 10:03 |
| ← dqx left | 10:03 |
| → iskander- joined | 10:04 |
| → dqx joined | 10:04 |
| ← gigasu_shida left | 10:05 |
| ← iskander left | 10:05 |
| ← dqx left | 10:07 |
| → digup joined | 10:08 |
| → mindCrime joined | 10:08 |
| ← hnOsmium0001 left | 10:08 |
| → calcul0n_ joined | 10:09 |
| → vorona joined | 10:10 |
| → iskander joined | 10:10 |
| ← tiin57 left | 10:10 |
| ← amahl left | 10:10 |
| ← iskander- left | 10:11 |
| → royal_screwup21 joined | 10:13 |
| ← digup left | 10:13 |
| → venmx joined | 10:14 |
| → tiin57 joined | 10:14 |
| → dqx joined | 10:17 |
| ← royal_screwup21 left | 10:18 |
| ← dqx left | 10:19 |
| → iskander- joined | 10:20 |
| ← iskander left | 10:20 |
| ← FH_thecat left | 10:21 |
| → hamidnz89 joined | 10:24 |
| → rcoote joined | 10:24 |
| ← kenwoodfox left | 10:24 |
| ← hamidnz89 left | 10:27 |
| ← iskander- left | 10:29 |
| → hamidnz89 joined | 10:29 |
| ← fling left | 10:29 |
| → dqx joined | 10:32 |
| → iskander joined | 10:32 |
| → wootehfoot joined | 10:32 |
| → fling joined | 10:33 |
| → cbreak joined | 10:37 |
| → amahl joined | 10:37 |
| ← hamidnz89 left | 10:37 |
| ← FFY00 left | 10:37 |
| ← worc3131 left | 10:38 |
| → FFY00 joined | 10:38 |
| ← ferdna left | 10:39 |
| → hamidnz89 joined | 10:39 |
| ← FFY00 left | 10:39 |
| → FFY00 joined | 10:40 |
| ← tiin57 left | 10:40 |
| → kenwoodfox joined | 10:40 |
| ← jl4 left | 10:42 |
| → tiin57 joined | 10:44 |
| ← FFY00 left | 10:47 |
| → FFY00 joined | 10:48 |
| ← vorona left | 10:48 |
| → vorona joined | 10:49 |
|
vorona
| Hello. Why "git status" gives me "On branch master" even if I have in ".gitconfig" file string:"init.defaultbranch=main" ? | 10:51 |
|
ikke
| did you create the repo after you changed that setting> | 10:52 |
|
| ? | 10:52 |
|
| And what version of git do you have? | 10:52 |
|
vorona
| Hm... I don't remember when I created. Version 2.25.1 | 10:53 |
|
ikke
| Oh, that version is too old | 10:53 |
|
vorona
| How can I upgrade git? | 10:54 |
|
ikke
| WHat distribution / os? | 10:55 |
|
vorona
| That's strange that this version is too old. I just install it from "apt" | 10:55 |
| → naftilos76 joined | 10:55 |
|
vorona
| couple of days ago | 10:55 |
|
ikke
| ubuntu does not give you the latest version | 10:55 |
|
vorona
| Ubuntu | 10:55 |
|
ikke
| you need to add a so called PPA to get the latest version | 10:56 |
|
| https://launchpad.net/~git-core/+archive/ubuntu/ppa | 10:56 |
|
vorona
| ok. Will read it now. Tnx | 10:56 |
| ← wootehfoot left | 10:59 |
| → dqx_ joined | 10:59 |
|
ikke
| you need at least 2.28.0 | 11:00 |
|
vorona
| ok. I've added PPA to my system. How can I upgrade git now? | 11:04 |
|
ikke
| if you just want to upgrade git, apt update && apt install git | 11:05 |
|
| should work | 11:05 |
|
vorona
| still the same version | 11:05 |
|
| Oh..ok | 11:05 |
| ← gxt left | 11:06 |
|
ikke
| so is it upgraded or not? | 11:07 |
|
vorona
| Yes, upgraded 2.30.0 now | 11:08 |
|
ikke
| ok, good | 11:08 |
| ← tiin57 left | 11:10 |
|
vorona
| But the same question. It shows "master" instead of "main" | 11:11 |
|
ikke
| vorona: you need to create a new repo | 11:11 |
|
| it does not affect existing repositories | 11:12 |
| ← dqx left | 11:12 |
| ← dqx_ left | 11:12 |
| → benfelin joined | 11:12 |
| → dqx joined | 11:13 |
| → tiin57 joined | 11:14 |
| ← yawkat left | 11:17 |
| ← venmx left | 11:17 |
| ← hamidnz89 left | 11:18 |
| → yawkat joined | 11:20 |
| → hamidnz89 joined | 11:21 |
| ← unixbsd left | 11:24 |
| → bolovanos__ joined | 11:32 |
| ← cbreak left | 11:33 |
| ← Lord_of_Life left | 11:33 |
| → IsntFunny joined | 11:33 |
| → AngryOwl joined | 11:33 |
| → buffet joined | 11:33 |
| → antoine joined | 11:33 |
| → SoF joined | 11:33 |
| → Lord_of_Life joined | 11:34 |
| ← lagothrix left | 11:34 |
| ← styler2go left | 11:34 |
| ← Dweezahr_ left | 11:34 |
| → Dweezahr_ joined | 11:35 |
| ← bolovanos_ left | 11:35 |
| → lagothrix joined | 11:36 |
|
jaziz
| ikke, wow lol exact same problem as me | 11:36 |
|
ikke
| jaziz: yes | 11:36 |
|
jaziz
| they benefitted from my struggle | 11:36 |
| ← al3x271 left | 11:36 |
|
ikke
| Lots of my knowledge of git comes from helping people and relaying what I've learned to others :) | 11:37 |
|
jaziz
| pretty cool | 11:37 |
|
ikke
| Seriously, hanging around here and trying to help others sky rockets your knewledge / experience | 11:37 |
|
jaziz
| I'll keep that in mind | 11:38 |
|
| it definitely is one of the better support channels | 11:38 |
| → al3x271 joined | 11:39 |
|
ikke
| Thanks | 11:40 |
|
| We do our best to be helpful | 11:40 |
| ← tiin57 left | 11:40 |
| ← dqx left | 11:40 |
| → dqx joined | 11:42 |
| → royal_screwup21 joined | 11:42 |
| → tiin57 joined | 11:43 |
| ← hamidnz89 left | 11:44 |
| ← dqx left | 11:44 |
|
vorona
| Yes, thanks that's helped | 11:46 |
| → hamidnz89 joined | 11:48 |
| → nkuttler joined | 11:48 |
| → BrunoSpr joined | 11:48 |
| → jnavila joined | 11:55 |
| ← hamidnz89 left | 11:55 |
| ← royal_screwup21 left | 11:58 |
| → royal_screwup21 joined | 11:58 |
| → drbean joined | 11:59 |
| → rosco_y joined | 12:01 |
| → rosco joined | 12:01 |
| ← royal_screwup21 left | 12:03 |
| → hamidnz89 joined | 12:06 |
| ← al3x271 left | 12:10 |
| ← BrunoSpr left | 12:10 |
| → al3x271 joined | 12:10 |
| ← tiin57 left | 12:10 |
| → Betal joined | 12:12 |
| ← hamidnz89 left | 12:13 |
| → tiin57 joined | 12:14 |
| ← mindCrime left | 12:14 |
| → herren- joined | 12:26 |
| ← herren left | 12:26 |
|
adlternative
| hey guys ,how can I get A file from anther commit or branch? | 12:27 |
|
| the file don't exist in HEAD now. | 12:28 |
|
ikke
| git checkout <commit> -- <path/to/file> | 12:28 |
| ← herren- left | 12:29 |
| → herren joined | 12:29 |
| ← tanuki_ left | 12:30 |
|
adlternative
| ikke:cool ,It can make work. | 12:30 |
| → hamidnz89 joined | 12:35 |
| ← xelxebar left | 12:36 |
| → xelxebar joined | 12:37 |
| → royal_screwup21 joined | 12:38 |
| → cbreak joined | 12:38 |
| → bariscant joined | 12:39 |
| ← tiin57 left | 12:40 |
| ← herren left | 12:40 |
| ← royal_screwup21 left | 12:43 |
| → herren joined | 12:43 |
| → tiin57 joined | 12:44 |
| ← pikapika left | 12:47 |
| → pikapika joined | 12:47 |
| → Blukunfando joined | 12:47 |
| ← pikapika left | 12:48 |
| → pikapika joined | 12:48 |
| ← nikivi left | 12:49 |
| → nikivi joined | 12:49 |
| ← pikapika left | 12:51 |
| → pikapika joined | 12:51 |
| ← pikapika left | 12:51 |
| → pikapika joined | 12:52 |
| ← POQDavid left | 12:53 |
| → POQDavid joined | 12:53 |
| ← lanartri left | 12:53 |
| ← acetakwas left | 12:53 |
| → acetakwas joined | 12:54 |
| ← POQDavid left | 12:54 |
| → POQDavid joined | 12:54 |
| ← nikivi left | 12:55 |
| → nikivi joined | 12:55 |
| → BrunoSpr joined | 12:57 |
| ← pikapika left | 12:57 |
| → pikapika joined | 12:57 |
| ← uebera|| left | 13:06 |
| ← acetakwas left | 13:07 |
| ← pikapika left | 13:07 |
| ← nikivi left | 13:07 |
| → acetakwas joined | 13:07 |
| → pikapika joined | 13:07 |
| → nikivi joined | 13:08 |
| ← tiin57 left | 13:10 |
| ← mozgalom left | 13:11 |
| ← hamidnz89 left | 13:14 |
| → venmx joined | 13:14 |
| → tiin57 joined | 13:14 |
| → hamidnz89 joined | 13:14 |
| → royal_screwup21 joined | 13:14 |
| → Guest20 joined | 13:15 |
| → m0viefreak joined | 13:16 |
| ← hamidnz89 left | 13:18 |
| ← venmx left | 13:19 |
| ← royal_screwup21 left | 13:20 |
| → PJBoy joined | 13:20 |
| → cd joined | 13:25 |
| → jaziz1 joined | 13:26 |
| → shadear joined | 13:26 |
| → dextercd joined | 13:27 |
| ← feriman left | 13:29 |
| ← jaziz left | 13:30 |
| → feriman joined | 13:33 |
| → uebera|| joined | 13:34 |
| ← uebera|| left | 13:34 |
| → uebera|| joined | 13:34 |
| → mat001 joined | 13:35 |
| → royal_screwup21 joined | 13:39 |
| ← mat001 left | 13:39 |
| ← tiin57 left | 13:40 |
| → tiin57 joined | 13:44 |
|
rawtaz
| looo | 13:46 |
| → shush joined | 13:46 |
| → nomadicmathmo joined | 13:46 |
| ← herren left | 13:49 |
| ← sweatsuit left | 13:49 |
| → Raging_Hog joined | 13:50 |
| → herren joined | 13:50 |
| ← shush left | 13:51 |
| → zebrag joined | 13:51 |
| ← drbean left | 13:52 |
| → tchan joined | 13:53 |
| ← shadear left | 13:59 |
| → sweatsuit joined | 13:59 |
| → goldstar joined | 14:00 |
| ← goldstar left | 14:00 |
| → goldstar joined | 14:00 |
| → bolovanos_ joined | 14:02 |
| ← bariscant left | 14:02 |
| ← bolovanos__ left | 14:05 |
| ← DiffieHellman left | 14:06 |
| → geosmile joined | 14:07 |
| → kerframil joined | 14:08 |
| → mat001 joined | 14:08 |
| → DiffieHellman joined | 14:10 |
| ← tiin57 left | 14:10 |
| ← rcoote left | 14:11 |
| → tiin57 joined | 14:14 |
| ← mat001 left | 14:18 |
| → venmx joined | 14:18 |
| → Jackneill joined | 14:19 |
| → jl4 joined | 14:22 |
| ← venmx left | 14:23 |
| ← nvmd left | 14:25 |
| ← jl4 left | 14:26 |
| → viruscthulhu joined | 14:28 |
| ← BrunoSpr left | 14:30 |
| → BrunoSpr joined | 14:31 |
| ← BrunoSpr left | 14:33 |
| ← viruscthulhu left | 14:33 |
| ← nomadicmathmo left | 14:33 |
| → nomadicmathmo joined | 14:34 |
| → bariscant joined | 14:34 |
| → AnAverageHuman joined | 14:36 |
| ← tiin57 left | 14:40 |
| → tiin57 joined | 14:44 |
| ← herren left | 14:44 |
| ← nomadicmathmo left | 14:48 |
| ← royal_screwup21 left | 14:50 |
| → royal_screwup21 joined | 14:50 |
| → crose joined | 14:53 |
| ← royal_screwup21 left | 14:55 |
| ← thaller left | 14:56 |
| ← jnavila left | 14:58 |
| → jnavila joined | 14:58 |
| → Vohlenzer joined | 15:03 |
| ← adlternative left | 15:03 |
| → herren joined | 15:03 |
| ← herren left | 15:04 |
| ← Mattiaslndstrm left | 15:04 |
| → nomadicmathmo joined | 15:05 |
| → herren joined | 15:06 |
| → sgn1 joined | 15:07 |
| → Mattiaslndstrm joined | 15:10 |
| ← tiin57 left | 15:10 |
| ← sgn left | 15:10 |
| ← Masklin left | 15:11 |
| → wrobinson joined | 15:11 |
| ← cbreak left | 15:11 |
| PJBoy → Guest48255 | 15:12 |
| ← goldstar left | 15:12 |
| → cbreak joined | 15:12 |
| → goldstar joined | 15:12 |
| → PJBoy joined | 15:12 |
| → tiin57 joined | 15:13 |
| ← Guest48255 left | 15:13 |
| ← wrobinso1 left | 15:14 |
| → wunderbar joined | 15:18 |
| ← feriman left | 15:21 |
| → rcoote joined | 15:21 |
| → sudoforge joined | 15:26 |
| ← bket left | 15:26 |
| → feriman joined | 15:26 |
| → bket joined | 15:27 |
| → cristian_c joined | 15:28 |
|
vorona
| I have a problem again: "git commit" doesn't work without a comment. I mean when I type "git commit" it runs Atom editor(I already have a message in terminal:"Aborting due to empty commit message"), it asks me to type a message in COMMIT_EDITMSG (probably this is some file), but when I type it I and quit Atom(according to manual book that's what I need to do), I push a save button, Atom shouts down, | 15:28 |
|
cristian_c
| parsnip: I think 9t's imlicit too | 15:28 |
|
vorona
| but nothing happens.I have "core.editor=atom -w" in my config file. How to commit with Atom editor? | 15:28 |
|
cristian_c
| *it's implicit too | 15:28 |
|
jimklimov
| rawtaz: dextercd: FWIW, I sometimes have changes saved, into same line or nearby lines, that in hindsight I want put into different commits to represent the code/idea evolution. I then split the `git add -p` as appropriate, and (e)dit the diff-chunk in patch format to leave just the changes I want for a commit. Then commit, and another `git add -p` to add the next changes, until the final status is committed. | 15:29 |
|
parsnip
| yay! | 15:29 |
|
| welcome cristian_c | 15:29 |
|
| cristian_c: i know you considered it off-topic, but a git command is running lots of RAM and taking long? | 15:29 |
| → jl4 joined | 15:29 |
|
parsnip
| !log | 15:30 |
|
gitinfo
| [!irclog] Public logs of #git are kept at: https://gitirc.eu/log | 15:30 |
|
parsnip
| hmm | 15:30 |
|
| i forgot how to use #git | 15:30 |
|
cristian_c
| parsnip: now Memory 3.0 GB / 3.4 GB on my system monitor / task mnajer on manjaro | 15:30 |
|
| git merge takes almost 1.0 GB alone | 15:31 |
|
parsnip
| cristian_c: it's really cli git, or in some special git tool? | 15:31 |
|
cristian_c
| (then, firefox 3-4 inaftive firefox processes) | 15:31 |
|
| no, I've typed git merge master in a terminal | 15:32 |
| ← nomadicmathmo left | 15:32 |
|
cristian_c
| it's unusual for me | 15:32 |
| → madewokherd joined | 15:32 |
|
cristian_c
| cpu usage is very low (1%) though | 15:32 |
| ← bolovanos_ left | 15:32 |
|
cristian_c
| (of cpurse, system is almost freesed) | 15:33 |
|
| *freezed | 15:33 |
| → nomadicmathmo joined | 15:33 |
|
parsnip
| !lol | 15:35 |
|
gitinfo
| A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all | 15:35 |
|
parsnip
| cristian_c: ^ | 15:35 |
|
| or add something like `-n 20` or whatever is needed to show the problem | 15:35 |
|
| are you allowed to pastebin and share that output? | 15:35 |
| ← jaziz1 left | 15:36 |
|
cristian_c
| parsnip: I'm at home | 15:36 |
|
| parsnip: anyway, should I kill git merge process? | 15:36 |
|
parsnip
| i'm not sure | 15:36 |
|
cristian_c
| or opening another termin and type git log...... | 15:36 |
| ← Guest20 left | 15:38 |
| → nomadicmathmo1 joined | 15:38 |
| ← fling left | 15:39 |
|
cristian_c
| the system is not very usable whwn ram memory is full | 15:39 |
| ← nomadicmathmo left | 15:40 |
| nomadicmathmo1 → nomadicmathmo | 15:40 |
|
ikke
| how big is the repo?> | 15:40 |
| ← tiin57 left | 15:40 |
| → Guest20 joined | 15:40 |
|
cristian_c
| ikke: linux rwpository | 15:40 |
|
| ao kernel size | 15:40 |
|
ikke
| ok, quite sizable then | 15:40 |
|
cristian_c
| unfortuntely pointer is stuck, maybe need to reboot | 15:42 |
| → fling joined | 15:42 |
| → tiin57 joined | 15:43 |
| → nomadicmathmo1 joined | 15:46 |
| ← nomadicmathmo left | 15:46 |
| nomadicmathmo1 → nomadicmathmo | 15:46 |
|
vorona
| I have a problem again: "git commit" doesn't work without a comment. I mean when I type "git commit" it runs Atom editor(I already have a message in terminal:"Aborting due to empty commit message"), it asks me to type a message in COMMIT_EDITMSG (probably this is some file), but when I type it and quit Atom(according to a manual that's what I need to do), I push a save button, Atom shouts down, but | 15:48 |
|
| nothing happens.I have "core.editor=atom -w" in my config file. How to commit with Atom editor?Sorry, I can't find a channel for atom editor | 15:48 |
|
ikke
| Do you see that it's trying to edit 'COMMIT_EDITMSG' in atom? | 15:50 |
|
vorona
| What do you mean? I am typing something in COMMIT_EDITMSG, and push save button. I am kind of edit it when typing... | 15:51 |
|
ikke
| sure, wanted to confirm | 15:52 |
|
| and after you saved the message (but before closing atom), can you check the contents of .git/COMMIT_EDITMSG?\ | 15:52 |
|
vorona
| let me try | 15:53 |
| → royal_screwup21 joined | 15:53 |
| → thiago joined | 15:53 |
| ← wunderbar left | 15:54 |
| ← crose left | 15:54 |
|
vorona
| Yes. my commenting is saved in COMMIT_EDITMSG | 15:54 |
|
ikke
| and then after you close atom, git still complains the message is empty? | 15:56 |
| → hamidnz89 joined | 15:57 |
|
vorona
| It complains before it opens Atom. After I close Atom nothing nappens | 15:57 |
|
ikke
| is atom -w the same as atom --wait? | 15:58 |
|
vorona
| must be the same | 15:58 |
|
| if I remember it right | 15:58 |
|
| According to someone on stackoverflow the same | 15:59 |
|
| And it had to me solution, but doesn't work for me | 15:59 |
|
| *had to be a solution | 16:00 |
| → pgimeno joined | 16:00 |
| → mat001 joined | 16:00 |
|
ikke
| if git already complains before you close atom, it seems like the 'atom -w' command did not wait before the editor was closed | 16:01 |
|
vorona
| It complains before it OPENS Atom | 16:01 |
|
pgimeno
| is there an equivalent to git -C <path> for gitk? | 16:01 |
|
ikke
| (cd <path && gitk) :P | 16:02 |
|
dextercd
| vorona: What is the output of `git config --global core.editor` and `git config --local core.editor` when you're inside of the repository? | 16:02 |
|
pgimeno
| ikke: thanks, I guess not :) | 16:03 |
|
vorona
| dextercd: 'git config --global core.editor' gives:"atom -w", second command gives empty response | 16:05 |
|
ikke
| ok, that's good so far | 16:05 |
| → Wetmelon joined | 16:05 |
| ← bdeshi left | 16:05 |
|
ikke
| vorona: what if run atom -w <filename> in the commandline | 16:05 |
|
| what if you run* | 16:05 |
|
vorona
| Should I use any file for <filename>? | 16:06 |
| → bdeshi joined | 16:06 |
|
ikke
| yes, just want to verify if it waits on the command line | 16:06 |
|
vorona
| In terminal I have no messages. It just opens a file. That's it | 16:07 |
|
ikke
| Do you get a prompt back to execute the next command? | 16:08 |
|
vorona
| yes | 16:08 |
|
ikke
| ok, so that means the command is not waiting | 16:08 |
|
| can you try the same thing with --wait? | 16:08 |
|
vorona
| ok. will try | 16:08 |
|
| You know, with --wait it doesn't work at all. just nothing. Even doesn't load Atom editor. | 16:10 |
| ← tiin57 left | 16:10 |
|
ikke
| hmm, strange | 16:11 |
|
| does atom --help provide something? | 16:11 |
| → Masklin joined | 16:11 |
|
vorona
| No, empty response | 16:11 |
|
ikke
| hmm | 16:13 |
|
vorona
| I had it in the previous version 2.25.1 too | 16:13 |
|
| before you helped me to upgrade it | 16:14 |
| → tiin57 joined | 16:14 |
|
ikke
| Well, if if the 'atom -w' command does not wait, I don't think it's a git issue | 16:14 |
|
| git basically needs the command to wait until you saved the commit message | 16:14 |
|
| once the command git execute exits, it checks the COMMIT_EDITMSG file and uses that as commit message | 16:15 |
|
dextercd
| I installed atom locally (v1.54) and it seems to work fine with -w/--wait. It could be that a plugin is interfering or you might have to update Atom. just a guess | 16:15 |
| → ExeciN joined | 16:15 |
|
vorona
| wait I just missed a dash | 16:17 |
|
| with 2 dashed (--) atom --wait works the same as atom -w | 16:17 |
|
jimklimov
| I wonder if the package with atom, or a user himself, edited the profile or installed a wrapper - anyway so the "atom" command is an alias or script that enforces certain command-line args | 16:17 |
|
ikke
| so the command exits immediately, and the editor pops up | 16:18 |
|
| ? | 16:18 |
|
| jimklimov: I was wondering hte same | 16:18 |
|
jimklimov
| my systems don't have an atom, and I've never heard of it :) so can't check | 16:18 |
| → CleverChris joined | 16:18 |
|
ikke
| Atom came after sublime text | 16:19 |
| → venmx joined | 16:19 |
|
vorona
| ikke: yes, it doesn't wait | 16:19 |
|
jimklimov
| FWIW, maybe can try another editor? gedit, mcedit, vi, something? | 16:19 |
|
ikke
| assyming vorona runs linux | 16:19 |
|
| vorona: what OS do you use? | 16:19 |
|
vorona
| Yes, ubuntu | 16:19 |
|
ikke
| ok | 16:20 |
|
jimklimov
| vi is everywhere for the past 30 or 40 years ;p | 16:20 |
|
ikke
| can you try: `which atom` | 16:20 |
|
jimklimov
| `mc -e` at least for 20+ | 16:20 |
|
vorona
| Which atom gives me: "/snap/bin/atom" | 16:20 |
|
ikke
| fun, snap | 16:21 |
|
| I would say, ask Ubuntu :P | 16:22 |
|
| atom -w / atom --wait should wait for the editor to close | 16:22 |
| ← pgimeno left | 16:23 |
| → mirrorbird joined | 16:23 |
|
vorona
| This apom editor doesn't have some PPA(whatever it is) to download the latest version? | 16:23 |
|
| *atom | 16:23 |
| ← venmx left | 16:24 |
| ← [twisti] left | 16:24 |
|
vorona
| Yeah, obviously something wrong with Ubuntu or atom | 16:25 |
|
thiago
| or snap | 16:26 |
|
vorona
| What is it? | 16:26 |
|
ikke
| ubuntu's crappy way of providing software | 16:26 |
| ← sunri5e left | 16:26 |
|
vorona
| Oh... yeah I forgot I installed it from there | 16:26 |
|
thiago
| snap is a container mechanism, which is probably why you're not getting it to wait | 16:27 |
|
| you're not running the actual binary, but a wrapper | 16:27 |
| ← dextercd left | 16:28 |
|
vorona
| thiago: You are speaking a foreigner language for me now | 16:28 |
| → dextercd joined | 16:29 |
|
vorona
| Can I install atom with apt command? | 16:29 |
| ← al3x271 left | 16:30 |
|
ikke
| https://linuxize.com/post/how-to-install-atom-text-editor-on-ubuntu-20-04/#installing-atom-with-apt | 16:30 |
|
thiago
| I have no clue. I don't use Ubuntu or Atom. | 16:31 |
| → al3x271 joined | 16:31 |
|
bremner
| #ubuntu is that way -> | 16:37 |
| ← amahl left | 16:38 |
| ← rcoote left | 16:38 |
| → mky[m] joined | 16:39 |
| → warthog9 joined | 16:39 |
| → zsoc joined | 16:40 |
| ← tiin57 left | 16:40 |
| ← bariscant left | 16:42 |
| ← Lord_of_Life left | 16:43 |
| → tiin57 joined | 16:43 |
| ← zsoc left | 16:44 |
| → Lord_of_Life joined | 16:44 |
|
vorona
| I reinstalled atom from apt, it doesn't help | 16:45 |
|
ikke
| vorona: what does `which atom` return? | 16:46 |
|
vorona
| /usr/bin/atom | 16:46 |
|
ikke
| ok, that's at least better | 16:46 |
| ← jl4 left | 16:47 |
|
vorona
| Oh... stop | 16:47 |
|
| it helped | 16:47 |
|
| just atom -w <filename> doesn't wait, but git commit waits now | 16:47 |
|
ikke
| Oh, good | 16:48 |
|
vorona
| yeah, thank you | 16:48 |
|
| git commit works fine now | 16:49 |
| → Lord_of_Life_ joined | 16:49 |
|
vorona
| That was becouse of this snap version | 16:49 |
| ← Lord_of_Life left | 16:51 |
| Lord_of_Life_ → Lord_of_Life | 16:51 |
| → Gustavo6046_ joined | 16:52 |
| ← Gustavo6046 left | 16:52 |
| → jl4 joined | 16:53 |
| Gustavo6046_ → Gustavo6046 | 16:54 |
| → FRWB joined | 16:54 |
| → crose joined | 16:58 |
| → sunri5e joined | 17:00 |
| → Goplat joined | 17:02 |
| → goodburner joined | 17:03 |
| ← mat001 left | 17:03 |
| ← goodburner left | 17:07 |
| ← mirrorbird left | 17:08 |
| ← sunri5e left | 17:08 |
| → goodburner joined | 17:10 |
| ← tiin57 left | 17:10 |
| → Jendall joined | 17:10 |
| → tiin57 joined | 17:13 |
| → sunri5e joined | 17:13 |
| → amahl joined | 17:14 |
| ← amahl left | 17:15 |
| → amahl joined | 17:16 |
| ← jl4 left | 17:18 |
| ← Jendall left | 17:20 |
| ← goodburner left | 17:21 |
| ← hexnewbie left | 17:21 |
| → gioyik joined | 17:23 |
| → eqw joined | 17:23 |
| → hexnewbie joined | 17:26 |
| → mirrorbird joined | 17:26 |
| ← royal_screwup21 left | 17:29 |
| → royal_screwup21 joined | 17:29 |
| ← Dweezahr_ left | 17:32 |
| → Narrat joined | 17:34 |
| → shush joined | 17:34 |
| → jl4 joined | 17:34 |
| ← al3x271 left | 17:39 |
| ← gioyik left | 17:39 |
| ← tiin57 left | 17:40 |
| → stats4647 joined | 17:40 |
| → al3x271 joined | 17:40 |
| ← mirrorbird left | 17:40 |
| → goodburner joined | 17:42 |
| ← herren left | 17:42 |
| → tiin57 joined | 17:43 |
| → herren joined | 17:43 |
| ← stats4647 left | 17:45 |
| → jtmusky joined | 17:47 |
| ← royal_screwup21 left | 17:53 |
| → royal_screwup21 joined | 17:53 |
| → nomadicmathmo1 joined | 17:53 |
| ← jl4 left | 17:54 |
| ← BSaboia left | 17:57 |
| ← nomadicmathmo left | 17:58 |
| nomadicmathmo1 → nomadicmathmo | 17:58 |
| → jl4 joined | 17:58 |
| → fax joined | 17:59 |
| → BSaboia joined | 17:59 |
| → rmbeer joined | 17:59 |
|
rmbeer
| hello | 17:59 |
|
| how to show a diff of a unstaged file? | 17:59 |
|
ikke
| git diff <file> | 17:59 |
|
| or do you mean untracked? | 18:00 |
|
rmbeer
| ikke# don't show nothing... | 18:00 |
|
| i want see a diff of a modified file from a file in the last commit | 18:00 |
| → thaller joined | 18:00 |
| ← BSaboia left | 18:00 |
|
ikke
| rmbeer: what does git status tell about this file>? | 18:00 |
|
rmbeer
| Untracked files: | 18:01 |
|
| (use "git add <file>..." to include in what will be committed) | 18:01 |
|
| Banner.cpp | 18:01 |
|
ikke
| so it's untracked | 18:01 |
|
| not unstaged | 18:01 |
|
rmbeer
| ok, sorry... | 18:01 |
|
ikke
| git add Banner.cpp; git diff --cached Banner.cpp | 18:02 |
| ← vdamewood left | 18:02 |
|
rmbeer
| i dont want add... | 18:02 |
| ← Wetmelon left | 18:03 |
|
ikke
| cat Banner.cpp | 18:04 |
|
| git diff --no-index /dev/null Banner.cpp | 18:04 |
| ← royal_screwup21 left | 18:04 |
| → royal_screwup21 joined | 18:04 |
| ← mky[m] left | 18:05 |
|
rmbeer
| if i use 'git diff' show all differences in the modified files, but with 'git diff Banner.cpp' don't show nothing??? | 18:05 |
|
ikke
| because it's not tracked | 18:05 |
| → BSaboia joined | 18:05 |
| ← Gustavo6046 left | 18:05 |
|
rmbeer
| oh... sure... Dx | 18:06 |
|
| I was psyched that I was already in commit. | 18:06 |
| Peetz0r → Peetz1r | 18:07 |
| → Gustavo6046 joined | 18:07 |
| ← rsx left | 18:08 |
| ← Muimi left | 18:09 |
| ← tiin57 left | 18:10 |
| → bariscant joined | 18:11 |
| → mat001 joined | 18:12 |
|
eqw
| How to change HEAD in the remote bare repo? | 18:12 |
|
ikke
| remotely | 18:12 |
| Peetz1r → Peetz0r | 18:13 |
| Peetz0r → Peetz1r | 18:13 |
| → tiin57 joined | 18:13 |
|
eqw
| is there any reason why there's no tool for such task? | 18:13 |
|
ikke
| The protocol does support it | 18:14 |
|
| and | 18:14 |
|
| mostly that | 18:14 |
| → stats4647 joined | 18:15 |
| ← andy25225 left | 18:15 |
|
j416
| s/does/doesn | 18:16 |
|
| harder than I thought | 18:16 |
|
| s/does/doesn't/ | 18:16 |
| ← sszark left | 18:16 |
| ← mat001 left | 18:16 |
|
ikke
| heh | 18:17 |
|
| yes, that's what I meant to say | 18:17 |
| ← Gustavo6046 left | 18:19 |
| → venmx joined | 18:20 |
| ← BSaboia left | 18:20 |
| ← nomadicmathmo left | 18:21 |
| → gioyik joined | 18:22 |
| ← venmx left | 18:25 |
| → arcatech joined | 18:27 |
| → andy25225 joined | 18:28 |
| → BSaboia joined | 18:29 |
| ← Guest20 left | 18:32 |
| ← shush left | 18:33 |
| ← bn_work left | 18:33 |
| → Gustavo6046 joined | 18:34 |
| ← arcatech left | 18:34 |
| ← hamidnz89 left | 18:38 |
| → hamidnz89 joined | 18:39 |
| ← tiin57 left | 18:40 |
| → SuperLag joined | 18:40 |
| → mirrorbird joined | 18:42 |
| ← CleverChris left | 18:44 |
| → tiin57 joined | 18:44 |
| → ferdna joined | 18:45 |
| CommunistWolf → tankies | 18:46 |
| ← tankies left | 18:46 |
| → CommunistWolf joined | 18:47 |
| → xf3rno joined | 18:48 |
| → CleverChris joined | 18:48 |
| ← lightstalker left | 18:50 |
| → lightstalker joined | 18:56 |
| → greyltc[m] joined | 19:01 |
|
greyltc[m]
| here's a repo: | 19:05 |
|
| https://gitlab.com/kicad/libraries/kicad-footprints.git | 19:05 |
|
| the latest tag there should be 5.1.9 | 19:05 |
| → jstein joined | 19:05 |
|
greyltc[m]
| but git describe --tags shows 5.1.6, why? | 19:06 |
|
rmbeer
| ikke# thanks by the help | 19:07 |
|
| goodbye | 19:07 |
| ← rmbeer left | 19:07 |
|
ikke
| greyltc[m]: those tags are not reachable from master | 19:09 |
|
| 5.1.7, 5.1.8, 5.1.9 | 19:09 |
| ← PJBoy left | 19:10 |
| → brunosaboia_ joined | 19:10 |
| ← tiin57 left | 19:10 |
| → PJBoy joined | 19:10 |
| → Mattiasl_ joined | 19:10 |
| ← m0viefreak left | 19:10 |
| → hnOsmium0001 joined | 19:10 |
| → m0viefreak joined | 19:10 |
| → cbreak_ joined | 19:11 |
|
greyltc[m]
| hmm | 19:11 |
|
ikke
| ttps://ibb.co/fFfV45h | 19:11 |
|
| https://ibb.co/fFfV45h | 19:11 |
|
greyltc[m]
| though they are listed with `git tag --list` | 19:11 |
|
ikke
| yes | 19:11 |
|
| but look at the history | 19:11 |
| → mgsk__ joined | 19:11 |
| → Natrick06 joined | 19:12 |
| → warthog19 joined | 19:12 |
| → tonyj_ joined | 19:12 |
| ← Mattiaslndstrm left | 19:12 |
| ← mgsk left | 19:12 |
| ← Cthalupa left | 19:12 |
| ← qassim left | 19:12 |
| ← prg3 left | 19:12 |
| ← tonyj left | 19:12 |
| ← vishal left | 19:12 |
| ← Dev0n left | 19:12 |
| mgsk__ → mgsk | 19:12 |
|
ikke
| that underlined commit "merge branch master into CalebReister" is not part of your master branch | 19:12 |
| ← ferdna left | 19:12 |
| ← BSaboia left | 19:12 |
| ← warthog9 left | 19:12 |
| ← cd left | 19:12 |
| ← ghoti left | 19:12 |
| ← leah2 left | 19:12 |
| ← dr_lepper left | 19:12 |
| warthog19 → warthog9 | 19:12 |
| → qassim joined | 19:12 |
| → OMGOMG joined | 19:12 |
| → traumschule joined | 19:12 |
| → waterkip joined | 19:12 |
| ← waterkip left | 19:12 |
| → waterkip joined | 19:12 |
| ← Lord_of_Life left | 19:13 |
| → Cthalupa joined | 19:13 |
| → dr_lepper joined | 19:13 |
|
greyltc[m]
| it's on v5? | 19:13 |
| ← cbreak left | 19:13 |
| → leah2 joined | 19:13 |
| → prg3 joined | 19:13 |
| ← hamidnz89 left | 19:13 |
| ← heroux left | 19:13 |
| ← sam_ left | 19:13 |
| → Lord_of_Life joined | 19:13 |
| → vishal joined | 19:13 |
| → ZachGibbens joined | 19:13 |
| → sebito91 joined | 19:13 |
| → Benett joined | 19:13 |
| → ghoti joined | 19:13 |
|
ikke
| yes | 19:13 |
| → Dev0n joined | 19:14 |
| → tiin57 joined | 19:14 |
| → sam_ joined | 19:14 |
| → VectorX joined | 19:14 |
| → nasamuffin_ joined | 19:14 |
| → ferdna joined | 19:15 |
|
greyltc[m]
| is there a way I can ask git describe to search all branches? | 19:15 |
| ← Raging_Hog left | 19:15 |
| → Kobaz joined | 19:15 |
| → cd joined | 19:15 |
|
greyltc[m]
| like git tag --list apparently does | 19:15 |
| → Raging_Hog joined | 19:15 |
|
ikke
| git tag --list just lists all branches | 19:15 |
| ← steven left | 19:16 |
|
ikke
| git describe describes the the commit you pass (by default HEAD) | 19:16 |
| → kupi joined | 19:16 |
| → steven joined | 19:17 |
| → tazle_ joined | 19:17 |
| → riotz joined | 19:18 |
| → heroux joined | 19:18 |
| ← stats4647 left | 19:19 |
| → usr_4124 joined | 19:19 |
| → hamidnz89 joined | 19:19 |
| → blahboybaz joined | 19:20 |
| → Xenguy joined | 19:20 |
| ← xf3rno left | 19:20 |
| → jaeckel joined | 19:20 |
| → xf3rno joined | 19:21 |
| ← usr_4124 left | 19:22 |
| ← xf3rno left | 19:23 |
| → otisolsen70_ joined | 19:23 |
| ← OnkelBlade left | 19:24 |
| → gonzo joined | 19:25 |
| ← otisolsen70_ left | 19:26 |
|
greyltc[m]
| ikke: what;'s the program you were using to inspect the history in the image you linked? | 19:29 |
|
ikke
| tig | 19:30 |
|
greyltc[m]
| thanks! | 19:31 |
|
| and how'd you call it to get that output? | 19:33 |
|
ikke
| tig --all | 19:33 |
| → optipan joined | 19:33 |
|
greyltc[m]
| nice. thank you | 19:33 |
| ← CleverChris left | 19:39 |
|
mehwork
| I'm confused by what 'git submodule init' does. It doesn't sem to "initialize" like how "git init" does. 'git submoddule add' already does that doesn't it? | 19:39 |
| ← tiin57 left | 19:40 |
| ← goldstar left | 19:40 |
|
ikke
| it reads .gitmodules and updates the local config based on that information | 19:40 |
|
| that's mostly used when cloning repositories that contains submodules | 19:41 |
| → tiin57 joined | 19:44 |
| → CleverChris joined | 19:45 |
|
mehwork
| got it, man that's confusing | 19:45 |
|
| the order should be init and then add, likke how creating a git repo works | 19:46 |
|
ikke
| with submodules, you work with existing repositories | 19:47 |
| ← Gustavo6046 left | 19:47 |
|
ikke
| you do not initialize new repositories | 19:47 |
| ← gonzo left | 19:48 |
| ← royal_screwup21 left | 19:49 |
| → royal_screwup21 joined | 19:49 |
| ← kini left | 19:50 |
|
greyltc[m]
| mehwork: I generally like to do the following right after I clone a repo with submodules that I want: `git submodule update --init --recursive` | 19:50 |
| ← ExeciN left | 19:52 |
| ← jl4 left | 19:54 |
| → kini joined | 19:54 |
| ← royal_screwup21 left | 19:54 |
| → arcatech joined | 19:54 |
| → orbyt_ joined | 19:54 |
| → ahf joined | 19:58 |
| ← arcatech left | 20:04 |
| → arcatech joined | 20:04 |
| ← Narrat left | 20:07 |
| ← tiin57 left | 20:10 |
| ← selckin left | 20:12 |
| → tiin57 joined | 20:14 |
|
mehwork
| greyltc[m]: i've been having to do that a lot more now that so many people are using submodules. For example, with vim plugins | 20:14 |
| → royal_screwup21 joined | 20:18 |
| ← leah2 left | 20:18 |
| → Wetmelon joined | 20:19 |
| → venmx joined | 20:20 |
| → leah2 joined | 20:21 |
| → jl4 joined | 20:24 |
| ← venmx left | 20:26 |
| ← naftilos76 left | 20:26 |
| ← j7k6 left | 20:26 |
| ← mirrorbird left | 20:29 |
| → shush joined | 20:30 |
| ← dhollinger left | 20:32 |
| → rcoote joined | 20:32 |
| → dhollinger joined | 20:32 |
| → hidedagger joined | 20:32 |
| → j7k6 joined | 20:32 |
| → Narrat joined | 20:35 |
| ← shush left | 20:35 |
| → tsdh joined | 20:36 |
| ← rcoote left | 20:38 |
| → howdoi joined | 20:39 |
| ← tiin57 left | 20:40 |
| → tiin57 joined | 20:44 |
| → gigasu_shida joined | 20:46 |
| → rwdrich joined | 20:49 |
| ← rwdrich left | 20:49 |
| → wunderbar joined | 20:49 |
| → bambanx joined | 20:49 |
| gigasu_shida → gigas_cedar | 20:52 |
| ← riksteri left | 20:53 |
| → thebiffman_ joined | 20:55 |
| ← amahl left | 20:56 |
| ← R2robot left | 20:57 |
| ← thebiffman_ left | 20:58 |
| → v0lksman joined | 20:58 |
| ← v0lksman left | 20:58 |
| → v0lksman joined | 20:58 |
| ← hamidnz89 left | 21:03 |
| ← bookworm left | 21:03 |
| → vicfred joined | 21:04 |
| → goldstar joined | 21:04 |
| ← goldstar left | 21:04 |
| → goldstar joined | 21:04 |
| → NightStrike joined | 21:08 |
|
NightStrike
| How do I verify that all the commits in a branch have been merged by someone else to another branch? | 21:09 |
| ← tiin57 left | 21:10 |
| ← gioyik left | 21:11 |
| → bookworm joined | 21:11 |
| → acercle joined | 21:13 |
| → tiin57 joined | 21:14 |
| → amalek joined | 21:17 |
| ← arcatech left | 21:19 |
| → apus joined | 21:19 |
| → gioyik joined | 21:20 |
| ← jl4 left | 21:20 |
|
eqw
| Is it possible to get list of branches without current branch marked by * or I have to strip it myself if I want to use the list in my script? | 21:20 |
|
ikke
| git for-each-ref refs/heads | 21:21 |
| → arcatech joined | 21:23 |
| → amahl joined | 21:26 |
| → mirrorbird joined | 21:26 |
| ← apus left | 21:26 |
|
mehwork
| if i 'git submodule add' something, it gets automatically staged. If i change my mind about it, what should i do? | 21:27 |
|
| do i have to git restore --staged it or --deinit it? | 21:27 |
| ← Wetmelon left | 21:28 |
|
rawtaz
| mehwork: doesnt git status tell you? | 21:29 |
| → thebiffman_ joined | 21:30 |
| → geosmileus joined | 21:31 |
| ← geosmile left | 21:32 |
| ← featurive left | 21:32 |
| → apus joined | 21:32 |
| → featurive joined | 21:33 |
| ← Vohlenzer left | 21:34 |
| → mowcat joined | 21:40 |
| → jl4 joined | 21:41 |
| ← tiin57 left | 21:41 |
|
mehwork
| rawtaz: yeah but wondering if there's a short cut or better way. Is git status's advice _always_ the gospel? I'm fine if it is | 21:42 |
| ← retrospe1tacus left | 21:43 |
|
mehwork
| i've never even heard of 'git restore' until lately | 21:43 |
|
rawtaz
| i dont know when it would be wrong :) | 21:43 |
|
mehwork
| used to be reset or something | 21:44 |
| → tiin57 joined | 21:44 |
|
rawtaz
| what youll find interesting in the long run is that the commands to unstage stuff are different now and then | 21:44 |
|
| yeah, that | 21:44 |
|
| just do what it says and be happy :) | 21:44 |
|
mehwork
| ok thanks | 21:44 |
|
| should i ever do 'git reset --hard' anymore if i wanted to undo changes? | 21:45 |
|
| i have some git aliases i'm wondering if i should change to do git restore stuff | 21:46 |
| ← wcpan left | 21:47 |
|
rawtaz
| mehwork: that command is used to reset a branch to some commit etc | 21:47 |
|
| if you need it, you use it | 21:47 |
|
mehwork
| ok | 21:47 |
| → wcpan joined | 21:47 |
|
mehwork
| wasn't sure if restore was taking over reset | 21:47 |
|
rawtaz
| no, dont think that restore is the new reset. they are different things. just follow git status when applicable. when it isnt, research docs to get the right command | 21:47 |
|
| nah, thats not it afaik | 21:47 |
|
| i could be wrong of course, but i know you shouldnt think that just because of what git status says | 21:47 |
| ← optipan left | 21:50 |
| → Newami joined | 21:50 |
| ← thebiffman_ left | 21:52 |
| ← Newami left | 21:53 |
| → thebiffman_ joined | 21:53 |
| ← feriman left | 21:53 |
| ← al3x271 left | 21:54 |
| ← thebiffman_ left | 21:57 |
| → thebiffman_ joined | 21:58 |
| ← jnavila left | 21:59 |
| → retrospectacus joined | 22:00 |
| ← royal_screwup21 left | 22:01 |
| → royal_screwup21 joined | 22:01 |
| ← shailangsa left | 22:04 |
| ← royal_screwup21 left | 22:06 |
| ← thebiffman_ left | 22:07 |
| → Ok3be joined | 22:07 |
| → thebiffman_ joined | 22:07 |
| → Gustavo6046 joined | 22:08 |
| → feriman joined | 22:09 |
| ← tiin57 left | 22:10 |
| ← jl4 left | 22:10 |
| → royal_screwup21 joined | 22:11 |
| → shailangsa joined | 22:12 |
| → tiin57 joined | 22:13 |
| ← Ok3be left | 22:15 |
|
mehwork
| i want to add a git submodule to my .vim/pack/start directory but 'git submodule add' won't let me because i have .vim/pack in my .gitignore. What's the solution? I don't want to commit all my plugins. | 22:16 |
|
osse
| mehwork: git add -f | 22:16 |
|
| or change .gitignore | 22:17 |
|
mehwork
| osse: I don't see how that would solve my problem of wanting to add vim plugins as submodules but not commit them | 22:18 |
|
| i'll try reading through more dotfiles on github. SOmeone had to have figured this out | 22:19 |
| → fatalhalt joined | 22:19 |
| ← feriman left | 22:20 |
| → venmx joined | 22:21 |
|
osse
| mehwork: then I don't know what you want | 22:23 |
|
| you cannot add anything to a repo without commiting | 22:24 |
|
ikke
| and you have to really commit to it | 22:25 |
| ← amahl left | 22:25 |
| → amahl joined | 22:26 |
| ← amahl left | 22:26 |
|
mehwork
| osse: then i don't really get why using submodules to manage vim plugins is supposedly so popular. I'm trying to do it but if it's going to force me to commit the 30 plugins i use to my dotfiles repo then no way. | 22:26 |
| ← venmx left | 22:26 |
|
mehwork
| i was hoping to only commit the .gitmodules file | 22:27 |
|
| actually you might be on to something. If i unignore .vim/pack first and then do a bunch of git submodule add's, it will create the .gitmodules file i want. Then i can reignore .vim/pack and _maybe_ it will just work. (i just wonder if git submodule update will work after that, probably not) | 22:28 |
|
osse
| is it popular? | 22:29 |
| → amahl joined | 22:29 |
|
osse
| many vim plugins are small. maybe they just don't care | 22:29 |
|
mehwork
| i care because i update them a lot and that's a lot more git add . && git commit -m "..."'s i'd have to do | 22:29 |
|
| and because it's just not "clean" to commit all that crap | 22:30 |
|
osse
| I simply don\t add them at all | 22:30 |
| → mat001 joined | 22:30 |
| → venmx joined | 22:30 |
|
mehwork
| well my .vim is in my dotfiles repo but i gitignore the stuff i don't want to add | 22:30 |
| ← p-core left | 22:30 |
|
mehwork
| but i've hit a wall if i can't use submodules with gitignored dirs | 22:30 |
| → p-core joined | 22:31 |
| → endiruna2 joined | 22:31 |
| ← k3yp left | 22:31 |
|
mehwork
| oh wait, stackoverflow might be saving me (a rare occurence): You can throw that away and tell git to ignore submodules once you have added them by adding ignore = all to their configuration in the .gitmodules file. | 22:32 |
|
| time to try it and see | 22:32 |
| ← retrospectacus left | 22:32 |
|
mehwork
| "Word of caution: I am new to submodules. I am not really sure how they behave." ugh. Yeah that's more like it SO. | 22:33 |
| ← endiruna1 left | 22:33 |
|
mehwork
| why do i even try to take advice from it | 22:33 |
| ← geosmileus left | 22:34 |
| → retrospectacus joined | 22:34 |
| → geosmileus joined | 22:34 |
| → k3yp joined | 22:34 |
| ← geosmileus left | 22:34 |
| ← mat001 left | 22:34 |
| → geosmileus joined | 22:35 |
| ← dviola left | 22:37 |
| → dviola joined | 22:38 |
| ← tiin57 left | 22:40 |
| → tiin57 joined | 22:43 |
| ← bariscant left | 22:44 |
| ← downunder_ left | 22:44 |
| → downunder joined | 22:46 |
| → R2robot joined | 22:50 |
| → Wetmelon joined | 22:54 |
| ← dhollinger left | 23:04 |
| → dhollinger joined | 23:04 |
| ← dhollinger left | 23:09 |
| ← vicfred left | 23:10 |
| ← tiin57 left | 23:10 |
| → dhollinger joined | 23:12 |
| → tiin57 joined | 23:13 |
| ← royal_screwup21 left | 23:17 |
| → royal_screwup21 joined | 23:17 |
| → dudek joined | 23:18 |
| ← royal_screwup21 left | 23:22 |
| ← cisco87 left | 23:24 |
| → mat001 joined | 23:26 |
| → mat001_ joined | 23:28 |
| ← mat001 left | 23:31 |
| → royal_screwup21 joined | 23:33 |
| → wpm joined | 23:33 |
| ← mat001_ left | 23:33 |
| ← venmx left | 23:34 |
| ← wpm left | 23:35 |
| ← kini left | 23:36 |
| → kini joined | 23:37 |
| ← tiin57 left | 23:40 |
| ← k3yp left | 23:41 |
| → tiin57 joined | 23:44 |
| ← herren left | 23:49 |
| ← andy25225 left | 23:50 |
| → andy25225 joined | 23:50 |
| → k3yp joined | 23:53 |
| ← goldstar left | 23:54 |
| ← blahboybaz left | 23:55 |
| → cisco87 joined | 23:55 |
| ← fax left | 23:56 |