| 2017-04-09 |
|
garyserj
| ToxicFrog: so how do you see all of staging and not just the differences between staging and head? | 00:00 |
| → saul joined | 00:00 |
| → MattMaker joined | 00:01 |
| ← agusyc left | 00:02 |
| → h12o joined | 00:03 |
| → unbalancedparen joined | 00:05 |
| ← MattMaker left | 00:05 |
| ← drodger left | 00:07 |
| ← paws_ left | 00:07 |
| ← peepsalot left | 00:07 |
| ← h12o left | 00:08 |
| ← raijin left | 00:08 |
| → drodger joined | 00:09 |
| ← Cabanossi left | 00:11 |
| ← Jaggz left | 00:13 |
| → Cabanossi joined | 00:15 |
|
ToxicFrog
| No idea. That's not something I've ever needed to do. | 00:16 |
| ← pbrewczynski_ left | 00:17 |
| → mostlybadfly joined | 00:20 |
| ← porfiriopaiz left | 00:24 |
| → PresidentBiscuit joined | 00:24 |
| → kyan joined | 00:25 |
| → kexmex joined | 00:32 |
| → star_prone joined | 00:33 |
| → flaguy48_ joined | 00:34 |
| ← dersand left | 00:35 |
| ← constant left | 00:37 |
| → peepsalot joined | 00:37 |
| ← star_prone left | 00:37 |
| ← ivanfon left | 00:37 |
| → ivanfon joined | 00:38 |
| ← re1_ left | 00:42 |
| → BSaboia joined | 00:42 |
| ← menip left | 00:51 |
| ← King_Hual left | 00:52 |
| → hagridaaron joined | 00:54 |
| ← a3Dman left | 00:55 |
| ← chipotle_ left | 00:57 |
| → scoobert1on joined | 00:58 |
| → livingstn joined | 00:58 |
| → sbasso joined | 00:58 |
| ← kexmex left | 00:59 |
| → MattMaker joined | 01:01 |
| → tgies joined | 01:02 |
| ← tgies left | 01:02 |
| ← scoobertron left | 01:02 |
| ← MattMaker left | 01:06 |
| → a3Dman joined | 01:08 |
| ← sbasso left | 01:10 |
| ← hfp left | 01:10 |
| ← Cthalupa left | 01:10 |
| ← hfp_work left | 01:10 |
| → fstd_ joined | 01:10 |
| ← fstd_ left | 01:10 |
| → fstd_ joined | 01:10 |
| → Cthalupa joined | 01:11 |
| ← anuxivm left | 01:11 |
| ← fstd left | 01:12 |
| fstd_ → fstd | 01:12 |
| ← BSaboia left | 01:13 |
| ← mikecmpbll left | 01:13 |
| → star_prone joined | 01:14 |
| ← hagridaaron left | 01:15 |
| ← star_prone left | 01:18 |
|
garyserj
| the documentation for "git commit" says "Stores the current contents of the index in a new commit". Is "current contents of the index" another way of saying the contents that have been added to the index that aren't contained in the HEAD? | 01:18 |
| → hahuang61 joined | 01:19 |
|
tmg
| garyserj: perhaps you're looking for ls-tree | 01:20 |
| → pabs3 joined | 01:20 |
|
ToxicFrog
| tmg: wait, you can ls-tree the index? What do you pass as the treeish? | 01:20 |
|
| garyserj: no, it means the current contents of the index. Commits are stored as snapshots, not diffs. | 01:20 |
| ← ToBeCloud left | 01:21 |
|
ToxicFrog
| If you 'git add .; git commit', the resulting commit contains the entire state of the working tree, *not* just the bits that changed since the last commit. | 01:21 |
| ← sunri5e left | 01:22 |
| → sunri5e joined | 01:22 |
| → finalbeta joined | 01:22 |
| → hagridaaron joined | 01:22 |
| → Tobbi joined | 01:22 |
| ← hahuang61 left | 01:23 |
| → bitslip_ joined | 01:24 |
|
ToxicFrog
| `git status` and `git diff` show the differences because 90% of the time that's the only part you're interested in. | 01:24 |
|
| (likewise `git show`) | 01:24 |
| ← bitslip left | 01:25 |
| ← pks left | 01:26 |
| ← hagridaaron left | 01:26 |
| ← DarkPsydeLord left | 01:26 |
| → pks joined | 01:26 |
| ← Cthalupa left | 01:27 |
| ← dendazen left | 01:27 |
| ← tvw left | 01:27 |
| → Cthalupa joined | 01:28 |
| ← Cabanossi left | 01:28 |
| → Cabanossi joined | 01:29 |
| → hagridaaron joined | 01:29 |
|
pabs3
| is gitk still developed in the git repository? I've been trying to get a simple gitk patch in for a while, posted it 3 times so far: http://public-inbox.org/git/?q=gitk%3A+use+right+colour+for+remote+refs+in+the+%22Tags+and+heads%22+dialog | 01:29 |
| ← a3Dman left | 01:31 |
| → kbeflo joined | 01:31 |
| → MattMaker joined | 01:31 |
| ← flaguy48_ left | 01:32 |
|
tmg
| ToxicFrog: it's ls-files, not ls-tree | 01:32 |
| → alexggordon joined | 01:33 |
| ← hagridaaron left | 01:34 |
| ← sunri5e left | 01:36 |
| → flaguy48_ joined | 01:36 |
| → a3Dman joined | 01:37 |
| → hfp_work joined | 01:37 |
| → sunri5e joined | 01:37 |
| → hfp joined | 01:38 |
| ← Tobbi left | 01:38 |
| ← courrier left | 01:41 |
| → SwiftMatt joined | 01:41 |
| → thiago joined | 01:43 |
| → a_thakur joined | 01:43 |
| ← ilbot3 left | 01:46 |
| ← a3Dman left | 01:46 |
| → ilbot3 joined | 01:49 |
| ← kristofferR left | 01:49 |
| ← flaguy48_ left | 01:51 |
| ← marianina8 left | 01:55 |
| ← PresidentBiscuit left | 01:56 |
| → PresidentBiscuit joined | 01:57 |
| ← Darren_ left | 01:58 |
| → hagridaaron joined | 01:58 |
| ← PresidentBiscuit left | 02:01 |
| → a3Dman joined | 02:02 |
| → h12o joined | 02:06 |
| ← Fallen0223 left | 02:06 |
| ← hexagoxel left | 02:08 |
| ← a3Dman left | 02:08 |
| ← h12o left | 02:11 |
| ← publio left | 02:12 |
| → lagothri1 joined | 02:13 |
| → dendazen joined | 02:14 |
| → hexagoxel joined | 02:14 |
| ← Gustavo6046 left | 02:15 |
| → jameser joined | 02:15 |
| ← lagothrix left | 02:16 |
| → marianina8 joined | 02:17 |
| → xall joined | 02:18 |
| ← ojdo left | 02:18 |
| ← chachasmooth left | 02:21 |
| ← Starky left | 02:22 |
| → a3Dman joined | 02:23 |
| ← hagridaaron left | 02:24 |
| → aidalgol joined | 02:24 |
| → chachasmooth joined | 02:25 |
| → ojdo joined | 02:25 |
| ← jameser left | 02:25 |
| → star_prone joined | 02:26 |
| → wagle_ joined | 02:27 |
| → menip joined | 02:27 |
| ← justin2 left | 02:27 |
| ← a_thakur left | 02:28 |
| → a_thakur joined | 02:28 |
| → TikityTik joined | 02:28 |
| ← chris3492 left | 02:30 |
| lagothri1 → lagothrix | 02:30 |
| → chipotle joined | 02:31 |
| ← star_prone left | 02:31 |
| ← a_thakur left | 02:32 |
| ← drodger left | 02:32 |
| ← pifon left | 02:33 |
| ← unbalancedparen left | 02:33 |
| ← chachasmooth left | 02:33 |
| ← peepsalot left | 02:33 |
| ← wagle_ left | 02:33 |
| ← a3Dman left | 02:34 |
| → chachasmooth joined | 02:34 |
| → peepsalot joined | 02:35 |
| → Thorn__ joined | 02:35 |
| → jagob joined | 02:36 |
| ← Thorn__ left | 02:36 |
| ← chachasmooth left | 02:37 |
| → chachasmooth joined | 02:37 |
| ← chachasmooth left | 02:38 |
| → drodger joined | 02:38 |
| → chachasmooth joined | 02:39 |
| ← chachasmooth left | 02:41 |
| → chachasmooth joined | 02:42 |
| → a_thakur joined | 02:42 |
| ← Xandaros left | 02:43 |
| ← bjarki left | 02:44 |
| ← CheckDavid left | 02:44 |
| → d4rkl0rd joined | 02:44 |
| → chris3492 joined | 02:44 |
| → Xandaros joined | 02:44 |
| ← d4rkl0rd left | 02:45 |
| → d4rkl0rd joined | 02:45 |
| → a3Dman joined | 02:46 |
| ← peepsalot left | 02:46 |
| ← chipotle left | 02:50 |
| ← a3Dman left | 02:53 |
| → pionen joined | 02:54 |
| ← pionen left | 02:54 |
| ← getxsick left | 02:55 |
| → metaQuux joined | 02:56 |
| → raijin joined | 02:56 |
| → Vortex34 joined | 02:56 |
| ← pabs3 left | 02:57 |
| → cam27 joined | 02:57 |
| → pabs3 joined | 02:57 |
| ← stoopkid left | 02:57 |
| ← Vortex35 left | 02:59 |
| ← netj left | 02:59 |
| → shinnya joined | 03:00 |
| pabs3 → Guest32321 | 03:00 |
| → pabs3 joined | 03:00 |
| → a3Dman joined | 03:01 |
| → netj joined | 03:01 |
| ← chachasmooth left | 03:03 |
| ← xall left | 03:03 |
| ← Guest32321 left | 03:03 |
|
pabs3
| I have a git repo where the history of the remote version of the repo has been completely rewritten. is there a way to compare the history of the two repos and see which commits differ? | 03:04 |
| ← metaQuux left | 03:05 |
| → chachasmooth joined | 03:05 |
|
pabs3
| most of them appear to be exactly the same except the commit id | 03:05 |
| ← hvxgr left | 03:07 |
| → masuberu joined | 03:08 |
| ← orbyt_ left | 03:08 |
| ← gugah left | 03:12 |
| → dsdeiz joined | 03:13 |
| ← d4rkl0rd left | 03:15 |
| → peepsalot joined | 03:15 |
| → d4rkl0rd joined | 03:16 |
| ← d4rkl0rd left | 03:18 |
| → d4rkl0rd_1 joined | 03:18 |
| pabs3 → Guest30684 | 03:18 |
| ← Guest30684 left | 03:18 |
| → pabs3 joined | 03:18 |
| ← Goplat left | 03:18 |
| → jimi_ joined | 03:19 |
| ← d4rkl0rd_1 left | 03:19 |
| → hahuang61 joined | 03:19 |
| → d4rkl0rd joined | 03:19 |
| → hvxgr joined | 03:20 |
| → gk_1wm_su joined | 03:20 |
| ← a_thakur left | 03:21 |
| ← dreiss left | 03:21 |
| ← gk_1wm_su left | 03:23 |
| → JanC_ joined | 03:23 |
| ← pabs3 left | 03:23 |
| ← zivester left | 03:24 |
| → pabspabspabs joined | 03:24 |
| pabspabspabs → pabs3 | 03:24 |
| ← hahuang61 left | 03:24 |
| JanC → Guest95326 | 03:24 |
| ← Guest95326 left | 03:24 |
| JanC_ → JanC | 03:24 |
| ← nickel_dime_look left | 03:24 |
| ← pabs3 left | 03:24 |
| ← raijin left | 03:25 |
| → Qo027 joined | 03:25 |
| ← Qo027 left | 03:25 |
| → h12o joined | 03:25 |
| → d4rkl0rd_2 joined | 03:26 |
| ← ispn left | 03:26 |
| → njbair joined | 03:26 |
| → raijin joined | 03:26 |
| → Goplat joined | 03:26 |
| ← d4rkl0rd left | 03:27 |
| ← d4rkl0rd_2 left | 03:27 |
| → d4rkl0rd joined | 03:27 |
| → a_thakur joined | 03:28 |
| → inflames joined | 03:28 |
| ← d4rkl0rd left | 03:28 |
| ← ethali left | 03:31 |
| → Emperor_Earth joined | 03:31 |
| → ethali joined | 03:33 |
| ← a3Dman left | 03:35 |
| ← dendazen left | 03:35 |
| ← raijin left | 03:35 |
| ← drodger left | 03:40 |
| ← Cabanossi left | 03:41 |
| ← leeN left | 03:42 |
| → kristofferR joined | 03:43 |
| → Cabanossi joined | 03:44 |
| ← kbeflo left | 03:44 |
| → gk_1wm_su joined | 03:44 |
| ← jagob left | 03:46 |
| → drodger joined | 03:46 |
| → a3Dman joined | 03:47 |
| ← gk_1wm_su left | 03:47 |
| → dreiss joined | 03:50 |
| ← dsdeiz left | 03:53 |
| ← TikityTik left | 03:59 |
| ← a_thakur left | 03:59 |
| ← a3Dman left | 04:03 |
| ← cagmz left | 04:07 |
| → dsdeiz joined | 04:08 |
| ← dsdeiz left | 04:08 |
| → dsdeiz joined | 04:08 |
| → Nilesh_ joined | 04:12 |
| ← desnudopenguino left | 04:14 |
| ← alexggordon left | 04:14 |
| → a3Dman joined | 04:14 |
| ← masuberu left | 04:15 |
| → masuberu joined | 04:17 |
| ← theiostream left | 04:21 |
| → ShapeShifter499 joined | 04:23 |
| → fakenerd joined | 04:24 |
| ← Cabanossi left | 04:25 |
| → pavelpopov joined | 04:26 |
| → Cabanossi joined | 04:28 |
| → robattila256 joined | 04:28 |
| ← ZyX-I left | 04:38 |
| ← pavelpopov left | 04:38 |
| ← njbair left | 04:39 |
| ← masuberu left | 04:41 |
| ← dreiss left | 04:41 |
| → njbair joined | 04:42 |
| → rubyonrailed joined | 04:45 |
| → navidr joined | 04:46 |
| ← njbair left | 04:47 |
| → justanotheruser joined | 04:49 |
| → njbair joined | 04:49 |
| ← capuk left | 04:51 |
| ← PioneerAxon left | 04:51 |
| → PioneerAxon joined | 04:54 |
| → a_thakur joined | 04:57 |
| ← blackwind_123 left | 04:58 |
| ← a_thakur left | 05:01 |
| ← shinnya left | 05:01 |
| ← livingstn left | 05:06 |
| ← nomike31 left | 05:06 |
| ← SwiftMatt left | 05:08 |
| → bruce_lee joined | 05:08 |
| ← bruce_lee left | 05:08 |
| → bruce_lee joined | 05:08 |
| → dendazen joined | 05:10 |
| ← Cabanossi left | 05:10 |
| → alexggordon joined | 05:11 |
| ← h12o left | 05:12 |
| → Cabanossi joined | 05:14 |
| ← alexggordon left | 05:15 |
| ← njbair left | 05:16 |
| ← cam27 left | 05:16 |
| ← Peuc left | 05:19 |
| → njbair joined | 05:20 |
| → hahuang61 joined | 05:20 |
| → Peuc joined | 05:21 |
| ← HoierM left | 05:25 |
| ← hahuang61 left | 05:25 |
| → a_thakur joined | 05:26 |
| → nomike31 joined | 05:26 |
| ← diogenese left | 05:28 |
| → jesst joined | 05:29 |
| → diogenese joined | 05:29 |
| ← waveclaw left | 05:29 |
| → waveclaw joined | 05:30 |
| → raijin joined | 05:34 |
| ← a_thakur left | 05:39 |
| ← boombatower left | 05:40 |
| ← pks left | 05:43 |
| → pks joined | 05:43 |
| → zefferno joined | 05:47 |
| ← mehola left | 05:49 |
| → MrWoohoo joined | 05:50 |
| ← raijin left | 05:53 |
| → h12o joined | 05:53 |
| ← ivanfon left | 05:55 |
| ← dendazen left | 05:55 |
| → Noldorin joined | 05:57 |
| → chipotle joined | 05:57 |
| → _ng joined | 06:01 |
| → Introoter joined | 06:05 |
| ← jesst left | 06:07 |
| ← rubyonrailed left | 06:10 |
| → jesst joined | 06:10 |
| ← Goplat left | 06:14 |
| ← pks left | 06:20 |
| ← chipotle left | 06:20 |
| → pks joined | 06:20 |
| ← rivarun left | 06:23 |
| → rivarun joined | 06:23 |
| ← swalladge left | 06:25 |
| → jesst_ joined | 06:33 |
| ← fmeerkoetter left | 06:33 |
| ← jesst left | 06:37 |
| → fmeerkoetter joined | 06:40 |
| ← Cabanossi left | 06:41 |
| → Cabanossi joined | 06:43 |
| ← MattMaker left | 06:44 |
| ← h12o left | 06:47 |
| ← chris3492 left | 06:48 |
| → pwnz0r joined | 06:51 |
| → dimi1947 joined | 06:53 |
| → chris3492 joined | 06:53 |
| → sbulage joined | 06:54 |
| → User458764 joined | 06:54 |
| ← dimi1947 left | 06:54 |
| ← kristofferR left | 06:54 |
| → FartMan696969 joined | 06:56 |
|
FartMan696969
| omfg http://tinyurl.com/le5v3v6 amazing link everyone click it | 06:56 |
|
| its lesbian fetish porn lol | 06:56 |
| → PresidentBiscuit joined | 06:57 |
| → schleppel joined | 07:00 |
| ← zefferno left | 07:01 |
| ← QwertyDragon left | 07:02 |
| ← menip left | 07:02 |
| ← PresidentBiscuit left | 07:02 |
| ← mmlb left | 07:02 |
| → zefferno joined | 07:02 |
| → mmlb joined | 07:03 |
|
FartMan696969
| dammit they kickbanned me on #minecraft for mass pinging | 07:03 |
|
| time to try here | 07:03 |
|
| gitinfo, belak, da5id, emaz, garyserj, mjuhl, Nitesh, Shavik, [diecast], _28_ria, __builtin, __main__, __name__, _cyril_, _ikke_, _ng, _Patrick_, _rgn, _Vi, _W_, `mx, a3Dman, Aaeriele, Aaron1011, abh: | 07:03 |
|
| ablackack, aboccia, abra0, aca20031, AciD`, acln, adamm, addshore, adgtl-, adymitruk, aendrew, ahammond, ahf, ahrs, aidalgol, ajpiano, akkad, AKPWD, albel727, alcohol, aleb, AlexanderS, alexandre9099, AlgorithmWizard, AlHafoudh: | 07:04 |
|
| alphor, altendky, am2on, am55, ams__, anbz, anderson, Andre_work, andres, AndrewGazelka, andschwa_, angseus, angular_mike_, Anja, Ankhers, anolir, anonnumberanon, anry, Anthaas_, APic, arand, arand__, Ardethian, Arguggi_, ariver: | 07:04 |
|
| Arkaniad, armin, armyriad, Arokh, arooni, artgoeshere, asd5a, ashnur, aspiers, AstralStorm, Atm0spher1c, atomi, atrus-, austin987, AustinMatherne, avar, averell, aviraldg, Awesomecase, axisys, azerus, b0nn, babilen, BackEndCoder, bambams: | 07:04 |
|
| bannakaffalatta, barq, barteks2x, batrick, bauruine, bbhoss, bcardarella, bcc, bdeferme, bdesmet, beaky, BeerSerc, bejeb, BenderRodriguez, Bengi, berndj, beuker, bgamari, bgerber, Bigcheese, Bilge-, BinGOs, bipolar, bitslip_, bittyx: | 07:04 |
|
| bjoe2k4_, bket, bl0m1_, bl0w3d_0ut, BlackPanx, blahdodo, BlaXpirit, BlessJah, Blkt, blr, BlueMatt, bluepixel, blueyed, Bock, bodie_, Bombe, bond, BooK, boshhead, boubou, bouncy, boxrick1, boz_v1, brandonw_, bratchley: | 07:05 |
|
| bremner, brennz, brewmaster, brokensyntax, brschaefer, bruce_lee, bsanford, bttf, Bucciarati, buck1, bumbar, bwn, byte512, c0, c0ded, Cabanossi, caffeinatedcode, caliculk, CalimeroTeknik, Calinou, canton7, Captain_Beezay, carousel, catern, Cathy: | 07:05 |
|
| catsup, causasui, cbreak, cebor, Celelibi, CEnnis91, Cerise, cfoch-always, chachasmooth, chadi, chamunks, Chaser, Chinorro, chovy, chris3492, chrisml, chrysa, chu, cite, cjohnson, cliluw, cloudcell_, cmalmber, cmn, cmosguy: | 07:05 |
|
| coasterz, codebam, codedmart, ColdKeyboard, colona, comps, contracode, Cork, covey, crater2150, creppe, cschneid, cspotcode, cstrahan, Cthalupa, cttttt, CussBot, cust, CustosLim3n, cwillu_at_work, cworth, cwre, cxreg, cydrobolt, cyphase: | 07:06 |
|
| d-fence_, d1b_, daishan, dan2k3k4, Dandelock: | 07:06 |
| ← jesst_ left | 07:06 |
|
FartMan696969
| LMFAO http://tinyurl.com/le5v3v6 | 07:06 |
| → sbasso joined | 07:07 |
| → g0d355__ joined | 07:07 |
| → baratheon joined | 07:07 |
| ← jimi_ left | 07:08 |
| → dreiss joined | 07:09 |
|
asd5a
| Time for a gline? | 07:09 |
| ← FartMan696969 left | 07:10 |
| ← marianina8 left | 07:10 |
| → marianina8 joined | 07:10 |
| → jesst_ joined | 07:11 |
|
dmc
| asd5a, close | 07:11 |
|
Seveas
| or a life... | 07:11 |
| ← zefferno left | 07:11 |
|
AciD`
| a +r on this chan would solve this in an instant | 07:11 |
| → ismithers joined | 07:11 |
| ← User458764 left | 07:11 |
| → zefferno joined | 07:12 |
|
asd5a
| Clearly the Adkins of freenode are more merciful than me | 07:12 |
|
| But that reminds me I need to check my umode | 07:12 |
|
| The spammer sent notices | 07:13 |
| ← marianina8 left | 07:15 |
| → griff joined | 07:15 |
| → mehola joined | 07:17 |
| → javahorn joined | 07:17 |
|
javahorn
| Hi | 07:18 |
| ← baratheon left | 07:18 |
| ← zefferno left | 07:19 |
| ← madewokherd left | 07:20 |
| ← cyphase left | 07:21 |
| → hahuang61 joined | 07:21 |
| ← mehola left | 07:21 |
| → t0by joined | 07:22 |
| ← pwnz0r left | 07:24 |
| ← sbasso left | 07:24 |
| → sbasso joined | 07:25 |
| ← Milos left | 07:25 |
| → zefferno joined | 07:25 |
| ← hahuang61 left | 07:26 |
| ← pks left | 07:27 |
| → pks joined | 07:27 |
| ChanServ set mode: +o | 07:28 |
| bremner set mode: +b | 07:29 |
| ← sbasso left | 07:29 |
| ChanServ set mode: -o | 07:30 |
| → YuGiOhJCJ joined | 07:32 |
| → Plippz joined | 07:34 |
| Plippz → Ploppz | 07:35 |
| ← Noldorin left | 07:36 |
| ← pks left | 07:36 |
| → pks joined | 07:37 |
| ← tnecniv left | 07:40 |
| → xaa__ joined | 07:43 |
| → tnecniv joined | 07:43 |
|
Ploppz
| `git submodule update --recursive` failed ("Direct fetching of that commit failed" in one of the submodules), even though I had just run `git fetch --recurse-submodules` | 07:46 |
| → cyphase joined | 07:48 |
| → sbasso joined | 07:49 |
| ← thiago left | 07:50 |
| → raijin joined | 07:51 |
| ← carousel left | 07:52 |
| ← Cabanossi left | 07:55 |
| → jagob joined | 07:57 |
| ← fragMental left | 07:58 |
| ← tnecniv left | 07:58 |
| → Cabanossi joined | 07:58 |
| ← raijin left | 07:59 |
| → Milos joined | 08:00 |
| ← __main__ left | 08:04 |
| → __main__ joined | 08:05 |
| → raijin joined | 08:06 |
| → TbobbyZ joined | 08:07 |
| ← TbobbyZ left | 08:07 |
| → TbobbyZ joined | 08:07 |
| → Endarked joined | 08:09 |
| → vuoto joined | 08:11 |
| ← raijin left | 08:13 |
| rivarun → Guest94130 | 08:14 |
| ← Guest94130 left | 08:14 |
| → rivarun joined | 08:14 |
| ← Milos left | 08:14 |
| → flavius joined | 08:16 |
| → ok91 joined | 08:16 |
| → mehola joined | 08:18 |
| → raijin joined | 08:18 |
|
Seveas
| Ploppz: smells like the host for that submodule needs allowreachablesha1inwant sent | 08:18 |
| ← griff left | 08:21 |
| ← mehola left | 08:23 |
| ← safe left | 08:23 |
| ← sbasso left | 08:24 |
| → sbasso joined | 08:24 |
| ← raijin left | 08:26 |
| → Milos joined | 08:26 |
|
Ploppz
| I think the problem might have been that I wasn't checked out on master in one of the submodules. Is that plausible, Seveas ? | 08:26 |
| ← netj left | 08:27 |
| ← sbasso left | 08:29 |
| → netj joined | 08:29 |
| → alexggordon joined | 08:30 |
|
Seveas
| plausible, because that's entirely normal. Submodules are check out onto a specific commit, not a branch. | 08:30 |
| ← sbulage left | 08:31 |
| ← bannakaffalatta left | 08:31 |
| → bannakaf_ joined | 08:32 |
| ← TbobbyZ left | 08:33 |
| → TbobbyZ joined | 08:33 |
| ← alexggordon left | 08:35 |
| ← vuoto left | 08:35 |
| → borkr joined | 08:36 |
| ← TbobbyZ left | 08:38 |
| → govg joined | 08:38 |
| ← Milos left | 08:39 |
|
Ploppz
| Seveas: so it should not be a problem that I was not checkout out on master ? | 08:40 |
| ← jonez left | 08:43 |
|
Seveas
| correct | 08:46 |
| → rumble joined | 08:46 |
| → kbeflo joined | 08:48 |
| → User458764 joined | 08:49 |
| → ispn joined | 08:54 |
| ← a3Dman left | 08:54 |
| ← MineCoins left | 08:55 |
| → jonez joined | 08:55 |
| ← grumble left | 08:56 |
| ← pks left | 08:56 |
| → pks joined | 08:56 |
| ← r0ry left | 08:57 |
| ← neunon left | 08:57 |
| → vuoto joined | 09:00 |
| → neunon joined | 09:01 |
| ← ertes left | 09:01 |
| → Milos joined | 09:01 |
| ← PaulCapestany left | 09:01 |
| → a3Dman joined | 09:01 |
| → aax joined | 09:03 |
| ← kyan left | 09:05 |
| ← xaa__ left | 09:07 |
| ← ismithers left | 09:11 |
| → marianina8 joined | 09:11 |
| → Jackneill joined | 09:12 |
| ← aidalgol left | 09:14 |
| ← marianina8 left | 09:16 |
| ← User458764 left | 09:16 |
| → PaulCapestany joined | 09:18 |
| ← neunon left | 09:18 |
| → neunon joined | 09:20 |
| → overlord_tm joined | 09:21 |
| → SteffanW joined | 09:22 |
| → hahuang61 joined | 09:22 |
| ← steve left | 09:23 |
| → ismithers joined | 09:23 |
| ← drodger left | 09:24 |
| ← hahuang61 left | 09:28 |
|
ronny
| hi | 09:28 |
| → masuberu joined | 09:28 |
| → TbobbyZ joined | 09:28 |
|
ronny
| is there a inexpensive way to figure the current branch /what branch the current checkout "belongs" to? | 09:29 |
| → drodger joined | 09:31 |
| ← catsup left | 09:31 |
| → catsup joined | 09:31 |
| ← catsup left | 09:32 |
| → catsup joined | 09:32 |
| → leeN joined | 09:33 |
| ← sarri left | 09:34 |
| → sbasso joined | 09:36 |
| ← inflames left | 09:39 |
|
grawity
| git symbolic-ref HEAD | 09:41 |
| → inflames joined | 09:41 |
|
grawity
| with fallback to `git rev-parse --short HEAD` in case it's not actually on a branch | 09:41 |
| ← rivarun left | 09:42 |
| → rivarun joined | 09:42 |
| ← neunon left | 09:42 |
| → neunon joined | 09:43 |
| ← vuoto left | 09:44 |
| → vuoto joined | 09:46 |
| → HoloIRCUser3 joined | 09:46 |
| ← HoloIRCUser3 left | 09:47 |
| ← neunon left | 09:50 |
| → neunon joined | 09:52 |
| ← TbobbyZ left | 09:53 |
| → TbobbyZ joined | 09:53 |
| → Tobbi joined | 09:56 |
| ← aax left | 09:56 |
| ← neunon left | 09:57 |
| ← Cabanossi left | 09:57 |
| → Cabanossi joined | 09:57 |
| ← TbobbyZ left | 09:58 |
| → King_Hual joined | 10:01 |
| → neunon joined | 10:02 |
| rumble → grumble | 10:02 |
| → Murii joined | 10:02 |
| → EDAKIRI joined | 10:04 |
| ← jesst_ left | 10:05 |
| → bitslip joined | 10:06 |
| ← bitslip_ left | 10:07 |
| ← thinkpad left | 10:08 |
| ← ok91 left | 10:09 |
| ← neunon left | 10:09 |
| → neunon joined | 10:10 |
| ← alexandre9099 left | 10:10 |
| → alexandre9099 joined | 10:11 |
| → thinkpad joined | 10:11 |
| → karols146 joined | 10:11 |
| → mikecmpbll joined | 10:12 |
| → kristofferR joined | 10:13 |
| ← thinkpad left | 10:14 |
| ← dreiss left | 10:14 |
| ← neunon left | 10:15 |
| → Acerific joined | 10:15 |
| → thinkpad joined | 10:16 |
| → kbeflo_ joined | 10:16 |
| → earnestly joined | 10:17 |
| → ZyX-I joined | 10:18 |
| ← lucasem left | 10:18 |
| → mehola joined | 10:19 |
| ← kbeflo left | 10:20 |
| → neunon joined | 10:20 |
| → nickel_dime_look joined | 10:20 |
| → ertes joined | 10:21 |
| ← kbeflo_ left | 10:21 |
| ← mehola left | 10:23 |
| → choki joined | 10:24 |
| ← SteffanW left | 10:25 |
| → courrier joined | 10:26 |
| ← lolopolosko left | 10:28 |
| → lolopolosko joined | 10:30 |
| ← lolopolosko left | 10:30 |
| → lolopolosko joined | 10:31 |
| ← lolopolosko left | 10:31 |
| → lolopolosko joined | 10:32 |
| → ok91 joined | 10:32 |
| ← lolopolosko left | 10:32 |
| → re1 joined | 10:32 |
| → dersand joined | 10:33 |
| → lolopolosko joined | 10:33 |
| ← lolopolosko left | 10:34 |
| → lolopolosko joined | 10:34 |
| → lucasem joined | 10:35 |
| → raijin joined | 10:35 |
| → kexmex joined | 10:38 |
| ← raijin left | 10:39 |
| ← re1 left | 10:44 |
| → rorro joined | 10:48 |
| ← Atm0spher1c left | 10:48 |
| ← _Vi left | 10:48 |
| → CheckDavid joined | 10:50 |
| ← exotime left | 10:50 |
| ← alexandre9099 left | 10:50 |
| → exotime joined | 10:52 |
| → jesst_ joined | 10:52 |
| ← ShapeShifter499 left | 10:53 |
| → getxsick joined | 10:54 |
| → aielima joined | 10:55 |
| ← chris3492 left | 10:57 |
| → PresidentBiscuit joined | 10:58 |
| → alexandre9099 joined | 10:59 |
| → chris3492 joined | 11:01 |
| ← PresidentBiscuit left | 11:02 |
| ← sbasso left | 11:02 |
| → sbasso joined | 11:03 |
| ← mostlybadfly left | 11:05 |
| ← sbasso left | 11:07 |
| → ShapeShifter499 joined | 11:12 |
| ← choki left | 11:14 |
| → Leonardo-1 joined | 11:15 |
| ← Leonardo-1 left | 11:15 |
| ← Impaloo left | 11:15 |
| → Impaloo joined | 11:17 |
| ← karols146 left | 11:17 |
| → hahuang61 joined | 11:24 |
| ← tmg left | 11:27 |
| ← pks left | 11:28 |
| ← hahuang61 left | 11:28 |
| ← drodger left | 11:29 |
| → pks joined | 11:29 |
| → drodger joined | 11:30 |
| ← rorro left | 11:30 |
| ← drodger left | 11:30 |
| ← inflames left | 11:31 |
| ← leah2 left | 11:34 |
| → tmg joined | 11:34 |
| → h12o joined | 11:35 |
| → drodger joined | 11:36 |
| ← h12o left | 11:40 |
| → buzzLightBeer joined | 11:43 |
| → wm4 joined | 11:47 |
| ← telephone left | 11:47 |
|
wm4
| what's a good way to rebase a feature branch to the current branch and checking it out at the same time? I usually do "git checkout branchname && git rebase master", but that's annoying because it makes my editor reload everything and the build system will rebuld everything | 11:48 |
|
| you could also do it manually by cherry-picking all commits into the current branch, and then renaming all the branch labels | 11:49 |
| → leah2 joined | 11:49 |
| ← Acerific left | 11:50 |
| → telephone joined | 11:50 |
| ← telephone left | 11:50 |
| → telephone joined | 11:50 |
| → rokups joined | 11:51 |
| → cdown joined | 11:51 |
| → _Vi joined | 11:52 |
| ← Tobbi left | 11:54 |
| → alexggordon joined | 11:55 |
| ← Cabanossi left | 11:55 |
| ← jesst_ left | 11:56 |
| → jesst joined | 11:56 |
| ← bwn left | 11:56 |
| → sarri joined | 11:57 |
| ← sarri left | 11:57 |
| → sarri joined | 11:57 |
| ← robotroll left | 11:57 |
| ← _Vi left | 11:59 |
| → Cabanossi joined | 11:59 |
| ← t0by left | 12:01 |
| ← alexandre9099 left | 12:01 |
| → alexandre9099_ joined | 12:01 |
| ← cdown left | 12:01 |
| alexandre9099_ → alexandre9099 | 12:02 |
| → bwn joined | 12:04 |
| ← am55 left | 12:05 |
| → robotroll joined | 12:05 |
| ← buzzLightBeer left | 12:09 |
| ← ethali left | 12:10 |
| → User458764 joined | 12:11 |
| → stoopkid joined | 12:12 |
| → shinnya joined | 12:12 |
| → am55 joined | 12:13 |
| → Tobbi joined | 12:14 |
| → ethali joined | 12:16 |
| → h12o joined | 12:17 |
| ← davimore left | 12:19 |
| → mehola joined | 12:20 |
| ← dsantiago left | 12:20 |
| ← h12o left | 12:21 |
| → steve joined | 12:23 |
| → dsantiago joined | 12:23 |
| ← howdoi left | 12:23 |
| ← mehola left | 12:24 |
| ← Cabanossi left | 12:26 |
| → Cabanossi joined | 12:27 |
|
_ikke_
| wm4: git rebase takes a 2nd parameter that tells git what branch it should 'checkout' | 12:29 |
| → p4trix joined | 12:29 |
|
earnestly
| _ikke_: Making the branch the 3rd parameter in `git rebase master branchname'? | 12:31 |
| → jimi_ joined | 12:32 |
| → MineCoins joined | 12:32 |
| ← leah2 left | 12:34 |
| ← utrack left | 12:34 |
| ← ethali left | 12:35 |
| ← wagle left | 12:35 |
| → utrack joined | 12:35 |
|
_ikke_
| well, rebase is a subcommand, making master the 1st argument, and branchname the 2nd | 12:35 |
| → wagle joined | 12:35 |
| → GingerGeek joined | 12:36 |
| ← GingerGeek left | 12:36 |
| → GingerGeek joined | 12:36 |
| ← utrack left | 12:36 |
| → utrack joined | 12:36 |
|
earnestly
| Fair enough | 12:37 |
| → ethali joined | 12:37 |
| ← utrack left | 12:38 |
| → utrack joined | 12:38 |
| ← GingerGeek left | 12:40 |
| ← EDAKIRI left | 12:40 |
| ← telephone left | 12:41 |
| ← utrack left | 12:42 |
| → telephone joined | 12:42 |
| ← telephone left | 12:42 |
| → telephone joined | 12:42 |
| → utrack joined | 12:44 |
| → h12o joined | 12:44 |
| → rorro joined | 12:47 |
|
wm4
| _ikke_: which one? I don't see how I can achieve what I want with a single rebase command (unless the feature branch is already checked out, which would be against the point of this) | 12:47 |
| → leah2 joined | 12:48 |
| → raijin joined | 12:48 |
| ← kexmex left | 12:48 |
| ← h12o left | 12:49 |
| → Raed|Mobile joined | 12:49 |
| → karols146 joined | 12:50 |
|
_ikke_
| wm4: git rebase master feature would first checkout feature, and then rebase onto master | 12:51 |
|
ojacobson
| however if your editor and build are triggered by writes then the checkout isn't the issue | 12:51 |
|
| rebase will cause a number of spurious builds as it reconstitutes the branch, with or without an initial checkout | 12:51 |
| ← a3Dman left | 12:52 |
| ← karols146 left | 12:52 |
|
wm4
| ojacobson: usually manually doing what I want avoids too much annoyance for editor/rebuilds | 12:52 |
| → karols146 joined | 12:53 |
|
j416
| wm4: can you not set your editor to not rebuild directly on change but wait for a second or two? | 12:53 |
| ← karols146 left | 12:53 |
|
j416
| or maybe manually trigger a build..? | 12:54 |
| → kbeflo joined | 12:54 |
|
j416
| my editor does _nothing_ when files change; I quite prefer it this way | 12:54 |
| ← bl0w3d_0ut left | 12:55 |
| ← raijin left | 12:56 |
| ← courrier left | 12:57 |
| → canoon joined | 12:57 |
| ← ok91 left | 12:57 |
| → Gustavo6046 joined | 12:58 |
| → a3Dman joined | 12:58 |
| → xall joined | 12:58 |
| → kbeflo_ joined | 12:59 |
| ← Gustavo6046 left | 12:59 |
| → Gustavo6046 joined | 12:59 |
| → kexmex joined | 12:59 |
| ← kbeflo left | 13:02 |
| ← nomike31 left | 13:02 |
| → miklcct joined | 13:03 |
| → karols146 joined | 13:03 |
| ← miklcct_ left | 13:04 |
| → eihabarabia joined | 13:06 |
| → bl0w3d_0ut joined | 13:08 |
| → rominronin joined | 13:09 |
| → chipotle joined | 13:09 |
| ← karols146 left | 13:11 |
| → karols146 joined | 13:12 |
| → marianina8 joined | 13:13 |
| → eahmedshendy joined | 13:13 |
| ← bannakaf_ left | 13:14 |
| ← marianina8 left | 13:17 |
| → TikityTik joined | 13:18 |
| ← dsdeiz left | 13:18 |
| ← eihabarabia left | 13:18 |
| ← mikecmpbll left | 13:18 |
| ← ethali left | 13:18 |
| ← User458764 left | 13:19 |
| ← alexggordon left | 13:19 |
| → thebope joined | 13:20 |
| → ordolizard joined | 13:21 |
| ← neunon left | 13:22 |
| → nomike31 joined | 13:23 |
| → hahuang61 joined | 13:25 |
| → Mysterious_Light joined | 13:26 |
| ← tmg left | 13:28 |
| ← ZyX-I left | 13:28 |
| → neunon joined | 13:29 |
| ← hahuang61 left | 13:30 |
| → ReptilianBrain joined | 13:30 |
| → bannakaffalatta joined | 13:31 |
|
Vaelatern
| How might I, using libgit2, figure out if a commit hash is an ancestor of the current HEAD? What I want to do is be able to, given a hash, try and check out that commit (so all workers are in the same place). | 13:34 |
|
| There is git_commit_nth_gen_ancestor but that is probably the Wrong Way to do this, especially with a lot of commits. | 13:35 |
| ← karols146 left | 13:35 |
| ← canoon left | 13:38 |
| ← vuoto left | 13:38 |
| ← MillerBoss left | 13:39 |
| → Starky joined | 13:39 |
| → MillerBoss joined | 13:39 |
| → karols146 joined | 13:40 |
| gitinfo set mode: +v | 13:45 |
|
Mysterious_Light
| Hello! I am git newbie. Today I decided to study git rebase. I cloned git repo with ~100 commits, ran git rebase -i --root and closed a text editor. Nothing is expected (because no change is made). An error "could not apply 07cdbaf..." occured. Why? What does that mean? | 13:45 |
| → rosiu joined | 13:45 |
| ← prg3 left | 13:47 |
| → prg3 joined | 13:48 |
|
_ikke_
| Mysterious_Light: are there merge commits? | 13:52 |
| ← bannakaffalatta left | 13:53 |
| → cam27 joined | 13:53 |
| ← mrcirca left | 13:53 |
|
Mysterious_Light
| no, they are commits in the middle of a commit chain | 13:54 |
| → Jackneill_ joined | 13:54 |
| ← nowhereman left | 13:54 |
|
Mysterious_Light
| It seems I misunderstood your question | 13:55 |
|
_ikke_
| Right, are there any merges in the project | 13:56 |
| ← Jackneill left | 13:56 |
|
_ikke_
| Note that git rebase by default linearizes history, which can cause these kinds of conflicts | 13:56 |
|
Mysterious_Light
| Yes, there are merge commits and several branches | 13:56 |
| ← shinnya left | 13:56 |
|
Mysterious_Light
| Am I correct that git rebase flattens a history of all the branches whose commits are reachable directly from the head? | 13:57 |
| → ZyX-I joined | 13:57 |
|
_ikke_
| It takes all commits, and applies them one after the other, not recreating any merges | 13:58 |
|
| (there is a --preserve-merges parameter) | 13:58 |
| → dendazen joined | 13:59 |
| ← bl0w3d_0ut left | 13:59 |
| ← ReptilianBrain left | 13:59 |
| ← karols146 left | 14:00 |
| → howdoi joined | 14:00 |
| → eizua joined | 14:01 |
| → ReptilianBrain joined | 14:04 |
| ← pks left | 14:04 |
| → roby10 joined | 14:04 |
| → pks joined | 14:05 |
| → nd_ joined | 14:07 |
| → PresidentBiscuit joined | 14:08 |
| → fees joined | 14:10 |
| ← nd left | 14:10 |
| → bl0w3d_0ut joined | 14:12 |
| ← PresidentBiscuit left | 14:13 |
| ← ReptilianBrain left | 14:15 |
| ← Zialus left | 14:17 |
| → Marumarsu joined | 14:19 |
| → Zialus joined | 14:19 |
| ← felixjet left | 14:20 |
| → felixjet joined | 14:20 |
| → vuoto joined | 14:20 |
| → mehola joined | 14:20 |
| → User458764 joined | 14:22 |
| ← User458764 left | 14:22 |
| ← MineCoins left | 14:22 |
| → User458764 joined | 14:23 |
| ← kexmex left | 14:24 |
| ← mehola left | 14:25 |
| → r0ry joined | 14:26 |
| → r0ry` joined | 14:26 |
| ← r0ry` left | 14:26 |
| ← jimi_ left | 14:28 |
| → aax joined | 14:29 |
| → marianina8 joined | 14:31 |
| ← thebope left | 14:32 |
| → thebope joined | 14:33 |
| ← rwb left | 14:33 |
| ← drodger left | 14:34 |
| ← wm4 left | 14:34 |
| ← Marumarsu left | 14:37 |
| ← mda1 left | 14:37 |
| ← thebope left | 14:37 |
| → mda1 joined | 14:37 |
| → tristanp joined | 14:38 |
| ← tristanp left | 14:38 |
| → Marumarsu joined | 14:38 |
| → tristanp joined | 14:38 |
| → drodger joined | 14:40 |
| → mikecmpbll joined | 14:42 |
| ← tristanp left | 14:43 |
| ← _ng left | 14:44 |
| ← drodger left | 14:44 |
| ← YuGiOhJCJ left | 14:44 |
| → dreiss joined | 14:44 |
| → SwiftMatt joined | 14:45 |
| → tristanp joined | 14:47 |
| → nowhereman joined | 14:50 |
| ← Marumarsu left | 14:51 |
| → ziombelas joined | 14:51 |
| → Marumarsu joined | 14:51 |
| ← jesst left | 14:52 |
| ← Marumarsu left | 14:53 |
| → Marumarsu joined | 14:54 |
| → ethali joined | 14:54 |
| → drodger joined | 14:55 |
| → onla joined | 14:55 |
|
onla
| I am trying to make a backup of local repository to another drive | 14:55 |
|
| I tried with `pass git remote add passi /media/onla/passi` and it gave no output, and then I pushed and it says it seems not to be a repository https://ptpb.pw/x7IJ | 14:56 |
|
j416
| !backup | 14:57 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 14:57 |
| → jimi_ joined | 14:57 |
| ← iamthad left | 14:58 |
| ← SwiftMatt left | 14:59 |
| ← Starky left | 15:00 |
| → TheDcoder joined | 15:00 |
| → iamthad joined | 15:01 |
| → kexmex joined | 15:02 |
|
TheDcoder
| Hi, I have a question regarding the phrasing which should be used in commit summery. In this article: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html it is recommended that "Fix" should be used instead of "Fixed". I am using "Fixed" for all of my commits until now... do you think I should start using "Fix"? What would be the best option? | 15:03 |
| → _ng joined | 15:04 |
| → xub joined | 15:04 |
| ← chris3492 left | 15:04 |
| ← borkr left | 15:05 |
|
onla
| I wonder if this is a problem when copying files with cp -a "cp: failed to preserve ownership for ‘/media/onla/.password-store040917’: Function not implemented" This happens with all files I copy to the usb key so it's not related to git etc, but I wonder how it affects in this case | 15:05 |
| ← xub left | 15:06 |
|
grawity
| onla: did you `git init [--bare]` that new repository first? | 15:06 |
| → BSaboia joined | 15:06 |
| ← javahorn left | 15:07 |
|
onla
| grawity: no. But I guess I use this cp -a that j416's message says as it's simpler. Although I would need to do a new cp later if things changed and copy everything again, and not just changes but that's not problem I guess | 15:07 |
| → HuskyApocalypse joined | 15:08 |
|
j416
| TheDcoder: "Fix". | 15:08 |
| ← _ng left | 15:08 |
|
grawity
| onla: you both are kinda missing the point here | 15:09 |
|
onla
| me and? :) | 15:09 |
| → chris3492 joined | 15:10 |
| → capuk joined | 15:10 |
|
onla
| so if I did the git init on the new repository, then the things I did should work and should be a viable option? | 15:10 |
|
TheDcoder
| onla: you and j416 | 15:10 |
|
j416
| ? | 15:10 |
|
TheDcoder
| that message was a reply to onla, not related to my question :) | 15:11 |
| → Uneliasmarsu joined | 15:11 |
| ← Uneliasmarsu left | 15:11 |
|
TheDcoder
| Thanks for the input j416 | 15:11 |
|
j416
| yes but what do I have to do with that | 15:11 |
| ← Tobbi left | 15:11 |
| → unbalancedparen joined | 15:12 |
| → dvaske_ joined | 15:12 |
|
TheDcoder
| (s)he mentioned you in her question | 15:12 |
|
onla
| gitinfo's message it was i'm sorry | 15:12 |
|
TheDcoder
| oh, so wrong mention | 15:12 |
| ← dvaske left | 15:12 |
|
j416
| ¯\_(ツ)_/¯ | 15:13 |
|
TheDcoder
| ¯\_(ツ)_/¯ | 15:13 |
| ← ethali left | 15:13 |
| gitinfo set mode: +v | 15:13 |
| gitinfo set mode: +v | 15:14 |
|
onla
| i'm running these commands through pass, so I wonder if I should `pass git init --bare` or just `git init --bare` | 15:14 |
|
TheDcoder
| what is pass? | 15:15 |
|
onla
| I mean I was instructed to run `pass git remote add <name> <path> | 15:15 |
|
| password storing program, the working dir has a .git dir inside it | 15:15 |
|
TheDcoder
| you should use pass if you are instructed to use it | 15:16 |
|
| you know better | 15:16 |
|
j416
| onla: perhaps the person instructing you to do that could help you out more or point you to relevant documentation | 15:17 |
| → raijin joined | 15:17 |
| ← TheDcoder left | 15:18 |
| → karols146 joined | 15:18 |
|
onla
| yeah, i'm asking but they afk now | 15:19 |
| ← nicolai86 left | 15:19 |
|
onla
| https://matrix.org/_matrix/media/v1/download/matrix.org/WyIXrxYOBVpxMaxwaXihfNCN | 15:19 |
| ← Marumarsu left | 15:21 |
| → kbeflo__ joined | 15:21 |
| ← raijin left | 15:22 |
| ← vuoto left | 15:23 |
| → Marumarsu joined | 15:23 |
| ← kbeflo__ left | 15:23 |
| → Starky joined | 15:23 |
| → kbeflo__ joined | 15:23 |
| ← kbeflo_ left | 15:23 |
| ← mda1 left | 15:24 |
| → mda1 joined | 15:24 |
| ← kbeflo__ left | 15:25 |
| ← zefferno left | 15:25 |
| ← Cabanossi left | 15:26 |
| → kbeflo__ joined | 15:26 |
| → nicolai86 joined | 15:26 |
| → hahuang61 joined | 15:26 |
| → Uneliasmarsu joined | 15:26 |
| ← kbeflo__ left | 15:27 |
| ← Zialus left | 15:27 |
| ← Marumarsu left | 15:28 |
| ← Uneliasmarsu left | 15:28 |
| → Marumarsu joined | 15:28 |
|
onla
| oh well. not like i'm making much changes there. I'll stay with what the !backup says. I guess i'm fine I just need to change back the ownership and rights when I return my backups and hope it works as I guess it likely is (no test needed!) thanks | 15:29 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 15:29 |
| → Cabanossi joined | 15:29 |
| → Tobbi joined | 15:30 |
| → Zialus joined | 15:30 |
| ← onla left | 15:30 |
| ← Marumarsu left | 15:30 |
| → kbeflo joined | 15:30 |
| ← hahuang61 left | 15:31 |
| → Marumarsu joined | 15:31 |
| ← kbeflo left | 15:31 |
| → madewokherd joined | 15:32 |
|
Vaelatern
| Onionnion: pass git because magic | 15:33 |
|
| oh, wrong tab-complete | 15:33 |
| ← ShapeShifter499 left | 15:34 |
| → BSAlb joined | 15:37 |
| ← maxxe left | 15:37 |
| ← xall left | 15:40 |
| ← karols146 left | 15:40 |
| ← BSaboia left | 15:41 |
| → xall joined | 15:41 |
| → BSab joined | 15:42 |
| → t0by joined | 15:43 |
| ← ziombelas left | 15:43 |
| ← Marumarsu left | 15:44 |
| → Marumarsu joined | 15:44 |
| ← Endarked left | 15:45 |
| ← BSAlb left | 15:46 |
| → Goplat joined | 15:47 |
| → rwb joined | 15:55 |
| ← Marumarsu left | 15:55 |
| → Marumarsu joined | 15:55 |
| ← Cabanossi left | 15:56 |
| → karols146 joined | 15:57 |
| ← fees left | 15:58 |
| → Cabanossi joined | 15:58 |
| ← ismithers left | 15:58 |
| ← xall left | 15:58 |
| ← karols146 left | 16:00 |
| → karols146 joined | 16:00 |
| → gugah joined | 16:02 |
| ← karols146 left | 16:04 |
| → karols146 joined | 16:05 |
| ← eahmedshendy left | 16:05 |
| ← drodger left | 16:06 |
| ← Marumarsu left | 16:06 |
| → Marumarsu joined | 16:06 |
| ← tango_ left | 16:08 |
| ← p4trix left | 16:08 |
| ← roby10 left | 16:08 |
| → Acerific joined | 16:09 |
| ← Acerific left | 16:09 |
| → Acerific joined | 16:09 |
| → tango_ joined | 16:09 |
| ← r0ry left | 16:09 |
| → peterbecich joined | 16:09 |
| ← t0by left | 16:10 |
| ← chipotle left | 16:11 |
| → drodger joined | 16:11 |
| → menip joined | 16:11 |
| ← exotime left | 16:12 |
| ← menip left | 16:12 |
| ← User458764 left | 16:13 |
| ← kexmex left | 16:13 |
| ← Raed|Mobile left | 16:14 |
| ← fmcgeough left | 16:14 |
| → exotime joined | 16:16 |
| ← marianina8 left | 16:16 |
| ← masuberu left | 16:16 |
| → marianina8 joined | 16:17 |
| → digidog joined | 16:17 |
| ← digidog left | 16:17 |
| → masuberu joined | 16:18 |
| ← peterbecich left | 16:19 |
| → orbyt_ joined | 16:19 |
| ← rwb left | 16:21 |
| → mehola joined | 16:21 |
| ← marianina8 left | 16:22 |
| ← mehola left | 16:26 |
| ← rorro left | 16:28 |
| → marianina8 joined | 16:28 |
| → d4rkl0rd_1 joined | 16:30 |
| ← pks left | 16:31 |
| → MineCoins joined | 16:32 |
| → pks joined | 16:32 |
| → carousel joined | 16:34 |
| ← nowhereman left | 16:38 |
| → kexmex joined | 16:38 |
| → pifon joined | 16:38 |
| → ok91 joined | 16:41 |
| ← netj left | 16:41 |
| → micwa joined | 16:43 |
| → netj joined | 16:43 |
| ← Starky left | 16:44 |
| → r0ry joined | 16:44 |
| ← carousel left | 16:44 |
| → carousel joined | 16:46 |
| ← masuberu left | 16:48 |
| ← jimi_ left | 16:48 |
| → cdg joined | 16:48 |
| → afuentes joined | 16:49 |
| ← micwa left | 16:49 |
| → osk joined | 16:52 |
| → re1 joined | 16:53 |
| → thiago joined | 16:55 |
| ← thiago left | 16:55 |
| → thiago joined | 16:55 |
| ← dreiss left | 16:56 |
| ← qqx left | 16:56 |
| → qqx joined | 16:56 |
| → Lyqyd joined | 16:57 |
| ← d4rkl0rd_1 left | 16:57 |
| → d4rkl0rd joined | 16:58 |
| ← Tobbi left | 17:03 |
| → JanC_ joined | 17:04 |
| → Endarked joined | 17:04 |
| → dreiss joined | 17:05 |
| → nowhereman joined | 17:05 |
| JanC → Guest47474 | 17:05 |
| ← Guest47474 left | 17:05 |
| JanC_ → JanC | 17:05 |
| → svm_invictvs joined | 17:06 |
| ← navidr left | 17:06 |
| ← marianina8 left | 17:06 |
| ← gugah left | 17:07 |
| ← kexmex left | 17:07 |
| → nexemacs joined | 17:09 |
| ← orbyt_ left | 17:10 |
| → publio joined | 17:10 |
| ← svm_invictvs left | 17:10 |
| ← nomike31 left | 17:11 |
| ← d4rkl0rd left | 17:11 |
| ← rominronin left | 17:14 |
| ← MineCoins left | 17:15 |
| ← cdg left | 17:17 |
| ← fakenerd left | 17:18 |
| → safe joined | 17:19 |
| ← karols146 left | 17:21 |
| ← Acerific left | 17:21 |
| ← Endarked left | 17:22 |
| → karols146 joined | 17:22 |
| → Acerific joined | 17:26 |
| → YuGiOhJCJ joined | 17:26 |
| ← nexemacs left | 17:26 |
| → hahuang61 joined | 17:27 |
| ← skypuke_ left | 17:27 |
| → digidog joined | 17:27 |
| digidog → diqidoq | 17:27 |
| ← diogenese left | 17:28 |
| → cdown joined | 17:28 |
| → tnecniv joined | 17:29 |
| → nomike31 joined | 17:30 |
| → marianina8 joined | 17:30 |
| ← hahuang61 left | 17:31 |
| → Tobbi joined | 17:32 |
| → sword joined | 17:33 |
| ← armyriad left | 17:36 |
| ← cdown left | 17:38 |
| → hhee2 joined | 17:39 |
| ← Nilesh_ left | 17:40 |
| → armyriad joined | 17:40 |
| ← cam27 left | 17:40 |
| → cam27 joined | 17:41 |
| ← Cabanossi left | 17:41 |
| ← cam27 left | 17:41 |
| → theoceaniscool joined | 17:42 |
| → cdown joined | 17:43 |
| → Cabanossi joined | 17:44 |
| → raijin joined | 17:47 |
| → thanwer_ joined | 17:48 |
| ← thanwer_ left | 17:48 |
| → diogenese joined | 17:50 |
| → Isla_de_Muerte joined | 17:51 |
| → sbasso joined | 17:52 |
| → agusyc joined | 17:52 |
| ← owlbynight left | 17:54 |
| ← raijin left | 17:54 |
| ← NwS left | 17:56 |
| → gugah joined | 17:56 |
| ← gugah left | 17:56 |
| ← Emperor_Earth left | 17:57 |
| ← moei left | 18:02 |
| ← mda1 left | 18:05 |
| → mda1 joined | 18:05 |
| → jottr joined | 18:05 |
| ← agusyc left | 18:07 |
| ← duderonomy left | 18:07 |
| → agusyc joined | 18:07 |
| ← Mysterious_Light left | 18:09 |
| → duderonomy joined | 18:10 |
| → star_prone joined | 18:10 |
| ← sbasso left | 18:10 |
| → sbasso joined | 18:11 |
| → Mysterious_Light joined | 18:12 |
| ← TheOrangeOne left | 18:12 |
| → ertesx joined | 18:13 |
| → kbeflo joined | 18:13 |
| ← sunrunner20 left | 18:13 |
| → MineCoins joined | 18:13 |
| → DuckMaestro joined | 18:15 |
| ← DuckMaestro left | 18:15 |
| ← ertes left | 18:16 |
| ertesx → ertes | 18:16 |
| → bitri joined | 18:16 |
| ← bitri left | 18:16 |
| ← marianina8 left | 18:18 |
| ← star_prone left | 18:19 |
| → freimatz joined | 18:19 |
| → DonMario joined | 18:19 |
| → snowalpaca joined | 18:19 |
| ← DonMario left | 18:20 |
| ← jokester left | 18:21 |
| → mehola joined | 18:22 |
| → User458764 joined | 18:24 |
| ← snowalpaca left | 18:24 |
| ← oskarkv left | 18:26 |
| ← mehola left | 18:26 |
| ← Peuc left | 18:28 |
| → PresidentBiscuit joined | 18:29 |
| ← sbasso left | 18:30 |
| ← agusyc left | 18:30 |
| → sbasso joined | 18:31 |
| ← cdown left | 18:32 |
| → doener joined | 18:33 |
| → TheOrangeOne joined | 18:33 |
| → Sound joined | 18:34 |
| Sound → Guest9049 | 18:35 |
| → cdown joined | 18:35 |
| ← r0ry left | 18:35 |
| → gunnaro joined | 18:36 |
| → unborn joined | 18:36 |
|
unborn
| guys how to remove all commits history? | 18:36 |
| → blackwind_123 joined | 18:37 |
|
bremner
| rm -r .git | 18:37 |
| ← Sushi left | 18:37 |
|
bremner
| but, uh, backups first ! | 18:37 |
| ← Guest9049 left | 18:37 |
| → r0ry joined | 18:37 |
|
_ikke_
| cd .. | 18:38 |
|
| git init new-repo | 18:38 |
| → Sound_ joined | 18:38 |
| ← wget_ left | 18:40 |
|
unborn
| something like rm -r .git then init the repo and then git remote add stash https://whatever.git and last git push --force stash master? | 18:41 |
| ← hhee2 left | 18:43 |
| → Rogue0ne joined | 18:44 |
| ← felixjet left | 18:45 |
| → wget joined | 18:48 |
| ← wget left | 18:48 |
| → wget joined | 18:48 |
| ← nowhereman left | 18:50 |
| → inflames joined | 18:50 |
| ← Goplat left | 18:54 |
| → bastelfreak joined | 18:57 |
| → robotrolll joined | 18:57 |
| → felixjet joined | 18:58 |
| → ndowens08 joined | 18:58 |
| → t0by joined | 18:58 |
| ← t0by left | 18:58 |
| → t0by joined | 18:58 |
| ← robotroll left | 18:59 |
| robotrolll → robotroll | 18:59 |
| → nexxus6 joined | 18:59 |
|
ndowens08
| git rebase -i is acting weird, trying to squash latest two commits which should be git rebase -i HEAD~2 but doesn't show commits, if it do HEAD~3, sometimes HEAD~4, it does but will include other non-related commits if i push; how do fix this? | 18:59 |
| → jesst joined | 19:00 |
|
selckin
| merges? | 19:00 |
| ← exotime left | 19:01 |
|
bremner
| unborn: all that stashing and pushing seems unrelated to your original question. You need to "git add ." and commit, as usual when starting a new repo | 19:01 |
|
ndowens08
| haven't merged anything; it is a branch just created | 19:01 |
| → exotime joined | 19:01 |
| ← sbasso left | 19:02 |
| → Starky joined | 19:03 |
| ← rosiu left | 19:03 |
| → sbasso joined | 19:03 |
| → dermoth_ joined | 19:04 |
| ← dermoth left | 19:04 |
| dermoth_ → dermoth | 19:05 |
| ← Starky left | 19:05 |
| ← Marumarsu left | 19:06 |
|
rwp
| ndowens08, Even if you just created a new branch the old branch may have had merges on it. Sounds like it by your description of the behavior. | 19:06 |
|
| ndowens08, Try this to see what it looks like: git log --oneline --graph --decorate --color | 19:06 |
| → Endarked joined | 19:07 |
| ← karols146 left | 19:08 |
|
ndowens08
| rwp: it shows them next to each other and one connected to it that looks "tabbed" over | 19:08 |
|
| right below the two i want to squash | 19:08 |
| → karols146 joined | 19:11 |
| → Starky joined | 19:14 |
| ← chris3492 left | 19:15 |
| → Peuc joined | 19:17 |
| ← dermoth left | 19:19 |
| ← drodger left | 19:19 |
| ← overlord_tm left | 19:19 |
| → livingstn joined | 19:23 |
| → Silenced joined | 19:24 |
| → drodger joined | 19:25 |
| → hahuang61 joined | 19:27 |
| → Epicblood joined | 19:28 |
| → Noldorin joined | 19:28 |
| ← robotroll left | 19:30 |
| ← timvisher left | 19:31 |
|
garyserj
| when a file is in staging, ok it means a file is in staging.. But when we delete a file and stage that deletion.. what does it mean "staging a deletion"? | 19:31 |
| ← sbasso left | 19:31 |
|
garyserj
| like, does staging contain a)files b)things saying a file has been deleted? | 19:31 |
| → dermoth joined | 19:32 |
| → sbasso joined | 19:32 |
| → sq-one joined | 19:32 |
| → chris3492 joined | 19:32 |
| ← hahuang61 left | 19:32 |
| → kexmex joined | 19:32 |
| → robotroll joined | 19:34 |
| → nowhere_man joined | 19:34 |
| → stevenbenner joined | 19:35 |
| ← Endarked left | 19:35 |
|
_ikke_
| garyserj: The staging area is just a diff between the index, the working tree and the current commit | 19:35 |
|
| garyserj: when you stage a removed file, the file entry is removed from the index | 19:36 |
| ← Cthalupa left | 19:37 |
| → Cthalupa joined | 19:38 |
|
BenderRodriguez
| When adding a git submodule , if I make a change on the parent repo and push it to remote, does the submodule also get included? | 19:39 |
| → k1rov_reporting joined | 19:40 |
|
_ikke_
| BenderRodriguez: included in what way? | 19:40 |
| ← rokups left | 19:42 |
| ← Cabanossi left | 19:42 |
| → Cabanossi joined | 19:43 |
| ← ordolizard left | 19:44 |
| → fbz joined | 19:45 |
| → ivanfon joined | 19:46 |
| ← fbz left | 19:47 |
| ← Mysterious_Light left | 19:47 |
| → Mysterious_Ligh1 joined | 19:47 |
| → InfoTest joined | 19:48 |
| ← InfoTest left | 19:49 |
| → davimore joined | 19:50 |
| ← Mysterious_Ligh1 left | 19:50 |
| → Mysterious_Light joined | 19:50 |
| → theiostream joined | 19:50 |
| ← YuGiOhJCJ left | 19:51 |
| ← Silenced left | 19:51 |
|
Ploppz
| .gitmodules doesn't say anything about the particular commit, so I had the impression it will just take the latest commit. But apparently there is information somewhere about which commit should be checked out. Where is this? | 19:52 |
|
| the particular commit of submodules * | 19:52 |
|
j416
| Ploppz: | 19:52 |
|
| in the tree | 19:52 |
|
Ploppz
| what tree? the working tree? | 19:52 |
| → ziombelas joined | 19:52 |
| ← MineCoins left | 19:53 |
| ← m1dnight_ left | 19:53 |
| → MineCoins joined | 19:53 |
|
j416
| no | 19:53 |
| ← MineCoins left | 19:53 |
| → m1dnight_ joined | 19:53 |
|
j416
| in the tree linked to by your commit | 19:53 |
|
| internally, so to speak | 19:54 |
|
| like any other file | 19:54 |
| ← BSab left | 19:54 |
|
_ikke_
| git ls-tree HEAD path/to/submodule shows the entry | 19:54 |
|
Ploppz
| didn't know there is a tree inside a single commit (or did I misunderstand?). | 19:54 |
| ← Starky left | 19:55 |
|
Ploppz
| thanks | 19:55 |
|
_ikke_
| Ploppz: a commit points to a tree, which contains a recursive tree structure pointing to all blobs and other things that are included in the commit | 19:55 |
| → Starky joined | 19:55 |
| → BSaboia joined | 19:56 |
| ← BSaboia left | 19:56 |
| ← Chaser left | 19:56 |
| → MineCoins joined | 19:56 |
| ← MineCoins left | 19:57 |
| ← sbasso left | 19:57 |
| → sbasso joined | 19:58 |
|
j416
| Ploppz: find the git object model in the docs on git-scm.com | 19:58 |
| → star_prone joined | 19:59 |
|
j416
| might be interesting to you | 19:59 |
| ← finalbeta left | 19:59 |
| → finalbeta joined | 20:00 |
| → Endarked joined | 20:00 |
| ← star_prone left | 20:03 |
|
avar
| With `git branch --list <pattern>` is there a way to make the <pattern> match the remote name of the name? | 20:03 |
| ← k1rov_reporting left | 20:03 |
|
avar
| AFAICT not, e.g. to get the branches on the "avar" remote that branched off 2.12.0: git branch --contains v2.12.2 | grep remotes/avar/ | 20:03 |
|
| I was hoping 'refs/remote/avar*' or 'remotes/avar/*' would work, but apparently not... | 20:04 |
| → kir0v joined | 20:04 |
|
s17
| I have a pull request which I have just reviewed. it has many files, but one of them has an incorrect change. do i just approve and merge, then edit that file myself? | 20:04 |
|
_ikke_
| avar: use git for-each-ref | 20:05 |
|
| git for-each-ref refs/remotes/avar | 20:05 |
|
avar
| oh sweet, hadn't thought of that use for fer, duh | 20:06 |
| → YottaByte joined | 20:06 |
|
_ikke_
| s17: Hard to tell | 20:06 |
|
| s17: Up to you basically | 20:06 |
|
s17
| I think that is the easiest route :/ | 20:07 |
|
| it's just one line wrong | 20:07 |
| → re1_ joined | 20:08 |
| ← sbasso left | 20:08 |
| → dirtyroshi joined | 20:08 |
| → spaceraspi joined | 20:09 |
| → Mission-Critical joined | 20:10 |
| ← scoobert1on left | 20:11 |
| ← re1 left | 20:11 |
| → Bob8989|2 joined | 20:12 |
| → Bob89893 joined | 20:12 |
| ← kegster left | 20:13 |
| ← HuskyApocalypse left | 20:13 |
| → kegster joined | 20:14 |
| → scoobertron joined | 20:15 |
| ← karols146 left | 20:16 |
| ← Murii left | 20:17 |
| → manuelschneid3r joined | 20:18 |
| ← User458764 left | 20:18 |
| → orbyt_ joined | 20:19 |
| ← Mysterious_Light left | 20:19 |
| → Mysterious_Light joined | 20:19 |
| ← spaceraspi left | 20:21 |
| ← schleppel left | 20:21 |
|
s17
| and notified the other devs, of course ;) | 20:23 |
| → mehola joined | 20:23 |
| → g105b joined | 20:26 |
| ← PresidentBiscuit left | 20:26 |
| ← Mysterious_Light left | 20:26 |
| → PresidentBiscuit joined | 20:27 |
| → hhee joined | 20:27 |
| → Mysterious_Light joined | 20:28 |
| ← mehola left | 20:28 |
| → savgnobl joined | 20:28 |
| ← Mysterious_Light left | 20:29 |
| ← _28_ria left | 20:30 |
| → zeroed joined | 20:30 |
| ← zeroed left | 20:30 |
| → zeroed joined | 20:30 |
| ← PresidentBiscuit left | 20:31 |
| → _28_ria joined | 20:31 |
| → overlord_tm joined | 20:32 |
| ← Acerific left | 20:32 |
| ← freimatz left | 20:34 |
| → Guest81707 joined | 20:34 |
| → lmatteis joined | 20:35 |
| ← mmlb left | 20:36 |
| → mmlb joined | 20:37 |
| ← Doginal left | 20:37 |
| → tyrese joined | 20:39 |
|
tyrese
| hi | 20:40 |
|
| so I did checkout -b new-branch | 20:40 |
| → chipotle joined | 20:40 |
|
tyrese
| then checkout new-branch | 20:40 |
|
| now how do i upload the branch to the repo? | 20:40 |
|
| it's talking about adding a new remote, but what's a remote? | 20:40 |
| ← jesst left | 20:41 |
|
tyrese
| i already accidently uploaded the new branch to master | 20:41 |
| → star_prone joined | 20:44 |
| ← ndowens08 left | 20:45 |
| ← Bob89893 left | 20:45 |
| ← Bob8989|2 left | 20:45 |
| ← ziombelas left | 20:48 |
| ← theiostream left | 20:49 |
|
rudi_s
| !doc | 20:49 |
|
gitinfo
| A list of useful documentation of all kinds is here: http://git-scm.com/documentation -- or try the wiki at http://git.wiki.kernel.org/. Also try typing "!book" "!cs" "!bottomup" "!parable" "!best_practices" or "!vcbe" or "!designers" here in IRC. !book is probably the most helpful. | 20:49 |
|
rudi_s
| !book | 20:49 |
|
gitinfo
| There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable | 20:49 |
| → theiostream joined | 20:49 |
|
rudi_s
| tyrese: ^ have a look at basic documentation, pro git is quite good. | 20:49 |
| → LeBlaaanc joined | 20:50 |
| ← Jackneill_ left | 20:50 |
| → jesusmartinb joined | 20:51 |
|
tyrese
| so I did what the basics said | 20:52 |
|
| git checkout -b photoview, then git checkout photoview. so i'm in the branch. I made changes, but when I type git push, it uploads it to master | 20:52 |
| ← Guest81707 left | 20:53 |
| ← jesusmartinb left | 20:53 |
|
tyrese
| what am I doing wrong? | 20:54 |
| ← zeroed left | 20:55 |
| ← savgnobl left | 20:56 |
| → svg-nobl joined | 20:57 |
|
tyrese
| when i do git push -u origin, it says branch master set up to track remote branch master from origin. | 20:57 |
|
_ikke_
| tyrese: after git checkout -b new-branch, you do no have to do another chekcout | 20:58 |
|
| tyrese: Did you commit yet? | 20:58 |
| ← Starky left | 20:58 |
|
tyrese
| gonna delete the branch and start over | 20:59 |
|
| lol | 20:59 |
|
rudi_s
| !backup | 20:59 |
|
gitinfo
| Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups | 20:59 |
|
tyrese
| yeah so it says im 1 ahead of master | 20:59 |
|
| but if I git push it, itll go to master but it's an entirely different library and it'll break master | 21:00 |
| ← kir0v left | 21:00 |
| → kir0v joined | 21:00 |
| → savg-nobl joined | 21:00 |
|
_ikke_
| tyrese: what does git branch -vv return? | 21:01 |
| ← kir0v left | 21:01 |
| ← savg-nobl left | 21:01 |
| ← sq-one left | 21:01 |
| → kir0v joined | 21:01 |
| → Guest81707 joined | 21:01 |
|
tyrese
| * master 867b651 [origin/master: ahead 1] added photoview library | 21:01 |
|
| photoview 8dcae93 added photoview library | 21:01 |
| ← kir0v left | 21:01 |
| → kir0v joined | 21:02 |
|
_ikke_
| So you comitted on master, and then created the branch? | 21:02 |
|
| (And you checked out master currently) | 21:02 |
| ← kir0v left | 21:02 |
|
tyrese
| oh | 21:02 |
|
| my bad | 21:02 |
|
| i was trying to delete it | 21:02 |
| → kir0v joined | 21:03 |
|
tyrese
| says the same thing | 21:03 |
| ← kir0v left | 21:03 |
| → kir0v joined | 21:03 |
| ← sunri5e left | 21:04 |
|
_ikke_
| What command are you executing? | 21:04 |
| ← kir0v left | 21:04 |
| ← Guest81707 left | 21:04 |
|
tyrese
| git branch -vv | 21:04 |
| ← eizua left | 21:04 |
| → sunri5e joined | 21:05 |
|
_ikke_
| And before that? | 21:06 |
| → marianina8 joined | 21:06 |
|
tyrese
| git checkout -b photoview | 21:07 |
|
_ikke_
| tyrese: You only have to use -b once, when you create a new branch | 21:07 |
|
tyrese
| how can I go into master and delete pending commits | 21:07 |
|
_ikke_
| git checkout master; git reset --keep HEAD~ | 21:07 |
|
| That will reset master back one commit | 21:08 |
|
| (You can also use origin/master instead of HEAD~ to make it equal to what remote has) | 21:08 |
| ← ws2k3 left | 21:08 |
|
tyrese
| ok so how do i force delete this branch | 21:10 |
|
| so i can start over | 21:10 |
| → hugdru joined | 21:11 |
|
tyrese
| i have everything backed up | 21:11 |
|
_ikke_
| git branch -D <branchname> | 21:11 |
| ← aielima left | 21:11 |
| → ws2k3 joined | 21:12 |
|
tyrese
| so | 21:13 |
|
| ty for the helop | 21:13 |
|
| so I want to make a new branch | 21:13 |
|
| i will type git checkout -b photoview, right? | 21:13 |
|
| sorry to ask so many questions, i've just never had to do this before | 21:14 |
|
Ploppz
| when working on a project `foo` with submodules `bar` and `baz` - and I do changes only inside `bar` and `baz`, how do I go about committing and sending pull requests? | 21:16 |
| ← Sound_ left | 21:18 |
| → jost_ joined | 21:18 |
|
Ploppz
| I guess the first thing is to commit in `bar`. Then do I fork `bar` and add my url as a remote, push to my fork, and in the end send a pull request in the original `bar` repo? | 21:19 |
|
| I guess after that I have to commit `foo` to point to the latest commits in `bar` (forget `baz`) and send a PR | 21:19 |
| → griff joined | 21:20 |
| ← jost__ left | 21:20 |
| ← NightMonkey left | 21:20 |
| → zivester joined | 21:22 |
|
tyrese
| hey _ikke_ got it work | 21:23 |
| → NightMonkey joined | 21:23 |
|
tyrese
| thank you for the help homie | 21:23 |
| Maple__ → Maple_ | 21:23 |
| Maple_ → JeanLucMelenchon | 21:24 |
| JeanLucMelenchon → Maple_ | 21:25 |
| → Atm0spher1c joined | 21:25 |
| → PresidentBiscuit joined | 21:28 |
| → hahuang61 joined | 21:28 |
| ← NightMonkey left | 21:29 |
| ← PresidentBiscuit left | 21:32 |
| → NightMonkey joined | 21:32 |
| ← hahuang61 left | 21:33 |
| → iqubic joined | 21:33 |
|
iqubic
| I'm trying to set up an upstream remote repo, and I can't seem to push to it. | 21:34 |
|
| I did the standard things like: "git remote add origin https://github.com/IQubic/morse.git" | 21:34 |
|
| and then I tried: "git push -u origin master | 21:35 |
|
| And that gives me the following errors: error: src refspec master does not match any. | 21:35 |
|
| error: failed to push some refs to 'https://github.com/IQubic/morse.git' | 21:35 |
| ← telephone left | 21:36 |
| ← scoobertron left | 21:37 |
| → telephone joined | 21:37 |
| ← telephone left | 21:37 |
| → telephone joined | 21:37 |
|
iqubic
| I feel stupid. I need to make an initial commit before pushing to a remote repo. | 21:38 |
| → bariscant joined | 21:38 |
| → pbrewczynski_ joined | 21:40 |
| ← ok91 left | 21:40 |
| → timvisher joined | 21:40 |
| → moei joined | 21:42 |
| → scoobertron joined | 21:42 |
| ← doener left | 21:46 |
| ← ZyX-I left | 21:47 |
| → mentazoom joined | 21:48 |
| ← iqubic left | 21:48 |
| ← bariscant left | 21:49 |
|
i7c
| You need at least one commit that "master" points to. | 21:50 |
|
| Oh, he’s gone. | 21:50 |
| ← dersand left | 21:51 |
| ← nomike31 left | 21:52 |
| ← aax left | 21:54 |
| ← Cabanossi left | 21:55 |
| → aax joined | 21:56 |
| → rosiu joined | 21:58 |
| ← tnecniv left | 21:59 |
| → Cabanossi joined | 21:59 |
| ← Endarked left | 22:01 |
| ← theiostream left | 22:02 |
| → theiostream joined | 22:02 |
| → cdown_ joined | 22:02 |
| ← cdown left | 22:03 |
| cdown_ → cdown | 22:03 |
| ← cbreak left | 22:04 |
| → tnecniv joined | 22:04 |
| → cbreak joined | 22:04 |
| ← theiostream left | 22:09 |
| ← star_prone left | 22:09 |
| → HoierM joined | 22:10 |
| ← marianina8 left | 22:11 |
| → nomike31 joined | 22:11 |
| ← jottr left | 22:11 |
| ← jagob left | 22:12 |
| ← griff left | 22:12 |
| ← snits left | 22:13 |
| → snits joined | 22:14 |
| ← CheckDavid left | 22:14 |
| ← flavius left | 22:15 |
| → askb joined | 22:16 |
| → mehola joined | 22:20 |
| ← mentazoom left | 22:24 |
| → ZyX-I joined | 22:25 |
| ← tristanp left | 22:27 |
| ← osk left | 22:27 |
| → tristanp joined | 22:28 |
| → osk joined | 22:28 |
| → PresidentBiscuit joined | 22:28 |
| → pandeiro joined | 22:29 |
| → MattMake_ joined | 22:30 |
| ← livingstn left | 22:31 |
| ← tristanp left | 22:32 |
| → tmsmith joined | 22:32 |
| ← MattMake_ left | 22:33 |
| ← netj left | 22:33 |
| → netj joined | 22:33 |
| ← PresidentBiscuit left | 22:33 |
| ← tmsmith left | 22:35 |
| ← TomyLobo left | 22:35 |
| → tmsmith joined | 22:36 |
| → sven1 joined | 22:37 |
| ← t0by left | 22:39 |
| ← sven1 left | 22:41 |
| ← prg3 left | 22:42 |
| ← re1_ left | 22:42 |
| ← dreiss left | 22:42 |
| → prg3 joined | 22:42 |
| → sunrunner20 joined | 22:43 |
| ← howdoi left | 22:43 |
| ← kbeflo left | 22:44 |
| ← nomike31 left | 22:44 |
| ← publio left | 22:47 |
| → anuxivm joined | 22:48 |
| ← hugdru left | 22:48 |
| ← lmatteis left | 22:49 |
| ← kegster left | 22:49 |
| ← manuelschneid3r left | 22:49 |
| ← leeN left | 22:49 |
| → jstimm joined | 22:49 |
| → dreiss joined | 22:54 |
| ← svg-nobl left | 22:55 |
| ← Cabanossi left | 22:55 |
| ← King_Hual left | 22:56 |
| ← hhee left | 22:57 |
| → Cabanossi joined | 22:58 |
| → nomike31 joined | 23:02 |
| → tsetair joined | 23:05 |
| ← robattila256 left | 23:08 |
| ← gunnaro left | 23:10 |
| ← finalbeta left | 23:11 |
| ← tsetair left | 23:12 |
| → cam27 joined | 23:17 |
| → tmg joined | 23:18 |
| ← NoOutlet left | 23:19 |
| → pietv joined | 23:22 |
| ← kexmex left | 23:24 |
| ← Cabanossi left | 23:26 |
| ← ivanfon left | 23:27 |
| ← g105b left | 23:29 |
| → Cabanossi joined | 23:29 |
| → PresidentBiscuit joined | 23:29 |
| → hahuang61 joined | 23:29 |
| ← PresidentBiscuit left | 23:34 |
| ← hahuang61 left | 23:34 |
| → SwiftMatt joined | 23:35 |
| ← r0ry left | 23:35 |
| ← safe left | 23:39 |
| ← chris3492 left | 23:40 |
| → Kaisyu joined | 23:42 |
| → Noodlewitt joined | 23:44 |
| → NoOutlet joined | 23:46 |
| ← drodger left | 23:48 |
| → drodger joined | 23:50 |
| ← zivester left | 23:50 |
| ← _28_ria left | 23:52 |
| ← netj left | 23:52 |
| → netj joined | 23:53 |
| → _28_ria joined | 23:53 |
| → sven1 joined | 23:54 |
| ← _28_ria left | 23:54 |
| ← osk left | 23:54 |
| → _28_ria joined | 23:56 |
| → chris3492 joined | 23:56 |
| ← Tobbi left | 23:58 |