Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-08

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

All times shown according to UTC.

Time Nick Message
00:01 diogenese joined #git
00:03 netj joined #git
00:04 canoon joined #git
00:08 TbobbyZ_ joined #git
00:09 sunrunner20 joined #git
00:10 SwiftMatt joined #git
00:10 Noldorin joined #git
00:13 prg3 joined #git
00:20 HedgeMage sitaram_: If/when you are around, I could use a ping :)
00:22 jeffreylevesque joined #git
00:23 Marumarsu joined #git
00:24 sitaram_ HedgeMage: hey what's up?
00:25 HedgeMage sitaram_: Got a minute for a pm to follow up on something from ages ago?
00:25 sitaram_ sure
00:26 h12o joined #git
00:26 ToBeFree joined #git
00:28 menip joined #git
00:30 sunrunner20 joined #git
00:31 drodger joined #git
00:32 aax joined #git
00:32 TikityTik joined #git
00:33 rnsanchez joined #git
00:34 holodoc joined #git
00:35 hotpancakes joined #git
00:35 YottaByte joined #git
00:36 canoon joined #git
00:36 TbobbyZ joined #git
00:38 sunrunner20 joined #git
00:39 ljc joined #git
00:39 durham_ joined #git
00:41 kbs joined #git
00:43 chipotle joined #git
00:44 thiago joined #git
00:51 kyan joined #git
00:52 Lyqyd joined #git
00:53 TbobbyZ joined #git
00:54 anuxivm left #git
00:58 h12o joined #git
00:58 TbobbyZ joined #git
01:01 MacWinner joined #git
01:02 star_prone joined #git
01:02 TbobbyZ joined #git
01:03 dstw joined #git
01:04 askb joined #git
01:06 Vortex34 joined #git
01:06 hahuang61 joined #git
01:12 fstd_ joined #git
01:13 eflynt joined #git
01:15 dstw joined #git
01:19 basdb joined #git
01:19 dendazen joined #git
01:20 Eugene dminuoso - I would split one component or the other out of the first repo, and then just continue like nothing happened
01:21 hotpancakes joined #git
01:22 finalbeta joined #git
01:23 star_prone joined #git
01:25 nandi_ge___ joined #git
01:26 HoierM joined #git
01:26 eb0t joined #git
01:26 eblip joined #git
01:27 tmg joined #git
01:28 peepsalot joined #git
01:28 pks joined #git
01:31 hotpanca_ joined #git
01:32 Puffball joined #git
01:36 raijin joined #git
01:37 toothe anyone know a bash-git integration?
01:38 toothe that works?
01:38 toothe https://github.com/magicmonty/bash-git-prompt
01:38 toothe I Found this, but I have no idea how it works.
01:38 Darren_ joined #git
01:38 sunri5e joined #git
01:40 toothe oh wait, its in the documentation...clearly
01:41 Squiggs left #git
01:42 NoOutlet joined #git
01:47 inflames joined #git
01:47 NoOutlet I created my own that I can show you if you want, Toothe.
01:47 toothe see, even then...nothing happens.
01:47 toothe NoOutlet: i would not mind, but let me get this one first...
01:47 NoOutlet Alright.
01:47 rivarun joined #git
01:47 toothe damn...maybe this is a FreeBSD vs Linux thing.
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:55 cahoots joined #git
01:55 drodger joined #git
01:56 gitnoob joined #git
01:56 basdb joined #git
01:56 toothe git it working!
01:57 toothe it was a .bash_profile vs .bashrc difference
01:57 NoOutlet Classic.
01:57 holodoc joined #git
01:58 toothe yeah, I don't even understand that issue.
01:58 NoOutlet Hmm. That prompt is a little more informative than mine. I might need to work on mine.
01:59 toothe I'm sure yours is awesome.
01:59 toothe I need to figure out hwo to get rid of this damn date.
02:00 nexemacs joined #git
02:02 NoOutlet Tell me this: Is there any noticeable delay before it displays the prompt if you hit enter?
02:02 ertes joined #git
02:03 NoOutlet I remember working on mine until the delay was imperceptible.
02:05 toothe yes.
02:05 thinkpad joined #git
02:05 toothe the delay is actually a bit annoying.
02:05 toothe maybe I should use yours :)
02:07 duderonomy joined #git
02:07 NoOutlet Well, I'll need to work mine into something that installable. Basically, I just have a repository of my .vim folder and inside that I keep my .bashrc which I then symlink from my home directory.
02:07 toothe ha! ncie.
02:07 toothe nice*
02:07 toothe does it just do a git branch, and read from that?
02:07 toothe yeah, the delay from this will annoy me.
02:08 toothe and the new line that I can't figure out how to end.
02:08 NoOutlet Here, I'll send you screenshot of mine.
02:08 toothe actually, I can deal with that delay, actually, but not the god damn new line.
02:08 orbyt_ joined #git
02:09 toothe that's a crime against humanity
02:09 rewt i just use the one that comes with git
02:10 toothe there is one?
02:11 dreiss joined #git
02:11 rewt yeah, just have to add it to your prompt and set a couple of env vars to configure it
02:11 NoOutlet Could you explain how one adds it?
02:12 rewt yeah, was just looking... in .bashrc (or w/e you have your prompt), add $(__git_ps1) to your PS1
02:14 rewt ah, here it is ... https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
02:14 lagothri1 joined #git
02:15 hexagoxel joined #git
02:16 rewt the comments at the top of that describe the options and which env vars need to be set to configure them
02:19 toothe that one is nice.
02:20 rewt but i can't seem to find that file on my system, or what's being sourced to get __git_ps1  :o
02:21 rewt found it
02:22 thinkpad joined #git
02:22 toothe rewt: the one you provided a nice one, but i thinkt he previous one spoiled me :)
02:23 rewt there was a file added to my /etc/bash_completion.d, which sources /usr/lib/git-core/git-sh-prompt
02:23 Ardethian joined #git
02:23 rewt toothe, yeah, this one's a bit simpler
02:23 toothe i think the colors spoiled me
02:23 rewt but there is no delay on enter :)
02:23 toothe I just need that damn \n to go away
02:23 toothe or rather how to change it up.
02:24 dodobrain joined #git
02:25 ojdo joined #git
02:26 NoOutlet Here's what mine looks like: http://imgur.com/a/9KHWE
02:26 dodobrain joined #git
02:26 gitnoob I have a question about git rebase. If you do a git merge, followed by a git rebase, is it possible to get conflicts from both operations?
02:26 toothe okay, yours nis veyr nice too.
02:26 toothe i like it.
02:27 toothe can I steal? :)
02:27 NoOutlet Sure.
02:27 dodobrain joined #git
02:28 Emperor_Earth joined #git
02:28 Goplat joined #git
02:29 dodobrain joined #git
02:29 mehola joined #git
02:29 NoOutlet Looking at the code for that git-prompt.sh from git, it seems like there would be a little delay.
02:30 tnecniv joined #git
02:30 toothe I don't understand, did you modify the code?
02:31 NoOutlet I just wrote my own prompt_command. https://raw.githubusercontent.com/NoOutlet/.vim/master/.bashrc
02:33 NoOutlet The relevant part starts right after the "Functions" header.
02:34 rchavik joined #git
02:34 JanC joined #git
02:36 thinkpad joined #git
02:36 rewt there is a tiny delay, not enough to insert a lot of blank lines when holding down enter, maybe a few in a screenful of prompts
02:36 toothe well, see
02:37 toothe I ssh into my dev freebsd jail, so I largely don't mind. There's already a delay :)
02:37 toothe PS1=$'(\\[\\033[0;34m\\]py3d\\[\\033[0;0m\\]) \\[\\033[0;32m\\]\342\234\224\\[\\033[0;0m\\] \\[\\033[0;33m\\]\\w\\[\\033[0;0m\\] [\\[\\033[0;35m\\]${GIT_BRANCH}\\[\\033[0;0m\\]|\\[\\033[1;32m\\]\342\234\224\\[\\033[0;0m\\]\\[\\033[0;0m\\]] \\n\\[\\033[0;37m\\]$(date +%H:%M)\\[\\033[0;0m\\] $ '
02:37 toothe i can't figure out where that date +%H:%M comes from.
02:38 NoOutlet What do you mean where it comes from?
02:38 toothe where is that set in the PS1 value.
02:38 raijin joined #git
02:38 NoOutlet 15 characters from the end?
02:38 Robstx joined #git
02:38 toothe I believe so, didn't count exactly.
02:39 NoOutlet I think I still don't understand what you mean by "where it comes from".
02:39 NoOutlet Like why the PS1 has access to the date?
02:40 thinkpad joined #git
02:40 NoOutlet `date` is a linux command. It's being called. Does that help?
02:40 toothe Yes, that's my question.
02:41 toothe $(date +%H:%M)
02:41 toothe how does that enter the PS1 variable.
02:41 NoOutlet The $() just tells bash to execute the command inside.
02:41 toothe correct.
02:42 toothe how do I remove it?
02:43 NoOutlet Delete from right after the "\\n" up to and including the "%M)".
02:45 toothe sorry, I"m not being clear.
02:46 NoOutlet rewt when I was building mine, I was using bash to log the time before and after the building of the prompt. I got it down to something like 60ms but couldn't get it further because that's just how long the git status call took.
02:46 toothe so, I am working through that bash-git code, honestly I really like it
02:46 toothe but, there are 2 things that annoy me about it - small things
02:47 toothe the \\n and the $(date) command
02:47 toothe its funny how much these things bother me.
02:49 toothe i'll just trace through the code
02:52 toothe ohh, its in themes :)
02:52 aliencraft joined #git
02:52 rewt hand-crafting it will always make it faster because you don't have to make it generic enough with plenty of options to please everyone else
02:53 SwiftMatt joined #git
02:56 toothe got it!
02:57 Vortex35 joined #git
02:57 NoOutlet That sounds like a challenge rewt.
02:57 toothe got it!
03:00 toothe if you'd like terminal, let me know.
03:01 chachasmooth joined #git
03:05 hanthings_ joined #git
03:05 Oatmeal joined #git
03:07 hahuang61 joined #git
03:10 HoierM joined #git
03:11 Darren_ joined #git
03:16 lavalamp joined #git
03:19 thinkpad joined #git
03:21 ivanfon joined #git
03:23 cyphase joined #git
03:27 dnvenegas joined #git
03:27 sunrunner20 joined #git
03:29 dsdeiz joined #git
03:29 dsdeiz joined #git
03:31 thinkpad joined #git
03:35 Sasazuka joined #git
03:37 kyan joined #git
03:37 xall joined #git
03:41 hvxgr joined #git
03:42 DIDAVISION joined #git
03:42 ivanfon joined #git
03:45 Cabanossi joined #git
03:49 cahoots joined #git
03:58 chachasmooth joined #git
03:58 Marumarsu joined #git
03:58 aidalgol joined #git
04:01 scoobertron joined #git
04:08 capuk joined #git
04:14 Cabanossi joined #git
04:15 netj joined #git
04:16 chachasmooth joined #git
04:18 adirsms52 joined #git
04:24 mda1 joined #git
04:25 duderono_ joined #git
04:26 thinkpad joined #git
04:28 dsdeiz joined #git
04:29 Doginal joined #git
04:31 Noldorin joined #git
04:36 drodger joined #git
04:36 pks joined #git
04:40 MineCoins joined #git
04:42 drodger joined #git
04:44 arand__ joined #git
04:44 Urbany joined #git
04:44 robattila256 joined #git
04:45 flopsec joined #git
04:46 WizJin joined #git
04:51 patrickmn joined #git
04:51 _ng joined #git
04:53 nivag joined #git
04:53 duderonomy joined #git
04:53 pmn joined #git
04:55 thinkpad joined #git
04:55 sbulage joined #git
04:55 star_prone joined #git
04:55 dnukem joined #git
04:56 jeffreylevesque joined #git
04:59 _Vi joined #git
05:00 pmn joined #git
05:01 h12o joined #git
05:01 abh joined #git
05:08 hahuang61 joined #git
05:09 chris3492 joined #git
05:09 pmn joined #git
05:14 pionen joined #git
05:14 jesst joined #git
05:15 Cabanossi joined #git
05:18 xissburg left #git
05:21 aax joined #git
05:22 dedondesta joined #git
05:23 xaa__ joined #git
05:25 ljc joined #git
05:26 h12o joined #git
05:30 jesst joined #git
05:30 axisys joined #git
05:31 polyzen joined #git
05:31 jesst joined #git
05:31 star_prone joined #git
05:31 dedondesta left #git
05:36 sbasso joined #git
05:43 mehola joined #git
05:45 sbasso joined #git
05:47 polyzen joined #git
05:49 acetakwas joined #git
05:51 diogenese joined #git
05:54 MineCoins joined #git
05:56 jagob joined #git
05:56 MineCoins joined #git
05:57 MineCoins joined #git
05:58 PioneerAxon joined #git
05:59 Cabanossi joined #git
06:05 menip joined #git
06:08 lordjancso joined #git
06:09 dmc joined #git
06:12 lordjancso joined #git
06:13 blahdodo joined #git
06:15 canoon joined #git
06:16 xall joined #git
06:17 ayogi joined #git
06:18 cam27 joined #git
06:28 h12o joined #git
06:34 Motoko joined #git
06:38 jesst joined #git
06:42 marianina8 joined #git
06:45 Cabanossi joined #git
06:50 dave0x6d joined #git
06:54 Peetz0r joined #git
06:55 User458764 joined #git
06:56 MineCoins joined #git
06:59 pwnz0r joined #git
07:03 pks joined #git
07:06 pwnz0r joined #git
07:08 MattMaker joined #git
07:09 hahuang61 joined #git
07:09 masuberu joined #git
07:15 thinkpad joined #git
07:16 theiostream joined #git
07:18 marianina8 joined #git
07:20 jesst joined #git
07:24 SwiftMatt joined #git
07:26 dreiss joined #git
07:28 navidr joined #git
07:39 zeroed joined #git
07:39 zeroed joined #git
07:48 tctara joined #git
07:51 Murii joined #git
07:52 EDAKIRI joined #git
07:53 exotime joined #git
07:54 EDAKIRI I have a problem that I point to submodules and a version in a submodule was removed from the repository -- so that my project is no longer valid.
07:54 EDAKIRI Can I cause I submodule to point to the HEAD of another repository, instead of or in addition to a specific hash version?
07:57 tmg joined #git
07:58 inflames joined #git
07:59 EDAKIRI or perhaps a public label
07:59 EDAKIRI i mean tag
08:00 monokrome joined #git
08:00 TbobbyZ joined #git
08:08 sunrunner20_ joined #git
08:09 MattMaker joined #git
08:11 ahrs joined #git
08:12 Darren_ joined #git
08:13 a3Dman joined #git
08:13 earnestly joined #git
08:15 Tobbi joined #git
08:16 dstw joined #git
08:23 kasual joined #git
08:24 schleppel joined #git
08:32 star_prone joined #git
08:32 Rogue0ne joined #git
08:32 Joefish joined #git
08:37 leaftor joined #git
08:39 overlord_tm joined #git
08:40 jnewt__ joined #git
08:43 armyriad joined #git
08:48 cbreak EDAKIRI: no
08:48 cbreak submodules refer to hashes
08:48 cbreak to hashes of commits
08:48 cbreak EDAKIRI: that's the whole point of strong binding
08:49 sunrunner20 joined #git
08:52 swalladge joined #git
08:54 nickel_dime_look joined #git
08:55 felixjet joined #git
08:57 swalladge[m] joined #git
08:59 mikecmpbll joined #git
09:00 fatalhalt joined #git
09:00 User458764 joined #git
09:00 hhee2 joined #git
09:02 bl0w3d_0ut joined #git
09:05 bl0w3d_0ut joined #git
09:07 QwertyDragon joined #git
09:10 star_prone joined #git
09:10 MattMaker joined #git
09:10 hahuang61 joined #git
09:10 ljc joined #git
09:15 sbasso joined #git
09:18 kontinuity joined #git
09:18 chris3492 joined #git
09:20 kontinuity joined #git
09:20 mukmuk joined #git
09:20 basiclaser joined #git
09:21 ohcibi joined #git
09:21 Jackneill joined #git
09:28 Joefish joined #git
09:31 rosiu joined #git
09:35 sarri joined #git
09:35 sarri joined #git
09:35 ahrs joined #git
09:36 King_Hual joined #git
09:36 _ng joined #git
09:41 mehola joined #git
09:42 mehola joined #git
09:42 xall joined #git
09:47 Introoter joined #git
09:48 Gloomy joined #git
09:53 acetakwas joined #git
09:54 manuelschneid3r joined #git
09:54 tvw joined #git
09:56 flavius joined #git
09:57 flavius joined #git
09:57 kexmex joined #git
09:58 ShapeShifter499 joined #git
09:59 flavius joined #git
10:00 ohcibi joined #git
10:01 TbobbyZ joined #git
10:03 sbasso joined #git
10:09 theoceaniscool joined #git
10:10 ispn joined #git
10:11 MattMaker joined #git
10:12 Acerific joined #git
10:14 Cabanossi joined #git
10:14 amosbird left #git
10:15 digidog joined #git
10:17 Maple__ joined #git
10:17 Maple__ joined #git
10:17 Maple__ joined #git
10:18 tristanp joined #git
10:19 _Vi joined #git
10:19 Tobbi joined #git
10:21 h12o joined #git
10:25 chipotle joined #git
10:32 sbasso joined #git
10:35 thinkpad joined #git
10:38 sbasso joined #git
10:40 CheckDavid joined #git
10:40 CussBot joined #git
10:41 pks joined #git
10:42 dersand joined #git
10:42 Olipro joined #git
10:43 mehola joined #git
10:46 _Vi joined #git
10:52 borkr joined #git
10:53 finalbeta joined #git
10:57 PioneerAxon joined #git
11:07 amrits joined #git
11:08 PioneerAxon joined #git
11:08 cbreak joined #git
11:11 jozwior joined #git
11:11 MattMaker joined #git
11:12 jozwior joined #git
11:12 hahuang61 joined #git
11:15 mehs joined #git
11:18 raijin joined #git
11:18 a3Dman joined #git
11:18 a3Dman joined #git
11:19 m0viefreak joined #git
11:20 ZyX-I joined #git
11:21 digidog joined #git
11:21 lb joined #git
11:23 Guest97562 joined #git
11:25 egeerardyn joined #git
11:29 jimi_ joined #git
11:30 pks joined #git
11:33 jesst joined #git
11:36 choki joined #git
11:36 t0by joined #git
11:36 t0by joined #git
11:39 msonntag joined #git
11:41 simon816 joined #git
11:43 simon816 joined #git
11:45 Cabanossi joined #git
11:45 simon816 joined #git
11:47 a3Dman joined #git
11:47 a3Dman joined #git
11:47 simon816 joined #git
11:49 simon816 joined #git
11:56 sbasso joined #git
11:56 blackwind_123 joined #git
11:58 sbasso joined #git
11:59 alexandre9099 joined #git
12:03 sbasso joined #git
12:07 YuGiOhJCJ joined #git
12:08 chipotle joined #git
12:08 xall joined #git
12:11 Nilesh_ joined #git
12:12 MattMaker joined #git
12:14 phase2 joined #git
12:18 marianina8 joined #git
12:21 eroux joined #git
12:22 King_Hual joined #git
12:22 King_Hual joined #git
12:28 jozwior joined #git
12:29 Cabanossi joined #git
12:30 pks joined #git
12:31 ok91 joined #git
12:33 doener joined #git
12:33 lmatteis joined #git
12:34 mizu_no_oto joined #git
12:36 jimi_ joined #git
12:38 anuxivm joined #git
12:38 rivarun joined #git
12:39 mentazoom joined #git
12:40 ankit01ojha joined #git
12:42 hussam joined #git
12:43 metachr0n joined #git
12:43 mehola joined #git
12:48 davimore joined #git
12:48 MutantMahesh joined #git
12:50 re1 joined #git
12:51 dermoth joined #git
12:51 dstw joined #git
12:51 MutantMahesh joined #git
12:55 sbasso joined #git
12:57 drodger joined #git
12:57 HoierM joined #git
12:58 nickel_dime_look joined #git
12:58 Random832 joined #git
12:59 dstw joined #git
13:01 dsdeiz joined #git
13:02 MutantMahesh joined #git
13:03 ToBeFree_ joined #git
13:04 jimi_ joined #git
13:06 MutantMahesh joined #git
13:07 kexmex joined #git
13:10 dgonzo joined #git
13:13 hahuang61 joined #git
13:14 User458764 joined #git
13:19 zivester joined #git
13:20 canoon joined #git
13:22 thinkpad joined #git
13:22 Olipro joined #git
13:23 chris3492 joined #git
13:27 dendazen joined #git
13:28 nd joined #git
13:29 mikecmpbll joined #git
13:31 jimi_ joined #git
13:33 e01 joined #git
13:33 e01 joined #git
13:36 sunri5e joined #git
13:36 dgonzo joined #git
13:37 leeN joined #git
13:40 Snugglebash joined #git
13:42 Travis-42 joined #git
13:44 mehola joined #git
13:45 jimi_ joined #git
13:46 Pilfers joined #git
13:46 jimi_ joined #git
13:48 tens0r joined #git
13:49 nowhereman joined #git
13:50 battousai left #git
13:54 User458764 joined #git
13:55 User458764 joined #git
13:57 ioprev joined #git
13:58 RWAG joined #git
14:00 Cabanossi joined #git
14:01 e01 left #git
14:04 masuberu joined #git
14:07 am55 joined #git
14:08 mda1 joined #git
14:12 nowhereman joined #git
14:12 Silenced joined #git
14:14 alexandre9099 joined #git
14:17 kexmex joined #git
14:17 Silenced joined #git
14:19 theiostream joined #git
14:19 publio joined #git
14:21 tristanp joined #git
14:24 pks joined #git
14:31 cam27 joined #git
14:31 lavalamp joined #git
14:32 blackwind_123 joined #git
14:37 todd_dsm joined #git
14:38 rorro joined #git
14:40 thebope joined #git
14:41 Khisanth joined #git
14:42 madewokherd joined #git
14:42 avar Is there an API to show where git fetched an object from (loose, pack, what pack..)
14:44 blackwind_123 joined #git
14:45 mehola joined #git
14:46 tens0r joined #git
14:48 fmcgeough joined #git
14:50 fmcgeough joined #git
14:51 Cavallari joined #git
14:51 rorro joined #git
14:53 MattMaker joined #git
14:54 h12o joined #git
14:57 menip joined #git
14:59 MineCoin_ joined #git
15:00 a3Dman joined #git
15:01 rosiu joined #git
15:03 am55 joined #git
15:04 Gustavo6046 joined #git
15:04 alexandre9099_ joined #git
15:05 theoceaniscool joined #git
15:05 mukmuk left #git
15:07 Random832 joined #git
15:14 hahuang61 joined #git
15:14 dave0x6d joined #git
15:18 pks joined #git
15:23 re1 joined #git
15:26 MineCoins joined #git
15:26 thebope joined #git
15:26 acetakwas joined #git
15:27 mohit joined #git
15:27 dreiss joined #git
15:28 karols146 joined #git
15:29 cagmz joined #git
15:29 futuristic joined #git
15:29 Cabanossi joined #git
15:31 Forlorn joined #git
15:34 re1_ joined #git
15:36 a3Dman joined #git
15:38 borkr joined #git
15:39 bremner If cut 1/3 of file A into new file B, is there anything sensible I can do to make rebasing some changes to A (and in the part cut into B) go more smoothly?
15:46 Forlorn joined #git
15:46 mehola joined #git
15:48 karols146 joined #git
15:51 jimi_ joined #git
15:54 MattMaker joined #git
15:57 Forlorn joined #git
16:03 finalbeta joined #git
16:04 chipotle_ joined #git
16:05 justanotheruser joined #git
16:06 durham joined #git
16:09 Acerific joined #git
16:09 Acerific joined #git
16:09 thiago joined #git
16:12 Tobbi joined #git
16:19 futuristic joined #git
16:20 marianina8 joined #git
16:22 a3Dman joined #git
16:22 a3Dman joined #git
16:24 bremner surprisingly git-format-patch followed by editing the patches seems to work
16:27 safe joined #git
16:33 durham joined #git
16:33 pwnz0r joined #git
16:34 sammyo joined #git
16:36 ok91 joined #git
16:36 rorro joined #git
16:38 orbyt_ joined #git
16:38 joeco joined #git
16:42 hhee2 joined #git
16:45 overlord_tm joined #git
16:49 thebope joined #git
16:51 Saravana joined #git
16:53 rominronin joined #git
16:53 User458764 joined #git
16:55 MattMaker joined #git
16:57 peterbecich joined #git
16:58 spaceraspi joined #git
16:58 futuristic joined #git
16:59 anuxivm left #git
17:00 FilipNortic_ joined #git
17:00 Cabanossi joined #git
17:00 jesst joined #git
17:02 mehola joined #git
17:04 SuperZadrotNerdV joined #git
17:07 fatalhalt joined #git
17:09 Andrey23 joined #git
17:09 drodger joined #git
17:12 Andrey23 Is it safe to publicly show  signingKey setting of .gitconfig? As far as I understand it shows only the public part of the gpg key. Am I right?
17:12 sonOfRa Andrey23: yes, that is safe to show. It is the fingerprint of the public key.
17:13 tnecniv joined #git
17:14 Andrey23 sonOfRa: Thanks!
17:14 orbyt_ joined #git
17:15 hahuang61 joined #git
17:18 thinkpad joined #git
17:18 raspado joined #git
17:20 p4trix joined #git
17:20 MineCoins joined #git
17:20 test joined #git
17:21 xall joined #git
17:23 Goplat joined #git
17:24 sweatsuit joined #git
17:24 telephone joined #git
17:24 telephone joined #git
17:29 Cabanossi joined #git
17:29 kanbal joined #git
17:29 jimi_ joined #git
17:30 rivarun joined #git
17:32 Guest45818 joined #git
17:32 Sleepy63 joined #git
17:34 diogenese joined #git
17:37 sweatsuit joined #git
17:38 zxd joined #git
17:38 zxd hi
17:38 zxd "And git rerere diff will show the current state of the resolution - what you started with to resolve and what you’ve resolved it to."
17:38 zxd from https://git-scm.com/book/en/v2/Git-Tools-Rerere
17:38 zxd it's confusing I don't understand what they mean by what I started with to resolve
17:39 sweatsuit joined #git
17:42 ncthom91 joined #git
17:44 kanbal left #git
17:44 sweatsuit joined #git
17:44 chris3492 joined #git
17:46 j416 zxd: rerere records the conflict and what you resolved it to
17:48 j416 zxd: I've gotten by fine without using "git rerere diff"; but given that it exists, perhaps there is a use-case that I have yet to encounter.
17:49 User458764 joined #git
17:49 j416 zxd: "what you started with to resolve" means the conflicted state, i.e. the file with conflict markers.
17:49 nickname_ joined #git
17:55 sweatsuit joined #git
17:55 netj joined #git
17:55 inflames joined #git
17:56 MattMaker joined #git
17:56 ziombelas joined #git
17:57 theiostream joined #git
17:58 ivanfon joined #git
17:58 ok91 joined #git
17:58 alexandre9099 joined #git
18:00 a3Dman joined #git
18:00 User458764 Hi, I checkout an older revision and then create a new branch to start from an older state. But how do I do to make this new branch the master?
18:01 preaction User458764: you could just use "git reset" to make the current master into the commit you want it to be
18:01 User458764 preaction yes I think it solve my problem, thanks :)
18:02 lavalamp joined #git
18:05 Doginal joined #git
18:06 Fallen0223 joined #git
18:07 jesst_ joined #git
18:08 strk joined #git
18:09 strk we just received a flood of mails which look like coming from post-receive hook doing while read oldrev newrev refname; do post-receive-email "${oldrev}" "${newrev}" "${refname}" | /usr/sbin/sendmail -t; done
18:10 strk is the version of post-receive-email supposed to prevent that, for pushing big branches ?
18:10 strk or is there any provision for avoiding that spam upon creating a new branch ?
18:12 strk oh wait, it's not the email, but a trac-admin invocation
18:12 strk could it be due to the if [ "$oldrev" = 0000000000000000000000000000000000000000 ]; then
18:12 strk piping to trac-admin the return from git rev-list --reverse "$newrev" --
18:13 ertesx joined #git
18:13 a3Dman joined #git
18:13 strk is that (0000) what you get as "oldrev" when pushing a new branch ?
18:20 theoceaniscool joined #git
18:20 strk is post-receive supposed to be fired for local (same filesystem) pushes ?
18:22 bgamari joined #git
18:24 PioneerAxon joined #git
18:26 bariscant joined #git
18:32 nickel_dime_look joined #git
18:33 grawity yes, and yes
18:34 pwnz0r joined #git
18:34 fakenerd joined #git
18:35 gugah joined #git
18:35 sunri5e joined #git
18:36 bgamari joined #git
18:41 finalbeta joined #git
18:42 peterbecich joined #git
18:42 Bob8989 joined #git
18:44 cahoots joined #git
18:44 mehola joined #git
18:45 finalbeta joined #git
18:46 _Vi joined #git
18:46 King_Hual joined #git
18:46 King_Hual joined #git
18:46 strk how can I get a list of commits which are *only* in the newly-pushed refname ?
18:46 toothe left #git
18:46 strk (and not in any other branch)
18:50 strk I want to know all commits which are in the history starting from branch "R" but are not found in any other branch
18:50 YuGiOhJCJ joined #git
18:50 finalbeta joined #git
18:51 strk I tried this:
18:51 strk git rev-list --reverse branch5 --not --branches=master
18:52 strk I guess I could do something like:
18:52 strk git rev-list --reverse R --not $(git branch | grep -v ^R$) # more or less, but I'm sure there's a better way
18:53 boombatower joined #git
18:53 marianina8 joined #git
18:55 mda1 joined #git
18:55 dreiss joined #git
18:56 MattMaker joined #git
18:58 Starky joined #git
19:01 Starky joined #git
19:05 Starky joined #git
19:05 robotroll joined #git
19:07 strk this is close:
19:07 strk git rev-list --reverse "$newrev" --not `git for-each-ref --format="%(refname)" | grep -vw "$refname"`
19:07 strk but: ambiguous argument 'refs/heads/branch1': both revision and filename
19:07 drodger joined #git
19:09 r0ry joined #git
19:11 a3Dman joined #git
19:11 strk this seems to work
19:11 strk branches=`git for-each-ref --format="%(refname)" | grep -vw "$refname"`
19:11 strk git rev-list --reverse "$newrev" --not $branches --
19:12 kexmex joined #git
19:13 drodger joined #git
19:14 r0ry joined #git
19:15 marianina8 joined #git
19:16 hahuang61 joined #git
19:16 MineCoins joined #git
19:22 nemo_ joined #git
19:23 tristanp joined #git
19:24 Nemo_ joined #git
19:24 fakenerd joined #git
19:27 h12o joined #git
19:28 ajf- joined #git
19:28 Xandaros joined #git
19:29 a3Dman joined #git
19:31 ajf- I'm looking at some modified files in two different servers, and I want to know whether the modifications are the same or not, by comparing the output of the git diff command (a diff of diffs). Is this possible?
19:31 Starky joined #git
19:31 grawity same modifications, but different baselines?
19:32 ajf- probably the same modification. One is staging, the other is production. I'm thinking an FTP commando tried things in stage and then uploaded to prod, but I want to confirm.
19:36 kent\n joined #git
19:36 marianina8 joined #git
19:37 _ng joined #git
19:39 marianina8 joined #git
19:41 ignarps joined #git
19:42 paws_ joined #git
19:42 ronny hi
19:43 ronny anyone aware of a simple wy to list all files in a folder tree and the first tag that was made after they where created
19:44 faraco joined #git
19:46 mehola joined #git
19:48 mehola joined #git
19:49 ncthom91 joined #git
19:53 sadied joined #git
19:53 sadied left #git
19:55 mehola joined #git
19:57 MattMaker joined #git
20:00 theiostream joined #git
20:01 Starky joined #git
20:02 pbrewczynski_ joined #git
20:03 thebope joined #git
20:06 _ikke_ No, there is no direct way to show that info
20:06 avar Sounds like a non-simple multi-level ls-files / git log --reverse / git tag --contains | head -n 1 for-loop
20:07 star_prone joined #git
20:09 peepsalot joined #git
20:09 carousel joined #git
20:10 pionen joined #git
20:10 bamb joined #git
20:10 bamb left #git
20:10 neilthereildeil joined #git
20:11 neilthereildeil how can i diff changes in tracked and untracked files against HEAD?
20:11 cahoots joined #git
20:12 blr joined #git
20:13 xingxing joined #git
20:16 carousel joined #git
20:16 rewt neilthereildeil, you diff tracked files with `git diff` or `git difftool`, and for untracked files there should be nothing to diff
20:17 skypuke_ joined #git
20:18 tristanp joined #git
20:21 ahrs joined #git
20:27 Blendify| joined #git
20:28 Blendify| can I create a branch at a specific revision
20:28 xingxing joined #git
20:29 theiostream joined #git
20:30 tang^ joined #git
20:32 alexandre9099 joined #git
20:34 _ikke_ sure
20:34 Blendify| nm I got it
20:35 pwnz0r joined #git
20:36 askb joined #git
20:37 ronny __builtin: i see, so the only sensible way to get this would be via a set of abstractions that assign sets of commits to tags and detecht the file addition
20:37 netj joined #git
20:37 xingxing joined #git
20:37 ronny whops i meant _ikke_ not __builtin , sorry
20:37 * __builtin waves
20:37 Blendify| Can I cherry pick a range of commits?
20:38 Blendify| git cherry-pick master ed18c6941bd02ea1f8ed82ffa8a5905fd95523e4...5c949d4242908d09b87d29b6c6fd09f741733bf4
20:38 Blendify| ?
20:38 alexandre9099 joined #git
20:39 hfp joined #git
20:39 eihabarabia joined #git
20:39 anry joined #git
20:39 hfp_work joined #git
20:42 _ikke_ Blendify|: sure
20:50 Tobbi joined #git
20:51 trewe joined #git
20:54 toothe joined #git
20:54 toothe so if the master and a branch go in opposite directions, is the typical process for a branch to rebase?
20:54 toothe or how does that work exactly?
20:56 BSaboia joined #git
20:56 preaction it depends on what the branch is for. for release branches, i never merge or rebase. for feature branches, i rebase. other people merge
20:56 preaction i like rebase because it keeps history in a straight line. other people like merge because it shows what commits went into that feature as an isolated set
20:57 toothe what's the difference? maybe I don't understand that.
20:58 Free_Shell joined #git
20:58 preaction https://git-scm.com/book/en/v2/Git-Branching-Rebasing <- this shows how rebasing changes how the branch looks
20:58 toothe thanks :)
20:58 MattMaker joined #git
20:59 toothe on a side note, i've written a few thosuand lines of python and C code off a chromebook :)
21:00 dendazen joined #git
21:02 Free_Shell joined #git
21:02 JuPaname left #git
21:02 JuPaname joined #git
21:03 JuPaname left #git
21:03 JuPaname joined #git
21:04 JuPaname left #git
21:04 JuPaname joined #git
21:04 raijin joined #git
21:06 tvw joined #git
21:07 Free_Shell joined #git
21:09 Free_Shell joined #git
21:13 Starky joined #git
21:14 drodger joined #git
21:15 Cabanossi joined #git
21:15 alexandre9099 joined #git
21:16 jost__ joined #git
21:17 hahuang61 joined #git
21:17 t0by joined #git
21:17 t0by joined #git
21:19 bgerber joined #git
21:20 ph88 joined #git
21:21 ph88 hey guys, does anyone know if it's possible to get an ETA while doing git clone ?
21:21 ph88 getting shit results from google when i search for it
21:21 star_prone joined #git
21:26 h12o joined #git
21:30 courrier joined #git
21:31 Goplat joined #git
21:32 tristanp joined #git
21:35 agusyc joined #git
21:36 JuPaname joined #git
21:36 _ikke_ Not that I'm aware of
21:37 star_prone joined #git
21:39 strk left #git
21:39 tens0r joined #git
21:40 JordanMoore joined #git
21:41 anuxivm joined #git
21:41 JordanMoore hello all, I'm trying to fix an issue on my one computer, with git being unbarably slow, I have ruled out all network issues, it's simply git on the machine in some way, even local repositorys are slow, is there an easy way to clean reinstall git?, or maybe another solution
21:42 kbs joined #git
21:43 ph88 JordanMoore, try strace
21:43 marianina8 joined #git
21:43 JordanMoore in cmd?
21:43 raijin joined #git
21:43 JordanMoore i'm using windows 10 btw
21:44 ojacobson git itself is stateless so I'd be surprised if reinstalling changed anything
21:44 ojacobson all the state is stored in individual repositories
21:44 ojacobson and in your user- and system-level git config files (man git-config)
21:44 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
21:44 ojacobson you can try it though, don't let me stop you :)
21:44 _ikke_ JordanMoore: What kind of system are you on?
21:45 ojacobson I'm not sure what the state of the art is for windows process monitoring but find out _what_ is slow during git operations
21:45 JordanMoore windows 10
21:45 ojacobson Used to be process explorer was the thing for that, dunno if it still is
21:45 _ikke_ JordanMoore: Do you have a virus scanner running?
21:45 _ikke_ ojacobson: you have a strace like tool from sysinternals
21:46 TbobbyZ joined #git
21:46 TbobbyZ joined #git
21:46 JordanMoore testing virus atm, ojacobson, i'll look that up
21:47 _ikke_ JordanMoore: Sometimes virusscanners themselves cause the slowness
21:47 wcpan joined #git
21:47 _ikke_ JordanMoore: Because the slow down file access
21:47 JordanMoore i'm talking making a local repo taking about 6 minutes
21:48 JordanMoore nothing even in it
21:48 ncthom91 joined #git
21:48 Joefish left #git
21:48 TbobbyZ joined #git
21:48 _ikke_ so just git init?
21:48 DarkPsydeLord joined #git
21:51 JordanMoore ok, well seems that the virus was the issue, i feel like a tool for never even considering it, being in the software field....
21:51 JordanMoore this has been an issue for almost a year
21:51 marianina8 joined #git
21:51 tmg joined #git
21:52 JordanMoore i'm going to drink myself into a stupper, thanks for the help
21:53 _ikke_ wow, did I accidentally point you in the right direction?
21:53 ojacobson heh
21:53 ojacobson virus scanners making FS access shockingly slow? not news to me
21:53 ojacobson nice catch
21:53 mda1 joined #git
21:54 JordanMoore i always ignored the option, cuase i must have tried that, dozens of times, right?
21:54 JordanMoore apparently not?
21:59 JuPaname joined #git
22:00 MattMaker joined #git
22:00 Atm0spher1c joined #git
22:01 nowhereman joined #git
22:04 TbobbyZ joined #git
22:05 TbobbyZ joined #git
22:06 tristanp joined #git
22:08 JuPaname joined #git
22:12 cbreak people still use virus scanners? :O
22:14 Cabanossi joined #git
22:17 garyserj joined #git
22:18 garyserj i've heard that when git status shows a 'new file', /  git status -s shows a file with "A_" then it's showing the index, it's showing files that are in the index but not in the commit you're checked out to.  So there could be other files in the index that it isn't showing. Is that the case? And if so, then how can I view all files that are in the index?
22:18 sostenuto joined #git
22:18 raijin joined #git
22:22 chris3492 joined #git
22:28 pks joined #git
22:28 neilthereildeil left #git
22:32 tristanp joined #git
22:33 dave0x6d joined #git
22:34 Achylles joined #git
22:37 porfiriopaiz joined #git
22:41 toothe I don't know if I should rebase or merge...even after reading up on it lol
22:43 pks joined #git
22:43 toothe https://www.atlassian.com/git/tutorials/merging-vs-rebasing
22:44 tvw joined #git
22:46 kbs my 0.02 fwiw - it's usually a consensus decision with the rest of the folks co-developing with you; and in the end not worth obsessing over.
22:47 madewokherd I'd say if you're working on something that you hope will eventually be accepted into a main branch, rebase; if you're going to maintain your changes on top of another branch indefinitely, merge
22:47 hvxgr joined #git
22:48 toothe "on top" ?
22:48 toothe what do you mean by "on top of another branch" ?
22:48 toothe ohh...
22:49 griff joined #git
22:49 madewokherd well, you might have a set of modifications to another project, that you update whenever there's a new release
22:50 Rogue0ne left #git
22:50 maroloccio joined #git
22:50 toothe okay, did a rebase. In the future, would the master branch merge back the branch?
22:51 dendazen joined #git
22:52 madewokherd probably, yes; if it's a fast-forward (the branch you're merging contains all the commits in the current branch), there's no difference between a merge and a rebase, no merge commit will be creates
22:53 toothe okay, I'm going to remerge them, then continue working on the current branch
22:53 toothe ie, the feature-branch isn't done yet, but I added in something the master should have.
22:54 madewokherd hm, if you only want part of the feature branch, you'll have to do something different, maybe a cherry-pick
22:54 toothe oh, that's possible?
22:54 toothe maybe in the future if I'm not the only developer
22:55 madewokherd cherry-pick would bring in one or more individual commits
22:56 manuelschneid3r joined #git
22:57 Darren_ joined #git
22:58 a3Dman joined #git
23:00 Cabanossi joined #git
23:00 MattMaker joined #git
23:01 SCHAPiE joined #git
23:01 dreiss joined #git
23:02 albel727 joined #git
23:05 ayogi joined #git
23:06 SCHAPiE joined #git
23:11 netj joined #git
23:13 cahoots joined #git
23:14 a3Dman joined #git
23:16 ToBeCloud joined #git
23:17 holodoc joined #git
23:18 hahuang61 joined #git
23:21 Maple__ joined #git
23:21 Maple__ joined #git
23:21 Maple__ joined #git
23:29 Cabanossi joined #git
23:36 raijin joined #git
23:39 variable joined #git
23:45 batrick joined #git
23:46 garyserj is it the case that git status shows staging, or that git status shows the difference between staging and the current commit?
23:47 ToxicFrog garyserj: it shows the differences between HEAD, staging, and the working tree
23:47 ToxicFrog The former being "changes staged for commit", the latter "changes not staged for commit" and/or "untracked files"
23:53 agusyc joined #git
23:55 agusyc joined #git
23:56 marianina8 joined #git

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