Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-01

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

All times shown according to UTC.

Time Nick Message
00:00 kristofferR joined #git
00:01 TbobbyZ_ joined #git
00:01 de-facto joined #git
00:02 KamiRath joined #git
00:02 Vampire0_ joined #git
00:03 cyberz joined #git
00:05 cyphase joined #git
00:05 codematt joined #git
00:08 buzzLightBeer joined #git
00:10 theiostream joined #git
00:11 euphxenos joined #git
00:11 Cabanossi joined #git
00:11 drodger joined #git
00:14 masuberu joined #git
00:17 TbobbyZ joined #git
00:17 euphxenos I'm looking at a strange problem.  I'm looking at the history of this branch.  I see a user's change (call it change A).  Nine changes later (call that change B), if I check out that commit, the changes from change A are not there.  If I look at the history of the only file changed in change A, it has not been touched since change A.  So how are the changes to that file missing if I checkout change B?
00:18 euphxenos the changes from commit A are there in HEAD
00:18 cyphase joined #git
00:22 maroloccio joined #git
00:23 euphxenos What would make a commit's changes just not be there for a while along a few points in a branch's history?
00:25 TbobbyZ joined #git
00:26 chachasmooth joined #git
00:27 netj joined #git
00:28 cyberz joined #git
00:28 cyphase joined #git
00:29 nckpz joined #git
00:31 cahoots_ joined #git
00:31 navidr joined #git
00:31 Noldorin joined #git
00:32 marianina8 joined #git
00:32 marianina8 joined #git
00:34 chachasmooth joined #git
00:35 matoro joined #git
00:37 qpdb joined #git
00:41 cyphase joined #git
00:42 Eugene euphxenos - man git-blame will probably lead you to your answer. Try also `git log -- filename.txt`
00:42 gitinfo euphxenos: the git-blame manpage is available at http://jk.gs/git-blame.html
00:43 mischat joined #git
00:47 euphxenos Eugene: git log -- <filename> shows me that the file has not been changed since commit A.
00:47 leeN joined #git
00:48 Eugene Is A an ancestor of B? man git-merge-base, see --is-ancestor
00:48 gitinfo the git-merge-base manpage is available at http://jk.gs/git-merge-base.html
00:49 Eugene Log without a --graph can be misleading
00:50 theiostream joined #git
00:52 cliluw joined #git
00:54 cyphase joined #git
00:56 euphxenos Okay, git merge-base --is-ancestor <A> <B> exits 1, so A is not an ancestor of B.
00:58 menip joined #git
01:00 Eugene And that's why
01:01 menip joined #git
01:01 lavalamp joined #git
01:02 euphxenos Okay, then I think I'm unclear about what I should expect to get when I checkout various points in a branch's history.  If I checkout this branch when B is the head, should I expect to see the changes from commit A?
01:02 gopar joined #git
01:02 raijin joined #git
01:02 chigang joined #git
01:03 euphxenos I would expect to have each point in a branch's history contain all the changes up to that point, but something else is clearly going on here that I don't quite follow
01:04 roelmonnens joined #git
01:04 cyberz joined #git
01:04 webdev007 joined #git
01:04 snowkidind joined #git
01:05 orbyt_ joined #git
01:05 euphxenos any suggestions for where in the docs I should look for an explanation of what's really going on?
01:07 cyphase joined #git
01:08 netj joined #git
01:09 ljc joined #git
01:13 gableroux joined #git
01:17 nd joined #git
01:22 SwiftMatt joined #git
01:22 Sandworm joined #git
01:25 JordanMoore joined #git
01:26 JordanMoore howdy, I'm having an issue with my git install, on my desktop, no matter what I'm connecting to, github or bitbucket in my case, or what i'm using, bash, sourcetree, tortise, connecting takes 20-30 seconds each time, were it's almost instant on my laptop beside me
01:26 fstd joined #git
01:26 kbs joined #git
01:26 jmesmon joined #git
01:27 hanthings_ joined #git
01:31 finalbeta joined #git
01:33 heroux joined #git
01:33 ThunderChicken JordanMoore, if you use curl instead of git, do you get the same delay on the same box?
01:34 ThunderChicken (I think that's what you're saying...)
01:34 ThunderChicken If so, check what's in /etc/resolv.conf -- it sounds like a DNS lookup issue.
01:35 JordanMoore i'm looking into curl, i'm not framilier with it
01:35 ThunderChicken it's like wget, but defaults to stdout.
01:36 Wulf4 joined #git
01:36 JordanMoore from the looks of some of your locations, it seems your assuming i'm on a linux distro, am i correct?
01:37 cqi joined #git
01:37 ThunderChicken *nix, yes.
01:37 ThunderChicken I understand that MS now has a bash shell.
01:37 ThunderChicken but I don't know how MS does name resolution... there should be a dialog box somewhere that lists the nameservers and the order they are in.
01:38 JordanMoore i'm running windows 10, should have mentioned that earlier i see where i misslead, sorry, geting curl atm
01:38 JordanMoore are you talking about a traceroot?
01:38 ThunderChicken We're going to have a bit of a translation problem. :)
01:39 JordanMoore i've used unix os's before, so i have an idea
01:40 ThunderChicken Are you familiar with how DNS lookups work?
01:40 ThunderChicken I think your first nameserver isn't responding, so you're getting a timeout and falling back to a secondary nameserver.
01:41 Cabanossi joined #git
01:41 ThunderChicken If the first time it was slow and the second time fast, I would suspect the nameserver.
01:46 zmachine joined #git
01:46 pks joined #git
01:46 JordanMoore my desktop is asking my router for dns, as is my laptop, but i'm checking to see if i can see anything with that in mind
01:46 sunri5e joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:49 JordanMoore anything git related, even using git though visual studios or other ide's is slow, but i have no issues with hg iirc, and nothing else i can think of
01:51 ThunderChicken so git is slow even with just local commands, but hg on the same tree (you CAN do it, and have hg and git ignore each other, IF you have the disk space) is fine?
01:52 euphxenos left #git
01:52 JordanMoore i can't say for same tree, but thats cool to know, let me see if i still have a repo in hg
01:56 mischat joined #git
01:56 svm_invictvs joined #git
01:58 d^sh joined #git
02:00 JordanMoore ok, i cloned 2 repos, a git and an hg, to a folder in c, around the same sizes, hg finished when i looked over my shoulder, and git took about 6 minutes
02:00 JordanMoore actualy, git is still tring to load the branches... just finished
02:00 svm_invictvs joined #git
02:02 Emperor_Earth joined #git
02:02 cyberz joined #git
02:03 Vortex35 joined #git
02:03 mda1 joined #git
02:07 theiostream joined #git
02:08 benlieb joined #git
02:08 benlieb joined #git
02:09 JordanMoore i'm testing a local only repo, and it is definitly slow, i remember back in the day, having sevreal java versions installed could cause issues, could that be an issue?
02:09 dsdeiz joined #git
02:09 dsdeiz joined #git
02:09 benlieb joined #git
02:10 benlieb joined #git
02:11 Cabanossi joined #git
02:11 benlieb joined #git
02:11 cyberz joined #git
02:12 fakenerd joined #git
02:19 lagothri1 joined #git
02:22 chachasmooth joined #git
02:23 hexagoxel joined #git
02:28 cyberz joined #git
02:29 thiago joined #git
02:33 Goplat joined #git
02:34 cyberz joined #git
02:38 jameser joined #git
02:38 raijin joined #git
02:43 Aeterne joined #git
02:43 cyberz joined #git
02:44 dsdeiz joined #git
02:44 dsdeiz joined #git
02:49 steeze joined #git
02:51 duderonomy joined #git
02:56 thebope joined #git
02:56 mischat joined #git
03:02 dreiss joined #git
03:04 kbeflo joined #git
03:04 cyberz joined #git
03:06 brokensyntax joined #git
03:06 ojdo joined #git
03:08 AciD` joined #git
03:08 Narziski joined #git
03:10 AciD` hey guys, is there a way to see which person changed which lines of a particular file, line by line? Also, is there a ways to get for a given file the summary of who changed how many lines?
03:13 bwn joined #git
03:14 LeBlaaanc joined #git
03:16 karols146 joined #git
03:20 shgysk8zer0 joined #git
03:20 rewt !man git blame
03:20 gitinfo The git man pages are available online at http://jk.gs/git.html. Or were you looking for the "man git-foo" syntax(without the !) ?
03:20 gitinfo the git-blame manpage is available at http://jk.gs/git-blame.html
03:20 rewt AciD` ^
03:27 orbyt_ joined #git
03:28 mehola joined #git
03:28 mehola joined #git
03:31 matoro joined #git
03:32 holodoc joined #git
03:33 AciD` thanks rewt, will look into it
03:34 AciD` ok, this has the line-by-line info, I'm not sure about the summary though
03:36 rxo joined #git
03:36 inflames joined #git
03:38 MarioBranco joined #git
03:38 brokensyntax joined #git
03:41 fuzzybear joined #git
03:42 hvxgr joined #git
03:43 mda1 joined #git
03:45 dsdeiz joined #git
03:47 MarioBranco joined #git
03:48 bwn joined #git
03:54 andre_pl joined #git
03:55 andre_pl I am trying to rewrite my email address throughout my git history using this script https://pastebin.com/5qbr9WVA but its changing commits by other people as well, what am I doing wrong here?
03:55 Cabanossi joined #git
03:55 Bock joined #git
03:57 mischat joined #git
04:00 pks_ joined #git
04:01 rchavik joined #git
04:01 JanC_ joined #git
04:01 dermoth joined #git
04:01 holodoc joined #git
04:09 holodoc joined #git
04:11 ysh joined #git
04:11 Bock joined #git
04:13 fakenerd joined #git
04:26 mizu_no_oto joined #git
04:27 pks joined #git
04:33 peepsalot joined #git
04:33 Muzer joined #git
04:34 cqi joined #git
04:35 jeffreylevesque joined #git
04:35 cqi joined #git
04:35 TbobbyZ joined #git
04:36 cqi joined #git
04:38 LeBlaaanc joined #git
04:41 fakenerd joined #git
04:43 mda1 joined #git
04:48 TbobbyZ joined #git
04:48 dsdeiz joined #git
04:48 cyberz joined #git
04:49 pks joined #git
04:50 shinnya joined #git
04:50 t-mart joined #git
04:52 jerkey_ joined #git
04:52 gtristan joined #git
04:55 bdonnahue joined #git
04:55 ayogi joined #git
04:56 aidalgol joined #git
04:57 thebope joined #git
04:57 jailbox joined #git
04:58 mischat joined #git
04:58 f0rks joined #git
05:02 Eragon joined #git
05:04 sbulage joined #git
05:05 pks joined #git
05:06 sunrunner20_ joined #git
05:16 freimatz joined #git
05:17 f3r70rr35f joined #git
05:18 dsdeiz joined #git
05:18 Eragon joined #git
05:21 dreiss joined #git
05:26 Eragon joined #git
05:26 Eragon joined #git
05:27 h12o joined #git
05:28 ysh joined #git
05:28 karols146 joined #git
05:31 Eragon joined #git
05:36 marianina8 joined #git
05:39 Cabanossi joined #git
05:41 fletom joined #git
05:43 ayogi joined #git
05:43 marianina8 joined #git
05:44 sunrunner20_ joined #git
05:45 marianina8 joined #git
05:47 lordjancso joined #git
05:48 mpeter joined #git
05:49 Sample joined #git
05:51 brokensyntax joined #git
05:56 henriknj joined #git
05:56 fakenerd joined #git
05:57 NightMonkey joined #git
05:59 mischat joined #git
05:59 h12o joined #git
06:00 dermoth joined #git
06:01 brokensyntax joined #git
06:01 marianina8 joined #git
06:02 overlord_tm joined #git
06:04 holodoc joined #git
06:13 mupadhye joined #git
06:20 TbobbyZ joined #git
06:22 brokensyntax joined #git
06:23 ysh joined #git
06:24 ysh joined #git
06:25 Cabanossi joined #git
06:30 elsevero joined #git
06:33 YuGiOhJCJ joined #git
06:35 holodoc joined #git
06:36 Nugget joined #git
06:40 dreiss joined #git
06:44 acetakwas joined #git
06:44 thebope joined #git
06:48 svm_invictvs joined #git
06:50 jameser_ joined #git
06:52 mda1 joined #git
06:53 afuentes joined #git
06:53 SteffanW joined #git
06:54 Cabanossi joined #git
06:55 cyberz joined #git
07:02 ainchk joined #git
07:03 jagob joined #git
07:04 urda joined #git
07:04 holodoc joined #git
07:08 dreiss joined #git
07:09 schleppel joined #git
07:13 Zialus joined #git
07:13 marianina8 joined #git
07:17 mpeter joined #git
07:20 kjsaihs joined #git
07:25 Cabanossi joined #git
07:33 mehola joined #git
07:36 doener joined #git
07:37 holodoc joined #git
07:39 thebope joined #git
07:39 ayogi joined #git
07:46 theoceaniscool joined #git
07:48 cyberz joined #git
07:50 scoobertron joined #git
07:56 robotroll joined #git
07:56 thinkpad joined #git
07:58 rchavik joined #git
08:01 ayogi joined #git
08:04 Eragon joined #git
08:06 mkoskar joined #git
08:14 quite joined #git
08:14 quite joined #git
08:16 dreiss joined #git
08:17 elsevero joined #git
08:17 inflames joined #git
08:18 diogenese joined #git
08:21 TbobbyZ joined #git
08:22 dmc joined #git
08:23 chipotle joined #git
08:24 davix joined #git
08:24 jameser joined #git
08:27 holodoc joined #git
08:28 cqi joined #git
08:28 dvaske_ joined #git
08:33 thebope joined #git
08:33 D4R5C0D3 joined #git
08:34 mehola joined #git
08:36 sunri5e joined #git
08:36 gopar joined #git
08:45 finalbeta joined #git
08:46 nanga joined #git
08:46 nanga joined #git
08:47 anuxivm joined #git
08:55 Eragon joined #git
08:55 Cabanossi joined #git
08:57 robotroll joined #git
09:00 finalbeta joined #git
09:01 schleppel joined #git
09:01 cliluw joined #git
09:05 sbulage joined #git
09:05 jagobdue joined #git
09:05 Gabemo joined #git
09:05 drodger joined #git
09:12 Jackneill joined #git
09:14 Jackneill joined #git
09:19 PioneerAxon_ joined #git
09:19 vuoto joined #git
09:22 miczac joined #git
09:23 nckpz joined #git
09:25 t0by joined #git
09:27 thebope joined #git
09:30 rominronin joined #git
09:30 synthmeat joined #git
09:31 franktam12 joined #git
09:33 jimi_ joined #git
09:33 kbeflo joined #git
09:34 hs366 joined #git
09:39 Vinnie_win joined #git
09:41 netj joined #git
09:41 hs366 joined #git
09:44 BadApe joined #git
09:47 osk joined #git
09:48 hs366 joined #git
09:50 eihabarabia joined #git
09:51 fakenerd joined #git
09:54 vuoto_ joined #git
09:55 Cabanossi joined #git
09:55 dtbn joined #git
09:56 hs366 joined #git
09:59 TheWild joined #git
10:00 TheWild hello
10:00 TheWild dang! It's not good. https://shattered.io/
10:01 holodoc joined #git
10:02 cbreak the indian ocean is taking over!
10:12 n3wborn joined #git
10:12 n3wborn hi!
10:12 gitinfo n3wborn: 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.
10:13 n3wborn To verify if my local repo is up-to-date, does a "git checkout" is enough ?
10:14 n3wborn or does it only verify the current branch I'm on ? I'm not sure to do things correctly
10:15 elsevero joined #git
10:16 Levex joined #git
10:16 Tobbi joined #git
10:18 j416 n3wborn: git fetch
10:18 j416 n3wborn: you need to fetch from your remote(s) to be able to compare to them
10:18 j416 n3wborn: just "git checkout" does nothing over the network
10:18 canoon joined #git
10:19 n3wborn ok j416
10:19 canoon left #git
10:20 n3wborn thanks. But what does "git checkout" though ? it just "go" to the distant branch ?
10:21 thebope joined #git
10:22 n3wborn and how can I see differences between distant and local repo after "git fetch" ?
10:22 n3wborn I think I found
10:22 n3wborn First, I "git fetch", then "git checkout"
10:23 n3wborn and "git checkout" tells me if there's things that can be updated
10:24 MutantMahesh joined #git
10:24 n3wborn but there's still something missing for me, How can I see what changes has been made on the most recent repo ?
10:25 gtristan joined #git
10:25 cbreak n3wborn: git log
10:26 cbreak for example, git log ..@{u}
10:26 cbreak or git log dev..origin/dev
10:26 cbreak or git log master..origin/ticket232
10:26 cbreak n3wborn: you can throw in a -p too
10:27 cbreak n3wborn: also check out !lol
10:27 gitinfo n3wborn: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
10:27 n3wborn cbreak: cool!
10:30 n3wborn "git log ..@{u}"  is exactly what I expected.Thanks !
10:30 aielima joined #git
10:32 mikecmpbll joined #git
10:32 cbreak yes, the git CLI is very intuitive... :P
10:32 n3wborn ^^
10:32 drodger joined #git
10:35 tango_ 34
10:37 drodger joined #git
10:40 Cabanossi joined #git
10:42 elsevero joined #git
10:44 Orbitrix joined #git
10:44 Orbitrix joined #git
10:45 m0viefreak joined #git
10:46 davimore joined #git
10:51 drodger joined #git
10:52 filcab joined #git
10:58 drodger joined #git
10:59 _28_ria joined #git
11:02 t-mart joined #git
11:03 dersand joined #git
11:06 n3wborn cbreak: thanks to your "git log ..@{u}" example, and looking after what this "..@{u}" meant (still not sure to understand exactly but it does the stuff), I found a cool command (thanks man!) : "git whatchanged", then I used "git whatchanged ..@{u}" and was like <<cool ! git really rules>>
11:06 Sound joined #git
11:06 cbreak n3wborn: you should read the man page for that
11:07 cbreak and use git log -p instead :)
11:07 Eragon joined #git
11:09 n3wborn wonderful =D
11:11 n3wborn I've started to "really" use git a week ago, before that, I just used "git clone" and build things, it really seems very very complete and powerful thing
11:14 zeroed joined #git
11:14 cbreak there are fun things to do
11:14 cbreak n3wborn: for example: git log -p --follow -- path/to/file
11:15 cbreak that will track a file over renames / moves
11:15 thebope joined #git
11:15 cbreak n3wborn: or git gui blame -C -- file
11:15 cbreak that will show an annotation for each line of a file who is responsible for it, and if the line was moved / copied from an other file, from where
11:16 borkr joined #git
11:16 cbreak I like git add -p / git reset -p a lot
11:16 cbreak it allows creating surgical, consistent commits
11:17 cbreak git checkout -p allows throwing away local test changes in a surgical fashion
11:17 n3wborn cbreak perfect !
11:17 cbreak git grep foobar finds all occurences of foobar in the repository
11:18 cbreak git log --grep foobar finds all occurences of foobar in commit messages
11:18 cbreak git log -Sfoobar finds all commits that added or removed foobar from the code
11:18 cbreak git log -Gfoobar finds all commits that changed a line containing the regex foobar
11:19 henriknj joined #git
11:20 n3wborn really cool to know all this
11:21 cbreak the git man pages are a worthy read if you have some spare hours :)
11:21 digidog joined #git
11:22 n3wborn I'll check this
11:22 c0c0 joined #git
11:23 n3wborn and will come here more often too
11:25 rosiu joined #git
11:31 CheckDavid joined #git
11:36 h12o joined #git
11:36 gopar joined #git
11:41 YuGiOhJCJ joined #git
11:47 pks joined #git
11:50 fakenerd joined #git
11:52 roby10 joined #git
11:54 cbreak joined #git
11:54 Masber joined #git
11:55 Cabanossi joined #git
11:59 synthroid joined #git
11:59 cbreak joined #git
12:00 Sound_ joined #git
12:02 _Vi joined #git
12:09 thebope joined #git
12:11 andrew710 joined #git
12:14 meZee joined #git
12:15 BackEndCoder joined #git
12:15 gableroux joined #git
12:18 roby10 joined #git
12:18 geoid joined #git
12:20 chipotle joined #git
12:23 myhau joined #git
12:25 Cabanossi joined #git
12:27 sunri5e joined #git
12:28 Eragon joined #git
12:29 oskarkv joined #git
12:32 HoierM joined #git
12:33 reynierp joined #git
12:33 HoierM joined #git
12:34 Cavallari joined #git
12:34 reynierp hi there, I am having some issues here while trying to exclude some files. This is my rule `/public_html/js/dojo` in  the .gitignore file but the file still being tracked and marked to be added|commited, why? I should say the file is previously in the repository and I want to keep it that way I just don't want to submit new changes, any help?
12:37 j416 reynierp: fix your workflow instead; having a file tracked _and_ ignored is error-prone (but possible via "git update-index --assume-unchanged" if you want to shoot yourself in the foot).
12:37 rokups joined #git
12:38 j416 reynierp: the .gitignore file has no effect on already-tracked files
12:38 reynierp j416, I don't know how to deal with this since the problem is the files are symlink and they behaves different between Docker for Windows and Docker for Linux, pretty sure because of the filesystem or something else
12:38 j416 fix your OS, fix your project, etc.
12:39 reynierp j416, ummmm
12:39 ayogi joined #git
12:39 drodger joined #git
12:39 jameser joined #git
12:39 maroloccio joined #git
12:40 reynierp j416, maybe will be better remove them from the repository and let each developer to create the symlinks since they are about 4 or 5
12:40 reynierp j416, in such case what should I do? remove them locally, commit and push the changes and that's it?
12:40 j416 I don't know how your project works, so I cannot say if that is a good solution or not
12:40 j416 but if you wish to remove them, just remove and commit, yes
12:41 reynierp j416, don't worry about understand how it works and thanks
12:41 j416 :)
12:42 j416 reynierp: perhaps you could just copy the files instead of symlinking
12:43 reynierp j416, aren't files but directories with subdir and files, doesn't make sense to me at all how they (old dev) are handling them and I'll ask that Monday at first hour if I can just move the files from the directory that needs to be symlinked to public_html
12:44 reynierp j416, anyway thanks for the suggestion
12:44 nowhere_man joined #git
12:47 Nilesh_ joined #git
12:48 chipotle_ joined #git
12:48 fakenerd joined #git
12:49 rwb joined #git
12:50 stux|RC-only joined #git
12:50 dermoth_ joined #git
12:50 dtbn joined #git
12:51 jameser joined #git
12:52 h12o joined #git
12:55 sunri5e joined #git
12:55 ShapeShifter499 joined #git
12:55 magueste joined #git
12:57 mischat joined #git
12:59 kexmex joined #git
13:03 thebope joined #git
13:11 askb joined #git
13:18 chachasmooth joined #git
13:19 askb joined #git
13:21 amdi_ joined #git
13:27 h12o joined #git
13:28 davimore_ joined #git
13:28 ToxicFrog joined #git
13:31 borkr joined #git
13:31 Eryn_1983_FL joined #git
13:31 am55 joined #git
13:34 Gustavo6046 joined #git
13:35 venmx joined #git
13:39 Cabanossi joined #git
13:40 mehola joined #git
13:42 marianina8 joined #git
13:45 drodger joined #git
13:45 kbeflo joined #git
13:45 theiostream joined #git
13:47 zeroed joined #git
13:47 zeroed joined #git
13:48 WeiJunLi joined #git
13:48 synthmeat joined #git
13:48 Tobbi joined #git
13:48 ayogi joined #git
13:54 Vgr joined #git
13:54 Vgr joined #git
13:55 myhau joined #git
13:57 thebope joined #git
14:02 theiostream joined #git
14:11 acetakwas joined #git
14:12 mischat joined #git
14:15 vuoto joined #git
14:16 dn1987p left #git
14:16 dtbn joined #git
14:18 mischat_ joined #git
14:25 scoobert1on joined #git
14:26 blackwind_123 joined #git
14:26 ankit01ojha joined #git
14:26 Tobbi joined #git
14:27 acetakwas joined #git
14:27 jozwior joined #git
14:32 ayogi joined #git
14:32 mda1 joined #git
14:36 chachasmooth joined #git
14:40 Cabanossi joined #git
14:47 acetakwas joined #git
14:47 Darcidride joined #git
14:47 zeroed joined #git
14:47 zeroed joined #git
14:48 MutantMahesh joined #git
14:48 dreiss joined #git
14:50 Sound joined #git
14:51 thebope joined #git
14:52 Darcidride joined #git
14:54 chachasmooth joined #git
14:56 anuxivm left #git
15:00 kristofferR joined #git
15:03 shinnya joined #git
15:05 ayogi joined #git
15:15 PioneerAxon joined #git
15:16 meadmoon joined #git
15:19 afuentes joined #git
15:25 steeze joined #git
15:25 Cabanossi joined #git
15:25 chipotle_ joined #git
15:27 kbeflo joined #git
15:28 chipotle joined #git
15:31 SwiftMatt joined #git
15:32 kexmex joined #git
15:35 pbrewczynski joined #git
15:36 gunnaro joined #git
15:40 narendraj9 joined #git
15:44 dreiss joined #git
15:44 xall joined #git
15:45 thebope joined #git
15:45 h12o joined #git
15:52 dendazen joined #git
15:52 BadApe joined #git
15:55 ayogi joined #git
15:58 orbyt_ joined #git
16:00 Levex joined #git
16:00 nowhere_man joined #git
16:04 menip joined #git
16:06 h12o joined #git
16:06 plos joined #git
16:07 Tobbi joined #git
16:07 dsdeiz joined #git
16:07 dsdeiz joined #git
16:08 [Brain] joined #git
16:12 mostlybadfly joined #git
16:14 NoOutlet joined #git
16:17 theiostream joined #git
16:22 chrisml joined #git
16:25 Cabanossi joined #git
16:30 ayogi joined #git
16:30 xall joined #git
16:31 davix joined #git
16:32 dirtyroshi joined #git
16:33 zeroed joined #git
16:33 publio joined #git
16:36 h12o joined #git
16:39 thebope joined #git
16:41 cbreak joined #git
16:41 Oatmeal joined #git
16:44 chrisml joined #git
16:50 madewokherd joined #git
16:50 ncthom91 joined #git
16:52 jacob123 joined #git
16:54 hhee joined #git
16:54 a_thakur joined #git
16:54 dtbn joined #git
16:55 King_Hual` joined #git
16:56 ispnsn joined #git
16:56 basdb joined #git
16:58 nowhere_man joined #git
17:05 zeroed joined #git
17:05 iamthad joined #git
17:07 h12o joined #git
17:07 am55 joined #git
17:07 Acerific joined #git
17:13 nowhere_man joined #git
17:17 supaket joined #git
17:18 TikityTik joined #git
17:19 xall joined #git
17:20 nowhere_man joined #git
17:20 cmosguy joined #git
17:21 zeroed joined #git
17:21 zeroed joined #git
17:21 iamthad joined #git
17:22 DIDAVISION joined #git
17:23 perrier-jouet joined #git
17:24 RoCKdaFrogg joined #git
17:25 Cabanossi joined #git
17:27 dreiss joined #git
17:27 thiago joined #git
17:28 Tobbi joined #git
17:30 SoulOfTheInterne joined #git
17:30 myhau joined #git
17:33 davimore joined #git
17:33 thebope joined #git
17:33 mpeter joined #git
17:35 hhee joined #git
17:37 h12o joined #git
17:39 chrisml joined #git
17:41 elsevero joined #git
17:42 ayogi joined #git
17:43 mehola joined #git
17:50 learning joined #git
17:51 lmatteis joined #git
17:51 yan left #git
17:53 pdgwien joined #git
17:53 jozwior joined #git
17:53 tokkee joined #git
17:54 fmeerkoetter joined #git
17:54 jacob123_ joined #git
17:55 anry joined #git
17:55 kfunk joined #git
17:56 PaulePanter joined #git
17:56 dsdeiz joined #git
17:56 dsdeiz joined #git
17:56 RichiH joined #git
17:56 Soliton joined #git
17:57 noctux joined #git
17:58 h12o joined #git
17:59 markus-k joined #git
17:59 ablackack joined #git
17:59 AlHafoudh joined #git
17:59 malt3 joined #git
18:00 meLon joined #git
18:01 prg3 joined #git
18:02 meLon joined #git
18:02 nopf joined #git
18:02 traxo-xx joined #git
18:03 musca joined #git
18:03 moei joined #git
18:08 h12o joined #git
18:09 alexandre9099 joined #git
18:10 BeerSerc joined #git
18:12 alexandre9099 joined #git
18:12 ertesx joined #git
18:13 YuGiOhJCJ joined #git
18:16 stoopkid joined #git
18:19 sammyo joined #git
18:20 nidr0x joined #git
18:23 WeiJunLi joined #git
18:23 theiostream joined #git
18:25 Cabanossi joined #git
18:27 Murii joined #git
18:27 thebope joined #git
18:28 ayogi joined #git
18:28 h12o joined #git
18:34 sarri joined #git
18:34 sarri joined #git
18:36 felixjet joined #git
18:38 phinxy joined #git
18:40 phinxy after git stash. git pull. git stash pop. there were some red lines saying something about 'add files'. it seems to have compiled but im not sure how i can confirm the merge was successful
18:41 phinxy how would it look like if there were conflicts?
18:42 Simplicity joined #git
18:43 thiago red lines where?
18:45 phinxy red lines of text in terminal window
18:45 phinxy i would assume red equals bad but i could be wrong
18:46 thiago git pull doesn't print anything in red
18:46 gugah joined #git
18:46 thiago which command printed something in red?
18:47 Simplicity joined #git
18:47 phinxy the final command which would merge local stashed changes with recently pulled master
18:48 thiago ok
18:48 phinxy git stash pop
18:48 thiago and what does it say above? exactly, please.
18:48 thiago what is the heading before the red
18:49 h12o joined #git
18:49 phinxy http://ideone.com/CdfKWw
18:50 phinxy im not interested in commiting anything
18:50 thiago you should be
18:50 thiago everything looks ok to me
18:50 thiago there's nothing about conflicts there
18:52 karstensrage joined #git
18:52 am55 joined #git
18:53 rewt the "modified" files are files that are modified (the checked out file doesn't match the last commit), and "untracked files" are files you have that are not in the repo at all
18:53 thiago I really recommend committing
18:56 SiliconDon joined #git
18:59 CEnnis91 joined #git
19:02 fahadash joined #git
19:08 ahrs joined #git
19:09 h12o joined #git
19:10 manuelschneid3r joined #git
19:10 drodger joined #git
19:13 dtbn joined #git
19:14 inflames joined #git
19:16 vamiry joined #git
19:17 leeN joined #git
19:20 dreiss joined #git
19:20 orbyt_ joined #git
19:21 a_thakur joined #git
19:22 thebope joined #git
19:23 cyberz joined #git
19:28 rivarun joined #git
19:28 kexmex joined #git
19:29 h12o joined #git
19:33 sunri5e joined #git
19:35 zeroed joined #git
19:35 zeroed joined #git
19:38 Levex joined #git
19:38 SiliconDon joined #git
19:44 ePirat joined #git
19:44 mehola joined #git
19:46 trewe joined #git
19:46 orbyt_ joined #git
19:47 staafl joined #git
19:50 h12o joined #git
19:51 mehola joined #git
19:52 ePirat- joined #git
19:54 ePirat- left #git
19:55 Cabanossi joined #git
19:59 alexandre9099 joined #git
20:01 myhau joined #git
20:06 Tobbi joined #git
20:08 svm_invictvs joined #git
20:10 h12o joined #git
20:12 bariscant joined #git
20:14 alexandre9099 joined #git
20:15 btree joined #git
20:15 bariscant joined #git
20:15 Levex joined #git
20:16 thebope joined #git
20:16 kexmex joined #git
20:17 svm_invictvs joined #git
20:17 btree left #git
20:18 TbobbyZ joined #git
20:18 TbobbyZ joined #git
20:22 steeze joined #git
20:22 TbobbyZ joined #git
20:25 TbobbyZ_ joined #git
20:28 pks joined #git
20:28 Acerific joined #git
20:28 TbobbyZ joined #git
20:29 Ryanar joined #git
20:29 Atm0spher1c joined #git
20:32 osk joined #git
20:35 zeroed joined #git
20:35 paul424 joined #git
20:36 eroux joined #git
20:39 cdg joined #git
20:41 h12o joined #git
20:41 SwiftMatt joined #git
20:43 duderonomy joined #git
20:45 TbobbyZ joined #git
20:45 drodger joined #git
20:53 tymczenko joined #git
20:54 TbobbyZ joined #git
20:54 Cabanossi joined #git
20:56 porfiriopaiz joined #git
21:00 porfiriopaiz joined #git
21:03 raijin joined #git
21:03 angular_mike_ is it possible to configure git repository to use a custom diff algorithm for specific types of files?
21:04 angular_mike_ e.g. for diffing image or audio files
21:06 SamSagaZ joined #git
21:06 SamSagaZ guys, is OK to store my cloned projects in a dir like python/miappname/miappname? i ask this because before clone the repo i create the dir with the reponame and when clone it add another directory with the same name or exist another way to clone it inside /python/myappname?
21:06 SamSagaZ (sorry for my english)
21:06 j416 don't nest repos
21:07 j416 angular_mike_: yes. Check man gitattributes search for "diff driver"
21:07 gitinfo angular_mike_: the gitattributes manpage is available at http://jk.gs/gitattributes.html
21:08 j416 SamSagaZ: you can just remove the directory and clone it properly from /python/ perhaps
21:08 SamSagaZ j416, yes you right, thanks
21:08 angular_mike_ ah, diffdriver
21:09 j416 SamSagaZ: you can give a path name as an argument to git-clone, but I'm not sure it makes any sense in this case.
21:09 SamSagaZ no, is OK, i understand
21:10 thebope joined #git
21:11 h12o joined #git
21:13 peacememories joined #git
21:15 jost__ joined #git
21:17 maroloccio joined #git
21:17 JJtG joined #git
21:20 JJtG Hi guys, quick question. How do I overwrite every local file that git is tracking and delete all changes. Essentially a completely clean wipe that doesnt have me going through all folders and deleting files manually
21:20 JJtG People online say git reset --hard but this doesnt actually overwrite anything, and doesnt get rid of changes either
21:22 a_thakur joined #git
21:23 dreiss joined #git
21:24 dirtyroshi joined #git
21:26 matoro joined #git
21:29 rewt JJtG, git reset --hard resets the files in your working tree (checked out versions) to match the commit you're resetting to... then have a look at man git clean to remove files not in the repo
21:29 gitinfo JJtG: the git-clean manpage is available at http://jk.gs/git-clean.html
21:31 amdi_ joined #git
21:32 h12o joined #git
21:32 JJtG rewt, does "git reset --hard" actually overwrite local files. Because the operation takes like 5sec. I would expect it to take about an hour
21:33 rewt yes it does; use "git status" to check the status
21:33 rewt how big is this repo that you'd expect it to take an hour?
21:33 JJtG UE4
21:34 rewt i'm not familiar with that measurement
21:34 JJtG atleast 15min
21:34 rewt 15 minute bytes?
21:35 drodger joined #git
21:36 JJtG No idea where I can actually see project size on github
21:36 JJtG https://github.com/EpicGames/UnrealEngine
21:37 rewt i get 404 for that
21:37 JJtG really. I didnt remember that being private
21:38 rewt git count-objects -vH
21:38 JJtG I just ran git clean -fd I dont think that would actually give the whole thing
21:39 JJtG Its probably around 3gb of code
21:40 Cabanossi joined #git
21:40 JJtG that command says 1.96gb
21:40 robotroll joined #git
21:40 raijin joined #git
21:41 JJtG but yeah, im a bit skeptical of the git reset --hard completing in about 5sec on a project that big.
21:41 rewt what does "git status" say?
21:41 rewt keep in mind that you have the whole repo on your local drive; it doesn't re-download anything
21:42 JJtG It says its up to date and clean. But this can not be correct. Because it works on my work computer. But on my home computer I get compilation errors
21:42 rewt do you have access to both right now?
21:43 JJtG no
21:43 cyberz joined #git
21:43 JJtG and before I ran the git clean command git was telling me there were hundreds of changed files, which is simply not true. No changes have been made to those files on the branch
21:44 JJtG so now its clean, but it still doesnt work. Which, granted, is weird. But thats the reason why I just wanted to nuke absolutely everything and actually redownload everything
21:46 JJtG It might actually be that i accidentaly had a wrong startup project set in VS and that one compile screwed things up
21:47 wcpan joined #git
21:47 aidalgol joined #git
21:49 sunrunner20 joined #git
21:51 BackEndCoder joined #git
21:54 Aleric left #git
21:56 catch22 joined #git
21:56 Cork joined #git
22:00 svm_invictvs joined #git
22:01 h12o joined #git
22:02 maroloccio joined #git
22:04 sunrunner20 joined #git
22:04 thebope joined #git
22:04 davimore joined #git
22:07 learning joined #git
22:07 telephone joined #git
22:07 telephone joined #git
22:07 raijin joined #git
22:15 durham joined #git
22:17 sunrunner20 joined #git
22:21 h12o joined #git
22:22 mda1 joined #git
22:22 dave0x6d joined #git
22:23 Masber joined #git
22:23 peacememories joined #git
22:25 Cabanossi joined #git
22:31 cyberz joined #git
22:33 sunrunner20 joined #git
22:34 hhee joined #git
22:35 zeroed joined #git
22:35 zeroed joined #git
22:37 maroloccio joined #git
22:38 perrier-jouet joined #git
22:38 BadApe joined #git
22:40 eikhorst joined #git
22:41 malt3 joined #git
22:41 h12o joined #git
22:42 prg3 joined #git
22:47 sunrunner20 joined #git
22:48 boubou joined #git
22:53 mda1 joined #git
22:54 sunrunner20 joined #git
22:54 Cabanossi joined #git
22:55 BadApe i've been careless and made commits with the wrong email, can i edit the commit author?
22:55 durham joined #git
22:55 pks joined #git
22:55 grawity `git filter-branch`, but see !rewrite
22:55 gitinfo Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
22:55 grawity also keep in mind to update both the 'author' and 'committer' emails
22:56 BadApe i wonder if i care :D
22:57 grawity then why did you come here asking how to update it in the first place
22:58 thebope joined #git
22:58 durham joined #git
23:00 joshszep joined #git
23:00 matoro joined #git
23:00 BadApe i was reading the bit about the impact to others
23:01 saul joined #git
23:02 h12o joined #git
23:03 baryon joined #git
23:05 dreiss joined #git
23:07 Achylles joined #git
23:08 prg3 joined #git
23:08 aapaaal joined #git
23:10 cyberz joined #git
23:10 BackEndCoder joined #git
23:11 sunrunner20 joined #git
23:11 telephone joined #git
23:11 telephone joined #git
23:12 learning joined #git
23:15 likewhoa joined #git
23:17 sunrunner20 joined #git
23:19 snowkidind joined #git
23:20 boombatower joined #git
23:21 h12o joined #git
23:22 a_thakur joined #git
23:23 tmg joined #git
23:27 ljc joined #git
23:28 sunrunner20 joined #git
23:36 courrier joined #git
23:38 orbyt_ joined #git
23:39 aaron joined #git
23:40 chu joined #git
23:41 sunrunner20 joined #git
23:42 midnightmagic joined #git
23:43 baryon left #git
23:43 ravel[m] joined #git
23:44 robattila256 joined #git
23:44 porfiriopaiz joined #git
23:45 raijin joined #git
23:46 BenderRodriguez joined #git
23:48 sunrunner20 joined #git
23:48 CEnnis91 joined #git
23:51 aidalgol joined #git
23:51 ravel[m] left #git
23:52 jameser joined #git
23:52 thebope joined #git
23:56 roby10 joined #git

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