Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-26

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

All times shown according to UTC.

Time Nick Message
00:00 jstimm joined #git
00:02 c1arknova joined #git
00:04 avar john_doe_jr: find will just use your fs mtimes, which != your git mtimes
00:09 Sound joined #git
00:11 zezba_ joined #git
00:12 matoro joined #git
00:13 bwn joined #git
00:14 SwiftMatt joined #git
00:14 john_doe_jr avar: this won worked and accepted relative paths: lP5DBF.YSq#-/
00:15 glebihan_ joined #git
00:15 john_doe_jr avar: sorry wrong command: git status --untracked-files=no | grep deleted | cut -d" " -f5 | git checkout
00:17 jimklo joined #git
00:18 zezba_ left #git
00:18 zezba_ joined #git
00:18 Rodya_ joined #git
00:18 zezba_ left #git
00:19 zezba joined #git
00:21 SCHAAP137 joined #git
00:24 p4trick joined #git
00:27 Rodya__ joined #git
00:30 c1arknova joined #git
00:33 maroloccio joined #git
00:34 drodger joined #git
00:37 zezba left #git
00:44 cyphase joined #git
00:50 govg joined #git
00:50 Bennux joined #git
00:50 DieguezZ joined #git
00:51 stnutt joined #git
00:52 jameser joined #git
01:02 venmx joined #git
01:06 d^sh joined #git
01:07 patarr joined #git
01:08 jameser joined #git
01:18 jimklo joined #git
01:18 jameser joined #git
01:19 warthog9 joined #git
01:19 hexagoxel joined #git
01:20 finalbeta joined #git
01:22 jameser joined #git
01:25 systemovich joined #git
01:29 arescorpio joined #git
01:38 fstd_ joined #git
01:40 bronson joined #git
01:47 peterbec` joined #git
01:49 ilbot3 joined #git
01:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.1 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
01:51 hexagoxel joined #git
01:51 inflames joined #git
01:52 fahadash joined #git
01:53 h12o joined #git
01:53 Emperor_Earth joined #git
01:54 jmau joined #git
01:55 pks joined #git
02:00 ij Didn't "git checkout feature" make a new local branch from a remote one at some point?
02:02 Vortex34 joined #git
02:06 dviola joined #git
02:06 Cabanossi joined #git
02:11 jeffreylevesque joined #git
02:17 brent__ joined #git
02:17 dsdeiz joined #git
02:19 j7k6 joined #git
02:22 jimklo joined #git
02:23 AndrewAlexMac joined #git
02:23 ki0 joined #git
02:24 lagothri1 joined #git
02:24 j7k6 joined #git
02:25 anonnumberanon joined #git
02:27 kbeflo joined #git
02:30 shinnya joined #git
02:30 hexagoxel joined #git
02:31 SwiftMatt joined #git
02:34 kadoban ij: It does as a shortcut if the branch doesn't exist locally and exactly one remote has a branch by that name
02:35 diogenese joined #git
02:38 Gsham joined #git
02:45 mehola joined #git
02:47 safe joined #git
02:54 cyberz joined #git
02:57 chipotle joined #git
02:59 Vortex35 joined #git
03:00 bmahe joined #git
03:02 peterbec` joined #git
03:03 venmx joined #git
03:04 Random832 joined #git
03:05 chachasmooth joined #git
03:06 ojdo joined #git
03:07 Cabanossi joined #git
03:07 stnutt left #git
03:08 patarr joined #git
03:08 Cabanoss- joined #git
03:09 thedudez0r joined #git
03:10 altendky joined #git
03:11 rchavik joined #git
03:13 jimklo joined #git
03:18 ankit01ojha joined #git
03:21 dsdeiz joined #git
03:23 hvn0413 joined #git
03:35 re1 joined #git
03:37 bezhermoso joined #git
03:37 mizu_no_oto joined #git
03:38 clarkn0va joined #git
03:41 cyphase joined #git
03:42 svm_invictvs joined #git
03:42 Oatmeal joined #git
03:44 orbyt_ joined #git
03:44 ij I see! I had two remotes, so that didn't work, obviously.
03:44 qmm left #git
03:46 ij Another thing: 1. git init 2. commit 3. push to remote feature. Now! Can I set upstream and tracking to remote/feature without fetching the remote?
03:51 a_thakur joined #git
03:53 Blkt joined #git
03:53 mizu_no_oto joined #git
03:54 h12o joined #git
03:56 kegster joined #git
03:59 OnBrokenWings joined #git
04:04 venmx joined #git
04:05 kegster joined #git
04:05 muhannad joined #git
04:06 bezhermoso joined #git
04:06 thedudez0r joined #git
04:08 ki0 joined #git
04:09 jnewt joined #git
04:12 JrCs joined #git
04:13 Cabanossi joined #git
04:15 scoobertron joined #git
04:26 basiclaser joined #git
04:39 dreiss joined #git
04:40 APic joined #git
04:44 zefferno joined #git
04:46 ggg1xkl joined #git
04:47 ggg1xkl Hello, I have a huge remote repository on github and I want to remove all previous commits except the last commit, and I want to do this without downloading the entire repo since it's so big.  Is this possible, and if so, how?
04:48 bezhermoso joined #git
04:50 jimklo joined #git
04:53 fakenerd joined #git
04:54 Evidlo joined #git
04:59 maarhart joined #git
05:00 zefferno joined #git
05:00 menip joined #git
05:04 Evidlo I submitted a pull request on github and the author wants me to get rid of my merge commits, but I can't figure out how.  I somehow managed to duplicate my previous commits: https://github.com/pschmitt/pykeepass/pull/12
05:04 aw1 joined #git
05:05 drodger joined #git
05:07 cev joined #git
05:09 patarr joined #git
05:09 kbeflo_ joined #git
05:09 Evidlo can anyone provide pointers on fixing this messed up pull request? https://github.com/pschmitt/pykeepass/pull/12
05:10 Evidlo I was trying to rebase a merge commit and I managed to duplicate all my commits
05:13 Cabanossi joined #git
05:15 pks joined #git
05:18 z8z joined #git
05:22 kasual joined #git
05:22 aw1 joined #git
05:26 sbasso joined #git
05:30 muhannad joined #git
05:31 gusnan joined #git
05:31 gusnan joined #git
05:42 _ikke_ Evidlo: !situation
05:42 gitinfo Evidlo: Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
05:47 UniFreak joined #git
05:47 pigeon joined #git
05:47 UniFreak .karma UniFreak
05:47 gitinfo the karma of the given users is shrouded in the mists of uncertainty.
05:49 UniFreak hi guys. I'm in the same branch `refactor` with another coworkder. He did a sync merge (from master), and flushed all my newest changes. what should I do now?
05:50 _ikke_ sunc merge? flushed your changes?
05:50 _ikke_ What exactly did he do
05:51 UniFreak he merged master into refactor, I wasn't there, so when he solve conflicts, he picked all the `newest` commits. I don't know how he decide which is `newest`, but today, when I pull from remote, all my changes are gone
05:52 a_thakur joined #git
05:52 _ikke_ first, slap your coworker :P
05:53 UniFreak yeah, if I could. but he is not here
05:53 kadoban That indeed sounds like a decent first step. Then, try to teach them what merges and conflicts are ...
05:54 kadoban You'll probably have to redo that merge, and actually resolve the conflicts in a sane way, not just by picking a winner based on some simple rule.
05:56 UniFreak kadoban, how can I redo the merge? after I pull the origin and found my changess are gone, I tried to checkout my last commit, the changes are there. but the problem is, my last commit doesn't contain his changes
05:56 pigeon joined #git
05:56 UniFreak how can I determine which code to pick
05:56 dsdeiz joined #git
05:56 _ikke_ how comfortable are you with rewriting history? (and help your coworker to properly handle that situation)
05:58 UniFreak _ikke_, I'm not a git master, I only usually use the common things git provide, when things get complicated, I have no idea
05:58 _ikke_ ok, than I think it's not a good idea
05:58 UniFreak I don't know if that what you're asking
05:59 _ikke_ what you could do is try git checkout -p <your last commit>
05:59 Lunatrius` joined #git
05:59 _ikke_ and check what changes you want to get back
05:59 justanotheruser joined #git
05:59 _ikke_ But you could loose changes from master this way
05:59 kadoban This is going to be fairly complicated, so if _ikke_ has a simpler idea, that's the way to go.
06:00 venmx joined #git
06:00 UniFreak gosh
06:01 _ikke_ UniFreak: That your coworker make commits after the merge?
06:01 _ikke_ s/that/did/i
06:02 cyberz joined #git
06:05 UniFreak _ikke_, according to log, he made one changes after the merge
06:06 ki0 joined #git
06:08 drodger joined #git
06:09 pratham_pc joined #git
06:12 UniFreak I'm thinking that, could I checkout my last commit, and merge it with my pulled commits?
06:13 UniFreak definitely I should merge my last commit with one other, I just don't know which commit is the `one other`
06:13 Cabanossi joined #git
06:13 fedepad joined #git
06:14 moei joined #git
06:16 snowalpaca joined #git
06:17 dvaske joined #git
06:19 thiago UniFreak: you can only merge a commit you know
06:19 dvaske_ joined #git
06:19 deltab the merge commit has two parents, your commit and your coworker's
06:19 thiago the command requires typing the committish that identifies it
06:22 cyberz joined #git
06:23 deltab !situation
06:23 gitinfo Please pastebin the relevant output of `git log -n 20 --all --graph --format="%h %p %d"` to give us an idea about what your situation is (increase the -n argument if your problem is more complex than 20 commits can explain)
06:24 deltab using a command such as that, or a viewer such as gitg or tig, you should be able to get the hashes of the other parent
06:25 deltab or just merge master, to include any more recent commits
06:26 deltab oh
06:26 UniFreak deltab: http://kopy.io/yRs9a
06:26 pigeon joined #git
06:27 UniFreak and http://kopy.io/NaMwL
06:27 deltab okay, so git checkout     重构: 获取用户订单总状态
06:27 deltab uh, sorry, don't know what happened there
06:28 deltab huh, that text is invisible in my other windows
06:30 UniFreak deltab: eh... what are you talking about?
06:30 deltab my browser is behaving weirdly: not displaying text, selecting the wrong text, etc.
06:31 UniFreak change one then
06:35 hahuang65 joined #git
06:41 Lea2 joined #git
06:48 kbeflo__ joined #git
06:49 jameser joined #git
06:52 pinkkis joined #git
06:53 drodger joined #git
06:53 dave0x6d joined #git
06:58 clarkn0va joined #git
07:01 bmahe joined #git
07:08 fbwnd joined #git
07:10 patarr joined #git
07:10 jameser joined #git
07:16 Taikibansei joined #git
07:17 mdqtpt joined #git
07:17 aw1 joined #git
07:19 aw1 joined #git
07:19 bronson joined #git
07:21 ki0_ joined #git
07:21 aw1 joined #git
07:24 luke_nukem joined #git
07:24 aw1 joined #git
07:28 vuoto joined #git
07:29 brent__ joined #git
07:29 schleppel joined #git
07:34 Skyfinn joined #git
07:35 Murii joined #git
07:35 muhannad joined #git
07:48 bariscant joined #git
07:51 jameser joined #git
07:53 dvaske joined #git
07:53 dvaske_ joined #git
07:54 drodger joined #git
07:54 oulanka joined #git
07:57 oulanka Is there some clearly good way to keep system gitconfig in git repository? To allow easy applying of my git config to other computers I have https://github.com/matkoniecz/my_git_config - but I feel that having two versions of system gitconfig and scripts to synchronize them is very ugly. Is there some clearly superior method to do that?
08:00 fedepad joined #git
08:01 venmx joined #git
08:01 VladGh_ joined #git
08:02 Skyfinn joined #git
08:08 jameser joined #git
08:08 patarr joined #git
08:09 bariscant joined #git
08:12 Cabanossi joined #git
08:14 Muzer joined #git
08:15 robnester joined #git
08:18 sagittarian joined #git
08:20 stoqn4o_pm joined #git
08:23 diogenese joined #git
08:29 bsanford joined #git
08:30 YuGiOhJCJ joined #git
08:31 j7k6 joined #git
08:32 eightg joined #git
08:32 bannakaffalatta joined #git
08:36 jagob joined #git
08:37 j7k6 joined #git
08:39 zxd joined #git
08:39 zxd hi
08:39 zxd what does -1  mean in git log --cc -p -1
08:39 Sound joined #git
08:40 deltab oulanka: ln -s my_git_config/.gitconfig ~/.gitconfig
08:41 j7k6 joined #git
08:43 deltab zxd: "-<n>: Limits the number of commits to show."
08:44 deltab (found by using &^\s*- in less)
08:49 drodger joined #git
08:50 zxd ah less accepts regex
08:50 zxd & is entire file?
08:50 zxd perl regex
08:52 j416 zxd: man less
08:52 j416 zxd: /&
08:52 leeN joined #git
08:53 zxd git revert ^M    means the parent of M ?
08:54 bariscant joined #git
08:55 zxd ah never mind
08:55 zxd slithly confusing https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging
08:56 Balliad joined #git
08:57 j7k6 joined #git
08:58 j7k6 joined #git
08:59 j7k6 joined #git
08:59 mehola joined #git
08:59 j7k6 joined #git
09:00 overlord_tm joined #git
09:02 robotroll joined #git
09:05 Bilz joined #git
09:05 Bilz joined #git
09:06 mkoskar joined #git
09:08 zxd recursive algorithm in git can only work  with two branches?
09:08 zxd recursve merge
09:11 muhannad___ joined #git
09:14 blackwind_123 joined #git
09:17 Balliad joined #git
09:21 Zarthus joined #git
09:22 bronson joined #git
09:22 deltab yes: "This can only resolve two heads using a 3-way merge algorithm."
09:22 bariscant_ joined #git
09:23 King_Hual joined #git
09:26 mda1 joined #git
09:27 Cabanossi joined #git
09:28 Elysia joined #git
09:32 octo8 joined #git
09:34 catsup joined #git
09:34 catsup joined #git
09:35 octo8 Hello, i'm in the middle of this situation, a 2 year old git repo is connected with githooks on a server, another developer was using nano to make changes for these 2 years, now I want to make a commit with the things he made, what to do?
09:35 octo8 in other words, we want to start doing things the right way, doing git push and pull, etc...
09:36 Nilesh_ joined #git
09:36 Bilz joined #git
09:36 Bilz joined #git
09:37 Assault joined #git
09:37 jameser joined #git
09:37 Assault hi, is it easily possible to transfer a repo from Bitbucket to Github while keeping the history?
09:41 canton7 Assault, sure, just push it. Transferring over things like the issues is a little more work
09:41 Assault so i dont need to use --mirror?
09:42 canton7 --mirror is for cloning. You can use --mirror to make sure you fetch all of the branches from the github repo into your local repo, and push --all to make sure they're all pushed to bitbucket
09:43 elinux joined #git
09:44 Junior joined #git
09:44 Assault canton7, well, I have my repo now on my harddrive from bitbucket. How do I now push to github? I think i need to set a new target origin to point to github
09:44 Assault not sure about the terms here, im not very active git user =P
09:44 canton7 a new remote, yes. "origin" is the name of a specific remote
09:45 brent__ joined #git
09:45 canton7 make sure you've got all of the branches you want to push to bitbucket available as local branches, and they're all up to date
09:45 canton7 then 'git remote add bitbucket <url>', and 'git push bitbucket --all'
09:45 Assault so git remote add origin path_to_my_github_repo.git?
09:46 canton7 that's not what I said, no
09:46 Assault canton7, im transferring from bitbucket to github, not the other way around..
09:46 canton7 oh, misread
09:46 canton7 yes, indeed, then
09:46 canton7 don't call it origin though - you'll already have a remote called 'origin'
09:48 andrew710 joined #git
09:49 Assault ok so now my local repo has 2 origins...so when I do push, it pushes to the original origin, which is BitBucket, right?
09:49 Assault and when I wanna push to Github, I need to do git push -u origin_github master
09:50 Assault just making sure I understand what I just did..?
09:51 canton7 that's if you want to just push master, instead of all branches, yes
09:51 canton7 and why did you call it 'origin_github'? 'origin' is just the default name givin to the remote you clone from. 'An origin' isn't a thing. Git doesn't have 'origins'
09:52 Assault well i just needed to come up with different name since "origin" was already reserved
09:52 Assault canton7, what would you have named it?
09:53 Assault just github?
09:53 Assault and thanks for pointing that out, the origin has been a bit fuzzy topic for me =)
09:55 andrew710 joined #git
09:55 canton7 yeah, just 'github'
09:55 AstralStorm joined #git
09:55 AstralStorm joined #git
10:03 Balliad joined #git
10:04 kexmex joined #git
10:06 elinux joined #git
10:08 inflames joined #git
10:09 Augustine joined #git
10:10 vuoto joined #git
10:11 manuelschneid3r joined #git
10:14 pickfire joined #git
10:14 ogny joined #git
10:14 ogny joined #git
10:16 saedelaere joined #git
10:19 zefferno joined #git
10:20 zefferno joined #git
10:27 xaa joined #git
10:27 drodger joined #git
10:31 eightg joined #git
10:39 jimi_ joined #git
10:39 Murii joined #git
10:47 BadApe joined #git
10:48 Jellyg00se joined #git
10:49 User458764 joined #git
10:50 Skyfinn joined #git
10:54 linuxmodder- joined #git
10:56 finalbeta joined #git
10:56 eahmedshendy joined #git
10:58 Cabanossi joined #git
10:58 mizu_no_oto joined #git
11:02 mehola joined #git
11:03 grumble joined #git
11:08 sbasso joined #git
11:12 mikecmpbll joined #git
11:13 jameser joined #git
11:17 todd_dsm joined #git
11:22 bronson joined #git
11:24 dersand joined #git
11:32 satifant joined #git
11:38 Jackneill joined #git
11:38 BadApe joined #git
11:44 afuentes joined #git
11:46 brent__ joined #git
11:47 Gloomy joined #git
11:49 ntnn joined #git
11:53 stoopkid joined #git
11:55 fbwnd joined #git
11:56 zefferno joined #git
11:58 Cabanossi joined #git
11:58 Karazhan joined #git
12:03 mehola joined #git
12:05 DieguezZ joined #git
12:06 eightg joined #git
12:06 Tobbi joined #git
12:09 rominronin joined #git
12:15 PioneerAxon joined #git
12:16 robotroll joined #git
12:17 maarhart_ joined #git
12:23 pks joined #git
12:24 ferr1 joined #git
12:25 dvaske joined #git
12:26 Levex joined #git
12:27 scoobertron joined #git
12:28 Cabanossi joined #git
12:28 sunri5e joined #git
12:31 jameser joined #git
12:32 a_thakur joined #git
12:37 mizu_no_oto joined #git
12:38 eikhorst joined #git
12:41 davimore joined #git
12:45 Gsham joined #git
12:45 jozwior joined #git
12:45 GT4066 joined #git
12:52 wxg joined #git
12:52 rokups joined #git
12:54 Skyfinn joined #git
12:55 andrew710 joined #git
12:58 Sound joined #git
12:58 bjoe2k4 joined #git
12:59 acetakwas joined #git
12:59 sammyo joined #git
13:00 oomemusss joined #git
13:00 t0by joined #git
13:00 t0by joined #git
13:03 sbasso joined #git
13:04 mehola joined #git
13:04 theiostream joined #git
13:05 publio joined #git
13:06 JanC_ joined #git
13:08 sarri joined #git
13:08 sarri joined #git
13:13 Cabanossi joined #git
13:15 User458764 joined #git
13:16 Gloomy joined #git
13:17 Murii joined #git
13:17 weakdan joined #git
13:17 weakdan sup
13:23 theiostream joined #git
13:23 plexigras joined #git
13:24 bronson joined #git
13:24 dvaske joined #git
13:27 wxg4irc joined #git
13:28 bariscant_ joined #git
13:31 sbasso joined #git
13:35 amrits joined #git
13:38 mda1 joined #git
13:39 wxg4irc joined #git
13:42 BadApe joined #git
13:48 bariscant joined #git
13:49 sbasso joined #git
13:52 andrew710 joined #git
13:52 hfp joined #git
13:53 hfp_work joined #git
13:53 cyberz joined #git
13:54 DaveTaboola joined #git
13:54 andrew710 joined #git
13:56 dvaske joined #git
13:58 Cabanossi joined #git
14:00 Skyfinn joined #git
14:01 andrew710 joined #git
14:01 brent__ joined #git
14:05 mehola joined #git
14:05 Skyfinn joined #git
14:05 neunon joined #git
14:16 flegent joined #git
14:24 fahadash joined #git
14:26 Joost I'm trying to run cgit, but for some reason all the hyperlinks become relative paths instead of absolutes
14:26 Joost and I end up with a bunch of URLs like mydomain.com/myrepo/myrepo/myrepo/commit/
14:26 Joost i.e. it keeps prefixing myrepo
14:27 Joost naturaly these URLs do not resolve properly
14:27 Joost ah, archwiki to the rescue
14:29 brent__ joined #git
14:31 Gustavo6046 joined #git
14:36 BadApe joined #git
14:37 Lyqyd joined #git
14:40 azerus joined #git
14:42 Cabanossi joined #git
14:44 sbasso joined #git
14:45 MarioBranco joined #git
14:45 robnester joined #git
14:45 Lletfrix joined #git
14:47 Lletfrix is anyone here related to GSoC?
14:47 mp3 joined #git
14:48 webdev007 joined #git
14:50 Lletfrix left #git
14:53 a_thakur joined #git
14:55 a_thakur joined #git
14:56 govg joined #git
14:56 librestreamer joined #git
14:56 CussBot joined #git
14:57 inflames joined #git
14:59 a_thakur joined #git
15:00 regedit joined #git
15:03 peterbecich joined #git
15:04 sbasso joined #git
15:04 bariscant joined #git
15:05 a_thakur joined #git
15:07 Levex joined #git
15:07 acetakwas joined #git
15:09 sbasso_ joined #git
15:11 altendky joined #git
15:14 sbasso joined #git
15:15 azerus joined #git
15:18 safe joined #git
15:24 eahmedshendy joined #git
15:24 bronson joined #git
15:24 sbasso joined #git
15:28 ToBeCloud joined #git
15:28 sbasso_ joined #git
15:31 davimore joined #git
15:33 yqt joined #git
15:36 bariscant joined #git
15:37 Eryn_1983_FL joined #git
15:37 _ikke_ .version
15:37 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
15:38 flegent joined #git
15:42 Cabanossi joined #git
15:44 Groscheri joined #git
15:49 mikecmpbll joined #git
15:51 orbyt_ joined #git
15:53 DolphinDream joined #git
15:57 sbasso joined #git
15:58 plexigras joined #git
16:00 henriknj joined #git
16:02 Sadeukko joined #git
16:04 droid joined #git
16:08 Murii joined #git
16:08 sbasso joined #git
16:09 overlord_tm joined #git
16:11 de-facto joined #git
16:11 de-facto guys whats the easiest way to download a .patch from github pullrequest?
16:12 bdonnahue joined #git
16:14 bdonnahue hey guys. im having an issue with the size of my project. I have made many many commits and the project is now taking several minutes to push. Is there any way i can make this smaller? or do i periodically need to start a new repo?
16:14 bdonnahue the size on disk is not so large so im not sure what the problem is
16:14 BlaXpirit de-facto, sigh i dont know,  maybe do this https://help.github.com/articles/checking-out-pull-requests-locally/#modifying-an-inactive-pull-request-locally  and then you can do the normal command line thing
16:15 gugah joined #git
16:15 BlaXpirit bdonnahue, doesnt seem right. do you have many binary files? does each commit change many files?
16:15 de-facto BlaXpirit, i just used this here, seems to kinda work: http://stackoverflow.com/questions/6188591/download-github-pull-request-as-unified-diff
16:15 de-facto thanks
16:16 BlaXpirit de-facto, good stuff, dont know how they found this out
16:17 davimore_ joined #git
16:19 sbasso_ joined #git
16:23 shinnya joined #git
16:24 bariscant joined #git
16:24 Gustavo6046_ joined #git
16:25 bsanford joined #git
16:27 Cabanossi joined #git
16:32 saedelaere joined #git
16:33 BenderRodriguez joined #git
16:34 dreiss joined #git
16:38 sweatsuit joined #git
16:41 TikityTik joined #git
16:43 bezhermoso joined #git
16:47 justan0theruser joined #git
16:47 menip joined #git
16:47 venmx joined #git
16:47 bdonnahue BlaXpirit: there are binary files. its a C# project im comitting. There are not two many files. sometimes only one or two. It has to count like 2000 objects during the push (not sure if that is important)
16:48 BlaXpirit does c# really require binary files as the source?
16:48 m0viefreak joined #git
16:49 Tatou What binary files?
16:49 bdonnahue BlaXpirit: no it does not require the binaries. I was just checking in the entire project directory
16:49 bdonnahue its the result of the build
16:49 Tatou Ok.. Don't check in the bin or the obj folders.
16:49 Tatou That's not correc.
16:49 _ikke_ You would normally want to exclude the build dir
16:50 bdonnahue ah ok. Is there a way to retroactively remove them to make the commits faster?
16:50 Tatou Use a .gitignore
16:50 Tatou Google for a c# one
16:50 bdonnahue but that wouldnt remove them from previous comits right? bc i think that is what is slowing things down
16:51 BlaXpirit bdonnahue, you can alter the whole commit history, with corresponding consequences
16:51 BlaXpirit like existing local checkouts of the project becoming useless
16:51 BlaXpirit if you're working on that alone, sure ,go for it
16:52 zivester joined #git
16:54 bsanford joined #git
16:56 learning joined #git
16:57 plos joined #git
16:57 Random832 joined #git
17:02 a_thakur joined #git
17:04 User458764 joined #git
17:05 YuGiOhJCJ joined #git
17:08 dsdeiz joined #git
17:08 paul424 joined #git
17:08 bezhermoso joined #git
17:10 Zialus joined #git
17:11 Sound joined #git
17:13 thebird joined #git
17:14 thebird joined #git
17:15 Chinggis6 joined #git
17:16 maroloccio joined #git
17:16 thedudez0r joined #git
17:17 drawkula joined #git
17:17 gugah joined #git
17:17 ankit01ojha joined #git
17:20 thiago joined #git
17:25 bronson joined #git
17:26 livingstn joined #git
17:27 ferdereine joined #git
17:29 astrofog joined #git
17:30 Skyfinn joined #git
17:33 madewokherd joined #git
17:33 BadApe joined #git
17:34 maarhart joined #git
17:40 ujjain joined #git
17:40 ujjain joined #git
17:40 bsanford joined #git
17:41 jozwior joined #git
17:41 Noldorin joined #git
17:42 BadApe joined #git
17:43 aielima joined #git
17:43 kadoban joined #git
17:44 kbs joined #git
17:46 Anja joined #git
17:48 sbasso joined #git
17:50 re1 joined #git
17:51 re1 joined #git
17:52 robattila256 joined #git
17:54 harushimo joined #git
17:55 harushimo i have a question about git.  I have two repositories. One of them is forked repository.  How do I sync it with my new repo that i created?
17:56 grawity either 'git push' in the one direction, or 'git fetch' or 'git pull' in the other
17:57 Silenced joined #git
17:57 Silenced joined #git
17:58 durham joined #git
17:58 harushimo i did a fetch but I can't sync the file
17:58 harushimo I mean files
17:58 harushimo i need to sync files and logs to this repo
17:59 nd- joined #git
17:59 harushimo how do I that? if I have origin and preprod remote.  they are pointing to a different git repo. Where does the sync happen? is it when I do a git pull
18:00 grawity you have origin, preprod, and the local repo
18:00 User458764 joined #git
18:00 harushimo correct
18:00 harushimo when I do git remote -v, I see my origin and prepod
18:00 grawity so first use the apropriate fetch/pull/something to download from remote 1 to the local repo
18:01 grawity then push the stuff you just downloaded to remote 2
18:01 grawity which branches are you trying to sync?
18:02 harushimo https://gist.github.com/harushimo/ed262e020af265ec79f965eab4fb37e0
18:02 harushimo my prepod remote has all the files
18:03 harushimo I know there is a way to do it
18:03 harushimo I did this once
18:03 harushimo I can
18:03 harushimo I can't remember now
18:04 harushimo i finished the project. I just want to sync the two repositories
18:04 harushimo thanks for the help
18:06 harushimo grawity, that's what i'm trying to do
18:07 Rodya_ joined #git
18:10 ujjain joined #git
18:10 ujjain joined #git
18:11 ertesx joined #git
18:13 jungsubk joined #git
18:16 Pseudocrat joined #git
18:16 mehola joined #git
18:21 sunrunner20_ joined #git
18:22 amdi_ joined #git
18:23 mehola joined #git
18:25 Rodya_ joined #git
18:26 drodger joined #git
18:27 astrofog joined #git
18:29 ozmage joined #git
18:30 bgerber joined #git
18:30 ujjain joined #git
18:30 ujjain joined #git
18:31 selckin joined #git
18:38 joeco joined #git
18:39 th_ joined #git
18:40 Rodya_ joined #git
18:46 goldpank joined #git
18:48 venmx joined #git
18:50 matoro joined #git
18:50 ozmage_ joined #git
18:52 User458764 joined #git
18:55 _Vi joined #git
18:56 mehola joined #git
18:56 dreiss joined #git
18:57 mehola joined #git
18:57 flegent joined #git
18:58 Cabanossi joined #git
18:58 dvaske joined #git
19:01 prg3 joined #git
19:07 DieguezZ joined #git
19:08 jfelchner joined #git
19:08 Jackneill joined #git
19:10 Atm0spher1c joined #git
19:11 finalbeta joined #git
19:12 learning joined #git
19:19 safe joined #git
19:26 bronson joined #git
19:27 overlord_tm joined #git
19:27 _Vi joined #git
19:28 bariscant joined #git
19:31 vuoto joined #git
19:31 scoobert1on joined #git
19:32 matoro joined #git
19:34 salios joined #git
19:36 ponyofdeath joined #git
19:37 manuelschneid3r joined #git
19:38 am55 joined #git
19:39 AdolphusGustavus joined #git
19:40 kbs joined #git
19:40 aidalgol joined #git
19:42 finalbeta joined #git
19:43 Eryn_1983_FL joined #git
19:52 Sandlayth joined #git
19:52 Sandlayth hello guys
19:52 gitinfo Sandlayth: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
19:52 dvaske_ joined #git
19:52 Sandlayth !backup
19:52 gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups
19:52 am55 joined #git
19:53 SwiftMatt joined #git
19:55 Rodya_ joined #git
19:55 Sandlayth left #git
19:56 ponyofdeath joined #git
19:58 bariscant joined #git
19:59 stfn joined #git
20:00 AdolphusGustavus joined #git
20:03 roentgen joined #git
20:04 mknod joined #git
20:05 apotry joined #git
20:06 theoceaniscool joined #git
20:07 salios joined #git
20:09 kexmex joined #git
20:09 nowhere_man joined #git
20:12 przemoc joined #git
20:12 cyberz joined #git
20:12 Darcidride joined #git
20:13 Cabanossi joined #git
20:16 a3Dman joined #git
20:21 amdi_ joined #git
20:23 hanthings joined #git
20:25 pks joined #git
20:26 armyriad joined #git
20:35 pks joined #git
20:38 Anja_ joined #git
20:39 raijin joined #git
20:45 ok91 joined #git
20:46 pks joined #git
20:46 mda1 joined #git
20:47 johtso joined #git
20:48 davimore__ joined #git
20:48 jnewt joined #git
20:48 venmx joined #git
20:50 AdolphusGustavus left #git
20:50 ThiefMaster joined #git
20:52 Nothing4You joined #git
20:52 timewalker joined #git
20:54 ejnahc_ joined #git
20:55 holodoc- joined #git
20:55 pypypypy1y joined #git
20:55 Olipro_ joined #git
20:55 bariscant joined #git
20:55 emPi joined #git
20:56 marlinc joined #git
20:56 monty joined #git
20:56 Ram-Z_ joined #git
20:58 cworth joined #git
20:59 DieguezZ joined #git
20:59 Noldorin joined #git
20:59 IndigoTiger joined #git
21:00 cyberz joined #git
21:01 IndigoTiger joined #git
21:02 pks joined #git
21:05 boombatower joined #git
21:06 jaeckel joined #git
21:07 bronson joined #git
21:07 venmx joined #git
21:10 livingstn joined #git
21:12 [Brain] joined #git
21:14 jost__ joined #git
21:16 pks joined #git
21:16 venmx joined #git
21:19 jimklo joined #git
21:20 aapaaal joined #git
21:22 learning joined #git
21:24 aidalgol Could someone give me a brief explanation of subtree vs submodule?
21:27 theiostream joined #git
21:31 thiago aidalgol: subtree merges the commits into the same repository, just changing the paths to be a subdir
21:31 thiago submodule simply links the two repositories
21:36 przemoc joined #git
21:38 cyberz joined #git
21:39 bronson joined #git
21:40 User458764 joined #git
21:40 KamiRath joined #git
21:47 linuxmodder- joined #git
21:47 kexmex joined #git
21:49 Hum4 joined #git
21:49 peepsalot joined #git
21:50 myhau joined #git
21:56 timewalker joined #git
21:58 leeN joined #git
21:58 hvxgr joined #git
22:01 sbasso joined #git
22:02 PaulCapestany joined #git
22:05 Streetwitch joined #git
22:05 venmx joined #git
22:06 Streetwitch Does anyone know how to delete everything on a github page?
22:06 grawity what kind of page
22:06 preaction delete the gh-pages branch?
22:06 Streetwitch Well I can delete things, but they still keep old revisions
22:06 Streetwitch I want to set up my git page with the latest code
22:07 Streetwitch And just forget about the old shit
22:07 preaction that's how git works, yes.
22:07 preaction so... you don't want version control?
22:07 acetakwas joined #git
22:07 Streetwitch Well I do, but only from this point forward
22:07 preaction are you trying to remove !sensitive information?
22:07 gitinfo [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
22:07 preaction the version history is important for lots of reasons, and it's good to keep
22:08 Streetwitch Just look at my github:
22:08 Streetwitch http://github.com/Treatz
22:08 Streetwitch It is a total mess
22:08 Streetwitch I need away to clean it up.   :)
22:08 preaction so... delete the repositories you don't want?
22:08 preaction which repository is the messy one?
22:08 Streetwitch All of them
22:08 kexmex joined #git
22:09 preaction if you don't want people looking at them, delete them
22:09 Streetwitch How?
22:09 preaction click on Settings, go down to Danger Zone, click "Delete"
22:09 Streetwitch That doesn't really do it
22:09 preaction yes, it does
22:09 Streetwitch It still saves the history
22:10 preaction if that doesn't delete a github repository, then github is lying, and you'll need to ask github support
22:10 Streetwitch hmm
22:10 Streetwitch I'll try
22:12 Cabanossi joined #git
22:21 bdonnahue joined #git
22:24 Streetwitch Is there a way to delete more than one repository at a time on GitHub?
22:24 preaction probably using the API yes
22:26 kexmex joined #git
22:27 dviola joined #git
22:28 venmx_ joined #git
22:30 Anja joined #git
22:30 madewokherd joined #git
22:31 learning joined #git
22:37 Fpr joined #git
22:38 alexandre9099 joined #git
22:41 arescorpio joined #git
22:41 bronson joined #git
22:44 maroloccio joined #git
22:47 XenophonF joined #git
22:49 hvn0413 joined #git
22:49 jottr joined #git
22:50 puff Anyone home?
22:50 puff I created a feature branch, checked it out, then I had to interrupt that, did "git stash", checked out to another branch, then accidentally checked out back to the wrong feature branch (albeit one that had already been pushed to the shared repo and merged) and did "stash pop", git add/commit. And then tried to push to the shared repo, got warned about changes on the shared repo, pulled, merged, rebuilt/tested, added/committed those
22:50 puff changes... and then realized I'm on the wrong branch.
22:57 Gsham joined #git
22:57 diogenese joined #git
22:58 Doginal joined #git
22:58 askb joined #git
22:58 maroloccio joined #git
22:59 cdown joined #git
23:01 snail joined #git
23:01 inflames joined #git
23:02 snail hello, i'm wondering how i would go about setting up a serverside git hook that pulls when a commit is made to the repo from local. thanks.
23:11 cyberz joined #git
23:11 User458764 joined #git
23:12 theiostream joined #git
23:13 bremner damnit people, you know there's a 3 minute response guarantee.
23:13 puff bremner: There's always a response.
23:13 puff bremner: Sometimes the response is implied ("we don't care").
23:13 puff :-)
23:18 chachasmooth joined #git
23:19 bdonnahue left #git
23:20 matoro joined #git
23:21 matoro joined #git
23:22 drodger joined #git
23:31 User458764 joined #git
23:32 jokajak joined #git
23:33 jokajak joined #git
23:37 Kallis joined #git
23:42 bronson joined #git
23:42 Lyqyd joined #git
23:42 venmx joined #git
23:44 LBV_User joined #git
23:49 alexandre9099 joined #git
23:50 mizu_no_oto joined #git
23:53 Rodya_ joined #git
23:54 jokajak joined #git

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