Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-04-23

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

All times shown according to UTC.

Time Nick Message
00:02 relipse joined #git
00:14 peterbecich joined #git
00:15 kbeflo joined #git
00:16 miha_S7_ joined #git
00:17 kbeflo_ joined #git
00:18 Gustavo6046 joined #git
00:21 jagob joined #git
00:26 watabou joined #git
00:28 alexggordon joined #git
00:28 peterbecich joined #git
00:29 cam27 joined #git
00:29 cam27 left #git
00:30 peterbecich joined #git
00:30 peterbecich joined #git
00:32 peterbecich joined #git
00:32 telephone joined #git
00:32 telephone joined #git
00:32 bronson joined #git
00:34 justin3 joined #git
00:34 DolphinDream joined #git
00:36 a3Dman joined #git
00:38 thiago joined #git
00:41 peterbecich joined #git
00:45 dermoth joined #git
00:45 Cabanossi joined #git
00:47 ckubrak joined #git
00:50 fstd_ joined #git
00:53 orbyt_ joined #git
00:54 kbeflo joined #git
00:54 kbeflo joined #git
00:55 a3Dman joined #git
00:59 kbeflo_ joined #git
01:00 qpdb joined #git
01:06 nowhereman joined #git
01:10 Es0teric joined #git
01:11 finalbeta joined #git
01:13 telephone joined #git
01:13 telephone joined #git
01:14 ckubrak joined #git
01:15 Cabanossi joined #git
01:16 Lyqyd joined #git
01:21 kbeflo joined #git
01:23 tmsmith joined #git
01:25 telephone joined #git
01:26 telephone joined #git
01:29 ali1234 joined #git
01:30 cyphase joined #git
01:32 Sein joined #git
01:34 kbeflo_ joined #git
01:35 tmsmith joined #git
01:36 gnixev joined #git
01:37 Gustavo6046 joined #git
01:37 Goplat joined #git
01:39 marianina8 joined #git
01:39 a3Dman joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at https://gitirc.eu/log | First visit? Read: https://gitirc.eu | Current stable version: 2.12.2 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 bronson joined #git
01:52 tmsmith joined #git
01:53 telephone joined #git
01:53 telephone joined #git
01:53 re1_ joined #git
01:55 dreiss joined #git
01:57 SwiftMatt joined #git
02:00 sunri5e joined #git
02:09 Noldorin joined #git
02:14 snowkidind joined #git
02:15 jameser joined #git
02:15 Cabanossi joined #git
02:16 peterbec` joined #git
02:17 gnixev joined #git
02:17 ResidentBiscuit joined #git
02:24 svm_invictvs joined #git
02:27 oskarkv joined #git
02:29 telephone joined #git
02:29 telephone joined #git
02:34 shinnya joined #git
02:42 DolphinDream joined #git
02:44 lb1c joined #git
02:44 Vortex35 joined #git
02:46 marianina8 joined #git
02:46 marianina8 joined #git
02:49 JeremyD joined #git
02:50 telephone joined #git
02:50 telephone joined #git
02:51 lagothrix joined #git
02:53 chachasmooth joined #git
02:54 tmsmith joined #git
02:55 mattcen joined #git
02:56 hexagoxel joined #git
02:56 f0rks joined #git
02:56 tmsmith joined #git
02:57 DolphinDream joined #git
02:59 sz0 joined #git
03:00 Cabanossi joined #git
03:06 tmsmith joined #git
03:13 hendry joined #git
03:14 hendry is there a way of telling in a script there has been an update after a git pull ?
03:17 miha_S7_ joined #git
03:18 orbyt_ joined #git
03:19 SwiftMatt joined #git
03:21 YuGiOhJCJ joined #git
03:26 darkbit joined #git
03:27 SwiftMatt joined #git
03:34 Random832 joined #git
03:38 deltab hendry: read the branch head commit id before and after, and compare
03:39 hendry deltab: good one, thanks
03:40 deltab git rev-parse
03:44 Cabanossi joined #git
03:46 marianina8 joined #git
03:46 Motoko joined #git
03:58 h12o joined #git
04:09 a3Dman joined #git
04:13 DolphinDream joined #git
04:13 bilal joined #git
04:20 a3Dman joined #git
04:21 h12o joined #git
04:22 tmsmith joined #git
04:23 jaziz joined #git
04:23 hdon_ joined #git
04:24 menip joined #git
04:25 hdon_ hi all :) i accidentally committed something (up-enter reflex in my shell) and then checked out its parent revision and did some work and committed a new detached HEAD. how can i remove the unwanted commit and make master branch point to my currently detached HEAD ?
04:26 tmsmith joined #git
04:30 Neurocam joined #git
04:35 h12o joined #git
04:35 Neurocam left #git
04:35 Guest48456 joined #git
04:36 SReject joined #git
04:37 TbobbyZ joined #git
04:37 tmsmith joined #git
04:37 SReject Is there a way to exclude all files that match a specific scheme except a specific file. I want to hide all files that match *.config.js except example.config.js
04:38 SReject -hide +exclude
04:38 SReject (via .gitignore)
04:39 SReject nvm: *.config.js\n!example.config.js
04:40 a3Dman joined #git
04:43 senaps joined #git
04:43 Nilesh_ joined #git
04:43 senaps joined #git
04:46 miha_S7_ joined #git
04:52 jameser joined #git
05:02 zefferno joined #git
05:02 marianina8 joined #git
05:10 hanthings joined #git
05:10 nickel_dime_look joined #git
05:12 kyan joined #git
05:14 Cabanossi joined #git
05:16 tnecniv joined #git
05:20 senaps joined #git
05:22 shinnya joined #git
05:24 freimatz joined #git
05:24 cdown joined #git
05:25 iamtakingiteasy joined #git
05:25 math-alpha joined #git
05:25 imack joined #git
05:26 Sein joined #git
05:27 Anthaas joined #git
05:31 peterbec` joined #git
05:31 sathed joined #git
05:33 rewt joined #git
05:37 PioneerAxon joined #git
05:39 acetakwas joined #git
05:48 MeltedLux joined #git
05:52 camoverride joined #git
05:53 MeltedLux joined #git
05:54 miha_S7_ joined #git
06:01 _ng joined #git
06:02 MeltedLux joined #git
06:03 Taikibansei joined #git
06:05 sunri5e joined #git
06:06 ozcanesen joined #git
06:07 MeltedLux joined #git
06:09 marianina8 joined #git
06:10 chatter29 joined #git
06:11 cdown joined #git
06:11 chatter29 joined #git
06:14 Cabanossi joined #git
06:18 Xenophon1 joined #git
06:20 cdown joined #git
06:20 navidr joined #git
06:21 bariscant joined #git
06:30 tohuw joined #git
06:30 tohuw joined #git
06:43 tarkus joined #git
06:45 svm_invictvs joined #git
06:45 ResidentBiscuit joined #git
06:46 svm_invictvs joined #git
06:48 aw1 joined #git
06:49 aw1 joined #git
06:52 aw1 joined #git
06:53 pks joined #git
06:54 watmm joined #git
06:55 Introoter joined #git
06:55 diogenese joined #git
06:58 Cabanossi joined #git
06:59 schleppel joined #git
07:02 finalbeta joined #git
07:04 bariscant joined #git
07:05 watmm joined #git
07:06 pks joined #git
07:08 bariscant joined #git
07:11 MACscr joined #git
07:13 senaps joined #git
07:13 senaps joined #git
07:13 MineCoins joined #git
07:14 senaps joined #git
07:17 EDAKIRI joined #git
07:18 pks joined #git
07:21 EDAKIRI git clone --depth=1 ; After doing a shallow clone, can one do shallow updates? such as to the new remote HEAD or fetch tags and then update to a tag?
07:22 EDAKIRI I wish to only fetch needed things, not an entire repository and instances of all versions of all files.
07:23 swalladge joined #git
07:23 marianina8 joined #git
07:24 aw1 joined #git
07:25 hanthings_ joined #git
07:25 aw1 joined #git
07:26 ArchNoob joined #git
07:28 aw1 joined #git
07:29 Oatmeal joined #git
07:29 hanthings_ left #git
07:29 dsdeiz joined #git
07:29 sunri5e joined #git
07:30 ZyX-I joined #git
07:38 miha_S7_ joined #git
07:39 MineCoins joined #git
07:39 pks joined #git
07:41 ski4x7 joined #git
07:44 JanC_ joined #git
07:44 hanthings joined #git
07:45 hanthings left #git
07:46 ski4x7 left #git
07:46 pks joined #git
07:47 ski7777 joined #git
07:47 finalbeta joined #git
07:50 beaky joined #git
07:51 Seveas joined #git
07:52 Guest93611 joined #git
07:52 hvxgr joined #git
07:53 danmackay_ joined #git
07:53 KevinMGranger joined #git
07:55 BackEndCoder joined #git
07:55 logos[m] joined #git
07:56 kent\n joined #git
07:57 imack joined #git
07:57 a3Dman joined #git
07:57 BinGOs joined #git
07:58 am2on joined #git
07:59 ter0 joined #git
08:01 _main_ joined #git
08:02 _main_ joined #git
08:02 pbandark joined #git
08:03 anolir joined #git
08:03 chipotle joined #git
08:05 rossome joined #git
08:08 jagob joined #git
08:10 shinnya joined #git
08:10 reactormonk[m] joined #git
08:10 Aaeriele joined #git
08:11 ArchNoob joined #git
08:14 Cabanossi joined #git
08:19 Anja_ joined #git
08:19 Tobbi joined #git
08:23 hhee joined #git
08:27 a3Dman joined #git
08:28 jaziz joined #git
08:29 tkore joined #git
08:29 tkore joined #git
08:30 armyriad joined #git
08:34 wxg joined #git
08:52 rokups joined #git
08:55 bariscant joined #git
08:55 sarri joined #git
08:56 sarri joined #git
08:56 robotroll joined #git
08:56 lekare joined #git
09:01 dhollin3 joined #git
09:01 pbandark joined #git
09:06 xaa joined #git
09:11 Anja_ joined #git
09:13 theoceaniscool_ joined #git
09:14 Cabanossi joined #git
09:14 gnixev joined #git
09:15 ChiLL_SurF joined #git
09:16 aax joined #git
09:17 overlord_tm joined #git
09:22 miha_S7_ joined #git
09:23 freimatz joined #git
09:24 miha_S7_ joined #git
09:25 MarioBranco joined #git
09:27 ash_workz joined #git
09:29 dsdeiz joined #git
09:29 dsdeiz joined #git
09:29 kbeflo joined #git
09:30 Murii joined #git
09:30 mentazoom joined #git
09:31 catsup joined #git
09:32 catsup joined #git
09:33 darkbit joined #git
09:34 zartu joined #git
09:39 cbreak EDAKIRI: man git-fetch
09:39 gitinfo EDAKIRI: the git-fetch manpage is available at https://gitirc.eu/git-fetch.html
09:39 cbreak look at --depth
09:39 leeN joined #git
09:40 miczac joined #git
09:42 senaps joined #git
09:42 senaps joined #git
09:43 ash_workz joined #git
09:43 bariscant joined #git
09:45 h12o joined #git
09:46 ash_workz joined #git
09:47 visual hey guys, i moved a repo to a different gitlab group  (basically a different upstream)
09:47 visual what would be the right way to update that change in the working directory?
09:48 visual like --set-upstream (new repo) and  then checkout?
09:48 cbreak no checkout
09:48 visual :O!
09:48 cbreak you can git push -u to the new upstream
09:48 visual it's that simple?
09:48 cbreak or git branch --set-upstream-to or what ever method you want to use
09:48 visual anything else i need to be aware of?
09:48 cbreak upstream is just a setting in .git/config
09:49 cbreak you don't need to set it if you don't want to
09:49 visual but now, when you do checkout, pull, push, you dont specify the branch
09:49 cbreak you can push to dozens of repositories without that
09:49 visual im assuming it's because of the upstream setting, right?
09:49 ArchNoob joined #git
09:50 Muzer joined #git
09:50 visual anyway thanks cbreak
09:51 visual $ git remote rm upstream
09:51 visual fatal: No such remote: upstream
09:51 visual what did it mean by this?
09:51 cbreak you didn't have a remote called upstream
09:52 cbreak git remote -v lists them
09:53 visual ooooh, so that "git remote add origin" the {origin} is just a name you give to the remote repo?
09:53 visual and doesnt affect anything?
09:53 Anja_ joined #git
09:53 GT4066 joined #git
09:54 cbreak yes
09:54 cbreak the names of remote tracking branches
09:59 visual super, thx
10:05 zartu joined #git
10:06 j08nY joined #git
10:10 zeroed joined #git
10:10 zeroed joined #git
10:12 Gloomy joined #git
10:13 h12o joined #git
10:13 davimore joined #git
10:16 imack joined #git
10:21 bariscant joined #git
10:23 darkbit joined #git
10:24 borkr joined #git
10:24 masuberu joined #git
10:34 ispn joined #git
10:34 dersand joined #git
10:36 grayjoc joined #git
10:37 fbwnd joined #git
10:37 s1scha joined #git
10:39 skre4 joined #git
10:41 YuGiOhJCJ joined #git
10:42 Levex joined #git
10:43 Furai joined #git
10:49 manuelschneid3r joined #git
10:49 anuxivm joined #git
10:58 lowercaseman joined #git
11:01 ArchNoob joined #git
11:02 TSS_ joined #git
11:02 digidog joined #git
11:04 earnestly joined #git
11:05 dedicated joined #git
11:06 finalbeta joined #git
11:07 Acerific joined #git
11:07 Acerific joined #git
11:18 bertschneider joined #git
11:20 iLembus joined #git
11:21 miczac joined #git
11:22 ArchNoob joined #git
11:24 Guest48456 joined #git
11:25 peacememories joined #git
11:26 kirb joined #git
11:28 aw1 joined #git
11:29 aw1 joined #git
11:29 xall joined #git
11:32 aw1 joined #git
11:35 aw1 joined #git
11:38 jbitdrop joined #git
11:43 finalbeta joined #git
11:47 Raed|Mobile joined #git
11:49 maroloccio joined #git
11:50 senaps joined #git
11:50 finalbeta joined #git
11:51 bouncy joined #git
11:53 lowercaseman joined #git
11:55 ahrs joined #git
11:56 oskarkv joined #git
11:57 cam27 joined #git
11:58 JimDungo joined #git
11:59 TbobbyZ joined #git
11:59 Cabanossi joined #git
11:59 TbobbyZ joined #git
12:00 TbobbyZ joined #git
12:01 TbobbyZ joined #git
12:02 TbobbyZ joined #git
12:03 andai joined #git
12:03 mohabaks joined #git
12:03 peacememories joined #git
12:07 ArchNoob joined #git
12:12 Raed|Mobile joined #git
12:13 zartu joined #git
12:14 nowhereman joined #git
12:15 moei joined #git
12:15 jstein_ joined #git
12:19 finalbeta joined #git
12:19 MrLawrence joined #git
12:21 Silenced joined #git
12:23 TikityTik joined #git
12:29 imack joined #git
12:29 King_Hual joined #git
12:29 King_Hual joined #git
12:30 ferr joined #git
12:31 vmiklos joined #git
12:31 medeirosthiiago joined #git
12:36 sturner joined #git
12:39 HoierM joined #git
12:41 s1scha joined #git
12:42 ArchNoob joined #git
12:44 dsdeiz joined #git
12:49 Gustavo6046 joined #git
12:51 khfeng joined #git
12:52 doener joined #git
12:52 zivester joined #git
12:54 MarioBranco joined #git
12:56 nod joined #git
12:57 Gloomy joined #git
12:59 thiago joined #git
12:59 miklcct joined #git
13:00 ArchNoob joined #git
13:01 masuberu joined #git
13:03 ncthom91 joined #git
13:03 kexmex joined #git
13:04 ArchNoob joined #git
13:07 bgerber joined #git
13:08 mikecmpbll joined #git
13:08 overlord_tm joined #git
13:09 cam27 joined #git
13:09 marianina8 joined #git
13:12 vrach joined #git
13:14 ArchNoob joined #git
13:16 otisZart joined #git
13:16 govg joined #git
13:17 otisZart Hello people, I am going full crazy, I have this issue: http://imgur.com/aTb0AgN <-- everytime I commit using SourceTree, it switches to master and doesn't follow the origin/master - why? how can I fix?
13:17 vandemar joined #git
13:19 _ng joined #git
13:21 Introoter joined #git
13:26 bremner otisZart: I am just leaving, but the short answer is, you normally commit to local branches; remote branches are read only mirrors of the other repo
13:26 oskarkv joined #git
13:26 bremner !remote
13:26 gitinfo [!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)
13:26 bremner err. not that.
13:27 bremner !remote branch
13:27 gitinfo [!remote_commands] The only git porcelain commands which might interact with remote repos are: fetch, pull, push, remote, ls-remote, archive, submodule (plus plumbing, remote helpers, etc)
13:28 vandemar I seem to have a strange pager problem, in a konsole terminal. No matter where I am in the pager, it won't show the first line it's supposed to show. Without any navigation, that means the first commit <commitid>... line isn't visible. If I scroll right, the line appears (end of the commit id is visible). If I shrink the konsole window enough, the line appears. setting TERM=xterm, xterm-color, or linux,
13:28 vandemar doesn't seem to make a difference. Konsole problem? Terminfo problem? (I don't think I've modified terminfo at all.)
13:28 vandemar I'm guessing it has to do with the coloring git applies to the commit lines?
13:28 otisZart but previously commits were correct, why now i get detached head?
13:29 leeN joined #git
13:29 Cabanossi joined #git
13:32 _ikke_ otisZart: You don't commit to remote tracking branches (origin/master), but local branches (master)
13:32 _ikke_ otisZart: only when you push or fetch are remote tracking branches updated
13:32 alexandre9099 joined #git
13:32 theoceaniscool joined #git
13:33 Acerific joined #git
13:33 Acerific joined #git
13:35 finalbeta joined #git
13:37 otisZart _ikke_, so you are telling me that origin/master was always there, down the branch, and I just didnt see/know that, and that I always pushed to master only?
13:38 otisZart so you see my situation as *normal* ?
13:40 jameser joined #git
13:40 _ikke_ otisZart: yes
13:40 _ikke_ you should not checkout origin/master
13:44 albel727 joined #git
13:44 griff joined #git
13:45 hugdru joined #git
13:47 otisZart ok thanks for the info
13:48 otisZart I don't get why they are separated though, shouldn't they be together? origin/master AND master
13:48 _ikke_ Only when they are the same
13:48 _ikke_ if you commit it locally, the remote has not have it yet. Then it makes no sense for those to be the same
13:49 otisZart it sounds reasonable now
13:49 andai joined #git
13:50 Gsham joined #git
13:54 alexandre9099 joined #git
13:54 ArchNoob joined #git
14:00 griff joined #git
14:03 finalbeta joined #git
14:04 dsdeiz joined #git
14:04 dsdeiz joined #git
14:06 Mike11 joined #git
14:07 _ng joined #git
14:08 tribly joined #git
14:11 kent\n joined #git
14:13 hugdru joined #git
14:15 Gsham joined #git
14:15 abacsai joined #git
14:15 Silenced joined #git
14:16 aard joined #git
14:17 davimore_ joined #git
14:18 stoopkid joined #git
14:19 publio joined #git
14:20 abacsai left #git
14:23 Svecify joined #git
14:24 Svecify For a project that consists of 3 main parts, which have to interact with each other, what git structure would be best?
14:25 imack joined #git
14:26 iamthad joined #git
14:34 hugdru joined #git
14:36 Silenced joined #git
14:37 hugdru joined #git
14:38 imack joined #git
14:38 xall joined #git
14:39 freimatz joined #git
14:39 ArchNoob joined #git
14:41 SlashLife joined #git
14:41 Domhack joined #git
14:44 _M6HZ_ joined #git
14:46 NeXTSUN joined #git
14:48 marianina8 joined #git
14:52 zeroed joined #git
14:55 orbyt_ joined #git
14:56 robattila256 joined #git
15:00 nedbat Svecify: it's not about git structure, it's about your project structure. Your tools likely have conventions to follow
15:01 Svecify nedbat, i'm talking about branch structure. I.e. should each part get a seperate branch, etc
15:02 nedbat Svecify: definitely not. Branches are about different versions of the same thing, not about different things.
15:03 Svecify To clarify a bit more: The project is about writing software to simulate drones and autopilots that are simulated. They should be considered two seperate programs, but preferable should be contained in the same repo.
15:03 nevodka joined #git
15:04 DolphinDream joined #git
15:04 ZyX-I joined #git
15:04 Svecify nedbat, so you're saying it is not really good use of git to store the simulation software and the autopilot in the same git repo?
15:05 nedbat Svecify: it's fine to keep all that in one repo.  Different directories in the same repo.
15:05 _ikke_ Sc0rpius: Like nedbat said, branches are not meant to separate out different components
15:05 dsdeiz joined #git
15:05 Svecify ok, makes sense
15:07 ZyX-I joined #git
15:08 dreiss joined #git
15:09 robattila256 joined #git
15:10 tmsmith joined #git
15:11 bertschneider joined #git
15:18 zeroed joined #git
15:19 davimore joined #git
15:20 Emperor_Earth joined #git
15:20 dsdeiz joined #git
15:21 iLembus_ joined #git
15:22 kexmex joined #git
15:24 theoceaniscool joined #git
15:26 hugdru joined #git
15:28 Levex joined #git
15:29 Cabanossi joined #git
15:31 dirtyroshi joined #git
15:34 peacememories joined #git
15:36 dsdeiz joined #git
15:36 robattila256 joined #git
15:36 madewokherd joined #git
15:38 grayjoc joined #git
15:39 gugah joined #git
15:39 gugah joined #git
15:42 ArchNoob joined #git
15:43 __builtin joined #git
15:44 Gsham joined #git
15:46 orbyt_ joined #git
15:46 Saint_Is_ joined #git
15:51 Fuzzy_Wuzzy_Pand joined #git
15:51 Fuzzy_Wuzzy_Pand I love git
15:51 dsdeiz joined #git
15:54 vuoto joined #git
15:54 maarhart joined #git
15:55 bremner !next
15:55 gitinfo Another satisfied customer. NEXT!
15:56 FuzzyWuzzyPanda joined #git
15:59 iLembus joined #git
16:00 TbobbyZ joined #git
16:01 Hello71 joined #git
16:02 cdown joined #git
16:03 g0d355__ joined #git
16:11 maarhart joined #git
16:13 bertschneider joined #git
16:17 Sleepy63 joined #git
16:18 ZyX-I joined #git
16:21 dsdeiz joined #git
16:21 dsdeiz joined #git
16:24 jeffreylevesque joined #git
16:26 andai joined #git
16:29 Cabanossi joined #git
16:30 dreiss joined #git
16:34 a_thakur joined #git
16:35 Gsham joined #git
16:35 dedicated joined #git
16:35 ArchNoob joined #git
16:35 hdon_ hi all :) i accidentally committed something (up-enter reflex in my shell) and then checked out its parent revision and did some work and committed a new detached HEAD. how can i remove the unwanted commit and make master branch point to my currently detached HEAD ?
16:39 m0viefreak joined #git
16:39 rewt hdon_, just rebase the "detached HEAD" commit on the branch
16:39 DolphinDream joined #git
16:40 menip joined #git
16:41 grayjoc joined #git
16:41 grayjoc joined #git
16:43 FuzzyWuzzyPanda joined #git
16:50 jeffreylevesque joined #git
16:52 elichai2 joined #git
16:52 diogenese joined #git
16:54 shgysk8zer0 joined #git
16:55 jimmyrcom joined #git
16:55 mizu_no_oto joined #git
17:00 theiostream joined #git
17:01 Hello71 git branch master
17:02 Hello71 -f
17:05 rastos2 joined #git
17:05 jaziz joined #git
17:07 dsdeiz joined #git
17:07 dsdeiz joined #git
17:12 xall joined #git
17:21 kristofferR joined #git
17:21 nowhereman joined #git
17:23 SwiftMatt joined #git
17:29 ArchNoob joined #git
17:30 trondth joined #git
17:32 iLembus_ joined #git
17:32 cstratak joined #git
17:34 MarioBranco joined #git
17:35 gunnaro joined #git
17:36 iLembus joined #git
17:37 SlashLife joined #git
17:40 svm_invictvs joined #git
17:41 marianina8 joined #git
17:48 Gloomy joined #git
17:50 usm4n joined #git
17:52 dsdeiz joined #git
17:53 darkbit joined #git
17:55 NeverDie_ joined #git
17:58 nowhereman joined #git
17:58 tnecniv joined #git
18:01 snowalpaca joined #git
18:02 robotroll joined #git
18:03 netj joined #git
18:05 zeroed joined #git
18:05 zeroed joined #git
18:05 TbobbyZ joined #git
18:06 gugah joined #git
18:07 Xenophon1 joined #git
18:14 imack joined #git
18:14 YuGiOhJCJ joined #git
18:15 TheSimonator joined #git
18:17 Guest48456 joined #git
18:19 SwiftMatt joined #git
18:19 NeXTSUN joined #git
18:21 marianina8 joined #git
18:32 jaziz1 joined #git
18:33 safe joined #git
18:33 MineCoins joined #git
18:33 ckubrak joined #git
18:36 acetakwas joined #git
18:37 dsdeiz joined #git
18:37 dsdeiz joined #git
18:38 NotKyros joined #git
18:40 dvaske joined #git
18:42 kristian_on_linu joined #git
18:42 kristian_on_linu hi
18:43 kristian_on_linu I have a jekyll project that I need to push to GitLab
18:43 kristian_on_linu that is, everything in the dir, recursively
18:43 SlashLife joined #git
18:44 grawity then `git add` it and so on
18:49 sctskw joined #git
18:50 tmsmith joined #git
18:51 kristian_on_linu the problem is, nothing happens
18:52 kristian_on_linu I tried fixing it, but I may have messed up ... can I reset the settings?
18:52 miha_S7_ joined #git
18:52 bilal joined #git
18:52 kristian_on_linu sorry if I am vague
18:53 grawity you're a *bit* vague about "nothing happens", yes
18:53 grawity please describe what you've done so far with the repo
18:56 kristian_on_linu okay, I have edited a few files
18:57 kristian_on_linu then I do git add .
18:57 CheckDavid joined #git
18:57 kristian_on_linu git commit -m "update"
18:59 grawity does `git ls-files` show all the files you need to upload?
18:59 Cabanossi joined #git
19:00 hdon_ rewt: i can't just delete the commit?
19:00 TbobbyZ joined #git
19:00 hdon_ rewt: it has no changes that aren't already in my revision history between the common ancestor and my detached head
19:01 grawity "just deleting" the commit wouldn't even do what you're trying to do
19:01 maarhart joined #git
19:01 grawity you need to update the branch first, then the unused commit will (eventually) disappear on its own
19:01 hdon_ :(
19:01 kristian_on_linu grawity, yes
19:02 hdon_ is there a command for me to just point master at another revision?
19:02 peacememories joined #git
19:02 kristian_on_linu but, there was an error after commit
19:02 kristian_on_linu HEAD detached at origin/master
19:02 kristian_on_linu nothing to commit, working directory clean
19:02 kristian_on_linu this is a result of the fiddling I was doing before
19:02 grawity that's not an error
19:02 grawity it does however say that you're committing to the wrong branch
19:03 grawity that is, you cannot change origin/* – they're just cached copies
19:03 grawity you must do all your commits on *local* branches, then push those
19:04 grawity (well, it's a bit more flexible than that, but save that for later.)
19:04 peacememories joined #git
19:04 grawity so right now you can use `git checkout -B master` to return to a local branch and keep all your commits
19:05 Acerific joined #git
19:05 Acerific joined #git
19:05 kristian_on_linu done
19:06 kristian_on_linu repeated steps from above, then did git push origin master
19:07 kristian_on_linu "Everything up-to-date"
19:08 kristian_on_linu tried again with git add -A ... same result
19:08 grawity are you trying to add files which are in .gitignore?
19:08 grawity or, do they show up in `git ls-tree -r HEAD`?
19:09 ozcanesen joined #git
19:10 nd joined #git
19:10 kristian_on_linu no to the first one, yes to the second
19:10 peacememories joined #git
19:10 kristian_on_linu wait!
19:11 kristian_on_linu just double checked GitLab, and the files are indeed updated there
19:11 kristian_on_linu hurm, sorry about that
19:12 kristian_on_linu very odd ... jekyll has not ran when it should, it seems
19:12 zeroed joined #git
19:12 zeroed joined #git
19:22 Kyros joined #git
19:22 bytefire joined #git
19:22 dsdeiz joined #git
19:22 dsdeiz joined #git
19:23 ski7777 joined #git
19:23 kristian_on_linu grawity, thanks for your help!
19:24 nebodka joined #git
19:30 Levex joined #git
19:31 dsdeiz joined #git
19:31 dsdeiz joined #git
19:33 Raedism joined #git
19:34 andai_ joined #git
19:35 Kyros joined #git
19:36 Achylles joined #git
19:46 Mutter joined #git
19:46 dre_ joined #git
19:46 justanotheruser joined #git
19:47 Atm0spher1c joined #git
19:48 bmahe joined #git
19:49 borkr joined #git
19:50 sctskw joined #git
19:51 Taikibansei joined #git
19:51 ali1234 joined #git
19:52 Anja_ joined #git
19:52 EDAKIRI cbreak.  Thanks for calling my attention to the right portion of the right manual page to research.  I will read it fully.
19:53 Anja_ joined #git
19:53 lagothrix joined #git
19:55 bodkan joined #git
19:56 Noldorin joined #git
19:56 ckubrak joined #git
19:59 Levex joined #git
20:00 stevenbenner joined #git
20:03 stevenbenner joined #git
20:04 Goplat joined #git
20:07 TheSimonator joined #git
20:11 sunrunner20 joined #git
20:16 SwiftMatt joined #git
20:21 earnestly joined #git
20:22 dsdeiz joined #git
20:22 _Quetzal_ joined #git
20:22 nnull joined #git
20:28 NoOutlet joined #git
20:28 munkinut joined #git
20:31 Kyros joined #git
20:39 sunrunner20 joined #git
20:46 cbreak git is very well documented, but the documentation is vast in scope :)
20:47 boombatower joined #git
20:48 pbandark1 joined #git
20:49 jstimm joined #git
20:52 griff__ joined #git
20:56 Random832 joined #git
20:56 dsdeiz joined #git
20:58 ertesx joined #git
20:59 Es0teric joined #git
21:01 mostlybadfly joined #git
21:01 justan0theruser joined #git
21:03 MrLawrence joined #git
21:04 anuxivm joined #git
21:05 NeverDie joined #git
21:07 NeverDie_ joined #git
21:08 cads2 joined #git
21:11 FuzzyWuzzyPanda joined #git
21:11 tnecniv joined #git
21:12 tlaxkit joined #git
21:14 Raed|Mobile joined #git
21:15 kent\n joined #git
21:16 sunrunner20 joined #git
21:18 sctskw joined #git
21:18 miczac joined #git
21:18 f0rks joined #git
21:19 Atm0spher1c joined #git
21:19 fragMental joined #git
21:20 kent\n joined #git
21:26 Aeterne joined #git
21:26 planigan joined #git
21:27 MrLawrence joined #git
21:28 f0rks joined #git
21:28 bilal joined #git
21:29 rubenb joined #git
21:29 askb joined #git
21:31 dsdeiz joined #git
21:31 dsdeiz joined #git
21:36 htaccess left #git
21:36 mns joined #git
21:38 sunrunner20 joined #git
21:42 metachr0n joined #git
21:43 dmc joined #git
21:47 jstein_ joined #git
21:48 choki joined #git
21:52 axisys joined #git
21:53 NumberStation08 joined #git
21:53 MrWoohoo joined #git
21:57 Darcidride joined #git
22:01 masuberu joined #git
22:02 dsdeiz joined #git
22:02 ZyX-I joined #git
22:05 Gsham joined #git
22:05 kadoban joined #git
22:08 atomicb0mb joined #git
22:08 sunrunner20 joined #git
22:19 cahoots joined #git
22:19 cahoots hi, how can i show the reverse patch of "git diff my-branch"
22:20 cahoots "git diff head my-branch" won't do it because i may have uncommitted changes
22:25 mathu joined #git
22:26 f0rks joined #git
22:26 TbobbyZ joined #git
22:26 mathu i just deleted a ton of mistakenly-added data that dropped the size of my .git dir from 150mb to 4mb. did a force push --all. when i pull again, my .git dir goes back up to 80mb. why might that be?
22:27 TbobbyZ joined #git
22:27 Raedism joined #git
22:28 Es0teric joined #git
22:28 TbobbyZ joined #git
22:28 f0rks joined #git
22:28 aidalgol joined #git
22:28 zachary joined #git
22:29 tmsmith joined #git
22:33 askb joined #git
22:33 cbreak mathu: tags?
22:41 orbyt_ joined #git
22:44 Cabanossi joined #git
22:44 eastercow joined #git
22:47 regedit joined #git
22:50 mathu cbreak: remote isn't running gc, figured it out
22:50 cbreak mathu: that's normal
22:51 aax joined #git
22:51 cbreak it should still send only the referenced stuff
22:51 mathu yeah, didn't occur to me that deleting objects locally wasn't gonna necessarily propagate
22:51 cbreak unless the remote is a local directory
22:51 johnkeates joined #git
22:51 cbreak the remote will stay big
22:51 mathu i don't want the remote to stay big
22:51 cbreak but cloning from it should not give you garbage
22:51 cbreak then clone the remote
22:52 mathu teammate committed giant python wheel files for deps to the repo and pushed it. so it's a good 100mb larger than it needs to be
22:52 johnkeates I have a repo with a branch I made a while ago. I wiped all files and put in a bunch of new files, and now I want to merge it back to master (yes, I intend to remove everything that's already there, but not the history), but git doesn't want that: fatal: refusing to merge unrelated histories
22:52 mathu i already used filter-branch to purge those and force-pushed. local repo gets smaller after gc but if i pull then it gets huge again
22:52 johnkeates does this mean I have to force push or overwrite master completely?
22:53 cbreak johnkeates: merging unrelated histories should be possible
22:53 cbreak just use the --allow-unrelated-histories flag
22:53 johnkeates okay, i'll try that
22:54 cbreak (seems this "protection" is new, it didn't use to exist)
22:57 kbeflo joined #git
23:00 johnkeates yeah, that's what threw me off there for a second
23:01 johnkeates but it worked out fine, thanks
23:01 thiago joined #git
23:05 NeverDie joined #git
23:08 bronson joined #git
23:10 NoOutlet joined #git
23:10 joki joined #git
23:11 stepho_ joined #git
23:12 stepho_ joined #git
23:13 stepho_ joined #git
23:14 stepho_ joined #git
23:15 stepho_ joined #git
23:15 stepho_ joined #git
23:20 NoOutlet joined #git
23:20 Achylles joined #git
23:22 Kaisyu joined #git
23:29 NoOutlet joined #git
23:33 Es0teric joined #git
23:36 jameser joined #git
23:37 porfiriopaiz joined #git
23:37 Darren_ joined #git
23:40 ahrs joined #git
23:40 zachary joined #git
23:44 tymczenko joined #git
23:44 cdown joined #git
23:46 tymczenko joined #git
23:49 tymczenko joined #git
23:50 Noodlewitt joined #git
23:50 marianina8 joined #git
23:50 marianina8 joined #git
23:56 sctskw joined #git
23:56 tyreld joined #git
23:56 robogoat joined #git
23:57 Doros joined #git
23:57 cam27 joined #git
23:57 marianina8 joined #git

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