Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-28

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

All times shown according to UTC.

Time Nick Message
00:00 MacWinner joined #git
00:01 rivarun joined #git
00:01 fission6 joined #git
00:01 de-facto joined #git
00:04 maarhart joined #git
00:06 oxguy3 joined #git
00:13 peepsalot joined #git
00:15 om_henners joined #git
00:16 marianina8 joined #git
00:19 jimklo_ joined #git
00:20 gugah joined #git
00:20 rivarun joined #git
00:20 biotim joined #git
00:24 marianina8 joined #git
00:24 rivarun joined #git
00:25 livingstn joined #git
00:25 Sasazuka joined #git
00:27 ocelotsloth joined #git
00:31 osk| joined #git
00:31 nckpz joined #git
00:33 matoro joined #git
00:33 thebope joined #git
00:34 am55 joined #git
00:35 gopar joined #git
00:37 Kaisyu joined #git
00:38 qpdb joined #git
00:41 fission6 joined #git
00:42 Cabanossi joined #git
00:42 onehrxn joined #git
00:43 dsdeiz joined #git
00:44 brent__ joined #git
00:46 MarioBranco joined #git
00:50 marianina8 joined #git
00:50 gugah joined #git
00:53 cqi joined #git
00:54 ncthom91 joined #git
00:57 gunnerman joined #git
00:57 mda1 joined #git
00:58 Keverw joined #git
00:58 dnukem joined #git
01:00 gunnerman Hello. I have a question about using remote repositories and web files. Anyone here to help?
01:01 sunrunner20 joined #git
01:02 pietv joined #git
01:02 thebope joined #git
01:02 rchavik joined #git
01:03 kadoban gunnerman: Several hundred people, you can just ask your followup question
01:06 Ryanar joined #git
01:09 Rodya_ joined #git
01:09 gunnerman I have set up a remote repository on GitLab. We have production, test, and development webservers. Right now it is just two developers, me and another person. The other developer does mostly work with front end web development and usually edits files via ssh on the servers. I use an IDE set up with sftp. Ideally, we would like to work on test and dev and production would get updates from the repo. My question is, what might be an id
01:11 matoro joined #git
01:11 gunnerman files on test and dev servers? I.e. do I clone the master on the server and then clone from the server again to my local machine? Or do I make changes via ftp and then do commits etc. via ssh on the server?
01:13 gunnerman The test and dev server names don't really carry any meaning for workflow. I do most of my work on dev and the other person does their work on test. We then copy to production after development and testing.
01:13 _Vi joined #git
01:16 rwp gunnerman, This is one of those hard questions because there is no single right answer. The system is flexible and you get to choose what you would like to do. Which of course is like giving a starving man a menu. :-)
01:16 rwp What I would do...
01:17 rwp What I would do is to have each of you work in your own working copy sandbox area separate from each other. I would not have both of you share the same work area.
01:17 rwp Then each of you can commit into your repository separately as you make changes you want to share. Then push them to the master when you are ready for the other person to see them.
01:18 rwp Then I would have the dev, test, production servers do a git pull when you want to move changes to them.
01:19 nckpz joined #git
01:19 rwp gunnerman, There is a reference I think you should look at though.  I will ask the irc bot to tell you about !deploy for additional reading.
01:19 gitinfo gunnerman: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
01:20 sz0 joined #git
01:21 de-facto joined #git
01:21 Rodya__ joined #git
01:21 bannakaffalatta joined #git
01:21 Chch joined #git
01:23 rewt`` joined #git
01:24 patarr_ joined #git
01:24 NeverDie joined #git
01:25 yaewa joined #git
01:25 gunnerman That is what I was thinking. I don't mean for it to be a deployment tool I am just trying to select a process that is simple enough that I wont see people uploading files with a bunch of unreleated changes before finally remembering to commit but we also want to keep versioning info comprehensive and usable.
01:26 NeverDie joined #git
01:26 sz0 joined #git
01:26 dave0x6d joined #git
01:26 tobie joined #git
01:27 belak joined #git
01:27 Ownix joined #git
01:27 shennyg joined #git
01:27 nezZario joined #git
01:27 dreiss joined #git
01:27 tharuin joined #git
01:27 eshlox joined #git
01:27 flupke joined #git
01:27 pks joined #git
01:28 Wulf4 joined #git
01:28 AustinMatherne joined #git
01:28 kdeal joined #git
01:28 bgerber joined #git
01:28 SuperLag joined #git
01:28 xkr47 joined #git
01:29 gunnerman For the SSH only user, it is easy to make the changes and commit in the same window. A little bit cumbersome if I am working in an ide and I need to maintain an ssh session to commit/branch/etc and then resync local files if I do branch.
01:29 gkatsev joined #git
01:29 waveclaw joined #git
01:29 arand joined #git
01:29 peterbecich joined #git
01:31 finalbeta joined #git
01:31 Hedgework joined #git
01:32 bipolar joined #git
01:32 jgornick joined #git
01:32 Gunni joined #git
01:32 SleePy joined #git
01:32 amdi_ joined #git
01:32 Eugene joined #git
01:33 snowkidind joined #git
01:34 fstd_ joined #git
01:36 bgerber joined #git
01:36 durham_ joined #git
01:36 biotim joined #git
01:37 Es0teric joined #git
01:37 parasite_ joined #git
01:37 rnsanchez joined #git
01:37 gnoirzox2 joined #git
01:41 Cabanossi joined #git
01:46 a_thakur joined #git
01:46 ekinmur joined #git
01:46 Es0teric joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:50 LeBlaaanc joined #git
01:50 pks joined #git
01:52 alexandre9099 joined #git
01:52 de-facto joined #git
01:52 fahadash joined #git
01:54 hahuang61 joined #git
01:59 cvcxc__ joined #git
02:00 lavalamp joined #git
02:02 alexandre9099_ joined #git
02:03 d^sh joined #git
02:03 dsdeiz joined #git
02:04 chipotle joined #git
02:06 buzzLightBeer joined #git
02:08 _W_ joined #git
02:10 chachasmooth joined #git
02:11 Cabanossi joined #git
02:13 buzzLightBeer joined #git
02:20 amdi_ joined #git
02:20 roentgen joined #git
02:20 raspado joined #git
02:21 Chch joined #git
02:21 lagothri1 joined #git
02:26 Emperor_Earth joined #git
02:27 madewokherd joined #git
02:27 MrJoshua joined #git
02:28 hexagoxel joined #git
02:30 raspado joined #git
02:32 livingstn joined #git
02:32 dreiss joined #git
02:36 mizu_no_oto joined #git
02:39 s2013 joined #git
02:40 atrigent joined #git
02:41 livingst_ joined #git
02:44 wagle joined #git
02:49 raspado joined #git
02:51 drodger joined #git
02:56 jameser joined #git
02:56 mischat joined #git
02:57 Vortex35 joined #git
02:57 drodger joined #git
02:59 a_thakur joined #git
02:59 thebope joined #git
03:05 raynold joined #git
03:06 chachasmooth joined #git
03:06 ojdo joined #git
03:10 Cabanossi joined #git
03:11 NoOutlet joined #git
03:15 andrew710 joined #git
03:16 thedudez0r joined #git
03:19 cqi joined #git
03:22 kbeflo joined #git
03:25 Awesomecase joined #git
03:29 dreiss joined #git
03:30 watabou joined #git
03:35 cyphase joined #git
03:35 Skyfinn joined #git
03:37 atrigent joined #git
03:37 hahuang61 joined #git
03:38 Atrumx joined #git
03:39 buzzLightBeer joined #git
03:39 aavrug joined #git
03:40 NightMonkey joined #git
03:40 Cabanossi joined #git
03:41 aavrug joined #git
03:45 bannakaf_ joined #git
03:46 IRCFrEAK joined #git
03:48 IRCFrEAK left #git
03:51 noteness_ joined #git
03:52 andrew710 joined #git
03:53 MasterNayru joined #git
03:53 a_thakur joined #git
03:54 thebope joined #git
03:54 CmndrSp0ck joined #git
04:01 matoro joined #git
04:03 a_thakur joined #git
04:03 prg3 joined #git
04:04 xissburg joined #git
04:06 Goplat joined #git
04:07 bocaneri joined #git
04:08 darkbit joined #git
04:11 bocaneri joined #git
04:11 Rodya_ joined #git
04:20 mknod joined #git
04:21 jameser joined #git
04:23 dreiss joined #git
04:24 Andrew_K joined #git
04:24 mehola joined #git
04:27 nevodka joined #git
04:31 elinux joined #git
04:35 starkhalo joined #git
04:39 menip joined #git
04:40 aidalgol joined #git
04:41 Noodlewitt joined #git
04:43 nowhere_man joined #git
04:43 buzzLightBeer joined #git
04:43 shinnya joined #git
04:45 atrigent joined #git
04:45 zerow joined #git
04:48 holodoc joined #git
04:50 hvn0413 joined #git
04:51 raspado joined #git
04:51 hvn0413 left #git
04:55 atrigent_ joined #git
04:56 ayogi joined #git
04:58 andrew710 joined #git
05:02 rscata joined #git
05:02 hotbobby joined #git
05:02 hotbobby when trying to update my fork to the original. base fork is mine and head fork is the original?
05:02 hotbobby i dont want to accidentally send a pull request to the original repo
05:03 dec0n joined #git
05:05 bakibour joined #git
05:05 bakibour left #git
05:05 dmc not familiar with the terms "base fork" and "head fork"
05:05 bourbaki joined #git
05:05 dmc I tend to have upstream as the origin remote
05:05 hotbobby im using the github website
05:05 hotbobby it refers to them as base and head forks
05:05 dmc and name the remote for my fork "fork"
05:06 bourbaki Hidiho, i get the following error, as you can see im running Windows (fatal: could not create leading directories of 'C:/Program Files (x86)/Jenkins/workspace/BuildUpdate/StudioSettings/Global/.git')
05:06 dmc hotbobby, #github
05:06 rscata joined #git
05:06 bourbaki I read that it is a problem to use single quotes for paths with whitespaces, is this correct?
05:07 hotbobby dmc: sorry i thought thats what this was -- im in the wrong place :P
05:07 dmc heheh
05:07 bourbaki This error has been produced by a,    git submodule update
05:07 dsdeiz joined #git
05:07 drodger joined #git
05:08 hotbobby left #git
05:10 Renter I just found out about git push origin :branchname
05:11 Renter thanks linus
05:11 Renter thanks
05:11 a_thakur joined #git
05:11 Cabanossi joined #git
05:11 Rodya_ joined #git
05:12 dmc lol
05:12 mischat joined #git
05:13 nowhere_man joined #git
05:18 GT4066 joined #git
05:18 Brski joined #git
05:19 Renter the worst part about it is looking at it it starts to make sense
05:19 Renter I can feel it sinking into my brain as something I'll just quietly accept, and in a year or so explain to someone 'oh, it's easy you just...'
05:21 jungsubk joined #git
05:22 darkbit joined #git
05:22 Skyfinn joined #git
05:22 ozmage joined #git
05:22 raijin joined #git
05:25 glebihan joined #git
05:26 ozmage_ joined #git
05:26 bariscant joined #git
05:26 nowhere_man joined #git
05:27 Nilesh_ joined #git
05:27 fakenerd joined #git
05:27 sncder joined #git
05:28 fakenerd joined #git
05:28 Raging_Hog joined #git
05:30 _August_ joined #git
05:30 yushyin Renter: but you can also use git push origin --delete <branchname>
05:31 nowhere_man joined #git
05:33 Mo joined #git
05:35 overlord_tm joined #git
05:36 acetakwas joined #git
05:38 hahuang61 joined #git
05:39 dersand joined #git
05:41 imack joined #git
05:41 pks joined #git
05:42 Mindiell joined #git
05:42 thebope joined #git
05:42 Mindiell hi there, I installed a git server and now, each time I do a "git push", the user gt stays connected
05:42 Mindiell s/gt/git
05:43 Mindiell so, after some days of work I got a lot of "git sessions git@notty"
05:43 kodo[m] left #git
05:43 Mindiell if anyone knows the problem... you'll be welcome ;)
05:45 frobnic joined #git
05:46 geoid joined #git
05:47 go1111111 joined #git
05:47 svm_invictvs joined #git
05:52 go1111111 joined #git
05:53 MutantMahesh joined #git
05:53 ThomasLocke joined #git
05:54 freimatz joined #git
05:54 nowhere_man joined #git
05:56 Cabanossi joined #git
05:56 marianina8 joined #git
05:57 Assault joined #git
05:57 rokups joined #git
05:58 diogenese joined #git
06:07 HurricaneHarry joined #git
06:08 jagob joined #git
06:08 jungsubk joined #git
06:09 Silmarilion joined #git
06:10 t0by joined #git
06:10 t0by joined #git
06:13 Rodya_ joined #git
06:13 go1111111 joined #git
06:15 MutantMa_ joined #git
06:15 a_thakur joined #git
06:15 jungsubk joined #git
06:15 cam27_ joined #git
06:15 marianina8 joined #git
06:15 chele joined #git
06:16 pks joined #git
06:17 inflames joined #git
06:22 z8z joined #git
06:23 thiago joined #git
06:24 schleppel joined #git
06:27 zerow_ joined #git
06:30 raijin joined #git
06:31 jnavila joined #git
06:31 zerow_ left #git
06:32 zerow joined #git
06:33 zeroed joined #git
06:33 zeroed joined #git
06:34 King_Hual joined #git
06:35 qt-x joined #git
06:36 sncder joined #git
06:36 thebope joined #git
06:39 hahuang61 joined #git
06:41 patarr joined #git
06:41 sncder joined #git
06:43 masuberu joined #git
06:44 starkhallo joined #git
06:46 aboccia joined #git
06:47 roelmonnens joined #git
06:50 Zarthus joined #git
06:51 chardan joined #git
06:52 fbwnd joined #git
06:53 go1111111 joined #git
06:56 Cabanossi joined #git
06:59 TomyWork joined #git
07:03 cyberz joined #git
07:06 mischat joined #git
07:09 govg joined #git
07:12 trondth joined #git
07:13 trondth joined #git
07:13 masuberu joined #git
07:13 Rodya_ joined #git
07:14 kbeflo_ joined #git
07:15 zefferno joined #git
07:18 no_gravity joined #git
07:19 no_gravity Where is the git config file that has the info about user email and stuff?
07:20 frobnic no_gravity: https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration
07:21 _ikke_ no_gravity: git config --global -l
07:21 no_gravity I found it in ~/.gitconfig
07:21 frobnic that's not the whole story :)  (and i have no idea, why my link is turkish)
07:22 chardan joined #git
07:23 go1111111 joined #git
07:24 _August_ joined #git
07:30 thebope joined #git
07:31 dvaske_ joined #git
07:36 eahmedshendy joined #git
07:36 MineCoins joined #git
07:38 jungsubk joined #git
07:40 Cabanossi joined #git
07:41 nowhere_man joined #git
07:43 lucasem joined #git
07:46 Silenced joined #git
07:46 Silenced joined #git
07:46 sbasso joined #git
07:47 a_thakur joined #git
07:48 IRQ` joined #git
07:48 Balliad joined #git
07:52 a_thakur joined #git
07:53 _August_ joined #git
07:54 plexigras joined #git
07:54 a_thakur joined #git
07:54 Mindiell hi there, I installed a git server and now, each time I do a "git push", the user git stays connected (pam session git@notty)
07:54 Mindiell so, after some days of work I got a lot of "git sessions git@notty"
07:55 Mindiell any idea is welcome ;o)
07:55 immae Mindiell: what kind of git server?
07:56 octo8_ joined #git
07:57 fees joined #git
07:59 dvaske joined #git
08:00 kurkale6ka joined #git
08:01 xywbtu joined #git
08:01 aard_ joined #git
08:01 hurricanehrndz joined #git
08:02 tvw joined #git
08:03 Glooomy joined #git
08:03 grawity maybe your ssh client has automatic multiplexing enabled
08:04 grawity although in that case it ought to only have one connection, not a ton
08:05 MonkOfCity joined #git
08:05 xaa joined #git
08:07 theoceaniscool joined #git
08:07 bumbar joined #git
08:08 HardlySeen joined #git
08:09 rominronin joined #git
08:09 User458764 joined #git
08:10 bumbar i've used http://stackoverflow.com/a/36463546 to move my last commit to a new branch, pushed new branch but the commit is still on master, should i just do "git reset --hard HEAD~1"?
08:12 peterbecich joined #git
08:16 Rodya_ joined #git
08:16 ShapeShifter499 joined #git
08:16 Whiskey joined #git
08:18 elect joined #git
08:19 Assault_ joined #git
08:19 fakenerd joined #git
08:19 pietv joined #git
08:20 thiago joined #git
08:21 marcogmonteiro joined #git
08:22 quite joined #git
08:23 jungsubk joined #git
08:24 bronson_ joined #git
08:24 thebope joined #git
08:25 notebox joined #git
08:25 pietv joined #git
08:27 acetakwas joined #git
08:30 thiago joined #git
08:32 MarioBranco joined #git
08:32 ij Does filter-branch work backwards?
08:32 grawity no, it has to start from the root(s)
08:33 ij Ah, I understood what I don't.
08:34 ij take commit, checkout tree, apply command, add ., commit. So conflicts aren't a problem.
08:35 jason237 joined #git
08:35 jstein_ joined #git
08:37 dumacdev joined #git
08:38 nowhere_man joined #git
08:40 thebird joined #git
08:40 hahuang61 joined #git
08:41 manuelschneid3r joined #git
08:42 patarr joined #git
08:43 a_thakur joined #git
08:47 Tobbi joined #git
08:51 clmsy joined #git
08:54 venmx joined #git
08:55 geoid joined #git
08:55 Cabanossi joined #git
08:56 Darcidride joined #git
08:57 jnavila joined #git
09:00 dvaske joined #git
09:02 varo joined #git
09:03 varo hello, can anyone tell me how to find out the last common commit for two diverged branches?
09:03 delboy1978uk joined #git
09:04 delboy1978uk how i can i check if my branch for a ticket i'm working on has been merged on another branch?
09:04 kadoban varo: Sounds like man git merge-base
09:04 gitinfo varo: the git-merge-base manpage is available at http://jk.gs/git-merge-base.html
09:06 delboy1978uk i need to check if my branch S6920 has been merged into branch env-reference, how can i check this?
09:06 osse delboy1978uk: git merge-base --is-ancestor S6920 env-reference
09:06 delboy1978uk osse: you da man! thank you very much!
09:07 delboy1978uk should i get outputr for that? i got nothing
09:07 miczac joined #git
09:09 geoid joined #git
09:09 kadoban delboy1978uk: It signals via exit code, slightly unfortunately. You can do   git merge-base --is-ancestor S6920 env-reference && echo "yep"     I suppose
09:10 mischat joined #git
09:14 dnukem joined #git
09:15 peterbecich joined #git
09:15 delboy1978uk kadoban: i use zsh, so either get a green prompt or a red prompt. it was red both times i ran it
09:16 Rodya_ joined #git
09:18 thebope joined #git
09:22 ankit01ojha joined #git
09:24 Glooomy joined #git
09:26 sbasso joined #git
09:26 delboy1978uk left #git
09:27 Murii joined #git
09:27 kexmex joined #git
09:28 thebird joined #git
09:29 jnewt joined #git
09:39 de-facto joined #git
09:39 alezandro joined #git
09:43 octo8 joined #git
09:44 octo8 Hello, i have a simple question about git webhooks, can you lend me a hand ? http://stackoverflow.com/questions/43065897/webhook-php-file-work-from-terminal-but-not-from-bitbucket
09:47 afuentes joined #git
09:52 thebird joined #git
09:53 Guest90 joined #git
09:53 sarri joined #git
09:53 sarri joined #git
09:53 varo kadoban: thanks, that was it
09:54 Guest90 left #git
09:55 no_gravity joined #git
09:55 no_gravity Hello! In a .gitignore file, What do the lines "*" and "!.gitignore" mean?
09:55 firebadam joined #git
09:55 kbeflo_ joined #git
09:56 Cabanossi joined #git
09:56 YuGiOhJCJ joined #git
09:57 kbeflo_ joined #git
09:57 cdown joined #git
09:58 kbeflo_ joined #git
09:58 tobiasvl no_gravity: man gitignore
09:58 gitinfo no_gravity: the gitignore manpage is available at http://jk.gs/gitignore.html
09:59 tobiasvl no_gravity: * means ignore everything, !.gitignore means don't ignore .gitignore
09:59 kbeflo_ joined #git
10:00 tolland ive lost a file in git somewhere, not sure if its in a stash or a branch, is there an option to grep/find through stash and branches?
10:00 arobert joined #git
10:00 kbeflo_ joined #git
10:01 sbasso joined #git
10:02 kbeflo_ joined #git
10:02 ferr1 joined #git
10:03 ronskisika joined #git
10:03 kbeflo__ joined #git
10:05 kbeflo__ joined #git
10:05 osse tolland: git grep
10:05 arobert_ joined #git
10:05 osse tolland: with liberal use of git rev-list in a loop
10:06 arobert_ Hello, i'm trying to install and configure A git server on Windows 2016 with SSH auth. I tried everything, but when i try my final git push (from my local computer to the remote) it's not working : I have this message : "fatal: Could not read from remote repository.  Please make sure you have the correct access rights and the repository exists."
10:06 arobert_ Someone to help me ? :)
10:06 govg joined #git
10:07 Raging_Hog joined #git
10:08 Assault__ joined #git
10:11 mischat joined #git
10:12 mikecmpbll joined #git
10:12 delboy1978uk joined #git
10:12 thebope joined #git
10:13 theoceaniscool joined #git
10:13 delboy1978uk how do i resolve a conflict without editing, syaing, just use my version of the file?
10:14 selckin i usually just tell me my mergetool to do that
10:15 tvw joined #git
10:15 osse delboy1978uk: git checkout --ours filename
10:16 delboy1978uk osse: thanks again! no idea how many times you've helped me now! If you're ever in Belgium, I'll buy you a beer! :-)
10:16 peterbecich joined #git
10:16 osse delboy1978uk: note that this will also pick your version even in the parts of the file that git was able to resolve
10:17 osse also, I've been sober for ten years
10:17 osse JUST KIDDING LOL
10:17 acetakwas joined #git
10:17 delboy1978uk lol
10:17 Rodya_ joined #git
10:20 de-facto joined #git
10:20 zerow joined #git
10:20 borkr joined #git
10:21 aviraldg joined #git
10:23 pinkkis joined #git
10:24 Raging_Hog joined #git
10:25 DARSCODE joined #git
10:27 masuberu joined #git
10:28 hahuang61 joined #git
10:29 ronskisika joined #git
10:29 mischat joined #git
10:34 kbeflo__ joined #git
10:35 raynold joined #git
10:36 kbeflo__ joined #git
10:37 CheckDavid joined #git
10:37 blackwind_123 joined #git
10:38 ncthom91 joined #git
10:40 Noodlewitt joined #git
10:43 patarr joined #git
10:43 Guest90 joined #git
10:45 govg joined #git
10:46 Ryanar joined #git
10:47 delboy1978uk left #git
10:49 dendazen joined #git
10:51 MineCoins joined #git
10:53 Assault__ joined #git
10:54 kbeflo__ joined #git
10:57 kexmex joined #git
10:59 kbeflo__ joined #git
10:59 Glooomy joined #git
11:02 cqi joined #git
11:06 netroxen joined #git
11:06 zerow joined #git
11:07 thebope joined #git
11:07 dimi1947 joined #git
11:07 Lunatrius` joined #git
11:07 netj joined #git
11:09 Trpger joined #git
11:09 Trpger left #git
11:10 livingstn joined #git
11:12 jrnieder joined #git
11:13 elsevero joined #git
11:13 Andrew_K joined #git
11:15 sbasso joined #git
11:16 peacememories joined #git
11:16 kexmex joined #git
11:17 peterbecich joined #git
11:18 Rodya_ joined #git
11:18 Raging_Hog joined #git
11:23 a3Dman joined #git
11:23 mizu_no_oto joined #git
11:25 King_Hual joined #git
11:26 Andrew_K joined #git
11:27 geoid joined #git
11:31 kexmex joined #git
11:32 systemovich joined #git
11:32 Brski joined #git
11:34 fission6 joined #git
11:35 kbeflo_ joined #git
11:35 Guest90 joined #git
11:37 bouncy joined #git
11:38 ryxxed joined #git
11:40 DolphinDream joined #git
11:41 User458764 joined #git
11:42 kbeflo__ joined #git
11:43 sbasso joined #git
11:44 kbeflo__ joined #git
11:45 SteffanW joined #git
11:47 LBV_User joined #git
11:47 mischat joined #git
11:48 chipotle joined #git
11:48 scoobertron joined #git
11:48 oskarkv joined #git
11:48 maroloccio joined #git
11:48 maxb joined #git
11:49 a3Dman joined #git
11:52 Sound joined #git
11:53 waveclaw joined #git
11:53 venmx joined #git
11:54 kristofferR joined #git
11:54 Darcidride joined #git
11:54 wrouesnel joined #git
11:55 mikecmpbll joined #git
11:58 nettoweb joined #git
12:00 dsdeiz joined #git
12:01 thebope joined #git
12:01 arobert_ Hello, i'm trying to install and configure A git server on Windows 2016 with SSH auth. I tried everything, but when i try my final git push (from my local computer to the remote) it's not working : I have this message : "fatal: Could not read from remote repository.  Please make sure you have the correct access rights and the repository exists."
12:01 arobert_ Someone to help me ?
12:02 osse arobert_: make regular ssh work, then git will "Just Work"
12:03 jameser joined #git
12:03 lacrymology joined #git
12:03 King_Hual` joined #git
12:04 aax joined #git
12:04 marianina8 joined #git
12:06 arobert_ osse > actually, when i do (from my client) a simple ssh <myname>@<dnshost> it's working properly ... Should i grant users on the remote repository (or something like that) ?
12:06 osse arobert_: what is the url you try to push to =
12:07 arobert_ "$ git remote -v origin  robert@spsgit01:/c/Program Files/Git/repos/SQL.git (fetch) origin  robert@spsgit01:/c/Program Files/Git/repos/SQL.git (push)"
12:07 osse and 'ssh robert@spsgit01'  works ?
12:07 Guest90 joined #git
12:08 kbeflo__ joined #git
12:08 arobert_ osse > yes
12:09 osse arobert_: and once your there, does  ls  '/c/Program Files/Git/repos/SQL.git'  work ?
12:09 arobert_ and /c/Program Files/Git/repos/SQL.get is a directory where i did a "git init --bare"
12:09 peacememories joined #git
12:10 arobert_ I think yes :
12:10 arobert_ robert@SPSGIT01 C:\Users\robert>ls  '/c/Program Files/Git/repos/SQL.git' HEAD  config  description  hooks  info  objects  refs
12:10 osse hmm
12:11 arobert_ Could it be a chmod issue ?
12:11 Cabanossi joined #git
12:11 osse yes
12:11 osse where did you do git init --bare from?
12:11 osse within ssh? a different user?
12:12 eroux joined #git
12:12 arobert_ i did my "git init --bare" from git bash executed as administrator into this folder : '/c/Program Files/Git/repos/SQL.git'
12:13 arobert_ (I can delete it and try again)
12:13 osse try it from within the ssh session
12:13 dglambert joined #git
12:13 dglambert yo
12:13 osse if that doesn't work, try it somewhere that doesn't have spaces
12:13 arobert_ Ok i give it a try , thanks
12:15 moei joined #git
12:16 Guest90 joined #git
12:16 fedepad joined #git
12:16 synthroid joined #git
12:18 peterbecich joined #git
12:20 nowhere_man joined #git
12:22 lmatteis joined #git
12:23 arobert_ osse > I tried with no space in "/c/git/SQL.git". I have the same issue (fatal: ''/c/git/SQL.git'' does not appear to be a git repository fatal: Could not read from remote repository.  Please make sure you have the correct access rights and the repository exists.)
12:23 arobert_ (I did the init from my client computer on a SSH session
12:23 arobert_ )
12:24 dvaske_ joined #git
12:24 Guest90 joined #git
12:26 Guest90 left #git
12:26 marianina8 joined #git
12:27 firebadam joined #git
12:28 FilipNortic joined #git
12:29 hahuang61 joined #git
12:29 Gloomy joined #git
12:35 karols146 joined #git
12:36 quinq joined #git
12:36 Sound joined #git
12:36 justanotheruser joined #git
12:36 xaa joined #git
12:37 fission6 joined #git
12:37 freimatz joined #git
12:38 Ryanar joined #git
12:40 fission6 joined #git
12:40 Tatou left #git
12:41 Cabanossi joined #git
12:41 paul424 joined #git
12:42 jeffreylevesque joined #git
12:42 buffal0 joined #git
12:43 MineCoins joined #git
12:43 brent__ joined #git
12:44 patarr joined #git
12:44 arobert_ osse > any idea for me ?
12:44 osse arobert_: no
12:44 osse ls -R the bare repo and check permissions
12:45 arobert_ Ok nevermind :) Thanks any way :)
12:45 quinq Hi, I'd like some advice on a merge situation.
12:45 osse arobert_: nuke everything and do  git init --bare --shared=world
12:45 dendazen joined #git
12:45 quinq I have currently two branches, master and newdev. I would like to swap those, but they have diverged a lot.
12:45 quinq ie: rename master to olddev, newdev to master, set HEAD to new master.
12:45 osse arobert_: and finally do   GIT_TRACE=1 git push  from the local repo to see what commands are invoked
12:45 quinq But I'm afraid doing so will break clones because now master is a different branch.
12:45 saintaquinas[m] joined #git
12:45 am2on joined #git
12:45 heftig joined #git
12:45 patrickr[m] joined #git
12:45 Elliott[m]1 joined #git
12:45 dyce[m] joined #git
12:45 monomon[m] joined #git
12:45 KevinMGranger joined #git
12:45 UncleCJ joined #git
12:45 jascot[m] joined #git
12:45 dikiaap joined #git
12:45 hiq[m] joined #git
12:45 unclechu joined #git
12:45 spinningarrow[m] joined #git
12:45 Remramm joined #git
12:45 SpEcHiDe joined #git
12:45 flo[m] joined #git
12:45 musicmatze[m] joined #git
12:45 M-meznak joined #git
12:45 keks[m] joined #git
12:45 logos[m] joined #git
12:45 elwan7[m] joined #git
12:45 quinq Is there a way I could achieve that making it easy on distant clones (or maybe I'm doing it wrong)
12:46 osse arobert_: but all of that is just investigation
12:46 Retropikzel[m] joined #git
12:46 fakenerd joined #git
12:46 arobert_ Ok thanks osse, i try
12:50 yehowyada joined #git
12:50 thebird joined #git
12:52 theoceaniscool joined #git
12:53 dvaske__ joined #git
12:54 UrsoBranco joined #git
12:54 sbasso joined #git
12:55 thebope joined #git
12:56 Emperor_Earth_ joined #git
12:57 ispn joined #git
12:58 _Vi joined #git
12:59 karols146 joined #git
13:00 ExoUNX joined #git
13:01 Guest90 joined #git
13:07 cdg joined #git
13:07 Guest90 left #git
13:09 miczac joined #git
13:10 cam27 joined #git
13:11 Cabanossi joined #git
13:11 muhannad____ joined #git
13:12 regedit joined #git
13:14 jungsubk joined #git
13:16 sotoz joined #git
13:17 holodoc joined #git
13:18 acetakwas joined #git
13:18 peterbecich joined #git
13:19 Rodya_ joined #git
13:20 acetakwas joined #git
13:22 acetakwas joined #git
13:23 jeffreylevesque_ joined #git
13:24 fakenerd joined #git
13:27 CheckDavid joined #git
13:29 gunnaro joined #git
13:29 ekinmur joined #git
13:31 chigang joined #git
13:34 Dougie187 joined #git
13:35 thebope joined #git
13:36 GodGinrai joined #git
13:36 no_gravity joined #git
13:36 livingstn joined #git
13:36 gugah joined #git
13:36 no_gravity Is there a way to make "git diff" and "git log --patch" show differences within a line?
13:37 no_gravity And not just "-old line / +new line"?
13:37 publio joined #git
13:37 _ikke_ no_gravity: --color-words
13:38 jast or --word-diff if you prefer less colours
13:38 no_gravity Interesting.
13:38 jast hmm, actually I guess the global colour settings affect that one, too
13:39 rigid is there a way to debug git-http-backend ? I think I got some ENV vars wrong but i'm not sure which
13:39 no_gravity It gets it somewhot wrong though
13:39 jast --word-diff adds extra markers, --word-diff=color and --color-words (equivalent) do not
13:39 no_gravity In a line where only a few chars were deleted, it thinks more got deleted and some of the same was reinserted.
13:39 rigid my nginx error log says "no user/password was provided for basic authentication" which can't be true
13:39 xanadu_ joined #git
13:40 jast without knowing anything specific about nginx, that doesn't seem unusual
13:40 jast for instance, a browser's first attempt to access a 401-protected resource does not include a user/password, either
13:41 Cabanossi joined #git
13:41 visual joined #git
13:41 visual hey guys
13:42 visual i come to you again with a question
13:42 visual supposing i want to add a remote repository to my local project (that should be like 99% the same files as in the repo)
13:42 rigid jast: well, when I take out all the CGI stuff and just autoindex the directory, the authentication succeeds. I think either user/pass is not forwarded to git-http-backend (although REMOTE_USER is passed) or something else is wrong. ?
13:42 visual how would i go about it?
13:42 shinnya joined #git
13:43 visual git init, git add remote, git checkout, git push?
13:43 jast rigid: git-http-backend actually doesn't care about the user, it doesn't do authorization anyway
13:44 Ryanar joined #git
13:44 Isla_de_Muerte joined #git
13:44 SteffanW joined #git
13:44 rigid jast: ah ok. good to know.
13:44 rigid i'm trying again from scratch...
13:45 no_gravity visual: It sounds like you want to "git remote add origin ..."
13:45 jast rigid: it does use that to disallow push to anonymous users by default... but if you always require authentication that doesn't actually ever happen :)
13:45 visual no_gravity: yeap, what next?
13:45 visual git fetch
13:45 visual ?
13:45 no_gravity visual: Next what?
13:45 jast visual: yes
13:46 visual push the local files to the upstream (remote) repo
13:46 visual ok, tried git add .
13:46 jast git push -u origin master (if you're on the master branch, which is the default). the -u is to make Git remember to push to that particular remote, allowing you to leave out all of push's parameters in the future
13:46 s2013 joined #git
13:46 jast once you have added and committed, of course
13:47 jast if everything is already committed, you can skip straight to pushing
13:47 kbs joined #git
13:47 visual thanks, you're very helpful
13:47 visual just did "git add"
13:47 visual then "git status"
13:47 visual and it shows a lot of files that *are already in the repo*, as "new file"
13:47 visual why?
13:48 no_gravity visual: To git, only what is in .git/ is "in the repo".
13:48 jwsuiw joined #git
13:48 visual alright, 2 questions then, doesnt git fetch place the remote into the .git ?
13:48 visual and 2 - how come it doesnt show *all* the files as new then?
13:48 no_gravity visual: fetch puts it into some magical place.
13:49 no_gravity visual: To put it into the "repo" you have to merge.
13:49 visual oh boy
13:49 no_gravity But I have the feeling the "new" files have nothing to do with the fetch.
13:49 visual alright, so first issue "failed to push some refs.. to prevent you from losing history.. etc"
13:49 visual how do i go about mergin the thing??
13:49 Ryanar joined #git
13:50 visual (only one '?' :^) )
13:50 bannakaffalatta joined #git
13:50 tijensse joined #git
13:50 no_gravity visual: Pushing in git is awkward, because of that I only pull and never push.
13:50 no_gravity Git was made by Linus to match his workflow. And that is pull based afaik.
13:51 visual no_gravity: idk man, the "new" files ~ http://prntscr.com/ephcd3 ~, are copies of each other, shouldnt register as diff files
13:51 visual no_gravity: oh boy!
13:52 visual so there's no way around the merge?
13:52 thebird joined #git
13:52 no_gravity Can't say. I don't know your situation.
13:52 visual what do you need to know?
13:52 no_gravity Git is a set of low level tools that lets you manipulate special data structures.
13:53 Gsham joined #git
13:53 no_gravity If you want to build a version control workflow on top of these tools, be prepared to invest some serious time.
13:53 pietv joined #git
13:53 visual you're drifting into theory teritory there, mate
13:53 qqx Pushing is only awkward when done to a non-bare repo.
13:53 visual not trying to reinvent the wheel here, just trying to push some files to the repo and merge the diffs
13:54 visual dont know how to do that :I
13:54 qqx And personally I (almost) never pull.
13:54 no_gravity qqx: yup
13:54 sotoz joined #git
13:54 Es0teric joined #git
13:54 no_gravity For the sake of simplicty, I live without bare repos.
13:54 jast not sure how that makes things simpler :P
13:55 oxguy3 joined #git
13:55 no_gravity Needs only half the number of concepts. Instead of push/pull normal/bare-repos, I only have pulls and repos.
13:56 no_gravity I don't even use branches.
13:56 quinq Anybody kind enough to give me some hints about my question?
13:56 jast well, if that's enough for you, great
13:56 lavalamp joined #git
13:56 no_gravity I for one am off for lunch.
13:56 jast quinq: I'm not seeing your question, can you repeat it?
13:56 osse jast: increase $LINES  :p
13:56 quinq About an hour ago
13:57 osse quinq: swapping the names of two branches will appear as a force-push to everyone else
13:57 jast osse: this is already 1600 or so y pixels
13:57 quinq Yes osse :/
13:57 miczac joined #git
13:57 quinq No way around that then?
13:57 visual is force-push bad?
13:57 YuGiOhJCJ joined #git
13:57 jast for clones it's no problem... but updates are problematic
13:57 visual what's a rebase?
13:57 _ikke_ visual: it's risky
13:57 qqx No, although depending on the workflow that may not be much of an issue.
13:57 jast visual: okay, one thing after another... :)
13:58 systemovich joined #git
13:58 osse visual: https://github.com/Osse/git-stuff/blob/master/rebase.txt
13:58 osse quinq: i don't know of a painless way
13:58 jast visual: force push means you push an altered version of your history, with commits removed, re-created, re-ordered or anything like that. you start running into problem if someone tries to update their own copy of the history using 'git pull/merge', because then they create a mishmash of the two versions of history
13:58 visual osse: thx man, but i dont get it
13:59 visual does it merge the 2 (feature && master) branches, and then branches the master one again?
13:59 qqx quinq: If you're using a pull request workflow having the main branch renamed may not be very awkward.
13:59 osse visual: it puts one in front of the other
13:59 visual jast: wait, with **all** commits removed?
13:59 qqx People should still be pushing to feature branches, and only need to change the target for pull requests.
13:59 visual jast: i get it, fuck )
13:59 quinq Yeah qqx, that was my backup solution
13:59 visual so that's not an optio
13:59 Jackneill joined #git
14:00 visual alright so when there's a diff between the local and the remote, and you want to push the changes, how would you go about it?
14:00 quinq But then I need to tell people to drop master and start using newdev brnch
14:00 visual force-push is not an option :U
14:01 quinq Err I'm not using “pull requests”
14:02 theiostream joined #git
14:02 visual come on git wizards, pls help :')
14:02 visual if you have the time
14:03 zivester joined #git
14:04 bannakaf_ joined #git
14:04 osse visual: i don't understand the original question
14:05 visual how do i push to the remote repo if there's unresolved conflicts between remote and local
14:05 osse either resolve or push to a different branch
14:06 visual wait so if i push to a different branch, i can then merge the branches via gitlab, right?
14:06 visual and checkout origin, and se-la-vie?
14:06 osse if you get conflicts when merging I don't think gitlab can do the merge for you
14:06 osse but you can try
14:06 visual manual merge through gitlab?
14:07 visual alright, how would i go about resolving the conflicts without losing data?
14:07 visual this so-called "merge"
14:07 Rodya_ joined #git
14:07 GodGinrai joined #git
14:07 visual in the help it says i can perform "git pull", but wont pull overwrite local changes?
14:07 osse how did you get the conflicts in the first place?
14:07 SirFunk joined #git
14:07 osse no it won't
14:07 osse it will merge
14:07 osse pull = fetch + merge
14:08 GodGinrai ^ this
14:08 menip joined #git
14:08 howdoi joined #git
14:08 visual alright, lets give it a shot
14:08 GodGinrai although I would never suggest forcing a merge w/ pull
14:08 patarr joined #git
14:08 GodGinrai it would be better to fetch and merge in a seperate branch
14:09 GodGinrai then, once you have resolved conflicts, you can FF merge your important branch
14:09 osse GodGinrai: not sure we're there yet :p
14:09 GodGinrai osse: well, once he pulls and creates the conflicts, he's past that
14:09 visual http://prntscr.com/ephm40
14:09 visual fucking great :I
14:10 osse hmm
14:10 visual right, pusing to a different branch and merging through gitlab it is then :^I
14:10 GodGinrai that's a lot of conflicts
14:10 visual that's not even 1/4'th of it
14:10 osse looks like you're merging two repos with no common history here
14:10 visual dont have the space to screenshot all ))
14:10 visual osse: upgraded framework
14:11 visual but it's like 99% it there
14:11 qqx visual: I'd say that having your framework checked in is the issue.
14:11 bongjovi joined #git
14:11 visual what do you mean "checked in "?
14:12 GodGinrai visual: he means tracked
14:12 visual http://prntscr.com/ephnf2
14:12 ws2k3 joined #git
14:12 visual >
14:12 visual fucking git
14:12 Murii joined #git
14:12 qqx No version control system is going to handle that in any nice way.
14:13 GodGinrai qqx: I don't know if that is really the issue, because even if the whole framework is updated, it shouldn't cause conflicts in all of the files unless you had made changes in all of those files that didn't exist in the history of the upstream
14:13 dimi1947 joined #git
14:13 GodGinrai or vice versa
14:13 GodGinrai depending on where that update was made
14:13 quinq visual, paste text instead of taking pictures
14:13 AaronMT joined #git
14:13 foist_ joined #git
14:14 visual quinq: easy
14:14 GodGinrai visual: `git merge --abort`
14:14 visual Automatic merge failed; fix conflicts and then commit the result.
14:14 visual previe333@previewonly.com [~/public_html/ric]# git branch 'upgrade sync'
14:14 visual fatal: 'upgrade sync' is not a valid branch name.
14:14 visual previe333@previewonly.com [~/public_html/ric]# git branch 'upgrade_sync'
14:14 visual previe333@previewonly.com [~/public_html/ric]# git add .
14:14 visual previe333@previewonly.com [~/public_html/ric]# git commit '1st commit'
14:14 visual fatal: cannot do a partial commit during a merge.
14:14 quinq No, not here…
14:14 visual previe333@previewonly.com [~/public_html/ric]#
14:14 visual oops
14:14 GodGinrai visual: use a pastebin
14:14 visual wrong paste, sorry
14:14 quinq Use a pasting service
14:14 visual i know
14:14 visual http://kopy.io/5uKzg
14:14 visual i know, sorry man, i said wrong paste
14:15 GodGinrai visual: `git merge --abort` <-- this is how you exit a partial merge
14:15 GodGinrai which is the state you are left in when you have conflicts
14:15 visual GodGinrai: it didnt work
14:15 visual http://kopy.io/84kyM
14:15 Some_Person joined #git
14:16 Some_Person I did something that caused a file to be renamed. How can I get this recognized as a move in git instead of a delete and an add?
14:16 GodGinrai oh, that's weird
14:16 LeBlaaanc joined #git
14:16 visual Some_Person: you kill yourself aparently
14:16 visual there's no easier way when it comes to git
14:16 quinq Some_Person, git mv
14:16 osse Some_Person: it makes no difference. it's only pretty printing.
14:17 GodGinrai well, you can always just use git-reset as well.  osse: would `git reset --hard HEAD` do the trick?
14:17 osse Some_Person: if you git add the new path and git rm the old path then it's probably ok
14:17 Some_Person quinq: A bit too late for git mv -- I renamed a project in Visual Studio, and that caused the file to be moved
14:17 osse GodGinrai: do you mean git merge --abort?
14:17 marianina8 joined #git
14:18 foist_ left #git
14:18 ionl joined #git
14:19 ionl left #git
14:19 azerus joined #git
14:19 peterbecich joined #git
14:19 quinq Some_Person, mv newfile oldfile && git mv oldfile newfile
14:20 quinq Not sure that's the best way to go about it, but it'll work
14:20 andrew710 joined #git
14:20 visual http://prntscr.com/ephrew
14:20 GodGinrai osse: see his paste.  `git merge --abort` didn't work
14:20 visual ^this is why git is one of the shittiest things ever created
14:20 quinq visual, don't use it
14:20 visual quinq: i wish i couldnt
14:20 Eou joined #git
14:21 quinq Then you can
14:21 visual the fact that it's necessary doesnt make it any less shitty
14:21 GodGinrai visual: this is really not the case.  I am fairly certain that a fair majority of your issues here have been caused by a lack of understanding how git works
14:21 visual it's like cleaning toilets, nobody fucking likes to do it, but it has to be done
14:21 quinq There are two ways to go about it, 1/learn it 2/solve why it's imposed to you
14:22 quinq Complaining about it won't solve anything
14:22 visual GodGinrai: look man, i've been a dev for 10 years, and every single time when it comes to git, it's always problematic
14:22 visual every single fucking time
14:22 qqx Complaining about it here isn't going to help.
14:22 visual helps to vent a little
14:23 Some_Person osse: Thanks, add and rm seems to have worked; I guess it auto detected that it's a rename
14:23 GodGinrai visual: probably because you've never taken the time to sit down and learn it rather than just trying to deal with git's "problems" whenever you run into an issue.
14:23 Es0teric joined #git
14:24 qqx Some_Person: It always auto detects renames, git only keeps track of snapshots not how changes are made.
14:24 oxguy3 joined #git
14:24 visual dude it's a problem when you do it by gitlab's instruction and it fails
14:24 zerow_ joined #git
14:25 GodGinrai visual: this can happen with literally any software.  No software is impervious to user error
14:25 sunri5e joined #git
14:25 yarekt Lol, you just doing this to flame... in #git? visual
14:25 visual it's not a user error if they have a proposed solution for it
14:25 visual right?
14:26 visual it means it's a common occurence that happens, and they have a way of bypassing that issue
14:26 visual but that way doesnt work
14:26 visual who's fault is it then?
14:26 visual yarekt: no man
14:26 yarekt Almost everyone here uses git for work and are proficient in it that it doesn't impede their workflow
14:26 GodGinrai visual: that's not a solution, that's steps you were supposed to perform.  Which *would* work btw
14:26 visual trying to solve it
14:26 GodGinrai visual: you are just complaining about having to do it.
14:26 visual GodGinrai: dude have you even looked at the screen
14:26 visual http://prnt.sc/ephrew
14:26 visual they *didnt* work
14:26 visual i did do them man, they didnt work
14:26 GodGinrai visual: it says "merge branch and fix any conflicts that come up"
14:27 yarekt Having said that, git has *terribly* named command and concepts, but theres nothing that can be done about it because these concepts are already embedded in people's skills
14:27 xanadu_ joined #git
14:27 GodGinrai visual: you got conflicts, you must fix them.
14:27 visual GodGinrai: Step 3. Merge the branch and fix any conflicts that come up
14:27 ekinmur_ joined #git
14:27 yarekt visual: But simply learning to use the software by understanding what happens inside will increase your level of competence with it until it helps you with your work instead of hindering
14:27 visual previe333@previewonly.com [~/public_html/ric]# git merge --no-ff upgrade_sync
14:27 visual Already up-to-date.
14:27 visual whoop-de-doo
14:28 visual yarekt: you can't logically understand a sotware that isnt bound by logic, can you
14:28 yarekt But the attitude of "Look #git, git is shit, because I don't want to invest time learning!"
14:28 visual we should add branching to svn and burn git
14:28 yarekt ... ins't going to get you anywhere
14:28 jast that looks like you finished the merge earlier
14:29 * yarekt fin
14:29 visual dude this attitude is a normal response to "if you'd learn how it works / follow the instructions, you wouldnt have problems"
14:29 visual and i have a clear example when taht's not the case :I
14:29 * visual rant over
14:30 User458764 joined #git
14:30 yarekt Let me read up the whole of scrollback then
14:30 visual jast: but if i'd have finished the merge, shouldnt it be able to push to remote instead of complaining that i'd lose history?
14:30 hahuang61 joined #git
14:30 jast that output from 'git merge --abort' is rather strange. maybe you have a fairly old version of Git, from before that option was added?
14:30 jast there is that, yeah...
14:31 masuberu joined #git
14:31 GodGinrai visual: the problem you are running into there is that you never pulled the latest master before performing that merge
14:31 jast it depends on what you merged and where you're pushing, though
14:31 yarekt Yea, nah, i'm not doing that. visual, it looks like you are using this channel like the manual, and ignoring people's advice
14:31 visual git version 1.7.1
14:31 GodGinrai thus, your update to the remote master is not a fastforward update
14:31 visual GodGinrai: i did
14:31 jast yeah, I think that's from before
14:31 jast next time you can try 'git reset --merge' instead which I think does the same thing
14:32 GodGinrai visual: you didn't anywhere in that terminal in the screenshot you keep linking
14:32 jast if that fails, too, there's always 'git reset --hard' to destroy all evidence of everything ever, but it eliminates all uncommitted changes, too
14:32 sunri5e joined #git
14:32 visual i posted a screen earlier, and a peep here said "that's a lot of conflicts", remember?
14:32 jast anyway, getting back to your situation. for instance, merging upgrade_sync into master doesn't mean that pushing master to the remote master will necessarily go through cleanly, e.g. if the remote master has some changes of its own that you haven't merged yet
14:32 visual jast: yeah, or push --force :^), but that's.. i mean come on
14:32 quinq visual, do you know about git status?
14:33 theiostream joined #git
14:33 visual quinq: yeah, checked  status, shows unmerged files
14:34 jast plus uncommitted/unstaged changes and such :)
14:34 visual jast: how does that make any sense, if you merged the 2, wouldnt the HEAD be at the new commit that was created by the merge?
14:35 visual yeah, back to the question
14:35 LeBlaaanc joined #git
14:35 visual how do you merge locally?
14:35 visual >fatal: 'merge' is not possible because you have unmerged files.
14:36 visual >you cant solve this problem, because this problem isnt solved
14:36 visual only in git
14:36 jast it means you can't start a new merge because an old merge is still in progress. have you tried the old 'git reset --merge' that I mentioned, in the meantime?
14:37 jast I don't remember the exact version in which each option was introduced, but worth a try I guess
14:38 buzzLightBeer joined #git
14:38 manuelschneid3r joined #git
14:38 maarhart joined #git
14:40 visual well
14:40 visual git reset --merge
14:40 visual then git merge origin origin says "fatal 'origin' does not point to a commit'
14:40 visual :^)
14:40 molgrum joined #git
14:40 molgrum joined #git
14:41 guampa joined #git
14:42 eroux joined #git
14:42 quinq visual, start reading manpages
14:42 quinq What do you think merging origin with origin means?
14:43 jast visual: usually origin is the name of a remote, not the same of a branch. you may have wanted 'origin/master' or something like that...
14:44 fbwnd joined #git
14:45 MarioBranco joined #git
14:45 visual if i switch to a branch sync_upgrade and try merge master, it says it's up-to-date
14:45 Fallen0223 joined #git
14:45 visual jast: thx btw, that clarified it a little
14:46 visual so i think what happened was i added the changes  to the local master branch, and that's why it says they're up-to-date
14:46 GodGinrai visual: that's probably because your master probably already successfully merged those changes at some point.  What does `git diff master sync_upgrade` return?
14:47 visual can i fetch remote master into a temporary branch, and then try to merge those?
14:47 visual GodGinrai: returns nothing
14:48 GodGinrai visual: yea, from master: `git checkout -b master_merge; git fetch origin/master; git merge origin/master`
14:48 GodGinrai visual: assuming you are trying to merge your master with the remote master
14:48 _August_ joined #git
14:48 GodGinrai after you resolve conflicts in master_merge, you can `git checkout master; git merge master_merge`
14:49 GodGinrai well, after you resolve conflicts and complete the merge
14:49 visual *sigh*
14:49 visual http://kopy.io/nNvzH
14:49 DaveTaboola joined #git
14:49 visual why why
14:49 GodGinrai visual: sorry, my fault
14:49 GodGinrai I gave you the wrong syntax for fetch
14:50 GodGinrai also
14:50 GodGinrai you need to merge origin/master
14:50 GodGinrai not master
14:50 visual oh no worries mate, i wrote right syntax (fetch origin master) after that
14:50 visual merge origin/master?
14:50 GodGinrai master is your local, origin/master is the remote branch
14:50 GodGinrai yup
14:50 quinq visual, you would have wasted less of your (and people trying to help you) time learning git instead of asking to type in commands for you
14:51 visual what do i learn specifically?
14:51 visual every register move and every stack change that happens inside?
14:52 quinq Yes, exactly
14:52 visual i know how to pull, push and branch, why would that no be enough to make a simple merge?
14:52 quinq Well, now you need to learn merge
14:52 quinq What's origin, what's a clone, what's a remote
14:52 visual im trying to, but clearly the docs ( https://git-scm.com/docs/git-merge ) arent helpful
14:52 quinq Anyway, good luck :)
14:52 visual thanks
14:52 visual you too
14:53 jast the manpages have a tendency to be a little on the technical side
14:53 jast if you ever want to take the time to read a proper book about it, there's always !book
14:53 gitinfo There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
14:54 jast and if you like looking at pictures of data structures, !gcs is worth a look, too, to get a better idea of what all these operations do on a structural level
14:54 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
14:54 thallada joined #git
14:54 visual quinq: why are you even here? to tell people they need to disassemble git to understand how to make a merge?
14:55 vuoto joined #git
14:55 visual jast: thanks man, i'll try to find the time for that
14:55 eroux joined #git
14:55 visual doesnt seem like a necessary time investment for such a simple concept :I
14:55 visual read an entire book i mean
14:56 eroux joined #git
14:56 beaky joined #git
14:56 beaky hello
14:56 quinq visual, you said that, my answer was sarcasm obviously
14:57 quinq You can have a look at https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes
14:57 beaky how do i pick particular diffs per file instead of commiting everything i've changed in a file
14:57 eroux joined #git
14:57 visual beaky: git diff other_branch path/to/file
14:57 GodGinrai visual: yea, I highly recommend the Pro Git book.  It explains things really well and teaches the basics that are needed
14:57 visual literally doing it rn )
14:57 Ice_Strike joined #git
14:57 beaky ah thanks
14:57 leeN joined #git
14:58 Ice_Strike Can you do mulitple "git add ." and then do git commit later?
14:58 _ikke_ yes
14:58 visual yeah
14:58 GodGinrai Ice_Strike: sure
14:58 kadoban beaky: Usually 'git add -p somefile' or if you've already staged, 'git commit -p' exists, but I never use it.
14:58 beaky thanks i will give those a try
14:58 Ice_Strike cool
14:58 visual GodGinrai: alright, and quinq will do, seems like helful (and succint !! )info
14:59 beaky i love git it is so awesome i can do anything
14:59 eroux joined #git
14:59 beaky (rather than leave my work in a messed-up state)
14:59 visual yeah? try upgrading your app/framework, and pushing that :^)
15:01 jast beaky: git add -p (or git commit -p to save one step) is my absolute favourite tool for that kind of thing
15:01 roelmonn_ joined #git
15:01 eblip joined #git
15:01 Levin^ joined #git
15:01 Levin^ hello there
15:01 Levin^ I'm really confused from what I researched on internet
15:02 User458764 joined #git
15:02 jast Levin^: hi :) let's see if we can clear it up, then!
15:02 quinq Levin^, you should be careful about what you search on the Internet
15:02 ekinmur joined #git
15:02 visual WHAT THE FUC
15:02 visual git edited my files
15:03 visual it added <<<<< HEAD, etc to my files
15:03 jast those are called conflict markers
15:03 Levin^ so I'll ask here. git refused my push claiming I need to pull first. but I'm scared it will pull and rewrite my other files edited locally beforehand
15:03 jimklo joined #git
15:03 math-alpha joined #git
15:03 visual http://kopy.io/eJGgs
15:03 jast visual: during a merge that's not at all unusual. it means both sides of the merge have made changes to the same parts of some files, you can manually edit the files to resolve the conflicts, or use a merge tool to help you.
15:04 Levin^ is there a command to check what it will pull to my local machine?
15:04 jast of course if you accidentally add and commit these conflict markers, that's not good, but before that it's the normal state of things, and every other VCS that supports merging does the same thing, in fact :)
15:04 quinq Levin^, you can branch before-hand
15:04 quinq and work there
15:04 dave0x6d joined #git
15:05 kadoban Levin^: First do 'git fetch', then you can check your favorite way(s) the differences between your local branch and the remote tracking branch. Then you can merge/rebase/other as you like.
15:05 jast Levin^: pull is actually a shorthand for fetch (to download the changes) and merge (to apply them). you can run 'git fetch' individually and then look at and compare yourbranch and origin/yourbranch
15:05 mischat joined #git
15:05 Levin^ oh
15:05 kbeflo joined #git
15:06 kadoban Levin^: As a shortcut, @{u} refers to the "upstream" branch, if one is set.
15:06 visual jast: no man, it fucked up royally
15:06 visual look
15:06 visual http://kopy.io/eJGgs
15:06 overlord_tm joined #git
15:06 visual it aded shit like >>>>origin/master to my fucking *files*
15:06 kadoban If you're not sure how to compare branches, gitk --all is a decent start, or !lol if you're into that. There's a few more specific log options that might help as well
15:06 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:07 Levin^ can I run the fetch command without commitment?
15:07 kadoban visual: Welcome to exactly what jast described above.
15:07 jast visual: that looks awfully like one generation of conflict markers got committed in an earlier, screwed up merge
15:07 visual FUUUUUUUUUUUUUUU
15:07 visual how do i rever
15:07 visual t
15:07 kbeflo joined #git
15:07 jast it happens if someone is not paying attention while merging
15:07 eroux joined #git
15:07 Levin^ I mean, does it require me to run another command to "confirm" something after the fetch?
15:07 jast the bad news is that reverting merges is a bit of a can of worms
15:07 jast !revert_merge
15:07 gitinfo [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
15:07 kadoban Levin^: 'git fetch' is *quite* hard to hurt anything, all it does is update your local view of the remote branches. Or in other words, it updates the "remote tracking branches"
15:08 maxpss joined #git
15:08 sspssptt joined #git
15:08 kadoban It won't mess with your local branches, or the files in your working directory, or the index or etc.
15:08 Levin^ hmm
15:09 DarkPsydeLord joined #git
15:09 visual FUUUUUUCK IT ADDED THEM TO MASTER BRANCH
15:09 Levin^ I dont't understand the "local view"
15:09 Levin^ visual: does it have lots and lots of <<<< stuff?
15:10 visual Levin^: http://kopy.io/eJGgs
15:10 Es0teric joined #git
15:10 visual not lots, but to lots of files
15:10 visual hundreds
15:10 visual god fucking damn it
15:10 Levin^ oh sad
15:10 kadoban Levin^: Are you familiar with branches like origin/master ?
15:10 Levin^ do a find/replace at least :/
15:10 Levin^ kadoban: I'm learning
15:11 Levin^ didn't reach that knowledge yet
15:11 kadoban Those are the "remote tracking branches". Those are what 'git fetch' updates. Along with tags, if you tell it to.
15:11 Levin^ I know they exist, but I didn't learn how to use it
15:11 visual btw, with that link, when fixing a fauly merge
15:11 visual i cant fucking revert because "you have unmerged files"
15:11 kadoban origin/master is essentially your local view of what the master branch looks like at the remote "origin". Git doesn't do network stuff unless you tell it to, so that's its way of being able to "see" remote things without having to always go to the network.
15:11 ronin_work joined #git
15:11 plasticle joined #git
15:12 eroux joined #git
15:12 visual lesson learned: fuck git
15:12 visual copy-paste it is
15:12 Levin^ hm
15:13 zerow_ left #git
15:13 zerow joined #git
15:14 nedbat visual: you probably don't want to hear this, but you're going to have to understand it at some point: git didn't add those markers to your master branch.
15:14 visual nedbat: who did then?
15:14 visual i did? copy pasted these markers into hundreds of files myself just to complain here?
15:14 nedbat visual: you did when you used "git add" and "git commit" on a file with merge conflict markers in them.
15:14 visual is that what you're suggesting?
15:14 nedbat visual: git added the markers, to show you where you needed to resolve conflicts.
15:14 nedbat then you didn't resolve them, added the files, and now they are in the files.
15:15 visual in what world does adding data to files constitute as a viable way to show changes?
15:15 nedbat visual: svn does this also, with the same markers.
15:15 visual not create a .tmp file, not keep them in memory, but *editing the fucking files*
15:15 jast in all version controls systems that ever became popular
15:15 visual that's fucking retarded
15:15 jast including cvs, svn, mercurial, tla, bzr, darcs
15:15 nedbat visual: you're going to have to deal with this.
15:15 eroux joined #git
15:15 nedbat visual: your attitude seems to be, "I don't want to understand git, it should be simpler!"
15:16 visual that's like me opening up windows/system32, and overwriting some files so i can remember which files i'd like to use at some point
15:16 visual instead of creating a list of the files i need
15:16 jast a list of files would be pretty worthless
15:16 paws_ joined #git
15:16 plasticle joined #git
15:16 Levin^ visual: it's sad, but you'll have to spend your time to find and solve each of the conflicts yourself, I think
15:16 AnimeLife joined #git
15:16 nedbat visual: you should take a deep breath, and commit to learning git, or you should stop using git.
15:16 visual yeah? well a list of files wouldnt fuck up your application
15:16 jast that wouldn't tell you which sections of the file are affected, and I'm sure you don't want to manually compare 40000 lines of two copies of a file
15:17 nedbat visual: you are grabbing the knife by the blade, and getting angry at the knife.
15:17 jast the merge didn't fuck up your application
15:17 Levin^ but isn't there a way to do a revert to a certain commit code?
15:17 kbeflo joined #git
15:17 jast at some point you went, "hey, let's just assume everything magically did what I think it did", and cast the temporary conflict markers into stone
15:17 Levin^ I readed about that
15:17 visual nedbat: that's why i joined to ask few simple questions, hwo do i resolve a bunch of conflicts
15:17 jast Levin^: reverts are a bit special when merges are involved
15:17 visual help from here resulted in fucking up the whole application
15:17 visual nice
15:17 visual top of the morning to you lad
15:17 nedbat visual: yes, but maybe you should really wait until you are done ranting, and interested to learn.
15:17 visual god fucking damn it
15:17 quinq Yeah, we did it on purpose
15:18 quinq Because everything is other's fault
15:18 jast nobody told you to just 'git add' everything without looking at it, you know
15:18 AnimeLife hello guys, I need help, how do I begin going through souce code of git, I am able to checkout and build, but where do I go next? is there a developer mannual or any arch design showcasing modules
15:18 eroux joined #git
15:18 visual i didnt know git marks files as "edited" by fucking adding it to them
15:18 jast anyway, I need to leave, good luck getting this cleaned up...
15:19 nedbat visual: what did you think "resolve the conflicts" meant?
15:19 GodGinrai visual: the point of adding the data to the files is three-fold.  1) Since code from both branches are there, you can easily choose one or the other, or concoct a merger of the two by hand. 2) Thanks to the markers, it is easy to find where you need to resolve the conflicts 3) By adding the markers, it prevents you from ignoring the conflicts.  You either need to finish the merge or give up on it to
15:19 canton7 (visual is a known troll from another channel. Not saying he's trolling now necessarily, but bear the possibility in mind)
15:19 GodGinrai proceed with your work.
15:19 visual that's like OS's adding "opened on 1.1.2017" to Word Documents *inside* the files
15:19 visual canton7: yeah no, i was fucking around in c#
15:19 fahadash joined #git
15:19 visual this shit's serious
15:19 nedbat visual: or, it's like the way Word will let you merge documents together, by showing you both changes inside Word....
15:19 snits joined #git
15:19 AnimeLife hello guys, I need help, how do I begin going through souce code of git, I am able to checkout and build, but where do I go next? is there a developer mannual or any arch design showcasing modules
15:20 GodGinrai nedbat: Word can merge documents? wut
15:20 visual instead of using an external file? what if there's a power surge in the middle of the thing, you're now left with hundreds of fucked files :I
15:20 peterbecich joined #git
15:20 nedbat visual: what did you think "resolve the conflicts" meant?
15:20 eroux joined #git
15:20 jast no, Git retains all versions of the files until you conclude the merge
15:20 jast if you do, incorrectly, it's on you
15:20 GodGinrai AnimeLife: are you trying to view git's source?  Or your project's source using git?
15:21 AnimeLife GodGineai, yes I am trying to view git's source
15:21 visual i did merging before, it shows the "+' and the "-" and you either choose which file you want to use, or you choose which "chunks" of files you want to use
15:21 jagob joined #git
15:22 tang^ joined #git
15:22 utrack joined #git
15:22 visual alright
15:22 GodGinrai visual: not really.  If the merge gets corrupted somehow, there are a number of ways to abort it
15:22 visual GodGinrai: in a perfect world, you'd be right
15:22 visual i tried that twice, remember?
15:22 visual both times it fucked up
15:22 visual "cant abort because of unresolved merge", then some other error
15:23 GodGinrai visual: you never did `git reset --hard HEAD`, tho', did you?
15:23 visual i did reset, and abort
15:23 eroux joined #git
15:23 visual no i didnt do it with the --hard HEAD, you never suggested that :I
15:23 kadoban visual: Typing the wrong commands quite often doesn't have the desired effect. Even if your intent is clear to you. That doesn't mean it's impossible.
15:23 GodGinrai yea, I did
15:23 AnimeLife GodGinrai, yes I am trying to view git's source. sorry for typo
15:23 GodGinrai it was the first thing I suggested when you said `git merge --abort` didn't work
15:23 visual see, even this guy's trying to rewrite git because its shit ))
15:23 visual right
15:23 visual well, too late for could'ves, right
15:23 AnimeLife lol
15:24 King_Hual joined #git
15:24 nedbat visual: it's not too late, git still has the history of all the files.
15:24 visual is there a pull --force?
15:24 patarr_ joined #git
15:24 kadoban visual: Probably not as you mean
15:24 kadoban What would it do?
15:25 AnimeLife Anyone?
15:25 visual edit and remove (if necessary) all the files that are different locally
15:25 nedbat AnimeLife: what are you trying to change in git?
15:25 visual you know?
15:25 kadoban AnimeLife: This channel isn't primarily git developers, you might have to wait a few.
15:25 visual nedbat: >fatal: 'revert' is not possible because you have unmerged files.
15:26 AnimeLife nedbat: I am working on their microprojects for gsoc
15:26 marianina8 joined #git
15:26 kadoban visual: That's not what pull is for. If you just want the state of files and the history to be the same as a remote, that's a different command. If you just want the state of files, but *not* the history to be the same, that's yet another command. Neither one is pull.
15:26 nedbat visual: i don't know specifically how to fix that problem. I know that your current style of "stomp around, and try things I half-understand" isn't going to work.
15:27 visual sure it will
15:27 visual :^)
15:27 AnimeLife kadoban: thnx, can is their any channel for git devs?
15:27 visual rm -rf; git pull {branch} and then re-upgrade the thing
15:27 latenite joined #git
15:27 visual should've done it an hour ago instead of fucking it up like this
15:27 nedbat visual: ok, do that now then, and put us all out of your misery :)
15:27 visual nedbat: done
15:27 visual )
15:27 visual fuck git
15:28 latenite Hi folks, why does git not recognize my new 'test' directory? https://gist.github.com/anonymous/8b44cd34554cd5d0c7d1dbf07d4d187a
15:28 visual thanks for your patience everybody
15:28 kadoban AnimeLife: #git-devel exists, but I don't know how active it is. Looks pretty small
15:28 marsmellow joined #git
15:28 sgen joined #git
15:28 steeze joined #git
15:29 perlpilot latenite: If it's empty git won't pay attention to it.
15:29 latenite perlpilot, I just cloned it. There are many files...
15:29 latenite perlpilot, what do you mean by "empty"?
15:29 Glooomy joined #git
15:30 perlpilot latenite: your paste shows "mkdir test" but not that you put any files into it
15:30 nedbat AnimeLife: i would expect gsoc to provide you with a contact, or some support.
15:30 eroux joined #git
15:30 kadoban latenite: You added the directory 'test', but there's no files in it. Git doesn't consider an empty directory as "content" worth tracking.
15:30 latenite perlpilot, right, I need an empty directory like this.
15:30 AnimeLife thnx guys, I will try these channels
15:30 kadoban I'm not really clear why this is, since it considers an empty file as content, but it is what it is.
15:30 latenite why does git not honor that?
15:31 perlpilot latenite: a common technique is to stick a .gitignore file in the dir.
15:31 bgerber joined #git
15:31 nedbat latenite: why is the directory there if it is empty? The answer to that would be a good thing to put into a README in the directory.
15:31 eroux joined #git
15:31 visual for all of you saying git is so sleek
15:31 ash_workz joined #git
15:31 perlpilot latenite: also, why do you "need" an empty dir?
15:32 sbasso joined #git
15:32 visual run git & svn side by side, and try to sync those :^)
15:32 latenite so when my project tree has some empty directories....they will not be part of the git repo, IF I dont put a .gitignore in them?
15:32 kadoban visual: This thread of conversation seems overdone already. Now you really are starting to sound like a troll.
15:32 visual i know experienced devs who quit because of that
15:32 perlpilot latenite: if the dirs have no files, git won't bother with them.
15:32 varo left #git
15:32 eroux joined #git
15:32 latenite so I have to make a 'find-empty-dir-and-add-gitignore' script then..?
15:33 perlpilot latenite: why do you need empty dirs?
15:33 MarioBranco joined #git
15:33 latenite perlpilot, for future project layout
15:33 visual kadoban: yeah well your interpretation of it is irelevant, it was in part due to your suggestions that i lost a a day's work, isnt it?
15:33 finalbeta joined #git
15:34 perlpilot latenite: just add those dirs to git when you actually put files in them
15:34 jn__ joined #git
15:35 latenite perlpilot, that absurdes the idea of "FUTURE layout"
15:35 latenite why does git have this policy?
15:35 kadoban visual: I *highly* doubt that I told you to type any command that hurt anything. If you can show where I did, that'd be interesting information to me. But regardless, you're always responsible for understanding what people suggest before using their suggestions.
15:35 sspssptt joined #git
15:35 perlpilot latenite: I don't know really.  I've always thought it odd.
15:36 sspssptt left #git
15:36 latenite perlpilot, me too
15:36 latenite then why not change it
15:36 nedbat this from the guy who was banned from another channel for suggesting a cloaked "rm -rf *" when someone needed help...
15:36 visual if you understood every suggestion, you wouldnt've asked for help, would you?
15:36 latenite #bug report?
15:36 kadoban visual: And my interpretation is indeed relevant; I am one of the people entrusted with keeping this channel functioning smoothly. Nobody minds if you want to make some snide comments, but continuing it won't be a fruitful conversation, you're not going to convince everyone to use svn.
15:36 mazert_ joined #git
15:37 perlpilot visual: people are responsible for their own actions.  period.  The onus of understanding what you're doing is still on you.
15:37 dimi1947 joined #git
15:37 kadoban visual: You are presumably not a robot. You can take people's suggestions, and if you don't understand them, look up what they do ... or ask (usually after trying to look it up).
15:37 visual i wasnt trying to convince to use svn, im saying running those 2 side by side and trying to keep them synced made experienced devs quit
15:37 brent__ joined #git
15:38 visual whatever man, you dont expect people who dont understand the question to attempt to give answers, thus not always spending time on researching every answer
15:39 visual if it doesnt look like a rm -rf, why would they purposely mislead you
15:39 latenite perlpilot, nedbat, kadoban thank you for helping.
15:39 visual if it's a bad answer by accident, usually others correct it
15:39 latenite :D
15:39 ResidentBiscuit joined #git
15:39 maarhart joined #git
15:39 visual latenite: yeah, check to see if your files dont contain <<<<<HEAD and shit like that
15:39 kexmex joined #git
15:40 kadoban visual: There are commands that are both dangerous and useful.
15:40 perlpilot latenite: good luck  (though, find empty dirs and add .gitignore is an easy script if you have to write it  :)
15:40 visual yeah well, there's no point in arguing
15:40 visual i've asked my boss and a a coleague to stay here past closing time (40+ minutes now) so i can fix this mistake :^)
15:40 visual im gonna get back to it
15:40 kadoban Good luck.
15:40 visual you too
15:41 mar77i hmm. how can I merge part of a different branch onto which I cherry-picked?
15:41 brent__ joined #git
15:41 YuGiOhJCJ joined #git
15:42 kadoban mar77i: Can you explain a bit more what you're attempting to acheive? Not really clear to me.
15:43 mar77i like master has A, B, C, D, E, F, G branch A, B, C and E off of master. I'd like to put branch into a state where master was on F.
15:43 nixjdm_ joined #git
15:43 theiostream joined #git
15:43 mar77i and... including D.
15:44 kadoban mar77i: I believe that's just 'git checkout otherbranch' and then 'git merge F', where F is any way you want to refer to that commit. Though make a !backup just in case I'm still misunderstanding you.
15:44 gitinfo mar77i: 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
15:44 cagomez joined #git
15:45 cagomez_ joined #git
15:45 kadoban mar77i: You can refer to it by shaid, or something like master~1 if you're comfortable with those, etc.
15:45 mar77i hmm. how comes I get conflicts for that, then?
15:46 kadoban Well, conflicts are a fairly expected part of merging sometimes. Do some of them not look like they should be happening?
15:46 kadoban I've found !eek helpful before, if you're not that comfortable with merging yet
15:46 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
15:47 quinq Humm, is there a reason “git shortlog --date='format:%Y' --format='format:%ad'” isn't printing only the commit year?
15:47 mar77i strangely, though, all of them are of the form <<<HEAD\n===\n...\n>>>
15:48 kadoban They're entirely whitespace you mean?
15:48 mar77i no, not whitespace. they're completely empty.
15:49 tyreld joined #git
15:49 kadoban The whole conflict is empty? That's ... weird. Or you mean only one side?
15:49 User458764 joined #git
15:49 mar77i one side.
15:50 mar77i which I find rather remarkable, really.
15:50 eroux joined #git
15:50 kadoban I think it means that one side deleted that section and the other side changed that section, at least usually.
15:51 drodger joined #git
15:53 mar77i now i have a case where the clearly old part is on one side an the clearly "new" part is on the other.
15:53 synthroid joined #git
15:54 eroux joined #git
15:54 mar77i ah, I understand. there's this merge strategies thing and the default seems rather awkward.
15:55 eroux joined #git
15:55 kadoban The default is generally okay, but yeah there are other strategies. Be careful they actually give you what you want though, it's easy to just get it to give you *a* result, not a useful result.
15:56 perlpilot graphical merge tools help greatly
15:57 Levin^ visual: I think you should do as I'm doing
15:57 Levin^ to read a book about git
15:57 Levin^ the basics
15:57 Levin^ my book is explaining how to deal with merge conflicts
15:58 orbyt_ joined #git
15:58 Levin^ maybe you can find a good book in your language
15:58 mar77i yup. the result I'm looking for treats the current branch as behind from master, but it seems "theirs" isn't even a valid strategy?
15:58 Doros joined #git
15:59 eroux joined #git
15:59 latenite Hi folks, I have added a hook script that simply appends the date to a file. THen I have pushed to the master. But the hook did not run. What am I missing?
15:59 kadoban mar77i: If this is too much of a mess, you can try just cherry-picking the two commits you're missing. Though it may (will?) result in the same thing.
15:59 _ikke_ What hook did you create and where did you create it?
15:59 _ikke_ latenite: ^
15:59 mar77i turns out I was reading the manual the wrong way.
15:59 dreiss joined #git
15:59 freimatz_ joined #git
16:00 eroux joined #git
16:00 Levin^ visual: and when I'm scared on some git command, all I do is to backup all my files so if there's a mistake, you can revert it
16:00 Levin^ but I'm learning it's troublesome to backup and restore files like that, it seems git doesn't like it
16:01 Levin^ hmmm
16:01 thebope joined #git
16:01 hahuang61 joined #git
16:01 latenite _ikke_, this is what I have done: https://gist.github.com/anonymous/df3920a645cee3cdf88762a36aaa2f94
16:01 Levin^ it seems git detects your massive changes and blames everything is not sync
16:02 _ikke_ latenite: (what a long promt)
16:02 thiago joined #git
16:02 latenite _ikke_, sorry I have not set it. I might have to change that later...
16:02 _ikke_ latenite: git hooks have predefined names, you cannot just put a file with a random name in the hooks dir
16:02 perlpilot latenite: which hook calls write-date.bash?
16:02 kadoban latenite: Hooks have to be named a specific thing, which corresponds to when git will run them.
16:03 latenite oh like post-receive
16:03 latenite so I 'mv write-date.bash post-receive'
16:03 _ikke_ post receive runs on the server side
16:04 mar77i ah, I managed to simplify it a lot by specifying --strategy=recursive -X theirs. now it was only confused about the file adds, which created the same file twice with different ~derp suffixes.
16:04 latenite _ikke_, want this to run on the serverside, yes
16:04 _ikke_ ok
16:04 _ikke_ latenite: and you need to make sure it's executable
16:05 kadoban mar77i: Sounds like an improvement. Do make sure at the end that the result still makes sense though, and includes all the stuff you think it should.
16:05 perlpilot latenite: why do you want to write the date to a file each time someone pushes changes?
16:05 Doros joined #git
16:05 latenite _ikke_, renaming did the trick. thank you
16:06 kadoban I kind of assume that's just a test to figure out hooks
16:06 latenite perlpilot, just to test. Actually I want to start an ansible job up on a receive.
16:06 perlpilot kadoban: one would hope.   I just like to be sure  :)
16:06 latenite kadoban, indeed :D
16:06 oxguy3 joined #git
16:06 kadoban :)
16:06 _ikke_ Make sure it runs asyncronously
16:07 porsche944 joined #git
16:07 latenite _ikke_, asyncronously? could you explain what you mean by that?
16:07 Doros_ joined #git
16:08 robotroll joined #git
16:08 freimatz joined #git
16:09 Constant544 joined #git
16:09 mar77i ...weird stuff.
16:09 jstein_ joined #git
16:10 kadoban latenite: I believe that git will make the client wait while the hook runs, so that any output can be directed to the client. Which is usually not what you want to happen, so you probably want to set it up so the hook does a very small amount of work that later triggers an automatic thing to do the long-running task.
16:11 latenite kadoban, ah ok, sure I'll do that. Thank you.
16:12 eroux joined #git
16:12 Constant544 joined #git
16:12 ronin_work joined #git
16:13 sbasso joined #git
16:13 mar77i hmm. seems I was using cherry-pick for too long. the branches aren't considered the same by git at all.
16:13 lhcrkd joined #git
16:13 mar77i that is, by a lot of the recent history, but going 15 into the complete history.
16:13 latenite Is there a way to tell the hook which files have changed? I'd like to write an email and add file names of changed files ...
16:13 mar77i 15%.
16:14 GodGinrai latenite: I'm pretty sure the files changed are passed to the hooks
16:14 GodGinrai latenite: which hook are you looking at?
16:14 latenite GodGinrai, post-receive
16:15 durham joined #git
16:15 madewokherd joined #git
16:15 eroux joined #git
16:16 kegster joined #git
16:17 cam27 left #git
16:19 GodGinrai latenite: it looks like post-receive is given a list of the updated refs, so you would just need to use those to find the changed files.  I'm not sure exactly what command you would need to pass these refs into to get that list of files, tho'.  Maybe one of the gits here can help you on that matter.
16:20 latenite GodGinrai, maybe I just use bash and parse $@ and see.... :D
16:20 eroux joined #git
16:20 latenite GodGinrai, thank you for pointing the right direction.
16:20 GodGinrai np
16:21 peterbecich joined #git
16:22 buzzLightBeer joined #git
16:25 mischat joined #git
16:25 MathNeverEnds joined #git
16:26 eroux joined #git
16:27 scoobert1on joined #git
16:27 eroux joined #git
16:28 Rodya_ joined #git
16:28 manuelschneid3r joined #git
16:28 mda1 joined #git
16:28 Rodya__ joined #git
16:29 buzzLightBeer joined #git
16:29 kristofferR joined #git
16:30 IRQ` left #git
16:30 latenite Using ${@} in a post-receive script does not yield the filenames that where changed. https://gist.github.com/anonymous/f9bdca945f97ae2095a05901db040fa2
16:31 latenite How can I get the names / paths of the files changed in a post-receive hook?
16:32 metachr0n joined #git
16:33 batrick joined #git
16:33 Es0teric joined #git
16:34 perlpilot latenite: normal git commands should work.
16:35 perlpilot latenite: something like:   git diff --name-only COMMIT
16:36 eahmedshendy joined #git
16:36 kadoban Be a bit careful if this is important. It's ambiguous what "changed" means. If I change a file in one commit and revert that change in the next, was that file changed?
16:38 latenite perlpilot, kadoban (yes it was changed twice ... thank for the hint)
16:38 latenite https://gist.github.com/anonymous/01b36c90c9837229c7e87aca37c79af2
16:38 latenite I get this ^^ but no list of files
16:39 GodGinrai latenite: I told you, it gives you a list of refs, not files
16:40 latenite GodGinrai, there was nothing in ${@}, no files names not refs.
16:40 GodGinrai weird
16:41 _ikke_ latenite: you have to read stdin
16:41 _ikke_ It doesn't get the refs as arguments
16:41 latenite GodGinrai, see my last paste https://gist.github.com/anonymous/f9bdca945f97ae2095a05901db040fa2
16:43 _ikke_ latenite: post-receive gets the refs via stdin
16:43 latenite _ikke_, so I do 'cat /dev/stdin' in post-receive?
16:43 boombatower joined #git
16:43 _ikke_ "It takes no arguments, but gets the same information as the pre-receive hook does on its standard input."
16:43 _ikke_ for example
16:45 _ikke_ while read commit_old commit_new ref; do echo $commit_old $commit_new $ref; done
16:45 latenite _ikke_, great
16:45 latenite https://gist.github.com/anonymous/dfb688ed1cd721b1dfbd0472fb91a83f
16:45 latenite there we go
16:45 latenite no what are "refs" and how to I work with them? Its a new term to me.
16:45 gareppa joined #git
16:45 _ikke_ ref is the name for branches, tags etc
16:46 TomyLobo2 joined #git
16:46 nowhere_man joined #git
16:46 holodoc joined #git
16:47 _ikke_ a branch is a type of ref
16:48 latenite 'git show' seems to give me all the info I want in the email. nice
16:49 _ikke_ git show just shows the changes of a single commit
16:49 _ikke_ if you were to push more commits, than you would miss information
16:51 sbasso joined #git
16:53 latenite _ikke_, true it only shows the last commit
16:53 latenite https://gist.github.com/anonymous/bfbf517161c07508bdc4f18cfe393eae
16:53 latenite thats bad... hmm
16:53 latenite is there a command to show the changes between to pushs?
16:54 kadoban git show on a commit indeed just shows information about that particular commit. You probably need to figure out the previous commit that a ref pointed to and then use something like log or something lower level.
16:54 octo8 joined #git
16:54 octo8 joined #git
16:55 thebope joined #git
16:55 oxguy3 joined #git
16:56 latenite kadoban, that sounds doable but tedious. I was hoping git comes with a command to show diffs
16:56 octo8 today I asked a question about webhooks, I figured out the solution, http://stackoverflow.com/questions/43065897/webhook-php-file-work-from-terminal-but-not-from-bitbucket .... I would like to either make a video tutorial or write an article, which is best ?
16:56 GodGinrai octo8: I prefer articles over videos.  I tend to absorb better from articles, plus you can actually copy the examples instead of being angry that you can't copy what you are seeing. ;)
16:56 kadoban latenite: Not a lot of hookish stuff is very pretty
16:57 dhollinger joined #git
16:57 octo8 GodGinrai: but what is more viral ?
16:57 GodGinrai octo8: dunno.  would either of them be all that viral?
16:58 octo8 GodGinrai: which one is better to show for future employers ?
16:58 _ikke_ latenite: why not git diff <old> <new>
16:58 freimatz3 joined #git
16:59 GodGinrai octo8: I would assume an article would be better to show future employers.  Unless you are looking for a job that has video creation as one of your job responsibilities
16:59 latenite _ikke_, sounds great, if I would only knew what  <old> <new> referes to.
16:59 _ikke_ latenite: man githooks explains what data you get from stdin
16:59 gitinfo latenite: the githooks manpage is available at http://jk.gs/githooks.html
16:59 MarioBranco joined #git
16:59 octo8 GodGinrai: some people say if i show my face, then employers would know more about me...
17:00 octo8 i don't know... i will make an article I think
17:00 octo8 ok, now i go back to watching a whole series about git, to be more familiar with it
17:00 GodGinrai octo8: showing your face is for your interviews, IMO.  Show up in person (or do a remote video chat) and be cordial
17:01 t0by joined #git
17:01 t0by joined #git
17:01 hahuang61 joined #git
17:01 svm_invictvs joined #git
17:03 livingstn joined #git
17:03 quinq Have a good day
17:03 quinq left #git
17:03 salamanderrake joined #git
17:04 fission6 joined #git
17:04 latenite _ikke_, git diff <old> <new> indeed gives me the files and also what changed. But now I am spoiled from the 'git show' output and want info about the user, date as well
17:04 latenite where is that stored?
17:05 latenite Oh I see in 'git show <last>'
17:05 kpease joined #git
17:05 latenite cool that pretty much does it.
17:06 salamanderrake_ joined #git
17:06 latenite _ikke_, great thank you.
17:06 matoro joined #git
17:06 _ikke_ git show <last> still shows one commit..
17:06 xmj joined #git
17:06 xmj moin
17:06 _ikke_ latenite: Don't you want git log --patch <old>..<new>?
17:06 xmj is there a way to partially revert a commit, that is, restore two files but not restore the rest?
17:07 _ikke_ xmj: git checkout <commit> <file1> <file2>
17:07 _ikke_ xmj: This will overwrite any local changes to those files
17:07 xmj ah interesting
17:07 xmj _ikke_: can i use paths as well?
17:07 plicki joined #git
17:08 _ikke_ sure
17:08 PaoloP joined #git
17:08 User458764 joined #git
17:09 peterbecich joined #git
17:09 fbwnd joined #git
17:10 faLUCE joined #git
17:11 faLUCE Hello. After doing:  git add file1; git commit -m "comment1"; git add file2; git commit -m "comment2";    <--- how can I create two patches from these commits and squash them into one patch file?
17:11 PaoloP left #git
17:12 salamanderrake joined #git
17:12 kadoban faLUCE: 'git diff HEAD~2 > blah.patch' probably?
17:12 ejnahc joined #git
17:14 hahuang65 joined #git
17:15 al-damiri joined #git
17:16 faLUCE kadoban: thanks
17:16 latenite _ikke_, git log --patch <old>..<new> shows way more that what happend between last and second to last push.
17:16 latenite how come?
17:18 thallada joined #git
17:20 bitmod joined #git
17:20 sword joined #git
17:20 Fallen0223 joined #git
17:26 cagomez joined #git
17:26 dsantiag_ joined #git
17:28 oleo joined #git
17:29 Ryanar joined #git
17:29 cliluw joined #git
17:29 livingstn joined #git
17:29 peterbecich joined #git
17:30 [twisti] joined #git
17:30 nd- joined #git
17:31 [twisti] is it possible to have two 'origin' upstreams, or to chain upstreams somehow ? i would like to use my own gitlab instance for my projects, but it would be nice if they would be transparently 'backed up' to github or bitbucket
17:33 gunnaro joined #git
17:35 bannakaffalatta joined #git
17:36 dreiss joined #git
17:37 Sound joined #git
17:37 sonOfRa git remote set-url --push --add git@backup.com:twisti/backup
17:37 sonOfRa origin between --push
17:37 [twisti] and then when i push, it will be pushed to both ?
17:38 svm_invictvs joined #git
17:38 rominronin joined #git
17:39 matoro joined #git
17:39 sonOfRa Yup
17:41 Cabanossi joined #git
17:42 bannakaf_ joined #git
17:43 ronin_work joined #git
17:43 ayogi joined #git
17:43 fedepad joined #git
17:44 miczac joined #git
17:46 raspado joined #git
17:49 thebope joined #git
17:50 kasual joined #git
17:51 [twisti] cool, thanks
17:51 peterbecich joined #git
17:52 livingstn joined #git
17:53 Rodya_ joined #git
17:56 cliluw joined #git
17:56 plasticle joined #git
17:56 oleo joined #git
17:57 c0c0 joined #git
17:58 kpease joined #git
18:00 m1dnight_ joined #git
18:00 mischat joined #git
18:01 mischat joined #git
18:01 procrasinator joined #git
18:01 procrasinator Upstream user deleting, creating branches, how to update that in my repo?
18:02 procrasinator How to keep it synced?
18:02 procrasinator Now I have 12 branches he has only 8
18:03 Levin^ joined #git
18:03 ojacobson procrasinator: `git fetch --prune <remote>` or `git remote update --prune <remote>` will update your view of the <remote>'s branches
18:04 svm_invictvs joined #git
18:05 procrasinator I did git fetch --all --prune, then git push --all, the upstream is update but not mine. the branches he had they still in my side
18:05 satifant joined #git
18:05 prg3 joined #git
18:06 kpease joined #git
18:07 karols146 joined #git
18:07 _ikke_ git fetch and git push will never remove local branches
18:07 _ikke_ you have to manually remove them
18:08 plasticle joined #git
18:09 theoceaniscool joined #git
18:09 b100s joined #git
18:09 b100s hi2all
18:09 b100s can i search in git in all branches for last year for exact file ? : )
18:10 b100s i mean, i want to find commits on some file in all branches in all repo
18:11 procrasinator _ikke_: when do i need to run this command? `git push origin '+refs/remotes/upstream/*:refs/heads/*'`
18:11 fission6 joined #git
18:11 procrasinator or git push --all 'll work to push new remote branches
18:11 b100s better to restrict it by date, but not necessarily
18:12 dmc joined #git
18:12 ertesx joined #git
18:12 orbyt_ joined #git
18:14 b100s solved; 'git log --all' is what i need
18:14 Sasazuka joined #git
18:15 Es0teric joined #git
18:15 theiostream joined #git
18:16 Jackneilll joined #git
18:16 dionysus69 joined #git
18:16 dionysus69 hey all
18:17 karols146 dionysus69: o/
18:17 Cassiopaya joined #git
18:17 dionysus69 I am having trouble with my partner. so I made a pull request but meanwhile my partner had commits. the pull overwrote my partners commits. how can he merge my changes without deleting his own?
18:18 diogenese joined #git
18:18 hashtagstrashtag joined #git
18:20 theiostream joined #git
18:20 brent__ joined #git
18:26 snowalpaca joined #git
18:27 _ikke_ A normal merge does not overwrite changes
18:27 peterbecich joined #git
18:30 karols146 joined #git
18:31 dvaske joined #git
18:32 dvaske_ joined #git
18:32 dglambert Hey, is it possible to figure out which setup I choose when installing Git for Windows?
18:33 orbyt_ joined #git
18:33 dglambert I'm talking specifically about the Adjusting your PATH environment setp
18:33 peterbec` joined #git
18:35 enckse joined #git
18:35 _ikke_ dglambert: I'd use the default
18:35 _ikke_ unless you want to change what cmd does
18:35 dglambert I'm trying to compare to existing install
18:36 gunnaro_ joined #git
18:38 dglambert http://imgur.com/a/0CzCx
18:38 dglambert Top is the old install, bottom is my install
18:39 _ikke_ How old is the old install?
18:39 dglambert 2.10 I think
18:39 dglambert I installed 2.12
18:40 moei joined #git
18:40 dglambert 2.11.1
18:40 dglambert I installed 2.12.2
18:40 Silenced joined #git
18:40 dglambert So not very old
18:41 Sasazuka joined #git
18:41 roby10 joined #git
18:41 _ikke_ ok
18:42 Noldorin joined #git
18:42 dglambert Maybe its just the logo
18:42 Disavowed joined #git
18:42 dglambert I was just wondering if the original install differed in the setup of the integration with windows
18:43 mischat joined #git
18:43 _ikke_ It should not matter too much
18:43 thebope joined #git
18:44 theiostream joined #git
18:44 dglambert this is what I am talking about in the setup, http://imgur.com/a/HjCNo
18:45 dglambert I think I will test it by using the find and sort commands
18:45 mischat joined #git
18:45 _ikke_ The default should be good
18:48 snowalpaca joined #git
18:49 buzzLightBeer joined #git
18:49 Levin^ left #git
18:49 Cavallari joined #git
18:53 Darren_ joined #git
18:54 govg joined #git
18:57 nd joined #git
18:57 p4trix joined #git
18:57 peterbec` joined #git
18:58 Disavowed Morning all. In the event that I want to merge a feature branch back into master but keep all the changes from my feature branch if there are any merge conflicts, what is the idiomatic approach? Generally I'll just delete master and `git co -b master` but something tells me this is a horrifying thing to do!
18:59 Gustavo6046 joined #git
18:59 m0viefreak joined #git
18:59 GodGinrai Disavowed: what you are describing is not a merge, but a replacement
19:00 GodGinrai Disavowed: a merge would include changes that exist in master
19:00 weijunli joined #git
19:00 perlpilot Disavowed: Sounds like you want `git checkout master;  git merge -s theirs feature-branch` though
19:01 weijunli i have a super slow connection and everytime i try to clone a big project i end up with this error
19:01 weijunli error: RPC failed; curl 56 SSLRead() return error -36 | 98.00 KiB/s
19:01 snowalpaca joined #git
19:01 weijunli there's a way to prevent that or there's no way around and i need to improve my connection somehow
19:01 GodGinrai perlpilot: the beginning of his comment sounded like that.  But then he literally described what he would usually do which was completely replacing the branch...
19:01 paws_ joined #git
19:01 muhannad joined #git
19:03 perlpilot GodGinrai: yeah, I'm sort of assuming that was a mistake he's trying to learn from
19:03 gunnaro joined #git
19:04 matoro joined #git
19:04 roger_raymond joined #git
19:06 Disavowed I thought theirs was the correct merge strategy too, but it doesn't work for my version of git (2.10.0): Available merge strategies are: octopus ours recursive resolve subtree.
19:06 theiostream joined #git
19:07 superflat joined #git
19:07 Some_Person I need to split a folder way down in the folder heirachy of a repo into its own separate repo. What's the best way to go about this?
19:07 Some_Person it's like 4 subfolders deep
19:07 GodGinrai Disavowed: then wouldn't you just merge the other way using ours, then FF merge master?
19:07 Silenced joined #git
19:09 MonkOfCity joined #git
19:10 Sammitch joined #git
19:10 Disavowed I did the first part, and I guess stumbled on the FF merge master. It seemed a roundabout way to do it, but if that's the correct strategy in that instance, then I'll do that in future.
19:10 Disavowed What happened to 'theirs' anyway? I see it from time to time but I'm guessing it got deprecated?
19:11 jstimm joined #git
19:11 Some_Person I've been trying but messed it up each time so far
19:11 AstralStorm joined #git
19:12 Sammitch we've got a [bad] workflow that results in a number of clean, but abandoned working trees which is beginning to cause problems with disk/inode usage. is there a way to remove all files in a clean working tree, but have them restorable via a simple "git pull"?
19:12 yqt joined #git
19:14 _ikke_ what do you mean in this case with working trees? do you mean commits, or are you copying the files somewhere?
19:14 ronin_work joined #git
19:15 steeze joined #git
19:15 Sammitch basically every user has the repo cloned to their homedir
19:15 peterbec` joined #git
19:15 warthog9 joined #git
19:15 sotoz joined #git
19:16 _ikke_ that's quite normal
19:17 Some_Person I've been trying using git subtree, but for some reason, I only seem to get some of the history
19:17 Brski joined #git
19:18 Some_Person Crap... I think I know why. The subdirectory these files are in was renamed at one point
19:18 ujjain joined #git
19:18 ujjain joined #git
19:18 Some_Person How can I preserve the history despite that?
19:18 Sammitch _ikke_: it's not abnormal, but we also don't need 50 copies of the same code when 49 have no modifications and might never be touched again
19:18 thebird joined #git
19:19 Some_Person any ideas?
19:20 peepsalot joined #git
19:20 theiostream joined #git
19:21 Gsham joined #git
19:22 kkreate joined #git
19:23 Sasazuka joined #git
19:24 tvw joined #git
19:25 imack joined #git
19:25 _ikke_ Some_Person: Sorry, too little experience with subtree merge
19:26 _ikke_ Sammitch: git can share files between repos (but not the working tree itself)
19:26 _ikke_ Sammitch: But I'm not really sure what you want to achieve for the rest
19:27 ujjain joined #git
19:27 ujjain joined #git
19:28 Disavowed left #git
19:29 kkreate Hello, I currently work with php files on remote server with NetBeans connected to ftp. Want to use something like the distributed version control described in https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control. Since I work on remote files, can I manage git on that server from within NetBeans? I don't really want to create a local repo that pushes to servers local repo which then pushes to the remote repo server. Th
19:29 kkreate step.
19:30 kbeflo_ joined #git
19:30 Sammitch I have a lot of working trees sucking up disk space, I want to: 1. not have them do that. 2. not break workflow [too much], eg: the standard `git pull` at loging gives the user their up-to-date WT as usual
19:31 cagomez joined #git
19:31 sgen joined #git
19:31 _ikke_ Sammitch: git pull is not a good command to 'get an up-to-date' WT
19:32 _ikke_ Sammitch: but then you might want to look into git's features regarding sharing objects
19:32 fedepad joined #git
19:33 _ikke_ Sammitch: not that this is just about the repositories, not about the WTs
19:33 Random832 joined #git
19:34 Sammitch if I were concerned about consolidating the git metadata I'd have asked about that
19:34 dglambert Hey I am trying to get the mv command to move and rename a folder
19:34 aidalgol joined #git
19:34 dglambert I have C:\P2\Web, but I want to move \Web to C:\P2
19:34 dglambert I keep trying, but no dice
19:35 dglambert I'm trying to do it from within P2
19:35 Sammitch dglambert: move the files, not the folder. git doesn't really track folders, but rather the paths to tracked files.
19:35 dglambert oh ok
19:36 dglambert mv is a bash command though
19:36 Sammitch git mv
19:36 _ikke_ Sammitch: you could just remove the working tree files. Then a "git checkout ." would restore them again
19:36 dglambert Web is outside of git
19:36 dglambert my git starts inside of \Web
19:36 kkreate joined #git
19:36 snowalpaca joined #git
19:37 kkreate I would connect to remote repository in NetBeans, push changes there and then set up some sort of webhook to push to the server but since I do debugging it would require me to debug in one project and work in another...
19:37 ahrs joined #git
19:37 dglambert if I do something like; mv \Web\* \Web\..
19:37 kkreate pull to the server *
19:37 dglambert IS that what you mean Sammitch
19:37 thebope joined #git
19:38 _ikke_ I'm not sure netbeans supports working on a remote server
19:39 MonkOfCity joined #git
19:39 _ikke_ kkreate: My workflow is the opposite. I work remotely, and have a script (based on rync) sync my files remotely
19:39 _ikke_ sorry
19:39 _ikke_ I work locally
19:39 _ikke_ have git locally
19:40 Rodya_ joined #git
19:41 Cabanossi joined #git
19:43 paul424 joined #git
19:43 daivyk joined #git
19:45 cagomez joined #git
19:45 kkreate That would be fine, and then my local git could push to the remote git repo. Then it is implied the server has the same files as reflected in the remote repo. (so long as no one ever makes changes on the server without pushing the repo) I guess what I was hoping for is some way to have the the "local" git repo on the server and be able to manage it from either ide or ssh.
19:46 berndj joined #git
19:48 theiostream joined #git
19:49 robattila256 joined #git
19:51 benjy joined #git
19:52 Es0teric joined #git
19:53 cjohnson sshfs the dir
19:53 cjohnson mount it locally, including the .git dir
19:53 cjohnson then anything that operates on a .git dir will work seamlessly
19:54 * _ikke_ has bad experiences with sshfs
19:54 _ikke_ locking up all the time
19:56 benjy left #git
19:56 xmj left #git
19:58 whitby Does anyone know of a "trick" that involves (something along the lines of) stashing multiple times (twice?) and using the diff to do something?
19:58 whitby I'm not sure what it was called but I'm trying to remember what the "trick" was
19:58 Fallen0223 joined #git
19:59 _ikke_ what do you want to achieve with it?
19:59 whitby I don't want to use it, I'm just trying to remember what it was
19:59 gunnaro_ joined #git
20:00 faLUCE I'm trying git send-email, but it says: "incorrect username or password". Here's the config file:  http://paste.ubuntu.com/24269794/    what's wrong ?
20:00 ahrs joined #git
20:01 _ikke_ whitby: I'm not aware of any 'trick' regarding that
20:03 Es0teric joined #git
20:04 kpease joined #git
20:05 whitby _ikke_: thanks, I think this was it: http://blog.moertel.com/posts/2013-02-18-git-second-order-diff.html
20:07 hhee joined #git
20:08 bgamari joined #git
20:08 whitby Googling for things with "git" and "tricks" is quite an ordeal
20:13 b100s joined #git
20:13 netj joined #git
20:14 cjohnson locking up _ikke_? locking up what?
20:14 _Vi joined #git
20:15 _ikke_ cjohnson: my terminals mostly
20:16 ResidentBiscuit joined #git
20:16 cjohnson strange I've been using it for years for all sorts of stuff, remote mounted codebases, mounting my mp3 collection to my DJ laptop for my DJ software to read my music collection, streaming movies etc
20:17 cdg joined #git
20:18 gugah_ joined #git
20:19 FilipNortic_ joined #git
20:20 GodGinrai joined #git
20:21 snowalpaca joined #git
20:21 snowalpaca joined #git
20:22 brent__ joined #git
20:25 peterbec` joined #git
20:25 Cabanossi joined #git
20:27 brent__ joined #git
20:31 myhau joined #git
20:31 thebope joined #git
20:31 re1 joined #git
20:33 Gill joined #git
20:33 Gill hey I am trying to figure out how to ignore all files except for .cfg files in my .gitignore is this possible?
20:34 MathNeverEnds joined #git
20:35 peterbec` joined #git
20:35 preaction Gill: !*.cfg
20:36 Gill preaction: cool that will ignore everything but though?
20:36 Gill do i need a specific rul eot tell it to ignore everything else?
20:36 preaction no, that adds *.cfg as an exception
20:36 preaction * ignores everything...
20:37 askb joined #git
20:37 Gill so i have to have 2 lines first * then ~*.cfg?
20:37 Gill !*.cfg
20:37 preaction what's ~ doing?
20:37 Gill sorry typo
20:37 preaction what happens when you try it/
20:38 Gill when i try !*.cfg its adding other files
20:38 preaction also remember that you can't ignore files that are already in the repository, so if you're trying to ignore changes in a checkout of the repo it won't work
20:38 matoro joined #git
20:39 fission6 joined #git
20:39 Gill its ignoring my .gitignore
20:39 cyphase joined #git
20:39 roelmonnens joined #git
20:39 preaction i assure you it isn't
20:39 latenite Hi folks, I think I screwd up my index file. https://gist.github.com/anonymous/18d3f7cd1df7cf2cf8cc4763ecd39c0a
20:39 latenite is there a way to fix it?
20:39 preaction Gill: you might have to use **/* to ignore directories and subdirectories and subsubdirectories
20:40 octo8 joined #git
20:40 octo8 joined #git
20:40 ojacobson latenite: mv .git/index .git/index.broken && git reset
20:40 Gill Untracked files:
20:40 Gill (use "git add <file>..." to include in what will be committed)
20:40 Gill .gitignore
20:40 octo8 hello, a question : what is the difference between 'git push -u origin master' and 'git push origin master' ??
20:40 preaction Gill: don't paste into the channel, please
20:41 Gill sorry
20:41 preaction Gill: it's not ignoring it, it's an untracked file. if you also want to ignore hidden files, .*
20:41 Gill should my gitignore file be hidden?
20:41 cjohnson Gill: untracked files are files that git is NOT ignoring, that it detects aren't yet in the repository
20:41 ojacobson octo8: with -u, git-push does the equivalent of `git branch --set-upstream-to origin/master master` after the push
20:41 ojacobson so that the pushed branch tracks the target branch
20:42 preaction Gill: yes, it must absolutely be ".gitignore"
20:42 octo8 ojacobson: i can't find an explanation about the '-u' online ? can you... i searched a lot
20:42 Brski joined #git
20:42 Gill ok cool
20:42 latenite ojacobson, nice that did that trick :D
20:42 latenite thank you
20:42 ojacobson octo8: man git-push
20:42 gitinfo octo8: the git-push manpage is available at http://jk.gs/git-push.html
20:43 ojacobson latenite: note that you'll have to restage any formerly-staged changes
20:43 latenite Now I try to pull and I get this: https://gist.github.com/anonymous/6527469356a6df136bc6a62df7218c91
20:43 latenite what does that mean?
20:43 Sasazuka joined #git
20:43 ojacobson if they only existed in the staging area, you'll need to recover them with `git fsck` and that's no fun
20:43 Gill that so in ‘.gitignore’ i have !*.cfg and i just did a push and it pushed test.xml
20:43 ojacobson error: Your local changes to the following files would be overwritten by merge:
20:43 ojacobson You have uncommitted changes that conflict with the merge you asked for.
20:44 preaction Gill: i already said that .gitignore does not ignore files already tracked by the repository
20:44 Gill preaction: they were new files…
20:44 latenite ojacobson, I did not edit any files in the repo I am doing the 'git pull' in
20:44 Gill i will create test2.xml and try again
20:44 cjohnson Gill: !*.cfg doesn't match test.xml
20:44 preaction Gill: "push" doesn't do "new files", ever. did you mean "add"?
20:44 peterbec` joined #git
20:44 latenite ojacobson, where do these changes come from?
20:45 octo8 ojacobson: if i know nothing about branches yet, or merging yet (i'm still learning), is it ok for me to do push without -u if i have the only master branch ???
20:45 ojacobson latenite: something on your machine edited those files
20:45 Gill i did git add *
20:45 ojacobson if it wasn't you personally, it was something you ran
20:45 preaction Gill: so you explicitly added test.xml, which overrides gitignore. you wanted git add -a or git add .
20:45 ronin_work joined #git
20:45 latenite ojacobson, can I see/look at how the differ?
20:45 Gill preaction: how does that override gitignore?
20:45 preaction Gill: but also, unless you have the "*" line that we talked about, it's not being ignored (if it were ignored, it would not show up in "Untracked files")
20:45 Gill im confused
20:46 Rodya_ joined #git
20:46 Gill oh
20:46 preaction Gill: "git add *" is expanded by your shell into "git add <every individual thing in the current directory>", which means you explicitly did "git add test.xml", which means git added it because you said to
20:46 roelmonnens joined #git
20:46 Gill so when i do a git push should i not be running git add *?
20:46 Rodya__ joined #git
20:47 ojacobson Gill: push and fetch transfer commits and branches
20:47 ojacobson git-add doesn't affect any existing commits, or any branches
20:47 preaction push and add are separate operations that don't have anything to do with each other. push pushes commits. add adds to a commit. commit is the link between them.
20:47 ojacobson `git add` stages stuff for the next `git commit`, which _does_ create a commit
20:47 miczac joined #git
20:48 scoobertron joined #git
20:50 latenite Hi folks, how can I view the differences of these files: https://gist.github.com/anonymous/6527469356a6df136bc6a62df7218c91
20:50 Gill i think i need to do a full git tutorial
20:50 Gill im totally confused now
20:51 ojacobson !gcs
20:51 gitinfo [!concepts] "Git Concepts Simplified" presents all the important structures in Git, step by step, including selected internal details so it becomes much easier to understand what's going on whenever something's going on. http://gitolite.com/gcs.html
20:52 ojacobson latenite: `git diff HEAD` will show any uncommitted changes in your work tree
20:52 ojacobson `git diff --staged HEAD` will show any uncommitted changes you have staged
20:52 lmatteis joined #git
20:53 Gill thanks!
20:53 sz0 joined #git
20:53 ojacobson latenite: the output of `git status` will tell you how to manipulate those changes, once you understand what they are :)
20:55 latenite ojacobson, so ONLY persmissions changed? https://gist.github.com/anonymous/c05167728964fa56318b24690faf12a5
20:57 ojacobson Looks like.
20:57 ojacobson Committed state has -x perms, disk state has +x perms
20:57 peterbec` joined #git
20:58 latenite ojacobson, so git also tracks permissions? I was not aware of that.
20:59 imack joined #git
20:59 ojacobson Just the X bit
20:59 ojacobson and only one bit, not three
20:59 ojacobson All other perms (and, for that matter, the application of the x bit to each of user, group, and other) come from your umask when you run git commands
21:01 latenite ojacobson, oh ok
21:01 latenite that's odd but I'll try to remember :D
21:01 cjohnson it would be a nightmare if it tracked perms hah
21:02 ojacobson cjohnson: it's actually one of the more frequent feature requests
21:02 austin987 joined #git
21:02 cjohnson the idea is if you need special perms you include some sort of setup tool to make those changes
21:02 ojacobson tools like etckeeper already do that
21:02 cjohnson Im sure, just seems like it would add a huge amount of mess and complexity
21:02 cjohnson if it's done in an opt-in way I'm ok with that but
21:02 ojacobson given how slapdash people are about umask generally, it'd probably lead to a lot of spurious mode change commits
21:02 ojacobson or disputes about whether a tracked file should be g+w or not
21:03 ojacobson or some jackass checking in 0777 perms on everything because they had a problem and looked up the solution on stackoverflow
21:03 cjohnson exactly
21:03 cjohnson I can barely enforce a consistent indentation method across devs
21:04 _August_ joined #git
21:07 mojjo joined #git
21:09 Atm0spher1c joined #git
21:14 borkr joined #git
21:14 MonkOfCity joined #git
21:14 peterbec` joined #git
21:14 jost__ joined #git
21:16 cdown joined #git
21:16 g0d355__ joined #git
21:16 dsdeiz joined #git
21:17 Endarked joined #git
21:18 cdg_ joined #git
21:19 sotoz joined #git
21:22 roelmonnens joined #git
21:23 cdown_ joined #git
21:24 alhariel joined #git
21:25 roelmonnens joined #git
21:25 zerow joined #git
21:26 thebope joined #git
21:28 nivag joined #git
21:29 oxguy3 joined #git
21:30 nivag joined #git
21:30 marianina8 joined #git
21:34 mikecmpbll joined #git
21:35 Doginal joined #git
21:35 prg3 joined #git
21:36 fission6 joined #git
21:36 secki joined #git
21:38 b100s joined #git
21:38 Some_Person How do I do a lightweight tag on an older commit?
21:39 sotoz joined #git
21:39 atomi joined #git
21:40 Cabanossi joined #git
21:42 preaction Some_Person: git tag <name> <commit>
21:44 Some_Person preaction: Thanks!
21:44 Ryanar joined #git
21:44 Some_Person The next thing I need to do is move 6 commits to a different branch...
21:45 bitmod joined #git
21:46 preaction rebase is a thing that can do that
21:46 preaction so is cherry-pick
21:46 preaction and then you need to reset to remove them from the branch they were on
21:47 gopar joined #git
21:47 Rodya_ joined #git
21:48 amdi_ joined #git
21:50 cdown_ joined #git
21:52 jeffreylevesque joined #git
21:54 dionysus69 joined #git
21:56 kegster joined #git
22:00 Gill joined #git
22:04 cagomez joined #git
22:06 Dougie187 left #git
22:06 watom- joined #git
22:09 kexmex joined #git
22:09 MarioBranco joined #git
22:10 Aeterne joined #git
22:10 Whiskey Many times when i make a commit
22:11 anderson_ joined #git
22:11 Whiskey and do "git push" it says "Everything up-to-date" so i have to do it repated times untill it accepts it, what can that be?
22:14 Sasazuka_ joined #git
22:17 ronin_work joined #git
22:18 cyberz joined #git
22:19 kadoban Whiskey: I've never seen it change behavior after repeated attempts, unless someone else changes the remote version in between ... and they'd have to change it in a pretty specific way for your push to get accepted after not being needed.
22:19 thebope joined #git
22:20 fission6 joined #git
22:20 cagomez joined #git
22:21 Whiskey kadoban, im the ony one that own the repo, so i the only one that make the changes to it
22:21 Whiskey its not a big problem, its just a bit enoying
22:22 kadoban Are you doing commits between trying to push and it not being needed, and then pushing and it being accepted?
22:23 Whiskey how do you mean
22:23 warthog9 joined #git
22:23 TikityTik joined #git
22:23 Whiskey i do a change, git add <file>, git commit -m "my massage", git push
22:24 aw1 joined #git
22:24 kadoban And then it's accepted? That's what's usually supposed to happen.
22:25 Whiskey yeh sometimes it works on first try, sometimes i have to try push it multiply times before it get accepted
22:25 kadoban Not sure, never seen that.
22:25 Whiskey i have only use git for like 1 month so im not good at this shit
22:26 Whiskey only handle like 10 commands but, i use a proxy for it to enable ssl for an example
22:26 Whiskey that can be one problem
22:26 Whiskey like connection are lost, or the read of current base don´t get right or whatever
22:27 Whiskey i use git 1,9,1 but i don´t think that has anything to do whit it, atlest not the main problem
22:28 TSS_ joined #git
22:29 kadoban Even through a proxy, AFAIK it should either succeed normally or fail with an error if the connection can't be done or something. Maybe there's some odd caching thing going on? What transport mechanism are you using, is this HTTP I guess?
22:30 afuentes joined #git
22:31 Sasazuka joined #git
22:33 foul_owl joined #git
22:33 Whiskey https, as i told
22:34 Whiskey the proxy use https, and the connector or whatever you call it use http
22:34 bannakaffalatta joined #git
22:34 kadoban Maybe it's caching then, that sounds awful. If you can do another transport mechanism, maybe try that?
22:34 Whiskey i use gitea, its on localhost so no need use it on https, its just the connection on the proxy it https as i don´t allow anything outside it but it was more easy to use https in apache, then actully do it whit gitea
22:35 perrier-jouet joined #git
22:35 Whiskey yeh can be that, and na i won´t change it :) it works good at it is
22:35 Whiskey espect from the commits sometimes :D
22:36 yarekt Hi, I'm looking for a fail safe and portable way to check if current HEAD is differe (or older) to remote
22:37 yarekt repo is cloned with -b <ref> parameter, which could be a branch name, a tag or just a ref
22:37 yarekt I suppose there wouldn't really be a failsafe way determine what is the remote ref for something...
22:38 yarekt But maybe theres a way to resolve a branch name or a tag to something?
22:39 fletom joined #git
22:39 Gloomy joined #git
22:41 peterbec` joined #git
22:42 Noodlewitt joined #git
22:43 chipotle joined #git
22:43 cyberz joined #git
22:44 foul_owl Is it common practice to have several branches and keep those branches around for long periods of time? ie, master, testing, integ? And of course doing the actual dev work in short term feature branches
22:45 oncall-pokemon joined #git
22:46 Synthead joined #git
22:46 dirtyroshi joined #git
22:47 yarekt foul_owl: It depends on your workflow. Generally I wouldn't advice to keep a lot of work in old branches, integration is always harder the bigger the diversion
22:47 dirtyroshi joined #git
22:48 AlexanderS joined #git
22:49 patarr joined #git
22:51 peterbec` joined #git
22:53 whitby joined #git
22:54 prg318 joined #git
22:54 chipotle joined #git
22:56 foul_owl I was thinking of a workflow like
22:56 foul_owl * Create feature in feature branch
22:56 foul_owl * Merge into testing branch
22:56 foul_owl * Test in testing branch
22:56 foul_owl * Merge testing into integration branch
22:56 foul_owl * Do integration testing
22:57 foul_owl * Merge into master
22:57 yarekt Why not test in feature branch?
22:57 webdev007 joined #git
22:57 foul_owl Sure
22:57 yarekt Why not run integration testing on feature branch?
22:57 yarekt You are only delaying the inevitable work anyway
22:58 foul_owl Aren't there normally different phases of testing though?
22:58 foul_owl Performed by different people?
22:58 yarekt People!?
22:58 foul_owl Just a way to break up the work over a large codebase at a company?
22:58 foul_owl Haha
22:59 hahuang65 joined #git
22:59 cagomez joined #git
23:01 peterbec` joined #git
23:03 gugah joined #git
23:04 systemovich joined #git
23:07 dirtyroshi joined #git
23:10 MarioBranco joined #git
23:13 venmx joined #git
23:13 molgrum joined #git
23:13 molgrum joined #git
23:14 thebope joined #git
23:17 matoro joined #git
23:19 octo8 joined #git
23:19 austin987 joined #git
23:21 peterbec` joined #git
23:24 dendazen joined #git
23:25 kyan joined #git
23:27 bocaneri joined #git
23:28 sythe joined #git
23:30 patarr joined #git
23:30 MathNeverEnds joined #git
23:30 gableroux joined #git
23:31 bocaneri joined #git
23:33 madewokherd joined #git
23:37 MacWinner joined #git
23:40 HardlySeen joined #git
23:42 gableroux joined #git
23:44 MrWoohoo joined #git
23:45 matoro joined #git
23:47 Taikibansei joined #git
23:47 Lyqyd joined #git
23:47 Gsham joined #git
23:48 prg3 joined #git
23:49 dsdeiz joined #git
23:50 ronin_work joined #git
23:50 patarr joined #git
23:56 Cabanossi joined #git
23:57 Ahmed90 joined #git

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