Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-10

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

All times shown according to UTC.

Time Nick Message
00:00 fuchstronaut joined #git
00:00 romerocesar joined #git
00:02 dopesong joined #git
00:02 hahuang61 joined #git
00:03 jottr joined #git
00:05 qpdb joined #git
00:10 chris26 joined #git
00:12 texinwien joined #git
00:15 mischat joined #git
00:17 spudowiar joined #git
00:18 azbarcea joined #git
00:20 romerocesar joined #git
00:20 fstd_ joined #git
00:30 romerocesar joined #git
00:37 JFS joined #git
00:46 markmarkmark joined #git
00:49 pioiytr_ joined #git
00:51 elmcrest_ joined #git
01:00 EduardoMartins joined #git
01:01 romerocesar joined #git
01:04 jottr joined #git
01:06 ToBeCloud joined #git
01:07 beastd|2 joined #git
01:09 jagob joined #git
01:10 aidalgol joined #git
01:12 Orion3k joined #git
01:17 mischat joined #git
01:21 flanio joined #git
01:21 pks joined #git
01:23 cqi joined #git
01:25 pamplemousse joined #git
01:26 eka joined #git
01:26 ybden joined #git
01:29 fahadash joined #git
01:31 romerocesar joined #git
01:35 lindenle joined #git
01:37 jamick joined #git
01:37 ejb joined #git
01:40 pioiytr_ joined #git
01:44 dmj` joined #git
01:46 ruuj joined #git
01:49 a_thakur joined #git
01:55 Goplat joined #git
01:58 pioiytr joined #git
02:00 liuzhen joined #git
02:00 ash_workz joined #git
02:00 fuchstronaut joined #git
02:01 romerocesar joined #git
02:04 dopesong joined #git
02:06 jottr joined #git
02:06 zumba_addict joined #git
02:08 arescorpio joined #git
02:09 zumba_a__ joined #git
02:14 hlysig joined #git
02:14 su1ts joined #git
02:18 jack_rip_vim joined #git
02:18 MattMaker joined #git
02:20 NeverDie joined #git
02:20 mischat joined #git
02:21 fugiman joined #git
02:21 hexagoxel joined #git
02:21 NeverDie joined #git
02:22 romerocesar joined #git
02:24 SwiftMatt joined #git
02:29 MattMaker joined #git
02:32 EduardoMartins1 joined #git
02:36 EduardoMartins1 joined #git
02:39 a_thakur joined #git
02:42 romerocesar joined #git
02:45 chachasmooth joined #git
02:49 BSaboia joined #git
02:53 realz joined #git
02:59 bonerx2k joined #git
03:05 ochorocho__ joined #git
03:07 jottr joined #git
03:12 romerocesar joined #git
03:13 pneuma joined #git
03:14 Vortex35 joined #git
03:15 realz joined #git
03:16 Literphor joined #git
03:16 Shentino joined #git
03:19 ybden joined #git
03:20 HoierM joined #git
03:20 treaki_ joined #git
03:22 mischat joined #git
03:23 ShapeShifter499 joined #git
03:24 Pr0t3us joined #git
03:33 dmj` joined #git
03:35 MattMake_ joined #git
03:36 t2mkn joined #git
03:37 fishcooker joined #git
03:42 romerocesar joined #git
03:43 zacts joined #git
03:44 kbs` joined #git
03:45 fracting joined #git
03:46 The_Phoenix joined #git
03:46 watabou joined #git
03:47 dmj` joined #git
03:47 ome joined #git
03:54 manosnore joined #git
03:57 hk238 joined #git
04:00 manosnore joined #git
04:01 fuchstronaut joined #git
04:02 Literphor joined #git
04:02 a_thakur joined #git
04:05 ShapeShifter499 joined #git
04:05 allstar joined #git
04:06 dopesong joined #git
04:06 boombatower joined #git
04:07 fracting joined #git
04:07 t2mkn joined #git
04:07 jottr joined #git
04:10 Limes_ joined #git
04:11 UTAN_dev_ joined #git
04:19 wiky joined #git
04:23 mischat joined #git
04:27 Chiko joined #git
04:28 xcesariox joined #git
04:29 realz joined #git
04:29 xcesariox hi
04:29 xcesariox is anyone there that can help me out?
04:30 xcesariox when i type git log > it opens up vim with status on the bottom right says "- (1/1) Line ?/?"
04:30 xcesariox how do i resolve it?
04:35 Dazzyo joined #git
04:36 jungsubk joined #git
04:37 zacts joined #git
04:38 thiago xcesariox: resolve what?
04:39 xcesariox thiago : when  i type git log in terminal in one of my repo
04:39 xcesariox thiago : it opens up a blank vim
04:39 xcesariox thiago : it used to display git log info in my terminal but now the command opens up vim
04:40 guiambros joined #git
04:40 thiago xcesariox: anything about vi or vim in .git/config?
04:41 xcesariox let me check
04:41 thiago or, better yet, in the output of git var -l
04:42 hk238 joined #git
04:42 jeffreylevesque joined #git
04:43 romerocesar joined #git
04:43 xcesariox thiago : https://gist.github.com/shaunstanisl​aus/fa50ddf1651d1cadc81dbceeca98611a
04:45 thiago what's diff-so-fancy?
04:46 xcesariox thiago : no idea .
04:46 xcesariox thiago : how do i remove it?
04:46 xcesariox nvim .git/config ?
04:46 Cabanossi joined #git
04:47 languitar joined #git
04:48 m2n joined #git
04:50 SwiftMatt joined #git
04:59 xcesariox thiago : what should the default GIT_PAGER = to?
05:04 diogenese joined #git
05:04 the_ktosiek joined #git
05:05 tomzx joined #git
05:05 tomzx joined #git
05:07 ochorocho__ joined #git
05:08 jottr joined #git
05:09 KnightsOfNi joined #git
05:09 M-shine joined #git
05:09 M-meznak joined #git
05:12 Electrometro joined #git
05:12 dreiss joined #git
05:13 hoangtranwork joined #git
05:14 rbern joined #git
05:23 tristanp joined #git
05:24 hoangtranwork joined #git
05:25 mischat joined #git
05:26 nilg joined #git
05:26 hoangtranwork joined #git
05:26 wiky joined #git
05:27 annoymouse joined #git
05:28 hk238 joined #git
05:29 wiky joined #git
05:30 hoangtranwork joined #git
05:31 hoangtranwork joined #git
05:32 hoangtranwork joined #git
05:35 tristanp joined #git
05:35 zeemz joined #git
05:36 a3Dman joined #git
05:38 lindenle joined #git
05:39 stoopkid joined #git
05:43 milki i wonder if theres a default PAGER
05:43 milki indeed
05:43 pi_0 joined #git
05:45 d4rklit3 joined #git
05:46 hoangtranwork joined #git
05:47 hoangtranwork joined #git
05:48 vrishab joined #git
05:48 Jeroen52 joined #git
05:59 hoangtranwork joined #git
06:00 chandlerbing joined #git
06:00 Tratos joined #git
06:00 hoangtranwork joined #git
06:02 fuchstronaut joined #git
06:07 hoangtranwork joined #git
06:09 jottr joined #git
06:12 texinwien joined #git
06:14 hoangtranwork joined #git
06:16 hoangtranwork joined #git
06:20 sangy joined #git
06:26 mischat joined #git
06:29 cs02rm0 joined #git
06:30 tvw joined #git
06:36 Literphor joined #git
06:37 ldlework joined #git
06:43 cyan__ joined #git
06:48 zumba_addict joined #git
06:49 toogley joined #git
06:49 Sasazuka joined #git
06:55 dsdeiz joined #git
07:05 tanuki joined #git
07:07 ochorocho__ joined #git
07:10 jottr joined #git
07:11 fishcooker joined #git
07:13 sanketdg joined #git
07:14 subhojit777 joined #git
07:16 phaleth joined #git
07:18 circ-user-fEAcm joined #git
07:28 mischat joined #git
07:34 lstanley left #git
07:37 sangy joined #git
07:39 keltvek joined #git
07:50 ochorocho__ joined #git
07:52 a_thakur joined #git
07:52 malide joined #git
07:53 kisonecat joined #git
07:55 armyriad joined #git
07:59 raven-au_ joined #git
08:01 Oebele joined #git
08:03 fuchstronaut joined #git
08:03 ahmedelgabri joined #git
08:08 vrishab joined #git
08:10 jottr joined #git
08:13 Garen joined #git
08:16 piling joined #git
08:17 PCatinean joined #git
08:18 Arban joined #git
08:18 thierryp joined #git
08:19 quetz joined #git
08:19 zacts joined #git
08:19 eka joined #git
08:20 circ-user-JW25t joined #git
08:23 cyan__ joined #git
08:26 Joost joined #git
08:26 Joost git has this habit of recommending me exactly the command I meant to type
08:26 Joost is there a way to say "Yeah, lets just execute that instead"
08:27 Joost instead of copypasting it?
08:27 Joost (short of super-hacky fiddling with my shell history)
08:29 mischat joined #git
08:30 romerocesar joined #git
08:32 satifant yes, there is a config option help.autocorrect
08:33 satifant see man git-config
08:33 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
08:34 dopesong joined #git
08:39 Joost satifant: right, that's close
08:39 Joost but I want to confirm before actually executing :P
08:39 satifant i see
08:39 satifant i don't know :D
08:42 Joost found a snippit that does this apparently (https://gist.github.com/papaben/4​63d72bb4ea329754566fa82ef0c949e) at the cost of re-executing the command..
08:42 Joost was hoping to avoid that :P
08:42 Joost because side effects can be scary
08:43 playfullyExist joined #git
08:43 satifant what kind of side effects do you have in mind here?
08:47 Joost perhaps if I'm aware of the fact that it'll re-execute whatever I just typed, that's good enough
08:48 Joost i.e. if it were some composite command that includes a git command
08:49 fees joined #git
08:49 fnky joined #git
08:51 satifant you would prefer the autocorrect to not execute automatically but to wait for your confirmation, like pressing return, right?
08:52 Joost right. but that idid.sh works close enough
08:53 satifant hm. that sounds like a reasonable feature-request to me...
08:53 Davey joined #git
08:53 joelsmith joined #git
08:53 LeMike_ joined #git
08:53 davidbz joined #git
08:53 m2n joined #git
08:53 The_Phoenix joined #git
08:53 chachasmooth joined #git
08:53 EduardoMartins joined #git
08:53 ash_workz joined #git
08:53 pioiytr joined #git
08:53 fstd joined #git
08:53 vivekp joined #git
08:53 Samual joined #git
08:53 Guest51884 joined #git
08:53 mt joined #git
08:53 sarbs joined #git
08:53 benwbooth joined #git
08:53 BlaXpirit joined #git
08:53 gkatsev joined #git
08:53 axisys joined #git
08:53 sagerdearia joined #git
08:53 tctara joined #git
08:53 justanotheruser joined #git
08:53 eycsigfy joined #git
08:53 jokajak joined #git
08:53 Neo joined #git
08:53 james3015 joined #git
08:53 skapunker joined #git
08:53 l0rdPE joined #git
08:53 aseidl joined #git
08:53 e-dard_afk joined #git
08:53 jrnieder joined #git
08:53 sbeller joined #git
08:53 pdgwien joined #git
08:53 roflin joined #git
08:53 unforgiven512 joined #git
08:53 geko joined #git
08:53 same_ol_geez joined #git
08:53 khelkun joined #git
08:53 ws2k3 joined #git
08:53 steve joined #git
08:53 faheem joined #git
08:53 Limes joined #git
08:53 wgrant joined #git
08:53 ulkesh joined #git
08:53 nd joined #git
08:53 superteece joined #git
08:53 slick joined #git
08:53 Tee_Pee joined #git
08:53 chris2 joined #git
08:53 cdesai joined #git
08:53 tomboy64 joined #git
08:53 Sleepy63 joined #git
08:53 naitsirhc_ joined #git
08:53 MTwister joined #git
08:53 Guest92364 joined #git
08:53 drodger joined #git
08:53 tobiasvl joined #git
08:53 NightMonkey joined #git
08:53 PhantomPhreak joined #git
08:53 sim642 joined #git
08:53 sfix joined #git
08:53 rezrov joined #git
08:53 frobnic joined #git
08:53 nedbat joined #git
08:53 tazle_ joined #git
08:53 trobotham joined #git
08:53 marcaddeo joined #git
08:53 jave joined #git
08:53 Shakeel_ joined #git
08:53 enleeten2 joined #git
08:53 sleezd joined #git
08:53 daynaskully joined #git
08:53 MrC joined #git
08:53 progrock joined #git
08:53 preaction joined #git
08:53 GingerGeek joined #git
08:53 sylario joined #git
08:53 Ariadeno joined #git
08:53 asdofindia joined #git
08:53 dhanush joined #git
08:53 adamm joined #git
08:53 McNozes joined #git
08:53 Forkk joined #git
08:53 ojacobson joined #git
08:53 SenpaiSilver joined #git
08:53 kanyeezy joined #git
08:53 ORiON-- joined #git
08:53 bailon joined #git
08:53 rancyd joined #git
08:53 devhoag joined #git
08:53 kennon_ joined #git
08:53 ionelmc joined #git
08:53 Seveas joined #git
08:53 yena joined #git
08:53 evanc joined #git
08:53 gigq joined #git
08:53 CussBot joined #git
08:53 weylin joined #git
08:53 chilversc joined #git
08:53 Celelibi joined #git
08:53 kutenai joined #git
08:53 imdsm_ joined #git
08:53 aendrew joined #git
08:53 braderhart joined #git
08:53 sebhoss joined #git
08:53 osse joined #git
08:53 etcinit joined #git
08:53 dx joined #git
08:53 cschneid joined #git
08:53 SegFaultAX joined #git
08:53 aca20031 joined #git
08:53 Riviera joined #git
08:53 bremner joined #git
08:53 gravitron joined #git
08:53 bodie_ joined #git
08:53 parsnip joined #git
08:53 belak joined #git
08:53 Zarthus joined #git
08:53 up_the_irons joined #git
08:53 markelite joined #git
08:53 gmh joined #git
08:53 danmackay joined #git
08:53 GameGamer43 joined #git
08:53 sitaram joined #git
08:53 m0ltar joined #git
08:53 brewmaster joined #git
08:53 tHEMtZ joined #git
08:53 Spinkzeit joined #git
08:53 Klumben joined #git
08:53 murph joined #git
08:53 r3c0d3x joined #git
08:53 marlun joined #git
08:53 blueyed joined #git
08:53 moritz joined #git
08:53 Neal_ joined #git
08:53 Mogget joined #git
08:53 troyt joined #git
08:53 cworth joined #git
08:53 slixpk joined #git
08:53 zero7 joined #git
08:53 shennyg joined #git
08:53 janx|away joined #git
08:53 contracode joined #git
08:53 parliament joined #git
08:53 barq joined #git
08:53 shauna joined #git
08:53 spr0tsuki joined #git
08:53 discopatrick joined #git
08:53 beckyconning_ joined #git
08:53 MLM joined #git
08:53 cstrahan joined #git
08:53 cspotcode joined #git
08:53 nezZario joined #git
08:53 bbhoss joined #git
08:53 codebam joined #git
08:53 blackjid joined #git
08:53 r4z3r joined #git
08:53 Xe joined #git
08:53 kossy_ joined #git
08:54 SteffanW joined #git
08:54 multi_io joined #git
08:54 Myrl-saki joined #git
08:54 M-mistake joined #git
08:54 BombStrike joined #git
08:54 jeffreylevesque joined #git
08:54 Shentino joined #git
08:54 BSaboia joined #git
08:54 joki joined #git
08:54 pikajude joined #git
08:54 hosttor joined #git
08:54 blackwind_123 joined #git
08:54 treehug88 joined #git
08:54 bgamari joined #git
08:54 OnkelTem joined #git
08:54 Eryn_1983_FL joined #git
08:54 meLon joined #git
08:54 bjoe2k4 joined #git
08:54 GGflags joined #git
08:54 DomeMaster joined #git
08:54 yonatankoren joined #git
08:54 tinanoo1 joined #git
08:54 heinrich5991 joined #git
08:54 tlolczyk joined #git
08:54 kugel joined #git
08:54 sentriz joined #git
08:54 atrigent joined #git
08:54 rpd joined #git
08:54 KeelOfSteel joined #git
08:54 rvsjoen_ joined #git
08:54 PioneerAxon joined #git
08:54 Gitzilla joined #git
08:54 kutsuya joined #git
08:54 jlewis_ joined #git
08:54 nivag joined #git
08:54 rogerraymond joined #git
08:54 ffualo joined #git
08:54 callumacrae joined #git
08:54 polyzen joined #git
08:54 Kamilion joined #git
08:54 constantinexvi joined #git
08:54 martinbjeldbak_ joined #git
08:54 jab416171 joined #git
08:54 Dev0n joined #git
08:54 Afforess joined #git
08:54 przemoc joined #git
08:54 markovh joined #git
08:54 MikeChernev joined #git
08:54 iron74 joined #git
08:54 gnarf joined #git
08:54 uranellus joined #git
08:54 grindhold joined #git
08:54 DTekk_ joined #git
08:54 deltab joined #git
08:54 BlackMaria joined #git
08:54 bcc joined #git
08:54 Neo joined #git
08:54 unforgiven512 joined #git
08:54 fstd_ joined #git
08:54 david_bz joined #git
08:54 multi_io joined #git
08:55 devbug joined #git
08:55 braderhart joined #git
08:55 discopatrick joined #git
08:55 MLM joined #git
08:55 blackwind_123 joined #git
08:56 ramsub07 joined #git
08:56 parsnip joined #git
08:56 ionelmc joined #git
08:57 pfg joined #git
08:58 Cerise joined #git
08:58 Cerise joined #git
08:58 moei joined #git
08:59 ash_workz joined #git
09:00 a3Dman joined #git
09:00 romerocesar_ joined #git
09:00 jeffreylevesque joined #git
09:00 hosttor joined #git
09:01 tomboy64 joined #git
09:02 myrl joined #git
09:02 m2n joined #git
09:08 reim joined #git
09:09 aidalgol joined #git
09:11 jottr joined #git
09:12 alkino joined #git
09:13 cdown joined #git
09:14 King_Hual joined #git
09:14 King_Hual joined #git
09:17 catsup joined #git
09:19 awek joined #git
09:20 Discovery joined #git
09:20 mischat joined #git
09:23 IlNominePatre joined #git
09:24 LeMike joined #git
09:27 shinnya joined #git
09:28 jottr joined #git
09:34 settermjd joined #git
09:34 settermjd joined #git
09:35 a_thakur joined #git
09:35 aard_ joined #git
09:38 freimatz joined #git
09:38 piling guys, how can i merge two commits into one ? these two commits in PR so i'd like to make them properly
09:39 thierryp joined #git
09:43 ShapeShifter499 joined #git
09:44 BlaXpirit piling, look into  git rebase -i
09:44 BlaXpirit are you in a branch that is 2 commits ahead of master?
09:44 tvw joined #git
09:49 piling yeah
09:49 piling BlaXpirit: thanks
09:49 BlaXpirit piling, well  git rebase -i master
09:50 BlaXpirit first one stays `pick`, 2nd one becomes `squash`
09:50 piling BlaXpirit: okay, let me try it . thank you again.
09:57 ahmedelgabri joined #git
09:59 fracting joined #git
10:03 fuchstronaut joined #git
10:04 jottr joined #git
10:07 ochorocho__ joined #git
10:09 nettoweb joined #git
10:10 nettoweb hey guys, about the issue with windows line ends, is it better to user .editorconfig to set a correct default behavior for this case or I should use .gitattibutes config instead? Both work together or I need to choose one of them?
10:14 romerocesar joined #git
10:16 settermjd joined #git
10:18 romerocesar_ joined #git
10:23 djb-irc joined #git
10:25 eijk_ joined #git
10:27 _ikke_ I think a combination of both works best
10:28 romerocesar joined #git
10:29 dsdeiz joined #git
10:29 dsdeiz joined #git
10:32 romerocesar_ joined #git
10:33 jottr joined #git
10:37 davisonio joined #git
10:37 nmz787_i joined #git
10:38 ac110 joined #git
10:38 romerocesar joined #git
10:40 nmz787_i I started working on a big refactoring using project-wide find-replace... and after some time realized I should have done these in an isolated commit, not on top of my work-in-progress already ongoing in that branch.... anyway, I have since made those changes in a fresh branch, off of master... and now would like to use those changes and SUBTRACT them from my work-in-progress (because I now feel they may not be the best changes).
10:40 nmz787_i I really don't want to look at the diff-log, and manually revert things
10:41 ynanm joined #git
10:42 bumpy joined #git
10:44 manosnore joined #git
10:45 _ikke_ nmz787_i: commit all the changes, reverse apply the refactor changes, commit --amend
10:45 _ikke_ something like that
10:45 mkoskar joined #git
10:45 jottr joined #git
10:50 Shock- joined #git
10:50 thierryp joined #git
10:52 jottr joined #git
10:52 jeffreylevesque_ joined #git
10:55 nickjj joined #git
10:57 nickjj how can i fix this issue with multiple .gitignore files -- i have a git repo that has a .gitignore that's a few directories deep but its contents are affecting my git repo but i don't want it to -- how can i make this happen?
10:57 nmz787_i _ikke_: so sounds like 'reverse apply' is the key term here?
10:57 nickjj it's a pretty non-standard use case i guess because that inner .gitignore is meant to be part of a code base that's getting generated by the app (which is the repo itself)
10:59 jottr joined #git
11:00 davisonio joined #git
11:00 pioiytr joined #git
11:04 atrigent_ joined #git
11:05 johnmilton joined #git
11:06 Limes_ joined #git
11:09 eijk_ joined #git
11:10 filcab joined #git
11:12 frogonwheels_ joined #git
11:12 t0by joined #git
11:15 ojdo joined #git
11:17 robotroll joined #git
11:18 xpk joined #git
11:20 devbug joined #git
11:20 Impaloo joined #git
11:21 jottr joined #git
11:30 freimatz joined #git
11:32 Shock-_ joined #git
11:35 l0rdPE joined #git
11:37 sobersabre joined #git
11:38 sobersabre hi, I'm hit with a sudden stupidity wave, so I need a small shake: I'm tracking upstream master branch in a local branch upsteram-master
11:38 sobersabre I can rebase it over to master.
11:38 Rodya_ joined #git
11:38 holdsworth joined #git
11:38 sobersabre now I want to make sure my master is pushed to origin.
11:38 sobersabre I'm not sure how do I do the pointer shuffle.
11:39 sobersabre I want the tip of upstream-master to start being my master.
11:39 sobersabre how do I do this?
11:39 sobersabre it should be a git reset
11:39 sobersabre do I need to checkout master, and then reset it to upstream-master?
11:43 romerocesar joined #git
11:43 zeemzz joined #git
11:44 xpk joined #git
11:44 xpk joined #git
11:52 mycyber joined #git
11:53 romerocesar joined #git
11:54 cbreak sobersabre: why?
11:54 Noldorin joined #git
11:54 cbreak just check out master
11:54 cbreak then push
11:54 cbreak that's how you ensure master is pushed to origin
11:54 cbreak no pointer shuffling needed
11:54 cbreak and delete upstream-master, it sounds worthless
11:57 cs02rm0 joined #git
12:00 lindelabs joined #git
12:00 rahtgaz joined #git
12:01 johnmilton joined #git
12:03 a_thakur joined #git
12:04 romerocesar joined #git
12:04 fuchstronaut joined #git
12:04 ximvan joined #git
12:09 mkoskar_ joined #git
12:09 Lunatrius joined #git
12:13 bumpy joined #git
12:14 cyan__ joined #git
12:14 ahmedelgabri joined #git
12:18 nwkj86 joined #git
12:21 davisonio joined #git
12:22 sdothum joined #git
12:22 jottr joined #git
12:23 fishcooker joined #git
12:24 hosttor joined #git
12:24 plasticle joined #git
12:32 jost joined #git
12:34 allcentury joined #git
12:35 cdown_ joined #git
12:43 tomog999 joined #git
12:44 alkino joined #git
12:45 lindelabs joined #git
12:49 stonerfish joined #git
12:50 catsup joined #git
12:53 The_Phoenix joined #git
12:53 nnyk_ joined #git
12:53 nnyk_ joined #git
12:57 zeroed joined #git
12:58 muelli joined #git
12:59 cs02rm0 joined #git
13:05 bumpy joined #git
13:07 devxom joined #git
13:09 Balliad joined #git
13:10 dsdeiz joined #git
13:21 Not_Whatever joined #git
13:22 devxom joined #git
13:23 jottr joined #git
13:24 romerocesar joined #git
13:24 diegoviola joined #git
13:26 vuoto joined #git
13:26 devxom joined #git
13:27 skinux joined #git
13:27 skinux I need to switch which remote repo git uses for my local project. How do I do that?
13:27 nickjj left #git
13:28 ahmedelgabri joined #git
13:28 devxom joined #git
13:29 devxom joined #git
13:30 azbarcea joined #git
13:30 ramsub07 joined #git
13:34 devxom joined #git
13:35 qsx skinux: man git-remote
13:35 gitinfo skinux: the git-remote manpage is available at http://jk.gs/git-remote.html
13:36 devxom joined #git
13:37 eivarv joined #git
13:39 devxom joined #git
13:39 skinux Not fully helping
13:45 lindenle joined #git
13:48 skinux Can't you just give me a command, that's what people usually do.
13:50 skinux Tried using set-url, says URL isn't found
13:50 skinux Probably because THAT repo doesn't exist anymore
13:50 DarkoEyes joined #git
13:53 cs02rm0 joined #git
13:54 SteffanW joined #git
13:55 netcarver joined #git
13:55 qsx no
13:55 qsx spoonfeeding is pointless
13:56 sangy joined #git
13:59 skinux Nah, you're just a dick
14:02 QwertyDragon joined #git
14:03 D-Boy joined #git
14:05 fuchstronaut joined #git
14:09 david007 joined #git
14:14 HoierM joined #git
14:22 catag87 joined #git
14:23 catag87 joined #git
14:25 jottr joined #git
14:27 ochorocho__ joined #git
14:29 cbreak skinux: get a brain.
14:29 cbreak skinux: and stop being an asshole
14:29 cbreak if you don't want help, don't ask
14:29 cbreak set-url will obviously work.
14:30 polyzen if it doesn't exist anymore maybe you want to add it
14:31 polyzen it's fairly clear from the very top of the manpage
14:31 cbreak he probably failed to specify a remote to set the url for...
14:31 cbreak because he didn't read the command synopsis
14:32 NeverDie joined #git
14:36 QwertyDragon joined #git
14:40 SteffanW joined #git
14:41 freimatz joined #git
14:42 Shock- joined #git
14:42 playfullyExist joined #git
14:43 Jackneill joined #git
14:44 UTAN_dev joined #git
14:46 ramsub07 joined #git
14:49 davisonio joined #git
14:51 LeMike joined #git
14:51 King_Hual joined #git
14:52 ochorocho__ joined #git
14:53 fuchstronaut joined #git
14:53 King_Hual joined #git
14:53 King_Hual joined #git
14:54 mellernoia joined #git
14:55 dangerousdave joined #git
14:57 madewokherd joined #git
14:59 skinux I tried using set-url tw9ice
14:59 skinux I removed it, added the right one...commands worked, but it's still set to use the wrong branch
15:05 fuchstronaut joined #git
15:05 franl joined #git
15:06 Shock- joined #git
15:07 fahadash joined #git
15:08 jimi_ joined #git
15:09 ruuj joined #git
15:11 cagmz joined #git
15:12 Gitzilla joined #git
15:12 stoopkid joined #git
15:17 cs02rm0 joined #git
15:19 allcentury joined #git
15:24 zumba_ad_ joined #git
15:25 jottr joined #git
15:28 hosttor joined #git
15:30 zumba_ad_ joined #git
15:37 cdown_ joined #git
15:40 hk238 joined #git
15:40 shinnya joined #git
15:41 encod3 joined #git
15:43 zumba_ad_ joined #git
15:45 texinwien joined #git
15:45 alkino joined #git
15:45 davisonio joined #git
15:52 ramsub07 joined #git
15:53 davisonio joined #git
15:54 TinkerTyper joined #git
15:56 dopesong joined #git
15:58 skoocda joined #git
16:03 eivarv joined #git
16:04 jungsubk joined #git
16:06 fuchstronaut joined #git
16:09 dreiss joined #git
16:11 wiky joined #git
16:13 cagmz joined #git
16:15 Lunatrius joined #git
16:17 LeMike joined #git
16:18 Gamecubic joined #git
16:21 dminca joined #git
16:21 DarkoEyes joined #git
16:25 Kobaz is there a list of all the @{} shortcuts/replacements
16:26 jottr joined #git
16:26 romerocesar joined #git
16:26 cagmz joined #git
16:26 yqt joined #git
16:27 texinwien joined #git
16:28 wspider joined #git
16:29 thiago joined #git
16:30 pioiytr joined #git
16:31 pioiytr joined #git
16:32 vuoto joined #git
16:33 orbitphreak joined #git
16:34 cagmz_ joined #git
16:35 kulelu88 joined #git
16:36 EricPoe joined #git
16:38 qsx Kobaz: man gitrevisions
16:39 gitinfo Kobaz: the gitrevisions manpage is available at http://jk.gs/gitrevisions.html
16:39 david002 joined #git
16:40 xlegoman joined #git
16:41 Kobaz k cool
16:41 Lunatrius joined #git
16:44 kulelu88 joined #git
16:54 pioiytr_ joined #git
16:55 pioiytr_ joined #git
16:56 JanC_ joined #git
16:56 pioiytr_ joined #git
16:57 bjoe2k4 joined #git
16:59 ochorocho__ joined #git
17:06 xpk joined #git
17:06 romerocesar joined #git
17:09 blackwind_123 joined #git
17:11 bjoe2k4 joined #git
17:13 lindelabs joined #git
17:13 wspider I am new into this.. I want to update some code in my production server and merge goes in the way.. I don't know if it makes sense to do a clone everytime you want an update
17:14 wspider because for that you also need to delete everything
17:16 thiago wspider: are you ssh'ing into the server and doing a git merge? Why?
17:16 mrkmg joined #git
17:17 romerocesar joined #git
17:17 spudowiar joined #git
17:18 tristanp joined #git
17:18 wspider thiago: the website haven't been published yet, it's my work to publish it and then be able to update it while in production and I don't know how to
17:18 wspider later I want to automatize it via ansible
17:18 texinwien joined #git
17:18 thiago wspider: !deploy
17:18 gitinfo wspider: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
17:18 wspider but now I don't know any better way of doing it than ssh
17:18 wspider oks
17:18 wspider thanks !!
17:19 lindelabs left #git
17:19 kulelu88 joined #git
17:19 mrkmg Hello. First time here. I just started a new project, as a simple replacement for git flow. I am looking for peoples thoughts on it, and maybe some code review by people who are much more knowledgeable than me. I call it Git Steam. https://github.com/mrkmg/git-stream
17:26 glebihan joined #git
17:27 jottr joined #git
17:29 glebihan joined #git
17:31 zacts joined #git
17:34 wspider thiago: I am interested in the git checkout -f master, the thing is that when i doit, it says I am already on master so I wonder if what's missing is having two branches, the current production branch and the new update branch..
17:34 bjoe2k4 joined #git
17:34 Rodya_ joined #git
17:36 shgysk8zer0 joined #git
17:36 shgysk8zer0 joined #git
17:36 piattino joined #git
17:37 thiago wspider: if you're already in a given commit, why would you want to check the same commit out?
17:37 thiago you're already in it
17:37 piattino what is the difference between git reset --hard branchname and git checkout --force branchname please?
17:37 Literphor joined #git
17:38 wspider thiago: but there's a new commit in the online repo
17:38 thiago did you fetch it?
17:39 thiago piattino: are you in that branch before you issue those commands?
17:40 piattino thiago: i dont know. sorry
17:41 piattino thiago: i just memorise the commands for now without understanding
17:41 thiago piattino: the difference is the branch that you're in before you issue those commands
17:41 thiago piattino: with git reset, you're still in it, even though it's now equal to branchname
17:41 thiago piattino: with git checkout, the old branch is left untouched and you switch to that new branch branchname
17:42 piattino aaaaahhhhhhh... agora entendo!
17:42 NimeshNeema joined #git
17:42 piattino thiago: thanks for the explanation! makes sense..
17:43 thiago wspider: git checkout doesn't download. You need to download the changes first, before you check them out.
17:43 wspider thiago: i did a git push with a new commit, then I did git checkout -f master.. now that you told me to fetch I did so ( in the future production server ) and did checkout -f master again and it said that I was already on master and that I was two commits behind 'origin/master' now I did git checkout -f 'origin/master' and it looks like what I wanted to happens happened
17:44 thiago wspider: but you're now on a !detached HEAD
17:44 gitinfo wspider: A detached HEAD(aka "no branch") occurs when your HEAD does not point at a branch. New commits will NOT be added to any branch, and can easily be !lost. This can happen if you a) check out a tag, remote tracking branch, or SHA; or b) if you are in a submodule; or you are in the middle of a c) am or d) rebase that is stuck/conflicted. See !reattach
17:44 vuoto joined #git
17:44 Zoxc joined #git
17:44 thiago wspider: go back to the branch (git checkout master). What you really want is git fetch && git reset --hard origin/master
17:45 Zoxc Hi. How do I resolve conflicts with submodules when the submodule is not checked out?
17:45 livingstn joined #git
17:45 muelli joined #git
17:46 thiago Zoxc: not sure if git checkout --ours submodulename works. You can try
17:49 Zoxc thiago: It doesn't seem to do anything
17:49 thiago Zoxc: still conflicted?
17:50 devxom joined #git
17:50 Zoxc git status gives both modified:   liblibc
17:52 Literphor joined #git
17:52 thiago try git checkout HEAD submodulename
17:53 kfunk joined #git
17:53 wspider thiago: oh, what you gave to me works perfectly, thanks !
17:54 thiago wspider: just make sure you and your co-workers know this: if they modify the files directly in production, all changes will be lost when those commands are run again
17:55 ifsp joined #git
17:58 Zoxc thiago: That removed the conflict so I could clone the submodule and point it to the right commit :)
17:58 myrl joined #git
18:00 nnyk_ joined #git
18:00 Ahmed90 joined #git
18:01 elastix joined #git
18:03 piattino joined #git
18:04 mariuscc joined #git
18:07 fuchstronaut joined #git
18:09 kbs joined #git
18:09 safe joined #git
18:13 chris2 joined #git
18:14 Literphor joined #git
18:14 texinwien joined #git
18:17 toogley joined #git
18:18 Dazzyp joined #git
18:19 ramsub07 joined #git
18:22 jost_ joined #git
18:25 allcentury joined #git
18:25 elementalest joined #git
18:26 wspider thiago: ok, great
18:26 wspider thanks again
18:27 vuoto joined #git
18:28 jottr joined #git
18:29 vuoto joined #git
18:29 davisonio joined #git
18:31 xcesariox joined #git
18:32 rawtaz joined #git
18:35 NeXTSUN joined #git
18:35 elastix joined #git
18:36 zumba_ad_ joined #git
18:40 CheckDavid joined #git
18:40 Lunatrius joined #git
18:41 d4rklit3 joined #git
18:44 ochorocho__ joined #git
18:45 bruce_lee joined #git
18:49 LeMike joined #git
18:53 cyan__ joined #git
18:54 yqt joined #git
19:00 mischat_ joined #git
19:01 zacts joined #git
19:02 rainbyte joined #git
19:07 nodz joined #git
19:07 fahadash joined #git
19:10 Aboba joined #git
19:11 QwertyDragon joined #git
19:12 djb-irc joined #git
19:12 fuchstronaut joined #git
19:13 nodz I have problem to merge conflict branch, when I want to resolve my code, part of it not appear in the conflict-marker. I am using 2.9.0. what am i doing wrong?
19:13 pykno-paron joined #git
19:13 skinux Well, my current problem is Git is set to use a branch that is wrong for the project. do I do git checkout passing master to fix that?
19:14 thiago nodz: how do you know it is conflicting if Git isn't marking it?
19:14 _ikke_ skinux: What do you mean by 'using a branch that is wrong'?
19:14 thiago skinux: if you want to change branches, use git checkout branchname
19:15 Literphor joined #git
19:16 mycyber joined #git
19:16 nodz thiago: when I want to merge by "git merge xxx"
19:17 romerocesar joined #git
19:17 thiago nodz: waiting for the second half of that sentence
19:18 nodz and then when I try to resolve conflicts, a big part of code disappeared (from master)
19:18 xall joined #git
19:19 thiago nodz: how did you try to resolve it?
19:19 thiago was the code there before you tried to resolve the conflits?
19:20 nodz thiago, can i pm you the difference between two branches?
19:20 thiago no
19:20 thiago I don't care what the difference is
19:20 nodz ok let me explain
19:21 tristanp joined #git
19:21 thiago you did git merge and got a conflict
19:21 thiago before you try to resolve those conflicts, is the code you're looking for already missing?
19:21 djb-irc joined #git
19:22 nodz the code is there in master after i git merge it disappear ..
19:22 skinux left #git
19:22 thiago that means the other branch deleted it
19:23 nodz but it should be between conflict-marker and let me choose what to do with code!
19:23 GavinMagnus joined #git
19:24 thiago ni
19:25 thiago not if there's no conflict
19:25 _ikke_ If one side removes the code, and the other side does not touch it, there is no conflict
19:25 acetakwas joined #git
19:26 azbarcea joined #git
19:26 Manis joined #git
19:27 nitin joined #git
19:28 nodz the problem is that git does not detect it as a separate code
19:28 _ikke_ Why should it?
19:28 _ikke_ git does not look at code, it just looks at lines
19:28 jottr joined #git
19:29 nodz for example my master is : "a zzz" and the other branch is "b v" and afterwards when conflict happen i see <<< b v ---- a >>>and zzz not exist in code
19:31 nodz _ikke_: can i send you the conflict, i can't explain it :|
19:31 Manis Hi. I'm having a little git problem. I have two servers with bare repos of the same codebase. One works perfectly, but with the other whenever I try to "git fetch" from it, I get 'fatal: mmap failed: Cannot allocate memory \n fatal: The remote end hung up upon initial contact'
19:34 Goplat joined #git
19:35 dsdeiz joined #git
19:35 catag87 joined #git
19:36 ac3takwas joined #git
19:36 catag87 joined #git
19:37 allstar joined #git
19:39 nilg joined #git
19:40 Literphor joined #git
19:41 Rodya_ joined #git
19:42 thiago nodz: we've already explained
19:42 thiago nodz: one side removed the code. The other didn't touch it.
19:44 kbs a random git question - why do git objects embed their lengths within themselves? (I assume this is not critical to the object integrity because sha, so what other purpose does it serve?)
19:45 hosttor joined #git
19:46 xlegoman joined #git
19:46 toydestroyer joined #git
19:47 _ikke_ iirc it does have to do with integrity
19:47 kbs oh, that's surprising - do you have a pointer by any chance?
19:48 romerocesar joined #git
19:48 thiago it is of course redundant information
19:49 thiago if the data is not corrupted, the object's file size is sufficient to tell what the object size is
19:49 robotroll joined #git
19:49 thiago if it is corrupted (power interrupted while saving), then the SHA-1 would fail to match
19:49 _ikke_ I'd imagine it has to do with collisions, but I can't tell for sure
19:50 shinnya joined #git
19:50 thiago right, but it is highly unlikely that a prefix of the actual data is a SHA-1 match for the data
19:51 _ikke_ trying to find references, but nothing shows up
19:52 ubic joined #git
19:53 kbs I more or less assumed that should/when sha-1 collisions appear, embedding the content length prior to hashing might be a bit of wishful hope :-) but maybe I'm mistaken
19:54 thiago the chance of a prefix matching the SHA-1 is the same whether you add the length in the beginning or not
19:55 thiago however, checking file sizes is orders of magnitude faster than computing SHA-1
19:55 tristanp joined #git
19:56 nodz thiago: what do you mean one side removed the code? isn't a conflict supposed to be resolved by user and the git must show me the conflicts! not to remove it?
19:56 kbs true, but the file size (as you indicate) is generally easily available otherwise
19:56 qpdb joined #git
19:56 Balliad joined #git
19:57 thiago nodz: correct, a conflict is supposed to be resolved by the user and git does show conflicts
19:57 ZenWalker left #git
19:57 thiago nodz: conclusion: it ISN'T a conflict
19:58 apotry joined #git
20:00 nodz thiago one side has something and the other has not , isn't a conflict??!! how do i force git to include that code in my new merge-commit? because git removing it
20:00 thiago nodz: it's a conflict if one side removed lines that the other also changed
20:00 ahmedelgabri joined #git
20:00 thiago nodz: if one side removed but the other made no changes, it's not a conflict
20:00 Bombe nodz, if one side removed the file but the other didn’t touch it at all, that’s no conflict.
20:00 thiago nodz: you cannot force it to be
20:02 nodz omg i don't understand what are u talking about, can you please just tell me how do fix that problem that i don't even know is a conflict or not
20:02 thiago nodz: if you want those lines, bring them back. Manually.
20:02 nodz part of my code is disappear!!
20:02 thiago bring it baack
20:03 thiago part of your code disappeared because either you or one of your collaborators removed it
20:03 thiago check if it was intentional. Talk to your collaborators.
20:04 zacts joined #git
20:05 nodz I know how to bring them back, my question is what if i didn't notice there were gone, should i check my code every time a conflict-like thing happen to see what disappeared?
20:05 nodz it's just me in the project
20:05 thiago no
20:05 thiago you should check after every merge
20:05 D[4]ni joined #git
20:05 apotry joined #git
20:05 thiago and after every rebase. It doesn't matter whether it was successful or not.
20:05 Vauff joined #git
20:06 D[4]ni Hello everyone, is it possible to list the contents of a folder in a remote repository without having a local clone of it?
20:06 thiago Git doesn't know your code or even your source code language. It can't know whether the automatic merging was what you intended or not, or even if it is syntactically correct.
20:06 thiago only you can tell that.
20:06 thiago D[4]ni: no
20:08 paka_ joined #git
20:09 paka_ Hi, new to this... I usually use pycharm to commit changes to git hub... usually from home... but sometimes on my work pc.. now for the first time I have taken the work pc home and pycharm says it cant find .gitconfig.. fair enough since it's probably on h: office network drive
20:10 paka_ so I just did what I wanted to do i pycharm... (coding... .) and then went on to use the github windows software to commit..
20:10 paka_ but then it committed all the pycharm project files that should not be aparat of the actual project
20:10 paka_ so I reverted that commit
20:10 nodz thiago thank you for you patience but i just created a repo and tested similar problem but it does not happen there i just happen in my project
20:10 paka_ And then all my changes was lost
20:10 paka_ So to the point: How do I "unrevert" some of the reverted files?
20:10 D[4]ni Would you think it would be practical to have a plugin system run on git repositories? Like, I manage the plugins, if people want to submit new ones they do it via pull request on Github, and if people would like to have other repositories to get plugins from, that'd also be cool.
20:11 btree joined #git
20:11 D[4]ni Does that make sense at all, and can I make it work at all via Git, or do I need to rethink it?
20:12 nodz and in my project after i separate the code and make a merge, the code does not disappear
20:13 nodz it make no sense.
20:13 paka_ btw... I am using win 7 and the git software "supplied" bit github
20:13 btree left #git
20:15 paka_ simplified question: I make a commit that accidently adds multiple unwanted files so I revert it, but that also reverts my changes... How do I get the changes back?
20:16 jottr joined #git
20:16 fuchstronaut joined #git
20:17 D[4]ni paka_: you didn't need to revert. Did you push that to a remote already?
20:18 RustyShackleford I made some pretty major changes on this branch
20:18 RustyShackleford can I just roll back a few commits?
20:18 diogenese joined #git
20:18 RustyShackleford delete them, forget that work was ever done
20:19 thiago nodz: a conflict is when the two sides make changes within 3 lines of one another
20:19 bjoe2k4 joined #git
20:19 paka_ D[4]ni:  new to git.. .used to svn.. what I did was press sync in the github sw, which I think makes a push
20:19 _ikke_ thiago: Are you sure about the 3 lines?
20:19 thiago _ikke_: yes
20:19 D[4]ni paka_: Do others use the same remote?
20:19 davisonio joined #git
20:20 thiago paka_: how did you do the first revert?
20:20 thiago paka_: git command
20:21 D[4]ni Yeah, did you revert or reset?
20:21 Darcidride joined #git
20:22 thiago paka_: I need you to tell us what git command was used. If you used a front-end software, check if it prints a log of git commands.
20:22 spudowiar joined #git
20:22 paka_ new account on github and I weould be very suprised if anyone EVER wanted to use this python thingy i wrote.. .so no, no others to worry about
20:22 _ikke_ thiago: confirmed :P
20:22 githogori joined #git
20:22 thiago paka_: if it doesn't or you can't get it back, we can't help you. You should seek help from the people who make that software so that they will tell you what exactly was done.
20:23 thiago RustyShackleford: yes, you can. Have you shared it with other people, though?
20:23 paka_ hrrrrm I am using the github software... notsure what commands it is using
20:23 RustyShackleford thiago, nope. Actually I figured it out with git gui
20:23 thiago paka_: then we can't help you
20:23 D[4]ni I think it does an actual revert.
20:23 RustyShackleford of course I figure it out the second I ask for help :p
20:23 _ikke_ Rubber Duck problem solcing
20:24 _ikke_ solving
20:24 thiago paka_: well, actually... open a shell and run git log. Do you see your work and a reversal of it?
20:24 paka_ lemme check
20:25 GavinMagnus left #git
20:25 Balliad joined #git
20:26 paka_ yes.. first a commit, then "this reverts commit: ***"
20:27 thiago paka_: so your work is still there, in the previous commit
20:27 D[4]ni paka_: do `git reset --hard HEAD^`, then `git rm` on all the unwanted files, then commit that, then git push -f
20:27 thiago paka_: my guess is that this reversal is not something you wanted, so you can probably do a git reset --hard HEAD~
20:27 thiago BTW, back up your repository first
20:27 D[4]ni ^
20:28 thiago then you want to undo the commit you made with too many files, but keep all the changes, so after the first reset, do git reset HEAD~ (without --hard)
20:28 tristanp joined #git
20:28 D[4]ni Well, that would probably make the history cleaner, yes.
20:28 thiago finally, make the commit you had wanted to do
20:29 D[4]ni Actually, git instead of a mixed reset you can just commit --amend
20:29 D[4]ni -git
20:29 Lunatrius` joined #git
20:29 davisonio joined #git
20:29 D[4]ni So the workflow would be: git reset --hard HEAD^; git rm <files>; git commit --amend; git push -f
20:30 paka_ just to make sure I dont mess up again, 1. git reset --hard HEAD~ 2. git reset HEAD~ 3. commit the changes I wanted to make form the start
20:30 thiago yes
20:31 D[4]ni HEAD~ works? I thought a number had to follow the ~
20:31 D[4]ni I always use HEAD^
20:31 thiago just like ^, the number is optional
20:31 thiago but unlike ^, ~ is usually not a shell special
20:31 D[4]ni Oh, ^ and ~ are the same thing?
20:32 thiago when not followed by any numbers, yes
20:32 D[4]ni I've always used ^ for going back one commit and ~ for more
20:32 paka_ thanks alot ppl! will try this now :)
20:32 Pulp joined #git
20:32 thiago as I said, ^ has one problem: it's a shell special
20:33 thiago so HEAD^ may expand to something you didn't expect
20:33 D[4]ni Never had any problems
20:33 D[4]ni Then again, I use fish everywhere, it's pretty special
20:33 thiago well, I use zsh and:
20:34 thiago $ echo HEAD^
20:34 thiago zsh: no matches found: HEAD^
20:34 D[4]ni To be exact, I use fish everywhere I can just install things and bash everywhere else
20:34 D[4]ni It's not a special character in bash, is it?
20:34 thiago it is
20:36 D[4]ni I should really refresh my knowledge about obscure shell features :P
20:37 Sonderblade joined #git
20:37 paka_ Thanks again! back on track!
20:38 D[4]ni Well, I'm still wonder if git would be a feasible backend for a plugin repository.
20:38 D[4]ni I mean, I guess I can't just pull single files out of a git repository
20:39 thiago you have to get all files
20:39 moritz D[4]ni: sounds like it would work for a small prototype, but not for a fully-fledged system
20:39 thiago but one assumes you want all of them
20:40 thiago if the author of the plugin added multiple files, they must be there for a reason
20:41 D[4]ni thiago: My idea was that I have one repo where I have all the plugins, every one in its own directory. I don't think that'd work without downloading the whole repo though
20:45 thiago one repo per plugin
20:46 cq1 joined #git
20:46 D[4]ni And one trusted repo/something else where I list all the plugins and their URLs
20:46 D[4]ni Kinda a little bit like APT
20:47 cq1 Hey folks. I'm a relative beginner at git, and I'm trying to figure out the best workflow to "push" commits from one machine to another when the central server I was using is down. Any ideas?
20:47 _ikke_ cq1: What OS?
20:47 cq1 _ikke_: Debian 8.
20:48 a3Dman joined #git
20:48 fishcooker joined #git
20:50 lindenle joined #git
20:51 _ikke_ cq1: SSH would be the easiest
20:52 cq1 _ikke_: Like, literally just copy the changed files over and commit them again on the other machine?
20:52 _ikke_ No
20:52 cq1 Okay, I was hoping not that.
20:53 p1k hey
20:53 _ikke_ But it would require each of you to have ssh access to the others machine
20:53 Literphor joined #git
20:54 cq1 So, I have SSH access to the desktop machine I would like to push to. I successfully pulled from it by doing "git remote add", then an appropriate "git pull". But I can't git push back to this remote, can I?
20:54 _ikke_ cq1: Not by default
20:55 _ikke_ But in this case, I would recommend a pull-only work-flow
20:55 D[4]ni Wait, I have an idea
20:55 D[4]ni Can I use git submodule as that "list of modules"?
20:55 D[4]ni I've never worked with that
20:55 _ikke_ !submodule
20:55 gitinfo git-submodule is ideal to add subsidiary git repositories to a git superproject when you do not control the subprojects or more specifically wish to fix the subproject at a specific revision even as the subproject changes upstream. See http://www.git-scm.com/boo​k/en/Git-Tools-Submodules
20:56 D[4]ni But a clone doesn't automatically clone submodules too, does it?
20:56 _ikke_ git clone --recursive will
20:56 D[4]ni Well, I don't want to clone submodules by default
20:56 D[4]ni So that's good.
20:56 _ikke_ right
20:56 jknetl joined #git
20:57 cq1 _ikke_: Okay, pull only. So I guess I just have to figure out how to get the other machine able to ssh into my laptop, despite the NAT going on. Would you recommend I just bite the bullet and reverse SSH somehow?
20:57 D[4]ni cq1: I think ssh -L might help you.
20:57 _ikke_ cq1: You can also setup a 'central' repository on that desktop
20:58 _ikke_ cq1: git init --bare and push to there
20:58 p1k if I submodule an existing folder
20:58 cq1 D[4]ni: Yeah, exactly what I was thinking. Eww.
20:58 p1k can I get all he commits to submodule as well ?
20:58 cq1 _ikke_: Of course! That's perfect.
20:59 p1k so that I can push it up as a separate repo with it's own history
20:59 cq1 I like that so much. So I git init --bare, and push into it, then add the local bare repo as another remote, and pull from the "main" working copy on the desktop machine.
20:59 cq1 I love it. In retrospect it's so obvious.
20:59 p1k or do I need to create a new repo, cherry-pick the commits and then submodule it ?
20:59 cq1 Am I understanding correctly?
20:59 _ikke_ cq1: Sounds like it, yes
20:59 cq1 Great, I'll report back in a second when I try.
21:00 _ikke_ p1k: sorry, what do you mean with submodule an existing folder?
21:00 D[4]ni p1k: quick google found me this: http://stackoverflow.com/questions/17413​493/create-a-submodule-repository-from-a​-folder-and-keep-its-git-commit-history
21:01 p1k D[4]ni: thanks, I'll read that
21:01 ahmedelgabri joined #git
21:04 indieross joined #git
21:07 tristanp joined #git
21:10 ekinmur joined #git
21:10 cq1 _ikke_: Exactly what I wanted, done.
21:10 cq1 Thanks so much for the help.
21:11 _ikke_ cq1: no problem
21:12 davisonio joined #git
21:15 _ikke_ That's nice with git being decentralized
21:15 _ikke_ You just put your repository somewhere else and you can just go on
21:16 fuchstronaut joined #git
21:18 cdg joined #git
21:18 moritz the real hassile (besides changing the URLs) is managing the SSH keys for accessing the repository
21:18 cdg joined #git
21:19 D[4]ni Just manage them in a git rep... oh wait
21:19 zumba_addict joined #git
21:19 romerocesar joined #git
21:19 spudowiar joined #git
21:22 _ikke_ You can always set-up a git daemon if it's within a lan
21:22 _ikke_ Or dumb http, which should still be supported
21:22 _ikke_ but neither of those support pushing
21:22 tgunr joined #git
21:29 romerocesar joined #git
21:29 studmuf joined #git
21:30 davisonio joined #git
21:31 aidalgol joined #git
21:31 alkino joined #git
21:33 zacts joined #git
21:34 JeDa joined #git
21:34 bruce_lee joined #git
21:36 trewe joined #git
21:40 sctskw joined #git
21:41 Arban joined #git
21:42 todd_dsm joined #git
21:42 Rodya_ joined #git
21:46 jagob joined #git
21:47 Lyqyd joined #git
21:47 davisonio joined #git
21:47 BSaboia joined #git
21:48 elastix joined #git
21:48 piattino joined #git
21:50 fracting joined #git
21:51 guidocalvano joined #git
21:51 guidocalvano hey I am trying to commit to a repository from my work computer
21:51 guidocalvano but I am doing this outside of work
21:51 guidocalvano so to avoid any copyright drama I want to commit to this repo using my personal git credentials
21:51 lindenle joined #git
21:51 thiago git doesn't care what network you're connected to in git commit
21:52 guidocalvano unfortunately git is being a total pain
21:52 guidocalvano and I can’t push to my personal git account
21:52 thiago first of all, check with your company that you're allowed to keep copyright for that contribution
21:52 thiago you're using company assets
21:52 thiago especially if it is a project you work on during your work
21:53 thiago second, is the problem committing or is it pushing?
21:53 guidocalvano my company won’t be able to identify that commit as made from company assets
21:53 guidocalvano pushing
21:53 guidocalvano to my own personal repository, so I can make a pull request
21:53 thiago regardless, they may claim copyright on it because you used work assets to develop it
21:54 guidocalvano and even though I did git config user.name myownbleedingname it still keeps showing my company’s git username for me
21:54 thiago are you using the laptop that your company gave you?
21:54 guidocalvano and right now I need to sleep
21:54 guidocalvano yes
21:54 guidocalvano but that laptop can no way be identified
21:54 thiago then check with your company first
21:54 thiago regardless
21:54 thiago you want to check that you're allowed to do this
21:54 guidocalvano I don’t think they’ll care
21:55 guidocalvano I know Dutch law
21:55 guidocalvano I am not paid, so it is fine
21:55 guidocalvano but I do not want to make the commit under my companies flag
21:55 guidocalvano that will make it theirs
21:55 thiago git show --pretty=fuller
21:55 thiago does it show the correct identities?
21:56 guidocalvano it shows my personal email
21:56 thiago for both author and for committer?
21:56 guidocalvano yes
21:56 thiago ok, so git is off the hook
21:56 thiago your problem is not git
21:57 thiago the server you're pushing to rejected the commit
21:57 guidocalvano well when I to a git push it does reject
21:57 johnmilton joined #git
21:57 guidocalvano (github.com )
21:57 thiago the server rejects, not git
21:57 guidocalvano but
21:57 thiago so your server is configured to reject that
21:57 guidocalvano that reject shows my company name
21:57 thiago are you pushing via SSH?
21:57 D[4]ni Is there any error message except "rejected"?
21:57 guidocalvano probably
21:58 thiago yes or no?
21:58 thiago 100% certain answer, please
21:58 eijk joined #git
21:58 qsx !repro
21:58 gitinfo [!transcript] Please paste (using https://gist.github.com/ or https://vomitb.in/ ) a transcript ( https://gist.github.com/2415442 ) of your terminal session so we can see exactly what you see
21:58 guidocalvano ERROR: Permission to guidocalvano/Gtk.jl.git denied to guidocalvano-voormedia.
21:58 guidocalvano fatal: Could not read from remote repository.
21:58 guidocalvano Please make sure you have the correct access rights
21:58 guidocalvano and the repository exists.
21:58 guidocalvano voormedia is the company
21:58 D[4]ni Your personal account is not allowed to push to that repo.
21:58 thiago are you pushing via SSH?
21:58 guidocalvano yes it is
21:58 thiago D[4]ni: it's the other way around: the work account is not allowed to push
21:59 guidocalvano origingit@github.com:guidocalvano/Gtk.jl.git (fetch)
21:59 guidocalvano origingit@github.com:guidocalvano/Gtk.jl.git (push)
21:59 thiago ok, SSH
21:59 NeXTSUN joined #git
21:59 thiago you've configured your SSH client to use the public key for your work user
21:59 guidocalvano and it probably uses my osxkeychain as a credential.helper
21:59 thiago change your SSH config
22:00 guidocalvano that sounds plausible
22:00 thiago don't know what that is
22:00 guidocalvano can I override it for this specific repository?
22:00 thiago just change your SSH config to use your other identity
22:00 thiago no
22:00 aidalgol How do I show stashes in gitk?
22:00 thiago this is an SSH config, not Git
22:00 qsx you can override with an environment variable in recent enough version
22:00 qsx GIT_SSH_COMMAND="ssh -i ~/.ssh/id_rsa_private" or so
22:00 guidocalvano can I add my work key to my personal repository ?
22:00 xall joined #git
22:00 thiago what you can do is create a Host entry in your .ssh/config that has a different IdentityFile, and then change the repository name
22:01 pioiytr joined #git
22:01 thiago guidocalvano: please check #github for that last question
22:01 * thiago has never admin'ed a GitHub repository
22:02 oich joined #git
22:04 joki joined #git
22:05 azbarcea joined #git
22:09 orbitphreak joined #git
22:09 romerocesar joined #git
22:11 cdown joined #git
22:12 Electrometro joined #git
22:17 Rodya_ joined #git
22:18 d4rklit3 joined #git
22:19 Literphor joined #git
22:19 ahmedelgabri joined #git
22:21 ascarter joined #git
22:21 studmuf joined #git
22:25 cyan__ joined #git
22:29 WaReZ joined #git
22:35 turnstileJumper joined #git
22:35 nivag joined #git
22:37 pioiytr joined #git
22:37 orbitphreak joined #git
22:39 kbs joined #git
22:40 romerocesar joined #git
22:41 Celelibi joined #git
22:43 hck89 joined #git
22:45 cd-rum joined #git
22:46 DarkoEyes joined #git
22:48 stantonk joined #git
22:49 stantonk joined #git
22:52 cd-rum_ joined #git
22:53 stantonk joined #git
22:53 stantonk joined #git
22:53 jon_ joined #git
22:54 chachasmooth joined #git
22:54 jottr_ joined #git
22:55 tristanp joined #git
22:56 jottr__ joined #git
22:58 jeffreylevesque joined #git
23:01 ac3takwas joined #git
23:06 mischat joined #git
23:07 miesco joined #git
23:07 miesco Hi.  Just wondering how pushing authentication wroks.  Does the server keep a list of allowed users?
23:08 miesco I am reading Pro Git and just wondering about this.
23:10 miesco It says "When you want to share a branch with the world, you need to push it up to a remote that you have write access to."  On a linux machine with ssh, does this just mean any user on the machine that can access that file?
23:10 romerocesar joined #git
23:10 miesco If the permission was 666, then any user can push to the repository?
23:11 arescorpio joined #git
23:11 qsx yes
23:12 miesco qsx: So github uses a linux machine with file permissions?  What about https?
23:12 qsx one usually has software around that, e.g. !gitolite, because unix permissions have proven to be error-prone and unflexible
23:12 gitinfo Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
23:13 fracting joined #git
23:13 qsx miesco: we don’t know.  they might as well use VMS and we wouldn’t notice, but most likely it’s linux.  they wrote their own (complex) software to handle permissions
23:13 miesco qsx: Oh I see.  So on github, you would add collaborators, and they are the only ones who can push?
23:14 qsx miesco: i don’t know much about github.  you’d best consult their documentation and support.
23:14 Orphis joined #git
23:14 miesco qsx: What do you use?
23:14 miesco If you don't mind me asking.
23:15 qsx miesco: git.qsuscs.de simple openssh (i’m the only one there, so no need for permissions and stuff), and else gitlab and github.  but i’m far from being an expert, so …
23:15 catag87 joined #git
23:16 catag87 joined #git
23:17 fuchstronaut joined #git
23:17 Isla_de_Muerte joined #git
23:20 romerocesar joined #git
23:20 MattMaker joined #git
23:26 pioiytr joined #git
23:27 cqi joined #git
23:27 a3Dman joined #git
23:27 a3Dman joined #git
23:30 inflames joined #git
23:36 tristanp joined #git
23:37 david007 joined #git
23:37 david002 joined #git
23:41 Rodya_ joined #git
23:41 livingstn joined #git
23:42 miesco You can have a remote tracking branch for a local branch, which effects where `git pull` merges.  Is a remote branch also said to be 'tracking' a local branch if you have a local branch configured to merge into that remote branch on a 'git push'?
23:48 harrisi joined #git
23:54 mwhooker joined #git
23:54 Rodya_ joined #git
23:55 stantonk joined #git
23:55 Chiko joined #git
23:56 harrisi left #git
23:59 inflames joined #git

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