Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-25

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

All times shown according to UTC.

Time Nick Message
00:03 raijin joined #git
00:03 Sasazuka_ joined #git
00:07 cagomez joined #git
00:10 cagomez joined #git
00:11 chitopunk joined #git
00:12 brent__ joined #git
00:16 mda1 joined #git
00:17 rivarun joined #git
00:18 pks joined #git
00:19 ffilozov joined #git
00:20 tvw joined #git
00:23 raijin joined #git
00:23 MrcRjs joined #git
00:25 MrcRjs left #git
00:26 sdlnv joined #git
00:26 aw1 joined #git
00:28 durham_ joined #git
00:28 zzz joined #git
00:32 nachoman joined #git
00:32 dave0x6d joined #git
00:34 GodGinrai joined #git
00:35 peterbec` joined #git
00:37 King_Hual` joined #git
00:38 brent__ joined #git
00:39 King_Hual` joined #git
00:40 King_Hual` joined #git
00:42 King_Hual` joined #git
00:43 theiostream joined #git
00:44 King_Hual` joined #git
00:44 armyriad joined #git
00:45 King_Hual` joined #git
00:47 alexandre9099 joined #git
00:47 King_Hual` joined #git
00:47 raijin joined #git
00:48 shgysk8zer0 joined #git
00:49 Cabanossi joined #git
00:49 Kallis joined #git
00:51 arescorpio joined #git
00:52 cyberz joined #git
00:53 gopar joined #git
00:55 imgglasses joined #git
00:57 jast joined #git
00:59 jameser joined #git
01:04 Sasazuka joined #git
01:06 simon816 joined #git
01:08 cyberz joined #git
01:09 raijin joined #git
01:10 peterbec` joined #git
01:10 czar_x joined #git
01:12 livingstn joined #git
01:12 bwn joined #git
01:14 snowalpaca joined #git
01:17 todd_dsm joined #git
01:17 czar_x joined #git
01:18 lucido-cl joined #git
01:18 osk joined #git
01:23 Funeral joined #git
01:24 Anja joined #git
01:26 re1 joined #git
01:26 KamiRathAlt joined #git
01:27 KamiRathAlt while understanding that git's hashing algorithm was not meant for security purposes and is only a feature by "bug" is there any way to have git use SHA256?
01:28 hanthings_ joined #git
01:29 mda1 joined #git
01:30 cyphase joined #git
01:33 bitmod joined #git
01:36 learning joined #git
01:40 osse KamiRathAlt: Not yet
01:42 cagomez joined #git
01:45 peterbec` joined #git
01:46 cccharles joined #git
01:46 drodger joined #git
01:47 jameser joined #git
01:47 alexsandroalmeid joined #git
01:49 dsdeiz joined #git
01:49 Cabanossi joined #git
01:52 drodger joined #git
01:53 menip joined #git
02:02 ffilozov KamiRathAlt, I've read that someone is working making the hashing algorithm pluggable.
02:02 texasmynsted joined #git
02:05 Jellyg00se joined #git
02:08 a3Dman joined #git
02:09 KamiRathAlt ffilozov, any links?
02:10 ffilozov KamiRathAlt, https://news.ycombinator.com/item?id=13906804
02:13 kbeflo joined #git
02:16 thiago joined #git
02:17 raijin joined #git
02:17 d^sh joined #git
02:22 nandi_ge___ joined #git
02:26 chitopunk joined #git
02:27 KamiRathAlt ffilozov, thank you
02:29 jerkey joined #git
02:31 jerkey can i make a patch with --format-patch and then apply it to a similar target but with different line numbers?
02:32 dsdeiz joined #git
02:33 cccharles joined #git
02:35 jerkey gitinfo: faq
02:39 sunri5e joined #git
02:40 fstd_ joined #git
02:46 JanC_ joined #git
02:47 cyberz joined #git
02:48 m0viefreak joined #git
02:49 Cabanossi joined #git
02:51 peterbec` joined #git
02:52 TechnoTony joined #git
02:52 zezba joined #git
02:54 diogenese joined #git
02:55 kbs joined #git
02:56 pks joined #git
02:59 * jerkey learns about rebase
03:02 patarr joined #git
03:02 maarhart joined #git
03:03 fahadash joined #git
03:03 chipotle joined #git
03:03 Emperor_Earth joined #git
03:06 ojdo joined #git
03:06 aidalgol joined #git
03:07 Goplat joined #git
03:10 Vortex35 joined #git
03:11 mizu_no_oto joined #git
03:13 lagothrix joined #git
03:15 chachasmooth joined #git
03:16 skalpin gitinfo: faq
03:18 skalpin .random
03:18 gitinfo <cbreak> with great power comes a whole load of command line flags. [25]
03:18 skalpin .random
03:18 gitinfo < jast> chmod +x .gitignore [32]
03:18 thiago heh
03:19 jerkey wtf does that do?
03:19 thiago what?
03:19 skalpin jerkey: the chmod command? it sets the file permissions to add the executable
03:19 Cabanossi joined #git
03:20 skalpin on the .gitignore file
03:21 peterbec` joined #git
03:21 thiago which is probably a bad idea
03:23 orbyt_ joined #git
03:26 jerkey why did the bot say it?  to be funny?
03:26 skalpin because I asked it to with the random command
03:26 skalpin https://jk.gs/git/bot/
03:27 skalpin I wanna try the graphs one
03:27 thiago .random
03:27 gitinfo <bremner> if it makes you feel better, I was going to mention reselling Linus's poop on ebay. But I restrained myself because that would be immature. [21]
03:27 jerkey SpeakerToMeat: are you a larry niven fan?
03:27 cyberz joined #git
03:27 ribasushi joined #git
03:28 thiago like that
03:28 GodGinrai joined #git
03:28 skalpin .graph
03:28 skalpin ... not impressed
03:28 gitinfo .graph: http://g.jk.gs/1Y.png
03:28 skalpin .graph Sleep -> Work [label="zombie"]
03:28 gitinfo .graph: http://g.jk.gs/ae.png
03:28 skalpin Work -> TV [label="zombie"]
03:29 skalpin TV -> Sleep [label="zombie"]
03:29 skalpin cool
03:29 cyphase joined #git
03:30 skalpin .graph A [label="master"] -> B [label="develop"] B -> C A-> C
03:30 gitinfo skalpin: .graph error processing the definition: Error: <stdin>:2: syntax error near line 2 | context: A [label="master"] >>>  - <<< > B [label="develop"] B -> C A-> C
03:30 skalpin .graph A -> B B -> C A -> C
03:30 gitinfo skalpin: .graph error processing the definition: Error: <stdin>:2: syntax error near line 2 | context: A >>>  - <<< > B B -> C A -> C
03:31 skalpin okay I'll stop
03:32 f3r70rr35f joined #git
03:33 enleeten joined #git
03:34 dsdeiz joined #git
03:34 dsdeiz joined #git
03:35 SwiftMatt joined #git
03:35 snowalpaca joined #git
03:37 learning joined #git
03:39 hexagoxel joined #git
03:41 MrWoohoo joined #git
03:43 masuberu joined #git
03:48 oaaao joined #git
03:49 Eugene It has a web UI
03:53 damdouma joined #git
04:00 atomi_ joined #git
04:00 bocaneri joined #git
04:02 bocaneri joined #git
04:03 kbeflo_ joined #git
04:05 latino31 joined #git
04:07 Cabanossi joined #git
04:11 lcibiyzw joined #git
04:11 achoe joined #git
04:11 zyank joined #git
04:11 jytyqn joined #git
04:11 lcibiyzw left #git
04:11 lcibiyzw joined #git
04:11 zyank left #git
04:11 zyank joined #git
04:11 mzgvjozl joined #git
04:11 achoe left #git
04:11 rfkqsqm joined #git
04:11 wjibcxl joined #git
04:11 cupkc joined #git
04:11 achoe joined #git
04:11 mzgvjozl left #git
04:11 lcibiyzw left #git
04:11 rfkqsqm left #git
04:11 mzgvjozl joined #git
04:11 achoe left #git
04:11 qpfjsbs joined #git
04:11 qpfjsbs left #git
04:11 lcibiyzw joined #git
04:11 qpfjsbs joined #git
04:11 tjxwhuwo joined #git
04:11 gkwyzr joined #git
04:11 achoe joined #git
04:11 jytyqn left #git
04:11 cupkc left #git
04:11 jrrxwe joined #git
04:11 jytyqn joined #git
04:11 gkwyzr left #git
04:11 cupkc joined #git
04:11 zyank left #git
04:11 wjibcxl left #git
04:11 gkwyzr joined #git
04:11 wjibcxl joined #git
04:11 zyank joined #git
04:11 gkwyzr left #git
04:11 jrrxwe left #git
04:11 gubescd joined #git
04:11 derzoz joined #git
04:11 wjibcxl left #git
04:11 jrrxwe joined #git
04:11 jlofa joined #git
04:11 gkwyzr joined #git
04:11 mzgvjozl left #git
04:11 jytyqn left #git
04:11 gubescd left #git
04:11 bzimt joined #git
04:11 gubescd joined #git
04:11 jytyqn joined #git
04:11 ciupwn joined #git
04:11 gkwyzr left #git
04:11 jrrxwe left #git
04:11 bzimt left #git
04:11 tjxwhuwo left #git
04:11 bcxhpw joined #git
04:11 gubescd left #git
04:11 derzoz left #git
04:11 jrrxwe joined #git
04:11 tjxwhuwo joined #git
04:11 bzimt joined #git
04:11 derzoz joined #git
04:11 sdzodhfe joined #git
04:11 amrois joined #git
04:11 fxrrhsau joined #git
04:11 jrrxwe left #git
04:11 ciupwn left #git
04:11 ciupwn joined #git
04:11 sdzodhfe left #git
04:11 jrrxwe joined #git
04:11 tjxwhuwo left #git
04:11 sdzodhfe joined #git
04:11 sdzodhfe left #git
04:11 akzgyn joined #git
04:11 xrofpufy joined #git
04:11 tjxwhuwo joined #git
04:11 pbvyptij joined #git
04:11 amrois left #git
04:11 sdzodhfe joined #git
04:11 amrois joined #git
04:11 derzoz left #git
04:11 pbvyptij left #git
04:11 ewbzubog joined #git
04:11 jlofa left #git
04:11 jlofa joined #git
04:11 pbvyptij joined #git
04:11 xrofpufy left #git
04:11 koiyx joined #git
04:11 akzgyn left #git
04:11 xrofpufy joined #git
04:11 qnqhvl joined #git
04:11 wsihtmen joined #git
04:11 hjsxmpyt joined #git
04:11 akzgyn joined #git
04:11 ciupwn left #git
04:11 lcqxrcb joined #git
04:11 jlofa left #git
04:11 zhqeak joined #git
04:11 plqfgmje joined #git
04:11 xrofpufy left #git
04:11 wrbuwln joined #git
04:11 amrois left #git
04:11 jlofa joined #git
04:11 ephrb joined #git
04:11 xrofpufy joined #git
04:11 qnqhvl left #git
04:11 qnqhvl joined #git
04:11 zevlp joined #git
04:11 vqfldv joined #git
04:11 pbvyptij left #git
04:11 koiyx left #git
04:11 amrois joined #git
04:11 wrbuwln left #git
04:11 hjsxmpyt left #git
04:11 koiyx joined #git
04:11 akzgyn left #git
04:11 bcxhpw left #git
04:11 wrbuwln joined #git
04:11 gmhya joined #git
04:11 eojyeo joined #git
04:11 kobbnakb joined #git
04:11 fjzgc joined #git
04:11 rhmrz joined #git
04:11 pbvyptij joined #git
04:11 xwsuorr joined #git
04:11 hjsxmpyt joined #git
04:11 akzgyn joined #git
04:11 bcxhpw joined #git
04:11 kobbnakb left #git
04:12 pbvyptij left #git
04:12 eojyeo left #git
04:12 hjsxmpyt left #git
04:12 wtiqlh joined #git
04:12 phkxya joined #git
04:12 nxiztjd joined #git
04:12 ewbzubog left #git
04:12 eojyeo joined #git
04:12 wsihtmen left #git
04:12 xrofpufy left #git
04:12 xwsuorr left #git
04:12 ephrb left #git
04:12 wsihtmen joined #git
04:12 eojyeo left #git
04:12 rhmrz left #git
04:12 xwsuorr joined #git
04:12 beovp joined #git
04:12 ewbzubog joined #git
04:12 ephrb joined #git
04:12 hjsxmpyt joined #git
04:12 phkxya left #git
04:12 vjjgv joined #git
04:12 cryhu joined #git
04:12 fpkzbv joined #git
04:12 ysajxeb joined #git
04:12 hjsxmpyt left #git
04:12 jdvrieql joined #git
04:12 rhmrz joined #git
04:12 phkxya joined #git
04:12 fjzgc left #git
04:12 kjcirjp joined #git
04:12 plqfgmje left #git
04:12 eojyeo joined #git
04:12 fjzgc joined #git
04:12 cryhu left #git
04:12 plqfgmje joined #git
04:12 hjsxmpyt joined #git
04:12 cryhu joined #git
04:12 vjjgv left #git
04:12 ysajxeb left #git
04:12 hjsxmpyt left #git
04:12 phkxya left #git
04:12 zhqeak left #git
04:12 laqgzaq joined #git
04:12 vjjgv joined #git
04:12 svlvx joined #git
04:12 gzjgxea joined #git
04:12 wtiqlh left #git
04:12 zhqeak joined #git
04:12 fpkzbv left #git
04:12 beovp left #git
04:12 fpkzbv joined #git
04:12 ntkqsl joined #git
04:12 plqfgmje left #git
04:12 ewbzubog left #git
04:12 zevlp left #git
04:12 wsihtmen left #git
04:12 zevlp joined #git
04:12 beovp joined #git
04:12 nxiztjd left #git
04:12 imvjzton joined #git
04:12 ntkqsl left #git
04:12 ewbzubog joined #git
04:12 wsihtmen joined #git
04:12 nxiztjd joined #git
04:12 ephrb left #git
04:12 plqfgmje joined #git
04:12 svlvx left #git
04:12 svlvx joined #git
04:12 wsihtmen left #git
04:12 gzjgxea left #git
04:12 gzjgxea joined #git
04:12 mrgur joined #git
04:12 svlvx left #git
04:12 fpkzbv left #git
04:12 ntkqsl joined #git
04:12 mrgur left #git
04:12 svlvx joined #git
04:12 beovp left #git
04:12 ewbzubog left #git
04:12 wsihtmen joined #git
04:12 mrgur joined #git
04:12 gzjgxea left #git
04:12 laqgzaq left #git
04:12 zhqeak left #git
04:12 vjjgv left #git
04:12 fpkzbv joined #git
04:12 beovp joined #git
04:12 iqmjspoh joined #git
04:12 cryhu left #git
04:12 laqgzaq joined #git
04:12 soksbbo joined #git
04:12 ilpmytmi joined #git
04:12 eymwpwpf joined #git
04:12 mrgur left #git
04:12 uqhxki joined #git
04:12 laqgzaq left #git
04:12 nxiztjd left #git
04:12 zevlp left #git
04:12 vqfldv left #git
04:12 iqmjspoh left #git
04:12 uqhxki left #git
04:12 cryhu joined #git
04:12 laqgzaq joined #git
04:12 gmhya left #git
04:12 vqfldv joined #git
04:12 fpich joined #git
04:12 ewwfsk joined #git
04:12 gmhya joined #git
04:12 soksbbo left #git
04:12 nxiztjd joined #git
04:12 soksbbo joined #git
04:12 ilpmytmi left #git
04:12 ilpmytmi joined #git
04:12 eymwpwpf left #git
04:12 gmhya left #git
04:12 kjcirjp left #git
04:12 ilpmytmi left #git
04:12 eymwpwpf joined #git
04:12 eymwpwpf left #git
04:12 ilpmytmi joined #git
04:12 kjcirjp joined #git
04:12 eymwpwpf joined #git
04:12 ilpmytmi left #git
04:12 ilpmytmi joined #git
04:12 eymwpwpf left #git
04:12 kjcirjp left #git
04:13 mehola joined #git
04:16 armyriad joined #git
04:20 kadoban joined #git
04:23 ribasushi joined #git
04:23 blackwind_123 joined #git
04:25 fedepad_ joined #git
04:27 theiostream joined #git
04:28 diogenese joined #git
04:30 ayogi joined #git
04:31 MrcRjs joined #git
04:32 leprechau joined #git
04:38 KamiRathAlt joined #git
04:40 bgerber joined #git
04:45 zezba_ joined #git
04:52 alburaq joined #git
04:52 alburaq hi - i forked a project, and i want to tell the project owner to pull from me. how to do it with github?
04:52 alburaq err, wrong chan. sorry.
04:55 IRCFrEAK joined #git
04:58 IRCFrEAK left #git
04:59 _IRCFrEAK joined #git
05:00 _IRCFrEAK left #git
05:01 rchavik joined #git
05:02 patarr joined #git
05:12 thedudez0r joined #git
05:13 kbeflo__ joined #git
05:17 pks joined #git
05:20 kbeflo_ joined #git
05:21 cyberz joined #git
05:24 kbeflo__ joined #git
05:27 kbeflo_ joined #git
05:28 GodGinrai joined #git
05:31 Nilesh_ joined #git
05:35 a_thakur joined #git
05:37 learning joined #git
05:38 mda1 joined #git
05:54 Dolos joined #git
05:55 sorenb joined #git
05:56 sbulage joined #git
05:56 maarhart joined #git
05:58 ankit01ojha joined #git
06:06 svm_invictvs joined #git
06:07 drodger joined #git
06:07 jimklo joined #git
06:08 ketas joined #git
06:12 cyphase joined #git
06:13 OnBrokenWings joined #git
06:16 hexagoxel joined #git
06:16 mda1 joined #git
06:19 Tobbi joined #git
06:24 wxg joined #git
06:26 cyphase joined #git
06:35 MrcRjs joined #git
06:37 a_thakur joined #git
06:38 cyphase joined #git
06:44 durham joined #git
06:50 venmx joined #git
06:51 hexagoxel joined #git
06:56 cyphase joined #git
07:02 dreiss joined #git
07:03 patarr joined #git
07:05 a_thakur joined #git
07:05 gopar joined #git
07:06 learning joined #git
07:07 Cabanossi joined #git
07:08 masuberu joined #git
07:13 aacn500 joined #git
07:14 scoobertron joined #git
07:19 schleppel joined #git
07:20 a_thakur joined #git
07:21 a_thakur joined #git
07:21 scoobertron joined #git
07:22 qguv joined #git
07:23 hexagoxel joined #git
07:23 peterbec` joined #git
07:24 cyphase joined #git
07:26 bannakaf_ joined #git
07:29 GodGinrai joined #git
07:29 andrew710 joined #git
07:32 damdouma joined #git
07:38 jozwior joined #git
07:39 brent__ joined #git
07:44 SteffanW joined #git
07:47 blur3d joined #git
07:49 Skyfinn joined #git
07:58 alburaq i have made a commit to master and i'm ashamed of it
07:58 hexagoxel joined #git
07:58 alburaq then i branched something better
07:58 alburaq now i want to delete tht commit, and merge from that branch
07:58 alburaq how to do that?
07:59 vuoto joined #git
08:00 _ikke_ Did you push the commit on master already?
08:06 alburaq i have no idea what i am doing. but i guess yes
08:06 alburaq _ikke_: can u link it?
08:07 alburaq this is my 1st time to do this kind of stuff. i did a number of things. not fully sure what you mean
08:07 alburaq if u link it'd help
08:07 drodger joined #git
08:08 Guest15078 joined #git
08:08 alburaq _ikke_: i did two commits to master. one was a terrible one. the other is ok one. which one u refer to?
08:09 sbulage joined #git
08:09 _ikke_ !fixup
08:09 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
08:11 alburaq _ikke_: oh, sorry. wrong channel. i was confused
08:11 alburaq _ikke_: i addesed that by:  git checkout -B maste, then git push -f
08:11 alburaq so first, i git checkout 1243..., then git checkout -B master, then git push -f
08:12 _ikke_ Right, that would work
08:13 _ikke_ you can also use git reset --keep HEAD~, instead of checkout <commit> + checkout -B <branch>
08:14 kasual joined #git
08:15 hhee2 joined #git
08:15 Murii joined #git
08:18 User458764 joined #git
08:19 paul424 joined #git
08:19 User458764 joined #git
08:22 soerenb_ joined #git
08:26 aw1 joined #git
08:26 venmx joined #git
08:27 ydnpft joined #git
08:27 overlord_tm joined #git
08:29 hexagoxel joined #git
08:30 Gabemo joined #git
08:31 Skyfinn joined #git
08:33 cyberz joined #git
08:38 YuGiOhJCJ joined #git
08:43 netj joined #git
08:46 babilen joined #git
08:52 roentgen joined #git
08:57 MatthewAllan93_ joined #git
08:59 MatthewAllan93_ joined #git
08:59 MatthewAllan93_ left #git
09:00 MatthewAllan93 joined #git
09:02 tvw joined #git
09:02 kexmex joined #git
09:04 patarr joined #git
09:06 cyberz joined #git
09:12 jagob joined #git
09:13 patarr joined #git
09:13 t0by joined #git
09:18 MineCoins joined #git
09:18 karols146 joined #git
09:24 peterbec` joined #git
09:27 venmx joined #git
09:27 cagomez joined #git
09:29 thebope joined #git
09:31 hexagoxel joined #git
09:37 netj joined #git
09:43 Jackneill joined #git
09:43 wxg joined #git
09:44 Tobbi joined #git
09:46 alexandre9099 joined #git
09:48 eihabarabia joined #git
09:55 tvw joined #git
10:03 inflames joined #git
10:04 alburaq joined #git
10:05 manuelschneid3r joined #git
10:15 jozwior joined #git
10:15 dersand joined #git
10:17 schleppel joined #git
10:17 King_Hual joined #git
10:18 pks_ joined #git
10:18 hexagoxel joined #git
10:24 kent\n joined #git
10:26 anuxivm joined #git
10:28 kjsaihs joined #git
10:29 armyriad joined #git
10:30 foption joined #git
10:32 foption left #git
10:32 King_Hual` joined #git
10:33 lorenzo left #git
10:34 afuentes joined #git
10:36 kbeflo joined #git
10:36 netj joined #git
10:38 armyriad joined #git
10:40 King_Hual joined #git
10:41 medeirosthiiago joined #git
10:44 pks joined #git
10:48 User458764 joined #git
10:57 Gloomy joined #git
11:00 satifant joined #git
11:00 aw1 joined #git
11:01 aw1 joined #git
11:02 aw1 joined #git
11:03 aw1 joined #git
11:04 madrat_ joined #git
11:04 madrat_ left #git
11:04 aw1 joined #git
11:04 Nilesh_ joined #git
11:05 aw1 joined #git
11:06 vuoto joined #git
11:07 Cabanossi joined #git
11:09 karols146 joined #git
11:09 masuberu joined #git
11:09 xaa joined #git
11:13 cdown joined #git
11:15 hexagoxel joined #git
11:15 Darcidride joined #git
11:17 muhannad joined #git
11:19 vuoto joined #git
11:19 Sadeukko joined #git
11:20 theiostream joined #git
11:22 grayjoc joined #git
11:23 aw1 joined #git
11:24 karols146 joined #git
11:25 aw1 joined #git
11:25 kjsaihs joined #git
11:26 aw1 joined #git
11:27 aw1 joined #git
11:28 aw1 joined #git
11:30 aw1 joined #git
11:30 nachoman joined #git
11:31 aw1 joined #git
11:31 buzzLightBeer joined #git
11:32 aw1 joined #git
11:33 aw1 joined #git
11:34 aw1 joined #git
11:35 aw1 joined #git
11:36 aw1 joined #git
11:36 khfeng joined #git
11:40 cyberz joined #git
11:41 brent__ joined #git
11:46 Gustavo6046 joined #git
11:47 karols146 joined #git
11:52 theoceaniscool joined #git
11:53 karols146 joined #git
11:53 aw1 joined #git
11:54 aw1 joined #git
11:56 Jellyg00se joined #git
12:00 karols146 joined #git
12:06 Cabanossi joined #git
12:07 learning joined #git
12:08 jimi_ joined #git
12:10 hexagoxel joined #git
12:11 cagomez joined #git
12:13 sarri joined #git
12:13 sarri joined #git
12:24 peterbec` joined #git
12:29 venmx joined #git
12:32 blackwind_123 joined #git
12:35 WeiJunLi joined #git
12:42 karols146 joined #git
12:53 safe joined #git
12:56 sbulage joined #git
12:56 kexmex joined #git
12:58 Chinggis6 joined #git
13:00 sorenb_ joined #git
13:01 Arban_ joined #git
13:03 rumble joined #git
13:05 finalbeta joined #git
13:06 venmx joined #git
13:08 medeirosthiiago joined #git
13:21 Cabanossi joined #git
13:23 ahrs joined #git
13:25 peterbec` joined #git
13:26 User458764 joined #git
13:28 thebope joined #git
13:33 dave0x6d joined #git
13:37 Cthalupa joined #git
13:37 skyfaller joined #git
13:37 skyfaller joined #git
13:37 ki0 joined #git
13:41 a_thakur joined #git
13:41 skyfaller_ joined #git
13:43 robotroll joined #git
13:44 m0viefreak joined #git
13:44 p4trix joined #git
13:46 pks joined #git
13:47 ankit01ojha joined #git
13:47 sunri5e joined #git
13:47 plos joined #git
13:52 jokajak joined #git
13:52 Cthalupa joined #git
13:57 kexmex joined #git
13:57 jokajak joined #git
13:57 gugah joined #git
14:00 publio joined #git
14:03 mikecmpbll joined #git
14:03 plexigras joined #git
14:04 plexigras how can i use word diff when merging?
14:07 Cabanossi joined #git
14:07 learning joined #git
14:09 kbs joined #git
14:11 wond999 joined #git
14:11 oskarkv joined #git
14:12 ncthom91 joined #git
14:18 genq joined #git
14:18 bitmod joined #git
14:21 gugah joined #git
14:21 j416 plexigras: can you be more specific?
14:23 Sound joined #git
14:24 plexigras j416 the commits need to be in word diff format dont they :/
14:26 j416 the commit is not a diff, git generates the diff on-demand
14:26 peterbec` joined #git
14:27 bariscant joined #git
14:27 moestevens joined #git
14:31 ahrs joined #git
14:31 Skyfinn joined #git
14:32 dirtyroshi joined #git
14:33 alexandre9099 joined #git
14:43 latino31 joined #git
14:45 vuoto joined #git
14:48 Murii joined #git
14:52 Cabanossi joined #git
14:52 theiostream joined #git
14:54 Nilesh_ joined #git
14:55 topi` joined #git
14:55 venmx joined #git
14:55 topi` I checkouted some older tag in my branch to see something, and now I checkouted back to the HEAD. but "git status" still says "HEAD detached at xxxxxxx"...how do I get rid of this? back to "normal" :)
14:58 j416 topi`: checkout the branch you were on instead of HEAD
14:58 j416 topi`: HEAD always points to where you are right now, so "git checkout HEAD" never makes sense (unless you run it with more options)
15:05 anuxivm joined #git
15:05 anthonyyy joined #git
15:05 anthonyyy left #git
15:06 Ranmaru joined #git
15:07 topi` j416: that was it, thanks!"
15:07 j416 o/
15:08 topi` if I commit something in a Detached head state, where does it go?
15:08 raynold joined #git
15:09 j416 topi`: it will create a commit just like normal, but there won't be a branch referencing it.
15:09 j416 topi`: the commit will exist until it is eventually garbage collected
15:10 topi` ok. So basically I'd be able to, say, git cherry-pick that commit into a branch
15:10 topi` if I knew its commit id
15:10 nedbat topi`: why not make a branch?
15:11 topi` I was just thinking what to do if I accidentally committed in a detached head state
15:11 j416 topi`: a branch is simply a pointer to a commit. Commits can exist with or without branches. Git will check if commits are referenced by anything (such as a branch, tag), if not, it will get rid of them.
15:11 j416 topi`: correct; you can cherry-pick it.
15:11 topi` then, cherry-picking such a dangling commit would essentially cure the situation I described, right?
15:12 j416 topi`: or if the commit is made on top of a commit that is already pointed at by the branch you want it into, you can simply fast-forward merge, reset the branch to that commit
15:12 topi` otherwise I should undo the commit somehow and cp the modified file to /tmp and git checkout <branch> and redo all
15:12 j416 you don't need to go through that hassle
15:12 topi` yeah
15:12 j416 if you committed something, you can use that commit
15:13 topi` I've done that "hassle" in historic times, when I was unsure of how to do it :)
15:13 j416 just make sure you use it before it gets garbage collected, and before you forget it was there (because it'll be tricky to find once you check something else out)
15:13 j416 I think the shortest time (unless you force things) things live before they are garbage collected is 14 days, but I think for many things it's longer than that
15:14 j416 I don't remember the times but I generally just think 14 days is the deadline for everything.
15:14 venmx joined #git
15:14 SwiftMatt joined #git
15:16 orbyt_ joined #git
15:17 cyberz joined #git
15:17 mda1 joined #git
15:18 drodger joined #git
15:19 Atemu joined #git
15:21 IntruderSRB joined #git
15:21 kbeflo joined #git
15:21 h12o joined #git
15:26 EisNerd_ joined #git
15:29 madewokherd joined #git
15:31 thiago joined #git
15:32 jokajak joined #git
15:34 jokajak joined #git
15:34 peepsalot joined #git
15:35 Murii joined #git
15:39 matoro joined #git
15:39 kbs joined #git
15:40 gugah joined #git
15:48 EisNerd joined #git
15:49 sunri5e joined #git
15:52 Cabanossi joined #git
15:53 EisNerd joined #git
15:54 mizu_no_oto joined #git
15:56 gugah_ joined #git
15:57 heroux joined #git
15:58 EisNerd joined #git
16:01 jokajak joined #git
16:02 vuoto joined #git
16:03 jokajak joined #git
16:03 gugah__ joined #git
16:03 Lyqyd joined #git
16:03 dreiss joined #git
16:07 jokajak joined #git
16:08 learning joined #git
16:09 User458764 joined #git
16:10 Zialus joined #git
16:11 a_thakur joined #git
16:11 vuoto joined #git
16:13 peepsalot joined #git
16:13 peeps[lappy] joined #git
16:13 jokajak joined #git
16:16 nowhere_man joined #git
16:16 ResidentBiscuit joined #git
16:16 jokajak joined #git
16:17 vuoto joined #git
16:23 jason237 joined #git
16:27 medeirosthiiago joined #git
16:27 peterbec` joined #git
16:32 thebope joined #git
16:32 Guest23 joined #git
16:33 h12o joined #git
16:34 Guest23 joined #git
16:35 Atemu joined #git
16:37 eightg joined #git
16:37 learning joined #git
16:39 kpease joined #git
16:42 jokajak joined #git
16:43 Groscheri joined #git
16:43 Dyonisos joined #git
16:43 callkalpa joined #git
16:43 theiostream joined #git
16:45 basiclaser joined #git
16:45 callkalpa Anyone know why "git commit -p views.py" doesn't prompt for hunks but try to commit the complete diff of the file?
16:49 scoobertron joined #git
16:50 texasmynsted joined #git
16:54 ahrs joined #git
16:54 j416 callkalpa: because all changes are contiguous
16:55 j416 callkalpa: you can use 'e' to edit the diff to your liking
16:55 callkalpa j416, Thank, let me try with e
17:00 shinnya joined #git
17:00 scoobert1on joined #git
17:01 nd joined #git
17:02 TikityTik joined #git
17:03 noyb joined #git
17:04 hahuang61 joined #git
17:04 Groscheri joined #git
17:05 Dyonisos joined #git
17:05 howitdo joined #git
17:05 howitdo joined #git
17:08 Dyonisos joined #git
17:12 learning joined #git
17:17 Goplat joined #git
17:19 henriknj joined #git
17:19 jost joined #git
17:24 Zialus joined #git
17:25 zezba joined #git
17:25 karols146 joined #git
17:26 mizu_no_oto joined #git
17:27 sz0 joined #git
17:31 apotry joined #git
17:32 jimklo joined #git
17:38 roentgen joined #git
17:38 vuoto joined #git
17:39 elisa87 joined #git
17:39 elisa87 joined #git
17:41 elisa87 joined #git
17:42 elisa87 joined #git
17:45 elisa87 joined #git
17:46 User458764 joined #git
17:48 Sonderblade joined #git
17:48 matoro joined #git
17:51 moestevens left #git
17:51 vuoto joined #git
17:52 Cabanossi joined #git
17:55 aielima joined #git
17:59 bariscant joined #git
18:00 jason237 joined #git
18:01 spriz joined #git
18:03 anuxivm left #git
18:04 jeffreylevesque joined #git
18:05 YuGiOhJCJ joined #git
18:07 MarioBranco joined #git
18:09 jimklo joined #git
18:10 davix joined #git
18:11 Vampire0_ joined #git
18:11 robattila256 joined #git
18:11 ertesx joined #git
18:15 matoro joined #git
18:15 jimklo joined #git
18:20 john_doe_jr joined #git
18:20 kbs joined #git
18:20 john_doe_jr when I do a git status I would like to ignore one directory…is that possible?
18:22 Cabanossi joined #git
18:22 preaction john_doe_jr: put it in .gitignore
18:23 john_doe_jr preaction: good idea
18:24 peterbecich joined #git
18:24 kbs curious about various text diff algorithms used in git, has there been an emperical study on real-world use comparing how well they do?
18:26 kexmex joined #git
18:28 peterbec` joined #git
18:31 leeN joined #git
18:33 grawity there was a mailing list thread last month
18:33 netj joined #git
18:34 learning joined #git
18:35 kbs ah - thinks grawity. any specific keywords you remember as I trawl through the logs
18:35 kbs ?
18:36 kadoban joined #git
18:36 grawity maybe search for the recently-added "compaction heuristic"
18:37 kbs great, thanks
18:37 Glooomy joined #git
18:37 ki0_ joined #git
18:38 grawity (also that thread where they sneakily switched *that* to a yet different algorithm)
18:39 kbs haha. I see a lot of references, earliest I notice seems to be mid-last yearish
18:39 kbs (context - wondering if someone has done a 'weighted' myers-diff implementation, and compared it with the other diffs currently in use)
18:40 User458764 joined #git
18:41 kbs It struck me that someone must have thought of an objective way to compare different diffs, but my google-fu around this was failing me
18:44 hotbobby left #git
18:46 Gloomy joined #git
18:47 zxd joined #git
18:47 Gloomy joined #git
18:47 zxd what does MERGE_HEAD point to\
18:48 Gloomy joined #git
18:49 Gloomy joined #git
18:49 Gloomy joined #git
18:53 kbs zxd: haven't tested this, but docs indicate "point to the other branch head". https://git-scm.com/docs/git-merge#_true_merge
18:54 InfoTest joined #git
18:57 weakdan joined #git
18:58 weakdan sup
18:58 zxd kbs: but if there are many branches being merged what is other
18:59 weakdan i amended a commit, force pushed my branch, but gitlab doesn't get rid of the old amended commit?
18:59 grawity weakdan: it'll GC eventually
18:59 grawity zxd: afaik, MERGE_HEAD is only created during manual conflict resolution
18:59 weakdan grawity: GC?
18:59 grawity weakdan: garbage-collect
19:00 weakdan ahh, just takes some time before the servers go for the sweep?
19:00 grawity zxd: since Git does not allow octopus merges with conflicts, MERGE_HEAD probably never happens
19:00 grawity weakdan: it's regular Git behavior -- amending creates a new commit, but doesn't destroy the old one until a while later, merely unreferences it
19:01 grawity it shouldn't show up in the branch log, though
19:01 weakdan nah it's gone there
19:01 weakdan but activity and whatnot all still show the old commit
19:01 weakdan heck, the old commit is still vieweable, all details and whatnot
19:01 grawity the activity log is Gitlab's own thing
19:01 grawity but accessing it directly by commit ID is going to work for a while longer until the server runs its scheduled `git gc`
19:01 weakdan ahh
19:02 weakdan didn't even know that command was git gc, but nice
19:02 weakdan thanks grawity!
19:03 ujjain joined #git
19:03 ujjain joined #git
19:04 grawity you'll notice that on your local repo it might take weeks or even months (it waits much longer to destroy commits which `git reflog` still remembers)
19:04 zxd grawity: what is octopus merge
19:04 grawity zxd: a multi-branch merge
19:05 grawity regular merges only deal with two
19:05 zxd grawity: I see so it applies only with 2
19:05 zxd the MERge_HEAD
19:05 john_doe_jr I have a file that shows modified when I do a `git status`….how do I determine the date the file was modified?
19:05 zxd so it's all or nothing with octipus
19:06 grawity john_doe_jr: `ls -l` it, that's the best you can get
19:06 karols146 Guys what are best book to learn git ?
19:07 Cabanossi joined #git
19:07 robotroll joined #git
19:08 karols146 joined #git
19:10 john_doe_jr grawity: well `git status` shows that a file was deleted and I would like to know when...
19:10 john_doe_jr grawity: is that possible?
19:10 roentgen joined #git
19:10 Random832 joined #git
19:12 grawity no, it's not
19:16 re1 joined #git
19:16 Murii joined #git
19:17 jimklo joined #git
19:18 re1 joined #git
19:18 MrWoohoo joined #git
19:19 Rotaerk joined #git
19:22 dvaske joined #git
19:23 oleo joined #git
19:23 noyb joined #git
19:27 tmsmith joined #git
19:27 grayjoc joined #git
19:27 scoobertron joined #git
19:29 acetakwas joined #git
19:30 ozmage joined #git
19:32 ujjain joined #git
19:32 ujjain joined #git
19:42 peterbec` joined #git
19:45 Bilz joined #git
19:45 noyb joined #git
19:46 mkoskar joined #git
19:48 mentazoom joined #git
19:48 tvw joined #git
19:51 dsdeiz joined #git
19:51 dsdeiz joined #git
19:51 ozmage joined #git
19:52 Cabanossi joined #git
19:52 t0by joined #git
19:52 t0by joined #git
19:54 patarr joined #git
19:56 alexandre9099 joined #git
19:56 bitmod joined #git
19:57 sparetire joined #git
20:00 kbs grawity: https://github.com/mhagger/diff-slider-tools is this the corpus you were thinking of? This one is specific to a particular set of diff comparisons, but still handy. Just want to know if I'm missing others...
20:01 muhannad joined #git
20:02 dmc karols146, https://git-scm.com/doc
20:03 karols146 thanks dmc
20:03 dmc yep
20:04 vuoto joined #git
20:06 mehola joined #git
20:07 Guest4561 joined #git
20:07 Guest4561 left #git
20:10 Michel2 joined #git
20:15 bariscant joined #git
20:15 john_doe_jr I would like to list all the files using git status that have a deleted status…is that possible?
20:18 Bilz john_doe_jr, git status | grep "deleted" might work?
20:18 Bilz sorry, assumed linux user :s
20:20 Chinggis6 joined #git
20:22 cccharles joined #git
20:26 SpeakerToMeat jerkey: Yes
20:26 SpeakerToMeat jerkey: And also an arrogant sod
20:27 _ikke_ git ls-files --deleted
20:27 xpkill23 joined #git
20:27 bannakaffalatta joined #git
20:28 baryon joined #git
20:28 SpeakerToMeat jerkey: second half of the nick comes from Terry Bison
20:30 jeffreylevesque joined #git
20:31 ujjain joined #git
20:31 ujjain joined #git
20:32 hashtagstrashtag joined #git
20:33 Atm0spher1c joined #git
20:34 baryon joined #git
20:38 Cxcf joined #git
20:44 venmx joined #git
20:44 Cxcf joined #git
20:46 inflames joined #git
20:49 overlord_tm joined #git
20:51 justan0theruser joined #git
20:51 ujjain joined #git
20:51 ujjain joined #git
20:52 azahi joined #git
20:57 GavinMagnus joined #git
20:59 venmx joined #git
20:59 gopar joined #git
21:02 cdown joined #git
21:02 maarhart joined #git
21:04 WeiJunLi joined #git
21:04 SwiftMatt joined #git
21:07 Cabanossi joined #git
21:07 Anja joined #git
21:11 luke_nukem joined #git
21:14 jost_ joined #git
21:14 finalbeta joined #git
21:18 t0by joined #git
21:18 bket joined #git
21:19 GavinMagnus joined #git
21:20 GavinMagnus joined #git
21:23 bariscant joined #git
21:24 gugah joined #git
21:28 brent__ joined #git
21:29 maarhart joined #git
21:33 cydrobolt joined #git
21:33 cydrobolt joined #git
21:35 GavinMagnus joined #git
21:35 maarhart joined #git
21:35 GavinMagnus joined #git
21:36 GavinMagnus joined #git
21:37 GavinMag1us joined #git
21:37 Rotaerk joined #git
21:37 weakdan left #git
21:37 GavinMag2us joined #git
21:39 GavinMagnus joined #git
21:41 maarhart joined #git
21:42 peterbec` joined #git
21:45 stoqn4o_pm joined #git
21:47 wcpan joined #git
21:47 elisa87 joined #git
21:48 NimeshNeema joined #git
21:48 gopar joined #git
21:49 TikityTik joined #git
21:56 azahi left #git
21:56 aidalgol joined #git
22:01 venmx joined #git
22:04 Chinggis6 joined #git
22:07 robattila256 joined #git
22:10 scoobert1on joined #git
22:17 kristofferR joined #git
22:21 bwn joined #git
22:21 BlaXpirit joined #git
22:28 librestreamer joined #git
22:28 bariscant joined #git
22:31 ujjain joined #git
22:31 ujjain joined #git
22:36 govg joined #git
22:38 Goplat joined #git
22:44 dsockwell left #git
22:47 kbs joined #git
22:48 joeco joined #git
22:52 Gloomy joined #git
22:57 AndrewAlexMac joined #git
22:57 apotry joined #git
23:02 venmx joined #git
23:03 beatdown joined #git
23:05 Rotaerk_ joined #git
23:05 theiostr_ joined #git
23:17 hashtagstrashtag joined #git
23:18 eblip joined #git
23:18 jstimm joined #git
23:18 DieguezZ joined #git
23:21 matoro joined #git
23:22 Cabanossi joined #git
23:26 manuelschneid3r joined #git
23:31 todd_dsm_ joined #git
23:32 Taikibansei joined #git
23:39 john_doe_jr I'm trying to git checkout files that were modified between Jan 1st 2017 and Jan 31st 2017 using the following command: find . -type f -name "*" -newermt 2017-01-01 ! -newermt 2017-01-31 -exec git checkout {} \; but this is not working…says "did not math any files know"…anybody know what I'm doing wrong?
23:41 robattila256 joined #git
23:42 baryon joined #git
23:42 ToBeCloud joined #git
23:42 cyphase joined #git
23:42 jstimm joined #git
23:43 john_doe_jr I figured it out…I wasn't using the full path
23:44 peterbec` joined #git
23:44 peterbecich joined #git
23:52 Cabanossi joined #git
23:52 h12o joined #git
23:57 masuberu joined #git
23:57 mda1 joined #git
23:57 baryon joined #git
23:58 jnewt joined #git

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