Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-30

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

All times shown according to UTC.

Time Nick Message
00:01 de-facto joined #git
00:02 dvaske joined #git
00:02 trulycool joined #git
00:02 systemovich joined #git
00:03 peterbec` joined #git
00:04 dsdeiz_ joined #git
00:05 chipotle joined #git
00:06 s2013 joined #git
00:06 aw1 joined #git
00:07 bdonnahue joined #git
00:07 aw1 joined #git
00:07 cam27 joined #git
00:08 Derperperd joined #git
00:08 aw1 joined #git
00:09 aw1 joined #git
00:10 Cabanossi joined #git
00:10 a_thakur joined #git
00:11 Rodya_ joined #git
00:15 cyphase joined #git
00:16 nd joined #git
00:16 drodger joined #git
00:17 cqi joined #git
00:17 porsche944 joined #git
00:17 planigan joined #git
00:18 LeBlaaanc joined #git
00:19 cyberz joined #git
00:19 Rodya_ joined #git
00:22 holodoc joined #git
00:24 mizu_no_oto joined #git
00:26 luke_nukem joined #git
00:26 systemovich joined #git
00:28 cyphase joined #git
00:29 ronin_work joined #git
00:31 wxg joined #git
00:34 jstimm joined #git
00:36 Chinggis6 joined #git
00:37 luke_nukem joined #git
00:40 sunrunner20 joined #git
00:40 Sasazuka_ joined #git
00:40 a_thakur joined #git
00:41 planigan joined #git
00:44 cyphase joined #git
00:50 gugah joined #git
00:54 marianina8 joined #git
00:57 steeze joined #git
00:57 cyphase joined #git
00:58 planigan joined #git
00:59 theiostream joined #git
01:00 jimklo_ joined #git
01:00 ahrs joined #git
01:02 orbyt_ joined #git
01:04 dsdeiz joined #git
01:04 zumba_addict joined #git
01:04 svm_invictvs joined #git
01:05 molgrum joined #git
01:05 molgrum joined #git
01:09 wxg joined #git
01:10 cyphase joined #git
01:12 jtoy joined #git
01:14 zumba_addict joined #git
01:14 lavalamp joined #git
01:14 zumba_addict on a shared repo where few devs are working, what will happen if someone pushes a tag that already exist?
01:15 kadoban zumba_addict: Should get rejected, especially if it's different. Not sure if you can -f or not, never tried.
01:16 zumba_addict thanks
01:16 TbobbyZ joined #git
01:19 matoro joined #git
01:22 Kaisyu joined #git
01:22 peterbec` joined #git
01:23 cyphase joined #git
01:26 Wulf4 joined #git
01:30 fstd_ joined #git
01:46 nevodka joined #git
01:46 gugah joined #git
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 XenophonF joined #git
01:50 dmarr joined #git
01:50 Sasazuka joined #git
01:51 dmarr I was in a branch and made several changes, then (dumbly) without committing I stashed. I checked out master and pulled, created a new branch and `stash pop`, thinking i would just add a single change i wanted to add to master until going back to my original branch. now my conflicts are in a branch off of master due to the stash pop, and im not sure how to reapply the stash pop to my original branch again
01:52 rchavik joined #git
01:55 Cabanossi joined #git
01:57 dmarr if i git stash again, that will try to stash the conflicted changes right?
01:58 tmsmith joined #git
01:58 dave0x6d joined #git
02:00 ronin_work joined #git
02:00 AlHafoudh joined #git
02:01 MacGyver joined #git
02:01 roflin joined #git
02:01 Nickeeh joined #git
02:01 s2013 joined #git
02:01 d^sh joined #git
02:04 kbeflo joined #git
02:04 dmarr phew, git is smart enough to know not to drop a stash if it doesn't apply cleanly
02:06 tmg joined #git
02:07 kadoban dmarr: Yep, thankfully. Glad you figured it out, was just going to suggest that.
02:07 dsdeiz joined #git
02:07 dsdeiz joined #git
02:08 Nothing4You joined #git
02:08 Goplat joined #git
02:09 dmarr crisis avoided :)
02:10 dmarr i did have to move some files that would have been overwritten, and re-delete some stuff but things worked out
02:17 Nilesh_ joined #git
02:18 cyberz joined #git
02:18 trulycool joined #git
02:19 roelmonnens joined #git
02:20 peterbecich joined #git
02:20 lagothri1 joined #git
02:21 jtoy joined #git
02:23 durham joined #git
02:24 peterbec` joined #git
02:24 durham joined #git
02:26 hexagoxel joined #git
02:26 raspado joined #git
02:31 steeze joined #git
02:35 cyberz joined #git
02:36 sunrunner20 joined #git
02:37 a_thakur joined #git
02:38 boombatower joined #git
02:39 alexandre9099 joined #git
02:41 zerow|afk joined #git
02:42 Emperor_Earth joined #git
02:44 lb1c joined #git
02:45 wagle joined #git
02:45 thebope joined #git
02:49 ljc joined #git
02:50 mischat joined #git
02:54 Vortex35 joined #git
02:54 Cabanossi joined #git
02:57 andrew710 joined #git
02:57 mazeinmaze joined #git
02:57 sunrunner20 joined #git
02:58 hyperair joined #git
03:00 chachasmooth joined #git
03:02 Darren_ joined #git
03:06 ojdo joined #git
03:06 jimi_ joined #git
03:06 aavrug joined #git
03:07 gugah joined #git
03:08 Cabanossi joined #git
03:10 marianina8 joined #git
03:11 hhee joined #git
03:11 inflames joined #git
03:13 chipotle joined #git
03:14 snowkidind joined #git
03:14 mehola joined #git
03:16 s2013 joined #git
03:16 raspado joined #git
03:16 ohcibi joined #git
03:17 raspado joined #git
03:19 LeBlaaanc joined #git
03:20 cyberz joined #git
03:25 peterbec` joined #git
03:26 robotroll joined #git
03:26 TbobbyZ joined #git
03:29 cqi joined #git
03:31 planigan joined #git
03:31 cyberz joined #git
03:32 ronin_work joined #git
03:32 safe joined #git
03:32 dreiss joined #git
03:32 Darren_ joined #git
03:34 Pseudocrat joined #git
03:36 allen23 joined #git
03:36 cyberz joined #git
03:39 thebope joined #git
03:43 fakenerd joined #git
03:45 cyberz joined #git
03:45 xall joined #git
03:46 trulycool joined #git
03:48 kusznir joined #git
03:48 khfeng joined #git
03:49 kusznir Hi all: I'm trying to make my first contribution to a project, but it appears to me that somehow git got out of sync and "lost" my contributions...
03:50 kusznir Work flow: some time ago, I cloned the project's repo to my workstaton.  Over the past few months, made some changes.  Ran git status, and saw the changes I made.  Ran git add <files> (as they were new files).  Git status showed them in green now.
03:50 kusznir Ran git commit -m "my message".  It responded positively.
03:51 kusznir Ran git push, and it failed as it should (I don't have permissions to direclty pus to project repo)
03:51 chipotle joined #git
03:51 mischat joined #git
03:51 alexandre9099 joined #git
03:52 kusznir So I went online to github, forked it, then git add myrepo <url>
03:52 kusznir Git commit myrepo origin/4.2.
03:52 kusznir It reported successful, that it uploaded the files and such.
03:52 kadoban "git add myrepo <url>" is hopefully missing a word. "git remote add ..." ?
03:52 kusznir But then I go back to github, under my account/my fork, branch 4.2, and nothing is there, and github says my branch is identical to the upstream project.
03:53 kadoban "Git commit myrepo origin/4.2" ... what?
03:53 thiago what do you mean by this:  kusznir> Git commit myrepo origin/4.2.
03:53 thiago that is not a Git command
03:53 kusznir Sorry, typo.  Here's the cut and paste: git push myrepo origin/4.2
03:54 Cabanossi joined #git
03:54 thiago so you pushed origin's 4.2 to myrepo
03:54 thiago but since you said that push to origin failed, that command did not push your commit
03:55 kusznir https://pastebin.com/YeAqkVuf   <- cut and paste from my terminal of the steps taken.
03:56 thiago you need to push 4.2, not origin/4.2
03:56 kadoban Ya, that ^
03:56 kusznir git status showed origin/4.2, and until I added origin/4.2, I got errors.
03:56 leeN joined #git
03:56 kusznir thiago: that's what I thought, but when I try, I get this: error: src refspec 4.2 matches more than one.
03:57 kusznir When I specified origin/4.2, then it actually uploaded my files (at least, it reported uploading the same number of files I expected it to)
03:57 kadoban 4.2 is a bit of a weird branch name. You maybe have a tag of that name as well?
03:57 kusznir No idea...all this started with a clone of fusionpbx branch 4.2
03:58 kadoban origin/4.2 is the 4.2 branch *from origin*, it's not the local one you've been doing stuff in.
03:58 kusznir git status currently shows this: Your branch is ahead of 'origin/4.2' by 1 commit.
03:58 mizu_no_oto joined #git
03:58 justan0theruser joined #git
03:59 kadoban kusznir: Try uhm ... 'git push myrepo refs/heads/4.2:4.2'
03:59 kusznir git push myrepo refs/heads/4.2:4.2
03:59 kusznir error: dst refspec 4.2 matches more than one.
03:59 thiago refs/heads/4.2 after the colon too
04:00 kadoban Oh the destination is ambiguous, interesting. Ya that ^
04:00 thiago you probably do have a tag called "4.2" too
04:00 kadoban 4.2 is really just a bad branch name, that's why this is tedious. It's not a great idea to have a branch with the same name as a tag usually. Though ya, it sounds like that wasn't your choice.
04:00 kusznir ! [rejected]        4.2 -> 4.2 (fetch first)   error: failed to push some refs to 'git@github.com:kusznir/fusionpbx.git'
04:01 kadoban Sounds like you have different history compared to origin/4.2 then
04:01 kusznir There is no other users pushing to my branch.  There are no changes on my branch other than the changes I want to commit/push.
04:01 kusznir My github account says my 4.2 is identical to upstream 4.2 (origin, in this case)
04:02 kadoban Do you just want to nuke what's already on myrepo's 4.2 branch and make it equal to your current one? That changes published history, but it sounds like you're just setting this thing up, so usually you don't care.
04:02 peeps[lappy] joined #git
04:03 thiago 4.2 is a good branch name
04:03 thiago it's a bad tag name, though
04:03 kusznir Not sure I fully understand...I do NOT want to change the files on my local box (its actually running in production; I was uploading my changes made from my production environment)
04:03 thiago kusznir: push -f
04:03 kusznir I don't care about killing any references this has to myrepo, or destroying the fork on github or anything that doesn't change the actual project files on my system's disk.
04:04 kusznir thiago: that appears to have taken (same response I got the first time I was successful); checking online now.
04:04 kusznir Ok, now it is showing online too!
04:05 kadoban Huzzah
04:07 roelmonnens joined #git
04:08 Blkt joined #git
04:11 BenderRodriguez joined #git
04:11 alexandre9099 joined #git
04:11 de-facto joined #git
04:12 freimatz joined #git
04:14 ryxxed joined #git
04:14 MutantMahesh joined #git
04:15 bocaneri joined #git
04:18 bocaneri joined #git
04:18 forrestv joined #git
04:20 steeze joined #git
04:22 alexandre9099_ joined #git
04:23 safe joined #git
04:24 peterbec` joined #git
04:25 Noodlewitt joined #git
04:28 bocaneri joined #git
04:29 Chinggis6 joined #git
04:30 a_thakur joined #git
04:31 zerow|afk joined #git
04:32 jnewt joined #git
04:32 nevodka joined #git
04:33 thebope joined #git
04:34 a_thakur joined #git
04:34 kbeflo joined #git
04:37 alexandre9099 joined #git
04:37 qmr joined #git
04:38 notebox joined #git
04:38 dustinm joined #git
04:38 Cabanossi joined #git
04:39 TbobbyZ joined #git
04:43 Timvde| joined #git
04:43 bocaneri joined #git
04:43 cyphase joined #git
04:47 ayogi joined #git
04:48 cyberz joined #git
04:49 trulycool joined #git
04:52 jimi_ joined #git
04:52 mischat joined #git
04:53 jimi_ joined #git
04:54 janat08 joined #git
04:54 jimi_ joined #git
04:55 jimi_ joined #git
04:55 fakenerd joined #git
04:57 cyphase joined #git
05:01 rscata joined #git
05:02 SteffanW joined #git
05:03 pwnz0r joined #git
05:03 cyberz joined #git
05:04 MutantMahesh joined #git
05:05 Endarked joined #git
05:09 dec0n joined #git
05:09 BlueMatt joined #git
05:10 dsdeiz joined #git
05:10 cyberz joined #git
05:10 dsdeiz joined #git
05:12 UTAN_dev_ joined #git
05:13 sbulage joined #git
05:15 cyphase joined #git
05:15 [sarri] joined #git
05:15 bambams_ joined #git
05:15 cydrobolt_ joined #git
05:16 jerrcs joined #git
05:16 umbSublime joined #git
05:16 umbSublime joined #git
05:16 salios joined #git
05:16 TheOrangeOne joined #git
05:16 __builtin joined #git
05:16 hfp_work joined #git
05:17 zerow|afk left #git
05:17 zerow joined #git
05:20 robnester joined #git
05:20 cyberz joined #git
05:21 hfp joined #git
05:23 jameser joined #git
05:25 inflames joined #git
05:26 marianina8 joined #git
05:26 XenophonF joined #git
05:27 thebope joined #git
05:33 darkbit joined #git
05:33 cyphase joined #git
05:33 ashnur joined #git
05:33 ashnur joined #git
05:33 yan joined #git
05:34 qt-x joined #git
05:35 inflames joined #git
05:35 AlgorithmWizard joined #git
05:35 pelegreno_ joined #git
05:35 salios joined #git
05:35 forgot joined #git
05:36 bodie_ joined #git
05:37 cyphase joined #git
05:37 BlueMatt joined #git
05:39 MuffinMedic joined #git
05:43 regedit joined #git
05:43 cyberz joined #git
05:44 brent__ joined #git
05:45 watom- joined #git
05:46 fakenerd joined #git
05:47 chardan joined #git
05:49 Aaron1011 joined #git
05:49 Aaron1011 joined #git
05:53 cyberz joined #git
05:53 mischat joined #git
05:54 Cabanossi joined #git
05:55 roelmonnens joined #git
05:55 Andrew_K joined #git
05:56 ThiefMaster joined #git
05:59 cyberz joined #git
05:59 Raging_Hog joined #git
06:01 diogenese joined #git
06:02 Assault joined #git
06:02 zefferno joined #git
06:02 cyphase joined #git
06:03 ronin_work joined #git
06:05 elementalest joined #git
06:06 cyberz joined #git
06:09 peterbec` joined #git
06:10 wxg joined #git
06:14 visual morning fellas
06:15 cyphase joined #git
06:17 roelmonnens joined #git
06:18 masuberu joined #git
06:18 roelmonnens joined #git
06:21 thebope joined #git
06:25 darkbit joined #git
06:25 cyphase joined #git
06:25 lb1c joined #git
06:26 pietv joined #git
06:28 User4587_ joined #git
06:29 fbwnd joined #git
06:29 dysfigured i want to put my weechat config in my dotfiles repo, buut i don't want to track my server listing in vcs.. so i'm wondering, is there a way to make sure i never commit a chunk of a file? or, is there a way i can automate staging up to a certain point in a file?  for instance, i could sed '/^\[servers/q' and get the relevant portion i'd want to commit, but idk how to stage a file by stdin like that..
06:30 drodger joined #git
06:30 trulycool joined #git
06:31 osse dysfigured: man gitattributes, look at clean and smudge filters
06:31 gitinfo dysfigured: the gitattributes manpage is available at http://jk.gs/gitattributes.html
06:31 dysfigured hm cheers
06:31 Silmarilion joined #git
06:32 hagabaka joined #git
06:35 t0by joined #git
06:36 drodger joined #git
06:37 buzzLightBeer joined #git
06:38 seitensei joined #git
06:38 cyphase joined #git
06:41 cyberz joined #git
06:43 rokups joined #git
06:43 nckpz joined #git
06:45 TbobbyZ joined #git
06:47 roelmonn_ joined #git
06:48 dysfigured so, i woudl add something like  irc.conf  filter=strip_server to .gitattributes? and then use clean = sed..  but where do i put the [filter..] block? in the .gitattributes file as well?
06:48 luke_nukem joined #git
06:51 wxg4irc joined #git
06:53 imack joined #git
06:53 osse dysfigured: .git/config
06:54 Cabanossi joined #git
06:54 smiiley joined #git
06:54 mischat joined #git
06:54 cyphase joined #git
06:55 ogny joined #git
06:56 dysfigured ahh. hmm but changes to that don't get saved to remote do they? so when i clone i have to re-create the filter?
06:56 osse yes
06:56 fbwnd joined #git
06:57 dysfigured bummer. oh well, still better than manually reviewing commits to make sure i didn't accidentally add secrets
07:00 Forlorn joined #git
07:01 dglambert joined #git
07:02 jnavila joined #git
07:05 Raging_Hog joined #git
07:05 Tobbi joined #git
07:05 JeroenT joined #git
07:06 borkr joined #git
07:07 overlord_tm joined #git
07:07 Raging_Hog joined #git
07:08 dysfigured what..the.. so apparently  clean = sed 's/^\[servers\]/q'  creates invalid syntax in .git/config
07:10 osse dysfigured: but if the filter was in the repo then nothing would have been achieved
07:12 chardan joined #git
07:12 catch22 joined #git
07:14 cyberz joined #git
07:14 fbwnnd joined #git
07:14 cyphase joined #git
07:16 thebope joined #git
07:17 trulycool joined #git
07:17 dersand joined #git
07:17 TomyWork joined #git
07:18 Guest54 joined #git
07:19 royiv joined #git
07:20 lucasem joined #git
07:21 skered joined #git
07:21 PHPanos joined #git
07:23 Silenced joined #git
07:24 flaviodesousa joined #git
07:24 thomas-oneill joined #git
07:25 thomas-oneill hey I got a bunch of unstaged/untracked changes that I want to get rid of, except for one or two files. And for fun, let's say in those one or two files maybe I only want to use some of the changes, so like -p. What's your workflow for this? Vaguely re-call that git-stash might be the thing for this... Will read that man now actually...
07:26 Silenced joined #git
07:26 jn__ left #git
07:27 osse thomas-oneill: i would git checkout -p -- partialfiles to get rid of the changes you want. so now you have a couple of files you want to keep whole, and garbage
07:28 osse thomas-oneill: then I'd stage those files you want to keep with git add. after that you can do 'git checkout -- .' on the whole lot
07:29 cyphase joined #git
07:29 osse git checkout -p lets you say yes ro no on a file-basis too, so if it's not *too* much you can use that all the way
07:29 roelmonnens joined #git
07:29 lb joined #git
07:29 achadwick joined #git
07:30 thomas-oneill oh yeah sweet
07:33 Silenced joined #git
07:33 Silenced joined #git
07:35 ronin_work joined #git
07:36 sea-gull joined #git
07:37 memfrob joined #git
07:38 ertes joined #git
07:38 memfrob Hey everyone! I just wanted to thank this channel again for helping me out so much, I've been able to backport 125 kernel patches from 4.9 to 4.4 so far and I'm making great progress.
07:39 memfrob I started over again recently as my development plan before was a mess, but after learning about git cherry-pick it's a heck of a lot easier.
07:39 chele joined #git
07:39 Cabanossi joined #git
07:39 memfrob A few members said they were interested in what I was working on, the patch series (incomplete) is hosted here: https://github.com/NTULINUX/kernel-patches/tree/master/security_backports
07:40 memfrob a full kernel repo will be available once it's tested and ensured that's working properly, thank you all again so much!
07:40 Gloomy joined #git
07:41 memfrob KASLR, hardened usercopy, tons of kernel hardening techniques developed in kernel 4.9 and 4.10 will be backported to 4.4 and I couldn't have done it without you #git
07:43 cyberz joined #git
07:46 drodger joined #git
07:47 schleppel joined #git
07:47 JeroenT joined #git
07:48 chigang joined #git
07:48 royiv joined #git
07:49 King_Hual joined #git
07:49 dvaske joined #git
07:50 Silenced joined #git
07:50 Silenced joined #git
07:50 cyphase joined #git
07:52 masuberu joined #git
07:53 grayjoc joined #git
07:54 shinnya joined #git
07:56 mikecmpbll joined #git
07:57 manuelschneid3r joined #git
07:58 Murii joined #git
07:59 marcvangend joined #git
07:59 kurkale6ka joined #git
08:01 deanc joined #git
08:01 deanc Hi. I want to interactively view the diffs of individual files that are currently not in staging (haven't been git added)
08:01 ronin_work joined #git
08:01 deanc git add -i doesn't seem to do what i would hope. it only allows me to view the diffs from things i have already git added
08:02 zeroed joined #git
08:02 zeroed joined #git
08:02 marcvangend Hi, we're getting a segmentation fault on Windows 10 when doing a git status. Where do I start debugging?
08:03 elect_ joined #git
08:04 jtoy joined #git
08:04 tvw joined #git
08:05 gtristan joined #git
08:07 osse deanc: i think you're misunderstanding
08:07 peterbec` joined #git
08:08 deanc osse: yes i think i misunderstood what git add -i will do also. What workflow could I use to to see a diff on a whole file and either add it or ignore and then interactively move on to the next file?
08:08 deanc Right now I have to type git diff <path> and then git add <path> and then go back to git status from time to time when my buffer is full etc.
08:08 jim_carry joined #git
08:08 Silenced joined #git
08:09 jim_carry Any one use vim-fugitive? What is Gblame? how to use it?
08:09 Cabanossi joined #git
08:09 osse deanc: add -i will let you view the diffs of files that are modified. not sure what you mean
08:09 jim_carry I understand it shows who changes last time line by line
08:09 osse jim_carry: type :Gblame when editing a file. that's it.
08:09 jim_carry what is reblame
08:10 osse reblame = running git blame over again from that point in history
08:10 thebope joined #git
08:10 cyphase joined #git
08:10 immae deanc: try "git add -p" ?
08:11 jim_carry osse: That means who changes that line before the last user
08:11 deanc osse: right now in git status i have about 10 files changed. some are staged, some are not. If I type in git add -i and then 6 i would expect it to let me see diffs of files that are not added to staging to decide whether to stage or not. It only shows a list of files that are staged
08:11 octo8_ joined #git
08:11 deanc immae: git add -p is too granular. i am not interested in breaking down a diff on a file into smaller commits. All i want to do is see a diff on a file and say y/n and move on to the next until complete
08:12 osse deanc: strange. it shows both here
08:12 osse jim_carry: it means run git blame as if that was the newest version of the file
08:13 deanc osse: on ad different repo where i have not run git add at all on the changed I've made - if i type git add -i and then type 6 to do the diff, there is nothing int he list. it just shows me a list of commands
08:13 osse deanc: git add -p lets you select "stage this hunk and all later hunks in the file"
08:13 deanc osse: at least when i tried git add -p earlier it would show one hunk at a time so it would not be safe to stage later hunks as they are not on my screen
08:14 osse deanc: these files you don't see, are they utnracked?
08:15 deanc no, they are tracked
08:17 osse add -i's diff subcommand shows diff between HEAD and index
08:17 osse aka. what is set to be committed
08:17 osse seems there is no equivalent for working tree and index
08:18 deanc okay then it doesn't do what i would want
08:18 deanc i wonder if there is a third-party tool i could run to aid with this workflow
08:19 deanc i don't like the idea of adding everything and then using git add -i to undo things
08:19 osse what is it that you want, exactly?
08:19 osse answer yes or no to each file, and if yes the whole file is added?
08:20 clmsy joined #git
08:22 sarbs joined #git
08:23 osse deanc:  git diff --name-only | while read -r file; do git diff -- "$file"; read -p "Add $file ?" </dev/tty; if [[ $REPLY = [Yy]* ]]; then git add "$file"; fi; done
08:24 deanc what on earth.. :D
08:24 deanc let's see...
08:25 deanc very impressive :) mind if i add this to my personal git tips blog post?
08:25 deanc I mainly use it as a personal reference, nobody goes there
08:26 kexmex joined #git
08:26 marcogmonteiro joined #git
08:27 deanc In fact, I'm not entirely sure how to make that into an alias
08:32 osse deanc: please don't. write it to a file named 'git-foo' where foo is what you'd alias it to, and put it in $PATH
08:32 deanc check
08:32 crater2150 hi, since updating to 2.12 I get perl syntax errors on git add -i: https://paste.pound-python.org/show/EIruOT8FSHCgxHY1efuC/
08:33 crater2150 as other users of the same distro (voidlinux) can't reproduce it, could there maybe be some new dependency that I'm missing?
08:33 osse that said, I think you can do  git config alias.foo '!git diff --name-only | while read -r file; do git diff -- "$file"; read -p "Add $file ?" </dev/tty; if [[ $REPLY = [Yy]* ]]; then git add "$file"; fi; done && :'
08:33 cqi joined #git
08:33 osse but at some point you gotta admit that it's not longer an alias, it's a new subcommand
08:33 ispn joined #git
08:33 eahmedshendy joined #git
08:34 mikecmpbll joined #git
08:36 sveinse left #git
08:37 notebox joined #git
08:37 buzzLightBeer joined #git
08:39 sotoz joined #git
08:41 netroxen joined #git
08:43 Silenced joined #git
08:46 sbasso joined #git
08:48 TbobbyZ joined #git
08:48 scoobertron joined #git
08:48 jagob joined #git
08:51 drodger joined #git
08:52 royiv joined #git
08:53 mischat joined #git
08:53 molgrum joined #git
08:53 molgrum joined #git
08:57 ThomasLocke joined #git
09:00 sbasso joined #git
09:01 matoro joined #git
09:01 dorian_ joined #git
09:02 bwn joined #git
09:04 deanc I see you point osse, but as it's git specific it's nice to have as an alias. big thank you :)
09:05 osse deanc: git-rebase is git specific, and yet it's a script and not an alias :O
09:05 osse at a point the aliases become so large and unwieldly that they're a pain to deal with
09:08 peterbec` joined #git
09:09 exotime joined #git
09:10 King_Hual joined #git
09:10 King_Hual joined #git
09:10 molgrum joined #git
09:10 molgrum joined #git
09:13 zefferno joined #git
09:17 fees joined #git
09:17 MineCoins joined #git
09:23 Gloomy joined #git
09:23 sbasso joined #git
09:25 Asenar joined #git
09:29 D4R5C0D3 joined #git
09:29 dsdeiz joined #git
09:30 aviraldg joined #git
09:32 mischat_ joined #git
09:32 jagob joined #git
09:34 ShapeShifter499 joined #git
09:35 marcvangend joined #git
09:39 D4R5C0D3 joined #git
09:40 Ice_Strike joined #git
09:40 maroloccio joined #git
09:40 zefferno joined #git
09:40 zefferno joined #git
09:43 IRQ` joined #git
09:47 btree joined #git
09:48 Silenced joined #git
09:51 monomon[m] joined #git
09:51 spinningarrow[m] joined #git
09:51 flo[m] joined #git
09:51 saintaquinas[m] joined #git
09:51 elwan7[m] joined #git
09:51 heftig joined #git
09:51 am2on joined #git
09:51 Elliott[m]1 joined #git
09:51 dyce[m] joined #git
09:51 dikiaap joined #git
09:51 unclechu joined #git
09:51 jascot[m] joined #git
09:51 M-meznak joined #git
09:51 KevinMGranger joined #git
09:51 musicmatze[m] joined #git
09:51 keks[m] joined #git
09:51 logos[m] joined #git
09:51 Remramm joined #git
09:51 UncleCJ joined #git
09:51 SpEcHiDe joined #git
09:51 patrickr[m] joined #git
09:51 hiq[m] joined #git
09:51 Retropikzel[m] joined #git
09:53 Jaiss joined #git
09:55 sarbs joined #git
09:56 YuGiOhJCJ joined #git
09:58 thebope joined #git
09:59 dsdeiz joined #git
09:59 feodaron joined #git
10:00 Gotham25 joined #git
10:01 TbobbyZ joined #git
10:01 brent__ joined #git
10:03 b100s joined #git
10:04 Gotham25 Hi, I'm using eclipse git plugin. I have cloned a repo from bitbucket account. It was working fine since yesterday. Now there was a change done and committed in one branch yesterday. And today when I used the fetch from upstream option, it fetched the changes done in that branch. But in Git perspective under Remote Branch I'm not able to find it....
10:04 Gotham25 Can anyone guide me in resolving this issue
10:04 dorian_ Hey, I set "gvimdiff" as my diff tool in git. But git opens an instance of vim instead. And my configuration of vim (not gvim) make it very hard to read the diffs. Can I tell git to use gvim instead of vim ?
10:04 jtoy joined #git
10:05 Gotham25 The remote branch is still behind 2 commits.....
10:05 Gotham25 But fet from upstream shows that the remote branch is up to date
10:05 Gotham25 fetch*
10:09 marcvangend joined #git
10:10 peterbec` joined #git
10:10 sbasso joined #git
10:11 zxd joined #git
10:11 zxd how to return from detached head back to having HEAD point to a branch
10:12 zxd ah
10:12 zxd checkout branch :)
10:12 rokups there are two projects, Upstream and Fork. Fork was "forked" by copying source code and just making new repository, so they do not share any history. Fork has some stuff removed, some stuff moved, bunch of stuff added. Currently merges are done by comparing relevant folders and moving changes manually. Is there maybe a better way to merge from Upstream using
10:12 rokups git?
10:12 sarri joined #git
10:12 sarri joined #git
10:13 osse dorian_: does git mergetool --tool=gvimdiff   work ?
10:14 troulouliou_div2 joined #git
10:14 theoceaniscool joined #git
10:14 kexmex joined #git
10:15 ronskisika joined #git
10:15 osse rokups: fetch the Upstream repo into the Fork repo. Next time you do a manual comparision, commit the result as a merge commit
10:15 osse after that you can continue to merge
10:16 rokups will try, thank you osse
10:18 ferr1 joined #git
10:19 dorian_ osse, I can't launch it because git keeps telling me that no file need merging. I'm not too sure how I can make a need for merge happen.
10:20 osse dorian_: heh, my bad. I mean git difftool --tool=gvimdiff
10:22 dorian_ osse, Yes it works: git starts gvimdiff as requested.
10:22 marcvangend left #git
10:22 dorian_ I see in my configuration file that there "tool = gvimdiff" under the [diff] section.
10:22 D4R5C0D3 joined #git
10:23 dorian_ maybe it should be in the difftool section ?
10:24 dorian_ Well it did not work :/
10:24 osse dorian_:  git config --show-origin -l | grep diff.tool
10:25 ToBeCloud joined #git
10:25 dorian_ osse, good thinking! My local git configuration was overriding my global configuration.
10:25 dorian_ It works fine now
10:25 peacememories joined #git
10:26 osse my thinking is the best
10:26 sotoz joined #git
10:26 finalbeta joined #git
10:26 osse dorian_: btw did that command show both values?
10:27 dorian_ yes
10:27 osse \o/
10:30 andrew710 joined #git
10:30 peacememories joined #git
10:32 Silenced joined #git
10:33 kbeflo_ joined #git
10:35 timlyo[m] joined #git
10:35 sbasso joined #git
10:36 msonntag joined #git
10:37 bongjovi joined #git
10:39 Cabanossi joined #git
10:41 Olipro joined #git
10:42 quizzi joined #git
10:43 Silenced joined #git
10:45 CussBot joined #git
10:50 mar77i joined #git
10:52 thebope joined #git
10:53 _August_ joined #git
10:53 aw1 joined #git
10:54 _August_ im trying to merge my branches and the branch I am trying to merge I keep getting an conflict error "Auto-merging javascript/common.js
10:54 _August_ CONFLICT (content): Merge conflict in javascript/common.js
10:54 _August_ Automatic merge failed; fix conflicts and then commit the result.
10:54 _August_ " any suggestions?
10:54 tobiasvl _August_: !eek
10:54 gitinfo _August_: [!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
10:54 zerow joined #git
10:56 pbrewczynski joined #git
10:57 onehrxn joined #git
10:59 barduck joined #git
10:59 Gloomy joined #git
10:59 tlaxkit joined #git
11:05 darkbit joined #git
11:07 sbasso joined #git
11:07 pinkkis joined #git
11:08 Tobbi joined #git
11:10 peterbec` joined #git
11:15 afuentes joined #git
11:16 lugzer joined #git
11:16 lugzer afternoon
11:18 onehrxn joined #git
11:18 lugzer i have a simple question i think - i made changes to source files of a submodule (which is in /node_modules) - and now i want to revert those changes. since /node_modules are ignored, i have to do it some other way.. what's the simplest?
11:18 sbasso joined #git
11:18 masuberu joined #git
11:19 chardan joined #git
11:20 mischat joined #git
11:21 marcoslater joined #git
11:23 borkr joined #git
11:28 Tatou joined #git
11:28 dsdeiz joined #git
11:28 dsdeiz joined #git
11:30 ogny joined #git
11:32 chachasmooth joined #git
11:37 dtbn joined #git
11:37 lugzer ok figured out.. it wasn't a submodule. it was npm package.. so a different channel first of all ;)
11:38 rnsanchez joined #git
11:38 dsdeiz joined #git
11:38 dsdeiz joined #git
11:38 nowhere_man joined #git
11:41 MrMojit0 joined #git
11:42 lmat How do I point a remote branch to a commit?
11:43 fakenerd joined #git
11:43 lmat git push origin 6284e8:master; doesn't work
11:44 lmat or a tag...   git push origin tag-name:master;  gives odd output: " * [new tag]         tag-name -> master" It looks like it created the tag anew on the remote? Not what I'm going for.
11:45 osse lmat: git push origin 6284e8:master should work just fine. what doesn't work about it?
11:45 Vampire0 lmat, !repro
11:45 gitinfo lmat: [!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
11:45 tymczenko joined #git
11:46 lmat osse: hmm, now it says "non-fast forward"...researching
11:46 lmat osse: You know... I bet the problem was that that commit didn't exist on the server...
11:46 chipotle joined #git
11:46 lmat no, that should be okay
11:46 lmat it just just upload it
11:46 thebope joined #git
11:46 lmat it should just upload it
11:46 osse lmat: if amster didn't already exist then you get an error
11:46 osse otherwise it should work
11:47 MutantMa_ joined #git
11:47 sbasso joined #git
11:47 lmat osse: okay, thanks
11:47 lmat osse: ... but why wouldn't it work if master didn't first exist?
11:47 kristofferR joined #git
11:47 osse lmat: because it doesn't know what you want master to be
11:48 osse a tag? a branch? something else?
11:48 lmat osse: dude, you're awesome.
11:48 osse the solution is to write the full name:  git push origin 6284e8:refs/heads/master
11:48 * lmat bows
11:48 ionl joined #git
11:48 ionl left #git
11:48 lmat osse: I have asked this question several times and never received a good answer. I will sleep very well tonight
11:48 Vampire0 lmat, and if you push a tagname, it "works" as it assumes that you want to push to a tag if you push a tag
11:49 Vampire0 lmat, hence you created the tag master when you pushed with tag name
11:49 Vampire0 lmat, and after that you did get the non-fast-forward warning, as now there is a thing called "master" it is just not a fast-forward
11:49 Vampire0 lmat, hence the error did change after you pushed the tag to the newly created tag master
11:50 HoierM joined #git
11:50 lmat Vampire0: That sounds like great reasoning, but master *did* exist when I pushed the tag ^_^
11:51 dtbn Hey boys & girls. Got a question - I have a pull request that require rebasing to master - how to do it in easiest way? `git checkout branch-name`, `git rebase master` and then?
11:51 Vampire0 lmat, hm, then it is strange that it created a new tag called master instead of updating the branch. osse, did I remember wrongly?
11:51 lmat Ah, I see thath it created a *local* "master" tag!
11:51 _ikke_ dtbn: 2. fix possible conflicts. 3. ???, 4. profit
11:52 osse Vampire0: afaik it uses the source to see what type the destination is
11:52 dtbn there is not really a conflict, just rebase to follow master branch
11:52 Vampire0 lmat, I don't think it created a local master tag on push. But if your push created a tag in remote and you then fetch the tags, you get the local one from the remote
11:52 marianina8 joined #git
11:52 _ikke_ dtbn: You possible have to force push te rebased branch
11:52 marianina8 joined #git
11:53 _ikke_ git push --force-with-lease origin branch-name
11:53 lmat Vampire0: Ah, I should make sure it didn't create a master tag on remote :-o
11:53 Vampire0 osse, even if it exists already? hm, must remembering wrongly then
11:53 osse Vampire0: if it already exists then I don't think it would
11:53 lmat dtbn: I don't think you can do non-fast forward pull requests.
11:54 lmat dtbn: yeah, force push like _ikke_ says.
11:54 zulutango joined #git
11:54 osse Vampire0: I don't think that's what happened here either.
11:54 osse I think master didn't exist at the time he did tag-name:master
11:55 bariscant joined #git
11:55 lmat osse: local or remote?
11:55 Vampire0 osse, lmat, yep, I just tried
11:55 osse lmat: remote
11:55 Vampire0 osse, lmat, if you push tag-name:master and master branch exists, the master branch is pushed to
11:55 lmat osse: master existed as a branch for many months now.
11:56 lmat Vampire0: ... pushed to what?!
11:56 Vampire0 osse, lmat, if you push tag-name:master and master branch does not exists, the master tag is pushed to (created if not exists)
11:56 osse lmat: then 'git push origin 6284e8:master' would have worked in the first place.
11:56 lmat osse: Yeah, but i did that tag thing first :-(
11:56 flopsec joined #git
11:57 osse that too sholud have worked, instead of getting "new tag"
11:57 lmat okay, time to research:  what does   git push remote <tag-name>:<existing-remote-branch>   do ^_^
11:57 lmat <tag-name> is an existing tag on remote.
11:57 Vampire0 lmat, you said 6284e8:master did fail, then tag-name:master created a tag called master and then 6284e8:master said it is not a fast-forward
11:57 osse it makes the remote branch point to the same commit as the local tag does
11:57 Vampire0 lmat, this definitely means that there was no branch called master on the remote
11:57 lugzer joined #git
11:58 lmat Vampire0: Sorry, I said "git push origin 6284e8:master; doesn't work"  I was working from faulty memory at that point.
11:58 lmat Vampire0: I hadn't done it :'(
11:58 Vampire0 lmat, whether the tag-name exists on remote is not relevant, it is only relevant whether existing-remote-branch exists
11:58 lmat Vampire0: makes sense.
11:58 Vampire0 lmat, and if it exists, it gets updated
11:58 Vampire0 lmat, I just tried it here to make sure not saying non-sense
11:59 synthroid joined #git
11:59 Vampire0 lmat, even if you didn't do 6284e8:master first, as tag-name:master created a tag called master, this is proof enough already that there is no remote branch called master
12:00 WizJin joined #git
12:00 lmat hmm
12:00 mar77i joined #git
12:01 Urbany joined #git
12:02 synthroi_ joined #git
12:02 scoobert1on joined #git
12:03 chardan joined #git
12:04 Vampire0 lmat, and what I also just tried, if there is both a tag called master and a branch called master and you use an explicit refspec like 123abc:master or tag-name:master or even master:master, Git will complain that the dst refspec is ambiguous and will not work unless you explicitly state which of the two you want to update. `git push origin master` though works and updates the master branch
12:04 TbobbyZ joined #git
12:07 jimi_ joined #git
12:07 dtbn I think believe it worked, thank you!
12:09 Cabanossi joined #git
12:10 gitinfo dtbn: This channel tracks karma based on who has gotten lots of thanks for being helpful. If you want to help someone reach karmic nirvana, please mention their name when thanking them with "thank you", "thankyou", "thanks", "thx", "ty" or "cheers". Try ".karma <nick>" or ".topkarma" to show karma status of a person.
12:11 cousteau joined #git
12:11 peterbec` joined #git
12:11 cousteau is `git commit --ammend` equivalent to fixup?
12:11 osse no
12:12 unreal joined #git
12:12 Vampire0 osse not?
12:13 cousteau er, amend
12:13 Vampire0 osse, assuming cousteau meant amending the latest commit vs doing a fixup commit and using rebase to integrate it
12:13 osse --amend modifies the existing commit.  --fixup creates a *new commit* which is intended to be used with git rebase --autosquash
12:14 osse ok, then I just interpretend the question to literally
12:14 osse *too
12:14 cousteau osse, sorry, I meant creating a new commit and then doing fixup with rebase
12:14 osse Yes, they sort of serve the same purpose
12:14 Vampire0 cousteau, then yes, it is the same
12:14 cousteau I assume the responsibility
12:14 cousteau osse, Vampire0, thanks!
12:14 Vampire0 yw
12:14 osse as in: --fixup is for when you want to --amend but you can't :p
12:14 cousteau then I'll stop doing rebases; they're rather inconvenient
12:15 cousteau (compared to --amend)
12:15 Vampire0 cousteau, if it is not the latest commit you want to amend, you need to do it with fixup. If it is the latest, amending is the most convenient way to go, yes
12:15 osse cousteau: you cannot use --amend to fix any commit except the current one
12:16 cousteau right
12:16 cousteau I mena, that's what I used rebase for
12:16 cousteau *mean
12:16 Vampire0 well, yeah, "current one" hits it better than "latest one"
12:16 mehola joined #git
12:16 cousteau another thing, what was the command to tell git to forget staged changes?  git reset --soft?
12:16 osse cousteau: so now you'll stop doing that and isntead get things right the first time? :p
12:17 osse just 'git reset'
12:17 Vampire0 cousteau, no, just "git reset"
12:17 cousteau ah
12:17 brent__ joined #git
12:17 cousteau that doesn't touch the files, right?
12:17 Vampire0 cousteau, soft reset will update the branch head, but leave the index and worktree untouched
12:17 marscher joined #git
12:18 cousteau ah wait, actually reverting files was checkout, not reset
12:18 Vampire0 cousteau, a mixed reset (the default if not --soft, --hard or --mixed is given explicitly) will reset the index and probably repoint the branch pointer, but will not touch your worktree
12:19 Vampire0 cousteau, checkout with path and without commit-ish will update your worktree files to match what is in the index
12:19 cousteau I see, thanks!
12:19 Vampire0 cousteau, a --hard reset will also update your worktree files to the given state
12:19 drodger joined #git
12:20 chachasmooth joined #git
12:22 trulycool joined #git
12:23 cousteau I see
12:23 gugah joined #git
12:25 scoobertron joined #git
12:25 Cavallari joined #git
12:25 marianina8 joined #git
12:26 cousteau hm, commit --amend seems to create a fork.  Ugly...
12:26 cousteau (guess that's easy to remove though)
12:27 osse And that, kids, is why you don't push immediately
12:28 lugzer joined #git
12:30 XenophonF joined #git
12:30 jtoy joined #git
12:30 itavero joined #git
12:31 itavero left #git
12:31 GodEater left #git
12:31 JeroenT_ joined #git
12:31 cousteau osse, I'm not pushing anyway; I'm honestly just using git as a log of changes
12:32 cousteau and just in case I want to undo something
12:32 osse cousteau: then where do you see the fork?
12:32 cousteau (I also have an external repository as a backup, but last time I pushed was 2 weeks ago)
12:32 cousteau osse, gitk
12:32 osse cousteau: and what are the tips of the work?
12:32 osse fork
12:33 cousteau the old commit that was amended
12:33 osse I mean why is it visible in the first place?
12:33 cousteau it's a one-node ramification
12:33 osse does it not say "HEAD" or "master" or "feature" or "origin/master" next to it?
12:34 Brski joined #git
12:35 cousteau So I closed gitk and opened it again and the branches disappeared.  Duh...
12:35 cousteau osse, so never mind I guess; it was a glitch in the gitk
12:35 Eryn_1983_FL joined #git
12:36 JeroenT joined #git
12:36 * cousteau had closed gitk and opened it again with the English locale in order to take a screenshot.  One of the cases when trying to diagnose the problem actually fixes it.
12:36 osse \o/
12:36 grayjoc joined #git
12:39 Guest54 joined #git
12:40 sbasso joined #git
12:40 tmsmith joined #git
12:40 Vampire0 cousteau, well, it is not so much a glitch. If you press F5, it just updates and adds stuff that was added. But commits that are already shown stay shown even if they are dangling.
12:40 AStorm joined #git
12:40 thebope joined #git
12:40 cousteau I see, so that's what Reload does (rather than Refresh)
12:40 Vampire0 cousteau, if you want to get those away do Shift+F5 and the repo will be reread completely and the graph rebuilt, then the dangling commit also is not shown anymore
12:41 Guest54 joined #git
12:41 cousteau Ctrl-F5
12:41 Vampire0 cousteau, unless of course you restart gitk with the SHA of that old commit additionally, then it will again be shown as long as it is still present in the repository
12:41 gibbocool joined #git
12:42 Vampire0 cousteau, or Ctrl+F5, I always forget which of the two modifiers it was, I have it in mechanical memory of my hand, was a 50:50 chance to mention the right one. :-D
12:42 Vampire0 But yes, that is Reload vs Refrsh
12:42 Vampire0 cousteau, ah, no, I was right. At least here it is Shift+F5
12:43 Vampire0 And it is Update vs. Reload here
12:43 osse TIL
12:43 Vampire0 TIL?
12:43 tobiasvl Today I Learned
12:44 paissad_ joined #git
12:44 Vampire0 ah, ok
12:44 brent__ joined #git
12:45 canton7 TYL what TIL means ;)
12:45 aapaaal joined #git
12:45 ToBeCloud joined #git
12:45 osse MFW
12:45 _ikke_ MRW
12:46 cousteau Vampire0, yes, here too
12:46 cousteau it is mislabeled on the menu
12:47 kbeflo joined #git
12:47 cousteau also, I said "Reload" because I had it in Spanish and just guessed the translation
12:47 khfeng joined #git
12:47 roelmonn_ joined #git
12:48 * cousteau wonders how it is possible to mislabel a shortcut in a menu
12:48 ankit01ojha joined #git
12:49 Vampire0 cousteau, the menu says it is Ctrl+F5 while it is Shift+F5? For me also the menu says Shift+F5. Are you on OS X?
12:49 cousteau no, Linux, but probably a super old version of gitk
12:50 IRQ` left #git
12:51 osse It's not inconceivable that soemthing is lsot in translation when you translate "update" and "reload"
12:51 perlpilot joined #git
12:52 buffal0 joined #git
12:52 cbegin joined #git
12:52 osse Or someone could submit a patch and hide "El impuesto es el robo" somewhere in a huge translation update
12:53 Vampire0 cousteau, it is the one from 2.9.3.windows.1 here
12:54 tymczenko joined #git
12:54 webguynow joined #git
12:55 marianina8 joined #git
12:56 cousteau I'm still trying to figure out how to get the version of gitk
12:56 Tatou left #git
12:56 cousteau 1:1.7.9.5-1ubuntu0.3 ...probably old-ish
12:56 basiclaser joined #git
12:56 cousteau I think it's like a year old or so
12:57 tymczenko joined #git
12:58 jeffreylevesque joined #git
12:58 osse ♫ ♪ Fiiiiive yeeeaaars ♪
12:59 osse and four days
12:59 JeroenT joined #git
12:59 osse RIP David Bowie
13:00 skalpin how can I push to a new remote branch and not set the upstream?
13:00 osse skalpin: leave out the -u
13:01 marianina8 joined #git
13:01 Vampire0 cousteau, 1.7.9.5 is from march 2012, so not quite a year. :-D
13:01 skalpin git push origin newbranchname gave me 'error: src refspec newbranchname does not match any.'
13:01 Vampire0 cousteau, maybe you should update, at least your Git, on a very old Ubuntu I simply compile Git myself and have the latest and greatest, not very problematic
13:01 osse skalpin: do you have a local branch named newbranchname ?
13:02 skalpin no
13:02 osse skalpin: so I guess you want to push the current one =
13:02 osse git push origin HEAD:refs/heads/newbranchname
13:04 Vampire0 cousteau, actually it is the single-liner `make prefix=/usr all doc info && sudo make prefix=/usr install install-doc install-html install-info` to install it to the system locations if the needed tools like dobook2x and so on are installed already
13:04 skalpin osse: ty that's exactly what I wanted
13:04 cousteau ok, maybe it was ...ah, that must be the date when I installed it, duh m(
13:05 Vampire0 cousteau, probably
13:06 leeN joined #git
13:07 iamthad joined #git
13:08 porsche944 joined #git
13:08 Gsham joined #git
13:09 Cabanossi joined #git
13:09 Darcidride joined #git
13:12 ExoUNX joined #git
13:12 peterbec` joined #git
13:12 buffffal00 joined #git
13:16 mehola joined #git
13:18 pinkkis joined #git
13:19 theoceaniscool joined #git
13:20 GT4066 joined #git
13:21 raspado joined #git
13:22 kbs joined #git
13:25 dglambert joined #git
13:25 dglambert yo
13:25 chachasmooth joined #git
13:26 karols146 joined #git
13:26 snowalpaca joined #git
13:27 theiostream joined #git
13:27 buffal0 joined #git
13:27 netj joined #git
13:28 nilg joined #git
13:29 gtifbv joined #git
13:30 h12o joined #git
13:31 DarkPsydeLord joined #git
13:31 octo8 joined #git
13:32 mda1 joined #git
13:33 dsdeiz joined #git
13:33 dsdeiz joined #git
13:33 octo8 Hello, what does     *~     mean in .gitignore files ?
13:34 osse octo8: all files that end with a tiled
13:34 osse tiled
13:34 osse fuck
13:34 chachasmooth joined #git
13:34 skalpin lol
13:34 octo8 osse: thanks, got the idea
13:34 thebope joined #git
13:35 octo8 and this           folder1/folder2/*   ....
13:35 octo8 it will ignore all the folders in folder2 ? what about the subfolders of folder2 ?
13:36 octo8 i can't see good documentation for .gitignore :(
13:36 smokeysea joined #git
13:37 skalpin https://git-scm.com/docs/gitignore ?
13:38 Elzington joined #git
13:38 smokeysea Hello all, I have a mongodb backup based on git; so we do hourly mongodump to files and they are pushed on git. Data is not huge; less than a GB. But .git size has piled up because all the push histroy is maintained; Is there any way to reduce .git size ?
13:40 mischat_ joined #git
13:41 Dougie187 joined #git
13:42 GodGinrai joined #git
13:42 osse octo8: they are regular patterns like *.txt etc. for the most part.  man gitignore
13:42 gitinfo octo8: the gitignore manpage is available at http://jk.gs/gitignore.html
13:42 * octo8 is reading
13:42 steeze joined #git
13:44 theiostream joined #git
13:46 kbs smokeysea: I assume git-gc isn't a panacea for your particular situation :-)?
13:48 Ice_Strike joined #git
13:48 oleo joined #git
13:49 lugzer joined #git
13:50 arooni joined #git
13:50 plasticle joined #git
13:54 Cabanossi joined #git
13:55 octo8 osse: skalpin: i have read both pages, I still want to to know if 'folder1/folder2*' will exclude all files in folder2 and sub folders of folder2, right ?
13:58 kbeflo joined #git
13:59 Assault_ joined #git
13:59 crose joined #git
14:00 GodGinrai joined #git
14:02 hiwk joined #git
14:03 demize smokeysea: Other than removing history, switch to a non-binary backup format that diffs well and git will pack them up rather nicely.
14:03 bannakaf_ joined #git
14:03 eahmedshendy joined #git
14:03 cousteau left #git
14:04 hiwk I have a bunch of tags, and I have a file A with a number of commits. How can I list, per tag, which version of file A is refered to by the tag?
14:05 inflames joined #git
14:05 hiwk or, alternatively, how can I in the log for file A list which tag checkout would yield which commit of file A?
14:06 hiwk git log --decorate -- A does not help me, because the commits that are listed for file A are not the ones the tags reffer to
14:07 octo8 osse: skalpin: i made an experiment myself, it does exclude sub folders all files...
14:07 menip joined #git
14:07 TbobbyZ joined #git
14:08 snowalpaca joined #git
14:12 LeBlaaanc joined #git
14:13 peterbec` joined #git
14:13 publio joined #git
14:13 holodoc joined #git
14:13 lavalamp joined #git
14:13 chachasmooth joined #git
14:20 Murii joined #git
14:20 bitmod joined #git
14:20 cdg joined #git
14:21 aw1 joined #git
14:24 kbeflo joined #git
14:24 cdg joined #git
14:24 ronin_work joined #git
14:25 Starky joined #git
14:25 osse octo8: Ahh.
14:25 osse I like your attitude
14:26 matoro joined #git
14:26 manuelschneid3r joined #git
14:27 jagob joined #git
14:28 kbs joined #git
14:28 Starky joined #git
14:28 thebope joined #git
14:31 oskarkv joined #git
14:32 addf joined #git
14:34 peacememories joined #git
14:34 h12o joined #git
14:36 Gianormagantrous joined #git
14:36 Gianormagantrous joined #git
14:37 ash_workz joined #git
14:41 mischat joined #git
14:42 yehowyada joined #git
14:42 ferr1 joined #git
14:44 AaronMT joined #git
14:47 Eryn_1983_FL joined #git
14:49 mischat joined #git
14:51 dendazen joined #git
14:53 CustosLimen hi
14:53 CustosLimen I have a bunch of utter nawbs here
14:53 CustosLimen where is a good course for git ?
14:53 CustosLimen that is free ?
14:54 CustosLimen interactive will be awesome
14:54 dglambert joined #git
14:54 Hedgework CustosLimen: Depends... newbs to git with experience at other SCMs, newbs to git who prefer very mathy things with graphs of the internals, or newbs to git who think everything sounds terrifying and want to learn by rote?
14:55 CustosLimen https://try.github.io/
14:55 CustosLimen that is actually good
14:55 Hedgework CustosLimen: That's good for the third group mentioned, but it will give them NO idea of what git is doing.  It's purely rote learning.
14:55 steeze joined #git
14:56 Gloomy joined #git
15:00 visual well have a good day guiz!
15:01 exarch joined #git
15:03 cdg joined #git
15:04 CustosLimen Hedgework, rote ?
15:04 CustosLimen Hedgework, nawbs nawbs like in probbably should not be using a computer
15:04 JeroenT joined #git
15:06 mischat_ joined #git
15:06 Hedgework CustosLimen: rote means drilling them until they memorize the steps, without caring whether they understand why they are doing it
15:07 CustosLimen Hedgework, rote is then the best I can hope for I guess
15:07 Hedgework CustosLimen: in that case...stick with the rote method until they have some clue, but have 1-2 of the smarter ones learn how git actually works so they can unscrew everyone else's merges when they break stuff
15:07 CustosLimen TIL a new word though ;)
15:08 Hedgework :D
15:09 CustosLimen Hedgework, I will just give them a copy pasta to throw away local changes on merge conflicts
15:10 s2013 joined #git
15:10 Hedgework CustosLimen: Just please tell me you are not a CS prof
15:11 Hedgework I have to deal with the people you schmucks give degrees to...
15:11 CustosLimen Hedgework, no
15:11 holodoc joined #git
15:11 theiostream joined #git
15:11 CustosLimen Hedgework, I'm just a poor developer working at a dying company :/
15:12 bitmod_ joined #git
15:12 Hedgework awww :(
15:13 Hedgework My condolences, then.
15:13 moei joined #git
15:14 moei joined #git
15:15 mohan_ joined #git
15:15 peterbec` joined #git
15:17 TbobbyZ joined #git
15:17 mehola joined #git
15:18 nobitanobi joined #git
15:18 mohan_ joined #git
15:19 Gustavo6046 joined #git
15:19 trulycool joined #git
15:20 kbs joined #git
15:20 jimklo joined #git
15:21 drodger joined #git
15:22 andrew710 joined #git
15:22 thebope joined #git
15:23 nobitanobi Is there a way to find the logs of a specific method in Ruby? I am trying to use `git log -L` with funcname option, but I am getting a `fatal: -L parameter 'initialize' starting at line 1: no match` . I am in 2.3.8 version and according to https://git-scm.com/docs/git-log/2.3.8 I have that feature
15:23 nobitanobi I am doing this: `git log -L :initialize:my_filename.rb`
15:24 nobitanobi I am basically trying to find the logs specific to that `initialize method in that file
15:24 mohan_ joined #git
15:25 selckin joined #git
15:25 ronin_work joined #git
15:26 troulouliou_div2 joined #git
15:27 FrozenFire Is it possible to have a submodule not be cloned by git submodule update in its parent repo?
15:27 FrozenFire That is, require it to be specifically targeted
15:27 marianina8 joined #git
15:28 Dougie187 FrozenFire: Isn't the the default? I thought you needed to specify `git submodule update --recursive` to get sub-submodules.
15:28 kbeflo joined #git
15:29 FrozenFire Dougie187, I'm asking about a submodule, not recursive
15:29 thiago joined #git
15:29 FrozenFire I have a submodule in this repo which is only accessible to specific people
15:29 kbeflo joined #git
15:29 Dougie187 Oh, sure. `man git submodule`
15:29 gitinfo the git-submodule manpage is available at http://jk.gs/git-submodule.html
15:29 Dougie187 Look at update.
15:29 Dougie187 It takes a path.
15:29 Dougie187 So, you can specify which you want to update, and which you don't want to.
15:30 Dougie187 I'm also pretty sure that if they don't init the repo, update won't do anything.
15:30 Dougie187 err, init the submodule.
15:30 sz0 joined #git
15:32 drodger joined #git
15:32 ResidentBiscuit joined #git
15:32 schleppel joined #git
15:33 Droolio joined #git
15:33 brent__ joined #git
15:33 mohan_ joined #git
15:33 shgysk8zer0 joined #git
15:34 buffffal00 joined #git
15:36 FrozenFire Great. Thank you. :)
15:36 synthroid joined #git
15:37 Khisanth joined #git
15:37 synthroi_ joined #git
15:37 jagobdue joined #git
15:38 bouncy joined #git
15:39 xall joined #git
15:44 dreiss joined #git
15:44 grayjoc joined #git
15:45 raspado joined #git
15:48 netroxen joined #git
15:48 hiwk left #git
15:49 drodger joined #git
15:50 GT4066 joined #git
15:51 theoceaniscool joined #git
15:54 digidog joined #git
15:55 _Vi joined #git
15:55 xanadu_ joined #git
15:55 smokeysea joined #git
15:57 brent__ joined #git
15:57 svm_invictvs joined #git
15:58 Gsham joined #git
16:00 JanC_ joined #git
16:02 Hanumaan joined #git
16:03 darkmist joined #git
16:03 Hanumaan is it good to keep files of sizes above 25 MB in git?
16:03 nowhere_man joined #git
16:03 mda1 joined #git
16:03 FrozenFire Is it good? No
16:04 FrozenFire Can you do it? Yeah
16:04 synthroid joined #git
16:04 Hanumaan FrozenFire, what would be max size you recommend in git?
16:04 FrozenFire It's more about what the file is
16:04 FrozenFire Do you need to version that file?
16:05 FrozenFire Is it a format which can be intelligibly diffed?
16:05 dtbn joined #git
16:05 Hanumaan yes it might change in 6 every months and it is not a binary file
16:05 FrozenFire In that case, sure, put it in git.
16:05 Hanumaan its a text file
16:05 FrozenFire But you might want to break that file up into pieces instead
16:05 FrozenFire That is, use include syntax in the relevant language
16:06 s1scha joined #git
16:06 Hanumaan is there any in-built technique that breaks file in git?
16:07 roelmonnens joined #git
16:07 FrozenFire Don't think so
16:07 FrozenFire The purpose of breaking the file up would be to make it easier to manage changes
16:08 henriknj joined #git
16:11 drodger joined #git
16:12 durham joined #git
16:15 xall joined #git
16:15 PaoloP joined #git
16:15 al-damiri joined #git
16:16 PaoloP left #git
16:16 faLUCE joined #git
16:16 peterbec` joined #git
16:17 thebope joined #git
16:17 tang^ joined #git
16:17 hashtagstrashtag joined #git
16:18 mehola joined #git
16:18 dvaske joined #git
16:20 tyreld joined #git
16:22 pks joined #git
16:22 LionsMane joined #git
16:23 vhscrb joined #git
16:25 madewokherd joined #git
16:25 drodger joined #git
16:26 fuzzzerd joined #git
16:26 iehl joined #git
16:28 mischat joined #git
16:28 jstimm joined #git
16:29 bkeys joined #git
16:29 bkeys How do I fetch a remote branch?
16:29 bkeys Running `git fetch --all' does nothing
16:30 TomyLobo2 joined #git
16:30 ayogi joined #git
16:30 whitby "fetch a remote branch"?
16:30 whitby Do you mean checkout?
16:31 bkeys I guess?
16:31 orbyt_ joined #git
16:31 bkeys I just want to download a remote branch
16:32 fbwnd joined #git
16:32 Fallen0223 joined #git
16:32 whitby Ah, yeah, so it's (kind of) a two step process. `git fetch $remote` will download it. `git checkout $branch` will check it out..
16:32 bkeys So say my branch is called foo_bar
16:32 a_thakur joined #git
16:32 bkeys It would be git fetch origin/foo_bar
16:33 whitby (That might work, I'm not sure off-hand, but) `git fetch origin && git checkout foo_bar` would work.
16:33 bkeys git fetch origin does nothing
16:33 drodger joined #git
16:34 whitby It does something :)
16:34 whitby It might have done it already
16:34 aielima joined #git
16:34 bkeys I do git branch -l and it just shows master
16:34 whitby Yes, you need the 2nd half of the command: `git checkout foo_bar`
16:35 bkeys error: pathspec 'binary_map' did not match any file(s) known to git.
16:35 fxrs joined #git
16:36 whitby Is that after trying to checkout?
16:36 bkeys Yes
16:36 smokeysea left #git
16:37 xanadu_ joined #git
16:37 whitby Weird, are you sure that you have the correct branch name?
16:37 jab416171 if I add a file on the master branch, make a new branch, delete the file, and then re-add the same file, is git now tracking two version of that file (taking up twice as much space) or is it smart enough to only store one copy?
16:37 bkeys whitby: I am just on master on a freshly cloned repo
16:38 jab416171 this is a binary file
16:38 orbyt_ joined #git
16:38 matoro joined #git
16:38 whitby bkeys: `git branch -vv --all` show the branch in the list (it should show up as `origin/$name`
16:38 whitby Does*
16:39 Cabanossi joined #git
16:39 bkeys It shows local master, remotes/origin/master, and remotes/origin/HEAD
16:39 bkeys But not my branch
16:40 whitby Then the branch doesn't exist. I'm not sure why.
16:40 whitby Are you sure it's on the remote?
16:40 drodger joined #git
16:40 bkeys https://notabug.org/bkeys/DMUX/src/binary_map
16:40 bkeys Given this is the branch I am trying to fetch, yes
16:41 kexmex joined #git
16:41 freexand joined #git
16:41 sbasso_ joined #git
16:41 whitby Weird, and you said you've run `git fetch origin`?
16:41 bkeys Yes
16:42 bkeys https://share.riseup.net/#yoZcim1gXcNj464WZLdtVA
16:43 whitby I've got nothing
16:43 whitby That's weird
16:44 bkeys Yeah all stack overflow questions tell me to do basically the same as you did
16:44 whitby Unless it's a shallow clone?
16:44 bkeys Yes it is
16:44 bkeys You mean git clone --depth=1
16:44 bkeys ?
16:44 whitby Yeah
16:44 bkeys Yeah this is a shallow clone
16:45 whitby Yeah, that's the problem
16:45 whitby It's fixable though
16:46 whitby http://stackoverflow.com/q/23708231/1267663 is what you're talking about
16:47 Cavallari joined #git
16:47 bkeys Seems like there are workarounds
16:47 bkeys But not really worth it; I will just reclone with the git history
16:47 bwn joined #git
16:48 whitby Yep, I would recommend not using shallow clones (unless you're aware of the trade-offs)
16:50 bkeys Yep that worked
16:51 raynold joined #git
16:51 dtbn joined #git
16:51 whitby jab416171: maybe, I think so (if the file is exactly the same the blob should have the same hash)
16:52 whitby Though someone else may be able to confirm
16:54 dviola joined #git
16:54 rmbeer joined #git
16:54 rmbeer hello
16:55 bkeys left #git
16:55 rmbeer what command can show all diff about of a commit? i not found where show from the gitg. (I want view from terminal why gitg is very low)
16:56 ronin_work joined #git
16:57 dysfigured rmbeer: git show <commit>  perhaps?
16:59 octo8 a bit urgent question, is this note really series ? https://paste.ofcode.org/3227wYCjiw2sCJNiGEgfRvN
16:59 rmbeer dysfigured, yes, thank! I was using it in error 'git diff [SHA]'..
17:00 LionsMane joined #git
17:02 Eryn_1983_FL joined #git
17:02 theiostr_ joined #git
17:02 lavalamp joined #git
17:03 dysfigured rmbeer: i use this with fzf.. https://u.teknik.io/uKnGQ.webm
17:03 jstimm joined #git
17:03 dysfigured git log --graph --color --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" | fzf --ansi --preview='git show --color=always "$(grep -m1 -o "[a-f0-9]\{7\}" <<< {})"' --bind='Enter:execute:LESS=-R PAGER=less git show --color=always "$(grep -m1 -o "[a-f0-9]\{7\}" <<< {})"'
17:05 bocaneri joined #git
17:05 [twisti] left #git
17:06 rmbeer dysfigured, nicee. you have a good term. :)
17:06 sequence joined #git
17:07 rmbeer dysfigured, i can view you PS1?
17:07 dysfigured i use zsh  https://github.com/DanielFGray/dotfiles/blob/master/zsh/themes/agnoster.zsh-theme
17:07 myhau joined #git
17:08 eahmedshendy joined #git
17:10 rmbeer i see. Only work for zsh.
17:10 cjohnson you can usually make something similar happen in bash
17:10 cjohnson but really you should just use zsh ;)
17:10 cjohnson where does fzf come from dysfigured?
17:10 cjohnson no package called fzf
17:11 thebope joined #git
17:11 cagomez joined #git
17:12 jast joined #git
17:12 xall joined #git
17:12 rmbeer now test zsh
17:13 octo8 if the current branch is live, and i want to push to live, then the command is 'git push origin live' ?
17:13 cd-rum joined #git
17:14 j416 octo8: that should work.
17:14 peterbec` joined #git
17:14 j416 (if your remote is called "origin")
17:15 dysfigured https://github.com/junegunn/fzf
17:15 dysfigured fzf is a lot like dmenu, it takes stdin, lets you interactively pick lines, and then prints the result to stdout. it does have a few more bells and whistles though, like --preview and --bind
17:16 cjohnson thanks, installing
17:16 dysfigured that commit viewer is actually part of a script i'm writing  https://github.com/DanielFGray/fzf-scripts/blob/master/fzgit
17:16 dreiss joined #git
17:17 grayjoc joined #git
17:17 kbeflo joined #git
17:17 kbeflo joined #git
17:18 faLUCE hello does myfile pass to stage area when I do git add myfile?
17:18 Gianormagantrous joined #git
17:18 Gianormagantrous joined #git
17:18 faLUCE sorry for the stupid question. just checked
17:19 cjohnson yes, that's what add does
17:19 cjohnson add it to the staging area
17:19 cjohnson then commit takes your staged changes and bundles them as a commit
17:19 rts-sander I type git rebase -ip HEAD~4, resolve a conflict
17:19 rts-sander now a commit is missing
17:19 faLUCE cjohnson: ok thanks
17:19 rmbeer left #git
17:20 cyberz joined #git
17:23 synthroid joined #git
17:27 peacememories joined #git
17:28 choki joined #git
17:29 choki What is the difference between a bare git repo and git clone --separate-git-dir ?
17:30 jast the one cloned with --separate-git-dir still contains an index and is marked as a non-bare repo
17:31 choki hmm i don't understand yet :/
17:31 gopar joined #git
17:31 qqx choki: A bare repo doesn't have an associated working tree where the content is readily accessible. Using --separate-git-dir still has one, just has the repo in a different location than usual.
17:31 nixjdm joined #git
17:34 a_thakur joined #git
17:34 choki i dont know why op is using --bare but in the comments below they recommend --separate-git-dir https://news.ycombinator.com/item?id=11070797
17:35 kpease joined #git
17:37 theiostream joined #git
17:39 dn1987p joined #git
17:39 bvtton joined #git
17:39 gopar joined #git
17:41 matoro joined #git
17:42 hhee joined #git
17:44 drodger joined #git
17:45 cjohnson so basically it lets you simulataneously do a bare clone and get a detached working copy?
17:46 cjohnson would you be able to switch branches on that working copy?
17:46 cjohnson or is this just a one-off copy
17:46 cjohnson just curious, never heard of this flag
17:49 choki me too, i just wanna improve the way i deal with ma dotfiles :v
17:50 cdleonard joined #git
17:51 qqx cjohnson: It is not a bare clone. It's a normal clone, just with a different layout.
17:51 qqx You can use it as you would any other non-bare repo.
17:54 sequence I have an interesting problem related to "missing necessary objects" on push: https://pastebin.com/E03yBeUz
17:54 sequence I'd appreciate any help on this, totally stuck.
17:54 theiostream joined #git
17:54 sequence `git fsck --full` returns one dangling blob, but is otherwise ok
17:55 mroth_ joined #git
17:55 Onionnion_ joined #git
17:55 aleb_ joined #git
17:55 nitemare joined #git
17:55 ec_ joined #git
17:56 Travis-42_ joined #git
17:56 aendrew_ joined #git
17:56 reznord_ joined #git
17:56 martin_g_ joined #git
17:56 huhlig_ joined #git
17:56 dddaviddd joined #git
17:56 theoceaniscool joined #git
17:56 unixdork joined #git
17:56 thekingofbandit joined #git
17:56 mikap joined #git
17:56 jbondhus joined #git
17:57 cjohnson_ joined #git
17:57 d1b_ joined #git
17:57 grantrul1s joined #git
17:57 likewhoa- joined #git
17:57 djh_ joined #git
17:58 Soliton_ joined #git
17:58 Ratler_ joined #git
17:59 marvi joined #git
18:00 Matsv joined #git
18:00 ghormoon joined #git
18:00 niax joined #git
18:00 gruetzkopf joined #git
18:00 EvilJStoker joined #git
18:00 Joost joined #git
18:00 Nevik joined #git
18:00 imack joined #git
18:01 jagobdue joined #git
18:01 traxo-xx joined #git
18:01 vrishab joined #git
18:02 monty joined #git
18:02 reznord_ left #git
18:02 saintaquinas[m] joined #git
18:03 freekevin joined #git
18:03 pepijndevos joined #git
18:03 Eragon joined #git
18:03 ac3takwas joined #git
18:03 Darcidride_ joined #git
18:03 TbobbyZ_ joined #git
18:04 choki joined #git
18:04 Sasazuka joined #git
18:04 dtbn joined #git
18:04 s1scha joined #git
18:05 thebope joined #git
18:05 reznord joined #git
18:05 Krenair joined #git
18:06 reznord left #git
18:08 myhau joined #git
18:08 Sound joined #git
18:09 plasticb1y left #git
18:10 Sound_ joined #git
18:10 plasticboy joined #git
18:12 Cabanossi joined #git
18:12 heinrich5991 joined #git
18:12 BSaboia joined #git
18:12 ertesx joined #git
18:13 LionsMane joined #git
18:13 lmat In github, how can I tell what the HEAD of the repository there is?
18:13 Discovery joined #git
18:13 sequence lmat: use `git ls-remote` with the name of the github remote
18:14 lmat sequence: excellent. Thank you.
18:15 lmat Is it possible for git version 2.11.0 to output the following message: "warning: Remote branch ... not found in upstream origin, using HEAD instead" ?
18:15 hs8136 joined #git
18:16 lmat in http://stackoverflow.com/questions/20280726 , this happens when he supplies a "tag" to  git clone --branch. But that appears to only be for an old version of git?
18:17 LeBlaaanc joined #git
18:17 faLUCE I have someproject cloned into someproject-cloned dir; if I enter into someproject-cloned dir, how can sync it with the modifications done meanwhile with upstream?
18:17 synthroid joined #git
18:18 matoro joined #git
18:19 mehola joined #git
18:20 dtbn joined #git
18:20 Rodya_ joined #git
18:20 joki joined #git
18:20 faLUCE (sorry for the previous question, it was not for the channel)
18:21 bgerber joined #git
18:22 dvaske_ joined #git
18:23 roelmonnens joined #git
18:25 lmat faLUCE: git fetch --all...sort of
18:25 lavalamp joined #git
18:25 lmat faLUCE: It's a separate repository. If you want it completely synchronized, re-clone using --mirror.
18:25 lmat faLUCE: If you want the commits from the "upstream" repositories, git fetch --all; should do the trick.
18:26 faLUCE thnks lmat, I'm reading docs about the difference between pull and fetch
18:28 ronin_work joined #git
18:30 theiostr_ joined #git
18:35 scoobertron joined #git
18:35 nitric joined #git
18:40 drodger joined #git
18:41 Sleepy63 joined #git
18:42 Sasazuka joined #git
18:43 chachasmooth joined #git
18:44 hahuang65 joined #git
18:45 drodger joined #git
18:46 saintaquinas[m] joined #git
18:49 jimi_ joined #git
18:50 freexand joined #git
18:51 freexand joined #git
18:51 xper0 joined #git
18:53 marianina8 joined #git
18:53 freexand joined #git
18:53 marianina8 joined #git
18:55 kfoonamalik joined #git
18:55 gopar joined #git
18:55 freexand joined #git
18:56 Cabanossi joined #git
18:56 freexand joined #git
18:58 freexand joined #git
18:58 kyan joined #git
18:59 thebope joined #git
19:00 mikecmpbll joined #git
19:00 freexand joined #git
19:01 freexand joined #git
19:02 freexand joined #git
19:03 freexand joined #git
19:05 Emperor_Earth_ joined #git
19:06 hahuang61 joined #git
19:06 peterbec` joined #git
19:06 chachasmooth joined #git
19:09 hahuang65 joined #git
19:11 jimi_ joined #git
19:12 robotroll joined #git
19:13 Brski joined #git
19:13 Acerific joined #git
19:14 hahuang61 joined #git
19:14 dtbn joined #git
19:14 archaic joined #git
19:15 chachasmooth joined #git
19:18 borkr joined #git
19:22 kexmex joined #git
19:24 tvw joined #git
19:24 Groscheri joined #git
19:26 pedahzur joined #git
19:26 dhollinger joined #git
19:26 TbobbyZ joined #git
19:27 Eragon joined #git
19:27 PaulCapestany joined #git
19:27 pedahzur I found this e-mail thread from 2009, which describes a feature that would be really handy right now: http://git.661346.n2.nabble.com/PATCH-format-patch-add-prefix-to-prepend-a-prefix-to-output-file-names-td3048920.html It's quite the discussion, but it seems the feature was never actually added. Anyone know what happened to it?
19:28 mkoskar joined #git
19:28 cagomez joined #git
19:29 damsel joined #git
19:30 damsel Hello I was just wondering git reg-list --count origin  counts unique commands that are on local but not on remote, EXCLUDING merge-commits(merged on local) how can I count them as well?
19:30 bannakaffalatta joined #git
19:30 ThiefMaster left #git
19:31 damsel because git status tells me that my branch is 12 commits ahead while git rev-list --count origin only tells me there are 6 commits
19:31 ThiefMaster joined #git
19:31 Eragon joined #git
19:33 MutantMahesh joined #git
19:34 qqx damsel: `git rev-list --count origin` would tell you how many commits are in "origin", nothing related to your current branch. Try `git rev-list --count origin..`.
19:34 Eragon joined #git
19:34 PaulCapestany joined #git
19:35 damsel qqx it tells me 59,
19:35 roelmonnens joined #git
19:35 damsel btw what is up with the ..suffix?
19:35 cagomez joined #git
19:35 qqx damsel: That specifies a range, with nothing after it defaults to using HEAD as the end.
19:36 qqx It specifies commits in HEAD that aren't also in origin.
19:36 damsel ths
19:36 qqx To get even closer to what status would be doing you could use `git rev-list --count @{u}..`.
19:37 qqx @{u} specifies the upstream branch for your current branch.
19:38 damsel ok how come I do not see that in the documentation? besides ref@{u}
19:39 damsel or to formulate it differently how can I know?(for me for future learning
19:39 damsel @{u}.. did the trick. I count 12.
19:39 damsel how come --count HEAD is not counting merge-commits?
19:39 qqx It's listed in man git-rev-parse.
19:39 gitinfo the git-rev-parse manpage is available at http://jk.gs/git-rev-parse.html
19:40 damsel ok I was only looking at rev-list
19:41 alexandre9099 joined #git
19:41 damsel thank you very much
19:41 qqx For me --count includes merges unless I specifically say --no-merges
19:41 chipotle joined #git
19:42 damsel ok that is strange ... when I specify --merges nothing changes for me
19:42 damsel where did your changes occure? local or remote?
19:42 askb joined #git
19:42 regedit joined #git
19:43 damsel hmm in the manpages it states for rev-list ... omit patch equivalent commits ....
19:44 gtristan joined #git
19:44 qqx That's only when used with --cherry-mark.
19:46 qqx Perhaps try !graph to help figure out what is being included.
19:46 gitinfo [!lol] A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
19:46 PaulCapestany joined #git
19:47 damsel ok.. then I do not know, I can only say how I arrived there, remote branch dev and abc, changes made in dev pushed by me, merged into dev, and then I merged from dev directly into abc locally
19:47 damsel and only the merge-commits are excluded
19:47 damsel all dedicated commits are counted
19:48 cagomez joined #git
19:49 damsel on the note of git rev-parse, it reads like it contains all the "funky" expressions one would need for some nifty scripts if necessary, and that are understood by most/all git-commands. good to know was always wondering where some find these paramters in the SO-answers
19:49 grayjoc joined #git
19:50 UrsoBranco joined #git
19:52 damsel anyways thanks for all the help qqx :D
19:53 Eugene It also slices, dices, and collates double-sided printing
19:53 damsel especially the rev-parse thing
19:53 thebope joined #git
19:53 satifant joined #git
19:54 damsel Eugene, probably but I don't wanna find out quite yet, wouldn't know when I would need to actually call reg-parse anyways
19:54 damsel scared to actually kill the companies repo :D
19:54 damsel as powerfull as git is
19:54 Eugene rev-parse doesn't modify anything
19:54 damsel ok I thought your answer was related sry bout that
19:55 Eugene Nah, this is just BS funny because its my lunchtime
19:55 tang^ joined #git
19:55 richardlitt joined #git
19:56 david-e joined #git
19:56 qqx You generally wouldn't call rev-parse directly. It's mainly for use by other scripts.
19:58 Rodya_ joined #git
20:06 miczac joined #git
20:06 madduck joined #git
20:06 drodger joined #git
20:09 mischat joined #git
20:09 HurricaneHarry joined #git
20:11 chardan joined #git
20:12 darkmist_ joined #git
20:12 me__ joined #git
20:13 cydrobolt joined #git
20:13 cydrobolt joined #git
20:14 maroloccio joined #git
20:15 matoro joined #git
20:15 theoceaniscool joined #git
20:17 luke_nukem joined #git
20:17 cdg joined #git
20:20 mehola joined #git
20:24 cd-rum joined #git
20:24 me__ joined #git
20:27 NeverDie joined #git
20:28 shgysk8zer0 joined #git
20:28 j08nY joined #git
20:29 faLUCE I don't understand the meaning of this image:  https://git-scm.com/book/en/v2/images/basic-rebase-2.png   (from:  https://git-scm.com/book/en/v2/Git-Branching-Rebasing) It says that there's a merge between C3 and C4, but the picture still shows C3 and C4 as separated nodes. Why? Should they be grouped into one node called "C3+C4", instead?
20:29 Nicmavr joined #git
20:29 bejeb joined #git
20:30 sea-gull joined #git
20:30 m0viefreak joined #git
20:30 synthroi_ joined #git
20:30 kadoban faLUCE: No, that's not what merge does in git
20:31 aidalgol joined #git
20:31 g0d355__ joined #git
20:31 kadoban faLUCE: That would change history, if C3 and C4 didn't exist anymore or something. Instead, a merge commit is created, with the parents of that commit being everything that's being merged into one. C5 is a merge commit that merges C3 and C4
20:32 PaulCape_ joined #git
20:32 synthro__ joined #git
20:34 faLUCE kadoban: I see, so the actual merge is C5
20:34 faLUCE thanks
20:36 faLUCE kadoban: so the idea of the rebase is to group multiple commits into one, instead of merging separate nodes?
20:37 crose joined #git
20:37 kadoban That's certainly not how I think about rebase, that doesn't sound correct unless you're talking about some specific usage.
20:39 kadoban Rebase usually involves "cutting" a branch out of the existing tree of commits and attaching it somewhere else
20:39 preaction squash is grouping multiple commits into one. rebase is rewinding the tape and then replaying it
20:39 kadoban Where in this case we treat a commit as a set of changes from the parent. So it tries to create a new history that includes all of the same changes that happened in an old history.
20:41 faLUCE kadoban: I have to contribute to a project with a git repo and many developers. hey told me to use rebase when I have to send ONE global modificiation for multiple files with inter-dependencies.
20:42 svm_invictvs joined #git
20:42 _Vi joined #git
20:44 theiostream joined #git
20:47 thebope joined #git
20:48 orbyt_ joined #git
20:53 snits joined #git
20:54 bdonnahue joined #git
20:54 MineCoins joined #git
20:55 TheOrangeOne joined #git
20:56 jimi_ joined #git
20:58 mmattice joined #git
21:01 ronin_work joined #git
21:03 diogenese joined #git
21:07 me__ left #git
21:08 AnimeLife joined #git
21:09 AnimeLife Hi devs, when I send an email to git public inbox git@vger.kernel.org from hotmail it is not seen at http://public-inbox.org/git/. Can somebody help?
21:09 grayjoc joined #git
21:10 salamanderrake joined #git
21:10 gunnaro joined #git
21:11 tymczenko joined #git
21:11 Cabanossi joined #git
21:11 mmattice joined #git
21:13 hahuang61 joined #git
21:15 jost__ joined #git
21:15 Silenced_v2 joined #git
21:16 j416 AnimeLife: it'll take a while.
21:17 AnimeLife ah, thnx for confirmation
21:17 cd-rum joined #git
21:17 j416 AnimeLife: what's the subject line?
21:18 AnimeLife [RFC/PATCH] Make “git tag --contains <id>” less chatty if <id> is invalid expand.png print.png thread-popout.png You Hi git developers. I am a student interested for Gsoc. With my patch I am able to produce following output. $ git tag --contains qq error: malformed object name qq $ git tag --contains HEAD q Mar 30, 8:26 pm sending-spinner.gif March 30, 2017, 8:54 PM   1 open ic-dropdown-replyall.pngicon-thread-disclosure.png messa
21:19 AnimeLife Sorry
21:19 AnimeLife it is [RFC/PATCH] Make “git tag --contains <id>” less chatty if <id> is invalid
21:19 AnimeLife I just heard from other channel that vger automatically drops html messages, is that trye?
21:21 j416 I can't find your message in my mailbox, at least.
21:21 bariscant joined #git
21:21 j416 but don't send html messages.
21:21 j416 I wouldn't be surprised if it dropped those
21:21 Qdo joined #git
21:22 AnimeLife Thnx, I am fixing the html problem.
21:22 dsdeiz joined #git
21:24 roelmonnens joined #git
21:27 AnimeLife j416: Can you please check it again, I sent it in plain text this time
21:27 j416 AnimeLife: Varun?
21:28 AnimeLife Yes
21:28 j416 :)
21:28 AnimeLife btw, are you a git contributer?
21:28 t0by joined #git
21:30 keks[m] left #git
21:31 Silenced_v2 joined #git
21:31 j416 technically yes, but not really, no.
21:32 j416 I have contributed 1 character to the project.
21:32 j416 XD
21:32 AnimeLife haha, but thaanks for helping me ;)
21:32 j416 o/
21:35 bomb-on joined #git
21:35 grayjoc joined #git
21:36 juvenal joined #git
21:39 davidfetter_ge joined #git
21:40 davidfetter_ge hi
21:40 davidfetter_ge if i move and edit a file in a commit, is there any way to record that it's been "renamed" instead of a delete/create
21:41 Peng No, but if you adjust the rename detection settings, it'll probably noticde
21:41 davidfetter_ge how do i do that?
21:41 kbs joined #git
21:41 thebope joined #git
21:42 WeiJunLi joined #git
21:42 TheHelper joined #git
21:42 WeiJunLi i have a super slow connections there's any option i can add on git clone cmd to prevent time outs?
21:43 Chinggis6 joined #git
21:43 jast davidfetter_ge: some of the operations in which rename detection is relevant let you specify a detection threshold, e.g. git log -M80. however, if you have too many edits in a renamed file you probably won't find a threshold that doesn't also detect renames where there actually weren't any. :)
21:43 TheHelper left #git
21:43 TikityTik joined #git
21:43 danboid joined #git
21:45 danboid How would I go about creating a patch that represents a branch?
21:45 crippleye joined #git
21:46 molgrum joined #git
21:46 molgrum joined #git
21:46 danboid Is my question clear, I wonder?
21:46 kevy0 joined #git
21:47 davidfetter_ge as in the patch that represent the diff from another branch?
21:48 jtoy joined #git
21:48 danboid I have a branch against linux git. I want to create a 'diff' of that branch so that I can create a patch for rc4 that does what the branch does
21:48 danboid I don't own the branch
21:49 danboid I have requested the maintainer of that branch do this for me but surprisingly he's not responded :)
21:49 btree left #git
21:49 cjohnson git diff master...branch
21:49 cjohnson should show you changes introduced in branch since the diverging point
21:49 cagomez joined #git
21:50 tanuki joined #git
21:50 cyberz joined #git
21:50 danboid cjohnson, That's part of what I need - thanks
21:51 cjohnson what is the rest?
21:51 danboid cjohnson, Is there an easy way to dump that into a regular diff patch file?
21:51 cjohnson it outputs in patch format
21:51 cjohnson just write the output to a file
21:51 danboid Oh OK :)
21:51 cjohnson git diff master...branch > my.patch
21:54 Dougie187 left #git
21:56 masuberu joined #git
21:56 Cabanossi joined #git
21:57 jtoy joined #git
21:59 juvenal joined #git
22:00 Atm0spher1c joined #git
22:01 buffal0 joined #git
22:01 de-facto joined #git
22:02 cyberz joined #git
22:04 Atm0sphe1 joined #git
22:05 dave0x6d joined #git
22:05 Atm0sphe1 joined #git
22:07 mmattice joined #git
22:07 blackwind_123 joined #git
22:08 FrozenFire Does anyone know of a decent resource on pointing submodules to the tip of a remote branch? I've read http://stackoverflow.com/a/9189815/1069833 and it's more of a how-to than information about the pros/cons and underlying implementation.
22:08 FrozenFire In particular, I have a dependency as a submodule which should preferably always be at a branch's HEAD.
22:09 sim642 joined #git
22:09 habbasi joined #git
22:10 myhau joined #git
22:11 tanuki joined #git
22:13 mda1 joined #git
22:13 danboid cjohnson, Actually, I need to diff against a specific tag in a branch
22:14 manuelschneid3r joined #git
22:14 tanuki joined #git
22:17 cjohnson danboid: that's fine, replace branch with the tag
22:17 cjohnson the tag just refers to a specific commit in the branch whcih means it will share the same history up to that point with the branch
22:17 b0nn joined #git
22:17 cjohnson and thus, the same common ancestor
22:18 b0nn hi all, I've got a bit of a mess I want to clean up; I am in a branch, and I am getting a message about being ahead of a different branch by n commits. All I want to do is scratch and git clone, without causing any issues for anyone else
22:19 b0nn How do I do that?
22:19 cjohnson to me the easiest way to do that is to just delete the local copy and re-clone
22:20 cjohnson but if you have some untracked local files
22:20 b0nn les, that's what I want to do
22:20 cjohnson oh then yeah, just do that
22:20 cjohnson delete the dir
22:20 danboid cjohnson, So if this is the branch command `git fetch https://git.pengutronix.de/git/pza/linux.git tags/v4.10-ipu-dp-plane-fix`
22:20 b0nn Are you saying, just rm -rf the tree?
22:20 cjohnson git clone
22:20 cjohnson yeah that's what I do if I don't have important untracked files/changes
22:20 danboid cjohnson, How does that translate into a branch/tag
22:21 b0nn good, I'll give it a go.
22:21 mehola joined #git
22:21 cjohnson danboid: well normally if you are specifically wanting to compare with a remote
22:21 cjohnson I would set it as an actual remote instead of hard specifying the URL
22:22 cjohnson git remote add upstream https://git.pengutronix.de/git/pza/linux.git
22:22 cjohnson then you can just use upstream/tags/v4.10-ipu-dp-plane-fix
22:22 bannakaffalatta joined #git
22:22 cjohnson to refer to that upstream tag
22:22 danboid cjohnson, OK - thanks!
22:23 darkmist_ joined #git
22:27 danboid cjohnson, Nah I'm lost :)
22:27 druonysus joined #git
22:27 danboid cjohnson, I want to diff  https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git aagainst that branch and tag above
22:28 cjohnson which branch of the linked repo are you diffing against
22:28 cjohnson you can't diff a branch against a whole repo
22:29 zerocua joined #git
22:29 jimi_ joined #git
22:29 danboid cjohnson, I want to diff againt Linux 4.11rc4
22:29 cjohnson that's the name of the branch?
22:29 cjohnson or what
22:29 danboid 4.11-rc4
22:30 danboid Its a test release
22:30 cjohnson git remote add upstream https://git.pengutronix.de/git/pza/linux.git
22:30 gugah joined #git
22:30 cjohnson git diff upstream/tags/4.11-rc4..tags/v4.10-ipu-dp-plane-fix
22:30 cjohnson two dots gives you a complete diff
22:31 cjohnson three dots will tell you differences from one side only
22:32 danboid that first command: `fatal: Not a git repository (or any of the parent directories): .git`
22:32 ronin_work joined #git
22:33 cjohnson you can't run git commands in a dir that isn't a git repo
22:33 danboid cjohnson, I need to clone the repo I'm diffing against first do I?
22:34 cjohnson Wait, you just want to diff two branches on the same remote repo?
22:34 cjohnson I thought you wanted to diff your local changes to the remote
22:34 FrozenFire If I've used `git submodule update --remote`, how can I reset an affected submodule's superproject commit back to what it was?
22:35 cjohnson from the super project, you can just git reset HEAD path/to/submodule
22:35 FrozenFire Thanks
22:35 Fallen0223 joined #git
22:35 danboid cjohnson, No. I want to diff a tag on one repo (the latest Linux 4.11 rc4) against a tag in a different repo/tag
22:35 thebope joined #git
22:36 david-e left #git
22:36 cjohnson when you say repo, do you mean branch?
22:36 cjohnson you can't compare across two repositories
22:36 cjohnson unless they are clones of one another of course
22:36 cjohnson sorry I see now. You have two remotes, presumably one is a clone of the other
22:36 danboid cjohnson, Yes, they are all clones of the Linux kernel
22:37 cjohnson I would clone the authoritative master, then add each one as a remote
22:37 cjohnson then use the diff command using the remote name in the path for each
22:37 cjohnson git remote add official //git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
22:37 zerocua_ joined #git
22:37 cjohnson woops
22:38 cjohnson git clone https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
22:38 cjohnson git remote add pengutronix https://git.pengutronix.de/git/pza/linux.git
22:38 cjohnson git diff tags/4.11rc4...pengutronix/tags/v4.10-ipu-dp-plane-fix
22:38 cjohnson something like that
22:39 danboid cjohnson, OK - I should be able to work it out from here :)
22:39 danboid I've only ever used the most basic features of git
22:41 b0nn hm, so, the clone went well (ish) but I'm missing code locally that exists remotely
22:41 Cabanossi joined #git
22:41 darkmist_ joined #git
22:42 chipotle joined #git
22:43 b0nn I can see the code remotely ( bitbucket) but it doesn't exist locally
22:43 b0nn ideas
22:43 b0nn ?
22:44 cjohnson different branch?
22:45 anuxivm joined #git
22:49 Tatou_ joined #git
22:50 shgysk8zer0 joined #git
22:51 Tatou_ left #git
22:51 Fallen0223 joined #git
22:51 Tatou joined #git
22:51 Tatou test
22:53 gunnaro_ joined #git
22:56 Tatou I want to mirror all my gitlab repos to local. Is this doable?
22:56 cagomez joined #git
22:57 Guest30225 joined #git
22:57 kbs dunno much about gitlab, but curious - what does mirror'ing mean in this context (presumably not just cloning all repos :-)
22:57 Tatou Cloning all repos and keeping htem up to date!
22:58 Tatou I'm not sure how much I trust gitlab.. They have some sketchy approaches to keeping their service running
22:58 Guest30225 joined #git
22:58 kbs oh :-) in my naive thinking, I might just have a cron job to periodically run git update, but maybe you're looking for something different...
22:58 lb Tatou seen gitea already?
22:59 Tatou gitea?
22:59 lb Tatou gitlab/github alternative http://gitea.io/
23:00 Tatou ok cool, so here is what I need: I need private repos for me alone, for code I won't have on any machine potentially..
23:00 getxsick joined #git
23:00 Tatou Like I keep puppet manifests on there to setup my machines
23:00 lb Tatou bitbucket offers free private repos?
23:01 Tatou bitbucket is altassian?
23:01 lb yes
23:01 juvenal joined #git
23:01 Tatou Ok, that works for me!
23:01 lb there you go :)
23:02 matoro joined #git
23:03 Tatou haha, what.. I have code on there from 2012
23:03 Tatou Why the hell did I use git in 2012..
23:03 Sasazuka_ joined #git
23:04 bdonnahue joined #git
23:05 aidalgol joined #git
23:06 tmg joined #git
23:06 eb0t joined #git
23:07 zerocua_ joined #git
23:07 freexand joined #git
23:08 safe joined #git
23:08 freexand joined #git
23:11 freexand joined #git
23:12 unbalancedparen joined #git
23:13 freexand joined #git
23:13 roelmonnens joined #git
23:15 freexand joined #git
23:15 cheesegits joined #git
23:15 zerocua joined #git
23:17 freexand joined #git
23:17 gugah joined #git
23:18 todd_dsm joined #git
23:18 robattila256 joined #git
23:19 freexand joined #git
23:21 cyberz joined #git
23:28 anuxivm left #git
23:29 scoobert1on joined #git
23:29 thebope joined #git
23:30 zerocua joined #git
23:33 cyberz joined #git
23:34 danboid joined #git
23:35 tterrag so I have a bit of an odd problem to solve. someone has made 2 PRs of *about* the same content to two different branches. however, I'm trying to keep branch B purely ahead of branch A so I can merge easily.
23:36 tterrag the PR only consists of adding one file. so I essentially just want to diff the file in branch B against the one in branch A and apply it as a change instead of a new file
23:36 tterrag is that doable? or will I have to do it manually
23:36 overlord_tm joined #git
23:42 crose joined #git
23:42 curtii joined #git
23:43 albel727 joined #git
23:46 curtii Hello everyone! I got something I've been struggling with throughout the day, regarding git permissions
23:46 cyberz joined #git
23:46 curtii Wondering if anyone here has advice. I'm setting up an Icinga monitoring server, and a good recommendation I found is to make the root directory for it's configurations a git repository
23:47 curtii Been working great, doing all the stuff git is supposed to do
23:47 curtii The issue I'm running into is I'd like to make backups, by cloning (pushing, really) this repository into a mounted NFS share, and it's been problematic due to permissions
23:49 TbobbyZ_ joined #git
23:49 curtii Problem is I can't really monkey with the file permissions in the original location without screwing up the monitoring server, and without changing the permissions, I get denied permission to write to the NFS mounted backup share
23:50 zerocua joined #git
23:50 curtii Files in the original location are owned by root, and due to the way my NFS server is setup, I can't really make the share accessible to root.
23:52 shgysk8zer0 joined #git
23:54 darkmist_ joined #git
23:54 holodoc joined #git
23:54 curtii So I'm kind of stuck in one of three scenarios: I'm logged in as root, and can't write to the NFS share - Logged in as normal user, and can't access the git repo - I change the file permissions/owner, and my monitoring configuration is broken
23:55 gunnaro joined #git
23:56 j08nY joined #git
23:56 shgysk8zer0_ joined #git
23:58 danboid joined #git
23:58 sbeller joined #git

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