Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-04

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

All times shown according to UTC.

Time Nick Message
00:00 sssilver joined #git
00:04 sssilver joined #git
00:05 sagerdearia joined #git
00:05 Noldorin joined #git
00:08 netj joined #git
00:09 e14 joined #git
00:10 meZee joined #git
00:10 e14 joined #git
00:16 Rodya_ joined #git
00:21 clevodearia joined #git
00:26 Guest78 joined #git
00:33 chrisshattuck joined #git
00:34 STOP- joined #git
00:36 mingrammer joined #git
00:41 sangy joined #git
00:42 dsdeiz joined #git
00:42 dsdeiz joined #git
00:42 antiMossad joined #git
00:42 jeffreylevesque joined #git
00:42 Ravana joined #git
00:45 njbair joined #git
00:46 njbair joined #git
00:47 justanotheruser joined #git
00:49 mattsl joined #git
00:59 Sasazuka joined #git
01:01 Droolio joined #git
01:05 devdearia joined #git
01:12 compeman joined #git
01:14 spudowiar joined #git
01:15 TheMoonMaster joined #git
01:15 TheMoonMaster joined #git
01:16 Peng joined #git
01:17 Rodya_ joined #git
01:17 jason237 joined #git
01:18 Dougie187 joined #git
01:18 constant joined #git
01:20 ToBeCloud joined #git
01:20 meZee joined #git
01:22 ASOLAr joined #git
01:25 Guest78 joined #git
01:27 anuxivm left #git
01:32 Drool joined #git
01:32 dreiss joined #git
01:33 CaMoT joined #git
01:34 pks joined #git
01:38 Rodya_ joined #git
01:41 tristanp joined #git
01:46 TheMoonMaster joined #git
01:46 rbern joined #git
01:46 archaic joined #git
01:48 tanuki joined #git
01:49 realz joined #git
01:49 d^sh joined #git
01:50 Vampire0_ joined #git
01:54 lizzie joined #git
01:57 Belinxi joined #git
01:59 silverdust joined #git
02:00 Belinxi Hi um, i installed the official git client for windows and im having trouble figuring out where to place my private key file for MINGW64?
02:02 Gsham joined #git
02:03 silverdust I have * with a few exceptions with ! inverse ignore but it doesn't include those which are folders
02:06 thiago joined #git
02:13 jhe_ joined #git
02:16 hexagoxel joined #git
02:17 Gianormagantrous joined #git
02:19 CheckDavid joined #git
02:19 sssilver joined #git
02:22 relipse joined #git
02:23 jeffreylevesque joined #git
02:24 mingrammer joined #git
02:24 Rodya_ joined #git
02:25 iamthad joined #git
02:27 mattcen joined #git
02:28 fstd_ joined #git
02:33 kyan joined #git
02:33 Vinnie_win_u joined #git
02:34 liefer joined #git
02:34 Droolio joined #git
02:35 biotim joined #git
02:36 Vinnie_win joined #git
02:37 iamthad joined #git
02:38 mingrammer joined #git
02:38 dreamyspell joined #git
02:41 lagothrix joined #git
02:43 LukeLR joined #git
02:47 snowkidind joined #git
02:47 Droolio joined #git
02:48 Aces_Charles joined #git
02:50 LeBlaaanc joined #git
02:50 zivester joined #git
02:58 pothepanda joined #git
02:58 mizu_no_oto joined #git
02:59 Droolio joined #git
03:01 chachasmooth joined #git
03:02 hue joined #git
03:04 snowkidind joined #git
03:04 holodoc joined #git
03:07 e14 joined #git
03:08 e14 joined #git
03:09 e14 joined #git
03:10 sssilver joined #git
03:10 e14 joined #git
03:11 Droolio joined #git
03:13 sssilver joined #git
03:14 dreiss joined #git
03:14 andlabs joined #git
03:14 ayjay joined #git
03:14 Vortex35 joined #git
03:16 sssilver joined #git
03:20 wcpan joined #git
03:20 Motoko joined #git
03:20 holodoc joined #git
03:21 sssilver joined #git
03:22 Guest9 joined #git
03:25 sssilver joined #git
03:26 arescorpio joined #git
03:26 terminal_echo joined #git
03:26 newbiee joined #git
03:31 jeffreylevesque joined #git
03:31 e14 joined #git
03:31 sssilver joined #git
03:32 SourTrout joined #git
03:34 aro joined #git
03:37 nettoweb joined #git
03:37 LeBlaaanc joined #git
03:39 durham joined #git
03:39 aro if i have a main dev branch, called aro_dev - and then i have two branches created off of that task1 and task2. if i make changes to task1, commit and switch to task2, make changes, commit and switch back to task1, merge task1 into main aro_dev - how do i see those changes in task2?
03:42 sssilver joined #git
03:45 mingrammer joined #git
03:46 rewt aro, merge it into task2
03:46 aro merge what into task2? task1?
03:47 rewt task1 or aro_dev, depending on what you want
03:47 aro there isnt a way to track changes on those branches?
03:47 rewt not sure what you mean by that
03:48 rewt any changes you commit are committed
03:48 aro yeah id like to see those changes either auto reflected in task2, or by available via pull
03:49 rewt you can merge the changes or cherry-pick the commits you want
03:49 aro i guess ill just merge them
03:49 shock- joined #git
03:49 aro it wont cause problems when i merge task2 back into the main branch will it?
03:49 rewt no
03:49 aro okay cool
03:50 aro do i want to use rebase or merge for that?
03:50 rewt merge
03:50 aro okay
03:50 aro cool that did what i needed, thanks
03:51 durham_ joined #git
03:52 dreiss joined #git
03:53 sssilver joined #git
03:56 newbiee joined #git
03:58 Vivekananda joined #git
04:04 sssilver joined #git
04:10 Droolio joined #git
04:10 dermoth joined #git
04:13 Raed|Mobile joined #git
04:13 ExoUNX joined #git
04:13 ExoUNX greetings
04:14 ExoUNX anyone know a good git tutorial/doc
04:14 ExoUNX I come from TFS
04:14 Cabanossi joined #git
04:14 sssilver joined #git
04:15 ExoUNX seems simple enough
04:15 ExoUNX just want to make sure I learn it right
04:18 GandalfTheWizard joined #git
04:18 zacts joined #git
04:21 sssilver joined #git
04:22 paulh_ joined #git
04:23 biotim i like this short oreilly book http://shop.oreilly.com/product/0636920024972.do
04:25 biotim ExoUNX: official git documentation is pretty good too https://git-scm.com/doc
04:25 sssilver joined #git
04:25 Muzer joined #git
04:27 LeBlaaanc joined #git
04:29 rewt !tutorials
04:29 gitinfo [!tutorial] A list of interactive git tutorials: http://try.github.com
04:31 bigman joined #git
04:35 ExoUNX thabjsm watching some videos of it now
04:36 sssilver joined #git
04:40 LeBlaaanc joined #git
04:40 ExoUNX that was easy
04:46 Captain_Ramius joined #git
04:47 sssilver joined #git
04:47 Captain_Ramius OK, I don't speak git.
04:47 languitar joined #git
04:47 Captain_Ramius Can someone tell me why I can't push to a remote because "branch is currently checked out"
04:48 Captain_Ramius It turns out the tutorial I followed to create a post-receive hook includes the command "git checkout -f"
04:48 Captain_Ramius Why can't I update the code in that remote?
04:49 psprint_ joined #git
04:50 sssilver joined #git
04:50 Kuukunen ExoUNX: and if you're more analytical technically oriented person, what really helped me was that !bottomup thing
04:50 gitinfo ExoUNX: 'Git from the bottom up' starts with explaining the building blocks of git and proceeds to tell you how they fit together. http://ftp.newartisans.com/pub/git.from.bottom.up.pdf (http://ikke.info/git.from.bottom.up.pdf)
04:50 ExoUNX oh nice, thanks
04:51 biotim Captain_Ramius: sounds like the branch is checked out on the remote
04:52 Motoko joined #git
04:52 lebster i have a public branch that i want to merge to master, but i want to merge it before the last commit on that branch. should i revert the commit. I read i may be able to do git merge commit-id of the commit from the branch, but not sure if thats correct.
04:52 Kuukunen hm, I think that implies the remote is not bare? or something?
04:52 Captain_Ramius biotim, that's what it claims, which I barely understand to begin with
04:53 Captain_Ramius evidently, it's because I ran init --bare when I started the remote repo (and I shouldn't have?)
04:53 Captain_Ramius An SO answer says "As pointed out in some of the other answers, you shouldn't really be pushing to a non-bare repository, "
04:53 Kuukunen yea, the remote SHOULD be bare
04:54 biotim but it sounds like it's not
04:54 biotim bare means no working tree, no branch checked out
04:54 Captain_Ramius Kuukunen, OK. I'm not sure what's going on then.
04:54 Captain_Ramius biotim, did you catch the part about the post-receive hook that I put in
04:54 Kuukunen Captain_Ramius: so if you have access to the remote, what does the directory look like inside?
04:54 _ng joined #git
04:54 Kuukunen Captain_Ramius: as for post-receive hooks, then anything can happen
04:55 Kuukunen Captain_Ramius: oh wait
04:55 Captain_Ramius It includes the files I pushed a few days ago after I set up the post-receive hook but nothing from today
04:55 Kuukunen Captain_Ramius: so if you put a post-receive hook on the remote that checks out stuff
04:55 Kuukunen yea.. sounds like a potential problem :P
04:55 Captain_Ramius Kuukunen, that's what (I thought) I wanted.
04:55 harish joined #git
04:55 Kuukunen Captain_Ramius: what are you trying to do with the hook?
04:56 Captain_Ramius WHen I first amde the remote and did a push to it, no files were transferred but the .git was updated
04:56 Kuukunen Captain_Ramius: oh you want to push the files to a directory on the remote?
04:56 Captain_Ramius So I Googled around and found the instructions to make a post receive hook to "pull" the latest files automattically when I pushed from local
04:56 Kuukunen Captain_Ramius: yea, it's not how you want to do it
04:56 daey_ joined #git
04:56 Captain_Ramius Kuukunen, yeah. I can SSH into the server and do a "manual" git pull but that's a pain
04:57 Captain_Ramius Kuukunen, haha. I hear that a lot over in ##php too!
04:57 Captain_Ramius "You're doing it wrong, n000b!"
04:57 sssilver joined #git
04:57 EduardoMartins joined #git
04:58 Kuukunen Captain_Ramius: I'm pretty sure lots of people have solved the problem before, but at the very least, I'd try to do something like have the post-receive hook not check out stuff on that bare repository, but on another one
04:58 Kuukunen but I wonder if just force pushing would work :P
04:59 Captain_Ramius I know I'm not the first one to want to do this.
04:59 Captain_Ramius I tried force push and still got the error.
04:59 Captain_Ramius Probably because of the mysterious denyCurrentBranch setting
05:00 Kuukunen Captain_Ramius: was it something like this you did? http://krisjordan.com/essays/setting-up-push-to-deploy-with-git
05:02 Captain_Ramius Something like that, yeah
05:02 dsdeiz joined #git
05:03 Captain_Ramius I'm open to starting over if there's a better way
05:03 Kuukunen well you could try doing what that article is doing
05:04 Kuukunen altho I wonder if the problem is that newer version of git has added more safeguards that break hacky scripts
05:05 Captain_Ramius Hmmm, I got a slightly diff error this time
05:05 Captain_Ramius I did a hard reset and now it says "cannot run hooks/post-receive: No such file or directory"
05:06 Kuukunen Captain_Ramius: probably you need to create the deploy directory
05:06 Kuukunen it wants a ../deploy dir, next to the git dir
05:08 sssilver joined #git
05:10 Captain_Ramius The curse of the geek: it works now, but I'm not happy because I don't know why!
05:10 Kuukunen Captain_Ramius: why it works, or why the other one didn't?
05:11 Captain_Ramius both
05:11 Captain_Ramius Generally speaking, the other one didn't work because I don't know what I'm doing.
05:11 Kuukunen I assume the other one didn't work because it got somehow messed up and checked out stuff in the actual repo
05:11 biotim yeah maybe you didn't have the GIT_WORK_TREE set before
05:12 Kuukunen yea, I assume it might be an env variable thing it was using, then got defaulted to the current dir
05:12 Captain_Ramius Haha. I also was trying the straight example.com instead of example.com/index.php
05:12 variable Kuukunen: nope
05:12 phaleth joined #git
05:12 Kuukunen variable: nope to which one?
05:12 variable never thought about it
05:12 Captain_Ramius I haven't set up the htaccess on this domain  yet
05:12 variable Kuukunen: I don't exist in the environment
05:13 Kuukunen hm, pretty sure you do, you're inside a great big machine and can't escape
05:14 Kuukunen Captain_Ramius: if you want a more in-depth explanation, I saw https://www.digitalocean.com/community/tutorials/how-to-use-git-hooks-to-automate-development-and-deployment-tasks
05:14 Kuukunen but didn't read it so I've no idea if it's any good, but at least it's long and explanatory
05:15 Captain_Ramius Kuukunen, thanks. I bookmarked another good article on their site. I'll check that one out.
05:16 jaafar joined #git
05:18 sssilver joined #git
05:19 sdothum joined #git
05:24 Captain_Ramius Kuukunen, thanks for the help. I'm one step closer. Gotta run now.
05:29 sssilver joined #git
05:30 durham joined #git
05:32 jaguarmagenta joined #git
05:33 sssilver joined #git
05:33 l4v2 joined #git
05:35 sdothum joined #git
05:36 holodoc joined #git
05:40 jaguarmagenta joined #git
05:40 Vivekananda joined #git
05:40 sssilver joined #git
05:43 sssilver joined #git
05:49 ljc joined #git
05:49 sdothum joined #git
05:50 bmahe joined #git
05:51 sssilver joined #git
05:52 roentgen joined #git
05:56 romerocesar_ joined #git
06:01 sssilver joined #git
06:04 holodoc joined #git
06:06 phanimahesh joined #git
06:08 shmuli joined #git
06:12 sssilver joined #git
06:16 ljc joined #git
06:20 newbiee joined #git
06:21 duderonomy joined #git
06:23 constant joined #git
06:23 sssilver joined #git
06:24 constant joined #git
06:24 constant joined #git
06:25 awice joined #git
06:26 awice left #git
06:26 awice joined #git
06:27 awice hello
06:27 gitinfo awice: 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.
06:27 awice im reading the git book and im wondering if its necessary if i want to become a full stack developer
06:27 awice anyone here
06:28 Motoko Git in general, or reading the book or what?
06:28 awice well im just taking a course on coursera for HTML, JavASCRIPT, css, and the guy said i should read the gitbook if i want to become a developer
06:28 awice or at least the first 4 chapters.
06:29 Motoko Do you understand what Git is about?
06:29 awice i think so. its about version control and saving files for collaboration and stuff
06:29 awice ?
06:30 awice i understand the commit/push/pull thing... but im basically just going to be working by myself (unemployed)
06:30 Motoko I guess that's as good as anything.
06:30 Motoko It's great for solo work too.
06:30 awice isnt it just the same as saving a file kinda
06:30 Motoko Since you can easily roll back changes and don't have to worry about keeping manual backups when you change things.
06:30 Motoko It keeps a change history.
06:30 awice is it good for looking at other people's work
06:30 Motoko So if you manage to mangle a file, you can easily fix it.
06:30 awice (not sure if u can even do that)
06:31 awice ya makes sense
06:31 Motoko You can also track changes so if something breaks, you can try to find what caused it.
06:31 Motoko (git bisect)
06:31 Motoko You can certainly look at the work of others if they have a repository that's public.
06:31 awice every developer team uses git/github
06:31 Motoko There are a lot of git-related services.
06:32 Motoko At the place I work, we use Assembla.
06:32 Motoko There's also Gitlab, Bitbucket, etc.
06:32 Motoko Managing your work with version control is a very smart thing, so understanding how to use the tool is a great idea.
06:32 awice are they all essentially the same thing?
06:33 Motoko The git part is the same, but some of them offer other services around development or have different perks.
06:33 Motoko Bitbucket offers no-cost private repos so you can keep remote backups.
06:33 shmuli joined #git
06:33 sssilver joined #git
06:33 Motoko Assembla is focused on companies and has agile management tools and a really robust ticketing system.
06:34 Motoko Gitlab offers their management system as an open source product, and also offers commercial paid and open source project free hosting.
06:34 SwiftMatt joined #git
06:34 awice ahhh, i understand now- ya github charges for priv repositories
06:35 Motoko Yes they do.
06:35 Motoko And it's totally understandable.
06:35 Motoko They need to pay for their costs somehow.
06:35 awice would it be stupid to host a site's code on a public repository
06:35 Motoko It depends.
06:36 Motoko Usually it's not the best idea since it is public.
06:36 awice im just interested in learning so i wanna know what i'd be able to find on other people's repositories
06:36 Motoko For one of my sites, I do have all the code public. Mostly because it's part of an open source API project that others can use.
06:36 shmuli joined #git
06:37 Motoko I'd recommend poking around the public repos on github in that case.
06:37 Motoko You can see everything from the Linux kernel to Wordpress to small niche projects.
06:37 awice wow thank you
06:38 awice i'll be sure to visit this chat more often from time to time. thx
06:39 Motoko My one major public project: https://bitbucket.org/ratan12/atarashii-api
06:39 Motoko Feel free to look at it or play around looking at the commits with git.
06:39 Motoko (You can't break it, you don't have write permission to the public repo)
06:40 awice thanks i will take a look
06:41 subhojit777 joined #git
06:41 Motoko Some other cool repos:
06:41 Motoko Powershell (now open source!) https://github.com/PowerShell/PowerShell
06:43 Motoko Microsoft Visual Studio Code: https://github.com/Microsoft/vscode
06:43 awice if im trying to find a repository of something specific, is there any way to search
06:44 bket joined #git
06:44 sssilver joined #git
06:45 Motoko You can do some general web searches.
06:45 Motoko Or search github directly. Most major software that uses git will have a mirror there.
06:46 t0by joined #git
06:48 sssilver joined #git
06:52 kugel joined #git
06:52 kugel joined #git
06:53 subhojit_ joined #git
06:55 sssilver joined #git
06:57 subhojit__ joined #git
06:57 bryznsty left #git
07:06 sssilver joined #git
07:06 Kicer86 joined #git
07:07 dislore joined #git
07:08 SteffanW joined #git
07:11 vimal2012 joined #git
07:12 subhojit_ joined #git
07:16 duderonomy joined #git
07:17 sssilver joined #git
07:17 texasmynsted joined #git
07:18 jknetl joined #git
07:19 subhojit__ joined #git
07:25 dreiss joined #git
07:27 cdg joined #git
07:27 subhojit_ joined #git
07:27 cdg joined #git
07:30 vimal2012 left #git
07:33 satbyy joined #git
07:34 vuoto joined #git
07:36 subhojit__ joined #git
07:37 psprint_ Are there any useful things that can be put on command line for tig?
07:38 sssilver joined #git
07:46 subhojit_ joined #git
07:49 sssilver joined #git
07:50 thiago joined #git
07:52 paulh_ joined #git
07:55 moritz psprint_: sure
07:55 moritz psprint_: type "man tig" without the quotes to find out :-)
07:59 Jackneill joined #git
07:59 subhojit__ joined #git
07:59 jaguarma_ joined #git
07:59 circ-user-iEC6C joined #git
07:59 sssilver joined #git
08:07 subhojit__ joined #git
08:08 ahmedelgabri joined #git
08:09 sanketdg joined #git
08:09 trelane joined #git
08:10 tvw joined #git
08:10 xaa joined #git
08:10 sssilver joined #git
08:10 sanketdg joined #git
08:11 psprint_ hah
08:11 psprint_ aha! "No manual entry for tig"
08:11 sanketdg joined #git
08:12 psprint_ bug tig --help shows there's nothing special
08:12 grawity https://i.imgur.com/jLw5BTt.png
08:13 sanketdg joined #git
08:14 sanketdg joined #git
08:14 psprint_ so Homebrew misses something
08:14 Aces_Charles joined #git
08:15 tvw joined #git
08:16 Lauven joined #git
08:17 subhojit_ joined #git
08:21 sssilver joined #git
08:21 cdg_ joined #git
08:22 irqq_ joined #git
08:23 cdg joined #git
08:24 stuh84 joined #git
08:24 * duarteper usando [CyberScript] v3.2 - Breakfast of champions (www.cyberscript.org)
08:26 subhojit__ joined #git
08:31 sssilver joined #git
08:32 subhojit_ joined #git
08:32 garethdaine joined #git
08:34 ronny joined #git
08:35 ronny hi
08:35 ronny is there by chance a easy way to have special git configs for a whole folder tree with many repos instead of each repo separately
08:35 sssilver joined #git
08:35 ronny (i have a folder with a set of repos that i want to configure distinct from the git config in my home)
08:36 grawity use [include]
08:38 robotroll joined #git
08:40 Dazzyp joined #git
08:42 WizJin joined #git
08:47 dodobrain joined #git
08:50 dan2k3k4 joined #git
08:52 blackwind_123 joined #git
08:54 subhojit777 joined #git
08:56 King_Hual joined #git
09:04 robotroll joined #git
09:05 subhojit_ joined #git
09:12 Repox joined #git
09:14 _ng joined #git
09:16 cdg_ joined #git
09:16 cdg_ joined #git
09:17 catsup joined #git
09:28 thiago joined #git
09:28 jstein_ joined #git
09:30 raatiniemi joined #git
09:32 sssilver joined #git
09:34 rahtgaz joined #git
09:36 ahr3n joined #git
09:37 Munt joined #git
09:38 cyphase joined #git
09:41 leeN joined #git
09:43 garethdaine left #git
09:44 Munt joined #git
09:44 subhojit__ joined #git
09:46 zeroed joined #git
09:46 zeroed joined #git
09:47 eivarv joined #git
09:51 aax joined #git
09:51 subhojit777 joined #git
09:53 govg joined #git
09:59 navidr joined #git
10:03 harish joined #git
10:06 kirb left #git
10:07 SirBrokealot joined #git
10:09 SirBrokealot Hi there! I've got some problems with subtrees.. help is very much appreciated: http://stackoverflow.com/questions/39298623/push-a-branch-into-a-newly-created-bitbucket-repository
10:10 souther joined #git
10:15 eivarv joined #git
10:16 danslo joined #git
10:17 mingrammer joined #git
10:23 sssilver joined #git
10:23 afuentes joined #git
10:28 zeroed joined #git
10:29 teroshan joined #git
10:31 sssilver joined #git
10:35 spb joined #git
10:47 j416 SirBrokealot: git checkout master && git push -u remote HEAD
10:47 j416 SirBrokealot: where remote is your remote
10:48 j416 perhaps I misunderstood the question. not sure.
10:49 SirBrokealot Yes, I want my splitted branch to be the master on the new repository
10:50 j416 make sure you've no stale remote refs
10:50 j416 git fetch --prune
10:51 SirBrokealot Then try to push again?
10:51 j416 try
10:52 j416 your syntax looks sane to me, but then again I just woke up
10:52 Xizor joined #git
10:52 SirBrokealot :D
10:52 SirBrokealot No, still doesn't work :(
10:57 m1dnight1 joined #git
10:57 cdg joined #git
10:58 Guest75 joined #git
10:59 j416 SirBrokealot: https://dl.dropboxusercontent.com/u/3207594/30d/works-for-me.txt
11:01 thiago joined #git
11:01 SirBrokealot Cool.. so, why doesn't it work for me? :/
11:04 j416 shot in the dark: old git version?
11:04 SirBrokealot I just tried to create that empty commit in my new repository (which worked), but then when I try to push, it is rejected, because it's non-fast-forward. Which makes sense
11:04 SirBrokealot 2.1.4
11:04 j416 quite old, but shouldn't be too old
11:06 j416 !repro ?
11:06 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
11:06 cdg joined #git
11:07 SirBrokealot https://gist.github.com/tbureck/faec342cc2459901db6bfdb42fa8ed00
11:07 j416 so this is a different issue than what you describe in the SO thread
11:08 SirBrokealot Just different names
11:08 j416 and words
11:09 SirBrokealot Sure, probably because I've made this empty commit thing just before :)
11:09 j416 your answer is in the hint that it gives you
11:09 j416 use --rebase to git pull to avoid self-merge.
11:09 SirBrokealot git push --rebase ... ?
11:09 j416 pull
11:09 j416 but I suppose you want to overwrite the remote's master
11:10 j416 in which case, git push --force
11:11 SirBrokealot :o okay, doesn't work when master is checked out. Let me create a bare repository
11:15 SirBrokealot Aaaand back to the old message :( https://gist.github.com/tbureck/faec342cc2459901db6bfdb42fa8ed00#file-gistfile2-txt
11:15 SirBrokealot ../common-test is an empty bare repository now: git init --bare
11:15 tens0r joined #git
11:19 ojdo joined #git
11:21 squll joined #git
11:21 j416 SirBrokealot: dunno. try a fully qualified name maybe.
11:21 j416 SirBrokealot: refs/heads/master instead of master
11:22 dharrigan joined #git
11:22 SirBrokealot ...
11:22 SirBrokealot that worked
11:22 j416 figured.
11:22 j416 not sure why it couldn't figure it out on its own
11:22 dsdeiz joined #git
11:23 SirBrokealot A bug maybe?
11:23 j416 make a self-contained example that reproduces the error; either you will learn something or you will reveal some bug :)
11:23 j416 probably the former, but who knows
11:24 daniel-wtd joined #git
11:24 _ikke_ "The destination refspec neither matches an existing ref on the remote nor begins with refs/, and we are unable to guess a prefix based on the source ref."
11:24 _ikke_ If you read this part carefully, it becomes more clear
11:25 j416 _ikke_: how come my example worked, then?
11:25 j416 _ikke_: (fwiw, I tried pushing to a non-existent branch name in a new bare repo as well, worked fine)
11:26 j416 push.default simple, if that matters.
11:26 _ikke_ push.default does not matter when explicitly mentioning refs
11:27 SirBrokealot hmm.. maybe the source branch name is the issue then? Because there's an / in it?
11:27 j416 there was a / in my source branch as well (as seen in my example above)
11:27 SirBrokealot ..yup!
11:28 SirBrokealot I've updated git to 2.9.3, still the same
11:30 SirBrokealot Just replayed your example, works like a charme
11:31 SirBrokealot Anyways, thank you very much. Should be able to go on from there :)
11:31 _ikke_ https://github.com/gitster/git/blob/master/remote.c#L1180
11:31 Puhe joined #git
11:32 _ikke_ So it does try to guess something, but apparently fails
11:32 sssilver joined #git
11:33 SirBrokealot Yay, C code, how I missed it :D
11:40 Gamecubic joined #git
11:41 fahadash joined #git
11:41 m0viefreak joined #git
11:43 jost__ joined #git
11:44 vuoto joined #git
11:46 eivarv joined #git
11:49 squll joined #git
11:49 d0nn1e joined #git
11:52 shymega joined #git
11:55 WalrusNaib joined #git
11:58 govg joined #git
12:02 ochorocho__ joined #git
12:03 robotroll joined #git
12:04 sdothum joined #git
12:05 WalrusNaib left #git
12:05 WalrusNaib joined #git
12:06 WalrusWarfare joined #git
12:07 Gurkenglas joined #git
12:07 jeffreylevesque joined #git
12:14 cdown_ joined #git
12:14 tribly joined #git
12:15 JanC_ joined #git
12:16 cdown__ joined #git
12:17 danslo joined #git
12:17 tlaxkit joined #git
12:17 canton7 joined #git
12:20 stasmakarov joined #git
12:21 shmuli joined #git
12:24 abh joined #git
12:25 netj joined #git
12:30 eftov joined #git
12:34 dan2k3k5 joined #git
12:35 vuoto joined #git
12:37 vuoto joined #git
12:38 relipse joined #git
12:38 sin3t joined #git
12:40 linduxed_ left #git
12:42 Gurkenglas joined #git
12:47 nwkj86 joined #git
12:49 nwkj86 joined #git
12:51 PrashantJ joined #git
12:53 PrashantJ left #git
12:55 MegaManS1c left #git
13:00 dodobrain joined #git
13:02 raijin joined #git
13:04 GandalfTheWizard joined #git
13:05 Pulp joined #git
13:05 jimi_ joined #git
13:05 vuoto joined #git
13:11 Biganon joined #git
13:12 Biganon Hi ; say I realize after working for days on a project from several different machines that I want all .pyc files ignored ; I will create a .gitignore file, but then what should I do ? git rm them all ? I think it will delete them from the machine on which I've run this command, but I don't want them deleted (for personal reasons), simply ignored from now on
13:13 jeffreylevesque joined #git
13:14 Biganon is there a simple way of saying "let's do as if these files had been ignored cleanly from day 1" ?
13:16 achlys joined #git
13:16 anuxivm joined #git
13:17 SonikBoom joined #git
13:17 Lunatrius joined #git
13:17 Noldorin joined #git
13:18 Somelauw joined #git
13:19 squll joined #git
13:19 fstd joined #git
13:19 Biganon maybe git rm --cached <file> is the solution
13:21 Somelauw I'm learning/trying to use git add -p and I choose to manually edit a hunk. I'm confused by this sentence from the manual: "# To remove '-' lines, make them ' ' lines (context)" Do I have to make them exactly one space and can I not simply remove them?
13:22 stuh84 joined #git
13:23 jaafar joined #git
13:23 HoierM joined #git
13:23 eivarv joined #git
13:24 jimi_sanchez joined #git
13:24 holodoc joined #git
13:25 vuoto joined #git
13:25 constant joined #git
13:25 glebihan joined #git
13:26 shmuli joined #git
13:26 lolmac joined #git
13:27 jimi_sanchez joined #git
13:29 WalrusWarfare joined #git
13:30 alp82 joined #git
13:31 zivester joined #git
13:32 nettoweb joined #git
13:34 fstd joined #git
13:38 zacts joined #git
13:39 Vivekananda joined #git
13:40 satbyy joined #git
13:40 satbyy joined #git
13:43 Surfer2010_ joined #git
13:43 waruqi joined #git
13:44 rorro joined #git
13:49 thiago joined #git
13:49 zonality joined #git
13:49 * duarteper duarteper using [CyberScript] v3.2 - like a girl in the bed (www.cyberscript.org)
13:51 eivarv joined #git
13:52 spudowiar joined #git
13:53 marksei joined #git
13:54 marksei joined #git
13:55 holodoc joined #git
13:56 meZee joined #git
13:57 arand__ left #git
13:57 arand__ joined #git
13:59 quetz^^ joined #git
13:59 trelane joined #git
13:59 trelane joined #git
13:59 meZee joined #git
13:59 arand__ Somelauw: It means that you replace the '-' prefix of that line with a ' ' and keep the rest of the line as it is.
14:00 joki joined #git
14:00 madewokherd joined #git
14:01 arand__ Hence in terms of a unified diff, turning it from a removed line into a context/unchanged line.
14:01 spudowiar joined #git
14:01 jeffreylevesque joined #git
14:01 vrishab joined #git
14:01 meZee joined #git
14:07 theonefoo joined #git
14:08 Munt joined #git
14:09 squll joined #git
14:09 ansimation joined #git
14:10 meZee joined #git
14:10 TheMoonMaster joined #git
14:10 TheMoonMaster joined #git
14:11 Discovery joined #git
14:13 IlNominePatre joined #git
14:14 nidr0x joined #git
14:16 subhojit777 joined #git
14:16 l4v2 joined #git
14:17 nidr0x joined #git
14:17 danslo joined #git
14:20 theonefoo left #git
14:23 kyan joined #git
14:24 raijin joined #git
14:25 WalrusWarfare joined #git
14:26 WalrusWarfare joined #git
14:27 Peng_ joined #git
14:29 vuoto joined #git
14:37 e14 joined #git
14:38 vuoto joined #git
14:39 e14 joined #git
14:44 jaguarmagenta joined #git
14:44 * duarteper usando [CyberScript] v3.2 - Breakfast of champions (www.cyberscript.org)
14:45 Darcidride joined #git
14:48 vuoto joined #git
14:48 ElChicoNube joined #git
14:49 Puhe_ joined #git
14:50 TheMoonMaster joined #git
14:53 Balliad joined #git
14:57 romerocesar joined #git
14:58 cyan__ joined #git
15:00 Somelauw arand__: thanks, it toke me a couple of tries to get the commit right, but it worked. I still find git add -p a bit hard to work with.
15:01 Gurkenglas joined #git
15:01 lolmac joined #git
15:04 Somelauw i wish i could just type git add -p filename line1:line2 or something
15:05 rorro joined #git
15:05 pikajude joined #git
15:05 pikajude joined #git
15:06 dreiss joined #git
15:06 Darcidride_ joined #git
15:08 chabil joined #git
15:15 m1dnight2 joined #git
15:18 msonntag joined #git
15:19 eivarv joined #git
15:22 Munt joined #git
15:22 jimi_ joined #git
15:23 fstd joined #git
15:23 constant joined #git
15:24 eivarv joined #git
15:27 _ikke_ Somelauw: Perhaps you find git gui easier, which allows you to stage per line
15:32 Somelauw _ikke_: I have 'tig' installed. I don't know if they can do this better or worse than git gui.
15:32 Somelauw i don't have git-gui installed yet
15:33 _ikke_ tig is also per hunk
15:34 trelane joined #git
15:34 sanketdg joined #git
15:35 trelane joined #git
15:36 bket joined #git
15:36 e14_ joined #git
15:38 satbyy joined #git
15:38 sylario joined #git
15:39 j416 Somelauw: ever tried pressing 'e' while patch-adding? you should try it.
15:39 guardian joined #git
15:39 Somelauw j416: that's what i'm doing
15:39 j416 Somelauw: split as much as you can first. When you can split no more, use e.
15:39 Somelauw My editor has support for staging hunks, but my life would be so much better if it had support for staging lines
15:40 Peng_ joined #git
15:40 _ikke_ (this topic has come up on the mailing list)
15:41 kus joined #git
15:41 Somelauw first git add -p, then search, (optionally s) then e, then remove everything i don't need, then q, then git commit, then start over for the next couple of lines
15:41 _ikke_ https://public-inbox.org/git/alpine.DEB.2.20.1609041000420.129229@virtualbox/T/
15:41 Somelauw as opposed to: 1. select lines, 2. shortcut! 3. git commit (repeat)
15:45 Somelauw and when it says "patch does not apply", I lose the undo history of my editor
15:45 Somelauw I'll try git gui
15:49 meZee joined #git
15:50 Somelauw I tried that git gui and it does make stuff easier
15:51 meZee joined #git
15:52 Xizor joined #git
15:53 TheMoonMaster joined #git
15:54 satifant joined #git
15:54 andlabs joined #git
15:55 Munt joined #git
15:56 meinteil joined #git
15:56 meinteil Can I add all deleted and modified files in one go?
15:56 meinteil "git add ." will that remove deleted files?
15:56 xelxebar joined #git
15:57 _ikke_ git add -A
15:57 Phrohdoh joined #git
15:57 _ikke_ And no, git add . will not stage removals
15:57 souther joined #git
15:58 Phrohdoh I am having a hell of a time trying to gitignore _all_ '.nuspec's, regardless of depth relative to the project root
15:58 Phrohdoh Oh, I may have just solved it.
16:00 Phrohdoh left #git
16:03 Somelauw I think something you nee **/.nuspec ?
16:04 CustosLimen joined #git
16:04 deltab Somelauw: what editor do you use? I use vim's fugitive extension to stage lines (by copying and pasting)
16:05 Peng_ joined #git
16:07 fstd joined #git
16:07 nettoweb joined #git
16:07 achlys joined #git
16:08 biotim joined #git
16:10 vrishab joined #git
16:13 harish joined #git
16:14 Somelauw deltab: I use vim with fugitive and gitgutter.
16:14 Somelauw not sure how fugitive would do this
16:15 bartosz_ joined #git
16:15 deltab :Gdiff  to split with the staged version
16:15 deltab you can then yy and p lines
16:15 Somelauw Do you temporarily insert old lines to split hunks?
16:16 deltab no
16:17 Somelauw I know about gdiff, yy and p, but how does that give me stage per line?
16:18 vuoto joined #git
16:18 t0by joined #git
16:18 f3r70rr35f joined #git
16:18 danslo joined #git
16:19 deltab whatever's in fugitive's buffer when you save will be staged
16:20 e14 joined #git
16:20 fstd_ joined #git
16:21 govg joined #git
16:21 fstd joined #git
16:24 Groscheri joined #git
16:24 cdg joined #git
16:28 catsup joined #git
16:30 spudowiar joined #git
16:30 t0by joined #git
16:31 e14 joined #git
16:32 Munt joined #git
16:32 mingrammer joined #git
16:33 e14 joined #git
16:35 cdg joined #git
16:36 Puhe__ joined #git
16:40 zeroed joined #git
16:40 zeroed joined #git
16:40 kadoban joined #git
16:40 justanotheruser joined #git
16:41 circ-user-iEC6C joined #git
16:41 cagmz joined #git
16:41 jaguarmagenta joined #git
16:42 eivarv joined #git
16:44 SteffanW joined #git
16:45 grift joined #git
16:48 e14 joined #git
16:51 mar77i hmm, I'm working on my dotfiles directory, now I have this make compare target which creates a unified diff from the installed state to the repo's working directory. how could I add (or add --edit) such a patch to git?
16:52 _ikke_ git apply
16:53 Noldorin joined #git
16:53 mar77i wow, that would be one other git-* command I'd be using. cool!
16:53 mar77i it's pretty neat as it is, rn https://github.com/mar77i/dotfiles/blob/master/Makefile
16:54 Puhe joined #git
16:54 vuoto joined #git
16:54 govg joined #git
16:54 eivarv joined #git
16:54 Somelauw deltab: oh, you edit the window that contains the old file, save it and then it will be staged?
16:54 Somelauw i didn't know that
17:00 deltab yep, you can make any edit you want there: it's not limited to diffput/diffget
17:02 __name__ joined #git
17:02 phaleth joined #git
17:02 deltab if I've made whitespace changes in a file that vim's diff mode can't recognise, I'll repeat the changes in the fugitive buffer, and write and commit them separately
17:03 deltab that way I can keep the substantive changes separate and concise
17:03 cdg joined #git
17:05 Balliad joined #git
17:05 Munt joined #git
17:05 eivarv joined #git
17:08 fus joined #git
17:09 vassagus joined #git
17:10 achlys joined #git
17:12 nabblet joined #git
17:13 Impaloo joined #git
17:13 nabblet hi, i merged a feature branch into master. Then i made changes in master to the code from the feature branch. How can I update my feature branch with those changes without merging everything else from master that is not related to that feature?
17:14 kadoban nabblet: cherry-pick them I suppose
17:14 PCatinean joined #git
17:15 jimi_ joined #git
17:15 chrisshattuck joined #git
17:16 nabblet kadoban: sounds like a work around since some of the commits i am interested modify unrelated files at the same time (in order to make everything work in master).
17:16 rewt you could rebase those commits on the feature branch
17:16 daey joined #git
17:16 nabblet kadoban: so I'm more looking for some kind of merge that is limited to a selection of files
17:16 shiriru joined #git
17:16 kadoban nabblet: Doesn't sound like a particularly good idea. git doesn't have that
17:17 rewt cherry-pick would only copy the changes in the commits that are cherry-picked
17:17 dreiss joined #git
17:17 texasmynsted joined #git
17:17 rewt did you have changes to the feature and others in the same commit?
17:17 nabblet rewt: i know but the problem is that some of the commits i am interested in also modify uninteresting files at the same time
17:17 rewt ah
17:17 edaught joined #git
17:18 rewt is there an interactive cherry-pick?
17:18 nabblet rewt: yes, it was required to make the overall system work.
17:19 rewt nabblet, looks like you could cherry-pick -n, and modify each commit to remove the change you don't want to move over
17:19 nabblet well, I'll look into rebasing and cherry-pikcing then.
17:19 nabblet rewt: kadoban thank you for your advice
17:19 jmd joined #git
17:21 jmd So it seems that upgrading to 2.10.0 breaks a lot of dependent tools.  Is there a fix?
17:23 _ikke_ What kind of tools?
17:23 jmd cgit for example.
17:23 _ikke_ How is it broken?
17:23 jmd It fails to build
17:24 _ikke_ Error?
17:24 jmd https://hydra.gnu.org/build/1464738/nixlog/1
17:27 paws_ joined #git
17:28 boushi joined #git
17:29 eivarv joined #git
17:29 Eugene joined #git
17:29 d1b joined #git
17:29 atrus joined #git
17:30 Aaeriele joined #git
17:30 SleePy joined #git
17:30 lohfu joined #git
17:30 msm joined #git
17:31 brunodlz joined #git
17:31 nabblet rewt: kadoban I am thinking: is there something that is generally wrong. Obviously I am in a situation I should never happen to be in... otherwise git would have tools for that problem.
17:32 rorro joined #git
17:32 chamunks joined #git
17:32 lolmac joined #git
17:33 atomi joined #git
17:33 nabblet What i see is that I could split up the commit in master into several commits. That way I create a commit that touches all files relevant for the feature and another commit that touches everything else. Then I cherry-bick.
17:33 rewt generally, each commit should be for a specific thing; if you have multiple changes that need to be committed, git has the tools to put them in separate commits -- this would have made it easy for you to cherry-pick the relevant commits
17:33 Seveas jmd: cgit is way too intimate with git's innards, it's bound to break from time to time.
17:33 kadoban nabblet: Well, it seems a bit like you want history to look like something other than what happened, which is fine but then you have to edit history if you want that. Or just merge master into your feature, make a commit that undoes the things you don't want, and revert that commit before you merge back into master.
17:34 jmd Seveas: Cgit is an "unofficial" thing?
17:34 Seveas jmd: yes. It uses git's internal library, for which there is absolutely no api or abi guarantee
17:35 jmd Seveas: Ok,  their problem then.
17:35 Seveas in this case it's one of the many sha1->oid patches that broke it. TO be expected.
17:35 brunodlz joined #git
17:35 deltab e,g, https://github.com/git/git/commit/a0d12c4433e25e87b67df78b45635df8a098fb23
17:35 nabblet rewt: in my case two features used a dummy variable. in master, this variable is responsible for making both features to work together. That's why master touched several features in on commit with a message along the line "unify variable names".
17:36 nabblet rewt: now that's a simplified version, but that's the reason for having only one commit in master.
17:36 tctara joined #git
17:36 dmarr joined #git
17:36 Munt joined #git
17:36 zacts joined #git
17:37 constant joined #git
17:37 nabblet kadoban: i'd rather not mess with history. merging master and getting rid of everything else (and reverting that step before merge) sounds like a reasonable solution.
17:37 rewt yeah, that does seem to belong in 1 commit
17:37 texasmynsted joined #git
17:37 Balliad joined #git
17:37 nabblet i just don't want to merge the whole master because then compiling/testing/debugging my code get way more involved.
17:37 nabblet *gets
17:38 inflames joined #git
17:38 nabblet kadoban: i think i'll do as you suggested. Thanks again for your advice!
17:38 nabblet rewt: ok i think it's "solved". Thank you very much for your help and advice
17:39 kadoban nabblet: Sure, anytime
17:39 SegFaultAX joined #git
17:40 cdg joined #git
17:41 dsdeiz joined #git
17:42 snowkidind joined #git
17:42 deltab jmd: I'm guessing that's a bug in the derivation: it should use a newer cgit or an older git
17:42 PCatinean joined #git
17:43 brunodlz joined #git
17:44 Puhe_ joined #git
17:44 jmd deltab: I expect you're right.
17:46 inflames joined #git
17:46 sangy joined #git
17:46 shmuli joined #git
17:51 haaja left #git
17:51 shinnya joined #git
17:53 boushi_ joined #git
17:53 Darren_ joined #git
17:55 multi_io joined #git
17:56 cydrobolt joined #git
17:56 cydrobolt joined #git
17:56 meinteil joined #git
17:58 Puhe joined #git
17:58 Shakeel_ joined #git
18:00 anuxivm joined #git
18:01 meinteil joined #git
18:02 e14 joined #git
18:04 vrishab joined #git
18:05 Somelauw deltab: do you know a way to cancel from :Gcommit in fugitive? something like :bclose doesn't work for me
18:06 qsx pkill vim
18:06 rewt heh
18:08 Somelauw well, git doesn't like that either
18:08 bremner sudo reboot
18:08 justanotheruser joined #git
18:09 Munt joined #git
18:09 jimi_ joined #git
18:10 deltab Somelauw: no, I don't; but you can reset after a commit to undo it
18:10 eivarv joined #git
18:11 achlys joined #git
18:13 Somelauw !ping
18:13 gitinfo I only respond to !reply_time
18:14 murph joined #git
18:14 rewt Somelauw, does :Gcommit bring up a new vim window where you enter the commit message?  and you want to cancel the commit?
18:14 Somelauw joined #git
18:14 Somelauw rewt: yes
18:14 mingrammer joined #git
18:14 rewt try :cq
18:15 Gurkenglas joined #git
18:16 GT4066 joined #git
18:16 ToBeCloud joined #git
18:17 AnarchyAo joined #git
18:19 e14 joined #git
18:19 danslo joined #git
18:23 e14 joined #git
18:24 HoierM joined #git
18:24 taha joined #git
18:25 dviola joined #git
18:25 netj joined #git
18:26 sssilver joined #git
18:27 adante joined #git
18:28 sssilver_ joined #git
18:30 newbiee joined #git
18:30 idmistir_ joined #git
18:31 idmistir joined #git
18:33 Goplat joined #git
18:34 shmuli joined #git
18:35 Somelauw rewt: cq worked, hopefully it's clean
18:35 Somelauw is it not the same as :q!
18:36 Lyqyd joined #git
18:36 rewt :cq exits vim with an error code, which is interpreted by git as cancel commit -- :q! exits vim without saving changes, which should result in an empty commit message, which is interpreted by git as cancel commit (except if it's a ammend/etc that already has a default message)
18:37 boushi joined #git
18:38 rewt so for new commits, it should be the same, but for amends/etc it's different
18:38 sangy joined #git
18:39 albel727_ joined #git
18:40 deltab ah, thanks
18:40 ahmedelgabri joined #git
18:49 Puhe_ joined #git
18:52 eivarv joined #git
18:53 netcarver joined #git
18:55 crayon joined #git
18:56 ExoUNX ok so my question is now
18:57 ExoUNX I have a local git setup and a remote git setup
18:57 ExoUNX I add and commit changes locally just fine
18:57 ExoUNX however when I try to push I get this "Push rejected: Push master to origin/master was rejected by remote"
18:57 ExoUNX google doesn't seem to be helping with this, that's why I ask
18:57 j416 ExoUNX: read the rest of it.
18:58 ExoUNX j416, ?
18:58 j416 the error message.
18:58 ExoUNX j416 show you more? or read it all?
18:58 j416 either.
18:59 ExoUNX j416, that's all my IDE is giving me
18:59 j416 aha. Bad IDE then.
18:59 j416 likely it's a non-ff push.
18:59 j416 now what was that faq again
18:59 j416 !noff
18:59 gitinfo [!signoff] A sign-off is a line in the commit message saying 'Signed-off-by: Your Name <your@email>'. It can be added using 'git commit -s'. A few open source projects require it for legal reasons. See http://stackoverflow.com/a/1962112/1086121 for a good explanation
18:59 j416 hm no
18:59 ExoUNX probably
19:00 ExoUNX I've seen that before
19:00 ExoUNX do I need to set that locally?
19:00 j416 !faq non-ff
19:01 gitinfo Your push would lose changes on the remote; more details available at https://git.wiki.kernel.org/index.php/GitFaq#non-ff
19:01 j416 but, I have no idea if that is even what is happening, since there is nothing more to the error.
19:01 j416 no offence intended, but you should try learning native git (cmdline)
19:01 j416 it'll be easier to get help
19:01 j416 :)
19:04 ratiotile joined #git
19:04 ExoUNX yah
19:06 meinteil joined #git
19:08 ExoUNX ok
19:08 ExoUNX I did it commandline
19:08 ExoUNX remote: error: insufficient permission for adding an object to repository database ./objects
19:08 j416 there you go
19:08 ExoUNX ouch. owned by root
19:08 ExoUNX let me fix that
19:08 j416 :)
19:09 mingrammer joined #git
19:09 ExoUNX j416, well now I have one huge error lol
19:11 j416 at least you know what it is.
19:11 ExoUNX j416, says branch is already checked out
19:12 j416 I don't know what you want me to do with that information.
19:12 ExoUNX magic damnit!
19:12 j416 is there a question?
19:12 shmuli joined #git
19:13 ExoUNX http://pastebin.com/BexrSKAz
19:15 j416 ExoUNX: !faq non-bare
19:15 gitinfo ExoUNX: Pushing to non-bare repositories is discouraged; more details available at https://git.wiki.kernel.org/index.php/GitFaq#non-bare
19:15 ExoUNX should I merge then?
19:15 j416 did you even read+
19:15 j416 ?
19:16 ExoUNX NEVER! who reads documentation these days?
19:16 j416 obviously you don't
19:16 ExoUNX ouch
19:16 ExoUNX I've read a bit of it
19:16 j416 try reading all of it
19:17 ExoUNX but
19:17 ExoUNX but
19:17 ExoUNX that involves an attention span
19:17 vdl joined #git
19:18 j416 I'll afk for a while. o/
19:18 j416 gl
19:18 ExoUNX j416, ok, thanks
19:23 circ-user-wzlJo joined #git
19:23 Klumben joined #git
19:24 mehola joined #git
19:33 romerocesar joined #git
19:37 cyan__ joined #git
19:37 thiago joined #git
19:38 justanotheruser joined #git
19:38 bmahe joined #git
19:39 dvl joined #git
19:39 dvl joined #git
19:39 Puffball joined #git
19:40 AfroThundr joined #git
19:40 lolmac joined #git
19:41 Munt joined #git
19:44 CheckDavid joined #git
19:47 thiago joined #git
19:49 rahtgaz joined #git
19:49 zacts joined #git
19:51 Silenced joined #git
19:51 cagedwisdom joined #git
19:51 Silenced joined #git
19:51 ansimation joined #git
19:52 tvw joined #git
19:52 Xizor joined #git
19:52 Faylite joined #git
19:58 clemf joined #git
19:58 ahmedelgabri joined #git
20:01 vdl joined #git
20:03 romerocesar_ joined #git
20:04 Puffball joined #git
20:09 shmuli joined #git
20:10 cdg joined #git
20:11 vuoto joined #git
20:11 robotroll joined #git
20:12 thiago joined #git
20:15 shymega joined #git
20:15 Munt joined #git
20:16 vdl joined #git
20:19 e14 joined #git
20:22 parasite_ joined #git
20:25 AnarchyAo joined #git
20:26 jaafar joined #git
20:30 Clan57 joined #git
20:31 newbiee joined #git
20:32 thiago joined #git
20:32 Clan57 left #git
20:32 Clan57 joined #git
20:33 VagabondAzulien joined #git
20:35 ahmedelgabri joined #git
20:37 justanotheruser joined #git
20:37 the_cybersphinx joined #git
20:42 cdown joined #git
20:47 Munt joined #git
20:48 mingrammer joined #git
20:48 osse /
20:48 stamina joined #git
20:52 _ikke_ \o
20:54 cdg joined #git
20:57 ahmedelgabri joined #git
20:58 MattMaker joined #git
20:59 bennyZ joined #git
21:00 eivarv joined #git
21:00 SebastianFlyte joined #git
21:00 e14 joined #git
21:02 dreiss joined #git
21:04 SebastianFlyte joined #git
21:08 slim joined #git
21:08 romerocesar joined #git
21:08 slim left #git
21:10 shmuli joined #git
21:13 griffindy joined #git
21:14 zacts joined #git
21:15 Xoo joined #git
21:15 circ-user-wzlJo joined #git
21:16 aidalgol joined #git
21:17 meinteil joined #git
21:20 tyreld joined #git
21:20 meinteil joined #git
21:20 Munt joined #git
21:22 griffindy joined #git
21:24 ahr3n joined #git
21:25 shmuli_ joined #git
21:25 drupald joined #git
21:33 SwiftMatt joined #git
21:35 Noldorin joined #git
21:36 Goplat joined #git
21:41 cdg_ joined #git
21:41 bernardio joined #git
21:42 mingrammer joined #git
21:47 ahr3n joined #git
21:48 ash_workz joined #git
21:50 Ryanar joined #git
21:51 Gsham joined #git
21:55 ahr3n joined #git
21:55 neunon joined #git
21:57 tureba joined #git
21:58 dtux joined #git
22:00 meinteil joined #git
22:00 vdl joined #git
22:01 Eugene ( ͡° ͜ʖ ͡°)
22:03 nwkj86 joined #git
22:03 meinteil joined #git
22:07 fstd joined #git
22:12 raijin joined #git
22:14 rbern joined #git
22:15 nilg joined #git
22:20 danslo joined #git
22:22 mattcen joined #git
22:22 newbiee joined #git
22:29 bernardio joined #git
22:29 mehola joined #git
22:35 jimi_ joined #git
22:38 snowkidind joined #git
22:38 spudowiar joined #git
22:39 RodrigoEduardo__ joined #git
22:43 Guest66 joined #git
22:44 newbiee joined #git
22:46 a3Dman joined #git
22:53 lebster is there a way i can tell if someone rewrote history?
22:54 zrak joined #git
22:55 preaction lebster: you can compare it to your history and see if it's different
22:57 EvilDMP joined #git
22:58 newbiee left #git
22:58 EvilDMP I use a shared server (I can list the other users on it, but I can't cd into their home directories). If I set up access to GitHub with a key from that server, that would be potentially insecure, correct?
23:00 spb EvilDMP: define insecure
23:01 spb what sort of threat are you worried about?
23:01 EvilDMP spb: anyone who got access to my account on the shared server could get access to my keys, and thus access to all the things I have access to on GitHub
23:01 spb yes
23:02 EvilDMP it's the kind of thing I would prefer to not have to explain at work
23:02 spb but anyone who got access to your account on the shared server could also get access to any passwords you typed in on that server
23:02 raijin joined #git
23:02 EvilDMP really?
23:03 spb yes
23:03 EvilDMP how?
23:03 cagedwisdom joined #git
23:03 lebster user1 commit code a on branch release , user2 commit code b on branch release, user2 merged all code to master user1 reverted a his commit a.
23:03 Somelauw left #git
23:03 lebster someone user2 code b got undone
23:03 lebster somehow not someone*
23:03 lebster not sure how this could happen
23:04 spb EvilDMP: they could modify your path setting to point to a fake git executable which recorded your password and sent it off to another server
23:04 spb EvilDMP: or they could run a program under your account which looked for new git processes running as you, attached using ptrace and read the password out of memory
23:05 EvilDMP spb: I think I will stay clear of authenticating to github from the server in that case...
23:05 spb EvilDMP: or they could edit your .git/config file to point at a different remote URL where they control the server, and get you to sent the password there instead of to github
23:05 mchelen2 joined #git
23:07 EvilDMP Thanks!
23:08 mizu_no_oto joined #git
23:09 ratiotile_ joined #git
23:11 spb EvilDMP: really it all depends on your risk profile
23:11 nevodka joined #git
23:11 spb and whether you trust the admins of the server in question to keep user accounts separate
23:13 EvilDMP spb: better safe than sorry, it will be inconvenient, but not worse than that
23:14 EduardoMartins joined #git
23:14 paulh_ joined #git
23:16 Lunatrius` joined #git
23:19 jaguarmagenta joined #git
23:22 dreiss joined #git
23:25 Blackpajamas joined #git
23:30 mingrammer joined #git
23:33 romerocesar joined #git
23:33 justanotheruser joined #git
23:33 romerocesar joined #git
23:35 zacts joined #git
23:37 Blackpajamas joined #git
23:44 shinnya joined #git
23:46 jooni joined #git
23:46 skylite_ joined #git
23:48 watabou joined #git
23:48 dodobrain joined #git
23:48 YvesLevier joined #git
23:52 ahr3n joined #git
23:56 Blackpajamas joined #git
23:57 Gitzilla joined #git
23:57 Gurkenglas joined #git
23:58 Shentino joined #git

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