| 2017-09-27 |
| ← jrabe left | 00:00 |
| → TheVice joined | 00:00 |
| ← orbyt_ left | 00:00 |
| → jrabe joined | 00:00 |
| ← ronster left | 00:04 |
| → drodger joined | 00:05 |
| ← shinnya left | 00:05 |
| → Tobbi joined | 00:06 |
| ← MattMaker left | 00:06 |
| ← SpeakerToMeat left | 00:06 |
| ← Gustavo6046 left | 00:06 |
| ← cdg left | 00:06 |
| → MattMaker joined | 00:08 |
| → MattMake_ joined | 00:08 |
| → Gustavo6046 joined | 00:08 |
| ← Kazuto left | 00:09 |
| ← MattMaker left | 00:09 |
| ← rorro left | 00:09 |
| → MattMaker joined | 00:10 |
| → Kazuto joined | 00:10 |
| ← Kazuto left | 00:10 |
| → Kazuto joined | 00:10 |
| ← Noldorin left | 00:12 |
| ← Solvaring left | 00:12 |
| → cdown joined | 00:13 |
| ← MattMake_ left | 00:14 |
| → BowBoy joined | 00:14 |
| ← xaa left | 00:15 |
| ← SerusWork left | 00:18 |
| → cbonobo joined | 00:18 |
| ← ArcaTech left | 00:18 |
| → roelmonnens joined | 00:19 |
| ← Tobbi left | 00:19 |
| ← cbonobo left | 00:20 |
| → cbonobo joined | 00:20 |
| → snowkidind joined | 00:23 |
| → SerusWork joined | 00:23 |
| ← roelmonnens left | 00:23 |
| → BlitZKotare joined | 00:23 |
| ← cagomez left | 00:24 |
| ← cbonobo left | 00:25 |
| → GrailKn1ght joined | 00:25 |
| → justanotheruser joined | 00:25 |
| → Yondering joined | 00:29 |
| → stutter joined | 00:30 |
| ← bronson left | 00:32 |
| ← Khisanth left | 00:33 |
| → SpeakerToMeat joined | 00:34 |
| ← Patriqu left | 00:34 |
| → jakogut joined | 00:38 |
| ← GrailKn1ght left | 00:42 |
| ← mr_sm1th left | 00:43 |
| → noobineer joined | 00:46 |
| ← noobineer left | 00:46 |
| ← BowBoy left | 00:49 |
| → Khisanth joined | 00:53 |
| → austin987 joined | 00:53 |
| ← piremi left | 00:55 |
| ← Garen left | 00:56 |
| ← [Kid] left | 00:57 |
| → robinb joined | 00:58 |
| → Neo joined | 00:58 |
| ← overlord_tm left | 01:03 |
| ← Feral_Cat left | 01:06 |
| → ronster joined | 01:06 |
| ← seanBE left | 01:07 |
| ← tilpner left | 01:07 |
| ← svm_invictvs left | 01:07 |
| → tilpner joined | 01:07 |
| → athaller joined | 01:09 |
|
FrostyBytes
| is there a way to gitignore */tmp but not */*/tmp? | 01:09 |
| → seanBE joined | 01:09 |
| → dsdeiz joined | 01:11 |
| ← dsdeiz left | 01:11 |
| → dsdeiz joined | 01:11 |
|
FrostyBytes
| oh lol thats exactly what putting */tmp in .gitignore does | 01:11 |
| → mel00010 joined | 01:13 |
| ← salamanderrake left | 01:14 |
| → sgtbigman joined | 01:14 |
| ← sunri5e left | 01:15 |
| ← bergice_ left | 01:16 |
| ← ronster left | 01:16 |
| → sunri5e joined | 01:17 |
| → [Kid] joined | 01:22 |
| → roelmonnens joined | 01:22 |
| ← mspo left | 01:24 |
| → finalbeta joined | 01:24 |
| ← Murr left | 01:25 |
| ← opalepatrick left | 01:26 |
| ← roelmonnens left | 01:26 |
| → Murr joined | 01:26 |
| ← Sasazuka left | 01:28 |
| ← Dreadnaught left | 01:33 |
| ← forsythe left | 01:34 |
| → piraye joined | 01:35 |
|
sparr
| How can I preview what would happen if I tried to merge a branch into my current branch? | 01:36 |
|
| I basically want to diff HEAD against HEAD+branch | 01:36 |
|
| where + is the merge operation | 01:36 |
| → BowBoy joined | 01:39 |
| → orbyt_ joined | 01:39 |
| ← orbyt_ left | 01:41 |
| ← MattMaker left | 01:41 |
|
alphor
| there is only ever one tree in a git repository, right? Why call it a directed acyclic graph instead of a directed tree? | 01:43 |
| ← griffindy left | 01:45 |
| → Lyqyd joined | 01:45 |
|
dzho
| because there are merges? | 01:45 |
| ← ilbot3 left | 01:45 |
|
| dzho doesn't know his graph theory well enough I guess | 01:46 |
| → LionsMane joined | 01:47 |
| → Dreadnaught joined | 01:47 |
| ← Dreadnaught left | 01:47 |
| → Dreadnaught joined | 01:47 |
| ← Dreadnaught left | 01:47 |
|
alphor
| that makes sense. wikipedia lists tree as undirected but you can always map a 'directed tree' into an undirected one. But what you said would introduce a cycle in the undirected version | 01:49 |
| → Dreadnaught joined | 01:49 |
| ← Dreadnaught left | 01:49 |
| → Dreadnaught joined | 01:49 |
| → neil_cn joined | 01:49 |
|
alphor
| the term for 'directed tree' is polytree. But that terminology is more confusing and also inaccurate. oh well. | 01:51 |
| ← sgtbigman left | 01:52 |
| ← mel00010 left | 01:54 |
| → igemnace joined | 01:54 |
| ← AfroThundr left | 01:55 |
| → ilbot3 joined | 01:55 |
| ← d^sh left | 01:56 |
| → orbyt_ joined | 01:57 |
| → d^sh joined | 01:57 |
| ← drodger left | 01:58 |
| → drodger joined | 02:00 |
| → ArcaTech joined | 02:03 |
| ← gugah left | 02:03 |
| → gugah joined | 02:05 |
| ← gugah left | 02:05 |
| → mel00010 joined | 02:05 |
| → cdg joined | 02:06 |
| ← Gustavo6046 left | 02:06 |
| → AfroThundr joined | 02:08 |
| → jameser joined | 02:10 |
| ← Cabanossi left | 02:11 |
| ← cdown left | 02:12 |
| → Cabanossi joined | 02:13 |
| ← robinb left | 02:14 |
| → cdown joined | 02:15 |
| ← troyt left | 02:17 |
| → wxg joined | 02:17 |
| → robinb joined | 02:18 |
| → piremi joined | 02:19 |
| → troyt joined | 02:19 |
| ← cdown left | 02:21 |
| → cdown joined | 02:24 |
| ← AfroThundr left | 02:25 |
| → AfroThundr joined | 02:25 |
| ← cdown left | 02:25 |
| → CssNoOb joined | 02:25 |
| → ToBeCloud joined | 02:26 |
| gitinfo set mode: +v | 02:27 |
| → chachasmooth_ joined | 02:27 |
| ← robinb left | 02:27 |
| ← chachasmooth left | 02:28 |
| → regedit joined | 02:28 |
| → acedia3 joined | 02:29 |
| → lagothrix joined | 02:30 |
| → zivester joined | 02:31 |
| ← dsdeiz left | 02:32 |
| ← lagothri1 left | 02:33 |
| ← ArcaTech left | 02:33 |
| ← wxg left | 02:33 |
| → dsdeiz joined | 02:33 |
| ← dsdeiz left | 02:33 |
| → dsdeiz joined | 02:33 |
| ← tchan left | 02:33 |
| → bronson joined | 02:33 |
| → ArcaTech joined | 02:34 |
| ← ShalokShalom left | 02:35 |
| → couchz joined | 02:38 |
| ← bronson left | 02:38 |
| ← m712 left | 02:39 |
| ← sz0 left | 02:40 |
| → m712 joined | 02:41 |
|
couchz
| hey im getting "Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. | 02:41 |
|
| hint: 'git pull ...') before pushing again.y | 02:41 |
|
oojacoboo
| is there a way I can copy all files into a directory, replacing all of them without triggering git to recognize all of these as changed? | 02:41 |
| ← PaulCapestany left | 02:41 |
|
couchz
| i tried "git pull origin master" and i got "fatal: refusing to merge unrelated histories" | 02:41 |
|
oojacoboo
| so that it only recognizes the changes? | 02:41 |
|
rewt
| couchz, just `git pull` | 02:42 |
| → PaulCape_ joined | 02:42 |
|
couchz
| "There is no tracking information for the current branch." | 02:42 |
|
| "Please specify which branch you want to merge with." | 02:42 |
|
rewt
| what did you type exactly to get that "Updates were rejected" message? | 02:43 |
| → MattMaker joined | 02:43 |
|
couchz
| so i started this repo on github with a license, but then I didnt pull with git initially, i used "git push origin master" as soon as I was ready | 02:44 |
| ← a3Dman left | 02:44 |
|
couchz
| then tried "git pull origin master" | 02:45 |
|
| then it gave me that | 02:45 |
|
rewt
| you can force push to overwrite what's on github with what you have locally | 02:45 |
| → a3Dman joined | 02:46 |
| ← lb1c left | 02:47 |
|
couchz
| so theres no way to pull now? | 02:47 |
|
rewt
| do you want to keep what's on github now? | 02:47 |
|
couchz
| if i can yeah | 02:48 |
| → lb1c joined | 02:48 |
|
rewt
| easiest way is to clone that repo elsewhere locally and copy in the files you want from here to there, and then commit + push | 02:49 |
|
couchz
| alright thanks, i think I will just delete it and do it over | 02:50 |
|
Toba
| couchz: did you create your github repo "with readme" on github | 02:50 |
|
| that option they have now for creating a repo with some stuff in it already for you | 02:51 |
|
FrostyBytes
| how do I get the latest commit on HEAD? more cleanly than git log | head -n 1 ? | 02:51 |
|
couchz
| no just the license | 02:51 |
|
Toba
| that's the same thing | 02:51 |
|
| it creates a commit that contains the license file | 02:52 |
|
igemnace
| FrostyBytes: HEAD already points to a commit. git show HEAD or simply git show | 02:52 |
|
couchz
| oh, yeah this time I will just make sure to pull first | 02:52 |
|
Toba
| yup | 02:52 |
|
couchz
| thanks | 02:52 |
|
rewt
| if you only have 1 or 2 files on github, just copy them into your local repo and force push it | 02:52 |
|
FrostyBytes
| but I want just the commit sha as output | 02:52 |
|
Toba
| that's bad advice rewt, I think | 02:52 |
|
rewt
| why? | 02:53 |
|
Toba
| if you're gonna force push a fresh repo just delete it and recreate it without files in it | 02:53 |
|
igemnace
| FrostyBytes: git rev-parse HEAD | 02:53 |
|
Toba
| why start with a little mess in there | 02:53 |
|
rewt
| he said he wants to keep those files | 02:53 |
|
couchz
| Toba: I can just delete the .git folder to start a new git init fresh right | 02:53 |
|
Toba
| yes | 02:53 |
|
igemnace
| FrostyBytes: btw git log can already take a number arg. git log -1 shows 1 commit at most | 02:53 |
|
couchz
| rewt: it was just the license file I dont mind restarting quickly | 02:53 |
| ← Puffball left | 02:56 |
| ← bumblebeer left | 02:56 |
| → bumblebeer joined | 02:56 |
| → tchan joined | 02:57 |
| → Puffball joined | 02:57 |
| → perrier-jouet joined | 03:00 |
| ← perrier-jouet left | 03:01 |
| → fstd_ joined | 03:02 |
| ← pks left | 03:03 |
| ← m0viefreak left | 03:03 |
| → pks joined | 03:05 |
| ← fstd left | 03:06 |
| fstd_ → fstd | 03:06 |
| ← dviola left | 03:11 |
| ← ecstaticmorse left | 03:12 |
| → ecstaticmorse joined | 03:14 |
| → dviola joined | 03:15 |
| → perrier-jouet joined | 03:16 |
| ← BowBoy left | 03:18 |
| → svm_invictvs joined | 03:19 |
| ← cdg left | 03:21 |
| → cdg joined | 03:21 |
| → accakks joined | 03:22 |
| → fatalhalt joined | 03:22 |
| ← ecstaticmorse left | 03:22 |
| ← orbyt_ left | 03:23 |
| ← stutter left | 03:24 |
| gitinfo set mode: +v | 03:24 |
|
accakks
| Hi, is this the right place for people who wish to apply to Git in outreachy round'15 or there is some other specific channel? | 03:24 |
|
couchz
| to delete ssh and gpg keys can I just clear the folders out? | 03:24 |
| ← jameser left | 03:24 |
| ← disi left | 03:25 |
| ← Murr left | 03:25 |
| ← cdg left | 03:25 |
| → Murr joined | 03:26 |
| ← Cabanossi left | 03:26 |
| → Cabanoss- joined | 03:27 |
| ← piremi left | 03:27 |
| Cabanoss- → Cabanossi | 03:27 |
| ← tunekey left | 03:28 |
| → jameser joined | 03:30 |
| ← couchz left | 03:32 |
| → bronson joined | 03:33 |
| ← jameser left | 03:36 |
| ← snadge left | 03:36 |
| → JeffH joined | 03:37 |
| ← TheVice left | 03:37 |
| → jameser joined | 03:37 |
| ← bronson left | 03:38 |
| → qpt joined | 03:38 |
|
JeffH
| I finally broke through today and ‘get’ git. Not sure what my hang up really was.. haha | 03:39 |
| → Janeway joined | 03:40 |
| ← Janeway left | 03:41 |
| → Bobdude joined | 03:41 |
| ← brent__ left | 03:41 |
| → rocktop joined | 03:42 |
| ← jameser left | 03:45 |
|
oojacoboo
| JeffH sounds like you have a long way to go | 03:46 |
|
| might want to just turn around :) | 03:47 |
| → govg joined | 03:47 |
|
oojacoboo
| it's a really deep rabbit hole | 03:47 |
|
| fair warning | 03:47 |
| → couchz joined | 03:48 |
|
couchz
| can gpg not use the private github email to sign commits? | 03:48 |
| → TikityTik joined | 03:48 |
| → jameser joined | 03:51 |
| → TheVice joined | 03:51 |
|
couchz
| nvm forgot to set gitconfig signing key | 03:52 |
| ← accakks left | 03:52 |
| → imack joined | 03:54 |
| ← Cabanossi left | 03:55 |
| ← couchz left | 03:56 |
| ← Elon_Satoshi left | 03:56 |
| → wombawomba joined | 03:57 |
| → Cabanossi joined | 03:57 |
| ← ArcaTech left | 03:57 |
| ← jameser left | 03:58 |
| → Elon_Satoshi joined | 03:59 |
| → ArcaTech joined | 04:00 |
|
parsnip
| oojacoboo: well played... i spent a couple days upping my git game, now i see it just goes on forever | 04:00 |
|
oojacoboo
| git is just the tip of the iceberg | 04:00 |
|
parsnip
| file system locks? credential helpers? mamma mia! | 04:01 |
|
| er, commit locks or whatever | 04:01 |
| → Syntax_Error joined | 04:01 |
|
oojacoboo
| it's what you use git for that's the real rabbit hole | 04:01 |
| ← Syntax_Error left | 04:02 |
| → jameser joined | 04:02 |
| ← Elon_Satoshi left | 04:03 |
| → Elon_Satoshi joined | 04:05 |
|
JeffH
| oojacoboo: haha. Everyone I know seems to think git is the best thing since sliced bread. | 04:07 |
| → piremi joined | 04:08 |
|
oojacoboo
| JeffH git is great, but if you're just gitting into it, the rabbit hole goes much deeper. Might I suggest the blue pill | 04:11 |
|
JeffH
| oojacoboo: haha. I’m doomed. The project I’m currently on and the next project are both using git. I came from CVS. | 04:11 |
|
oojacoboo
| git has a lot of advantages over CVS | 04:12 |
|
| branch merging is certainly a big one | 04:12 |
| ← piremi left | 04:12 |
|
JeffH
| Yeah.. we didn’t even really mess with branching with CVS. | 04:13 |
|
oojacoboo
| yea b/c it was a disaster | 04:13 |
|
JeffH
| We ended up using a tagging mechanism as a poor man’s branching. | 04:13 |
| → rscata joined | 04:14 |
| ← a3Dman left | 04:15 |
|
JeffH
| I’m quite excited to be using git.. more so now that I seem to have gotten over the learning curve. For some reason ‘git log’ of all things was tripping me up. | 04:15 |
|
| I think that’s more because I learned mercurial for a short bit before picking up git. | 04:15 |
| → robinb joined | 04:15 |
| ← ArcaTech left | 04:15 |
| ← tnecniv left | 04:16 |
|
parsnip
| `git log` is life | 04:16 |
| ← jameser left | 04:16 |
|
parsnip
| i heard hg has an easier learning curve | 04:16 |
|
| i guess the idiom would be more like, "gentler" | 04:17 |
|
JeffH
| parsnip: exactly.. so not quite getting it really hampered things. It was hard to understand the state of my local area without understanding ‘git log’. | 04:17 |
|
| I do miss the simplicity of ‘hg in’ and ‘hg out’. | 04:18 |
| → Brain joined | 04:19 |
| → Yonderen joined | 04:20 |
| → ArcaTech joined | 04:20 |
| → Ardethian\ joined | 04:20 |
| → piremi joined | 04:21 |
| → ghoti_ joined | 04:21 |
| → milki_ joined | 04:21 |
| → ojacobson_ joined | 04:22 |
| → robotroll joined | 04:22 |
| → musl_ joined | 04:22 |
| → jab416171_ joined | 04:22 |
| → frobnic_ joined | 04:22 |
| → JrCs_ joined | 04:22 |
| → oojacobo_ joined | 04:22 |
| → jameser joined | 04:23 |
| → sven^_ joined | 04:24 |
| → fxrs joined | 04:24 |
| → bond_ joined | 04:24 |
| → Toba__ joined | 04:24 |
| → s17_ joined | 04:24 |
| → destiny__ joined | 04:24 |
| → somiaj_ joined | 04:25 |
| → abec0_ joined | 04:25 |
| → Mathiasd1 joined | 04:25 |
| → drodger_ joined | 04:25 |
| → elbeardmorez_ joined | 04:25 |
| → likewhoa- joined | 04:25 |
| → Ruler-_ joined | 04:25 |
| → ikonia_ joined | 04:25 |
| → PaulePan1er joined | 04:25 |
| → holdsworth joined | 04:25 |
| → djh_ joined | 04:25 |
| → nephyrin` joined | 04:25 |
| → axisys_ joined | 04:25 |
| → parsnip0 joined | 04:25 |
| ← piremi left | 04:25 |
| → ivo_ joined | 04:25 |
| ← ivo_ left | 04:25 |
| → d-fence__ joined | 04:25 |
| → chrfle^ joined | 04:25 |
| → tec___ joined | 04:25 |
| ← wombawomba left | 04:25 |
| → BlaXpirit joined | 04:26 |
| → ivo_ joined | 04:26 |
| ← ivo_ left | 04:26 |
| → ivo_ joined | 04:26 |
| ← ivo_ left | 04:26 |
| → jakogut_ joined | 04:26 |
| → Methos_ joined | 04:26 |
| → ivo_ joined | 04:26 |
| ← ivo_ left | 04:26 |
| → ivo_ joined | 04:26 |
| ← ivo_ left | 04:27 |
| → ivo_ joined | 04:27 |
| ← ivo_ left | 04:27 |
| → ivo_ joined | 04:27 |
| ← ivo_ left | 04:27 |
| → ivo_ joined | 04:27 |
| ← ivo_ left | 04:27 |
| → ivo_ joined | 04:27 |
| ← ivo_ left | 04:27 |
| → ivo_ joined | 04:28 |
| ← ivo_ left | 04:28 |
| → ivo_ joined | 04:28 |
| → FK04 joined | 04:28 |
| → devster joined | 04:28 |
| → incredible_ joined | 04:29 |
| → Ricaz- joined | 04:29 |
| → StephenS_ joined | 04:29 |
| → levex_ joined | 04:29 |
| → andai_ joined | 04:29 |
| ← rscata left | 04:29 |
| ← lagothrix left | 04:29 |
| ← drodger left | 04:29 |
| ← jakogut left | 04:29 |
| ← Yondering left | 04:29 |
| ← toydestroyer left | 04:29 |
| ← Oatmeal left | 04:29 |
| ← monokrome left | 04:29 |
| ← armyriad left | 04:29 |
| ← diogenese left | 04:29 |
| ← tec__ left | 04:29 |
| ← elbeardmorez left | 04:29 |
| ← destiny_ left | 04:29 |
| ← andai left | 04:29 |
| ← blahdodo left | 04:29 |
| ← chrfle left | 04:29 |
| ← jab416171 left | 04:29 |
| ← oojacoboo left | 04:29 |
| ← parsnip left | 04:29 |
| ← autrilla left | 04:29 |
| ← __main__ left | 04:29 |
| ← tkore left | 04:29 |
| ← lexruee left | 04:29 |
| ← marienz left | 04:29 |
| ← kloeri left | 04:29 |
| ← typikal left | 04:29 |
| ← JrCs left | 04:29 |
| ← Ruler- left | 04:29 |
| ← bond left | 04:29 |
| ← axisys left | 04:29 |
| ← vdl left | 04:29 |
| ← mikeymop left | 04:29 |
| ← uidzer0 left | 04:29 |
| ← Cathy left | 04:29 |
| ← duckydan left | 04:29 |
| ← RiPer left | 04:29 |
| ← levex left | 04:29 |
| ← permalac left | 04:29 |
| ← musl left | 04:29 |
| ← [Brain] left | 04:29 |
| ← j416 left | 04:29 |
| ← anderson left | 04:29 |
| ← atrus left | 04:29 |
| ← SlizardWizard left | 04:29 |
| ← Mathiasdm left | 04:29 |
| ← sven^ left | 04:29 |
| ← holdsworth_ left | 04:29 |
| ← danieli left | 04:29 |
| ← grkblood13 left | 04:29 |
| ← ExeciN left | 04:29 |
| ← Ricaz left | 04:29 |
| ← no_maam left | 04:29 |
| ← frobnic left | 04:29 |
| ← d-fence_ left | 04:29 |
| ← elricsfate left | 04:29 |
| ← StephenS left | 04:29 |
| ← abec0 left | 04:29 |
| ← incredible left | 04:29 |
| ← ujjain- left | 04:29 |
| ← Random832 left | 04:29 |
| ← Aichan left | 04:29 |
| ← catern left | 04:29 |
| ← jerrcs left | 04:29 |
| ← Guest14068 left | 04:29 |
| ← __name__ left | 04:29 |
| ← WakiMiko left | 04:29 |
| ← lus left | 04:29 |
| ← maqr left | 04:29 |
| ← osse left | 04:29 |
| ← somiaj left | 04:29 |
| ← quadz left | 04:29 |
| ← milki left | 04:29 |
| ← arand left | 04:29 |
| ← FiendKing04 left | 04:29 |
| ← nikow left | 04:29 |
| ← fxrs_ left | 04:29 |
| ← BlackPanx left | 04:29 |
| ← sentriz left | 04:29 |
| ← mulvane left | 04:29 |
| ← ojacobson left | 04:29 |
| ← oprypin left | 04:29 |
| ← gnarf left | 04:29 |
| ← devster31 left | 04:29 |
| ← Amadiro left | 04:29 |
| ← nutron|w left | 04:29 |
| ← qassim left | 04:29 |
| ← likewhoa left | 04:29 |
| ← wwalker left | 04:29 |
| ← nephyrin left | 04:29 |
| ← Toba left | 04:29 |
| ← PaulePanter left | 04:29 |
| ← veremitz left | 04:29 |
| ← djh left | 04:29 |
| ← pelegreno left | 04:29 |
| ← ikonia left | 04:29 |
| ← GGMethos left | 04:29 |
| ← thekingofbandit left | 04:29 |
| ← volestorm left | 04:29 |
| ← murr4y left | 04:29 |
| ← Adylas left | 04:29 |
| ← BooK left | 04:29 |
| ← s17 left | 04:29 |
| ← avar left | 04:29 |
| ← ghoti left | 04:29 |
| BlaXpirit → oprypin | 04:29 |
| → uidzer0 joined | 04:30 |
| → lexruee joined | 04:30 |
| → volestorm joined | 04:30 |
| → RiPer_ joined | 04:30 |
| → armyriad joined | 04:30 |
| → qassim joined | 04:30 |
| → veremitz joined | 04:30 |
| → autrilla joined | 04:30 |
| → atrus joined | 04:30 |
| → BlackPanx joined | 04:30 |
| → toydestroyer joined | 04:30 |
| → typikal joined | 04:30 |
| → __name__ joined | 04:30 |
| → jerrcs joined | 04:30 |
| ← Yonderen left | 04:30 |
| → anderson joined | 04:30 |
| → j416 joined | 04:31 |
| → ujjain joined | 04:31 |
| ← ujjain left | 04:31 |
| → ujjain joined | 04:31 |
| → Cathy joined | 04:31 |
| → avar joined | 04:31 |
| → catern joined | 04:31 |
| → kloeri joined | 04:31 |
| → arand joined | 04:31 |
| → Map joined | 04:31 |
| → wwalker joined | 04:32 |
| → thekingofbandit joined | 04:32 |
| → lus joined | 04:32 |
| → mulvane joined | 04:32 |
| ← mulvane left | 04:32 |
| → mulvane joined | 04:32 |
| → __main__ joined | 04:32 |
| ← dminuoso left | 04:32 |
| ← ggherdov left | 04:32 |
| Map → Guest15255 | 04:32 |
| ← ahammond left | 04:32 |
| → danieli joined | 04:32 |
| → BooK joined | 04:32 |
| → SlizardWizard joined | 04:32 |
| → blahdodo joined | 04:32 |
| ← d^sh left | 04:32 |
| ← HM left | 04:32 |
| → Aichan joined | 04:32 |
| ← SCHAPiE left | 04:32 |
| ← ivo_ left | 04:33 |
| → a3Dman joined | 04:33 |
| ← cbreak left | 04:33 |
| ← dogmatic69 left | 04:33 |
| → duckydan joined | 04:33 |
| ← sunri5e left | 04:33 |
| → d^sh joined | 04:33 |
| ← boombatower left | 04:34 |
| → gnarf- joined | 04:34 |
| ← AndreSomers left | 04:34 |
| → ggherdov joined | 04:34 |
| → AndreSomers joined | 04:34 |
| → maqr joined | 04:34 |
| → dogmatic69 joined | 04:34 |
| → SCHAPiE joined | 04:34 |
| ← maqr left | 04:34 |
| → maqr joined | 04:34 |
| → HM joined | 04:34 |
| → cbreak joined | 04:34 |
| → ahammond joined | 04:34 |
| → dminuoso joined | 04:35 |
| → vdl joined | 04:35 |
| → Adylas joined | 04:35 |
| → lagothrix joined | 04:35 |
| → elricsfate joined | 04:36 |
| → pelegreno joined | 04:36 |
| → permalac joined | 04:36 |
| → grkblood13 joined | 04:36 |
| ← ToBeCloud left | 04:36 |
| → quadz joined | 04:36 |
| → sentriz joined | 04:36 |
| → sunri5e joined | 04:36 |
| → murr4y joined | 04:36 |
| → mikeymop joined | 04:37 |
| → WakiMiko joined | 04:37 |
| → Random832 joined | 04:37 |
| → marienz joined | 04:37 |
| → rscata joined | 04:37 |
| → nutron|w joined | 04:37 |
| → no_maam joined | 04:37 |
| → Amadiro joined | 04:37 |
| → nikow joined | 04:38 |
| → monokrome joined | 04:38 |
| → ozette_ joined | 04:40 |
| → durre joined | 04:40 |
| → UTAN_dev_ joined | 04:41 |
| ← UTAN_dev left | 04:42 |
| ← _ng left | 04:42 |
| → ExeciN joined | 04:46 |
|
ephemera_
| Hi, When I update to 2.14.2, can not use `git add -p`. It do not show select command. It action just same as `git diff`. What's problem with me? | 04:48 |
| → diogenese joined | 04:50 |
|
_ikke_
| ephemera_: You mean that you don't see this part: "Stage this hunk [y,n,q,a,d,/,e,?]? "? | 04:50 |
|
ephemera_
| _ikke_: exactly yes. | 04:50 |
|
_ikke_
| ephemera_: Are you dropped back to the command line, or does it wait? | 04:51 |
| ← jameser left | 04:51 |
| ← acedia3 left | 04:52 |
|
ephemera_
| _ikke_: dropped back to the command line | 04:52 |
| ← aNusBlEach left | 04:54 |
| → Solvaring joined | 04:54 |
|
_ikke_
| Hmm, odd | 04:54 |
| ← Lyqyd left | 04:54 |
| ← al-damiri left | 04:55 |
| ← Cabanossi left | 04:56 |
| → Cabanossi joined | 04:57 |
| → pabs3 joined | 04:58 |
|
pabs3
| is there a way to tell which git tags haven't been pushed to the remotes (without using git push --tags --dry-run)? | 04:58 |
| ← whitby left | 04:59 |
|
_ikke_
| pabs3: no, you have to communicate with the remote to do so | 05:00 |
|
| pabs3: you could use git ls-remote to find out what tags the remote has | 05:00 |
| → whitby joined | 05:00 |
| → jameser joined | 05:00 |
|
_ikke_
| ephemera_: I'm not sure what's wrong | 05:01 |
|
| ephemera_: can you also reproduce that on other systems? | 05:01 |
|
ephemera_
| _ikke_: I will try it | 05:02 |
|
| pabs3 finds https://stackoverflow.com/questions/11308298/how-to-list-unpushed-git-tags | 05:02 |
|
_ikke_
| RIght, that uses ls-remote | 05:03 |
| → ivo_ joined | 05:03 |
| ← zivester left | 05:03 |
|
_ikke_
| pabs3: why don't you want to use push --dry-run? | 05:03 |
|
| Or is the reason you want to script it? | 05:03 |
|
pabs3
| I was hoping for something local-only | 05:03 |
|
_ikke_
| git does not track tags | 05:04 |
|
| like it does with branches | 05:04 |
|
pabs3
| it could though, just storing them in .git/info/refs like it does with local tags | 05:04 |
| ← blahdodo left | 05:05 |
| ← durre left | 05:05 |
| parsnip0 → parsnip | 05:05 |
| → Oatmeal joined | 05:06 |
| ← safe left | 05:06 |
| → blahdodo joined | 05:08 |
| ← rocktop left | 05:11 |
|
_ikke_
| it could, but it doesn't | 05:13 |
|
| There is normally little value in tracking them | 05:13 |
| ← samlisl_ left | 05:14 |
|
pabs3
| there is for tracking git tags that haven't been pushed to the remotes :) | 05:14 |
|
_ikke_
| pabs3: note that .git/info/refs is for dumb http transport | 05:15 |
|
| pabs3: it's not updated automatically | 05:15 |
| ← skered left | 05:16 |
| ← ArcaTech left | 05:16 |
|
pabs3
| oh, where are git tags stored then? | 05:16 |
| → Feral_Cat joined | 05:16 |
| → ws2k3 joined | 05:16 |
| ← ws2k3 left | 05:16 |
|
_ikke_
| either refs/heads/tags or packed refs | 05:16 |
|
| sorry refs/tags | 05:17 |
| → ws2k3 joined | 05:17 |
| ← ws2k3 left | 05:17 |
| → ppang joined | 05:17 |
|
pabs3
| hmm | 05:17 |
| → ws2k3 joined | 05:17 |
| ← ws2k3 left | 05:17 |
|
pabs3
| all the refs I've pushed are missing from .git/refs/tags | 05:18 |
| → ws2k3 joined | 05:18 |
| ← ws2k3 left | 05:18 |
| → ws2k3 joined | 05:18 |
| ← ws2k3 left | 05:18 |
|
_ikke_
| pabs3: right, like I said, they may be packed | 05:19 |
|
| git show-ref lists them all | 05:19 |
| → ws2k3 joined | 05:19 |
| ← ws2k3 left | 05:19 |
|
pabs3
| ahh | 05:19 |
| ← somiaj_ left | 05:20 |
| ← CssNoOb left | 05:20 |
| ← snowkidind left | 05:21 |
| frobnic_ → frobnic | 05:21 |
| → somiaj joined | 05:21 |
| → bambs joined | 05:22 |
| → ogny joined | 05:23 |
| → lss8_ joined | 05:26 |
| ← TikityTik left | 05:26 |
| ← JeffH left | 05:27 |
| ← somiaj left | 05:28 |
| → piremi joined | 05:28 |
| → CssNoOb joined | 05:29 |
| ← lss8 left | 05:29 |
| ← FrostyBytes left | 05:31 |
| → zefferno joined | 05:31 |
| ← bambs left | 05:32 |
| → skered joined | 05:33 |
| ← ppang left | 05:34 |
| → bronson joined | 05:34 |
| ← Neo left | 05:35 |
| → ppang joined | 05:35 |
| ← ozette_ left | 05:40 |
| → zenirc369 joined | 05:41 |
| → Numerotone joined | 05:42 |
| → dreiss joined | 05:42 |
| ← Numerotone left | 05:43 |
| → ThomasLocke joined | 05:44 |
| ← ThomasLocke left | 05:44 |
| → ThomasLocke joined | 05:44 |
| → Raging_Hog joined | 05:46 |
| ← robinb left | 05:46 |
| → diqidoq joined | 05:47 |
| → robinb joined | 05:47 |
| ← bongozig left | 05:47 |
| PaulePan1er → PaulePanter | 05:47 |
| ← neil_cn left | 05:47 |
| ← bronson left | 05:49 |
| → Bock joined | 05:51 |
| ← ivo_ left | 05:56 |
| ← TheVice left | 05:57 |
| ← jameser left | 05:58 |
| → ZyX-I joined | 05:59 |
| ← Bercik left | 06:00 |
| ← chrfle^ left | 06:01 |
| → chrfle^ joined | 06:01 |
| → dec0n joined | 06:01 |
| ← chrfle^ left | 06:02 |
| → chrfle joined | 06:02 |
| ← chrfle left | 06:02 |
| → chrfle joined | 06:02 |
| → osse joined | 06:03 |
| ← typikal left | 06:05 |
| → Bercik joined | 06:06 |
| → dre_ joined | 06:07 |
| → dege joined | 06:09 |
| → roelmonnens joined | 06:11 |
| → jceb joined | 06:14 |
| → freimatz joined | 06:15 |
| → neil_cn joined | 06:15 |
| ← webguynow left | 06:22 |
| → abba joined | 06:22 |
| ← ogny left | 06:25 |
| → ogny joined | 06:25 |
| ← ogny left | 06:25 |
| → ogny joined | 06:25 |
| ← Cabanossi left | 06:26 |
| → zulutango joined | 06:26 |
| ← MACscr left | 06:27 |
| → Cabanossi joined | 06:27 |
| ← Random832 left | 06:29 |
| → redhedded1 joined | 06:29 |
| ← ZyX-I left | 06:31 |
| → Silmarilion joined | 06:32 |
| → webguynow joined | 06:33 |
| → cdown joined | 06:33 |
| ← imack left | 06:33 |
| → ZyX-I joined | 06:34 |
| → MACscr joined | 06:35 |
| ← felixsanz left | 06:36 |
| → alcohol joined | 06:37 |
| → tkore joined | 06:37 |
| → felixsanz joined | 06:38 |
| ← piraye left | 06:39 |
| → nd joined | 06:40 |
| → Random832 joined | 06:40 |
| → bambs joined | 06:40 |
| ← selckin left | 06:41 |
| → luc4 joined | 06:41 |
| → selckin joined | 06:41 |
| → AegonTarg joined | 06:42 |
| → YETI joined | 06:42 |
|
AegonTarg
| Is there a git for windows that just has the console? | 06:42 |
|
| I don't want anything added to my context menus, I just want git on my command prompt. | 06:42 |
| ← dreiss left | 06:42 |
| → piraye joined | 06:43 |
| ← nd- left | 06:44 |
| → brillenfux joined | 06:45 |
| ← bambs left | 06:45 |
| → JeroenT joined | 06:45 |
|
AndreasLutro
| if you download git for windows on the git official website that's what you'll get | 06:46 |
| → dreiss joined | 06:47 |
| → imack joined | 06:47 |
| ikonia_ → ikonia | 06:48 |
| ← brillenfux left | 06:49 |
|
AegonTarg
| AndreasLutro, I don't want the context menus though. | 06:49 |
|
| I believe this installs context menus | 06:49 |
| → King_Hual joined | 06:50 |
|
AndreasLutro
| mm okay | 06:50 |
|
| maybe get the portable version? | 06:50 |
| ← Solvaring left | 06:51 |
| ← alcohol left | 06:51 |
| → alcohol joined | 06:52 |
| ← YETI left | 06:53 |
| → Lunatrius` joined | 06:53 |
| → YETI joined | 06:54 |
| ← Lunatrius left | 06:54 |
| Lunatrius` → Lunatrius | 06:54 |
| → bambs joined | 06:54 |
| ← qpt left | 06:55 |
| ← pabs3 left | 06:55 |
| → chele joined | 06:56 |
|
grawity
| AndreasLutro: I believe it also confirms whether you want context menus or not | 06:56 |
|
AndreasLutro
| yeah that's what I would hope | 06:57 |
| → dulange__ joined | 06:57 |
| ← regedit left | 06:58 |
| ← YETI left | 07:00 |
| → StarSeedling joined | 07:00 |
| → ArcaTech joined | 07:00 |
| → ertes-w joined | 07:01 |
| ← likewhoa- left | 07:02 |
| → ecstaticmorse joined | 07:02 |
| ← bambs left | 07:02 |
| → likewhoa joined | 07:02 |
| ← ojdo left | 07:04 |
| ← dreiss left | 07:04 |
| → _ng joined | 07:07 |
| → ShekharReddy joined | 07:07 |
| → theoceaniscool joined | 07:07 |
| ← lss8_ left | 07:08 |
| ← Xiti` left | 07:10 |
| → YuGiOhJCJ joined | 07:10 |
| → ojdo joined | 07:10 |
| → Xiti joined | 07:10 |
| → TomyWork joined | 07:11 |
| ← dviola left | 07:13 |
| ← robattila256 left | 07:14 |
|
osse
| AndreasLutro: you can disable that at install | 07:14 |
|
| oops, that was for AegonTarg | 07:14 |
|
grawity
| seems to be mistab o'clock | 07:14 |
| ← thiago left | 07:14 |
|
AegonTarg
| thanks! | 07:14 |
|
grawity
| time for coffee | 07:14 |
| ← AegonTarg left | 07:14 |
|
osse
| he knows nothing | 07:15 |
| ← theoceaniscool left | 07:15 |
| → Brski joined | 07:16 |
| → opalepatrick joined | 07:18 |
| ← Hobbyboy left | 07:18 |
| → roelmonn_ joined | 07:18 |
| ← barteks2x left | 07:18 |
| → flaviodesousa joined | 07:20 |
| → JeroenT_ joined | 07:21 |
| ← dave0x6d left | 07:21 |
| ← roelmonnens left | 07:22 |
| → phash joined | 07:22 |
| ← _ng left | 07:23 |
| → _ng joined | 07:24 |
| ← JeroenT left | 07:24 |
| ← roelmonn_ left | 07:24 |
| → roelmonnens joined | 07:25 |
| → Evalix joined | 07:26 |
| → jstein_ joined | 07:26 |
| → Evalix_ joined | 07:26 |
| jstein_ → jstein | 07:26 |
| ← Evalix_ left | 07:26 |
| ← ArcaTech left | 07:30 |
| → robattila256 joined | 07:30 |
| → SwiftMatt joined | 07:31 |
| → Hobbyboy joined | 07:35 |
| → ams__ joined | 07:35 |
| → barteks2x joined | 07:38 |
| → phluks joined | 07:39 |
| ← SerusWork left | 07:41 |
| ← SwiftMatt left | 07:41 |
| → bronson joined | 07:46 |
| ← energizer left | 07:47 |
| ← Willis left | 07:47 |
| ← piremi left | 07:47 |
| → AnujSharma joined | 07:47 |
| → rorro joined | 07:48 |
| ← phash left | 07:50 |
| ← bronson left | 07:50 |
| → Willis joined | 07:50 |
| → Ladus joined | 07:54 |
| ← cagedwisdom left | 07:55 |
| → cagedwisdom joined | 07:55 |
| → mikecmpbll joined | 07:57 |
| ← Random832 left | 08:00 |
| → VladGh joined | 08:02 |
| → lss8 joined | 08:02 |
| ← VladGh_ left | 08:04 |
| ← Ladus left | 08:07 |
| → Guest24 joined | 08:08 |
| → kurkale6ka joined | 08:09 |
| → revoltingPeasant joined | 08:09 |
| ← felixsanz left | 08:10 |
| ← Cabanossi left | 08:11 |
| → schleppel joined | 08:11 |
| → felixsanz joined | 08:12 |
| → Cabanossi joined | 08:12 |
| ← kurkale6ka left | 08:13 |
| → Random832 joined | 08:14 |
| → piremi joined | 08:14 |
| → kurkale6ka joined | 08:14 |
| → manuelschneid3r joined | 08:18 |
| ← piremi left | 08:19 |
| → theoceaniscool joined | 08:20 |
| → rominronin joined | 08:20 |
| ← hussam left | 08:20 |
| → cdg joined | 08:22 |
| ← dsdeiz left | 08:22 |
| ← xsteadfastx left | 08:23 |
| ← ZyX-I left | 08:23 |
| → Nobun joined | 08:23 |
| → dsdeiz joined | 08:23 |
| ← Anja left | 08:24 |
| ← cdg left | 08:26 |
| → Floflobel joined | 08:27 |
| ← YuGiOhJCJ left | 08:29 |
| ← Ratler left | 08:29 |
| → hussam joined | 08:29 |
| ← _ADN_ left | 08:30 |
| → Ratler joined | 08:30 |
| → xaa joined | 08:30 |
| → durham joined | 08:32 |
| ← dsdeiz left | 08:35 |
| ← freimatz left | 08:36 |
|
Nobun
| Hi. I am planning to develop an application where you can manage documents and, for each document, you could see the different revisions (so you can revert back to a previous revision than the most recent one). The idea is to call and use GIT through the application (creating internal local repository for each document) | 08:37 |
|
| but I need to understand how I can allow my application to "interact" with git (I don't need to upload to github or similar site). | 08:38 |
|
grawity
| you can use various libraries like libgit2 | 08:39 |
|
| (libgit2 deals with repos directly, but some other libraries call git behind the scenes and require it to be installed) | 08:39 |
|
Nobun
| well... I think it is not a problem if the final application will require git to be installed... but thank for the suggestion about libgit2... I will take a look at it. | 08:40 |
| → chll_ joined | 08:41 |
| → Anja joined | 08:41 |
|
Nobun
| for the moment, however, I need to understand a thing... when I do git push or pull (with git application, I mean) I will publish to remote repository or update local repository from remote site like github or similar. If I want to create a repository system, for example, in a server, are there some things to know about data structure on remote? | 08:42 |
| → CheckDavid joined | 08:43 |
|
Nobun
| I will try to be more clear | 08:43 |
|
| I mean... when I git push origin master on master branch on repository (for example on github), the github repository will take all new commits and add them to github too | 08:43 |
| → cstratak joined | 08:44 |
| ← cstratak left | 08:44 |
| → AegonTarg joined | 08:44 |
|
AegonTarg
| I cannot get my test.txt file removed from the git repo. | 08:44 |
| → cstratak joined | 08:44 |
|
AegonTarg
| I've tried git rm "test.txt" but it's still there.. | 08:44 |
|
grawity
| AegonTarg: did you commit the changes | 08:44 |
| → _ADN_ joined | 08:44 |
|
AegonTarg
| grawity, yup, it's still there. | 08:45 |
| → murii joined | 08:45 |
|
grawity
| AegonTarg: still where | 08:45 |
|
AegonTarg
| on the git repo. | 08:45 |
|
grawity
| AegonTarg: which git repo? | 08:45 |
|
Nobun
| local or server repo? | 08:45 |
|
AegonTarg
| server. | 08:45 |
|
grawity
| Nobun: what data structure did you mean – commits/branches? | 08:45 |
|
AegonTarg
| it's off the local repo, but still on server. | 08:45 |
|
grawity
| AegonTarg: did you `git push` the removal commit? | 08:45 |
|
AegonTarg
| yup. | 08:45 |
|
grawity
| how are you looking at the server? | 08:45 |
|
AegonTarg
| I did | 08:45 |
|
grawity
| does it have files just checked out? is there a post-update script that deploys them somewhere? | 08:46 |
|
AegonTarg
| git rm "test.txt", git add -A, git commit -m "removed test.txt", git push | 08:46 |
|
grawity
| is this just a github-like web UI? | 08:46 |
| → pbandark joined | 08:46 |
|
AegonTarg
| It's Gogs git | 08:46 |
|
Nobun
| with data structure I mean the information required to push and pull from/to a remote service (for example saving repository in a private server and not on github, bitbucket or other similar sites) | 08:46 |
|
grawity
| AegonTarg: so you're looking at the web UI then? | 08:46 |
|
AegonTarg
| Yes. | 08:47 |
|
| Correct. | 08:47 |
|
grawity
| AegonTarg: does the commit ID match what you're seeing locally? | 08:47 |
|
| are you looking at the correct branch? | 08:47 |
|
| (did you push to the correct repo?) | 08:47 |
|
AegonTarg
| actually no it doesnt | 08:47 |
|
| I added test.txt in a commit message titled "initial commit" over 1 hour ago | 08:47 |
|
| but I literally just removed test.txt, yet it still shows that initial commit for the file. | 08:47 |
|
grawity
| Nobun: git's protocol usually takes care of that | 08:47 |
|
| Nobun: are you planning on running regular git on the server, or a custom implementation? | 08:48 |
|
AegonTarg
| you know what, I don't know why this is happening | 08:48 |
|
Nobun
| grawity: for the moment I only at a planning state. I still not yet started this project. I am only try to understand wich kind of additional knowledge I will need before starting | 08:48 |
|
AegonTarg
| I'm just gonna remove it manually using the web UI | 08:48 |
| ← AegonTarg left | 08:49 |
|
grawity
| always a pleasant experience trying to help people who give up halfway— | 08:49 |
|
| not quite as good as being told to fuck off but still | 08:49 |
|
| Nobun: the Git push/fetch protocol only deals with commits (and refs – branches, tags, etc.) | 08:49 |
|
| Nobun: there's nothing specific that your program would need to do, if you're just using git's or libgit2's regular operations | 08:50 |
| ← _ADN_ left | 08:50 |
|
grawity
| tbh I'd worry more about merges... | 08:50 |
| ← chrfle left | 08:51 |
| → evangeline joined | 08:52 |
| ← feodaron left | 08:52 |
| ← a3Dman left | 08:53 |
| → feodaron joined | 08:53 |
|
Nobun
| grawity: I think I will not require anithing specify. After all the idea is to have a software wich can show different revisions of documents (for advocates) so he will able to re-access to the document saved in different revisions and see wich one fits better for his needs | 08:53 |
|
grawity
| well, as long as it's strictly linear | 08:54 |
|
Nobun
| I know that git protocol is not used very efficiently this way (after all a .doc/.odt document is indeed binary than text), but I think that having the chance to access to different revision of a document could be a fine tool | 08:55 |
|
grawity
| but let's say the same document is downloaded to two computers, at version X | 08:55 |
|
| and different modifications happen on both | 08:55 |
|
| well, the git protocol really doesn't care about text vs binary | 08:55 |
| → acidjnk joined | 08:55 |
|
Nobun
| yeah... but you cannot use diffs... this is what I mean, grawity | 08:55 |
|
| my fault I was not clear | 08:56 |
|
| grawity: in your scenario you should see different commits, each one coming from different author (user) right? | 08:57 |
|
| (if the application correctly pushes to a common server, in this example) | 08:57 |
| ← venmx_ left | 08:58 |
| ← venmx left | 08:58 |
| → clmsy joined | 08:58 |
|
Nobun
| the problem could be, like you said, if I plan to use also branches... it could be very hard to merge in a trusted way | 08:59 |
|
| to avoid conflicts with different files with a single commit, the starting idea is to create, through application, different internal repositories for each document. But I don't know if the idea is nice. | 09:00 |
| ← svm_invictvs left | 09:00 |
|
Nobun
| (so... every document should be contained in its own local repo) | 09:00 |
| ← thomasross left | 09:01 |
| → a3Dman joined | 09:01 |
| → thomasross joined | 09:01 |
| → _ADN_ joined | 09:02 |
| → testuser joined | 09:04 |
|
testuser
| hi, I'm currently using git submodules for the actual project + libraries it uses; the libraries are in a separate repositories, since they are reused in a different project (the libraries are internal only). However, I'm having the issue when certain feature is split among different repositories (project libraries), which is hard to update, since there is no unified pull request for example: each repository has to be updated separated | 09:05 |
|
| even though this is the same functionality. I'm looking to switch to something that would solve this issue - would git subtrees help there, can I still have a separate library repository that is reused across projects? | 09:05 |
| ← Raging_Hog left | 09:05 |
| ← dhollinger left | 09:05 |
| ← robinb left | 09:09 |
| → j08nY joined | 09:09 |
|
Nobun
| testuser, since I am not so expert on using git, the only advice I could think of is to use diff-patch | 09:11 |
| → jameser joined | 09:11 |
|
testuser
| Nobun, how would that help me in this use case? | 09:12 |
|
Nobun
| after creating and testing the new feature in a library and after testing it you create a diff files from the starting revision (before changing) and the "final" revision (after the feature was applied) | 09:12 |
|
grawity
| Nobun: basically, your app would handle the merging | 09:12 |
|
| Nobun: Git can give you version A, version B, and the "base" version | 09:12 |
|
testuser
| Nobun, but I would have to apply the patch to every library separately, including the project itself; that won't solve anything. | 09:13 |
|
Nobun
| then you could apply the same diff in the other repos so the code will be updated easily. But, however, your repos must be actually updated separately even following this advice | 09:13 |
|
grawity
| Nobun: though of course that only applies if two computers are allowed to push the same document to the same server repo/account | 09:13 |
|
| testuser: separate repo sounds like submodules | 09:13 |
|
| testuser: they're kind of a pain sometimes, though | 09:14 |
| → seschwar joined | 09:14 |
|
grawity
| but they still let you say that "this commit of main-app repo requires that specific commit of library repo" | 09:14 |
|
Nobun
| testuser: sorry than. That was the only idea I could think of :( | 09:14 |
| ← Guest24 left | 09:15 |
|
grawity
| and a pull request could update that as well (e.g. change file A, change file B, and update submodule to commit X) | 09:15 |
|
testuser
| grawity, yeah, I would like to solve that, I'm asking whether subtree would solve this? | 09:15 |
|
Nobun
| thank for answers and for your time, grawity | 09:17 |
| → Yondering joined | 09:17 |
| ← a3Dman left | 09:18 |
|
testuser
| grawity, there would have to be multiple pull requests for each of the libraries as well as the actual project, which is precisely what I'm trying to avoid. | 09:18 |
|
jast
| there's no great way to handle this if your interface doesn't allow bundling changes in multiple repositories | 09:19 |
| → nisseni joined | 09:19 |
| ← King_Hual left | 09:20 |
| → buyfn joined | 09:21 |
| → gitprotector joined | 09:22 |
| ← rorro left | 09:22 |
| ← gitprotector left | 09:23 |
|
testuser
| jast, I'm looking for a way to solve it, maybe https://github.com/ingydotnet/git-subrepo but don't have any experience with it, so I'm not sure if it will work. | 09:24 |
| → Tobbi joined | 09:24 |
|
nisseni
| I've installed a plugin to wordpress that has a git repo. So my main repo won't add it (guess it wants it as a submodule) - however, I want it in the original repo. I've removed all the git-files from the plugin and the submodule config in my original repo, but it still won't add. Any ideas how to fix this? | 09:25 |
| ← Murr left | 09:25 |
| → Murr joined | 09:26 |
| → a3Dman joined | 09:26 |
| → akushner___ joined | 09:26 |
| ← askb left | 09:26 |
| ← zero85 left | 09:27 |
| → askb joined | 09:27 |
| → SerusWork joined | 09:27 |
| → plitter joined | 09:28 |
| → venmx joined | 09:28 |
| → venmx_ joined | 09:28 |
| → joe1 joined | 09:30 |
| ← askb left | 09:32 |
| → dhollinger joined | 09:32 |
| ← revoltingPeasant left | 09:32 |
| ← Random832 left | 09:33 |
| → askb joined | 09:33 |
| ← CssNoOb left | 09:34 |
| ← PtxDK_ left | 09:38 |
| → santaclauze joined | 09:38 |
|
santaclauze
| how do i change my default protected branch? | 09:38 |
|
| I pushed on dev when initialising my project rather than on master | 09:38 |
| ← StephenS_ left | 09:38 |
|
_ikke_
| git does not have protected branches | 09:39 |
| ← a3Dman left | 09:39 |
|
_ikke_
| You are probably using github|gitlab|bitbucket|<git_hosting_service> | 09:39 |
| ← VladGh left | 09:39 |
| → StephenS joined | 09:39 |
| → PtxDK joined | 09:39 |
| → VladGh joined | 09:40 |
|
dcpc007
| When doing a rebase -i on many commits, how can i "pause" to check what was exactly in the commit where i'm to choose the right message ? | 09:41 |
|
| currently i got the screen with commit message to edit and "only" the list of modified files | 09:41 |
|
grawity
| just open a new terminal window and look around | 09:42 |
| ← theoceaniscool left | 09:43 |
| → re1 joined | 09:43 |
|
dcpc007
| ha yes :) | 09:43 |
|
| pffff cheater :) | 09:44 |
| ← Tobbi left | 09:44 |
| → bergice_ joined | 09:45 |
| → Random832 joined | 09:46 |
| → bronson joined | 09:47 |
| ← j08nY left | 09:48 |
| → simka joined | 09:48 |
| ← ahrs left | 09:50 |
| → FernandoBasso joined | 09:51 |
| → cdown_ joined | 09:51 |
| → tvw joined | 09:51 |
| ← ecstaticmorse left | 09:51 |
| → ahrs joined | 09:52 |
| ← bronson left | 09:52 |
| s17_ → s17 | 09:52 |
| ← cdown left | 09:52 |
| cdown_ → cdown | 09:52 |
| → stamina joined | 09:53 |
| ← buyfn left | 09:59 |
| ← cagedwisdom left | 10:01 |
| → Agrajag- joined | 10:01 |
| → Guest24 joined | 10:02 |
| ← ojdo left | 10:02 |
| ← Guest24 left | 10:02 |
| → ojdo joined | 10:03 |
| → dimi1979 joined | 10:04 |
|
Agrajag-
| g'day, is there a way to identify/checkout the branch that origin/HEAD points to? (without a detached HEAD, i want to switch to the local branch) | 10:04 |
| → rorro joined | 10:04 |
| ← JeroenT_ left | 10:05 |
|
tobiasvl
| Agrajag-: git symbolic-ref refs/remotes/origin/HEAD | 10:05 |
|
grawity
| trick question, origin/HEAD never points to a local branch | 10:06 |
|
Agrajag-
| as in teh corresponding local branch | 10:06 |
|
grawity
| but in most cases, if you just trim the "refs/remotes/*/" prefix and pass the resulting text to `git checkout` | 10:07 |
|
| that should work fine | 10:07 |
|
Agrajag-
| ah yep ok that should be good. thanks tobiasvl grawity | 10:08 |
| ← rorro left | 10:10 |
| → j08nY joined | 10:14 |
| joe1 → revoltingPeasant | 10:15 |
|
jast
| FWIW the porcelain/high-level way to get this info is 'git remote show origin' | 10:15 |
|
TomyWork
| i have a path (absolute or relative) that is assumed to be inside a git working directory, not necessarily the current one. the path's target may or may not exist and may or may not be tracked. How do I convert the path into a repo-relative path? | 10:16 |
| ← neil_cn left | 10:18 |
|
TomyWork
| one necessary step is of course to cd "$(dirname "$path")" | 10:18 |
| → manuels joined | 10:18 |
| ← manuels left | 10:18 |
| → rorro joined | 10:18 |
|
TomyWork
| but then, how do i find the relative path for the current directory? | 10:18 |
| ← DogHackit left | 10:19 |
|
grawity
| git rev-parse --show-toplevel, --show-cdup, --show-prefix | 10:20 |
| ← infernix left | 10:20 |
| → kurkale61 joined | 10:20 |
|
TomyWork
| cdup is a recent addition? | 10:20 |
|
grawity
| no | 10:20 |
|
| but a recent addition on Linux is `realpath "$path" --relative-to="$(git rev-parse --show-toplevel)"` | 10:21 |
|
TomyWork
| man git ls-rev-parse in git 2.14.1 doesnt mention cdup | 10:21 |
|
gitinfo
| the git manpage is available at https://gitirc.eu/git.html | 10:21 |
|
grawity
| no cd'ing necessary | 10:21 |
| → Guest24 joined | 10:21 |
| → eduardas_m joined | 10:21 |
| ← j08nY left | 10:21 |
|
TomyWork
| grawity cding is still necessary since i can't assume that i'm in the same git working directory | 10:22 |
|
| i.e. the working directory might be part of a different repo | 10:22 |
| ← kurkale6ka left | 10:22 |
|
TomyWork
| but show-prefix is what i need, nice | 10:23 |
| → overlord_tm joined | 10:23 |
| → freimatz joined | 10:23 |
|
TomyWork
| foo="$(cd "$(dirname "$path")" && git rev-parse --show-prefix)/$(basename "$path")" | 10:24 |
|
| +/- some missing characters :) | 10:25 |
| ← xcm left | 10:26 |
| → kurkale6ka joined | 10:27 |
| ← kurkale61 left | 10:27 |
| ← SkyPatrol left | 10:27 |
| → SkyPatrol joined | 10:29 |
| ← Guest24 left | 10:31 |
| → JeroenT joined | 10:32 |
| → buyfn joined | 10:33 |
| ← JeroenT left | 10:37 |
| → JeroenT joined | 10:38 |
| → aard joined | 10:39 |
| → robinb joined | 10:40 |
| → cdown_ joined | 10:42 |
| ← JeroenT left | 10:42 |
| ← lexruee left | 10:44 |
| ← cdown left | 10:44 |
| cdown_ → cdown | 10:44 |
| → lexruee joined | 10:46 |
| → phash joined | 10:47 |
| ← SkyPatrol left | 10:48 |
| → gechr joined | 10:48 |
| ← gechr left | 10:48 |
| → SkyPatrol joined | 10:50 |
| → tlaxkit joined | 10:52 |
| → JeroenT joined | 10:54 |
| ← phluks left | 10:55 |
|
TomyWork
| file_name="$(cd "$raw_file_name" && git rev-parse --show-prefix)" # for directories | 10:57 |
|
| file_name="$(cd "$(dirname "$raw_file_name")" && git rev-parse --show-prefix)$(basename "$raw_file_name")" # for everything else | 10:57 |
|
| grawity that's how i do it now. works nicely | 10:57 |
| → piremi joined | 10:57 |
| → aielima joined | 10:59 |
| ← Guest25803 left | 10:59 |
| → davebrown joined | 11:00 |
| ← jameser left | 11:00 |
| ← davebrown left | 11:02 |
| → davebrown joined | 11:03 |
| → amcsi__ joined | 11:04 |
| ← buyfn left | 11:05 |
| ← davebrown left | 11:06 |
| ← Random832 left | 11:06 |
| ← ejsf left | 11:06 |
| ← amcsi_ left | 11:08 |
| → davebrown joined | 11:08 |
| ← davebrown left | 11:09 |
| → debian joined | 11:09 |
| debian → Guest92304 | 11:10 |
| → hs367 joined | 11:10 |
| → Acerific joined | 11:10 |
| ← Acerific left | 11:10 |
| → Acerific joined | 11:10 |
| ← ertes-w left | 11:11 |
| ← hs366 left | 11:11 |
| → elsevero joined | 11:11 |
| ← igemnace left | 11:11 |
| → Cavallari joined | 11:11 |
| ← AnujSharma left | 11:11 |
| → ertes-w joined | 11:14 |
| ← robinb left | 11:15 |
| → chrfle joined | 11:15 |
| ← chrfle left | 11:15 |
| → chrfle joined | 11:15 |
| → Random832 joined | 11:19 |
| ← murii left | 11:21 |
| ← JeroenT left | 11:23 |
| → JeroenT joined | 11:24 |
| ← Acerific left | 11:24 |
| → arup_r joined | 11:24 |
| ← Murr left | 11:25 |
|
arup_r
| I would like to ignore all files in this app/pems/* but I would like to keep app/pems/.keep . how can I set this pattern in .gitignore file? | 11:26 |
| → Murr joined | 11:26 |
|
grawity
| just `git add -f` the .keep file | 11:26 |
| ← rorro left | 11:27 |
|
grawity
| then it doesn't matter what .gitignore says | 11:27 |
| → ejsf joined | 11:28 |
| → AnujSharma joined | 11:28 |
|
arup_r
| grawity: oh I see, thanks | 11:28 |
| ← eduardas_m left | 11:29 |
| ← Feral_Cat left | 11:29 |
| ← FernandoBasso left | 11:29 |
| ← durham left | 11:29 |
| → Tobbi joined | 11:31 |
| ← aielima left | 11:33 |
| → jimmyrcom_ joined | 11:33 |
| → aielima joined | 11:33 |
| ← jceb left | 11:34 |
| → Munt joined | 11:35 |
| → oisota joined | 11:35 |
| → shinnya joined | 11:37 |
|
Codaraxis
| grawity, arup_r, why not add !app/pems/.keep to the .gitignore? | 11:37 |
|
gitinfo
| grawity: [!cant_happen] The scenario you describe does not add up, and/or we feel it is unlikely that there is such a fundamental bug that it could have happened like this. Please provide more detail: what commands (literally!) did you run, what did they say, and what did you expect instead? | 11:37 |
| ← danieli left | 11:38 |
| → danieli joined | 11:38 |
|
arup_r
| Codaraxis: I didn't know it. :) | 11:38 |
| ← nowhereman left | 11:38 |
| → durham joined | 11:38 |
|
grawity
| Codaraxis: why bother | 11:39 |
|
Codaraxis
| I personally find it cleaner to have the exclusion to what is covered by .gitignore explicitly listed in the .gitignore itself. | 11:39 |
| → abba_ joined | 11:39 |
| → Locra_ joined | 11:41 |
| ← jstimm left | 11:42 |
| → ferr joined | 11:42 |
| → justAllgood joined | 11:42 |
| ← abba left | 11:43 |
| → diqidoq_ joined | 11:43 |
| ← diqidoq_ left | 11:43 |
| ← diqidoq left | 11:43 |
| → mr_sm1th joined | 11:44 |
| → kurkale61 joined | 11:45 |
| ← jeffreylevesque left | 11:47 |
| ← kurkale6ka left | 11:47 |
| ← arup_r left | 11:47 |
| → bronson joined | 11:48 |
| → sumor9 joined | 11:48 |
| ← re1 left | 11:49 |
| → jceb joined | 11:49 |
| ← sumor9 left | 11:49 |
| ← tlaxkit left | 11:52 |
| ← bronson left | 11:53 |
| ← dimi1979 left | 11:53 |
| ← redhedded1 left | 11:53 |
| ← phash left | 11:56 |
| ← ferr left | 11:57 |
| → dimi1979 joined | 11:57 |
| → FernandoBasso joined | 11:58 |
| ← kurkale61 left | 11:58 |
| ← SkyPatrol left | 11:59 |
| → tunekey joined | 12:00 |
| ← oisota left | 12:00 |
| ← durham left | 12:00 |
| ← hs367 left | 12:00 |
| ← akushner___ left | 12:00 |
| → durham joined | 12:03 |
| → SkyPatrol joined | 12:03 |
| ← jceb left | 12:06 |
| → delboy1978uk joined | 12:06 |
|
delboy1978uk
| git add . warning: LF will be replaced by CRLF in src/Image.php. WHY? How do I stop this nonsense? | 12:07 |
| → deepakbndeepu joined | 12:07 |
|
delboy1978uk
| windows sucks :-| | 12:07 |
| → robinb joined | 12:09 |
| ← Locra_ left | 12:09 |
|
_ikke_
| Disable crlf normalization | 12:09 |
|
| You could choose it during installation | 12:09 |
| → synthroid joined | 12:12 |
| → stanfordtools joined | 12:13 |
|
Seveas
| !app | 12:15 |
|
gitinfo
| [!cant_happen] The scenario you describe does not add up, and/or we feel it is unlikely that there is such a fundamental bug that it could have happened like this. Please provide more detail: what commands (literally!) did you run, what did they say, and what did you expect instead? | 12:15 |
|
Seveas
| !botsnack | 12:15 |
|
gitinfo
| Om nom nom | 12:15 |
| ← stanfordtools left | 12:16 |
| → Parraki_ joined | 12:16 |
| → masuberu joined | 12:17 |
| → stanfordtools joined | 12:17 |
|
stanfordtools
| when I push to git, I'd like my remote server to pull automatically, so that my website is updated. What's the best way to make this automatic? Maybe instead of just pushing I can run another command that pushes and pulls remotely. But how can I make such script? | 12:17 |
|
grawity
| .git/hooks/post-update, see !deploy | 12:17 |
|
gitinfo
| Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html | 12:17 |
| → hs366 joined | 12:18 |
| → jceb joined | 12:18 |
| ← Parraki left | 12:18 |
|
stanfordtools
| I don't understand. would the post-receive hook be on the server? doesn't that mean I have to pull manually? | 12:18 |
|
osse
| stanfordtools: it's invoked when you push to the server | 12:19 |
| → Locra_ joined | 12:19 |
|
stanfordtools
| osse, but i'm not pushing to the server! | 12:19 |
|
| i'm pushing to github | 12:19 |
|
| is it even possible to push directly to the server? that'd be enough for me. How can I do this? | 12:19 |
|
_ikke_
| stanfordtools: If you have ssh access, it's quite easy | 12:20 |
|
stanfordtools
| _ikke_, can you give an example? | 12:21 |
| → amcsi_ joined | 12:21 |
| → kurkale61 joined | 12:21 |
|
osse
| stanfordtools: github *is* the server in this case. | 12:21 |
| → boombatower joined | 12:21 |
|
osse
| so you can't use it. github has its own webhook thingy | 12:21 |
|
stanfordtools
| github doesn't serve websites | 12:21 |
|
| or, it doesn't serve mine | 12:22 |
|
osse
| i never said it did | 12:22 |
|
stanfordtools
| how could a webhook on github, update my server? | 12:23 |
|
_ikke_
| stanfordtools: github would call a page on your server | 12:23 |
|
stanfordtools
| what's calling a page?? | 12:23 |
|
| like, an http request? | 12:23 |
|
_ikke_
| yes | 12:24 |
| ← amcsi__ left | 12:24 |
|
stanfordtools
| and the question is what do I do on my server to convert an http request into a git pull ? | 12:24 |
| → jeffreylevesque joined | 12:25 |
| ← jceb left | 12:25 |
| ← Locra_ left | 12:26 |
| ← bumblebeer left | 12:26 |
| → typikal joined | 12:26 |
| → bumblebeer joined | 12:26 |
| ← Munt left | 12:27 |
| ← zulutango left | 12:27 |
|
stanfordtools
| I had a problem pushing to my server, I don't understand why: https://pastebin.com/xjfmYRS0 | 12:28 |
|
tobiasvl
| the error message is pretty explanatory | 12:28 |
|
| !bare | 12:28 |
|
gitinfo
| A bare repository is used to push/fetch (useful for running a git server), and contains only the contents of .git/ from a "normal" repo. Read more: http://bare-vs-nonbare.gitrecipes.de/ | 12:28 |
|
osse
| https://developer.github.com/webhooks/ | 12:28 |
|
grawity
| in short "you can't push into a repository which has files checked out" | 12:28 |
|
stanfordtools
| but... I donn't want a bare repo | 12:29 |
|
| I just want to push to it | 12:29 |
|
grawity
| you don't want a bare repo, but you *need* a bare repo | 12:29 |
| ← in1t3r_ left | 12:29 |
|
tobiasvl
| what would pushing to a non-bare repo mean? what do you want here? | 12:29 |
|
stanfordtools
| wtf. so how do I update and pull to my remote repo, without having a bare repo? | 12:29 |
|
grawity
| you don't | 12:29 |
|
_ikke_
| people usually want push to deploy | 12:29 |
|
grawity
| well, it's not strictly required with the latest git versions | 12:30 |
|
tobiasvl
| pulling to a non-bare repo is not problematic | 12:30 |
|
stanfordtools
| tobiasvl, I just want the remote repo to be up to date and checked out exactly like my local one | 12:30 |
|
grawity
| there is "receive.denyCurrentBranch = updateInstead" nowadays | 12:30 |
| → akushner___ joined | 12:30 |
| → in1t3r joined | 12:30 |
|
stanfordtools
| I use this to deploy, but it's nice being able to edit on the server side itself | 12:30 |
|
| on the deploy repo, too | 12:30 |
|
| this is just for prototyping so i think it's fine | 12:30 |
|
tobiasvl
| stanfordtools: then read the error message, it tells you some stuff about receive.denyCurrentBranch | 12:31 |
|
stanfordtools
| tobiasvl, is that the best way? to modify that config? I assume there might be a better way | 12:31 |
|
tobiasvl
| a better way to do what? | 12:31 |
|
| better in what way? | 12:31 |
| → stutter joined | 12:31 |
| → Nizumzen joined | 12:31 |
|
stanfordtools
| also, I remember being able to update a coworkers' repo by just pushing to it | 12:31 |
| → Achylles joined | 12:31 |
|
tobiasvl
| okay, set up your repo the same way your coworker's repo was set up then | 12:32 |
|
stanfordtools
| tobiasvl, is there a command i can run remotely that will just remotely do "giit pull" on the remote repo? | 12:32 |
| → murii joined | 12:32 |
|
grawity
| ssh | 12:32 |
|
stanfordtools
| tobiasvl, we didn't really change the config | 12:32 |
| ← kurkale61 left | 12:33 |
|
stanfordtools
| grawity, can I do: [email@hidden.address] git pull | 12:33 |
|
grawity
| how did you set up that repo? | 12:33 |
|
tobiasvl
| this is a confusing conversation. a command you can run remotely that will remotely "git pull"? because that's juts "git pull" | 12:33 |
|
stanfordtools
| how would i do that in one valid command, grawity ? | 12:33 |
| → DevAntoine joined | 12:33 |
|
tobiasvl
| unless the first "remotely" meant "locally" | 12:33 |
| ← JeroenT left | 12:33 |
|
stanfordtools
| tobiasvl, git pull on my remote repo, not the local one. running the command locally | 12:33 |
| → Locra_ joined | 12:33 |
| → JeroenT joined | 12:33 |
|
tobiasvl
| then ssh | 12:33 |
|
stanfordtools
| I assume it's something like: ssh [email@hidden.address] git pull | 12:34 |
|
| Is there a way to make one valid command? like this?? ssh [email@hidden.address] /home/me/www/mywebsite.com/; git pull | 12:34 |
|
tobiasvl
| ssh [email@hidden.address] "cd /home/me/www/mywebsite.com/ && git pull" | 12:34 |
|
stanfordtools
| ssh [email@hidden.address] cd /home/me/www/mywebsite.com/; git pull | 12:35 |
|
| oh, got it, tobiasvl | 12:35 |
| → Munt joined | 12:35 |
| ← koell left | 12:35 |
|
stanfordtools
| tobiasvl, is it possible to add this as a git command so I can do git deploy, or git push deploy, and it'll run this script you wrote? | 12:35 |
|
tobiasvl
| I think you confuse me with someone else, I didn't write any scripts | 12:35 |
|
stanfordtools
| a one line script | 12:36 |
|
| <tobiasvl> ssh [email@hidden.address] "cd /home/me/www/mywebsite.com/ && git pull" | 12:36 |
| → kurkale61 joined | 12:36 |
| ← stutter left | 12:36 |
|
stanfordtools
| you did, tobiasvl | 12:36 |
|
tobiasvl
| oh. that's not a script, it's just an ssh command | 12:36 |
|
stanfordtools
| exactly | 12:36 |
|
tobiasvl
| no, you can't make it a git command because it's not a git command, it's an ssh command | 12:36 |
|
stanfordtools
| git can't execute ssh commands? | 12:36 |
|
tobiasvl
| not arbitrary ones, no | 12:37 |
| ← Random832 left | 12:37 |
|
stanfordtools
| ok, thanks | 12:37 |
|
| that means i have to make a bash script to save that command | 12:38 |
| ← JeroenT left | 12:38 |
| ← feodaron left | 12:38 |
|
tobiasvl
| just make a bash alias if it's important | 12:38 |
|
| is this going to be automated? | 12:39 |
| ← enkrypt left | 12:39 |
|
stanfordtools
| but then where is the alias saved? | 12:39 |
|
| yes | 12:39 |
|
tobiasvl
| automated merges aren't really advisable | 12:39 |
|
stanfordtools
| I'll just do ./deploy locally | 12:39 |
| ← deepakbndeepu left | 12:39 |
| → Raging_Hog joined | 12:39 |
|
tobiasvl
| what if the remote has local changes or diverged history? | 12:39 |
|
stanfordtools
| tobiasvl, then i've made a mistake to leave local changes | 12:39 |
| → gugah joined | 12:39 |
|
tobiasvl
| clearly, but how will the automated deploy routine deal with it | 12:40 |
|
stanfordtools
| the pull would be rejected, right? | 12:40 |
|
grawity
| just pull with --ff-only | 12:40 |
|
| either it succeeds or fails | 12:40 |
| ← Locra_ left | 12:40 |
|
stanfordtools
| ok | 12:40 |
| ← chrfle left | 12:41 |
| ← raynold left | 12:41 |
|
stanfordtools
| fatal: could not read Username for 'https://github.com': No such device or address | 12:43 |
|
| I'm doing ssh [email@hidden.address] "cd /home/me/www/mywebsite.com/ && git pull" | 12:44 |
|
alcohol
| looks like you are using a https origin without a stored username and password | 12:45 |
|
| aka, that's not going to work | 12:45 |
|
grawity
| set up the remote repo to remember your password, or to use SSH for github | 12:45 |
|
jast
| apparently the remote repo uses HTTP for fetching and needs to ask you for a password on a terminal but no terminal is available | 12:45 |
|
stanfordtools
| dammit. it always happens. how can i set it to remember username? | 12:46 |
|
tobiasvl
| !credential-cache | 12:47 |
|
gitinfo
| Tired of entering your username and password every time you access an HTTP(S) remote and have good reasons not to use SSH? A summary of shortcuts and supported caching methods can be found here: http://stackoverflow.com/a/5343146 | 12:47 |
| → fission6 joined | 12:48 |
| → freddieptf joined | 12:48 |
| → jstimm joined | 12:48 |
|
stanfordtools
| I'm using ssh now. But still I think it asks for password every so often | 12:48 |
| ← freddieptf left | 12:48 |
| → freddieptf joined | 12:49 |
| → JeroenT joined | 12:50 |
| → Random832 joined | 12:50 |
|
stanfordtools
| fatal: Unable to create '/mnt/d/Lucas/Dropbox/Startups/notpcbro-startup/notpcbro/.git/refs/remotes/origin/master.lock': File exists. | 12:51 |
|
tobiasvl
| not password, in that case, but ssh key passphrase | 12:51 |
| ← venmx_ left | 12:51 |
| → SkyPatrol_ joined | 12:51 |
| ← Munt left | 12:51 |
| ← venmx left | 12:51 |
| → enkrypt joined | 12:52 |
|
stanfordtools
| tobiasvl, so what do I do to remember it? | 12:52 |
| ← delboy1978uk left | 12:52 |
| ← jimmyrcom_ left | 12:52 |
| ← SkyPatrol left | 12:52 |
| → jceb joined | 12:52 |
|
tobiasvl
| not sure if you can since you create a new session every time you ssh in | 12:53 |
|
| best thing would probably be to use a deploy key with github instead | 12:54 |
| ← jstimm left | 12:54 |
|
tobiasvl
| https://developer.github.com/v3/guides/managing-deploy-keys/ | 12:54 |
|
| https://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys | 12:54 |
| ← stamina left | 12:55 |
| ← Cabanossi left | 12:56 |
| → Cabanossi joined | 12:57 |
| ← robinb left | 12:57 |
| ← stanfordtools left | 12:58 |
| → jeffreylevesque_ joined | 12:58 |
| → glad joined | 12:58 |
| → str joined | 12:59 |
| ← jeffreylevesque left | 13:00 |
| jeffreylevesque_ → jeffreylevesque | 13:01 |
| ← robotroll left | 13:02 |
| → feodaron joined | 13:02 |
| ← rscata left | 13:05 |
| ← elsevero left | 13:08 |
| → cdg joined | 13:08 |
| ← cdg left | 13:10 |
| → cdg joined | 13:10 |
| → elsevero joined | 13:11 |
| → RxMcDonald joined | 13:11 |
| → cdg_ joined | 13:12 |
|
RxMcDonald
| Hello, I cloned a repo then removed the git folder and did a bunch of commits, is it possible to add the original git folder and apply the changes again as if I didn't delete the .git folder? | 13:12 |
| → dsdeiz joined | 13:12 |
| ← dsdeiz left | 13:12 |
| → dsdeiz joined | 13:12 |
| → zivester joined | 13:12 |
|
RxMcDonald
| i.e. replay the commits but from the moment I cloned instead of starting a new git repo | 13:13 |
|
jast
| yes | 13:13 |
| → robinb joined | 13:14 |
|
jast
| basically: 1) add the original source of the clone as a remote, 2) fetch | 13:14 |
| ← cdg left | 13:15 |
|
jast
| the next step is a little tricky. the easiest way is to use the grafts feature to pretend like your new commits are based on the correct base commit from the original history | 13:15 |
| ← robinb left | 13:15 |
|
jast
| it's a little arcane, though | 13:15 |
|
| but all other ways I can think of are significantly more work | 13:15 |
| → orbyt_ joined | 13:16 |
|
Tobbi
| Can I get a diff of stashes? git stash show <i> only shows me the files changed. | 13:16 |
|
_ikke_
| add -p | 13:16 |
|
Tobbi
| Ah, ok. | 13:16 |
|
| Thanks! | 13:17 |
|
RxMcDonald
| jast: alright I'm going to try that | 13:18 |
|
| jast: btw what do you mean use the grafts feature ? | 13:18 |
|
jast
| yeah, just mentioning it isn't terribly helpful, is it :) | 13:19 |
|
| grafts are a feature to change a commit's parent(s), so in this case you could pretend that your first commit is based on a specific commit from the original commit history | 13:19 |
|
RxMcDonald
| jast: xD | 13:19 |
|
| jast: yea well, idk how to use that | 13:20 |
|
jast
| you create one by creating the file .git/info/grafts and adding a line for each commit where you want to pretend like that, in this case for your first commit | 13:20 |
|
| the line consists of the ID of your commit, a space character, and then the ID of the correct base commit (the one the repo was at when you cloned) | 13:20 |
|
RxMcDonald
| sounds easy, let's try it out ;) | 13:22 |
| → AaronMT joined | 13:23 |
| → jstimm joined | 13:23 |
| ← akushner___ left | 13:24 |
| ← Murr left | 13:25 |
| → Murr joined | 13:26 |
| → rocktop joined | 13:26 |
| → stutter joined | 13:27 |
| → xcm joined | 13:28 |
|
jast
| well, I just noticed that 'git replace' makes this even easier. I never knew it had a --graft option, I thought using 'git replace' would be very tedious | 13:28 |
|
| lesson learned :) | 13:28 |
| ← zenirc369 left | 13:30 |
| ← stutter left | 13:31 |
| → akushner___ joined | 13:33 |
| → roelmonn_ joined | 13:33 |
| ← xaviergmail left | 13:35 |
| → xaviergmail joined | 13:35 |
| → stutter joined | 13:36 |
| ← roelmonnens left | 13:36 |
| ← akushner___ left | 13:39 |
| ← Nizumzen left | 13:41 |
| ← Tobbi left | 13:42 |
| → Nizumzen joined | 13:42 |
| → kalib joined | 13:43 |
|
kalib
| Hello guys. I have an old repository with lots of stuff on it. Now I have my new project, and I would like to use the same repository for it. I mean, really overwrite everything in this repository (remote) with this new project that I have in my computer. In my project, I changed my remote, so this is ok. I did git add and git commit, all good. But when trying to git push, I receive the information: Updates were | 13:46 |
|
| rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing..." The question is: Is there a way to force this? I really don't care about what I had in the remote repo. I really waqnt to have it all gone and only keep what I have now in my machine. In the repo was an old version of this same project, so most of the files changed anyway. | 13:46 |
| → Tobbi joined | 13:47 |
| → mikecmpb_ joined | 13:48 |
|
tobiasvl
| kalib: do you want to just force the remote repo to have the FILES in the state you have now locally? or do you want to throw away the remote's old git history too? | 13:49 |
|
kalib
| the first option. | 13:49 |
|
| maybe "git push origin --force" ? | 13:49 |
|
tobiasvl
| no, that's the second option | 13:50 |
|
kalib
| oh, sorry | 13:50 |
|
| so, what would be the first? | 13:50 |
| → klhjvadzschkljvj joined | 13:50 |
| ← mikecmpbll left | 13:51 |
| → settermjd joined | 13:51 |
|
kalib
| tobiasvl: what would be the command in this case? | 13:53 |
| → TikityTik joined | 13:53 |
|
settermjd
| I’ve created a patch between two files, which were moved between branches, where the latter version had a small set of changes. However, I can’t apply it in a feature branch because „No such file or directory“. Any tips for what I’ve done wrong? | 13:53 |
|
tobiasvl
| kalib: git pull -s ours; git push | 13:54 |
|
kalib
| wouldn't that mess with my local files? | 13:54 |
|
| I don't want to change anything in my local. | 13:54 |
|
tobiasvl
| kalib: no, that should fetch and merge with the "ours" merge strategy, which from the man page is: "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches. It is meant to be used to supersede old development history of side branches." | 13:55 |
|
| man git merge | 13:55 |
|
gitinfo
| the git-merge manpage is available at https://gitirc.eu/git-merge.html | 13:55 |
|
kalib
| got it | 13:55 |
|
| let me try it.. | 13:56 |
| ← Raging_Hog left | 13:56 |
| ← zivester left | 13:57 |
| ← stutter left | 13:57 |
| ← rtjure left | 13:58 |
| ← JeroenT left | 14:00 |
| ← shinnya left | 14:00 |
| → JeroenT joined | 14:00 |
| ← rocktop left | 14:00 |
| ← synthroid left | 14:01 |
| gitinfo set mode: +v | 14:01 |
|
RxMcDonald
| jast: so, could you give me an example way to do it with git replace / grafts? | 14:01 |
| → nowhereman joined | 14:01 |
| ← justanotheruser left | 14:02 |
|
klhjvadzschkljvj
| hello please help me I used "git pull" and now I'm jailed in a text editor in the command line and I cant find the shortcut to save and exit | 14:02 |
|
tobiasvl
| klhjvadzschkljvj: that's probably vim. do this: <escape>:wq | 14:02 |
|
| that saves and quits | 14:03 |
|
| did you write a commit message though? | 14:03 |
| → JeroenT_ joined | 14:03 |
|
klhjvadzschkljvj
| yes i did | 14:03 |
| → rtjure joined | 14:03 |
|
RxMcDonald
| jast: just added the original remote and git fetch | 14:04 |
| → phluks joined | 14:04 |
| ← JeroenT left | 14:04 |
| → DaleK5whr joined | 14:04 |
| ← DaleK5whr left | 14:05 |
| → soccerstud joined | 14:05 |
| → Argylelabcoat joined | 14:06 |
| ← soccerstud left | 14:06 |
| → spacemud_ joined | 14:06 |
| → tnecniv joined | 14:07 |
| → cbonobo joined | 14:07 |
| ← ewitz left | 14:08 |
| ← spacemud left | 14:08 |
| → iNCoNFuN joined | 14:09 |
| ← Random832 left | 14:09 |
| → venmx joined | 14:09 |
| → venmx_ joined | 14:10 |
| ← Eryn_1983_FL left | 14:10 |
| → raven7 joined | 14:10 |
| ← fission6 left | 14:10 |
| ← Cabanossi left | 14:10 |
| → fahadash joined | 14:11 |
| ← CheckDavid left | 14:11 |
| ← imack left | 14:11 |
| → ewitz joined | 14:11 |
| → Cabanossi joined | 14:12 |
| → griffindy joined | 14:12 |
| → dskull joined | 14:12 |
| → oisota joined | 14:12 |
| → Eryn_1983_FL joined | 14:12 |
|
RxMcDonald
| looks like it worked | 14:12 |
|
| jast: :) | 14:12 |
| ← sunri5e left | 14:13 |
| ← JeroenT_ left | 14:13 |
| → snowkidind joined | 14:13 |
| → JeroenT joined | 14:14 |
| ← daynaskully left | 14:14 |
| dskull → daynaskully | 14:14 |
| → chrfle joined | 14:15 |
| ← chrfle left | 14:15 |
| → chrfle joined | 14:15 |
| → sunri5e joined | 14:15 |
| → akushner___ joined | 14:16 |
| ← klhjvadzschkljvj left | 14:16 |
| → leeN joined | 14:17 |
| ← TikityTik left | 14:17 |
| ← JeroenT left | 14:18 |
| → bongozig joined | 14:18 |
| → JeroenT joined | 14:18 |
| ← hs366 left | 14:18 |
| ← luc4 left | 14:19 |
| → luc4 joined | 14:19 |
| ← xcm left | 14:21 |
| → xcm joined | 14:21 |
|
kalib
| tobiasvl: it worked fine. Thanks for the tip: "git pull -s ours; git push" | 14:22 |
| → Random832 joined | 14:22 |
| ← tnecniv left | 14:22 |
| ← mikecmpb_ left | 14:22 |
| ← raven7 left | 14:23 |
| ← Brski left | 14:24 |
| → mikecmpbll joined | 14:24 |
| → dave0x6d joined | 14:26 |
| → mink joined | 14:27 |
| ← oisota left | 14:29 |
| → al-damiri joined | 14:30 |
| ← mink left | 14:31 |
| → elfring joined | 14:32 |
| ← luc4 left | 14:32 |
| → luc4 joined | 14:33 |
| → kurkale6ka joined | 14:33 |
| ← JeroenT left | 14:34 |
|
RxMcDonald
| how do you undo a change in permissions in an old commit? | 14:34 |
| ← kurkale61 left | 14:34 |
|
RxMcDonald
| i.e. 5 commits ago i changed the permissions of a lot of files but want to keep the rest of the changes except that | 14:34 |
|
| and I also don't want to lose the commit history | 14:34 |
| ← Ploppz left | 14:35 |
| → samlisl_ joined | 14:36 |
| → kurkale61 joined | 14:36 |
| ← zefferno left | 14:37 |
| ← mr_sm1th left | 14:37 |
| ← ppang left | 14:37 |
| ← kurkale6ka left | 14:38 |
| ← ertes-w left | 14:38 |
| ← ertes left | 14:39 |
| → tnecniv joined | 14:41 |
| ← murii left | 14:41 |
| ← levex_ left | 14:41 |
| → levex joined | 14:42 |
| gitinfo set mode: +v | 14:42 |
| → regedit joined | 14:43 |
| ← cbonobo left | 14:44 |
| → cbonobo joined | 14:44 |
| ← cbonobo left | 14:45 |
| → cbonobo joined | 14:45 |
| → fission6 joined | 14:46 |
| → dreiss joined | 14:47 |
| ← elfring left | 14:47 |
| ← jstimm left | 14:48 |
| ← durham left | 14:48 |
| ← phluks left | 14:48 |
| → durham joined | 14:48 |
| ← akushner___ left | 14:49 |
| ← dimi1979 left | 14:49 |
| → morado joined | 14:50 |
| → akushner___ joined | 14:50 |
| ← wget left | 14:50 |
| ← kalib left | 14:50 |
| → kpease_ joined | 14:50 |
| ← roelmonn_ left | 14:51 |
| → crose joined | 14:52 |
| → roelmonnens joined | 14:52 |
| ← tvw left | 14:52 |
| ← durham left | 14:52 |
| → tcorneli joined | 14:53 |
| → wget joined | 14:54 |
| ← wget left | 14:54 |
| → wget joined | 14:54 |
| ← StephenS left | 14:54 |
| → Darren_ joined | 14:55 |
| ← Cabanossi left | 14:55 |
| → zivester joined | 14:55 |
| ← abba_ left | 14:56 |
| → StephenS joined | 14:56 |
| ← AnujSharma left | 14:57 |
| → Cabanossi joined | 14:57 |
| ← flaviodesousa left | 14:58 |
| → durham joined | 14:58 |
| ← elsevero left | 14:59 |
| ← freddieptf left | 15:00 |
| ← dec0n left | 15:00 |
| → SkyPatrol joined | 15:01 |
| → Atemu joined | 15:01 |
| ← Atemu left | 15:01 |
| ← samlisl_ left | 15:01 |
| → Atemu joined | 15:02 |
| ← Silmarilion left | 15:02 |
|
revoltingPeasant
| I'm using git-bash on windows10, I'm getting a strange mix of line breaks when I edit files with visual studio https://imgur.com/a/crH2l both of the edited files were edited with vs2013, the project still compiles but I don't want to commit that. what's going on? | 15:02 |
| ← morado left | 15:02 |
| → synthroid joined | 15:02 |
| → igemnace joined | 15:03 |
| ← SkyPatrol_ left | 15:04 |
| ← ThomasLocke left | 15:04 |
| → roelmonn_ joined | 15:05 |
| ← ogny left | 15:05 |
| ← TomyWork left | 15:06 |
| ← aielima left | 15:06 |
| ← orbyt_ left | 15:07 |
| → fmcgeough joined | 15:07 |
| → Locra_ joined | 15:07 |
| ← roelmonnens left | 15:08 |
| ← jimm left | 15:09 |
| ← dreiss left | 15:09 |
| → Cumulo741 joined | 15:10 |
| ← roelmonn_ left | 15:10 |
| → gareppa joined | 15:11 |
| → Darcidride joined | 15:12 |
| ← lukasdboer_ left | 15:13 |
| ← xcm left | 15:14 |
| → xcm joined | 15:14 |
| → tanimislam_ joined | 15:14 |
| ← tcorneli left | 15:14 |
| ← tanimislam_ left | 15:15 |
| → sz0 joined | 15:15 |
| → Gustavo6046 joined | 15:16 |
| ← tnecniv left | 15:17 |
| ← settermjd left | 15:19 |
| ← Locra_ left | 15:21 |
| ← nisseni left | 15:22 |
| → Murii|linux joined | 15:22 |
| → jstimm joined | 15:22 |
| → stutter joined | 15:22 |
| → jimm joined | 15:22 |
| → roelmonnens joined | 15:23 |
| kurkale61 → kurkale6ka | 15:24 |
| ← mel00010 left | 15:24 |
| → ertes-w joined | 15:25 |
| → Locra joined | 15:25 |
| ← Murr left | 15:25 |
| → Murr joined | 15:26 |
| ← cdown left | 15:26 |
| ← roelmonnens left | 15:28 |
| ← in1t3r left | 15:28 |
| ← ertes-w left | 15:28 |
| ← Locra left | 15:28 |
| → Locra joined | 15:29 |
| ← CussBot left | 15:29 |
| → CussBot joined | 15:30 |
| ← igemnace left | 15:30 |
| ← synthroid left | 15:32 |
| → max12345 joined | 15:32 |
| ← RxMcDonald left | 15:32 |
| → ertes-w joined | 15:33 |
|
max12345
| hello I have split my repo so I can track code and other resources like pictures and sounds separately | 15:33 |
| → Ladus joined | 15:33 |
| → tnecniv joined | 15:34 |
|
max12345
| I reset my remote url to the new resources repo but using git it still places my resources in the old folder, not the one for the resources. Why and how do I change that? | 15:34 |
|
| is there some kind of git root command that shows or sets the relative path? | 15:34 |
| → TinkerTyper joined | 15:36 |
| → acedia3 joined | 15:36 |
| → thiago joined | 15:36 |
| → mel00010 joined | 15:36 |
| → cagomez joined | 15:38 |
| → lperezdude joined | 15:40 |
| → synthroid joined | 15:40 |
|
max12345
| hm apparently I didn't do the splitting correctly... | 15:40 |
| ← Random832 left | 15:41 |
| → kurkale61 joined | 15:43 |
| ← chele left | 15:43 |
| → nonconvergent joined | 15:43 |
|
nonconvergent
| Is setting multiple remotes a way to deal with multiple private forks? | 15:44 |
| → gableroux joined | 15:44 |
|
nonconvergent
| I'm on a team that doesn't branch, it forks EVERYTHING. And then everyone forgets to open up their forks. | 15:45 |
|
_ikke_
| :-/ | 15:45 |
|
nonconvergent
| "Because the other way we'd make too many branches and we'd have to clean them up" as if that's a bad thing. | 15:45 |
| → kurkale62 joined | 15:45 |
|
_ikke_
| nonconvergent: Tell them that each fork *is* a branch | 15:45 |
|
| nonconvergent: but with a lot more overhead | 15:45 |
| ← durham left | 15:46 |
|
nonconvergent
| Oh, that also means constant rebasing and force pushing. | 15:46 |
| ← kurkale6ka left | 15:46 |
| → seebyr joined | 15:46 |
|
alcohol
| tell them that you're looking for a new job | 15:46 |
|
_ikke_
| s/branch/fork/ and the same thing counts | 15:46 |
| → durham joined | 15:46 |
| ← Evalix left | 15:47 |
| ← kurkale61 left | 15:48 |
| ← Locra left | 15:48 |
| → theoceaniscool joined | 15:48 |
| → King_Hual joined | 15:48 |
| ← King_Hual left | 15:48 |
| → King_Hual joined | 15:48 |
| → Locra joined | 15:48 |
| ← griffindy left | 15:49 |
| ← dhollinger left | 15:49 |
| → dhollinger joined | 15:49 |
| → bronson joined | 15:50 |
| ← seschwar left | 15:51 |
| → YuGiOhJCJ joined | 15:51 |
| → mr_sm1th joined | 15:51 |
| → TomyLobo joined | 15:51 |
| → stalker314314 joined | 15:51 |
| ← Locra left | 15:52 |
| → Locra joined | 15:52 |
| → madewokherd joined | 15:53 |
| ← jstimm left | 15:55 |
| ← bronson left | 15:55 |
| → Random832 joined | 15:55 |
| ← durham left | 15:55 |
| gitinfo set mode: +v | 15:55 |
|
lperezdude
| I need a file to hold different data depending on the branch it is on? is there any way of doing this? | 15:55 |
| → durham joined | 15:56 |
| ← drodger_ left | 15:56 |
| ← Locra left | 15:57 |
| → mkali joined | 15:57 |
| ← clmsy left | 15:57 |
| → drodger joined | 15:58 |
| → durham_ joined | 15:58 |
| → infernix joined | 15:58 |
| → Locra joined | 15:58 |
|
Learath2
| lperezdude: commit it to each branch with different data? | 15:58 |
| → zenirc369 joined | 15:59 |
|
lperezdude
| Learath2 this has to hold true even after pull requests between these branches have been merged | 15:59 |
|
| oh well ill add it to the git ignore once chages are done | 15:59 |
|
Learath2
| lperezdude: do you need the file to be tracked aswell? | 15:59 |
|
| either way you can (ab)use a post-checkout hook | 16:00 |
| → ArcaTech joined | 16:00 |
| ← durham left | 16:01 |
| → ResidentBiscuit joined | 16:01 |
| ← ResidentBiscuit left | 16:01 |
| → ResidentBiscuit joined | 16:02 |
| ← ResidentBiscuit left | 16:02 |
| → roelmonnens joined | 16:02 |
| → ResidentBiscuit joined | 16:02 |
| ← ResidentBiscuit left | 16:02 |
| → Munt joined | 16:02 |
| → ResidentBiscuit joined | 16:02 |
| ← theoceaniscool left | 16:03 |
| McKraken → McKraken_zzzzz | 16:04 |
| ← luc4 left | 16:04 |
| ← Locra left | 16:05 |
| ← roelmonnens left | 16:08 |
| ← Cabanossi left | 16:09 |
| → SkyPatrol_ joined | 16:10 |
| ← DevAntoine left | 16:12 |
| → Cabanossi joined | 16:12 |
| ← mkali left | 16:12 |
| ← SkyPatrol left | 16:12 |
| ← madewokherd left | 16:13 |
| → czart_ joined | 16:14 |
| ← max12345 left | 16:15 |
| ← dulange__ left | 16:15 |
| ← ArcaTech left | 16:17 |
| ← czart__ left | 16:17 |
| → Es0teric joined | 16:18 |
| → kjsaihs joined | 16:18 |
| ← thiago left | 16:18 |
| ← Parraki_ left | 16:18 |
| ← nydel07 left | 16:20 |
| ← jab416171_ left | 16:21 |
| → roelmonnens joined | 16:21 |
| → jab416171 joined | 16:22 |
| → nydel07 joined | 16:22 |
| ← cagomez left | 16:23 |
| → cagomez joined | 16:23 |
| ← tkore left | 16:25 |
| ← cbonobo left | 16:25 |
| ← fission6 left | 16:26 |
| → cbonobo joined | 16:26 |
| ← StephenS left | 16:27 |
| → StephenS joined | 16:27 |
| ← stutter left | 16:28 |
|
kjsaihs
| I am trying to automate weblate but for some reason hooks are not working | 16:29 |
|
| executing each hook as a shell script proofs there is no problem with the hooks (i am sure because the same hooks work on the test instance of weblate) | 16:29 |
|
| What might be preventing the execution of git gooks? | 16:29 |
| → cbonobo_ joined | 16:30 |
| ← cbonobo left | 16:30 |
| ← Nobun left | 16:31 |
| ← upperdeck left | 16:31 |
| → disi joined | 16:31 |
| ojacobson_ → ojacboson | 16:32 |
| → orbyt_ joined | 16:33 |
| → upperdeck joined | 16:33 |
| ← synthroid left | 16:33 |
| ← mikecmpbll left | 16:35 |
| → madewokherd joined | 16:35 |
| ← evie_hammond left | 16:36 |
| ← kurkale62 left | 16:36 |
| → InfoTest joined | 16:38 |
| → ArcaTech joined | 16:38 |
| ← Murii|linux left | 16:39 |
| → paul424 joined | 16:40 |
| ← bumblebeer left | 16:40 |
| → bumblebeer joined | 16:41 |
| → illuminatedwax joined | 16:42 |
| ← freimatz left | 16:43 |
| ← ertes-w left | 16:44 |
| → pbandark1 joined | 16:44 |
| ← roelmonnens left | 16:45 |
| ← mostlybadfly left | 16:45 |
| ← pbandark left | 16:45 |
| pbandark1 → pbandark | 16:45 |
| → roelmonnens joined | 16:45 |
| ← Cumulo741 left | 16:46 |
|
illuminatedwax
| Hi! I'm dealing with two branches, one is my code base that works with python2.7 and another for python2.6. I made a new feature branch off the python2.7 branch, and now I want to take that set of changes and put *only those changes* (so the diff between python2.7..feature) onto the python2.6 branch. Unfortunately I had a lot of merges with other intermediate branches (all based off python2.7) in the meantime, and git cherry-pick python2.7..feature | 16:46 |
|
| doesn't work because there are merges in that list. I can't figure out how to use rebase because it pulls in the python2.7 changes into python2.6. What tool am I looking to use here? | 16:46 |
| ← tnecniv left | 16:46 |
| → morado joined | 16:47 |
| → oisota joined | 16:48 |
|
moritz
| illuminatedwax: git diff featurebranch...python27 | patch -p1 | 16:48 |
| → evie_hammond joined | 16:48 |
|
moritz
| when on branch python26 | 16:48 |
| ← jceb left | 16:48 |
|
moritz
| rm, likely the other way round: git diff python27...featurebranch | 16:48 |
|
illuminatedwax
| ok, cool, though mortiz, it removes the individual commit history moritz, but maybe there's no way around that? | 16:49 |
| ← roelmonnens left | 16:50 |
|
illuminatedwax
| (oops didnt mean to put yr name in there twice) | 16:50 |
| ← kjsaihs left | 16:50 |
| → juiccifer joined | 16:51 |
| → Phylock joined | 16:51 |
| → stutter joined | 16:51 |
| ← oisota left | 16:52 |
| → raynold joined | 16:52 |
| ← InfoTest left | 16:53 |
| → imack joined | 16:53 |
| ← cbonobo_ left | 16:54 |
| ← King_Hual left | 16:54 |
| → cbonobo joined | 16:54 |
| ← SkyPatrol_ left | 16:57 |
| → SkyPatrol joined | 16:57 |
| → dimm joined | 16:59 |
| ← revoltingPeasant left | 16:59 |
| → TheMontyChrist joined | 17:00 |
| ← cstratak left | 17:00 |
|
dimm
| hello, All! Ho i can solve issue - fatal: Unable to find remote helper for 'http'. Git 2.8.3. builded from sources | 17:00 |
| ← TheMontyChrist left | 17:01 |
| → TheMontyChrist joined | 17:01 |
| ← TheMontyChrist left | 17:01 |
| → TheMontyChrist joined | 17:01 |
|
TheMontyChrist
| test | 17:01 |
| → cdg joined | 17:01 |
|
TheMontyChrist
| supposeI have branch "blah1/blah2" | 17:01 |
| ← imack left | 17:01 |
|
TheMontyChrist
| blah1 is resolve to a remote if it's in my remote list? | 17:02 |
|
| I see "velodyne/refactor" as a branch name | 17:02 |
|
| yet, I see a lot of "remote/branch" nomenclature | 17:03 |
| → svm_invictvs joined | 17:03 |
| → peterbecich joined | 17:03 |
| → imack joined | 17:03 |
|
TheMontyChrist
| I guess what's stopping velodyne from being a remote? | 17:03 |
|
| ...other than it doesn't appear in my remote list | 17:03 |
|
dimm
| i was build git with '--with-curl' and as i can see this flag is 'yes' by default. How i can check git build options? | 17:04 |
| ← netj left | 17:04 |
| ← cdg_ left | 17:04 |
| → netj joined | 17:04 |
| → cdg_ joined | 17:04 |
|
Tobbi
| I'm curious: If I rename a branch, will that change the commit hashes on any of the commit IDs? | 17:04 |
|
| *on any of the commits? | 17:05 |
| ← cdg left | 17:06 |
| → Parraki joined | 17:06 |
|
illuminatedwax
| Another question: does "git rebase branch-foo" modify the branch "branch-foo" at all? | 17:06 |
| → Locra joined | 17:07 |
| → nixjdm joined | 17:07 |
| → thiago joined | 17:08 |
| ← peterbecich left | 17:09 |
|
Tobbi
| illuminatedwax: As far as I know it does not. It just takes the commits from branch-foo and replays them onto the current branch. | 17:10 |
| ← ArcaTech left | 17:11 |
| ← cbonobo left | 17:12 |
| ← Parraki left | 17:12 |
| ← UTAN_dev_ left | 17:12 |
| → cbonobo joined | 17:13 |
| → UTAN_dev joined | 17:13 |
| ← stutter left | 17:13 |
| ← lperezdude left | 17:14 |
| → brent__ joined | 17:14 |
| ← chll_ left | 17:16 |
| ← Jokler left | 17:17 |
| ← cbonobo left | 17:17 |
| ← sorressean left | 17:17 |
| ← gareppa left | 17:18 |
| ← overlord_tm left | 17:18 |
| → Jokler joined | 17:18 |
| ← durham_ left | 17:18 |
| ← sz0 left | 17:19 |
| → durham joined | 17:19 |
| ← Floflobel left | 17:19 |
| ← Locra left | 17:19 |
| → fission6 joined | 17:20 |
| → sathed joined | 17:20 |
| ← morado left | 17:20 |
| → synthroid joined | 17:20 |
| → ozette_ joined | 17:22 |
| → morado joined | 17:22 |
| ← durham left | 17:23 |
| → ArcaTech joined | 17:24 |
| ← illuminatedwax left | 17:26 |
| ← akushner___ left | 17:28 |
| ← YuGiOhJCJ left | 17:31 |
|
dimm
| was check config.log and found that | 17:31 |
|
| /usr/bin/ld: cannot find -lcurl | 17:31 |
| ← netj left | 17:34 |
| → netj joined | 17:34 |
|
dimm
| i found that libcurl is only in /usr/lib64 and not in /usr/lib | 17:35 |
| ← cagomez left | 17:41 |
| → cdown joined | 17:41 |
| → lafleurdubien joined | 17:42 |
| ← masuberu left | 17:43 |
| → salamanderrake joined | 17:44 |
| ← orbyt_ left | 17:45 |
| ← surfist left | 17:46 |
| → overlord_tm joined | 17:46 |
| → durham joined | 17:47 |
| ← durham left | 17:49 |
| → surfist joined | 17:49 |
| → Parraki joined | 17:49 |
| → durham joined | 17:49 |
| → cdown_ joined | 17:50 |
| ← paul424 left | 17:50 |
| ← synthroid left | 17:50 |
| → orbyt_ joined | 17:51 |
| → bronson joined | 17:51 |
| ← orbyt_ left | 17:52 |
| ← cdown left | 17:52 |
| cdown_ → cdown | 17:52 |
| → wootehfoot joined | 17:54 |
| ← durham left | 17:54 |
| ← govg left | 17:54 |
| → gopar joined | 17:54 |
| ← Dreadnaught left | 17:55 |
| → ankush joined | 17:56 |
| ← bronson left | 17:56 |
| → JanC_ joined | 17:56 |
| ← Parraki left | 17:56 |
| → SurenNihalani joined | 17:57 |
| → orbyt_ joined | 17:57 |
| ← JanC left | 17:57 |
| JanC_ → JanC | 17:57 |
| ← MattMaker left | 17:57 |
|
parsnip
| Tobbi: if you rename a branch, that doesn't effect the commits. the commits are a hash of their contents, and the branch names are not part of that. | 17:57 |
|
Tobbi
| parsnip: Thanks :) | 17:57 |
| → cagomez joined | 17:58 |
|
Tobbi
| I'm feeling a bit stupid. | 17:58 |
|
parsnip
| Tobbi: you might enjoy researching a little about what is inside a commit | 17:58 |
| → hahuang65 joined | 17:58 |
| → Cumulo741 joined | 17:58 |
|
parsnip
| i think !bottomup covers some of that | 17:58 |
|
gitinfo
| 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. https://jwiegley.github.io/git-from-the-bottom-up/ | 17:58 |
|
parsnip
| this might cover internals of commits also https://www.youtube.com/watch?v=MYP56QJpDr4 | 17:59 |
| → Parraki joined | 17:59 |
|
Tobbi
| Thanks, I'll give it a read. | 18:00 |
|
parsnip
| i think rebase _does_ modify a branch, quite a bit. | 18:00 |
| ← ankush left | 18:00 |
| → tnecniv joined | 18:01 |
|
parsnip
| it can modify _every_ commit. not necessarily the tree object inside, but the commit hash also involves the hashes of the parent commits, so if that changes, _all_ the subsequent commit hashes change. | 18:01 |
| ← ArcaTech left | 18:01 |
|
parsnip
| but those resources may emphasize those understandings :) | 18:01 |
| → gareppa joined | 18:01 |
| ← iNCoNFuN left | 18:01 |
| → ArcaTech joined | 18:02 |
|
Tobbi
| Alright :) | 18:02 |
|
_ikke_
| ephemera_: Are you there? | 18:03 |
| ← wootehfoot left | 18:05 |
| ← nixjdm left | 18:05 |
| bond_ → bond | 18:05 |
| → flobin joined | 18:05 |
| ← cdg_ left | 18:06 |
| ← aboccia left | 18:08 |
| ← pix9 left | 18:08 |
| → Dreadnaught joined | 18:09 |
| ← Dreadnaught left | 18:09 |
| → Dreadnaught joined | 18:09 |
| ← Dreadnaught left | 18:09 |
| → aboccia joined | 18:10 |
| → Dreadnaught joined | 18:11 |
| ← Dreadnaught left | 18:11 |
| → Dreadnaught joined | 18:11 |
| → Sasazuka joined | 18:11 |
| ← fission6 left | 18:12 |
| → cdg joined | 18:12 |
| ← overlord_tm left | 18:12 |
| ← Parraki left | 18:16 |
| ← gareppa left | 18:18 |
| → nixjdm joined | 18:18 |
| → TomyLobo2 joined | 18:19 |
| ← morado left | 18:19 |
| ← TomyLobo left | 18:20 |
| → wootehfoot joined | 18:20 |
|
skered
| Can git list file hashes? | 18:20 |
|
_ikke_
| git ls-tree -r HEAD | 18:21 |
|
| Note that there are not plain sha1 hashes | 18:21 |
| ← acedia3 left | 18:22 |
| → justAllgood1 joined | 18:22 |
| ← tnecniv left | 18:23 |
| ← SurenNihalani left | 18:23 |
| ← justAllgood left | 18:23 |
|
skered
| Yeah, I was looking to generate a file that sha* or md5 can use to compare non-git repos with. | 18:24 |
| ← cdown left | 18:25 |
| ← Cabanossi left | 18:25 |
| → synthroid joined | 18:26 |
|
_ikke_
| Right, git has nothing for that | 18:26 |
| → cdown joined | 18:27 |
| → Cabanossi joined | 18:27 |
| ← Bock left | 18:28 |
| → cdg_ joined | 18:28 |
| ghoti_ → ghoti | 18:28 |
| → mel__ joined | 18:30 |
| ← synthroid left | 18:31 |
| ← cdg left | 18:31 |
| ← cdg_ left | 18:33 |
| ← jimm left | 18:33 |
| ← mel00010 left | 18:33 |
| → jnavila joined | 18:34 |
| → ZyX-I joined | 18:37 |
| ← TheMontyChrist left | 18:38 |
| ← imack left | 18:38 |
| ← xaa left | 18:39 |
| → SurenNihalani joined | 18:39 |
| ← madewokherd left | 18:39 |
| → namstdnsk joined | 18:40 |
| → saidelike joined | 18:40 |
| ← namstdnsk left | 18:40 |
| → namstdnsk joined | 18:41 |
| → elsevero joined | 18:42 |
| ← ozette_ left | 18:42 |
| → noidea joined | 18:42 |
| ← noidea left | 18:42 |
| → noidea joined | 18:42 |
| ← Atemu left | 18:43 |
|
namstdnsk
| wtf | 18:43 |
|
_ikke_
| .. | 18:43 |
|
| hi to you to | 18:43 |
|
| OMGOMG | 18:43 |
| ← sigg left | 18:43 |
| ← saidelike left | 18:44 |
|
namstdnsk
| git very true staff | 18:44 |
| → sigg joined | 18:44 |
|
namstdnsk
| svn for lamerz | 18:44 |
|
| Pakistan salam | 18:45 |
| → cstratak joined | 18:46 |
| → jimm joined | 18:47 |
| → troulouliou_div2 joined | 18:47 |
| → tnecniv joined | 18:47 |
| → SkyPatrol_ joined | 18:48 |
|
Calinou
| gah, I'm trying to rebase a branch, keeping all of my commits (applied on top of conflicting ones, ignoring these changes) | 18:49 |
|
| I tried "git rebase master -s ours" and "git rebase master -X ours", neither give the desired effect( | 18:49 |
|
| (keeping my history of commits, that is) | 18:49 |
| ← SkyPatrol left | 18:49 |
| → saidelike joined | 18:49 |
|
Calinou
| I did this 2 weeks ago but completely forgot | 18:49 |
|
_ikke_
| -X theirs | 18:49 |
|
| The commits being applies are 'theirs' not 'ours' | 18:50 |
| → fission6 joined | 18:50 |
| ← _ng left | 18:51 |
| → fatihgenc joined | 18:51 |
|
Calinou
| thanks! this works, I thought "ours" was the commits in my branch | 18:52 |
| ← voker57 left | 18:52 |
| → xaa joined | 18:53 |
| ← gopar left | 18:53 |
| → voker57 joined | 18:53 |
| ← voker57 left | 18:53 |
| → voker57 joined | 18:53 |
| ← cstratak left | 18:53 |
| → gopar joined | 18:54 |
| ← Ardethian\ left | 18:54 |
| ← saidelike left | 18:55 |
| → TomyLobo joined | 18:56 |
| → mikecmpbll joined | 18:56 |
| ← TomyLobo2 left | 18:57 |
| → overlord_tm joined | 18:58 |
| → ertes-w joined | 18:59 |
| → pbandark1 joined | 19:01 |
| ← pbandark left | 19:01 |
| pbandark1 → pbandark | 19:01 |
| ← jimm left | 19:03 |
| ← SkyPatrol_ left | 19:03 |
| ← justAllgood1 left | 19:03 |
| → saidelike joined | 19:03 |
| ← saidelike left | 19:03 |
| ← orbyt_ left | 19:03 |
| ← nixjdm left | 19:05 |
| ← ShekharReddy left | 19:05 |
| → Solvaring joined | 19:05 |
| ← daguiam left | 19:06 |
| ← gopar left | 19:06 |
| → gopar joined | 19:07 |
| → SkyPatrol joined | 19:07 |
| → GrailKn1ght joined | 19:10 |
| → tarkus joined | 19:10 |
| → revoltingPeasant joined | 19:11 |
| ← gopar left | 19:13 |
| → gopar joined | 19:14 |
| → jimm joined | 19:16 |
| ← _ADN_ left | 19:17 |
| → nixjdm joined | 19:18 |
| ← Ladus left | 19:19 |
| → neilthereildeil joined | 19:20 |
| ← juiccifer left | 19:20 |
| ← svm_invictvs left | 19:20 |
| ← neilthereildeil left | 19:22 |
| ← fission6 left | 19:22 |
| → qaz1 joined | 19:22 |
| ← qaz1 left | 19:22 |
| → neilthereildeil joined | 19:22 |
|
neilthereildeil
| hi. me and another engineer made changes on the same files in GIT. He has committed, but i have not. what should my next step be if i want to pull? | 19:22 |
| → fission6 joined | 19:22 |
| ← fission6 left | 19:22 |
| → synthroid joined | 19:23 |
|
moritz
| neilthereildeil: you can just try "git pull". If his changes are to other files than yours, it'll Just Work[tm] | 19:23 |
| ← SurenNihalani left | 19:23 |
| → fission6 joined | 19:24 |
| ← ams__ left | 19:25 |
| ← Murr left | 19:25 |
| → Murr joined | 19:25 |
| → cagedwisdom joined | 19:27 |
| ← Cumulo741 left | 19:30 |
| ← ArcaTech left | 19:31 |
|
neilthereildeil
| moritz: no, the changes are to the same files | 19:31 |
|
| i know ill get errors | 19:32 |
|
| how do i settle this? | 19:32 |
| → Murii|linux joined | 19:32 |
|
moritz
| neilthereildeil: first add your changes ('git add -p'), then you commit | 19:33 |
|
| neilthereildeil: then you 'git pull' | 19:33 |
| → peterbecich joined | 19:33 |
|
moritz
| neilthereildeil: and if you get a merge conflict, resolve it | 19:33 |
|
| !eek | 19:33 |
|
gitinfo
| [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II | 19:33 |
| ← cagomez left | 19:34 |
| → Grailknight joined | 19:35 |
| ← GrailKn1ght left | 19:35 |
| → TheVice joined | 19:35 |
| ← thiago left | 19:36 |
| ← Grailknight left | 19:36 |
| ← bongozig left | 19:37 |
| → GrailKn1ght joined | 19:37 |
| → ArcaTech joined | 19:38 |
| → energizer joined | 19:38 |
| → gargola joined | 19:39 |
| ← jimm left | 19:40 |
| ← cdown left | 19:43 |
| → jrajav joined | 19:45 |
|
jrajav
| Hi! | 19:45 |
| ← nixjdm left | 19:45 |
| → cdown joined | 19:45 |
| → nixjdm joined | 19:45 |
|
jrajav
| What is the safest and easiest way to rename master to something else for archival, then rename a different branch to master? | 19:45 |
| ← namstdnsk left | 19:46 |
| ← zenirc369 left | 19:47 |
| ← ArcaTech left | 19:47 |
|
_ikke_
| git branch -m | 19:48 |
| ← snowkidind left | 19:48 |
| → jil joined | 19:48 |
|
jil
| hello | 19:48 |
| ← Achylles left | 19:49 |
|
jil
| in git help log ... what is meant by <path> , simplifying history to a path ? | 19:49 |
|
| is that the file system path ? | 19:49 |
| → dminuoso_ joined | 19:50 |
| ← synthroid left | 19:51 |
| ← kus_ubuntui686 left | 19:52 |
| → bronson joined | 19:52 |
| ← peterbecich left | 19:53 |
|
parsnip
| jil: yeah, like you could try `git log README` | 19:54 |
| → peterbecich joined | 19:55 |
| → orbyt_ joined | 19:55 |
| → saidelike joined | 19:56 |
|
jil
| to limit log to the README file | 19:56 |
| → cbonobo joined | 19:56 |
| ← bronson left | 19:56 |
| → jimm joined | 19:57 |
| ← cbonobo left | 19:58 |
| → synthroid joined | 19:58 |
| ← disi left | 20:00 |
| → bronson joined | 20:01 |
| → King_Hual joined | 20:02 |
| → cdg joined | 20:03 |
| ← peterbecich left | 20:03 |
| ← Solvaring left | 20:03 |
| ← jstein left | 20:04 |
|
jil
| I don't get what's a patch. Why do I need the -p when looking for a string in one of the commit ? | 20:04 |
|
| why not just git log -S "abc" *org for example | 20:04 |
| ← glad left | 20:04 |
| ← nixjdm left | 20:05 |
| ← jnavila left | 20:05 |
| ← crose left | 20:05 |
| → dviola joined | 20:06 |
|
parsnip
| jil: i'm pretty new to git. what resources says you need the -p? | 20:07 |
| → SurenNihalani joined | 20:07 |
| ← dminuoso_ left | 20:08 |
|
jil
| I ask here two days ago how to search for the commit that suppressed some text and I was advice to use git log -p -S ... | 20:08 |
|
| Tried it, it work... but I don't know what a patch is. | 20:09 |
| ← mikeymop left | 20:10 |
| → ArcaTech joined | 20:10 |
| → disi joined | 20:10 |
| → bongozig joined | 20:12 |
| ← ArcaTech left | 20:13 |
| → cdg_ joined | 20:13 |
| → preyalone joined | 20:13 |
| → juiccifer joined | 20:14 |
| ← btree left | 20:15 |
| → Cumulo741 joined | 20:15 |
| ← flobin left | 20:15 |
| ← Anja left | 20:16 |
| → settermjd joined | 20:16 |
| ← cdg left | 20:16 |
| ← troulouliou_div2 left | 20:17 |
| ← Elon_Satoshi left | 20:18 |
| → gablerou_ joined | 20:18 |
| → nixjdm joined | 20:18 |
| → Achylles joined | 20:19 |
| ← hanneso left | 20:20 |
| → MattMaker joined | 20:20 |
| → Elon_Satoshi joined | 20:21 |
| ← gableroux left | 20:21 |
| ← settermjd left | 20:23 |
| ← synthroid left | 20:24 |
| ← jimm left | 20:25 |
| → Anja joined | 20:28 |
| → m0viefreak joined | 20:29 |
| ← Cumulo741 left | 20:30 |
| → synthroid joined | 20:31 |
| → oisota joined | 20:34 |
| ← oisota left | 20:34 |
| ← nixjdm left | 20:34 |
| → cagomez joined | 20:35 |
| ← Murii|linux left | 20:36 |
| → nixjdm joined | 20:36 |
| ← fatihgenc left | 20:38 |
| ← manuelschneid3r left | 20:38 |
| → jimm joined | 20:41 |
| → Gurkenglas_ joined | 20:43 |
| ← mel__ left | 20:44 |
| → manuelschneid3r joined | 20:48 |
| ← pbandark left | 20:49 |
| ← noidea left | 20:49 |
| → pbandark1 joined | 20:49 |
| → mikeymop joined | 20:51 |
|
mikeymop
| i have a repository setup with a submodule inside of a folder in it | 20:51 |
|
| this submodule links to a new branch in the same repository | 20:51 |
|
| i followed this guide | 20:51 |
|
| https://hjdskes.github.io/blog/update-deploying-hugo-on-personal-gh-pages/ | 20:51 |
| pbandark1 → pbandark | 20:51 |
|
mikeymop
| if I were to git clone my repository on a secondary computer, will it carry over this branching scheme? | 20:51 |
| ← SurenNihalani left | 20:53 |
| ← energizer left | 20:53 |
| ← gablerou_ left | 20:53 |
| ← synthroid left | 20:53 |
| → energizer joined | 20:54 |
| ← petersaints left | 20:54 |
| ← sunri5e left | 20:55 |
| → mel__ joined | 20:55 |
| → couchz joined | 20:57 |
| → sunri5e joined | 20:57 |
|
couchz
| if I made a commit with "git commit -S -m "update"" before I added new versions of files to the index, but then I ran "git add ." can I just push and it will be fine? or do i need to make a new commit | 20:58 |
|
| or can I modify that commit somehow | 20:58 |
| ← hahuang65 left | 20:58 |
| ← jeffreylevesque left | 20:58 |
| ← fmcgeough left | 20:58 |
|
couchz
| like "git commit --amend -m "Message."" | 20:58 |
| → hahuang65 joined | 20:59 |
| → cbonobo joined | 20:59 |
| → SurenNihalani joined | 20:59 |
| ← King_Hual left | 20:59 |
| → petersaints joined | 20:59 |
| → svm_invictvs joined | 20:59 |
| ← gopar left | 20:59 |
| → peoliey joined | 20:59 |
| → capstar joined | 21:00 |
| → gopar joined | 21:00 |
| ← hahuang65 left | 21:00 |
|
peoliey
| is there any way to stash all the commits till some specific commit? One of doing that is doing "git reset to_specific_commit && git stash" but this will remove all the commit messages. | 21:00 |
|
| is there any smarter way? | 21:00 |
| → Fulg joined | 21:01 |
| ← jimm left | 21:01 |
| ← Darcidride left | 21:01 |
| ← AaronMT left | 21:02 |
| ← couchz left | 21:03 |
| ← cbonobo left | 21:04 |
| → hahuang65 joined | 21:04 |
| ← orbyt_ left | 21:04 |
| ← zivester left | 21:04 |
| ← gopar left | 21:04 |
| ← nixjdm left | 21:04 |
| ← bigjazzsound_ left | 21:06 |
| → bigjazzsound joined | 21:06 |
| ← Cavallari left | 21:08 |
| → mar77i joined | 21:09 |
| ← GaveUp left | 21:10 |
| ← xcm left | 21:10 |
| → xcm joined | 21:11 |
| ← Fulg left | 21:13 |
| ← GrailKn1ght left | 21:14 |
| → jimm joined | 21:14 |
| → gableroux joined | 21:14 |
|
parsnip
| peoliey: look at `git reset --soft` | 21:14 |
| ← gugah left | 21:15 |
|
parsnip
| peoliey: but maybe you want to create a temporary branch name to make it easier to keep your place as refs move around. | 21:15 |
| → nixjdm joined | 21:16 |
| ← tnecniv left | 21:17 |
|
parsnip
| peoliey: so if you have A <- B <- C <- D <- E, sounds like currently your ref is pointing at E | 21:17 |
| ← mar77i left | 21:17 |
|
parsnip
| and you want to add all changes from A to E to be recorded as a single stash? | 21:17 |
| ← gableroux left | 21:19 |
|
peoliey
| parsnip: a->b->c->d ....i want to compile my changes till only 'b' and remove 'c' and 'd' commit temporarily. As those are commits, i also don't want to rewrite commit message again if i do 'git reset b' | 21:19 |
|
| if i want to get back 'c' and 'd' later | 21:19 |
|
parsnip
| peoliey: you could just check out the hash at b, instead of resetting the ref. | 21:20 |
|
| it would then be a "detached head" | 21:20 |
|
| the ref could stay at d | 21:20 |
| → stanfordtools joined | 21:21 |
|
parsnip
| commits correspond 1-1 with their hashes. the refs just point to them. | 21:21 |
| → ozette_ joined | 21:22 |
| → hseg joined | 21:22 |
| ← MattMaker left | 21:22 |
|
hseg
| How do I debug "fatal: src refspec 'foo' must name a ref"? | 21:22 |
|
_ikke_
| hseg: Are you use that you have a local branch called foo? | 21:22 |
| ← neunon left | 21:22 |
|
peoliey
| parsnip: let me try that | 21:22 |
|
hseg
| Yes, I'm on it right now | 21:22 |
|
_ikke_
| hseg: what command are you executing? | 21:23 |
|
hseg
| git push origin foo | 21:23 |
|
| while on branch foo | 21:23 |
| → neunon joined | 21:23 |
|
hseg
| Git also complains fatal: process for submodule 'common' failed, even though the submodule is fully up to date... | 21:24 |
|
_ikke_
| Are you using submodules? | 21:24 |
|
hseg
| Yes | 21:24 |
|
| With push.recurseSubmodules set to on-demand | 21:24 |
| → roelmonnens joined | 21:25 |
| ← TheVice left | 21:25 |
| ← Murr left | 21:25 |
|
hseg
| But again, given that the submodule mentioned is clean, this shouldn't be an issue unless it's trying to push branch foo on the submodule, which it shouldn't | 21:25 |
| ← jil left | 21:25 |
| → Paparaciz joined | 21:25 |
|
_ikke_
| https://stackoverflow.com/questions/44641872/how-can-i-do-git-push-recurse-submodules-on-demand-when-the-parent-repo-is-o | 21:25 |
| → Murr joined | 21:25 |
|
_ikke_
| https://public-inbox.org/git/20170627162307.GE161648@aiede.mtv.corp.google.com/ | 21:26 |
| → TheVice joined | 21:26 |
|
hseg
| Wait, what? IIRC, I've managed to push with submodules on differing names. | 21:27 |
|
| May be mistaken and have had both be master. | 21:27 |
| → astrofog joined | 21:27 |
|
hseg
| But again, this shouldn't happen as the submodule is up-to-date. | 21:28 |
| → orbyt_ joined | 21:29 |
| ← linuxmodder left | 21:29 |
| ← roelmonnens left | 21:29 |
| → linuxmodder joined | 21:29 |
| ← linuxmodder left | 21:29 |
| → linuxmodder joined | 21:29 |
|
hseg
| But passing --no-recurse-submodules did it, thanks | 21:29 |
|
| Hm. Odd, will debug another time. Late | 21:30 |
|
| ty _ikke_ | 21:30 |
| ← hseg left | 21:30 |
| → gopar joined | 21:31 |
| → porfiriopaiz joined | 21:33 |
| ← Es0teric left | 21:33 |
| → sturner joined | 21:33 |
| ← revoltingPeasant left | 21:35 |
| ← duckydan left | 21:35 |
| → nisseni joined | 21:38 |
| → mar77i joined | 21:39 |
| ← simka left | 21:40 |
| ← porfiriopaiz left | 21:40 |
| ← gopar left | 21:41 |
| → gopar joined | 21:42 |
| ← aard left | 21:43 |
| → MattMaker joined | 21:43 |
| → LeoBud joined | 21:43 |
| Anja → Sally | 21:44 |
| Sally → Sephyette | 21:45 |
| ← Guest92304 left | 21:46 |
| → debian joined | 21:47 |
| debian → Guest23921 | 21:47 |
| ← LeoBud left | 21:48 |
| → jstimm joined | 21:48 |
| ← tarkus left | 21:49 |
| ← gopar left | 21:50 |
| ← Toba__ left | 21:51 |
| ← xcm left | 21:51 |
| → Toba__ joined | 21:51 |
| → gopar joined | 21:51 |
| ← Toba__ left | 21:51 |
| → _ADN_ joined | 21:51 |
| → Toba joined | 21:51 |
| ← wootehfoot left | 21:51 |
| ← TomyLobo left | 21:52 |
| ← kpease_ left | 21:54 |
| ← capstar left | 21:55 |
| → xcm joined | 21:56 |
| → jeffreylevesque joined | 21:57 |
| → subnet257 joined | 21:58 |
| ← Gurkenglas_ left | 21:58 |
| → peterbecich joined | 21:59 |
| ← ZyX-I left | 22:01 |
| ← peterbecich left | 22:01 |
| ← MattMaker left | 22:02 |
| ← TheVice left | 22:02 |
| ← nonconvergent left | 22:02 |
| ← nixjdm left | 22:04 |
| ← opalepatrick left | 22:05 |
| → ArcaTech joined | 22:05 |
| → theoceaniscool joined | 22:05 |
| → denimsoft joined | 22:07 |
| ← nisseni left | 22:07 |
| → tnecniv joined | 22:07 |
| ← lukky513 left | 22:08 |
| → raijin joined | 22:08 |
| ← Nizumzen left | 22:12 |
| → Acerific joined | 22:13 |
| ← Acerific left | 22:13 |
| → Acerific joined | 22:13 |
| ← ycyclist left | 22:15 |
| ← manuelschneid3r left | 22:15 |
| → shinnya joined | 22:16 |
| ← gopar left | 22:16 |
| ← seebyr left | 22:17 |
| → gopar joined | 22:17 |
| → nixjdm joined | 22:18 |
| ← xcm left | 22:20 |
| ← theoceaniscool left | 22:21 |
|
fission6
| how do i undo the last to commits | 22:22 |
|
| some bad code got merged in | 22:22 |
| ← jrajav left | 22:23 |
| ← gopar left | 22:24 |
| → Patriqu joined | 22:24 |
| ← dre_ left | 22:24 |
| → gopar joined | 22:25 |
| → xcm joined | 22:25 |
| ← Cabanossi left | 22:26 |
| ← cdown left | 22:26 |
| ← ertes-w left | 22:27 |
| → Cabanossi joined | 22:27 |
| ← neilthereildeil left | 22:28 |
| ← astrofog left | 22:28 |
| ← schleppel left | 22:28 |
| ← Argylelabcoat left | 22:28 |
| → dre_ joined | 22:32 |
| → cd-rum joined | 22:33 |
| ← Jackneill left | 22:34 |
|
parsnip
| fission6: can you show us !situation | 22:34 |
|
gitinfo
| fission6: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain) | 22:34 |
| → mizu_no_oto joined | 22:35 |
| → Nizumzen joined | 22:35 |
| ← gopar left | 22:36 |
| ← subnet257 left | 22:39 |
| → pionen joined | 22:39 |
| → MattMaker joined | 22:40 |
| → subnet257 joined | 22:40 |
| → gopar joined | 22:41 |
| ← m712 left | 22:41 |
| ← nixjdm left | 22:42 |
| ← preyalone left | 22:43 |
| → m712 joined | 22:43 |
| ← dsdeiz left | 22:46 |
| → dsdeiz joined | 22:46 |
| ← dsdeiz left | 22:46 |
| → dsdeiz joined | 22:46 |
| → zivester joined | 22:46 |
| ← m712 left | 22:49 |
|
Hello71
| !undo | 22:49 |
|
gitinfo
| [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history! | 22:49 |
| ← fahadash left | 22:50 |
|
fission6
| is there an easier more modern way to address this issue | 22:51 |
| phaazon → haze_ | 22:51 |
| → ndun4 joined | 22:51 |
|
fission6
| where you revert poor code in a merge and then want to fix it in a branch | 22:51 |
| ← cd-rum left | 22:52 |
| ← Nizumzen left | 22:52 |
| namcap → polyzen | 22:52 |
| haze_ → phz | 22:53 |
| phz → haaze | 22:53 |
| → m712 joined | 22:55 |
| → theoceaniscool joined | 22:56 |
| ← juiccifer left | 22:57 |
| ← ndun4 left | 22:58 |
| ← shinnya left | 22:58 |
|
fission6
| whats the common course of action when you merge in a branch that has a bug and you need to pull it out | 22:58 |
| haaze → haze__ | 22:59 |
| → juiccifer joined | 23:00 |
| haze__ → phaazon | 23:00 |
| ← dsdeiz left | 23:00 |
| ← rtjure left | 23:01 |
| → dsdeiz joined | 23:01 |
| ← dsdeiz left | 23:01 |
| → dsdeiz joined | 23:01 |
| ← finalbeta left | 23:04 |
| ← pbandark left | 23:04 |
| → cdown joined | 23:05 |
| → peterbecich joined | 23:06 |
| ← Phylock left | 23:06 |
| → adelyne joined | 23:07 |
| ← peterbecich left | 23:08 |
| → P4nther joined | 23:08 |
| ← ozette_ left | 23:08 |
| ← FernandoBasso left | 23:09 |
| ← P4nther left | 23:10 |
| ← fission6 left | 23:11 |
| ← Darren_ left | 23:12 |
| ← xcm left | 23:13 |
| → xcm joined | 23:14 |
| ← ArcaTech left | 23:14 |
| → thiago joined | 23:16 |
| ← MrMagic left | 23:16 |
| ← theoceaniscool left | 23:17 |
| → madewokherd joined | 23:17 |
| ← diogenese left | 23:18 |
| → diogenese joined | 23:18 |
| ← denimsoft left | 23:18 |
|
awygle
| Am I right that there is no way to clone part of a repo? Or even just download part of one? | 23:19 |
| → denimsoft joined | 23:19 |
| ← denimsoft left | 23:19 |
| → denimsoft joined | 23:20 |
| ← denimsoft left | 23:20 |
| → denimsoft joined | 23:21 |
| ← denimsoft left | 23:21 |
| → denimsoft joined | 23:21 |
| ← denimsoft left | 23:22 |
| → denimsoft joined | 23:22 |
| ← denimsoft left | 23:22 |
| ← pionen left | 23:23 |
| → MrMagic joined | 23:23 |
| ← Murr left | 23:25 |
| → Murr joined | 23:26 |
| ← Acerific left | 23:27 |
| → MattMake_ joined | 23:30 |
| ← MattMaker left | 23:30 |
|
preaction
| awygle: you can make a shallow clone of one commit in a repo, but not of a path in a repo, no | 23:31 |
| ← msonntag left | 23:32 |
| ← VladGh left | 23:33 |
| → VladGh joined | 23:34 |
| ← MattMake_ left | 23:37 |
| → clime joined | 23:37 |
| ← dege left | 23:38 |
| → msonntag joined | 23:39 |
| → Guma joined | 23:40 |
| ← clime left | 23:44 |
| → kasual joined | 23:44 |
| McKraken_zzzzz → McKraken | 23:45 |
| ← gargola left | 23:45 |
| ← uebera|| left | 23:46 |
| → uebera|| joined | 23:47 |
| ← uebera|| left | 23:47 |
| → uebera|| joined | 23:47 |
| ← SurenNihalani left | 23:47 |
| ← cagomez left | 23:47 |
| → peterbecich joined | 23:49 |
| ← peterbecich left | 23:50 |
| ← gopar left | 23:51 |
| → gopar joined | 23:52 |
| ← xcm left | 23:52 |
| → SurenNihalani joined | 23:52 |
| → xcm joined | 23:53 |
| → cagomez joined | 23:53 |
| → acidjnk2 joined | 23:53 |
| ← Guma left | 23:54 |
| ← thiago left | 23:54 |
| ← piraye left | 23:55 |
| ← madewokherd left | 23:56 |
| ← acidjnk left | 23:56 |
| → cdg joined | 23:59 |