Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-15

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:11 ali1234 _ikke_: wildmatch works correctly in .gitignore: **/foo correctly ignores foo at the top of the repo, but "git ls-files -o **/foo" can't see it
00:11 systemovich joined #git
00:12 mentor joined #git
00:12 telephone joined #git
00:12 telephone joined #git
00:12 mentor On continuing a rebase after resolving a conflict, is there any way to tell git that I don't want to edit the commit message?
00:15 raynold joined #git
00:15 TbobbyZ_ joined #git
00:22 MrRicecake joined #git
00:22 axh joined #git
00:25 alexggordon joined #git
00:38 fish3485 joined #git
00:41 portal__ joined #git
00:52 thebope joined #git
00:52 Cabanossi joined #git
00:55 matoro joined #git
01:00 fstd_ joined #git
01:01 diogenese joined #git
01:02 scoobert1on joined #git
01:03 dstw joined #git
01:04 CarlFK joined #git
01:05 dstw joined #git
01:07 dstw joined #git
01:08 Khisanth joined #git
01:08 dstw joined #git
01:10 dstw joined #git
01:12 snowkidind joined #git
01:12 dstw joined #git
01:12 durham joined #git
01:13 dstw joined #git
01:14 dstw joined #git
01:19 elsevero joined #git
01:21 duderonomy joined #git
01:25 kegster joined #git
01:29 ayjay_t joined #git
01:29 * Eugene waves to dviola
01:33 tnecniv joined #git
01:34 Dewin|znc joined #git
01:38 kegster joined #git
01:38 elsevero_ joined #git
01:39 awc737 joined #git
01:39 cahoots joined #git
01:41 texasmynsted joined #git
01:42 sunri5e joined #git
01:46 durham joined #git
01:46 alexandre9099 joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 livingstn joined #git
01:52 Cabanossi joined #git
01:53 canoon joined #git
01:54 watabou joined #git
01:56 VagabondAzulien joined #git
01:57 durham joined #git
01:57 awc737 joined #git
01:57 Goplat joined #git
01:59 Emperor_Earth joined #git
02:06 chachasmooth joined #git
02:08 awc737 joined #git
02:09 cqi joined #git
02:09 flippo joined #git
02:12 fish3485 joined #git
02:13 duderonomy joined #git
02:14 Anja joined #git
02:14 alexandre9099 joined #git
02:24 Nilesh_ joined #git
02:26 ojdo joined #git
02:31 Anja joined #git
02:32 Anja joined #git
02:37 cliluw joined #git
02:38 jstimm joined #git
02:40 thebope joined #git
02:40 souther joined #git
02:41 fish3485 joined #git
02:42 kexmex joined #git
02:44 Guest55 joined #git
02:46 kegster joined #git
02:49 Vortex34 joined #git
02:51 pietv joined #git
02:51 Cabanossi joined #git
02:52 zumba_addict joined #git
02:52 zumba_addict anyone here uses npm?
02:58 lagothri1 joined #git
03:02 pks joined #git
03:02 systemovich joined #git
03:05 hexagoxel joined #git
03:06 chachasmooth joined #git
03:08 raijin joined #git
03:09 jagob joined #git
03:09 jameser joined #git
03:13 telephone joined #git
03:13 telephone joined #git
03:14 bronson joined #git
03:15 shgysk8zer0_ joined #git
03:18 memori zumba_addict, check in ##javascript
03:18 zumba_addict i was hoping someone was using npm and git and would like to know their experience with npm shrinkwrap
03:26 zumba_addict I have a git question. It's been months and we still haven't come up with a way yet to do hotfix. My boss was saying that the suggestion I mentioned will lose history. Here it is
03:28 zumba_addict Currently, we only have master branch. We make bug-or-feature-branch and we submit a pull request. When pull-request is approved, it gets merged to master. When master is updated, our Jenkins job runs and it creates a build of our frontend app. The job also uploads to an S3 bucket.
03:28 TbobbyZ joined #git
03:29 zumba_addict I forgot to mention that the first upload is to DEV environment. I wrote another jenkins job that copies the built code(not source code) from S3 in DEV env to S3 in STAGE. Our QA testers can start testing
03:30 zumba_addict the same thing happens when we promote the built code in STAGE to PROD. This can happen in a span of 2 weeks since we usually don't promote to STAGE and PROD at the same time.
03:31 moestevens joined #git
03:32 kegster joined #git
03:32 zumba_addict Within this 2 weeks period, so many things have happened in MASTER branch. Let's say it was deploy to PROD about a week ago and someone saw a bug. We've been notified about the bug and now we need to do hotfix. However, MASTER has already been updated so many times
03:33 zumba_addict If you recall, we only built our code once and that was to dev. We don't have a code that we use to build for PROD
03:35 zumba_addict What should we do in this case? Here is what I was thinking and let me know if it's a good approach. A) git tag every merge to master B) if let's say QA team says build 123 is the best stable version, we'll git checkout build123 and then run git checkout -b release1.0
03:36 Cabanossi joined #git
03:36 zumba_addict Right now, our team is not git tagging every merge. We are not used to it nor we are not sure if it's the proper way to do
03:38 canoon just create a production branch and merge from master into that when you want to do a release
03:38 Murr- joined #git
03:38 moestevens left #git
03:38 canoon if you want to do a hotfix just merge that in directly avoiding master
03:42 thiago zumba_addict: branch off from the commit that was pushed to production. Apply the hotfix (with all the testing required, of course).
03:42 thiago zumba_addict: then merge that back to master
03:44 zumba_addict ok, let me try if I understand :)
03:46 zumba_addict so build123 was the one that QA team said it was the best stable. Build123 was the branch that also got merged to master. Were you saying to checkout the commit where it contains the build123 then git checkout -b release 1.0?
03:47 dreiss joined #git
03:49 xall joined #git
03:49 seveneve1 joined #git
03:52 jost__ joined #git
03:53 qzorg joined #git
03:55 canoon zumba_addict, you can do that if you like
03:55 zumba_addict ok
03:55 zumba_addict i got confused when he wrote "then merge that back to master"
03:56 zumba_addict i think he's refering to the hotfix branch
03:56 canoon yeah you should merge the hotfix back into master so when you release another new version it has the fix
03:56 jagob joined #git
03:57 zumba_addict ok. I said that today and their question to me was, what happens to the newer codes that have been merged to master, do they get affected?
03:57 canoon well you aren't touching master you are just releasing off a different branch
03:57 zumba_addict there might be some conflict when it gets merged back. Was i right?
03:57 zumba_addict oh
03:57 zumba_addict let's start again. I'm a bit lost
03:58 shinnya joined #git
03:58 zumba_addict let's say today we got a message from QA manager that the latest master branch with build123 merged to it was the best and free from issues
03:59 zumba_addict So I create a release branch right? git checkout -b release-1.0, correct?
03:59 canoon that's up to you...
03:59 zumba_addict I mean, I'd like to use what others have been doing. I don't like to reinvent
04:00 zumba_addict i'd like to use the best practice
04:00 zumba_addict how would you do it?
04:01 canoon we just create a branch off master with the fix we want and release that branch directly
04:01 zumba_addict but our master have many newer updates after build123
04:02 zumba_addict would that mean I should git tag build123?
04:02 zumba_addict this way, I can git checkout a tag and branch off of it
04:02 canoon i think maybe you want something like this http://nvie.com/posts/a-successful-git-branching-model/
04:03 canoon because you seem to want a very structured workflow
04:03 canoon but depending on what you do you might not need such complexity
04:03 zumba_addict i remember seeing that link before and someone here I remember mentioned that it's not a good flow
04:04 zumba_addict we are 17 in the team, it's a lot
04:04 canoon yeah i think it's somewhat overcomplicated but you keep asking about release branches and etc
04:04 zumba_addict ok
04:07 zumba_addict I'm going to try making a basic git repo. Then I'll create a git tag everytime I merge to master. Then I will git checkout a previous tag and branch off of it then put fixes then deploy. Then that branch should be merged back to master. Correct?
04:09 pks_ joined #git
04:10 canoon oh sorry i meant to say we branch off the commit that's in production
04:11 zumba_addict yup, I was aware you where referring to production. When I also said build123 that got merged into master, it was also that point that got deployed to production
04:11 zumba_addict one sec, i'll create the repo real quick :D
04:16 cqi joined #git
04:16 zumba_addict I've created it. Now I'm going to create branch-fix to react my teammates merging to master :D  https://github.com/v1rt/learn-hotfix
04:16 alexggordon joined #git
04:18 zumba_addict I will accept this pull request now - https://github.com/v1rt/learn-hotfix/pull/1
04:18 cqi joined #git
04:19 SwiftMatt joined #git
04:20 cqi joined #git
04:21 zumba_addict I merged it then I checkout master then git pull. Then I git tag -a release1.0 then I ran git push origin release-1.0. It was successful
04:22 zumba_addict I see it - https://github.com/v1rt/learn-hotfix/tree/release-1.0
04:22 zumba_addict I'm going to make another feature but later I'll checkout release-1.0 to fix something. Hopefull it works
04:23 holodoc joined #git
04:25 MarioBranco joined #git
04:26 SwiftMatt joined #git
04:26 zumba_addict I guess, I'm doing good so far. I pushed another tag release-1.1 - http://imgur.com/a/ZQHf5
04:27 svm_invictvs joined #git
04:27 z8z joined #git
04:28 shgysk8zer0_ joined #git
04:28 zumba_addict Let's assume that release-1.0 had a bug which was caught after a week it got deployed. So am I right that I should git checkout release-1.0 && git checkout -b release-1.0-fix?
04:29 zumba_addict I got this after checking out release-1.0. Is this normal? https://pastebin.com/Vru7YrsL
04:30 SwiftMatt joined #git
04:31 aidalgol joined #git
04:33 zumba_addict anyways, i branch off of tag release-1.0 and then I pushed my updates - git push --set-upstream origin release-1.0-fix  The question now is, do I merge this back to tag release-1.0?
04:35 zumba_addict oh no, why is it pointing to master when I'm going to create a pull request? http://imgur.com/a/9Xahv
04:35 zumba_addict I don't want to merge it to master because it's a hotfix and master is being updated by other devs too
04:36 atomi joined #git
04:38 Murr joined #git
04:38 svm_invictvs joined #git
04:39 canoon zumba_addict, change the base / target?
04:39 zumba_addict the choices are only this
04:39 zumba_addict http://imgur.com/a/W4GeN
04:41 zumba_addict or did I miss a step? Should I have created a Release-Candidate-v1.0 branch?
04:41 canoon yeah you might need to create it first
04:41 axh joined #git
04:41 zumba_addict ok, I only git push tag
04:41 zumba_addict i'll try it. I'll scrap this last pull request. Thanks
04:43 zumba_addict I think I can now see the value as to why there should be a dedicated person that will handle this especially when git tagging and releasing
04:43 zumba_addict i think it's called maintainer?
04:43 zumba_addict or author
04:44 SwiftMatt joined #git
04:45 diogenese joined #git
04:45 zumba_addict I just did this - git push --set-upstream origin Release-Candidate-v1.0
04:45 zumba_addict do I git tag or should I go back to master now?
04:53 zumba_addict this is what I currently see now. master has the latest changes from bug-fix-jsexception. However, it's not deployed in production. Right now QA says, there is a bug in prod. So I'll git checkout Release-Candidate-v1.0 then branch off of it (git checkout -b Release-Candidate-v1.0-FIX)
04:55 vuoto joined #git
04:55 zumba_addict this is what I see now in github - v1rt wants to merge 1 commit into Release-Candidate-v1.0 from Release-Candidate-v1.0-FIX
04:55 zumba_addict not sure if you folks can see it - https://github.com/v1rt/learn-hotfix/pull/4
04:56 zumba_addict Ok, I've accepted the merge so branch Release-Candidate-v1.0 should have the fixes. Let me check it out and pull to confirm
04:57 zumba_addict yup it work. Release-Candidate-v1.0 has the fixes. I think at this point, I can redeploy to production. Correct? It's because this is the same branch I deployed previously
04:58 zumba_addict also thiago earlier said to merge back to master. Since Release-Candidate-v1.0 has the fixes, am I right that this is also the branch that should be merged back to master?
04:59 zumba_addict oh wow, check this out. Looks like my guess is correct - http://imgur.com/a/Doecw I can merge it back to master
05:01 finalbeta joined #git
05:02 zumba_addict It worked!
05:02 zumba_addict now I'm not sure when this pattern will not work
05:05 zumba_addict so looks like I really don't need to use git tag
05:06 Cabanossi joined #git
05:06 drodger joined #git
05:09 xall joined #git
05:16 cqi joined #git
05:26 Saint_Isadore joined #git
05:32 CheckDavid joined #git
05:33 alexandre9099 joined #git
05:45 SwiftMatt joined #git
05:46 portal__ joined #git
05:52 svm_invictvs joined #git
05:54 nilg joined #git
05:57 YuGiOhJCJ joined #git
05:59 fakenerd joined #git
06:00 sandev joined #git
06:00 JanC_ joined #git
06:13 alexggordon joined #git
06:14 freimatz joined #git
06:21 Cabanossi joined #git
06:23 shuffle2 joined #git
06:25 Anja joined #git
06:25 shuffle2 hi, i'm trying to write a credential helper
06:26 shuffle2 the target git server is using https and requires to POST username/password, then server will set http cookie, which git needs to use
06:26 shuffle2 is that possible?
06:26 shuffle2 the current server design redirects to a login page, and git seems to get confused by this
06:26 shuffle2 it never invokes my helper :(
06:27 ayogi joined #git
06:27 shuffle2 the redirect is on the same protocol + domain ...
06:28 ayogi joined #git
06:28 canoon shuffle2, i don't think that lets you do what you want
06:28 canoon i think you'd have to write your own remote for that
06:29 shuffle2 hmm, what do you mean
06:30 canoon i think the credential helper just allows you to store passwords etc doesn't actually let change how it authenticates
06:31 shuffle2 https://github.com/Microsoft/Git-Credential-Manager-for-Windows
06:31 shuffle2 seems to be doing something similar (does some extra http requests to get a token)
06:32 shuffle2 is there some verbose mode i can use to get git to dump traffic out?
06:32 shuffle2 then i can compare e.g. something using that helper and my own stuff
06:37 sim590 joined #git
06:38 kaldoran joined #git
06:41 safe joined #git
06:42 govg joined #git
06:43 shuffle2 perhaps a better question is: how can i change the server to require the least/easiest changes to clients
06:44 canoon shuffle2, can you not accept the user/password as basic auth?
06:45 shuffle2 the actual problem is that after the user/pass, i'm doing custom 2fa. so a token needs to be included with requests after auth is done
06:45 canoon ah
06:45 shuffle2 and i was also hoping i could reuse the existing config i'm using for cgit web interface
06:45 shuffle2 but if it has to change, i guess i will change it
06:46 canoon most people just use ssh keys can call that "two factor authentication" even though it isn't
06:46 shuffle2 i'm using U2F :)
06:47 shuffle2 (where "using" means it works in browsers but i need to make it work for git too :P)
06:48 canoon you might be able to make the credential helper and pass the token to git as the password
06:52 lavalamp joined #git
06:57 rokups joined #git
06:58 sbasso joined #git
06:58 ZyX-I joined #git
06:59 lowercaseman joined #git
07:04 RM982 joined #git
07:05 ToBeCloud joined #git
07:09 Saint_Isadore joined #git
07:11 YuGiOhJCJ joined #git
07:17 RM982 is 'git push' the proper command to copy my repo to dev to production server?
07:18 RM982 or git remote?
07:18 lordjancso joined #git
07:20 ki0 joined #git
07:21 Cabanossi joined #git
07:26 RM982 If I understand correctly the simpler way would be git clone form production server, but I cannot do it from there because dev is not publicly accessible
07:30 t0by joined #git
07:30 t0by joined #git
07:34 loskutak joined #git
07:35 noctu joined #git
07:36 sbasso joined #git
07:39 peacememories joined #git
07:40 zeroed joined #git
07:41 Sircle joined #git
07:41 RM982 anyone?
07:43 Sircle Is there a way by which I can make notes/comments on code lines (while I am reviewing it and find an issue), and then list those or let the dev know about it. Then also track if all the comments / code  had been resolved by the dev. Is there some kind of listing all my comments with current code state so I can approve/ reject a PR/MR? or any other ideas on how to do this?
07:47 Vampire0 joined #git
07:47 murii_ joined #git
07:51 armyriad joined #git
07:52 karols146 joined #git
07:53 LeMike joined #git
07:53 a_thakur joined #git
07:54 mrcrjs joined #git
07:59 axh_ joined #git
08:00 axh__ joined #git
08:02 axh__ joined #git
08:03 axh joined #git
08:04 axh_ joined #git
08:10 websurfer joined #git
08:11 stefano_ joined #git
08:12 zacts joined #git
08:14 alexggordon joined #git
08:16 dreiss joined #git
08:19 ntnn joined #git
08:20 Cabanossi joined #git
08:22 schleppel joined #git
08:28 henriknj joined #git
08:31 afuentes joined #git
08:37 cdown joined #git
08:37 ethali joined #git
08:47 sbasso joined #git
08:49 EDAKIRI joined #git
08:49 oghamb joined #git
08:56 murii_ joined #git
08:59 oleo joined #git
09:00 visual joined #git
09:00 visual joined #git
09:01 sbasso joined #git
09:04 r0ry joined #git
09:05 shinnya joined #git
09:05 Cabanossi joined #git
09:08 davimore joined #git
09:08 ethali joined #git
09:09 ethali_ joined #git
09:11 Xenophon1 joined #git
09:12 ethali joined #git
09:12 Introoter joined #git
09:14 Taikibansei joined #git
09:15 g0d355__ joined #git
09:15 Anja joined #git
09:16 xall joined #git
09:23 robattila256 joined #git
09:23 D4R5C0D3 joined #git
09:25 ethali_ joined #git
09:32 ethali joined #git
09:32 masuberu joined #git
09:35 robotroll joined #git
09:36 ispn joined #git
09:40 visual joined #git
09:40 visual joined #git
09:40 ayogi joined #git
09:46 slappymcfry joined #git
09:48 earnestea joined #git
09:50 codeone joined #git
09:54 sbasso joined #git
09:58 Anja joined #git
09:59 mar77i joined #git
10:06 aielima joined #git
10:07 schleppel joined #git
10:14 alexggordon joined #git
10:16 lordjancso joined #git
10:17 jstimm joined #git
10:20 P4nther joined #git
10:25 schleppel joined #git
10:30 netj joined #git
10:32 copy-on-write joined #git
10:34 kexmex joined #git
10:35 elsevero joined #git
10:40 copy-on-write left #git
10:45 karols146 "/aspell setdict en_US"
10:45 masuberu joined #git
10:46 karols146 \/aspell setdict en_US
10:46 Anja joined #git
10:46 karols146 /aspell setdict en_US
10:46 elsevero_ joined #git
10:48 karols146 aspell setdict en_US
10:54 kexmex joined #git
10:59 Anja joined #git
11:02 Anja joined #git
11:03 Tobbi joined #git
11:05 TikityTik joined #git
11:06 Cabanossi joined #git
11:07 karols146 joined #git
11:11 overlord_tm joined #git
11:13 karols146 joined #git
11:14 Anja joined #git
11:15 Anja joined #git
11:15 docmrc97 joined #git
11:15 JrCs joined #git
11:15 acetakwas joined #git
11:16 drodger joined #git
11:16 Anja joined #git
11:23 humbolt joined #git
11:24 kexmex joined #git
11:25 humbolt joined #git
11:25 humbolt Hi there
11:25 humbolt I have a submodule question.
11:26 humbolt I would like to add a submodule of an existing repo to my current project. I know how to do that. But is it possible, to not add the root of that submodule repo but a subdirectory of it?
11:29 basteh joined #git
11:29 basteh joined #git
11:33 Anja joined #git
11:34 alexandre9099 joined #git
11:34 thebope joined #git
11:34 Anja joined #git
11:36 karols146 left #git
11:36 pks joined #git
11:37 OliverJAsh joined #git
11:37 MattMaker joined #git
11:38 OliverJAsh If I rename a file and then make modification, is there any way to stage the rename and modifications separately? I want to use `git add --interactive` to select hunks, but the rename takes precedence.
11:39 karols146 joined #git
11:39 OliverJAsh I know I can commit after the rename and then commit again after modifications, then git add will show me hunks. But I always forget to do this.
11:42 XenophonF joined #git
11:44 karols146 / b 5
11:46 mar77i joined #git
11:46 m0viefreak joined #git
11:48 manuelschneid3r joined #git
11:48 Sircle joined #git
11:48 Sircle Is there a way by which I can make notes/comments on code lines (while I am reviewing it and find an issue), and then list those or let the dev know about it. Then also track if all the comments / code  had been resolved by the dev. Is there some kind of listing all my comments with current code state so I can approve/ reject a PR/MR? or any other ideas on how to do this?
11:48 avar humbolt: No, pointers to submodules inherently point to commits, and commits can only be made on the top-level tree (well, pedintically not, but ...)
11:48 cdown joined #git
11:49 avar humbolt: So you have two options basically, symlink to the dir you want after adding, or use some git-worktree trickery or whatever to check out a subdir
11:56 ZyX-I joined #git
12:00 Anja joined #git
12:02 Xenophon1 joined #git
12:03 schleppel joined #git
12:06 Cabanossi joined #git
12:07 synthroid joined #git
12:08 XenophonF joined #git
12:10 chipotle joined #git
12:11 sarri joined #git
12:11 sarri joined #git
12:12 Oatmeal joined #git
12:13 decoyrus joined #git
12:13 Anja joined #git
12:14 decoyrus left #git
12:15 alexggordon joined #git
12:16 synthroi_ joined #git
12:19 dem joined #git
12:20 variable joined #git
12:25 Starky joined #git
12:25 Starky joined #git
12:26 jozwior joined #git
12:27 alexggordon joined #git
12:31 mrcrjs joined #git
12:33 dem joined #git
12:33 a3Dman joined #git
12:36 Cabanossi joined #git
12:42 ski7777 joined #git
12:46 MrWoohoo joined #git
12:46 doener joined #git
12:51 a3Dman joined #git
12:51 a3Dman joined #git
12:53 chipotle joined #git
12:55 Acerific joined #git
12:58 mar77i joined #git
13:06 elsevero joined #git
13:06 peacememories joined #git
13:07 anddam joined #git
13:07 anddam hello
13:07 anddam I cloned a project from github, create a few branches locally and committed, forked the repo on github, set the --push for origin to my own repo
13:08 anddam now I'd like to push all local branches to origin, what's the proper syntax?
13:09 anddam aaand nvm, help push showed --all
13:09 ToBeCloud joined #git
13:10 phase2 joined #git
13:10 Hello71 in general you shouldn't update a remote url in such a way
13:10 Hello71 you should make a new remote for your repo
13:11 ok91 joined #git
13:12 anddam Hello71: I created a new "mine" and a new "upstream"
13:12 anddam but origin I wanted to keep mixed, pull from upstream, push to my own
13:12 anddam also I haven't got yet the what-s-tracking-what game of git
13:13 anddam so I figured the origin remote was already somehow well setup
13:13 anddam Hello71: tl;dr I didn't know better
13:14 Hello71 a remote is represented in git as a set of refs
13:14 Hello71 git branch -a
13:15 Oatmeal joined #git
13:16 anddam I see, the branches without   remote/name/ are local ones, right?
13:17 _ikke_ anddam: correct
13:17 anddam what's the deal with "trackign" is that something affecting pulling, pushing or pullshing?
13:18 anddam tracking*
13:18 anddam oh the other day someone suggested the Git Parable, now I have the time
13:18 anddam is that covered?
13:19 _ikke_ I think pro-git is better for the actual git concepts
13:19 _ikke_ anddam: tracking is information git stores in the configuration about wich local branch 'tracks' which remote branch
13:20 _ikke_ git status, git push, git pull and more can use that information
13:22 variable joined #git
13:23 mrcrjs joined #git
13:23 sz0 joined #git
13:24 gareppa joined #git
13:25 newbie_ joined #git
13:26 newbie_ left #git
13:27 gitnewb joined #git
13:27 gugah joined #git
13:33 gitnewb Hello, how to merge the changes of two branches into a third one?
13:34 ncthom91 joined #git
13:38 MattMaker joined #git
13:41 basiclaser joined #git
13:44 miczac joined #git
13:44 freimatz joined #git
13:45 _ikke_ gitnewb: one after the other
13:45 a3Dman_ joined #git
13:45 gitnewb hmm
13:45 gitnewb I guess I should explain what I'm doing first then
13:46 gitnewb I'm forking a project, and therefore made 3 branches - master (direct pull from origin), patches (my changes to the fork), merged (a mix of the two, to be released)
13:47 gitnewb Theoretically I could remove "merged" altogether, but my goal was that I could pull to master when it updates and keep my patches to merge
13:48 cjohnson your intention is to submit a PR?
13:48 gitnewb no, just keep doing my own fork with my patches
13:49 theiostream joined #git
13:49 cjohnson "to be released" though
13:49 gitnewb well, release my fork
13:49 cjohnson you have no intention of submitting back to upstream?
13:49 cjohnson gotchya
13:49 peacememories joined #git
13:49 cjohnson anyway, fork the repo, list the original as a second remote
13:49 cjohnson I call it "upstream"
13:49 cjohnson then you can occasionally do something like this
13:49 cjohnson git checkout master && git merge upstream/master
13:50 cjohnson to refresh your master from the original master
13:50 cjohnson then you can branch your dev branch off your master
13:50 cjohnson git remote add upstream https://original/repo
13:50 cjohnson to add it as a remote
13:51 Cabanossi joined #git
13:51 gitnewb Didn't it already do that when I forked? I'm using Bitbucket
13:51 cjohnson I'm not sure what bitbucket does when you fork
13:52 cjohnson I'm not sure if remotes are stored on a repo itself or if they are local only
13:52 cjohnson You can check with git remote -v
13:53 gitnewb hmm okay, looks like it doesn't do that then
13:53 cjohnson I believe remotes do not get stored/pushed with the repo itself and each person has to set up any remotes themselves. When you cloned your fork, clone set up the "origin" remote
13:53 cjohnson but nothing else
13:53 cjohnson so now you just add "upstream"
13:54 gitnewb okay, upstream added
13:54 cjohnson oh and also you would want to make sure you run "git fetch" before merging upstream to local
13:56 gitnewb Okay, what should I do next?
13:56 cjohnson git fetch will refresh your upstream, then you just merge upstream into local
13:57 cjohnson git merge upstream/master master
13:57 zt joined #git
13:57 monq joined #git
13:58 gitnewb That's already there, there are no updates to upstream for now
13:59 gugah joined #git
13:59 cjohnson cool then you are good to go, in the future as they release updates, that's how you can refresh
13:59 cjohnson then make sure you merge master into your dev branch once you get changes from them
14:00 cjohnson well, that's up to you. But I prefer to dev from the latest master
14:00 gitnewb Well, yeah, that's what I use my master branch for
14:01 gitnewb But so how can I merge my "patches" with the "master" as "merged"?
14:02 gitnewb so like "patches" is where I dev and "merged" is where I release
14:02 cjohnson you don't need a "merged"
14:02 cjohnson just merge your dev into your master
14:02 gitnewb oh okay
14:02 cjohnson your master will contain the upstream master with your changes applied over top
14:02 cjohnson then if you ever decide to do a PR you would just PR your master to their master
14:03 cjohnson or whatever their PR procedure is
14:03 gitnewb right, thanks
14:03 cjohnson np
14:03 gitnewb then I have another question, how can I develop in "patches" consistently
14:03 cjohnson what do you mean by that
14:04 gitnewb like I use my "patches" commits with "master" upstream commits simuntaniously in IDE
14:04 cjohnson still don't know what you mean exactly
14:05 miczac joined #git
14:05 gitnewb If I merged the "master" to "patches", I would lose the original commits of "patches"
14:05 gitnewb that's what I want to avoid
14:05 cjohnson why would you "lose" anything?
14:06 ankit01ojha joined #git
14:06 cjohnson that's not how merge works
14:06 gitnewb well I can't reapply the commits to newest upstream master, can I?
14:06 cjohnson For example if master has A B C D E   and then you make a branch called "patches" and add commit F, patches now has A B C D E F and master has A B C D E
14:06 cjohnson once you pull in changes from upstream into your master your master will have A B C D E G
14:07 cjohnson you can then merge master to patches and patches would have A B C D E F G
14:07 lavalamp joined #git
14:07 gitnewb What if the upstream master changes something that would affect my patches commits?
14:07 cjohnson Think of upstream like just another branch, it behaves like any other branch
14:08 cjohnson when you merge, if git can resolve it automatically, it will
14:08 cjohnson if not, you get a conflict, then you just fix the conflict
14:08 cjohnson !conflict
14:08 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
14:10 jameser joined #git
14:11 gitnewb okay, let me explain this differently
14:11 gitnewb if I have for example 5 deleted files in patches, and I pull from upstream that has the 5 files, won't they be readded to my patches branch?
14:12 mentor joined #git
14:12 mentor joined #git
14:12 cjohnson git merges are smarter than that, they don't just take two current-working-copies and merge them
14:12 cjohnson they merge the commits themselves
14:13 cjohnson if your local branch doesn't include any commits that modify those 5 deleted files, then the merge will happen just fine
14:13 cjohnson if your branch does modify one of those deleted files, you would just get a conflict
14:14 cjohnson and then you would do what makes sense, either deleting the file or re-adding it, depending on which branch's changes make more sense
14:15 synthroid joined #git
14:15 govg joined #git
14:15 gitnewb Alright, I hope things work out as I expect then. Thanks for the help!
14:15 SwiftMatt joined #git
14:15 cjohnson np
14:16 cjohnson gitnewb: if you aren't sure about how things work I highly reocmmend setting up some test repos to try things out
14:16 cjohnson mkdir /tmp/upstream && cd /tmp/upstream && git init
14:16 cjohnson git clone /tmp/upstream /tmp/origin
14:16 cjohnson Now you've got an upstream and an origin, and you can push and pull
14:17 cjohnson make your changes in the upstream dir, switch to the origin dir, run the fetch && merge command I gave above
14:17 armin joined #git
14:17 cjohnson something like that
14:20 freddy_ joined #git
14:20 jameser joined #git
14:29 alexandre9099 joined #git
14:33 Acerific joined #git
14:33 Acerific joined #git
14:34 ResidentBiscuit joined #git
14:34 cdown_ joined #git
14:35 peacememories joined #git
14:37 a3Dman joined #git
14:39 MattMaker joined #git
14:42 Tobbi joined #git
14:44 YuGiOhJCJ joined #git
14:50 xall joined #git
14:52 sunri5e joined #git
14:52 noobineer joined #git
14:52 juandpineiro joined #git
14:56 Khisanth joined #git
14:58 JanC_ joined #git
14:59 daynaskully joined #git
15:07 kent\n joined #git
15:08 synthroi_ joined #git
15:10 _Ana_ joined #git
15:11 kexmex joined #git
15:15 a3Dman joined #git
15:16 kexmex joined #git
15:16 thebope joined #git
15:19 drodger joined #git
15:20 dirtyroshi joined #git
15:21 Cabanossi joined #git
15:25 dreiss joined #git
15:28 Tobbi joined #git
15:28 sunri5e joined #git
15:31 durham joined #git
15:33 alexandre9099 joined #git
15:33 durham joined #git
15:33 ResidentBiscuit joined #git
15:38 texasmynsted joined #git
15:39 weylin joined #git
15:40 MattMaker joined #git
15:41 peacememories joined #git
15:42 areyoureddy joined #git
15:43 blackwind_123 joined #git
15:44 weylin joined #git
15:44 Tobbi joined #git
15:44 VagabondAzulien joined #git
15:44 bartosz_ joined #git
15:52 xall joined #git
15:53 TikityTik how can i see how many additions/deletions i have on my current work without commiting?
15:53 theoceaniscool joined #git
15:53 watabou joined #git
15:55 yushyin TikityTik: git diff --shortstat?
15:56 areyoureddy_ joined #git
15:57 ayjay_t joined #git
15:58 TikityTik yes
15:58 masuberu joined #git
15:58 garyserj joined #git
16:02 jimklo joined #git
16:05 miczac joined #git
16:05 alexandre9099 joined #git
16:06 Cabanossi joined #git
16:08 boombatower joined #git
16:09 Gustavo6046 joined #git
16:11 vuoto joined #git
16:11 sunri5e joined #git
16:11 areyoureddy joined #git
16:12 lacour joined #git
16:12 Johnwalker247 joined #git
16:12 areyoureddy joined #git
16:13 xall joined #git
16:14 peacememories joined #git
16:14 areyoureddy joined #git
16:16 areyoureddy joined #git
16:17 sunri5e joined #git
16:18 miczac joined #git
16:19 courrier joined #git
16:20 dsdeiz joined #git
16:20 dsdeiz joined #git
16:21 miczac joined #git
16:22 Vampire0_ joined #git
16:22 thiago joined #git
16:22 gugah joined #git
16:22 gugah joined #git
16:23 miczac joined #git
16:27 miczac joined #git
16:28 vuoto joined #git
16:32 vuoto joined #git
16:32 peacememories joined #git
16:32 ToBeCloud joined #git
16:33 satifant joined #git
16:35 portal__ joined #git
16:35 miczac joined #git
16:37 miczac joined #git
16:37 alexandre9099_ joined #git
16:38 SwoleGymBro joined #git
16:39 jimklo joined #git
16:40 hotpancakes joined #git
16:41 MattMaker joined #git
16:41 miczac joined #git
16:41 kontinuity joined #git
16:42 hotpancakes Hi people. I installed the asdf language version manager (https://github.com/asdf-vm/asdf) via git. It's a command line tool, but it doesn't offer a command to update itself. How can I use git to update this tool?
16:43 Goplat joined #git
16:43 portal_ joined #git
16:44 jimklo joined #git
16:44 hotpancakes Wait, nevermind!
16:45 zumba_addict joined #git
16:46 zumba_addict Morning folks. Am I right that it's ok to encounter conflicts when merging back hotfix to master?
16:46 _ikke_ zumba_addict: correct
16:46 zumba_addict cool. Thanks
16:46 _ikke_ if someone updates a line in master that the hotfix also touched, then it's a conflict
16:46 zumba_addict got it
16:47 jimklo_ joined #git
16:47 zumba_addict I'm not sure if you saw what I wrote last night. I created a hotfix of release-candidate-1.0 but there is already a commit ahead of it. That newer commit won't get lost right if I merge back a hotfix?
16:48 zumba_addict I remember checking the file last night on the newer commit, it was still there
16:48 zumba_addict so I think my hotfix solution will work for all of us
16:49 _ikke_ No, that commit won't be lost, that's what merging does
16:50 jimklo joined #git
16:54 jimklo joined #git
16:56 juvenal joined #git
16:57 nd_ joined #git
16:59 jml1017 joined #git
17:00 theiostream joined #git
17:01 ayjay_t joined #git
17:04 diogenese joined #git
17:06 Cabanossi joined #git
17:06 chipotle joined #git
17:09 zumba_addict cool
17:09 dave0x6d joined #git
17:10 zumba_addict is there anything for us to worry about? I remember boss is saying we might lose history
17:11 zumba_addict I don't think history will be lost since it's a merge
17:11 YuGiOhJCJ joined #git
17:12 zumba_addict I remember he said I shouldn't use -f but at that time we weren't talking about hotfixes
17:12 _ikke_ zumba_addict: with -f I assume that is git push -f
17:12 zumba_addict I couldn't remember the context/topic anymore when I said -f
17:12 zumba_addict yes, it is
17:12 _ikke_ That only applied when you are rewriting history
17:12 _ikke_ which merging is nt
17:12 _ikke_ not
17:12 _ikke_ git rebase, git reset, git commit --amend among others rewrite history
17:13 zumba_addict got it. Is he correct that using -f will affect history?
17:13 zumba_addict oh
17:13 _ikke_ it will overwrite remote history
17:14 zumba_addict I'll have to read more about history since I'm still confused about it. Right now when I hear history, it's the data we see when we run `git log`. So I'm thinking all those logs we see will be rewritten. Am I right?
17:14 adgtl- left #git
17:15 _ikke_ zumba_addict: the rewriting is done locally, with commands like git rebase
17:15 zumba_addict ok
17:15 _ikke_ what that means is that you change some thing along those commits, causing all following commit hashes to change
17:16 _ikke_ What you did is basically created an 'alternate' history
17:16 _ikke_ while the remote might still have the original history if you had pushed those commits
17:16 chipotle joined #git
17:18 madewokherd joined #git
17:19 juvenal joined #git
17:23 Han joined #git
17:23 chipotle joined #git
17:25 peacememories joined #git
17:26 raijin joined #git
17:26 synthroid joined #git
17:31 Starky joined #git
17:35 netj joined #git
17:35 Cabanossi joined #git
17:37 memori joined #git
17:37 memori joined #git
17:41 MattMaker joined #git
17:44 LeBlaaanc joined #git
17:47 sunri5e joined #git
17:47 portal_ joined #git
17:48 elsevero joined #git
17:52 Guest55 joined #git
17:52 jason237 joined #git
17:53 paul424 joined #git
17:55 bannakaffalatta joined #git
17:56 adgtl- joined #git
17:57 Cabanossi joined #git
17:59 bgerber joined #git
18:00 Han I just had two bad commits, How do I get rid of them? % git reset --hard 8bd67af8ed4dcad
18:00 Han HEAD is now at 8bd67af autoyast: Add support for static networking
18:01 Han So the log shows what I want to see, I want to push those changes to github
18:01 Han And that's not happening.
18:02 NoOutlet joined #git
18:03 mentor joined #git
18:03 mentor joined #git
18:04 selckin why not
18:05 Han Ah! push -f !
18:05 selckin rubber duck waves
18:06 _ikke_ use at least --force-with-lease
18:06 Han too late
18:07 tnecniv joined #git
18:07 _ikke_ Use it next time :-)
18:07 texasmynsted left #git
18:07 Han Hope I'll remember :-)
18:09 _ikke_ It's to prevent you from overwriting someone else's commits
18:09 bgerber joined #git
18:10 jimklo joined #git
18:11 Han uh, thanks for the tip.
18:12 TbobbyZ joined #git
18:12 ertesx joined #git
18:16 axh joined #git
18:17 orbyt_ joined #git
18:18 durham joined #git
18:26 safe joined #git
18:27 zumba_addict sorry, someone came over. so _ikke_, so as much as possible never do -f
18:27 Rr4sT joined #git
18:27 zumba_addict unless we're doing it to our squash or fixbranches
18:32 navidr joined #git
18:33 peacememories joined #git
18:34 kontinuity joined #git
18:37 TbobbyZ joined #git
18:38 TbobbyZ joined #git
18:38 Han mosterd na de maaltijd
18:38 TbobbyZ joined #git
18:39 Han left #git
18:40 TbobbyZ joined #git
18:42 MattMaker joined #git
18:44 aielima joined #git
18:46 Cabanossi joined #git
18:49 trewe joined #git
18:52 netj joined #git
18:52 synthroi_ joined #git
18:55 blunaxela joined #git
18:56 loskutak joined #git
18:57 Tobbi joined #git
19:07 juvenal joined #git
19:07 maarhart joined #git
19:10 inflames joined #git
19:15 karols146 joined #git
19:16 zeroed joined #git
19:16 zeroed joined #git
19:20 scottjl joined #git
19:20 ali1234 joined #git
19:22 shinenelson joined #git
19:26 Atm0spher1c joined #git
19:28 Darren_ joined #git
19:29 TbobbyZ joined #git
19:30 hexa- joined #git
19:30 jgrasser joined #git
19:31 jgrasser joined #git
19:32 theoceaniscool joined #git
19:37 AlineGomes joined #git
19:40 jeffreylevesque joined #git
19:41 acetakwas joined #git
19:42 dsdeiz joined #git
19:42 dsdeiz joined #git
19:42 AlineGomes joined #git
19:43 MattMaker joined #git
19:46 schleppel joined #git
19:46 karols146 joined #git
19:47 axh joined #git
19:50 XenophonF joined #git
19:54 freimatz joined #git
19:54 atomi joined #git
19:59 svm_invictvs joined #git
20:02 synthroid joined #git
20:05 raijin joined #git
20:07 juvenal joined #git
20:07 LeBlaaanc joined #git
20:08 loskutak joined #git
20:09 bartosz_ joined #git
20:09 schleppel joined #git
20:11 memori joined #git
20:11 memori joined #git
20:12 maarhart joined #git
20:13 courrier joined #git
20:14 netj joined #git
20:17 snowalpaca joined #git
20:20 Seveas net op tijd voor de kroket als dessert :-)
20:20 anddam left #git
20:22 tnecniv joined #git
20:24 juvenal joined #git
20:24 _ikke_ :D
20:25 Acerific joined #git
20:25 Acerific joined #git
20:25 _ikke_ No I want a kroket
20:25 _ikke_ now*
20:26 frobnic something something Oude Jenever
20:27 Seveas Me too. Need something to drown in the last Wintervrunds I've been drinking :)
20:27 Seveas we're halfway through spring and I still have 2 winterbeers left.
20:28 Seveas (was 4 a few hours ago)
20:28 brk_ joined #git
20:30 elsevero joined #git
20:31 sunrunner20 joined #git
20:31 Cabanossi joined #git
20:34 ResidentBiscuit joined #git
20:38 vuoto joined #git
20:40 boboc joined #git
20:40 vuoto joined #git
20:41 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Git pages at jk.gs offline due to domain glitch, hopefully to be fixed on Monday | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
20:42 LeBlaaanc joined #git
20:43 VladGh joined #git
20:44 MattMaker joined #git
20:48 netj joined #git
20:48 LeBlaaanc joined #git
20:49 drodger joined #git
20:51 pbrewczynski_ joined #git
20:52 LeBlaaanc joined #git
20:53 oldschool^ joined #git
20:54 MrRicecake joined #git
20:56 _ikke_ jast: what happened?
20:58 kexmex joined #git
21:07 theiostream joined #git
21:08 elsevero joined #git
21:08 MattMaker joined #git
21:09 portal_ joined #git
21:12 netj joined #git
21:15 jast _ikke_: my domain registrar does all billing on a prepaid model and all of the reminder mails for this year's renewal got lost in my spam filter. basically the domain is now in a "can't renew, can't transfer, can't edit, can't anything" state and I have to wait for it to move on to the next state so I can maybe spend extra money to restore it. or it'll lapse and someone else will grab it.
21:15 drodger joined #git
21:16 jast I noticed the problem about 15 hours after the domain went into its current /dev/null state
21:16 jast for additional insult, the officialy listed expire time is actually still in the future
21:19 Ph_ joined #git
21:20 jast if it doesn't work out I'll cry... and set up a new domain for all the git stuff
21:21 MattMaker joined #git
21:22 itouchkids joined #git
21:24 dreiss joined #git
21:24 brk__ joined #git
21:26 robotrolll joined #git
21:26 Random832 joined #git
21:27 mattcen joined #git
21:30 _ikke_ jast: ug :-(\
21:31 _ikke_ funny, my browser still has it cached apparently
21:31 _ikke_ though, I get a 404 back
21:31 Ph_ joined #git
21:32 portal_ joined #git
21:32 jast I no longer get any DNS
21:32 _ikke_ oh, something funny is going on
21:33 _ikke_ something is resolving it to my own server
21:34 Ph_ joined #git
21:34 _ikke_ search domain
21:35 ninjaaron joined #git
21:35 MattMaker joined #git
21:35 ninjaaron I just had a weird idea...
21:36 ninjaaron what if I did git init in my root directory?
21:36 mentor joined #git
21:37 loskutak joined #git
21:37 ninjaaron could I, like, do filesystem snapshots with this?
21:37 jast by default git doesn't transcend filesystem boundaries, so if (for instance) you have a different partition mounted as /home, being in there won't go up far enough to find the repo root
21:37 jast also, no, don't do that :P
21:37 ninjaaron ok
21:37 jast use a backup tool like borg which is smarter about backing up large files, too
21:37 ninjaaron It just occured to me.
21:37 ninjaaron I use btrfs, so I get cheap snapshots already.
21:38 ninjaaron I mean, locally.
21:39 jast yeah, and btrfs will be a lot faster than git because it won't have to scan the entire hierarchy :)
21:40 Anja joined #git
21:41 ninjaaron but just in theory, since git doesn't transent fs boundries, could I have a .git in / for system snapshots
21:41 ninjaaron ?
21:42 ninjaaron and theoretically another in /home for user data?
21:42 ninjaaron or is that just crazy?
21:42 TbobbyZ joined #git
21:42 jast it's possible but that doesn't mean it's not crazy ;)
21:43 ninjaaron Interesting.
21:43 jagob joined #git
21:43 TbobbyZ joined #git
21:43 ninjaaron I guess I'm not the first person to think of this, so perhaps I will read things on the internet about this.
21:43 jast for instance, if you turn /home into a huge repo, any existing git repos inside there will be treated in unexpected ways, and you'll have a really hard time adding those to the repo at the /home level
21:43 jast one thing I can say is that Git is not optimized for that kind of thing
21:44 TbobbyZ joined #git
21:44 ninjaaron jast: yes, I heard what happend to facebook when they tried to pull huge numbers of files in.
21:44 TbobbyZ joined #git
21:45 LeBlaaanc joined #git
21:45 TbobbyZ joined #git
21:46 Ph_ joined #git
21:46 TbobbyZ joined #git
21:46 ninjaaron jast: I suspose I could make git repos in /home into submodules.
21:46 Cabanossi joined #git
21:46 ninjaaron but they are already backed up to github anyway, so it's not really something that needs to be added.
21:47 TbobbyZ joined #git
21:47 wcpan joined #git
21:47 ninjaaron anyway, thanks for entertaining my crazy hypothetical.
21:47 ninjaaron I will happily continue using btrfs.
21:48 TbobbyZ joined #git
21:48 Ph_ joined #git
21:48 TbobbyZ joined #git
21:49 TbobbyZ joined #git
21:51 jast one other thing to keep in mind is that git doesn't track full filesystem permissions and ownerships and such, and (AFAIK) can't store device nodes and stuff like that, either
21:51 brk joined #git
21:57 Anja joined #git
22:01 rominronin joined #git
22:05 dirtyroshi_ joined #git
22:09 ninjaaron jast: interesting. I'm 100% sure it tracks the executable bit, but I don't know what it does otherwise.
22:14 _ikke_ only the executable bit
22:15 _ikke_ (666 or 777 with umask)
22:17 maarhart joined #git
22:20 thiago joined #git
22:21 immae joined #git
22:21 Gustavo6046_ joined #git
22:25 myhau joined #git
22:27 acetakwas joined #git
22:29 slappymcfry joined #git
22:35 alexandre9099 joined #git
22:35 ZyX-I joined #git
22:45 davimore joined #git
22:47 Random832 joined #git
22:50 t0by joined #git
22:50 t0by joined #git
22:53 juvenal joined #git
22:58 snowalpaca joined #git
23:00 mentazoom joined #git
23:01 jargonjunkie joined #git
23:04 monq joined #git
23:05 Gustavo6046 joined #git
23:06 alexandre9099 joined #git
23:08 porfiriopaiz joined #git
23:08 juvenal joined #git
23:09 maarhart joined #git
23:09 theiostream joined #git
23:11 hseg joined #git
23:12 hseg Hi, I got the message "refs/remotes/origin/HEAD has become dangling!" from git remote prune.  A) What does it mean and B) given that on origin, master is checked out, shouldn't origin/HEAD point to origin/master?
23:13 hseg This does not get fixed by a git fetch.
23:15 hseg When I check .git/refs/remotes/origin/HEAD, I see it still contains the original branch, even though the remote has chosen another branch since.
23:18 gesh joined #git
23:25 hseg OK, I've figured it out - when what my local machine thought was remote's HEAD gets deleted, my local HEAD doesn't get updated.
23:25 LeBlaaanc joined #git
23:25 hseg To fix this, one must run git remote set-head
23:26 hseg However, this doesn't get suggested by git remote prune when it notices that HEAD is dangling.
23:26 hseg This looks like a wart.
23:27 Hello71 I think origin/HEAD is only used to get the default branch on clone
23:27 monq_ joined #git
23:27 hseg And for the default branch (e.g. when pushing to origin, you actually push to origin/HEAD)
23:27 Anja joined #git
23:28 hseg I agree that this is usually unimportant
23:29 hseg However, when git complains to me that something is dangling, it's usually bad news.
23:30 zumba_addict joined #git
23:31 Svecify joined #git
23:32 Svecify How can I undo some commits before they are even pushed to the repo?
23:33 hseg Eh. As I said, it's a wart, not a bug.
23:36 XenophonF joined #git
23:38 Murii_ joined #git
23:42 juvenal joined #git
23:42 peepsalot joined #git
23:46 chipotle joined #git
23:47 Cabanossi joined #git
23:51 TbobbyZ joined #git
23:52 hugdru joined #git
23:57 boombatower joined #git
23:58 ShapeShifter499 joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary