| 2019-06-30 |
| ← Crocodillian left | 00:00 |
| → Crocodillian joined | 00:00 |
| ← rfold left | 00:01 |
| → florekm__ joined | 00:01 |
|
Ori_B
| So, uhm, question: when updating a (git fetch, pull, etc), what is a client expected to do with the hEAD ref? | 00:02 |
| ← kreyren left | 00:02 |
| ← florekm left | 00:04 |
| → Oatmeal joined | 00:05 |
| → orbyt_ joined | 00:07 |
| ← orbyt_ left | 00:11 |
| ← fphilipe_ left | 00:13 |
| → g00s joined | 00:13 |
| → valuemachine joined | 00:25 |
| → libertyprime joined | 00:28 |
| ← kjartan left | 00:29 |
| → kjartan joined | 00:31 |
| → hqdruxn08__ joined | 00:31 |
| ← matsaman left | 00:33 |
| ← hqdruxn08_ left | 00:35 |
| ← kjartan left | 00:38 |
| → cdown joined | 00:40 |
| ← g00s left | 00:41 |
| ← bambanx left | 00:42 |
| ← yyy left | 00:43 |
| ← m0viefreak left | 00:44 |
| ← valuemachine left | 00:44 |
| → valuemachine joined | 00:45 |
| → bambanx joined | 00:48 |
| → Onionnion joined | 00:50 |
| ← dege left | 00:53 |
|
deltab
| Ori_B: hmm, nothing? fetch updates FETCH_HEAD | 00:54 |
| ← valuemachine left | 00:56 |
| ← tufteddeer left | 00:56 |
| → tufteddeer joined | 00:56 |
| ← ghoti left | 00:57 |
| → bambanxx joined | 00:58 |
| → wjschmidt joined | 01:01 |
| ← bambanx left | 01:02 |
| → orbyt_ joined | 01:04 |
| ← duderonomy left | 01:05 |
| ← plexigras left | 01:05 |
| → veegee joined | 01:07 |
| → dviola joined | 01:07 |
| → StarLord__ joined | 01:11 |
| → valuemachine joined | 01:14 |
| ← bambanxx left | 01:15 |
| ← tufteddeer left | 01:15 |
| → tufteddeer joined | 01:16 |
| → Freshnuts joined | 01:21 |
| ← Freshnuts left | 01:22 |
| → Freshnuts joined | 01:23 |
| → florekm joined | 01:23 |
| → duderonomy joined | 01:25 |
| ← Karyon left | 01:26 |
| ← florekm__ left | 01:27 |
| ← tufteddeer left | 01:27 |
| → tufteddeer joined | 01:27 |
| → Karyon joined | 01:28 |
| ← comptroller left | 01:28 |
| ← valuemachine left | 01:29 |
| ← MACscr left | 01:30 |
| → valuemachine joined | 01:30 |
| → florekm__ joined | 01:32 |
| ← F0rTex left | 01:32 |
| → MACscr joined | 01:33 |
| ← cdown left | 01:33 |
| → F0rTex joined | 01:34 |
| ← florekm left | 01:35 |
|
Ori_B
| deltab: so, why is it there? | 01:38 |
| → comptroller joined | 01:39 |
|
deltab
| why is what there? HEAD? | 01:39 |
|
| it tells git commit which branch head to update when you make a commit | 01:40 |
|
| other commands use it as a default starting point | 01:41 |
|
Ori_B
| deltab: in the pack protocol? | 01:43 |
|
| I'm not talking about .git/HEAD, I'm talking about the first ref sent by the server when you do 'git fetch' | 01:44 |
|
deltab
| oh, sorry. no idea | 01:44 |
|
Ori_B
| it *looks* spurious to me, but I'm not sure. | 01:45 |
|
| the documentation doens't say anything about it, beyond it existing and needing to be the first ref sent by the server if it's sent. | 01:45 |
|
deltab
| hmm, used by git clone as a default? "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository’s HEAD, point to <name> branch instead." | 01:47 |
|
Ori_B
| yeah, if it had a name :) | 01:48 |
|
| it's just the hash of the comit. | 01:48 |
|
| which, I suppose I could go through the list of refs for. | 01:48 |
| ← tufteddeer left | 01:48 |
|
Ori_B
| readpkt: 0100:d025a11e327a324ce750d4a8717e422e0911b538 HEAD | 01:49 |
|
deltab
| hmm, but there could be multiple branch heads pointing at it | 01:49 |
|
Ori_B
| readpkt: 003f:d025a11e327a324ce750d4a8717e422e0911b538 refs/heads/master | 01:49 |
|
| ^-- that's what it looks like. | 01:49 |
| → tufteddeer joined | 01:49 |
|
Ori_B
| on the wire. | 01:49 |
|
| (well, minus the readpkt: bits) | 01:49 |
| → fphilipe_ joined | 02:09 |
| ← bashfulshell left | 02:09 |
| ← StarLord__ left | 02:12 |
| → ghoti joined | 02:12 |
| → orcainbox joined | 02:13 |
| → walbo joined | 02:14 |
| ← lagothrix left | 02:18 |
| → lagothrix joined | 02:18 |
| ← AtumT left | 02:26 |
| ← walbo left | 02:31 |
| ← deltam left | 02:34 |
| ← Cabanossi left | 02:34 |
| → Cabanossi joined | 02:37 |
| ← fphilipe_ left | 02:42 |
| ← YuGiOhJCJ left | 02:47 |
| ← tombusby left | 02:47 |
| → sauvin joined | 02:47 |
| ← ghost43 left | 02:47 |
| ← rmsvc left | 02:47 |
| → tombusby joined | 02:49 |
| → ghost43 joined | 02:49 |
| → YuGiOhJCJ joined | 02:49 |
| → rmsvc joined | 02:49 |
| → florekm joined | 02:55 |
| ← libertyprime left | 02:56 |
| ← florekm__ left | 02:58 |
| ← orcainbox left | 02:58 |
| → florekm__ joined | 03:02 |
| → cdown joined | 03:02 |
| → libertyprime joined | 03:02 |
| ← wjschmidt left | 03:05 |
| ← florekm left | 03:05 |
| → deltam joined | 03:07 |
| → mowcat joined | 03:08 |
| ← lankanmon left | 03:11 |
| → lankanmon joined | 03:13 |
| → fphilipe_ joined | 03:14 |
| ← veegee left | 03:20 |
| → g00s joined | 03:26 |
| ← cdown left | 03:28 |
| → veegee joined | 03:31 |
| ← jcbitter left | 03:35 |
| ← igemnace left | 03:35 |
| → jcbitter joined | 03:37 |
| ← Onionnion left | 03:40 |
| ← bket left | 03:42 |
| → bket joined | 03:46 |
| → cdown joined | 03:46 |
| ← fphilipe_ left | 03:48 |
| → crtcji joined | 04:08 |
| ← crtcji left | 04:10 |
| → Wafficus joined | 04:13 |
|
Wafficus
| Hi there, I have a Git meets Phabricator question. I want to prevent a git from monitoring another git instance. What I'm trying to do is git clone a repository for Lubuntu's dev team into my local machine, and then rehosting my branch on my GitHub so I can track changes. What's the best way to do this, but so I can add my own "git" to track changes on my own branch on my rehosted repo in GitHub? | 04:13 |
| ← boombatower left | 04:14 |
| ← cdown left | 04:18 |
| ← nic-hartley left | 04:25 |
| ← Oatmeal left | 04:26 |
| → florekm joined | 04:27 |
| ← florekm__ left | 04:30 |
| ← valuemachine left | 04:32 |
| → florekm__ joined | 04:33 |
| ← mowcat left | 04:33 |
| → valuemachine joined | 04:35 |
| ← florekm left | 04:36 |
| → AugustusCaesar24 joined | 04:36 |
| ← valuemachine left | 04:37 |
| → valuemachine joined | 04:37 |
| → nic-hartley joined | 04:39 |
| ← valuemachine left | 04:42 |
| ← Newami left | 04:47 |
| ← orbyt_ left | 04:49 |
|
Ori_B
| Wafficus: you mean changing where 'origin' points? | 04:53 |
|
| there are config commands for that, but I usually just open up .git/config and edit it. | 04:53 |
|
| ah, take a look at 'man git-remote' | 04:54 |
|
gitinfo
| the git-remote manpage is available at https://gitirc.eu/git-remote.html | 04:54 |
|
Wafficus
| thanks | 04:54 |
|
| what actually I need to do | 04:54 |
|
| is | 04:54 |
|
| since the workflow is primarily with Phabricator | 04:54 |
|
| I would just want to mirror the changes of the Phabricator repo to my GitHub | 04:54 |
|
| so I get credit on GitHub for what I've been doing | 04:54 |
|
| that's all | 04:54 |
|
Ori_B
| git doesn't "track" other git instances, so.. uhm. | 04:55 |
|
| basically just add another remote, and push to that? | 04:55 |
|
| 'git remote add mine git+ssh://git@github.com/your/repo.git', and push to that when you commit? | 04:55 |
|
| but IIRC, phabricator's tools rebase, so that may get messy -- don't know. | 04:56 |
|
Wafficus
| is that how you would mirror a repo from Phabricator to GitHub? | 04:56 |
|
Ori_B
| for mirroring, I'd add a commit hook to the repository that phabricator makes the commits into, but that doesn't sound like an option since you don't own that repostory. | 04:57 |
|
| so, you just need to sync them occasionally. | 04:57 |
| → omnireq joined | 04:59 |
|
Wafficus
| yeah exactly | 05:00 |
|
| I asked the lead dev for Lubuntu, and they don't want any hooks for this reason | 05:00 |
|
| so I'm kind of on my own for this one, which sucks on some regards since this is a bit above my head | 05:01 |
|
Ori_B
| a cronjob that force-pushes to github sounds like it will do the job. | 05:01 |
|
Wafficus
| I get the point of using git, use it on a regular basis to just back up my work | 05:01 |
|
| but merging branches, or even mirroring gets above my head for some reason | 05:01 |
|
| that's what he suggested | 05:01 |
|
| a cron job for the same reason | 05:01 |
|
| I've done a cron job before | 05:01 |
|
| but one that checks the Phabricator repo, sees if there are changes, and pushes it to github right | 05:01 |
| → pks_ joined | 05:02 |
|
Wafficus
| what does that mean in terms of actual steps on how to do it | 05:02 |
|
| this is the part I can't come up with personally | 05:02 |
|
Ori_B
| git push --force --all [email@hidden.address] | 05:02 |
|
| in your crontab. | 05:02 |
| ← pks left | 05:02 |
| pks_ → pks | 05:02 |
|
Wafficus
| wait, but how does that relate to the Phabricator repo? | 05:03 |
|
Ori_B
| it doesn't. | 05:03 |
|
Wafficus
| but I want it to though | 05:03 |
|
Ori_B
| you just push your copy of the repo to two different places. | 05:03 |
|
Wafficus
| ah I see | 05:03 |
|
| so pushing it to two different places right | 05:03 |
|
| so the workflow is like as follows: | 05:04 |
|
Ori_B
| if you want it to mirror exactly, you can pull the phabricator repo into a clean repository. | 05:04 |
|
Wafficus
| yeah can you describe the entire workflow | 05:04 |
|
| because I get lost in the details | 05:04 |
|
| like ex: git clone phab repo > remirror it with cron job, etc | 05:04 |
|
Ori_B
| git pull theirs; git push --force --all yours | 05:05 |
|
| automate that however you want. | 05:05 |
|
| or type it in by hand. | 05:05 |
|
Wafficus
| I'm still not getting it | 05:07 |
|
| to be honest | 05:07 |
| → gordonfish joined | 05:07 |
|
Ori_B
| do you understand what 'git pull' does? | 05:09 |
|
Wafficus
| yeah it pulls the changes for a repo onto your local machine | 05:09 |
|
Ori_B
| ok. | 05:09 |
|
| and do you understand what git push does? | 05:09 |
|
Wafficus
| it would push the changes from my local copy up to the repo | 05:10 |
|
Ori_B
| ok. | 05:10 |
|
| and do you understand what 'git push git+ssh://git@github.com/your/repo' does? | 05:11 |
|
Wafficus
| well, I usually do git push origin master for my repos | 05:11 |
|
| so I haven't used that command variant to be honest | 05:11 |
|
Ori_B
| sure you have. | 05:12 |
|
Wafficus
| it looks like its pushing the changes through ssh to the repo | 05:12 |
|
Ori_B
| origin is just shorthand for git+ssh://git@github.com/the/origin/repo | 05:12 |
|
Wafficus
| that's why you add the origin step right? | 05:12 |
|
| like even in the basic GitHub repo steps | 05:12 |
| ← pengwens left | 05:12 |
|
Ori_B
| yes. | 05:13 |
|
| it's entirely optional, but specifying where you push to is annoying to do every time. | 05:13 |
|
| so you set a shortcut name. | 05:13 |
|
| so, you can push to wherever you want. | 05:14 |
|
| any repository. | 05:14 |
|
| all repositories are equal. | 05:14 |
|
Wafficus
| gotcha | 05:15 |
|
Ori_B
| so if you want to put a copy of a repo somewhere, push to that somewhere. | 05:15 |
|
Wafficus
| eh still lost on that one | 05:15 |
|
| not trying to be difficult | 05:15 |
| ← ghoti left | 05:16 |
|
Wafficus
| but lets go back to the steps of workflow, and maybe the gaps will reveal where i'm stuck | 05:16 |
|
| : | 05:16 |
| ← fatalhalt left | 05:16 |
|
Wafficus
| I git clone the Phab repo, I then make my changes. I want to then push the changes to the Phab repo and the GitHub repo simultaneously. | 05:17 |
|
| is this simulataneous steps that seems hard to me | 05:17 |
|
| AND | 05:17 |
|
Ori_B
| write a script that does 2 git pushes. | 05:17 |
|
| mypush: git push origin master; git push myrepo master | 05:17 |
|
Wafficus
| what happens when someone modifies the Phabricator repo, how can I make it so it updates the GitHub repo? | 05:17 |
|
Ori_B
| then don't push to both places. | 05:18 |
|
| write a separate script that just updates from phabricator occasioanlly. | 05:18 |
|
Wafficus
| yesss | 05:18 |
|
| this is the one part that I need | 05:18 |
|
| so basically I need to make a script locally that does this right | 05:18 |
|
| with a cron job right? | 05:18 |
|
Ori_B
| if you want to use cron, sure. | 05:18 |
|
Wafficus
| right | 05:19 |
|
| but inside that Cron job right | 05:19 |
|
| what are the steps to do | 05:19 |
|
| would it be to make temporary repos that would then be pushed into the GitHub one | 05:20 |
|
| or do I need to just setup a basic mirror? | 05:20 |
| ← jcbitter left | 05:20 |
| → jcbitter joined | 05:22 |
|
Wafficus
| wait hold on | 05:25 |
|
| is it as simple as this article: | 05:25 |
|
| https://help.github.com/en/articles/duplicating-a-repository | 05:25 |
|
| you would just have a cron job that would make a pull from the phab repo, and then push --mirror the changes to the github based repo? | 05:25 |
|
Ori_B
| what have I said repeatedly? | 05:27 |
| → dartmouthed joined | 05:27 |
|
Ori_B
| git pull theirs; git push --force --all yours | 05:28 |
|
| --mirror does, apparently, pretty much the same thing. | 05:28 |
| → uebera|| joined | 05:35 |
| → Sasazuka joined | 05:35 |
| ← nic-hartley left | 05:40 |
| ← g00s left | 05:42 |
|
Wafficus
| yep it works :) | 05:44 |
|
| thanks so much Ori_B | 05:44 |
|
| have a great night, appreciate the help a ton, thanks so much | 05:44 |
| ← Wafficus left | 05:44 |
| → fphilipe_ joined | 05:44 |
| ← R2robot left | 05:48 |
| → R2robot joined | 05:49 |
| ← amrx left | 05:56 |
| → g00s joined | 05:57 |
| ← g00s left | 05:57 |
| → florekm joined | 05:59 |
| ← florekm__ left | 06:02 |
| → florekm__ joined | 06:04 |
| ← jcbitter left | 06:07 |
| ← florekm left | 06:07 |
| → jcbitter joined | 06:08 |
| → learningc joined | 06:09 |
| → Lucas_Gray joined | 06:13 |
| ← fphilipe_ left | 06:17 |
| ← RoriconKnight left | 06:37 |
| → RoriconKnight joined | 06:37 |
| ← neunon left | 06:41 |
| → neunon joined | 06:43 |
| ← YuGiOhJCJ left | 06:43 |
| → fphilipe_ joined | 06:49 |
| → deathwishdave joined | 07:01 |
| → jstein_ joined | 07:06 |
| jstein_ → jstein | 07:06 |
| ← ferdna left | 07:11 |
| ← fletom left | 07:15 |
| ← Novae left | 07:19 |
| → igemnace joined | 07:19 |
| → JrCs joined | 07:21 |
| → florekm joined | 07:31 |
| ← florekm__ left | 07:34 |
| → sinhue joined | 07:35 |
| ← florekm left | 07:38 |
| → hexnewbie joined | 07:38 |
| → czart joined | 07:42 |
| ← deathwishdave left | 07:47 |
| ← jstein left | 07:48 |
| ← cfoch left | 07:51 |
| ← fphilipe_ left | 08:03 |
| → kjartan joined | 08:04 |
| ← KnoP left | 08:05 |
| ← queip left | 08:06 |
| → deathwishdave joined | 08:08 |
| → fphilipe_ joined | 08:11 |
| → queip joined | 08:13 |
| → plexigras joined | 08:15 |
| ← fphilipe_ left | 08:16 |
| ← RoriconKnight left | 08:21 |
| → Novae joined | 08:23 |
| ← learningc left | 08:24 |
| ← Lucas_Gray left | 08:29 |
| → chachasmooth joined | 08:30 |
| → abraxxas joined | 08:33 |
| ← deathwishdave left | 08:35 |
| → randomdude999 joined | 08:43 |
| → fphilipe_ joined | 08:44 |
| ← Sasazuka left | 08:49 |
| ← Muzer left | 08:49 |
| → wootehfoot joined | 08:54 |
| ← yonder left | 08:56 |
| → Muzer joined | 08:56 |
| → ToAruShiroiNeko joined | 08:58 |
|
ToAruShiroiNeko
| So would this be the correct place to ask questions about bonobo git config? | 08:59 |
| → rfold joined | 09:00 |
| → florekm joined | 09:03 |
| → florekm__ joined | 09:05 |
| ← sinhue left | 09:06 |
| ← florekm left | 09:08 |
| ← zulutango left | 09:09 |
|
Zarthus
| unless you can ask it as a generic git question, i don't think so | 09:10 |
| → zulutango joined | 09:13 |
| ← Freshnuts left | 09:17 |
| ← xcm left | 09:18 |
| → xcm joined | 09:18 |
| ← fphilipe_ left | 09:18 |
| → learningc joined | 09:19 |
| ← catsup left | 09:20 |
| → catsup joined | 09:20 |
| ← catsup left | 09:21 |
| → catsup joined | 09:21 |
| ← Goplat left | 09:23 |
| → theoceaniscool joined | 09:27 |
| → arunkumar413 joined | 09:28 |
| → lbr joined | 09:40 |
| ← kjartan left | 09:41 |
| → fphilipe_ joined | 09:41 |
| → kjartan joined | 09:42 |
| ← tufteddeer left | 09:43 |
| → tufteddeer joined | 09:43 |
| ← fphilipe_ left | 09:46 |
| ← lbr left | 09:51 |
| → lbr joined | 09:51 |
| → im0nde- joined | 09:53 |
| ← im0nde_ left | 09:53 |
| → im0nde| joined | 09:53 |
| ← im0nde left | 09:54 |
| → kreyren joined | 09:54 |
| → fphilipe_ joined | 09:58 |
| ← kjartan left | 09:59 |
| → Atlenohen joined | 09:59 |
| → kjartan joined | 10:00 |
| ← lankanmon left | 10:00 |
| ← fphilipe_ left | 10:04 |
| → yyy- joined | 10:09 |
| ← rfold left | 10:12 |
|
lbr
| Hi. I'm heaving a bit of a trouble with "cleaning-up" commit that is in the middle of local tree. I've used `bgf` to remove file locally, but then I need to `pull` from remote and damn file appears again! | 10:12 |
|
| I don't care if filename shows in logs, but content must be purged locally and remotely. What course of action is generally recommended in this case? | 10:13 |
| → anikras joined | 10:13 |
|
anikras
| Hi, I have a question, if I am doing "git fetch origin develop" | 10:16 |
|
| How can I show the news changes before do "git pull origin develop" ? | 10:17 |
| ← AugustusCaesar24 left | 10:21 |
| → fphilipe_ joined | 10:30 |
| ← kjartan left | 10:30 |
| → kjartan joined | 10:31 |
| → rsrx joined | 10:33 |
| → florekm joined | 10:35 |
| ← florekm__ left | 10:38 |
| ← TomTom left | 10:46 |
| ← netj left | 10:46 |
| → netj joined | 10:47 |
| → deathwishdave joined | 10:47 |
| ← florekm left | 10:49 |
|
Norrin
| git log branch_1...branch_2 anikras | 10:51 |
|
| git log ...origin/develop | 10:51 |
| → lankanmon joined | 11:00 |
| → luis joined | 11:03 |
| ← deltam left | 11:04 |
| → sinhue joined | 11:05 |
| ← yyy- left | 11:07 |
|
ToAruShiroiNeko
| okay | 11:08 |
|
| so on the client side I get error: RPC failed; HTTP 413 curl 22 The requested URL returned error: 413 | 11:08 |
|
| on the server side I get 2019-06-30 03:23:52.755 -07:00 [Warning] GitAuth: No auth header, anon operations not allowed | 11:09 |
|
| I do not quite understand what I need to look for :/ | 11:09 |
|
| repo has no files | 11:09 |
|
| I am just trying to init it and failing | 11:09 |
|
| rather init works but push fails | 11:12 |
|
anikras
| @Norrin thanks, it is wonderfull !! | 11:15 |
| → mikecmpbll joined | 11:17 |
| → Fernando-Basso joined | 11:18 |
| ← fphilipe_ left | 11:19 |
| ← zulutango left | 11:25 |
| → zulutango joined | 11:27 |
| ← prometheus_falli left | 11:31 |
| → martin-_-___ joined | 11:31 |
|
martin-_-___
| I'm trying to setup gitweb | 11:31 |
|
| I get attempt to invoke directory as script: /c/var/www/GITSCM/gitweb | 11:31 |
| ← dmc left | 11:32 |
|
martin-_-___
| this is my config https://pastebin.com/cm8EWqJw | 11:32 |
| → m0viefreak joined | 11:35 |
| ← kjartan left | 11:36 |
| → kjartan joined | 11:37 |
| → dmc joined | 11:42 |
| → fphilipe_ joined | 11:42 |
| ← martin-_-___ left | 11:42 |
| ← tufteddeer left | 11:43 |
| → tufteddeer joined | 11:44 |
| → enoq joined | 11:48 |
| ← czart left | 11:51 |
| → d1b joined | 11:55 |
| ← omnireq left | 11:59 |
| → yyy- joined | 12:07 |
| → florekm joined | 12:07 |
| ← yyy- left | 12:08 |
| → yyy- joined | 12:08 |
| ← sinhue left | 12:10 |
| → florekm__ joined | 12:10 |
| ← vishal left | 12:11 |
| → vishal joined | 12:13 |
| ← florekm left | 12:13 |
| ← fphilipe_ left | 12:17 |
| → valuemachine joined | 12:20 |
| ← kjartan left | 12:20 |
| → kjartan joined | 12:22 |
| ← arecaceae left | 12:32 |
| → arecaceae joined | 12:32 |
| ← hofmann3900 left | 12:33 |
| → kent\n joined | 12:35 |
| ← Atlenohen left | 12:38 |
| → lbr_ joined | 12:46 |
| → freeman42x joined | 12:47 |
| ← lbr left | 12:48 |
| ← agowa338 left | 12:49 |
| lbr_ → lbr | 12:52 |
| ← kjartan left | 12:57 |
| → medfly joined | 12:57 |
| → kjartan joined | 12:58 |
|
medfly
| I am merging stuff, but I kinda messed up the merge (rather: I messed up the import which I'm merging). what's the best way to go about re-doing it? I'm thinking of keeping the old tree and copying all the files over, and seeing what's left.OA | 12:59 |
|
| Anything slightly better? | 12:59 |
| → greatgatsby joined | 13:00 |
| → pengwens joined | 13:10 |
| ← kent\n left | 13:12 |
| ← kreyren left | 13:15 |
| → YuGiOhJCJ joined | 13:17 |
| ← kjartan left | 13:17 |
| → malmalmal joined | 13:17 |
| ← malmalmal left | 13:17 |
| → kent\n joined | 13:18 |
| → kjartan joined | 13:18 |
| ← queip left | 13:21 |
| → kreyren joined | 13:22 |
| ← Inline left | 13:23 |
| → queip joined | 13:29 |
| ← learningc left | 13:29 |
| → learningc joined | 13:29 |
| → shtick joined | 13:32 |
| → mikecmpb_ joined | 13:33 |
| → Inline joined | 13:33 |
| ← mikecmpbll left | 13:34 |
| ← kjartan left | 13:34 |
| → kjartan joined | 13:36 |
| → inkbottle joined | 13:38 |
| → florekm joined | 13:39 |
| ← florekm__ left | 13:42 |
| ← randomdude999 left | 13:43 |
| ← florekm left | 13:51 |
| ← deathwishdave left | 14:01 |
| ← tufteddeer left | 14:01 |
| → tufteddeer joined | 14:02 |
| → mat001 joined | 14:05 |
| → sinhue joined | 14:06 |
| ← tufteddeer left | 14:10 |
| → tufteddeer joined | 14:11 |
| → muhaha joined | 14:12 |
| ← greatgatsby left | 14:12 |
| → fphilipe_ joined | 14:13 |
| ← yyy- left | 14:15 |
| ← neunon left | 14:18 |
| ← kjartan left | 14:18 |
| → kjartan joined | 14:19 |
| → DusteD joined | 14:19 |
| → greatgatsby joined | 14:23 |
| → deathwishdave joined | 14:26 |
| ← nowhere_man left | 14:31 |
| → nowhereman joined | 14:31 |
| → rwb joined | 14:33 |
|
arecaceae
| so when I squash-merge from branch A to B and I do a `git diff` between them the commits I squash-merged will still show up | 14:33 |
|
| anything I can do about it? | 14:33 |
|
GyrosGeier
| hm? | 14:35 |
|
| so you want a single commit off the master with all the changes, and then a merge commit on top of that? | 14:36 |
| ← kreyren left | 14:37 |
|
arecaceae
| GyrosGeier: you're responding to me? | 14:37 |
| ← greatgatsby left | 14:38 |
|
GyrosGeier
| yes | 14:38 |
|
arecaceae
| I've been doing `git merge --squash` previously | 14:39 |
|
| now I diff the two branches and the commits I merged show up as not been merged | 14:39 |
|
GyrosGeier
| ah | 14:39 |
|
| that is normal | 14:39 |
|
| squashing creates a new commit | 14:39 |
|
arecaceae
| which then means I can't use `git diff` reliably anymore no | 14:39 |
|
GyrosGeier
| and the merge commit doesn't reference that | 14:40 |
|
arecaceae
| can't I explicitly say I merged those commits without "actually merging" them? | 14:40 |
|
GyrosGeier
| but "git diff" should show no differences between the squashed commit and the branch | 14:40 |
|
| normally I just check that all changes made it into the merge and then remove the branch | 14:41 |
|
| usually by rebasing the feature branch | 14:41 |
|
| the branch should become empty then as there are no changes left | 14:42 |
|
arecaceae
| hmmmm let me check again | 14:42 |
|
GyrosGeier
| but squash-merges are one of the least useful features there are | 14:42 |
|
arecaceae
| right, in this case I didn't remove the branch | 14:42 |
| ← tufteddeer left | 14:43 |
| → tufteddeer joined | 14:43 |
|
GyrosGeier
| I normally do this in two stages -- squash first with an interactive rebase (this is also where I remove all the debug code) | 14:44 |
| → cd joined | 14:44 |
| → mniip joined | 14:45 |
|
GyrosGeier
| then merging the squash commit will record the branch as merged | 14:45 |
|
arecaceae
| true, I've not doing `git diff` but showing missing commits via `git log` | 14:46 |
|
| in my case, this was not a branch that I've deleted then and the use case for squash merging still seemed reasonable | 14:46 |
| ← fphilipe_ left | 14:46 |
|
GyrosGeier
| squashing is sensible for a rework when your policy is that every commit needs to compile and test okay | 14:48 |
|
arecaceae
| on second thought tho I think this was a mistake in that case | 14:48 |
|
| but can't undo it | 14:48 |
|
GyrosGeier
| git reflog to the rescue? | 14:49 |
|
arecaceae
| mhm best probably is to undo it in that case | 14:49 |
| → yyy joined | 14:50 |
|
arecaceae
| thanks for the info | 14:50 |
|
GyrosGeier
| np, that's what we're here for :) | 14:51 |
| ← kjartan left | 14:54 |
| → kjartan joined | 14:56 |
| ← YuGiOhJCJ left | 14:58 |
| ← deathwishdave left | 15:02 |
| ← mat001 left | 15:10 |
| → florekm joined | 15:11 |
| → subopt joined | 15:12 |
| → florekm__ joined | 15:14 |
| ← sinhue left | 15:14 |
| → czart joined | 15:14 |
| → fphilipe_ joined | 15:16 |
| ← florekm left | 15:17 |
| → nkuttler joined | 15:24 |
| ← shtick left | 15:26 |
| ← xcm left | 15:27 |
| → xcm joined | 15:27 |
| → nic-hartley joined | 15:28 |
| ← nic-hartley left | 15:28 |
| ← yyy left | 15:29 |
| ← igemnace left | 15:29 |
| → igemnace joined | 15:30 |
| ← satifant left | 15:31 |
| → satifant joined | 15:31 |
| → TomTom joined | 15:35 |
| ← kjartan left | 15:37 |
| → kjartan joined | 15:38 |
| → thiago joined | 15:45 |
| → jstein_ joined | 15:45 |
| jstein_ → jstein | 15:45 |
| ← valuemachine left | 15:47 |
| → valuemachine joined | 15:48 |
| ← silverballz left | 15:48 |
| ← valuemachine left | 15:48 |
| ← fphilipe_ left | 15:50 |
| → valuemachine joined | 15:51 |
| → omnireq joined | 15:51 |
| → silverballz joined | 15:52 |
| ← kjartan left | 15:55 |
| ← valuemachine left | 15:56 |
| → kjartan joined | 15:57 |
| → nic-hartley joined | 15:58 |
| ← inkbottle left | 15:59 |
| ← thiago left | 15:59 |
| → thiago joined | 15:59 |
| → andrewm87 joined | 16:00 |
| ← andrewm87 left | 16:01 |
| → plitter joined | 16:02 |
| → agowa338 joined | 16:03 |
| → hussam joined | 16:04 |
| ← plitter left | 16:08 |
| ← kjartan left | 16:11 |
| → kjartan joined | 16:11 |
| ← tufteddeer left | 16:12 |
| → tufteddeer joined | 16:13 |
| ← agowa338 left | 16:15 |
| → agowa338 joined | 16:17 |
| → greatgatsby joined | 16:19 |
| → inkbottle joined | 16:19 |
| ← tufteddeer left | 16:20 |
| ← omnireq left | 16:22 |
| → omnireq joined | 16:23 |
| ← kjartan left | 16:24 |
| → kjartan joined | 16:26 |
| → valuemachine joined | 16:26 |
| ← inkbottle left | 16:28 |
| ← quizzi left | 16:30 |
| → azwieg103 joined | 16:30 |
| → inkbottle joined | 16:31 |
| ← khisanth_ left | 16:32 |
| → plitter joined | 16:35 |
| → orbyt_ joined | 16:36 |
| ← agowa338 left | 16:37 |
| ← inkbottle left | 16:38 |
| subopt → _subopt_in_repos | 16:38 |
| ← _subopt_in_repos left | 16:38 |
| → inkbottle joined | 16:38 |
| ← omnireq left | 16:39 |
| → florekm joined | 16:43 |
| ← czart left | 16:43 |
| → khisanth_ joined | 16:45 |
| → tufteddeer joined | 16:46 |
| ← inkbottle left | 16:46 |
| ← panopticon3M left | 16:46 |
| ← florekm__ left | 16:46 |
| ← xcm left | 16:48 |
| → florekm__ joined | 16:49 |
| → xcm joined | 16:49 |
| ← rsrx left | 16:49 |
| → subopt joined | 16:51 |
| ← florekm left | 16:52 |
| → inkbottle joined | 16:52 |
| ← azwieg103 left | 16:57 |
| ← valuemachine left | 16:57 |
| ← kjartan left | 17:02 |
| ← tufteddeer left | 17:03 |
| → kjartan joined | 17:03 |
| → tufteddeer joined | 17:04 |
| → ferdna joined | 17:05 |
| → kreyren joined | 17:05 |
| ← greatgatsby left | 17:05 |
| ← inkbottle left | 17:06 |
| → inkbottle joined | 17:06 |
| ← nic-hartley left | 17:16 |
| ← xcm left | 17:16 |
| → xcm joined | 17:16 |
| ← arunkumar413 left | 17:17 |
| ← plitter left | 17:19 |
| → sahasatvik joined | 17:19 |
| → quizzi joined | 17:20 |
| ← thiago left | 17:20 |
| → rfold joined | 17:24 |
| ← kjartan left | 17:25 |
| → valuemachine joined | 17:25 |
| → kjartan joined | 17:25 |
| → malmalmal joined | 17:26 |
| → Goplat joined | 17:30 |
| ← sahasatvik left | 17:32 |
| ← learningc left | 17:32 |
| → plitter joined | 17:34 |
| ← tufteddeer left | 17:37 |
| → tufteddeer joined | 17:38 |
| ← inkbottle left | 17:40 |
| → yonder joined | 17:40 |
| → Lucas_Gray joined | 17:40 |
| → nic-hartley joined | 17:41 |
| ← JanC left | 17:43 |
| → JanC joined | 17:43 |
| → fphilipe_ joined | 17:46 |
| ← lbr left | 17:47 |
| ← nic-hartley left | 17:47 |
| ← kjartan left | 17:48 |
| → kjartan joined | 17:49 |
| → deathwishdave joined | 17:51 |
| ← orbyt_ left | 17:52 |
| ← kjartan left | 18:02 |
| → hussar joined | 18:02 |
| → kjartan joined | 18:03 |
| ← deathwishdave left | 18:04 |
|
mns
| I have tags that I have deleted locally and want to push that to origin, but it does not seem to be working: git tag -d TAG_NAME ; git push --tags origin | 18:05 |
| ← medfly left | 18:09 |
| → nic-hartley joined | 18:11 |
| → moei joined | 18:12 |
| ← queip left | 18:15 |
| → florekm joined | 18:15 |
| → yyy- joined | 18:17 |
| ← florekm__ left | 18:19 |
| ← fphilipe_ left | 18:19 |
| → orbyt_ joined | 18:23 |
| → randomdude999 joined | 18:24 |
| ← kjartan left | 18:25 |
| → florekm__ joined | 18:25 |
| → kjartan joined | 18:26 |
| ← anikras left | 18:26 |
| → czart joined | 18:27 |
|
moritz
| mns: git push --delete TAG_NAME I believe | 18:28 |
| → queip joined | 18:28 |
| ← florekm left | 18:28 |
| ← tufteddeer left | 18:33 |
| → tufteddeer joined | 18:34 |
|
mns
| moritz: thanks. | 18:36 |
| → OtakuSenpai joined | 18:39 |
| ← OtakuSenpai left | 18:45 |
| → OtakuSenpai joined | 18:47 |
| → fphilipe_ joined | 18:47 |
| → crtcji joined | 18:49 |
| ← crtcji left | 18:50 |
| → bebbet joined | 18:51 |
| → Jackneill joined | 18:58 |
| ← OtakuSenpai left | 18:58 |
| → SkarmoutsosV joined | 18:59 |
| ← jcbitter left | 18:59 |
| → jcbitter joined | 19:01 |
| → deathwishdave joined | 19:02 |
| ← quizzi left | 19:03 |
| → OtakuSenpai joined | 19:03 |
| → quizzi joined | 19:05 |
| ← deathwishdave left | 19:08 |
| ← queip left | 19:08 |
| ← OtakuSenpai left | 19:08 |
| ← netj left | 19:08 |
| → netj joined | 19:08 |
| ← czart left | 19:12 |
| → queip joined | 19:14 |
| ← malmalmal left | 19:20 |
| ← kjartan left | 19:21 |
| ← fphilipe_ left | 19:22 |
| ← TomTom left | 19:22 |
| → kjartan joined | 19:23 |
| → fphilipe_ joined | 19:29 |
| ← fphilipe_ left | 19:34 |
| → inkbottle joined | 19:47 |
| → florekm joined | 19:47 |
| ← Cabanossi left | 19:47 |
| ← armyriad left | 19:49 |
| → armyriad joined | 19:49 |
| ← florekm__ left | 19:50 |
| → fphilipe_ joined | 19:50 |
| → florekm__ joined | 19:51 |
| ← Lucas_Gray left | 19:51 |
| → Cabanossi joined | 19:51 |
| ← florekm left | 19:54 |
| ← fphilipe_ left | 19:55 |
| → lucasb joined | 19:56 |
| → fphilipe_ joined | 19:57 |
| → [yyy] joined | 19:58 |
|
arooni_team_b
| with git i can create a local repo; commit to it and then later when i feel like it i can add a remote source correct? | 19:58 |
|
moritz
| correct | 19:58 |
| ← inkbottle left | 20:00 |
| → n3wborn joined | 20:00 |
| ← SkarmoutsosV left | 20:01 |
| ← yyy- left | 20:01 |
| → g00s joined | 20:03 |
| → Phylock joined | 20:04 |
| → mowcat joined | 20:07 |
| → ChocolateArmpits joined | 20:16 |
|
arooni_team_b
| once i add a remote source ; the entire history will be pushed there right? not just what i added after the remote source? | 20:16 |
| → azwieg103 joined | 20:16 |
| ← valuemachine left | 20:17 |
| → valuemachine joined | 20:19 |
| → dege joined | 20:20 |
| → Ruflexo joined | 20:22 |
| → navidr joined | 20:23 |
| ← valuemachine left | 20:23 |
| ← Jackneill left | 20:25 |
| ← tazle_ left | 20:26 |
| ← pandem left | 20:26 |
| → tazle_ joined | 20:26 |
| → pandem joined | 20:26 |
| ← fphilipe_ left | 20:29 |
| ← azwieg103 left | 20:31 |
| → fphilipe_ joined | 20:35 |
| → causa_sui joined | 20:45 |
| → valuemachine joined | 20:45 |
| ← kjartan left | 20:45 |
| → kjartan joined | 20:46 |
| → warthog19 joined | 20:47 |
| ← wagle left | 20:48 |
| ← causasui left | 20:48 |
| → wagle joined | 20:48 |
| warthog19 → warthog9 | 20:50 |
| → Ram-Z joined | 20:51 |
| → Ranhir joined | 20:52 |
| ← Phylock left | 20:56 |
| → Freshnuts joined | 20:57 |
| ← armyriad left | 20:59 |
| subopt → _subopt_in_repos | 20:59 |
| ← xcm left | 21:00 |
| → xcm joined | 21:00 |
| → armyriad joined | 21:00 |
| → SCHAPiE joined | 21:12 |
| ← queip left | 21:12 |
| ← [yyy] left | 21:14 |
| → h2t4vc7s9 joined | 21:18 |
| → queip joined | 21:18 |
| → florekm joined | 21:19 |
| ← florekm__ left | 21:22 |
| → fstd_ joined | 21:22 |
| ← h2t4vc7s9 left | 21:25 |
| → florekm__ joined | 21:26 |
| ← fstd left | 21:26 |
| fstd_ → fstd | 21:26 |
| ← Ruflexo left | 21:27 |
| ← florekm left | 21:30 |
| ← kjartan left | 21:36 |
| ← ChocolateArmpits left | 21:38 |
| ← pengwens left | 21:38 |
| → kjartan joined | 21:38 |
| ← tufteddeer left | 21:39 |
| ← theoceaniscool left | 21:40 |
| → tufteddeer joined | 21:40 |
| → bambanx joined | 21:40 |
| ← Cabanossi left | 21:47 |
| → Cabanossi joined | 21:49 |
| ← plexigras left | 21:51 |
| ← rfold left | 21:54 |
| → sunrunner20 joined | 21:59 |
| ← mikecmpb_ left | 22:00 |
| ← randomdude999 left | 22:00 |
| → randomdude999 joined | 22:00 |
| ← tufteddeer left | 22:01 |
| → tufteddeer joined | 22:01 |
| ← dege left | 22:04 |
| ← kjartan left | 22:05 |
| → kjartan joined | 22:06 |
| → kezimo joined | 22:11 |
| → EgS joined | 22:12 |
| → dr_lepper joined | 22:16 |
| → fphilipe joined | 22:17 |
| ← wootehfoot left | 22:17 |
| ← dartmouthed left | 22:17 |
| ← fphilipe_ left | 22:20 |
| ← fphilipe left | 22:22 |
| ← haasn left | 22:27 |
| ← tufteddeer left | 22:30 |
| → tufteddeer joined | 22:31 |
| → haasn joined | 22:32 |
| → mdeckert joined | 22:33 |
| ← kjartan left | 22:36 |
| ← moei left | 22:36 |
| → butterth_ joined | 22:37 |
| → kjartan joined | 22:38 |
| ← butterth_ left | 22:39 |
| → bambanxx joined | 22:41 |
| ← bambanx left | 22:45 |
| ← kreyren left | 22:45 |
| → yyy joined | 22:48 |
| → fphilipe joined | 22:48 |
| ← DusteD left | 22:51 |
| → florekm joined | 22:51 |
| ← tufteddeer left | 22:53 |
| → tufteddeer joined | 22:53 |
| ← florekm__ left | 22:54 |
|
supernovah
| how is it that after I run git clean -f -d -x, that ther are still untracked files | 22:57 |
| ← abraxxas left | 22:58 |
| ← nic-hartley left | 23:00 |
| → Sasazuka joined | 23:01 |
| → cfoch joined | 23:02 |
| ← orbyt_ left | 23:02 |
|
supernovah
| how does this file have this conflict when I ```git merge FETCH_HEAD``` but doesn't show up with ```git clean -f -d -x```... ? | 23:05 |
|
| it's invisible to half of the software, but not the other - this must be considered a bug | 23:05 |
| ← florekm left | 23:06 |
| → sinhue joined | 23:08 |
| ← queip left | 23:09 |
| ← Sasazuka left | 23:10 |
| → OtakuSenpai joined | 23:10 |
| ← OtakuSenpai left | 23:15 |
| → OtakuSenpai joined | 23:15 |
| → orbyt_ joined | 23:16 |
| ← kezimo left | 23:17 |
| ← g00s left | 23:18 |
| → queip joined | 23:18 |
| → g00s joined | 23:18 |
| → kezimo joined | 23:19 |
| ← OtakuSenpai left | 23:20 |
| → OtakuSenpai joined | 23:20 |
| ← tufteddeer left | 23:21 |
| → hofmann3900 joined | 23:21 |
| → tufteddeer joined | 23:21 |
| ← fphilipe left | 23:22 |
| ← kezimo left | 23:22 |
| ← jcbitter left | 23:23 |
| → kezimo joined | 23:23 |
| → jcbitter joined | 23:25 |
| ← OtakuSenpai left | 23:27 |
| → OtakuSenpai joined | 23:27 |
| ← Fernando-Basso left | 23:29 |
| ← jcbitter left | 23:30 |
| → orcainbox joined | 23:31 |
| → jcbitter joined | 23:32 |
| → bashfulshell joined | 23:35 |
| → camsbury joined | 23:35 |
| ← OtakuSenpai left | 23:36 |
| → StarLord__ joined | 23:37 |
| ← camsbury left | 23:37 |
| → camsbury joined | 23:38 |
| ← bambanxx left | 23:41 |
| ← tufteddeer left | 23:41 |
| → tufteddeer joined | 23:43 |
| ← duderonomy left | 23:45 |
| → bambanxx joined | 23:47 |
| ← Cabanossi left | 23:47 |
| ← enoq left | 23:49 |
| ← camsbury left | 23:49 |
| ← StarLord__ left | 23:50 |
| ← lucasb left | 23:55 |
| → Cabanossi joined | 23:59 |