IRCloggy #git 2016-03-27

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2016-03-27

← p-l left00:00
← sssilver left00:00
→ sssilver joined00:01
← bcadren left00:01
← dan2k3k4 left00:02
→ diogenese joined00:02
← sssilver left00:03
→ s84 joined00:03
→ sssilver joined00:04
← s841 left00:05
← sssilver left00:07
→ sssilver joined00:07
→ mwhooker joined00:08
← mwhooker left00:08
← mkoskar left00:09
← sssilver left00:10
→ sssilver joined00:10
← KevinMGranger left00:11
→ duotang joined00:12
← elastix left00:12
→ MattMaker joined00:13
→ dsdeiz joined00:15
← dsdeiz left00:15
→ dsdeiz joined00:15
→ vervet joined00:15
→ kanzure joined00:16
← vervet left00:16
← tang^ left00:16
← dreiss left00:16
duotang → tang^00:17
← ochorocho__ left00:17
→ vervet joined00:17
← vervet left00:17
← SimonNaa left00:18
← LekeFly left00:18
← kanzure left00:18
→ kanzure joined00:18
→ vervet joined00:18
← grillo left00:18
→ bongjovi joined00:18
→ preyalone joined00:19
← roflincopter left00:20
← a_thakur left00:20
→ mkoskar joined00:20
← MattMaker left00:21
← vervet left00:23
← rom1504 left00:24
→ vervet joined00:24
→ Wetmelon joined00:25
← tsums left00:26
← mkoskar left00:27
→ sargas joined00:32
→ mkoskar joined00:33
→ raijin joined00:33
→ monoda joined00:34
← hightower2 left00:35
← mkoskar left00:37
→ mkoskar joined00:38
← rom15044 left00:38
→ Amichateur joined00:38
→ bronson joined00:39
← mikiones left00:41
← Amichateur left00:41
← mkoskar left00:42
← fracting left00:43
← bronson left00:43
→ dopesong joined00:43
→ mikiones joined00:43
← bongjovi left00:44
→ ascarter joined00:44
→ mkoskar joined00:45
→ eletuchy joined00:48
← raijin left00:48
← dopesong left00:49
← tehtraveler2321 left00:49
← sssilver left00:50
→ minibar joined00:50
minibar hello00:50
https://github.com/schovi/webpack-chrome-extension00:50
← sargas left00:51
← leeN left00:51
minibar I want to use this boilerplate and be able to merge future changes, but to squash all past commits00:51
is this possible?00:51
or won't I be able to merge anymore after I change the history?00:51
← user083 left00:52
← eletuchy left00:52
→ sangy joined00:53
osse you won't be able to merge00:53
but you will be able to cherry--pick00:53
→ a_thakur joined00:53
← rkazak left00:53
→ mwhooker joined00:54
minibar meh00:54
thanks, better than nothing I guess00:55
so I guess I should just copy the code and ignore the commits?00:55
→ lolmac joined00:55
osse the easiest thing to do is nothing00:56
→ sssilver joined00:56
← mattfoo left00:58
→ dreiss joined00:58
← fstd left00:59
Vampire0_ → Vampire000:59
→ Sasazuka joined01:00
Vampire0 Hey osse, do you have a quick hand for me? How do I specify a pattern to git so that ./build.xml and foo/build.xml is matched? If I do "-- build.xml" only the first is matched, if I do "-- **/build.xml" only the second is matched01:00
→ fstd joined01:00
← sssilver left01:01
osse Vampire0: do you quote the ** ?01:02
← afuentes left01:02
Vampire0 tried with and without01:02
→ sssilver joined01:02
Vampire0 no difference01:02
← Limes_ left01:02
osse afaik **/ should also match ./01:02
→ tomog999_ joined01:02
Vampire0 I thought so too01:03
But it doesnt01:03
→ Goplat joined01:03
← Goplat left01:03
→ Goplat joined01:03
← sssilver left01:03
Vampire0 At least not in 1.7.10.4 that is present on this linux machine01:04
← liamonade left01:04
→ mattfoo joined01:04
→ sssilver joined01:04
→ faux___ joined01:04
osse same here01:05
Vampire0 oh, ok, hm, strange01:05
← tomog999 left01:05
← sssilver left01:06
→ raijin joined01:06
osse i don't know then01:06
→ sssilver joined01:06
Vampire0 :-(01:06
→ mablae__ joined01:07
osse according to the docs at least ./**/build.xml should work01:08
→ daito joined01:08
osse but I find it doesn't01:08
Vampire0 hm, a bug then as it seems01:08
← kermit left01:09
← faux___ left01:09
← sssilver left01:09
← bq left01:10
→ sssilver joined01:10
← mablae_ left01:10
← tazle_ left01:11
← sssilver left01:11
← daito left01:13
→ ochorocho__ joined01:14
← fission6 left01:17
→ MattMaker joined01:18
osse i think i agree01:18
← Lyqyd left01:18
← ochorocho__ left01:18
← PasiFist left01:18
→ PasiFist joined01:18
← PasiFist left01:18
→ PasiFist joined01:18
← joki left01:19
→ fission6 joined01:19
← PasiFist left01:19
← sig left01:19
← jaafar left01:20
← vervet left01:21
← a_thakur left01:21
← Sasazuka left01:21
→ sssilver joined01:22
← Alistair left01:22
← sssilver left01:23
← titanium17 left01:23
← otho left01:24
→ jeffspeff joined01:24
→ sig joined01:24
→ PasiFist joined01:24
← diogenese left01:24
→ tazle_ joined01:25
← trewe left01:25
→ joki joined01:26
→ canoon joined01:26
jeffspeff i have a remote server with config files. i copied those config files to my machine via scp. i then created a repository in gitlab and uploaded the files from my local machine. i now want to be able to pull from that remote repository to the remote server. do i need to do a "git init" or a "git clone" ? the files are all the same in all 3 locations, the remote servers directory has not been set up as a git repo.01:26
← MattMaker left01:26
← diegoaguilar left01:28
→ otho joined01:28
→ diogenese joined01:29
← dsdeiz left01:29
rewt jeffspeff, i'd git clone it01:29
← sig left01:29
rewt jeffspeff, you could git init, set remote, etc, but much easier to just clone01:29
← tazle_ left01:30
← rpdprd left01:30
→ sig joined01:31
→ clemf joined01:31
→ Bruce_ joined01:31
← u404 left01:33
→ u404 joined01:33
→ SimonNa joined01:35
← u404 left01:35
← otho left01:35
← PasiFist left01:35
→ PasiFist joined01:35
→ arescorpio joined01:36
→ tazle_ joined01:37
→ kermit joined01:38
← raijin left01:38
→ sctskw joined01:39
→ diego1 joined01:39
← diego1 left01:41
→ diego1 joined01:41
diegoviola → Guest1899001:41
diego1 → diegoviola01:41
← bluezone left01:41
← canoon left01:41
← Bruce_ left01:42
← Guest18990 left01:43
← PasiFist left01:43
→ PasiFist joined01:43
← sig left01:43
→ sig joined01:43
← sig left01:43
← PasiFist left01:43
→ kfpratt joined01:44
TomyLobo clone in the end does nothing else anyway01:45
clone is just an init+remote add+pull01:45
with more options01:46
→ stormlrd joined01:47
← stormlrd left01:47
→ stormlrd joined01:47
← stormlrd left01:48
→ stormlrd joined01:48
← stormlrd left01:48
→ tristanp joined01:51
→ staticshock_ joined01:52
→ sig joined01:53
→ dsdeiz joined01:53
→ Vampire0_ joined01:53
← kfpratt left01:55
← staticshock_ left01:57
→ Bruce_ joined01:57
→ rubie joined01:57
← Vampire0 left01:57
← Sadeukko left01:58
← toogley1 left02:00
← pks left02:01
→ PasiFist joined02:01
← cmn left02:02
→ cmn joined02:02
→ realz joined02:04
→ pks_ joined02:05
→ diego1 joined02:05
← sig left02:05
← PasiFist left02:05
→ sig joined02:06
← diegoviola left02:08
→ daito joined02:09
→ faux___ joined02:09
← PityDaFool left02:09
← happy-dude left02:09
← sig left02:13
← daito left02:13
jeffspeff so, i'm trying to do a git pull on a linux server to pull from from my gitlab repository. gitlab tells me to use ssh so when i run 'git pull [email@hidden.address] it times out on me. i have generated a key pair on the server and added that pub key to my gitlab users key store. suggestions?02:15
→ ochorocho__ joined02:15
← Bruce_ left02:15
Peng Wat happens with "ssh [email@hidden.address] Possible with -v or -vv or -vvv or -vvvv02:16
What*02:16
← spriz left02:16
→ jasondockers joined02:17
jasondockers can I remove all commits besides the current one?02:17
rewt delete .git dir, git init, commit02:18
← ochorocho__ left02:19
→ patrick-sartent joined02:19
Peng There are other options. But that's the quick one, yeah.02:22
← Ahmed90 left02:22
jeffspeff Peng that doesn't do anything. git isn't an actual user on the system. like a fake user or something weird with the way gitlab configures itself02:22
Peng "doesn't do anything"?02:22
→ MattMaker joined02:23
→ eletuchy joined02:23
jeffspeff it sits there02:23
Peng Sounds firewall or network-issuey02:23
← TomyLobo left02:24
rewt you can't give `git pull` a url like that02:24
give it a remote repo name that you've set up as a remote repo02:24
hmm... maybe you can...02:25
← diego1 left02:25
→ diego1 joined02:25
rewt but that would need the protocol too02:25
diego1 → diegoviola02:25
→ spriz joined02:25
Vaelatern I want to rebase, and make no commit have an earlier date than a later one. The reason is the last commit on this list should be the very first one. https://github.com/voidlinux/void-packages/pull/390002:26
→ tsums joined02:26
← eletuchy left02:28
→ PasiFist joined02:29
→ sig joined02:29
← fedexo left02:31
← MattMaker left02:32
← PasiFist left02:32
jeffspeff Peng thanks, found the issue in my iptables. all works well now02:33
← kermit left02:34
→ jaequery joined02:35
← sig left02:36
← faux___ left02:36
← hexagoxel left02:37
← fission6 left02:37
→ hexagoxel joined02:39
→ sig joined02:39
→ PasiFist joined02:39
→ bronson joined02:41
← rubie left02:41
← PasiFist left02:42
← sig left02:42
→ kfpratt joined02:45
← bronson left02:45
→ faux___ joined02:47
← faux___ left02:47
→ faux___ joined02:47
→ sig joined02:48
← chachasmooth left02:49
→ PasiFist joined02:50
← yqt left02:50
→ chachasmooth joined02:52
← dsdeiz left02:53
→ Bruce_ joined02:53
→ canoon joined02:56
← Bruce_ left02:58
← PasiFist left03:01
← sig left03:01
→ AfroThundr joined03:02
→ PasiFist joined03:04
→ sig joined03:05
→ a_thakur joined03:07
→ Bruce_ joined03:07
→ sargas joined03:08
← kfpratt left03:13
→ brinck10 joined03:16
→ ochorocho__ joined03:16
→ ASDADFESD joined03:16
← a_thakur left03:16
← ASDADFESD left03:17
← lindenle left03:18
→ lindenle joined03:19
→ raijin joined03:19
← brinck10 left03:20
← ochorocho__ left03:21
← teknishun left03:21
→ sanketdg joined03:25
← lindenle left03:25
→ lindenle joined03:26
→ MattMaker joined03:28
← jaequery left03:29
← tsums left03:32
← lindenle left03:33
→ lindenle joined03:34
← sargas left03:35
← MattMaker left03:36
→ xcesariox joined03:37
← sig left03:37
← PasiFist left03:37
← garyserj left03:37
← mrkurtz left03:38
→ garyserj joined03:38
← bb010g left03:38
← italoacasas left03:40
→ mizu_no_oto joined03:42
← monoda left03:42
← mikiones left03:45
→ ffio joined03:45
← tristanp left03:45
→ PasiFist joined03:47
← PasiFist left03:48
→ monoda joined03:50
← m0viefreak left03:50
→ digidog_ joined03:52
← digidog_ left03:52
→ tristanp joined03:53
Caelum I just wrote a 102 line commit message03:53
→ staticshock_ joined03:53
Vaelatern Caelum: I hope it was worth it03:54
Caelum well, I spent like 3 weeks on this commit03:54
← realz left03:55
← digidog left03:55
Vaelatern Is it an insanely long commit?03:55
→ realz joined03:55
→ PasiFist joined03:55
→ sig joined03:55
Caelum yeah it's pretty big03:58
← staticshock_ left03:58
simon816 *writes 100 line commit for a one line change*03:59
← raijin left03:59
← sdothum left04:02
← PasiFist left04:02
← sig left04:02
→ sig joined04:04
← diegoviola left04:05
→ rubie joined04:07
→ raijin joined04:08
→ daito joined04:09
← sig left04:11
→ sig joined04:11
← faux___ left04:12
← daito left04:14
← sig left04:17
→ mehola joined04:19
→ sig joined04:20
→ PasiFist joined04:20
jasondockers the remote server is rejecting my push because it's about 8 MiB.04:21
phroa you can split a commit with an interactive rebase. see man git-rebase 's interactive section. you'd want the "edit" option04:23
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html04:23
← kerrick left04:23
jasondockers "efrror: RPC failed; result=56, HTTP code = 0"04:23
phroa, thanks04:23
phroa it has a section on splitting. good luck04:23
normally I would say "don't rebase history!" but it appears you didn't push it in the first place :)04:24
← Puffball left04:26
→ muthu joined04:27
← rubie left04:28
→ Puffball joined04:28
← muthu left04:28
← marienz left04:28
← PasiFist left04:29
→ PasiFist joined04:29
← dreiss left04:29
→ Corosauce joined04:29
→ muthu joined04:30
← muthu left04:30
→ duderonomy joined04:30
← PasiFist left04:31
← sig left04:31
→ brinck10 joined04:32
→ MattMaker joined04:33
← Corosus left04:33
← PryMar56 left04:33
← sangy left04:36
→ jaequery joined04:36
← brinck10 left04:36
→ arooni joined04:37
→ sig joined04:37
→ brinck10 joined04:37
← arooni left04:38
← boudicca left04:39
← sig left04:40
← cagedwisdom left04:41
← MattMaker left04:41
→ sig joined04:41
→ PasiFist joined04:41
→ boudicca joined04:41
→ bronson joined04:43
→ a_thakur joined04:43
← a_thakur left04:43
→ skylite_ joined04:44
← DistantStar left04:44
← PasiFist left04:45
← languitar left04:47
→ languitar joined04:47
← sig left04:47
← bronson left04:47
← skylite left04:47
← Cabanossi left04:48
→ Cabanossi joined04:50
→ DistantStar joined04:51
→ cagedwisdom joined04:53
→ Limes__ joined04:54
→ staticshock_ joined04:54
← mizu_no_oto left04:54
→ blackpajamas joined04:55
→ sig joined04:56
← sig left04:57
← staticshock_ left04:58
→ mizu_no_oto joined04:59
← duderonomy left04:59
→ sig joined05:03
← diogenese left05:03
← flaguy48 left05:04
← sig left05:05
→ duderonomy joined05:06
→ Alistair joined05:08
→ diogenese joined05:10
→ sig joined05:11
← blackpajamas left05:11
→ joufflu joined05:12
→ scott27 joined05:12
← ToBeCloud left05:14
→ Lauven joined05:15
← Aerosonic left05:17
← mizu_no_oto left05:18
→ PasiFist joined05:18
→ clemf_ joined05:18
← duderonomy left05:19
← clemf left05:19
→ cmosguy joined05:22
→ CharlieWONG joined05:22
→ bcadren joined05:23
← raven-au left05:23
← brinck10 left05:25
→ CharlieWongSuper joined05:25
→ bq joined05:26
→ cabargas joined05:27
← PasiFist left05:27
→ PasiFist joined05:27
← sig left05:27
→ sig joined05:27
← CharlieWONG left05:29
→ charlieWONG joined05:29
← banister left05:30
→ raven-au joined05:31
← charlieWONG left05:32
→ Sonicbit joined05:33
← ninsei left05:36
→ MattMaker joined05:38
→ charlieWONG joined05:39
→ RustyShackleford joined05:39
RustyShackleford I created a branch I really didn't need05:40
I want to merge back to master and then forget I ever created this branch05:40
← CharlieWongSuper left05:40
← scott27 left05:40
jpleau you said merge, did you really mean that word05:41
← joufflu left05:43
RustyShackleford I think so05:43
there are 8 commits I want in master now05:43
git checkout master05:44
git merge busapi05:44
→ rubyonrailed joined05:44
RustyShackleford when I delete the busapi branch is it completely gone from the commit history?05:44
← MattMaker left05:46
→ fahadash joined05:46
← arescorpio left05:46
← Bruce_ left05:48
jpleau if you merged it, and then deleted it, the commits are not gone from master05:48
← noteness left05:50
→ kerrick joined05:51
→ eletuchy joined05:51
→ Aerosonic joined05:51
→ Bruce_ joined05:56
→ fracting joined05:57
→ d4rklit3 joined05:57
→ titanium17 joined05:57
→ diegoviola joined05:58
RustyShackleford I also did a git branch -d busapi05:59
the branch is deleted, but commit history still shows the busapi branch06:00
← dermoth left06:00
→ dermoth joined06:00
← Alistair left06:01
→ blackpajamas joined06:01
→ mohabaks joined06:02
→ Alistair joined06:02
phroa RustyShackleford: perhaps you want to rebase busapi on top of master, to get a linear history?06:03
man git-rebase06:03
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html06:03
RustyShackleford well I need to learn about that too06:04
← rubyonrailed left06:04
RustyShackleford ideally i'd just hide the fact that there was ever a branch called busapi06:04
i did nothing related to the busapi06:04
→ CharlieWongSuper joined06:05
RustyShackleford those commits should appear only on the master branch06:05
→ rubie joined06:07
→ a_thakur joined06:07
← presto left06:08
→ phaleth joined06:09
← mohabaks left06:09
← AndroidVaan left06:10
→ daito joined06:10
→ a_thakur_ joined06:11
← bq left06:11
← rubie left06:11
← boombatower left06:12
← a_thakur left06:14
← daito left06:14
← clemf_ left06:15
→ Bruce___ joined06:16
→ noteness joined06:19
← d4rklit3 left06:20
← Bruce_ left06:20
→ drbean joined06:20
→ brinck10 joined06:21
→ d4rklit3 joined06:21
→ MattMaker joined06:24
→ rubie joined06:25
← rubie left06:25
← drbean left06:28
→ dreiss joined06:29
← jaequery left06:30
← Bruce___ left06:30
← eletuchy left06:34
← fscala left06:34
← CharlieWongSuper left06:34
→ eletuchy joined06:34
← diegoviola left06:34
← brinck10 left06:34
→ infra-red joined06:34
→ brinck10 joined06:35
→ fscala joined06:36
← charlieWONG left06:36
← titanium17 left06:37
← eletuchy left06:38
→ zapcode joined06:41
← tristanp left06:44
→ King_Hual joined06:44
→ jaequery joined06:45
→ bronson joined06:45
← cabargas left06:45
→ samy__ joined06:45
samy__ hello folks i was pushing the changes in my repo but when i did git push -u origin master i got this error https://gist.github.com/divyam3897/2d1b51e00b772f3b0d6906:47
← monoda left06:47
← bronson left06:50
→ radsy joined06:50
→ shinnya joined06:52
← a_thakur_ left06:52
→ subhojit777 joined06:52
→ LucaTM joined06:54
→ diegoviola joined06:54
← jaequery left06:55
→ staticshock_ joined06:55
← kadoban left06:57
→ jaequery joined06:57
← staticshock_ left06:59
jasondockers I'm trying to merge with a branch that has no history. Only a couple files are different but I'm gettingmerge conflicts on every files (100s). Is there anyway around this?07:00
→ monoda joined07:02
→ bq joined07:03
← sctskw left07:06
→ User458764 joined07:09
→ daito joined07:11
→ johnny56_ joined07:13
← dreiss left07:14
← nwf left07:15
← daito left07:15
← johnny56 left07:16
← zapcode left07:16
← rinwa left07:20
← diogenese left07:20
→ ochorocho__ joined07:21
← raven-au left07:22
← jaequery left07:23
milki whats a branch with no history?07:25
← ochorocho__ left07:25
→ rubie joined07:25
→ emPi joined07:27
→ ochorocho__ joined07:28
← [Brain] left07:30
← rubie left07:30
→ a_thakur joined07:30
← jagob left07:33
→ eletuchy joined07:35
← thiago left07:35
← subhojit777 left07:36
→ nadim joined07:37
← a_thakur left07:40
← eletuchy left07:40
→ diogenese joined07:41
← robbyoconnor left07:44
← ochorocho__ left07:44
→ tristanp joined07:45
← JanC left07:49
→ dopesong joined07:49
← tristanp left07:50
→ robbyoconnor joined07:51
→ hightower2 joined07:54
← dopesong left07:55
← King_Hual left07:55
→ King_Hual` joined07:55
→ a_thakur joined07:56
→ t0by joined08:02
← sig left08:02
← PasiFist left08:02
→ JanC joined08:04
← diegoviola left08:04
→ apotry joined08:08
← fracting left08:10
→ rinwa joined08:12
→ icebrain joined08:13
← icebrain left08:20
DuncanT Hi. Is there a doc, tutorial or similar to writing a git storage backend? I've been using git-mediawiki, but it only works under some circumstances, I'd like to rewrite how it works. I'd prefer to work from a tutorial than reverse engineer the perl08:21
← fahadash left08:21
← blackpajamas left08:22
← a_thakur left08:23
→ eolien joined08:24
← Chex left08:25
eolien → eoli3n08:29
→ a_thakur joined08:29
← gusnan left08:31
Seveas DuncanT: git-mediawiki isn't a storage backend (there isn't really more than one storage backend in git) but a remote helper. The relevant documentation is man gitremote-helpers08:31
gitinfo DuncanT: the gitremote-helpers manpage is available at http://jk.gs/gitremote-helpers.html08:31
← CheckDavid left08:31
DuncanT Seveas: Great, just wha tI was after by the looks of it. Thanks!08:33
→ gusnan joined08:33
← gusnan left08:33
→ gusnan joined08:33
← raijin left08:36
→ fracting joined08:36
→ dopesong joined08:38
← dopesong left08:40
← monoda left08:40
→ ochorocho__ joined08:41
→ stormlrd joined08:45
→ leeN joined08:45
← ochorocho__ left08:45
← stormlrd left08:45
→ stormlrd joined08:47
→ bronson joined08:47
→ simon8162 joined08:48
← a_thakur left08:49
← bronson left08:51
← simon816 left08:52
← Goplat left08:53
→ a_thakur joined08:53
← d4rklit3 left08:54
← canoon left08:56
→ staticshock_ joined08:56
→ d4rklit3 joined08:58
← Limes__ left09:00
→ italoacasas joined09:00
← staticshock_ left09:00
→ elastix joined09:00
← eoli3n left09:01
← italoacasas left09:01
← a_thakur left09:03
→ PasiFist joined09:04
← Alistair left09:05
→ sig joined09:06
→ eoli3n joined09:06
← sig left09:06
← PasiFist left09:06
→ wmeu joined09:07
→ Alistair joined09:07
← wmeu left09:08
→ daito joined09:12
← mrkake left09:13
→ PCatinean joined09:13
← samy__ left09:14
→ mrkake joined09:15
→ Borkr joined09:15
← daito left09:16
← User458764 left09:16
← catsup left09:17
→ catsup joined09:17
← Meow-J left09:18
→ SteffanW joined09:18
← mwhooker left09:18
← catsup left09:18
← radsy left09:19
← eoli3n left09:20
→ dadada joined09:24
→ mischat joined09:24
dadada hello09:24
→ vdv joined09:25
dadada is there a tool for viewing remote git repositories (without downloading them first), and I don't mean a webview09:25
→ jqp joined09:25
← jqp left09:26
← mostlybadfly left09:27
← d4rklit3 left09:29
← brinck10 left09:29
→ brinck10 joined09:29
← brinck10 left09:29
→ absk007 joined09:30
→ nuge joined09:30
← absk007 left09:30
→ absk007 joined09:31
← absk007 left09:32
→ absk007 joined09:32
→ subhojit777 joined09:36
→ xplaxx joined09:36
← lindenle left09:38
→ eletuchy joined09:38
← hightower2 left09:38
→ dimi1947 joined09:39
← eletuchy left09:42
→ ochorocho__ joined09:43
→ dan2k3k4 joined09:43
← stormlrd left09:45
→ elsevero joined09:46
← infernix left09:48
← ochorocho__ left09:48
→ tristanp joined09:48
Fissure dadada: git ls-remote?09:49
← Terens left09:50
→ Terens joined09:50
← cbreak left09:50
→ User458764 joined09:51
dadada Fissure: I was thinking about a GUI09:52
← tristanp left09:52
→ brinck10 joined09:53
→ fdsa_ joined09:53
Fissure so a web view? :)09:53
there's no network protocol to fetch individual objects, so whatever's looking at the data has to have it all locally09:54
→ a_thakur joined09:55
← Synthead left09:55
→ pantsman_ joined09:55
← pantsman_ left09:56
→ infernix joined09:56
← infernix left09:56
→ infernix joined09:56
← mischat left09:57
← jeffmjack left09:57
← Wetmelon left09:59
→ nyrcg joined10:02
→ daito joined10:03
→ cbreak joined10:04
← metastableB left10:06
→ th0m_ joined10:07
← daito left10:08
← xcesariox left10:08
→ tayfun joined10:08
→ daito joined10:09
→ Synthead joined10:09
→ p-l joined10:10
← Silex left10:12
← daito left10:13
→ yuklair joined10:16
yuklair I outline my question in this post: http://stackoverflow.com/questions/36246192/automatic-merging-from-git-pull10:16
I appreciate any help.10:16
← nyrcg left10:17
→ banana_pancakes joined10:19
← phaleth left10:20
→ phaleth joined10:20
← coredumb left10:21
← User458764 left10:22
→ nitin_ joined10:22
← ffio left10:25
← vdv left10:25
← FuzzySockets left10:26
← mehola left10:26
→ ffio joined10:28
← brinck10 left10:30
→ bongjovi joined10:31
← absk007 left10:32
← a_thakur left10:32
→ absk007 joined10:33
→ ahr3n joined10:33
← nitin_ left10:35
← banana_pancakes left10:37
← tayfun left10:37
→ lindenle joined10:38
← yuklair left10:38
→ Kicer86 joined10:40
← lindenle left10:43
← Borkr left10:43
→ User458764 joined10:43
→ catsup joined10:43
← diogenese left10:43
← MattMaker left10:45
→ MattMaker joined10:46
→ roflin joined10:46
← dimi1947 left10:47
← ahr3n left10:47
← kerrick left10:48
← xplaxx left10:48
→ bronson joined10:49
→ PCatinean_ joined10:50
← Lauven left10:50
→ Lauven joined10:50
← PCatinean left10:52
← SteffanW left10:52
← bronson left10:54
→ Balliad joined10:54
← MattMaker left10:55
→ staticshock_ joined10:56
← th0m_ left10:57
→ rinwa_ joined11:01
→ xplaxx joined11:01
← staticshock_ left11:01
← dan2k3k4 left11:02
← rinwa left11:05
→ ochorocho__ joined11:06
→ nitin_ joined11:07
← elsevero left11:08
pks_ → pks11:08
→ okovko joined11:13
← Lauven left11:15
→ AndroidVaan joined11:15
← bcadren left11:16
← infra-red left11:22
← fracting left11:25
→ davisonio joined11:26
→ TomyLobo joined11:27
← nitin_ left11:27
→ branscha joined11:27
← User458764 left11:28
→ User458764 joined11:29
→ Sendoushi joined11:31
← leeN left11:32
→ annoymouse joined11:33
→ mostlybadfly joined11:39
→ DarkSpectrum joined11:39
← Sendoushi left11:41
→ Sendoushi joined11:41
← Sendoushi left11:43
→ Sendoushi joined11:43
← hyperdri- left11:43
→ hardenedapple joined11:47
→ hyperdrive joined11:47
→ Lunatrius` joined11:48
→ tristanp joined11:49
→ MattMaker joined11:51
← bq left11:51
← User458764 left11:52
← Lunatrius left11:52
Lunatrius` → Lunatrius11:52
← branscha left11:52
← Sendoushi left11:53
→ Sendoushi joined11:53
← tristanp left11:54
← DarkSpectrum left11:54
→ peterz joined11:56
→ Musok joined11:57
→ Lauven joined11:57
← Sendoushi left11:57
← fstd left11:59
← nuge left11:59
→ fstd joined11:59
→ vdv joined12:00
← MattMaker left12:00
→ wrouesnel joined12:05
← simon8162 left12:05
→ toogley joined12:06
→ eletuchy joined12:06
← SimonNa left12:06
→ mwhooker joined12:07
→ HyP3r joined12:07
HyP3r hey all, sometimes git is a bit too complicated for me: I cloned a repository from the internet (v1) and changed something a bit, but my fried changed some files and did some commit (v2, v3). Now when I do "git pull" I get the message that I have to commit or stash the work, thats okay but in my case I want to "loose" my local work. I dont want to commit it12:09
→ daito joined12:09
← toogley left12:10
← TomyLobo left12:11
← eletuchy left12:11
← mwhooker left12:12
grawity throw it away using `git checkout -f` or `git reset --hard`12:12
either works12:12
HyP3r ah okay, I'll try it12:12
grawity assuming you meant "lose"12:12
HyP3r yes lose not loose :S12:13
← amdi_ left12:13
→ mwhooker joined12:13
← njbair left12:13
← daito left12:13
→ njbair joined12:23
→ infra-red joined12:23
→ sdothum joined12:26
← Musok left12:26
← xelxebar left12:26
← p-l left12:27
→ Noldorin joined12:27
← infra-red left12:28
← Balliad left12:28
→ denimsoft joined12:30
JyZyXEL does anyone have a good Git book for Kindle?12:32
← denimsoft left12:32
← Lunatrius left12:34
→ nicoulaj joined12:34
← vdv left12:34
→ Lunatrius joined12:35
→ nicoulaj_ joined12:35
← nicoulaj_ left12:35
← nicoulaj left12:35
→ vdv joined12:35
← vdv left12:36
→ nicoulaj joined12:37
→ toogley joined12:38
→ xelxebar joined12:39
→ Discovery joined12:42
→ IlNominePatre joined12:42
→ mischat joined12:42
← davisonio left12:42
→ SteffanW joined12:42
→ Limes__ joined12:42
→ bq joined12:43
→ raven-au joined12:44
← lolmac left12:46
→ eletuchy joined12:47
→ artemisart joined12:48
← mischat left12:48
→ Borkr joined12:49
← raven-au left12:49
→ Sendoushi joined12:50
→ bronson joined12:51
→ lolmac joined12:51
← Noldorin left12:52
← eletuchy left12:53
→ rinwa__ joined12:55
← netj left12:55
← bronson left12:56
→ netj joined12:56
→ MattMaker joined12:56
→ jay-m joined12:56
← sdothum left12:57
→ staticshock_ joined12:57
→ sdothum joined12:58
← rinwa_ left12:58
→ al-caveman joined12:59
→ raven-au joined12:59
← t0by left12:59
al-caveman guys help. how can i git pull on my windows machine if there are files with colon on them?12:59
→ dopesong joined12:59
qsx JyZyXEL: !book13:00
gitinfo JyZyXEL: There are several good books available about git; 'Pro Git' is probably the best: http://git-scm.com/book but also look at !bottomup !cs !gcs !designers !gitt !vcbe and !parable13:00
→ Noldorin joined13:01
JyZyXEL ahhh, "Download ebook" was right in front of me the whole time :D13:01
→ brinck10 joined13:01
← raven-au left13:01
→ raven-au joined13:02
← staticshock_ left13:02
← subhojit777 left13:02
← raven-au left13:03
← dopesong left13:03
← brinck10 left13:04
← MattMaker left13:04
← McNozes left13:05
→ raven-au joined13:05
→ mikiones joined13:07
← al-caveman left13:08
← odigem left13:08
→ LiamGoodacre joined13:09
→ fission6 joined13:10
→ al-caveman joined13:11
→ elsevero joined13:11
→ vervet joined13:14
→ scott27_ joined13:15
← scott27_ left13:18
→ rubie joined13:18
← relipse2 left13:18
← xelxebar_ left13:21
← rubie left13:23
→ infra-red joined13:24
← LiamGoodacre left13:24
→ davisonio joined13:26
→ lindenle joined13:30
→ Jackneill joined13:30
← infra-red left13:30
← Limes__ left13:39
→ a_thakur joined13:43
→ McNozes joined13:44
← rinwa__ left13:45
← nadim left13:46
← SteffanW left13:46
← wrouesnel left13:47
→ eletuchy joined13:48
→ nadim joined13:48
→ CheckDavid joined13:49
→ simon8162 joined13:50
→ tristanp joined13:51
→ nilsi joined13:51
→ emak joined13:52
← eletuchy left13:53
← elsevero left13:53
← Lunatrius left13:54
→ autrilla joined13:54
→ Lunatrius joined13:54
autrilla I have "docker-compose-live.yml merge=ours" in my .gitattributes, yet when I merged from another branch that deleted that file, that file was deleted in my branch too13:54
← raven-au left13:55
← tristanp left13:56
gitinfo set mode: +v13:56
→ User458764 joined13:56
→ raven-au joined13:56
emak Hey, it may be a silly question but as I never used git but I am sure there's a solution I try to formulate a comprehensive question :) How can I sync a file from a repo to a local file with a predefined name so I can automatically update it when using a git command?13:56
→ BigBoss joined13:57
BigBoss → Guest7342913:57
← dadada left13:58
→ mariuscc joined13:58
j416 emak: the question was not really comprehensive; what is your use-case?13:58
→ Balliad joined14:00
→ MattMaker joined14:01
→ LBV_User joined14:01
emak j416: I found a script which is very useful for me but the git author has also a lot of other scripts I don't need in his repo. Can I just syncronize this one file to a predefined folder (where I use to have my personal scripts)?14:01
j416 emak: not without scripting something to do that.14:01
emak: hang on, writing something up14:02
emak j416: cool, waiting, no worries :)14:03
← cagedwisdom left14:04
← Balliad left14:04
← jay-m left14:06
← mariuscc left14:06
← Guest73429 left14:07
→ Jesson_BO joined14:07
← hardenedapple left14:08
unreal_ → unreal14:08
j416 emak: git archive --remote=url/to/repo master path/to/script.sh -o output.sh14:08
emak: where master is the name of the remote branch14:08
emak: sorry, I never use that command, took a bit to figure out14:08
emak: fwiw I don't think github supports the above, if the remote is at github.14:09
→ weox joined14:09
j416 emak: (is it github?)14:09
← MattMaker left14:09
emak j416: yes it is github and tells me "fatal: Operation not supported py protocol."14:10
j416: in fact it is following path (hopefully I can send a link in here): https://github.com/seblu/archutils/blob/master/checkservices14:10
j416 emak: then just curl it?14:10
→ daito joined14:10
emak j416: oh... *blushing* yes that sounds like a too close alternative to have thought about...14:11
→ th0m_ joined14:11
j416 emak: curl -sq <url> -o output14:11
← Sendoushi left14:11
→ Sendoushi joined14:11
→ Meow-J joined14:11
j416 emak: curl -sq https://raw.githubusercontent.com/seblu/archutils/master/checkservices -o check.bash && chmod +x check.bash14:12
maybe14:12
emak j416: yeah - also wget works. thx a lot! adding that as an alias so it will always be updated before I use it. cool and thx again!14:13
→ titanium17 joined14:13
j416 :)14:13
→ SteffanW joined14:13
j416 emak: also, don't blindly do that14:13
emak: unless you completely trust that guy, github, and any attacker inbetween.14:14
← Jesson_BO left14:14
← daito left14:15
emak j416: well the guy is trustful, it's one of the accepted arch devs. but yes of course it could be a mitm. well then going to do an update script which checks if there's an difference in the local and remote file and shows me the diffs to accept. that should work and make me check first.14:15
→ elsevero joined14:15
j416 emak: or, you could download the whole repo to some place; then at least you've a hash to verify against14:17
emak j416: no, that's what I wanted to avoid. I am just interested in this particular script.14:17
j416 emak: it's what I'd do, anyway.14:18
emak: then I'd either use the script from there (add it to path), or I'd symlink it into something that's on my path14:18
emak: because then you know exactly what version you are on if you ever need to figure out an error, plus you're not randomly curling an url14:19
emak: plus, an update would just be a 'git pull' away14:19
emak: and, you get the changelog for the script. :)14:20
→ jay-m joined14:20
emak j416: lol - jajaja that's the pro version. But for me the beginner one is sufficient: I have a local version of the script. If I run another script which checks if the local file and the remote file differs (vim -d) I can examine the changes and obtain it to local file if I want to before I run it. Would be quite okay as well and avoids me to use all the git commands unless I have no further use for it14:21
← Sendoushi left14:22
j416 emak: how would that script determine what the remote version is?14:22
→ Sendoushi joined14:22
j416 emak: and, what if there were multiple versions?14:22
emak: you are basically reinventing git. :)14:22
emak: but, whatever you prefer..14:23
→ p-l joined14:23
→ dreiss joined14:24
j416 emak: besides, you want to learn git, and you need git. you just don't know it yet. :D14:25
emak j416: well I use the raw file link and compare my local script against this one. If it has differences they will be shown to me and that is sufficient to me. Not at all full git functionality - I am by far no programmer so don't worry to need to switch soon ;)14:25
→ youser joined14:25
emak j416: I may not be strong in git yes, but one thing at a time. Already happy having tried IRC and found somebody showing several ways to achieve the goals ;)14:26
j416 heh14:26
alright14:26
→ infra-red joined14:26
→ rpdprd joined14:28
→ dling` joined14:28
← toogley left14:29
→ LiamGoodacre joined14:30
← infra-red left14:30
→ dan2k3k4 joined14:31
→ rivarun joined14:32
← ariel_17 left14:32
→ t0by joined14:33
→ rubie joined14:34
→ toogley joined14:34
← bq left14:37
→ r0ry joined14:37
← rubie left14:38
→ rubie joined14:39
← rubie left14:39
→ rubie joined14:41
← a_thakur left14:42
→ BigBoss joined14:44
BigBoss → Guest2692114:44
→ mischat joined14:45
← rubie left14:46
← robbyoconnor left14:47
→ Jesson_BO joined14:47
→ eletuchy joined14:47
→ robbyoconnor joined14:47
→ rubie joined14:48
→ scott27_ joined14:48
← Guest26921 left14:49
scott27_ → scott2714:49
← mischat left14:49
← scott27 left14:50
← Nouv left14:51
→ Nouv joined14:52
← eletuchy left14:52
emak part #git14:52
← emak left14:52
← rubie left14:52
← vervet left14:53
→ bronson joined14:53
→ reim joined14:54
→ rubie joined14:55
← t0by left14:55
→ raijin joined14:56
← Sendoushi left14:58
← bronson left14:58
→ staticshock_ joined14:58
→ Sendoushi joined14:58
Nouv I think this is a bash script problem, but I get a strange error when trying to use a post-receive hook: https://gist.github.com/cmcarey/9cb8351a769ff4976a1c14:59
← flyx left15:00
Nouv Any advice on why my script isn't working would be great15:01
← fscala left15:01
→ brinck10 joined15:02
→ fscala joined15:02
→ Bruce_ joined15:02
j416 Nouv: your paths are off15:02
Nouv j416: It should be cd ../ instead of cd ../.. right?15:02
← staticshock_ left15:02
← dan2k3k4 left15:02
j416 tias15:03
Nouv: you could readlink -f instead of cd and pwd15:04
→ BigBoss_ joined15:04
→ yann|work joined15:04
j416 Nouv: hm nevermind, seems that's not cross-os15:04
← artemisart left15:04
Nouv j416: Yeah it was a path error, fixed it now, thanks!15:05
j416 o/15:05
→ MattMaker joined15:06
→ a_thakur joined15:06
← Jesson_BO left15:07
← Bruce_ left15:07
← jay-m left15:10
← Sendoushi left15:10
→ Sendoushi joined15:10
→ Balliad joined15:11
→ muthu joined15:12
→ d0lph1n98 joined15:13
← MattMaker left15:14
← xplaxx left15:15
← Balliad left15:15
→ mahmoud joined15:16
→ infra-red joined15:17
← al-caveman left15:19
← a_thakur left15:19
← Sendoushi left15:19
← fission6 left15:19
← BigBoss_ left15:21
← PCatinean_ left15:21
← Anderson69s_Deb left15:22
Vampire0_ → Vampire015:22
→ Anderson69s_Deb joined15:23
→ zarel joined15:23
→ Jesson_BO joined15:24
→ digidog joined15:26
← cmosguy left15:26
← bongjovi left15:27
← d0lph1n98 left15:27
→ bongjovi joined15:29
← AndroidVaan left15:30
→ mizu_no_oto joined15:31
← simon8162 left15:32
→ xplaxx joined15:32
→ simon816 joined15:33
→ awasum joined15:33
← mahmoud left15:34
→ staticshock_ joined15:34
← nilsi left15:34
← dreiss left15:35
→ cmosguy joined15:35
← garyserj left15:36
← awasum left15:36
→ garyserj joined15:37
→ italoacasas joined15:38
→ a_thakur joined15:38
→ xcesariox joined15:38
← mizu_no_oto left15:39
→ mizu_no_oto joined15:39
→ Sendoushi joined15:40
← User458764 left15:40
→ Aboba joined15:40
→ rkazak joined15:41
→ binni_ joined15:42
→ diogenese joined15:42
← mizu_no_oto left15:43
← xlegoman left15:44
← qhp left15:45
→ mischat joined15:46
→ PryMar56 joined15:46
→ dan2k3k4 joined15:48
← reim left15:48
→ reim joined15:48
→ dreiss joined15:49
→ cdg joined15:49
→ User458764 joined15:49
← rkazak left15:50
← bongjovi left15:50
→ clemf joined15:51
← mischat left15:51
→ bongjovi joined15:53
→ flaguy48 joined15:53
→ infra-re_ joined15:55
← Aboba left15:57
← rpdprd left15:58
→ Ahmed90 joined15:59
← infra-red left15:59
→ Gamecubic joined15:59
← dan2k3k4 left15:59
→ dan2k3k4 joined16:01
→ artemisart joined16:01
← preyalone left16:03
← staticshock_ left16:04
← Borkr left16:05
← netj left16:05
→ netj joined16:06
← garyserj left16:06
→ garyserj joined16:06
→ _nadim joined16:07
← nadim left16:07
→ Lyqyd joined16:07
← D-Boy left16:10
→ daito joined16:11
→ MattMaker joined16:11
← d0nn1e left16:11
← peterz left16:12
→ d0nn1e joined16:12
→ staticshock_ joined16:13
← zarel left16:14
→ sangy joined16:14
← _chrispop_ left16:15
← daito left16:15
← xcesariox left16:17
→ mdw joined16:18
→ zarel joined16:18
← zarel left16:19
← User458764 left16:19
→ User458764 joined16:19
← MattMaker left16:20
→ D-Boy joined16:20
← a_thakur left16:20
← infra-re_ left16:21
→ kfoonamalik joined16:22
← ascarter left16:22
← _nadim left16:22
→ WaReZ joined16:23
→ _nadim joined16:23
← Jesson_BO left16:23
← shinnya left16:25
→ Jesson_BO joined16:26
← WaReZ left16:26
→ ascarter joined16:26
← Jesson_BO left16:27
→ Bruce_ joined16:27
← diogenese left16:29
→ thiago joined16:30
← thiago left16:30
→ thiago joined16:30
← cdg left16:30
← p-l left16:31
→ dopesong joined16:31
← dopesong left16:35
→ dopesong joined16:35
← chandlerbing left16:35
→ chandlerbing joined16:35
← artemisart left16:38
→ diogenese joined16:39
← User458764 left16:41
→ User458764 joined16:41
← User458764 left16:41
← doppo left16:42
→ User458764 joined16:42
→ doppo joined16:42
dilfridge → ^O^16:42
^O^ → dilfridge16:43
→ shiriru joined16:43
→ mohabaks joined16:44
← chandlerbing left16:45
→ chandlerbing joined16:45
→ ranguli joined16:46
→ mischat joined16:46
→ m0viefreak joined16:49
→ Jession_BO joined16:50
← mischat left16:51
← User458764 left16:52
← dan2k3k4 left16:52
← thiago left16:53
→ thiago joined16:53
→ safe joined16:53
→ bronson joined16:55
→ presto joined16:56
→ jaequery joined16:56
← dreiss left16:56
→ nwf joined16:57
← fearedbliss left16:58
← bronson left17:00
→ doener joined17:03
→ CharlieWONG joined17:03
← Bruce_ left17:05
→ mellernoia joined17:07
← Aerosonic left17:07
← justanotheruser left17:07
→ Bruce_ joined17:08
← mohabaks left17:08
← annoymouse left17:08
→ jagob joined17:10
→ tristanp_ joined17:10
← hashpuppy left17:11
← IlNominePatre left17:12
→ dreiss joined17:12
← Discovery left17:13
← jaequery left17:15
→ Limes__ joined17:15
→ subhojit777 joined17:16
→ MattMaker joined17:16
→ bq joined17:16
→ CharlieWongSuper joined17:18
← al-damiri left17:19
→ diegoaguilar joined17:19
← CharlieWongSuper left17:21
← CharlieWONG left17:22
→ Goplat joined17:22
← Jession_BO left17:22
← MattMaker left17:24
← reim left17:28
→ reim joined17:28
← brinck10 left17:29
→ brinck10 joined17:30
→ mehola joined17:31
→ xcesariox joined17:31
→ User458764 joined17:33
→ s841 joined17:33
→ JSharpe joined17:33
← s84 left17:34
→ kadoban joined17:35
← mehola left17:36
← boudicca left17:41
← m0viefreak left17:41
→ boudicca joined17:42
→ monoda joined17:44
→ boudiccas joined17:47
→ mischat joined17:47
→ UTAN_dev joined17:47
← boudicca left17:48
← smithbone_ left17:48
→ ToBeCloud joined17:49
gitinfo set mode: +v17:49
← UTAN_dev_ left17:50
→ mohabaks joined17:52
← mischat left17:52
← Sendoushi left17:53
→ fission6 joined17:55
→ cdg joined17:56
← Bruce_ left17:58
← dreiss left17:58
← italoacasas left17:59
→ Bruce_ joined17:59
→ italoacasas joined18:01
→ nitin joined18:01
→ tildes joined18:02
→ kerrick joined18:03
← cdg left18:03
→ samw joined18:05
→ Dyonisos joined18:06
→ cagedwisdom joined18:06
→ netcarver joined18:07
→ kfoonama1ik joined18:10
→ zso joined18:11
→ daito joined18:12
← nitin left18:12
→ PEMapModder_ joined18:13
← kfoonama1ik left18:13
PEMapModder → PEMapModder|18:13
PEMapModder_ → PEMapModder18:14
→ nitin joined18:14
← subhojit777 left18:14
→ rolha joined18:15
← daito left18:16
← User458764 left18:18
← Bruce_ left18:18
← tildes left18:19
← digidog left18:19
→ MattMaker joined18:21
→ Bruce_ joined18:23
→ Rythorn joined18:23
← shiriru left18:25
→ Borkr joined18:26
← bq left18:27
← ascarter left18:28
→ dreiss joined18:28
← MattMaker left18:29
← Bruce_ left18:33
← mohabaks left18:34
→ User458764 joined18:34
← Nugget left18:35
← tristanp_ left18:36
→ Nugget joined18:36
← garyserj left18:36
→ tristanp joined18:36
→ garyserj joined18:36
→ liamonade joined18:37
← rxc left18:39
← mdw left18:41
→ Wetmelon joined18:42
→ cyphase joined18:43
→ Bruce_ joined18:43
→ Tryop88 joined18:44
← nitin left18:44
← lolmac left18:46
← moei left18:46
→ mohabaks joined18:47
→ mischat joined18:48
← PEMapModder left18:48
→ overyander joined18:49
→ FuzzySockets joined18:50
← jeffspeff left18:51
← Ragnor left18:52
← mischat left18:52
← davisonio left18:54
← diegoaguilar left18:55
→ lolmac joined18:55
← zso left18:56
← clemf left18:56
← diogenese left18:57
→ icio joined18:57
→ bronson joined18:57
→ davisonio joined18:57
→ mdw joined18:57
← multi_io left18:57
→ vdv joined18:58
← brinck10 left18:59
← mdw left18:59
→ zso joined18:59
→ multi_io joined18:59
→ YouCallItFar joined19:00
→ Ragnor joined19:00
→ mdw joined19:00
YouCallItFar arg. git driving me mad.19:00
im testing various different submodules of same name. so ill submodule add one persins libjpeg-turbo. when it doesnt build, ill git rm -rf it. and gitsubmodule add another libjpeg-turbo. however this totally confuses git19:01
at first after readding the 2nd submodule git remote -v shows the old remote. so i git submodule sync. git checkout master. git pull19:01
but this is giving me a huge conflict19:01
last time happened i just had to rm -rf and start a new tree19:01
this time i woul really prefer not to lose my changes19:02
can canyone help?19:02
← liamonade left19:02
YouCallItFar i love a lot about github, but git itself is far more buggy than alternatives19:02
→ kfoonama1ik joined19:02
← bronson left19:02
← rolha left19:03
← kfoonama1ik left19:03
← icio left19:05
← davisonio left19:06
→ yqt joined19:07
← zso left19:08
→ rxc joined19:08
← rxc left19:08
→ rxc joined19:08
← th0m_ left19:10
← Guest98085 left19:12
YouCallItFar just got it. (without losing my changes) woo! that was lucky.19:14
← blahdodo left19:14
← SteffanW left19:15
→ blahdodo joined19:16
← kfoonamalik left19:18
→ nilg joined19:18
→ kfoonamalik joined19:19
← dreiss left19:20
← kfoonamalik left19:20
← GnuYawk left19:20
→ user083 joined19:21
user083 How can i read from a Socket without blocking my program?19:22
← netcarver left19:22
cbreak user083: boost::asio19:22
← nicoulaj left19:23
← Joel left19:23
user083 cbreak, but that is a C++ library19:23
cbreak user083: yes, isn't it great? :)19:23
user083 no19:23
cbreak saves you a ton of hassle as opposed to the normal kqueue (os x)19:24
or io completion (windows)19:24
or poll (posix)19:24
or epoll (linux)19:24
→ Silex joined19:24
grawity if you don't want a C++ library19:24
user083 sorry wrong programming channel19:24
grawity perhaps you should specify which language you *do* want19:24
user083 I am using Ada19:24
the two chat tabs are side by side19:25
→ fedexo joined19:25
→ MattMaker joined19:26
← rivarun left19:26
← Silex left19:26
→ zsolt joined19:27
→ kejoma joined19:28
→ HelloShitty joined19:30
→ rivarun joined19:30
← Tryop88 left19:32
→ kfpratt joined19:32
→ tsr_dev joined19:33
← MattMaker left19:34
← mohabaks left19:36
← Borkr left19:37
← rivarun left19:38
← presto left19:38
→ rivarun joined19:38
→ rain1 joined19:40
rain1 hello19:40
I edited a file and did not git commit19:40
how do I reset?19:40
← raijin left19:41
→ GnuYawk joined19:41
→ raijin joined19:41
← sanketdg left19:42
← HelloShitty left19:43
→ HelloAtMega joined19:44
→ st0opkid joined19:44
deepy why can't I do a git rebase -i HEAD~3 if I got 3 commits? it tells me Needed a single revision. invalid upstream HEAD19:46
~319:46
← rivarun left19:46
tobiasvl rain1: you mean you want to discard the uncommited changes?19:46
→ siaw joined19:47
rain1 yeah19:47
deepy okay nevermind. found --root19:47
→ Aboba joined19:47
siaw i cloned a repo to my desktop, made some change. made a pull request. it appears i have to remove some things i added in my pull request. how do i do this? considering i have deleted the fork of the repo i made?19:48
← Aboba left19:48
tobiasvl rain1: depends on whether or not you have staged the changes. I would just get into the habit of using "git stash" and then "git stash drop" if you find out you want them all gone19:49
→ mischat joined19:49
tobiasvl rain1: but if you have not changed: git checkout .19:49
← phaleth left19:49
tobiasvl if you have not STAGED19:49
rain1 thanks a lot!19:49
tobiasvl rain1: if you have staged (or even if you have not): git reset --hard HEAD19:49
→ cyan__ joined19:52
← mellernoia left19:53
→ rivarun joined19:54
← mischat left19:54
→ Silex joined19:54
→ circ-user-R9Fhl joined19:54
← Silex left19:55
→ mohabaks joined19:55
→ grillo joined19:56
← mwhooker left19:56
← rubie left19:56
→ daito joined19:58
→ rubie joined19:58
→ kloeri joined19:59
← kejoma left19:59
→ clemf joined19:59
← circ-user-R9Fhl left19:59
→ jaafar joined19:59
← fedexo left20:00
→ AndroidVaan joined20:02
← AndroidVaan left20:02
← daito left20:03
→ denimsoft joined20:03
← elsevero left20:03
→ s84 joined20:03
← s841 left20:04
← xplaxx left20:04
→ jay-m joined20:06
→ t4nk246 joined20:07
← t4nk246 left20:08
→ daito joined20:08
← ffio left20:10
← jay-m left20:11
BustyLoliChan okay20:12
← xcesariox left20:12
→ elsevero joined20:12
BustyLoliChan no one in my group knows how to use git20:12
← Dyonisos left20:12
BustyLoliChan we started our project... as 5 separate branches basically trying to build 5 features that actually depend on each other in some way20:12
and now we are trying to merge these branches all back together20:12
← staticshock_ left20:13
BustyLoliChan but what's worse.... is that everyone is trying to e-mail everyone else their files instead of actually using git.... so it's like they can copy and paste all the source code and crap20:13
but I feel like that's going to cause some terrible horrible problems when everyone finally goes to merge20:13
← daito left20:14
BustyLoliChan what is the best way at this point... all 5 branches unsynchronized included... to get everyone back on the same page...20:14
one that makes it easy for everyone to do their work, while also not causing huge merge conflicts20:15
→ smithbone joined20:15
← youser left20:15
← mohabaks left20:15
→ Balliad joined20:16
→ rhombus joined20:18
← kfpratt left20:20
← Bruce_ left20:20
→ peterz joined20:21
← Alistair left20:22
jpleau BustyLoliChan: what I'd do (and what I did before); have them push their branches separately, you pull them and do the merge. Then take some time and run them through the basics of git (this is the hard part, if they don't care =/)20:22
← Balliad left20:23
→ Alistair joined20:24
BustyLoliChan The worst part is... the guy who thinks he is in charge knows next to nothing20:24
I seriously hold it as his fault that this happened to begin with20:24
← yann|work left20:25
bremner well, we could ban him from the channel, but that's about it ;)20:25
→ roelmonnens joined20:26
→ p-l joined20:27
← monoda left20:27
autrilla How can I exclude files from merges permanently? For instance, I don't want my dev branch's deployment configuration merged into my staging configuration20:28
bremner !config20:30
gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas20:30
bremner autrilla: ^20:30
← overyander left20:30
deepy Can I search for a specific phrase through all commits?20:30
← GnuYawk left20:31
← LBV_User left20:31
deepy I think I removed all traces of it from the history, but I gotta make sure no snippets remain20:31
→ MattMaker joined20:31
Seveas do you mean commit messages or the contents of the files?20:31
autrilla deepy: grep git log?20:31
oh, yeah, what Seveas said :)20:32
deepy content of the files20:32
Seveas deepy: git log -S phrase20:32
← rivarun left20:32
deepy cheers20:32
pheew, all is gone. I can release the source now. woo20:32
Seveas throw in an --all to be sure20:33
autrilla bremner: I don't see a way to do what I want nicely there20:33
bremner autrilla: right. What you want is not "nice" from git's point of view20:34
Seveas autrilla: that's because you shouldn't want that. Don't put configfiles in git.20:34
autrilla Is a docker-compose file a config file? I don't think so20:34
→ brinck10 joined20:34
→ blackpajamas joined20:34
→ rivarun joined20:35
autrilla Seveas: and sometimes you *must* put them in git. .travis.yml, for example, travis expects that file to be in the repo20:35
Seveas bad example, as local changes to that file make no sense. It's only used by travis.20:36
← brandonw left20:36
autrilla Seveas: local changes? I have a master branch, a staging branch and a development branch. I don't want my changes to travis.yml in my staging branch to be merged over to master20:37
→ brandonw joined20:37
→ jeffspeff joined20:38
bremner git mergers atomic commits, not files.20:38
Seveas autrilla: well, that's not going to work, so you need to make change your .travis.yml to work for both20:39
← brinck10 left20:39
← MattMaker left20:39
← blackpajamas left20:39
autrilla Well, that's a problem. travis-ci does not allow per-branch environment variables :(20:39
← kerrick left20:40
Seveas then don't rely on those :)20:40
autrilla I could probably get away with a prefix for each branch's env variables20:40
Seveas: I need to rely on something20:40
Seveas take a step or two back: why does travis need to do different things per branch?20:41
autrilla Because it has to deploy to different servers for staging and production20:41
Seveas ah, !deploy it is then.20:41
gitinfo 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.html20:41
Seveas I'd never rely on travis to do deploys. How would you deploy if Travis is down?20:42
← m1dnight_ left20:43
← rubie left20:44
→ AndroidVaan joined20:44
← AndroidVaan left20:45
bremner but the cloud is always up!20:45
→ AndroidVaan joined20:45
← AndroidVaan left20:45
→ AndroidVaan joined20:45
← AndroidVaan left20:45
→ AndroidVaan joined20:46
← Rythorn left20:47
→ mwhooker joined20:47
→ LaptopBrain joined20:48
→ mischat joined20:49
← noteness left20:51
→ Bruce_ joined20:52
← LucaTM left20:53
← mischat left20:54
← toogley left20:55
→ leonarth joined20:56
← mdw left20:56
→ noteness joined20:56
→ monoda joined20:56
→ Juzzika joined20:57
← Wetmelon left20:59
← fission6 left20:59
← Juzzika left20:59
← boudiccas left20:59
→ bronson joined20:59
→ metaphysis joined21:00
→ bcadren joined21:00
← cyan__ left21:00
→ boudiccas joined21:01
→ Guest11 joined21:01
← fdsa_ left21:02
qsx i wish it were21:02
it's way too sunny here :(21:02
and i don't have curtains or so yet21:02
→ th0m_ joined21:02
qsx -> wake up at 8am or so every morning becuase it's bright and warm.21:02
→ Imaginativeone joined21:02
← noteness left21:03
← Guest11 left21:04
← bronson left21:05
← chris2 left21:06
← muthu left21:06
autrilla Seveas: all of those are very inconvenient21:08
Seveas: if travis is down I can just run `fab deploy`21:08
→ noteness joined21:08
← bongjovi left21:09
→ justanotheruser joined21:09
← emPi left21:09
← Alistair left21:10
→ Alistair joined21:11
→ gsingh joined21:11
← clemf left21:13
→ clemf joined21:13
← mwhooker left21:17
← titanium17 left21:18
← Alistair left21:18
→ chris2 joined21:19
← p-l left21:19
← roelmonnens left21:20
→ Alistair joined21:20
→ bluezone joined21:21
← justanotheruser left21:23
← User458764 left21:23
→ justanotheruser joined21:25
← Kicer86 left21:29
← patrick-sartent left21:30
← LiamGoodacre left21:30
← YouCallItFar left21:30
← JSharpe left21:32
← leonarth left21:32
← felipedvorak left21:33
→ staticshock_ joined21:34
→ Juzzika joined21:35
→ MattMaker joined21:36
← staticshock_ left21:39
← Bruce_ left21:42
← metaphysis left21:43
→ banister joined21:43
→ p-l joined21:43
← MattMaker left21:45
→ rubie joined21:45
→ staticshock_ joined21:45
→ fission6 joined21:45
→ Sasazuka joined21:46
→ nidr0x joined21:46
→ felipedvorak joined21:46
→ Silex joined21:46
← Silex left21:47
← rhombus left21:47
→ staticshock__ joined21:49
← rubie left21:49
← staticshock_ left21:50
→ mischat joined21:50
← dopesong left21:51
→ mehola joined21:52
→ hightower3 joined21:52
← Lauven left21:52
→ artemisart joined21:53
→ Lauven joined21:53
← Lauven left21:53
→ durham joined21:54
→ rubyonrailed joined21:54
→ zotherstupidguy joined21:54
← mischat left21:55
→ liamonade joined21:56
← King_Hual` left21:57
← fission6 left21:57
← AfroThundr left21:58
← Goplat left21:59
→ xlegoman joined22:02
← Gitzilla left22:02
← elsevero left22:02
→ arooni joined22:04
← nidr0x left22:04
→ nidr0x joined22:06
→ GnuYawk joined22:06
← durham left22:06
→ dsdeiz joined22:09
← arooni left22:11
← justanotheruser left22:11
→ elsevero joined22:11
← Alistair left22:11
→ daito joined22:11
→ ivo_ joined22:11
→ AfroThundr joined22:11
← AfroThundr left22:11
→ arooni joined22:11
→ AfroThundr joined22:12
← nidr0x left22:12
→ fstd_ joined22:12
← jeffspeff left22:12
→ nidr0x joined22:12
← fstd left22:13
fstd_ → fstd22:13
← Noldorin left22:14
← zotherstupidguy left22:15
← daito left22:15
← arooni left22:16
→ toogley joined22:16
← staticshock__ left22:16
→ Bruce_ joined22:18
→ rkazak joined22:18
→ staticshock__ joined22:18
→ m0viefreak joined22:20
→ Gooer joined22:22
← Bruce_ left22:22
→ Silex joined22:23
← elastix left22:23
← staticshock__ left22:23
→ [gmi] joined22:25
← Silex left22:25
← nidr0x left22:25
→ bb010g joined22:26
gitinfo set mode: +v22:26
→ nidr0x joined22:27
→ annoymouse joined22:28
→ staticshock__ joined22:28
→ qhp joined22:28
← nidr0x left22:28
→ botevoker joined22:29
→ titanium17 joined22:29
→ arooni joined22:29
← tsr_dev left22:31
← elsevero left22:32
→ mohabaks joined22:34
← mohabaks left22:34
← staticshock__ left22:34
← liamonade left22:35
← st0opkid left22:35
→ st0opkid joined22:35
→ JordiGH joined22:38
JordiGH Are git recursive merges in-memory?22:38
→ Bruce_ joined22:39
→ Joel joined22:39
← Sasazuka left22:40
→ jeffspeff joined22:41
→ MattMaker joined22:41
← rivarun left22:42
← apotry left22:43
→ staticshock__ joined22:43
← italoacasas left22:44
→ rivarun joined22:44
→ Gsham joined22:45
← clemf left22:45
← artemisart left22:47
← [gmi] left22:47
← jeffspeff left22:48
→ wrouesnel1 joined22:48
← MattMaker left22:49
→ Literphor joined22:50
→ mischat joined22:51
→ mohabaks joined22:52
← staticshock__ left22:52
→ d4rklit3 joined22:54
← mischat left22:56
← Juzzika left22:59
← mohabaks left22:59
→ liamonade joined23:00
← Jackneill left23:01
→ staticshock__ joined23:01
← timmu left23:01
→ bronson joined23:02
→ m1dnight_ joined23:02
← Gsham left23:03
← samw left23:04
← doener left23:05
← mattfoo left23:06
← bronson left23:07
→ jession joined23:07
→ choki joined23:07
→ sto0pkid joined23:07
→ Atm0spher1c joined23:08
← Gooer left23:09
← sto0pkid left23:09
→ sto0pkid joined23:10
← st0opkid left23:11
→ italoacasas joined23:11
→ mattfoo joined23:11
→ st0opkid joined23:11
← jession left23:11
← d4rklit3 left23:13
→ bongjovi joined23:14
← sto0pkid left23:15
← monoda left23:15
→ timmu joined23:16
← Limes__ left23:17
→ jeffspeff joined23:17
→ sctskw joined23:17
← gsingh left23:17
← ivo_ left23:18
← jeffspeff left23:19
← Agent281 left23:21
→ Gitzilla joined23:21
→ kfpratt joined23:21
← tristanp left23:22
→ EvilPenguin joined23:22
← choki left23:24
← kfpratt left23:25
→ diegoaguilar joined23:27
← diegoaguilar left23:27
← p-l left23:28
← rubyonrailed left23:29
← italoacasas left23:29
← vdv left23:29
→ italoacasas joined23:30
← italoacasas left23:31
← bluezone left23:31
→ diogenese joined23:31
→ italoacasas joined23:32
← Bruce_ left23:32
→ EvilPeng1 joined23:33
← ShapeShifter499 left23:33
→ Bruce_ joined23:33
← EvilPenguin left23:34
← staticshock__ left23:35
← xaa left23:36
→ fracting joined23:37
→ diegoaguilar joined23:38
→ tristanp joined23:40
→ xelxebar_ joined23:41
→ Gsham joined23:42
← bongjovi left23:42
← yqt left23:42
→ relipse2 joined23:43
← sctskw left23:43
→ nevodka joined23:44
→ yrashk joined23:45
→ fission6 joined23:45
← osse left23:45
← hightower3 left23:46
→ MattMaker joined23:46
→ WaReZ joined23:46
→ sctskw joined23:47
→ osse joined23:47
← sweatsuit left23:47
→ monoda joined23:47
→ sweatsuit joined23:49
← xelxebar_ left23:51
→ mischat joined23:52
→ staticshock__ joined23:52
→ kerrick joined23:52
← Gsham left23:54
→ xelxebar_ joined23:54
← MattMaker left23:54
← xelxebar_ left23:54
← mischat left23:56
→ xelxebar_ joined23:58
← fstd left23:59
← boudiccas left23:59
← xelxebar_ left23:59
→ fstd joined23:59
← cagedwisdom left23:59

Logs Search ←Prev date Next date→ Channels Documentation