Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-11

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

All times shown according to UTC.

Time Nick Message
00:03 pks joined #git
00:04 MattMaker joined #git
00:04 pfrench joined #git
00:05 arescorpio joined #git
00:07 sharkz joined #git
00:11 marianina8 joined #git
00:12 ocelotsloth joined #git
00:14 j08nY joined #git
00:16 jimklo joined #git
00:16 howitdo joined #git
00:17 pfrench joined #git
00:18 rchavik joined #git
00:24 jimklo joined #git
00:28 pfrench joined #git
00:29 TbobbyZ_ joined #git
00:29 MattMaker joined #git
00:29 gopar joined #git
00:31 gopar joined #git
00:32 pur3eval joined #git
00:35 cdown_ joined #git
00:35 wxg joined #git
00:36 dsdeiz joined #git
00:36 dsdeiz joined #git
00:37 cdown__ joined #git
00:38 ResidentBiscuit joined #git
00:39 pfrench joined #git
00:39 minn joined #git
00:45 ResidentBiscuit joined #git
00:45 King_Hual joined #git
00:46 snowalpaca joined #git
00:47 PaulCapestany joined #git
00:47 bomb-on joined #git
00:52 xissburg_ joined #git
00:52 chachasmooth joined #git
00:53 mvensky joined #git
00:54 PaulCapestany joined #git
00:54 chachasmooth_ joined #git
00:56 eclecticjohny joined #git
00:56 Bhootrk_ joined #git
00:57 Cabanossi joined #git
01:02 chachasmooth joined #git
01:03 durham joined #git
01:03 sathya joined #git
01:07 peeps[lappy] joined #git
01:10 clemf joined #git
01:14 gopar joined #git
01:14 Lyqyd joined #git
01:17 madewokherd joined #git
01:17 rkazak_ joined #git
01:20 LeBlaaanc joined #git
01:21 raijin joined #git
01:22 pfrench joined #git
01:26 orbyt_ Quick question: I have a repository which was originally creating inside my Google Cloud Platform console. I had been having some issues, and wanted to put the repository on Github for another developer to help debug. I added him as a collaborator on Github to see the repo. If he clones the repository from Github, will he then be able to push or pull to the Cloud Platform Repository?
01:27 orbyt_ I'm a bit confused on how authentication works in this case
01:28 raspado joined #git
01:29 echo2 orbyt_ no, he will only be able to push and pull from github, unless you are secretly a git maven and have set up a real distributed version control system
01:29 orbyt_ git maven?
01:29 echo2 expert
01:30 orbyt_ Oh, I assumed the build system
01:30 orbyt_ lol
01:30 echo2 hahaha
01:30 echo2 wow. just hit me that i haven't done java in years. who would have thought
01:31 orbyt_ Yea, if I do git remote -v in the repository, it lists the push and pull remote for the cloud repository. If he tries to push or pull from that origin, what will happen
01:31 pfrench joined #git
01:32 echo2 how about you try cloning from Github into another location, and then try to break into your gcp instance from there?
01:32 danielparks joined #git
01:33 danielparks Is there a command line option to ignore ~/.gitconfig?
01:34 cdown joined #git
01:34 g0d355__ joined #git
01:34 orbyt_ Well that is where my confusion arises. Google cloud platform provides a Cloud SDK which enables a bunch of tools through a `gcloud` command. When the tool is initialized I had to authenticate, and the tool is global to my machine.
01:34 orbyt_ @echo2 ^
01:34 orbyt_ Will try it though, one moment
01:34 Virox joined #git
01:35 orbyt_ Oh, hmm. When I clone it and execute `git remote -v`, only the github remotes are listed.
01:36 orbyt_ let me try and add the other remotes..
01:40 onecoder779981 joined #git
01:40 orbyt_ Cool, it asks for authentication
01:42 einnjo joined #git
01:43 jimi_ joined #git
01:43 Lunatrius joined #git
01:46 onecoder779981 left #git
01:49 pfrench joined #git
01:54 pfrench joined #git
01:55 danielparks To answer my own question, it looks like setting XDG_CONFIG_HOME=~/emptydir HOME=~/emptydir GIT_CONFIG_NOSYSTEM=1 will disable all general configuration. I haven't tested it yet.
01:56 jimklo_ joined #git
01:57 Cabanossi joined #git
01:58 BackEndCoder joined #git
01:58 pur3eval joined #git
01:59 Some_Person joined #git
01:59 Some_Person joined #git
01:59 MattMaker joined #git
02:01 danielparks Even better. I've just confirmed that XDG_CONFIG_HOME= HOME= GIT_CONFIG_NOSYSTEM=1 git … works
02:02 prg318 joined #git
02:06 xissburg joined #git
02:06 svm_invictvs joined #git
02:08 Darren_ joined #git
02:09 dandaman joined #git
02:10 finalbeta joined #git
02:10 askb joined #git
02:11 nevodka joined #git
02:12 duderonomy joined #git
02:13 dsantiago joined #git
02:13 einnjo joined #git
02:15 ahrs joined #git
02:18 pfrench joined #git
02:21 finalbeta joined #git
02:25 Derperperd joined #git
02:25 TbobbyZ joined #git
02:25 pks joined #git
02:27 ffilozov joined #git
02:27 Learath2 joined #git
02:29 d^sh joined #git
02:30 xissburg joined #git
02:32 blunaxela joined #git
02:36 TbobbyZ joined #git
02:37 TbobbyZ joined #git
02:37 chachasmooth joined #git
02:40 luke_nukem joined #git
02:42 anuxivm left #git
02:47 Cabanossi joined #git
02:47 pfrench joined #git
02:47 skyfaller joined #git
02:47 snowalpaca joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 pfrench joined #git
02:52 menip joined #git
02:54 lorenzo joined #git
02:54 chachasmooth joined #git
02:54 lorenzo hi
02:54 gitinfo lorenzo: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
02:55 fatalhalt joined #git
02:55 marianina8 joined #git
02:55 lorenzo does git automatically convert \r\n to \n?
02:56 pfrench joined #git
02:56 sunri5e joined #git
02:56 bocaneri joined #git
02:59 cjohnson lorenzo: https://help.github.com/articl​es/dealing-with-line-endings/
03:02 lorenzo aha thanks
03:02 pfrench joined #git
03:02 Emperor_Earth joined #git
03:02 eh3- joined #git
03:04 fstd_ joined #git
03:04 ojdo joined #git
03:08 impliednude joined #git
03:14 chachasmooth joined #git
03:14 pfrench joined #git
03:15 xall joined #git
03:19 Goplat joined #git
03:19 orbyt_ joined #git
03:21 chris_wot joined #git
03:21 TbobbyZ joined #git
03:22 hexagoxel joined #git
03:24 impliednude joined #git
03:24 Vortex35 joined #git
03:25 lagothrix joined #git
03:33 jeffreylevesque joined #git
03:33 jameser joined #git
03:38 pfrench joined #git
03:39 minn When I run git log with -z and tformat for null separator semantics, the output of --numstat is sometimes separated from whatever is specified by the format string by one (rarely) and two (most often) null characters. Does anyone know why this is?
03:43 pfrench joined #git
03:44 pks joined #git
03:49 minn I thought at first the issue could be related to blank fields, since fields are being separated by null characters, but that isn't the case.
03:50 xaviergmail joined #git
03:52 pfrench joined #git
03:52 ayogi joined #git
03:56 pfrench joined #git
03:58 hexagoxel joined #git
04:00 anry joined #git
04:01 pfrench joined #git
04:03 pks joined #git
04:04 dreiss joined #git
04:06 Nilesh_ joined #git
04:07 chachasmooth joined #git
04:07 eclecticjohny joined #git
04:07 pfrench joined #git
04:08 raijin joined #git
04:11 Cabanossi joined #git
04:11 pfrench joined #git
04:15 pfrench joined #git
04:18 chachasmooth joined #git
04:19 pfrench joined #git
04:22 ertes joined #git
04:22 dsdeiz joined #git
04:24 mizu_no_oto joined #git
04:24 pfrench joined #git
04:25 pks joined #git
04:28 pfrench joined #git
04:33 pfrench joined #git
04:47 dandaman joined #git
04:47 pfrench joined #git
04:48 TbobbyZ joined #git
04:50 clemf joined #git
04:52 pfrench joined #git
04:53 TbobbyZ joined #git
04:53 oxenfree joined #git
04:55 oxenfree hi guys, i changed the permissions on some files in a git repo a few commits back. it looks ugly on the commit log and change log. is there a fix for this?
04:55 preaction you can rewrite history, but i'd not do that. i'd ignore it
04:56 mizu_no_oto joined #git
04:56 oxenfree copy that, i just get anal about how things look sometimes, and this one is dissapointing
04:56 oxenfree i guess its a lesson learned
04:56 pfrench joined #git
04:56 oxenfree would `git config core.filemode false` help prevent this issue in the future?
04:58 lucido-cl joined #git
04:59 oxenfree i was also looking this thread, https://stackoverflow.com/questions/251​7339/how-to-recover-the-file-permission​s-to-what-git-thinks-the-file-should-be, but running the script i keep getting unrecognized input
04:59 oxenfree maybe because the issue is a few commits back?
05:00 chachasmooth joined #git
05:00 pfrench joined #git
05:00 wxg joined #git
05:01 oxenfree the thread is from 2010, but the answer was edited last year in april, it's up to date with other threads
05:01 oxenfree i guess i would want to diff the appropriate commit though
05:04 kasual joined #git
05:05 pfrench joined #git
05:07 SwiftMatt joined #git
05:11 Cabanossi joined #git
05:11 pfrench joined #git
05:11 ebcz joined #git
05:17 hexagoxel joined #git
05:18 pfrench joined #git
05:23 Derperperd joined #git
05:23 pfrench joined #git
05:24 TheHackax joined #git
05:27 pfrench joined #git
05:32 shinnya joined #git
05:32 Darren_ joined #git
05:36 marianina8 joined #git
05:43 oaaao joined #git
05:45 matoro joined #git
05:45 pfrench joined #git
05:45 ResidentBiscuit joined #git
05:45 pks joined #git
05:50 pfrench joined #git
05:52 gtristan joined #git
05:56 jimi_ joined #git
05:58 pks joined #git
05:58 MineCoins joined #git
06:02 pfrench joined #git
06:04 xaviergmail joined #git
06:05 EisNerd joined #git
06:11 pfrench joined #git
06:13 hexagoxel joined #git
06:15 chachasmooth joined #git
06:17 pfrench joined #git
06:18 diogenese joined #git
06:22 pfrench joined #git
06:25 xall joined #git
06:27 pfrench joined #git
06:27 significance joined #git
06:28 significance Hey all! Is there a way to automate deployment of my git repository over ssh on push?
06:29 awal significance: Have you looked at server-side update hooks?
06:29 mda1 joined #git
06:29 significance awal: I haven't -- how might I implement those?
06:29 jameser joined #git
06:30 awal significance: https://git-scm.com/book/en/​v2/Customizing-Git-Git-Hooks
06:30 significance thank you!!!
06:31 awal np
06:34 pfrench joined #git
06:38 guardianN joined #git
06:38 guardianN left #git
06:41 Cabanossi joined #git
06:42 pfrench joined #git
06:44 rwp significance, Also please read this too: http://gitolite.com/deploy.html
06:45 ankit01ojha joined #git
06:46 pfrench joined #git
06:50 pfrench joined #git
06:54 pfrench joined #git
06:59 pfrench joined #git
06:59 marianina8 joined #git
07:01 oxenfree left #git
07:03 mehola joined #git
07:03 dreiss joined #git
07:05 jagob joined #git
07:06 pfrench joined #git
07:08 eroux joined #git
07:09 awal left #git
07:09 impliednude joined #git
07:11 dsdeiz joined #git
07:11 dsdeiz joined #git
07:13 pfrench joined #git
07:17 ayogi joined #git
07:18 pfrench joined #git
07:19 tmg joined #git
07:22 pfrench joined #git
07:27 thiago joined #git
07:27 pfrench joined #git
07:27 significance joined #git
07:28 significance Dumb question -- I have my client computer, a server computer, and GitHub. How can I trigger a hook on the server when I push from my client to GitHub?
07:29 thiago check GitHub's website for more information or ask in #github if they have a notification API
07:29 thiago something like an RSS feed
07:29 significance thiago: thank you!
07:29 thiago it will be time-delayed
07:30 significance left #git
07:31 pfrench joined #git
07:31 jameser joined #git
07:33 dsdeiz joined #git
07:35 pfrench joined #git
07:36 lowercaseman joined #git
07:36 impliednude joined #git
07:39 hexagoxel joined #git
07:39 lowercas_ joined #git
07:40 chachasmooth joined #git
07:40 pfrench joined #git
07:45 pfrench joined #git
07:45 impliednude joined #git
07:46 ResidentBiscuit joined #git
07:48 TbobbyZ joined #git
07:49 pfrench joined #git
07:49 jnavila joined #git
07:50 brent__ joined #git
07:52 pfrench joined #git
07:53 d0nn1e joined #git
07:54 MarioBranco joined #git
07:54 radoslavcap joined #git
07:56 Cabanossi joined #git
07:56 pfrench joined #git
07:56 xall joined #git
08:01 finalbeta joined #git
08:01 pfrench joined #git
08:03 wxg joined #git
08:04 TomyLobo joined #git
08:06 jleclanche is there a way in git to rebase onto multiple branches at once?
08:07 jleclanche I have A->B, A->C, A->D and I want to get A->D->C->B
08:07 jleclanche the way I'd do that right now is do a rebase on d, then cherry-pick the c branch, then the b branch. surely theres a better way?
08:07 venmx joined #git
08:08 MarioBranco joined #git
08:09 pfrench joined #git
08:09 TheHackax joined #git
08:10 hexagoxel joined #git
08:10 smurfendrek123 joined #git
08:12 irqq joined #git
08:14 MarioBranco joined #git
08:15 pfrench joined #git
08:18 MarioBranco joined #git
08:19 Derperperd joined #git
08:20 pfrench joined #git
08:21 blablabla joined #git
08:21 MarioBranco joined #git
08:22 JanC_ joined #git
08:23 miczac joined #git
08:24 rwp joined #git
08:24 pfrench joined #git
08:25 kexmex joined #git
08:26 SuperLag_ joined #git
08:28 pfrench joined #git
08:33 Murii_ joined #git
08:34 impliednude joined #git
08:35 Murii_ joined #git
08:35 radoslavcap joined #git
08:37 SteffanW joined #git
08:37 pfrench joined #git
08:40 a_thakur joined #git
08:41 t0by joined #git
08:41 t0by joined #git
08:41 blunaxela joined #git
08:43 overlord_tm joined #git
08:44 Jackneill joined #git
08:44 pfrench joined #git
08:44 scoobertron joined #git
08:49 blablabla Hi. Could someone help me how to do "git pull" for local branch if we use gerrit?
08:49 blablabla I mean I'd like to fetch and merge remote commit "refs/changes/22/123/11" to my local branch that is on "refs/changes/22/123/5"
08:50 pfrench joined #git
08:51 radoslavcap joined #git
08:51 geek2nerd joined #git
08:52 OnceMe joined #git
08:53 matoro joined #git
08:53 Amarylis joined #git
08:53 MarioBranco joined #git
08:56 pfrench joined #git
08:56 OnceMe I have removed file and doesnt know how to retrieve it
08:56 OnceMe I tried git fetch and git pull but file still doesnt show up
08:58 noonien left #git
09:00 MarioBranco joined #git
09:01 lucido-cl joined #git
09:02 PioneerAxon joined #git
09:02 elenmirie joined #git
09:03 rwp OnceMe, "git status" shows the file as "delete: somefile" ?  If so then use "git checkout somefile" to retrieve a copy from the repository.
09:05 pfrench joined #git
09:06 OnceMe rwp: yes thanks
09:06 OnceMe git status also shows
09:06 OnceMe modified:   python/Tornado/venv/lib/python2.7/site-pac​kages/backports.ssl_match_hostname-3.5.0│    1  exit
09:06 OnceMe .1.dist-info/RECORD
09:06 hexagoxel joined #git
09:06 OnceMe rwp: how to fetch and pull/merge that?
09:07 OnceMe because whenever I do git pull and git status I see some python files modified
09:07 rwp First you seem to be misunderstanding what fetch, merge, and pull do. Especially in relation to local modifications.
09:08 rwp If you have local modifications, including removing the file, then that all appears as local changes not yet committed.
09:08 radoslavcap joined #git
09:08 rwp You should either commit those first, or "git stash" them. Get to a clean state. Then do your merges.
09:09 xaviergmail joined #git
09:09 rwp If you have local modifications, such as modified files or removed files, then merge (or pull which is fetch+merge) will not restore them. Removed files look like a local change.
09:10 rwp So if you have a "modified:" file and want to un-modify it then that is something you must explicitly do.
09:10 rwp You can "git checkout somefilename" to pull the copy out of the object store if you want.
09:11 rwp Or you can (caution, can undo everything, big hammer here) "git reset --hard" too.
09:11 OnceMe I see, thank for explanation
09:11 chris_wot joined #git
09:13 MarioBranco joined #git
09:13 pfrench joined #git
09:15 bruce_lee joined #git
09:17 xall joined #git
09:18 MarioBranco joined #git
09:19 TomyLobo joined #git
09:20 pfrench joined #git
09:21 navidr joined #git
09:22 mabuchin joined #git
09:23 MarioBranco joined #git
09:23 TomyLobo joined #git
09:24 TomyLobo joined #git
09:24 pfrench joined #git
09:24 chardan joined #git
09:27 th_ joined #git
09:28 pfrench joined #git
09:29 sm_ joined #git
09:33 tmg joined #git
09:35 pfrench joined #git
09:37 MarioBranco joined #git
09:38 Hozy joined #git
09:39 duderonomy joined #git
09:41 Cabanossi joined #git
09:41 Kopitaja joined #git
09:44 ShapeShifter499 joined #git
09:46 __main__ joined #git
09:46 pfrench joined #git
09:46 ResidentBiscuit joined #git
09:51 King_Hual joined #git
09:52 Cassiopaya joined #git
09:53 _ADN_ joined #git
09:53 pfrench joined #git
09:55 cdown joined #git
09:57 pfrench joined #git
09:57 aard_ joined #git
09:58 senaps joined #git
09:59 MarioBranco joined #git
09:59 cdown_ joined #git
10:00 noteness joined #git
10:02 pfrench joined #git
10:03 _ADN_ joined #git
10:06 _ADN_ joined #git
10:06 dersand joined #git
10:06 brent__ joined #git
10:06 lucido-cl joined #git
10:07 d^sh joined #git
10:10 mastro joined #git
10:10 hexagoxel joined #git
10:11 smurfendrek123 joined #git
10:12 elsevero joined #git
10:14 pfrench joined #git
10:14 BackEndCoder joined #git
10:17 TbobbyZ joined #git
10:17 _ADN_ joined #git
10:17 Taikibansei joined #git
10:17 miczac joined #git
10:18 pfrench joined #git
10:18 NwS joined #git
10:19 Dodgis joined #git
10:19 inflames joined #git
10:19 Vampire0_ joined #git
10:20 _ADN_ joined #git
10:21 jbitdrop joined #git
10:22 _ADN_ joined #git
10:23 pfrench joined #git
10:25 miczac_ joined #git
10:26 nowhere_man joined #git
10:28 _ADN_ joined #git
10:29 nidr0x joined #git
10:29 pfrench joined #git
10:30 MarioBranco joined #git
10:31 YuGiOhJCJ joined #git
10:33 jameser joined #git
10:33 clemf joined #git
10:35 Maxdamantus joined #git
10:36 bket joined #git
10:39 shinnya joined #git
10:40 pfrench joined #git
10:41 mehola joined #git
10:42 nowhere_man joined #git
10:42 netj joined #git
10:43 _ADN_ joined #git
10:43 cdown_ joined #git
10:45 salamanderrake joined #git
10:46 pfrench joined #git
10:46 miczac joined #git
10:50 eroux joined #git
10:52 elsevero joined #git
10:53 _ADN_ joined #git
10:55 jnavila joined #git
10:55 nowhere_man joined #git
10:56 _ADN_ joined #git
10:57 pfrench joined #git
10:59 absinthe joined #git
11:01 marenz_ joined #git
11:01 j08nY joined #git
11:02 eroux joined #git
11:03 pfrench joined #git
11:03 quite joined #git
11:05 vuoto joined #git
11:06 impliedn joined #git
11:06 theoceaniscool joined #git
11:08 sunnny joined #git
11:12 _ADN_ joined #git
11:13 Cabanossi joined #git
11:13 as_g5pw joined #git
11:14 Tobbi joined #git
11:18 pfrench joined #git
11:21 g5pw joined #git
11:26 smurfendrek123 joined #git
11:27 pfrench joined #git
11:34 jameser joined #git
11:34 pfrench joined #git
11:37 robotroll joined #git
11:46 echo2 joined #git
11:49 jimi_ joined #git
11:49 _ADN_ joined #git
11:50 pfrench joined #git
11:56 jnavila joined #git
11:56 pfrench joined #git
11:57 _ADN_ joined #git
11:58 pks joined #git
11:58 Cabanossi joined #git
12:00 _ADN_ joined #git
12:00 ayogi joined #git
12:01 irqq joined #git
12:02 pfrench joined #git
12:04 mehola joined #git
12:05 Jackneill joined #git
12:09 irqq_ joined #git
12:09 nettoweb joined #git
12:09 pfrench joined #git
12:12 _ADN_ joined #git
12:13 nowhere_man joined #git
12:14 GT4066 joined #git
12:15 overlord_tm joined #git
12:17 cdown joined #git
12:18 s1scha joined #git
12:18 _ADN_ joined #git
12:20 pfrench joined #git
12:24 pfrench joined #git
12:24 cdown_ joined #git
12:29 Michael_ joined #git
12:29 elsevero joined #git
12:32 _ADN_ joined #git
12:35 cdown_ joined #git
12:37 sbasso joined #git
12:38 pfrench joined #git
12:39 Michael_ joined #git
12:40 xaviergmail joined #git
12:41 _ADN_ joined #git
12:44 Michael_ left #git
12:44 pfrench joined #git
12:45 Guest24 joined #git
12:47 cdown_ joined #git
12:47 jameser joined #git
12:48 pfrench joined #git
12:50 brent__ joined #git
12:53 pfrench joined #git
12:56 _ADN_ joined #git
12:56 robotroll joined #git
12:56 sgen joined #git
12:56 jameser joined #git
12:56 hfp joined #git
12:57 hfp_work joined #git
13:00 pfrench joined #git
13:01 _ADN_ joined #git
13:02 kotk joined #git
13:05 wxg joined #git
13:09 User458764 joined #git
13:10 jameser joined #git
13:11 impliednude joined #git
13:12 irqq joined #git
13:13 imack joined #git
13:13 _ADN_ joined #git
13:15 pfrench joined #git
13:19 nettoweb joined #git
13:20 pfrench joined #git
13:23 nettoweb joined #git
13:26 jost joined #git
13:28 JanC_ joined #git
13:32 chipotle joined #git
13:32 Lyberta joined #git
13:34 Lyberta my, I don't have to rights to push to master and we use a separate branch for each feature but some of my features depend on ones that are not in the master yet, can I create a separate fake master branch with all of my features?
13:34 cdown joined #git
13:35 osse Lyberta: You can make a your own branch initially equal to master that you merge the features you need into
13:35 Lyberta I see
13:39 pfrench joined #git
13:40 jameser joined #git
13:40 _ADN_ joined #git
13:41 radoslavcap joined #git
13:43 geek2nerd joined #git
13:44 Sound joined #git
13:44 hfp joined #git
13:45 hfp_work joined #git
13:51 naquad left #git
13:52 cdown joined #git
13:52 mabuchin joined #git
13:53 ThomasLocke joined #git
13:54 chachasmooth joined #git
13:55 peeps[lappy] joined #git
13:56 jost_ joined #git
13:56 jameser joined #git
14:00 Derperperd joined #git
14:00 marianina8 joined #git
14:05 bitmod joined #git
14:05 bitmod how does one untrack a file?
14:05 Murii_ joined #git
14:05 bremner !untrack
14:05 gitinfo To remove a file from git's tracking, without deleting it from your working tree, `git rm --cached <file>`. Note that any repo which pulls this change will delete their local copy of that file. You can "bring it back" using `git checkout HEAD@{1} file` immediately after pulling / merging
14:06 bitmod thanks
14:06 bitmod also what does it mean when a file is tracked? i'm reading through pro git but don't really understand what it's trying to say
14:07 masuberu joined #git
14:07 bitmod does tracked mean it will be included in the next commit?
14:08 nedbat bitmod: no, it means you can add it to the next commit
14:09 bitmod nedbat: so if you create a new file in a repo with git status "nothing to commit, working tree clean", does that mean it's also tracked? (because it can be added to the repo)
14:10 nedbat bitmod: it will be tracked unless it's ignored by a .gitignore
14:10 raynold joined #git
14:10 jost__ joined #git
14:11 Timvde nedbat: Are you sure that's the right meaning?
14:12 shinnya joined #git
14:12 Timvde Doesn't "tracked" mean that the file has been added to git before, and will be included if you do git commit -a?
14:12 nedbat Timvde: i could be wrong.
14:12 _ADN_ joined #git
14:12 Timvde Yea, the thing is: me too :P
14:13 pfrench joined #git
14:13 Cabanossi joined #git
14:18 chachasmooth joined #git
14:20 chipotle joined #git
14:25 _ADN_ joined #git
14:25 borkr joined #git
14:27 Blaguvest joined #git
14:28 Vampire0 joined #git
14:29 adac joined #git
14:29 impliednude joined #git
14:30 mizu_no_oto joined #git
14:31 _ADN_ joined #git
14:32 chachasmooth joined #git
14:34 User458764 joined #git
14:38 cdg joined #git
14:39 aielima joined #git
14:39 xaviergmail joined #git
14:40 elenh_ joined #git
14:40 elenh_ left #git
14:41 slackR joined #git
14:41 scoobert1on joined #git
14:41 pfrench joined #git
14:41 chachasmooth joined #git
14:43 Cabanossi joined #git
14:45 _ADN_ joined #git
14:45 marianina8 joined #git
14:46 elsevero_ joined #git
14:48 chachasmooth joined #git
14:48 jameser joined #git
14:48 _ADN_ joined #git
14:50 _ADN_ joined #git
14:51 aielima joined #git
14:51 Tobbi joined #git
14:53 grayjoc joined #git
14:53 finalbeta joined #git
14:53 jost joined #git
14:54 sarri joined #git
14:54 sarri joined #git
14:57 User458764 joined #git
14:59 Gustavo6046 joined #git
15:01 theoceaniscool joined #git
15:02 _ADN_ joined #git
15:02 stoopkid joined #git
15:02 leeN joined #git
15:05 pfrench joined #git
15:07 pijiu joined #git
15:07 eh3- joined #git
15:08 eclecticjohny joined #git
15:09 grayjoc joined #git
15:10 dsdeiz joined #git
15:10 dsdeiz joined #git
15:12 _ADN_ joined #git
15:13 pfrench joined #git
15:14 slackR left #git
15:16 nettoweb joined #git
15:16 chipotle joined #git
15:16 Atm0spher1c joined #git
15:19 cjdarcy joined #git
15:20 User458764 joined #git
15:23 _Cyclone_ joined #git
15:23 forgon joined #git
15:24 forgon joined #git
15:24 forgon joined #git
15:24 nettoweb joined #git
15:24 forgon Newbie. Cloned repository, added a commit and want to push it, yet receive a 403.
15:25 forgon Username and password entered are correct.
15:25 forgon Did I forget to set something up?
15:25 osse forgon: Did you clone someone else's repo?
15:25 n1ce joined #git
15:26 forgon osse: Yes.
15:26 pfrench joined #git
15:26 osse forgon: Then you don't get to push. You either gave to ask for permission, or create a fork and push that.
15:27 osse Go to the repo webpage, press the fork button and follow the instructions
15:27 Tobbi joined #git
15:27 osse https://help.github.com/ar​ticles/working-with-forks/
15:28 ndowens08 joined #git
15:28 nettoweb joined #git
15:28 Cabanossi joined #git
15:28 Lyberta I accidentally created a branch from the wrong commit, how can I change it? Or maybe create another branch and move the commit to it?
15:30 phy1729 you can rebase --onto
15:30 ndowens08 If I delete a local copy of my repo(origin), which is forked from another project(upstream) and it has a Pull request upstream, is there a way to regain access to the upstream PR to update it?
15:31 mehola joined #git
15:31 ndowens08 hopefully that is clear to understand :)
15:31 osse ndowens08: The straight way, I believe. The pr originated in your repo, so clone it again and push to the branch the pr was cheated from
15:32 mehola joined #git
15:32 ankit01ojha joined #git
15:32 ndowens08 osse: the only way i have found is to open a new PR since I can't push it upstream, as I have no commit access there
15:34 ndowens08 i can do the git pull upstream pull/ID/head:NAME but doesn't help when I can push it upstream. Can't pull ID from my repo b/c of it isnt there anymore
15:34 ndowens08 s/can/can't
15:34 pfrench joined #git
15:35 fees joined #git
15:36 Eryn_1983_FL hi peeps
15:36 Eryn_1983_FL so..
15:36 MarioBranco joined #git
15:36 Eryn_1983_FL this is long winded question ...l
15:36 Eryn_1983_FL so I have my nagios configurations files puppetized and templated in a git repo..
15:37 Eryn_1983_FL on saturdays and sundays my box make alot of alerts for nagios and page my phone..
15:38 Eryn_1983_FL do you think it is wise for me to make a branch in git to raise the levels for these alerts a bit, and switch it back after it is done?
15:38 Eryn_1983_FL is this too much work?
15:39 orbyt_ joined #git
15:39 nettoweb joined #git
15:41 osse ndowens08: So your fork is deleted from github? Then I've no idea
15:42 MarioBranco joined #git
15:44 ndowens08 osse: like if my local copy(on hard drive) is gone, when I look at the upstream repo, it says I want to merge NAME to master from what would be my forked copy on github to named unknown repo
15:44 pfrench joined #git
15:45 arunpyasi joined #git
15:46 MarioBranco joined #git
15:47 * osse is confused
15:49 Darren_ joined #git
15:49 osse The important bits are: the original repo made by someone else, your fork that's also on github, and the clone on your local hard-drive. Which of these don't exist anymore?
15:53 Vampire0_ joined #git
15:54 robotroll joined #git
15:55 pfrench joined #git
15:57 warthog9 joined #git
15:59 MarioBranco joined #git
15:59 fold4 joined #git
16:00 anuxivm joined #git
16:00 nod joined #git
16:06 re1 joined #git
16:06 pfrench joined #git
16:08 madewokherd joined #git
16:09 sarri joined #git
16:09 sarri joined #git
16:13 kexmex joined #git
16:14 sunnny left #git
16:15 Balliad joined #git
16:15 xaviergmail joined #git
16:15 Balliad joined #git
16:16 _ADN_ joined #git
16:17 pfrench joined #git
16:18 grayjoc joined #git
16:18 Tobbi joined #git
16:18 _ADN_ joined #git
16:18 grayjoc joined #git
16:18 dandaman joined #git
16:22 LeBlaaanc joined #git
16:23 dsteplight__ joined #git
16:24 grayjoc joined #git
16:24 hfp joined #git
16:25 peeps[lappy] left #git
16:25 ndowens08 ok lets see if I can explain better maybe; origin is my forked copy of nixos/nixpkgs; upstream is nixos/nixpkgs; I updated a package and opened a PR to be pushed to upstream; if I messed up my local copy of my origin repo; if my copy of my origin gets messed up, i tend to delete origin and local folder pointing to origin; after forking again, I clone it to my HD and which makes the PR say it is wanting to merge
16:25 ndowens08 to nixos/nixpkgs:master from ndowens:unknown repo. Is there a way to update the PR upstream
16:26 pfrench joined #git
16:26 osse I would expect that to "just work". The new fork you create presumably has the exact same name as the previous one.
16:27 osse But ask #github. I don't know.
16:27 ndowens08 ah ok, thought maybe it was a git thing, forgot may need to as github :) thanks for your time though
16:27 dwmw2_gone joined #git
16:28 osse Also, deleting both a local and remote repo is a very nuclear approach to starting over. Learning how to deal with the problems you get into is well worth your time compared to this
16:28 govg joined #git
16:28 ndowens08 yea i dont understand git too good; and also I need to redo my partitions to in which will create issues( running out of partition space)
16:28 Cabanossi joined #git
16:29 grayjoc joined #git
16:29 Balliad joined #git
16:30 SCHAAP137 joined #git
16:30 _joes__ joined #git
16:31 blahdodo joined #git
16:36 ndowens08 left #git
16:40 YuGiOhJCJ joined #git
16:41 adac joined #git
16:42 pfrench joined #git
16:43 _ADN_ joined #git
16:46 _ADN_ joined #git
16:47 miczac joined #git
16:47 grayjoc joined #git
16:49 eh3 joined #git
16:49 User458764 joined #git
16:52 diogenese joined #git
16:53 Endarked joined #git
16:55 impliednude joined #git
16:57 dreiss joined #git
16:58 telephone joined #git
16:58 telephone joined #git
17:01 _ADN_ joined #git
17:02 gugah joined #git
17:02 manuelschneid3r joined #git
17:03 _ADN_ joined #git
17:05 chipotle joined #git
17:05 elenmirie\splat joined #git
17:06 Sonderblade joined #git
17:08 _ADN_ joined #git
17:09 mda1 joined #git
17:11 _ADN_ joined #git
17:11 kbs joined #git
17:12 nd_ joined #git
17:12 publio joined #git
17:13 dandaman joined #git
17:13 multi_io joined #git
17:14 _ADN_ joined #git
17:18 dreiss joined #git
17:19 dwmw2_gone joined #git
17:19 fahadash joined #git
17:20 User458764 joined #git
17:20 pfrench joined #git
17:23 jnavila joined #git
17:24 dviola joined #git
17:25 eroux joined #git
17:25 eclecticjohny joined #git
17:28 elsevero joined #git
17:29 radoslavcap joined #git
17:31 ispn joined #git
17:31 dsdeiz joined #git
17:31 pfrench joined #git
17:33 Tobbi joined #git
17:34 _ADN_ joined #git
17:34 Hozy1 joined #git
17:36 _ADN_ joined #git
17:37 pfrench joined #git
17:38 dreiss joined #git
17:38 Vampire0 joined #git
17:41 rkazak_ joined #git
17:42 _joes__ joined #git
17:42 xaviergmail joined #git
17:43 rkazak_ joined #git
17:47 pfrench joined #git
17:48 tyrese1 joined #git
17:48 tyrese joined #git
17:48 tyrese hey
17:48 gitinfo tyrese: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
17:48 Some_Person joined #git
17:48 Some_Person joined #git
17:48 tyrese I have to a private repo but want to be able to share certain commits with people
17:48 tyrese is there a way I can easily copy select commit versions to a public repo?
17:49 durham joined #git
17:49 tyrese without making a new repo, copying the files to a new folder, etc
17:49 zeth joined #git
17:50 gk- joined #git
17:51 miczac_ joined #git
17:51 pfrench joined #git
17:53 gk- joined #git
17:54 nedbat tyrese: that sounds difficult. are you sure you can't separate your work into a public repo and a private repo?
17:54 tyrese i could
17:54 tyrese i just wish git had an option for public branches in a private repo
17:55 tyrese that could temporary be made public
17:55 ertesx joined #git
17:56 apotry joined #git
17:56 nedbat tyrese: hmm, it doesn't do that.
17:58 gk- joined #git
17:59 durham joined #git
17:59 radoslavcap joined #git
18:00 ujjain joined #git
18:00 ujjain joined #git
18:00 astrofog joined #git
18:01 Goplat joined #git
18:04 m0viefreak joined #git
18:05 gk- joined #git
18:05 PHPanos joined #git
18:05 particle1olem joined #git
18:07 orbyt_ joined #git
18:07 dandaman joined #git
18:08 jnavila joined #git
18:11 spm_draget joined #git
18:13 jimklo joined #git
18:13 Cabanossi joined #git
18:14 User458764 joined #git
18:14 xissburg joined #git
18:17 mmlb joined #git
18:17 jost joined #git
18:21 gk- joined #git
18:23 jimklo joined #git
18:28 vuoto joined #git
18:28 jimklo joined #git
18:28 miczac joined #git
18:28 whaley joined #git
18:34 Bizkit joined #git
18:35 impliednude joined #git
18:36 livingstn joined #git
18:37 vegard joined #git
18:37 pfrench joined #git
18:39 Gloomy joined #git
18:40 ujjain joined #git
18:41 ij How can a .git be smaller than the working tree?
18:41 preaction compression
18:41 preaction untracked files
18:42 ujjain joined #git
18:42 ij I cloned from a local directory bare repo, so untracked files are off.
18:43 dreiss joined #git
18:44 nidr0x joined #git
18:44 pfrench joined #git
18:44 jimklo joined #git
18:44 Some_Person joined #git
18:44 Some_Person joined #git
18:44 taylan joined #git
18:45 taylan can I set an ssh key to use per git repo?  I need different keys for different repos on the same host
18:46 User458764 joined #git
18:46 ij I think it depends on what you host those repos with.
18:46 Lyberta left #git
18:47 ij If you've an regular linux ssh creds, then no matter what repo you're trying to use, once you're in, you're in.
18:47 miczac joined #git
18:47 ij You might need a gitolite or gitlab or something to have better control.
18:49 taylan my issue is with github.  it didn't allow the same ssh key for multiple accounts.  now I need to set up git/ssh to conditionally use one or another key depending on what github user's repo I'm pushing to.  (unfortunately, pushing to github involves always using the "git" user, regardless of the github user account in question)
18:49 taylan ah wait, I found something: use a pseudo hostname for the remote url, set the true name of the host in the ssh config
18:49 ankit01ojha joined #git
18:51 taylan yeah that worked
18:52 inflames joined #git
18:52 ij Nice.
18:53 clemf joined #git
18:54 pfrench joined #git
18:57 sbasso joined #git
18:58 vdv joined #git
19:04 tureba joined #git
19:05 fbwnd joined #git
19:06 manuelschneid3r joined #git
19:07 menip joined #git
19:08 pfrench joined #git
19:10 Vampire0_ joined #git
19:12 phillco joined #git
19:13 theoceaniscool joined #git
19:13 irqq joined #git
19:15 diogenese joined #git
19:18 ResidentBiscuit joined #git
19:19 miczac joined #git
19:19 jost joined #git
19:20 TikityTik joined #git
19:21 CountryNerd joined #git
19:25 pfrench joined #git
19:25 jost_ joined #git
19:27 ResidentBiscuit joined #git
19:27 miczac joined #git
19:27 jost__ joined #git
19:28 schleppel joined #git
19:29 kjsaihs joined #git
19:29 pfrench joined #git
19:29 mda1 joined #git
19:31 kbs joined #git
19:32 eclecticjohny joined #git
19:33 robotroll joined #git
19:34 Guest32509 joined #git
19:34 monty_hall left #git
19:39 SwiftMatt joined #git
19:40 variable joined #git
19:42 LEI joined #git
19:42 LEI joined #git
19:43 Tobbi joined #git
19:43 Cabanossi joined #git
19:44 dvaske joined #git
19:48 TbobbyZ joined #git
19:49 pfrench joined #git
19:49 Derperperd joined #git
19:54 impliednude joined #git
19:57 jnavila joined #git
19:58 miczac joined #git
19:59 pfrench joined #git
20:04 pfrench joined #git
20:07 pks joined #git
20:07 ajaXHorseman joined #git
20:08 ResidentBiscuit joined #git
20:09 cdown joined #git
20:09 kbs joined #git
20:14 ResidentBiscuit joined #git
20:14 ToBeCloud joined #git
20:15 menip joined #git
20:17 livingstn joined #git
20:17 Tatou joined #git
20:18 jnewt joined #git
20:19 metalraiden34 joined #git
20:21 finalbeta joined #git
20:22 Eryn_1983_FL joined #git
20:24 elenmirie\splat left #git
20:25 elenmirie joined #git
20:28 elenmirie left #git
20:30 Lauven joined #git
20:32 grayjoc joined #git
20:35 mknod joined #git
20:35 kbs joined #git
20:38 Ring0` joined #git
20:38 Ring0` joined #git
20:39 chardan joined #git
20:41 Amaryllis joined #git
20:42 raijin joined #git
20:42 Derperperd joined #git
20:48 TheHackax joined #git
20:48 MattMaker joined #git
20:48 MattMaker joined #git
20:49 irqq_ joined #git
20:49 Amaryllis left #git
20:52 dvaske joined #git
20:53 apotry joined #git
20:53 d0nn1e joined #git
20:57 miczac joined #git
20:59 grayjoc joined #git
21:00 Anja joined #git
21:02 DIDAVISION joined #git
21:06 rx-bad joined #git
21:08 miczac joined #git
21:08 Rotaerk joined #git
21:09 MattMaker joined #git
21:09 metachr0n joined #git
21:10 TbobbyZ joined #git
21:14 blackwind_123 joined #git
21:14 jimklo joined #git
21:16 pfrench joined #git
21:17 cbreak taylan: why this is done is quite obvious
21:17 cbreak they use the SSH key not only for authorization but also for identification
21:17 rx-bad left #git
21:19 kjsaihs joined #git
21:19 jost joined #git
21:19 miczac joined #git
21:22 pfrench joined #git
21:23 Rodya_ joined #git
21:28 pfrench joined #git
21:30 courrier joined #git
21:32 orbyt_ joined #git
21:33 pfrench joined #git
21:35 fragMental joined #git
21:41 nejni-marji joined #git
21:41 raijin joined #git
21:42 nejni-marji From the command line, is there a way to revert the last commit that hasn't already been reverted?
21:42 atomi joined #git
21:43 nejni-marji or if I can revert the entire most recent git pull
21:43 tmg joined #git
21:45 pfrench joined #git
21:46 kbs joined #git
21:47 ajaXHorseman joined #git
21:47 wcpan joined #git
21:47 theoceaniscool joined #git
21:48 sathya left #git
21:50 rmbeer joined #git
21:50 rmbeer hello
21:52 rmbeer where found a documentation about of push, pull, and fetch? Is for make a new protocol in TCP/IP for remote repository
21:52 rmbeer documentation for developer**
21:55 pfrench joined #git
22:00 geek2nerd joined #git
22:01 kbs rmbeer: have you looked at the source/Documentation?
22:02 rmbeer kbs, yes
22:02 rmbeer kbs, but what of all?
22:02 rmbeer which*
22:03 kbs rmbeer: whatever you find useful I suppose :) things under Documentation/technical seem relevant, but I'll hand-wave and wish you success
22:03 kyan joined #git
22:04 rmbeer ....
22:04 Guest45611 joined #git
22:05 thiago rmbeer: do you really need to write a new protocol?
22:05 thiago why?
22:05 thiago what's wrong with SSH transport?
22:07 rmbeer thiago, not have problem for SSH, but thinking that is best if make a another protocol, like github built his own.
22:07 rudi_s rmbeer: They did?
22:08 rmbeer rudi_s, sorry, unknown. maybe git make the protocol for github...
22:09 jast github didn't make any new protocols
22:10 rmbeer jast, ok
22:11 ReptilianBrain joined #git
22:11 jast github supports three different protocols: Git via SSH, Git via HTTPS and Git's own anonymous protocol (for unauthenticated access)
22:12 Fischmiep joined #git
22:12 rmbeer jast, yes, now view this. with github support the HTTPS....
22:15 gugah joined #git
22:15 boombatower joined #git
22:15 lucido-cl joined #git
22:16 dreiss joined #git
22:17 atomi joined #git
22:18 thiago rmbeer: right, it supports https
22:18 thiago rmbeer: why do we need a new protocol?
22:18 luke_nukem joined #git
22:18 nilg joined #git
22:20 rmbeer thiago, for build a new server that work with repositories. Thinking that is a best idea if make a new protocol like HTTPS but completely different and more low level.
22:21 thiago rmbeer: you didn't answer why we need a new one
22:21 rmbeer SSH work always with a remote account, and HTTPS work with MIME and HTML
22:21 thiago HTTPS works for Git too
22:21 thiago why do we need a new one?
22:21 phy1729 HTTP doesn't need to server HTML
22:21 phy1729 -r
22:22 thiago what are you trying to accomplish that the current ones can't do?
22:22 rmbeer phy1729, no? and what about of MIME?
22:22 thiago what does MIME have to do with anything?
22:23 rmbeer thiago, in the HTTP use GET/POST for send and receive from server, and always need a headers of MIME.....
22:23 thiago yes, so?
22:24 thiago what's the problem with that?
22:24 rmbeer thiago, then, i want remove it in the new protocol...
22:24 thiago like HTTP2?
22:24 rmbeer thiago, no...
22:24 thiago ok, so you don't want binary like HTTP2
22:24 thiago and like Git over SSH
22:24 thiago what do you want to accomplish that those can't do?
22:25 rmbeer SSH work with account of the system...
22:25 thiago so?
22:25 thiago what's the problem with that?
22:25 thiago answer what you want to do that you can't do with those
22:25 rmbeer not understand, you dislike a new protocol? :/
22:26 thiago I dislike useless work
22:26 thiago what is the single most important thing your new protocol will do that the current ones won't?
22:27 thiago this question will be asked if you want to contribute it to Git
22:29 impliednude joined #git
22:29 rmbeer thiago, git have the 3 protocol that work all. SSH and HTTPS for remote server, yes, two protocol that exist and work. But what about a new protocol? But have two problem: 1) For make a new server with SSH you need all system for git, why SSH take accounts name. 2) HTTP you need make a new server web, add plugins like PHP and all stuff.... But why not a new protocol for work direct with remote gits?
22:31 BlaXpirit joined #git
22:31 thiago 1) is wrong
22:31 thiago you can run an SSH server on another port, besides 22
22:31 thiago I don't know about 2. I don't run Git via HTTP.
22:32 thiago as for a protocol that works directly, we already have one: the Git protocol
22:32 rmbeer thiago, not is convenient open a SSH port for all users in a server, only if you maintain only 1 repository that you want maintain....
22:32 thiago you're not making sense
22:33 thiago obviously only the administrator can add repositories to a server
22:33 thiago so one server is fine. If you don't want to run it on port 22, you can run it on another port.
22:33 pfrench joined #git
22:33 thiago you don't even need to use OpenSSH. For example, Gerrit uses its own SSH server.
22:34 xaviergmail joined #git
22:34 rmbeer without openssh??
22:34 thiago yes
22:35 rmbeer then is possible make a multiple account for git with only 1 account of linux?
22:35 bremner !gitolite
22:35 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/ Quick example: http://gitolite.com/gitolit​e/overview/#basic-use-case
22:35 bremner rmbeer^
22:35 alexandre9099 joined #git
22:36 thiago yes
22:36 rmbeer ooooh, ok. thank. now view this. :D
22:36 thiago you can multiplex via SSH keys, like Gitolite and GitHub do
22:37 thiago Gerrit uses the SSH user name, but it runs its own SSH server
22:37 ngc0202 joined #git
22:37 ngc0202 Hi, how do I force all files to use LF line endings in my repository?
22:37 thiago ngc0202: are you on Windows?
22:37 ngc0202 Yes
22:38 ngc0202 I mean the remote repository not locally
22:38 rmbeer thank thiago bremner
22:38 thiago ngc0202: man git-config. There's a setting (search for CRLF) to tell Git to check out as-is and not convert to Windows line endinga
22:38 gitinfo ngc0202: the git-config manpage is available at http://jk.gs/git-config.html
22:38 dmc joined #git
22:40 ngc0202 Doesn't git config affect only what's local?
22:40 thiago ngc0202: yes
22:40 thiago ngc0202: but everything starts local
22:41 thiago ngc0202: anyway, CRLF conversions are local only.
22:41 grumble joined #git
22:41 ngc0202 I did git add and got about a hundred thousand lines saying it'd convert all my LF to CRLF
22:41 ResidentBiscuit joined #git
22:41 thiago ngc0202: that's because you added LF files
22:41 thiago they'll be converted to CRLF when you check them out again
22:41 ngc0202 I want them to be LF
22:41 pfrench joined #git
22:42 thiago see the config I asked you to search for, then
22:42 thiago the files in the repository database will have LF
22:42 thiago the question is only what Git checks them out on Windows
22:42 ngc0202 Can I make this setting only for the current repository though?
22:42 ngc0202 I don't necessarily want everything I ever do on git to be forced LF
22:43 ngc0202 I assume you're referring to core.eol=LF ?
22:43 thiago ngc0202: yes, .git/config only applies to the current repository
22:43 thiago I think so, I am not sure of the name
22:44 ngc0202 git config --local core.eol=lf
22:44 ngc0202 I'm about to hit enter. Promise this does what I want? :)
22:44 thiago yes, though --local is the default
22:44 ngc0202 I want to be double extra sure
22:44 inflames joined #git
22:44 ngc0202 also how do I unadd the files I added before?
22:44 thiago can't promise, but I have good confidence
22:44 thiago is this a new repository?
22:46 ngc0202 no it's not
22:46 ngc0202 and I still got the same messages about LF being replaced with CRLF
22:46 pfrench joined #git
22:46 DuckHuntDog joined #git
22:47 thiago back up those files, git reset --hard, restore the files, git add them again
22:48 DuckHuntDog I dropped a few stashes too many and now I gotta recover the commit-hashes. However there's so much stuff in my githistory now that I can't filter out the relevant ones from the noise.
22:49 DuckHuntDog I tried  `git show --oneline $(git fsck --no-reflogs | awk '/dangling commit/ {print $3}')´ which basically gives one long log of everything
22:49 DuckHuntDog Is there a way to filter that by date or something?
22:50 DuckHuntDog I just want to see stuff I did in the past 3 days
22:50 geek2ne34 joined #git
22:52 mehola joined #git
22:53 mostlybadfly joined #git
22:53 smurfendrek123 joined #git
22:53 cbreak DuckHuntDog: take a look at the reflog
22:54 cbreak DuckHuntDog: man git log -g
22:54 gitinfo DuckHuntDog: the git-log manpage is available at http://jk.gs/git-log.html
22:54 LBV_User joined #git
22:54 cbreak run that on the branch you're interested in
22:54 cbreak DuckHuntDog: man git reflog
22:54 gitinfo DuckHuntDog: the git-reflog manpage is available at http://jk.gs/git-reflog.html
22:55 heroux joined #git
22:56 spm_draget left #git
22:59 pfrench joined #git
22:59 beuker joined #git
23:00 DuckHuntDog cbreak: `git reflog` doesn't show me anything about stashes. Unless there's an option for that which I'm not seeing
23:01 ngc0202 i cant seem to get it to not change lf to crlf
23:02 geek2nerd joined #git
23:03 geek2ne46 joined #git
23:04 ngc0202 no amount of git reset git add -A will save me from this tyranny
23:04 Noldorin joined #git
23:05 ngc0202 i wouldnt mind but i learned the hard way that shell scripts dont work with crlf
23:06 geek2nerd joined #git
23:09 anuxivm joined #git
23:10 justanotheruser joined #git
23:13 Cabanossi joined #git
23:14 cbreak DuckHuntDog: nothing does
23:14 cbreak DuckHuntDog: since the stashes are reflog
23:15 cbreak DuckHuntDog: but if you have ever committed anything properly, the reflog will show it
23:15 cbreak ngc0202: just turn off that auto crlf crap
23:16 rmbeer between gitolite and gerrit, seem best gerrit.
23:16 NeXTSUN joined #git
23:16 cbreak rmbeer: nah
23:16 cbreak gerrit is very different from gitolite
23:16 raijin joined #git
23:18 pfrench joined #git
23:18 rmbeer !gerrit
23:18 gitinfo Gerrit is a web-based code review system, built by Google. https://www.gerritcodereview.com/
23:18 durham joined #git
23:19 ahrs_ joined #git
23:19 smurfendrek123 joined #git
23:20 rmbeer google, java, and server web... this take a negative points about of gerrit.... :(
23:21 geek2ne41 joined #git
23:22 geek2ne86 joined #git
23:23 rmbeer gitolite confess that not have all stuff that have gerrit, and use git and openssh for work...
23:23 LeBlaaanc joined #git
23:24 Eugene gerrit and gitolite are serving wildly different goals, so yes, one might be "better" if it matches your goal ;-)
23:24 TikityTik Why is it that a fail merge happens when i'm the only maintainer and I didn't git pull before my git commit?
23:25 TikityTik where i need to manually resolve it?
23:26 mmattice joined #git
23:28 pfrench joined #git
23:34 geek2nerd joined #git
23:35 metalraiden34 joined #git
23:35 Goplat joined #git
23:36 ahrs joined #git
23:39 pfrench joined #git
23:43 cbreak TikityTik: you get conflicts if there are changes that conflict
23:43 cbreak no matter how many maintainers there are
23:43 Cabanossi joined #git
23:43 TikityTik but the last push and commit came from the same machine
23:44 TikityTik and when i commit, it says things changed from the remote
23:44 TikityTik well it gets that fail merge i mean
23:44 xaviergmail joined #git
23:44 geek2nerd joined #git
23:45 cbreak TikityTik: that's not a failed merge
23:45 TikityTik it still tells me to resolve the merge
23:45 geek2ne48 joined #git
23:46 rmbeer the SSH, HTTPs, and intern... Also gitolite and garrit... If this not is sufficient?....
23:47 pfrench joined #git
23:47 rmbeer i view that always take and mixed with exist protocol and exist package extern like a main control of data and bds...
23:47 cbreak TikityTik: merge conflicts only happen on merge
23:48 cbreak they do NOT happen on commit
23:48 Guma joined #git
23:49 TikityTik well i get it after a commit and then pull
23:49 rmbeer is really insane make a own code for work it??
23:49 TikityTik should i always do a git pull after a git push to avoid that?
23:49 Aefot joined #git
23:49 cbreak no
23:49 cbreak after a push, pulling would do nothing
23:50 geek2nerd joined #git
23:52 nejni-marji :q
23:52 pfrench joined #git
23:54 rmbeer left #git
23:56 DuckHuntDog left #git
23:58 inflames joined #git
23:59 geek2ne28 joined #git

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