Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-21

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

All times shown according to UTC.

Time Nick Message
00:00 memfrob (btw in case anyone is interested, there's a lot of new kernel security features in 4.8 and 4.9 which I'd like to have in LTS kernels as others do too)
00:00 lyxus joined #git
00:00 heftig joined #git
00:02 memfrob Now obviously I could git cherry pick those 6 in that example and fix all conflicts between each patch but in other branches, people would update their trees and sync with the latest kernel source at that time and continue their work off the new kernel release.
00:02 phox memfrob: our server is set up to preserve history, so you can't delete and commit -f
00:03 phox memfrob: given the kind of production environment this is this is totally unsurprising ;)
00:04 memfrob also git cherry pick doesn't report where the conflicts are, I need to run git commit -as and scroll down to see where the conflicts were, or run "git grep <<<<"
00:04 jimi_ joined #git
00:04 memfrob so it's a lot more work and I'm already giving myself a lot here taking on such a task.
00:05 memfrob phox, so the worst you have is a commit that says "revert commit blah blah" and in the message it says "oops" :p
00:06 phox memfrob: the change isn't a problem, it just has a weird graph edge because I accidentally picked up a commit I shouldn't have, then rebased -after- pushing so now it points to something I merged from in order to clean up what I'd ingested
00:07 phox if it was a straight line with an extra node that would be cool, but it's the merge that makes it look weird
00:07 memfrob contact a server admin if it's that big a deal?
00:07 phox it was only like 20-30LOC, I should have just circumvented the VCS to avoid that :D
00:07 phox it's just embarrassing ;)
00:08 memfrob why doesn't git cherry pick tell you where the conflicts where in stdout? :/
00:08 memfrob *were
00:08 preaction because it leaves conflict markers in the file
00:09 memfrob which it then leaves me so I can git grep the tree?
00:09 preaction it tells you what files conflict. otherwise, use git status to see what's still in conflict
00:11 memfrob preaction, do you like it better when you have to run git status or when it tells you right off the bat where something went wrong?
00:11 magicturtle joined #git
00:11 preaction is that a real question?
00:12 memfrob In my opinion one just wastes more time is all. :/
00:12 memfrob I didn't mean to offend you.
00:12 adymitruk I always just do ag >>>>
00:12 chachasmooth joined #git
00:12 memfrob ag?
00:12 adymitruk silversearcher-ag
00:12 adymitruk faster than grep and nicer
00:12 adymitruk also beyond compare
00:13 memfrob I have noticed that grep works kinda slow..
00:13 bremner git mergetool finds all the conflicts
00:13 memfrob vim's search tool is instant. must be pointless CPU cycles that grep gets caught up in?
00:13 NimeshNeema joined #git
00:14 rivarun joined #git
00:15 memfrob Heh I just tried git mergetool and get The merge tool bc is not available as 'bcompare'
00:16 preaction well, git can't help you with that
00:16 preaction and which vim search tool? :grep uses, well, grep by default
00:16 hexa- joined #git
00:16 memfrob vim then /
00:17 preaction which searches only in the current buffer, which is all in memory, which is why it's fast
00:17 memfrob XDD
00:17 swalladge joined #git
00:18 preaction and iirc you can configure vim to be a mergetool, but i've only tried once and forgot how
00:19 tobiasvl vimdiff
00:20 timvisher joined #git
00:22 memfrob I'm interested to see if adymitruk can figure this out.. How long you been using git for?
00:22 memfrob btw guys, meld works
00:22 memfrob (the only thing I could install quickly and launch on this temp debian system)
00:23 bremner for whatever reason I prefer kdiff3 to meld, but *shrug*
00:23 adymitruk I've been using git since 07
00:23 chachasmooth joined #git
00:23 Cavallari joined #git
00:25 FilipNortic joined #git
00:25 chachasmooth_ joined #git
00:28 cosmicfires joined #git
00:28 cosmicfires how do I tell git to replace one file in the local set with the version from HEAD?
00:28 adymitruk git reset
00:28 bremner git checkout HEAD foo
00:29 cosmicfires thanks bremner
00:29 memfrob git reset will replace more than just one file! be careful with that!
00:29 memfrob or maybe that's because I'm always using --hard
00:29 adymitruk git reset --
00:29 adymitruk git reset -- path/to/your/file
00:29 cosmicfires yeah I got a bad feeling about that since it didn't name the file I want replaced
00:29 YuGiOhJCJ joined #git
00:30 memfrob XD
00:30 adymitruk git reset --hard -- path/to/your/file
00:30 memfrob I like this channel, I should come here more often
00:30 stickperson joined #git
00:30 adymitruk one of my standard channels in weechat. I also link all slacks and gitters inthere
00:30 adymitruk in there
00:31 memfrob I'll credit you on the project adymitruk, this means a lot.
00:32 roelmonnens joined #git
00:32 lolmac joined #git
00:32 davimore joined #git
00:32 memfrob Helping me rebase thousands of lines of code with some fancy git tricks, you're a life saver.
00:33 chachasmooth joined #git
00:35 lolmac joined #git
00:36 mizu_no_oto joined #git
00:37 jimi_ joined #git
00:38 lolmac joined #git
00:38 memfrob In case git doesn't work this way, is there a way to git cherry-pick several commits at once and let me solve all the commits after everything has been attempted to be merged?
00:40 memfrob Just so that way I'm not going back into the same file again let's say 10 times to fix commits which I could have only done in one pass.
00:40 adymitruk memfrob: can you list me the commits you want again
00:40 adymitruk and then where exacly you want them to go?
00:40 bremner memfrob: you could squash the commits first.
00:41 adymitruk memfrob: do you have a fork of this on github?
00:41 Darren_ joined #git
00:41 ramsub07 joined #git
00:41 dsdeiz joined #git
00:42 adymitruk if so, can you add me as a contributor so I can push?
00:43 memfrob Yeah sure! One moment.
00:44 frobnic joined #git
00:47 BackEndCoder joined #git
00:48 safe joined #git
00:49 soilder joined #git
00:50 memfrob https://github.com/NTULINUX/kern​el-patches/tree/master/backports
00:50 davimore_ joined #git
00:50 memfrob it's empty right now, do you want me to upload 4.4 vanilla to it?
00:51 memfrob I just started working on this today.
00:56 brent__ joined #git
00:56 timvisher joined #git
00:57 memfrob I finally have the time now.
00:58 phox left #git
00:59 raedah left #git
00:59 adymitruk no.. I've cloned the original already
00:59 memfrob Ok!
01:00 adymitruk I'm going to zap everytihng that's in it, is that ok?
01:00 adymitruk I was thinking you were going to share a fork of the kernel
01:01 adymitruk but this is ok. I'll just push over this
01:01 davimore__ joined #git
01:01 memfrob Don't kill my LTO folder :P I was actually planning on hosting a patch set there but this method works too!
01:01 chipotle joined #git
01:02 adymitruk what I was expecting was a clone. You should not be dealing with uploading anything
01:02 adymitruk is there a github mirror?
01:02 adymitruk what I'll do is create a maste-backup branch off the one you have there
01:03 adymitruk I'll blast away master with the real repo
01:03 adymitruk I'll apply your commits on top of a branch starting at 4.4 tag
01:03 adymitruk would that work?
01:03 memfrob The idea is to support other kernels though not just 4.4 that's why I have a backports folder
01:04 memfrob So 4.4 folder is a mirror or 4.4 etc
01:04 adymitruk well, it's easier to deal with this not via folders
01:04 adymitruk but via branches
01:04 jimi_ joined #git
01:04 memfrob alright thats fine!
01:05 adymitruk you can generate patches as you wish
01:05 memfrob Sweeeeet
01:05 adymitruk but walking history should be easy to see what you changed where, how conflicts were resolved, etc
01:08 menip joined #git
01:08 memfrob Now when you do this though, so I can duplicate the steps and build on it for other releases (i.e. backport other branches against other kernels) will I see your steps?
01:09 DolphinDream joined #git
01:09 MadLamb joined #git
01:10 memfrob I have to head out for a bit, I'll be back later. Thank you again for everything!
01:10 cosmicfires joined #git
01:10 mikecmpbll joined #git
01:12 adymitruk yup
01:12 iampigman joined #git
01:12 pity joined #git
01:15 davimore joined #git
01:15 denete joined #git
01:16 denete joined #git
01:17 cosmicfires left #git
01:17 durham_ joined #git
01:17 mki left #git
01:18 Derperperd joined #git
01:18 Gloomy joined #git
01:22 ome joined #git
01:24 chachasmooth joined #git
01:24 justanotheruser joined #git
01:26 thiago joined #git
01:30 timvisher joined #git
01:32 Nilesh_ joined #git
01:33 fuzzybear joined #git
01:37 pur3eval joined #git
01:40 EliasH joined #git
01:40 spacelord_ joined #git
01:42 mentazoom joined #git
01:42 jgarr left #git
01:46 durham joined #git
01:48 durham joined #git
01:49 raspado joined #git
01:52 jameser joined #git
01:55 hahuang61 joined #git
01:58 ikelso joined #git
01:59 Darren_ joined #git
02:00 einnjo joined #git
02:00 Shentino joined #git
02:01 arescorpio joined #git
02:03 FilipNortic joined #git
02:04 eizua joined #git
02:08 jameser joined #git
02:10 timvisher joined #git
02:11 Sasazuka_ joined #git
02:11 memleak joined #git
02:12 mizu_no_oto joined #git
02:13 DolphinDream joined #git
02:13 aw1 joined #git
02:14 brent__ joined #git
02:15 mehola joined #git
02:16 brent___ joined #git
02:17 brent____ joined #git
02:19 druonysus_ joined #git
02:19 Derperperd joined #git
02:20 Shentino joined #git
02:20 Gloomy joined #git
02:24 brent__ joined #git
02:26 FilipNortic joined #git
02:31 finalbeta joined #git
02:32 d^sh joined #git
02:34 pks joined #git
02:37 jaggz uhm
02:37 jameser joined #git
02:37 jaggz how do I check my current files against my next pull?
02:37 jaggz I know there are changes about to come in, but I want to see them first
02:38 jaggz git fetch master; git diff origin/master  # ?
02:39 rewt git fetch ; git diff origin/master
02:40 jaggz and how's git fetch work?  it just gets all the info but doesn't touch the local files?
02:40 _geoff joined #git
02:40 jaggz I mean.. my filetree.. it obviously gets the information into the .git files
02:40 voldz1tic3n joined #git
02:40 rewt it fetches all commits/etc from remote that you don't already have locally
02:41 rewt and updates remote branch pointers
02:41 rewt doesn't touch your working tree
02:42 jaggz hmm... git diff origin/master didn't show any differences
02:42 rewt does `git status` say you're up to date?
02:46 jaggz yeah
02:46 jaggz :/
02:46 rewt then pull wouldn't do anything more than fetch
02:46 jaggz I just pushed changes from another system..
02:46 rewt since pull is just fetch+merge
02:46 jaggz to the repo.. weird
02:46 rewt was that in master branch?
02:46 rewt are you in master branch locally?
02:46 jaggz maybe I didn't do it right.. I probably didn't commit -a
02:46 rewt that -a only adds files; not needed if you `git add` them
02:46 timvisher joined #git
02:46 gdct joined #git
02:46 jaggz yeah I didn't.. just wanted them all
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:50 duderonomy joined #git
02:51 SenpaiSilver joined #git
02:53 stick-sh_ joined #git
02:54 lyxus joined #git
02:54 SenpaiSilver joined #git
02:56 menip joined #git
02:57 Vampire0 joined #git
02:59 zacts joined #git
03:01 miklcct joined #git
03:03 gugah joined #git
03:06 voldz1tic3n joined #git
03:06 dirtyroshi joined #git
03:07 FilipNortic joined #git
03:08 jameser joined #git
03:09 chachasmooth joined #git
03:12 chipotle joined #git
03:12 hexagoxel joined #git
03:14 sunri5e joined #git
03:14 aidalgol joined #git
03:15 afuentes joined #git
03:15 jeffreylevesque joined #git
03:16 gugah joined #git
03:18 Vortex34 joined #git
03:20 Derperperd joined #git
03:23 timvisher joined #git
03:23 einnjo joined #git
03:24 memleak im back!
03:25 memleak is my friend adymitruk ahrewnd?
03:26 ertes joined #git
03:26 memleak aww i wish i was here to answer jaggz's question! i knew the answer!
03:26 memleak Does anyone need help?
03:28 memleak I want to be clear that I am not a leech and am willing to assist anyone who has a question of which I know the answer to.
03:33 pks joined #git
03:33 YourTheBombNow23 joined #git
03:34 dsdeiz joined #git
03:34 fstd_ joined #git
03:37 ShalokShalom_ joined #git
03:37 JanC_ joined #git
03:37 gigq joined #git
03:43 nivag joined #git
03:45 Goplat joined #git
03:45 adymitruk memleak: hey.. was away for a bit. can look again now
03:48 Darren_ joined #git
03:50 govg joined #git
03:51 Lyqyd joined #git
03:51 dreiss joined #git
03:55 drbean joined #git
03:56 pity joined #git
03:58 jaggz memleak, what does it mean to "know your true self?"
03:59 ikelso joined #git
04:03 memleak jaggz i think it means to recognize yourself, both your good and bad side, relatively speaking.
04:04 memleak self wisdom philosophical stuff. i don't follow that really. not much of a philosophy type of guy. that's my true self lol
04:04 jaggz I think there's a practical side to it
04:04 jaggz but thanks :)
04:04 l4v2 joined #git
04:04 memleak to know how practical you are in the majority of situations/
04:05 memleak and how well you can practice practicality
04:05 jaggz no.. to being aware of yourself and its needs, to focus ones efforts and attentions in life
04:06 memleak see thats that super deep shakespear stuff i never got. the way i see it is.. meat keeps me alive. that's what i need. but clearly you're not referring to steak.
04:06 jaggz heh.. it's all off topic for this channel anyway
04:06 memleak as far as attentions in life go.. i pay close attention to how my steak is cooked. and you're right, sorry.
04:07 jaggz np.. I started it
04:07 Guest9 joined #git
04:07 Guest9 joined #git
04:13 timvisher joined #git
04:14 AKPWD joined #git
04:14 memleak adymitruk, as far as the git work goes how complicated is this? if it's more work to battle the inner workings of git than it is to cherry pick, i'll just cherry pick them if need be.
04:18 Cthalupa joined #git
04:19 rivarun joined #git
04:20 gugah joined #git
04:20 Derperperd joined #git
04:24 miczac joined #git
04:25 memleak you'd figure a channel with over 1100 users that it'd be noisy
04:25 harry_ joined #git
04:25 salamanderrake joined #git
04:26 memleak maybe everyone is just really old and they're slowing down?
04:26 memleak it's friday night, everyone is supposed to be getting drunk, partying and talking on IRC
04:33 neunon joined #git
04:33 mizu_no_oto joined #git
04:37 jameser joined #git
04:38 Gloomy joined #git
04:38 atrigent_ joined #git
04:40 parasite_ joined #git
04:40 masuberu joined #git
04:44 navidr joined #git
04:45 a_thakur joined #git
04:46 a_thakur_ joined #git
04:47 xall joined #git
04:51 timvisher joined #git
04:52 SwiftMatt joined #git
04:53 matsaman joined #git
04:56 govg joined #git
04:59 abbr joined #git
05:00 vvsagar joined #git
05:00 jeffspeff joined #git
05:01 dermoth joined #git
05:02 gugah_ joined #git
05:02 chachasmooth joined #git
05:04 mehola joined #git
05:06 salamanderrake joined #git
05:06 bocaneri joined #git
05:06 einnjo joined #git
05:09 gigq joined #git
05:16 mizu_no_oto joined #git
05:16 Gloomy joined #git
05:20 ayogi joined #git
05:21 Derperperd joined #git
05:22 memleak Be back later!
05:23 stickperson joined #git
05:24 lyxus joined #git
05:26 chipotle joined #git
05:30 timvisher joined #git
05:33 justan0theruser joined #git
05:33 Cabanossi joined #git
05:38 TomTomTosch joined #git
05:43 memfrob joined #git
05:44 xall joined #git
05:45 phanimahesh joined #git
05:47 gugah joined #git
05:48 raspado joined #git
05:48 shinnya joined #git
05:50 phanimah1sh joined #git
05:51 svm_invictvs joined #git
05:53 ayogi joined #git
05:53 z3t0 joined #git
05:53 z3t0 hi all i have a question about the git workflow when working on PRs and new features
05:54 z3t0 I currently am working on adding a bunch of new features to an open source repo but now need to add something to the master that is a small change and is ready to merge. But other commits before it in the history are not as those are other features still being worked on
05:54 z3t0 how is this done?
05:57 chachasmooth joined #git
05:57 legobanana joined #git
05:57 z3t0 oh wait nevermind i thought my feature branches werent working but apparently my git log alias only checked master...
06:01 ikelso joined #git
06:05 jameser joined #git
06:06 mohabaks joined #git
06:06 diogenese joined #git
06:07 meadmoon joined #git
06:10 timvisher joined #git
06:11 _geoff joined #git
06:15 mohabaks_ joined #git
06:16 stickperson joined #git
06:16 dreiss joined #git
06:16 rivarun joined #git
06:19 jeffspeff joined #git
06:20 eliasp joined #git
06:22 Derperperd joined #git
06:30 memfrob z3t0, like cherry pick?
06:30 z3t0 memfrob: not really
06:31 jameser joined #git
06:31 z3t0 the problem i was having is that i was working on a bunch of different features on different branches. some of the features were nearly complete and others needed to be merged back.
06:31 z3t0 but when i ran git lg (an aliased command)
06:31 memfrob so you fixed it though or do you still need help?
06:31 z3t0 I would always get the latest commit status although that shoulnt have been the case as different branches had different HEADS, turns out the alias was only checking master
06:32 memfrob im just confused on one thing. are you trying to merge one commit or several, and if so, which ones?
06:32 z3t0 theres wasnt a problem haha i thought there was. thansk though
06:32 z3t0 well not a merge
06:32 z3t0 i just thought for some reason all branches had the same head
06:32 z3t0 but they didnt so all good
06:32 pur3eval joined #git
06:32 memfrob XDDD how would git work if everything had the same head? that completely ruins the point of git branches.
06:33 z3t0 my thoughts exactly
06:33 memfrob XDDD
06:33 z3t0 but i was confused because my log script always returned the same regardless of branch xD so i assumed i must be using git wrong haha
06:34 memfrob current head will always be returned by the top of $ git log unless someone's clock is broken
06:35 memfrob in which case you yell at them for not using RTC properly.
06:35 z3t0 haha yep
06:36 memfrob ugh I hate it when I see the same old 1969 commits. That was a big problem about 10 years ago.
06:37 memfrob So glad NTP became really popular!
06:38 memfrob So z3t0 you got any plans for the weekend?
06:38 memfrob Friday night and not a soul to be seen.
06:39 z3t0 well memfrob i have a paper due like yesterday that i have to get started on.....
06:39 memfrob You sending it in via git? ;)
06:39 z3t0 i was planning on doing it tonight but ended up spending the night working on issues / prs on some open source projects i contribute to
06:39 dreiss joined #git
06:39 z3t0 memfrob: haha nah i generally prefer google docs ;) you can edit the doc without anyone really noticing
06:40 z3t0 i mean theres a history viewer but its more subtle than git log?
06:40 memfrob Google cache view :P
06:40 z3t0 ah i love google cache!
06:40 z3t0 its the best for getting around filters, though i think certain sites disable it?
06:41 memfrob yeah robots.txt does that along with maybe others (not a web designer don't quote me on this)
06:41 duderonomy joined #git
06:41 brent__ joined #git
06:42 z3t0 ah thats terrible though, im pretty sure reddit never works with google cache
06:44 memfrob for getting around filters, ssh works pretty well, plus you can change the default port ;) I've set up remotes at home and used that network versus the school's
06:44 Gloomy joined #git
06:44 svm_invictvs joined #git
06:45 z3t0 really? i'll have to look into that
06:46 z3t0 one problem though is that my router doesnt do port forwarding for some reason, as far as i can tell its blocked by the ISP
06:49 memfrob if port 22 is really blocked by your ISP (doubtful) like I said you can change what port your ssh server rests on. Most likely it's just the router. I run iptables for NAT so TCP/UDP control is a non issue. Some routes don't have settings for that. Only way to fix that is change routers.
06:50 memfrob The ASUS gaming routers are the best IMO for out of the box configuration.
06:50 z3t0 well what ends up happening as far as I can tell is that the router is accessible
06:50 z3t0 but it wont push that traffic to the correct device, say im running a server on a desktop and want to access that from outside
06:51 Derperperd joined #git
06:51 z3t0 memfrob: wouldnt any half decent router thats not from an ISP get the job done?
06:51 harwood joined #git
06:51 memfrob I said "best" not "only" :P
06:51 timvisher joined #git
06:52 memfrob If you want to save money on buying a new router, just hook a switch directly into the modem and bypass the router. hook your server up directly to that but configure it carefully as you'll be in the open.
06:53 Derperperd joined #git
06:53 memfrob i.e. don't run bone stock DVL on it XD
06:54 z3t0 haha i see
06:58 memfrob You're cool z3t0
06:58 z3t0 you as well memfrob
06:58 memfrob A much better community here than lots of other channels.
06:59 z3t0 more than anything its nice that there is a community here
07:00 z3t0 i go to some other channels and theres a bunch of people but its hard to strike up a conversation when there are no responses haha
07:00 z3t0 #linux is great too
07:00 z3t0 ##linux *
07:01 ikelso joined #git
07:04 z3t0 so any plans for your weekend? memfrob
07:04 matsaman I got a plan for tomorrow
07:05 z3t0 cool
07:05 elementalest joined #git
07:06 YourTheBombNow23 joined #git
07:06 sea-gull joined #git
07:07 lyxus Folks, what is really the difference between git push -- mirror and the normal git push
07:10 matsaman --mirror?
07:10 z3t0 its an option for git push
07:10 matsaman yes...
07:10 z3t0 i could read out the docs to you but i dont really understand them myself haha
07:10 matsaman he said '-- mirror'
07:10 z3t0 oh my bad
07:11 lyxus I mean --mirror (fat fingers)
07:11 matsaman yeah I gotta say, if you find yourself only using git with crazy params, it's probably the wrong thing for you
07:11 matsaman or put another way: git has too man params
07:11 * matsaman finds himself another VCS =P
07:11 matsaman j/k cbf to do that right now
07:11 matsaman =)
07:11 z3t0 lmao so svn...
07:12 lyxus z3t0 Good to see I am not the only one
07:12 z3t0 lyxus tbh its not in english :(
07:12 lyxus I am trying to mirror a repo and keep it updated.
07:13 phanimahesh joined #git
07:13 lyxus I was thinking of doing a git clone --mirror oldrepo; git push --mirror mirror repo
07:13 lyxus I was thinking of doing a git clone --mirror oldrepo; git push --mirror new_repo
07:13 matsaman really nothing should have so many params
07:14 SwiftMatt joined #git
07:14 lyxus matsaman could't agree more with you
07:14 matsaman and git has params for its params
07:14 z3t0 this might help https://help.github.com/artic​les/duplicating-a-repository/ lyxus
07:14 jeffspeff joined #git
07:15 z3t0 does anyone here frequent /r/git?
07:15 matsaman dunno why you'd go to reddit if you knew about irc
07:15 lyxus z3t0 I saw that. But they are deleting after. I want to have both running at the same time.
07:16 matsaman I feel like ordinary git, pull, branch, merge, push is fine
07:16 matsaman and that everything else is about rectifying flaws in the implementation of the back end
07:16 lyxus matsaman that's what I though until I saw that there was a mirror option
07:16 matsaman people want the bits they never see unless they seek them out to be a certain way
07:16 netj joined #git
07:16 matsaman but this is always the danger with software, it seems
07:17 matsaman invariably humans decide the software is right and that the extra work should be done by the human, not the software
07:17 matsaman which is obviously wrong, but easily forgotten =P
07:18 matsaman I mean it has its own aliasing system
07:18 z3t0 matsaman: i generally find reddit and irc to complement one another
07:18 matsaman if it wasn't obvious before: when you make your own aliasing system, your program is too complicated =P
07:18 z3t0 reddit saves and is easily searchable, irc is live and has far less spam (generally speaking)
07:18 matsaman z3t0: I find that, too, but only in that one is a distraction from the other when time must be killed
07:18 matsaman reddit, meh
07:18 matsaman reddit has that archived thread nonsense
07:18 z3t0 matsaman: hahaha yeah its 1am here so just killing time
07:18 theoceaniscool joined #git
07:19 matsaman where unresolved threads are eternally atop search engine results
07:19 z3t0 yeah i just stumbled on that its bs
07:19 matsaman and even if you find the answer you can't resolve them
07:19 matsaman nothing
07:19 matsaman is dumber than that
07:19 z3t0 stackoverflow is better if you want answers reddit if you want a bunch of people arguing...
07:19 matsaman niche porn is what reddit is for
07:20 z3t0 lmao whats 4chan then
07:21 matsaman eh, that's niche porn, but the illegal/immoral kind
07:23 * z3t0 went to grab a drink
07:23 flavius joined #git
07:23 lyxus 4chan is reddit user that got kicked out
07:24 matsaman might have one more drink myself, hum
07:26 FabTG joined #git
07:27 z3t0 lyxus: nah its the reddit bot that got kicked out
07:28 timvisher joined #git
07:31 legobanana left #git
07:32 lindenle joined #git
07:32 finalbeta joined #git
07:33 muthu joined #git
07:35 memleak joined #git
07:37 memleak heh while i was playing the crew,#git picked up some noise!
07:37 rizonz what is the best way to update a folder with new content, when I remove it and copy the new one it ir still sees deleted files and only an added folder
07:37 rizonz do I need two commits ?
07:37 memleak cp -prvn <old_dir> <new_dir> ?
07:37 memleak git add -A && git commit -as ?
07:38 sbulage joined #git
07:38 rizonz no I already know the issuse
07:38 rizonz there is some old git folder in that new one
07:38 memleak why do i have such a hard time understanding people -_-
07:38 buzzLightBeer joined #git
07:38 memleak sorry.. im trying
07:39 rizonz memleak: you need sleep maybe, I do surely
07:39 memleak when you delete files and you want them gone, you need to run git add -A to make git forget those
07:39 _ikke_ rizonz: git summarizes new folders by the parent folder name
07:39 rizonz memleak: no it's my own git repo where i gitclone some only repo in
07:39 _ikke_ rizonz: git status -uall
07:40 rizonz I can't have a .git in a subfolder I guess
07:41 memleak Well you _can_ ext4 doesn't limit you from that :P
07:41 memleak if you want the .git folder to not be included in your repo, you'd need to add that to .gitignore
07:41 rizonz memleak: I'm on windows my love
07:41 rizonz memleak: now I see, you have a memleak :P that was your issue
07:42 memleak XDD
07:42 z3t0 memleak: git rm works too
07:42 rizonz I have a parent which is my own git repo where I upstream with but I have folders in it which I sync from time to time from github... so that confuses
07:42 rizonz wow gitlab is so great!
07:43 memleak i have reading comprehension disabilities so it's very difficult for me to understand things if they're not in simple, in order terms. the way i write is also very "unique" as coined by many people due to my language issues. it's the easiest way for me to keep my words in order. even though you may i say i "talk funny"
07:43 _ikke_ .git is ignored by default
07:44 memleak right, i forgot about that
07:44 _ikke_ although, if you git add a directory with a .git folder in it (which is a proper repo), then it will add a gitmodule link
07:44 memleak git add .git ?
07:44 _ikke_ memleak: You can't
07:44 memleak symlink?
07:45 rizonz I need some sleep
07:45 _ikke_ it will just track the location where the symlink points to
07:45 ThomasLocke joined #git
07:45 ThomasLocke joined #git
07:46 * memleak is out of ideas
07:46 YanCorgi joined #git
07:46 nowhere_man joined #git
07:46 jagob joined #git
07:46 _ikke_ What is the idea?
07:46 xall joined #git
07:46 memleak to try to help him.
07:46 _ikke_ !subproject
07:46 gitinfo [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
07:47 memleak voila there's your answer!
07:47 memleak !thanks
07:47 gitinfo You're very welcome!
07:47 memleak XDDD ROFL IT WORKS
07:47 _ikke_ hehe
07:47 _ikke_ !botsnack
07:47 gitinfo Om nom nom
07:48 memleak are you a channel op?
07:48 _ikke_ I am
07:48 coco joined #git
07:48 jameser joined #git
07:50 jorj joined #git
08:00 SwiftMatt joined #git
08:02 ikelso joined #git
08:03 timvisher joined #git
08:05 govg joined #git
08:06 mda1 joined #git
08:08 muthu_ joined #git
08:09 finalbeta joined #git
08:11 YanCorgi left #git
08:12 snits joined #git
08:13 CorgiRunning joined #git
08:14 YanCorgi joined #git
08:15 rajat joined #git
08:17 askb joined #git
08:21 rajat joined #git
08:21 overlord_tm joined #git
08:23 jagob joined #git
08:23 YuGiOhJCJ joined #git
08:26 chachasmooth joined #git
08:32 jagob joined #git
08:33 jameser joined #git
08:39 denisMone joined #git
08:40 nostrora joined #git
08:42 SwiftMatt joined #git
08:43 timvisher joined #git
08:44 mohabaks joined #git
08:45 Murii joined #git
08:46 einnjo joined #git
08:46 einnjo joined #git
08:47 einnjo joined #git
08:48 jameser joined #git
08:48 einnjo joined #git
08:49 einnjo joined #git
08:52 netj joined #git
08:55 yankaiqi joined #git
08:57 yankaiqi left #git
08:57 m4sk1n joined #git
08:58 xall joined #git
08:58 ihradek joined #git
08:59 rajat joined #git
09:03 Jackneill joined #git
09:04 yankaiqi joined #git
09:05 eihabarabia joined #git
09:05 yankaiqi left #git
09:07 parasite_ joined #git
09:07 govg joined #git
09:10 bernardio joined #git
09:10 jnavila joined #git
09:11 parasite_ joined #git
09:16 mikedpad joined #git
09:16 PioneerAxon joined #git
09:19 ayogi joined #git
09:23 timvisher joined #git
09:24 hussam joined #git
09:26 b1tchcakes joined #git
09:28 chachasmooth joined #git
09:30 bernardio joined #git
09:33 TomyLobo joined #git
09:37 cyan__ joined #git
09:38 pks joined #git
09:39 ramsub07 joined #git
09:39 jameser joined #git
09:54 ayogi joined #git
09:56 King_Hual joined #git
09:56 pks joined #git
09:56 NeverDie @botsnack
09:56 NeverDie !botsnack
09:56 gitinfo Om nom nom
09:56 NeverDie fml
09:57 brainysmurf joined #git
10:01 memleak !fml
10:01 memleak !neverdie
10:01 NeverDie fml
10:01 memleak well this is awkward, night all!
10:01 timvisher joined #git
10:01 memleak oh and timvisher I always wondered what fios is like
10:01 roelmonnens joined #git
10:02 memleak night!
10:02 brainysmurf Okay, I merged the wrong branch, and now I have to merge in the right one.
10:02 brainysmurf Also, I already pushed.  :]
10:03 NeverDie brainysmurf: Ouch.
10:03 brainysmurf Do I reset back to sha before the merge?
10:03 * brainysmurf is indeed in pain
10:08 pks joined #git
10:10 coco joined #git
10:10 afuentes joined #git
10:10 borkr joined #git
10:11 Groscheri joined #git
10:12 ayogi joined #git
10:12 robotroll joined #git
10:13 Endarked joined #git
10:15 andrew710 joined #git
10:19 shubhnik joined #git
10:22 Guest26 joined #git
10:23 dersand joined #git
10:24 spacelord_ joined #git
10:25 Nilesh_ joined #git
10:26 govg joined #git
10:29 stickperson joined #git
10:34 garethdaine joined #git
10:35 lyxus joined #git
10:35 brainysmurf what the git command to auto accept from head?
10:35 brainysmurf in a conflict
10:36 pks joined #git
10:36 Masber_080 joined #git
10:37 inflames joined #git
10:38 timvisher joined #git
10:43 mablae joined #git
10:48 Limes_ joined #git
10:49 [0xAA] joined #git
10:51 SteffanW joined #git
10:54 jnavila joined #git
10:54 TyrfingMjolnir joined #git
10:55 byte512 joined #git
10:56 neunon joined #git
10:56 matumbo joined #git
10:57 jameser joined #git
10:57 ispn joined #git
10:59 vdv joined #git
11:00 donught joined #git
11:00 moritz brainysmurf: you can merge/rebase with -X ours
11:00 moritz or git checkout --ours . and then git add all the conflicting files
11:00 donught joined #git
11:01 ThomasLocke joined #git
11:05 Mikerhinos joined #git
11:05 ShalokShalom_ joined #git
11:05 Gloomy joined #git
11:07 Guest36461 joined #git
11:07 jozwior joined #git
11:07 roelmonnens joined #git
11:08 cdown joined #git
11:10 neunon joined #git
11:10 doener joined #git
11:14 TFrag joined #git
11:14 roelmonnens joined #git
11:15 ShekharReddy joined #git
11:16 andrew711 joined #git
11:19 ihradek joined #git
11:20 roelmonnens joined #git
11:23 Sonderblade joined #git
11:23 apple__ joined #git
11:29 noc_ joined #git
11:30 roelmonnens joined #git
11:31 ssitani joined #git
11:32 pur3eval joined #git
11:34 hhee joined #git
11:35 Milos joined #git
11:36 lindenle joined #git
11:41 aard__ joined #git
11:50 timvisher joined #git
11:53 sq-one joined #git
11:56 mentazoom joined #git
11:56 ertes joined #git
12:05 jstein_ joined #git
12:13 mda1 joined #git
12:19 YuGiOhJCJ joined #git
12:21 roelmonnens joined #git
12:25 Learath2 joined #git
12:28 cyan__ joined #git
12:28 glnz joined #git
12:29 paws_ joined #git
12:29 stickperson joined #git
12:35 MineCoins joined #git
12:35 zxzfpehu joined #git
12:36 satifant joined #git
12:39 finalbeta joined #git
12:40 Guest36461 joined #git
12:41 lufeng joined #git
12:41 m0viefreak joined #git
12:44 sea-gull joined #git
12:44 coco joined #git
12:46 hhee guys, i need to move current commits in master to branch. how can i do it?
12:47 todd_dsm joined #git
12:48 _ikke_ new or existing branch?
12:49 Masber_080 joined #git
12:49 Rodya_ joined #git
12:50 finalbeta joined #git
12:51 Tobbi joined #git
12:52 jameser joined #git
12:53 hhee _ikke_, to new branch (dont exists in remote repo)
12:54 osse hhee: https://raw.githubusercontent.com/Osse/gi​t-stuff/master/git-reset-explanation.txt
12:54 jagob joined #git
12:56 timvisher joined #git
12:58 _ikke_ right, create a new branch based on master, and then reset master back to the commit you want\
13:00 texinwien joined #git
13:01 cdg joined #git
13:02 hhee osse, _ikke_ thx guys!
13:04 pur3eval joined #git
13:06 sdothum joined #git
13:06 jimi_ joined #git
13:12 g105b joined #git
13:13 mentazoom joined #git
13:18 sea-gull joined #git
13:18 Guest26 joined #git
13:29 anddam reading in order to figure how to properly do my rebase
13:29 anddam http://www.mail-archive.com/dri-devel​@lists.sourceforge.net/msg39091.html
13:30 anddam "You must not rebasecommits other people did." I'm fine with that and in fact I'd like not to, the point is I don't know how I did that
13:30 hecliunyx joined #git
13:31 leeN joined #git
13:32 einnjo joined #git
13:33 netj joined #git
13:33 codemann joined #git
13:34 _ikke_ anddam: !repo?
13:34 gitinfo anddam: Repo is a tool produced by Google for the AOSP project(and others) which wraps git and provides its own set of commands. While it is possible to use git with repositories that are managed by repo, it is not always easy. https://source.android.com/source/using-repo.html
13:35 anddam _ikke_: no, plain git
13:36 jozwior joined #git
13:36 anddam _ikke_: a few days ago you tried to help, not sure if you can recall that
13:36 mda1 joined #git
13:36 anddam _ikke_: namely I odd-rebased and ended with a bunch of duplicated commit from upstream, this time I was smart enough to push to my own github fork
13:37 anddam that I can gladly destroy and recreate, but I'd like to understand the actual issue before
13:38 anddam I'll start reading documentation, since I never bothered coming from subversion, I feel I lack some basic knowledge
13:39 anddam meanwhile I've got about 750 duplicates at https://github.com/anddam/ma​cports-ports/commits/master if you have a suggestion about how to rollback that and push --force the history I'm glad to hear it
13:39 anddam I was suggested to use reflog to check what the proper hash to checkout is, but i couldn't figure the output
13:40 anddam well, I figure the output, I just don't know where in the log the problems started
13:41 sea-gull joined #git
13:42 Jackneill_ joined #git
13:42 _ikke_ anddam: sorry, I meant !repro
13:42 gitinfo anddam: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
13:42 _ikke_ :P
13:42 rivarun joined #git
13:46 ihradek joined #git
13:47 anddam _ikke_: it's been a couple days
13:48 anddam and ofc I didn't stay inactive, I obviously tried to fix it by typing commands at random
13:48 jimi_ joined #git
13:49 _ikke_ Can you give more insight in your !situation then?
13:49 gitinfo 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)
13:50 _ikke_ That talks a little easier
13:50 anddam this is the relevant part in reflog, given that I got ~750 duplicated changeset
13:50 anddam https://gist.github.com/anddam/c​6a5091c6dd7f977d9bff53cefe78b2b
13:50 anddam sure, I'll provide any info I can, also I'd like to understand where the devil lies in those rebase
13:51 anddam I don't get what "rewrites" other people commits
13:51 _ikke_ amend + rebase
13:51 _ikke_ mostly rebasing
13:51 anddam I most assuredly rebased everythin
13:51 anddam g*
13:52 anddam but since I pull from upstream isn't rebase supposed to put my local changes on top of upstream history?
13:52 timvisher joined #git
13:52 Rodya_ joined #git
13:53 anddam I updated the gist with git log output
13:58 anddam would you like some other info?
14:02 _ikke_ Let me check
14:03 _ikke_ That only shows one branch, is not that helpful
14:03 _ikke_ anddam: So what do you want to achieve right now
14:04 nostrora joined #git
14:04 anddam good question
14:04 ihradek joined #git
14:05 anddam I have upstream, that is the project repo on github, I have a github fork, where I can mess things up
14:05 anddam and I have a local repo where I want to be able to change a couple files, rebase as requested by the project and then pull
14:06 anddam atm my github fork is messed up, but I figure my local repo -from which I pushed onto the github fork- has the duplicate history as well
14:06 anddam I'd like both those to be consistent with upstream
14:06 _ikke_ Do you have anything local or in your fork that you need to keep?
14:06 anddam oh when I say upstream I refer to the project github repo, I set three remote
14:06 anddam I think I had but it's long gone
14:06 anddam and doesn't matter anyway
14:07 _ikke_ anddam: yeah, that's how upstream usually is used
14:07 anddam I think I had stashed a bunch of things to merge one at time in the svn-to-git conversion
14:07 ikelso joined #git
14:07 anddam _ikke_: yes but i set "upstream" and "mine" remotes each with push and pull url of the related github repo
14:07 anddam while origin is mixed, it pulls upstream and push mine
14:08 disconnect_me_ joined #git
14:08 anddam so I don't mess things up accidentally
14:08 _ikke_ git branch -f master upstream/master would reset your local master to upstreams version
14:08 anddam I have to mess things up on purpose
14:08 anddam would "reset local master" change the history as well?
14:08 _ikke_ Yeah, it changes what your history looks like
14:09 _ikke_ from your local master points of view
14:09 anddam Branch master set up to track remote branch master from upstream.
14:09 anddam looks easy
14:09 _ikke_ sounds good
14:10 anddam so now checkout?
14:10 _ikke_ now you might want to push this to 'mine' too?
14:10 anddam yes, I figure i'll need to force push on mine
14:10 _ikke_ correct
14:10 anddam and if I don't force git will tell me I have to
14:11 anddam why didn't I need an "update" "checkout" or the like?
14:11 anddam error: failed to push some refs to 'git@github.com:anddam/macports-ports.git'
14:11 anddam beautiful
14:11 bremner update is not even a git command
14:12 mizu_no_oto joined #git
14:12 anddam yes, that was non-git lingo to clear what I meant
14:13 _ikke_ anddam: Did you have master checked out?
14:13 anddam _ikke_: how do I check that?
14:13 anddam git branch says
14:13 anddam * (no branch, rebasing (null))
14:14 anddam and master is not selected, I'm going with "No, I don't"
14:14 _ikke_ git checkout master then
14:14 _ikke_ git rebase --abort
14:14 _ikke_ (you were still in a rebase)
14:15 Limes_ joined #git
14:16 anddam Applied autostash.
14:16 anddam that sounds oddly encouraging
14:16 spaceone is there a shortcut for a fixup commit to squash it automatically?
14:16 _ikke_ git rebase --autosquash
14:17 _ikke_ (and git config rebase.autosquash true)
14:18 anddam https://gist.github.com/anddam/c6a5091c6d​d7f977d9bff53cefe78b2b#file-checkout-txt
14:18 anddam now I don't feel confident committing anything before I checkout master
14:19 _ikke_ Do you feel you need to save any of these changes?
14:19 anddam the lang/ghc change is mine, the other I don't recognize
14:19 anddam and my stash are gone
14:20 anddam I have a copy of the whole disk so of the repo as well, so I could get the changes and reapply those
14:20 anddam what's with the untracked working tree notice?
14:21 _ikke_ anddam: Those files are currently considered untracked by git (but still in your working tree), but in master they are tracked
14:22 anddam I can lose all of those, lang/ghc included
14:22 pity joined #git
14:22 anddam so I figure a checkout force kind of thing
14:23 _ikke_ yeah, git checkout -f then
14:23 anddam checkout --force master
14:23 anddam running already
14:23 _ikke_ ok
14:24 anddam Your branch is up-to-date with 'upstream/master'.
14:25 _ikke_ sounds good
14:25 anddam I'm on   * master
14:25 _ikke_ What does git status say?
14:25 anddam it says "Fine thanks. What about you?"
14:25 _ikke_ lol
14:25 anddam seriously, It left two files in the lang/ghc directory, that I will sort lter
14:25 anddam later
14:26 _ikke_ ok
14:26 anddam now I'm push-forcing to mine master
14:26 anddam my upload is a bit limited
14:28 anddam https://github.com/anddam/ma​cports-ports/commits/master no duplicates
14:28 anddam (round of applause9
14:29 anddam thanks *a lot*
14:29 _ikke_ The duplicates probably happened because you did a local rebase, and then merged the original history back in again
14:29 mehola joined #git
14:29 anddam as rule of thumb is a     git log upstream/master..master     going to tell me how many changesets I've changed?
14:30 _ikke_ If I were you, I would not touch master
14:30 _ikke_ (because that's coming from upstream)
14:30 anddam Elementary, my dear Ikke
14:30 anddam of course not having clear git's working doesn't help
14:31 anddam but is local master the same of upstream?
14:31 anddam I figure it's just referencing it, due to the "tracking" thing
14:31 stickperson joined #git
14:31 anddam I can use my "wip" branch to do the work
14:31 _ikke_ anddam: Technically, it's a unique branch
14:31 anddam should I then merge wip from master or push my wip and do a PR from github?
14:31 _ikke_ anddam: I would use separate feature branches
14:32 anddam each thing its name?
14:32 _ikke_ each PR would be a separate branch based of master
14:32 _ikke_ yeah
14:32 _ikke_ So you can treat them seperately
14:32 mizu_no_oto joined #git
14:32 anddam I'll need to be more thorough with git and read the full docs at some point
14:33 TheOrangeOne joined #git
14:33 anddam I felt mercurial way more natural given that the subcommand names matched more one-to-one
14:33 anddam but I get that that's just a minor thing and a matter of habit, you have to actually do the job of reading docs
14:33 _ikke_ !workflow
14:33 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.c​om/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
14:34 anddam yes but I lack a couple concepts about local working tree, changesets and all
14:34 _ikke_ yeah, git doesn't really use the term changeset
14:34 _ikke_ But I understand what you mean
14:34 anddam oh I thought I had got it from here
14:35 _ikke_ It's a mecurial term
14:38 * anddam bows and apologizes
14:38 _ikke_ Don't worry
14:38 _ikke_ We're kind and forgiving here
14:41 WayToDoor joined #git
14:41 govg joined #git
14:41 kesslerfrost joined #git
14:41 * anddam hg updates away
14:41 anddam thanks again!
14:42 ShalokShalom joined #git
14:42 _ikke_ yw
14:43 mizu_no_oto joined #git
14:43 lyxus joined #git
14:44 bjoe2k4 joined #git
14:47 Guest36461 joined #git
14:47 DolphinDream joined #git
14:48 xfbs joined #git
14:52 timvisher joined #git
14:53 Rodya_ joined #git
14:55 Takumo joined #git
14:55 Takumo joined #git
14:58 aard_ joined #git
14:59 trewe joined #git
15:00 dan2k3k4 joined #git
15:00 ankit01ojha joined #git
15:03 Tobbi joined #git
15:05 Spherical joined #git
15:05 Canaimero-e64b6 joined #git
15:05 kesslerfrost joined #git
15:07 Canaimero-e64b6 left #git
15:08 ikelso joined #git
15:19 SpeakerToMeat joined #git
15:19 jnavila joined #git
15:21 mda1 joined #git
15:22 rivarun joined #git
15:22 andrew710 joined #git
15:23 Bizkit joined #git
15:26 dan2k3k4 joined #git
15:27 kesslerfrost joined #git
15:30 jost__ joined #git
15:31 Guest36461 joined #git
15:32 Murii joined #git
15:33 texinwien_ joined #git
15:34 xall joined #git
15:35 timvisher joined #git
15:36 blackwind_123 joined #git
15:37 btree joined #git
15:39 lindenle joined #git
15:40 finalbeta joined #git
15:42 Groscheri joined #git
15:43 Murii joined #git
15:44 dreiss joined #git
15:44 qpdb joined #git
15:47 govg joined #git
15:48 Darcidride joined #git
15:49 dsdeiz joined #git
15:53 Muzer joined #git
15:54 Rodya_ joined #git
16:03 kesslerfrost joined #git
16:04 zivester joined #git
16:06 Ranmaru joined #git
16:06 str joined #git
16:08 cdown joined #git
16:08 madewokherd joined #git
16:10 Serious8 joined #git
16:10 sarri joined #git
16:10 sarri joined #git
16:17 str joined #git
16:18 InfoTest joined #git
16:19 svm_invictvs joined #git
16:21 timvisher joined #git
16:24 lyxus joined #git
16:24 xall joined #git
16:26 Jguy joined #git
16:26 lindenle joined #git
16:26 Nilesh_ joined #git
16:26 Naan joined #git
16:28 nd joined #git
16:30 mehola joined #git
16:31 xall_ joined #git
16:31 boubou joined #git
16:32 stickperson joined #git
16:32 zeroed joined #git
16:32 zeroed joined #git
16:33 vdv joined #git
16:40 a_thakur joined #git
16:40 nickabbey joined #git
16:44 raspado joined #git
16:47 pity joined #git
16:49 ThomasLocke joined #git
16:49 ThomasLocke joined #git
16:53 Endarked joined #git
16:53 pbrewczynski joined #git
16:53 dreiss joined #git
16:55 finalbeta joined #git
16:55 jmpp_ joined #git
16:56 sea-gull joined #git
16:56 cdg joined #git
16:56 jnavila joined #git
16:57 Serious8 joined #git
16:58 midgetspy joined #git
17:00 qqx joined #git
17:02 DolphinDream joined #git
17:03 pur3eval joined #git
17:03 qqx joined #git
17:05 qqx joined #git
17:07 texinwien_ joined #git
17:08 unreal joined #git
17:08 Xandaros joined #git
17:10 ikelso joined #git
17:10 jost joined #git
17:12 swift1 joined #git
17:12 timvisher joined #git
17:12 Endarked joined #git
17:14 lvh joined #git
17:14 ShekharReddy joined #git
17:15 lyxus joined #git
17:20 boubou joined #git
17:20 dirtyroshi joined #git
17:21 cyan__ joined #git
17:22 gugah joined #git
17:24 govg joined #git
17:26 ramsub07 joined #git
17:29 darkbit joined #git
17:32 sword joined #git
17:33 Brando753-o_O_o joined #git
17:38 aard_ joined #git
17:40 rkazak joined #git
17:43 Zialus joined #git
17:44 GavinMagnus joined #git
17:45 mda1 joined #git
17:46 ajf- joined #git
17:46 lvh joined #git
17:52 rindolf joined #git
17:55 rindolf Hi all! I am doing "git rebase master" now and had a conflict in one file and solved it and did "git add lib/cms/cmsprofile.h" after which "git status -s" returns an empty and now "git rebase --continue" gives me this - http://pastie.org/10991604
17:55 rindolf what should I do?
17:55 moritz rindolf: read the message, and decide
17:56 diogenese joined #git
17:56 rindolf moritz: should I do git rebase --skip?
17:56 _ikke_ rindolf: The merge conflict resolution resulted in an 'emtpy' commit
17:57 moritz rindolf: if it's OK (or even intentional) that the conflict resolution made the current commit empty: yes
17:57 timvisher joined #git
17:57 rindolf _ikke_: moritz : I see
17:57 _ikke_ A commit that does not introduce any changes regarding to the previous commit
17:57 Derperperd joined #git
17:57 moritz if not, don't do --skip, but investigate what went wrong
17:57 TyrfingMjolnir How do I do git push to a folder available onlt through ssh?
17:58 TyrfingMjolnir user@10.0.0.12:/opt/dev/project/.git
17:58 TyrfingMjolnir as example
17:58 moritz TyrfingMjolnir: configure a remote that uses the ssh protocol
17:58 _ikke_ git remote add <name> user@10.0.0.12:/opt/dev/project/.git
17:59 masuberu joined #git
17:59 TyrfingMjolnir git remote add project user@10.0.0.12:/opt/dev/
17:59 TyrfingMjolnir ?
17:59 TyrfingMjolnir Or what is <name>?
17:59 _ikke_ An easy name to refer to that remote
17:59 TyrfingMjolnir git remote add localrepo user@10.0.0.12:/opt/dev/project/
17:59 TyrfingMjolnir Like that?
17:59 cdg joined #git
18:00 mikecmpbll joined #git
18:00 _ikke_ right
18:01 cdg_ joined #git
18:02 swift1 joined #git
18:03 kyan joined #git
18:04 cdg_ joined #git
18:04 Xandaros joined #git
18:04 pity joined #git
18:04 jimi_ joined #git
18:05 Naan joined #git
18:07 rindolf _ikke_: moritz : thanks
18:12 kulelu88 joined #git
18:12 cime joined #git
18:13 Cthalupa joined #git
18:14 stickperson joined #git
18:16 anddam joined #git
18:16 gugah joined #git
18:18 shubhnik joined #git
18:20 sonOfRa joined #git
18:24 LeBlaaanc joined #git
18:25 matsaman joined #git
18:27 YuGiOhJCJ joined #git
18:27 govg joined #git
18:31 TyrfingMjolnir I did: git remote add localrepo user@10.0.0.12:/opt/dev/project/
18:32 TyrfingMjolnir https://bpaste.net/raw/f7387a4404a0
18:32 TyrfingMjolnir How can I push to an empty folder?
18:33 miczac joined #git
18:33 _ikke_ TyrfingMjolnir: git init --bare
18:33 moritz (run the git init --bare on the remote side)
18:33 TyrfingMjolnir The folder on my laptop has the repo
18:33 TyrfingMjolnir My current folder that is
18:33 Mobutils joined #git
18:34 _ikke_ sure, you just need to init a repository there
18:34 _ikke_ then you can push to it
18:34 TyrfingMjolnir So I have to login to: user@10.0.0.12:/opt/dev/project/
18:34 TyrfingMjolnir Then do: git init --bare
18:34 TyrfingMjolnir ?
18:34 moritz yes
18:38 g__k___ joined #git
18:39 timvisher joined #git
18:40 TyrfingMjolnir Now it "worked"
18:40 TyrfingMjolnir Something was pushed
18:40 TyrfingMjolnir But I'm not able to see my files, just alot of indexing stuff
18:43 robotroll joined #git
18:43 cmosguy hey all, I have been doing devleopment on a project in windows, but when I am on an ubuntu system, right after I clone the repo, I have a bunch of files that show they are modified
18:43 cmosguy what do I do in this situation?
18:43 rindolf cmosguy: reallu?
18:44 dweelie joined #git
18:44 rindolf cmosguy: what are the differences?
18:44 _ikke_ TyrfingMjolnir: That's what a bare repository is
18:44 TyrfingMjolnir https://bpaste.net/raw/8901ac639813
18:44 _ikke_ cmosguy: Most likely line ending normalization
18:44 TyrfingMjolnir But I pushed from my laptop to my workstation
18:44 _ikke_ TyrfingMjolnir: Try running git log there
18:44 cmosguy rindolf: things like this: modified:   server/october/themes/moxtree/asse​ts/plugins/titan/images/top_bg.png
18:44 TyrfingMjolnir on the workstation or the laptop?
18:45 _ikke_ workstation
18:45 Mobutils joined #git
18:45 rindolf cmosguy: binary files?
18:45 * cmosguy _ikke_: I have this in my ~/.gitconfig:
18:45 cmosguy [core]
18:45 cmosguy autocrlf = input
18:45 TyrfingMjolnir All changes are logged, and the file names are mentioned
18:46 cmosguy rindolf: yes it looks like it is happengint to binary files
18:46 TyrfingMjolnir However the files are not there
18:46 _ikke_ TyrfingMjolnir: !bare
18:46 gitinfo TyrfingMjolnir: 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/
18:46 _ikke_ cmosguy: what does git diff show?
18:47 cmosguy _ikke_: The file will have its original line endings in your working directory.
18:47 cmosguy warning: CRLF will be replaced by LF in server/october/themes/moxtree/as​sets/images/frontpage/logo.png.
18:47 cmosguy The file will have its original line endings in your working directory.
18:47 mjuszczak joined #git
18:48 Random832 cmosguy: https://git-scm.com/docs/gitattributes
18:49 dmc joined #git
18:49 cmosguy Random832: TL;DR
18:49 TyrfingMjolnir How do I change to a normal one?
18:49 cmosguy why are the binary files screwing up?
18:49 cmosguy what do I do?
18:50 _ikke_ TyrfingMjolnir: init without --bare, but pushing your repo does not automatically make your files show up
18:50 matsaman cmosguy: sure it's a binary file?
18:50 _ikke_ TyrfingMjolnir: It's better to push and fetch to/from a central repository
18:50 _ikke_ cmosguy: Is there a .gitattributes file?
18:51 cmosguy _ikke_: yes:# Autodetect text files
18:51 cmosguy * text=auto
18:51 cmosguy # Force the following filetypes to have unix eols, so Windows does not break them
18:51 cmosguy *.* text eol=lf
18:52 TyrfingMjolnir _ikke_: https://bpaste.net/raw/f9eb2adf00d2
18:52 TyrfingMjolnir I would like to have an inhouse repo
18:52 minikN joined #git
18:52 Random832 cmosguy, that right there, you're telling it all your files are text files.
18:52 TyrfingMjolnir What if my "central" repo is on one of my inhouse servers?
18:53 TyrfingMjolnir I could have this repo be the central one
18:55 lyxus joined #git
18:56 Rodya_ joined #git
18:57 cmosguy hmm... so if I remove that line that should fix the git status?
18:57 _ikke_ TyrfingMjolnir: the 'central' repo is just used to push to and fetch from
18:57 _ikke_ It's a bare repo without any working tree files
18:58 _ikke_ TyrfingMjolnir: That message is exactly what I mean with pushing to a non-bare repo
19:00 Goplat joined #git
19:00 Redfoxmoon joined #git
19:01 pbrewczynski joined #git
19:02 F0rTh3J3st joined #git
19:03 Redfoxmoon where does the git build system change man files with :: in the filenames to . for cygwin and win32?
19:03 spacelord_ joined #git
19:04 bremner because win32 hates : in filenames
19:04 _ikke_ bremner: he askes where
19:04 bremner oh, where. no idea
19:04 Redfoxmoon hehe:-)
19:04 Redfoxmoon it's not sticking out boldly as it did in perl sadly
19:05 _ikke_ what man file have : in it's name?
19:05 bremner perl modules?
19:06 _ikke_ yeah, just found them
19:08 Shakeel_ joined #git
19:08 cmosguy _ikke_: and Random832 thanks for your help
19:08 cmosguy it was an issue with the git attributes file
19:12 bmahe joined #git
19:14 F0rTh3J3st joined #git
19:14 mizu_no_oto joined #git
19:15 timvisher joined #git
19:16 tasslehoff joined #git
19:17 mjuszczak joined #git
19:18 tasslehoff Trying out subtree to replace my submodules. First problem is a subtree that uses submodules. (How) can I make that work?
19:22 lyxus joined #git
19:26 dsdeiz joined #git
19:26 dsdeiz joined #git
19:34 chachasmooth joined #git
19:35 aidalgol joined #git
19:35 TyrfingMjolnir _ikke_: Yes
19:36 TyrfingMjolnir How do I make one of my local servers my central repo?
19:37 Derperperd joined #git
19:37 F0rTh3J3st left #git
19:42 gajus joined #git
19:42 grawity joined #git
19:44 _ikke_ Just like you did before
19:44 _ikke_ create a bare repository somewhere where everyone has access to
19:47 manuelschneid3r joined #git
19:47 oskarkv joined #git
19:47 likewhoa joined #git
19:50 chachasmooth joined #git
19:53 dave0x6d joined #git
19:56 stevenbenner joined #git
19:57 lyxus joined #git
19:57 timvisher joined #git
19:58 multi_io joined #git
20:00 quackgyver joined #git
20:00 mar77i_ joined #git
20:05 pity joined #git
20:06 zero85 joined #git
20:07 MineCoins joined #git
20:09 gugah joined #git
20:10 lyxus joined #git
20:12 memfrob joined #git
20:12 ikelso joined #git
20:14 memfrob Guys! So last night right before I fell asleep I had an epiphany as to solve my problem. Clone the tree I want, git checkout into the branch I want the commits from, copy that tree, go into the copy, git reset --hard HEAD~<latest vanilla kernel commit> copy the patched source into the copied kernel tree and BAM
20:14 shgysk8zer0 joined #git
20:15 memfrob That will generate a single patch with all conflicts all in one pass :D
20:17 memfrob All I need to do then is git diff &> patch_to_backport.patch and apply that patch to 4.4 and other kernel releases and fix all the issues
20:18 memfrob I don't need any help anymore :D I got it allll figured out to do exactly what I need. jaggz how are ya?
20:20 jaggz memfrob, dandy
20:21 jaggz :)
20:21 memfrob adymitruk, if you're still working on anything for me don't worry about it.
20:21 memfrob jaggz, glad to hear!
20:22 memfrob This is gunna be awesome, KSPP for everyone!
20:22 chachasmooth joined #git
20:23 Rodya_ joined #git
20:24 cdg joined #git
20:25 memfrob Too early to do kernel development just wanted to give you an update. I'm gunna head back onto The Crew (amazing game if you have a force feedback wheel) and continue my daunting project later.
20:28 webstrand joined #git
20:28 hasc joined #git
20:29 filcab joined #git
20:30 fahadash joined #git
20:30 l4v2 joined #git
20:30 mar77i joined #git
20:30 lyxus joined #git
20:31 jstein_ joined #git
20:34 timvisher joined #git
20:36 zzz joined #git
20:36 stickperson joined #git
20:40 DolphinDream joined #git
20:49 Atm0spher1c joined #git
20:50 boombatower joined #git
20:52 daviid joined #git
20:53 daviid i just did this:
20:54 daviid mkdir guile-cv.git; cd guile-cv.git; git init; cd anotherplace; git clone <patto>/guile-cv.git
20:54 lyxus joined #git
20:54 daviid then aded a couple of files, commit and tried to push to master but treceived this message
20:54 daviid error: failed to push some refs to '/usr/local/local.git/guile-cv.git'
20:55 daviid ! [remote rejected] master -> master (branch is currently checked out)
20:55 daviid what did I do wrong in this initialization attempt?
20:57 aard_ joined #git
20:59 mentazoom joined #git
21:01 publio joined #git
21:03 ssitani joined #git
21:03 mentazoom joined #git
21:05 cdown_ joined #git
21:05 Rodya_ joined #git
21:05 tmsmith joined #git
21:08 Mikerhinos joined #git
21:08 Mutter joined #git
21:08 kyan joined #git
21:09 mehola joined #git
21:10 z3t0 joined #git
21:10 gugah joined #git
21:11 z3t0 hi
21:11 matsaman heyo z
21:12 sdothum joined #git
21:13 z3t0 anyone know how to bypass school networks, someone here suggested ssh yesterday?
21:13 matsaman what're the OSes involved?
21:14 sea-gull joined #git
21:15 timvisher joined #git
21:15 ikelso joined #git
21:17 daviid i can't find how to create a local new git repo
21:17 daviid and clone it locally, and start to use it ...
21:17 exussum_ left #git
21:17 daviid what ever i do it says origin/master is missing
21:18 daviid i do this:
21:18 daviid actually i wrote it above alredy :)
21:18 daviid just lost
21:19 matsaman daviid: git init --bare
21:19 Mutter joined #git
21:19 daviid matsaman: ok, trying
21:20 j416 z3t0: tether through your phone?
21:20 daviid ah matsaman that worked, thanks
21:21 matsaman =)
21:21 Mutter left #git
21:23 mda1 joined #git
21:24 z3t0 i dont have data
21:24 z3t0 matsaman: it would be windows
21:24 z3t0 or osx really
21:24 chachasmooth joined #git
21:24 gugah joined #git
21:25 z3t0 i have admin access on my own macbook which i take to school if that helps
21:25 lvh joined #git
21:25 daviid left #git
21:25 mehola joined #git
21:26 matsaman eh
21:26 matsaman a web-based remote admin service would be simplest
21:27 z3t0 couldnt i do something like ssh tunneling?
21:29 memfrob joined #git
21:29 tasslehoff joined #git
21:30 cebor joined #git
21:30 tasslehoff left #git
21:30 matsaman there's really no limit to the things you can do
21:30 matsaman dunno why anyone bothers trying to make it otherwise
21:30 gugah_ joined #git
21:32 Derperperd joined #git
21:32 memfrob What he said. You can do anything if you put your mind to it. And that includes becoming an orange president!
21:35 memfrob matsaman, maybe it's because the ones who already can do whatever it is don't want anyone else being able to do the same? They enjoy being the alpha as it boosts their ego?
21:35 matsaman maybe, but I think it's just ignorant people pretending they understand security
21:36 matsaman y'know, the people who force you to use a very short password that is impossible to remember or type
21:36 memfrob network security? or what kind? I missed it.
21:36 matsaman making it impossible for you and simple for scripts
21:36 memfrob ok, who forces such a thing?
21:36 matsaman he's just on a "locked down" school network
21:36 matsaman computer janitors, IME
21:36 memfrob oop, gotta run. Sorry :/ will be back!
21:40 miczac joined #git
21:42 kazantip joined #git
21:42 btree left #git
21:43 cebor joined #git
21:44 Derperperd joined #git
21:47 wcpan joined #git
21:48 cdg joined #git
21:50 timvisher joined #git
21:51 MrLawrence joined #git
21:51 lyxus joined #git
21:55 z3t0 yeah its a ridiculous school network *sigh*
21:56 MrLawrence joined #git
21:57 spacelord_ joined #git
22:00 chachasmooth joined #git
22:03 Limes_ joined #git
22:03 mikecmpbll joined #git
22:07 ZeZu joined #git
22:08 heftig_ joined #git
22:08 nitemare joined #git
22:09 sonOfRa joined #git
22:09 Blkt joined #git
22:09 ohcibi joined #git
22:10 BinGOs joined #git
22:10 BinGOs joined #git
22:12 gugah joined #git
22:14 davimore joined #git
22:15 cmn joined #git
22:15 cust joined #git
22:16 cr34ton joined #git
22:16 Guest36461 joined #git
22:17 manuelschneid3r joined #git
22:19 lvh joined #git
22:19 AlexanderS joined #git
22:21 Mikerhinos joined #git
22:22 timvisher joined #git
22:22 cdg joined #git
22:23 stickperson joined #git
22:24 Chinorro joined #git
22:24 adymitruk memfrob: ran out of time yesterday. I still want to see what you are doing and help if at least for the next time.
22:24 svm_invictvs joined #git
22:25 m4sk1n joined #git
22:26 jozwior joined #git
22:27 tristanp joined #git
22:28 Hobbyboy joined #git
22:28 barteks2x joined #git
22:29 z3t0 whats he doing?
22:29 Derperperd joined #git
22:29 theoceaniscool joined #git
22:33 cebor joined #git
22:33 Tobbi joined #git
22:33 sea-gull joined #git
22:35 pity joined #git
22:42 dreiss joined #git
22:42 sdothum joined #git
22:45 davimore_ joined #git
22:47 davimore_ joined #git
22:47 WayToDoor joined #git
22:49 dHoard joined #git
22:52 timvisher joined #git
22:53 cdg_ joined #git
22:53 l33ch joined #git
22:56 Murii joined #git
22:58 miczac_ joined #git
22:59 m0viefreak joined #git
22:59 parsnip joined #git
23:01 atrigent__ joined #git
23:01 fmeerkoetter joined #git
23:02 dave0x6d joined #git
23:04 linuxmodder joined #git
23:04 cdg joined #git
23:05 rivarun joined #git
23:05 sea-gull joined #git
23:09 raspado joined #git
23:10 Derperperd joined #git
23:12 geoid joined #git
23:13 Gloomy joined #git
23:14 Gloomy joined #git
23:15 Gloomy joined #git
23:15 Gloomy joined #git
23:16 pur3eval joined #git
23:16 Gloomy joined #git
23:19 timvisher joined #git
23:19 jeffspeff joined #git
23:21 gugah joined #git
23:22 brent__ joined #git
23:23 hramrach joined #git
23:24 parsnip does it make sense to write a script that checks if there's a recent commit as "Added SHA1 of tagged release commit"?
23:27 moei joined #git
23:28 jwr joined #git
23:28 jwr is there a way that i can make git refuse a commit where file1 changes unless the same commit also includes changes to file2?
23:29 phroa try a pre-commit hook
23:29 phroa man githooks
23:29 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
23:31 jwr phroa: will do, thanks
23:31 phroa or on the server side, pre-receive
23:33 kyan joined #git
23:33 manuelschneid3r joined #git
23:33 Bob8989 joined #git
23:33 heroux joined #git
23:34 bgerber joined #git
23:34 l33ch joined #git
23:35 memfrob adymitruk, you like kernel hacking?
23:35 mehola joined #git
23:36 druonysus_ joined #git
23:36 fatalhalt joined #git
23:38 voldz1tic3n joined #git
23:38 memfrob All I'm doing is backporting all the new security features from kernel 4.8 and 4.9 (usercopy, vmap stacks, whatever is in mainline from the PaX patch)
23:39 l33ch joined #git
23:41 memfrob it's all from KSPP (kernel self protection project) which is essentially a cleaned up version of the PaX + grsec patch
23:42 memfrob but because spender / brad spengler is a complete douchebag and not cooperative at all, a bunch of guys from kernel.org is taking all of his patches written by him and his buddies and refactoring all of it to linus's and GKH's standards
23:44 memfrob man that guy was PISSED when i told him i was working on splitting up his 10MB kernel patch into a bunch of seperate files. i'm like dude, it's GPL, i can do what I want with it, i'm not removing your name from the source or anything, he's like i don't care, i don't approve of what you're doing to my patch, don't touch it.
23:46 cr34ton joined #git
23:47 Naan left #git
23:48 memfrob parsnip, i guess it depends who you ask. i say don't let other's personal opinions reflect what you do with your choices. i don't see why not, so go for it. if it does the job and it works!
23:50 _geoff joined #git
23:50 memfrob I could see it as useful if you're trying to track commits on a regular basis with that message constantly coming through.
23:50 memfrob Matter of fact I don't see a better alternative XD
23:51 memfrob just don't hardcode anything so if the message you're trying to track changes or you want to build on it or adapt it, it won't be hard.
23:55 timvisher joined #git
23:56 tacoshellmcgee joined #git
23:57 chipotle joined #git
23:57 jameser joined #git
23:59 jfelchner_ joined #git

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