Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-11

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:02 treehug88 joined #git
00:06 cdg joined #git
00:08 King_Hual joined #git
00:08 King_Hual joined #git
00:09 zzz joined #git
00:10 HoierM joined #git
00:11 converge joined #git
00:12 hue joined #git
00:12 askb joined #git
00:14 martman sorry for the delay
00:14 martman how would deletes work?
00:14 martman im not sure how to keep eveything insync
00:15 treehug88 martman sorry I got disconnected for a bit. what's your question?
00:15 anuxivm joined #git
00:18 martman i would like to mirror a git repo, but im not sure how to keep them in sync
00:18 martman i do not have control over what i would like to mirror
00:18 treehug88 well, you're trying to keep a mirror on your computer of what's in this remote repo?
00:18 flippo joined #git
00:18 nwkj86 joined #git
00:18 martman yes
00:19 treehug88 ok all you have to do is first 'clone' their repo. then each time you do a 'git pull --all' you'll get all their updates
00:19 treehug88 you won't be able to 'push' to that repo because you don't have permissions
00:20 martman how do i push all branch update to my git server?
00:20 martman i want to get all there commits and deletes
00:20 treehug88 ah, so you also want to push your changes to your own remote?
00:20 martman yes
00:20 martman i would like to mirror it locally
00:20 treehug88 yeah that's a confusing terminology
00:21 treehug88 what you want to do is keep your private copy of the repo in sync with the source repo
00:21 martman sorry, seemed straight forward in my head. maybe that why im not finding much on google
00:22 treehug88 this is one documented way: https://help.github.com/artic​les/duplicating-a-repository/
00:24 martman alright, bit worried it wont get updates but ill give that a shot quick
00:24 treehug88 yeah, that will create a dup of the repo. You'll have to then run commands to keep yours in sync periodically
00:25 treehug88 they mention a way at the end of that link
00:26 martman thanks, ill give that a shot
00:26 martman looks much easier than what i was working o
00:26 martman *on
00:28 Jameser joined #git
00:36 kfoonamalik joined #git
00:39 johnny56_ joined #git
00:42 nwkj86 joined #git
00:44 WayToDoor joined #git
00:44 unbalanced joined #git
00:48 nettoweb joined #git
00:49 treehug88 martman yw
00:51 mentazoom joined #git
00:54 venmx joined #git
00:55 dikiaap joined #git
00:56 ash_workz joined #git
01:03 DrRobotic joined #git
01:05 EoN joined #git
01:07 netj joined #git
01:08 inflames joined #git
01:09 breezy_ joined #git
01:15 jj- joined #git
01:16 dbamutura joined #git
01:20 arescorpio joined #git
01:21 heftig joined #git
01:27 CheckDavid joined #git
01:27 Lyqyd joined #git
01:37 Gsham joined #git
01:40 sr___ joined #git
01:42 Naan joined #git
01:47 Hink joined #git
01:53 dreiss joined #git
01:54 converge_ joined #git
01:56 heftig joined #git
01:56 anuxivm left #git
01:59 mario_ joined #git
01:59 emerson joined #git
02:00 venmx joined #git
02:00 mizu_no_oto joined #git
02:03 mentazoom joined #git
02:05 realz joined #git
02:08 kbs2 joined #git
02:11 mountpoint joined #git
02:11 gfixler joined #git
02:16 GavinMagnus joined #git
02:17 mario_ joined #git
02:18 davix[matrix] joined #git
02:19 mountpoint joined #git
02:26 nikivi joined #git
02:31 d0nn1e joined #git
02:33 xlegoman joined #git
02:35 GavinMagnus left #git
02:35 giraffe joined #git
02:37 mountpoint joined #git
02:40 romerocesar joined #git
02:40 dreiss joined #git
02:41 steelsw0rd joined #git
02:43 SteveCharleston joined #git
02:46 Sheogorath[m] joined #git
02:46 kineticrootkit[m joined #git
02:46 Tiaan[m] joined #git
02:46 unclechu joined #git
02:46 patrickr[m] joined #git
02:46 Start[m] joined #git
02:46 Remramm joined #git
02:46 Mher[m] joined #git
02:46 kikijiki[m] joined #git
02:46 saintaquinas[m] joined #git
02:46 WillianPaiva[m] joined #git
02:46 M-nated joined #git
02:46 daopu[m] joined #git
02:46 samwise[m] joined #git
02:46 hallogallo[m] joined #git
02:46 mtso[m] joined #git
02:46 M-shine joined #git
02:46 Dhanya[m] joined #git
02:46 M-meznak joined #git
02:46 M-mistake joined #git
02:46 malo[m] joined #git
02:46 am2on joined #git
02:46 monomon[m] joined #git
02:46 mei[m] joined #git
02:46 Ineentho[m] joined #git
02:46 scrambo[m] joined #git
02:46 srkrishna[m] joined #git
02:46 timlyo[m] joined #git
02:46 Carlos[m] joined #git
02:46 musicmatze[m] joined #git
02:46 alaeri[m] joined #git
02:46 aviraldg joined #git
02:46 warrantyvoid joined #git
02:46 kjsage[m] joined #git
02:46 M64137[m] joined #git
02:46 eagle_mike joined #git
02:46 eltopo[m] joined #git
02:46 dodobrain joined #git
02:50 ilbot3 joined #git
02:50 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:51 King_Hual joined #git
02:52 thebope joined #git
02:54 ketas joined #git
02:56 _W_ joined #git
02:56 pks joined #git
02:57 mountpoint joined #git
03:01 kaldoran joined #git
03:01 venmx joined #git
03:03 steelsw0rd joined #git
03:05 romerocesar joined #git
03:05 BlaDe^ joined #git
03:06 BlaDe^ hi everyone. We have a fork of node.js and I want to make a PR to upgrade us to 6.9.2 from 6.3.x
03:06 mountpoint joined #git
03:06 BlaDe^ it creates a TON of conflicts, obviously.... how do I just say "i don't care, use the 6.9.2 branch to resolve"?
03:07 rfv joined #git
03:09 eagle_mike joined #git
03:15 jetpack_joe joined #git
03:19 heftig joined #git
03:22 flavius joined #git
03:23 chachasmooth joined #git
03:25 tmsmith joined #git
03:28 rorro joined #git
03:34 kadoban BlaDe^: Well ... it probably should be making a bunch of conflicts. That you probably have to actually resolve, not just trick your way out of. Is it sensical to say "oh I only want something different from their branch only when it doesn't conflict at all"? You're then choosing what things you want different based on what an algorithm is smart enough to figure out on its own?
03:35 BlaDe^ kadoban: no, I don't want to resolve it -- I'm moving from node 6.3.x to 6.9.2
03:35 BlaDe^ i'm literally maintaining a mirror of a github repo for availability purposes
03:35 zzz joined #git
03:36 BlaDe^ git checkout --ours for everything almost works, but any files that were since deleted end up in the working tree which I don't want
03:36 kadoban BlaDe^: Well, what process are you actually even doing? A merge? A rebase?
03:36 kadoban BlaDe^: Do you just want your branch to exactly equal the upstream one?
03:36 BlaDe^ i'd like to merge, but perhaps I should be rebasing
03:36 BlaDe^ exactly
03:36 kadoban BlaDe^: That's neither a merge or a rebase, that's just a reset --hard
03:36 BlaDe^ yeah, totally I know how to do that
03:37 BlaDe^ but I want to make a pull request so I get get the procedural +1 .... is that not really possible?
03:37 BlaDe^ reset --hard is basically how I got my 6.9.2 branch .. which I tested and it works
03:37 sunri5e joined #git
03:37 BlaDe^ now I want to make a pull request on our internal github to say .. OK, upgrading, any objections?
03:38 kadoban A PR implies a merge, which I don't think really makes sense here, if it's not just a straight-up fast-forward, which it sounds like it's not.
03:38 kadoban (PR = pull request, pull = fetch + merge)
03:38 BlaDe^ it kinda is, but by over a year of delta haha
03:38 kadoban Well, if it were a fast forward, there would be no conflicts, there can't be conflicts in a fast-forward.
03:38 BlaDe^ okay, if there's no way to "trick" this to work, I'll just make the PR, get a +1 and manually reset the master branch to what I want and push it up
03:39 menip joined #git
03:39 kadoban I don't think there's a trick, yeah.
03:44 BlaDe^ ok cool, thanks kadoban
03:44 mizu_no_oto joined #git
03:45 kadoban Anytime. By the way, I didn't really ask ... you do want the *history* of your fork to exactly match the upstream one, right? If all you want is the files to be exactly the same, that's possible without a reset --hard
03:46 kadoban Thought I threw that word in above, history, but doesn't look like I did.
03:50 ljc joined #git
03:50 los joined #git
03:52 gfixler joined #git
03:53 thebope joined #git
03:56 hexagoxel joined #git
03:58 railssmith joined #git
04:00 ericsupreme joined #git
04:01 whitby joined #git
04:02 venmx joined #git
04:07 ixjlyons joined #git
04:14 cyan__ joined #git
04:14 Vortex35 joined #git
04:16 cdg joined #git
04:16 NeverDie joined #git
04:19 MrWoohoo joined #git
04:20 fstd_ joined #git
04:21 mizu_no_oto joined #git
04:22 Jameser joined #git
04:25 los joined #git
04:27 Remramm joined #git
04:27 Remramm joined #git
04:29 rbern joined #git
04:30 ixjlyons joined #git
04:34 acetakwas joined #git
04:37 Nilesh_ joined #git
04:39 flavius Is there any tool readily available which allows me to keep the history of notes themselves?
04:39 cyphase joined #git
04:40 umpc joined #git
04:45 cagmz joined #git
04:46 oskarkv joined #git
04:47 sharms joined #git
04:50 a_thakur joined #git
04:51 dreiss joined #git
04:52 wxg joined #git
04:54 thebope joined #git
04:57 ixjlyons joined #git
04:58 cbegin joined #git
05:00 Jameser joined #git
05:01 breezy_ joined #git
05:01 menip joined #git
05:03 venmx joined #git
05:04 justanotheruser joined #git
05:07 BlaDe^ kadoban: sorry I missed that, yeah, I do want to preserve history
05:08 BlaDe^ we only mirror it for availability, no changes are made besides adding one meta file for our build system
05:11 kadoban Then yep, the stuff before applies.
05:12 daey_ joined #git
05:13 BlaDe^ cool, thanks!
05:18 ketas joined #git
05:19 Orion3k joined #git
05:24 regedit joined #git
05:30 breezy_ joined #git
05:31 Derderderd joined #git
05:34 menip joined #git
05:34 romerocesar joined #git
05:38 steelsw0rd joined #git
05:47 Limes_ joined #git
05:48 languitar joined #git
05:50 romerocesar joined #git
05:51 Cabanossi joined #git
05:55 thebope joined #git
05:57 _ng joined #git
06:03 venmx joined #git
06:05 cagmz_ joined #git
06:12 Puffball joined #git
06:12 svm_invictvs joined #git
06:20 dsdeiz joined #git
06:22 nixdork joined #git
06:22 SDKr00t joined #git
06:29 govg joined #git
06:32 Puffball joined #git
06:37 a_thakur joined #git
06:47 lindenle joined #git
06:49 Zamerick joined #git
06:50 subhojit777 joined #git
06:56 thebope joined #git
06:57 Random832 joined #git
07:01 venmx joined #git
07:08 mahendratech joined #git
07:17 d1b joined #git
07:19 krillr joined #git
07:20 leeN joined #git
07:21 rossome joined #git
07:22 maskeraid joined #git
07:23 nilsi joined #git
07:28 bannakaffalatta joined #git
07:29 hhee joined #git
07:30 quetz joined #git
07:31 QuestionTime joined #git
07:31 Orion3k joined #git
07:40 pks joined #git
07:41 khfeng joined #git
07:42 khfeng_ joined #git
07:44 diogenese joined #git
07:48 derk0pf joined #git
07:49 venmx joined #git
07:53 tnecniv joined #git
07:56 maskeraid joined #git
07:56 thebope joined #git
07:58 UniFreak joined #git
07:58 UniFreak hi. I shared a windows folder into a virtual box, then git detected mode change, so every filed is now `modified`
07:59 UniFreak I searched the web so that I found I should do `git config --global core.filemode false
07:59 UniFreak `, so I did that
07:59 UniFreak but the mode change is still causing files in `modified` status
07:59 Derderderd joined #git
08:00 _ikke_ sharing a single directory between linux and windows is not recommended, because of all these issues
08:01 derk0pf joined #git
08:01 UniFreak _ikke_: that's the best way I think of to work in windows and serve site by Linux
08:02 _ikke_ UniFreak: Separate the working and serving part
08:02 iliv joined #git
08:03 blackwind_123 joined #git
08:04 Guest32241 joined #git
08:04 hhee guys, which merge are you using? linux
08:05 hhee merge tool*
08:05 _ikke_ vimdiff :P
08:05 kadoban I've used meld a couple of times. I usually forget to bother until I've already done the merge manually though, heh.
08:05 hhee _ikke_, it opened 3 window, whci one i need to edit? :)
08:06 _ikke_ It should open 4
08:06 hhee which*
08:06 _ikke_ Or is it a 2 way merge by chance?
08:06 _ikke_ The windows are named
08:07 _ikke_ (I recommend changing the diff colors in vim, the default is pretty unreadable to me)
08:07 hhee _ikke_, dunno... first time im merging smth :-) git pull, and there is conflict, and i try to resolve it
08:07 _ikke_ http://www.rosipov.com/blog/u​se-vimdiff-as-git-mergetool/
08:07 hunter joined #git
08:08 _ikke_ g2g
08:08 hhee _ikke_, thx!
08:08 netj joined #git
08:11 navidr joined #git
08:12 Lyqyd joined #git
08:14 ahmedelgabri joined #git
08:20 rominronin joined #git
08:22 vdv joined #git
08:29 dmc joined #git
08:30 dreampwnzor joined #git
08:36 CrashOverride joined #git
08:36 senaps joined #git
08:37 tango_ joined #git
08:42 Cork joined #git
08:46 nkouevda joined #git
08:48 Guest36931 joined #git
08:54 giraffe joined #git
08:57 thebope joined #git
08:58 boz_v1 joined #git
09:03 dbamutura joined #git
09:12 fearless_man joined #git
09:16 garethdaine joined #git
09:16 robotroll joined #git
09:22 cagedwisdom joined #git
09:23 dikiaap joined #git
09:26 PioneerAxon joined #git
09:28 mischat joined #git
09:30 cyan__ joined #git
09:32 SteffanW joined #git
09:34 Jameser joined #git
09:38 nevodka joined #git
09:38 nevodka I have this directory and want to gitignore everything except for three of the subdirectories
09:38 nevodka https://paste.fedoraproject.org/504418/14490961/
09:39 nevodka this is what the directory looks like, followed by my current gitignore, and the output of a git status
09:39 nevodka i must be doing something wrong because theres an extra directory in there that is still being tracked..
09:41 nevodka ah this seems too complex
09:46 Limes_ joined #git
09:48 overlord_tm joined #git
09:49 Sample joined #git
09:52 romerocesar joined #git
09:52 P4nther joined #git
09:54 a3Dman joined #git
09:59 pks joined #git
10:01 mikecmpbll joined #git
10:05 yaewa joined #git
10:05 cdown joined #git
10:07 YuGiOhJCJ joined #git
10:08 cbreak nevodka: !*/ means "unignore every directory"
10:11 nevodka cbreak, different question.. if i have subdirectory X and want to include X/config but not the other files in that directory
10:11 nevodka i would think id put X/* in the gitignore
10:11 nevodka then do !X/config
10:11 nevodka but its not seeming to work
10:11 cbreak I would just git add -f X/config
10:12 cbreak no point wasting time unignoring anything
10:12 nevodka yeah
10:12 nevodka good point
10:13 cqi joined #git
10:17 mehola joined #git
10:17 catsup joined #git
10:17 PCatinean joined #git
10:18 mrkake joined #git
10:18 catsup joined #git
10:22 atomi joined #git
10:23 Masber joined #git
10:25 Masber joined #git
10:29 mischat joined #git
10:29 SteveCharleston joined #git
10:31 strugee joined #git
10:31 romerocesar joined #git
10:32 Anja joined #git
10:40 nebodka joined #git
10:41 Ciblia joined #git
10:43 Ciblia joined #git
10:43 qpdb joined #git
10:43 derk0pf joined #git
10:43 iliv joined #git
10:45 Jackneill_ joined #git
10:46 qpdb joined #git
10:51 jnavila joined #git
10:52 King_Hual joined #git
10:53 Jameser joined #git
10:55 Atrumx joined #git
10:55 King_Hual` joined #git
10:59 thebope joined #git
11:00 hecliunyx_ joined #git
11:00 Jameser joined #git
11:01 lanking joined #git
11:03 WaReZ joined #git
11:04 vrlx joined #git
11:06 JanC_ joined #git
11:06 mischat joined #git
11:07 King_Hual joined #git
11:16 tarkus joined #git
11:18 irco joined #git
11:26 derk0pf joined #git
11:29 Zamerick joined #git
11:29 pks joined #git
11:31 johnny56_ joined #git
11:33 King_Hual joined #git
11:34 ahmedelgabri joined #git
11:38 aard_ joined #git
11:40 King_Hual joined #git
11:40 King_Hual joined #git
11:42 Jameser joined #git
11:43 pks joined #git
11:43 heroux joined #git
11:45 Masber joined #git
11:51 [0xAA] joined #git
11:55 rolha joined #git
11:56 netj joined #git
11:59 nettoweb joined #git
11:59 thebope joined #git
12:01 derk0pf joined #git
12:02 cyan__ joined #git
12:02 mehola joined #git
12:03 ispn joined #git
12:03 balance2 joined #git
12:13 mehola joined #git
12:22 khfeng joined #git
12:23 khfeng_ joined #git
12:23 HoierM joined #git
12:28 minikN joined #git
12:30 minikN Hello. I real noob here. I want to set up git on my production site, there are plenty of tutorials out there. But no one seems to do what I want. I'm a bit lost. Could there be someone willing to give some basic guidance to a git newcomer?
12:32 satifant joined #git
12:33 [|SDK|] joined #git
12:37 spriz joined #git
12:37 Raging_Hog joined #git
12:39 sea-gull_ joined #git
12:42 manuels joined #git
12:45 converge joined #git
12:47 GavinMagnus joined #git
12:49 Zamerick joined #git
12:50 UniFreak joined #git
12:55 _UniFreak joined #git
12:55 Limes_ joined #git
12:55 Emperor_Earth joined #git
12:55 cebor joined #git
12:56 nettoweb joined #git
12:59 sdothum joined #git
13:00 dmarques joined #git
13:00 thebope joined #git
13:00 Masber_080 joined #git
13:05 tcurdt joined #git
13:08 zeroed joined #git
13:08 zeroed joined #git
13:12 KV joined #git
13:13 SwiftMatt joined #git
13:14 manuels joined #git
13:17 nedbat minikN: what do you want git to do on your production site?
13:18 minikN Hey nedbat. Thanks for replying, but I think I just got it. Give me a sec and I'll tell you what I did.
13:26 raijin joined #git
13:28 unbalanced joined #git
13:30 fearless_man joined #git
13:30 minikN nedbat, would you be able to help me set up a git hook?
13:30 nedbat minikN: I've never done that, sorry
13:31 minikN Hm..
13:32 minikN Well so far, I've setup git on my production side to pull a branch called production from my remote. It's working. But I want to setup a post-receive hook so that it copies my project files to the proper location.
13:34 Learath2 joined #git
13:40 Starky joined #git
13:41 re1 joined #git
13:41 Starky joined #git
13:41 shinnya joined #git
13:44 d^sh joined #git
13:49 d^sh joined #git
13:51 moei joined #git
13:54 rolha joined #git
13:54 buffal0 joined #git
13:54 j416 joined #git
13:54 m0viefreak joined #git
13:56 SteveCharleston joined #git
13:56 byte512 joined #git
13:57 [0xAA] joined #git
13:58 czart joined #git
13:58 minikN Would anyone know why my post-receive hook doesn't work (http://laravel.io/bin/0e24w)? I set the +x attribute, but it doesn't do anything after I pulled updates.
13:58 polyrob joined #git
13:58 [0xAA] joined #git
14:00 Jameser joined #git
14:00 jetpack_joe joined #git
14:01 thebope joined #git
14:05 synthroid joined #git
14:06 Starky joined #git
14:07 polyrob_ joined #git
14:07 polyrob_ joined #git
14:08 GavinMagnus joined #git
14:09 sq-one joined #git
14:15 GavinMagnus left #git
14:15 acetakwas joined #git
14:19 iliv joined #git
14:20 mda joined #git
14:22 mehola joined #git
14:22 Gsham joined #git
14:25 _ng joined #git
14:29 SwiftMatt joined #git
14:35 moritz nedbat: post-receive must be run on the server
14:36 moritz sorry, meant minikN
14:36 minikN I am running it on the server.
14:37 moritz so what does "after I pulled updates" mean?
14:37 moritz that sounds like a client-y thing
14:37 minikN I do git pull on my server to pull the production branch from remote
14:37 moritz but post-receive is run when you push to a repo
14:38 minikN Oh..
14:38 minikN So how would I fire a hook after I pulled from remote?
14:38 moritz if you do an explicit pull, why not run a script explicitly?
14:39 minikN Yeah.
14:39 minikN I guess I could also directly push from my local env to my production. Or set up a web hook on bitbucket..
14:39 minikN .. to push to production.
14:39 * moritz is a fan of more high-powered deployment systems, and throws https://leanpub.com/deploy into the ring
14:40 converge_ joined #git
14:41 iliv joined #git
14:42 RatSalad joined #git
14:43 cdg joined #git
14:44 rbern joined #git
14:50 regedit joined #git
14:54 lindenle joined #git
14:55 ismaris joined #git
15:04 Arguggi joined #git
15:05 quackgyver joined #git
15:05 robotroll joined #git
15:06 PioneerAxon joined #git
15:07 maskeraid joined #git
15:09 _UniFreak joined #git
15:10 nettoweb joined #git
15:10 tmsmith joined #git
15:11 carif joined #git
15:11 maskeraid joined #git
15:14 tcurdt joined #git
15:14 Gsham joined #git
15:15 maskeraid joined #git
15:16 ejb joined #git
15:20 maskeraid joined #git
15:22 converge_ joined #git
15:23 mehola joined #git
15:25 madewokherd joined #git
15:26 creppe joined #git
15:29 rolha joined #git
15:33 Gsham joined #git
15:35 hhee joined #git
15:37 d0nn1e joined #git
15:39 basiclaser joined #git
15:42 Gsham joined #git
15:43 maskeraid joined #git
15:45 steelsw0rd joined #git
15:45 DrRobotic joined #git
15:46 SteffanW joined #git
15:47 mda1 joined #git
15:56 [0xAA] joined #git
15:56 cebor joined #git
15:57 nettoweb joined #git
15:58 fatalhalt joined #git
16:00 fahadash joined #git
16:02 cdg joined #git
16:05 cdg joined #git
16:07 xlegoman joined #git
16:09 Ougu joined #git
16:10 Spec-Chum joined #git
16:11 Spec-Chum joined #git
16:13 thebope joined #git
16:13 giraffe joined #git
16:14 basiclaser joined #git
16:14 Gsham joined #git
16:14 Limes_ joined #git
16:15 miczac joined #git
16:16 buffal0 joined #git
16:20 cbegin joined #git
16:20 converge_ joined #git
16:25 miczac joined #git
16:28 synthroid joined #git
16:28 buzzLightBeer joined #git
16:28 menip joined #git
16:31 acetakwas joined #git
16:32 rolha joined #git
16:33 cdg_ joined #git
16:35 ixjlyons joined #git
16:36 synthroid joined #git
16:38 Guest12932 joined #git
16:40 astrofog joined #git
16:41 zacts joined #git
16:43 Balliad joined #git
16:45 _ng joined #git
16:45 anddam joined #git
16:46 anddam hi, while calling 'status' git informs me that  "Your branch is ahead of 'upstream/master' by 2 commits."
16:46 anddam why is it referring to upstream/master rather than origin? is that due to the fact that the last push I did was to upstream?
16:46 PickAndMix left #git
16:47 osse anddam: it is because you told it to, somehow. presumably push -u or branch -u
16:47 j416 anddam: it's because of the tracking information set up for that branch. See "git branch -vv" to see what your branches are set up to track.
16:47 j416 anddam: you can change it with 'git branch -u' man git-branch
16:47 gitinfo anddam: the git-branch manpage is available at http://jk.gs/git-branch.html
16:48 j416 anddam: it's what it will push to by default when you do 'git push' without argumets
16:48 j416 arguments*
16:48 osse i think a lot of people use -u with push every time because they misunderstand how it works.
16:49 ncthom91 joined #git
16:52 HoierM joined #git
16:53 anddam I didn't use -u, not intentionally at least
16:53 anddam I figure upstream was origin that was later renamed, and origin added for my own fork
16:53 j416 that's also possible
16:54 anddam thanks, I was just curious
16:55 b3kN joined #git
16:56 b3kN joined #git
16:57 zacts joined #git
17:03 Balliad joined #git
17:07 buffal0 joined #git
17:09 diogenese joined #git
17:10 acetakwas joined #git
17:13 brent__ joined #git
17:20 bdonnahue joined #git
17:20 bdonnahue hey guys... anyone handle QA and CI in here? had some general best practice questions
17:20 cbegin left #git
17:23 nettoweb joined #git
17:25 CrazyMonkey201 joined #git
17:25 iLembus_ joined #git
17:26 Balliad joined #git
17:39 GingerGeek joined #git
17:39 GingerGeek joined #git
17:40 breezy_ joined #git
17:44 Milos joined #git
17:45 Milos joined #git
17:48 Milos joined #git
17:50 Lipp joined #git
17:51 orsms joined #git
17:54 nd joined #git
17:55 jooni joined #git
17:56 arunpyasi joined #git
17:56 cagmz joined #git
17:56 Zarthus bdonnahue: !ask
17:56 gitinfo bdonnahue: Yes, it's okay to ask questions here.... in fact, you just asked one! ;-) Pretty much any question is fine. We're not terribly picky, but we might be asleep. Please be patient and you should get an answer soon.
17:57 anddam I have a very messy working dir, inherited from a subversion to git change. I stashed it while doing some change on origin but I wonder what the proper approach would be
17:58 Milos joined #git
17:58 anddam I figure I should create a temporary branch "messy-stuff-to-merge" and then pick diffs between that and master to group, one coherent set of files at times
17:58 cagmz joined #git
17:58 anddam any hint?
17:59 Milos joined #git
18:02 YuGiOhJCJ joined #git
18:02 BSaboia joined #git
18:02 osse anddam: you can add coherent sets right now. git checkout -- file(s) to stage particular files. and git add -p (-- file) to to pick individual changes
18:03 Milos joined #git
18:03 uhpd joined #git
18:04 BSAlb joined #git
18:05 nivag joined #git
18:07 BSAlb joined #git
18:07 _ikke_ osse: git checkout to stage files?
18:07 osse shit
18:07 * osse runs away'
18:07 Siegfried joined #git
18:08 * _ikke_ hunts osse
18:09 zotherstupidguy joined #git
18:11 Milos joined #git
18:13 bdonnahue im trying to figure out a best pratices for commits and my QA/CI/Build server. If a user submits code that breaks QA or CI what to people do? The build engine should not distribute a broken build right?
18:13 garethdaine joined #git
18:13 thebope joined #git
18:15 WhiskerBiscuit joined #git
18:16 madewokherd joined #git
18:18 anddam osse: coherent sets?
18:18 anddam oh sorry, that was literally my phrase
18:18 osse bdonnahue: we're a small team so it might not be relevant. the CI sends an email. one of us gets the job of fixing the problem (usually the guy who broke it)
18:18 osse bdonnahue: we don't "distribute" anything automatically. but i assume the sensible thing to do is don't distribute something if a build fails
18:19 BSaboia joined #git
18:22 khfeng joined #git
18:23 bdonnahue osse: ok that makes sense.
18:26 iliv joined #git
18:28 cagmz_ joined #git
18:28 Orion3k joined #git
18:29 Balliad joined #git
18:32 acetakwas joined #git
18:33 davimore__ joined #git
18:33 robics joined #git
18:36 Lipp joined #git
18:38 BSAlb joined #git
18:38 breezy_ joined #git
18:39 khfeng joined #git
18:39 treehug88 joined #git
18:43 massi joined #git
18:44 massi left #git
18:45 HoierM joined #git
18:54 jnavila joined #git
18:56 iliv joined #git
19:00 lindenle joined #git
19:01 BSab joined #git
19:01 Orion3k joined #git
19:02 Ordentlig joined #git
19:05 BSaboia joined #git
19:05 gigq joined #git
19:08 mizu_no_oto joined #git
19:09 Gsham joined #git
19:10 netj joined #git
19:10 QuestionTime joined #git
19:11 hhee joined #git
19:11 Goplat joined #git
19:11 jaguarmagenta joined #git
19:12 Ntemis joined #git
19:12 Ntemis hello
19:13 Ntemis i want to get a git format-patch from a remote repo branch, doable?
19:13 hussam joined #git
19:13 Ntemis right now i must clone the repo i want but i thought if it was doable i would spare the trouble waiting
19:16 _ikke_ Ntemis: nope
19:16 _ikke_ You can do a shallow clone though
19:17 _ikke_ What you can do without cloning: list all the refs the remote has, and git archive
19:18 Ntemis i was wishing there was a git remove https://somewherethere/myrepo.git format-patch -1 commitblablah
19:18 Ntemis *remote
19:22 tarkus joined #git
19:24 mehola joined #git
19:29 snowkidind joined #git
19:30 g5pw joined #git
19:32 Derderderd joined #git
19:32 nwkj86 joined #git
19:34 iliv joined #git
19:37 krillr joined #git
19:38 tnecniv joined #git
19:39 Panacea joined #git
19:41 romerocesar joined #git
19:44 amacado joined #git
19:47 stfn joined #git
19:48 kyan joined #git
19:48 Garen joined #git
19:52 converge_ joined #git
19:58 chuchunaku joined #git
20:03 jnavila joined #git
20:06 minikN joined #git
20:06 robattila256 joined #git
20:09 justanotheruser joined #git
20:09 tnecniv joined #git
20:11 ncthom91 joined #git
20:12 ncthom91 joined #git
20:12 buffal0 joined #git
20:14 thebope joined #git
20:15 dirtyroshi joined #git
20:16 mountpoint joined #git
20:16 Learath2 joined #git
20:19 iliv joined #git
20:22 cgundersson joined #git
20:22 lindenle joined #git
20:22 netcarver joined #git
20:22 netj joined #git
20:27 aidalgol joined #git
20:29 Lyqyd joined #git
20:32 Limona joined #git
20:32 Limona hi
20:32 Limona can someone help
20:32 Limona i've made an android app project with my friend and put it up on git. When i cloned, i'm unable to get it to work
20:32 Limona any idea why
20:33 Derderderd joined #git
20:33 _ikke_ Limona: Can you give more details?
20:33 _ikke_ What does not work?
20:33 Limona what do you need
20:33 Limona well
20:33 Limona i can't get it to compile,
20:33 Limona do you want specific errors or..
20:34 _ikke_ Well, as this is a git channel, is there anything git related to this question?
20:34 SwiftMatt joined #git
20:34 Limona yes, is it possible git ignored files related to android dev.
20:34 _ikke_ Limona: Not by itself
20:34 Limona or if a folder structure is important
20:34 ojacobson Sure, if the original author configured it to
20:35 _ikke_ Limona: It can be that your friend did not commit everything
20:36 _ikke_ or that you are missing dependencies locally
20:36 _ikke_ many reasons why it might not compile on your machine
20:36 Limona is there a way to check
20:37 _ikke_ check what exactly?
20:37 _ikke_ You first need to find out why it does not compile
20:38 Limona Error:(4, -1) android-apt-compiler: [main] C:\Users\Origin\AndroidStudioProjects\android-rss​-app\RSSapp\app\src\main\res\values\styles.xml:4: error: Error retrieving parent for item: No resource found that matches the given name 'Theme.AppCompat.Light.DarkActionBar'.
20:38 _ikke_ Looks like a dependency missing?
20:38 _ikke_ Or configuration error
20:38 Limona it's just the default project being gitted
20:38 _ikke_ Limona: https://stackoverflow.com/questions/21900853/no-r​esource-found-theme-appcompat-light-darkactionbar
20:38 Limona i don't think there's any dependencies
20:39 _ikke_ Limona: https://stackoverflow.com/a/21900883/20261
20:39 Limona so it's not in by default?
20:39 thiago Limona: please get to the Git part of your question
20:39 Limona i thought it had something to do with git not including config files thiago
20:40 ojacobson Git's dumb, it tracks what you tell it to track
20:40 _ikke_ Limona: The only way to find out is to contact your friend
20:40 ojacobson it doesn't try to categorize or make decisions about it
20:40 nidr0x joined #git
20:40 _ikke_ Limona: Ask him to run git status
20:40 thiago Limona: can you confirm that a file does not have the changes you think it should have?
20:40 _ikke_ check their .gitignore file
20:40 Limona kk
20:40 _ikke_ thiago: (He cloned the project from a friend, does not look like a local problem per se)
20:40 Limona it seems it's a problem with graddle thing
20:41 BSAlb joined #git
20:41 Limona i don't see any graddle files though :<
20:41 KV joined #git
20:41 Limona it's different than if i make a new project, my folder structure is just the java files
20:42 Limona as oppsed to graddle being there
20:42 thiago I don't know what gradle is
20:42 thiago and don't care
20:42 _ikke_ android build tool
20:42 thiago like I said, don't care
20:42 thiago it's not relevant
20:42 _ikke_ Right
20:43 thiago please explain the problem in terms of what files are, are not, may be present when they shouldn't or may be missing
20:44 Limona there's no graddle files, it's as if the project wasn't imported correctly with git
20:44 thiago so certain files are missing?
20:44 Limona i presume so
20:45 Limona http://imgur.com/a/JwZXd
20:45 Limona if you've ever done android dev that's hwat i get
20:45 thiago I have not
20:45 _ikke_ I did a little android dev, but not enough to help you
20:45 thiago please confirm that the files are not in the repository: git ls-tree -r. Do they show up?
20:45 thiago sorry, git ls-tree -r HEAD
20:45 _ikke_ thiago: I think Limona does not even know if the files are missing
20:46 _ikke_ The only way to find out is by contacting the one who created the project
20:46 thiago I'm assuming Limona knows enough about the tool he's using to determine if certain files are missing
20:46 cdown joined #git
20:47 refried_ joined #git
20:48 nettoweb joined #git
20:49 urbanendeavour joined #git
20:49 Limona i do not i'm afraid
20:49 Limona i'm a c++ dev
20:49 Limona i have no idea how android apps run
20:49 urbanendeavour I just did a push -f and I need to restore the old files. Ive just researched it and realised that this deleted all your history. I have no local as it was on a different machine no longer accessible.
20:49 urbanendeavour Is there any way of restoring from github?
20:50 _ikke_ Ask github
20:51 _ikke_ iirc, they do not expose it to users, but they should have a reflog where they should be able to restore the history from
20:51 mda1 joined #git
20:52 thiago Limona: ok. so you need help with Android and that buildsystem.
20:52 thiago Limona: it's not a Git problem
20:52 dsdeiz joined #git
20:52 dsdeiz joined #git
20:53 thiago urbanendeavour: check your own reflog. You may still have them.
20:53 _ikke_ Only if urbanendeavour has fetched
20:53 Limona yes, i'm getting help from android folks
20:53 thiago urbanendeavour: run git log -g
20:53 _ikke_ urbanendeavour: Lesson for next time, always user --force-with-lease, it would have rejected the force push
20:54 _ikke_ s/user/use/
20:54 thiago well, I was assuming that the repository may have them prior to the history rewriting operation that necessitated the push -f
20:54 urbanendeavour reflog?
20:54 _ikke_ urbanendeavour: man git reflog
20:54 gitinfo urbanendeavour: the git-reflog manpage is available at http://jk.gs/git-reflog.html
20:54 urbanendeavour I have no record of the changes on this machine
20:54 urbanendeavour this local repo is out of date.
20:55 urbanendeavour I cannot access the local repo where I made the change.
20:55 _ikke_ urbanendeavour: Right
20:55 _ikke_ urbanendeavour: Ask github then
20:55 urbanendeavour ok thanks.
20:55 thiago urbanendeavour: or ask a colleague who may have an updated copy
20:55 urbanendeavour It is a personal project.
20:55 tnecniv joined #git
20:56 urbanendeavour Assumed that it being in the cloud made it safe for backup but now I've seen what force can do and its not pretty=oneline --awesome.
20:56 thiago well, it doesn't help you delete your cloud backup
20:56 Doginal joined #git
20:57 dreaddymck joined #git
20:57 kulelu88 joined #git
20:59 onmeac joined #git
21:01 urbanendeavour anyway of reading a cached file from android phone?
21:02 _ikke_ cached by what?
21:02 HoierM joined #git
21:04 cagmez__ joined #git
21:05 urbanendeavour why has git deleted my old commits?
21:06 urbanendeavour I thought it would create a new commit with a new set of files and leave the old ones on there.
21:06 _ikke_ urbanendeavour: git did not delete anything
21:06 _ikke_ urbanendeavour: You asked git to overwrite a branch by force pushing
21:07 _ikke_ The old commits are still there, just not directly acessible
21:07 urbanendeavour How can I get to them?
21:07 _ikke_ Ask github
21:07 _ikke_ (I know, I'm repeating)
21:07 _ikke_ You need direct repository access for that
21:07 b_rare joined #git
21:07 urbanendeavour I head you, how long is that likely to take?
21:08 j416 urbanendeavour: git is not the same as github; we are not github
21:08 steelsw0rd joined #git
21:08 j416 urbanendeavour: github support staff usually replies fairly quickly.
21:09 urbanendeavour ok thanks
21:09 urbanendeavour how would they be able to recover the commits?
21:09 _ikke_ the reflog or any other means they cache / store these things
21:09 j416 they'll know that if you explain what you did and what you want
21:10 stevenbenner joined #git
21:10 urbanendeavour thank you.
21:10 _ikke_ read up on the reflog
21:10 _ikke_ it's going to help you in the future
21:12 urbanendeavour Thanks.
21:12 urbanendeavour This wouldn't normally be an issue as I keep local backups but I used a temporary machine and no longer have access to it.
21:13 _ikke_ urbanendeavour: And learn to use --force-with-lease :-)
21:13 urbanendeavour I saw something on that online, will do. thanks.
21:15 Orion3k joined #git
21:15 diogenese joined #git
21:21 mehola joined #git
21:22 urbanendeavour joined #git
21:24 ajpiano joined #git
21:24 BlessJah joined #git
21:25 askb joined #git
21:25 b3kN joined #git
21:25 moestevens joined #git
21:25 refried_ joined #git
21:27 courrier joined #git
21:29 courrier joined #git
21:30 courrier joined #git
21:31 nettoweb1 joined #git
21:31 Limona_ joined #git
21:32 ejb joined #git
21:32 urbanendeavour joined #git
21:33 hhee left #git
21:35 dreiss joined #git
21:37 t0by joined #git
21:37 t0by joined #git
21:39 Darcidride joined #git
21:40 Darcidride joined #git
21:44 Atm0spher1c joined #git
21:47 steelsw0rd joined #git
21:51 SteveCharleston joined #git
21:52 anuxivm joined #git
21:52 Anja joined #git
21:54 GavinMagnus joined #git
21:55 urbanendeavour joined #git
21:56 Naan joined #git
21:56 marlinc joined #git
21:58 _nwkj86 joined #git
22:00 anth0ny joined #git
22:00 courrier joined #git
22:02 spacelord_ joined #git
22:05 boombatower joined #git
22:07 daforce joined #git
22:11 Anja joined #git
22:15 thebope joined #git
22:17 cagedwisdom joined #git
22:19 t-mart_ joined #git
22:23 sonOfRa joined #git
22:25 cdg joined #git
22:26 tazle_ joined #git
22:28 dreaddymck joined #git
22:30 courrier joined #git
22:33 pbrewczynski joined #git
22:34 ChiLL_SurF joined #git
22:36 netj joined #git
22:40 mischat joined #git
22:40 MrLawrence joined #git
22:41 MrLawrence Hello, is there a site like Github that provides free hosting for private (non open source) projects?
22:41 mischat joined #git
22:41 BenderRodriguez joined #git
22:42 mischat joined #git
22:42 mischat joined #git
22:43 mischat joined #git
22:44 kadoban MrLawrence: bitbucket, with some limitations that I don't think usually matter
22:44 mischat joined #git
22:45 mischat joined #git
22:45 courrier joined #git
22:46 mischat joined #git
22:46 Gsham joined #git
22:47 MrLawrence kadoban, thank you
22:47 mischat joined #git
22:50 MrLawrence How does one edit the commit text if they have already written it but have not pushed yet?
22:51 buffal0 joined #git
22:52 sr___ amend
22:53 venmx joined #git
22:53 converge_ joined #git
22:54 Mutter joined #git
22:56 MrLawrence and what if you pushed a commit and you want to undo it, but is not the last one?
22:56 GavinMagnus joined #git
22:59 phroa MrLawrence: there's a few definitions of "undo".  man git-revert to create a new commit that undoes the old, but it won't remove it from history (which you probably shouldn't do unless it had sensitive info)
22:59 gitinfo MrLawrence: the git-revert manpage is available at http://jk.gs/git-revert.html
23:00 MrLawrence phroa, there is sensitive information in it actually, need to remove it from all existance
23:00 phroa I don't know if !bfg works on commits as well as individual files, but you can try that.
23:00 gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)
23:00 phroa in plain git, you'd use man git-revert #INTERACTIVE mode
23:00 gitinfo the git-revert manpage is available at http://jk.gs/git-revert.html
23:01 phroa errr, man git-rebase #INTERACTIVE
23:01 gitinfo errr: the git-rebase manpage is available at http://jk.gs/git-rebase.html
23:01 phroa lol
23:01 fmeerkoetter joined #git
23:03 GavinMagnus joined #git
23:04 MrLawrence phroa, so if I want to remove it even from history what command should I look the man page for?
23:04 mellernoia joined #git
23:05 venmx joined #git
23:10 modin joined #git
23:10 Mutter joined #git
23:12 Cavallari joined #git
23:12 Zoxc joined #git
23:13 Goplat joined #git
23:14 MrLawrence Basically, I have first commit, then second commit, I want to remove first commit and act as if the second commit was really the first commit, how would one achieve this?
23:16 Sample joined #git
23:17 ToBeCloud joined #git
23:18 hiroki joined #git
23:18 hiroki joined #git
23:18 blahdodo joined #git
23:21 venmx joined #git
23:23 kfoonamalik joined #git
23:23 xkr47_ left #git
23:24 ismaris joined #git
23:24 Gsham joined #git
23:26 anddam joined #git
23:29 moestevens_ joined #git
23:30 Oatmeal joined #git
23:30 venmx joined #git
23:32 garethdaine joined #git
23:35 O47m341 joined #git
23:38 Puffball joined #git
23:39 kfoonamalik joined #git
23:40 jimi_ joined #git
23:42 romerocesar joined #git
23:42 dikiaap joined #git
23:44 kfoonamalik joined #git
23:45 jcadduono joined #git
23:46 venmx joined #git
23:46 GavinMagnus left #git
23:46 jcadduono can i make git am or git apply allow conflict fixing similar to cherry-pick which has its own fancy 3-way kinda thing? --reject just sucks a lot
23:47 jcadduono i figured git am -3 would do something similar but it appears to be an unfinished command (does nothing different from git am, which doesn't apply any changes at all if there are any conflicts)
23:47 mischat joined #git
23:48 jcadduono i've been using git apply followed by patch -3 as an alternative, but patch's -3 is not as nice as cherry-pick conflict fixing
23:51 urbanendeavour joined #git
23:52 Puffball joined #git
23:54 linuxmodder- joined #git
23:54 venmx joined #git

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