| 2020-12-17 |
|
osse
| yes, there are some tricks | 00:00 |
|
| but usually the branch you change you have checked out, so | 00:00 |
| ← kupi left | 00:03 |
| ← al3x27 left | 00:04 |
| → stats4647 joined | 00:04 |
|
shush
| Can one create symbolic refs? | 00:05 |
|
| I'm wondering if symbolic refs could be useful to mark some remote refs as deploy remotes | 00:05 |
| ← jabster28 left | 00:06 |
|
osse
| yes, man git-symbolic-ref | 00:06 |
|
gitinfo
| the git-symbolic-ref manpage is available at https://gitirc.eu/git-symbolic-ref.html | 00:06 |
| → Muimi joined | 00:08 |
| ← justanotheruser left | 00:08 |
| ← stats4647 left | 00:09 |
| ← patrickp left | 00:11 |
| → patrickp joined | 00:12 |
| ← nrmt^ left | 00:12 |
| ← Jitta left | 00:13 |
| ← Kurozen left | 00:15 |
| → yonder joined | 00:16 |
| ← tiin57 left | 00:21 |
| ← cads left | 00:24 |
| → geosmile joined | 00:24 |
| ← cads2 left | 00:24 |
| ← fstd left | 00:25 |
| → fstd joined | 00:25 |
| → tiin57 joined | 00:25 |
| ← is_null left | 00:28 |
| ← orbyt_ left | 00:29 |
| → va5c0 joined | 00:30 |
| → bambanx joined | 00:33 |
| ← va5c0 left | 00:33 |
| → va5c0 joined | 00:33 |
| → cr4y1 joined | 00:34 |
| → is_null joined | 00:35 |
| ← eligos left | 00:36 |
| ← va5c0 left | 00:36 |
| → va5c0 joined | 00:38 |
| ← va5c0 left | 00:39 |
| ← foul_owl left | 00:39 |
| → va5c0 joined | 00:41 |
| → Noldorin joined | 00:42 |
| ← cbreak left | 00:47 |
| ← tiin57 left | 00:51 |
| → jedsharp joined | 00:52 |
| ← mowcat left | 00:54 |
| → tiin57 joined | 00:55 |
| ← va5c0 left | 00:58 |
| → royal_screwup21 joined | 01:01 |
| ← _Warl0ck left | 01:03 |
| → ShapeShifter499 joined | 01:03 |
| → _Warl0ck joined | 01:03 |
| → va5c0 joined | 01:03 |
| ← va5c0 left | 01:04 |
| ← royal_screwup21 left | 01:06 |
| ← jedsharp left | 01:07 |
| ← ShapeShifter499 left | 01:07 |
| → ShapeShifter499 joined | 01:08 |
| → va5c0 joined | 01:08 |
| ← va5c0 left | 01:09 |
| ← clime left | 01:09 |
| → foul_owl joined | 01:10 |
| ← fuzzypixelz left | 01:12 |
| → blahboybaz joined | 01:12 |
| → cliluw joined | 01:12 |
| → va5c0 joined | 01:12 |
| ← va5c0 left | 01:14 |
| → va5c0 joined | 01:16 |
| ← dqx left | 01:18 |
| ← va5c0 left | 01:20 |
| → va5c0 joined | 01:21 |
| ← tiin57 left | 01:21 |
| → jedsharp joined | 01:22 |
| ← minsec left | 01:24 |
| ← blahboybaz left | 01:24 |
| ← ShapeShifter499 left | 01:24 |
| ← Noldorin left | 01:24 |
| ← hnOsmium0001 left | 01:24 |
| ← jstein left | 01:24 |
| ← FFY00 left | 01:24 |
| ← nickmass left | 01:24 |
| ← CodeSlingerPaul left | 01:24 |
| ← amerigo left | 01:24 |
| ← saidelike left | 01:24 |
| ← shabius left | 01:24 |
| ← random_yanek left | 01:24 |
| ← chachasmooth left | 01:24 |
| ← DNS left | 01:24 |
| ← onmeac left | 01:24 |
| ← Lewix_ left | 01:24 |
| ← de-vri-es left | 01:24 |
| ← uidzer0 left | 01:24 |
| ← Seveas left | 01:24 |
| ← chusem4n left | 01:24 |
| ← jelmer left | 01:24 |
| ← mp3 left | 01:24 |
| ← trobotham left | 01:24 |
| ← sjohnson left | 01:24 |
| ← crawler left | 01:24 |
| ← batrick left | 01:24 |
| ← Abdullah left | 01:24 |
| ← LouWestin left | 01:24 |
| ← yn left | 01:24 |
| ← infernix left | 01:24 |
| ← Nothing4You left | 01:24 |
| ← LeMike left | 01:24 |
| ← demize left | 01:24 |
| ← lolmac left | 01:24 |
| ← sparr left | 01:24 |
| ← CustosLimen left | 01:24 |
| ← circuitbone left | 01:24 |
| ← graphicsv left | 01:24 |
| ← ghormoon left | 01:24 |
| ← rudi_s left | 01:24 |
| ← dakar left | 01:24 |
| ← dwmw2_gone left | 01:24 |
| ← jkhsjdhjs left | 01:24 |
| ← Zenstecm left | 01:24 |
| ← forrestv left | 01:24 |
| ← altendky left | 01:24 |
| ← Lewix left | 01:24 |
| ← GGMethos left | 01:24 |
| ← madduck left | 01:24 |
| ← bodie_ left | 01:24 |
| ← Nizumzen left | 01:24 |
| ← gitinfo left | 01:24 |
| ← howell left | 01:24 |
| ← tbrowder left | 01:24 |
| ← nioncode left | 01:24 |
| ← i7c left | 01:24 |
| ← ThiefMaster left | 01:24 |
| ← miklcct left | 01:24 |
| ← BinGOs left | 01:24 |
| ← CheckYourSix left | 01:24 |
| ← daurnimator left | 01:24 |
| ← bremner left | 01:24 |
| ← mx08 left | 01:24 |
| ← joder left | 01:24 |
| ← Forkk left | 01:24 |
| ← onla left | 01:24 |
| ← shrysr left | 01:24 |
| ← wmo left | 01:24 |
| ← Hobbyboy left | 01:24 |
| ← raz left | 01:24 |
| ← trevnorris left | 01:24 |
| ← sim642 left | 01:24 |
| ← appll left | 01:24 |
| ← TooLmaN left | 01:24 |
| ← va5c0 left | 01:25 |
| → ghormoon joined | 01:25 |
| → tiin57 joined | 01:25 |
| → sparr joined | 01:27 |
| ← is_null left | 01:27 |
| ← ephemer0l left | 01:27 |
| ← melosense left | 01:28 |
| → va5c0 joined | 01:28 |
| ← va5c0 left | 01:29 |
| → blahboybaz joined | 01:30 |
| → ShapeShifter499 joined | 01:30 |
| → Noldorin joined | 01:30 |
| → hnOsmium0001 joined | 01:30 |
| → jstein joined | 01:30 |
| → FFY00 joined | 01:30 |
| → nickmass joined | 01:30 |
| → CodeSlingerPaul joined | 01:30 |
| → amerigo joined | 01:30 |
| → saidelike joined | 01:30 |
| → shabius joined | 01:30 |
| → chachasmooth joined | 01:30 |
| → DNS joined | 01:30 |
| → onmeac joined | 01:30 |
| → Lewix_ joined | 01:30 |
| → de-vri-es joined | 01:30 |
| → uidzer0 joined | 01:30 |
| → Seveas joined | 01:30 |
| → chusem4n joined | 01:30 |
| → jelmer joined | 01:30 |
| → mp3 joined | 01:30 |
| → trobotham joined | 01:30 |
| → sjohnson joined | 01:30 |
| → crawler joined | 01:30 |
| → batrick joined | 01:30 |
| → Abdullah joined | 01:30 |
| → LouWestin joined | 01:30 |
| → yn joined | 01:30 |
| → infernix joined | 01:30 |
| → LeMike joined | 01:30 |
| → demize joined | 01:30 |
| → lolmac joined | 01:30 |
| → circuitbone joined | 01:30 |
| → CustosLimen joined | 01:30 |
| → graphicsv joined | 01:30 |
| → rudi_s joined | 01:30 |
| → dakar joined | 01:30 |
| → dwmw2_gone joined | 01:30 |
| → jkhsjdhjs joined | 01:30 |
| → Zenstecm joined | 01:30 |
| → forrestv joined | 01:30 |
| → Lewix joined | 01:30 |
| → altendky joined | 01:30 |
| → GGMethos joined | 01:30 |
| → madduck joined | 01:30 |
| → bodie_ joined | 01:30 |
| → Nizumzen joined | 01:30 |
| → gitinfo joined | 01:30 |
| → howell joined | 01:30 |
| → bremner joined | 01:30 |
| → tbrowder joined | 01:30 |
| → nioncode joined | 01:30 |
| → i7c joined | 01:30 |
| → ThiefMaster joined | 01:30 |
| → miklcct joined | 01:30 |
| → BinGOs joined | 01:30 |
| → CheckYourSix joined | 01:30 |
| → daurnimator joined | 01:30 |
| → onla joined | 01:30 |
| → mx08 joined | 01:30 |
| → joder joined | 01:30 |
| → Forkk joined | 01:30 |
| → trevnorris joined | 01:30 |
| → shrysr joined | 01:30 |
| → wmo joined | 01:30 |
| → Hobbyboy joined | 01:30 |
| → raz joined | 01:30 |
| → sim642 joined | 01:30 |
| → appll joined | 01:30 |
| → TooLmaN joined | 01:30 |
| tepper.freenode.net set mode: +o | 01:30 |
| ← miklcct left | 01:30 |
| → miklcct joined | 01:31 |
| ← GGMethos left | 01:31 |
| → minsec joined | 01:31 |
| ← Sigma left | 01:32 |
| → Sigma joined | 01:32 |
| → va5c0 joined | 01:32 |
| ← altendky left | 01:33 |
| ← howell left | 01:33 |
| ← va5c0 left | 01:33 |
| → howell joined | 01:33 |
| ← hnOsmium0001 left | 01:33 |
| ← amerigo left | 01:33 |
| ← lolmac left | 01:33 |
| ← CustosLimen left | 01:33 |
| ← graphicsv left | 01:33 |
| ← Nizumzen left | 01:33 |
| → GGMethos joined | 01:34 |
| ← circuitbone left | 01:34 |
| → altendky joined | 01:34 |
| → amerigo joined | 01:35 |
| → lolmac joined | 01:35 |
| → random_yanek joined | 01:36 |
| → Nizumzen joined | 01:36 |
| → graphicsv joined | 01:36 |
| → hnOsmium0001 joined | 01:36 |
| → CustosLimen joined | 01:36 |
| → Nothing4You joined | 01:36 |
| ← OnkelBlade left | 01:36 |
| → circuitbone joined | 01:37 |
| ← onizu left | 01:39 |
| → cr4y1_ joined | 01:40 |
| → jstimm joined | 01:41 |
| ← cr4y1 left | 01:41 |
| ← cr4y1_ left | 01:41 |
| ← wallacer left | 01:41 |
| → cr4y1 joined | 01:41 |
| → wallacer joined | 01:42 |
| ← cr4y1 left | 01:43 |
| ← CodeSlingerPaul left | 01:45 |
| ← jstimm left | 01:46 |
| → jaziz joined | 01:47 |
| ← minsec left | 01:47 |
| ← bambanx left | 01:48 |
| → minsec joined | 01:49 |
| → Lord_of_Life_ joined | 01:49 |
| ← qpdb left | 01:50 |
| ← Lord_of_Life left | 01:51 |
| Lord_of_Life_ → Lord_of_Life | 01:51 |
| ← tiin57 left | 01:51 |
| ← ShapeShifter499 left | 01:53 |
| → ShapeShifter499 joined | 01:53 |
| → tiin57 joined | 01:55 |
| → cr4y1 joined | 01:55 |
| → jstimm joined | 01:55 |
| ← nadley left | 01:58 |
| ← cr4y1 left | 01:58 |
| → cr4y1 joined | 01:59 |
| ← jedsharp left | 02:00 |
| → brodie_ joined | 02:03 |
| → Xenguy_ joined | 02:03 |
| → Blukunfando joined | 02:03 |
| ← stux|RC-only left | 02:03 |
| → is_null joined | 02:04 |
| ← cr4y1 left | 02:04 |
| → jabster28 joined | 02:04 |
| → stux|RC-only joined | 02:05 |
| ← Xenguy left | 02:07 |
| ← jabster28 left | 02:08 |
| ← jstimm left | 02:08 |
| Xenguy_ → Xenguy | 02:11 |
| → Newami joined | 02:13 |
| ← Newami left | 02:18 |
| → oatmealraisin joined | 02:19 |
| ← tiin57 left | 02:21 |
| → Goplat joined | 02:22 |
| ← Maxattax left | 02:23 |
| → tiin57 joined | 02:24 |
| → xelxebar joined | 02:24 |
| → Maxattax joined | 02:25 |
| ← powerhouse left | 02:26 |
| ← orbyt_v7 left | 02:28 |
| ← Noldorin left | 02:30 |
| ← ShapeShifter499 left | 02:30 |
| → ShapeShifter499 joined | 02:30 |
| → powerhouse joined | 02:30 |
| ← F0rTex left | 02:30 |
| → F0rTex joined | 02:38 |
| ← amerigo left | 02:41 |
| → qpdb joined | 02:42 |
| ← shush left | 02:44 |
| → ephemer0l joined | 02:49 |
| ← tiin57 left | 02:51 |
| ← tejr left | 02:53 |
| → tejr joined | 02:54 |
| → tiin57 joined | 02:55 |
| → eligos joined | 03:09 |
| ← thiago left | 03:13 |
| ← zsoc left | 03:16 |
| → duderonomy joined | 03:16 |
| ← ShapeShifter499 left | 03:16 |
| → ShapeShifter499 joined | 03:16 |
| ← tiin57 left | 03:21 |
| lagothrix → Guest64420 | 03:24 |
| → xirhtogal joined | 03:24 |
| ← Guest64420 left | 03:24 |
| xirhtogal → lagothrix | 03:24 |
| ← PJBoy left | 03:24 |
| → tiin57 joined | 03:24 |
| → Guest20 joined | 03:28 |
| → drbean joined | 03:36 |
| ← schweby left | 03:41 |
| → Irish joined | 03:42 |
| → schweby joined | 03:44 |
| ← Guest20 left | 03:49 |
| → CamWang joined | 03:50 |
| ← tiin57 left | 03:51 |
| ← Technodrome left | 03:52 |
| ← CamWang left | 03:52 |
| → tiin57 joined | 03:54 |
| ← Irish left | 03:59 |
| ← wallacer left | 04:00 |
| → wallacer joined | 04:02 |
| → jabster28 joined | 04:04 |
| ← prgg left | 04:05 |
| → prg3 joined | 04:06 |
| → stats4647 joined | 04:06 |
| ← jabster28 left | 04:09 |
| ← Cthalupa left | 04:09 |
| → Cthalupa joined | 04:10 |
| ← stats4647 left | 04:10 |
| ← infl00p left | 04:15 |
| → infl00p joined | 04:15 |
| ← tryte left | 04:16 |
| ← hagabaka left | 04:17 |
| → tryte joined | 04:17 |
| → hagabaka joined | 04:18 |
| ← tiin57 left | 04:21 |
| → riksteri joined | 04:21 |
| → orbyt_v7 joined | 04:23 |
| ← riksteri left | 04:24 |
| → Guest20 joined | 04:24 |
| ← orbyt_v7 left | 04:24 |
| → riksteri joined | 04:24 |
| → tiin57 joined | 04:25 |
| → orbyt_ joined | 04:25 |
| → darkbit joined | 04:35 |
| ← drbean left | 04:37 |
| ← minsec left | 04:42 |
| → shush joined | 04:44 |
| ← zulutango left | 04:45 |
| ← geosmile left | 04:48 |
| → triode joined | 04:48 |
| triode → Guest95606 | 04:48 |
| → zulutango joined | 04:50 |
| ← shush left | 04:50 |
| ← tiin57 left | 04:51 |
| → justanotheruser joined | 04:54 |
| → tiin57 joined | 04:55 |
| → minsec joined | 04:56 |
| → crose joined | 04:57 |
| ← relipse left | 04:58 |
| ← brodie_ left | 04:59 |
| ← unluckyshrubbery left | 05:01 |
| ← minsec left | 05:01 |
| → unluckyshrubbery joined | 05:09 |
| → minsec joined | 05:11 |
| → brodie_ joined | 05:14 |
| brodie_ → brodie | 05:20 |
| ← tiin57 left | 05:21 |
| → tiin57 joined | 05:24 |
| ← oatmealraisin left | 05:27 |
| ← gordonfish left | 05:28 |
| → gordonfish joined | 05:28 |
| ← minsec left | 05:33 |
| → al3x27 joined | 05:33 |
| ← brodie left | 05:34 |
| ← j7k6 left | 05:39 |
| → j7k6 joined | 05:40 |
| ← gast0n left | 05:40 |
| ← wallacer left | 05:47 |
| ← cliluw left | 05:48 |
| → wallacer joined | 05:49 |
| ← tiin57 left | 05:51 |
| ← madewokherd left | 05:52 |
| → minsec joined | 05:53 |
| → tiin57 joined | 05:54 |
| → dob1_ joined | 05:57 |
| ← minsec left | 05:58 |
| ← dob1 left | 05:59 |
| ← AnAverageHuman left | 06:03 |
| → brodie joined | 06:03 |
| dob1_ → dob1 | 06:04 |
| → jabster28 joined | 06:04 |
| → minsec joined | 06:09 |
| ← jabster28 left | 06:09 |
| ← brodie left | 06:13 |
| ← zulutango left | 06:15 |
| → raven-au_ joined | 06:15 |
| ← sudoforge left | 06:16 |
| ← raven-au left | 06:18 |
| raven-au_ → raven-au | 06:18 |
| → OnkelBlade joined | 06:20 |
| ← tiin57 left | 06:21 |
| → zulutango joined | 06:21 |
| → tiin57 joined | 06:24 |
| ← bookworm left | 06:25 |
| ← tonyj left | 06:28 |
| → sord937 joined | 06:28 |
| → bookworm joined | 06:28 |
| → jaziz1 joined | 06:35 |
| ← sim590 left | 06:37 |
| ← jaziz left | 06:39 |
| → cliluw joined | 06:40 |
| → sim590 joined | 06:43 |
| ← Furai left | 06:47 |
| ← tiin57 left | 06:51 |
| ← minsec left | 06:52 |
| ← waveclaw left | 06:54 |
| → tiin57 joined | 06:55 |
| → LetoThe2nd joined | 06:56 |
| → ferdna joined | 06:58 |
| → gigasu_shida joined | 07:00 |
| ← Muimi left | 07:03 |
| → Muimi joined | 07:03 |
| → minsec joined | 07:03 |
| ← cliluw left | 07:07 |
| → cliluw joined | 07:07 |
| ← apus left | 07:08 |
| → apus joined | 07:08 |
| → onizu joined | 07:11 |
| ← Maxattax left | 07:12 |
| ← milkt left | 07:13 |
| ← j7k6 left | 07:15 |
| ← Jookia left | 07:16 |
| ← tejr left | 07:16 |
| ← gxt left | 07:16 |
| → j7k6 joined | 07:16 |
| → tejr joined | 07:16 |
| → Jookia joined | 07:17 |
| → gxt joined | 07:17 |
| → rfuentess joined | 07:18 |
| ← DarthRadar left | 07:18 |
| → milkt joined | 07:18 |
| → teclator joined | 07:18 |
| → DarthRadar joined | 07:18 |
| → Furai joined | 07:20 |
| ← tiin57 left | 07:21 |
| ← yonder left | 07:24 |
| → tiin57 joined | 07:24 |
| ← gpanders left | 07:26 |
| ← thansen left | 07:27 |
| → thansen joined | 07:28 |
| → cbreak joined | 07:31 |
| ← tejr left | 07:32 |
| ← tryte left | 07:34 |
| ← DiffieHellman left | 07:34 |
| ← denisse left | 07:34 |
| ← Wetmelon left | 07:36 |
| ← Jookia left | 07:36 |
| → tryte joined | 07:37 |
| → denisse joined | 07:37 |
| → DiffieHellman joined | 07:37 |
| → gpanders joined | 07:37 |
| → Jookia joined | 07:37 |
| → tejr joined | 07:38 |
| ← OnkelBlade left | 07:39 |
| ← sven^ left | 07:43 |
| ← cYmen left | 07:43 |
| → cYmen joined | 07:43 |
| → sven^ joined | 07:43 |
| ← sven^ left | 07:43 |
| → sven^ joined | 07:43 |
| ← ShapeShifter499 left | 07:45 |
| → ShapeShifter499 joined | 07:45 |
| ← gpanders left | 07:48 |
| ← Betal left | 07:48 |
| ← ShapeShifter499 left | 07:50 |
| → ShapeShifter499 joined | 07:50 |
| ← cliluw left | 07:50 |
| → cliluw joined | 07:51 |
| ← tiin57 left | 07:51 |
| → tiin57 joined | 07:54 |
| ← hexnewbie left | 07:55 |
| ← ShapeShifter499 left | 07:59 |
| → ShapeShifter499 joined | 07:59 |
| ← unluckyshrubbery left | 08:03 |
| → rfuentess_ joined | 08:04 |
| → jabster28 joined | 08:05 |
| ← rfuentess left | 08:05 |
| rfuentess_ → rfuentess | 08:06 |
| ← arcatech left | 08:07 |
| ← ferdna left | 08:08 |
| → stats4647 joined | 08:08 |
| ← howdoi left | 08:09 |
| → DevAntoine joined | 08:09 |
| ← jabster28 left | 08:09 |
| ← Goplat left | 08:11 |
| → fuzzypixelz joined | 08:12 |
| ← fuzzypixelz left | 08:12 |
| → fuzzypixelz joined | 08:12 |
| ← stats4647 left | 08:12 |
| ← nbsande left | 08:14 |
| ← zmt01 left | 08:16 |
| → nbsande joined | 08:16 |
| → Kurozen joined | 08:17 |
| → chele joined | 08:18 |
| → zmt00 joined | 08:19 |
| ← tiin57 left | 08:21 |
| ← darkbit left | 08:22 |
| → Haohmaru joined | 08:22 |
| ← dob1 left | 08:23 |
| → tiin57 joined | 08:25 |
| → thm joined | 08:26 |
|
thm
| when merging a branch from another repo to my local repo, can I include tags attached to one of the merged commits? | 08:27 |
|
ikke
| thm: what exactly do you expect to happen? | 08:30 |
|
thm
| the tag present in the source repo should be present in the target repo afterwards | 08:32 |
| ← theorangeone left | 08:33 |
| → bongjovi joined | 08:33 |
|
ikke
| Then you just need to fetch the tags from that repo | 08:33 |
| → theorangeone joined | 08:33 |
|
thm
| no, I only want the tags present on one of the commits that were added to the target repo | 08:33 |
|
| not any other unrelated tags | 08:33 |
|
ikke
| Then you need to fetch that single tag | 08:34 |
|
| a tag is similar to a branch | 08:34 |
|
| they are both refs | 08:34 |
|
thm
| I know that I cant fetch that tag manually, I'm asking whether that can be made automatically as part of the merge operation | 08:35 |
|
ikke
| no | 08:35 |
|
| merging branches does not involve fetching tags | 08:35 |
|
thm
| like the --follow-tags option for other operations | 08:35 |
| → darkbit joined | 08:35 |
|
ikke
| No, merging is a local operation, while fetching tags is a remtoe operation | 08:36 |
|
| (an operation involving remotes) | 08:36 |
|
thm
| so there's a difference between a 'real' remote, and an ad-hoc one? | 08:38 |
|
ikke
| thm: no, it's more similar in that you cannot merge a branch that you did not fetch first | 08:40 |
|
| and, that, once you fetched a tag, it makes no sense to have it part of a merge operation | 08:40 |
| ← is_null left | 08:40 |
| ← Kurozen left | 08:44 |
| ← gigasu_shida left | 08:44 |
| ← bongjovi left | 08:50 |
| → amahl joined | 08:50 |
| ← thansen left | 08:50 |
| → thansen joined | 08:51 |
| ← tiin57 left | 08:51 |
| ← orbyt_ left | 08:53 |
| → tiin57 joined | 08:55 |
| → cr4y1 joined | 08:59 |
| → theoceaniscool joined | 09:00 |
| ← Ekho left | 09:00 |
| ← Cthalupa left | 09:01 |
| → Cthalupa joined | 09:02 |
| ← ShapeShifter499 left | 09:06 |
| → ShapeShifter499 joined | 09:06 |
| ← minsec left | 09:07 |
| → minsec joined | 09:11 |
| → milkt_ joined | 09:11 |
| → shabius_ joined | 09:12 |
| ← j7k6 left | 09:12 |
| → Ekho joined | 09:12 |
| ← austin987 left | 09:12 |
| ← milkt left | 09:14 |
| → j7k6 joined | 09:14 |
| ← shabius left | 09:15 |
| → dob1 joined | 09:17 |
| ← tiin57 left | 09:21 |
| ← justanotheruser left | 09:24 |
| ← Bigcheese left | 09:25 |
| → tiin57 joined | 09:25 |
| → Bigcheese joined | 09:26 |
| → austin987 joined | 09:27 |
| → calcul0n joined | 09:34 |
| ← Guest20 left | 09:35 |
| → amerigo joined | 09:36 |
| ← fuzzypixelz left | 09:37 |
| ← hnOsmium0001 left | 09:39 |
| → Kurozen joined | 09:40 |
| → hexnewbie joined | 09:41 |
| ← cliluw left | 09:41 |
| → cliluw joined | 09:42 |
| ← Tobbi_ left | 09:46 |
| → Tobbi_ joined | 09:46 |
| → unluckyshrubbery joined | 09:48 |
| ← tiin57 left | 09:51 |
| → badeball joined | 09:51 |
|
badeball
| hi! will `get remote-ls` perform a request and return updated information or does it use data from last git-fetch? | 09:52 |
|
ikke
| badeball: it directly connects to the remote | 09:53 |
|
badeball
| ikke: very cool, thanks! | 09:54 |
|
ikke
| it's ls-remote btw | 09:54 |
| → tiin57 joined | 09:54 |
|
badeball
| and a follow up question: will running remote-ls in a local repository affect it like git-fetch does? | 09:54 |
|
| ikke: oh, yeah | 09:54 |
|
ikke
| no, git ls-remote is just a query tool | 09:55 |
| ← hendry left | 09:55 |
|
badeball
| alright, very awesome | 09:56 |
| → DevAntoi_ joined | 09:59 |
| ← DevAntoine left | 09:59 |
| → fuzzypixelz joined | 10:00 |
| ← fuzzypixelz left | 10:00 |
| → fuzzypixelz joined | 10:00 |
| ← DevAntoi_ left | 10:00 |
| → DevAntoine joined | 10:01 |
| → hendry joined | 10:03 |
| → jabster28 joined | 10:05 |
| → OnkelBlade joined | 10:06 |
| ← jabster28 left | 10:09 |
| → clime joined | 10:14 |
| → flashmozzg joined | 10:16 |
| ← hqdruxn08 left | 10:17 |
| → flashmozg joined | 10:18 |
| ← wallacer left | 10:20 |
| ← onizu left | 10:20 |
| ← flashmozzg left | 10:20 |
| ← tiin57 left | 10:21 |
| → wallacer joined | 10:21 |
| ← duderonomy left | 10:24 |
| → tiin57 joined | 10:24 |
| ← minsec left | 10:27 |
| ← blahboybaz left | 10:29 |
| ← gxt left | 10:30 |
| ← queip left | 10:31 |
| → minsec joined | 10:42 |
| → queip joined | 10:43 |
| → inkbottle joined | 10:47 |
| → shush joined | 10:47 |
| ← POQDavid left | 10:48 |
| ← zebrag left | 10:48 |
| ← minsec left | 10:48 |
| ← pikapika left | 10:48 |
| ← nikivi left | 10:48 |
| ← acetakwas left | 10:48 |
| ← tiin57 left | 10:51 |
| ← shush left | 10:52 |
| → nikivi joined | 10:53 |
| → pikapika joined | 10:53 |
| → acetakwas joined | 10:54 |
| → tiin57 joined | 10:55 |
| → minsec joined | 11:00 |
| → POQDavid joined | 11:05 |
| → Guest20 joined | 11:12 |
| ← VectorX left | 11:17 |
| ← ShapeShifter499 left | 11:21 |
| ← tiin57 left | 11:21 |
| → ShapeShifter499 joined | 11:21 |
| → danilam joined | 11:23 |
| ← dynetrekk left | 11:23 |
| → dynetrekk joined | 11:24 |
| → dionysus69 joined | 11:24 |
| → tiin57 joined | 11:25 |
| ← ShapeShifter499 left | 11:25 |
| → ShapeShifter499 joined | 11:25 |
| ← flashmozg left | 11:26 |
| → jaziz joined | 11:27 |
| → Lope joined | 11:29 |
|
Lope
| I've created a new git repo | 11:29 |
|
| with git init. It seems to be working fine, did a commit to master. | 11:29 |
|
| when I run git status, it shows that I'm on master. | 11:29 |
|
| but if I run `git branch` it returns nothing!? | 11:29 |
| ← jaziz1 left | 11:29 |
|
Lope
| 0 return value and no output?!? | 11:30 |
|
osse
| !repro | 11:30 |
|
gitinfo
| [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see | 11:30 |
| → amcsi joined | 11:30 |
|
ikke
| git branch -a? | 11:30 |
|
| And was the commit succesful? | 11:31 |
|
Lope
| osse, ikke: my bad. I had deleted and re-created the .git dir a few times. | 11:33 |
|
| I had not committed to it this time. | 11:33 |
|
| That's why git branch didn't return anything. | 11:33 |
|
ikke
| makes sense | 11:33 |
|
| the branch gets created after the first commit | 11:33 |
|
Lope
| ikke, okay thanks, I figured :) | 11:34 |
| → flashmozg joined | 11:35 |
| → jabster28 joined | 11:35 |
|
Lope
| Is there some nice companion app for git that will do an automagic commit every time a file changes? | 11:36 |
|
selckin
| we call it human | 11:36 |
|
Jookia
| Lope: generally you want to have your commits be meaningful changes | 11:37 |
|
Lope
| cool, where can I get it? :) | 11:37 |
|
ikke
| Lope: from Human Resources :P | 11:37 |
| ← danilam left | 11:38 |
|
Lope
| ikke, what kind of repo is that? | 11:38 |
|
ikke
| it's an enterprise product | 11:38 |
|
Jookia
| the undo feature of your editor is pretty good | 11:38 |
|
Lope
| It's for a program that's buggy. It crashes sometimes, so I save often. So far it hasn't corrupted the work-file but if it does, that would be pretty terrible. | 11:38 |
|
| I literally save whenever I remember to, like whenever I do a good change. | 11:39 |
|
ikke
| You can script something with inotify-wait | 11:39 |
|
Lope
| It would be nice to use inotify-wait yeah. I was just wondering if such a thing already exists. | 11:39 |
|
ikke
| I'm not aware of anything | 11:40 |
|
Lope
| cool, yeah, will be quite trivial to make a bash script do it. | 11:40 |
|
osse
| while true; do git commit -m "Autocommit" file; done | 11:41 |
|
| will probably max out a core, but who cares | 11:41 |
|
| oh, add >/dev/null 2>&1 | 11:41 |
|
ikke
| trivial to add an inotify-wait in there | 11:42 |
|
osse
| (no I am not serious (but yes it would probably work)) | 11:42 |
|
Lope
| haha, I would never ever do that. But thanks :) | 11:42 |
|
Jookia
| Lope: you sure git is the right tool for this? maybe there's something better that could use hardlinks on your OS or something | 11:44 |
|
selckin
| how is that going to help, he needs a copy | 11:45 |
|
Lope
| git is definitely the right tool. | 11:49 |
|
| gotta reboot etc. Thanks guys | 11:51 |
|
| Have a great day! :) | 11:51 |
| ← Lope left | 11:51 |
| ← tiin57 left | 11:51 |
| → rcoote joined | 11:53 |
| → tonythomas joined | 11:54 |
| → tiin57 joined | 11:54 |
| → bolovanos joined | 11:57 |
| → va5c0 joined | 11:58 |
| ← va5c0 left | 11:58 |
| ← Eryn_1983_FL left | 12:01 |
|
flashmozg
| Given a commit range, is there a simple way to "filter" out/xor it with a branch? | 12:03 |
| → TomyWork joined | 12:05 |
| ← daurnimator left | 12:08 |
| ← cliluw left | 12:08 |
| → stats4647 joined | 12:09 |
| → Mortir joined | 12:10 |
| → maxwilliamson joined | 12:12 |
| ← stats4647 left | 12:14 |
| → wrobinso1 joined | 12:15 |
|
osse
| flashmozg: in what sense? | 12:16 |
|
| a range foo..bar is the same as ^foo bar | 12:16 |
|
| you can do ^foo ^baz bar | 12:16 |
| ← ShapeShifter499 left | 12:16 |
| → ShapeShifter499 joined | 12:16 |
| → wolfshappen joined | 12:17 |
| → dqx joined | 12:18 |
|
flashmozg
| osse: well, suppose I have a foo..bar range that may or may not contain some commits from branch baz, suppose it's foo..boo, then I want to get boo..bar. | 12:18 |
| → DiffieHellman_ joined | 12:18 |
| ← wrobinson left | 12:18 |
| → va5c0 joined | 12:18 |
| ← DiffieHellman left | 12:19 |
| → va5c0_ joined | 12:20 |
| → thiago joined | 12:20 |
| ← tiin57 left | 12:21 |
|
osse
| Sounds like foo ^baz bar is what you want then | 12:21 |
|
| ugh | 12:21 |
|
| ^foo ^baz bar | 12:22 |
| ← nbsande left | 12:23 |
| ← va5c0 left | 12:23 |
| → tiin57 joined | 12:24 |
| → nbsande joined | 12:24 |
| → daurnimator joined | 12:24 |
|
flashmozg
| Hm, how to turn this into range? | 12:27 |
|
osse
| it *is* a range | 12:27 |
|
| foo..bar is just syntactic sugar for ^foo bar | 12:27 |
|
flashmozg
| defined by two commits. | 12:27 |
|
osse
| not sure that's mathematically possible, unless you know for a fact they're all on a straight line | 12:28 |
|
| hmm, maybe it is. too tired to draw graphs in my head | 12:29 |
|
| you could do it by doing what I said, pick the oldest of those commits, and use the parent of that as the lower end of the range | 12:30 |
|
| I think | 12:30 |
| ← Cthalupa left | 12:33 |
| → Cthalupa joined | 12:33 |
| ← va5c0_ left | 12:38 |
| → va5c0 joined | 12:39 |
| ← va5c0 left | 12:40 |
| ← daurnimator left | 12:42 |
| → va5c0 joined | 12:42 |
| → maxwilli- joined | 12:42 |
| ← sgn left | 12:42 |
| ← maxwilliamson left | 12:43 |
|
osse
| Hmm, I guess it's not a range, but a set. | 12:45 |
|
ikke
| <a, b] | 12:50 |
| ← tiin57 left | 12:51 |
| → tiin57 joined | 12:54 |
|
osse
| But here it's more like <a, <b, c] so to speak | 12:55 |
| → Technodrome joined | 12:56 |
|
osse
| I don't think there exists a general d so that <d, c] would be the same | 12:56 |
| ← minsec left | 12:57 |
| → gpanders joined | 12:59 |
|
osse
| flashmozg: the graph drawing in my head is complete. I am fairly sure that if baz forked off from bar before foo did, then it is not possible. | 13:00 |
|
| I immediately withdraw that. My solution is "symmetric" so yo speak, so it doesn't make sense. | 13:01 |
| ← jabster28 left | 13:01 |
|
flashmozg
| foo..bar are in the same branch | 13:01 |
|
| that was forked from baz at some indeterminate point. (foo could be before or after that point). | 13:02 |
| → Anticom joined | 13:03 |
|
osse
| if foo is after that point then the range would be no different. if is the before that point then the range you want is simply baz..bar | 13:03 |
| → iffraff joined | 13:04 |
|
osse
| so the range is X..bar where X is the newest of the two merge bases of foo and bar, and baz and bar | 13:04 |
|
| I'm curious why ^foo ^baz bar is not an acceptable answer | 13:05 |
| ← amerigo left | 13:05 |
| ← Xenguy left | 13:05 |
| ← Jookia left | 13:05 |
|
osse
| leaving all the graphy shit up to Git seems like the best way. | 13:05 |
| ← dionysus69 left | 13:06 |
|
flashmozg
| osse: need it for a tool that only accepts "start" and "end" commits. | 13:10 |
| → Jookia joined | 13:10 |
|
osse
| Boo | 13:13 |
|
flashmozg
| Not sure what you mean by the merge base of "foo and bar". foo and bar are the commits in the same branch, not individual branches. So I guess it's always foo. By newest, will rev-list --topo-order be enough? | 13:13 |
|
osse
| I'll rephrase | 13:14 |
|
| the range is X..bar where X is the newest of foo and the merge-base of baz and bar | 13:14 |
|
| merge-base = common ancestor. you can find that for any commits, not just branches | 13:15 |
| ← rkta left | 13:15 |
| → rkta joined | 13:15 |
| → kupi joined | 13:17 |
| ← tiin57 left | 13:21 |
| → tiin57 joined | 13:24 |
| → mellernoia joined | 13:24 |
| → daurnimator joined | 13:26 |
| ← zulutango left | 13:31 |
| → zulutango joined | 13:31 |
| ← jaziz left | 13:32 |
| ← tgunr left | 13:35 |
| ← pikapika left | 13:36 |
| → pikapika joined | 13:37 |
| ← nikivi left | 13:37 |
| ← POQDavid left | 13:37 |
| ← acetakwas left | 13:37 |
| ← pikapika left | 13:37 |
| → hqdruxn08 joined | 13:38 |
| → dionysus69 joined | 13:39 |
| ← cr4y1 left | 13:40 |
| → cr4y1 joined | 13:40 |
| ← clime left | 13:40 |
| → pikapika joined | 13:41 |
| → acetakwas joined | 13:41 |
|
flashmozg
| osse: yeah, I understood the merge-base part. It's the "newest" that's a bit ambiguous in Git. | 13:43 |
| → nikivi joined | 13:44 |
| ← fuzzypixelz left | 13:49 |
| → fuzzypixelz joined | 13:50 |
| ← tiin57 left | 13:51 |
| → minsec joined | 13:52 |
| → Raging_Hog joined | 13:52 |
| → tiin57 joined | 13:54 |
|
osse
| flashmozg: I meant topologically speaking | 13:55 |
| → POQDavid joined | 13:57 |
|
flashmozg
| Ok, thanks. That's what I was asking with "rev-list --topo-order". | 13:57 |
| ← minsec left | 13:57 |
| ← thm left | 13:58 |
|
osse
| flashmozg: find the merge-base of baz and bar, and then you can check which of those is newest with git merge-base --is-ancestor | 14:02 |
|
| (not that rev-list --topo-order won't work, but this might be easier to parse) | 14:02 |
|
flashmozg
| osse: would 'git rev-list --topo-order -n 1 baz bar' return the desired commit directly without need for branching? | 14:04 |
|
| Or you mean "easier for humans to parse"? | 14:04 |
|
| forgot --no-walk | 14:05 |
|
osse
| i suspect that would return either baz or bar itself | 14:05 |
|
| but I don't know | 14:05 |
|
Foxboron
| ag55 | 14:05 |
|
| wops | 14:05 |
| → geosmile joined | 14:06 |
| → zsoc joined | 14:10 |
| ← zsoc left | 14:10 |
| → zsoc joined | 14:10 |
| ← xelxebar left | 14:11 |
| → xelxebar joined | 14:11 |
| → Darcidride joined | 14:11 |
| → minsec joined | 14:14 |
| → dpflick joined | 14:15 |
| ← minsec left | 14:19 |
| ← srinidhi left | 14:20 |
| → VectorX joined | 14:21 |
| ← tiin57 left | 14:21 |
| ← fuzzypixelz left | 14:23 |
| → fermion0 joined | 14:24 |
| ← fermion0 left | 14:24 |
| → danilam joined | 14:25 |
| → tiin57 joined | 14:25 |
| ← oprypin left | 14:26 |
| ← rcoote left | 14:26 |
| → oprypin joined | 14:26 |
| → srinidhi joined | 14:26 |
| → rcoote joined | 14:27 |
| ← rcoote left | 14:28 |
| ← flashmozg left | 14:28 |
| → onizu joined | 14:31 |
| → CodeSlingerPaul joined | 14:31 |
| → rcoote joined | 14:33 |
| ← Anticom left | 14:35 |
| → trinityblade joined | 14:36 |
| → minsec joined | 14:36 |
| ← minsec left | 14:42 |
| ← Darcidride left | 14:43 |
| → jwest joined | 14:43 |
| ← jwest left | 14:44 |
| → AnAverageHuman joined | 14:44 |
| → waveclaw joined | 14:45 |
| → plitter joined | 14:49 |
| ← rcoote left | 14:49 |
| → vdamewood joined | 14:49 |
| ← tiin57 left | 14:51 |
| → tiin57 joined | 14:55 |
| → minsec joined | 14:57 |
| → jabster28 joined | 14:58 |
| ← bolovanos left | 14:58 |
| → herren joined | 14:58 |
| ← minsec left | 15:01 |
| ← jabster28 left | 15:03 |
| ← dionysus69 left | 15:05 |
| → jabster28 joined | 15:09 |
| ← iffraff left | 15:09 |
| → fuzzypixelz joined | 15:12 |
| ← fuzzypixelz left | 15:12 |
| → fuzzypixelz joined | 15:12 |
| ← ShapeShifter499 left | 15:12 |
| ← gpanders left | 15:13 |
| ← jabster28 left | 15:14 |
| → Newami joined | 15:15 |
| → minsec joined | 15:17 |
| ← Newami left | 15:18 |
| ← tiin57 left | 15:21 |
| → Darcidride joined | 15:22 |
| ← sweatsuit left | 15:22 |
| ← minsec left | 15:23 |
| → rsx joined | 15:23 |
| → sweatsuit joined | 15:23 |
| ← AnAverageHuman left | 15:23 |
| → tiin57 joined | 15:25 |
| → gpanders joined | 15:25 |
| → flashmozg joined | 15:26 |
| → jabster28 joined | 15:27 |
| ← danilam left | 15:29 |
| ← fachinformatiker left | 15:33 |
| → AnAverageHuman joined | 15:35 |
| ← jelmer left | 15:36 |
| ← vdamewood left | 15:36 |
| ← tiin57 left | 15:36 |
| → tiin57 joined | 15:37 |
| ← k_sze left | 15:37 |
| → fachinformatiker joined | 15:37 |
| ← fachinformatiker left | 15:37 |
| → fachinformatiker joined | 15:37 |
| → k_sze joined | 15:38 |
| → minsec joined | 15:41 |
| ← jabster28 left | 15:43 |
| → dionysus69 joined | 15:46 |
| ← minsec left | 15:46 |
| → iskander joined | 15:48 |
| → superbolide joined | 15:49 |
| ← iskander- left | 15:50 |
| ← Guest20 left | 15:50 |
| ← tiin57 left | 15:51 |
| → jabster28 joined | 15:53 |
| → tiin57 joined | 15:54 |
| → Muimi_ joined | 15:55 |
| ← Muimi_ left | 15:55 |
| → relipse joined | 15:58 |
| ← Muimi left | 15:58 |
| → cloud69 joined | 15:59 |
| → danilam joined | 15:59 |
| → sgn joined | 16:00 |
| → royal_screwup21 joined | 16:01 |
| ← flashmozg left | 16:02 |
| → minsec joined | 16:02 |
| → sudoforge joined | 16:03 |
| → vdamewood joined | 16:03 |
| → Wetmelon joined | 16:05 |
| ← jabster28 left | 16:05 |
| ← minsec left | 16:07 |
| ← Jackneill left | 16:07 |
| ← dionysus69 left | 16:10 |
| ← iskander left | 16:11 |
| ← fuzzypixelz left | 16:11 |
| → yohnnyjoe joined | 16:13 |
| ← va5c0 left | 16:13 |
| → Jackneill joined | 16:14 |
| → Cyan22 joined | 16:14 |
| ← royal_screwup21 left | 16:16 |
| → royal_screwup21 joined | 16:16 |
| ← Trieste left | 16:21 |
| → dionysus69 joined | 16:21 |
| ← tiin57 left | 16:21 |
| ← samuelbernardo left | 16:23 |
| → tiin57 joined | 16:25 |
| → otisolsen70 joined | 16:26 |
| → minsec joined | 16:26 |
| → gast0n joined | 16:27 |
| → bn_work joined | 16:30 |
| ← minsec left | 16:31 |
| → jabster28 joined | 16:33 |
| → clime joined | 16:36 |
| → justanotheruser joined | 16:39 |
| ← tonythomas left | 16:40 |
| → minsec joined | 16:45 |
| → iskander joined | 16:48 |
| ← dionysus69 left | 16:48 |
| ← minsec left | 16:50 |
| ← tiin57 left | 16:51 |
|
causa_sui
| to revert a merge commit, I have to pass a parent commit "number". I don't understand what this number signifies or how to know what number I need to pass in here. I thought I would give a commit hash | 16:52 |
| ← Technodrome left | 16:52 |
| ← Cyan22 left | 16:52 |
| ← LDerJim left | 16:53 |
|
thiago
| causa_sui: don't revert merges | 16:54 |
|
| forget it | 16:54 |
| → tiin57 joined | 16:55 |
| → LDerJim joined | 16:55 |
| → Technodrome joined | 16:55 |
| ← Deknos left | 16:56 |
|
causa_sui
| what does the -m switch to a revert signify? | 16:56 |
|
ikke
| causa_sui: in case you want to revert a merge request | 16:56 |
|
| it tells git what you consider the main line, so that it know what to diff against | 16:57 |
|
causa_sui
| ikke: yes, but what is the argument? see my question above | 16:57 |
|
ikke
| It's the parent number | 16:57 |
| → Guest20 joined | 16:57 |
|
causa_sui
| "number"? | 16:57 |
|
ikke
| parents are ordered | 16:57 |
|
| so 1st or 2nd parent | 16:57 |
|
causa_sui
| how can I find the ordering? | 16:57 |
|
ikke
| The branch being merged into is always the first parent | 16:58 |
|
| while the branch being merged would be the 2nd parent | 16:58 |
| → sentinal8473 joined | 16:58 |
| → Maxattax joined | 16:59 |
|
causa_sui
| so I should always pass '-m 2' when reverting a merge? o_o | 16:59 |
|
ikke
| no, in almost all cases, you want -m 1 | 16:59 |
|
causa_sui
| alright, here goes | 17:00 |
|
ikke
| because the first parent is the main line | 17:00 |
|
| basically, you specify the changes of which parent you want to keep | 17:00 |
|
causa_sui
| that did it, thank you | 17:01 |
|
| still scratching my head about why I would need something else than that but hopefully I won't be in this situation again any time soon :D | 17:01 |
|
ikke
| git supports merges with more then 1 parent (octopus-merges) | 17:01 |
|
| more then 2 parents* | 17:02 |
| → flashmozg joined | 17:02 |
| ← rfuentess left | 17:03 |
| ← fachinformatiker left | 17:03 |
| ← Darcidride left | 17:04 |
| ← danilam left | 17:05 |
| ← amcsi left | 17:06 |
| ← sentinal8473 left | 17:06 |
| → fuzzypixelz joined | 17:06 |
| → minsec joined | 17:06 |
| → fachinformatiker joined | 17:07 |
| ← fachinformatiker left | 17:07 |
| → fachinformatiker joined | 17:07 |
| → sudomann joined | 17:09 |
|
sudomann
| I want to delete the changes of my last commit. There are unstaged changes in my working tree. Is dropping the last commit the right thing to do | 17:09 |
|
| I want to keep my unstaged changes, just discard the last commited changes | 17:10 |
| ← minsec left | 17:11 |
| ← trinityblade left | 17:11 |
|
causa_sui
| sudomann: revert HEAD? | 17:11 |
| ← de-vri-es left | 17:11 |
|
sudomann
| ahh yes the command i need | 17:13 |
|
| thank you | 17:13 |
|
ikke
| revert creates a new commit fyi | 17:13 |
| ← royal_screwup21 left | 17:13 |
| → royal_screwup21 joined | 17:13 |
|
andytoshi
| causa_sui: git consistently pretends like "master" is no different from any other branch, so there are a lot of things like -m1 where realistically you would never need anything different | 17:14 |
|
| but you gotta specify it | 17:14 |
|
| and in this case, i think it's nice because it's otherwise nonobvious what "git revert" on a merge commit would actually do | 17:14 |
|
causa_sui
| ok, I think I kinda get it | 17:15 |
|
andytoshi
| but having said that ... in this case i would probably just "manually" make a revert commit | 17:15 |
|
| by doing "git checkout <commit i want to go back to> -- ." in the root | 17:15 |
|
| and committing that | 17:15 |
| → samuelbernardo joined | 17:15 |
|
andytoshi
| well, *i'd* do it using git-read-tree because i'm nuts | 17:15 |
|
ikke
| git does not even pretend master is not different | 17:15 |
|
| to git, there is nothing special about master | 17:16 |
|
causa_sui
| andytoshi: why not revert the merge commit? it had stuff in it that we never ever want to be in that branch | 17:16 |
|
andytoshi
| right, sorry, "pretend it's not different" is not a good way to say what i meant | 17:16 |
|
| which was that in practice, people treat "master" (and "origin") specially but git does not | 17:16 |
|
ikke
| right | 17:16 |
|
imMute
| ikke: the first commit in an empty repo will create a "master" branch. ;) | 17:17 |
|
andytoshi
| causa_sui: reverting the merge commit is exactly what you want to do. but the reason you might want to do it "manually" is because then you don't need to understand the semantics of "git revert" on merge commits :) | 17:17 |
|
causa_sui
| ok. well, I did the revert on the merge commit, and it seems everything is fine | 17:17 |
|
ikke
| Yes, there are some defaults | 17:17 |
|
andytoshi
| causa_sui: cool, sounds like you're set | 17:18 |
| ← oprypin left | 17:18 |
|
causa_sui
| :) | 17:18 |
|
ikke
| But otherwise, there is nothing special | 17:18 |
| → madewokherd joined | 17:18 |
| ← Haohmaru left | 17:20 |
|
ikke
| git init && echo 'ref: refs/heads/foobar' >git/HEAD | 17:20 |
| ← tiin57 left | 17:21 |
|
ikke
| maybe I'll make foobar my new default branch :P | 17:21 |
| → tiin57 joined | 17:25 |
| → oprypin joined | 17:25 |
| → BrunoSpr joined | 17:27 |
| ← royal_screwup21 left | 17:30 |
| → minsec joined | 17:30 |
| → royal_screwup21 joined | 17:30 |
| ← Raging_Hog left | 17:32 |
| → de-vri-es joined | 17:33 |
| ← minsec left | 17:34 |
| ← royal_screwup21 left | 17:35 |
| → royal_screwup21 joined | 17:35 |
| → va5c0 joined | 17:39 |
| → txtsd joined | 17:42 |
| → gxt joined | 17:42 |
| ← Gustavo6046 left | 17:44 |
| → minsec joined | 17:44 |
| → Darcidride joined | 17:46 |
| → Gustavo6046 joined | 17:46 |
| → amcsi joined | 17:47 |
| ← flashmozg left | 17:48 |
| ← chele left | 17:49 |
| ← minsec left | 17:49 |
| ← tiin57 left | 17:51 |
| → shush joined | 17:51 |
| → tiin57 joined | 17:54 |
| → stats4647 joined | 17:59 |
| → yohnnyjo1 joined | 18:03 |
| → orbyt_v7 joined | 18:03 |
| → PaddyF joined | 18:03 |
| → Guest20_ joined | 18:04 |
| → mirrorbird joined | 18:04 |
| ← stats4647 left | 18:04 |
| ← amcsi left | 18:04 |
| ← OnkelBlade left | 18:04 |
| ← Guest20 left | 18:05 |
| ← yohnnyjoe left | 18:06 |
| ← mirrorbird left | 18:07 |
| → pac1 joined | 18:08 |
| → Narrat joined | 18:10 |
| → arcatech joined | 18:11 |
| → minsec joined | 18:11 |
| → stats4647 joined | 18:11 |
| ← superbolide left | 18:12 |
| → superbolide joined | 18:12 |
| ← Guest20_ left | 18:15 |
| ← minsec left | 18:15 |
| → stdedos joined | 18:16 |
| ← rustyshackleford left | 18:18 |
| ← jimklimov1 left | 18:18 |
| → jimklimov joined | 18:18 |
| ← jabster28 left | 18:19 |
| ← tiin57 left | 18:21 |
| → tiin57 joined | 18:25 |
| → trinityblade joined | 18:26 |
| → rustyshackleford joined | 18:28 |
| → minsec joined | 18:29 |
| → jimklimov1 joined | 18:29 |
| ← jimklimov left | 18:30 |
| → howdoi joined | 18:32 |
| ← superbolide left | 18:32 |
| → superbolide joined | 18:33 |
| ← minsec left | 18:34 |
| ← rsx left | 18:34 |
| → Iarfen joined | 18:35 |
| → nomadicmathmo joined | 18:35 |
| → Guest20 joined | 18:35 |
|
Iarfen
| hI! | 18:36 |
| ← Technodrome left | 18:37 |
| ← trinityblade left | 18:39 |
| → TomyLobo joined | 18:40 |
| ← Blukunfando left | 18:40 |
|
Iarfen
| I've a merge conflict inside Bitbucket, but here at local when I pull in order to have the merge conflict git says me "Already up-to-date", which commands I need for this case? | 18:40 |
| → nomadicmathmo1 joined | 18:40 |
|
ikke
| You need to do the same merge that bitbucket is trying to perform | 18:41 |
|
Iarfen
| how I do that? | 18:41 |
|
ikke
| well, check bitbucket what branches are being merged | 18:41 |
| → oatmealraisin joined | 18:42 |
| ← Wetmelon left | 18:42 |
| ← TomyWork left | 18:43 |
| ← nomadicmathmo left | 18:45 |
| nomadicmathmo1 → nomadicmathmo | 18:45 |
| ← dude187 left | 18:46 |
| ← Guest20 left | 18:47 |
| → jabster28 joined | 18:49 |
| → fuzzypixelz_ joined | 18:50 |
| → jnavila joined | 18:50 |
| ← fuzzypixelz_ left | 18:50 |
| → Betal joined | 18:50 |
| → fuzzypixelz_ joined | 18:50 |
| ← PaddyF left | 18:50 |
|
Iarfen
| ikke: I receive from git: "already up to date" | 18:50 |
| → minsec joined | 18:51 |
| ← tiin57 left | 18:51 |
| ← fuzzypixelz left | 18:51 |
| fuzzypixelz_ → fuzzypixelz | 18:51 |
| ← fuzzypixelz left | 18:52 |
|
thiago
| the commands you're issuing don't match what bitbucket is doing | 18:52 |
| ← superbolide left | 18:52 |
|
thiago
| or the commit you're starting from doesn't | 18:52 |
| → fuzzypixelz joined | 18:52 |
| → superbolide joined | 18:52 |
| → tiin57 joined | 18:54 |
|
ikke
| You need to merge | 18:54 |
|
| not pull | 18:54 |
| → cliluw joined | 18:56 |
| ← minsec left | 18:56 |
| ← fuzzypixelz left | 18:56 |
| ← jabster28 left | 18:58 |
| → jabster28 joined | 18:59 |
| → sudomann_ joined | 18:59 |
| → hnOsmium0001 joined | 19:02 |
| ← sudomann left | 19:03 |
| ← superbolide left | 19:04 |
| → superbolide joined | 19:04 |
| → Wetmelon joined | 19:05 |
| ← LetoThe2nd left | 19:05 |
| ← stdedos left | 19:07 |
| ← sudoforge left | 19:08 |
| → minsec joined | 19:11 |
| ← archwizard left | 19:11 |
| ← jabster28 left | 19:12 |
| → archwizard joined | 19:12 |
|
BrunoSpr
| hi all | 19:12 |
|
| If I have 2 computers and want to use both with github do I need to copy the ssh code to the other computer only? | 19:13 |
|
| the ssh-key is on my other laptop how can I now use the main computer to access github? | 19:14 |
|
ikke
| you can either copy the ssh key, or generate another one | 19:15 |
| ← minsec left | 19:15 |
| → wootehfoot joined | 19:16 |
|
BrunoSpr
| ah ok to generate another one is easier I think thanks very much ikke | 19:18 |
| ← tiin57 left | 19:21 |
| → tiin57 joined | 19:25 |
| → otisolsen70_ joined | 19:31 |
| → blahboybaz joined | 19:32 |
| → dfee joined | 19:32 |
| ← dmlloyd left | 19:33 |
| ← otisolsen70_ left | 19:34 |
| ← archwizard left | 19:34 |
| → archwizard joined | 19:34 |
| ← otisolsen70 left | 19:35 |
| ← john2gb left | 19:36 |
| → Achylles joined | 19:36 |
| → minsec joined | 19:38 |
| → john2gb joined | 19:39 |
|
BrunoSpr
| ikke is it better to use a password together with the ssh-key? | 19:41 |
|
| no problem if I leave it empty? | 19:41 |
|
ikke
| Best practice is to use a passphrase for the key | 19:41 |
|
BrunoSpr
| ah ok | 19:41 |
|
| thx | 19:41 |
|
ikke
| Note that you can use ssh agents to cache the unencrypted key | 19:41 |
|
BrunoSpr
| oh? I am just a beginner | 19:42 |
|
| can I create a new ssh-key if I like | 19:43 |
|
ikke
| sure, as long as the system where you want to push it knows it | 19:43 |
| ← minsec left | 19:43 |
|
ikke
| note that you do not need to generate a new key if you want to add a passphrase | 19:43 |
| → voidSurfr joined | 19:43 |
|
BrunoSpr
| ah ok how to add a passphrase now? | 19:44 |
|
ikke
| ssh-keygen -p | 19:44 |
| ← voidSurfr left | 19:45 |
| ← Achylles left | 19:48 |
| → dude187 joined | 19:48 |
| ← royal_screwup21 left | 19:48 |
| → royal_screwup21 joined | 19:48 |
| ← tiin57 left | 19:51 |
| ← vicfred left | 19:53 |
| ← royal_screwup21 left | 19:53 |
| → tiin57 joined | 19:54 |
| → minsec joined | 19:56 |
| ← apus left | 20:00 |
| ← archwizard left | 20:00 |
| → apus joined | 20:00 |
| → archwizard joined | 20:01 |
| ← minsec left | 20:01 |
| ← riksteri left | 20:02 |
| → dpflick_ joined | 20:02 |
| → yohnnyjoe joined | 20:03 |
| ← yohnnyjo1 left | 20:05 |
| ← dpflick left | 20:05 |
| ← darkbit left | 20:05 |
| ← luke-jr left | 20:09 |
| → luke-jr joined | 20:10 |
| ← vdamewood left | 20:12 |
| ← antranigv left | 20:12 |
| → antranigv joined | 20:14 |
| → dflick__ joined | 20:18 |
| ← tiin57 left | 20:21 |
| ← dpflick_ left | 20:21 |
| → minsec joined | 20:22 |
| ← FFY00 left | 20:24 |
| → fandre1986 joined | 20:24 |
| → FFY00 joined | 20:25 |
| → tiin57 joined | 20:25 |
| ← archwizard left | 20:26 |
| → archwizard joined | 20:26 |
| ← FFY00 left | 20:27 |
| ← minsec left | 20:27 |
| → trinityblade joined | 20:28 |
| → royal_screwup21 joined | 20:34 |
| ← blahboybaz left | 20:34 |
| → shush_ joined | 20:35 |
| → duderonomy joined | 20:35 |
| ← yohnnyjoe left | 20:35 |
| ← shush left | 20:39 |
| ← royal_screwup21 left | 20:39 |
| ← onizu left | 20:40 |
| → minsec joined | 20:40 |
| ← mellernoia left | 20:41 |
| → herbergalarga joined | 20:42 |
| → mowcat joined | 20:42 |
| → jabster28 joined | 20:42 |
| → Jitta joined | 20:44 |
| ← archwizard left | 20:44 |
| → archwizard joined | 20:45 |
| ← minsec left | 20:45 |
| ← herbergalarga left | 20:47 |
| ← gpanders left | 20:47 |
| ← downunder_ left | 20:48 |
| ← tiin57 left | 20:51 |
| ← jabster28 left | 20:52 |
| ← archwizard left | 20:53 |
| → archwizard joined | 20:53 |
| → tiin57 joined | 20:55 |
| → jabster28 joined | 21:00 |
| → minsec joined | 21:02 |
| ← archwizard left | 21:02 |
| → archwizard joined | 21:03 |
| → gpanders joined | 21:05 |
| ← minsec left | 21:07 |
| ← jabster28 left | 21:09 |
| → jabster28 joined | 21:09 |
| ← sord937 left | 21:10 |
| → royal_screwup21 joined | 21:10 |
| → blahboybaz joined | 21:10 |
| ← archwizard left | 21:10 |
| → archwizard joined | 21:11 |
| ← fandre1986 left | 21:15 |
| ← royal_screwup21 left | 21:15 |
| → jjakob joined | 21:18 |
| ← va5c0 left | 21:19 |
| ← bn_work left | 21:20 |
| ← tiin57 left | 21:21 |
| → dmlloyd joined | 21:22 |
| → minsec joined | 21:23 |
| ← Maxattax left | 21:23 |
| → tiin57 joined | 21:24 |
| → SwiftMatt joined | 21:26 |
| ← minsec left | 21:27 |
| ← jabster28 left | 21:28 |
| → jabster28 joined | 21:28 |
| → va5c0 joined | 21:29 |
| ← jjakob left | 21:32 |
| ← sgn left | 21:34 |
| → sgn joined | 21:35 |
| → calcul0n_ joined | 21:36 |
| ← SwiftMatt left | 21:37 |
| ← jabster28 left | 21:37 |
| → jabster28 joined | 21:37 |
| → jjakob joined | 21:37 |
| ← va5c0 left | 21:37 |
| ← trinityblade left | 21:38 |
| ← crose left | 21:38 |
| ← calcul0n left | 21:39 |
| → Xenguy joined | 21:41 |
| → va5c0 joined | 21:41 |
| → minsec joined | 21:43 |
| ← va5c0 left | 21:43 |
| → royal_screwup21 joined | 21:44 |
| → yonder joined | 21:44 |
| → va5c0 joined | 21:44 |
| ← archwizard left | 21:46 |
| → OnkelBlade joined | 21:46 |
| → archwizard joined | 21:46 |
| ← shush_ left | 21:46 |
| ← jabster28 left | 21:46 |
| → jabster28 joined | 21:47 |
| → shush joined | 21:47 |
| ← minsec left | 21:48 |
| ← royal_screwup21 left | 21:48 |
| ← va5c0 left | 21:49 |
| → va5c0 joined | 21:50 |
| ← tiin57 left | 21:51 |
| ← va5c0 left | 21:51 |
| ← shush left | 21:51 |
| → va5c0 joined | 21:52 |
| ← archwizard left | 21:53 |
| → archwizard joined | 21:54 |
| → tiin57 joined | 21:54 |
| ← jabster28 left | 21:56 |
| → jabster28 joined | 21:56 |
| ← archwizard left | 22:01 |
| → archwizard joined | 22:01 |
| ← archwizard left | 22:03 |
| → archwizard joined | 22:03 |
| ← wootehfoot left | 22:03 |
| ← archwizard left | 22:05 |
| → archwizard joined | 22:05 |
| ← jabster28 left | 22:05 |
| → jabster28 joined | 22:06 |
| ← archwizard left | 22:07 |
| → minsec joined | 22:07 |
| → archwizard joined | 22:07 |
| ← kupi left | 22:07 |
| ← archwizard left | 22:08 |
| ← superbolide left | 22:08 |
| → archwizard joined | 22:08 |
| → mirrorbird joined | 22:09 |
| ← OnkelBlade left | 22:10 |
| ← archwizard left | 22:10 |
| → archwizard joined | 22:10 |
| ← cloud69 left | 22:11 |
| ← minsec left | 22:12 |
| ← archwizard left | 22:12 |
| → archwizard joined | 22:13 |
| ← archwizard left | 22:15 |
| → archwizard joined | 22:15 |
| ← archwizard left | 22:17 |
| → shush joined | 22:17 |
| → archwizard joined | 22:17 |
| ← shush left | 22:18 |
| ← jnavila left | 22:19 |
| ← archwizard left | 22:19 |
| → archwizard joined | 22:20 |
| → royal_screwup21 joined | 22:21 |
| ← tiin57 left | 22:21 |
| ← archwizard left | 22:22 |
| → archwizard joined | 22:22 |
| ← archwizard left | 22:23 |
| → archwizard joined | 22:23 |
| ← va5c0 left | 22:23 |
| ← DevAntoine left | 22:24 |
| → tiin57 joined | 22:24 |
| → DevAntoine joined | 22:24 |
| ← archwizard left | 22:25 |
| → archwizard joined | 22:25 |
| → va5c0 joined | 22:25 |
| ← va5c0 left | 22:25 |
| ← Jookia left | 22:27 |
| ← archwizard left | 22:27 |
| → va5c0 joined | 22:27 |
| → archwizard joined | 22:27 |
| ← archwizard left | 22:28 |
| → Jookia joined | 22:28 |
| → minsec joined | 22:28 |
| ← DevAntoine left | 22:29 |
| ← va5c0 left | 22:32 |
| ← minsec left | 22:33 |
| ← dqx left | 22:35 |
| ← Xenguy left | 22:40 |
| → Xenguy joined | 22:40 |
| ← Darcidride left | 22:40 |
|
andytoshi
| is there a way, given two commits, to find the merge base of both which is in the past of them | 22:41 |
|
| like, if I have a diamond which has a commit A, with two parents B1, B2, which in turn both have parent C | 22:41 |
|
| if I try merge_base(A, B1) I'll get B1 | 22:42 |
|
| but i'd like to get C | 22:42 |
|
| "the most recent ancestor of B1 that was in A's history, not including B1's fork" | 22:42 |
|
imMute
| git merge-base A^1 A^2 | 22:43 |
| ← jabster28 left | 22:43 |
|
imMute
| A^1 is the first parent of A, and A^2 is the 2nd parent of A. | 22:43 |
|
andytoshi
| well, in my case A is actually just master | 22:43 |
|
| so it'll be indefinitely far ahead | 22:43 |
| → jabster28 joined | 22:43 |
|
andytoshi
| and A^, A^^ etc will have the same problem | 22:43 |
|
Hello71
| this question sounds poorly defined | 22:45 |
|
imMute
| andytoshi: A^^ and A^2 are not the same thing. | 22:46 |
|
andytoshi
| imMute: i know | 22:46 |
|
imMute
| did you try my suggest? | 22:46 |
|
Hello71
| maybe you want git merge-base A^1 A^2 B1 | 22:46 |
|
imMute
| suggestion* | 22:46 |
|
Hello71
| otherwise your question is not clear | 22:46 |
|
andytoshi
| imMute: that will work if A is the commit that merges B1 and B2 | 22:46 |
|
| but not if A is any descendent of that | 22:47 |
|
Hello71
| that's what you said though | 22:47 |
|
imMute
| andytoshi: in your example, it is. | 22:47 |
|
Hello71
| maybe you intended to say ancestor | 22:47 |
|
| but you said parent | 22:47 |
|
andytoshi
| it my question i did not say parent | 22:47 |
|
| in the examlpe i did | 22:47 |
|
| i'm sorry, i will not give examples anymore when asking things here | 22:47 |
| → shush joined | 22:48 |
|
imMute
| can you restate the question please? | 22:48 |
|
andytoshi
| if I have two commits A and B, i want to find the closest ancestor of B which is in the first-parent history of A | 22:48 |
|
| i'm not sure what the best term for "first-parent history" is | 22:48 |
|
imMute
| I'm not sure if that's possible. why does it have to be the first parent history and not just all the history of A? | 22:49 |
| ← Xenguy left | 22:49 |
|
andytoshi
| because if B is later merged into A, then if i search the whole history of A | 22:49 |
|
| i'll just get B back | 22:49 |
|
| i'm trying to get the history of a feature branch in a way that will continue to work even after it's been merged into the trunk | 22:49 |
|
Hello71
| man git-merge-base | 22:50 |
|
gitinfo
| the git-merge-base manpage is available at https://gitirc.eu/git-merge-base.html | 22:50 |
|
Hello71
| your explanation is still not very clear. maybe you can get better help reading the man page | 22:50 |
| ← shush left | 22:50 |
|
andytoshi
| god it's like i'm on ##c | 22:50 |
| → shush joined | 22:50 |
|
andytoshi
| if i look at the history of A, taking only the first parent at each merge, i will get a linear list of commits | 22:51 |
|
| given a commit B, i want to find its closest ancestor which is in that list | 22:51 |
| ← tiin57 left | 22:51 |
|
imMute
| Hello71: the question makes sense to me now. it's the simple git merge-base master feature-branch but works even after feature-branch is merged into master. | 22:51 |
|
| works meaning returns the same result. | 22:52 |
| → minsec joined | 22:52 |
| → dqx joined | 22:52 |
|
andytoshi
| it's possible --fork-point will do what i want, it's named suggestively | 22:52 |
|
| but the description does not sound encouraging | 22:52 |
|
imMute
| andytoshi: that's w hat I thought too but it doesn't seem to be it. looks like it only uses the reflog | 22:52 |
| ← jabster28 left | 22:52 |
| → bryan92 joined | 22:52 |
|
andytoshi
| yeah, that's a pretty weird feature | 22:52 |
| → jabster28 joined | 22:53 |
|
andytoshi
| i guess most options in git are like this :P they solve a veery particular problem | 22:53 |
| ← dqx left | 22:53 |
| → tiin57 joined | 22:55 |
| ← minsec left | 22:56 |
| ← theoceaniscool left | 22:57 |
|
andytoshi
| i'm having a lot of trouble re-stating this without talking about first parents, at least in a way that doesn't sound intractible | 22:57 |
|
| e.g., given commits A and B, i'd like an ancestor of A such that every descendant of that ancestor is an ancestor of B | 22:58 |
|
| no that's still not right, that's the same as merge-base | 22:58 |
|
| i'd like an ancestor such that every descendent of every ancestor is an ancestor of B :P | 22:59 |
|
| but in practice really, i just want the intersection point between A's first-parent history and B's first-parent history | 22:59 |
|
| most recent intersection point* | 22:59 |
|
Hello71
| i still don't see how this isn't solved by git merge-base A^* B^*, notwithstanding that ^* doesn't exist | 23:02 |
|
andytoshi
| Hello71: because where i typed A in my example, i actually meant some arbitrary descendent of A | 23:02 |
|
| if i could find the actual merge point of B into master, i could use your solution | 23:04 |
|
| but all i have is the current position of master | 23:04 |
|
| but i think "the actual merge point of B into master" isn't well-defined | 23:05 |
| ← d-fence left | 23:05 |
| ← fachinformatiker left | 23:05 |
|
andytoshi
| though maybe "the first descendent of B which is a merge commit" might work in practice on the repos i'm looking at | 23:06 |
| ← jabster28 left | 23:06 |
| → jabster28 joined | 23:07 |
| → d-fence joined | 23:07 |
| ← orbyt_v7 left | 23:07 |
| ← riceandbeans left | 23:10 |
| → fachinformatiker joined | 23:11 |
| ← fachinformatiker left | 23:11 |
| → fachinformatiker joined | 23:11 |
| → va5c0 joined | 23:11 |
| ← va5c0 left | 23:11 |
| → minsec joined | 23:11 |
| → va5c0 joined | 23:11 |
| ← herren left | 23:11 |
| ← royal_screwup21 left | 23:12 |
| → royal_screwup21 joined | 23:12 |
|
Hello71
| "the most recent merge involving B" is well-defined but potentially time-consuming to compute | 23:14 |
| ← CodeSlingerPaul left | 23:14 |
|
andytoshi
| i think i've got it, iterating through the first parents of master until i find one which B is not an ancestor of. (this is n^2 in the number of descendents of B, but i'm not certain that i can do better) | 23:15 |
|
| then once i get that, i take the merge base with B | 23:15 |
| → sudomann joined | 23:15 |
| ← minsec left | 23:16 |
| ← mowcat left | 23:17 |
| ← royal_screwup21 left | 23:17 |
| ← sudomann_ left | 23:18 |
| ← tiin57 left | 23:21 |
| ← terrorjack left | 23:23 |
| → terrorjack joined | 23:24 |
| → tiin57 joined | 23:24 |
| ← jstein left | 23:24 |
| ← vikonen left | 23:25 |
| → vikonen joined | 23:25 |
| ← calcul0n_ left | 23:27 |
| ← al3x27 left | 23:28 |
| → Technodrome joined | 23:30 |
| ← jabster28 left | 23:30 |
| ← BrunoSpr left | 23:31 |
| → minsec joined | 23:32 |
| ← Mortir left | 23:34 |
| ← Kobaz left | 23:35 |
| ← mfiano left | 23:35 |
| → jabster28 joined | 23:35 |
| ← _Vi left | 23:36 |
| ← minsec left | 23:36 |
| ← jabster28 left | 23:44 |
| → jabster28 joined | 23:44 |
| ← schweby left | 23:44 |
| → Mortir joined | 23:45 |
| → schweby joined | 23:46 |
| → Blukunfando joined | 23:50 |
| ← tiin57 left | 23:51 |
| ← jabster28 left | 23:51 |
| → jabster28 joined | 23:51 |
| ← chachasmooth left | 23:52 |
| → chachasmooth joined | 23:52 |
| → royal_screwup21 joined | 23:52 |
| → tiin57 joined | 23:54 |
| ← royal_screwup21 left | 23:57 |
| ← jabster28 left | 23:58 |
| → jabster28 joined | 23:58 |
| ← amahl left | 23:59 |
| → minsec joined | 23:59 |