Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-15

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

All times shown according to UTC.

Time Nick Message
00:02 masuberu joined #git
00:06 xaviergmail joined #git
00:06 boutcher joined #git
00:07 masuberu joined #git
00:07 SwiftMatt joined #git
00:10 theoceaniscool joined #git
00:10 Cthalupa joined #git
00:10 YuGiOhJCJ joined #git
00:15 dnuke3074 joined #git
00:16 romerocesar joined #git
00:19 albel727 joined #git
00:19 dnuke3074 left #git
00:25 denimsoft joined #git
00:27 mischat joined #git
00:35 hahuang61 joined #git
00:36 voldz1tic3n joined #git
00:53 kyan joined #git
00:53 nettoweb1 joined #git
00:54 leeN joined #git
01:00 Gsham joined #git
01:02 wCPO_ left #git
01:04 davimore joined #git
01:06 cdown_ joined #git
01:07 qpdb joined #git
01:10 arescorpio joined #git
01:13 lindenle joined #git
01:28 mischat joined #git
01:32 mehola joined #git
01:37 madewokherd joined #git
01:40 Zamerick joined #git
01:41 netj joined #git
01:42 BRS-Ryan joined #git
01:45 BRS-Ryan Hello this is Ryan from BulkReefSupply.com. Do not forget about our YouTube Channel where you can watch videos about everything reefing created by me, Ryan Batcheller, CEO of Bulk Reef Supply. https://www.youtube.com/user/BulkReefSupplyCom is the link. Visit http://www.bulkreefsupply.com today for all your reefing needs, as at Bulk Reef Supply our mission is to make reefing fun & easy!
01:48 davimore_ joined #git
01:48 lindenle joined #git
01:52 Only2 joined #git
01:52 Only2 left #git
02:01 stick-shift joined #git
02:06 finalbeta joined #git
02:08 WayToDoor joined #git
02:13 leeN joined #git
02:13 menip joined #git
02:16 Wulf4 joined #git
02:19 morsecat joined #git
02:19 duderonomy joined #git
02:22 Atrumx joined #git
02:31 safe joined #git
02:32 mischat joined #git
02:36 hahuang61 joined #git
02:37 ljc joined #git
02:40 d^sh joined #git
02:46 sword` joined #git
02:46 duderonomy joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
02:51 nettoweb joined #git
02:58 jarshvor joined #git
02:58 shinnya joined #git
02:59 stick-sh_ joined #git
03:00 timvisher joined #git
03:05 chipotle joined #git
03:05 nettoweb joined #git
03:10 netj joined #git
03:17 chipotle_ joined #git
03:19 hexagoxel joined #git
03:21 svm_invictvs joined #git
03:21 variable joined #git
03:23 ankit01ojha joined #git
03:24 Vortex34 joined #git
03:25 spriz joined #git
03:27 SwiftMatt joined #git
03:28 chachasmooth joined #git
03:28 nwkj86 joined #git
03:30 unbalancedparen joined #git
03:30 dreiss joined #git
03:31 duderonomy joined #git
03:32 sunri5e joined #git
03:32 mischat joined #git
03:38 Xarodon joined #git
03:41 pizzaops joined #git
03:43 Gsham joined #git
03:44 dirtyroshi joined #git
03:46 fstd_ joined #git
03:47 Nilesh_ joined #git
03:49 diogenese joined #git
03:52 sevenever joined #git
03:54 Wasp joined #git
04:00 rchavik joined #git
04:01 Derperperd joined #git
04:05 m0viefreak joined #git
04:05 tristanp joined #git
04:09 drbean joined #git
04:16 duderonomy joined #git
04:24 gugah joined #git
04:24 nic_ joined #git
04:33 jmpp joined #git
04:33 jmpp joined #git
04:33 mischat joined #git
04:35 inflames joined #git
04:35 dave0x6d joined #git
04:37 cyan__ joined #git
04:37 hahuang61 joined #git
04:37 dreiss joined #git
04:39 ygeLN joined #git
04:46 SwiftMatt joined #git
04:50 jarshvor joined #git
04:51 toothe joined #git
04:51 toothe so...I accidently git add'ed a ton of object files
04:51 toothe How do I remove them without losing my changes?
04:51 svm_invictvs joined #git
04:52 wrouesnel1 joined #git
04:53 preaction toothe: git reset (git status should explain how to transition between states)
04:53 Derperperd joined #git
04:55 toothe thank you! :)
04:56 Derperperd joined #git
04:57 chipotle joined #git
04:57 mizu_no_oto joined #git
04:59 SwiftMatt joined #git
05:00 timvisher joined #git
05:08 fahadash joined #git
05:25 toothe left #git
05:32 timvisher joined #git
05:34 mischat joined #git
05:34 Guest54781 joined #git
05:37 zacts joined #git
05:40 JanC_ joined #git
05:41 Kaisyu joined #git
05:41 Cabanossi joined #git
05:43 n9418 joined #git
05:43 cyan__ joined #git
05:51 xaviergmail joined #git
05:52 Darren_ joined #git
05:56 drbean joined #git
05:57 overlord_tm joined #git
05:58 chachasmooth joined #git
06:01 sbulage joined #git
06:02 ianmethyst joined #git
06:03 mentazoom joined #git
06:07 Guest90141 joined #git
06:08 eizua joined #git
06:09 mikecmpbll joined #git
06:09 amdi_ joined #git
06:12 ramsub07 joined #git
06:15 timvisher joined #git
06:21 dreiss joined #git
06:30 jaggz joined #git
06:30 jaggz how can I add a dir but not the files in it?
06:30 jaggz is the git add dir/;  git rm -f dir/*;  working as I hope?
06:31 Grievre There's no such thing as "adding a dir"
06:31 Grievre empty directories are not a thing that exists in a git repo
06:31 jaggz oh
06:31 jaggz Grievre, the dirs don't show in git status after I do that
06:31 jaggz am I leaving grunge in my git repo with the files accidentally added?
06:31 Grievre Right, you can't add directories, you can only add files (as far as I can tell anyway)
06:32 jaggz I added /dir/logs/ (huge files), then git rm -f /dir/logs/*  .. :(
06:32 jaggz perhaps they're going to be added now when I commit?  yuck
06:32 chachasmooth joined #git
06:33 Grievre jaggz: So do you want the directory to be there whenever your repo is checked out?
06:33 jaggz yes
06:33 Grievre If so, what you can do is add a .gitignore to that directory and tell it to ignore all files except .gitignore
06:33 lindenle joined #git
06:33 jaggz imagine a bin/ folder.. I want the structure of the project created, but make will populate bin/ with binaries (bins I do not want in the repo themselves)
06:35 mischat joined #git
06:35 snowkidind joined #git
06:36 jaggz okay.. thanks Grievre
06:37 jaggz my bin/ and logs/ folders aren't showing in git status.. what happened when I added it and rm'ed the files before committing?
06:38 hahuang61 joined #git
06:38 col joined #git
06:39 kadoban jaggz: git doesn't track empty directories
06:39 kadoban It doesn't consider them content, only files.
06:39 jaggz kadoban, they're not empty.. one has logs, the other bins
06:40 kadoban Are the files tracked by git?
06:40 jaggz but I added the dirs, and rm'ed the files..
06:40 jaggz now I don't see either in git status
06:40 jaggz so I'm wondering if my git commit is going to add all those log files, and the removal as well
06:40 kadoban You can't trick it ... it's not going to get fooled by "hey, look over there!". It just won't do it. It looks like Grievre gave a suggestion that will work above.
06:41 jaggz so i'm going to have a ton of junk in my repo
06:41 kadoban No, a commit can't both add and remove the same things.
06:41 jaggz yeah, I'll use .gitignore from now on
06:41 jaggz it's interesting that the dirs don't show in untracked anymore
06:42 jaggz give it a shot.. mkdir foo; touch foo/bar;  git add foo; git rm -f foo/bar; git status
06:44 kadoban jaggz: It doesn't track empty directories ... why would it show that directory?
06:45 jaggz kadoban, it's not empty
06:45 jaggz kadoban, it shows it in git status initially
06:45 jaggz but when I add that dir, then git rm all the files in it, it doesn't show it anymore
06:45 kadoban Because it had a file in it.
06:45 jaggz oh crap
06:45 kadoban Meh, play with it, you'll figure it out ...
06:46 jaggz I removed the files.. ugh
06:46 jaggz now I need to unremove them.. sigh
06:46 Gloomy joined #git
06:47 Phanes joined #git
06:47 Phanes hey there
06:47 Phanes using cgit to host
06:47 Phanes looks like that's web ui only though
06:47 Phanes is there a system recommended for hosting the actual git repos
06:49 Phanes im familiar with gitlab
06:49 jaggz is there a way to recover git rm'ed files that were added and rm -f'ed before commit?
06:49 Phanes but thats overkill
06:49 Phanes just looking for a way to also host http
06:49 Phanes and a little web app that will manage repos at high level
06:50 Phanes cgit does it once the repo exists
06:52 kadoban jaggz: I think there is, but I don't know how to do it. They should be stored as a blob somewhere, but ... I forget how to find them. Make a backup of the entire repo immediately so in searching you don't nuke them
06:52 hhee2 joined #git
06:52 jaggz kadoban, thanks
06:53 kadoban jaggz: I think they might be listed in some variation of 'git fsck', but you'd have to check around, the manpage might say something. I think it'd probably be like a loose blob or dangling blob or ... I dunno what it calls it.
06:53 kadoban (really do the backup thing, just in case, it's more important than usual in this case because git is really free to delete a blob that's not reachable from any ref)
06:55 jaggz yeah, backed up just now
06:55 jaggz tarred the whole project dir
06:55 jaggz kadoban, one other question before I continue.. i did a git reset HEAD path/to/logs/2016-12.log
06:55 jaggz it didn't seem to do anything.. (that log's still gone)
06:55 jaggz that reset head didn't screw anything up right?
06:56 jaggz I had other desired uncommitted changes
06:56 kadoban jaggz: Naw, it shouldn't have screwed anything up.
06:56 jaggz I'm wondering if I just undid the past weeks of work that were, unfortunately, uncommitted
06:56 kadoban I am quite confident that it's possible to get them back without too much trouble. You might be in for a little bit of tedium though.
06:57 kadoban If you don't figure it out by tomorrow I'll be less busy then, but someone more knowledgeable about the process should be around before then anyway.
06:57 jaggz nothing too important actually.. if I don't get back those logs it's okay
06:57 jaggz but if I just undid some weeks of work.. that would be an issue
07:00 jaggz okay, nice.. yeah the reset didn't kill my work :)
07:00 jaggz phew
07:00 * jaggz wipes forehead
07:00 jaggz and fsck does show tons of blobs
07:01 dermoth joined #git
07:01 subhojit777 joined #git
07:03 navidr joined #git
07:04 Phanes really should have some kind of management system for spawning new empty repos so i dont have to ssh to a remote host and set up a bare repo every time cgit gets a new repo
07:09 davimore joined #git
07:11 jaggz Phanes, :)
07:11 Phanes a little clue would be wonderful
07:13 Motoko joined #git
07:16 jaggz Phanes, sorry I'm one of the least clueful about that
07:18 phanimahesh joined #git
07:22 pietv joined #git
07:24 chipotle_ joined #git
07:25 marchelly joined #git
07:26 ertes joined #git
07:28 d1z joined #git
07:35 shinnya joined #git
07:36 mischat joined #git
07:36 gautamsomani joined #git
07:38 pks joined #git
07:52 b3kN joined #git
07:52 b3kN joined #git
07:52 [0xAA] joined #git
07:53 drbean joined #git
07:53 spacelord_ joined #git
07:54 timvisher joined #git
07:55 b3kN joined #git
07:55 b3kN joined #git
07:59 col joined #git
08:00 vdv joined #git
08:02 cdown_ joined #git
08:08 theoceaniscool joined #git
08:09 zefferno joined #git
08:10 _ng joined #git
08:15 absinthe joined #git
08:19 dreiss joined #git
08:19 mehola joined #git
08:20 pks joined #git
08:21 vuoto joined #git
08:22 Raineer joined #git
08:23 Nokurn joined #git
08:24 bernardio joined #git
08:26 variable joined #git
08:27 YuGiOhJCJ joined #git
08:32 bket joined #git
08:36 mischat joined #git
08:38 hahuang61 joined #git
08:39 absinthe joined #git
08:42 lindenle joined #git
08:42 dsdeiz joined #git
08:42 dsdeiz joined #git
08:47 bernardio joined #git
08:49 timvisher joined #git
08:51 dr7 joined #git
08:53 duderonomy joined #git
08:54 romerocesar_ joined #git
08:57 cdown_ joined #git
09:01 _main_ joined #git
09:02 _main_ joined #git
09:02 Anja joined #git
09:05 __main__ joined #git
09:08 frobnic joined #git
09:08 phanimahesh joined #git
09:12 ramsub07 joined #git
09:13 thierryp joined #git
09:15 tvw joined #git
09:34 thierryp joined #git
09:35 youser joined #git
09:36 pks joined #git
09:37 mischat joined #git
09:37 zeroed joined #git
09:37 zeroed joined #git
09:38 jarshvor joined #git
09:38 Jackneill joined #git
09:39 gambl0re joined #git
09:39 leeN joined #git
09:42 Murii joined #git
09:42 timvisher joined #git
09:44 CaptainHeavy joined #git
09:44 Glooomy joined #git
09:45 miczac joined #git
09:45 rorro joined #git
09:48 ahr3n joined #git
09:51 PHPanos joined #git
09:54 Fakerr joined #git
09:56 xissburg joined #git
10:00 Murii joined #git
10:02 LordRyan joined #git
10:04 robotroll joined #git
10:06 davimore_ joined #git
10:06 TSS_ joined #git
10:08 masuberu joined #git
10:09 gusnan joined #git
10:09 gusnan joined #git
10:11 TSS_ joined #git
10:13 timvisher joined #git
10:17 netj joined #git
10:17 t0by joined #git
10:17 t0by joined #git
10:20 mlvd joined #git
10:21 leeN joined #git
10:23 catsup joined #git
10:23 Shock- joined #git
10:23 catsup joined #git
10:25 Derperperd joined #git
10:28 aax joined #git
10:28 overlord_tm joined #git
10:29 jameser joined #git
10:34 TomyLobo joined #git
10:38 mischat joined #git
10:39 hahuang61 joined #git
10:45 nettoweb joined #git
10:48 thejoecarroll joined #git
10:49 phanimahesh joined #git
10:52 King_Hual joined #git
10:55 timvisher joined #git
10:57 Nevik_ joined #git
10:59 afuentes joined #git
11:05 jnavila joined #git
11:07 Tobbi joined #git
11:08 flavius joined #git
11:08 jameser joined #git
11:11 Nevik_ left #git
11:11 Nevik joined #git
11:12 pietv joined #git
11:12 bathtub_shark joined #git
11:16 absinthe joined #git
11:19 nostrora joined #git
11:19 WayToDoor joined #git
11:19 jameser joined #git
11:19 dersand joined #git
11:21 code0990 joined #git
11:22 phanimahesh joined #git
11:25 erzk joined #git
11:26 Derperperd joined #git
11:29 SodaPop joined #git
11:29 jnavila joined #git
11:30 code0990 left #git
11:33 Balliad joined #git
11:35 vdv joined #git
11:36 timvisher joined #git
11:37 mentazoom joined #git
11:38 davimore joined #git
11:39 mischat joined #git
11:39 theoceaniscool joined #git
11:42 chipotle joined #git
11:42 minikN joined #git
11:43 joki joined #git
11:47 mikecmpbll joined #git
11:52 theoceaniscool joined #git
11:53 ertesx joined #git
11:56 dsdeiz is the git commit.template scriptable? :D
11:56 d1b joined #git
11:59 borkr joined #git
12:00 iLembus joined #git
12:01 xXHellblazerXx joined #git
12:01 xXHellblazerXx left #git
12:05 BlessJah dsdeiz: check out prepare-commit-message hook
12:05 averell joined #git
12:09 Guest90141 joined #git
12:11 mikecmpbll joined #git
12:11 Levex joined #git
12:12 str joined #git
12:13 timvisher joined #git
12:17 youser joined #git
12:18 [0xAA] joined #git
12:19 Nilesh_ joined #git
12:23 iLembus_ joined #git
12:23 phanimahesh joined #git
12:28 Derperperd joined #git
12:30 aard_ joined #git
12:33 JanC_ joined #git
12:38 nd joined #git
12:40 hahuang61 joined #git
12:40 mikecmpbll joined #git
12:40 blahdodo joined #git
12:43 shiriru joined #git
12:45 lindenle joined #git
12:47 stfn joined #git
12:49 gambl0re joined #git
12:50 spacelord_ joined #git
12:50 G-Boy joined #git
12:51 timvisher joined #git
12:55 gambl0re left #git
12:57 ojdo joined #git
13:00 nowhereman joined #git
13:00 astrofog joined #git
13:02 garethdaine joined #git
13:02 aax joined #git
13:11 mikecmpbll joined #git
13:12 masuberu joined #git
13:19 vdv joined #git
13:21 sodapop_ joined #git
13:22 gugah joined #git
13:22 timvisher joined #git
13:23 iLembus__ joined #git
13:25 mentazoom joined #git
13:27 ramsub07 joined #git
13:27 satifant joined #git
13:28 Derperperd joined #git
13:36 theoceaniscool joined #git
13:37 youser joined #git
13:47 iLembus_ joined #git
13:49 _ng joined #git
13:50 _ng joined #git
13:50 iLembus_ joined #git
13:51 [0xAA] joined #git
13:51 theoceaniscool joined #git
13:51 stick-shift joined #git
13:53 tchan joined #git
13:53 tchan joined #git
13:55 frobnic joined #git
13:56 wCPO joined #git
13:56 iLembus__ joined #git
14:01 anuxivm joined #git
14:01 aavrug joined #git
14:01 timvisher joined #git
14:02 iLembus joined #git
14:05 Debyte joined #git
14:06 sdothum joined #git
14:06 vdv joined #git
14:12 gautamsomani joined #git
14:14 ramsub07 joined #git
14:21 cdg joined #git
14:22 vdv joined #git
14:23 dsdeiz BlessJah: yeah that's what i'm using right now. just found out about commit.template
14:24 [0xAA] joined #git
14:29 Derperperd joined #git
14:29 Kaisyu joined #git
14:34 _ng joined #git
14:36 littlebit joined #git
14:37 iLembus_ joined #git
14:38 publio joined #git
14:41 hahuang61 joined #git
14:42 Gsham joined #git
14:42 vdv joined #git
14:45 mikecmpbll joined #git
14:45 timvisher joined #git
14:46 miczac joined #git
14:51 littlebit hi people, I have a question about pushing to a gitlab server, and I'm trying to push to it the scp way and my gitlab keeps on asking for the password although I have created a keypair. is there a way to get a more verbose out put of git push?
14:51 fahadash joined #git
14:51 osse littlebit: GIT_SSH_COMMAND='ssh -vvv "$@"' git push
14:52 osse littlebit: or rather, try   ssh -T git@gitlab.yourcompany.com
14:52 littlebit osse: as the user git?
14:53 osse littlebit: whatever the URL gitlab tells you to use
14:53 osse usually it is git
14:53 littlebit osse: still get asked for the password
14:54 osse yes
14:54 osse getting more verbose output doesn't magically fix it
14:55 osse or was there no extra output?
14:55 littlebit osse: ssh -T .... leads me straight to the password prompt
14:55 osse sh
14:55 osse ssh -vvv -t
14:55 osse -T
14:56 osse but if you get a pw prompt there that means the SSH config is borked
14:56 osse Git itself just uses it
14:57 littlebit osse: I know
15:00 Zamerick joined #git
15:00 anuxivm joined #git
15:01 _28_ria joined #git
15:01 VladGh joined #git
15:02 VladGh joined #git
15:04 littlebit osse: is it required to use a seperate ssh keypair for pusing?
15:04 osse no
15:04 marchelly joined #git
15:04 VladGh joined #git
15:05 littlebit osse: this is my output: http://pastebin.com/6TiphSFa
15:06 borkr joined #git
15:06 osse what is the name of your key?
15:06 Noldorin joined #git
15:07 littlebit osse: /home/tarek/.ssh/id_rsa
15:07 osse says "no such file or directory" :O
15:10 littlebit osse: sounds not plausible when you get this: http://pastebin.com/eH2KzEft
15:11 osse littlebit: how about GIT_SSH_COMMAND='ssh -i /home/tarek/.ssh/id_rsa "$@"'
15:11 littlebit hold
15:11 tchan joined #git
15:11 littlebit osse: no output
15:12 osse ugh
15:12 osse i forgot the git push
15:13 littlebit osse: how would the command look like? just to be on the safe side
15:13 osse GIT_SSH_COMMAND='ssh -i /home/tarek/.ssh/id_rsa "$@"' git push
15:14 littlebit osse: is the password prompt => git@gitlab.home.hub's password:
15:15 d1z joined #git
15:15 osse littlebit: have you uploaded your public key to gitlab?
15:15 littlebit osse: you mean pasting the contents of id_rsa.pub to the user profile?
15:15 mikecmpbll joined #git
15:15 osse yes
15:16 littlebit osse: done that
15:17 osse littlebit: maybe something in your .ssh/config then
15:17 osse oh you don't have one
15:19 osse littlebit: final mega command:  GIT_TRACE=1 GIT_SSH_COMMAND='ssh -vvv -i /home/tarek/.ssh/id_rsa "$@"' git push
15:19 Discovery joined #git
15:23 NeverDie joined #git
15:23 mlr joined #git
15:24 garethdaine joined #git
15:25 ignarps joined #git
15:29 littlebit osse: it gave me lots of output and landed into the password prompt
15:30 Derperperd joined #git
15:33 littlebit osse: are there any logs on the side of the gitlab server?
15:33 joco42 joined #git
15:35 osse littlebit: but the output is interesting
15:35 osse i don't know. you have to ask #gitlab
15:37 littlebit osse: ok onse sec let me pastebin it
15:37 m4sk1n joined #git
15:38 m4sk1n How can I change default download manager for git?
15:38 bremner wut?
15:38 littlebit osse: here you go http://pastebin.com/P21mtve8
15:39 robotroll joined #git
15:40 bremner m4sk1n: man git-fetch tells you about the different kinds of URLs that git understands
15:40 gitinfo m4sk1n: the git-fetch manpage is available at http://jk.gs/git-fetch.html
15:40 osse littlebit: woops, seems like putting "$@" in there is wrong
15:40 osse so you can remove that at least
15:41 cdown joined #git
15:41 jmd joined #git
15:42 jmd How can I sign about 20 commits in one easy move?
15:42 m4sk1n bremner gitinfo thanks
15:42 gitinfo m4sk1n: you're welcome, but please note that I'm a bot. I'm not programmed to care.
15:43 littlebit osse: just remove "$@"
15:43 littlebit ?
15:44 osse yes
15:44 osse won't fix anything though...
15:44 osse i can't get over the fact that ssh thinks your key doesn't exist
15:45 littlebit osse: here you go http://pastebin.com/XhZ8zNp9
15:45 osse or maybe not... "Offering RSA public key: /home/tarek/.ssh/id_rsa"
15:45 osse then I definitely don't know
15:46 Gloomy joined #git
15:46 osse i give up. double check that the key you put on gitlab is correct
15:46 littlebit no problem
15:47 lindenle joined #git
15:50 _ng joined #git
15:51 byte512 joined #git
15:51 _ng joined #git
15:52 m4sk1n So I see that I can't do this
15:53 m4sk1n gitinfo: I noticed this, but even if you are bot, it's nice to say thanks. I also know that you may not understand it, but it's not important
15:53 gitinfo m4sk1n: you're welcome, but please note that I'm a bot. I'm not programmed to care.
15:54 m4sk1n gitinfo: can you say something more?
15:54 osse !snack
15:54 gitinfo [!botsnack] Om nom nom
15:54 bremner please take it /query if you have much more fun to have with the bot
15:55 bremner m4sk1n: no guarantees, but someone might have ideas if you describe the problem you are trying to solve, rather than the perceived solution.
16:00 mischat joined #git
16:01 xaviergmail joined #git
16:02 dave0x6d joined #git
16:04 astrofog joined #git
16:05 CrispyClean joined #git
16:10 CrispyClean is there a prefered image host for sharing images inorder to ask a question?
16:10 iLembus joined #git
16:12 bremner for me, text is preferred over images.
16:12 bremner Do you _really_ need an image?
16:12 jmd CrispyClean: Since you know how to read and write, it's better to ask in words rather than pictures.
16:13 cdown_ joined #git
16:14 osse imgur is nice
16:14 _ikke_ is it?
16:15 osse sure, why not
16:16 CrispyClean when I run “git remote show origin” under “Local branches configured for 'git pull’ “ I have “development merges with remote dev” I removed the branch “dev” in bitbucket and removed the branch locally (i think) yet it still show up in the example i stated. How can I get rid of “dev” branch completely???
16:17 osse CrispyClean: is 'development' listed by 'git branch' ?
16:18 CrispyClean yes “develpment”  (as well as “master”)
16:19 osse CrispyClean: then you didn't delete it
16:19 CrispyClean I want to delete “dev”
16:21 osse try git fetch --prune
16:21 CrispyClean see when I first set up the repo i was lazy and used “dev” on bitbucket. Then I created “development” later. went back to bitbucket and deleted “dev” but somehow there is a ref to it
16:21 CrispyClean ok
16:21 nettoweb1 joined #git
16:23 jnavila joined #git
16:23 CrispyClean after doing that it no longer suggests I should prune but I still see “development merges with remote dev”
16:24 osse CrispyClean: git branch -r | grep dev
16:25 exussum joined #git
16:28 CrispyClean ok picture time..
16:30 CrispyClean http://tinypic.com/view.php?pic=aawykl&s=9
16:30 exussum Hi all, looking for a shorthand of git diff $(git merge-base origin/master HEAD)
16:31 exussum git diff origin/master...HEAD does not include the working directory
16:31 Derperperd joined #git
16:31 athaller joined #git
16:31 zivester joined #git
16:32 osse CrispyClean: this is just some local config that remains. what you probably want is to set development to track origin/development
16:32 osse CrispyClean: git branch -u origin/development development
16:33 osse CrispyClean: look in .git/config. there's probably a remnant
16:33 CrispyClean that did the trick!!! Thanks osse!!!
16:33 Raineer joined #git
16:34 miczac_ joined #git
16:36 amdi_ joined #git
16:40 dreiss joined #git
16:41 jagob joined #git
16:41 hahuang61 joined #git
16:42 sunri5e joined #git
16:43 xaviergmail joined #git
16:43 iLembus joined #git
16:49 menip joined #git
16:50 BSaboia joined #git
16:55 acetakwas joined #git
16:56 idlemind joined #git
16:57 vdv joined #git
16:59 buzzLightBeer joined #git
17:00 ramsub07 joined #git
17:02 vuoto joined #git
17:07 dikiaap left #git
17:08 PioneerAxon joined #git
17:11 nettoweb joined #git
17:12 dsdeiz joined #git
17:12 dsdeiz joined #git
17:13 timvisher joined #git
17:14 navidr joined #git
17:14 acetakwas joined #git
17:15 Gsham joined #git
17:15 garethdaine joined #git
17:19 ki0 joined #git
17:19 RichiH also /111
17:19 RichiH erm, disregard that
17:21 Smopi joined #git
17:22 svm_invictvs joined #git
17:28 sunri5e joined #git
17:30 miczac joined #git
17:31 Derperperd joined #git
17:32 sunri5e joined #git
17:35 madewokherd joined #git
17:36 jeffreylevesque joined #git
17:40 dhollinger joined #git
17:41 timvisher joined #git
17:41 nettoweb joined #git
17:41 sunri5e joined #git
17:42 astrofog joined #git
17:50 mohabaks joined #git
17:51 Mobutils joined #git
17:52 inflames joined #git
17:55 nettoweb1 joined #git
17:56 Tobbi joined #git
18:05 Silox| joined #git
18:06 sunri5e joined #git
18:08 jmpp joined #git
18:08 Gsham joined #git
18:12 eizua joined #git
18:15 mehola joined #git
18:20 niles250 joined #git
18:20 mathematic-alpha joined #git
18:21 mathematic-alpha left #git
18:22 niles250 left #git
18:22 gautamsomani joined #git
18:22 Mobutils joined #git
18:30 Uwp joined #git
18:32 Derperperd joined #git
18:37 phanimahesh joined #git
18:42 hahuang61 joined #git
18:45 hasc joined #git
18:45 mizu_no_oto joined #git
18:46 Shentino joined #git
18:47 jost_ joined #git
18:49 Atm0spher1c joined #git
18:49 romerocesar joined #git
18:50 jmd joined #git
18:51 jmd How do I sign a merge commit ?
18:51 _ikke_ 0git merge -S / --gpg-sign
18:52 jmd _ikke_: No.  I mean a commit which already exists.
18:52 _ikke_ jmd: amend the commit?
18:52 jmd I thought ammed can only apply to the most reset commit.
18:52 stamina joined #git
18:52 jmd s/reset/recent/
18:52 mischat joined #git
18:52 _ikke_ yes
18:53 jmd then I'll have to lose all the others since.
18:53 habbasi joined #git
18:54 _ikke_ Then you have to rebase
18:54 _ikke_ git rebase -i --preserver merges
18:54 _ikke_ git rebase -i --preserve-merges
18:58 jottr joined #git
18:58 jmd _ikke_: Thanks
19:01 jmpp joined #git
19:01 jmpp joined #git
19:01 Goplat joined #git
19:02 Shakeel_ joined #git
19:07 timvisher joined #git
19:08 ratdeptrai joined #git
19:08 PHPanos joined #git
19:08 Gsham joined #git
19:11 xaviergmail joined #git
19:13 doener joined #git
19:13 rgdjw joined #git
19:14 jaggz left #git
19:15 mizu_no_oto joined #git
19:17 anuxivm joined #git
19:19 iLembus_ joined #git
19:20 lindenle joined #git
19:21 youser joined #git
19:23 absinthe joined #git
19:28 luis_ joined #git
19:30 chachasmooth joined #git
19:31 yosstheboss joined #git
19:33 Derperperd joined #git
19:34 Tobbi joined #git
19:35 justanotheruser joined #git
19:36 done joined #git
19:37 serialoverflow joined #git
19:39 ygeLN joined #git
19:42 mohabaks joined #git
19:42 Nokurn joined #git
19:43 albel727 joined #git
19:43 tagia joined #git
19:43 vals_ joined #git
19:44 daviid joined #git
19:46 frobnic_ joined #git
19:48 overlord_tm joined #git
19:49 lektrik joined #git
19:49 ratdeptrai1 joined #git
19:50 julioaratanha joined #git
19:51 nowhereman joined #git
19:51 jnavila joined #git
19:52 aidalgol joined #git
19:53 sunri5e joined #git
19:53 mischat joined #git
19:53 dsdeiz joined #git
19:53 dsdeiz joined #git
19:55 ahr3n joined #git
19:56 zeroed joined #git
19:56 zeroed joined #git
19:57 Oav joined #git
19:57 yosstheboss joined #git
19:57 mischat joined #git
19:59 theoceaniscool joined #git
19:59 askb joined #git
20:00 garethdaine joined #git
20:01 nettoweb joined #git
20:07 garethdaine left #git
20:12 absinthe joined #git
20:16 fus joined #git
20:19 serialoverflow joined #git
20:22 mohabaks joined #git
20:23 d1z joined #git
20:24 acetakwas joined #git
20:26 mizu_no_oto joined #git
20:30 gugah joined #git
20:34 Derperperd joined #git
20:34 govg joined #git
20:36 timvisher joined #git
20:36 fus joined #git
20:36 g105b joined #git
20:40 borkr joined #git
20:41 kjsaihs joined #git
20:43 hahuang61 joined #git
20:47 robattila256 joined #git
20:47 jiut joined #git
20:50 multi_io_ joined #git
20:50 multi_io_ left #git
20:51 cagomez joined #git
20:52 ki0 joined #git
20:53 mizu_no_oto joined #git
20:56 chardan joined #git
20:57 brent__ joined #git
20:58 anuxivm joined #git
20:59 cagomez joined #git
21:02 timvisher joined #git
21:04 cdg joined #git
21:04 dave0x6d joined #git
21:04 boutcher joined #git
21:05 cdg joined #git
21:08 albel727 joined #git
21:12 _ng joined #git
21:12 blackwind_123 joined #git
21:13 ramsub07 joined #git
21:14 miczac_ joined #git
21:14 nettoweb joined #git
21:24 brent__ joined #git
21:28 fscala joined #git
21:28 sbeller joined #git
21:30 NeverDie joined #git
21:31 timvisher joined #git
21:32 stench joined #git
21:32 bannakaffalatta joined #git
21:33 stick-shift joined #git
21:34 Derperperd joined #git
21:36 nettoweb joined #git
21:37 jnavila joined #git
21:46 busta joined #git
21:52 aarobc joined #git
21:53 astrofog joined #git
21:54 osse joined #git
21:55 Cabanossi joined #git
21:56 mischat joined #git
21:56 mischat joined #git
21:57 jeffreylevesque_ joined #git
21:59 grill joined #git
22:00 theoceaniscool_ joined #git
22:01 nick123 joined #git
22:01 jozwior joined #git
22:02 pietv joined #git
22:07 ToBeCloud joined #git
22:10 timvisher joined #git
22:12 Gsham joined #git
22:13 DrSlony joined #git
22:13 DrSlony Hi, git-2.11 screws up binary file histories https://1x.com/photo/27981
22:14 DrSlony sorry, wrong link
22:14 DrSlony correct link: https://i.imgur.com/fSad8aK.png
22:16 Guest9 joined #git
22:17 Guest9 I've a git subtree setup for the public folder on my repo to be pushed to gh-pages. Do I need to track the public folder under my repo in this case? can I just generate it whenever I need and force a new history on my subtree?
22:19 cr34ton joined #git
22:19 xaviergmail joined #git
22:23 cdg_ joined #git
22:23 canton7 DrSlony, what's the issue?
22:23 canton7 DrSlony, do be aware that the 'renamed' stuff is just for interest: that information it's stored by git
22:23 DrSlony canton7 "renamed:    Pentax K10D.dcp -> FUJIFILM X-T1.dcp"
22:23 cdg__ joined #git
22:23 canton7 !rename
22:23 gitinfo git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.L​NX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
22:24 DrSlony that's not what was done
22:24 canton7 it's just looking at % file similarity
22:24 Darren_ joined #git
22:24 canton7 *that information isn't stored by git, I mean
22:24 aard_ joined #git
22:24 Guest9 does anyone know about the subtree thing I just asked?
22:25 DrSlony canton7 but I renamed the files first (100% similarity), then modified it, and at that point everything's fine. Then when I git add the modified file, it goes haywire.
22:26 canton7 DrSlony, like I said, dont worry about the 'renamed' stuff that git status shows you
22:26 canton7 it means nothing. None of that information is trakced by git
22:26 DrSlony ok
22:27 canton7 when did you modify things? that isn't in your screenshot?
22:30 LaptopBrain joined #git
22:30 cyan__ joined #git
22:31 DrSlony canton7 I'm not clear what you're asking. The DCP files in the repo are old (last year), the new ones I generated just now.
22:31 bmahe joined #git
22:31 DrSlony Their contents differ, and in most cases the new names are uppercase.
22:32 grill joined #git
22:33 Arban joined #git
22:34 canton7 right, so Pentax K10D.dcp and PENTAX K10D.dcp are modifications to the same file? Since it's a binary file, they might be completely different?
22:34 Arban joined #git
22:35 canton7 so git's figured out that the old Pentax K10D.dcp file is similar to the new FUJIFILM X-T1.dcp file, and the old Nikon D7200.dcp file is similar to the new PENTAX K10D.dcp file
22:35 canton7 that's all, really
22:35 DrSlony canton7 first I renamed "Pentax K10D.dcp" to "PENTAX K10D.dcp", then I overwrote the latter with a new file (different md5sum)
22:35 DrSlony renamed = git mv
22:35 Derperperd joined #git
22:35 WifiBrain joined #git
22:36 cdown joined #git
22:36 DrSlony I verified that the end result is correct using md5sums, but I'm worried that this commit diff will show that i made several mistakes when I did not
22:36 canton7 like I keep saying, git does not track moves/renames
22:37 DrSlony yes I read, I replied to your question
22:37 canton7 it's displaying those 'renames' because those files happen to be similar
22:37 canton7 if you mark those files as binary in .gitattributes, it'll probably stop doing those calculations :P
22:38 DrSlony well that clears it all up
22:38 DrSlony thank you for the explanation
22:40 xaviergmail joined #git
22:41 mehola joined #git
22:44 hahuang61 joined #git
22:45 JanC joined #git
22:45 romerocesar joined #git
22:50 Raineer joined #git
22:54 aax joined #git
22:57 WayToDoor joined #git
22:58 Guest87941 joined #git
22:59 jwest joined #git
23:01 fmeerkoetter joined #git
23:02 nick123 joined #git
23:07 liamonade joined #git
23:11 Darren_ joined #git
23:11 chardan joined #git
23:15 atrigent joined #git
23:17 nwkj86 joined #git
23:23 lindenle joined #git
23:24 cdown_ joined #git
23:24 nwkj86 joined #git
23:26 Derperperd joined #git
23:28 m0viefreak joined #git
23:29 timvisher joined #git
23:38 a_thakur joined #git
23:38 Raed joined #git
23:42 dirtyroshi joined #git
23:47 bannakaffalatta joined #git
23:48 thierryp joined #git
23:51 spacelord_ joined #git
23:56 dreiss joined #git
23:58 daviid joined #git
23:58 daviid left #git
23:58 GavinMagnus joined #git
23:59 nettoweb1 joined #git

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