Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-08-06

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

All times shown according to UTC.

Time Nick Message
00:00 zacts joined #git
00:00 eruditehermit rpd: I did a git commit and was hoping it would work. How do I make it unmake it a not module
00:00 frogonwheels eruditehermit: you could use something like this too: http://source.android.com/source/downloading.html#installing-repo
00:01 xall joined #git
00:01 eruditehermit note the careful choice of unmake a not module into a submodule
00:02 fuchstronaut joined #git
00:03 rpd eruditehermit: I would just go before all the commits and just use `git submodule add` in the first place. You could also just do all the submodule adding steps manually, but it seems unnecessary.
00:04 t-mart joined #git
00:04 frogonwheels rpd: also maybe this:  https://github.com/maxhebditch/batchgit
00:05 tesuji_ joined #git
00:09 rubyonrailed joined #git
00:09 ericsupreme joined #git
00:13 wxg joined #git
00:15 amdi_ joined #git
00:21 d5sx43 joined #git
00:21 livingstn joined #git
00:23 leeN joined #git
00:23 unknownIdentity joined #git
00:24 hahuang65 joined #git
00:28 atsaloli joined #git
00:28 markgrady joined #git
00:33 fairuz joined #git
00:37 ytl joined #git
00:38 cjbrambo joined #git
00:38 griffindy joined #git
00:46 dhollinger joined #git
00:49 Derperperd joined #git
00:50 HoierM joined #git
00:51 Atrumx joined #git
00:55 qpdb joined #git
00:56 johnny56_ joined #git
00:59 Balliad joined #git
00:59 aidalgol joined #git
01:03 b1tchcakes joined #git
01:03 fuchstronaut joined #git
01:05 inflex joined #git
01:06 inflex Style question;  Is there any reason to not use the master branch of your own fork of an existing project?
01:07 ki0 joined #git
01:08 Rodya_ joined #git
01:09 Sucks joined #git
01:10 jhass if you know what you're doing, it's totally fine
01:11 jhass the thing is that it's not a good advice for newbies, since many examples refer to the local master branch when rebasing, creating new branches etc
01:14 fairuz joined #git
01:14 heroux joined #git
01:16 arescorpio joined #git
01:19 Sucks joined #git
01:21 rkazak joined #git
01:22 Balliad joined #git
01:25 MattMaker joined #git
01:25 djGrrr joined #git
01:25 djGrrr left #git
01:27 Fabricio20_ joined #git
01:28 MattMaker joined #git
01:29 Dougie187 joined #git
01:30 fairuz joined #git
01:30 cdown joined #git
01:31 dreiss joined #git
01:32 Limes__ joined #git
01:33 pks joined #git
01:33 cdown_ joined #git
01:33 rahtgaz joined #git
01:35 mroth joined #git
01:36 MattMaker joined #git
01:39 wgrant joined #git
01:46 Garen joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help and botany | Public logs at http://goo.gl/BuUi5o | Current stable version: 2.9.2 | First visit? Read: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | Nurture your git-twigs and they will grow into a full branch
01:52 d^sh joined #git
01:53 heroux joined #git
01:54 durham joined #git
01:57 dreiss joined #git
01:58 fairuz joined #git
02:04 MattMaker joined #git
02:05 heroux joined #git
02:10 Sucks joined #git
02:12 leehambley joined #git
02:13 ki0 joined #git
02:14 Sucks joined #git
02:16 ki0 joined #git
02:16 ke4nhw joined #git
02:16 leehambley joined #git
02:18 fahadash joined #git
02:19 ke4nhw I'm gonna be straight honest. I'm not a big time programmer, and as of right now I don't have the skills to plan to be. I am looking for a reliable, low to medium maintenance, relatively secure (access is only through encrypted VPN web of trust anyway) source code vault and version control system where code and entire solutions can be "checked out" and "checked in", and maybe worked on at the same
02:19 ke4nhw time. Key is that it has to work with Visual Basic, Visual C++, and one or two MS-based languages, Java, C-deritives to be compiled in various platforms, and maybe even Android programs.
02:19 ke4nhw does such a thing even exist?
02:19 ki0 joined #git
02:20 ke4nhw At minimum it should be accessible by me locally, but having it accessible by encrypted VPN remotely would be excellent
02:20 Shentino joined #git
02:20 polyzen ke4nhw, Git can do this. any of them can
02:20 ke4nhw And ideally it should run on RedHat or RH-derivitives such as CentOS
02:20 ke4nhw ok
02:21 polyzen they don't discriminate what language/content you want to track
02:21 polyzen afaik
02:21 ke4nhw Key is how difficult is git to download in Fedora, CentOS, and how hard is it to maintain, add new users, and assign user access / editing permissions?
02:22 ke4nhw I don't want, noor have time for, spending hours a day managing permissions for half a dozen users.
02:23 ke4nhw So Visual Studio 2010 is just as happy to connect to a git or subversion or csv (cvs?) as it is a Team Foundation Server?
02:23 heroux joined #git
02:24 stormlrd joined #git
02:24 ke4nhw And as far as tracking, with any of these systems, will it track changes made by users and give the master user (project manager) the ability to reject parts or whole changes and revert to the previous version, in part or whole, or is that down to good bkup practices?
02:25 hahuang65 joined #git
02:25 ke4nhw And again, straight honest. I'm new to this aspect of programming, but I just lost 4374 lines of error handling code in a major program I was writing. I came within a hair's breath of becoming heavily violent. I do NOT want to repeat this again.
02:27 qsx ke4nhw: vs2010 doesn't support git directly
02:27 ke4nhw Do you have a recommendation for someone of my newbie status to cvs/csv whatever that will still provide me ease of use but robust protection?
02:27 ke4nhw subversion?
02:27 qsx i never had to try plugins for that, i have vs2015 everywhere
02:27 ke4nhw cvs?
02:27 qsx team foundation.
02:27 qsx the very old ones maybe VSS
02:28 themill There's no need to have support directly within VS
02:28 Jellyg00se joined #git
02:29 qsx yeah, that too.
02:29 qsx it's convenient though
02:29 david007 joined #git
02:29 MZAWeb joined #git
02:30 ke4nhw Older version of vs used a "code vault" or "code safe" where you could check code in and out, it was kept relatively safe, but not available anymore. Besides I may have one or two others helping me out, and being able to track who does what would be useful. so as of right now tfs is my only option, or is cvs another possibility, and how hard is it to run in RedHat or its derivitaves?
02:31 qsx forget about CVS unless you must
02:31 ke4nhw Well with the other ops off the table looks like tfs then
02:31 qsx it's way too legacy for about everything (says the one who manages their DNS zones with RCS)
02:31 qsx you could of course use git.
02:31 qsx i doubt you can run a TF server on linux
02:32 ke4nhw vs2010 supports git, and can git run on my personal linux server?
02:32 qsx i dunno about the former (even if it doesn't, it does not matter, you can run git outside of vs2010), and the latter of course
02:33 qsx git is distributed, it doesn't need a server per se (they do of course come in handy) and it isn't restricted to exactly one server either
02:35 ke4nhw any type of dfs has advantages, but I really would like to keep the source on a single server, security purposes. Programs I may start later could be considered sensitive (sensitive enough that they will have to undergo U.S. Army Tempesting for operational approval)
02:35 qsx sure.  you don't need to distribute your source.
02:35 ke4nhw Not top secret, but still touchy enough they won't appreciate the source code being public domain
02:35 rardiol joined #git
02:35 pwnz0r_ joined #git
02:37 ke4nhw Actual classification will be UNCLAS-FOUO in its concept stage, and only a single step higher in its source code stage. At highest, confidential.
02:37 themill That's not relevant
02:38 ke4nhw Well it does rule out some of the online code repositories I have looked at
02:38 qsx host your own.
02:38 ke4nhw so yea sorta relevant.
02:38 qsx !gitolite, !host_gui, i personally am a fan of !gerrit
02:38 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/
02:38 gitinfo There are several options for self-hosting git repositories with a web GUI: !gitblit !gitlab !rhode_code !gerrit and !gogs. Keep in mind that these all take far more work than a (non-GUI) !gitolite install. An overview of nearly all GUIs is available at: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools
02:38 gitinfo Gerrit is a web-based code review system, built by Google. https://www.gerritcodereview.com/
02:38 ke4nhw Precisely what I'd like, but again Kinda a newbie at hosting a code repo
02:39 themill ke4nhw: well, you're asking about git in #git...
02:39 Rodya_ joined #git
02:39 ke4nhw That's because I've heard a great deal of positive stuff about git
02:39 themill ke4nhw: git isn't going to suddenly publish your source code.
02:40 ke4nhw and that it works with most other languages, just didn't know about VB or VC++
02:40 fairuz joined #git
02:40 MZAWeb joined #git
02:40 qsx git does not care about its content
02:40 themill It just stores stuff
02:40 qsx it's a huge bunch of bytes, that's it.
02:41 chachasmooth joined #git
02:42 ke4nhw A huge bnch of bytes that is restricted to only those the account holder authorizes... which shouldn't be too hard...  Again, the only, ONLY way into the server is via VPN (even from within the local network) that requires certificates that are pw verified
02:43 stormlrd joined #git
02:43 dreiss joined #git
02:44 ke4nhw One last question. If I want a user to see, for example, all the code and program, but only be capable of editing, for example, the errorhandler file, can I make that file rw to him, everything r only, and still give him permission to run the program in debug mode, or is that more a problem of the IDE in question?
02:45 ke4nhw In other words, how much control over each user's cauability do I have?
02:45 bremner ke4nhw: read !gitolite
02:45 gitinfo ke4nhw: 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/
02:46 bremner ke4nhw: one thing to keep in mind is that you have basically no control over what developers do on their own computer, after they access the server
02:46 heroux joined #git
02:46 Goplat joined #git
02:46 ke4nhw I will pull it now. Bear in mind I own the hardware for the primary host server, and therefore am root on the host and root on the VM that will host git, so having root access is not a problem. Is there an advantage over not installing root or installing as root into a sandbox?
02:47 david007 joined #git
02:47 Guest55 joined #git
02:48 qsx ke4nhw: you just don't merge the patches editing anything else than the errorhandler file
02:48 qsx either manually or by scripts simply denying everything else
02:48 hexagoxel joined #git
02:48 lagothri1 joined #git
02:49 qsx every "working tree" contains a complete repo.  a server is only a semantical central repository, it has no special meaning to git itself
02:49 rardiol joined #git
02:49 qsx gerrit, which i mentioned above, works very nice to review every patch
02:51 qsx ke4nhw: if you have time, read the !book.  if not ... there was a nice set of slides explaining git from the beginning, or the !parable, or some of the other resources
02:51 gitinfo ke4nhw: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable
02:51 gitinfo ke4nhw: 'The git parable' provides some good reasoning behind git.  http://tom.preston-werner.com/2009/05/19/the-git-parable.html
02:52 cyan__ joined #git
02:52 inflex jhass, sorry for the reply lag;  I'll take that in to consideration, as I am pretty much just a newbie.
02:53 skylite joined #git
02:55 RedneckDonut joined #git
02:55 qsx welp.  bedtime actually started 5 horus ago ... let's see where this gets now.
02:55 Shentino joined #git
02:56 zacts joined #git
02:57 Dougie187 left #git
02:57 MZAWeb joined #git
02:57 fairuz joined #git
03:01 MattMaker joined #git
03:02 Gomurf joined #git
03:05 fuchstronaut joined #git
03:06 cjbrambo_ joined #git
03:07 ke4nhw Awesome guys lots to think about here t
03:07 ke4nhw will look into it al. tHANK YOU ALL :0
03:08 ke4nhw Thank you all even lol :0
03:10 blur3d joined #git
03:10 Sazhen86 joined #git
03:14 shinnya joined #git
03:16 rardiol joined #git
03:17 cdown joined #git
03:18 cagedwisdom joined #git
03:23 ShekharReddy joined #git
03:24 nettoweb joined #git
03:26 teyc joined #git
03:26 ytl joined #git
03:26 fstd_ joined #git
03:28 teyc I'm trying to understand exactly why `git status` shows a file as modified, but `git diff` doesn't. Can you help me learn how to probe and understand why.
03:28 polyzen git diff --cached
03:28 polyzen how do you get voice in here :o
03:29 bremner polyzen: you don't need it, since you can talk. But see /topic
03:29 polyzen oh
03:29 polyzen bremner, sorry, thank you :p
03:32 dreiss joined #git
03:33 teyc backstory @polyzen  I ftp'ed a bunch of files into my git repo to compare what has changed. I haven't git added anything, so git diff --cached shows nothing.
03:33 bremner so don't use --cached?
03:34 teyc git diff for the file in question -- nothing.
03:34 teyc git status --- the file shows up
03:34 teyc git status --- the file shows up (as modified)
03:34 jmd joined #git
03:35 polyzen teyc, tig should be able to help you out
03:35 jmd How can I squash all commits between origin/master and HEAD into one?
03:35 polyzen install -> `tig` -> hit enter
03:36 polyzen jmd, the easy way afaik would be to rebase
03:36 teyc thanks @polyzen.
03:36 heroux joined #git
03:36 polyzen IRC doesn't use @ :p
03:36 jmd polyzen: Rebasing doesn't consolodate commits (at least not by default)
03:37 polyzen jmd, not sure what you're saying, but rebase can squash
03:38 jmd but not by default.
03:38 jmd (didn't I say that?)
03:38 anu0 joined #git
03:39 jmd In fact, the only way I know of doing it with rebase is to use its interactive mode.
03:39 polyzen so what's the problem?
03:39 polyzen there's also --autosquash
03:39 Maple__ joined #git
03:40 jmd Again, --autosquash I think means one has to first change all te commit messages to start with "squash" or "fixup"
03:40 polyzen right
03:41 polyzen but that is another way
03:41 polyzen (why does this feel like an argument)
03:41 jmd So how is reabase the "easy way" ??
03:41 polyzen because it's what comes to mind ^^
03:42 polyzen and is pretty easy
03:42 polyzen you seem to already know enough to do this..
03:42 jmd Ahh  So you meant the "easy way to answer the question", whereas I was thinking "the easy way to actually do it".
03:43 polyzen sure
03:45 polyzen someone give the man a harder way
03:45 polyzen or woman
03:45 jmd Well I was actually looking for an easy way.  I can think of several hard ways.
03:45 polyzen you can do eet
03:46 zacts joined #git
03:48 polyzen maybe I meant "simple" instead of "easy". I was contemplating which to use
03:49 jmd I was hoping to find a command similar to "git squash origin/master HEAD" or somthing ...
03:50 polyzen that would be convenient
03:51 zumba_addict joined #git
03:52 heroux joined #git
03:52 polyzen jmd, http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git#5189600
03:52 dreiss joined #git
03:54 cdown_ joined #git
03:55 Rodya_ joined #git
03:58 interne7y joined #git
04:00 githogori joined #git
04:01 mitzip joined #git
04:01 thecomedian joined #git
04:03 cdown_ joined #git
04:06 fuchstronaut joined #git
04:06 fairuz joined #git
04:07 stormlrd joined #git
04:09 zumba_addict joined #git
04:10 cdown_ joined #git
04:11 elementalest joined #git
04:12 RedneckDonut joined #git
04:14 cdown_ joined #git
04:14 piling joined #git
04:16 snowkidind joined #git
04:16 Darren_ joined #git
04:16 zumba_addict joined #git
04:17 stormlrd joined #git
04:18 rardiol joined #git
04:22 stormlrd joined #git
04:23 Sasazuka joined #git
04:23 ItSANgo joined #git
04:25 stormlrd_ joined #git
04:25 hahuang65 joined #git
04:28 cdown joined #git
04:30 dreiss joined #git
04:32 stormlrd joined #git
04:32 ke4nhw does git have a gui under kde, make my job easier?
04:34 tesuji joined #git
04:34 inflex there's qgit
04:35 Cabanossi joined #git
04:36 mohabaks joined #git
04:37 rardiol joined #git
04:38 zumba_addict joined #git
04:47 bocaneri joined #git
04:48 phanimahesh joined #git
04:54 phaleth joined #git
04:58 cdown_ joined #git
04:59 zumba_addict joined #git
05:05 madebymarkca joined #git
05:05 pwnz0r joined #git
05:07 inflames joined #git
05:12 madebymarkca joined #git
05:14 govg joined #git
05:15 wrouesnel1 joined #git
05:16 sdothum joined #git
05:18 madebymarkca joined #git
05:23 rardiol joined #git
05:29 gtristan joined #git
05:29 lel joined #git
05:34 The_Phoenix joined #git
05:44 rossome joined #git
05:44 pikajude joined #git
05:44 pikajude joined #git
05:44 phanimahesh joined #git
05:46 XanThaOs joined #git
05:46 XanThaOs joined #git
05:47 Rodya_ joined #git
05:49 govg joined #git
05:54 WhiskerBiscuit joined #git
05:55 govg joined #git
05:58 star_prone joined #git
06:00 xlegoman joined #git
06:00 Rodya_ joined #git
06:03 thomas joined #git
06:04 tinajohnson___ joined #git
06:05 freimatz joined #git
06:07 bluezone joined #git
06:07 fuchstronaut joined #git
06:12 Izabia joined #git
06:13 Shentino joined #git
06:14 sanketdg joined #git
06:15 madebymarkca joined #git
06:18 Sazhen86 joined #git
06:19 madebymarkca joined #git
06:20 phanimahesh joined #git
06:20 madebymarkca joined #git
06:23 madebymarkca joined #git
06:25 dsdeiz joined #git
06:26 hahuang65 joined #git
06:33 blackwind_123 joined #git
06:36 madebymarkca joined #git
06:38 robotroll joined #git
06:41 madebymarkca joined #git
06:44 fairuz joined #git
06:44 cdown joined #git
06:47 phanimahesh joined #git
06:53 star_prone joined #git
06:53 Sazhen86 joined #git
06:54 The_Phoenix joined #git
06:55 subhojit777 joined #git
06:58 cdown joined #git
07:00 cdown_ joined #git
07:01 HanClinto joined #git
07:01 Rodya_ joined #git
07:02 madebymarkca joined #git
07:03 madebymarkca joined #git
07:06 MattMaker joined #git
07:08 fuchstronaut joined #git
07:09 shpoont joined #git
07:12 madebymarkca joined #git
07:13 fairuz joined #git
07:14 phanimahesh joined #git
07:16 MattMaker joined #git
07:19 zumba_addict joined #git
07:22 stoopkid joined #git
07:22 Dazzyp joined #git
07:23 tabrez joined #git
07:25 MattMaker joined #git
07:29 ambro718 joined #git
07:32 fairuz joined #git
07:33 The_Phoenix joined #git
07:35 emPi joined #git
07:36 MattMaker joined #git
07:37 armyriad joined #git
07:38 phanimahesh joined #git
07:40 hoangtranwork joined #git
07:41 MattMaker joined #git
07:47 MattMaker joined #git
07:51 NwS joined #git
07:57 SteffanW joined #git
07:59 fairuz joined #git
08:01 chachasmooth joined #git
08:04 star_prone joined #git
08:06 GavinMagnus joined #git
08:09 fuchstronaut joined #git
08:09 ahmedelgabri joined #git
08:09 eka joined #git
08:13 tomog999_ joined #git
08:13 blackwind_123 joined #git
08:19 LiohAu joined #git
08:22 madebymarkca joined #git
08:22 Sazhen86 joined #git
08:25 fairuz joined #git
08:27 hahuang65 joined #git
08:27 MattMaker joined #git
08:28 grayjoc joined #git
08:32 danslo joined #git
08:33 garethdaine joined #git
08:41 MattMaker joined #git
08:47 destr0yr42 joined #git
08:50 xall joined #git
08:56 star_prone joined #git
09:00 ahmedelgabri joined #git
09:03 GavinMagnus left #git
09:03 MattMaker joined #git
09:09 fuchstronaut joined #git
09:10 case39 joined #git
09:11 WhiskerBiscuit joined #git
09:15 phanimahesh joined #git
09:17 WhiskerBiscuit Does anyone know of a guide to teach git from those coming from a mercurial background?  I almost feel like I'm at a disadvantage because I think I know what I'm doing.
09:18 fairuz joined #git
09:19 MattMaker joined #git
09:22 Vampire0 joined #git
09:29 MattMaker joined #git
09:31 sanketdg joined #git
09:32 eivarv joined #git
09:35 phanimahesh joined #git
09:40 mablae joined #git
09:41 mariuscc joined #git
09:42 Rodya_ joined #git
09:42 pwnz0r joined #git
09:45 t0by joined #git
09:45 xaa joined #git
09:47 vuoto joined #git
09:48 MattMaker joined #git
09:49 cyan__ joined #git
09:51 davisonio joined #git
09:58 vuoto joined #git
09:59 Shentino joined #git
10:02 satifant joined #git
10:05 subhojit777 joined #git
10:06 netcarver joined #git
10:07 djb-irc joined #git
10:07 MattMaker joined #git
10:09 sanketdg joined #git
10:10 fuchstronaut joined #git
10:16 t0by joined #git
10:17 ahmedelgabri joined #git
10:17 MattMaker joined #git
10:19 ki0 joined #git
10:22 star_prone joined #git
10:22 mikecmpbll joined #git
10:23 jost joined #git
10:27 MattMaker joined #git
10:27 fairuz joined #git
10:28 hahuang65 joined #git
10:28 SteffanW joined #git
10:30 ediz__ joined #git
10:31 Anupkumar WhiskerBiscuit: hope this helps: https://codio.com/blog/moving-from-mercurial-to-git/
10:36 vuoto joined #git
10:38 yoan joined #git
10:39 wwwi joined #git
10:43 MattMaker joined #git
10:43 playfullyExist joined #git
10:43 eka joined #git
10:44 guardianJ joined #git
10:45 guardianJ left #git
10:47 djb-irc joined #git
10:50 Shentino joined #git
10:55 MattMaker joined #git
10:57 The_Phoenix joined #git
10:59 anu1 joined #git
11:00 Kulrak joined #git
11:00 Kulrak joined #git
11:00 ki0 joined #git
11:00 danslo joined #git
11:02 ahmedelgabri joined #git
11:02 Keridos joined #git
11:03 guardianJ joined #git
11:06 vuoto_ joined #git
11:08 Jackneill joined #git
11:08 warrantyvoid joined #git
11:08 guardianJ left #git
11:10 djb-irc joined #git
11:11 fuchstronaut joined #git
11:14 danslo joined #git
11:16 MattMaker joined #git
11:18 ojdo joined #git
11:20 p4trix joined #git
11:20 Balliad joined #git
11:23 sdothum joined #git
11:23 star_prone joined #git
11:25 MattMaker joined #git
11:25 phanimahesh joined #git
11:25 GlenK joined #git
11:26 GlenK hi.  so I'm confused.  I created a .gitignore file, put the name of the file I want to ignore in there, but git status still lists it as changed.  what gives?
11:28 GavinMagnus joined #git
11:28 hahuang65 joined #git
11:31 vuoto joined #git
11:32 LiohAu joined #git
11:35 djb-irc joined #git
11:36 qsx GlenK: !ignore_tr
11:36 gitinfo GlenK: [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
11:37 davisonio joined #git
11:39 Jackneill joined #git
11:39 inflames joined #git
11:39 guardianJ joined #git
11:40 guardianJ left #git
11:43 Rodya_ joined #git
11:44 cyan__ joined #git
11:45 djb-irc joined #git
11:45 star_prone joined #git
11:48 vuoto joined #git
11:49 MattMaker joined #git
11:49 Maple__ joined #git
11:50 sanketdg joined #git
11:52 Dyonisos joined #git
11:53 guardianJ joined #git
11:53 eivarv joined #git
11:54 guardianJ left #git
11:55 m0nkmaster joined #git
11:56 guardianJ joined #git
11:56 fahadash joined #git
11:56 vuoto joined #git
11:58 harish_ joined #git
11:59 zumba_addict joined #git
11:59 MattMaker joined #git
12:00 guardianJ joined #git
12:01 phanimahesh joined #git
12:01 blur3d joined #git
12:02 djb-irc joined #git
12:06 m0nkmaster joined #git
12:10 Anderson69s_Deb joined #git
12:11 reda_ joined #git
12:11 mkoskar joined #git
12:12 fuchstronaut joined #git
12:13 guardianJ joined #git
12:14 guardianJ left #git
12:14 ahmedelgabri joined #git
12:18 djb-irc joined #git
12:18 MattMaker joined #git
12:19 aspiers joined #git
12:21 LiohAu joined #git
12:21 freimatz joined #git
12:21 davisonio joined #git
12:22 reda joined #git
12:22 guardianJ_ joined #git
12:29 hahuang65 joined #git
12:30 iio7 joined #git
12:31 leeN joined #git
12:31 iio7 Anyone who knows what this Git aware prompt being used is? https://www.youtube.com/watch?v=2E23I9PzplM
12:34 djb-irc joined #git
12:37 BobbyPeru joined #git
12:37 omegak joined #git
12:37 MattMaker joined #git
12:38 BobbyPeru hi, i'm trying to push with git 2.9 on windows to a local server running git 2.7, and after writing the objects it just stops at 100% progress, like it's waiting for the server to say something
12:38 BobbyPeru any idea?
12:39 eka joined #git
12:42 cyphase joined #git
12:45 NeonSynth joined #git
12:47 star_prone joined #git
12:48 m0viefreak joined #git
12:50 knod joined #git
12:50 mikecmpbll joined #git
12:51 knod I'm dealing with a pull request for the first time and I realized that I have no idea what to do. There are merge conflicts. What are my next steps? Or can you point me to a resource about them?
12:51 bremner knod: yell at the submitter to fix the merge conflicts
12:52 bremner in particular, ask them to rebase the branch against your master (or whatever you are merging into)
12:52 quackgyver joined #git
12:52 MattMaker joined #git
12:52 zeroed joined #git
12:53 knod bremner: I just want some practice.
12:54 bremner knod: ok, rebase it yourself then
12:54 knod Also, I think it might not have been a problem had I noticed the request when it was actually made.
12:54 knod brenner: What are the commands to start with?
12:54 knod I can't just do git pull origin master, right?
12:54 bremner well, really you want !conflict
12:54 gitinfo [!eekaconflict] Merge conflicts are a natural part of collaboration. When facing one, *don't panic*. Read "How to resolve conflicts" in man git-merge and http://git-scm.com/book/ch3-2.html#Basic-Merge-Conflicts then carefully go through the conflicts. Picking one side verbatim is not always the right choice! A nice video explaining merge conflicts: https://www.youtube.com/watch?v=zz7NuSCH6II
12:55 knod I mean where do I pull from?
12:55 bremner dunno, I don't use github.
12:56 knod bremner: Ok, thanks anyway. And thanks for the resource.
12:56 knod Anyone else here use github and know where I'm supposed to pull from?
12:57 djb-irc joined #git
12:58 knod I think I found the page on github finally
13:00 tanuki joined #git
13:01 knod Heh, still not sure what to do. I'll try to find more resources with that same search
13:04 Tachyon_ joined #git
13:07 knod Nope, still not getting it.
13:07 jhass knod: if you install https://github.com/github/hub you can just hub merge pull-request-url, resolve the conflicts as normal, commit and push
13:07 MattMaker joined #git
13:08 knod jhass: Thanks I'll think about that. I'd first like to understand how it works with plain old git if possible
13:08 LiohAu joined #git
13:08 The_Phoenix joined #git
13:08 jhass knod: if you look at the pull request, there are instructions to check out the branch locally right there
13:08 knod Do I just do git pull origin pullID#?
13:09 ahmedelgabri joined #git
13:09 knod jhass: Hmm, I'm missing them somehow. Where on the page are they?
13:09 stoopkid joined #git
13:11 jhass at the bottom, "view command line instructions"
13:12 knod Ah, there's a bit of blue text that says "Use the command line"
13:12 knod That seems similar enough to what you describe
13:12 ediz_ joined #git
13:13 fuchstronaut joined #git
13:13 knod Thanks jhass
13:20 knod left #git
13:22 playfullyExist joined #git
13:23 BobbyPeru is there any way to do git-init onto a remote server?
13:25 guardianJ_ joined #git
13:25 jhass ssh remote_server git init foo ?
13:26 trewe joined #git
13:26 BobbyPeru yes but that's really doing it on the server, rather than onto it. i'm just running a basic git daemon on the server, and want to avoid logging on to it to init a new repo
13:26 GavinMagnus left #git
13:27 Zarthus well you kind of need to log in to identify you as you
13:27 MattMaker joined #git
13:27 BobbyPeru the daemon accepts anonymous pushes, so i was hoping it would accept anonymous inits via git:// if it's possible. this is all happening on a local network
13:27 stoopkid joined #git
13:28 bremner BobbyPeru: the short answer is there is no way to create a git repo using git://
13:28 Zarthus What would prevent a malicious user from cloning their own backdoor and running it on your server?
13:28 Zarthus you could open up some sort of endpoint to the user where you can pass in an instruction, but I don't think it'll be very worthwhile
13:29 bremner BobbyPeru: if you want that kind of facility, you can use gitolite
13:29 BobbyPeru i guess it's easier to just do the ssh on the command line then. thanks tho
13:30 BobbyPeru still can't get 2.9 on windows to push onto 2.7 server, if anyone know what's up with that
13:30 hahuang65 joined #git
13:30 bremner last time someone (maybe you) had this problem, it was windows choking on 500k refs
13:30 bremner because file systems are hard, I guess.
13:31 BobbyPeru this is just a test repo, a single file and a single commit
13:31 BobbyPeru it stops at 100% completion, like it's waiting for the server to say smth
13:33 plasticle joined #git
13:35 nilsi joined #git
13:35 diogenese joined #git
13:36 Gamecubic joined #git
13:39 GavinMagnus joined #git
13:40 Rodya_ joined #git
13:46 jguillen_ joined #git
13:46 playfullyExist joined #git
13:47 sleepee joined #git
13:49 kyan joined #git
13:49 star_prone joined #git
13:51 Guest38 joined #git
13:58 djb-irc joined #git
14:02 radsy joined #git
14:06 BobbyPeru "git config --global sendpack.sideband false" finally fixed it. seems this bug has been hanging around for years
14:08 MZAWeb joined #git
14:09 MattMaker joined #git
14:10 eivarv joined #git
14:12 star_prone joined #git
14:13 theweekendgeek joined #git
14:13 fuchstronaut joined #git
14:17 radsy joined #git
14:19 airdisa joined #git
14:22 airdisa_ joined #git
14:23 ediz__ joined #git
14:24 ArchNoob joined #git
14:25 {AS} left #git
14:26 blackwind_123 joined #git
14:30 kugel_ joined #git
14:30 kugel_ joined #git
14:31 hahuang65 joined #git
14:32 rik316 joined #git
14:36 shinnya joined #git
14:40 MattMaker joined #git
14:42 cjbrambo_ joined #git
14:42 tureba joined #git
14:43 rardiol joined #git
14:44 GavinMagnus left #git
14:46 HanClinto joined #git
14:47 McNozes joined #git
14:48 danslo_ joined #git
14:53 rvc joined #git
14:53 cyan__ joined #git
14:54 MattMaker joined #git
14:54 livingstn joined #git
14:56 davisonio joined #git
14:58 LiohAu joined #git
15:01 ksolv joined #git
15:03 zeroed joined #git
15:03 zeroed joined #git
15:04 kpoz joined #git
15:06 InfoTest joined #git
15:06 anonnumberanon I am using this in order to install a Git server on my vps, am I doing it right? https://git-scm.com/book/en/v2/Git-on-the-Server-Getting-Git-on-a-Server The goal being to make it less pain-inducing to develop on several machines.
15:10 subhojit777 joined #git
15:11 snowkidind joined #git
15:13 star_prone joined #git
15:14 MattMaker joined #git
15:14 fuchstronaut joined #git
15:15 tom___ joined #git
15:17 zacts joined #git
15:18 Darkhunter joined #git
15:19 Darkhunter hi guys. Can I somehow put my linux to git? I have issues with .gitignore for proc/sys/dev...I want to have these directories in repo, but not their content and I can't add .gitignore file there.
15:21 Darren_ joined #git
15:24 oiom joined #git
15:24 leehambley joined #git
15:25 tom___ left #git
15:27 Erati joined #git
15:28 MattMaker joined #git
15:30 khs joined #git
15:32 vuoto joined #git
15:33 davisonio joined #git
15:35 eivarv joined #git
15:39 star_prone joined #git
15:40 ahmedelgabri joined #git
15:40 yxxiu joined #git
15:44 johnnyfive joined #git
15:44 diegoviola joined #git
15:45 vuoto joined #git
15:46 vuoto joined #git
15:46 jaequery joined #git
15:52 MattMaker joined #git
15:55 eivarv joined #git
15:56 ediz__ joined #git
15:56 vdv joined #git
15:57 Cassiopaya joined #git
15:59 IlNominePatre joined #git
16:01 davisonio joined #git
16:03 Tachyon_ joined #git
16:03 interne7y joined #git
16:04 Seveas Darkhunter: that sounds like a pretty bad idea.
16:06 Darkhunter Seveas: Why? It's archlinux for rpi and I am currently developing my "embedded version" for it. So I need to store that somewhere to be able to deploy it.
16:07 usm4n joined #git
16:08 tanuki joined #git
16:10 madewokherd joined #git
16:10 sargas joined #git
16:11 ytl joined #git
16:15 fuchstronaut joined #git
16:16 usm4n joined #git
16:17 SteffanW joined #git
16:18 Goplat joined #git
16:22 MattMaker joined #git
16:24 damjan joined #git
16:24 jaequery joined #git
16:25 damjan hi all, I'm trying to implement a feature for cgit, so I was wondering… is there a function in git that would iterate key,value from a section in a config file?
16:26 Fabricio20 joined #git
16:29 ediz__ joined #git
16:31 MattMaker joined #git
16:31 LiohAu joined #git
16:31 hahuang65 joined #git
16:32 rardiol joined #git
16:33 damjan something like what `git config -f git.ini --list`  does but with a optional section
16:33 rudi_s Darkhunter: You shouldn't commit the binaries but create a script/build tool/whatever to create the resulting distribution.
16:34 zumba_addict joined #git
16:34 nettoweb joined #git
16:38 jottr joined #git
16:38 Darkhunter rudi_s: I know I should, but it would take me years... :/ But I will try pacstrap probably...
16:39 HanClinto joined #git
16:39 rudi_s Darkhunter: What?
16:39 Darkhunter rudi_s: https://wiki.archlinux.org/index.php/Install_from_existing_Linux
16:42 mischat joined #git
16:48 vuoto joined #git
16:48 roflincopter joined #git
16:48 vuoto joined #git
16:48 TinkerTyper joined #git
16:49 HanClinto joined #git
16:51 MattMaker joined #git
16:52 daynaskully joined #git
16:53 ediz__ joined #git
16:57 Spec-Chum joined #git
16:58 shaggycat joined #git
17:02 sangy joined #git
17:04 davisonio joined #git
17:05 eivarv joined #git
17:05 MattMaker joined #git
17:06 xPucTu4 joined #git
17:08 zeemz joined #git
17:09 durham joined #git
17:10 joki joined #git
17:12 durham joined #git
17:12 Tachyon_ joined #git
17:12 snowkidind is making a "release" a github thing or a git thing?
17:13 vuoto joined #git
17:14 vuoto joined #git
17:14 damjan github
17:14 ahmedelgabri joined #git
17:14 _sjs joined #git
17:16 star_prone joined #git
17:16 fuchstronaut joined #git
17:16 snowkidind ok. i saw it on there but wasn't sure
17:17 mohabaks joined #git
17:20 sagerdearia joined #git
17:20 MattMaker joined #git
17:22 wwwi joined #git
17:22 ahmedelgabri joined #git
17:24 Thorn__ joined #git
17:24 lel joined #git
17:25 Tachyon_ joined #git
17:26 vuoto joined #git
17:29 freimatz joined #git
17:30 MattMaker joined #git
17:34 freimatz Hi, i have done (windows) a "del Dcu\*,* /s/q" on root. Now my git repository is corrupted. Is there a chance to restore something
17:37 Finnoloid joined #git
17:37 ediz__ joined #git
17:38 eivarv joined #git
17:38 cyan__ joined #git
17:41 paul424 joined #git
17:42 mablae_ joined #git
17:43 khmarbaise joined #git
17:43 kyan joined #git
17:44 MattMaker joined #git
17:45 thiago joined #git
17:48 star_prone joined #git
17:48 l4v2 joined #git
17:49 Anderson69s_Deb joined #git
17:51 Limes__ joined #git
17:52 sargas joined #git
17:59 MattMaker joined #git
18:04 cagmz joined #git
18:07 darkbit joined #git
18:09 zeroed joined #git
18:09 ahmedelgabri joined #git
18:13 MattMaker joined #git
18:13 akitada joined #git
18:16 fuchstronaut joined #git
18:16 fuchstronaut joined #git
18:19 watabou joined #git
18:20 kadoban joined #git
18:20 jstein_ joined #git
18:23 Tachyon_ joined #git
18:23 MattMaker joined #git
18:24 eivarv joined #git
18:28 case39 joined #git
18:32 ResidentBiscuit joined #git
18:32 hahuang65 joined #git
18:33 MattMaker joined #git
18:35 sargas joined #git
18:35 hecliunyx joined #git
18:38 Guest27 joined #git
18:38 Lvjasha joined #git
18:42 govg joined #git
18:42 awt joined #git
18:42 nwkj86 joined #git
18:44 fahadash joined #git
18:44 dsdeiz joined #git
18:47 eivarv joined #git
18:47 heroux joined #git
18:51 davisonio joined #git
18:52 MattMaker joined #git
18:52 Shentino joined #git
18:58 rardiol joined #git
19:00 a3Dman joined #git
19:01 xall joined #git
19:01 Ahmed90 joined #git
19:01 hdon joined #git
19:02 MattMaker joined #git
19:03 hdon hi all :) i want to re-apply changes from a past commit that were lost somewhere along the line. what's a simple way to do this? with hg i would hg diff -c <revid> > patch && hg import < patch
19:04 durham hdon: "git cherry-pick <hash>" maybe?  Also, in hg it'd be cleaner to do "hg graft -r <hash>"
19:05 hdon ah thanks durham :)
19:07 zacts joined #git
19:08 xlegoman joined #git
19:09 hdon oh i see why this change was lost during merges... it was never made :3
19:12 zeroed joined #git
19:12 damjan hi all, I'm trying to implement a feature for cgit, so I was wondering… is there a C function in git that would iterate key,value from a section in a config file?
19:12 hdon can is specify filenames to git reset --hard ?
19:12 damjan hdon: you can use `git checkout -- file/name/path`
19:12 LarArT joined #git
19:12 damjan reset works on commits though
19:13 hdon ahh thanks damjan
19:14 netj joined #git
19:15 VladGh joined #git
19:17 star_prone joined #git
19:17 fuchstronaut joined #git
19:18 anuxivm joined #git
19:20 eivarv joined #git
19:21 MattMaker joined #git
19:21 DJ_Spies joined #git
19:29 ypid joined #git
19:32 VladGh joined #git
19:32 snowkidind
19:32 snowkidind oops
19:34 VladGh joined #git
19:35 VladGh joined #git
19:36 Tachyon_ joined #git
19:37 VladGh joined #git
19:37 mischat joined #git
19:39 VladGh joined #git
19:40 _ikke_
19:40 etcinit_ joined #git
19:41 fcrick_ joined #git
19:41 MattMaker joined #git
19:42 qsx
19:46 ajf- joined #git
19:48 myo joined #git
19:50 LiohAu joined #git
19:51 choki joined #git
19:51 sin3t joined #git
19:52 VladGh joined #git
19:52 Viua joined #git
19:53 VladGh joined #git
19:54 ypid Just curious, has anybody checked https://github.com/thammi/digger or seen the talk for it (was some Datengarten, URL not currently on hand)?
19:54 armyriad joined #git
19:54 ypid Or more interestingly, has anyone done something to fake git metadata (mainly commit times) to make this more blurry?
19:56 rns joined #git
19:56 bartosz_ joined #git
19:56 SoItBegins joined #git
19:56 madebymarkca joined #git
19:56 Vgqo5 joined #git
19:57 mroth_ joined #git
19:58 _ikke_ ypid: Can you elaborate? I'm missing the context of what that project actually does
19:59 bartosz_ left #git
19:59 Barteks2x joined #git
19:59 ypid Sure, "This project fetches various data sources and generates graphs from them."
20:00 ypid So it can parse your git history of various repos and plot them.
20:00 MattMaker joined #git
20:00 Barteks2x I'm tying to use git submodule in place of previously existing but empty directory. It gives me this error: A git directory for 'src/test/resources' is found locally with remote(s), when I add --force option it fails with fatal: Not a git repository: src/test/resources/../../../.git/modules/src/test/resources. What is wrong/how to fix it?
20:00 vuoto joined #git
20:00 _sjs joined #git
20:00 ypid So someone can learn the times you make commits and draw conclusions from that.
20:00 _ikke_ Sure
20:00 _ikke_ Why is that a problem?
20:01 ypid One might want to randomize the times somehow :)
20:01 bcardarella joined #git
20:01 kfpratt joined #git
20:01 Barteks2x Also, I already have some things waiting to be commited, and I just need to add this submodule to finish it
20:01 _ikke_ One can play with GIT_AUTHOR_DATE and GIT_COMMITTER_DATE when comitting
20:01 Rtxmo joined #git
20:02 kadoban joined #git
20:03 ypid _ikke_: Thanks :) I already searched the web, did not find a project which allows to configure random offsets and other things so I am currently writing one in Python.
20:03 ypid Just wanted to check if one might have input on that.
20:03 _ikke_ ypid: right, because I guess not a lot of people care about it
20:03 ypid No problem :)
20:04 beyertech joined #git
20:04 sin3t joined #git
20:05 beyertech joined #git
20:06 interne7y joined #git
20:07 vdv joined #git
20:08 CheckDavid joined #git
20:09 jab416171 joined #git
20:09 qsx if i were paranoid, i'd just set both to january 1st 1970
20:10 ypid qsx: Hm, I still want a bit of information. Just mixing the time a bit :) Also, that would be too obvious
20:10 MattMaker joined #git
20:10 Jauza joined #git
20:11 ypid Also, another requirement is that I need to fake gpg signature time also. I can not hook into that from git so a gpg wrapper is needed.
20:11 burp87 joined #git
20:12 beyertech joined #git
20:13 Barteks2x is it even possible to replace existing directory with submodule?
20:15 Barteks2x when I use directory that doesn't exist I get fatal: You are on a branch yet to be born
20:15 ibpo joined #git
20:16 Barteks2x nevermind, it worked when I removed --force
20:17 Barteks2x and it worked in the directory it didn't work before. HOW!?
20:18 fuchstronaut joined #git
20:25 armyriad joined #git
20:25 burp87 joined #git
20:25 star_prone joined #git
20:26 izr joined #git
20:29 MattMaker joined #git
20:31 Ega joined #git
20:33 hahuang65 joined #git
20:35 StuartMI joined #git
20:36 Meotf joined #git
20:37 Goplat joined #git
20:37 jeffreylevesque joined #git
20:38 mischat joined #git
20:39 danhedron joined #git
20:39 danhedron I think I've broken my checkout
20:39 MattMaker joined #git
20:39 duarteper wtf
20:39 danslo_ joined #git
20:39 danhedron when I run git commit -a, the message is populated like I'm doing a fixup
20:40 danhedron but rebase --abort says I'm not currently rebasing
20:40 tango_ joined #git
20:42 danhedron I can always clone again, but I'd like to know how git tracks that state
20:43 danhedron because it seems to have gotten mangled somewhere
20:43 damjan danhedron: what did you do?
20:43 damjan also, git status ussualy explains a lot
20:44 danhedron I previous did git rebase -i HEAD~5, moved 3 commits back and used fixup to squash them
20:44 danhedron previously *
20:45 BananaMagician joined #git
20:46 Karkus joined #git
20:46 danhedron git status just tells me i have some unstaged changes to a file
20:46 danhedron nothing out of the ordinary
20:46 Karkus Hello. Is there a way to copy a file and retain history?
20:48 Barteks2x I added got sumbodule, but no files appear there, I tried "git submodule foreach git pull origin master", why there are no files?
20:49 kyan joined #git
20:49 Barteks2x git submodule update --recursive also doesn't work
20:52 ytl joined #git
20:53 oej joined #git
20:53 Barteks2x After "git submodule add https://github.com/<something> src/test/resources" it just shows "Adding existing repo at 'src/test/resources' to the index", even when I do it second time
20:54 Barteks2x What am I doing wrong?
20:54 MattMaker joined #git
20:55 ytl joined #git
20:55 zacts joined #git
20:56 mohabaks joined #git
20:57 gwo joined #git
20:57 BananaMagician joined #git
20:59 ytl joined #git
20:59 tomog999_ joined #git
21:00 eivarv joined #git
21:00 ytl joined #git
21:02 Zuo joined #git
21:05 Marbug joined #git
21:06 BananaMagician joined #git
21:08 MattMaker joined #git
21:08 yoan joined #git
21:09 cdown joined #git
21:10 solrize joined #git
21:11 solrize is it ok (and a sane idea) to have multiple remotes for a repo?  i.e. to use git push as a cheesy deployment system, where pushing puts the program on a dozen different machines.  currently i use ansible but for some things, git would skip a step
21:12 BananaMagician joined #git
21:12 shgysk8zer0 joined #git
21:14 chachasmooth joined #git
21:17 ytl joined #git
21:18 ytl joined #git
21:18 MattMaker joined #git
21:19 fuchstronaut joined #git
21:20 Vampire0 joined #git
21:20 shgysk8zer0 joined #git
21:24 SwiftMatt joined #git
21:25 l4v2 joined #git
21:25 ytl joined #git
21:26 Mhad joined #git
21:26 Sasazuka joined #git
21:27 Barteks2x how to undo git filter-branch?
21:27 Barteks2x It messed up tags
21:28 moritz Barteks2x: restore from backup
21:28 MattMaker joined #git
21:28 moritz or re-clone your repo from remote
21:28 Barteks2x I already pushed
21:28 mattcen joined #git
21:28 Barteks2x and added more commits
21:28 Barteks2x and don't have any reasonably recent backup
21:28 moritz you might need to force-push the tags as well
21:29 Barteks2x They are broken locally too
21:29 moritz because tags usually don't update on the remote on conflict
21:29 Barteks2x ie. git describe doesn't work
21:29 moritz do you still have revisions from before the filter-branch in your reflog?
21:29 Barteks2x yes
21:29 damjan are only the tags broken?
21:30 Barteks2x I think so, I just wanted to fix one commit with invalid email address
21:30 Barteks2x but it "fixed" a lot of older commits too
21:30 damjan remove the tags locally, remove them on the remote, make them, push them
21:30 texasmynsted left #git
21:30 Karkus joined #git
21:31 moritz you could do a rollback by doing a git reset --hard <oldcommit> and then getting the new commits on the branch with cherry-pick or rebase
21:31 moritz Barteks2x: next time just ship a .mailmap
21:31 danhedron left #git
21:31 Barteks2x I had blank email and username set
21:32 moritz ... or an interactive rebase
21:33 pwnz0r joined #git
21:34 Barteks2x That seems easier, I simply followed the top answer from stackoverflow. It looked like it should work
21:36 cagmz joined #git
21:37 lb !ping
21:37 gitinfo I only respond to !reply_time
21:37 MattMaker joined #git
21:39 l4v2 joined #git
21:40 mischat joined #git
21:40 Barteks2x I can only imagine some confusing github notifications people following this repository will get...
21:40 Vampire0 Barteks2x, for next time !perfect
21:40 gitinfo Barteks2x: [!postproduction] So, you want to make your commit history look pretty before pushing? http://sethrobertson.github.com/GitPostProduction talks you through how to use 'rebase -i' to do this.
21:41 tlaxkit joined #git
21:43 Seveas joined #git
21:47 MattMaker joined #git
21:48 VladGh joined #git
21:53 eel joined #git
21:54 ytl joined #git
21:59 Fqew joined #git
22:01 Karkus left #git
22:03 MattMaker joined #git
22:03 taxw joined #git
22:07 FelixVi joined #git
22:07 shgysk8zer0 joined #git
22:08 ResidentBiscuit joined #git
22:09 ksolv joined #git
22:10 Dkq joined #git
22:13 jhave left #git
22:17 Uwte joined #git
22:20 fuchstronaut joined #git
22:22 Mannn joined #git
22:23 Derperperd joined #git
22:24 Onk joined #git
22:25 blackwind_123 joined #git
22:27 mattcen joined #git
22:30 azerus joined #git
22:31 Ewtl joined #git
22:32 albel727 joined #git
22:33 nettoweb joined #git
22:34 hahuang65 joined #git
22:37 Darren_ joined #git
22:38 mshadle joined #git
22:39 mshadle can someone here help me, i'm trying out something and it doesn't seem to work right. here's my .gitignore at the root of my server - https://gist.github.com/mike503/626df24baf951f191036b7201d2be4ea it doesn't seem to behave as i would expect - if i do a !localfile it works but !directory or anything doesn't. anyone have any ideas?
22:39 gitinfo Git does not track directories, only files in directories.  Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook
22:39 tlaxkit joined #git
22:39 leehambley joined #git
22:39 mshadle i have even added in a !etc/php/7.0/mods-available/opcache.ini which is a file that exists and it still doesn't change the confusion
22:40 gitinfo [!fetch] When you work with remote repositories, Git stores copies of the remote's branches in !tracking_branches (basically mirrors). You can use 'git fetch' to update those. If you want to actually apply changes from the remote to your checked out branch, a second step is needed, usually 'git merge' or 'git rebase'. There's also 'git pull' which combines both steps.
22:40 BananaMagician joined #git
22:42 damjan mshadle: you can ignore everything and still add any file to git
22:42 damjan though, having root in git doesn't make much sense, and I guess is gonna bite you at some point
22:43 mshadle you mean /root ?
22:43 mshadle or / root. it can act like a tracking tripwire of sorts. which is nice
22:43 blackwind_123 joined #git
22:44 damjan /
22:44 mshadle why do you say it will bite me
22:45 damjan you'll think you work with your gi project in /srv/stuff, but maybe you forgot it wasn't a git repo but an unpacked archive
22:45 damjan etc.
22:45 mshadle i know i can forcibly add things.. but was hoping to detect it.
22:45 mshadle yeah.. that was a concern
22:45 mshadle the whole system is a working directory basically
22:45 mshadle gotcha.
22:45 qsx git will by default stop at fs boundaries
22:46 mshadle well that's not useful enough. :)
22:47 Mannn when I pushback things to a vector, is there any internal iterator keeping track of the last element, or rather, the element right after the one I just pushed back
22:48 Mannn oh its end()
22:54 Mannn Okay, but what if I do for(auto i=vectorOne.end() : vectorTwo), will that work as intended
22:55 qsx Mannn: this doesn’t sound like git.
22:55 xall joined #git
22:55 semantipc joined #git
22:56 Mannn whoa lol
22:56 Mannn sorry
23:01 fairuz joined #git
23:01 BooK so I was wondering about tags in remotes
23:01 BooK what happens if two remotes have (lightweight) tags with the same name ?
23:02 BooK what happens on the local repo that fetched both
23:02 mshadle left #git
23:02 damjan BooK: afaik git fetch doesn't get tags by default
23:02 damjan otherwise, afaik again, first one wins
23:02 BooK oh, didn't know that
23:03 BooK so git clone gets them, but that's it
23:04 BooK damjan: "By default, any tag that points into the histories being fetched is also fetched; the effect is to fetch tags that point at branches that you are interested in."
23:04 BooK says the doc for git fetch
23:04 fairuz joined #git
23:05 BooK I'll look at it more deeply, there's probably a way to fetch them like branches, in a special place like refs/tags/remote
23:05 damjan hm, maybe I'm wrong, or the behaviour changed. I think at some point I had to add --tags to fetch
23:06 BooK or maybe I can get the list of remote tags and save them where I want myself
23:08 shgysk8zer0 joined #git
23:20 fuchstronaut joined #git
23:22 cjbrambo joined #git
23:24 mischat joined #git
23:26 aavrug joined #git
23:27 ffabi joined #git
23:27 ksolv joined #git
23:29 b1tchcakes joined #git
23:30 israelzuniga joined #git
23:32 liuzhen joined #git
23:33 ffabi joined #git
23:34 hahuang65 joined #git
23:35 cagedwisdom joined #git
23:39 boombatower joined #git
23:41 Motoko joined #git
23:41 BenderRodriguez joined #git
23:43 Izabia joined #git
23:44 Izabia joined #git
23:57 jaequery joined #git
23:57 mablae__ joined #git

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