Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-01-03

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

All times shown according to UTC.

Time Nick Message
00:00 cbreak that sounds exceptionally stupid
00:00 cbreak you can make a script to do that, and run it from the hook
00:00 cbreak but... oh my would that be stupid
00:01 ome joined #git
00:01 mizu_no_oto joined #git
00:03 [log] joined #git
00:04 Shock- joined #git
00:05 clemf joined #git
00:05 ToBeCloud joined #git
00:13 ratdeptrai joined #git
00:15 clemf joined #git
00:17 cagomez joined #git
00:18 variable joined #git
00:18 aidalgol joined #git
00:19 aax joined #git
00:21 fission6 joined #git
00:22 GavinMagnus joined #git
00:25 clemf joined #git
00:25 rwb joined #git
00:25 ToxicFrog joined #git
00:26 Darcidride_ joined #git
00:27 justan0theruser joined #git
00:29 rominronin joined #git
00:29 mizu_no_oto joined #git
00:33 nanga joined #git
00:34 Shock- joined #git
00:35 ratdeptrai joined #git
00:36 clemf joined #git
00:36 elh9 joined #git
00:36 GavinMagnus left #git
00:39 DIDAVISION joined #git
00:42 dsdeiz joined #git
00:43 aarobc joined #git
00:44 bcc joined #git
00:44 bcc joined #git
00:49 brent__ joined #git
00:49 cqi joined #git
00:50 elh9 joined #git
01:01 boubou joined #git
01:01 toogley is there a program for displaying the git status of many git projects in a folder?
01:02 toogley => e.g. so that i can easily identify which projects i haven't pushed yet
01:02 variable toogley not that I know of, but it should be relativly easy to script
01:03 BrianJ joined #git
01:03 toogley variable: hmm.. yeah, might be true.
01:04 Shock- joined #git
01:05 neanderslob joined #git
01:05 nanga joined #git
01:06 qpdb joined #git
01:15 cdown joined #git
01:17 pks joined #git
01:21 zifnab|cloud joined #git
01:23 [0xAA] joined #git
01:25 LiENUS joined #git
01:32 khfeng joined #git
01:32 khfeng_ joined #git
01:32 daurnimator joined #git
01:34 shgysk8zer0 joined #git
01:34 Shock- joined #git
01:43 qwidj joined #git
01:44 * qwidj gently pets his domesticated Git Backup Solution For Personal Data Backup
01:44 qwidj hey guys
01:44 gitinfo qwidj: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.
01:44 Anja_ joined #git
01:44 Aleric or 'admin' and 'trust me'
01:46 alhariel joined #git
01:47 Aleric Life is full of hard questions... like, do I put the window with the source code above or below the window with the object directory in which I compile?
01:48 shpew12 joined #git
01:50 Aeleck joined #git
01:53 dave0x6d joined #git
01:53 jast joined #git
01:55 toogley variable: i found sth. :) find . -name ".git" -type d | sed 's/\/.git//' | xargs -I {} sh -c "echo {}; git --git-dir={}/.git --work-tree={} status --short"
01:55 boombatower joined #git
01:55 boombatower joined #git
01:55 toogley variable: it works great :D
01:55 dirtyroshi joined #git
01:56 toogley <3 linux :D
01:57 thiago you can do better, with shell replacement and avoiding sed and xargs :-)
02:00 elsevero joined #git
02:02 HoierM joined #git
02:03 arescorpio joined #git
02:04 Shock- joined #git
02:04 rominronin joined #git
02:06 dodobrain joined #git
02:11 pks joined #git
02:11 nickabbey joined #git
02:12 mizu_no_oto joined #git
02:12 Nilesh_ joined #git
02:14 andrew710 joined #git
02:15 Vinnie_win joined #git
02:21 aw1 joined #git
02:27 chigang joined #git
02:34 Shock- joined #git
02:35 finalbeta joined #git
02:46 nickabbey joined #git
02:46 Sample joined #git
02:46 Sample joined #git
02:46 Vampire0 joined #git
02:46 qwidj left #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and silly hats | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | Repository is actual size
02:52 d^sh joined #git
02:53 aavrug joined #git
02:54 ISmithers joined #git
02:58 jottr joined #git
03:05 Shock- joined #git
03:05 Aeleck I have a quick question, where do I put the .gitignore file?
03:07 ojacobson A .gitignore file applies to the directory it's in, and may include patterns matching files in subdirectories of that directories.
03:07 ojacobson You can put one anywhere in the work tree, or even have multiple .gitignore files; common practice is to have a single .gitignore in the root of the project, but that's not the only way to do it
03:12 chachasmooth joined #git
03:15 Goplat joined #git
03:27 thiago joined #git
03:28 eehackr_ joined #git
03:28 Noldorin joined #git
03:29 hexagoxel joined #git
03:33 Emperor_Earth joined #git
03:35 [log] joined #git
03:35 ToxicFrog joined #git
03:35 Emperor_Earth joined #git
03:35 LiENUS joined #git
03:35 jast joined #git
03:35 aw1 joined #git
03:35 dsdeiz joined #git
03:35 khfeng joined #git
03:35 dirtyroshi joined #git
03:35 arescorpio joined #git
03:35 Vampire0 joined #git
03:35 hexagoxel joined #git
03:35 Noldorin joined #git
03:35 thiago joined #git
03:35 jottr joined #git
03:35 aavrug joined #git
03:35 d^sh joined #git
03:35 finalbeta joined #git
03:35 chigang joined #git
03:35 Vinnie_win joined #git
03:35 Nilesh_ joined #git
03:35 dodobrain joined #git
03:35 dave0x6d joined #git
03:35 shpew12 joined #git
03:35 Anja_ joined #git
03:35 shgysk8zer0 joined #git
03:35 daurnimator joined #git
03:35 [0xAA] joined #git
03:35 zifnab joined #git
03:35 qpdb joined #git
03:35 nanga joined #git
03:35 neanderslob joined #git
03:35 BrianJ joined #git
03:35 boubou joined #git
03:35 elh9 joined #git
03:35 cqi joined #git
03:35 bcc joined #git
03:35 aarobc joined #git
03:35 DIDAVISION joined #git
03:35 ToBeCloud joined #git
03:35 ome joined #git
03:35 holodoc joined #git
03:35 t-mart joined #git
03:35 cagedwisdom joined #git
03:35 JanC joined #git
03:35 Mobutils joined #git
03:35 NeverDie joined #git
03:35 jost_ joined #git
03:35 askb joined #git
03:35 Electrometro joined #git
03:35 fsckd joined #git
03:35 davimore__ joined #git
03:35 Davey joined #git
03:35 Zarthus joined #git
03:35 Aaeriele joined #git
03:35 HedgeWork joined #git
03:35 du joined #git
03:35 MrC joined #git
03:35 justinmrkva joined #git
03:35 sfix joined #git
03:35 h12o joined #git
03:35 michael_mbp joined #git
03:35 relrod joined #git
03:35 caffeinatedcode joined #git
03:35 seitensei joined #git
03:35 varx1 joined #git
03:35 Arokh joined #git
03:35 ldlework joined #git
03:35 m1dnight1 joined #git
03:35 Narwhaal joined #git
03:35 sentriz joined #git
03:35 tomek joined #git
03:35 shakalaka joined #git
03:35 nkhoit joined #git
03:35 BeerSerc joined #git
03:35 sleezd joined #git
03:35 AlgorithmWizard joined #git
03:35 ariver joined #git
03:35 Roconda_ joined #git
03:35 varesa joined #git
03:35 Kronuz joined #git
03:35 Mathiasdm joined #git
03:35 angseus_ joined #git
03:35 qsx joined #git
03:35 murph joined #git
03:35 dserodio joined #git
03:35 BooK joined #git
03:35 IndigoTiger joined #git
03:35 mika joined #git
03:35 `slikts joined #git
03:35 Peng joined #git
03:35 AlHafoudh joined #git
03:35 ollien joined #git
03:35 Neic0 joined #git
03:35 gruetzkopf joined #git
03:35 Kobaz joined #git
03:35 abra0 joined #git
03:35 tapout joined #git
03:35 freekevin joined #git
03:35 kugel joined #git
03:35 ec\ joined #git
03:35 Nevik joined #git
03:35 minibar joined #git
03:35 ftoulemon joined #git
03:35 fscala joined #git
03:35 Dev0n joined #git
03:35 Bombe joined #git
03:35 kba joined #git
03:35 AlexanderS joined #git
03:35 ahammond joined #git
03:35 Ph_ joined #git
03:35 gitinfo joined #git
03:35 sfan786_ joined #git
03:35 timwis joined #git
03:35 nezZario joined #git
03:35 bttf joined #git
03:35 EgS joined #git
03:35 caliculk joined #git
03:35 ngladitz joined #git
03:35 martinklepsch joined #git
03:35 grantrules joined #git
03:35 nkuttler joined #git
03:35 tomaw joined #git
03:35 p1k joined #git
03:35 bshacklett joined #git
03:35 knittl joined #git
03:35 mdk joined #git
03:35 cworth joined #git
03:35 sns joined #git
03:35 XVar joined #git
03:35 cydrobolt joined #git
03:35 jaeckel joined #git
03:35 moritz joined #git
03:35 toydestroyer_ joined #git
03:35 tilpner joined #git
03:35 fus joined #git
03:35 ahf joined #git
03:35 SirFunk joined #git
03:35 qlkzy joined #git
03:35 icedp joined #git
03:35 preaction joined #git
03:35 osse joined #git
03:35 harv joined #git
03:35 ^7heo joined #git
03:35 Zeedox joined #git
03:35 JoshL joined #git
03:35 VampiricPadraig joined #git
03:35 Derega_ joined #git
03:35 ianp joined #git
03:35 KekSi joined #git
03:35 nedzadhrnjica joined #git
03:35 berndj joined #git
03:35 bathtub_shark joined #git
03:35 spacemud joined #git
03:35 brendyn joined #git
03:35 qassim joined #git
03:35 ericP joined #git
03:35 stux|RC joined #git
03:35 HedgeMage joined #git
03:35 roger_raymond joined #git
03:35 thekingofbandit joined #git
03:35 heinrich5991 joined #git
03:35 johnlage joined #git
03:35 Infamous joined #git
03:35 Knirch joined #git
03:35 nemesit|znc joined #git
03:35 jokajak joined #git
03:35 osseswirc joined #git
03:35 rxo joined #git
03:35 ninsei joined #git
03:35 bittyx joined #git
03:35 _cyril_ joined #git
03:35 ejnahc joined #git
03:35 PerlJam joined #git
03:35 jlewis joined #git
03:35 Esya joined #git
03:35 __name__ joined #git
03:35 Forkk joined #git
03:35 Fiouz joined #git
03:35 mroth joined #git
03:35 hide joined #git
03:35 TooLmaN joined #git
03:35 mukmuk joined #git
03:35 AKPWD joined #git
03:35 musca joined #git
03:35 bremner joined #git
03:35 maqr joined #git
03:35 SirCmpwn joined #git
03:35 lungaro joined #git
03:35 midnightmagic joined #git
03:35 ohcibi joined #git
03:35 shout-user27 joined #git
03:35 Vorisi joined #git
03:35 pigeon joined #git
03:35 Xe joined #git
03:35 Takumo joined #git
03:35 jgornick joined #git
03:35 dogmatic69 joined #git
03:35 MajorPay1e joined #git
03:35 cmosguy joined #git
03:35 Yaiyan joined #git
03:35 aspiers joined #git
03:35 thib joined #git
03:35 cjbrambo joined #git
03:35 ReenignE joined #git
03:35 jailbox joined #git
03:35 Rhonda joined #git
03:35 laumann joined #git
03:35 Ring0` joined #git
03:35 weltall joined #git
03:35 blr_ joined #git
03:35 janx joined #git
03:35 cstrahan joined #git
03:35 Lowell joined #git
03:35 pfg joined #git
03:35 eshlox joined #git
03:35 cloudcell_ joined #git
03:35 barq joined #git
03:35 aendrew joined #git
03:35 ulkesh joined #git
03:35 tharuin joined #git
03:35 sebhoss joined #git
03:35 milkshoes joined #git
03:35 HandheldPenguin` joined #git
03:35 masak joined #git
03:35 atrus joined #git
03:35 padde joined #git
03:35 qguv joined #git
03:35 snowinferno joined #git
03:35 valkyr2e joined #git
03:35 cxreg joined #git
03:35 Hogofwar joined #git
03:35 ndimitrij joined #git
03:35 Pieter__ joined #git
03:35 Renter joined #git
03:35 tokkee joined #git
03:35 brandonw joined #git
03:35 plasticb1y joined #git
03:35 jbondhus_ joined #git
03:35 bodie_ joined #git
03:35 SleePy joined #git
03:35 monty joined #git
03:35 PasiFist joined #git
03:35 Brando753-o_O_o joined #git
03:35 felixjet joined #git
03:35 ybden joined #git
03:35 c0ded joined #git
03:35 jwest joined #git
03:35 m0ltar joined #git
03:35 systmkor_ joined #git
03:35 danmackay joined #git
03:35 kanzure joined #git
03:35 kwmiebach___ joined #git
03:35 resetpacket joined #git
03:35 duartepe- joined #git
03:35 SegFaultAX joined #git
03:35 Eugene joined #git
03:35 leonarth_ joined #git
03:35 lucz joined #git
03:35 alphor joined #git
03:35 PaulePanter joined #git
03:35 hplar joined #git
03:35 scorphus joined #git
03:35 Gabemo joined #git
03:35 fuchstronaut joined #git
03:35 ribasushi joined #git
03:35 bcardarella joined #git
03:35 sharkz joined #git
03:35 snufft joined #git
03:35 Saturn812 joined #git
03:35 Frede__ joined #git
03:35 shennyg joined #git
03:35 GameGamer43 joined #git
03:35 ggherdov joined #git
03:35 ionelmc joined #git
03:35 beckyconning__ joined #git
03:35 daxroc joined #git
03:35 suy joined #git
03:35 thoros joined #git
03:35 APic joined #git
03:35 Moult joined #git
03:35 athaller joined #git
03:35 watersoul joined #git
03:35 rom1504 joined #git
03:35 timewalker joined #git
03:35 johtso joined #git
03:35 r3c0d3x joined #git
03:35 BinGOs joined #git
03:35 davidstrauss joined #git
03:35 tjbp joined #git
03:35 cschneid joined #git
03:35 gmh joined #git
03:35 gyre007 joined #git
03:35 asdofindia joined #git
03:35 POQDavid joined #git
03:35 hagabaka joined #git
03:35 dhanush joined #git
03:35 nedbat joined #git
03:35 telephone joined #git
03:35 Guest19788 joined #git
03:35 fold4 joined #git
03:35 waveclaw joined #git
03:35 anry joined #git
03:35 barteks2x joined #git
03:35 Hobbyboy joined #git
03:35 DuncanT joined #git
03:35 MatthewAllan93 joined #git
03:35 McKraken joined #git
03:35 wenzowski joined #git
03:35 dmj` joined #git
03:35 flupke joined #git
03:35 cttttt joined #git
03:35 discopatrick joined #git
03:35 t-richards joined #git
03:35 davisonio joined #git
03:35 RickyB98 joined #git
03:35 djh joined #git
03:35 DistantStar joined #git
03:35 uebera|| joined #git
03:35 ikonia joined #git
03:35 Cerise joined #git
03:35 toogley joined #git
03:35 niax joined #git
03:35 nsh joined #git
03:35 ensign joined #git
03:35 Chaser joined #git
03:35 HalfEatenPie joined #git
03:35 rancyd joined #git
03:35 nioncode joined #git
03:35 fiete joined #git
03:35 i7c joined #git
03:35 gsingh93 joined #git
03:35 Furai joined #git
03:35 apeiros joined #git
03:35 vaesper joined #git
03:35 AndrewAlexMac joined #git
03:35 tobie joined #git
03:35 yena joined #git
03:35 prosody joined #git
03:35 theresajayne joined #git
03:35 llamapixel joined #git
03:35 danemacmillan joined #git
03:35 pitastrudl joined #git
03:35 FilipNor1ic joined #git
03:35 doppo joined #git
03:35 colona_ joined #git
03:35 styx_ joined #git
03:35 warthog9 joined #git
03:35 runlevl4 joined #git
03:35 shampine joined #git
03:35 Ankhers joined #git
03:35 thinkpad joined #git
03:35 aca20031 joined #git
03:35 forrestv joined #git
03:35 jj- joined #git
03:35 emerson joined #git
03:35 rfv joined #git
03:35 GingerGeek joined #git
03:35 Zoxc joined #git
03:35 gusnan joined #git
03:35 larrybolt joined #git
03:35 themill joined #git
03:35 spaceone joined #git
03:35 spinningarrow joined #git
03:35 sangy joined #git
03:35 tier2villain_ joined #git
03:35 yonatankoren joined #git
03:35 Mixologic joined #git
03:35 salparadise joined #git
03:35 henriquev joined #git
03:35 lamont joined #git
03:35 chamunks- joined #git
03:35 Orphis joined #git
03:35 pepijndevos joined #git
03:35 loglaunch joined #git
03:35 vishal joined #git
03:35 Someguy123 joined #git
03:35 Silex joined #git
03:35 guardian joined #git
03:35 thecomedian joined #git
03:35 utrack joined #git
03:35 tsunamie joined #git
03:35 sitaram joined #git
03:35 richardlitt joined #git
03:35 magicbit joined #git
03:35 reda joined #git
03:35 olbat joined #git
03:35 mniip joined #git
03:35 Deamon joined #git
03:35 n-st joined #git
03:35 linduxed joined #git
03:35 DonRichie joined #git
03:35 ashnur joined #git
03:35 catern joined #git
03:35 gnarf joined #git
03:35 lukky513 joined #git
03:35 _joes__ joined #git
03:35 fearless_man joined #git
03:35 Ruler- joined #git
03:35 Blkt joined #git
03:35 bumpy joined #git
03:35 brewmaster joined #git
03:35 Kamilion joined #git
03:35 zapb_ joined #git
03:35 andres joined #git
03:35 diget joined #git
03:35 ToBeFree joined #git
03:35 tcsc joined #git
03:35 noahsussman joined #git
03:35 evanc joined #git
03:35 matthiaskrgr joined #git
03:35 skelterjohn joined #git
03:35 Iacobus__ joined #git
03:35 mehdi___ joined #git
03:35 jor joined #git
03:35 tonyj joined #git
03:35 mloy joined #git
03:35 Serus joined #git
03:35 devster31 joined #git
03:35 saidelike joined #git
03:35 CustosLimen joined #git
03:35 Virox joined #git
03:35 Bilge joined #git
03:35 Spydar007 joined #git
03:35 przemoc joined #git
03:35 Timvde joined #git
03:35 Keridos joined #git
03:35 cyberz joined #git
03:35 ExeciN joined #git
03:35 g22 joined #git
03:35 swift1 joined #git
03:35 kineticrootkit[m joined #git
03:35 monomon[m] joined #git
03:35 M-shine joined #git
03:35 kikijiki[m] joined #git
03:35 M-nated joined #git
03:35 enjunear[m] joined #git
03:35 unclechu joined #git
03:35 am2on joined #git
03:35 saintaquinas[m] joined #git
03:35 Dhanya[m] joined #git
03:35 alaeri[m] joined #git
03:35 srkrishna[m] joined #git
03:35 Start[m] joined #git
03:35 M-mistake joined #git
03:35 musicmatze[m] joined #git
03:35 Remramm joined #git
03:35 malo[m] joined #git
03:35 patrickr[m] joined #git
03:35 davix[matrix] joined #git
03:35 daopu[m] joined #git
03:35 hallogallo[m] joined #git
03:35 scrambo[m] joined #git
03:35 timlyo[m] joined #git
03:35 Carlos[m] joined #git
03:35 aviraldg joined #git
03:35 BackEndCoder joined #git
03:35 dwmw2_gone joined #git
03:35 AndreSomers joined #git
03:35 Tiaan[m] joined #git
03:35 ntnn joined #git
03:35 Boniche joined #git
03:35 LeMike joined #git
03:35 WakiMiko_ joined #git
03:35 Mekkis joined #git
03:35 kfc joined #git
03:35 KnightsOfNi joined #git
03:35 tchan joined #git
03:35 WizJin joined #git
03:35 arand__ joined #git
03:35 Urbany joined #git
03:35 Ramen joined #git
03:35 nebg joined #git
03:35 Awesomecase joined #git
03:35 hiroki joined #git
03:35 blacksyke joined #git
03:35 nicoulaj joined #git
03:35 LordRyan joined #git
03:35 CEnnis91 joined #git
03:35 DelphicOkami joined #git
03:35 relgar joined #git
03:35 joelsmith joined #git
03:35 wagle joined #git
03:35 samwise[m]1 joined #git
03:35 M64137[m] joined #git
03:35 codebam joined #git
03:35 Klumben joined #git
03:35 Bigcheese joined #git
03:35 ws2k3 joined #git
03:35 Afforess joined #git
03:35 nixdork joined #git
03:35 lolmac_ joined #git
03:35 ulkesh_ joined #git
03:35 mei[m]1 joined #git
03:35 compeman joined #git
03:35 JuliusN joined #git
03:35 eycsigfy joined #git
03:35 elmcrest joined #git
03:35 cspotcode joined #git
03:35 drawkula joined #git
03:35 lohfu joined #git
03:35 hecliunyx joined #git
03:35 UncleCJ joined #git
03:35 jdelStrother joined #git
03:35 Caelum joined #git
03:35 ketas joined #git
03:35 bejeb joined #git
03:35 AustinMatherne joined #git
03:35 tmz joined #git
03:35 setuid joined #git
03:35 Travis-42 joined #git
03:35 manveru joined #git
03:35 rwp joined #git
03:35 jasom joined #git
03:35 tobiasBora joined #git
03:35 adamm joined #git
03:35 dsop joined #git
03:35 qqx joined #git
03:35 Jupelius joined #git
03:35 arooni joined #git
03:35 hfp joined #git
03:35 hfp_work joined #git
03:35 strugee joined #git
03:35 tinanoo joined #git
03:35 ruskie joined #git
03:35 kfunk joined #git
03:35 MillerBoss joined #git
03:35 pelegreno joined #git
03:35 pingwindyktator joined #git
03:35 armin joined #git
03:35 Whisket joined #git
03:35 CIAguy- joined #git
03:35 babilen joined #git
03:35 Gaga joined #git
03:35 Celelibi joined #git
03:35 jesk joined #git
03:35 anddam joined #git
03:35 nephyrin` joined #git
03:35 farhaan joined #git
03:35 Maple__ joined #git
03:35 Seveas joined #git
03:35 habbasi joined #git
03:35 Impaloo joined #git
03:35 jab416171 joined #git
03:35 timothy joined #git
03:35 javaJake joined #git
03:35 Grum joined #git
03:35 arand_ joined #git
03:35 sunny256 joined #git
03:35 trobotham joined #git
03:35 vdl joined #git
03:35 nikow joined #git
03:35 bouncy joined #git
03:35 _flow__ joined #git
03:35 midgetspy joined #git
03:35 stfn joined #git
03:35 SpEcHiDeR joined #git
03:35 ixian joined #git
03:35 fuzzmz joined #git
03:35 Anthaas joined #git
03:35 phroa joined #git
03:35 eltopo[m] joined #git
03:35 Ineentho[m] joined #git
03:35 Sheogorath[m] joined #git
03:35 mquin joined #git
03:35 MattE joined #git
03:35 kent\n joined #git
03:35 unbalancedparen joined #git
03:35 meLon joined #git
03:35 lmat joined #git
03:35 RichiH joined #git
03:35 nellicus_ joined #git
03:35 jantje joined #git
03:35 nopf joined #git
03:35 CtrlC joined #git
03:35 likewhoa joined #git
03:35 traxo-xx joined #git
03:35 alip joined #git
03:35 Tsutsukakushi joined #git
03:35 hue joined #git
03:35 buckowski joined #git
03:35 emg joined #git
03:35 sathed joined #git
03:35 holgersson joined #git
03:35 invisbl joined #git
03:35 ygeLN joined #git
03:35 feodaron joined #git
03:35 dysfigured joined #git
03:35 mand0 joined #git
03:35 swalladge joined #git
03:35 cebor joined #git
03:35 hendry joined #git
03:35 hegge joined #git
03:35 grift joined #git
03:35 vrishab joined #git
03:35 markelite joined #git
03:35 scarcry joined #git
03:35 ploop joined #git
03:35 raatiniemi joined #git
03:35 krabat joined #git
03:35 hyperair joined #git
03:35 marvi joined #git
03:35 Bengi joined #git
03:35 rideh joined #git
03:35 XDS2010 joined #git
03:35 tanuki joined #git
03:35 uranellus joined #git
03:35 johnny56 joined #git
03:35 jgrasser joined #git
03:35 Kulrak joined #git
03:35 mgoodwin joined #git
03:35 Cthalupa joined #git
03:35 mrkake joined #git
03:35 rebrec joined #git
03:35 reznord joined #git
03:35 parasite_ joined #git
03:35 wloncom joined #git
03:35 Vauff joined #git
03:35 spriz joined #git
03:35 Dazzyp joined #git
03:35 Peng_ joined #git
03:35 Nicmavr joined #git
03:35 averell joined #git
03:35 mitzip joined #git
03:35 thunderbirdtr joined #git
03:35 rizonz joined #git
03:35 d1b joined #git
03:35 chrisml joined #git
03:35 robogoat_ joined #git
03:35 tazle__ joined #git
03:35 weSpe joined #git
03:35 lkurusa joined #git
03:35 atomi joined #git
03:35 Hello71 joined #git
03:35 Kaisyu joined #git
03:35 forgot joined #git
03:35 bond joined #git
03:35 jfr joined #git
03:35 maxb joined #git
03:35 ghoti joined #git
03:35 jdiez_ joined #git
03:35 dilfridge joined #git
03:35 theShirb- joined #git
03:35 boshhead joined #git
03:35 Kuukunen- joined #git
03:35 nevyn_ joined #git
03:35 Guest69981 joined #git
03:35 cite_ joined #git
03:35 lus joined #git
03:35 comps joined #git
03:35 brokensyntax_ joined #git
03:35 VladGh_ joined #git
03:35 koenvg_ joined #git
03:35 pkiller joined #git
03:35 anonnumberanon joined #git
03:35 sysanthrope joined #git
03:35 disi joined #git
03:35 tribly joined #git
03:35 dustinm joined #git
03:35 daishan joined #git
03:35 simon816 joined #git
03:35 ajpiano joined #git
03:35 cafuser001 joined #git
03:35 BytesAndCoffee joined #git
03:35 ilogger2 joined #git
03:35 Stravy joined #git
03:35 tabakhase joined #git
03:35 bauruine joined #git
03:35 alcohol joined #git
03:35 Sc0rpius joined #git
03:35 pR0Ps joined #git
03:35 Dyonisos joined #git
03:35 Dandelock joined #git
03:35 sab3r joined #git
03:35 Xarodon joined #git
03:35 hiwk joined #git
03:35 markmarkmark joined #git
03:35 maxorator joined #git
03:35 bill99 joined #git
03:35 unholycrab joined #git
03:35 UgJkA joined #git
03:35 kier joined #git
03:35 ToeSnacks joined #git
03:35 Cork joined #git
03:35 noodle joined #git
03:35 akkad joined #git
03:35 ekneuss_ joined #git
03:35 bambams joined #git
03:35 kenansulayman joined #git
03:35 Soliton joined #git
03:35 zyxep joined #git
03:35 ujjain joined #git
03:35 HarryHallman joined #git
03:35 Xethron joined #git
03:35 Ekho joined #git
03:35 RiPer joined #git
03:35 dwts joined #git
03:35 WebDawg joined #git
03:35 rt joined #git
03:35 boz_v1 joined #git
03:35 mage_ joined #git
03:35 gkatsev joined #git
03:35 ski7777 joined #git
03:35 Nugget joined #git
03:35 M-ou-se joined #git
03:35 Lunatrius joined #git
03:35 darkmist joined #git
03:35 GodEater joined #git
03:35 miklcct joined #git
03:35 todder joined #git
03:35 ShoaibJahejo joined #git
03:35 TSS_ joined #git
03:35 blahdodo joined #git
03:35 leprechau joined #git
03:35 BenderRodriguez joined #git
03:35 Sonderblade joined #git
03:35 enleeten_ joined #git
03:35 mattcen joined #git
03:35 Hink joined #git
03:35 sevenever joined #git
03:35 dikiaap joined #git
03:35 Ratler joined #git
03:35 BlessJah joined #git
03:35 mgedmin joined #git
03:35 trondth joined #git
03:35 MikeChernev joined #git
03:35 nickthetait joined #git
03:35 mar77i joined #git
03:35 idmistir joined #git
03:35 skalpin joined #git
03:35 JrCs joined #git
03:35 Pursuit joined #git
03:35 JelmerD joined #git
03:35 murr4y joined #git
03:35 nyuszika7h joined #git
03:35 glebihan_ joined #git
03:35 Vaelatern joined #git
03:35 mozzarella joined #git
03:35 smithbone_ joined #git
03:35 BlaXpirit joined #git
03:35 musicmatze joined #git
03:35 nuck joined #git
03:35 austin987 joined #git
03:35 HelloShitty joined #git
03:35 hramrach joined #git
03:35 Spinkzeit joined #git
03:35 quite joined #git
03:35 AciD` joined #git
03:35 Mathieu_Du joined #git
03:35 franks-reich joined #git
03:35 fk joined #git
03:35 jon-mac joined #git
03:35 lu_zero joined #git
03:35 mattp_ joined #git
03:35 absence joined #git
03:35 PtxDK joined #git
03:35 mindfart joined #git
03:35 linuxdaemon joined #git
03:35 sobersabre joined #git
03:35 Nerbrun joined #git
03:35 tobiasvl joined #git
03:35 BlackMaria joined #git
03:35 mrnuke joined #git
03:35 neunon joined #git
03:35 idr0p joined #git
03:35 watmm1 joined #git
03:35 c^ joined #git
03:35 kini joined #git
03:35 bekks joined #git
03:35 sbeller joined #git
03:35 Gianormagantrous joined #git
03:35 mmlb joined #git
03:35 eb0t joined #git
03:35 ppppp5 joined #git
03:35 polyrob joined #git
03:35 dhollinger joined #git
03:35 holdsworth joined #git
03:35 Peuc joined #git
03:35 SJr joined #git
03:35 icey joined #git
03:35 alexsystemf____ joined #git
03:35 artgoeshere joined #git
03:35 dpower joined #git
03:35 Outsider__ joined #git
03:35 fcrick joined #git
03:35 trig-ger_ joined #git
03:35 kutenai joined #git
03:35 EmeraldExplorer joined #git
03:35 deepy joined #git
03:35 boxrick1 joined #git
03:35 souther joined #git
03:35 ojacobson joined #git
03:35 acr4 joined #git
03:35 canton7 joined #git
03:35 hdon joined #git
03:35 drizbit joined #git
03:35 paramourne joined #git
03:35 gnoirzox1 joined #git
03:35 Nothing4You joined #git
03:35 biertie joined #git
03:35 ThiefMaster joined #git
03:35 rawtaz joined #git
03:35 grawity joined #git
03:35 j416 joined #git
03:35 Log1x joined #git
03:35 Ram-Z joined #git
03:35 chridal joined #git
03:35 hwoarang_ joined #git
03:35 mutex_ joined #git
03:35 Pie_Napple joined #git
03:35 infernix joined #git
03:35 troyt joined #git
03:35 VoidFox joined #git
03:35 e joined #git
03:35 leah2 joined #git
03:35 MuffinMedic joined #git
03:35 blueyed joined #git
03:35 Thorn joined #git
03:35 Ariadeno joined #git
03:35 jephsf joined #git
03:35 adymitruk joined #git
03:35 spb joined #git
03:35 mtso[m] joined #git
03:35 roflin joined #git
03:35 TheOrangeOne joined #git
03:35 dersand joined #git
03:35 M-meznak joined #git
03:35 kjsage[m] joined #git
03:35 unilovelight[m] joined #git
03:35 Mher[m] joined #git
03:35 WillianPaiva[m] joined #git
03:35 MacGyver joined #git
03:35 jokester joined #git
03:35 snits joined #git
03:35 noctux joined #git
03:35 thesquib joined #git
03:35 creppe joined #git
03:35 asd5a joined #git
03:35 andschwa joined #git
03:35 rudi_s joined #git
03:35 ColdKeyboard joined #git
03:35 anbz joined #git
03:35 Exagone313 joined #git
03:35 avar joined #git
03:35 cwillu_at_work joined #git
03:35 Cathy joined #git
03:35 jhasse joined #git
03:35 jerrcs joined #git
03:35 milki joined #git
03:35 Korvin joined #git
03:35 sim642 joined #git
03:35 marcaddeo joined #git
03:35 bjoe2k4 joined #git
03:35 deltab joined #git
03:35 rockfruit joined #git
03:35 SupaHam joined #git
03:35 robinsmidsrod joined #git
03:35 _ikke_ joined #git
03:35 madknight joined #git
03:35 up_the_irons joined #git
03:35 thejoecarroll_ joined #git
03:35 rcn joined #git
03:35 tgummerer joined #git
03:35 r4z3r joined #git
03:35 quadz joined #git
03:35 pcarrier joined #git
03:35 Chinorro joined #git
03:35 jrahmy- joined #git
03:35 EvilJStoker joined #git
03:35 Karazhan joined #git
03:35 Neo joined #git
03:35 sparr joined #git
03:35 Remram joined #git
03:35 chrysaor joined #git
03:35 errr joined #git
03:35 mt joined #git
03:35 monokrome joined #git
03:35 Mogget joined #git
03:35 archaic joined #git
03:35 nunchuck joined #git
03:35 wizonesolutions joined #git
03:35 Matsv joined #git
03:35 shmup joined #git
03:35 _Patrick_ joined #git
03:35 cruxeternus joined #git
03:35 meZee joined #git
03:35 hexa- joined #git
03:35 axisys joined #git
03:35 selckin joined #git
03:35 raedah joined #git
03:35 sagerdearia joined #git
03:35 synchronous joined #git
03:35 gigq joined #git
03:35 srcerer joined #git
03:35 albel727 joined #git
03:35 joshszep joined #git
03:35 azerus joined #git
03:35 Salander27 joined #git
03:35 APNG joined #git
03:35 rvsjoen joined #git
03:35 ThunderChicken joined #git
03:35 hanneso joined #git
03:35 Garen joined #git
03:35 grekkos joined #git
03:35 bipolar joined #git
03:35 malide joined #git
03:35 yanome joined #git
03:35 Guest57693 joined #git
03:35 kaldoran joined #git
03:35 marlinc joined #git
03:35 Werring joined #git
03:35 iron_houzi joined #git
03:35 jozwior_ joined #git
03:35 FabTG joined #git
03:35 wgrant joined #git
03:35 bl0m1_ joined #git
03:35 krillr joined #git
03:35 batrick joined #git
03:35 cbreak joined #git
03:35 zero85 joined #git
03:35 arunpyasi joined #git
03:35 blackjid joined #git
03:35 Phil-Work joined #git
03:35 Tee_Pee joined #git
03:35 cmn joined #git
03:35 jason237 joined #git
03:35 quizzi joined #git
03:35 Ranhir joined #git
03:35 jjasinski joined #git
03:35 imMute joined #git
03:35 rossome joined #git
03:35 tterrag joined #git
03:35 mns joined #git
03:35 Aleric joined #git
03:35 sweatsuit joined #git
03:35 Eryn_1983_FL joined #git
03:35 r00twrh joined #git
03:35 coasterz joined #git
03:35 eehackr joined #git
03:35 bocaneri joined #git
03:35 robnester joined #git
03:35 glebihan joined #git
03:35 filcab joined #git
03:35 Zialus joined #git
03:35 hagridaaron joined #git
03:35 de-vri-es joined #git
03:35 sonOfRa joined #git
03:35 Arguggi joined #git
03:35 inovas joined #git
03:35 Slush- joined #git
03:35 Jon28 joined #git
03:35 SuperSeriousCat joined #git
03:35 pasky joined #git
03:35 Sleepy63 joined #git
03:35 Puffball joined #git
03:35 idlemind joined #git
03:35 silnp joined #git
03:35 psyb0t joined #git
03:35 Jonuz joined #git
03:35 heroux joined #git
03:35 romerocesar joined #git
03:35 jorj joined #git
03:35 the_cybersphinx joined #git
03:35 weylin joined #git
03:35 a3Dman joined #git
03:35 GGMethos joined #git
03:35 wcpan joined #git
03:35 Random832 joined #git
03:35 bket joined #git
03:35 Peetz0r joined #git
03:35 MrWoohoo joined #git
03:35 realz joined #git
03:35 iveqy joined #git
03:35 QualityAddict joined #git
03:35 jrm joined #git
03:35 mmattice joined #git
03:35 causasui joined #git
03:35 mostlybadfly joined #git
03:35 linuxmodder joined #git
03:35 drbean_ joined #git
03:35 Sigma joined #git
03:35 prg3 joined #git
03:35 moei joined #git
03:35 cyphase joined #git
03:35 Vangelis joined #git
03:35 __main__ joined #git
03:35 kryware joined #git
03:35 catsup joined #git
03:35 EisNerd_ joined #git
03:35 sostenuto joined #git
03:35 metachr0n joined #git
03:35 moestevens joined #git
03:35 perrier-jouet joined #git
03:35 frobnic joined #git
03:35 gtristan joined #git
03:35 sparetire joined #git
03:35 _W_ joined #git
03:35 altendky joined #git
03:35 Bloo[m] joined #git
03:35 Olipro joined #git
03:35 Kehet joined #git
03:35 pikajude joined #git
03:35 rewt joined #git
03:35 [cust] joined #git
03:35 weckstrom joined #git
03:35 ignarps joined #git
03:35 Xandaros joined #git
03:35 [Saint] joined #git
03:35 m1dnight2 joined #git
03:35 nwkj86 joined #git
03:35 kadoban joined #git
03:35 FilipNortic_ joined #git
03:35 jeffreylevesque joined #git
03:35 dsantiago joined #git
03:35 salamanderrake joined #git
03:35 bluepixel joined #git
03:35 jonascj joined #git
03:35 unreal joined #git
03:35 TyrfingMjolnir joined #git
03:35 Samual joined #git
03:35 Muzer joined #git
03:35 CussBot joined #git
03:35 nydel07 joined #git
03:35 bannakaffalatta joined #git
03:35 leeN joined #git
03:35 karstensrage joined #git
03:35 dmc joined #git
03:35 Raed joined #git
03:35 sunri5e joined #git
03:35 Vortex34 joined #git
03:35 fstd joined #git
03:35 sarbs joined #git
03:35 gfixler joined #git
03:35 johnnyfive joined #git
03:35 Cabanossi joined #git
03:35 Milos joined #git
03:35 PioneerAxon joined #git
03:35 MeltedLux joined #git
03:35 nd joined #git
03:35 vmiklos joined #git
03:35 nivag joined #git
03:35 rasto joined #git
03:35 bdeferme joined #git
03:35 markovh joined #git
03:35 Synthead joined #git
03:35 cjohnson joined #git
03:35 dzho joined #git
03:35 trelane joined #git
03:35 lightstalker joined #git
03:35 crater2150 joined #git
03:35 ayjay_t joined #git
03:35 fling joined #git
03:35 Nitesh joined #git
03:35 Learath2 joined #git
03:35 tango_ joined #git
03:35 joki joined #git
03:35 pry0cc joined #git
03:35 dede_ joined #git
03:35 mda1 joined #git
03:35 schneider joined #git
03:35 ojdo joined #git
03:35 swords joined #git
03:35 demize joined #git
03:35 wget joined #git
03:35 modin joined #git
03:35 ghormoon joined #git
03:35 guampa joined #git
03:35 rishi joined #git
03:35 enckse joined #git
03:35 storrgie joined #git
03:35 grumble joined #git
03:35 Jackneill joined #git
03:35 BSaboia joined #git
03:35 rivarun joined #git
03:35 f0rks joined #git
03:35 esc joined #git
03:35 Jonno_FTW joined #git
03:35 ispn joined #git
03:35 Orbitrix joined #git
03:35 g5pw joined #git
03:35 mkoskar joined #git
03:35 phanimahesh joined #git
03:35 jagob joined #git
03:35 Corosus joined #git
03:35 lacour joined #git
03:35 Khisanth joined #git
03:35 oaao joined #git
03:35 ertes joined #git
03:35 PaulCape_ joined #git
03:35 sea-gull joined #git
03:35 tuor joined #git
03:35 zacts joined #git
03:35 dendazen joined #git
03:35 ljubak joined #git
03:35 worstadmin joined #git
03:35 regedit joined #git
03:35 stevenxl joined #git
03:35 cfoch joined #git
03:35 howdoi joined #git
03:35 epic joined #git
03:35 Hess joined #git
03:35 addshore joined #git
03:35 jleclanche joined #git
03:35 moop joined #git
03:35 etcinit joined #git
03:35 da5id joined #git
03:35 contracode joined #git
03:35 codedmart joined #git
03:35 parliament joined #git
03:35 adambrenecki joined #git
03:35 ELLIOTTCABLE joined #git
03:35 MLM_ joined #git
03:35 belak joined #git
03:35 hussam joined #git
03:35 WillMoogle joined #git
03:35 kireevco joined #git
03:35 angelsl joined #git
03:35 martin_g joined #git
03:35 huhlig joined #git
03:35 [diecast] joined #git
03:35 stealthii joined #git
03:35 vcoinminer joined #git
03:35 Ferris_ joined #git
03:35 pizzaops joined #git
03:35 dunk joined #git
03:35 ghostlight joined #git
03:35 fahadash joined #git
03:35 yoyoyo_____ joined #git
03:35 bbhoss joined #git
03:35 prg318 joined #git
03:35 vargas joined #git
03:35 Singmyr joined #git
03:35 AlineGomes joined #git
03:35 Atm0spher1c joined #git
03:35 lebster joined #git
03:35 diogenese joined #git
03:35 heftig joined #git
03:35 nowhereman joined #git
03:35 zeller joined #git
03:35 teadrop_ joined #git
03:35 angular_mike_ joined #git
03:35 jw4242 joined #git
03:35 twisted` joined #git
03:35 theskillwithin joined #git
03:35 d0nn1e joined #git
03:35 kisonecat joined #git
03:35 SpeakerToMeat joined #git
03:35 sword joined #git
03:35 safe joined #git
03:35 umbSublime joined #git
03:35 daynaskully joined #git
03:35 netj joined #git
03:35 CheckDavid joined #git
03:35 msonntag joined #git
03:35 blackwind_123 joined #git
03:35 paws_ joined #git
03:35 jave joined #git
03:35 chachasmooth joined #git
03:35 ISmithers joined #git
03:35 pks joined #git
03:35 boombatower joined #git
03:35 alhariel joined #git
03:35 rwb joined #git
03:35 aidalgol joined #git
03:35 Shock- joined #git
03:35 khfeng joined #git
03:35 dirtyroshi joined #git
03:35 alhariel joined #git
03:35 Emperor_Earth joined #git
03:35 rominronin joined #git
03:36 khfeng_ joined #git
03:37 fatalhalt joined #git
03:37 justanotheruser joined #git
03:38 snowkidind joined #git
03:38 Limes_ joined #git
03:39 chachasmooth joined #git
03:43 ghostlight joined #git
03:44 Shentino joined #git
03:45 sunri5e joined #git
03:49 nickabbey joined #git
03:51 brent__ joined #git
03:53 rwb joined #git
03:54 TXRANGER joined #git
03:55 Vortex35 joined #git
03:58 TXRANGER left #git
04:02 umpc joined #git
04:04 a_thakur joined #git
04:04 Shock- joined #git
04:06 fstd_ joined #git
04:06 a_thakur joined #git
04:11 nicksloan joined #git
04:11 mizu_no_oto joined #git
04:28 eehackr_ joined #git
04:28 ayjay_t joined #git
04:28 hahuang61 joined #git
04:32 govg joined #git
04:34 mehola joined #git
04:37 Shock- joined #git
04:40 Mobutils joined #git
04:41 Sasazuka joined #git
04:49 subhojit777 joined #git
04:58 nbdy joined #git
05:04 Sasazuka joined #git
05:07 rominronin joined #git
05:09 Shock- joined #git
05:19 ayogi joined #git
05:19 sbulage joined #git
05:21 Shentino joined #git
05:21 slappymcfry joined #git
05:25 eehackr_ joined #git
05:30 govg joined #git
05:42 Shock- joined #git
05:45 mehola joined #git
05:45 nbdy joined #git
05:46 daynaskully joined #git
05:52 grumble joined #git
05:55 Cabanoss- joined #git
06:02 ayjay_t joined #git
06:02 Eatmeimanazuki joined #git
06:02 Eatmeimanazuki left #git
06:06 rscata joined #git
06:10 qt-x joined #git
06:10 a_thakur_ joined #git
06:15 Shock- joined #git
06:17 JanC_ joined #git
06:20 Shentino joined #git
06:28 lixujia joined #git
06:30 sweatsuit joined #git
06:38 tvw joined #git
06:38 rominronin joined #git
06:39 nd_ joined #git
06:46 Tanfrieze joined #git
06:46 systemovich joined #git
06:49 systemovich joined #git
06:50 ThomasLocke joined #git
06:50 ThomasLocke joined #git
06:50 Shock- joined #git
06:51 sweatsuit joined #git
06:52 systemovich joined #git
06:52 netj joined #git
06:54 dreiss joined #git
06:56 Raging_Hog joined #git
07:02 lordjancso joined #git
07:03 dec0n joined #git
07:07 cyan__ joined #git
07:08 zeroed joined #git
07:10 dave0x6d joined #git
07:12 dec0n_ joined #git
07:12 elsevero joined #git
07:19 PioneerAxon joined #git
07:20 almy joined #git
07:22 ki0 joined #git
07:23 Shock- joined #git
07:26 mizu_no_oto joined #git
07:26 chele joined #git
07:31 PCatinean joined #git
07:31 svm_invictvs joined #git
07:35 overlord_tm joined #git
07:35 ki0 joined #git
07:37 aax joined #git
07:39 mizu_no_oto joined #git
07:40 Sceorem joined #git
07:42 zefferno joined #git
07:46 rominronin joined #git
07:50 tvw joined #git
07:54 Shock- joined #git
07:58 iamtakingiteasy joined #git
07:59 a_thakur joined #git
08:00 pbrewczynski joined #git
08:03 a_thakur joined #git
08:04 cqi joined #git
08:07 acetakwas joined #git
08:11 CVDH joined #git
08:12 fmeerkoetter joined #git
08:12 CVDH left #git
08:14 pcre joined #git
08:19 tvw joined #git
08:22 chele joined #git
08:22 ThomasTang joined #git
08:25 systemovich joined #git
08:25 freimatz joined #git
08:26 Duikb00t joined #git
08:26 Duikb00t Morning all.
08:27 eehackr_ joined #git
08:27 Shock- joined #git
08:27 ygeLN joined #git
08:30 byte512 joined #git
08:31 eduardas_m joined #git
08:31 fbwnd joined #git
08:32 danslo joined #git
08:40 akagr joined #git
08:40 bannakaffalatta joined #git
08:41 kurkale6ka joined #git
08:43 Balliad joined #git
08:45 Balliad joined #git
08:46 jfr joined #git
08:48 akagr left #git
08:50 freimatz3 joined #git
08:51 afuentes joined #git
08:52 King_Hual joined #git
08:52 King_Hual joined #git
08:52 elh9 joined #git
08:52 DanmerZ joined #git
08:53 theoceaniscool joined #git
08:53 Macaveli joined #git
09:01 Shock- joined #git
09:01 ayogi joined #git
09:02 anddam left #git
09:06 marcogmonteiro joined #git
09:06 inflames joined #git
09:07 tuor Hi, i have multiple commits in the current branch master. The commits are pushed. Now I need to push an older state again. The changes should be reverted. Is there a simpler way then revert each commit?
09:10 sea-gull joined #git
09:10 zoraj joined #git
09:12 zoraj hi guys, happy new year, I've done a git remote pull,now, I want to cancel this and rollback to my old version because the pull did some regression to the project
09:12 zoraj how can I do that
09:12 zoraj ?
09:12 ki0 joined #git
09:13 jknetl joined #git
09:18 Duikb00t I have a question. For now I am working all alone with Git Im using some basic functionality to rollback commit, etc etc on a dev and master branch. Soon I'll will have a project where I work on with 2 people.
09:19 Duikb00t Just a really really basic example what if I have 1 main repo on (github/bitbucket.. locally)  and I work in 'foo.txt' and  I make changes and the second user makes changes as well in that file...
09:19 Duikb00t I assume they need to be merged and I will get 'conflict' errors.
09:19 Snugglebash joined #git
09:20 Duikb00t Is this some manual process you have to fix? to merge the code into a 'clean' file or how does that work?
09:21 tuor Duikb00t, it depends if your changes in that file conflicts with the changes the other did. If they conflict, yes you need to merge manualy. Lets say you both just add a line somewhere, that's it, then git will merge both changes for you. Test it out ;)
09:21 Duikb00t Ok great thanks. 1 more thing... how do people manage that flow with a project with 10 people working on it?
09:22 Duikb00t let's say... the change they overwrite some code is like 80%?
09:22 jnavila joined #git
09:22 Duikb00t Then you have to work hours and hours on fixing it all?
09:22 bannakaffalatta joined #git
09:22 Duikb00t Or am I seeing problem where there is no problem ( I have to mention I am working for now already 5 years as lonely dev )  :D
09:24 tuor Duikb00t, you don't work all on the same file. You splitt stuff up. One is working in class a the other one on class b. You splitt stuff up.
09:25 Duikb00t yes but from a MVC perspective : What if I work on a ... ( think think)  a calendar page and a to do list  where both 'views' and controllers need stuff from eachother ( or something )
09:25 Duikb00t then you probably will be working in the same files while you are setting up specific functionality
09:26 clmsy joined #git
09:27 tuor Maybe someone with more experiance can better answer this questions. ;)
09:27 finalbeta joined #git
09:27 Duikb00t Is this a point where agile/scrum things are being used as structure for a project or... am I missing the point :D
09:28 jottr joined #git
09:28 star_prone joined #git
09:31 Serpent7776 joined #git
09:31 kadoban Duikb00t: In practice, if everyone is changing the same *exact* code over and over, not even the same file, the same code ... nothing can save you. That's so rare though that you'd almost have to be trying to do it.
09:32 william1835 joined #git
09:32 william1835 left #git
09:32 Duikb00t ok :)
09:32 kadoban Duikb00t: I think you're worrying over not much. Merge conflicts come up, and they're a bit tedious now and then, but mostly they're not that bad.
09:34 Shock- joined #git
09:35 encod3 joined #git
09:37 SteffanW joined #git
09:37 chll_ joined #git
09:37 Xatenev joined #git
09:37 Xatenev Heya
09:37 Xatenev Anybody familiar with gitolite?
09:37 Xatenev Im having trouble starting a gitolite shell manually..
09:37 encod3 joined #git
09:38 jast I've been using it for a while. what are you trying to do?
09:38 Xatenev I got a post-update script
09:38 Xatenev That i wanna start manually
09:38 Xatenev It validates that some ENV variables are set before it executes its' stuff.
09:38 Xatenev Those env variables are apparently only set within the so-called "gitolite" shell
09:38 Xatenev (Atleast I've read that online)
09:39 Xatenev I tried to use locate gitolite-shell but obv that doesn't exist.
09:40 jast what variables do you need?
09:40 Xatenev Umm let me check that
09:40 Xatenev Running a quick updatedb
09:41 Xatenev GL_RC
09:41 Xatenev GL_BINDIR and GL_ADMINDIR
09:41 jast okay
09:42 jast give me a moment to try and remember how this all works :)
09:42 Xatenev jast: That would be great :)
09:44 Xatenev I could probably just run a git pull - but I have no idea where my repo is. LOL
09:45 jast post-update is run after a push to the repo, not a pull in/from it
09:45 PCatinean joined #git
09:45 pcre joined #git
09:45 Xatenev Oh okay
09:45 Xatenev Are you sure?
09:45 sitaram Xatenev: x-y problem
09:45 Xatenev Cause It wouldnt make senes then
09:45 jast very
09:45 jast man githooks
09:45 gitinfo the githooks manpage is available at http://jk.gs/githooks.html
09:45 Xatenev sitaram: Don't think so tbh :p
09:45 Xatenev sitaram: There is a repository to define the gitolite users called gitolite-admin.git
09:45 jast what's your post-update script doing, by the way?
09:46 jast you don't need to explain, sitaram wrote gitolite :P
09:46 sitaram :)
09:46 jast talking about it summoned him from the void
09:46 gr1sha joined #git
09:46 davimore_ joined #git
09:46 Xatenev Cool :)
09:46 jast or something like that. I never did figure out how he does it. :}
09:46 xall joined #git
09:46 Xatenev Let me explain it then tho what im trying to do
09:46 Xatenev If you think its an XXY
09:47 Xatenev The repository that defines the gitolite users called gitolite-admin.git - I don't have access to it cause im no gitolite admin
09:47 Xatenev I wanna add myself to it
09:47 sitaram jast: wish it would always work that way.  I have highlight" set on "gitolite" but I have to log in to my tmux session to see it
09:47 Xatenev Cause I can't clone it I wanna add myself manually and perform the compilation
09:47 sitaram just so happened I logged in just now :)
09:47 jast sitaram: yeah, I guessed as much :)
09:47 Xatenev Well yeah thats basically it
09:47 gr1sha :q
09:47 Xatenev Ive added myself to gitolite.conf - now I have to start the compiltaion process
09:47 Xatenev compilation*
09:47 sitaram Xatenev: assuming gitolite v3, look in gitolite.com for the word "emergencies"
09:47 jast I'm pretty sure there's a really easy way to do that...
09:48 Xatenev How can I find out the version?
09:48 sitaram Xatenev: what script does the "command=" parameter point to in ~/.ssh/authorized_keys, for existing gitolite users?
09:48 Oleh_ joined #git
09:49 Xatenev Authorized keys?
09:49 Xatenev wat?
09:49 Xatenev theres obv no command= in authorized_keys
09:49 pcre_ joined #git
09:49 jast gitolite manages the authorized_keys file in the gitolite account, otherwise it wouldn't work
09:50 jast unless you've got an HTTP-only setup but one does not set that up by accident
09:50 jast sitaram: might wanna add a --version flag to gitolite ;)
09:50 Xatenev Dunno theres nothing like that in my authorized keys
09:50 Xatenev Just.. ssh keys
09:50 jast the authorized_keys file on the server, in gitolite's home?
09:50 sitaram jast: 'info' command shows it; I assumed he was on the server
09:50 jast oh, right
09:50 jast I didn't look very hard for version info
09:51 Xatenev sitaram: there is no "gitolite push"
09:51 Xatenev sitaram: On my server.
09:51 sitaram Xatenev: are you logged in to the server that is hosting gitolite?  You can't "add yourself" from a client, without already being an admin
09:51 Xatenev Yea
09:51 Xatenev I am.
09:51 Xatenev with root access
09:52 nyuszika7h joined #git
09:52 sitaram I don't need root; go to the home directory of the gitolite hosting user (probably "cd ~git" or "cd ~gitolite", depending on who installed it and how)
09:52 Xatenev Ah
09:52 Xatenev ~gitolite exists.
09:52 Xatenev I am there
09:53 nowhereman joined #git
09:54 jast in fact even a simple 'ssh gitolite@...' will output version info. I should have remembered that...
09:54 TomyWork joined #git
09:54 Xatenev What now?
09:54 phanimahesh joined #git
09:54 kadoban Xatenev: Look in ~gitolite/.ssh/authorized_keys for the command= part
09:55 BadSnappa joined #git
09:55 jknetl joined #git
09:55 Xatenev Ah yea
09:55 Xatenev It says:
09:55 Xatenev command="/usr/bin/gl-auth-command username",no-port-forwarding,....
09:56 oskarkv joined #git
09:56 Xatenev f.e. /usr/bin/gl-auth-command xatenev
09:56 jast that's gitolite 2, then, I believe
09:56 sitaram yeah; too old sorry.  I suggest you upgrade.  If you installed via RPM/DEB, try "<yum|apt-get> install gitolite3" or similar
09:57 Xatenev Yea I cna't upgrade now sorry
09:57 Xatenev Im not doing this stuff regularly
09:57 jast doesn't g2 have an equivalent to 'gitolite push'?
09:57 jast gl-admin-push
09:57 sitaram yes
09:57 Xatenev "Unable to determine correct path for gitolite scripts from the authkeys file"
09:57 Xatenev It says.
09:58 jast it expects to be run by the gitolite user
09:58 sitaram "su - gitolite" and then do all that
09:59 jast or you can cheat: GL_BINDIR=/usr/bin gl-admin-push but let's avoid ugly hacks if we can help it
09:59 sitaram but TBH I forgot how that is supposed to be used
09:59 jast it'd probably mess up a bunch of file permissions if you cheat
09:59 sitaram jast: running as root?  almost certain to...
09:59 Xatenev Now I just have to find the repo
09:59 Xatenev LOL
10:00 Xatenev gl-admin-push: Not a git repo
10:00 sitaram Xatenev: WAIT
10:00 sitaram oops
10:00 Xatenev ok
10:00 sitaram hit caps lock by mistake
10:00 * Xatenev stops doing everything
10:00 sitaram wait
10:01 timothy joined #git
10:01 sitaram Xatenev: http://paste.fedoraproject.org/519260/48343768/  -- extract from the documentation for v2
10:02 sitaram good luck
10:02 jast you should be able to find the repo locations in ~gitolite/.gitolite.rc or /etc/gitolite/gitolite.rc
10:03 * sitaram has to go to a meeting
10:06 Xatenev now i just have a keydir cloned
10:06 Xatenev OMF
10:07 Xatenev GOMFG
10:07 Xatenev ok im relaxing again
10:08 netj joined #git
10:09 Xatenev Okay I cloned it made the change and everything is okay
10:09 Xatenev then when i try to push it:
10:09 Xatenev remote: ENV GL_RC not set
10:09 Xatenev Did I destroy it? :D
10:09 kurkale6ka joined #git
10:09 Shock- joined #git
10:10 encod3 joined #git
10:10 jast Xatenev: when using gl-admin-push?
10:10 Xatenev When using the casual git push
10:11 jast yeah, you can't use that in this case
10:11 Xatenev Ive just cloned th erpeository with my root user @ the server
10:11 jast and you can't use root, either
10:11 Xatenev Why?
10:11 Xatenev Other people clone the repo
10:11 Xatenev its the same, not?
10:11 jast because a local push does everything directly on the file system
10:11 Xatenev Yea idk im done then
10:11 jast so the new objects in gitolite-admin.git would belong to root and that would mess up future pushes
10:11 Xatenev no idea how to solve this
10:12 jast you just have to do the temporary clone, along with the changes and the final gl-admin-push, all as the gitolite user
10:12 mgedmin suid bit on each directory \o/
10:12 jast that's precisely what you use gitolite to avoid :}
10:12 Xatenev What temporary clone
10:12 Xatenev I temporary cloned it
10:12 mgedmin because fixing umasks for every user is /o\
10:13 Xatenev I can't clone it with the gitolite user himself cause permission denied.
10:13 timothy joined #git
10:13 Xatenev ls
10:13 Xatenev whoops
10:13 jast you do need to find a location where gitolite has write permissions. /tmp should do it...
10:13 timothy left #git
10:14 timothy joined #git
10:14 timothy left #git
10:14 jfr joined #git
10:15 encod3_ joined #git
10:15 Xatenev Do i have to commit it?
10:15 Xatenev Or run instantly gl-admin-push
10:17 Xatenev OMGOMG it worked
10:17 Xatenev thanks! jast and sitaram
10:17 ghostlight joined #git
10:17 jast good to hear
10:17 chele joined #git
10:20 evie_hammond joined #git
10:20 encod3 joined #git
10:22 aw1 joined #git
10:22 xall joined #git
10:24 modin joined #git
10:29 xall_ joined #git
10:30 Starcraftmazter joined #git
10:30 Starcraftmazter hi
10:30 sitaram I hate it when they act so surprised it worked.  It jolly well is *supposed to* :-)
10:31 shiriru joined #git
10:31 Xatenev sitaram: Well, I mostly act surprised when I don't understand things
10:31 Xatenev sitaram: and get to the phase "try out random things youve read in the internet"
10:32 jast the most dangerous phase :)
10:32 jast we get the occasional person who has tried random things beyond the point of recovery
10:32 Starcraftmazter if i am on a branch which has several commits and in the middle there is a merge from another branch, is there a way to undo specifcially that merge using its commit hash, without touching any of the commits before or after that merge?
10:33 sitaram Xatenev: one piece of advice for you: always look for a "non-root" solution.  The amount of trouble that running as root, when you should not, causes, is usually high
10:33 Xatenev sitaram: makes sense
10:33 jast Starcraftmazter: sort of, but reverting merges has pitfalls... !revert_merge
10:33 gitinfo Starcraftmazter: [!faulty_merge] If you have published a merge commit that turned out to be faulty and you'd like to get rid of it, you're probably not going to have a good time. Here's the full story: https://raw.github.com/git/git/master/Documentation/howto/revert-a-faulty-merge.txt
10:34 sitaram Xatenev: the nice thing about gitolite (and probably all the gui ones as well) is that nothing in the gitolite source code will damage any of your *actual* repos; at worst you damage the gitolite-admin repo
10:34 sitaram (and even that takes real effort)
10:34 Xatenev hehe
10:39 danslo jast: thanks, that was a useful read. I've been bitten by that before, and didn't know what was happening. so just ended cherry-picking a bunch of stuff
10:40 Starcraftmazter jast: this is not in master or anything
10:40 Starcraftmazter not that it would matter?
10:42 Shock- joined #git
10:44 acetakwas joined #git
10:45 jnavila joined #git
10:48 EisNerd joined #git
10:52 denisMone joined #git
10:53 Snugglebash joined #git
10:53 EisNerd_ joined #git
10:53 Snugglebash joined #git
10:54 sdothum joined #git
10:59 PioneerAxon joined #git
11:04 mahendratech joined #git
11:05 theShirb- left #git
11:10 YuGiOhJCJ joined #git
11:12 Singmyr joined #git
11:16 Shock- joined #git
11:19 bouncy joined #git
11:22 d0nn1e joined #git
11:23 eehackr joined #git
11:23 Snugglebash joined #git
11:25 mazert joined #git
11:26 bumpy joined #git
11:28 phanimahesh joined #git
11:29 CheckDavid joined #git
11:37 joki joined #git
11:42 DaveTaboola joined #git
11:47 vrlx joined #git
11:47 phanimah1sh joined #git
11:49 Junior joined #git
11:49 Junior yello and "happy new year"! :)
11:49 fission6 joined #git
11:49 PCatinean joined #git
11:50 Renter "happy new year" to "you, too"
11:50 Shock- joined #git
11:50 ertesx joined #git
11:55 a_thakur joined #git
11:56 jnavila joined #git
11:56 FunTan6 joined #git
11:56 nettoweb joined #git
12:00 temp___ joined #git
12:00 marcogmonteiro joined #git
12:01 manuelschneid3r joined #git
12:01 a_thakur joined #git
12:01 nettoweb1 joined #git
12:02 temp___ hello, what could be the reason for "git rev-list --first-parent HEAD ^master" to include the last merge commit to master on one machine and not include it on another one ? did something change between git releases or is this controlled by some setting ?
12:04 Nerbrun joined #git
12:06 [log] joined #git
12:07 Cavallari joined #git
12:07 nettoweb joined #git
12:08 [log] joined #git
12:08 [log] joined #git
12:10 cdown_ joined #git
12:10 osse temp___: No good reason other than that master is not fully up to date on one them. Try origin/master
12:11 temp___ yeah, looks like it, "git show master" produces different results
12:11 temp___ thanks
12:12 encod3 joined #git
12:12 thiago joined #git
12:13 [log] joined #git
12:14 [log] joined #git
12:14 nettoweb1 joined #git
12:15 freimatz3 joined #git
12:16 Rodya_ joined #git
12:16 dviola joined #git
12:17 robotroll joined #git
12:17 FunTan6 joined #git
12:19 grydholt joined #git
12:19 Mogget joined #git
12:19 midgetspy joined #git
12:19 ajpiano joined #git
12:19 hegge_ joined #git
12:19 phroa joined #git
12:19 quizzi joined #git
12:19 ixian joined #git
12:19 sparr joined #git
12:19 stfn joined #git
12:19 errr joined #git
12:19 kadoban joined #git
12:19 M-ou-se joined #git
12:19 batrick joined #git
12:20 Anthaas joined #git
12:20 mquin joined #git
12:20 wcpan joined #git
12:20 miklcct joined #git
12:20 worstadmin joined #git
12:21 eltopo[m] joined #git
12:21 Tsutsukakushi joined #git
12:21 Sheogorath[m] joined #git
12:21 blackjid joined #git
12:21 endiruna joined #git
12:21 fcrick joined #git
12:21 Ineentho[m] joined #git
12:21 KekSi i'm having a best-practice problem.. currently we have multiple (java) projects in repos and it's annoying (all sorts of reasons).. how would i go about moving projects out of the repos and into their own repos while keeping the history and everything
12:21 WillMoogle joined #git
12:21 _flow__ joined #git
12:21 SpEcHiDeR joined #git
12:22 Bengi joined #git
12:22 contracode joined #git
12:22 cfoch joined #git
12:22 ELLIOTTCABLE joined #git
12:22 ToeSnacks joined #git
12:23 KekSi i've thought about forking and then removing files.. or is there a better way to do it? with fork+remove there's going to be a lot of commits in the history to files that don't exist any more but i'm guessing there's no way around this..?
12:23 codedmart joined #git
12:24 Shock- joined #git
12:25 diego1 joined #git
12:25 martin_g joined #git
12:25 bbhoss joined #git
12:25 osse KekSi: filter-branch can automatically remove commits that become empty after
12:25 diego1 joined #git
12:26 matthiaskrgr hm, so there is a git repo which I use in many different places (only for pulling) on my system
12:27 matthiaskrgr in order to optimize this, I would like to have one central repo that fetches from the upstream sever (internet) and make all the other local copies to just pull from that one cental local repo to save some bandwith
12:27 matthiaskrgr what would be the best way to do this?
12:27 KekSi thanks osse, i'll look into it
12:28 matthiaskrgr can I make the  internet to central   repo in a way so that it does not check out all the files (--bare) ?
12:28 osse matthiaskrgr: cd /central/location; git clone [--bare if you wish] blablabla; cd other/places; git clone /central/location
12:28 [log] joined #git
12:29 freimatz3 joined #git
12:29 ghostlight joined #git
12:31 Anticom joined #git
12:31 dan2k3k4 joined #git
12:32 matthiaskrgr mmh, and to update, I cd  central/repo ; git fetch ; cd local_repo ; git pull  ?
12:32 osse matthiaskrgr: yes
12:32 matthiaskrgr ok, great, thanks =)
12:32 noecc joined #git
12:33 Dev0n hey, at which point should you commit a version number for your project?
12:33 Dev0n should this be done as the last commit in dev then merge across to staging then master?
12:33 dsdeiz joined #git
12:33 dsdeiz joined #git
12:34 jast ideally you'd avoid committing it altogether and having your build scripts handle that kind of thing... failing that, yeah, that's an option, as is bumping the version number directly after the merge
12:35 Dev0n ahh, say if I were to use the build scripts to bump versions, it would still be the same process after right?
12:35 Dev0n as in, commit in dev, merge staging then prod.
12:36 jast yeah, basically use 'git describe' or something like that in your build script, and create a tag when you're done merging
12:36 Dev0n gotcha, thanks
12:37 encod3 joined #git
12:38 dan2k3k4 joined #git
12:39 BSAlb joined #git
12:39 KekSi osse: but using filter-branch i would probably fork the old repository n times before doing that (with n being the number of projects i have in the repo)? for example repo->(projectA,projectB) i would form two new repos projectA and projectB which would each hold the contents of the folders individually before running filter-branch on each of them?
12:40 KekSi i'm still completely unsure as to the correct way of doing this :S
12:40 bsanford joined #git
12:40 jast KekSi: something like that. if projectA and projectB are confined to their own subdirs, filter-branch can actually take care of rewriting all of the file trees to contain only files from one subdir
12:40 jast --subdirectory-filter or something like that
12:41 mgedmin KekSi: yes, clone for each subproject then filter-branch to remove files not relevant for each subproject
12:41 mgedmin KekSi: perhaps also check out git subtrees
12:42 mgedmin http://stackoverflow.com/questions/359424/detach-move-subdirectory-into-separate-git-repository sounds like what you want?
12:42 Rodya_ joined #git
12:45 troulouliou_div2 joined #git
12:46 Anja_ joined #git
12:47 diogenese joined #git
12:49 gajus joined #git
12:50 KekSi this is pretty much it: https://paste.ee/p/IoFA4
12:52 KekSi but i think the subtree thing will let me do pretty much exactly that
12:55 timvisher joined #git
12:56 Tobbi joined #git
12:56 [log] joined #git
12:57 [log] joined #git
12:57 ojdo joined #git
12:58 [log] joined #git
12:58 Shock- joined #git
12:59 [log] joined #git
12:59 [log] joined #git
13:00 evanc joined #git
13:00 dviola joined #git
13:01 bsanford joined #git
13:05 Knirch hmm, I have seemingly begun seeing an increase of errors during rebase, with "error: Could not parse conflict hunks in <file>" and git status showing UU <file> and mergetool not wanting to touch it, is there something I can do? or something I have done to cause this? I'm fairly certain this started somewhat recently
13:06 treehug88 joined #git
13:07 cdown joined #git
13:07 osse KekSi: yes, that is how i would do it
13:07 osse not sure if it's the best way. it's the only one i know of
13:08 jnavila joined #git
13:08 Knirch nm, seems it was rerere, (I thought I had disabled it by commenting the rerere section, but aparently it's set to true elsewhere, setting it to false let me work on the file as usual)
13:09 KekSi i think it's pretty much all i want (i'll have to look into automatically doing that or i'll have to manually go through 121 repos by hand :S)
13:09 KekSi thanks a lot for your help
13:12 Vinnie_win_r joined #git
13:12 jast Knirch: rerere defaults to enabled if rerere data already exists in your repo. perhaps it's become corrupted and you just need to clean it up a little...
13:14 isysd joined #git
13:14 phanimahesh joined #git
13:16 Menekshe joined #git
13:16 treehug88 joined #git
13:17 str joined #git
13:17 timvisher joined #git
13:18 buzzLightBeer joined #git
13:19 elh9 joined #git
13:19 Prasad_ joined #git
13:20 denisMone joined #git
13:22 chiasmata joined #git
13:22 Eugene joined #git
13:24 treehug88 joined #git
13:26 WayToDoor joined #git
13:27 Wind0r joined #git
13:29 osse KekSi: are they somewhat neatly separated by directory?
13:31 jknetl joined #git
13:32 jeffreylevesque joined #git
13:35 Shock- joined #git
13:35 roent joined #git
13:35 rumble joined #git
13:36 DonRichie joined #git
13:37 roent left #git
13:38 WakiMiko joined #git
13:40 jdoe1234 joined #git
13:44 jdoe1234 Hello, I am wondering if git lfs is supposed to work if multiple push url are added to one remote, on my case (gitlab + bitbucket as push url on one remote), it seems that only one of the two receives the lfs data. Any idea on how to check / correct that ?
13:45 grawity um, why *do* you have two completely different servers as one remote?
13:45 jdoe1234 one is kinda my ofsite backup
13:45 jdoe1234 -offsite
13:46 thiago when you do a git push, which one does it get pushed to?
13:46 jdoe1234 so it's really convenient to do only one git push that pushes to 2 urls at the same time
13:46 mozzarel1 joined #git
13:46 jdoe1234 git pushes pushes to both of them
13:46 grawity joined #git
13:46 jdoe1234 but not the lfs data
13:46 bl0m1__ joined #git
13:47 thiago what happens if one of them rejects the push?
13:47 rivarun joined #git
13:47 jdoe1234 dunno
13:47 thiago sounds like a bad idea to use this technique then
13:47 jlewis joined #git
13:47 kugel joined #git
13:47 kugel joined #git
13:47 Renter joined #git
13:47 mukmuk_ joined #git
13:47 padde joined #git
13:47 Gabemo joined #git
13:47 padde joined #git
13:47 Gabemo joined #git
13:47 AlHafoudh joined #git
13:47 sns joined #git
13:47 freekevin joined #git
13:47 heinrich5991 joined #git
13:47 jdoe1234 no it's reallyè cool appart from fls support
13:47 cydrobolt joined #git
13:47 cydrobolt joined #git
13:47 pitastrudl joined #git
13:47 jdoe1234 -lfs
13:47 watersoul_ joined #git
13:47 XVar joined #git
13:47 preaction joined #git
13:47 ikonia joined #git
13:47 ollien joined #git
13:47 jdoe1234 I mean my question is just about lfs in my context, not about having two remotes
13:48 roger_raymond joined #git
13:48 BadSnappa joined #git
13:48 brandonw joined #git
13:48 jdoe1234 a remote with 2 push urls
13:48 Moult joined #git
13:48 Mixologic joined #git
13:48 daishan joined #git
13:48 mazert_ joined #git
13:48 TooLmaN joined #git
13:48 Nicmavr joined #git
13:48 jjasinski joined #git
13:49 dendazen joined #git
13:49 jdoe1234 fyi, I just did git remote set-url --add --push origin gitlaburl, then git remote set-url --add --push origin bitbucketurl
13:49 WakiMiko joined #git
13:49 rwb joined #git
13:50 llamapixel joined #git
13:50 siddart joined #git
13:51 yanome joined #git
13:51 Neico joined #git
13:53 Kobaz joined #git
13:54 jdoe1234 and also it is working if I have only one push url
13:54 cstrahan joined #git
13:54 ulkesh joined #git
13:54 yoyoyo_____ joined #git
13:56 kaldoran joined #git
13:58 ghostlight joined #git
13:58 sylario joined #git
13:59 saml joined #git
14:00 BrownBear joined #git
14:01 VladGh joined #git
14:02 dave0x6d joined #git
14:05 enckse joined #git
14:06 storrgie joined #git
14:07 HardlySeen joined #git
14:07 HardlySeen joined #git
14:09 Shock- joined #git
14:10 aavrug joined #git
14:11 gmacisme_ joined #git
14:11 aavrug joined #git
14:12 ExoUNX joined #git
14:13 dermoth joined #git
14:16 ioer3 joined #git
14:17 jimi_ joined #git
14:18 EvilDMP joined #git
14:19 nicksloan joined #git
14:21 EvilDMP While working on a pull request, I've made a number of commits. In the meantime, the target branch for my pull request has itself been updated, so I've merged that into my branch. It means though that my commits and the other others are interleaved, which is going to make it harder to squash my work into a single neat commit.
14:22 EvilDMP What's a good strategy to use now?
14:22 SpeakerToMeat joined #git
14:22 EvilDMP I can rebase the recent commits and reorder them I think, which might help.
14:22 grawity they're not interleaved; they walk two different paths
14:23 grawity and yes, `git rebase` is how one can flatten merges
14:23 fbwnd joined #git
14:23 EvilDMP grawity: but as far as using fixup on my commits to flatten them into one, I can't do that *without* reordering I believe
14:24 EvilDMP I wanted to know if there might be a better way to proceed at this point.
14:24 grawity I don't exactly see the problem, tbh
14:24 snowkidind joined #git
14:26 ikelso joined #git
14:26 EvilDMP grawity: there's not a problem exactly - but if there's a better way to do what I'm doing, I'd be pleased to know.
14:27 Vortex34 joined #git
14:28 jast when updating against the original target, use rebase instead of pull to get clean history. you can do it now and it'll get rid of the merge (that makes the log look interleaved in its default format, even though it's not actually interleaved)
14:28 jast assuming that nobody else is working on your branch
14:28 grawity *use pull --rebase instead of pull
14:29 jast yeah, that
14:29 GGMethos joined #git
14:29 thiago EvilDMP: the correct strategy is to have the correct number of commits on the current target at the moment you send your request
14:29 thiago so, clean up before you ask it to be merged
14:29 DINOWILLIAM joined #git
14:30 thiago if the target branch gets updated, you may merge, rebase or do nothing
14:30 EvilDMP Thank you all, will try.
14:31 GGMethos joined #git
14:31 jast holy. looking at atlassian's tutorial about merge vs. rebase right now, and there's an ugly mistake in the very first set of examples.
14:32 GodGinrai joined #git
14:32 mage_ jast: which one?
14:32 jast claiming that 'git merge master feature' == 'git checkout feature; git merge master'
14:32 jast https://www.atlassian.com/git/tutorials/merging-vs-rebasing/conceptual-overview
14:33 thiago git rebase can do that
14:33 jast and merge can spawn octopi
14:33 NicoHood joined #git
14:33 thiago right, which is why it can't do that
14:33 jast right
14:33 thiago anyway, git merge <currentbranch> is no-op, so that actually does work
14:33 NicoHood does a local git config overwrite the global one or vice versa?
14:33 jast my guess is someone inserted it in the wrong section by accident, because this bit is missing in the section about rebase
14:33 jast NicoHood: local wins
14:34 thiago NicoHood: local overrides global, global overrides system
14:34 jast the assumption being that the more local, the more specific it's supposed to be
14:34 thiago NicoHood: lizard poinons spock, spock vaporises rock, rock crushes lizard, lizard eats paper, paper disproves spock
14:35 jast thiago: yeah, but the examples kind of imply that the user is *not* on either of the two branches
14:35 EvilDMP Is there a way to rewind a local branch back to a previous commit, so that the subsequent commits are in effect discarded? I can switch to another branch, delete my branch, and checkout -b a new branch with the name of the one I just deleted, based on the commit I want - but it's rather long-winded!
14:35 thiago EvilDMP: yes, that's the git reset command
14:35 thiago EvilDMP: add --hard to make it check out the branch after it's rewound
14:35 EvilDMP thiago: thanks, I will look it up
14:35 jast EvilDMP: wouldn't simply rebasing against the upstream branch be way faster?
14:36 jast unless this is a new topic now
14:36 EvilDMP jast: I want to go back a couple of steps to try out the pull --rebase command suggested above
14:36 jast it should work even now, without having to undo anything
14:37 Xatenev The support in #git is really pretty good :)
14:37 jast the whole idea is that rebase (and pull --rebase) automatically rewinds you to the current state of the upstream branch, and then re-plays your local commits
14:37 Xatenev Too bad I don't have git problems too often :(
14:37 reser joined #git
14:37 NicoHood Xatenev: try svn then if you want problems :D
14:37 jast and it ought to be smart enough to notice all the merged commits don't need to be applied again
14:38 EvilDMP OK, let's try!
14:38 GodGinrai joined #git
14:38 Xatenev I'm afraid #git doesn't support svn and that #svn isn't nearly as cool as #git. :P #channelWar
14:41 uzuo joined #git
14:41 endiruna joined #git
14:42 weylin joined #git
14:42 Nilesh_ joined #git
14:42 [0xAA] joined #git
14:42 jast supporting svn isn't forbidden here
14:42 jast but not everyone likes the pain :P
14:42 ShekharReddy joined #git
14:42 thiago we support git-svn and the other conversion tools
14:42 demize joined #git
14:43 thiago so long as you're using Git, we can support you
14:43 Xatenev ^^
14:43 Shock- joined #git
14:43 thinkpad joined #git
14:43 fsckd left #git
14:44 jast I do feel a bit of pity when people have to use something like git-svn, so there's that
14:44 Dougie187 joined #git
14:45 jast (I've used it myself, after all... even contributed a fix or two, and wasn't that an interesting journey, having to wade through all the SVN interfacing code)
14:47 jast darn, there's no link for contributions/feedback on that atlassian tutorial
14:47 drbean joined #git
14:48 rnsanchez joined #git
14:51 hashpuppy joined #git
14:52 ams__ joined #git
14:52 noecc joined #git
14:53 shpew12 joined #git
14:54 chele joined #git
14:54 cdg joined #git
14:59 mmlb joined #git
14:59 AaronMT joined #git
14:59 e14 joined #git
15:00 nowhereman joined #git
15:03 EvilDMP jast, grawity: git pull --rebase is my favourite new tool, thanks
15:05 Rodya_ joined #git
15:07 jast EvilDMP: yeah, it's pretty great, but you can't use it if you're working on the same branch with multiple people and stuff like that... because in order to re-apply your commits, git creates new ones that just happen to look extremely similar, and if someone accidentally merges the old and the new versions, at best you get really ugly history
15:07 hussam joined #git
15:09 vxe joined #git
15:11 finalbeta joined #git
15:12 Aleric Rebase is evil, but so is EvilDMP, that's why he likes it.
15:13 _ikke_ lies!
15:13 Aleric lol
15:16 VagabondAzulien joined #git
15:17 jeffreylevesque its it possible to merge and only accept changes from the head
15:17 Shock- joined #git
15:17 jeffreylevesque to ignore everything else?
15:17 NicoHood is there a way to get a git config in the git preferred search? local>global>system
15:17 NicoHood I currently use git config --local user.signingkey which only gives me the config of the specified context
15:18 Aleric jeffreylevesque: I'd first merge with HEAD~1 using 'ours', and then do a normal merge with HEAD.
15:19 jeffreylevesque bc i did git pull upstream master
15:20 jeffreylevesque and it seems the conflict, all i want is the HEAD
15:20 jeffreylevesque and it's tedious
15:20 jeffreylevesque more than a couple dozen files i have to manually sift through
15:20 Aleric What about git cherry-pick ?
15:20 jeffreylevesque so far, either the file was deleted, of the diff is keeping the HEAD
15:21 jeffreylevesque *or the diff indicates that the HEAD is the change i want
15:21 jeffreylevesque i think there is over 100+ files i have to check
15:21 mukmuk_ left #git
15:22 GodGinrai Aleric: merge master race
15:23 zivester joined #git
15:24 Aleric Well, after what he wants to do, he's never going to be able to merge again anyway (unless he REALLY wants to ignore everything before the last commit, and does what I suggested first)
15:24 theskillwithin joined #git
15:24 Aleric After which you will never be able to push, of course :p.
15:25 Aleric So, taking that into account, I think he wants a cherry-pick
15:25 looper joined #git
15:26 SteffanW joined #git
15:26 7F1AAAAAB joined #git
15:26 GodGinrai that was actually in reference to your "rebase is evil" comment :P  I'm still having a hard time grasping what exactly jeffreylevesque is trying to do
15:26 tapout joined #git
15:26 jast NicoHood: just leave out the --local flag
15:27 YuGiOhJCJ joined #git
15:27 Rodya_ joined #git
15:28 nickabbey joined #git
15:28 _ADN_ joined #git
15:29 courrier joined #git
15:30 filcab joined #git
15:31 denisMone joined #git
15:33 InfoTest joined #git
15:33 hagabaka joined #git
15:33 JelmerD joined #git
15:34 lungaro joined #git
15:34 Sonderblade joined #git
15:36 kpease joined #git
15:37 souther joined #git
15:42 gtristan joined #git
15:42 lamont joined #git
15:43 jbitdrop joined #git
15:43 Tobbi joined #git
15:44 gargola joined #git
15:45 zefferno joined #git
15:46 re1 joined #git
15:48 mizu_no_oto joined #git
15:49 shubhnik joined #git
15:49 Rodya_ joined #git
15:49 SpeakerToMeat joined #git
15:50 subhojit777 joined #git
15:50 NicoHood jast: no this uses the local variable then
15:51 NicoHood and that is the problem
15:51 LionsMane joined #git
15:51 GodGinrai NicoHood: then what value *are* you trying to see?
15:51 NicoHood if no local is defined i want to know the global definition
15:51 Shock- joined #git
15:54 GodGinrai NicoHood: that's how it works without the flag
15:54 weckstrom joined #git
15:57 e14 joined #git
15:57 zzz joined #git
15:58 al-damiri joined #git
16:01 Xatenev left #git
16:02 jnavila joined #git
16:02 afuentes joined #git
16:02 xall_ joined #git
16:05 digidog joined #git
16:06 digidog_ joined #git
16:08 ejb joined #git
16:10 kevwil joined #git
16:11 davidosomething joined #git
16:12 TomyWork is there anything that will help me clone a subdirectory in Git yet?
16:12 Endarked joined #git
16:13 Phil-Work a subdirectory of a repository, without cloning the whole respository?
16:13 TomyWork wouldnt mind cloning the entire thing
16:13 TomyWork i just dont want to check it all out
16:13 Phil-Work "check it out" is an SVN term
16:14 TomyWork yes but it's also a git term
16:14 Phil-Work not in the context you are talking about
16:14 Phil-Work you checkout a commit
16:15 Phil-Work not a directory
16:15 thiago partial checkouts are still not supported
16:15 thiago (AFAIK)
16:15 thiago yuo can clone and not check anything out. That's possible.
16:16 TomyWork hmm maybe i'll just go with a sparse checkout then
16:17 elh9 joined #git
16:17 TomyWork i'll have to deal with the extra directory in between then... not a big deal actually
16:17 dreiss joined #git
16:17 Junior joined #git
16:17 GodGinrai TomyWork: so you don't want history, but are fine having the whole fileset?
16:18 TomyWork i do want history
16:18 TomyWork and i dont want the whole fileset
16:18 astrofog joined #git
16:19 TomyWork btw, the reason i dont mind cloning the whole thing is that i can share it with another local repo. Now I have a tiny problem with that as well
16:20 TomyWork git worktree supports checking out another branch in a separate directory
16:20 TomyWork however, I cannot have multiple copies of the master branch and check them out in two directories (sparse and non-sparse)
16:21 GodGinrai TomyWork: why do you not want the whole fileset, yet you want history?
16:21 TomyWork is there a way of transparently sharing the object storage of two local repositories?
16:21 jeffreylevesque is there a streamline command, which will allow me to add all files from a merge conflict, but only the HEAD component?
16:22 ash_workz joined #git
16:22 TomyWork jeffreylevesque you mean you want to resolve all conflicts as "use ours"?
16:22 jeffreylevesque yeah
16:23 TomyWork there's a merge resolution strategy for that
16:23 jeffreylevesque i want to add between the <<<<< HEAD ======
16:23 jeffreylevesque but, nothing under that
16:23 crayon joined #git
16:23 zoraj_ joined #git
16:23 Snugglebash joined #git
16:23 xall joined #git
16:24 TomyWork --strategy=recursive --strategy-option=ours # no guarantees
16:24 _Patrick_ joined #git
16:25 TomyWork jeffreylevesque you should not do that though. you are going to throw away your colleagues' work
16:25 jeffreylevesque it's my work
16:25 Shock- joined #git
16:25 jeffreylevesque what about `git checkout HEAD --`
16:25 Rodya_ joined #git
16:26 TomyWork that's going to throw away all changes, not just conflicting ones
16:26 elh9 joined #git
16:26 TomyWork you're really working against git there, btw
16:26 TomyWork reconsider what you are doing
16:27 SpeakerToMeat joined #git
16:29 TomyWork GodGinrai that repo used to be an SVN repo. SVN supports sub-directory checkouts. I checked out the entire thing to develop in and i had a separate sub-directory checkout which i basically used read-only, but where i always needed the latest trunk version
16:30 TomyWork so basically I need those two separate and I dont want all that clutter in the latest-trunk/master-sub-directory-checkout
16:30 GT4066 joined #git
16:30 TomyWork so sub-directory checkouts would be nice
16:31 TomyWork seeing the history is actually optional, but i need to be able to "git pull" to get the latest version.
16:32 khfeng joined #git
16:32 jost__ joined #git
16:32 Rapture joined #git
16:33 anonymuse joined #git
16:34 Rodya_ joined #git
16:37 TomyWork anyway, i gtg
16:41 sasso joined #git
16:41 sasso Hi! do i force git to check out for rename, after they have been done?
16:41 sasso *how do i force..
16:42 osse sasso: what do you mean by check out?
16:42 sasso to check for rename :)
16:42 Aleric It does that automatically
16:42 sasso it isn't working properly :(
16:43 osse sasso: if you use 'git add' on the new file and 'git rm' on the old file it'll all be good
16:43 Aleric It might help, but I'm not even sure if it does, when you use 'git mv oldname newname' to do the rename.
16:43 osse in the mean time you'll just see a new file and a deleted file in git sttus
16:43 fbwnd joined #git
16:43 tang^ joined #git
16:44 sasso osse: if it doesn't shows up in 'git status' how do i know it's working?
16:44 Aleric Yeah, in the end git will just compare files and see that they look alike and thus assume they were renamed... no worry
16:44 osse sasso: have you made a change at all ?
16:44 osse sasso: show me git status
16:45 sea-gull joined #git
16:45 Darren_ joined #git
16:45 kulelu88 joined #git
16:45 sasso yes a lot of import stuff was changed,  a list of deleted and a list of new files :/
16:46 osse yes, exactly
16:46 osse use git rm and git add
16:46 osse or maybe git add -A if that's all
16:49 sasso :/ isn't there some magic find something similar algorithm? there are tens of folder move and an hundred of single files
16:49 osse add -A
16:53 rominronin joined #git
16:53 Ryanar joined #git
16:54 TomyLobo joined #git
16:55 rominronin joined #git
16:56 sasso :( not working
16:56 qis joined #git
16:57 Raging_Hog joined #git
16:57 qis Can somebody tell me which safecrlf autocrlf cr-at-eol combination I need if I want to work with CRLF on windows (except .sh files) on Windows and in WSL and with LF on Unix? I don't want to see any warnings and most importantly, I don't want line ending changes to trigger file staging, ever.
16:57 jccn joined #git
16:58 rnsanchez joined #git
16:58 osse sasso: !repro
16:58 gitinfo sasso: [!transcript] Please paste (using https://gist.github.com/ or similar) a transcript ( https://git.io/viMGr ) of your terminal session so we can see exactly what you see
16:59 Aleric All I know is that files in the repository should always be just LF. So you need translation both on checkout and commit.
16:59 Shock- joined #git
16:59 xall joined #git
16:59 Aleric And then config somewhere for which extensions you want that (although it's mostly guessing right already.. the default should work fine)
17:00 Limes_ joined #git
17:00 [log] joined #git
17:01 Aleric (LF? I call it newline (\n)) :p
17:01 ronny joined #git
17:01 ronny hi
17:02 iLembus_ joined #git
17:02 [log] joined #git
17:02 [log] joined #git
17:03 _rht joined #git
17:03 matrixa1 joined #git
17:03 sasso :-) YES, i managed through to commit through the ide and to restore changes xD love changes history <3
17:04 gtristan I have a bare repository, and I want to know the submodules and commit refs for each respective submodule *for a given commit* of the bare/mirror repository
17:04 gtristan without performing a checkout
17:04 gtristan Can I do it ?
17:04 sasso maybe was too much to handle.. 1536 files changed, 6149 insertions(+), 5939 deletions(-)
17:04 [log] joined #git
17:04 Aleric gtristan: no
17:05 osse gtristan: read .gitmodiles, then do ls-tree on the locations and find the commit thingy
17:05 Aleric gtristan: A repository contains submodule info in a file (.gitmodules) which are translated into .git/modules/.. only after a git submodule init, so a bare repo won't have that info.
17:05 [log] joined #git
17:06 cdown joined #git
17:06 gtristan Hmmm, ok too bad :-/
17:06 [log] joined #git
17:07 Guest14887 joined #git
17:07 osse Aleric: oh? but the specific hash to use is recorded in the tree corresponding to the directory
17:07 Aleric Oh, that is true.
17:07 Aleric The hash should be somewhere yes
17:07 gtristan So I can do it ?
17:07 [log] joined #git
17:07 osse yes
17:08 * gtristan scratches head... sees code which is parsing submodules and doing exactly that git ls-tree, but it *happens* to be in a checkout
17:08 gtristan ok, I will try without :)
17:08 [log] joined #git
17:08 * gtristan does some small tests in his shell
17:08 ronny anyone aware of tools to sync sets of git repos includign rebases between multiple computers in a local network
17:08 ronny i have a laptop and a desktop, and i switchbetween them a lot, its a pain to keep git repos in sync
17:09 * Aleric sits next to gtristan cause he likes that gtristan talks in the third-person about himself.
17:09 mehola joined #git
17:10 wootehfoot joined #git
17:10 nickabbey joined #git
17:10 mehola joined #git
17:10 [log] joined #git
17:11 mehola joined #git
17:12 moestevens joined #git
17:12 rivarun joined #git
17:13 anonymuse joined #git
17:15 gtristan nice, take 'ref' as commit: `git show ref:.gitmodules`, without any errors, shows a parsable .gitmodules, and then git ls-tree can be used on those paths to show the commits
17:15 relipse joined #git
17:16 dave0x6d joined #git
17:16 relipse i've got mixed case files which will not get rid of . I've tried stashing, i've tried committing and i've tried pulling latest changes and i've tried git reset --hard master and nothing will get rid of these local files
17:16 relipse the only thing i can think of is to clone the repo afresh
17:17 [log] joined #git
17:17 felixjet joined #git
17:19 overlord_tm joined #git
17:19 relipse is there a way to fetch the latest from master and jump to the latest commit and blow all local changes out of the water
17:21 Aleric mixed case files?
17:21 Aleric All my files are case sensitive...
17:21 _ikke_ Aleric: de
17:22 _ikke_ Aleric: depends on your filesystem
17:22 _ikke_ ntfs / hfs (by default) are not
17:22 siddart joined #git
17:23 relipse _ikke_:  i'm on mac os x
17:23 Aleric Well, you don't want to squash everything to lower case or something because that would give problems for others
17:23 fuzzmz joined #git
17:23 _ikke_ rm all files and check out again
17:24 tyreld joined #git
17:24 _ikke_ git ls-files -z | xargs -0 rm && git checkout .
17:25 HardlySeen left #git
17:25 madewokherd joined #git
17:27 mustmodify joined #git
17:27 mustmodify I need to revert seven commits (or a single branch) that make up a feature. The commits are 20+ commits ago on master.
17:28 mustmodify Should I revert each one individually or can I do it in one?
17:28 mustmodify I guess I could use -n
17:28 _ikke_ No need to
17:28 _ikke_ you can specify multiple commits (or a range) to revert
17:29 mustmodify Oh, man suggests it just takes one hash.
17:29 mustmodify ok I'll do that, thanks.
17:29 _ikke_ The dots mean you can repeat it
17:29 GodGinrai mustmodify: "<commit>..." from the man page
17:29 _ikke_ and the explenation: "Commits to revert. For a more complete list of ways to spell commit names, see gitrevisions(7). Sets of commits can also be given but no traversal is done by default, see git-rev-list(1) and its --no-walk option. "
17:30 mustmodify It's unusually convenient that a-f are on the left side of the keyboard so you can type hex numbers with your right hand on the keypad.
17:31 mustmodify Well, the singular <commit> is what I meant.
17:31 mustmodify Oh, dots  mean repeat. That makes sense, thanks.
17:31 mehola joined #git
17:34 Shock- joined #git
17:34 Darcidride joined #git
17:34 xall joined #git
17:35 shubhnik joined #git
17:36 NeverDie joined #git
17:36 boombatower joined #git
17:37 svm_invictvs joined #git
17:38 mehola joined #git
17:38 jstimm joined #git
17:39 [log] joined #git
17:40 SpeakerToMeat joined #git
17:41 star_prone joined #git
17:42 [log] joined #git
17:42 denisMone joined #git
17:43 [log] joined #git
17:43 [log] joined #git
17:45 xall joined #git
17:45 chardan joined #git
17:45 AlgorithmWizard left #git
17:45 peepsalot joined #git
17:46 [log] joined #git
17:50 todd_dsm joined #git
17:51 e14 joined #git
17:54 LBV_User joined #git
17:55 e14 joined #git
17:55 cagomez joined #git
17:56 rominronin joined #git
17:57 up_the_irons joined #git
18:01 nickabbey joined #git
18:02 cagedwisdom joined #git
18:04 freimatz joined #git
18:04 King_Hual joined #git
18:04 King_Hual joined #git
18:04 bongjovi joined #git
18:06 noecc joined #git
18:06 ZeroZeroZeroZero joined #git
18:07 ikelso joined #git
18:09 Puffball joined #git
18:09 Shock- joined #git
18:09 shgysk8zer0 joined #git
18:10 jnavila joined #git
18:10 qis left #git
18:11 jimi_ joined #git
18:11 albel727 joined #git
18:12 vdv joined #git
18:13 ResidentBiscuit joined #git
18:14 ResidentBiscuit joined #git
18:14 LionsMane joined #git
18:14 ResidentBiscuit joined #git
18:16 ResidentBiscuit joined #git
18:19 gargola joined #git
18:20 jccn joined #git
18:20 ikelso joined #git
18:22 shgysk8zer0_ joined #git
18:22 gmac joined #git
18:23 aw1 joined #git
18:24 Rodya_ joined #git
18:25 romerocesar joined #git
18:26 parasite_ joined #git
18:27 WayToDoor joined #git
18:33 moei joined #git
18:34 Rodya_ joined #git
18:42 Shock- joined #git
18:42 Rodya_ joined #git
18:45 Rodya_ joined #git
18:48 vrlx joined #git
18:48 Tobbi joined #git
18:52 Anja_ joined #git
18:53 AaronMT joined #git
18:54 Rodya_ joined #git
18:54 ki0 joined #git
18:57 todd_dsm joined #git
18:58 dan2k3k4 joined #git
19:02 ikelso joined #git
19:02 ejb joined #git
19:02 netj joined #git
19:03 marc_v92 joined #git
19:04 iLembus__ joined #git
19:06 durham joined #git
19:06 ikelso joined #git
19:06 ResidentBiscuit joined #git
19:07 netj joined #git
19:08 thebope joined #git
19:09 Rodya_ joined #git
19:09 Balliad joined #git
19:10 polyrob joined #git
19:12 lenswipe joined #git
19:12 lenswipe joined #git
19:12 lenswipe hey guys
19:12 _ikke_ ohai
19:12 lenswipe anyone know if i can git ignore a pattern? like /public/{img|css|js}
19:13 osse you can use standard globs
19:13 lenswipe that it?
19:13 osse yes
19:13 lenswipe :(
19:13 lenswipe I want to ignore some files in the public directory but not all
19:13 grawity doesn't seem too horrible to just include /public/img and /public/js as separate lines
19:13 lenswipe grawity, it's not and I'll continue to do so...it' just theres img, build, js, css, and storage
19:14 GodGinrai lenswipe: lines in gitignore are more about ignoring filetypes than ignoring directories
19:14 lenswipe it would be nice to just be able to do /public/{build, css, js, img, storage}
19:14 GodGinrai lenswipe: which is why multiple filetypes on one line isn't a thing
19:14 lenswipe fair enough
19:14 lenswipe thanks anyway
19:14 GodGinrai np
19:15 fahadash joined #git
19:15 EvilDMP left #git
19:16 Shock- joined #git
19:18 mikeric joined #git
19:18 dsantiago joined #git
19:18 trig-ger_ left #git
19:19 e14 joined #git
19:20 dsantiag_ joined #git
19:20 kevwil joined #git
19:21 tyreld joined #git
19:23 Ryanar joined #git
19:23 Anja_ joined #git
19:26 Atm0spher1c joined #git
19:26 a3Dman joined #git
19:27 rominron_ joined #git
19:29 elh9 joined #git
19:30 rizonz when I fork a repo, create my own branches from it and push it should i create a new branche ?
19:31 netj joined #git
19:31 GodGinrai rizonz: what do you mean?
19:33 mehola joined #git
19:33 rizonz I pull the master repo, or actually fork it, and going to working in my own repo... I need to make a new branche, work in that and push from there every time
19:34 rizonz but what if it's merged, I pull the master again, create another branche ?
19:34 nickabbey joined #git
19:34 GodGinrai rizonz: yes.  Generally, it is good practice to develop each feature in a separate branch
19:35 Oatmeal joined #git
19:35 rizonz ok, but what if there are overlapping features ?
19:35 rizonz I mean, dev can go from here to there when devs didn't commit well and such
19:35 styx_ joined #git
19:35 hegge joined #git
19:35 shmup_ joined #git
19:35 krillr_ joined #git
19:35 hiroki joined #git
19:35 shpew12_ joined #git
19:35 Virox joined #git
19:35 bauruine joined #git
19:35 habbasi joined #git
19:35 d^sh joined #git
19:35 HelloShitty joined #git
19:35 javaJake joined #git
19:35 [Saint] joined #git
19:35 sysanthrope joined #git
19:35 trelane joined #git
19:35 Seveas joined #git
19:35 zero85 joined #git
19:35 comps joined #git
19:35 iveqy joined #git
19:35 Jupelius_ joined #git
19:35 ixian joined #git
19:35 Wasp joined #git
19:35 FilipNortic joined #git
19:35 synchronous joined #git
19:36 hiroki joined #git
19:36 murr4y joined #git
19:36 APNG joined #git
19:36 jdiez joined #git
19:36 hexagoxel joined #git
19:36 Jon28 joined #git
19:36 APNG joined #git
19:36 Cabanossi joined #git
19:36 olbat joined #git
19:36 thiago rizonz: each feature in a branch, until they're ready
19:36 causasui joined #git
19:36 nd joined #git
19:36 Spydar007 joined #git
19:36 watmm joined #git
19:36 traxo-xx- joined #git
19:36 musicmatze joined #git
19:36 gfixler joined #git
19:36 olbat joined #git
19:36 blahdodo joined #git
19:36 batrick joined #git
19:36 franks-reich joined #git
19:36 Dazzyp joined #git
19:36 WebDawg joined #git
19:36 M-ou-se joined #git
19:36 tuor joined #git
19:36 holodoc joined #git
19:36 trelane joined #git
19:36 rizonz thiago: ok, but when there is too much to fix, I first work from one branche
19:36 Jackneill joined #git
19:36 Karazhan joined #git
19:36 manuelschneid3r joined #git
19:36 Ekho joined #git
19:36 wgrant joined #git
19:36 linduxed joined #git
19:36 nickthetait joined #git
19:36 Singmyr joined #git
19:36 SJr joined #git
19:36 markmarkmark joined #git
19:36 idlemind joined #git
19:36 Aleric joined #git
19:36 wcpan joined #git
19:36 kadoban joined #git
19:36 psyb0t joined #git
19:36 miklcct joined #git
19:36 salamanderrake joined #git
19:36 thiago bug fixes go directly to the branch the bug affects
19:37 thiago unless you need time to do it properly, then create a branch for it
19:37 ketas joined #git
19:37 M-ou-se joined #git
19:37 azerus joined #git
19:37 _flow__ joined #git
19:37 pcre joined #git
19:37 blackjid joined #git
19:38 maxorator joined #git
19:38 AlineGomes joined #git
19:38 altendky joined #git
19:38 PaulCapestany joined #git
19:38 dede_ joined #git
19:38 codebam joined #git
19:38 rizonz thiago: yeah I have done a lot of dev and will do that as major fix
19:38 rizonz or so
19:39 Iacobus__ joined #git
19:39 relgar joined #git
19:39 aviraldg joined #git
19:39 samwise[m]1 joined #git
19:39 rizonz thiago: but what if I push a branch it's commits, it's still not merged and I want to work through ?
19:39 Salander27 joined #git
19:39 thiago what?
19:39 musicmatze[m] joined #git
19:40 thiago we're talking about three repositories: the one on your machine, the fork you created and the upstream
19:40 pizzaops joined #git
19:40 unclechu joined #git
19:40 JackMc joined #git
19:40 thiago please be clear what you're pushing, where from and where to.
19:40 kineticrootkit[m joined #git
19:40 bumpy joined #git
19:40 rizonz yes I keep my fork un sync from the upstream
19:40 rizonz ok ?
19:40 thiago ok
19:40 moop joined #git
19:41 ELLIOTTCABLE joined #git
19:41 EmeraldExplorer joined #git
19:42 alexsystemf____ joined #git
19:42 rizonz so, I create branches from my fork and push them to upstream
19:42 thiago that didn't make sense
19:42 rizonz erm that is wring
19:42 rizonz wrong
19:42 thiago you create the branch in your local repository, not in the fork and not in the upstream
19:42 fcrick joined #git
19:42 rizonz ok, I fork, keep my fork master un sync from the master repo
19:43 thiago right
19:43 GodGinrai rizonz: you shouldn't push your branches to upstream if you have a fork
19:43 rizonz then I create a branche, I push that to my own upstream
19:43 rizonz then I create a PR
19:43 GodGinrai you should open pull requests against upstream
19:43 thiago no
19:43 thiago you push to your fork, not to upstream
19:43 thiago if you push to upstream, there's no need to create a PR
19:43 GodGinrai ^ this
19:43 evanc joined #git
19:43 rizonz yes but I upstream to my own fork
19:43 [diecast] joined #git
19:43 johtso joined #git
19:43 wootehfoot joined #git
19:43 thiago please use the terminology we all use
19:43 thiago you push to your fork
19:44 thiago you didn't upstream
19:44 rizonz yes that is my upstream, at least that is how netbeans calls it
19:44 rizonz I clone my own fork
19:44 wizonesolutions joined #git
19:44 timwis joined #git
19:44 Klumben joined #git
19:44 thiago I don't care what netbeans calls it
19:44 thiago upstream is the original repository
19:44 thiago not your fork
19:44 rizonz no but tru to understand me
19:44 thiago try to use the terminology we understand
19:44 WillMoogle joined #git
19:44 Balliad joined #git
19:44 rizonz ok, so I push to my own fork and create a PR
19:45 thiago ok
19:45 rizonz now, this branche is not merged yet, what do I do when I want to work further ? create a branche out of my branche ?
19:45 thiago are the new changes part of the same logical request for merging?
19:45 thiago or are they new work?
19:46 rizonz could be both
19:46 cyan__ joined #git
19:46 rizonz or one of the two
19:46 urda joined #git
19:46 lebster joined #git
19:46 ToeSnacks joined #git
19:46 thiago if it is part of the same logical change, then just push again to the same branch in your own fork and (I think) the PR updates
19:46 qqx Yes, that would update the PR.
19:47 thiago if it's new work, create a new branch and a new PR
19:47 rizonz ok, but what if it's merged while I was working in it and I can't push again ? rebase ?
19:47 thiago if the new work does not depend on the previous work, then make sure you don't include them in the new branch
19:47 thiago yes, rebase
19:47 qqx The prior work being merged shouldn't affect your ability to push other changes.
19:47 thiago (or merge, but that creates convoluted history)
19:47 rizonz yeah this dev did all kinds of stuff over and over and never committed after he finshed something and he finshed all half
19:48 thiago sounds like he needs training
19:48 GodGinrai rizonz: only open the PR when you believe it is ready to be merged
19:48 grumble joined #git
19:48 thiago one logical change per PR
19:48 GodGinrai rizonz: any work after the PR is merged should be due to peer reviews pointing out flaws
19:49 rizonz qqx: but new work could depend on unmerged previouis work
19:49 GodGinrai s/after the PR is merged/after the PR is opened/
19:49 thiago that's fine
19:49 thiago you can continue working, but until the new work is ready, don't include it in the PR
19:49 rizonz ok
19:49 thiago if you're done and the PR is still not merged, you can either update it with the new work or create a new PR with the combined work
19:50 thiago as I said: one PR per logical change
19:50 rizonz I might make some misstakes overthere :)
19:50 thiago if you did A and while A is being reviewed, you did B, but B depends on A, then you probably have two PRs
19:50 Ferris_ joined #git
19:50 thiago and obviously A needs to be approved first
19:51 milkshoes joined #git
19:51 Shock- joined #git
19:51 thiago if A is an actual merged, you don't need to update B; if it is cherry-picked, you may be asked to rebase B
19:51 * thiago always cherry-picks -s any PRs he receives
19:51 rizonz ok
19:51 qqx I find that to be terribly unkind to contributors.
19:52 rizonz I need to see how cherrypicking works
19:52 thiago Signed-off-by is required in our project, therefore I need to do it
19:52 thiago kindness is not a criterion
19:52 barq joined #git
19:53 rizonz qqx: what >
19:53 thiago I could do merge --ff-only, but I will never do merges like GitHub's web buttons do
19:53 qqx rizonz: I was referring to cherry picking PRs rather than merging them.
19:54 denisMone joined #git
19:54 qqx Yeah, I don't really like merges created by GitHub's web UI either.
19:54 stealthii joined #git
19:54 rizonz qqx: yes cherrypickingf is just pickup and go from there yourself as master maintainer ?
19:54 kadoban What's wrong with them, out of curiosity? (I never use the web UI for that)
19:54 qqx The commit messages tend to be completely useless.
19:54 cstrahan joined #git
19:54 bbhoss joined #git
19:54 thiago kadoban: they create merges
19:54 kadoban Haha
19:55 thiago merges are for long-lived branches, not for a simple, logical change
19:55 eihabarabia joined #git
19:55 kadoban Ah, yes if it's a single change then I probably wouldn't want a merge either.
19:55 qqx Personally I tend to use merge --no-ff for most of my merges.
19:55 kadoban Ya, me too, but it's usually for feature branches.
19:56 * thiago doesn't practice what he preaches
19:56 rizonz how do you name Branches ? I mean like I have the-project is the fork the-project can I do: "Oh I'm gonna change this using my own Branche you fools" ?
19:56 thiago I have all my changes in a single branch
19:56 thiago the branch is called "master"
19:56 rizonz no that is the Revision
19:57 mda1 joined #git
19:57 irco joined #git
19:58 jnavila joined #git
19:58 GodGinrai thiago: I disagree.  Merges are for anything going *into* a long-lived branch, imo
19:58 thiago GodGinrai: matter of opinion
19:59 GodGinrai yes
19:59 GodGinrai hence, "imo"
19:59 thiago there's also a middle ground, which is that merges are for any logical change composed of more than one commit
19:59 thiago single commits -> cherry-pick, no merge
19:59 thiago multiple commits -> merge
20:00 GodGinrai seems reasonable
20:02 valkyr2e joined #git
20:03 ghostlight joined #git
20:07 brokensyntax_ left #git
20:07 kyan joined #git
20:08 m0viefreak joined #git
20:14 xall_ joined #git
20:16 Guest14887 joined #git
20:17 NeverDie joined #git
20:18 aax joined #git
20:19 valkyr2e joined #git
20:20 wpm joined #git
20:20 askb joined #git
20:24 Shock- joined #git
20:24 _TWS joined #git
20:26 ki0_ joined #git
20:26 durham_ joined #git
20:29 e14 joined #git
20:30 Macaveli joined #git
20:31 Shock- joined #git
20:31 alhariel joined #git
20:31 Rodya_ joined #git
20:32 rizonz what are good branchnames ?
20:32 rizonz *branche
20:32 bremner what are good variable names?
20:33 jnavila joined #git
20:33 Seveas what are good sandwiches?
20:33 skalpin branch1
20:33 rizonz no I mean, can they have spaces ?
20:33 skalpin no
20:33 rizonz fancy names ?
20:33 rizonz oh!
20:33 Seveas terrible sandwich that
20:33 rizonz hehe
20:34 bremner one weird gotcha is that you can't have branches foo and foo/bar
20:34 qqx joined #git
20:34 rizonz like I need to fix whatever lots of things, what would be ideal then ?
20:35 blackpajamas joined #git
20:35 grawity ok, let's say I want to find commits for a specific filename, but I don't remember which directory it was in (and for that matter, it moved a lot)
20:35 grawity can I list commits which touched */foo
20:36 Snugglebash joined #git
20:36 skalpin grawity: git log -- */foo might work
20:37 grawity ah yes, that works if I quote the globs
20:39 noecc left #git
20:40 ResidentBiscuit what are good children names?
20:40 marc_v92 joined #git
20:42 acetakwas joined #git
20:42 skalpin 7 of 9
20:43 wootehfoot joined #git
20:44 nickabbey joined #git
20:45 Balliad joined #git
20:46 jccn joined #git
20:47 diogenese joined #git
20:50 Topic for #git is now Welcome to #git, the place for git help and a fresh start on a new branch | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This channel may contain users known to the state of California to cause cancer.
20:50 rizonz Eugene: cancer ?
20:51 Eugene https://en.wikipedia.org/wiki/California_Proposition_65_(1986)#Warning_label
20:51 wrkrcoop joined #git
20:51 Eugene If you've never been to California, *everything* has this label, starting with the walls at the airport.
20:52 rizonz Eugene: are they crazy ?
20:52 wrkrcoop im reading: https://git-scm.com/book/en/v2/Getting-Started-Git-Basics can someone explain what they mean by git takes snapshots instead of diffing new versions of the file?
20:52 Cassiopaya joined #git
20:52 Eugene Yes, its California.
20:52 rizonz what a hell
20:52 Eugene See the Abuse section on that same page.
20:53 dodobrain joined #git
20:53 Sasazuka joined #git
20:53 rizonz weird
20:53 dermoth joined #git
20:54 MillerBoss joined #git
20:54 neanderslob joined #git
20:54 IlNominePatre joined #git
20:54 wrkrcoop so if i were to create a VCS i’d just save the updated files like this: https://gist.github.com/anonymous/f5436699ea6c6a90d4322cc78cc93b97 but is this what git does … https://gist.github.com/anonymous/9dceca8a627e5a8c61a82945dc51d1d2
20:57 wrkrcoop :D
20:59 rominron_ joined #git
21:01 gajus joined #git
21:01 wrkrcoop anyone?
21:06 kadoban wrkrcoop: Uhm, that's not actually what git does?
21:06 wrkrcoop no?
21:06 wrkrcoop that original link i sent said it takes snapshots … could u explain what that means
21:10 kadoban wrkrcoop: Each commit can be seen as an exact set of files
21:10 wrkrcoop oh ok so each commit is all the files?
21:10 kadoban Yes, conceptually. How it's implemented is a bit of a mix.
21:10 wrkrcoop so if i have 5 files, each commit is all 5?
21:10 kadoban Yes
21:11 wrkrcoop and in other version control systems its usually just the files that have changed?
21:11 wrkrcoop interesting
21:11 bremner wrkrcoop: only in old, primitive ones
21:11 kadoban I don't know much about other VCSes anymore, git is the only one I use and has colored my mental model.
21:11 bremner like RCS
21:11 wrkrcoop k ty
21:12 roygbiv joined #git
21:15 raspado joined #git
21:18 mmlb joined #git
21:18 acln joined #git
21:19 jnewt joined #git
21:21 Eugene https://git-scm.com/book/ca/v1/Git-Internals is a good read about git's insides. In a nutshell, it stores a full copy of each file at each revision in the database. Periodically it does a compress/pack/dedupe, saving deltas and compressing the whole thing into a big ball of mud.
21:21 Eugene But importantly you can always get the original objects back(and verify this using a SHA hash)
21:21 Eugene "Why not both?", as it were
21:22 Jupelius joined #git
21:24 wrkrcoop ty Eugene
21:24 wrkrcoop left #git
21:24 mizu_no_oto joined #git
21:25 raedah how do I merge?
21:26 kadoban raedah: Usually with 'git merge'.
21:26 le_melomane joined #git
21:27 raedah do I really have to have a whole new commit for everytime there is an upstream merge conflict?
21:27 raedah after a merge, can I rebase it back to a single commit?
21:28 kadoban "upstream merge conflict" ? I think you should probably explain more what you're trying to do, and why.
21:29 dsdeiz joined #git
21:29 raedah i had my own commit, but things changed upstream, and so I did 'git pull' and then fixed the conflicts and did 'git commit'
21:30 kadoban If you didn't want a merge commit, you probably shouldn't have done 'git pull'. Most likely you should be doing your own commits in a feature branch, and if you're not sharing them with anyone you can rebase them on top of master when you want.
21:30 babu joined #git
21:31 rollerBoi joined #git
21:32 raedah kadoban: I am using a feature branch. how do I rebase ontop of master?
21:32 kadoban With git rebase
21:32 raedah Ive just been using  git rebase -i HEAD~2
21:32 rollerBoi left #git
21:32 rizonz when I want to use some github project in my own project folders but don't want to see all it's commits all the time (in my timeline) what do I do ?
21:34 raedah kadoban: i see, that works.
21:34 raedah thx
21:36 robotroll joined #git
21:39 hahuang61 joined #git
21:40 finalbeta1 joined #git
21:45 rizonz meh should I pull or checkout the master branch after a merge request being done ?
21:45 rizonz as I forked the project
21:46 NeverDie joined #git
21:47 WaReZ joined #git
21:48 ki0 joined #git
21:56 iLembus_ joined #git
21:57 jeffreylevesque joined #git
21:58 arand_ rizonz: What do you aim to do? Sync with another repo?  Finalise a merge in your repo? Start a new line of development?
21:59 _TWS is there such a thing as a very simple web-based browser to access a local repository?  All I need is to do is see files, revisions, and diffs.
21:59 rizonz arand_: I forked a project and pushed to my own fork and created a MR, MR has been approved and now I wan to have my fork (master) being up to date with the real project master again
22:02 f3r70rr35f joined #git
22:03 Sasazuka__ joined #git
22:03 rizonz _TWS: go GitLab :)
22:04 ki0 joined #git
22:04 ResidentBiscuit GitLab++
22:04 arand_ rizonz: Usually you do just as you would when you sync with upstream normally, fetch & merge (~ pull).
22:05 O47m341 joined #git
22:05 _TWS I've been looking at that, but it feels like trying to kill a fly with a tactical nuke
22:05 rizonz _TWS: but it's good!
22:06 rizonz arand_: erm true but it's a gitlab thing atm I think, I forked thewre
22:06 rizonz *there
22:07 rivarun joined #git
22:09 arand_ _TWS: My though as well, there's git instaweb, which is probably the quickest. gitweb and cgit are the more lightweigth and single-purpose web viewers for Git I known of.
22:12 govg joined #git
22:12 ikelso joined #git
22:12 Brando753-o_O_o joined #git
22:13 PasiFist joined #git
22:13 dreiss joined #git
22:14 str joined #git
22:15 arand_ _TWS: (instaweb uses a quick and temporary gitweb instance)
22:16 Samual joined #git
22:16 Samual joined #git
22:17 _TWS yeah, I saw that.  I need a permanent solution with ldap authentication and the ability to access a repository on local storage that's managed by another process.
22:21 arand_ rizonz: I would guess it being on Gitlab would make little difference: Add upstream as remote merge their master into yours, push to your repo? I'm thinking would be the general workflow regardless of where it's hosted?
22:21 Gsham joined #git
22:22 arand_ _TWS: For simple ldap you could just use the webserverhttpd,
22:25 arand_ _TWS: For simple ldap you could just use the httpd (or ), then say gitolite for managing, and cgit for generating the html content.
22:26 rwb joined #git
22:28 Blkt joined #git
22:28 arand_ But depending on the amount of moving parts in such a setup it might be tempting to look at something more suite-like: gogs, gitlab, kallithea, phabricator, ...
22:28 _TWS we had another app that used http auth... everyone hated it
22:29 _TWS I found a fairly small utility (viewgit) I might be able to modify with LDAP or maybe even convert it into an extension for another framework
22:29 rizonz arand_: how do you mean ?
22:29 rizonz I wonder, if I fetch should I be able to see the changes detected ?
22:30 tmsmith joined #git
22:31 rominron_ joined #git
22:32 deltab joined #git
22:32 arand_ _TWS: viewgit looks to be unmaintained though.
22:34 _TWS it does, but it's simple enough to provide a starting point :)
22:34 f3r70rr35f joined #git
22:34 arand_ rizonz: what do you mean by "changes detected"?
22:35 rizonz arand_: on diff and such
22:35 Starcraftmazter left #git
22:35 rizonz I'm figuring out how I can keep my fork in sync
22:36 _TWS and it's either that, or I switch back to SVN and use websvn, but everyone tells me "Go git!" so here I am :)
22:36 rizonz _TWS: I did the same
22:36 rizonz and use GitLab to start with then
22:36 rizonz I come from SubVersion Edge
22:37 [Saint] joined #git
22:38 _TWS if we were a dev shop, then something like gitlab would be great.  All I need is to be able to track and review network configurations, and training other people to use git from the command line is really not an option (it's bad enough that it took me a day to figure out even a few basic commands)
22:38 j416 _TWS: github, maybe?
22:38 fatalhalt joined #git
22:38 rizonz _TWS: you need versions of network configs ?
22:39 j416 oh
22:39 rizonz _TWS: what kind of devices ?
22:39 j416 "training other people to use git from the command line is really not an option" <- why?
22:39 j416 if it's not an option, perhaps git is not the tool for you
22:39 rizonz j416: no bull
22:39 j416 rizonz: ?
22:39 _TWS routers, switches, access points, etc... hundreds of them, with daily changes
22:39 dreiss joined #git
22:40 rizonz _TWS: I have somethnig for you
22:40 rizonz _TWS: college or so >
22:40 _TWS j416: the collection and versioning is automatic (rancid... another old tool I need to replace one day).  it can use svn, cvs, or git.  I'm agnostic about it all
22:41 rizonz _TWS: http://www.rconfig.com/
22:41 j416 _TWS: ah.
22:41 nahra joined #git
22:42 nahra Hello. How to undo last commit?
22:42 j416 _TWS: not sure how that works I'm afraid :/
22:42 j416 !undo
22:42 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
22:42 peepsalot i was trying to merge some changes from another branch into mine, and realized i hadn't pulled changes for my current branch, so I tried to abort the merge, but then when i pull it brings back all the staged merge changes
22:42 peepsalot i'm really confused
22:42 peepsalot how do you abort a merge
22:42 j416 peepsalot: git reset --hard
22:43 j416 I think you can "git merge --abort" as well
22:43 arand_ rizonz: To sync with another repo, you normally add it as a remote, fetch, and merge in (possibly with --ff-only) the remote tracking branches that you want to sinc into your corresponding local branches, then push that to your public repo.
22:43 j416 peepsalot: yep, "git merge --abort" is the way
22:43 _TWS j416: it's pretty simple really... fetch configs every hour and commit
22:44 rizonz arand_: mhh
22:44 rizonz arand_: there is a feature request for gitlab
22:44 j416 _TWS: and you just want a way to look at the history, that's all?
22:44 j416 ah.. ldap
22:44 peepsalot j416, after git merge --abort, git status shows nothing staged, that's great... then i do git pull, and it gets a conflict, and then all the staged merge changes are back again when i check git status
22:44 j416 dunno about that
22:44 * j416 should read the scrollback more properly
22:45 j416 peepsalot: rebase instead
22:45 wootehfoot joined #git
22:45 peepsalot other people are using this branch
22:46 j416 what branch?
22:46 j416 I thought you were trying to merge your changes with upstream
22:47 peepsalot i'm trying to merge changes from another branch into my working branch
22:47 j416 and others are using your working branch?
22:47 peepsalot YES
22:47 aarobc joined #git
22:48 j416 then: git checkout workingbranch && git merge otherbranch
22:48 j416 fix your conflicts, add and commit
22:48 j416 or, stop working on the same branch as others.
22:48 j416 preferably.
22:48 j416 (or you'll end up with a lot of merges)
22:49 peepsalot ok, that's what i did when i started... but i realized i should have pulled workingbranch changes first.  so i tried to abort the merge, and pull, but the pull keeps giving me a conflict and then the merge changes all reappear
22:49 j416 and what is the issue?
22:49 peepsalot that the aborted merge changes are being resurrected somehow
22:49 peepsalot how is there a conflict from a pull
22:49 j416 well you're trying to merge again, that appears to be why
22:50 j416 a pull is a meerge
22:50 j416 merge*
22:50 _TWS rizonz: thanks for the link to rconfig.  I'd seen it before, but gave up after not finding any documentation, forums, wikis, or anything of that nature
22:50 mgoodwin left #git
22:50 peepsalot the pull should be a fast forward afaict though
22:50 j416 not as far as git sees it, so no
22:51 zzz joined #git
22:51 j416 unless you change your history, there's no way to make it a fast-forward
22:51 j416 assuming I understand your situation correctly.
22:52 peepsalot well, the thing is i basically have 0 changes on the working branch at the moment
22:52 peepsalot therefore everything should be fast forward, right?
22:52 j416 define "basically"
22:52 j416 does it mean.. "precisely"?
22:53 j416 (do you mean 0 changes, or "kind of" 0 changes?)
22:54 peepsalot precisely 0, except for a separate merge that I thought i aborted
22:54 peepsalot i'm all mixed up about these merges now
22:54 j416 peepsalot: what does 'git status' say after you 'git merge --abort' ?
22:54 rizonz _TWS: it's doable
22:55 j416 peepsalot: is this repo public, by the way? (can I see it?)
22:55 peepsalot it is private
22:55 j416 ok
22:55 peepsalot for my job
22:58 nahra What's going wrong when getting http://sprunge.us/ILOJ ?
22:59 j416 nahra: there are commits on the remote master that you don't have, so you'll need to rebase your changes on top of those first. You can do it by either: "git pull --rebase", or "git fetch && git rebase @{upstream}" (or @{u} for short instead of @{upstream})
23:00 j416 nahra: next time, I'd recommend working in a separate branch, then rebasing that every now and then on master, so as to stay up to date and avoid lagging too far behind.
23:00 mustmodify left #git
23:01 imachuchu joined #git
23:01 fmeerkoetter joined #git
23:01 j416 nahra: generally working on a separate branch tends to make things easier. Branching is easy and cheap in git.
23:01 peepsalot i think i got it figured out now
23:01 j416 peepsalot: good
23:02 j416 o/
23:02 nahra j416: What is the difference between "git pull --rebase" and "git fetch && git rebase @{upstream}" ?
23:02 j416 nahra: the result should be identical; although I have spotted some oddities with "git pull --rebase"; not sure if there is a subtle difference or not.
23:03 j416 I hardly ever use "git pull --rebase"
23:04 imachuchu How do I manually add a parent to a commit (but I don't want to go through merging)? I have 2 public branches that share an old ancestor, but are painfully dissimilar. I would like to just replay one on top of the other, squash the commits, then call it a decendent of both so that nothing gets publically rewritten.
23:04 j416 imachuchu: man git-replace
23:04 gitinfo imachuchu: the git-replace manpage is available at http://jk.gs/git-replace.html
23:04 j416 imachuchu: then use git-filter-branch to make changes permanent
23:06 jeffreylevesque joined #git
23:06 dendazen joined #git
23:08 Sasazuka joined #git
23:09 anuxivm joined #git
23:10 f3r70rr35f joined #git
23:13 Dougie187 left #git
23:16 YuGiOhJCJ joined #git
23:17 kevwil joined #git
23:17 dsdeiz joined #git
23:21 mikeric joined #git
23:26 MissionCritical joined #git
23:30 jimi_ joined #git
23:34 str joined #git
23:37 justanotheruser joined #git
23:38 brent__ joined #git
23:39 emg joined #git
23:40 aeontech joined #git
23:43 theskill_ joined #git
23:44 causasui joined #git
23:44 nicksloan joined #git
23:48 mda1 joined #git
23:51 HoierM joined #git
23:51 aidalgol joined #git

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