Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-18

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

All times shown according to UTC.

Time Nick Message
00:02 anuxivm left #git
00:03 gopar joined #git
00:05 snowkidind joined #git
00:09 gopar joined #git
00:13 pietv joined #git
00:15 gopar joined #git
00:17 gopar joined #git
00:19 dsdeiz joined #git
00:19 shuffle2 left #git
00:22 gopar joined #git
00:26 theiostream joined #git
00:28 fstd joined #git
00:30 NeXTSUN joined #git
00:31 livingstn joined #git
00:33 austin987 joined #git
00:34 HoierM joined #git
00:34 kfoonamalik joined #git
00:35 duderonomy joined #git
00:36 Cabanossi joined #git
00:39 jast joined #git
00:40 dreiss joined #git
00:41 TbobbyZ joined #git
00:48 juvenal joined #git
00:51 cqi joined #git
00:52 Lyqyd joined #git
00:52 HoierM_ joined #git
00:52 safe joined #git
00:54 peacememories joined #git
00:56 dirtyroshi_ joined #git
01:00 fstd_ joined #git
01:01 fakenerd joined #git
01:01 Pseudocrat joined #git
01:06 Cabanossi joined #git
01:09 nexemacs joined #git
01:09 fstd joined #git
01:14 hyperair joined #git
01:14 fstd joined #git
01:15 watabou joined #git
01:17 lavalamp joined #git
01:18 tmcmahon joined #git
01:18 diget joined #git
01:19 finalbeta joined #git
01:23 Darren_ joined #git
01:25 basdb joined #git
01:25 peterbec` joined #git
01:26 courrier joined #git
01:26 hitman1 joined #git
01:27 hitman1 How to know if I have made some changes in a file after making my last commit?
01:28 hitman1 I want to know if the file is changed or it is same I have made no changes since my last commit ?
01:28 livingstn joined #git
01:28 peacememories joined #git
01:29 TbobbyZ joined #git
01:34 juvenal joined #git
01:34 fstd joined #git
01:35 kadoban hitman1: git status, or you can check only one specific file with something like 'git diff HEAD -- the_file' probably
01:35 TheSimonator joined #git
01:36 fstd joined #git
01:38 ShapeShifter499 joined #git
01:39 bitmod joined #git
01:40 cyphase joined #git
01:41 TheSimonator joined #git
01:41 durham_ joined #git
01:42 re1 joined #git
01:46 TbobbyZ joined #git
01:48 ilbot3 joined #git
01:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | 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 svm_invictvs joined #git
01:50 NeXTSUN joined #git
01:51 re1_ joined #git
01:51 Tobbi joined #git
01:52 peacememories joined #git
01:53 jorj joined #git
01:53 juvenal joined #git
01:56 theiostream joined #git
01:59 Rodya_ joined #git
02:01 sunri5e joined #git
02:07 durham joined #git
02:09 Vivekananda joined #git
02:12 pwnz0r joined #git
02:14 thiago joined #git
02:17 nexemacs joined #git
02:17 jameser joined #git
02:18 austin987 joined #git
02:19 dsdeiz joined #git
02:19 rchavik joined #git
02:25 Rodya_ joined #git
02:25 juvenal joined #git
02:26 ojdo joined #git
02:26 PioneerAxon joined #git
02:26 TbobbyZ joined #git
02:27 DarkPsydeLord joined #git
02:27 watabou joined #git
02:28 qqx joined #git
02:28 idlemind joined #git
02:29 stealthii joined #git
02:30 inflames joined #git
02:31 bgerber joined #git
02:32 timthowtdi joined #git
02:32 r3c0d3x joined #git
02:32 batrick joined #git
02:33 dwmw2_gone joined #git
02:35 peacememories joined #git
02:35 GGMethos joined #git
02:38 ensign joined #git
02:40 nsh joined #git
02:41 jascot[m] joined #git
02:41 Elliott[m]1 joined #git
02:41 patrickr[m] joined #git
02:41 ajeremias joined #git
02:45 dermoth_ joined #git
02:45 rasto joined #git
02:45 watabou joined #git
02:52 Vortex34 joined #git
02:56 lagothrix joined #git
02:57 gregor2 joined #git
02:57 nwmcsween joined #git
02:58 Goplat joined #git
02:59 raijin joined #git
03:00 juvenal joined #git
03:00 chachasmooth joined #git
03:00 ayogi joined #git
03:02 hexagoxel joined #git
03:02 aavrug joined #git
03:03 aavrug joined #git
03:06 Cabanossi joined #git
03:07 pietv joined #git
03:22 peacememories joined #git
03:22 aidalgol joined #git
03:25 davidpitkin joined #git
03:26 Rodya_ joined #git
03:27 peterbec` joined #git
03:33 TbobbyZ joined #git
03:33 mizu_no_oto joined #git
03:36 cqi joined #git
03:36 Fissure joined #git
03:39 Anthaas joined #git
03:41 TbobbyZ joined #git
03:42 jameser_ joined #git
03:42 fakenerd joined #git
03:47 Atm0spher1c joined #git
03:50 Cabanossi joined #git
03:52 jost_ joined #git
03:56 a3Dman joined #git
03:56 parantapVikram joined #git
04:07 rscata joined #git
04:09 donught joined #git
04:10 ReenignE joined #git
04:10 ReenignE joined #git
04:10 fakenerd joined #git
04:10 donught joined #git
04:11 inflames joined #git
04:14 fakenerd_ joined #git
04:23 pietv joined #git
04:27 zeromus joined #git
04:28 Rodya_ joined #git
04:28 peterbec` joined #git
04:29 zeromus does anyone know how to export a single commit as a patch from tortoisegit?
04:31 kadoban Whatever corresponds to 'git show' I guess
04:31 kadoban I don't know that tool in particular.
04:31 dsdeiz joined #git
04:32 zeromus of course, immediately after asking, i discovered "show changes as unified diff" from which i can save a diff file. kind of a pointless extra step, but i can live with it
04:32 kadoban Hehe
04:33 polyzen huzzah
04:36 yogesh_ joined #git
04:37 kbeflo joined #git
04:38 ayogi joined #git
04:40 raijin joined #git
04:46 peterbecich joined #git
04:49 Mutter joined #git
04:50 MineCoins joined #git
04:58 overlord_tm joined #git
04:59 ma5ter joined #git
04:59 MineCoins joined #git
05:00 bronson joined #git
05:05 kbeflo joined #git
05:06 Mutter joined #git
05:07 diogenese joined #git
05:07 durham joined #git
05:09 bongo joined #git
05:09 freimatz joined #git
05:11 Tuor joined #git
05:15 darkbit joined #git
05:17 Introoter joined #git
05:19 Bock joined #git
05:20 Cabanossi joined #git
05:20 drodger joined #git
05:22 incredible-- joined #git
05:24 TbobbyZ joined #git
05:27 Noodlewitt joined #git
05:28 Noodlewitt joined #git
05:28 TbobbyZ joined #git
05:28 Rodya_ joined #git
05:28 shgysk8zer0 joined #git
05:30 khushi joined #git
05:31 PioneerAxon joined #git
05:32 khushi joined #git
05:37 nexemacs joined #git
05:41 sbulage joined #git
05:43 zefferno joined #git
05:45 Raging_Hog joined #git
05:46 qt-x joined #git
05:48 marianina8 joined #git
05:50 zerow joined #git
05:51 marianina8 joined #git
05:51 ThomasLocke joined #git
05:52 chele joined #git
05:56 Motoko joined #git
05:58 rasto joined #git
05:58 TbobbyZ joined #git
06:00 _ng joined #git
06:06 TbobbyZ joined #git
06:06 om_henners joined #git
06:08 shgysk8zer0 joined #git
06:08 acetakwas joined #git
06:09 visual hey peeps
06:09 fakenerd joined #git
06:10 bgerber joined #git
06:10 visual question [in a dwight schrute voice]: when creating and switching to the new branch, is it normal for the new branch to have all the history/commits from the master branch (the branch you created it from)
06:10 visual ?
06:10 i7c Yes.
06:10 visual Hot. Thanks i7c!
06:10 i7c When you make a commit, that commit will be only in the new branch then. But up until that point, they are equal.
06:11 visual makes sense!
06:14 octo8 joined #git
06:14 octo8 Hello, it looks like #Node.js requires an invitation, can you invite me? thanks.
06:15 nickel_dime_look joined #git
06:15 octo8 nevermind, added, thanks.
06:17 freimatz3 joined #git
06:17 fakenerd joined #git
06:18 freimatz_ joined #git
06:20 StephenS left #git
06:20 circ-user-8bIZ6 left #git
06:20 drodger joined #git
06:22 imack joined #git
06:22 rokups joined #git
06:23 jagob joined #git
06:24 bronson joined #git
06:28 Sasazuka joined #git
06:28 zeroed joined #git
06:29 Rodya_ joined #git
06:30 peterbec` joined #git
06:31 Muzer joined #git
06:31 ronskisika joined #git
06:31 ronskisika joined #git
06:36 bronson joined #git
06:37 schleppel joined #git
06:37 JeroenT joined #git
06:38 nevodka joined #git
06:39 imack joined #git
06:40 idlemind joined #git
06:41 pks joined #git
06:42 TbobbyZ joined #git
06:45 netj joined #git
06:45 MineCoins joined #git
06:48 metachr0n joined #git
06:48 rasto joined #git
06:49 henriknj joined #git
06:52 r0ry joined #git
06:56 incredible joined #git
06:56 idlemind joined #git
06:56 a3Dman joined #git
06:57 pietv joined #git
06:57 todd_dsm joined #git
06:58 watabou joined #git
06:59 fstd joined #git
07:01 pks joined #git
07:05 vmiklos joined #git
07:05 Cabanossi joined #git
07:05 D4R5C0D3 joined #git
07:06 pks_ joined #git
07:06 fbwnd joined #git
07:08 doener joined #git
07:10 jast Eugene: the registrar isn't letting me pay, actually... the domain is stuck in a zombie state in their DB
07:12 brk_ joined #git
07:14 _ikke_ jast: :-(
07:14 aw1 joined #git
07:14 _ikke_ so funny when they don't want to accept money
07:14 fakenerd_ joined #git
07:15 bodkan joined #git
07:15 _ikke_ Domain Status: pendingDelete
07:15 _ikke_ Domain Status: serverHold
07:16 ZyX-I joined #git
07:16 _ikke_ So hope you can get it back before someone else registers it :-/
07:16 _ikke_ https://www.icann.org/resources/pages/epp-status-codes-2014-06-16-en
07:17 cdown joined #git
07:17 jast the redemption period lasts for another 27 days
07:17 jast in the meantime I've moved everything #git-related to a new domain as you may have seen
07:18 _ikke_ Not yet
07:18 _ikke_ but now have
07:19 rchavik joined #git
07:22 dvaske joined #git
07:23 emPi Anyone here rocking a private GitHub repository?
07:23 nevodka yes
07:23 i7c no
07:23 jast I have access to one
07:23 i7c Dat question.
07:24 i7c (is none)
07:24 emPi I'm curious if I pay the subscription, make a private repo, and a few months later I stop paying the subscription, what happens with the repository?
07:24 emPi there's a question for you
07:24 jast you'd probably best ask their support about it
07:24 emPi :D
07:24 nevodka it goes public and you die
07:24 jast !weasels
07:24 gitinfo The consequences of this proposal are not well-defined. A band of furious weasels may infest your undergarments, or it might work just fine. You should !backup then !tryit and let us know what happens.
07:24 nevodka https://help.github.com/articles/unlocking-a-locked-personal-account/
07:25 nevodka they lock it
07:25 nevodka and eventually delete it
07:25 emPi I see, thanks nevodka
07:26 SwiftMatt joined #git
07:28 parasite_ joined #git
07:29 overlord_tm joined #git
07:30 Rodya_ joined #git
07:30 djb-irc joined #git
07:32 peterbec` joined #git
07:32 scarabx joined #git
07:34 Chuguniy joined #git
07:35 chardan joined #git
07:37 p4trix joined #git
07:39 pks_ joined #git
07:40 andrew710 joined #git
07:42 Kaisyu joined #git
07:43 pbandark joined #git
07:43 nexemacs joined #git
07:44 aw1 joined #git
07:49 Cabanossi joined #git
07:57 yqt joined #git
08:00 bl0w3d_0ut joined #git
08:01 svm_invictvs joined #git
08:01 JeroenT joined #git
08:01 oskarkv joined #git
08:01 mikecmpbll joined #git
08:04 marcogmonteiro joined #git
08:06 p4trix joined #git
08:07 Paraxial joined #git
08:08 qt-x joined #git
08:08 rominronin joined #git
08:09 tarkus joined #git
08:10 tarkus Hi. Is there a difference between "git pull remote master" and "git fetch remote; get merge remote/master'?
08:10 Murii joined #git
08:10 immae tarkus: for default config it's the same
08:11 tarkus where "remote" is an upstream repo, not the origin one
08:11 tarkus e.g. when an "upstream" repo contains project boilerplate, and I regularly pull and merge updates from the boilerplate back into my real project
08:12 Murii joined #git
08:13 fakenerd joined #git
08:13 _ikke_ tarkus: git pull is just a helper to do git fetch and git merge, so the end result is exactly the same (there used to be a difference when you did exactly git pull origin master (with 2 arguments), because it would not update remote tracking branches, but that has been changed somewhere along 2.0).
08:13 _ikke_ 2.x rather
08:14 tarkus thanks
08:14 nexemacs joined #git
08:15 vrach joined #git
08:15 systemovich joined #git
08:17 davimore joined #git
08:17 zeromus left #git
08:19 selckin joined #git
08:19 pietv joined #git
08:22 vmiklos joined #git
08:22 canoon joined #git
08:25 tohuw joined #git
08:27 tohuw I've a lighthearted question: what do you typically put as your commit message when simply committing the change in state of a submodule? In the submodule itself, I write a detailed message of what changed, but all too often in the parent repo, I find myself simply stating "Updated foo", where foo is the submodule name.
08:28 kurkale6ka joined #git
08:28 kadoban The version I updated to, and why.
08:28 tvw joined #git
08:29 Croab joined #git
08:30 Rodya_ joined #git
08:31 zeroed joined #git
08:31 zeroed joined #git
08:31 fbwnd joined #git
08:32 clmsy joined #git
08:32 Eddi|nichZuHause joined #git
08:33 peterbec` joined #git
08:35 Croab left #git
08:36 King_Hual joined #git
08:36 King_Hual joined #git
08:36 thepoof joined #git
08:38 bodkan joined #git
08:38 mikecmpbll joined #git
08:38 Eddi|nichZuHause hi, i'm pretty unexperienced at git, but i have this thing where i wanted to have some "advanced usage"... so i have this local change, which i'm pretty sure i'm never wanting to push, but i want to keep it applied locally on top of the "master" branch. so whenever i want to commit to "master", i need to undo this change, apply the new commit, and then put the change back. or keep it unstaged
08:38 Eddi|nichZuHause forever, which is unwieldy. i looked at "git stash" but it doesn't look like it's what i want. any suggestions?
08:39 ispn joined #git
08:40 bronson joined #git
08:40 jast Eddi|nichZuHause: 'git rebase' does precisely what you want. might I suggest doing it on a separate branch, though, to avoid accidents? you can then rebase that branch against master after updating master
08:41 cyphase joined #git
08:41 Eddi|nichZuHause jast: the thing is, i want to avoid doing that every time i want to commit, but it should do this somehow automatically
08:41 jast there are also dedicated patch queueing tools for git but I don't have any experience with them and don't know how automatic they are
08:42 jast !topgit
08:42 jast huh, I thought we had something for that
08:42 jast https://github.com/greenrd/topgit
08:43 seni joined #git
08:43 zerow joined #git
08:43 Eddi|nichZuHause just reading that
08:43 tohuw kadoban: what if the submodule doesn't particularly have versions? Sure, I could be diligent enough to mention the commit ID or so, but then again, that's clearly logged. Some submodules I use are very transient and have few or no tags. Example: I'm building a Jekyll site and, for various reasons, have the drafts folder as a submodule. When I change drafts, I note the draft changed and some salient note, but in the main project, it's usually just "updated
08:43 tohuw drafts"
08:44 jast tohuw: the most important information to me is what impact the update has on the main repo
08:44 Murii joined #git
08:45 jast for your Jekyll case it's probably not nearly as useful as in the typical case where there are code dependencies and such
08:47 tohuw yes, if the submodule actually had some substantial impact on the rest of the site, like if it were a plugin that changed the site build behavior, I could see being more thorough, like "updated some_plugin to v2 to support more cowbell" and such. All this is good feedback and levels my perspective. Thanks!
08:48 mikecmpbll joined #git
08:48 jast my gold standard for what to include in a commit message: if I don't put it in, will I regret it in a few months when I have to understand what happened in that part of the history?
08:49 notebox joined #git
08:50 Cabanossi joined #git
08:50 marcogmonteiro joined #git
08:50 jast my commit messages are often longer than my diffs, but in this case it would probably be overkill
08:51 tkore joined #git
08:51 tkore joined #git
08:53 monq joined #git
08:57 MACscr joined #git
08:57 fakenerd joined #git
08:59 redeemed joined #git
09:00 watabou joined #git
09:00 Eddi|nichZuHause oh, something else i wanted to do recently: i was following this guide: http://www-cs-students.stanford.edu/~blynn/gitmagic/ch06.html#_git_over_anything but i could not make the second command (git pull somefile) work. is there anything i'm missing?
09:01 xall joined #git
09:02 manuelschneid3r joined #git
09:02 Tobbi joined #git
09:05 Snugglebash joined #git
09:09 Vampire0 Eddi|nichZuHause, !repro
09:09 gitinfo Eddi|nichZuHause: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
09:09 daynaskully joined #git
09:10 usm4n joined #git
09:10 Murr joined #git
09:11 rasto joined #git
09:14 nick123__ joined #git
09:15 m0viefreak joined #git
09:16 jstimm joined #git
09:20 xall_ joined #git
09:21 pocho joined #git
09:21 pocho left #git
09:23 mda1 joined #git
09:27 afuentes joined #git
09:27 Mysterious_Light joined #git
09:27 jozwior joined #git
09:28 PioneerAxon_ joined #git
09:28 rorro joined #git
09:31 Rodya_ joined #git
09:34 peterbec` joined #git
09:34 serdar joined #git
09:34 serdar good morning
09:34 Cabanossi joined #git
09:35 serdar I have a git running on one server and want to migrate it to another, what is the best way to do it all at once? or do I need to migrate repository by repository?
09:36 _ikke_ serdar: not sure how you are 'hosting' these repositories, but the repositories can be just copied to the new server in one go
09:36 skunkz joined #git
09:36 Mysterious_Light joined #git
09:37 serdar _ikke_, you mean backup of directory and copy it over?
09:37 _ikke_ yeah
09:37 serdar I am using bitbucket, will use it again, but don't want to migrate one by one
09:37 serdar _ikke_, okay thank you very much
09:38 _ikke_ You can best ask bitbucket how to migrate those
09:39 serdar I wil lcheck this, thanks
09:40 bruce_lee joined #git
09:40 bruce_lee joined #git
09:41 eightg joined #git
09:42 kiltzman joined #git
09:43 kiltzman joined #git
09:44 kiltzman joined #git
09:45 acetakwas joined #git
09:47 kiltzman joined #git
09:48 CrummyGummy joined #git
09:48 kiltzman joined #git
09:49 kiltzman joined #git
09:50 Murr joined #git
09:51 MineCoins joined #git
09:52 cqi joined #git
09:53 mda1 joined #git
09:54 YuGiOhJCJ joined #git
09:59 incredible_ joined #git
10:03 fakenerd_ joined #git
10:05 Cabanossi joined #git
10:07 fakenerd joined #git
10:08 Nilesh_ joined #git
10:09 gunnaro joined #git
10:09 zerow joined #git
10:09 chll_ joined #git
10:11 systemovich joined #git
10:12 Tobbi joined #git
10:13 govg joined #git
10:15 freimatz joined #git
10:16 seni joined #git
10:16 Acerific joined #git
10:16 Acerific joined #git
10:19 lb1c joined #git
10:22 mschorm joined #git
10:23 mda1 joined #git
10:25 zeroed joined #git
10:26 mschorm Hello
10:26 gitinfo mschorm: 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:28 mschorm I created new repository on GitHub and I want to completely copy another repo inside, which I got clonned locally now.
10:28 marcogmonteiro joined #git
10:28 cdown joined #git
10:28 cbreak push
10:28 _ikke_ add remote, push
10:29 cbreak you should instead fork it in the UI if you can though
10:29 cbreak that'll use less space, and will preserve ancestry
10:29 g0d355__ joined #git
10:31 mschorm "git remote add origin https://github.com/......"     fatal: remote origin already exists.
10:31 Introoter joined #git
10:32 mschorm Please note, that the repo I want to paste on GitHub does not reside on GitHub originally. I clonned it to my PC and I'd like to upload it to the created GitHub repo now.
10:32 _ikke_ Either use a different name, or use set-url to update an exsting one
10:32 Rodya_ joined #git
10:33 reki joined #git
10:36 mschorm I got it :)    Used "git remote remove origin", "git remote add origin ...", "git push"
10:37 _ikke_ git remote set-url origin .. was shorter
10:37 sunri5e joined #git
10:39 mschorm I was looking for "git set-url", which wasn't there, so I looked around before next question :)
10:39 JeroenT joined #git
10:41 netj joined #git
10:43 CrummyGummy Hi! I have an issue pushing commits between repositories.
10:43 CrummyGummy I run the following "git push --verbose" and get a few "fatal" errors. It then succeeds. I don't understand what's going on. Please take a look at the details here. https://paste.ee/p/XBDcj
10:43 rekicc joined #git
10:45 mikecmpb_ joined #git
10:47 grayjoc joined #git
10:47 _ikke_ CrummyGummy: It's the remote that is givig the errors
10:47 gregor2 joined #git
10:47 _ikke_ CrummyGummy: The remote repository is using a hook that pushes again when you push
10:48 borkr joined #git
10:48 _ikke_ CrummyGummy: it tries to push to a remote called zabbix, apparently is not configured
10:48 _ikke_ sorry, zabbix1
10:49 _ikke_ CrummyGummy: note how those lines are prefixed with "remote:", which means it's output from the remote server, not from your local pc
10:50 Cabanossi joined #git
10:52 freimatz joined #git
10:52 gareppa joined #git
10:55 CrummyGummy _ikke_: Yes, that's by design. I get the same output when I run the command from the remote. Apologies if I didn't explain better.
10:56 CrummyGummy the config mentioned in my link was from my default upstream server.
10:59 Acerific joined #git
11:00 fakenerd_ joined #git
11:01 waveclaw joined #git
11:01 watabou joined #git
11:02 no_gravity joined #git
11:02 no_gravity How do I merge a single commit?
11:02 fakener__ joined #git
11:06 cbreak no_gravity: git merge thatcommit
11:07 no_gravity I tried "git cherry-pick ..." and now git status tells me You are currently cherry-picking commit ..."
11:07 no_gravity Do I have to undo that somehow?
11:07 cbreak cherry-pick does not merge commits
11:08 cbreak it copies the effect of a commit into a new one
11:08 no_gravity damn
11:08 cbreak if you had conflicts, resolve them, then git commit
11:08 no_gravity What does "you are currently cherry picking ... " mean?
11:08 no_gravity I had no conflicts.
11:08 cbreak or git cherry-pick --continue
11:08 cbreak there's also --abort
11:09 cbreak look at git status
11:09 no_gravity Ok, I did "git cherry-pick --abort"
11:10 no_gravity But it shows in my "git log".
11:10 no_gravity Did I fuck up my repo?
11:10 cbreak then the cherry-pick finished
11:10 cbreak and you copied that commit
11:10 no_gravity "git log master..origin/master" still shows that commit.
11:10 no_gravity Shouldn't it disappear?
11:10 cbreak no
11:11 visual hey, when merging a branch X into master, will master inherit all of branch X's commit history?
11:11 catphish joined #git
11:11 cbreak no_gravity: if you want to rewrite history, you can use git reset --hard ... or similar
11:11 cbreak that will allow you to kill commits
11:11 catphish did the format of git diff output for moved file change at some point?
11:11 cbreak don't do that without being sure you want it though
11:11 cbreak visual: yes
11:12 catphish "rename from" and "rename to"
11:12 cbreak visual: merging merges all history
11:12 no_gravity cbreak: I tried "git reset --hard ORIG_HEAD". It's still in my "git log".
11:13 visual cbreak: hot beans, and that's where squash comes in?
11:13 visual (gitlab's commit squash)
11:13 cbreak no_gravity: reset to what ever you want.
11:13 cbreak you can't just randomly reset to things and expect to keep your history intact though
11:13 cbreak you will have to think
11:14 cbreak visual: merge --squash
11:14 cbreak visual: that's not a real merge though
11:14 theoceaniscool joined #git
11:14 visual what do you mean?
11:14 cbreak it doesn't merge anything
11:14 visual you merge the branch into the master, how is it not a real branch?
11:14 cbreak it just copies the effects
11:14 visual what effets
11:14 jast CrummyGummy: apparently your hook is trying to push somewhere that is not detected as a Git repo, or authentication from your remote host to the zabbix1 remote host isn't working. looks like you're going to have to troubleshoot your authentication setup.
11:15 cbreak visual: of the branch
11:15 cbreak visual: git merge somebranch merges that branch
11:15 visual supposing you have File1 on branch X, you merge them with --squash, the merge *will* add file1 to mater (target branch), riught?
11:15 cbreak visual: git merge --squash somebranch does not merge that branch, it just creates a commit that contains its effects
11:15 visual *master
11:15 visual what's the difference :
11:15 cbreak the difference is that one merges
11:15 cbreak the other does not
11:15 visual yeah i dont think you understand what you're saying
11:16 visual if it copies the effect = it merges the branch
11:16 visual just doesnt add the commit history
11:16 cbreak I know very well what I am saying
11:17 cbreak visual: do you know cherry-pick?
11:17 visual no
11:17 cbreak squash merging is like cherry-picking everything in the branch, and then squashing those commits into one commit
11:17 cbreak there's no merging involved
11:17 courrier joined #git
11:18 visual what do you understand as "merging"?
11:18 scoobertron joined #git
11:18 visual a + b = ab - merging
11:18 cbreak creating a merge commit
11:18 CrummyGummy jast: Maybe I must just rebuild my remote repository from mirror.
11:18 visual than how is squashing not merging?
11:19 visual you said it yourself it cherypicks all the commits and adds them to the branch
11:19 visual the only difference is the lack of history
11:19 CrummyGummy Output is "Everything up-to-date" on subsequent pushes so it's really wierd
11:19 cbreak visual: history is what makes a merge
11:19 jast visual: and that's an important difference, isn't it?
11:19 cbreak visual: without history it's obviously not a merge
11:19 jast CrummyGummy: the push doesn't actually happen if no data is going to be transmitted
11:20 visual shit we've been arguing about the same position
11:20 cbreak no
11:20 visual well thanks for the info ))
11:20 jast visual: happens all the time :}
11:20 jast anyway, in Git land, merge means with history
11:20 visual got it got it, thx
11:20 cbreak git merge can do a bunch of things that aren't real merges
11:20 cbreak the most common one is fast-forward merging
11:21 jast it's slightly confusing because combining the changes from two files/trees is *also* called merge, which is a concept on a different level of abstraction
11:21 dsdeiz joined #git
11:21 cbreak but squash merging is a different one
11:21 jast and a merge often does that kind of merge, as does squashing, rebasing, cherry-picking and what not
11:21 Ryanar joined #git
11:23 ppang joined #git
11:23 jameser joined #git
11:24 JanC_ joined #git
11:24 al-damiri joined #git
11:25 d10n-work joined #git
11:26 brk_ joined #git
11:26 kiltzman joined #git
11:26 ppang why git considers file with same indent length ( 1 tab = 2 spaces ) to be different? git diff shows tab length to be around 8spaces per tab
11:27 ppang sample : https://paste.fedoraproject.org/paste/h3~CQyQh7xMBVRLYOgR1A15M1UNdIGYhyRLivL9gydE=
11:27 Eddi|nichZuHause joined #git
11:29 cbreak ppang: different content means the file is different.
11:29 Vampire0 ppang, what do you mean? For Git 1 tab is not equal to any amount of spaces, it is a clear difference. How wide a tab is displayed depends on your terminal
11:29 Sigma joined #git
11:30 cbreak if you don't want it to consider whitespace changes, use git diff -w
11:30 Vampire0 ppang, if you want diff to ignore whitespace differences when displaying the diff, use `-w` and maybe `--ignore-blank-lines`
11:30 cbreak --color-words is also fun
11:30 Vampire0 ppang, but this is only for the diff output, Git still considers those changes as changes correctly when using git status or git add
11:30 TinkerTyper joined #git
11:31 Cavallari joined #git
11:31 ppang cbreak, guess i have to revert that hunk
11:32 jast for future reference: http://editorconfig.org/
11:33 cbreak eeew, space indentataion
11:33 jleclanche joined #git
11:33 Rodya_ joined #git
11:33 jast personally I prefer tabs, too, but I don't really think it's a big deal
11:33 mindfart joined #git
11:35 mindfart joined #git
11:35 peterbec` joined #git
11:36 CrummyGummy _ikke_: jast : I recreated the remote repository --bare and it worked. Thanks for the info.
11:37 Vampire0 jast, tabs are bad, it always looks bunky if people have different tab size settings. If you use spaces for indentation the code looks like intended for everyone :-)
11:37 jast tabs for indentation, spaces for alignment
11:37 jast though IMO most alignment stuff people do is useless
11:38 scottjl joined #git
11:38 bodkan joined #git
11:39 jast for instance, I hate alignment to the opening paren/brace on the previous line a huge hassle, e.g. foo_bar({ on first line and stuff aligned to the { on the next line. rename your variable/function and you have to reformat the whole block.
11:40 jast but apparently in Python land this is The Right Thing(tm) in many places. style validators keep barfing complaints at me about this crap. ugh.
11:43 peacememories joined #git
11:43 siccegge joined #git
11:45 s17 i tell my editor to use 2-space tabs ;]
11:47 andrew710 joined #git
11:48 tlaxkit joined #git
11:48 jast soft tabs, you mean? problem is many editors don't treat fully equivalently to tabs, so some operations will still work on the individual spaces
11:48 jast and, of course, 2 spaces is just way too small unless you're stuck in callback hell (JavaScript)
11:50 Cabanossi joined #git
11:50 visual if one check out another branch without commiting the changes from the current branch, the changes are lost, right?
11:51 jast no
11:51 Guest13490 joined #git
11:51 jast !float
11:51 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
11:52 jast the changes are only lost if you apply additional force (git reset --hard, git checkout -- <files>, git checkout -f etc.)
11:52 visual makes sense, thanks
11:56 juvenal joined #git
11:58 zefferno joined #git
11:59 catphish left #git
12:01 synthroid joined #git
12:02 fide joined #git
12:04 Khisanth joined #git
12:04 dsdeiz joined #git
12:04 dsdeiz joined #git
12:05 alexandre9099 joined #git
12:08 pks joined #git
12:09 phase3 joined #git
12:12 Chuguniy joined #git
12:14 Tobbi joined #git
12:15 gugah joined #git
12:16 qpdb joined #git
12:16 Darcidride joined #git
12:16 imrg joined #git
12:16 sarri joined #git
12:16 sarri joined #git
12:19 pks joined #git
12:22 BlessJah how can I find all possible references with particular name? someone named tag after a hash, but I have two other "ambigous references" I'm unable to track
12:23 grawity git show-ref
12:26 Vgr joined #git
12:26 BlessJah ok, so two are abc -> abc tags
12:27 BlessJah but third is abc -> def, and it doesn't seem that abc commit exists
12:28 BlessJah the third shouldn't be ambigous
12:28 cbreak what does git rev-parse say?
12:28 robattila256 joined #git
12:28 Starky joined #git
12:29 portal_ joined #git
12:30 BlessJah it returns given string, but I know what mistake I've done
12:30 BlessJah git log --all --oneline returns short hash, I've been grepping for long
12:31 BlessJah I have abc->def, and independent abc commit
12:31 BlessJah thanks folks
12:32 drodger joined #git
12:33 BlessJah is there way to do opposite of refs/tags/abc?
12:33 BlessJah so I would reference commit?
12:33 jeffreylevesque joined #git
12:34 Rodya_ joined #git
12:34 grawity opposite in what sense? `git name-rev`?
12:34 BlessJah I can `git log refs/tags/abc`, how do I `git log objects/abc`?
12:35 grawity afaik, if `git log <abc>` is ambiguous it should always pick the object
12:36 Acerific joined #git
12:36 romancer joined #git
12:36 BlessJah it does pick object, that should do
12:36 BlessJah thanks
12:37 peterbec` joined #git
12:37 romancer Hi. I'm receiving "unable to index file dir/subdir" while doing "git commit -a". "stat dir/subdir" returns nothing unusual. Any cues?
12:38 romancer "git commit -a" --> "error: Unable to index file dir/subdir \n fatal: updating files failed"
12:39 cbreak ls -laR .git
12:39 marianina8 joined #git
12:40 dglambert joined #git
12:40 dglambert yo
12:41 marcogmonteiro joined #git
12:41 jozwior joined #git
12:42 romancer cbreak, nothing too peculiar, all files are owned by current user. What exactly shall I look for?
12:42 cbreak sometimes people pull as root or other sillyness
12:42 ankit01ojha joined #git
12:43 cbreak your repo is on a proper local filesystem?
12:43 romancer yes
12:43 jameser joined #git
12:43 cbreak sometimes users clone to smb or similar sillyness
12:45 romancer I'm trying to merge the branch that was pushed from OSX host, while running another *nix
12:45 gunnaro joined #git
12:45 romancer ..but it shouldn't really matter, right?
12:46 grawity run the git command under your "another *nix" equivalent of Linux `strace -f`
12:47 cbreak hmm. or GIT_TRACE
12:48 romancer hold on.. "error: dir/subdir appears as both a file and as a directory \n cannot drop to stage #0"
12:48 romancer wtf? :)
12:50 TheSimonator joined #git
12:53 TheToad joined #git
12:54 scoobert1on joined #git
12:55 davimore joined #git
12:58 bakibour joined #git
12:58 bakibour left #git
12:58 bourbaki joined #git
12:59 bourbaki Hidiho, is it possible to determine if a git repo (spefific branch) has been changed without cloning?
12:59 cdown joined #git
12:59 grawity git ls-remote
13:00 bourbaki thanks
13:00 zeroed joined #git
13:01 bannakaffalatta joined #git
13:03 watabou joined #git
13:05 MineCoins joined #git
13:05 Cabanossi joined #git
13:08 JeroenT joined #git
13:10 fakenerd joined #git
13:13 vkareh joined #git
13:13 bl0w3d_0ut joined #git
13:13 FilipNortic joined #git
13:14 bl0w3d_0ut joined #git
13:15 kpease joined #git
13:16 relipse joined #git
13:17 jameser joined #git
13:18 bitmod joined #git
13:21 ExoUNX joined #git
13:21 juvenal joined #git
13:22 Xenophon1 joined #git
13:22 publio joined #git
13:23 monq_ joined #git
13:24 fider joined #git
13:24 Rodya_ joined #git
13:25 finalbeta joined #git
13:27 Junior joined #git
13:27 rivarun joined #git
13:29 incredible_ left #git
13:29 incredible_ joined #git
13:32 gottcha joined #git
13:33 theoceaniscool joined #git
13:33 DarkPsydeLord joined #git
13:33 mda1 joined #git
13:33 fakenerd joined #git
13:35 snowkidind joined #git
13:36 grayjoc joined #git
13:38 peterbec` joined #git
13:38 drodger joined #git
13:39 JeroenT_ joined #git
13:41 monq__ joined #git
13:42 kurkale6ka joined #git
13:43 kurkale6ka joined #git
13:44 livingstn joined #git
13:44 theiostream joined #git
13:44 pks joined #git
13:46 canoon joined #git
13:47 kurkale6ka joined #git
13:48 theiostr_ joined #git
13:48 idlemind joined #git
13:50 nowhere_man joined #git
13:50 Cabanossi joined #git
13:50 lavalamp joined #git
13:54 Dougie187 joined #git
13:55 gunnaro joined #git
13:59 bronson joined #git
14:00 bannakaffalatta joined #git
14:01 MineCoins joined #git
14:02 theiostream joined #git
14:02 systemovich joined #git
14:03 Murii joined #git
14:07 thebope joined #git
14:08 ShapeShifter499 joined #git
14:09 AaronMT joined #git
14:09 ResidentBiscuit joined #git
14:10 mikecmpbll joined #git
14:11 pks joined #git
14:12 LeBlaaanc joined #git
14:12 PioneerAxon joined #git
14:13 crose joined #git
14:14 dvaske joined #git
14:14 babilen joined #git
14:15 Kaisyu joined #git
14:17 tsetair joined #git
14:18 bronson joined #git
14:20 theiostream joined #git
14:23 re1 joined #git
14:24 incredible joined #git
14:24 monq joined #git
14:25 Some_Person left #git
14:25 notebox joined #git
14:28 NeXTSUN joined #git
14:29 vuoto joined #git
14:30 guampa joined #git
14:31 bronson joined #git
14:33 acetakwas joined #git
14:34 Snugglebash joined #git
14:34 mikecmpb_ joined #git
14:34 moei joined #git
14:35 cdg joined #git
14:35 raijin joined #git
14:35 Guest82161 joined #git
14:36 incredible-- test
14:38 oleo joined #git
14:38 Acerific joined #git
14:39 davimore joined #git
14:39 peterbec` joined #git
14:40 luke_penn joined #git
14:42 raijin joined #git
14:43 boombatower joined #git
14:44 lewix joined #git
14:45 tyreld joined #git
14:45 jagob joined #git
14:47 Ryanar joined #git
14:47 joeco joined #git
14:50 kurkale6ka joined #git
14:52 freimatz_ joined #git
14:53 QuickGitQuestion joined #git
14:53 CheckDavid joined #git
14:54 bronson joined #git
14:54 mikecmpbll joined #git
14:54 marc_v92 joined #git
14:54 Snugglebash joined #git
14:56 kurkale6ka joined #git
14:56 TikityTik joined #git
14:56 fish3485 joined #git
14:57 peacememories joined #git
14:58 robotroll joined #git
14:58 robattila256 joined #git
14:58 bsanford joined #git
15:02 tsetair_ joined #git
15:03 nexemacs joined #git
15:03 lavalamp left #git
15:04 dvaske joined #git
15:04 Cabanossi joined #git
15:05 watabou joined #git
15:07 bodkan joined #git
15:07 drodger joined #git
15:07 earnestly joined #git
15:09 ResidentBiscuit joined #git
15:09 luke_penn joined #git
15:09 Darren_ joined #git
15:10 finalbeta joined #git
15:11 Rodya_ joined #git
15:12 perlpilot joined #git
15:12 Peetz1r joined #git
15:13 ertes joined #git
15:16 lowercaseman joined #git
15:16 fahadash joined #git
15:17 ivo_ joined #git
15:17 Endarked joined #git
15:18 _ivo_ joined #git
15:19 Noldorin joined #git
15:20 s1scha joined #git
15:22 ertes joined #git
15:23 unbalancedparen joined #git
15:24 guampa joined #git
15:26 matsaman joined #git
15:26 zeroed joined #git
15:28 durham joined #git
15:28 kadoban joined #git
15:30 gunnaro joined #git
15:30 bronson joined #git
15:32 dreiss joined #git
15:35 Cabanossi joined #git
15:36 Ryanar joined #git
15:36 YuGiOhJCJ joined #git
15:36 juvenal joined #git
15:36 kurkale6ka joined #git
15:37 eroux joined #git
15:37 imack joined #git
15:37 kurkale6ka joined #git
15:38 dvaske joined #git
15:38 kurkale6ka joined #git
15:38 synthroi_ joined #git
15:39 theoceaniscool joined #git
15:40 peterbec` joined #git
15:41 vuoto joined #git
15:44 cdg joined #git
15:45 aw1 joined #git
15:46 scarabx joined #git
15:48 madewokherd joined #git
15:49 sbulage joined #git
15:49 Taikibansei joined #git
15:51 PioneerAxon_ joined #git
15:51 pbrewczynski_ joined #git
15:52 IRQ` joined #git
15:56 madewokherd joined #git
15:56 kurkale6ka joined #git
15:56 kurkale6ka joined #git
15:58 shinnya joined #git
15:59 durham joined #git
15:59 kurkale6ka joined #git
16:01 mknod joined #git
16:02 faux___ joined #git
16:02 vuoto joined #git
16:02 thiago joined #git
16:02 kurkale6ka joined #git
16:02 madewokherd joined #git
16:03 kurkale6ka joined #git
16:03 qqx joined #git
16:03 kurkale6ka joined #git
16:04 nexemacs joined #git
16:06 govg joined #git
16:07 drodger joined #git
16:08 vuoto joined #git
16:08 vuoto joined #git
16:11 kurkale6ka joined #git
16:11 jrnieder joined #git
16:12 vuoto joined #git
16:14 cagmz joined #git
16:15 juvenal joined #git
16:15 hashtagstrashtag joined #git
16:16 h12o joined #git
16:16 gunnaro joined #git
16:16 monq joined #git
16:18 Aeterne joined #git
16:19 InfoTest joined #git
16:19 vuoto joined #git
16:20 fish3485__ joined #git
16:20 drodger joined #git
16:21 a3Dman joined #git
16:22 ambro718 joined #git
16:22 vuoto joined #git
16:24 fish3485 joined #git
16:24 faux___ joined #git
16:25 drodger joined #git
16:25 brent__ joined #git
16:29 marianina8 joined #git
16:29 marianina8 joined #git
16:30 IRQ` left #git
16:30 Gustavo6046 joined #git
16:30 svm_invictvs joined #git
16:31 nurey joined #git
16:31 nitric joined #git
16:31 raynold joined #git
16:32 serdar joined #git
16:33 flavius joined #git
16:34 Cabanossi joined #git
16:35 dave0x6d joined #git
16:36 vuoto joined #git
16:37 faux___ joined #git
16:38 re1_ joined #git
16:40 freimatz3 joined #git
16:41 peterbec` joined #git
16:42 bronson joined #git
16:42 TheSimonator joined #git
16:43 faux___ joined #git
16:46 TheSimonator joined #git
16:49 svm_invictvs joined #git
16:49 diogenese joined #git
16:49 tnecniv joined #git
16:55 MineCoins joined #git
16:56 mmlb joined #git
16:56 orbyt_ joined #git
16:58 overlord_tm joined #git
16:59 PioneerAxon joined #git
17:01 faux___ joined #git
17:02 faux___ joined #git
17:05 Fallen0223 joined #git
17:08 watabou joined #git
17:14 hahuang65 joined #git
17:15 foreal joined #git
17:16 hahuang65 joined #git
17:22 gopar joined #git
17:22 mentazoom joined #git
17:23 thiago joined #git
17:25 theiostream joined #git
17:25 PioneerAxon joined #git
17:27 tang^ man git push
17:27 gitinfo the git-push manpage is available at https://gitirc.eu/git-push.html
17:28 Murii joined #git
17:30 tvw joined #git
17:34 pitastrudl joined #git
17:36 fide joined #git
17:38 bronson joined #git
17:38 rorro joined #git
17:40 warthog9 joined #git
17:42 peterbec` joined #git
17:44 pitastrudl joined #git
17:48 nd joined #git
17:49 ter0 joined #git
17:50 marianina8 joined #git
17:50 incredible joined #git
17:52 mostlybadfly joined #git
17:53 ChrisEadle joined #git
17:54 paul424 joined #git
17:55 fider joined #git
17:56 re1 joined #git
17:56 ChrisEadle joined #git
17:57 serdar joined #git
18:00 gregor2 joined #git
18:01 Sasazuka joined #git
18:03 courrier joined #git
18:07 dreiss joined #git
18:08 watabou joined #git
18:09 rominronin joined #git
18:11 cdg_ joined #git
18:14 theiostream joined #git
18:17 govg joined #git
18:19 rastos2 joined #git
18:19 juvenal joined #git
18:19 doener joined #git
18:20 brandonw_ joined #git
18:25 EgS joined #git
18:28 maarhart joined #git
18:29 InfoTest joined #git
18:30 Snugglebash joined #git
18:32 notebox joined #git
18:34 bilal joined #git
18:37 tvw joined #git
18:41 TheSimonator joined #git
18:42 Domhack joined #git
18:43 imack joined #git
18:43 peterbec` joined #git
18:44 MrWoohoo joined #git
18:47 pitastrudl joined #git
18:47 theiostream joined #git
18:49 lewix joined #git
18:50 leeN joined #git
18:50 dreiss joined #git
18:52 Atm0spher1c joined #git
18:52 satifant joined #git
18:54 beuker joined #git
18:56 bakabakabaka left #git
19:02 tnecniv joined #git
19:04 rominronin joined #git
19:04 plasticle joined #git
19:04 drodger joined #git
19:05 theiostream joined #git
19:07 maarhart joined #git
19:08 salamanderrake joined #git
19:10 watabou joined #git
19:10 drodger joined #git
19:13 MineCoins joined #git
19:15 TbobbyZ joined #git
19:24 salamanderrake joined #git
19:25 courrier joined #git
19:26 anonymoose joined #git
19:26 imrg joined #git
19:28 hamdyaea joined #git
19:28 TheSimonator joined #git
19:28 plasticle joined #git
19:28 manuelschneid3r joined #git
19:30 Levin^ joined #git
19:30 Levin^ hi there
19:30 Levin^ is that a good idea to track your graphic files?
19:30 Levin^ photoshop, illustrator
19:30 hamdyaea left #git
19:31 ali1234 joined #git
19:31 _ikke_ because they are binary files, they are not easy to track
19:31 _ikke_ if they are large files, they can easily bloat your rep
19:31 _ikke_ repo
19:31 Levin^ having a git for storing version of those files sounds like a good idea, but I'm afraid it could store big storage space
19:31 Levin^ hm
19:33 kadoban Storing binary files can be okay, depending. If they don't change often (and especially don't change often in ways that need to be merged), and/or if they're not that big, it's fine.
19:33 kadoban But those tend to be pretty big "if"s
19:33 Levin^ I'd say many of us just leave several copies of the same project at a folder and we easily lose track of what we were developing after a certain time
19:33 Levin^ that's why I think git could do something about those files as well
19:34 imrg joined #git
19:34 salamanderrake joined #git
19:35 mda1 joined #git
19:35 _ikke_ right, but git cannot merge those files, so if two people to decide to change the same file at the same time, you have to find a way to consolidate those changes
19:35 Levin^ I concur
19:36 jeffreylevesque joined #git
19:37 ixpict joined #git
19:38 kadoban It's kind of possible typically, especially if they're files that can show recent changes (like an undo log), but it can be really tedious and error-prone.
19:38 kadoban And it's all manual of course.
19:39 _ikke_ And you would need to understand the file structure
19:39 _ikke_ which is often propriatary
19:40 bilal joined #git
19:41 Es0teric joined #git
19:45 peterbec` joined #git
19:45 duderonomy joined #git
19:46 kurkale6ka joined #git
19:46 kurkale6ka joined #git
19:50 Cabanossi joined #git
19:51 ayee joined #git
19:51 ayee Someone made a PR on github, deleted their remote branch/closed the PR.. but I can still see the diff. is there a way to checkout this PR on my local git?
19:52 _ikke_ !github_pr
19:52 _ikke_ !pr_githb
19:52 diogenese joined #git
19:52 _ikke_ !trigger
19:52 gitinfo [!triggers] Please don't spam me! I'm just a poor bot! Here's everything I know: https://gitirc.eu/bot/trigger.php -- that's a list of these nifty keywords like "!bot" that you can use in the channel, in case you were wondering.
19:53 Seveas ayee: git fetch refs/pull/<pull id>/head:refs/heads/branch_for_pr
19:54 ayee ➜  cloud-custodian git:(priority_email) git fetch capitalone pull/1080/head:priority_email fatal: Refusing to fetch into current branch refs/heads/priority_email of non-bare repository
19:55 qqx ayee, Seveas: The name of the remote (e.g. "origin") needs to be put after "fetch".
19:55 cdg joined #git
19:55 jstimm joined #git
19:56 qqx ayee: Change the part after the colon to something other than your checked out branch.
19:56 kurkale6ka joined #git
19:58 aw1 joined #git
19:59 aw1 joined #git
20:06 gopar joined #git
20:09 ayee qqx: thanks, that worked! I appreciate your help/time.
20:09 ayee Seveas: thanks too!
20:11 watabou joined #git
20:11 peterbecich joined #git
20:11 hahuang65 joined #git
20:13 dreiss joined #git
20:15 ertes joined #git
20:16 aw1 joined #git
20:16 synthroid joined #git
20:24 ayee If I deleted a file, and copied it to another place.. is there some ex post facto way to tell git I actually moved it?
20:25 qqx ayee: No need. Git doesn't record moves in any case. It will usually be able to detect that when displaying the history.
20:25 overlord_tm joined #git
20:25 mschorm joined #git
20:26 ayee https://github.com/capitalone/cloud-custodian/pull/1080/files .. somehow it knew I did this: tools/c7n_mailer/c7n_mailer/processor.py → ...ailer/c7n_mailer/sqs_message_processor.py
20:26 ayee meaning a move
20:26 mikecmpbll joined #git
20:26 ayee but it doesn't know I did this: tools/c7n_mailer/c7n_mailer/worker.py -> tools/c7n_mailer/c7n_mailer/sqs_queue_processor.py
20:26 ayee it thinks I deleted and made a new file
20:26 qqx ayee: Yes, but that's determined when displaying it isn't recorded.
20:26 grayhatter left #git
20:27 qqx The heuristic for detecting that doesn't always work.
20:27 ayee qqx: o, this is a github specific thing?
20:27 qqx No, git will do that itself. Not sure if github is just using that or if they have their own.
20:27 qqx Although I suspect they're just using the standard git heuristic.
20:28 ayee qqx: my goal is I don't want it to show I deleted and entire file, and made an entire new file. I only want it to show the changes I made + the move.
20:28 ayee is this acheivable?
20:28 kadoban They probably have their own I think. On the command line it's fairly configurable the heuristics it uses for what's a move and what's nt.
20:28 ayee I did 'git mv foo bar', I'm not sure why it doesn't show as a move
20:28 qqx ayee: The only way would be to adjust what changes you make at the same time as the move.
20:28 kadoban ayee: Probably not, on github. I guess if you change history to make them separate commits I guess.
20:29 kadoban ayee: Because git doesn't record moves specially.
20:29 kadoban That's just a convenience command
20:29 ayee I see. that's too bad
20:29 ayee o well, it will be slightly more annoying to code review
20:29 jast git detects renames on the fly based on file similarity
20:30 ayee corner cases on code diff/reviewing
20:30 jast if you want it to detect renames more easily, don't rename and edit at the same time
20:30 tnecniv joined #git
20:30 ayee So if I had the rename in a separate commit, then the edit in another commit.. that would work?
20:30 jast you can also tweak the thresholds for detection on several commands
20:30 jast yes, typically
20:30 preyalone joined #git
20:31 ayee I'll just redo it that way then.
20:31 ayee what's the harm in an extra commit
20:31 ayee I usually like squashing to one, but this seems better
20:32 askb joined #git
20:33 Levin^ joined #git
20:37 mentor joined #git
20:39 cahoots joined #git
20:39 cahoots hi, when i try to push to my git repo, i get a mysterious error "Not found" and then it fails
20:39 ayee https://github.com/capitalone/cloud-custodian/pull/1080/commits hmm, I did two commits. the first just renamed the files. the second edited the files
20:40 ayee but my github view is still broken. :(
20:40 ayee I guess github really wants to view the file as a full delete, and then a full new file. :/
20:41 ayee The odd thing is, it works on one file rename, but not the other
20:41 ayee and I don't understand the conditions of why one works and not the other
20:41 ayee https://github.com/capitalone/cloud-custodian/pull/1080/commits/190bb39f07609c9a45020a99daa49e1d3152b9a0
20:41 ayee You can see I rename both of those files the same in my first commit
20:43 mentazoom joined #git
20:45 bilal joined #git
20:46 peterbec` joined #git
20:46 chrisgeorge joined #git
20:47 fatalhalt joined #git
20:48 Levin^ thanks guys
20:48 Levin^ left #git
20:49 cdg joined #git
20:50 tinanoo joined #git
20:51 Fallen0223 joined #git
20:51 cdg joined #git
20:53 cyberz joined #git
20:53 cdg joined #git
20:53 jstimm joined #git
20:53 teroshan joined #git
20:55 zeroed joined #git
20:55 zeroed joined #git
21:00 aidalgol joined #git
21:00 cdg_ joined #git
21:00 Anja joined #git
21:03 druonysus joined #git
21:04 ZeroZeroZeroZero joined #git
21:04 Anja joined #git
21:05 holodoc joined #git
21:06 ashokrajar joined #git
21:07 Taikibansei_ joined #git
21:09 TikityTik joined #git
21:09 cdg joined #git
21:16 dreiss joined #git
21:18 ZyX-I joined #git
21:20 dirtyroshi_ joined #git
21:21 dirtyroshi joined #git
21:22 TheSimonator joined #git
21:23 weaksauce joined #git
21:24 weaksauce has anyone made a program to aggregate statistics on files edited throughout a commit range?
21:24 re1_ joined #git
21:24 weaksauce say i want to know the frequency of commits targeting a folder over time
21:25 weaksauce lines changed, number of authors, etc
21:32 Anja joined #git
21:32 Vivekananda joined #git
21:33 Anja joined #git
21:35 brent__ joined #git
21:37 theiostream joined #git
21:39 Dougie187 left #git
21:42 drodger joined #git
21:48 peterbec` joined #git
21:51 bronson joined #git
21:53 tnecniv joined #git
21:55 MacWinner joined #git
21:56 raijin joined #git
21:58 dsdeiz joined #git
21:58 kfoonamalik joined #git
21:59 Sasazuka joined #git
22:01 theoceaniscool joined #git
22:01 fish3485 joined #git
22:02 NeXTSUN joined #git
22:02 chichou joined #git
22:02 TheSimonator joined #git
22:06 chrysa joined #git
22:08 ahrs joined #git
22:09 re1 joined #git
22:09 bannakaffalatta joined #git
22:10 juvenal joined #git
22:10 scoobertron joined #git
22:10 lewix joined #git
22:11 mentazoom joined #git
22:14 ispn joined #git
22:14 watabou joined #git
22:18 anuxivm joined #git
22:18 chichou joined #git
22:19 chichou left #git
22:21 rorro joined #git
22:27 gnixev joined #git
22:28 j`ey joined #git
22:29 j`ey is there a way to git add -p from the bottom of a file upwards?
22:29 cahoots_ joined #git
22:30 Lunatrius joined #git
22:33 bulletmark joined #git
22:35 javahorn joined #git
22:35 winfli joined #git
22:37 juvenal joined #git
22:43 cjohnson turn your screen upside down
22:50 ali1234 joined #git
22:50 jimmyrcom joined #git
22:51 ISmithers joined #git
22:51 muzza joined #git
22:51 blacksoul joined #git
22:52 ZyX-I joined #git
22:52 blacksoul hey, is it possible to see my last pushs over all repositories? does git log these events somewhere separately?
22:56 kadoban Git has no central repository of data per-computer at all, so it's unlikely.
22:57 kadoban You might be able to tell from the reflog of a specific repo, I'm not sure if that's typically kept.
22:58 blacksoul yes, I feared so... unfortunately I deleted the local repo and I forgot the remote url to clone it again...
22:58 todd_dsm joined #git
22:58 blacksoul anyway, thanks for the help, kadoban
22:59 kadoban Anytime, sorry I couldn't help.
23:01 BSaboia joined #git
23:01 drodger joined #git
23:06 thiago joined #git
23:07 dsdeiz joined #git
23:08 sds__ joined #git
23:11 ZyX-I joined #git
23:15 watabou joined #git
23:15 unplayednamer joined #git
23:18 ShapeShifter499 joined #git
23:20 Cabanossi joined #git
23:20 sammyo joined #git
23:23 LeBlaaanc joined #git
23:24 bronson joined #git
23:24 gugah joined #git
23:30 mar77i joined #git
23:30 alexggordon joined #git
23:30 cbreak joined #git
23:30 dsdeiz joined #git
23:34 juvenal joined #git
23:35 andrew710 joined #git
23:36 Gustavo6046 joined #git
23:39 drodger joined #git
23:41 Noodlewitt joined #git
23:41 mschorm joined #git
23:43 bilal joined #git
23:47 kyan joined #git
23:48 maroloccio joined #git
23:49 NeXTSUN joined #git
23:49 peterbec` joined #git
23:57 ExeciN joined #git
23:58 menip joined #git

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