Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-30

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

All times shown according to UTC.

Time Nick Message
00:01 mykespb joined #git
00:02 jeffreylevesque joined #git
00:02 Sound joined #git
00:04 johnflux joined #git
00:04 johnflux joined #git
00:05 earnestly joined #git
00:05 Rodya_ joined #git
00:09 fahadash joined #git
00:11 Sound_ joined #git
00:12 DieguezZ joined #git
00:12 cr1tic joined #git
00:15 mizu_no_oto joined #git
00:17 lowercaseman joined #git
00:18 peterbecich joined #git
00:19 Sound_ joined #git
00:22 Cabanossi joined #git
00:23 ozcanesen joined #git
00:24 snowalpaca joined #git
00:26 netj joined #git
00:26 barbos joined #git
00:28 rewt joined #git
00:28 SilverBe joined #git
00:31 zulutango joined #git
00:32 JanC joined #git
00:35 MrWoohoo joined #git
00:36 thiago joined #git
00:36 fstd_ joined #git
00:40 gableroux joined #git
00:41 nowhereman joined #git
00:44 kexmex joined #git
00:45 skered joined #git
00:46 cqi joined #git
00:46 a3Dman joined #git
00:49 lf94 Is there a way to "filter" deleted by us, and delete them?
00:49 lf94 Or do I have to do some sed and grep wizardry
00:53 [Kid] joined #git
00:55 stevenspasbo joined #git
01:00 m0viefreak joined #git
01:01 ojdo joined #git
01:03 Kerwin_chain joined #git
01:04 chipotle joined #git
01:04 ertes joined #git
01:05 lf94 I mean, is there a way to filter "deleted by us" entries in a rebase, and run git rm on them?
01:06 finalbeta joined #git
01:06 kbeflo joined #git
01:07 Rodya_ joined #git
01:09 otiose_ joined #git
01:10 Kerwin_chain joined #git
01:10 a3Dman joined #git
01:12 bremner lf94: I tend to use git status -s | sed wizardry
01:13 cdown joined #git
01:15 d^sh joined #git
01:15 [Kid] joined #git
01:16 cads joined #git
01:17 peepsalot joined #git
01:17 justanotheruser joined #git
01:17 ToBeCloud joined #git
01:18 gugah joined #git
01:20 dsdeiz joined #git
01:20 dsdeiz joined #git
01:24 justanotheruser joined #git
01:24 justanotheruser joined #git
01:28 bongo joined #git
01:29 bailon joined #git
01:30 prg318 joined #git
01:32 chipotle joined #git
01:32 MerinoBailon joined #git
01:35 a3Dman joined #git
01:41 watmm joined #git
01:47 jstimm joined #git
01:47 sunri5e joined #git
01:49 Rodya_ joined #git
01:53 SantaClauze joined #git
01:54 sunrunner20 joined #git
02:02 FilipNortic_ joined #git
02:04 Masber_080 joined #git
02:04 pks joined #git
02:05 SwiftMatt joined #git
02:10 Kyros joined #git
02:11 watabou_ joined #git
02:11 menip joined #git
02:11 nowhereman joined #git
02:12 Introoter joined #git
02:13 thiago joined #git
02:14 Vortex35 joined #git
02:18 DolphinDream joined #git
02:18 Vaelatern joined #git
02:20 gableroux joined #git
02:20 doppo joined #git
02:22 Cabanossi joined #git
02:31 danimal2 joined #git
02:41 MacGyver joined #git
02:43 prg3 joined #git
02:44 chachasmooth joined #git
02:44 lb1c joined #git
02:48 hexagoxel joined #git
02:49 netroxen joined #git
02:57 lagothri1 joined #git
02:58 otiose_ joined #git
02:58 a3Dman joined #git
03:00 juvenal joined #git
03:00 DolphinDream joined #git
03:03 DolphinDream joined #git
03:09 Vaelatern joined #git
03:09 Vaelatern joined #git
03:10 zedronar joined #git
03:12 zedronar joined #git
03:14 a3Dman joined #git
03:16 ozcanesen joined #git
03:16 bmahe joined #git
03:26 phase2 joined #git
03:31 a3Dman joined #git
03:31 Emperor_Earth joined #git
03:31 ozcanesen Hello, I have forked and repository and made commits on master then send pull request, then maintainer asked me to rebase and force-push to my fork, I did rebase before but only with branches. But this time I made commits on master, so that confused me how can I rebase my master to upsteam master
03:35 Cabanossi joined #git
03:36 Rodya_ joined #git
03:37 mizu_no_oto joined #git
03:41 kbeflo_ joined #git
03:41 jeffreylevesque joined #git
03:45 a3Dman joined #git
03:45 kbeflo__ joined #git
03:45 gradleh8 left #git
03:46 danimal2 joined #git
03:47 gradleh8r joined #git
03:50 rwp ozcanesen, You can 'git fetch origin' then 'git rebase origin/master' to rebase your current master against the upstream master.
03:50 ozcanesen rwp: but origin is my fork, not the upstream
03:51 raijin joined #git
03:51 gradleh8r left #git
03:51 gradleh8r joined #git
03:51 gradleh8r left #git
03:51 rwp If the upstream is some other branch, then pull that other branch, rebase against it, then force push it back to your origin.
03:56 Emperor_Earth joined #git
03:59 durham_ joined #git
04:06 a3Dman joined #git
04:06 a3Dman joined #git
04:07 masuberu joined #git
04:09 SwiftMatt joined #git
04:11 Vgr joined #git
04:15 Wulf joined #git
04:17 a3Dman joined #git
04:20 kadoban joined #git
04:26 samcv joined #git
04:27 samcv I need help with `git -p` when i am staging and type `e` to edit the chunk for staging. I have tried removing the +'s from the area i don't want included in the chunk
04:27 samcv i have also tried replacing those +'s with spaces instead. and when i do either of those things it says that i did something wrong, and i'm not sure what it actually wants me to do
04:28 snowkidind joined #git
04:29 samcv actually i just figured it out... ok so i delete fully + lines. and - lines i replace - with a space. was a bit confused there
04:31 a3Dman joined #git
04:34 hvxgr joined #git
04:36 Cabanossi joined #git
04:36 YuGiOhJCJ joined #git
04:37 Rodya_ joined #git
04:41 a3Dman joined #git
04:41 a3Dman joined #git
04:47 tristanp joined #git
04:48 nevodka joined #git
04:48 ZexaronS Hello
04:51 ZexaronS I'm new and I need to do rebase. I have 1 PR on master branch that needs updating. upstream is official, origin is my github fork. I tried the thing rpw suggested to ozcanesen earlier and it didn't do much, first i fetched from uptream, then I rebased "git rebase" since "git rebase upstream master" didn't work had some fatal error, and then i force pushed and it told me everything up to date, but it really didn't do anything to github
04:53 a3Dman joined #git
04:59 SwiftMatt joined #git
04:59 otiose joined #git
05:02 shinnya joined #git
05:05 danimal2 joined #git
05:16 svm_invictvs joined #git
05:18 a3Dman joined #git
05:28 navidr joined #git
05:30 ktchen14 joined #git
05:34 safe joined #git
05:36 robotroll joined #git
05:36 ShapeShifter499 joined #git
05:38 LeBlaaanc joined #git
05:48 peterbecich joined #git
05:48 Kyros joined #git
05:49 gableroux joined #git
05:50 Burgerz joined #git
05:50 peterbecich joined #git
05:51 cyphase joined #git
05:54 matoro joined #git
05:56 gablerou_ joined #git
06:00 dermoth joined #git
06:01 psprint joined #git
06:01 Kerwin_chain joined #git
06:02 psprint Would this suit anybody? A tool that uses Huffman codes and base-1024 encoding to pack ASCII repository data into single string: giturl rsync://github.com/zdharma/history-search-multi-word -r development -p Src/params.c -> gitu://õỔỲ7ƆӋĮƊϹȯÀŦṱÉṔǂЭãѿŒΓȏĤÒṄÅṥҫȜẙПȟϛṄӗŀмþ
06:02 ZexaronS I typed git log and I can't get out of it
06:02 Kerwin_chain joined #git
06:03 ZexaronS ESC not working on bash, fail
06:09 _ikke_ ZexaronS: q
06:09 jagob joined #git
06:09 ZexaronS thanks
06:10 Pursuit joined #git
06:10 _ikke_ That's a pager called less
06:10 dreiss joined #git
06:10 a3Dman joined #git
06:10 _ikke_ git shows output in a pager when it doesn't fit on one screen
06:11 thinkpad joined #git
06:11 diogenese joined #git
06:13 ZexaronS I'm kinda getting used to stuff, it's windows but bash has great window options for scaling, I'm just having hard time understanding the terminology
06:14 _ikke_ Right
06:15 _ikke_ a pager is a program that allows you to gradually show output from a program that has lots of output
06:16 _ikke_ traditionally, you have a pager called more (which windows also has)
06:16 _ikke_ this shows one screen of output, and with space or another button, it will show you some more output
06:17 _ikke_ with less you can arbitrarily scroll up and down through the output
06:21 Cabanossi joined #git
06:24 rokups joined #git
06:28 tohuw joined #git
06:28 QwertyDragon joined #git
06:31 _ng joined #git
06:33 a3Dman joined #git
06:34 User458764 joined #git
06:34 freimatz joined #git
06:36 circ-user-dfkWJ joined #git
06:40 ski7777 joined #git
06:46 sweatsuit joined #git
06:47 Levex joined #git
06:47 nikow joined #git
06:52 Levex joined #git
06:54 Wulf How can I dump the contents of a bundle file (git-bundle) in human readable format?
06:54 danimal2 joined #git
07:00 otiose joined #git
07:00 Levex joined #git
07:05 masuberu joined #git
07:07 Wulf never mind
07:07 Wulf I found git-remote-gcrypt which probably does exactly what I want
07:16 schleppel joined #git
07:19 text1 joined #git
07:28 tohuw joined #git
07:38 rudrab joined #git
07:38 Levex joined #git
07:41 guardian left #git
07:42 NeverDie_ joined #git
07:43 vuoto joined #git
07:44 Nerbrun joined #git
07:44 cha1800 joined #git
07:44 m0viefreak joined #git
07:49 xall joined #git
07:54 zefferno joined #git
07:54 MrMojit0 joined #git
07:55 masuberu joined #git
07:59 j416 Wulf: bundles are not encrypted
08:00 skered joined #git
08:00 barbos joined #git
08:00 thinkpad joined #git
08:01 _main_ joined #git
08:02 _main_ joined #git
08:04 _main_ joined #git
08:05 King_Hual joined #git
08:07 davisonio left #git
08:08 Wulf j416: I know
08:08 Wulf j416: but I thought I could design my own encrypted git backup with bundle.
08:09 MACscr joined #git
08:10 danimal2 joined #git
08:14 ok91 joined #git
08:15 j416 I see
08:16 masuberu joined #git
08:18 xall_ joined #git
08:20 dsdeiz joined #git
08:24 dust_ joined #git
08:27 tohuw joined #git
08:30 routingsparks joined #git
08:31 theoceaniscool joined #git
08:34 arecaceae joined #git
08:40 lavenders1 joined #git
08:42 neunon joined #git
08:47 mdk joined #git
08:47 ShapeShifter499 joined #git
08:51 nickel_dime_look joined #git
08:51 Acerific joined #git
08:55 leeN joined #git
08:55 mkoskar joined #git
08:58 polyrob joined #git
08:58 circ-user-dfkWJ joined #git
09:01 otiose joined #git
09:01 barbos joined #git
09:02 tohuw joined #git
09:02 tohuw joined #git
09:05 SReject is there a way, after a file has been cimmited/updated, to ignore all local changes for all subsequent commits across all forks&clones. basically. I have an example config file uploaded, and don't want the chance of accidentally commiting actual configs. Renaming isn't an option
09:06 earnestly joined #git
09:06 jnavila joined #git
09:07 sarri joined #git
09:07 sarri joined #git
09:09 danimal2 joined #git
09:13 j416 SReject: no.
09:13 j416 SReject: do it properly
09:13 j416 SReject: move the file to config_example or the like
09:13 j416 SReject: then instruct the user to copy that to another location and modify it
09:14 j416 SReject: then, never commit that new file
09:14 j416 SReject: you can also keep the configuration outside of the program folder, to avoid accidental editing
09:18 circ-user-dfkWJ_ joined #git
09:19 rudrab joined #git
09:19 SReject dang. I'm working on a stream overlay and was hoping to use github's gh-pages to run as an example straight from the master branch
09:22 jozwior joined #git
09:22 ndim joined #git
09:23 barbos joined #git
09:24 johnflux joined #git
09:24 johnflux joined #git
09:25 catsup joined #git
09:25 catsup joined #git
09:28 sunrunner20 anybody about at this hour?
09:28 M-ou-se joined #git
09:28 sunrunner20 PM me the answer if you are
09:29 jarnos joined #git
09:29 sunrunner20 I manage a complex, intertwined set of applications (60+ at last count) that I'd like to be able to deploy individual changes for
09:29 sunrunner20 any ideas how to manage that from the Git side of things?
09:30 sunrunner20 have branches for each change that gets merged into development for the test envs and then merged into master for the prod build?
09:30 xaa joined #git
09:33 mikecmpbll joined #git
09:35 tkore joined #git
09:36 User458764 joined #git
09:38 j416 sunrunner20: sounds like you want a microservice architecture of some kind with proper contracts between
09:39 j416 SReject: so read the config from elsewhere, not the repo
09:41 sunrunner20 that doesn't help with how the git layout is done
09:42 sunrunner20 also, such an architectural change is impossible at this point in time.
09:42 Glooomy joined #git
09:44 GT4066 joined #git
09:48 karols146 joined #git
09:50 karols146 /o/
09:50 j416 \o\
09:50 karols146 Try to allchan command
09:50 karols146 something not right again :
09:51 grayjoc joined #git
09:51 Cabanossi joined #git
09:51 j416 sunrunner20: are the applications in separate repos or one?
09:52 sunrunner20 in sum there are some 100+ repos
09:52 sunrunner20 lots of little supporting assemblies
09:53 sunrunner20 and even more assemblies that shouldn't exist
09:53 j416 and you cannot deploy them separately because?
09:53 sunrunner20 but thats a different problem
09:53 sunrunner20 some of them I cn
09:53 sunrunner20 *can
09:53 sunrunner20 some I can't
09:53 sunrunner20 10 or so are COM objects
09:54 sunrunner20 so if I have a compatability break theres 20ish applications that have to be deployed
09:54 misosoup joined #git
09:54 j416 so deploy one and then monitor to see that it works, then deploy another?
09:55 sunrunner20 i'm at the point where I don't need to monitor
09:55 j416 then deploy them all in one go
09:55 sunrunner20 I know when it'll work or not
09:55 sunrunner20 yea
09:55 sunrunner20 but how does that look in the git repo?
09:55 j416 how does what look?
09:56 sunrunner20 the changes beiing deployed
09:56 sunrunner20 is it just one commit cherry picked into master?
09:56 j416 I'm not quite sure what your question is
09:56 j416 are you asking how to deploy?
09:56 sunrunner20 no
09:57 sunrunner20 asking how to properly organize the git repository
09:57 j416 git tracks the history of changes
09:57 j416 it's not a deploy tool per se
09:57 sunrunner20 it also has branches
09:57 j416 you can use many different workflows
09:57 sunrunner20 exactly
09:57 sunrunner20 i'm asking what the best work flow is
09:57 j416 I see
09:57 sunrunner20 because i'm no expert
09:58 visual hey #gits
09:58 ndim joined #git
09:58 sunrunner20 right now my guess is
09:58 j416 I prefer to keep the currently deployed code in the branch called "master"
09:58 visual in an event like "Your local changes ... will be overwritten by merge" after an attempted "git pull"
09:58 sunrunner20 developers get a branch that gets merged into development branch
09:58 visual in case i want to discard the local changes, do i just.. git pull --force?
09:58 visual or remove the file?
09:59 sunrunner20 then I'll merge that feature branch into master and build that for deploy
09:59 j416 sunrunner20: sounds like one way, yes
09:59 sunrunner20 kewl
09:59 sunrunner20 *cool
09:59 j416 sunrunner20: it all depends on how much control you need
10:00 sunrunner20 I'm a Jr level person doing architect level work :|
10:00 visual welcome to being a corporate employee ))
10:00 j416 sunrunner20: in an earlier project, we had devs submit their separate branches to the integrator (a role someone had) and that person would regularly merge all branches and make sure things worked nicely
10:00 sunrunner20 esp small business
10:01 visual pls help with the thing
10:01 phase2 joined #git
10:01 j416 sunrunner20: at my current project, everyone pushes their code to a staging branch that gets automatically deployed to a staging environment, and anyone is allowed to merge that staging branch to production at any time
10:01 User458764 joined #git
10:02 byte512 joined #git
10:02 sunrunner20 my medium-long term plan is to get gitlabs running with a few code lint apps added, then jenkins and a basic test suite
10:02 j416 (but that of course means people need to be sane enough to not push stuff to production on a friday night)
10:02 sunrunner20 i'm lucky enough or unlucky
10:02 j416 visual: !backup
10:02 gitinfo visual: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
10:02 j416 visual: git reset --hard && git pull --ff-only
10:02 sunrunner20 I'm in 100% control of all deployments
10:03 j416 poor you
10:03 visual j416: thank you lad
10:03 sunrunner20 short of a direct order from the owner of the company
10:03 sunrunner20 my word is law
10:03 visual >tfw complaining on irc
10:04 j416 sunrunner20: I suppose each application has a local copy of the COM object code that it compiles?
10:04 sunrunner20 nope
10:04 sunrunner20 unfortunatly
10:04 sunrunner20 com objects are system wide
10:04 steve joined #git
10:04 sunrunner20 period
10:04 sunrunner20 immutable
10:04 j416 this is nuts
10:04 sunrunner20 I'm trying to fix that
10:05 j416 :/
10:05 j416 git alone won't fix it
10:05 sunrunner20 here's a taste
10:05 sunrunner20 my main project rigiht now
10:05 sunrunner20 is to get us off of .net 1.1 onto .net 4.6.2
10:05 chipotle joined #git
10:06 j416 > is to get us off of .net
10:06 j416 I'd have been happy if you just stopped there :P
10:06 sunrunner20 I have carte blanche to do whatever it takes to get the business there without breaking the bank
10:07 sunrunner20 :P j416
10:07 sunrunner20 I rather like c#
10:07 sunrunner20 one of the examples of issues i've run into
10:07 sunrunner20 I sent a ticket/app upgrade back to the developer
10:08 prg3 joined #git
10:08 sunrunner20 because he wrote a old log4net dll to new log4net dll interface dll instead of fixing 30 lines of log4net code
10:08 j416 maybe he needed to.
10:08 sunrunner20 I politely told him to fuck off and do it right
10:08 sunrunner20 no
10:09 sunrunner20 it was 100% pure lazy
10:09 j416 your workplace sounds like hell
10:09 karols146 joined #git
10:10 sunrunner20 its... challengeing
10:10 sunrunner20 but I can get away with a lot of shit which suits me because of some personal issues
10:11 xbob joined #git
10:12 j416 I'm happy I never entered the world of .net
10:13 sunrunner20 I prefer .net over java 10x
10:14 sunrunner20 mostly because the GUI makes sense to me
10:14 sunrunner20 in my few years of college
10:14 sunrunner20 I told my 3 other team mates
10:15 sunrunner20 you write the GUI code
10:15 sunrunner20 I'll do the backend
10:15 j416 heh
10:15 j416 not a big fan of java either
10:15 fakenerd joined #git
10:16 sunrunner20 I think I whipped out the backend code in 2 days for a semester final project
10:16 j416 anyway, did you solve the git issues?
10:18 sunrunner20 not 100%
10:18 sunrunner20 but I think you confirmed i'm on the right track
10:18 sunrunner20 even though "prod build different that test build" breaks a few rules
10:18 j416 I think I gave you two scenarios, maybe you picked one :)
10:19 sunrunner20 I'm hoping to be able to spin up a test environment on the fly soon
10:19 sunrunner20 I'm on vacation technicaly
10:20 sunrunner20 but i've spent it either on work work (so I get those PTO days back while basking in glorious outdoors)
10:20 j416 sounds like technically you're not on vacation
10:20 sunrunner20 or as today, an Alton brown performance and playing with my new android phone
10:20 sunrunner20 which i'm trialing
10:20 j416 good that you almost solved it though
10:20 j416 come back if you have more issues
10:20 sunrunner20 because apple killed the 3.5mm port
10:22 sunrunner20 j416, biggest issue Is I have to build a devops culture/envioronment from scratch
10:23 sunrunner20 with no prior knowledge
10:24 sunrunner20 work cannot continue to be profitable with the model thats in place
10:24 sunrunner20 I've gotten one big expense slaughtered
10:24 sunrunner20 now I have to rework the system to be a well oiled machine
10:25 sunrunner20 (big expense was one person BLAH BLAH I WANT IT NOW)
10:25 sunrunner20 30 man hours later
10:25 sunrunner20 oh we don't need that
10:26 sunrunner20 I keep trying to use this new android phone like my old iphone
10:27 sunrunner20 it of course doesn't work
10:27 j416 sunrunner20: not to sound like a jerk, but there are 1000+ people here; it's probably a good idea to keep discussions on-topic
10:27 sunrunner20 j416, np
10:27 j416 :)
10:28 sunrunner20 some channels are open to off topic when theres not an on topic question to be answered and some arn't
10:28 masuberu joined #git
10:28 j416 good luck with your endeavours, though
10:28 justanotheruser joined #git
10:28 justanotheruser joined #git
10:28 sunrunner20 I'll mark this one mentally to try and keep it on topic
10:29 j416 I'm not sure there is an explicitly stated rule, but I like to think it's a good idea to avoid too much offtopic in general
10:30 sunrunner20 I'm used to offtopic until somebody is like "halp!" then you shutup if you don't have the answer
10:30 Jonuz joined #git
10:31 sunrunner20 anyway, its 5:30am and the booze and sleeping meds have finally kicked in. I'm out. I might see ya'll tommorow. Depends on if I spend all day bleeding my brakes
10:31 justanotheruser joined #git
10:32 j416 o/ gl
10:32 sunrunner20 oh ffs, I need an app to stop playing music after x minutes on android?
10:33 SpeakerToMeat joined #git
10:35 beuker joined #git
10:36 Cabanossi joined #git
10:38 leeN joined #git
10:42 zeroed joined #git
10:43 jarnos joined #git
10:44 raynold joined #git
10:46 satifant joined #git
10:46 roelmonnens joined #git
10:48 basy_ left #git
10:49 basy_ joined #git
10:49 basy joined #git
10:50 felher joined #git
10:52 niax joined #git
10:52 roelmonnens joined #git
10:52 phase2 joined #git
10:54 roelmonnens joined #git
10:54 aw1 joined #git
10:57 cyphase joined #git
10:57 jstein joined #git
10:57 SteffanW joined #git
10:58 anuxivm joined #git
10:59 karols146 joined #git
10:59 armyriad joined #git
11:02 NotKyros joined #git
11:02 otiose joined #git
11:03 TheKyros joined #git
11:04 jesst joined #git
11:06 Cabanossi joined #git
11:06 dersand joined #git
11:08 vrach joined #git
11:10 romank joined #git
11:12 romank joined #git
11:14 _ng joined #git
11:14 h12o joined #git
11:14 romank joined #git
11:15 armyriad joined #git
11:18 tbstbs joined #git
11:18 roelmonnens joined #git
11:19 borkr joined #git
11:21 circ-user-dfkWJ joined #git
11:24 s17 a music-playing app with sleep function
11:27 karols146 cmus ?
11:30 ok92 joined #git
11:30 Kerwin_chain left #git
11:31 PioneerAxon joined #git
11:33 romank joined #git
11:33 mdk joined #git
11:34 rudrab joined #git
11:34 qsx joined #git
11:34 peepsalot joined #git
11:36 Tobbi joined #git
11:36 aw1 joined #git
11:39 Puffball joined #git
11:46 romank joined #git
11:49 romank joined #git
11:52 h12o joined #git
11:52 Murii joined #git
11:53 zefferno joined #git
11:55 fakenerd joined #git
11:58 kexmex joined #git
12:01 mdk joined #git
12:02 romank joined #git
12:02 howdoi joined #git
12:04 Introoter joined #git
12:05 tymczenko joined #git
12:05 mkoskar joined #git
12:05 romank joined #git
12:05 Discovery joined #git
12:06 gnixev joined #git
12:06 Cabanossi joined #git
12:06 groton joined #git
12:06 rt joined #git
12:08 h12o joined #git
12:09 raijin joined #git
12:10 EisNerd joined #git
12:11 bilal joined #git
12:14 bilal joined #git
12:20 jnavila joined #git
12:21 xbob joined #git
12:23 groton joined #git
12:25 leah2 joined #git
12:28 prg3 joined #git
12:28 h12o joined #git
12:31 h12o_ joined #git
12:35 mt joined #git
12:35 moop joined #git
12:36 Cabanossi joined #git
12:37 shennyg joined #git
12:38 zifnab joined #git
12:38 GameGamer43 joined #git
12:40 Ownix joined #git
12:41 ggherdov joined #git
12:42 ionelmc joined #git
12:42 Cork joined #git
12:44 daxroc joined #git
12:45 phtes joined #git
12:45 thinkpad joined #git
12:47 raijin joined #git
12:48 rodarmor joined #git
12:49 mostlybadfly joined #git
12:49 Tee_Pee joined #git
12:51 dpower joined #git
12:53 danimal2 joined #git
12:56 justanotheruser joined #git
13:00 sturner_ joined #git
13:00 karols146 joined #git
13:00 YuGiOhJCJ joined #git
13:02 sturner joined #git
13:02 kbeflo__ joined #git
13:03 otiose joined #git
13:03 infinite joined #git
13:03 h12o joined #git
13:09 xbob joined #git
13:09 raijin joined #git
13:11 User458764 joined #git
13:12 romank joined #git
13:12 DaveTaboola joined #git
13:12 _Noble_Turk_ joined #git
13:13 rogerraymond joined #git
13:15 ismithers joined #git
13:18 dave0x6d joined #git
13:19 xbob joined #git
13:20 ZyX-I joined #git
13:20 chipotle joined #git
13:22 xbob_ joined #git
13:25 bilal joined #git
13:26 livingstn joined #git
13:26 cads joined #git
13:26 bongo joined #git
13:35 bilal joined #git
13:37 h12o joined #git
13:39 bilal joined #git
13:42 wintrytbstbs joined #git
13:44 SwiftMatt joined #git
13:44 mda1 joined #git
13:45 romank joined #git
13:47 Vasya666 joined #git
13:50 ZyX-I joined #git
13:53 mdk joined #git
13:54 livingstn joined #git
13:55 mdk joined #git
13:57 iamthad joined #git
13:58 livingstn joined #git
14:00 DieguezZ joined #git
14:00 bilal joined #git
14:01 raijin joined #git
14:02 Xenophon1 joined #git
14:04 bilal joined #git
14:05 h12o joined #git
14:06 misosoup joined #git
14:06 neunon joined #git
14:06 Kerwin_chain joined #git
14:08 livingstn joined #git
14:09 axk4545 joined #git
14:10 axk4545 sometimes when I do a git status it says it is up to date eventhough I know it is not. It is fixed by a fetch but is there some better fix so that I get accurate info from git status
14:11 circ-user-dfkWJ joined #git
14:11 _ikke_ axk4545: You mean the before / ahead information?
14:12 axk4545 _ikke_: yes.
14:12 _ikke_ That's by design
14:12 _ikke_ git status will not talk to a remote and fetch or push things
14:12 livingstn joined #git
14:12 theoceaniscool joined #git
14:12 _ikke_ git status only reports what it knows based on what you last fetched and/or pushed
14:13 axk4545 _ikke_: so how do I know when I need to fetch?
14:14 _ikke_ whenever convenient or required in your workflow
14:14 rokups joined #git
14:15 maestrojed joined #git
14:17 bilal joined #git
14:17 wcstok joined #git
14:19 netj joined #git
14:19 justanotheruser joined #git
14:20 oskarkv joined #git
14:20 caper joined #git
14:21 digidog joined #git
14:21 am55 joined #git
14:21 mdk joined #git
14:23 LordRyan joined #git
14:23 SpeakerToMeat joined #git
14:24 felher joined #git
14:24 WakiMiko joined #git
14:24 justanotheruser joined #git
14:24 mdk joined #git
14:26 LordRyan joined #git
14:27 justanotheruser joined #git
14:28 mdk joined #git
14:31 mdk joined #git
14:31 justanotheruser joined #git
14:31 Hunter1 joined #git
14:31 netj joined #git
14:31 justanotheruser joined #git
14:32 mdk joined #git
14:33 canton7 joined #git
14:33 WakiMiko joined #git
14:34 ok91 joined #git
14:35 GreenJello joined #git
14:36 GreenJello How do I get this to go away? http://sprunge.us/FgCC tried git checkout -- .config/fish/nvm-wrapper
14:36 Karazhan joined #git
14:37 kbeflo_ joined #git
14:37 GreenJello oh, there was a .git directory in ./config/fish/.git but I removed it
14:38 GreenJello oh there was another .git directory in nvm-wrapper; sigh, sorry
14:38 GreenJello all fixed
14:38 Cabanossi joined #git
14:38 axk4545 left #git
14:38 romank joined #git
14:41 Starky joined #git
14:41 leah2 joined #git
14:42 TikityTik joined #git
14:45 SwiftMatt joined #git
14:46 mda1 joined #git
14:46 MarioBranco joined #git
14:49 Anja__ joined #git
14:49 neunon joined #git
14:49 ayocaine joined #git
14:51 artgoeshere joined #git
14:52 acetakwas joined #git
14:52 raijin joined #git
14:53 neunon joined #git
14:54 groton joined #git
14:54 rkazak joined #git
14:59 Goplat joined #git
14:59 neunon joined #git
14:59 mdk joined #git
15:01 SpeakerToMeat joined #git
15:01 justanotheruser joined #git
15:01 mdk joined #git
15:01 SpeakerToMeat joined #git
15:01 livingstn joined #git
15:02 mdk joined #git
15:02 SpeakerToMeat joined #git
15:02 TheKyros left #git
15:03 neunon joined #git
15:03 mdk joined #git
15:03 peepsalot joined #git
15:03 justanotheruser joined #git
15:03 SpeakerToMeat joined #git
15:03 SpeakerToMeat joined #git
15:03 mdk joined #git
15:03 justanotheruser joined #git
15:03 SpeakerToMeat joined #git
15:03 robotroll joined #git
15:04 otiose joined #git
15:04 SpeakerToMeat joined #git
15:04 SpeakerToMeat joined #git
15:04 mdk joined #git
15:04 justanotheruser joined #git
15:04 SpeakerToMeat joined #git
15:05 SpeakerToMeat joined #git
15:05 SpeakerToMeat joined #git
15:05 justanotheruser joined #git
15:05 barbos joined #git
15:06 SpeakerToMeat joined #git
15:06 justanotheruser joined #git
15:06 SpeakerToMeat joined #git
15:06 SpeakerToMeat joined #git
15:06 justanotheruser joined #git
15:06 tristanp joined #git
15:06 SpeakerToMeat joined #git
15:07 justanotheruser joined #git
15:07 aw1 joined #git
15:07 fahadash joined #git
15:07 SpeakerToMeat joined #git
15:08 SpeakerToMeat joined #git
15:08 SpeakerToMeat joined #git
15:08 SpeakerToMeat joined #git
15:09 SpeakerToMeat joined #git
15:09 justanotheruser joined #git
15:10 bilal joined #git
15:10 SpeakerToMeat joined #git
15:10 justanotheruser joined #git
15:10 DolphinDream joined #git
15:10 leah2 joined #git
15:11 SpeakerToMeat joined #git
15:11 justanotheruser joined #git
15:11 leah2 joined #git
15:11 SpeakerToMeat joined #git
15:12 justanotheruser joined #git
15:12 SpeakerToMeat joined #git
15:13 xall_ joined #git
15:13 justanotheruser joined #git
15:14 SpeakerToMeat joined #git
15:14 bilal joined #git
15:14 justanotheruser joined #git
15:14 gugah joined #git
15:14 SpeakerToMeat joined #git
15:14 justanotheruser joined #git
15:17 rebrec joined #git
15:18 ertes joined #git
15:18 thiago joined #git
15:19 snowkidind joined #git
15:21 mdk joined #git
15:24 Darren_ joined #git
15:25 Gustavo6046 joined #git
15:26 gableroux joined #git
15:27 bilal joined #git
15:28 dreiss joined #git
15:30 artgoeshere joined #git
15:32 livingstn joined #git
15:34 Levex joined #git
15:35 kexmex joined #git
15:39 karols146 joined #git
15:41 circ-user-dfkWJ joined #git
15:44 xbob joined #git
15:46 nowhereman joined #git
15:48 ndim joined #git
15:48 dirtyroshi joined #git
15:48 livingstn joined #git
15:51 livingstn joined #git
15:54 XenophonF joined #git
15:54 FuzzyWuzzyPanda joined #git
15:55 User458764 Hi, how to remove all modification in working directory?
15:55 Ulrar git stash
15:56 Ulrar That'll store them in the stash, you'll be able to access them later if needed (or not)
15:56 j416 that'll just .. stash them
15:56 alexandre9099 joined #git
15:56 User458764 Ulrar thanks
15:57 aw1 joined #git
15:57 noctux joined #git
15:58 buzzLightBeer joined #git
15:59 mentazoom joined #git
15:59 jnavila joined #git
15:59 mjuszczak joined #git
16:01 justanotheruser joined #git
16:03 _ikke_ then it's just a stash pop to remove the stash
16:04 anuxivm left #git
16:05 mjuszczak joined #git
16:05 karols146 joined #git
16:07 justanotheruser joined #git
16:08 justanotheruser joined #git
16:08 justanotheruser joined #git
16:08 justanotheruser joined #git
16:09 justanotheruser joined #git
16:09 bilal joined #git
16:10 francuz joined #git
16:11 sunri5e joined #git
16:11 francuz hello,
16:11 gitinfo francuz: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
16:11 justanotheruser joined #git
16:11 francuz !backup
16:11 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
16:13 acetakwas joined #git
16:14 justanotheruser joined #git
16:15 justanotheruser joined #git
16:16 justanotheruser joined #git
16:17 francuz hi, I worked this week on an existing project where i had to fixed tens of minor little problems, so i made tens of little commit, just 5-15 lines each,     and for a fix I made I found a better way of doing it, so i'd like to "cancel" this commit and make another one with the "new way" i found,                   usually i'd just remove the 15 lines, commit -am "rolling back", doing the new thing, and commit -am "here is
16:17 francuz the new way for problem n°24"                   but the idea is i'd like to keep my commit extra clean so the guy working on this project can understand easily what I changed and why,
16:17 _ikke_ right
16:17 francuz also i'd like to learn how to use Git in a better way than just the bases I use for now,   so what would be "best practice" for cancelling and old commit (the best would be if i could change the old commit),
16:17 _ikke_ is it the last commit?
16:18 francuz not at all, made like 50 commits in between
16:18 _ikke_ any merges?
16:18 _ikke_ since then
16:18 s17 find the hash of the commit before it got commited and checkout that one
16:18 francuz no merges
16:19 _ikke_ You can use rebase --interactive in that case
16:19 cr34ton joined #git
16:19 mhg joined #git
16:20 menip joined #git
16:20 francuz @s17 if i checkout to the commit before, what would be the best way to "recommit" everything but the one i don't want ?
16:21 s17 you don't checkout everything, only the file in question
16:21 s17 then add it again and commit
16:21 King_Hual joined #git
16:21 King_Hual joined #git
16:21 francuz made a few other commits on the same file, (but not same place of the file)
16:22 _ikke_ francuz: Does you coleage already have those commits?
16:23 francuz no,
16:24 _ikke_ rebase involves rewriting history
16:24 francuz (he doesn't even have the git on his computer anymore as he's formating this week, he's going to clone the project when he gets back)
16:24 _ikke_ which is okay for local commits
16:24 _ikke_ ok
16:25 _ikke_ So normally, when its longer ago, you should not bother rewriting history
16:25 _ikke_ !perfect
16:25 gitinfo [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
16:27 francuz looks like it's exactly what i need,
16:29 francuz for late use on other project : is there no git methode like "git cancel ed87a0a1" that would create a new commit that is like the invert of the one you specify ? (dont find method like this and it would surprise me if it doesn't exist on a tool like git)
16:29 bilal joined #git
16:30 _ikke_ man git revert
16:30 gitinfo the git-revert manpage is available at https://gitirc.eu/git-revert.html
16:31 _ikke_ it does exactly what you described
16:31 francuz perfect, thanks
16:33 podlech joined #git
16:34 Burgerz joined #git
16:35 kasual joined #git
16:36 MacWinner joined #git
16:36 theiostream joined #git
16:40 bilal joined #git
16:41 Cabanossi joined #git
16:44 bilal joined #git
16:45 madewokherd joined #git
16:50 bilal joined #git
16:50 humanBird joined #git
16:51 humanBird i don't know why git keeps doing this
16:51 humanBird http://pasteall.org/379549
16:51 humanBird why is ./ tracked as a change... i'm not even doing anything to it
16:52 thiago it's not tracked
16:52 Rodya_ joined #git
16:53 _ikke_ humanBird: try git status -uall
16:54 humanBird oh. git is just changing the paths as you are navigating through the directories in the project
16:54 bilal joined #git
16:54 humanBird annoying
16:54 JanC joined #git
16:54 humanBird shouldn't all of that be relative to the root of where git was initialized anyways?
16:55 SwiftMatt joined #git
16:55 thiago it's relative to where you ran git from
16:55 _ikke_ so that you can do git add file in a subdir
16:55 _ikke_ instead of git add subdir/file even if you are currently in that subdir
16:56 plos joined #git
16:56 humanBird nothing preventing that from being done by default
16:56 thiago early git was like that, it was extremely annoying
16:56 GreenJello left #git
16:56 thiago it's been changed for at least 10 years
16:56 lungaro are remotes pluggable somehow? what if I wanted to do "git remote add s3:/<bucket>" ?
16:56 thiago the one remaining annoyance is git grep
16:56 _ikke_ lungaro: kind of, git has remote backends
16:57 Ratler joined #git
16:57 Ratler joined #git
16:57 lungaro interesting. I'll look into it closer. good to know!
16:57 thiago lungaro: yes, see /usr/lib/git/ (or wherever your distro installs the subcommands)
16:57 _ikke_ git --lib-exec
16:57 _ikke_ sorry --exec-path
17:00 skalpin joined #git
17:01 lungaro appreciate it, I also see git annex. this is pretty cool
17:02 MattMaker joined #git
17:06 otiose joined #git
17:07 jozwior joined #git
17:09 Raging_Hog joined #git
17:12 barbos joined #git
17:12 beuker joined #git
17:16 peacememories joined #git
17:23 mozzarella joined #git
17:24 YuGiOhJCJ joined #git
17:24 dvaske joined #git
17:26 mjuszczak joined #git
17:27 t-mart joined #git
17:27 maarhart joined #git
17:28 humanBird is .gitignore with a /node_modules rule supposed to complain when ./node_modules/.cache is a new file?
17:28 tnecniv joined #git
17:28 roelmonnens joined #git
17:29 kadoban Complain? No, I don't know of any circumstances where .gitignore causes git to complain about anything at all. Are you asking if it'll match that? No, assuming that .gitignore isn't in ./
17:30 kadoban You can check what's up with 'git check-ignore' if it's not clear.
17:30 bilal joined #git
17:32 humanBird http://pasteall.org/379594 is git mentally damaged?
17:33 canton7 no? that file isn't tracked, so of course 'git checkout' doesn't recognise it
17:33 groton left #git
17:34 humanBird i don't understand why it's even trying to say it's a change
17:34 canton7 it's saying that that's a new file
17:34 humanBird http://pasteall.org/379603
17:34 humanBird that file shouldn't even show up as a change
17:34 canton7 "/node_modules" means "the node_modules folder in the root of the repo"
17:34 canton7 your node_modules folder *isn't* at the root of the repo, so it doesn't match that rule
17:35 humanBird damnit. this react dajgno integration is becoming a pain in the ass
17:35 canton7 just use "node_modules" (no leading "/") if you mean a node_modules folder anywhere
17:36 kadoban Soundsn like something that should go in a non-repo-specific ignore file, by the way. Usually people have one in their home directory with general ignores like that.
17:36 canton7 nah, that should go in the repo's .gitignore
17:37 canton7 since everyone who uses the repo will want to ignore it
17:37 webdev007 joined #git
17:37 canton7 you don't want someone contributing a PR which adds node_modules by accident, because it wasn't in your .gitignore
17:37 kadoban Isn't node_modules general to pretty much all node.js projects?
17:37 canton7 yes, but that's not my point
17:38 kadoban No use having that in every .gitignore file in every node.js project. That's just kind of annoyingly duplicated.
17:38 jackrandom joined #git
17:38 canton7 you're not addressing my point: you don't want everyone who contributes to the repo to have to set up their own personal ignore of node_modules
17:38 kadoban Yes, I do. I don't want to have to add 12 things to .gitignore every time I start a project.
17:39 canton7 yes, you get duplication between different .gitignore files, but that's fine. It means that each repo is self-contained, and people don't need a bunch of setup steps in order to use a repo
17:39 canton7 just use a skeleton/template .gitignore
17:40 canton7 "before contributing to this project, please perform the following steps: 1) setup a global .gitignore list, 2) add 'node_modules' to that list, 3) ....". What if that contributer wants node_modules to be tracked for a single project?
17:41 caper joined #git
17:42 earnestly joined #git
17:47 theoceaniscool joined #git
17:51 sammyo joined #git
17:54 chubek_ joined #git
17:55 Random832 joined #git
17:55 nedbat canton7: strange: why doesn't the project just put node_modules in their .gitignore file?
17:56 * nedbat is late to the discussion, and is probably mis-targeting...
17:57 barbos joined #git
17:58 sammyo joined #git
18:00 maarhart joined #git
18:02 tristanp joined #git
18:03 rastos2 joined #git
18:03 User458764 joined #git
18:05 cr34ton joined #git
18:06 ertes joined #git
18:08 kexmex joined #git
18:09 barbos joined #git
18:10 raijin joined #git
18:11 bilal joined #git
18:11 tanuki_ joined #git
18:15 raijin joined #git
18:15 barbos joined #git
18:15 chachasmooth joined #git
18:17 bernd27 joined #git
18:17 Discovery joined #git
18:17 ketas joined #git
18:18 tanuki joined #git
18:18 ugjka_ joined #git
18:18 cha1800 joined #git
18:18 chachasmooth joined #git
18:20 pwnz0r joined #git
18:26 Cabanossi joined #git
18:27 anuxivm joined #git
18:27 finalbeta joined #git
18:34 barbos joined #git
18:34 miczac joined #git
18:35 kadoban canton7: Why would a JS programmer who uses node even need to be told that? Doesn't make a lot of sense to me. What do you do for projects where there's a bunch of different compilers someone could be using then, with different build artifacts and etc.?
18:35 kadoban One per dev makes a lot more sense to me than once per project.
18:37 User458764 joined #git
18:37 miczac Hi, I'm trying to update a branch with the latest changes from master. So being checkout to this branch I'd think I have to merge. But I'm not sure how to limit that to avoid a total mess.
18:38 kadoban Your options are essentially limited to merge, rebase or cherry-pick.
18:38 kadoban I'm not sure what you mean limit it. Are there only certain changes you want?
18:39 miczac_ joined #git
18:39 shgysk8zer0 joined #git
18:44 raijin joined #git
18:44 xaa joined #git
18:44 acetakwas joined #git
18:44 miczac kadoban: Basically I was testing new ideas in the branch and tried not to touch this parts of code in master. A test merge I did from the branch to master (in case I'm happy w/ the changes) showed some minor conflicts. No big deal. For a test I'd try to merge from master all changes since the creation of the branch. This should result in similar merge conflicts. I'm not sure, so I'm probably...
18:44 miczac ...too careful not to totally mess up
18:45 kadoban Yeah, that would usually result in a similar set of conflicts. If you're unsure, you can create a copy of the branch (git checkout thebranch && git checkout -b testbranch) and merge into that. Then if it somehow goes very bad, just nuke the test branch.
18:45 kadoban Or if you're really unsure, !backup is always fine.
18:45 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
18:46 mjuszczak joined #git
18:46 Ulrar left #git
18:47 tymczenko joined #git
18:49 miczac kadoban: that's my thinking ... I think it's better to  merge the changes from master before the differences grow too big. Lack of routine causes lack of certainty. ;)  And backup is the concept of surviving! Thx for help!  I'll try the branch copy.
18:50 kadoban Probably not a bad idea. I tend not to do that unless I actually need changes from master, but then most of my feature branchs don't last too long, typically.
18:53 chachasmooth joined #git
18:54 bilal joined #git
18:59 mkoskar joined #git
19:00 yqt joined #git
19:01 AndreasLutro joined #git
19:02 ahrs joined #git
19:03 chachasmooth joined #git
19:04 dustinm joined #git
19:05 bilal joined #git
19:05 miczac yeah, this one here is a year or so old. I'm spinning too many ideas and want to test them in the current environment. Reality-check so to speak. Lets see ... copying the branch is a good idea anyway.
19:05 jnavila joined #git
19:06 finalbeta joined #git
19:07 nadley joined #git
19:07 _rgn joined #git
19:07 otiose joined #git
19:09 chachasmooth joined #git
19:10 tymczenko joined #git
19:11 njbair joined #git
19:11 Achylles joined #git
19:12 bilal joined #git
19:12 dermoth_ joined #git
19:14 bilal joined #git
19:16 texasmynsted joined #git
19:19 bilal joined #git
19:19 otiose joined #git
19:21 miczac_ not good
19:22 justanotheruser joined #git
19:25 chachasmooth joined #git
19:26 Cabanossi joined #git
19:28 Cabanossi joined #git
19:29 Hunter1 joined #git
19:33 bilal joined #git
19:35 borkr joined #git
19:35 livingstn joined #git
19:37 unreal joined #git
19:38 madewokherd joined #git
19:38 diogenese joined #git
19:43 jnewt joined #git
19:45 bilal joined #git
19:46 finalbeta joined #git
19:47 peacememories joined #git
19:50 Acerific joined #git
19:51 dka joined #git
19:51 dka is there a way to tell "git clone" to not complain about host key checking?
19:52 dka is there a way to tell "git clone" to not complain about host key checking when doing ssh clone ?
19:52 kadoban What is this complaining it's doing? Usually those messages are quite important.
19:52 _ikke_ dka: that's pure ssh
19:53 dka imo
19:55 MattMaker joined #git
19:56 rwp If you are cloning and using ssh for the protocol then ssh is the software that is issuing those warnings.
19:56 rwp You can set ssh option "CheckHostIP no" to avoid checking for IP addresses.
19:57 rwp You can set other options too.  But AFAIK there isn't a way to silence ssh to all warnings since some security warnings are considered too important to silence.
19:58 freimatz joined #git
19:59 _ikke_ Rightly so
20:00 justanotheruser joined #git
20:00 ozcanesen joined #git
20:01 TheSimonator joined #git
20:01 Hello71 joined #git
20:02 ozcanesen is fetch and then checkout same as checkout and then pull?
20:02 rwp I set my own config so that connections to my RFC1918 addresses as hostnames use /dev/null for the known hosts file. Those are throwaway VMs in my environment.
20:03 _ikke_ ozcanesen: no
20:03 rwp Then I turn off strict host checking for those hosts too.
20:03 _ikke_ ozcanesen: pull == fetch + merge
20:03 tmcmahon joined #git
20:03 safe joined #git
20:04 rwp ozcanesen, "fetch" (in typical use) pulls the upstream origin branch (usually master) to origin/master which is your remote. Remotes master -> to the local origin/master.
20:04 rwp With fetch no merge is performed. With fetch it does not affect the working copy at all. It just updates origin/master.
20:05 ozcanesen _ikke_: I see, in my case there is no local changes on that branch, so that is why I am confused, thought they are the same
20:05 rwp git checkout affects the local working copy from the local repositor (local meaning not from origin/master)
20:06 rwp On typically will merge from origin/master into the locally checked out master. But that is just one possibility out of endless many possibilities and different workflows.
20:07 Starky joined #git
20:08 bl0w3d_0ut joined #git
20:13 ozcanesen rwp, sometimes git fetch origin/master works but sometimes it expects git fetch origin master without slash
20:13 ozcanesen i am pretty sure that I have used remotename/branch before
20:13 ozcanesen but it does not work now
20:13 aidalgol joined #git
20:13 jast 'git fetch origin/master' is never correct
20:14 ozcanesen jast, maybe with git rebase remote/branch?
20:14 jast yeah, that's more like it
20:15 jast fetch/pull and push are the exceptions where it needs the two separately, pretty much everything else takes the name of the remote-tracking branch (which is remote/branch)
20:16 ozcanesen jast, thank you, everything is more clear now
20:21 misosoup joined #git
20:28 Achylles joined #git
20:33 peepsalot joined #git
20:33 ok91 joined #git
20:33 immae joined #git
20:35 bilal joined #git
20:35 netj joined #git
20:36 Hunter1 joined #git
20:37 bilal joined #git
20:37 tribly joined #git
20:43 juvenal joined #git
20:46 tnecniv joined #git
20:48 zeroed joined #git
20:48 zeroed joined #git
20:55 raijin joined #git
20:55 Starky joined #git
20:56 zeroed joined #git
20:56 Atm0spher1c joined #git
20:58 m4sk1n joined #git
20:58 m4sk1n hi, how can I clone only headers from git remote?
20:58 ertesx joined #git
20:59 tnecniv joined #git
20:59 kadoban What's a header in this context?
21:00 m4sk1n .git
21:00 m4sk1n folder content
21:01 kadoban That's probably clone with --bare, though I think you might be overestimating what that's going to save you.
21:02 Kqis joined #git
21:02 m4sk1n it still downloads everything
21:02 kadoban Yes
21:04 kadoban ".git folder content" is probably less meaningful than what you're imagining. But it likely doesn't matter, history is for the most part all or nothing. There are "shallow" clones but that just means you can only go back a certain amount, the recent history and blobs are all there.
21:05 roelmonnens joined #git
21:06 hashpuppy joined #git
21:07 cdown joined #git
21:09 paultreny joined #git
21:09 ozcanesen joined #git
21:11 tnecniv joined #git
21:13 publio joined #git
21:13 borkr joined #git
21:13 babilen joined #git
21:14 tnecniv joined #git
21:14 rwp ozcanesen, I was being specific with origin/master there to indicate that it was the remote branch. That wasn't the actual command.
21:15 bilal joined #git
21:16 rwp Plus one needs to be careful with the syntax or they will create a local branch literally "origin/master" along with the remote and branch of the same name. That will get confusing.
21:19 ozcanesen rwp, hmm. why / allowed in branch name?
21:19 rwp But you can "git fetch origin" and then "git log origin/master" to look at the upstream without merging it into the current working copy.
21:19 Dow joined #git
21:19 rwp I think you mean why not instead of why. And the answer is that they are allowed but that means the local branches not the remote branches.
21:20 rwp This is an area where I think git is really quite confusing. Local branches have one syntax and remote repositories appear to use a different syntax. Because they go through the git-remote code and not the git-branch code.
21:20 otiose joined #git
21:20 kadoban ozcanesen: Beacuse it's useful
21:21 rwp For working with local branches you read the docs for git-branch.  But for looking at anything to do with remotes you look at the docs for git-remote.
21:21 rwp Since those are different they have different capabilities and features.
21:22 juvenal joined #git
21:22 texasmynsted joined #git
21:30 robattila256 joined #git
21:30 maroloccio joined #git
21:30 mel00010 joined #git
21:32 miczac kadoban: wow, 23 conflicts. I guess I got something to solve! Thx it's just a test branch
21:32 johnflux joined #git
21:34 zacts joined #git
21:34 theoceaniscool joined #git
21:34 blueyed joined #git
21:35 texasmynsted joined #git
21:38 tymczenko joined #git
21:38 tnecniv joined #git
21:39 tmcmahon joined #git
21:41 tnecniv joined #git
21:43 Lyqyd joined #git
21:47 YuGiOhJCJ joined #git
21:54 bilal joined #git
21:55 justan0theruser joined #git
21:56 kadoban 23 could be ... not too bad. Depending, heh.
21:56 nivag joined #git
21:57 cagomez joined #git
21:58 caper joined #git
22:00 cebor joined #git
22:02 skered Is there a git'ish way to reset a branch back to a give commitid but keep the changes as unstaged?  Right I was thinking 'git diff ... > file.patch', git reset --hard commit, patch ... < file.patch'
22:02 tsdev joined #git
22:02 rewt man git reset
22:02 gitinfo the git-reset manpage is available at https://gitirc.eu/git-reset.html
22:02 tsdev left #git
22:03 rewt maybe --soft
22:03 kadoban Indeed sounds like one of the resets, though I'm not sure which one from the description.
22:03 tsdev joined #git
22:03 bilal joined #git
22:05 astrofog joined #git
22:06 masuberu joined #git
22:06 Stumbler joined #git
22:07 skered I think --merge is it?
22:07 skered --soft doesn't update the working tree
22:07 skered Which is the 'patch ... < file.patch' part.
22:09 asd5a joined #git
22:10 skered or not..
22:10 tnecniv joined #git
22:11 justanotheruser joined #git
22:11 Cabanossi joined #git
22:12 dave0x6d joined #git
22:12 skered Ok well maybe --soft is it but vim-fugitive isn't pickup the changes.  'git status' displays as expect (and as the man page says)
22:12 justanotheruser joined #git
22:13 ToxicFrog joined #git
22:13 tbstbs joined #git
22:13 justanotheruser joined #git
22:13 skered Ok.. --mixed did it.
22:17 justanotheruser joined #git
22:19 justanotheruser joined #git
22:20 njbair joined #git
22:25 matt|home quick question - if i do "git clone [repo]" , and the repo has been updated on the server that i cloned it from, do i just run the command again to update all the files, or is there some update command?
22:26 matt|home if that makes sense
22:26 kadoban Using git just to download/distribute some project is kind of crap, but 'git pull --ff-only' should often "work" for various values of work.
22:27 mmattice git remote update; git status # will usually tell you what to do to get current
22:28 matt|home thank you
22:28 dsdeiz joined #git
22:28 dsdeiz joined #git
22:29 kadoban Never heard of 'git remote update' before. Sounds like it does a fetch on ... some set of remotes? Weird.
22:30 telephone joined #git
22:30 telephone joined #git
22:31 TheSimonator joined #git
22:32 tmcmahon joined #git
22:32 nd_ joined #git
22:35 ok92 joined #git
22:40 MacWinner joined #git
22:40 dedicated joined #git
22:44 ToBeCloud joined #git
22:45 Hunter1 joined #git
22:46 robotroll joined #git
22:47 danemacmillan joined #git
22:51 tnecniv joined #git
22:53 gnixev joined #git
22:58 ToxicFrog Yeah, it looks like it might be similar to `git fetch --all`?
22:58 kadoban Seems quite similar to it in practice, but more useful/configurable in weird use-cases.
23:00 ToxicFrog left #git
23:03 texasmynsted I am trying to use my local git repot but it is reporting status that doe not make sense and when I try stash I see https://gist.github.com/mmynsted/9684abc40459eb8dee65de4afc507806
23:06 texasmynsted hmm some git reset —hard, rm files, and git pull seems to have fixed it
23:07 raijin joined #git
23:07 alexandre9099 joined #git
23:08 jaziz joined #git
23:13 fxrs joined #git
23:20 misosoup joined #git
23:20 Calinou joined #git
23:21 justan0theruser joined #git
23:21 otiose joined #git
23:25 miczac joined #git
23:26 Cabanossi joined #git
23:29 sturner_ joined #git
23:32 chipotle joined #git
23:32 gableroux joined #git
23:33 tnecniv joined #git
23:35 chipotle joined #git
23:37 feodoran joined #git
23:39 tnecniv joined #git
23:41 BorkStick joined #git
23:44 gugah joined #git
23:46 P4nther joined #git
23:47 _lvb_ joined #git
23:48 gnixev joined #git
23:49 dsdeiz joined #git
23:49 dsdeiz joined #git
23:51 bannakaffalatta joined #git
23:55 matt|home after i edit the .git/config file 'cause i made a mistake in a repo, is there anything i have to do to "refresh" that bit or just run git status to make sure everything's solid

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