Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-09-26

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

All times shown according to UTC.

Time Nick Message
00:00 alex1a joined #git
00:00 Shentino joined #git
00:00 raijin joined #git
00:00 niels___ joined #git
00:01 prawnzy joined #git
00:03 e14 joined #git
00:08 Chloe joined #git
00:08 Urbany joined #git
00:10 rgrinberg joined #git
00:11 f3r70rr35f joined #git
00:11 texasmynsted joined #git
00:12 snowkidind joined #git
00:15 WizJin joined #git
00:20 akkad joined #git
00:21 e14 joined #git
00:23 DolpheenDream joined #git
00:23 tmcmahon joined #git
00:25 MattMaker joined #git
00:28 tmcmahon joined #git
00:30 raijin joined #git
00:31 mgoodwin Hmm. I thought git kept indexed / untracked changes between branches
00:31 mgoodwin Now it's saying that my files would be overwritten by checkout
00:32 mgoodwin That seems odd, or I'm having a brain failure
00:32 mgoodwin (I know I can just stash, but I feel like that shouldn't be necessary)
00:34 Kaisyu joined #git
00:35 ResidentBiscuit joined #git
00:35 MattMaker joined #git
00:39 f3r70rr35f joined #git
00:39 linuxmint joined #git
00:44 fedepad joined #git
00:44 bremner if the files are tracked in one branch but not the other, this can happen
00:45 Milijus joined #git
00:46 e14_ joined #git
00:47 irqq_ joined #git
00:48 shgysk8zer0 joined #git
00:48 andlabs joined #git
00:49 evanwang joined #git
00:50 MattMaker joined #git
00:59 wxg joined #git
00:59 jnavila joined #git
01:02 niels__ joined #git
01:10 f3r70rr35f joined #git
01:10 hanshenrik joined #git
01:10 zivester joined #git
01:15 arand joined #git
01:16 e14 joined #git
01:17 wxg joined #git
01:19 kyan joined #git
01:21 morenoh149 joined #git
01:21 LeBlaaanc joined #git
01:24 Vampire0_ joined #git
01:25 d^sh joined #git
01:26 Droolio joined #git
01:28 Milijus joined #git
01:31 LeBlaaan_ joined #git
01:33 SwiftMatt joined #git
01:33 multi90 joined #git
01:35 kyan joined #git
01:37 justanotheruser joined #git
01:38 CEnnis91 joined #git
01:46 jon-mac joined #git
01:46 fstd joined #git
01:46 anuxivm left #git
01:46 Samual joined #git
01:47 l4v2 joined #git
01:48 pratch joined #git
01:48 e14 joined #git
01:51 pks joined #git
01:54 mycyber joined #git
01:55 tristanp joined #git
01:55 bibek22 left #git
01:55 dsdeiz joined #git
01:59 arescorpio joined #git
02:01 jaguarmagenta joined #git
02:06 jaguarmagenta joined #git
02:06 Prisoner-2460_1 joined #git
02:11 e14 joined #git
02:13 niels__ joined #git
02:17 DolpheenDream joined #git
02:24 AlexxNica joined #git
02:25 mizu_no_oto joined #git
02:28 anonymuse joined #git
02:28 evanwang_ joined #git
02:28 unbalanced joined #git
02:29 NeverDie_ joined #git
02:30 nephyrin joined #git
02:32 freekevin joined #git
02:32 Milijus joined #git
02:33 Anthaas joined #git
02:34 kyan joined #git
02:35 ojdo joined #git
02:35 evanwang joined #git
02:37 prawnzy joined #git
02:40 lagothri1 joined #git
02:41 rchavik joined #git
02:43 e14 joined #git
02:44 snthsnth joined #git
02:44 tabakhase uhm, gitweb ccannot give me a difftree aka commit..commit? only "to parent"? dang =(
02:45 a_thakur joined #git
02:46 safe joined #git
02:47 chachasmooth joined #git
02:47 tabakhase uhm, seems it was my param derping, nevermind
02:54 hexagoxel joined #git
02:54 kyan joined #git
02:54 Castor_Troy joined #git
02:55 Milijus joined #git
02:55 tristanp joined #git
02:56 Castor_Troy joined #git
02:58 Castor_Troy joined #git
02:59 Castor_Troy Hello
02:59 Castor_Troy I read on progit book that git won't allow you to create a new branch when there are uncommited changes in the working directory. But I just tried it and it worked.
03:01 Lor_ joined #git
03:01 Castor_Troy my bad.
03:02 Milijus joined #git
03:03 harish joined #git
03:04 aidalgol joined #git
03:05 aavrug joined #git
03:06 clemf joined #git
03:07 preaction Castor_Troy: it might not let you switch to a new branch if there are uncommitted changes and those changes would disappear if moving to the new branch
03:07 clemf joined #git
03:08 Andrew_K joined #git
03:09 Castor_Troy preaction, When i create a new file, but didn't it, i am able to switch to another branch and could see the new file there.
03:09 preaction because it's not committed
03:09 preaction so git isn't tracking it and doesn't care about it
03:09 Castor_Troy even when i stage it, on the other branch its in staged
03:09 preaction unless the other branch has a file with the same name, then git would prevent you from destroying the file
03:09 preaction yes, because it isn't committed
03:10 morenoh149 joined #git
03:10 Castor_Troy ok. since it doesnt clash with the files existing on the second branch, all is good ?
03:10 preaction the staging area isn't a commit. it's before a commit
03:10 preaction that's why you are allowed to switch branches, yes
03:10 dreiss joined #git
03:11 Castor_Troy great, thanks
03:12 Castor_Troy preaction, do you use any third party clients, or use the command line ?
03:12 justanotheruser joined #git
03:12 preaction i use the command line client
03:12 DolpheenDream joined #git
03:13 Castor_Troy i know that to push to a branch we use the git push remote branch... but is it possible to push commits made in all branches at once?
03:13 Castor_Troy is that a good practice?
03:15 niels__ joined #git
03:16 armyriad joined #git
03:16 a3Dman_ joined #git
03:17 prawnzy joined #git
03:20 clemf joined #git
03:22 ahr3n joined #git
03:24 DolpheenDream joined #git
03:35 PioneerAxon joined #git
03:50 jaguarmagenta joined #git
03:52 MattMaker joined #git
03:53 Sleepy63 joined #git
03:53 bonerx2k joined #git
03:53 nidr0x joined #git
04:00 a_thakur joined #git
04:00 dsantiago joined #git
04:02 nidr0x joined #git
04:05 dreiss joined #git
04:08 Cabanossi joined #git
04:08 _ng joined #git
04:12 nilg joined #git
04:13 tristanp joined #git
04:15 daey_ joined #git
04:15 AlexxNic_ joined #git
04:16 niels__ joined #git
04:16 mikecmpbll joined #git
04:16 prawnzy joined #git
04:16 micahf joined #git
04:17 micahf i'm having the hardest time understanding subtrees.  where are subtree remotes stored?  if i want to change a subtree remote, do i just remove the subtree and add a new one with the same prefix?
04:18 micahf i know with ordinary remotes, i can go into the .git/config file and edit the remote, but i'm having trouble figuring out if this is the same for a subtree's remote
04:18 micahf there is a remote listed as a submodule remote, but i don't remember ever adding a submodule, only a subtree.. could that be my subtree's remote?
04:22 armyriad joined #git
04:27 eizua joined #git
04:31 a_thakur_ joined #git
04:34 17WAAP19A joined #git
04:34 14WAAGL6K joined #git
04:35 zivester joined #git
04:38 nilg` joined #git
04:38 circ-user-130ZE joined #git
04:39 snthsnth joined #git
04:39 text1 joined #git
04:43 rscata joined #git
04:44 fedepad joined #git
04:45 cagmz joined #git
04:47 hahuang62 joined #git
04:47 GT4066 joined #git
04:49 diogenese joined #git
04:52 a_thakur joined #git
04:52 hahuang62 joined #git
04:59 morenoh149 joined #git
04:59 archaic joined #git
04:59 dec0n joined #git
05:01 subhojit777 joined #git
05:02 freimatz joined #git
05:07 ffabi joined #git
05:11 biax_ joined #git
05:12 romerocesar_ joined #git
05:12 mar77i_ joined #git
05:12 canuk joined #git
05:12 [1]ringer1 joined #git
05:13 lixujia joined #git
05:13 aurelien` joined #git
05:13 diprotic joined #git
05:13 diprotic joined #git
05:13 martin_g_ joined #git
05:13 raven-au joined #git
05:13 tfnico_ joined #git
05:14 ReenignE- joined #git
05:14 ReenignE- joined #git
05:14 paperziggurat_ joined #git
05:14 GameGamer43_ joined #git
05:14 angelsl_ joined #git
05:14 yoyoyo____ joined #git
05:14 kwmiebach__ joined #git
05:14 Lowell_ joined #git
05:14 lebster_ joined #git
05:14 pfg_ joined #git
05:14 ulkesh_ joined #git
05:14 theresajayne_ joined #git
05:14 etcinit_ joined #git
05:14 beckyconning__ joined #git
05:15 watt_rabbit_ joined #git
05:15 adambrenecki_ joined #git
05:15 synthmea1 joined #git
05:15 joseph_arnstein_ joined #git
05:15 XDS2010_ joined #git
05:15 DuncanT_ joined #git
05:15 epic__ joined #git
05:15 snowinferno_ joined #git
05:15 boshhead_ joined #git
05:15 sLite_ joined #git
05:15 kenansulayman joined #git
05:15 hwoarang_ joined #git
05:15 geko joined #git
05:15 Infamous- joined #git
05:15 rbr joined #git
05:16 sylario_ joined #git
05:16 cjohnson_ joined #git
05:16 Moggets joined #git
05:16 flupke_ joined #git
05:16 adamm_ joined #git
05:16 marcadde1 joined #git
05:16 RichiH_ joined #git
05:16 sitaram_ joined #git
05:16 sitaram_ joined #git
05:16 mns_ joined #git
05:16 meejah_ joined #git
05:16 Walex2 joined #git
05:16 ndimitrij joined #git
05:16 maxb_ joined #git
05:16 EvanDotP1o joined #git
05:16 brewmast1r joined #git
05:16 tokkee_ joined #git
05:16 emilyrose joined #git
05:16 angseus_ joined #git
05:16 bejeb joined #git
05:16 plasticb1y joined #git
05:16 rudycane_ joined #git
05:16 and_i joined #git
05:16 wagle_ joined #git
05:16 EisNerd joined #git
05:16 thomas1 joined #git
05:16 frobnic_ joined #git
05:16 babilen_ joined #git
05:16 runlevl4_ joined #git
05:16 Ragnor joined #git
05:16 niels__ joined #git
05:16 des_cons1lado joined #git
05:16 magicbit_ joined #git
05:16 unreal_ joined #git
05:16 spb_ joined #git
05:16 Rh0nda joined #git
05:16 bambams_ joined #git
05:16 bambams_ joined #git
05:17 VladGh_ joined #git
05:17 bratchle1 joined #git
05:17 vmiklos joined #git
05:17 sleezd_ joined #git
05:17 Ariadeno joined #git
05:17 brandonw_ joined #git
05:17 Peng___ joined #git
05:17 Zoxc joined #git
05:19 altendky_ joined #git
05:19 Bengi_ joined #git
05:19 harleypig_ joined #git
05:19 zeller_ joined #git
05:19 ToeSnacks_ joined #git
05:19 elmcrest_ joined #git
05:19 KevinMGranger_ joined #git
05:19 nolageek_ joined #git
05:19 preilly joined #git
05:19 h12o_ joined #git
05:19 jasondotstar_ joined #git
05:19 krillr joined #git
05:20 hyamamoto joined #git
05:20 hyamamoto joined #git
05:20 yazdmich joined #git
05:20 Michaela joined #git
05:20 Spinkzeit` joined #git
05:20 thoros- joined #git
05:20 sumoruman joined #git
05:20 Potatoes joined #git
05:20 weylin- joined #git
05:20 bencevans_ joined #git
05:20 tHEMtZ- joined #git
05:20 LiENUX joined #git
05:20 Sc0rpius_ joined #git
05:20 MillerBo55 joined #git
05:20 snsapiens joined #git
05:20 dmarr_ joined #git
05:20 Pursuit_ joined #git
05:20 meZee- joined #git
05:20 spychalski joined #git
05:20 jerrcs_ joined #git
05:20 blahdodo_ joined #git
05:20 sigjuice_ joined #git
05:20 BlackMaria_netsp joined #git
05:20 toydestroyer_ joined #git
05:20 sfix_ joined #git
05:20 ThiefMasterrr joined #git
05:20 daishan_ joined #git
05:20 guyz joined #git
05:20 andschwa_ joined #git
05:20 goezz joined #git
05:20 bakingbread joined #git
05:20 Don joined #git
05:20 Hogofwar_ joined #git
05:20 warthog19 joined #git
05:20 gsingh93- joined #git
05:20 nchambers^ joined #git
05:20 Timvde| joined #git
05:20 __shymega__ joined #git
05:20 bodie__ joined #git
05:20 hfp_ joined #git
05:20 fus_ joined #git
05:20 [Ben] joined #git
05:20 jamick_ joined #git
05:20 JoshL_ joined #git
05:20 lep2 joined #git
05:20 hecliunyx_ joined #git
05:20 SirCmpwn_ joined #git
05:20 ybden joined #git
05:20 pdgwien- joined #git
05:20 musca` joined #git
05:20 Ricaz joined #git
05:21 Nile joined #git
05:21 sweatsuit_ joined #git
05:21 Mir4g3_ joined #git
05:21 tnsi joined #git
05:21 HarryHallman joined #git
05:21 Arguggi joined #git
05:21 qsx joined #git
05:21 deltab joined #git
05:21 _joelsmith joined #git
05:21 Someguy123 joined #git
05:21 TooLmaN joined #git
05:21 RiPer joined #git
05:21 maqr joined #git
05:21 ruskie joined #git
05:21 oldrobot joined #git
05:21 ybden joined #git
05:21 jantje joined #git
05:21 emptynine joined #git
05:21 traxo joined #git
05:21 Slush- joined #git
05:22 M-mistake1 joined #git
05:22 Xe joined #git
05:22 HelloShitty joined #git
05:22 Atlantic777 joined #git
05:22 Atlantic777 joined #git
05:22 heinrich5991 joined #git
05:22 ybden joined #git
05:23 Milos joined #git
05:23 ffabi joined #git
05:23 Ram-Z_ joined #git
05:23 ybden joined #git
05:23 codebam joined #git
05:23 Rikairchy joined #git
05:24 kini joined #git
05:24 ybden joined #git
05:24 Guest81107 joined #git
05:24 kline_ joined #git
05:24 stuh84 joined #git
05:25 Akimb joined #git
05:25 jleclanche joined #git
05:25 sfan786_ joined #git
05:26 ybden joined #git
05:27 ybden joined #git
05:27 sparr joined #git
05:27 wloncom joined #git
05:27 ash_workz joined #git
05:27 ToxicFrog joined #git
05:27 vdl joined #git
05:28 danemacmillan joined #git
05:28 WakiMiko joined #git
05:28 monokrome joined #git
05:28 circ-user-130ZE joined #git
05:28 jesk joined #git
05:28 markmark joined #git
05:28 selckin joined #git
05:28 salparadise joined #git
05:28 marienz joined #git
05:28 marlun joined #git
05:28 marlun joined #git
05:28 mkoskar joined #git
05:28 blueyed joined #git
05:28 rcn_ joined #git
05:28 Guest53913 joined #git
05:28 Derega joined #git
05:28 ghostlight joined #git
05:29 Fissure joined #git
05:29 elijah joined #git
05:29 ybden joined #git
05:29 KennethGao joined #git
05:29 ionelmc joined #git
05:30 ybden joined #git
05:30 cloudcell_ joined #git
05:30 addshore joined #git
05:30 vcoinminer joined #git
05:30 GameGamer43_ joined #git
05:30 Mission-Critical joined #git
05:30 johtso joined #git
05:30 cstrahan joined #git
05:30 rfv joined #git
05:30 wizonesolutions joined #git
05:30 spr0tsuki joined #git
05:30 pfg_ joined #git
05:30 discopatrick joined #git
05:30 unholycrab joined #git
05:31 felowe joined #git
05:31 Ender13 joined #git
05:31 cmosguy joined #git
05:31 kutenai joined #git
05:31 Iacobus joined #git
05:31 ybden joined #git
05:31 fahadash joined #git
05:31 ybden joined #git
05:31 pizzaops joined #git
05:32 msonntag joined #git
05:32 joseph_arnstein_ joined #git
05:32 ybden joined #git
05:32 MLM joined #git
05:33 yena joined #git
05:33 Bengi_ joined #git
05:33 zero7 joined #git
05:33 prosody joined #git
05:34 JackMc joined #git
05:34 KennethGao left #git
05:34 ybden joined #git
05:35 ybden joined #git
05:35 teadrop_ joined #git
05:35 ybden joined #git
05:35 mehdi___ joined #git
05:36 prawnzy joined #git
05:36 Awesomecase joined #git
05:36 ybden joined #git
05:41 ybden joined #git
05:41 cyan__ joined #git
05:41 ybden joined #git
05:42 JackMc joined #git
05:43 ybden joined #git
05:44 themayor joined #git
05:45 ybden joined #git
05:46 ybden joined #git
05:47 ybden joined #git
05:48 ybden joined #git
05:49 ybden joined #git
05:49 mgoodwin A subtree is a join of two repositories
05:50 mgoodwin It merges the objects into a single repo, preserving a history
05:50 ybden joined #git
05:50 mgoodwin Subtrees don't have the extraneous info like a submodule has
05:51 Sucks joined #git
05:51 sin3t joined #git
05:51 ybden joined #git
05:51 Takiito joined #git
05:52 mgoodwin Thus, you're required to supply the -P <prefix> <repository> each time
05:52 ThomasLocke joined #git
05:52 ThomasLocke joined #git
05:54 ExeciN joined #git
05:59 alcohol joined #git
06:01 Raging_Hog joined #git
06:03 lixujia joined #git
06:04 duderonomy joined #git
06:06 evanwang joined #git
06:08 zeroed joined #git
06:09 zotherstupidguy joined #git
06:09 zotherstupidguy what is content_offset in git diff?
06:10 zotherstupidguy its a  #rugged
06:10 zotherstupidguy quesiton
06:11 qt-x joined #git
06:11 txdv rigged?
06:11 zotherstupidguy rugged
06:12 zotherstupidguy its a ruby library for git
06:12 omx joined #git
06:12 txdv its a ruby binding for libgit2
06:13 Wind0r joined #git
06:13 mgedmin left #git
06:14 zotherstupidguy yup
06:14 chele joined #git
06:14 psprint joined #git
06:14 lb1c joined #git
06:15 zotherstupidguy could someone explain what is content_offset?http://www.rubydoc.info/github/libgit2/rugged/R​ugged/Diff/Line#content_offset-instance_method
06:15 psprint Hello. How to get parsable merge, cherry-pick indication? Because currently doing [[ -e .git/MERGE_HEAD ]] etc. seems to be best option
06:16 psprint and bisect indication also
06:17 niels joined #git
06:20 JeroenT joined #git
06:20 thomas joined #git
06:21 Mixologic joined #git
06:21 moritz psprint: !xy
06:21 gitinfo psprint: Woah, slow down for a bit. Are you sure that you need to jump through that particular hoop to achieve your goal? We suspect you don't, so why don't you back up a bit and tell us about the overall objective...
06:22 moritz typically if you want to do automatic merge conflict resolution, you do that by writing merge drivers for particular file formats
06:23 psprint it's for handy git UI, would like to show overall status of repo, e.g. "Merging", "Cherry-Picking" say labels
06:25 lordjancso joined #git
06:26 moritz psprint: git status --porcelain
06:27 psprint didn't show merging, MERGE_HEAD is there, via merge --no-commit.. I thin [[ -e is a nice option, but forgot name of the file created by cherry-pick, what was it?
06:28 nidr0x joined #git
06:29 elect joined #git
06:29 psprint cherry_pick_head cool
06:30 txdv zotherstupidguy: you should find the code in libgit2 that corresponds to that line
06:30 txdv https://libgit2.github.com/lib​git2/#HEAD/type/git_diff_line
06:30 txdv Offset in the original file to the content
06:31 watabou joined #git
06:32 a_thakur joined #git
06:32 eduardas_m joined #git
06:38 aurelien` left #git
06:40 Error404NotFound joined #git
06:40 Error404NotFound joined #git
06:41 spriz_ left #git
06:42 spriz_ joined #git
06:43 King_Hual joined #git
06:43 King_Hual joined #git
06:45 Repox joined #git
06:45 Sceorem joined #git
06:45 hahuang62 joined #git
06:46 [Brain] joined #git
06:46 robotroll joined #git
06:46 leftriver49 joined #git
06:47 morenoh149 joined #git
06:48 leftriver49 I have a quick question, maybe someone here can help.  How do I copy a commit's changes to a stash?  I meant to stash my changes but committed them and they are no longer in my working copy.
06:48 txdv you want to uncommit shit?
06:48 leftriver49 Yes
06:48 biax_ joined #git
06:48 osse git reset HEAD~1
06:49 leftriver49 Uncommit and move to my working copy
06:49 osse leftriver49: have switched branches in the mean time?
06:49 moritz if you committed them, but they aren't in your working copy, you must have switched branches
06:49 grawity they're always in your working copy after committing, they don't disappear anywhere
06:49 biax joined #git
06:50 leftriver49 I commited them and they became the HEAD of branch A.  Then I moved to branch B, now I am moving back to branch A and would like to stash the changes that are at the head of that branch.
06:50 rominronin joined #git
06:52 grawity well, move to branch A first
06:53 leftriver49 @grawity, i am at the head of branch A
06:53 zotherstupidguy txdv thanks :))
06:54 grawity so why are you even talking about branch B...
06:54 leftriver49 git reset HEAD~1 worked perfectly!
06:54 DieguezZ joined #git
06:55 osse \o/
06:55 zotherstupidguy txdv i don't think i don't understand what it means still, could you please eloberate a little? example?
06:55 osse leftriver49: probably a misundestanding: the changes you found missing are still there. I mean the files should be according to the latest commit.  it's just that 'git diff
06:56 osse 'git diff' won't show them anymore
07:00 overlord_tm joined #git
07:00 TomyWork joined #git
07:01 txdv a patch isnt the entire file
07:01 txdv its just the different lines
07:01 emlee joined #git
07:01 Darcidride joined #git
07:01 txdv and those different lines have to start somewhere
07:01 txdv this is the content offste
07:04 grawity a commit, however, is the entire file
07:05 niels joined #git
07:05 acetakwas joined #git
07:06 ybden joined #git
07:07 evanwang_ joined #git
07:07 Akimb joined #git
07:07 submitnine joined #git
07:08 SwiftMatt joined #git
07:08 ybden joined #git
07:09 ybden joined #git
07:09 _sfiguser joined #git
07:09 ybden joined #git
07:15 ap0c joined #git
07:15 Darcidride joined #git
07:15 aidalgol joined #git
07:15 snthsnth joined #git
07:18 _ng joined #git
07:19 HappyLoaf joined #git
07:21 omegak joined #git
07:22 quenode joined #git
07:23 JeroenT_ joined #git
07:24 DevAntoine` joined #git
07:25 Balliad joined #git
07:30 eshlox joined #git
07:33 a_thakur_ joined #git
07:34 Andrew_K joined #git
07:41 thierryp joined #git
07:41 Error404NotFound joined #git
07:43 shymega joined #git
07:44 ahmedelgabri joined #git
07:44 danslo joined #git
07:44 submitnine joined #git
07:49 synthmeat joined #git
07:52 fedepad joined #git
07:53 tvw joined #git
07:55 sophiag joined #git
07:55 unforgiven512 joined #git
07:56 fedepad joined #git
07:57 adamm joined #git
07:57 Alienpruts joined #git
07:58 a_thakur joined #git
07:59 laumann joined #git
07:59 sophiag hi. i'm pretty new to git and wondering if there's a way to fetch commits made on github before i inited a local repo? i can see i my activity they're there, but the commits themselves aren't showing up... just accidentally deleted a readme i wrote in the browser and can't find i my logs :/
07:59 jknetl joined #git
08:00 mikecmpbll joined #git
08:01 aspiers_ left #git
08:01 aspiers joined #git
08:01 weckl joined #git
08:02 _main_ joined #git
08:05 cdown joined #git
08:06 PioneerAxon joined #git
08:07 ohcibi does anybody know how to enable git-flow-avh completions for `git flow` command on zsh?
08:07 ohcibi mine are working for git-flow but not for `git flow`
08:08 ocbtec joined #git
08:09 Err404NF joined #git
08:09 ferr joined #git
08:11 __main__ joined #git
08:14 ohcibi nvm.... brew uninstall git && brew intall git --without-completion
08:14 encod3 joined #git
08:14 zotherstupidguy txdv true, but rugged seem to provide the offset in characters, not in lines. each line is ended by a \n, is it possible to provide offsite via lines instead of characters?
08:14 cloudbud joined #git
08:16 noyb joined #git
08:17 flobin joined #git
08:17 cloudbud I am new to git and trying to learn git. Can anybody explain the purpose of this command .
08:17 cloudbud git commit -a -m 'added new benchmarks'
08:17 AciD` joined #git
08:18 AciD` hey
08:19 AciD` I did a git add *, and that added a log.txt file I did not want to track. I misstype git rm log.txt, instead of git rm --cached log.txt (that I did just after). Now I have a "deleted:    log.txt" staged
08:19 AciD` how can I clean that?
08:19 AciD` so that does not appear at all?
08:21 Seveas AciD`: you have not just added log.txt, but already committed it in a previous comimt
08:21 Seveas to restore it to the commited state, just check it out: git checkout HEAD -- log.txt
08:22 cloudbud can anybody tell me the -a option in git commit -a -m 'added new benchmarks'
08:22 cloudbud will it commit the newly created file as well
08:22 quetz joined #git
08:23 moritz only if you 'git add' it before
08:24 cloudbud moritz : it will commit all modified files
08:24 moritz cloudbud: but you're asking about new files, no?
08:25 moritz cloudbud: also, !tias applies
08:25 gitinfo cloudbud: Try it and see™. You learn much more by experimentation than by asking without having even tried. If in doubt, make backups before you experiment (see !backup). http://gitolite.com/tias.html may help with git-specific TIAS.
08:25 cloudbud thanks people
08:26 ybden joined #git
08:26 niels__ joined #git
08:27 AciD` whoops, doing that just remove all the changed done to log.txt since the last commit though :\
08:27 Error404NotFound joined #git
08:30 roelj_ left #git
08:30 cspack joined #git
08:30 Serpent7776 joined #git
08:31 mischat joined #git
08:34 kurkale6ka joined #git
08:34 ShekharReddy joined #git
08:36 roelmonnens joined #git
08:36 Ezzy joined #git
08:36 morenoh149 joined #git
08:37 cloudbud it does not commit the new created files tested that
08:37 a_thakur joined #git
08:41 star_prone joined #git
08:42 robotroll joined #git
08:42 lss8 joined #git
08:42 jknetl joined #git
08:46 sophiag going to try asking this again :(
08:47 sophiag hi. i'm pretty new to git and wondering if there's a way to fetch commits made on github before i inited a local repo? i can see i my activity they're there, but the commits themselves aren't showing up... just accidentally deleted a readme i wrote in the browser and can't find i my logs
08:47 hahuang62 joined #git
08:48 chll joined #git
08:48 txdv zotherstupidguy: you can just count yourself
08:48 mischat_ joined #git
08:49 ghostlight joined #git
08:50 mohabaks joined #git
08:51 HappyLoaf joined #git
08:53 clmsy joined #git
08:55 jknetl joined #git
08:55 zotherstupidguy txdv true, but the premises of computers is that they do it better :)
08:56 King_Hual joined #git
08:57 Snugglebash joined #git
09:00 mischat joined #git
09:00 basiclaser joined #git
09:00 zotherstupidguy sophiag git can be viewed as an append-only datastore of objects (only 4). in other words nothing is EVER lost unless you use a plumping command to do delete it.
09:00 zotherstupidguy sophiag https://git-scm.com/book/en/v2/Git​-Internals-Plumbing-and-Porcelain
09:01 auzty joined #git
09:01 grawity sophiag: does the local repo have anything to keep? otherwise simplest would be to `git clone` from Github
09:01 grawity otherwise, fetch + checkout
09:03 averell joined #git
09:04 flobin joined #git
09:04 sophiag zotherstupidguy
09:04 sophiag well i'm under the impression things are lost if you create them on github with no local repo and then force a push, right?
09:05 jknetl joined #git
09:05 sophiag grawity: i could clone the repo from github, but it was just pushed from my local so...
09:06 sophiag again...trying to recover a readme that was created with no local repo
09:06 sophiag and github does not save copies apparently
09:06 txdv computers dont do it better
09:06 zotherstupidguy sophiag i am not sure what happened in your case, but you can try somthing like `git cat-file -p master^{tree}` make sure to change master to your branch if it is not master
09:07 txdv computers only do what we tell them to do
09:07 txdv you just want that piece of code to be already available trough some api
09:07 sophiag zotherstupidguy: do you understand what i'm trying to do here? just want to be sure
09:08 zotherstupidguy txdv i don't consider laziness a sin :)
09:08 zotherstupidguy sophiag git cat-file -p master^{tree} wouldn't harm your repo in anyway, it will jsut list all the blob objects in the specified branch,
09:09 zotherstupidguy so if it is there you will see it
09:09 zotherstupidguy github doesn't delete any files. it is git too!
09:10 sophiag zotherstupidguy: oh ok...so if i create a new local repo and force push to a different repo on github i can recover the github repo? because they have no docs on that
09:11 synthmeat joined #git
09:12 zotherstupidguy sophiag how you to recover the github repo from a force push! i am not sure i am following, sorry
09:12 troulouliou_div2 joined #git
09:12 sophiag are you asking me a question?
09:13 sophiag i'm asking how to recover files that were only ever hosted on github and were forced pushed from an entirely different repo
09:13 sophiag that's my question
09:13 fedepad joined #git
09:13 zotherstupidguy sophiag maybe you can try to list your case better on stackoverflow, tag it with git; and post a link of the question here
09:14 sophiag well i asked you and you had a very clear answer to give me...
09:15 txdv do you mean overwritten by a force push?
09:15 sophiag that command returned several strings in addition to the one file my repo is tracking
09:15 sophiag is one of those the one from the other repo?
09:16 sophiag also you said: "github doesn't delete any files. it is git too!" so...how do i access those files?
09:16 sophiag if they're not deleted and i own the repos then it should be simple
09:17 felixdu_007 joined #git
09:18 zotherst1 joined #git
09:20 sophiag ok, so i'm told github doesn't delete files that are created only online...if so, how do i recover them after after a force push from a local repo? thanks
09:27 zotherstupidguy joined #git
09:27 zotherstupidguy git log to get the commit SHA and checkout the commit that you think got your files
09:34 sophiag i need to reset past the first commit and can't figure out how to do that
09:38 fuzzmz sophiag, not sure you can do anything. if they were first added locally (or were available on a repo at a point in time) you could use the reflog to get them back, but otherwise I'm not sure you have any options
09:39 fuzzmz I think the best way to go forward is to contact GitHub directly via https://github.com/contact
09:39 jknetl joined #git
09:39 sophiag fuzzmz: zotherstupidguy said that "github doesn't delete any files." is that true?
09:40 fuzzmz sophiag, it doesn't delete any files in the sense that they would still be in your git history
09:40 fuzzmz the problem comes from the fact that you overwrote that history by doing a git push --force
09:41 sophiag well my problem was never creating a local repo in the first place :/
09:41 fuzzmz yeah, it's best to have local clones of repos
09:41 sophiag the weird part is they still show your commits in activity, but if you click on them you get nothing...
09:42 fuzzmz sophiag, is the repo public?
09:42 sophiag yup it's public...not indexed tho. obviously i checked first thing
09:42 fuzzmz can you give me the link?
09:43 fuzzmz I'm curious about how the history looks
09:43 sophiag https://github.com/Sophia-​Gold/Symbolic-Algebra.clj
09:43 Milijus joined #git
09:44 fuzzmz ok, so I take it how things happened is this way: you created the repo on github, then via the web added a file, then from a pc did a force push with the "added type reduction..." commit?
09:45 troulouliou_div2 joined #git
09:46 sophiag yup, pretty stupid...but like i said, new to git
09:46 sophiag really just generally transitioning to a cli workflow this year
09:46 fuzzmz yeah, you can't really do much from your side unfortunately
09:46 sophiag yikes ok
09:46 blackwind_123 joined #git
09:47 sophiag welp, i'll send them a message and worst case...i just hate writing readmes
09:48 afuentes joined #git
09:48 WayToDoor joined #git
09:52 stamina joined #git
09:57 PCatinean joined #git
09:59 zotherst1 joined #git
09:59 mischat joined #git
10:00 satya4ever joined #git
10:03 rominronin joined #git
10:03 Akimb joined #git
10:03 Alienpruts joined #git
10:12 sophiag left #git
10:13 wxg joined #git
10:15 jknetl joined #git
10:15 mischat joined #git
10:16 Snugglebash joined #git
10:16 pothepanda joined #git
10:17 DelphicOkami joined #git
10:18 fuchstronaut joined #git
10:20 fuchstronaut joined #git
10:20 fuchstronaut joined #git
10:20 cloudbud I am using mv command to change a file name
10:23 cloudbud jbhanot@XAV-IND-LAP272 /d/clone (master) $ git mv newfile newfile.txtx  jbhanot@XAV-IND-LAP272 /d/clone (master) $ git status On branch master Your branch is ahead of 'origin/master' by 2 commits.   (use "git push" to publish your local commits)  Changes to be committed:   (use "git reset HEAD <file>..." to unstage)          deleted:    jyoti.txt         new file:   newfile.txtx
10:25 ash_workz joined #git
10:25 morenoh149 joined #git
10:26 watabou joined #git
10:27 tlaxkit joined #git
10:28 canton7 cloudbud, looks fine
10:28 canton7 cloudbud, !rename
10:28 gitinfo cloudbud: git does not support explicitly file renaming - the 'git mv' command is shorthand for 'git rm --cached; mv; git add'. All "rename" statistics are generated at runtime when examining history with git-log. See the -M option in the git-log manpage for more info. Also public-inbox.org/git/Pine.L​NX.4.58.0504150753440.7211@ppc970.osdl.org and `diff.renames = true`  in man git-config
10:28 CheckDavid joined #git
10:32 mischat joined #git
10:32 cloudbud but when I do git status it does not does not shows as renamed file.. if im doing anything wrong canton7
10:32 dodobrain joined #git
10:32 canton7 cloudbud, as gitinfo told you, that message is for information only. Git does not track whether a file was renamed. It does not matter whether 'git status' shows 'moved' or not
10:35 eduardas_m joined #git
10:35 cloudbud thanks :)
10:36 Lunatrius joined #git
10:36 fuchstronaut joined #git
10:37 dsdeiz joined #git
10:37 dsdeiz joined #git
10:38 HappyLoaf joined #git
10:38 tvw joined #git
10:38 qt-x joined #git
10:39 PalTale joined #git
10:39 CussBot joined #git
10:39 fuchstronaut joined #git
10:40 Error404NotFound joined #git
10:45 star_prone joined #git
10:47 AlexxNica joined #git
10:48 ssitani joined #git
10:48 hahuang62 joined #git
10:49 al-damiri joined #git
10:59 robotroll joined #git
11:01 danslo joined #git
11:02 PioneerAxon joined #git
11:02 _ng joined #git
11:04 rominronin joined #git
11:05 rts-sander_2 left #git
11:05 WayToDoor joined #git
11:06 rts-sander joined #git
11:09 danslo joined #git
11:12 drbean joined #git
11:13 encod3 joined #git
11:18 jnavila joined #git
11:19 barteks2x joined #git
11:20 Snugglebash joined #git
11:21 kyan joined #git
11:21 zotherst1 joined #git
11:24 _ng joined #git
11:25 WayToDoor joined #git
11:26 rnsanchez joined #git
11:26 s4ro joined #git
11:28 watabou joined #git
11:28 NwS joined #git
11:28 mizu_no_oto joined #git
11:29 ojdo joined #git
11:29 m0nkmaster joined #git
11:30 mizu_no_oto joined #git
11:31 m0nkmaster joined #git
11:34 nowox Does anybody know why git is not built with PCRE by default?
11:35 nuck joined #git
11:36 Marbug joined #git
11:37 marienz joined #git
11:38 bremner because it's an extra dependency that needs to be installed, maybe?
11:40 nowox PCRE is pretty standard I think.
11:40 encod3 joined #git
11:41 tlaxkit joined #git
11:41 marienz_ joined #git
11:41 Zarthus I don't know if I've ever used regex with git.
11:42 Zarthus How often do you?
11:44 osse Zarthus: bro do u even git grep? git log -G ? get with the times!
11:44 osse git log --grep
11:45 tjone270 joined #git
11:45 fuzzmz wait, regex works with all the git installs I have
11:45 osse But I mostly use those with fixed strings anyway :p
11:45 Zarthus osse: I am aware of the command, but how often do you use it :P
11:46 bremner I suspect most linux distros compile in PCRE support. Debian does. So, ask your favourite binary provider.
11:46 Zarthus aside from git log, I can't think of any other command that is used for regex as well (but that may just be me)
11:46 nowox Zarthus dozens times everyday
11:46 osse I rarely use git log -G, but its sibling -S quite often
11:47 nowox fuzzmz, regexes yes, but which flavor? ERE? BRE? PCRE?
11:47 osse git grep is nice for IDE-like "find occurences/references"
11:48 harish joined #git
11:48 fuzzmz nowox, good point, I have no idea what flavour I'm using
11:48 Zarthus i hope it's at least extended posix :P
11:48 nowox I usually use the `g` alias as `git --no-pager grep --perl-regexp -n -i`
11:49 nowox It is slightly faster than `ag`
11:50 rom15041 left #git
11:50 osse i suppose git will use whatever <regex.h> uses if not PCRE
11:50 Snugglebash joined #git
11:50 jeffreylevesque joined #git
11:51 rorro joined #git
11:51 rom1504 joined #git
11:51 encod3 joined #git
11:52 a_thakur joined #git
11:52 grawity <regex.h> is always POSIX regexen
11:52 JeroenT joined #git
11:53 JeroenT joined #git
11:53 osse hmm, git has a compat/regex/
11:53 osse ouch
11:55 mgoodwin joined #git
11:55 jwest1 joined #git
11:56 bcc joined #git
11:57 Ba11istiX joined #git
11:58 dsdeiz joined #git
11:58 raijin joined #git
12:00 kba left #git
12:03 DolpheenDream joined #git
12:03 johnmilton joined #git
12:04 Junior joined #git
12:04 rnsanchez_ joined #git
12:05 johnmilton joined #git
12:06 winterchip joined #git
12:07 sdothum joined #git
12:08 Rh0nda left #git
12:09 Rhonda joined #git
12:09 jknetl joined #git
12:09 JeroenT_ joined #git
12:10 ewet joined #git
12:13 Prisoner-2460_1 joined #git
12:14 morenoh149 joined #git
12:18 Ba11istiX left #git
12:18 winterchip joined #git
12:19 JeroenT joined #git
12:21 niels__ joined #git
12:23 aswen joined #git
12:23 rgrinberg joined #git
12:24 star_prone joined #git
12:25 Castor_Troy joined #git
12:25 Castor_Troy Hello
12:26 masuberu joined #git
12:27 osse Is there anybody in there?
12:27 osse Just nod if you can hear me
12:27 Castor_Troy nodding
12:27 rgrinberg joined #git
12:28 BlackMaria joined #git
12:29 nowox Lots of connected people, but nobody listening. It feels like my team meetings.
12:30 geoid joined #git
12:31 rominronin joined #git
12:32 fmcgeough joined #git
12:35 cyan__ joined #git
12:36 Snugglebash joined #git
12:36 jimi_ joined #git
12:37 GodGinrai joined #git
12:37 Perspicaciosity joined #git
12:37 poz3idon joined #git
12:37 pskhadke joined #git
12:37 a_thakur joined #git
12:38 cyan__ joined #git
12:38 King_Hual joined #git
12:41 tlaxkit joined #git
12:42 cm24 joined #git
12:42 DevAntoine` left #git
12:42 DevAntoine joined #git
12:42 DevAntoine hi
12:42 Chinorro joined #git
12:43 DevAntoine is it possible to rebase while having non tracked files?
12:43 osse yes
12:43 Vinnie_win joined #git
12:43 leeN joined #git
12:43 isysd joined #git
12:44 Vinnie_win joined #git
12:44 masuberu hi
12:44 gitinfo masuberu: 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.
12:44 DevAntoine osse: how so?
12:44 osse DevAntoine: you just do it
12:45 DevAntoine osse: error: The following untracked working tree files would be overwritten by checkout:
12:45 osse ah yes
12:45 osse not a rebase-specific problem. move it out of the way
12:45 anbz joined #git
12:46 jeffreylevesque joined #git
12:46 DevAntoine osse: outside the git repo?
12:47 osse DevAntoine: this sometimes happens because the commits you want to rebase add a file, and the upstream commits don't have it, and because of some weirdness the are remnants of files left over from switching branches or resolving conflicts
12:48 tchan joined #git
12:48 anbz joined #git
12:49 osse DevAntoine: outside the repo, or rename it, or move it to a different dir
12:49 hahuang62 joined #git
12:49 osse chances are you can just delete it
12:50 snowkidind joined #git
12:50 DevAntoine osse: no, I cannot, it's a file I created myself, not present in develop (from which I want to rebase)
12:51 osse DevAntoine: the branch you want to rebase adds a file by this name
12:52 DevAntoine osse: well, weird, because I did the rebase and I had no file of this name
12:53 osse ok then. the branch you want to rebase does not have it; the branch you want to rebase onto does.
12:53 rbern joined #git
12:53 osse for some reason git wants to create a file by that name, but there is one already there
12:54 masuberu I am trying to push my project to bitbucket but it says "fatal: The current branch master has no upstream branch.
12:54 masuberu "
12:55 perrier-jouet joined #git
12:55 DevAntoine osse: http://pastebin.com/APehkSzm
12:55 DevAntoine anyway I've solved it, but I don't understand the issue
12:57 osse DevAntoine: git log develop -- src/Agenor/AppBundle/Service/ContractService.php
12:57 osse some commit adds that file
12:57 DevAntoine oh yes, so weird oO
12:57 DevAntoine thanks
12:58 osse maybe by mistake?
13:00 DevAntoine well, I guess so
13:01 EY joined #git
13:01 osse DevAntoine: !config
13:01 gitinfo DevAntoine: [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
13:01 umbSublime_ joined #git
13:01 osse (my guess)
13:02 tjone270_ joined #git
13:03 hallogallo[m] joined #git
13:03 geoid joined #git
13:04 fuchstronaut joined #git
13:04 rominronin joined #git
13:04 shinnya joined #git
13:05 geoid joined #git
13:08 canton7 bleh. `git config --global alias.commit-am 'commit -am'`
13:08 tjone270__ joined #git
13:10 ExoUNX joined #git
13:11 e14 joined #git
13:12 e14 joined #git
13:12 perlpilot joined #git
13:12 Gsham joined #git
13:12 cdg joined #git
13:13 yaymukund joined #git
13:13 Prisoner-2460_1 joined #git
13:13 zivester joined #git
13:13 ssitani joined #git
13:13 chele joined #git
13:14 absence left #git
13:14 citizen-stig joined #git
13:15 Snugglebash joined #git
13:17 thierryp joined #git
13:17 shafun joined #git
13:17 JamesBaxter joined #git
13:19 Darren_ joined #git
13:21 cdg joined #git
13:21 yaymukund I have a dream of a tool that will, when I (e.g.) delete user-login.js, it will analyse my repository and warn me that a variable referenced in that file is still being used elsewhere in teh repository, or that I forgot to delete `user-login-test.js`. Does such a tool exist?
13:22 ^7heo yaymukund: you mean an IDE?
13:23 inflames joined #git
13:23 ^7heo yaymukund: I mean, you can achieve the same with grep(1) in that example, but an IDE will have the advantage of doing it for more operations than rm.
13:23 snowkidind when i type git staus i get a bunch of files I deleted a while ago. How do I remove them ? e.g. deleted:    uploads/image562c530c6278cthumb.jpg
13:23 star_prone joined #git
13:24 star_prone joined #git
13:24 yaymukund ^7heo: ah okay. I mean. I'm on vim I can look for plugins that achieve the same thing. I was also thinking it would be cool to trace through git history and try to guess related code that way.
13:24 ^7heo well
13:24 ^7heo maybe there are plugins for code analysis
13:25 ^7heo I know that I have syntastic that does some of those things
13:25 satya4ever joined #git
13:25 robotroll joined #git
13:25 ^7heo for example, warning me that the include (in C) I'm using isn't in the path
13:25 ^7heo also does some python linting
13:26 satya4ever_ joined #git
13:26 s4ro left #git
13:26 ^7heo I think it also warns me if my PHP code is fucked up
13:27 sangy_ joined #git
13:27 ^7heo So I guess it might also work with JS
13:27 yaymukund gotcha, yeah linting is great and things like clojure compilation (for JS) is also nice
13:27 ^7heo yep
13:29 GodGinrai Yea, you can set up linters in vim fairly easily
13:30 ^7heo and for git, you can also have fugitive and gitgutter
13:30 WayToDoor joined #git
13:30 ^7heo which are good ways of doing some git operations in vim
13:30 watabou joined #git
13:30 ^7heo you might also want to check out vimdiff if you haven't.
13:30 ^7heo it's useful too.
13:31 Error404NotFound joined #git
13:31 yaymukund yeah I use fugitive and like it
13:31 yaymukund and syntastic
13:32 yaymukund I was looking for something more aggressive than linting, which wouldn't include rules such as "similar filenames to deleted files" unless you added a plugin specific to whatever testing library you were using, for example. shrug, I guess maybe it's a bad idea for reasons I'm overlooking or it's hard or I should write it :p
13:32 fuchstronaut joined #git
13:33 yaymukund and I still think it would be cool to analyze git history to fuzzily detect related code that you forgot to delete
13:33 satya4ever left #git
13:35 mischat_ joined #git
13:36 mniip joined #git
13:37 yaymukund https://github.com/adamtornhill/code-maat looks fun, gonna spent 10m trying to see if this works
13:37 sin3t joined #git
13:38 JoshL joined #git
13:38 crose joined #git
13:39 mmlb joined #git
13:41 whitby joined #git
13:41 patarr joined #git
13:42 sveinse joined #git
13:42 codfection joined #git
13:43 eivarv joined #git
13:43 jaguarmagenta joined #git
13:43 _rnsanchez_ joined #git
13:44 l4v2 joined #git
13:45 danslo I merged a feature branch containing a single commit to master. That commit shouldn't have landed yet, so someone did a git revert. I want to merge the branch again now, but git says there are no changes when I attempt to 'git merge' again. I can do a revert of revert, but I wonder what the situation would be when I had multiple commits in this branch, how do I force a merge?
13:46 tvw joined #git
13:46 tctara_ left #git
13:47 jaguarmagenta joined #git
13:49 ayjay_t joined #git
13:50 patarr joined #git
13:50 ssitani joined #git
13:51 thomas_25 joined #git
13:52 thomas_25 I have a README.md that is in my repository but I want it to be generated pre-commit by a command? Does that make sense?
13:52 Murii joined #git
13:52 whitby danslo: I imagine there are other ways but I'd recommend rebasing the feature branch on master
13:52 whitby That way you'd have a new commit
13:53 thomas_25 this means that the pre-commit script will in affect modify a file that is being committed
13:53 CEnnis91 joined #git
13:54 JeroenT joined #git
13:55 roue joined #git
13:55 roue hola
13:57 roue git newbie question: is it possible to have a single git clone'd repo on the local filesystem and have multiple simultaneous branches each in it's own directory? I maintain a project that has multiple tag releases that are in use. All the tags are branches in a single git repo. My end users go to the directory for the tag release and use them there rather than using git themselves.
13:57 roue thanks for any suggestions.
13:57 AaronMT joined #git
13:57 sveinse I need to rewrite the git URL to git-shell (remove the prepending '/'). I planned on doing this by wrapping git-shell and then call exec git-shell. However I just can't get it to work. I have to call git-shell -c <options_from_ssh_cmdline> right?
13:58 sveinse Is that with one argument after -c or multiple?
13:58 moritz roue: why not use separate clones?
13:58 sveinse It fails with "fatal: Run with no arguments or with -c cmd"
13:59 moritz roue: you can do local clones that create hardlinks to save space, if disk space is a concern
13:59 roue moritz, disk space. It's a big repo.
13:59 whitby roue: yep, use separate clones (as moritz pointed out) though you may be able to play around with the worktree feature
13:59 red82 joined #git
13:59 whitby man git-worktree
13:59 gitinfo the git-worktree manpage is available at http://jk.gs/git-worktree.html
14:00 pskhadke joined #git
14:00 roue moritz, whitby, thanks. Worktree looks like it might be the solution I need.
14:00 phaleth joined #git
14:00 am55 joined #git
14:01 moritz roue: but you want separate HEADs, not just separate wortrees, right?
14:01 whitby sveinse: probably one argument (that's how sh works iirc)
14:01 moritz afk
14:01 roue moritz, no idea. I'm a newbie :)
14:02 mmlb joined #git
14:03 e14_ joined #git
14:03 morenoh149 joined #git
14:03 _ng joined #git
14:03 ahmed_elgabri joined #git
14:04 roue git clone --reference looks like a reasonable option for me too.
14:04 _ng joined #git
14:04 pskhadke joined #git
14:04 moritz roue: my advise would be to go with that first, and maybe buying bigger disks as a second step. Disk is cheap (especially if it doesn't need backups and all that fuzz), your time figuring it all out likely less so :-)
14:06 mmlb joined #git
14:07 oxsyn joined #git
14:08 mitnk joined #git
14:09 eindoofus joined #git
14:11 Peuc2 joined #git
14:11 sonOfRa joined #git
14:11 star_prone joined #git
14:12 wrouesnel2 joined #git
14:12 niels__ joined #git
14:13 Dougie187 joined #git
14:15 roue I keep trying to do a git clone --reference /path/to/full/git/clone but it keeps telling me that I must specify a repository to clone.
14:15 roue I've tried both /path/to/full/git/clone and /path/to/full/git/clone/.git
14:15 roue but neither are recognized as a clone for some reason I'm not understanding.
14:15 actinide joined #git
14:19 usm4n joined #git
14:20 geoid joined #git
14:21 enfx joined #git
14:22 IndigoTiger joined #git
14:25 andlabs joined #git
14:25 lamont joined #git
14:25 jottr joined #git
14:26 niels__ joined #git
14:27 lamont joined #git
14:27 Zamyatin joined #git
14:28 star_prone joined #git
14:28 enfx joined #git
14:29 averell joined #git
14:29 mikecmpbll fwiw i think it's to do with this http://stackoverflow.com/a/32503667/1520714 and default branch setting on gitlab
14:29 cyan__ joined #git
14:30 vassagus joined #git
14:30 ToBeCloud joined #git
14:31 moritz roue: try it with a bare repo?
14:31 lamont joined #git
14:31 watabou joined #git
14:31 yaymukund joined #git
14:32 ResidentBiscuit joined #git
14:32 cyan__ joined #git
14:32 jknetl joined #git
14:32 lamont joined #git
14:33 codfection joined #git
14:33 scorphus joined #git
14:35 ShekharReddy joined #git
14:37 Snugglebash joined #git
14:37 mjuszczak joined #git
14:38 _xor joined #git
14:39 e14_ joined #git
14:39 zacts joined #git
14:40 anonymuse joined #git
14:42 nilg joined #git
14:43 AphoticAphid joined #git
14:44 sns joined #git
14:45 actinide joined #git
14:46 sssilver joined #git
14:47 AphoticAphid so, i'm thinking of using git to manage writing novels. i don't really want to make a new repo for each book though, as it would be a pain to push/pull the updates to all of my devices. any thoughts?
14:47 AphoticAphid if i made a folder for each book, i don't think i could make branches meaningfully
14:47 a_thakur joined #git
14:47 AphoticAphid but having a branch for each book might work
14:47 Stummi whats wrong with one repo per book?
14:48 AphoticAphid i have a server i push all my repos to to keep them updated and provide for easy syncing, but i don't want to remember to run git push or pull for so many repos
14:49 AphoticAphid if i could just manage one "books" repo, that might make it easier
14:49 moritz AphoticAphid: you'd need to. Just push afater you commit, and pull before you start wrting
14:49 moritz *after
14:49 AphoticAphid hm
14:49 AphoticAphid alright
14:49 selckin could keep each book on a differend branch too
14:49 moritz AphoticAphid: I mean, you won't be writing on 10 novels at the same time, right?
14:49 lamont joined #git
14:49 AphoticAphid haha, yeah i won't be, just one at a time
14:50 hahuang62 joined #git
14:50 AphoticAphid i guess one book per repo makes a lot more sense than anything i'm thinking of
14:50 robotroll joined #git
14:50 moritz if you come from an SVN background, that seems scary at first, because setting up an SVN repo is scary
14:50 moritz but for git, it's usually very little effort
14:50 JanC_ joined #git
14:50 AphoticAphid now that i think about it, it doesn't seem so bad
14:51 moritz especially if you compare it to writing the freakin' book itself
14:51 swalladge joined #git
14:51 jokester joined #git
14:52 xshuiniu joined #git
14:53 nettoweb joined #git
14:54 ronny joined #git
14:54 AphoticAphid i guess the only major pain point would be if i want to rename or move the bare git repo on the server
14:54 ronny hi
14:55 AphoticAphid right now the book i'm working on is in /home/git/book1 , but once i give it a title i might want to change that
14:55 ResidentBiscuit Not really hard. Just change your remote URL
14:55 ronny is there any wayto get git describe output in a more well-parsable manner? its really tricky to determine what each part of the string means
14:57 AphoticAphid ResidentBiscuit: hm, i knew i would have to do that, but now that i think about it it doesn't seem so bad
14:57 moritz ronny: you can use --long
14:58 moritz ronny: then the format is always <last tag>-<number of commits since last tag>-g<abbrev. hash>
14:58 ResidentBiscuit AphoticAphid: Ye, it's one command. Not too bad
14:58 moritz not hard ot parse at all
14:58 JeroenT_ joined #git
14:58 AphoticAphid git's great
14:58 jknetl joined #git
14:59 hobodave joined #git
14:59 ronny moritz: its not if i use always
14:59 moritz ronny: then don't do that
14:59 ronny moritz: my prolbem is, that i try to infer a version number fromthe scm state, currently this results in incorrect data when poeple have no tag whatsoever
15:00 ronny so bacially for any commit in the repo i want to be able to infer a version number
15:00 zivester joined #git
15:01 phaleth joined #git
15:03 mangolisk joined #git
15:03 roelmonn_ joined #git
15:03 somaReverse joined #git
15:03 moritz ronny: you cannot generate monotonous version numbers from any git commit
15:03 somaReverse hi
15:03 somaReverse how can I add a directory without its elements
15:04 moritz ronny: if they don't have to be monotonous, you can simply use `git rev-parse HEAD` (the full sha1)
15:04 moritz somaReverse: you cannot
15:04 moritz !empty
15:04 gitinfo [!directory] Git does not track directories, only files in directories.  Create a nonce file as a placeholder (eg .gitignore) to create the directory or create the directory as part of a post-checkout hook
15:04 NeverDie joined #git
15:04 somaReverse cool
15:04 grawity you can do `git rev-list --count HEAD` assuming it's always the same upstream branch
15:04 somaReverse thanks
15:04 grawity e.g. when always building from origin/master
15:04 grawity it's... not really different from the number in the middle of `git describe`
15:05 moritz also, it really depends on your use case. If you need a version number for a build, maybe your build tool can help you
15:05 moritz for example https://go.cd/ offer GO_PIPELINE_COUNTER and GO_STAGE_COUNTER as environment variables
15:05 Emperor_Earth joined #git
15:06 somaReverse moritz: can I add a gitignore file
15:06 somaReverse moritz: that ignores everything except itself
15:07 grawity "*"
15:07 moritz somaReverse: or just everything. Sure
15:07 ronny moritz: i mostly need branch and distance to last tag
15:07 grawity then `git add -f .gitignore`
15:07 laumann joined #git
15:08 ronny moritz: the version number is generally $(guess-next $currentReleaseTag).dev$(dista​nce)$(node-and-date-if-dirty)
15:08 ronny and in future guess next will pick the increment based on branch
15:09 dviola joined #git
15:11 phaleth joined #git
15:11 sssilver joined #git
15:11 ayjay_t joined #git
15:13 shgysk8zer0 joined #git
15:13 drbean_ joined #git
15:13 sns joined #git
15:14 miklcct joined #git
15:15 drbean- joined #git
15:15 lv2eof joined #git
15:15 sangy joined #git
15:15 lv2eof Hello everybody :)
15:16 mikecmpb_ joined #git
15:16 InfoTest joined #git
15:16 ciss joined #git
15:16 hashpuppy joined #git
15:16 Snugglebash joined #git
15:16 drbean| joined #git
15:18 tyreld joined #git
15:18 Prisoner-2460_1 joined #git
15:20 Snugglebash joined #git
15:20 drbean joined #git
15:21 codfection joined #git
15:22 Gitzilla joined #git
15:22 thierryp joined #git
15:22 sssilver joined #git
15:22 miklcct joined #git
15:23 vassagus joined #git
15:23 clemf joined #git
15:23 drbean_ joined #git
15:23 Brain joined #git
15:24 xshuiniu joined #git
15:25 lamont joined #git
15:25 phaleth joined #git
15:25 ItSANgo joined #git
15:26 thebope joined #git
15:26 raspado joined #git
15:26 crayon joined #git
15:26 sfjdchjsdy joined #git
15:26 felixdu_007 joined #git
15:28 navidr_ joined #git
15:28 drbean joined #git
15:29 michaelsharpe joined #git
15:29 kpease joined #git
15:30 xshuiniu joined #git
15:31 le_melomane joined #git
15:31 rnsanchez_ joined #git
15:32 johnmilton joined #git
15:32 watabou joined #git
15:32 drbean_ joined #git
15:33 croberts joined #git
15:33 subhojit777 joined #git
15:34 drbean joined #git
15:34 subhojit777 joined #git
15:36 hobb joined #git
15:36 hobb left #git
15:36 _rnsanchez_ joined #git
15:38 drbean_ joined #git
15:38 nikivi joined #git
15:38 johnmilton joined #git
15:39 vassagus joined #git
15:39 xshuiniu joined #git
15:40 vassagus_ joined #git
15:40 drbean- joined #git
15:41 xshuiniu joined #git
15:41 anonymuse joined #git
15:41 cagedwisdom joined #git
15:41 tomek joined #git
15:42 drbean joined #git
15:42 eduardas_m joined #git
15:42 le_melomane joined #git
15:43 ShekharReddy joined #git
15:43 KevinMGranger_ left #git
15:43 nedbat lv2eof: hi, on IRC it works best to ask your question immediately, if you have one.
15:43 KevinMGranger joined #git
15:44 drbean| joined #git
15:44 xshuiniu joined #git
15:44 Snugglebash joined #git
15:46 ahmedelgabri joined #git
15:46 drbean_ joined #git
15:47 anonymuse joined #git
15:47 thebope joined #git
15:47 Salander27 joined #git
15:49 drbean joined #git
15:49 NeverDie joined #git
15:50 eduardas_m joined #git
15:51 drbean- joined #git
15:51 kyan joined #git
15:51 tang^ joined #git
15:52 harry1 joined #git
15:52 watabou joined #git
15:52 thadtheman joined #git
15:53 e14 joined #git
15:54 drbean_ joined #git
15:54 le_melomane joined #git
15:56 citizen-stig joined #git
15:57 jaguarmagenta joined #git
15:57 drbean joined #git
15:57 WayToDoor joined #git
15:57 durham joined #git
15:59 diogenese joined #git
15:59 red82 If I’m on branch A (master) and want to merge in a bunch of stuff from branch B, but I want to do a dry run first, would making a A1 branch off A and merging B into there be the same as a dry run ?
15:59 le_melomane joined #git
15:59 mitnk-test joined #git
15:59 grawity if the contents are identical, the results are also identical
16:00 drbean- joined #git
16:01 saidelike joined #git
16:02 ExoUNX joined #git
16:03 raijin joined #git
16:03 anonymuse joined #git
16:04 drbean joined #git
16:05 Dong joined #git
16:05 e14 joined #git
16:06 WakiMiko joined #git
16:06 harish joined #git
16:07 drbean_ joined #git
16:07 Dong anybody familiar with pack negotiation used for fetch? got confused a lot
16:07 Apteryx joined #git
16:09 drbean- joined #git
16:09 xshuiniu joined #git
16:10 danimal2 joined #git
16:10 snowkidind joined #git
16:10 miklcct joined #git
16:10 drbean| joined #git
16:10 danslo joined #git
16:10 leeN joined #git
16:11 mikecmpbll joined #git
16:11 clemf joined #git
16:12 dave0x6d joined #git
16:12 drbean joined #git
16:12 dave0x6d How can I get git ls-files to output all the filenames on one line with spaces?
16:13 tvw joined #git
16:13 dave0x6d -z uses nulls.
16:13 ExoUNX joined #git
16:13 a_thakur joined #git
16:14 ahmedelgabri joined #git
16:15 drbean_ joined #git
16:15 laumann joined #git
16:15 Chloe joined #git
16:15 kpease joined #git
16:15 lacrymology joined #git
16:16 drbean- joined #git
16:16 star_prone joined #git
16:17 lindenle joined #git
16:17 canuk joined #git
16:18 miklcct joined #git
16:19 mikecmpb_ joined #git
16:19 xshuiniu joined #git
16:19 michaelsharpe joined #git
16:19 drbean joined #git
16:20 mitnk-test joined #git
16:22 MacWinner joined #git
16:23 wrouesnel2 joined #git
16:24 mjuszczak joined #git
16:24 drbean_ joined #git
16:27 niels__ joined #git
16:27 barteks2x joined #git
16:28 nikivi joined #git
16:28 jimi_ joined #git
16:29 drbean joined #git
16:29 ansimation joined #git
16:30 rnsanchez_ joined #git
16:31 drbean- joined #git
16:32 pijiu joined #git
16:33 tgunr joined #git
16:34 drbean_ joined #git
16:35 LeBlaaanc joined #git
16:36 madewokherd joined #git
16:37 EvilPenguin joined #git
16:37 rnsanchez_ joined #git
16:38 raijin joined #git
16:38 codfection joined #git
16:38 intellix joined #git
16:38 sssilver_ joined #git
16:38 stomplee joined #git
16:39 joenet joined #git
16:39 BlaXpirit dave0x6d, do you accept usage of other processes?
16:40 dave0x6d BlaXpirit: already got it working, thanks =)
16:40 BlaXpirit echo $(git ls-files)
16:40 BlaXpirit oh right, that was long ago
16:43 sanketdg joined #git
16:44 mjuszczak joined #git
16:48 Salander27 joined #git
16:48 nitric joined #git
16:49 Dong anybody familiar with pack negotiation used for fetch? got confused a lot
16:49 ^7heo nice nick.
16:50 hahuang62 joined #git
16:51 beagleGuy joined #git
16:52 Groscheri joined #git
16:52 scorphus joined #git
16:52 danslo joined #git
16:52 Groscheri joined #git
16:52 kikijiki[m] joined #git
16:52 actinide joined #git
16:52 miklcct joined #git
16:53 Groscheri joined #git
16:53 lv2eof joined #git
16:54 jaafar joined #git
16:55 crayon joined #git
16:55 crayon joined #git
16:56 Groscheri joined #git
16:58 MattMaker joined #git
16:59 Darcidride joined #git
16:59 Groscheri joined #git
17:00 durham_ joined #git
17:00 dsdeiz_ joined #git
17:01 mikecmpbll joined #git
17:02 freimatz joined #git
17:02 durham__ joined #git
17:02 danimal2 joined #git
17:04 tabakhase uhm uhm uhm,....
17:04 tabakhase did github irl just learnt "rebase & merge" o.O
17:04 thebope joined #git
17:05 kpease joined #git
17:06 mykespb joined #git
17:07 citizen-stig joined #git
17:07 a_thakur joined #git
17:07 thebope joined #git
17:10 Chloe joined #git
17:10 mutex joined #git
17:12 star_prone joined #git
17:13 SteffanW joined #git
17:15 e14 joined #git
17:16 duderonomy joined #git
17:16 Sucks joined #git
17:19 KevinMGranger I think it's available everywhere, not just ireland
17:19 mykespb joined #git
17:19 fuchstronaut joined #git
17:20 Apteryx joined #git
17:21 mischat joined #git
17:22 mischat joined #git
17:22 inflames joined #git
17:22 watersoul joined #git
17:25 LionsMane joined #git
17:28 kpease joined #git
17:28 str_ joined #git
17:29 thierryp joined #git
17:29 a_thakur joined #git
17:30 Rodya_ joined #git
17:30 CussBot joined #git
17:31 mischat joined #git
17:33 dreiss joined #git
17:34 danslo joined #git
17:36 nsekhar joined #git
17:36 hahuang65 joined #git
17:36 xer0x joined #git
17:38 Topic for #git is now Welcome to #git, the place for git help and electronically-induced comas | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.0 | Getting "cannot send to channel"? /msg gitinfo .voice | git-daemon: the evil rises
17:38 gee_one joined #git
17:39 winterchip joined #git
17:39 thebope_ joined #git
17:39 kline joined #git
17:40 thebope joined #git
17:40 star_prone joined #git
17:41 harry1 joined #git
17:41 xer0x Git push help please, I run `git push github origin/xer0x/branch` but on GitHub my xer0x/branch isn't updated?
17:41 grawity you're probably pushing the wrong branch
17:41 ayjay_t joined #git
17:41 thebope_ joined #git
17:41 xer0x probably, I wanted to run `git push github xer0x/branch` it told me it couldn't that branch
17:42 grawity ...what branches does `git show-ref` list?
17:42 thiago joined #git
17:42 xer0x Great question
17:43 nate_c joined #git
17:44 aard joined #git
17:45 NeverDie_ joined #git
17:45 Orphis joined #git
17:46 qws-user-1228 joined #git
17:47 thebope joined #git
17:48 nilg joined #git
17:49 mjuszczak joined #git
17:50 Gsham joined #git
17:50 rbern joined #git
17:51 Erati joined #git
17:51 xer0x @grawity 3 refs:
17:51 xer0x f7a8 refs/heads/xer0x/branch
17:51 xer0x a7a0 refs/remotes/github/xer0x/branch
17:51 xer0x f7a8e refs/remotes/origin/xer0x/branch
17:51 xer0x f7a8 is what I want on GitHub, but a7a0 is what is there
17:54 shinnya joined #git
17:55 danslo joined #git
17:55 steelnwool joined #git
17:55 steelnwool hello.
17:55 NwS joined #git
17:56 steelnwool I updated my remote branch on github to merge master into it. when I do a git pull on my workstation it tells me to do a "git pull <remote> <branch>". What syntax is proper for remote and branch? ssh://github.com/myproject feature/mybranch ?
17:56 cyan__ joined #git
17:57 Sasazuka joined #git
17:57 jmd joined #git
17:58 jaguarmagenta joined #git
17:58 jmd How can I list the files which are changed by a commit?
17:59 codfection joined #git
17:59 steelnwool Google that one, there is an stackover flow answer to that. (I know this cause i checked about 30 minute ago, but have now closed it:) )
18:00 mjuszczak joined #git
18:00 steelnwool http://stackoverflow.com/questions/42407​1/how-to-list-all-the-files-in-a-commit
18:00 thebope_ joined #git
18:00 yaymukund joined #git
18:01 tizia joined #git
18:01 thebope_ joined #git
18:04 e14 joined #git
18:04 multi_io joined #git
18:05 mikecmpbll joined #git
18:06 durham joined #git
18:06 flobin joined #git
18:06 drizbit joined #git
18:07 annoymouse4210 joined #git
18:08 snthsnth joined #git
18:08 morenoh149 joined #git
18:09 morenoh149 why does `git branch -m newname` give me error: refname refs/heads/branch not found ?
18:09 AnarchyAo joined #git
18:09 morenoh149 nvm http://stackoverflow.com/questions/18​382986/git-rename-local-branch-failed
18:12 masak joined #git
18:12 masak is it kosher for the post-receive hook to create branches, merge commits, etc?
18:14 Mikerhinos joined #git
18:16 actinide joined #git
18:16 meejah_ left #git
18:17 jknetl joined #git
18:17 geoid joined #git
18:18 tvw joined #git
18:18 testic joined #git
18:19 cspack joined #git
18:20 mkoskar joined #git
18:21 Zamyatin joined #git
18:23 x_ joined #git
18:23 kyan joined #git
18:24 x_ left #git
18:25 ahmedelgabri joined #git
18:27 re1 joined #git
18:27 nsekhar left #git
18:29 Spec-Chum joined #git
18:30 joki joined #git
18:30 dsantiago joined #git
18:31 alex1a joined #git
18:32 mikecmpbll joined #git
18:33 mischat joined #git
18:37 Salander27 joined #git
18:40 mkoskar joined #git
18:40 rahtgaz joined #git
18:41 sanketdg joined #git
18:42 jnavila joined #git
18:42 sanketdg why is 73 a standard for shorlogs?
18:42 sanketdg s/standard/considered standard
18:42 neurodrone_ joined #git
18:43 Ryanar joined #git
18:43 Ryanar joined #git
18:44 rishi joined #git
18:46 inflames joined #git
18:46 jimi_sanchez joined #git
18:46 masak I see many examples of the post-receive hook sending emails and stuff -- but is it also OK for it to create new branches, merge branches, etc?
18:46 masak I mean, I'm guessing it is, but I can't really find an example of someone doing it.
18:46 masak I'm thinking of doing this for some team workflows.
18:48 clemf_ joined #git
18:48 masak oh, and tagging commits too.
18:48 nwkj86 joined #git
18:51 hahuang62 joined #git
18:52 preaction sanketdg: because e-mails and terminals are wrapped at 80, and you want to have a couple levels of quoting (2 characters each) just in case
18:52 jimi_ joined #git
18:52 sanketdg preaction: I see, is there a source somewhere for this?
18:52 preaction sanketdg: for the e-mail thing? you could read the rfcs...
18:53 sanketdg preaction: no this 73 chars thing
18:54 clemf joined #git
18:54 kyan joined #git
18:56 citizen-stig joined #git
18:57 nitric sanketdg: https://www.kernel.org/doc/Do​cumentation/SubmittingPatches, though here it says just "70-75", but it does give the full reasoning
18:57 parasite joined #git
18:57 danslo joined #git
18:59 kulelu88 joined #git
18:59 sanketdg nitric: uh tanks
18:59 morenoh149 joined #git
18:59 RichiH nitric, sanketdg: 72 is what people used in the old days
18:59 RichiH and what i still use today
19:00 RichiH it allows five levels of conversations, and quoting deeper than that is very unlikely
19:02 e14 joined #git
19:03 actinide joined #git
19:03 bsanford joined #git
19:03 aswen joined #git
19:03 ninetysevena joined #git
19:04 johnmilton joined #git
19:05 snthsnth joined #git
19:06 nopevms joined #git
19:06 aswen joined #git
19:07 t0n1c joined #git
19:08 gshrikant joined #git
19:09 AlexxNica joined #git
19:11 mlvnd joined #git
19:14 aswen joined #git
19:14 brake joined #git
19:15 vh0st- left #git
19:15 tchan joined #git
19:15 tchan joined #git
19:16 rgrinberg joined #git
19:17 winterchip joined #git
19:20 cdown joined #git
19:20 red82 joined #git
19:21 chelly joined #git
19:22 nurey joined #git
19:22 fuchstronaut joined #git
19:23 marc_v92 joined #git
19:23 carandraug joined #git
19:25 hahuang62 joined #git
19:25 carandraug hello! I have the sha1sum of a file and I know it's somewhere on the history of my repo. How can I retrieve the correct version of that file? (I have the checksum of the file, not of the commit). Should I loop over all revisions, and check the checksum of the file at each stage or is there a better way to do it?
19:29 sns joined #git
19:29 ShapeShifter499 joined #git
19:30 harry1 joined #git
19:30 m0viefreak joined #git
19:31 asdofindia joined #git
19:32 LeBlaaanc joined #git
19:32 thebope joined #git
19:32 Ldip joined #git
19:33 thebope Hello, in my "git diff master" comparison I'm seeing the same line subtracted from master and readded in my branch. I'm curious as to why that is being seen as a difference?
19:33 treehug88 was is removed from master
19:33 treehug88 "it"
19:34 mykespb joined #git
19:34 mischat joined #git
19:34 thebope hey treehug88, it's literally the exact same line, in one it's a minus, and then in the next it's a plus
19:35 thebope If it didn't exist in master wouldn't it just be a plus?
19:35 treehug88 right, what I said explains that
19:35 thebope Also I'm certain these haven't been removed from master
19:35 cdown joined #git
19:35 treehug88 I've seen cases where github got the boundaries of diffs wrong
19:36 treehug88 without looking at the exact case, I can't make any more guesses.
19:36 thebope hmm alright
19:36 thebope I'm trying to reduce the number of revisions so I'm seeing if I can get rid of these
19:37 incog joined #git
19:39 nd joined #git
19:40 prawnzy joined #git
19:43 thebope treehug88: I have a feeling it's a difference between spaces and tabs actually
19:43 treehug88 aha. Makes sense. So it's a change
19:44 thebope haha yea I suppose so
19:46 aidalgol joined #git
19:47 Flaghacker joined #git
19:48 Flaghacker I accidentally commited to the wrong branch, how can I move my last commit? Eg. I'm currently on branch A and I would like to move my last commit from A to branch B.
19:50 stamina joined #git
19:52 mlvnd joined #git
19:52 usm4n joined #git
19:53 enckse I'm in a situation in which I'm referencing rapidjson as a git submodule but I don't actually need (or want) the whole of their github repo (tests, documentation, etc.)...just the *.h file includes...what's the best way to approach this?
19:53 mrpackethead joined #git
19:53 vassagus joined #git
19:54 enckse flaghacker: you could cherry-pick the commit
19:55 tgunr joined #git
19:56 Flaghacker enckse, I'll take a look at that, thanks!
19:58 alex1a joined #git
19:58 sharpy joined #git
19:58 jaguarmagenta joined #git
20:00 treehug88 enckse You don't say anything about your context, but - One way to go would be to install it somewhere (say /opt/rapidjson or /opt/rapidjson-1.1.0) and refer to the install location from your build. You could also automate copying and committing the parts you need into you project, but that's kind of meh.  People mostly seem to avoid submodules these days (you can google around about them and form your own opinion).
20:01 vassagus joined #git
20:02 miklcct joined #git
20:02 yaymukund joined #git
20:03 cdg joined #git
20:05 fuchstronaut joined #git
20:05 enckse treehug88: that's actually very helpful, it sort of fits what I was suspecting for this case because I need such a subset of a repo that either putting it some place else or just "downloading" what I need when I need it would be better alternatives
20:05 treehug88 yeah install it and refer to the installed location
20:05 vassagus_ joined #git
20:06 enckse thanks
20:06 treehug88 you're welcome
20:08 ahr3n joined #git
20:08 ExoUNX joined #git
20:09 thebope_ joined #git
20:10 fuchstronaut joined #git
20:11 jnavila joined #git
20:12 t0n1c left #git
20:12 fedepad joined #git
20:12 KnownSyntax joined #git
20:15 ochorocho__ joined #git
20:15 jnavila_ joined #git
20:17 kyan Hi! Why when I ran git add -A; git commit -m "example"; in a repository, did it say "Changes not staged for commit:"…?
20:17 kyan My understanding was that git add -A would stage all the changes for commit.
20:18 romerocesar joined #git
20:18 incog left #git
20:20 dodobrain joined #git
20:22 ansimation joined #git
20:23 nedbat kyan: was it a new file?
20:24 kyan It was a new folder
20:24 nedbat kyan: then it had new files inside it (git doesn't track folders independently of the files inside).  git add -A   only adds changes to already-tracked files
20:24 kyan Oh...
20:24 kyan so I should do git add -A; git add -A *?
20:25 jon-mac joined #git
20:25 danslo joined #git
20:25 nedbat kyan: actually, I am wrong: git add -A   will add new files.
20:26 nedbat kyan: i don't know why it didn't take your new files.
20:26 kyan Hmm
20:26 inkog joined #git
20:26 kyan ok, thanks.
20:26 littlebi1 joined #git
20:27 ochorocho__ joined #git
20:28 _tgunr joined #git
20:28 inkog left #git
20:28 elastix joined #git
20:28 vassagus joined #git
20:29 clemf joined #git
20:30 winterchip joined #git
20:32 de-vri-es joined #git
20:35 thebope joined #git
20:35 satifant joined #git
20:37 thebope_ joined #git
20:37 ercx2x joined #git
20:38 ercx2x hey guys, i made a git commit and I want my project to be as if it was just when I made that git commit
20:38 ercx2x this is the last commit I had. I knew I'd be doing some risky stuff that would screw up my project which it has
20:38 littlebi1 joined #git
20:38 ercx2x but I created a commit before I screwed up my project. I want to go back to exactly like it was when the commit was made. I tried git reset --hard
20:39 ercx2x but that didn't undo the edits i did after that commit
20:39 sparr joined #git
20:39 dalias joined #git
20:39 perrier-jouet joined #git
20:41 Emperor_Earth_ joined #git
20:41 Repox joined #git
20:43 red82 joined #git
20:45 citizen-stig joined #git
20:45 pijiu joined #git
20:45 clemf joined #git
20:46 le_melomane joined #git
20:46 nedbat ercx2x: git reset --hard SHA_OF_THE_COMMIT
20:46 ercx2x nedbat: it was my very last comit
20:46 ercx2x can't I omit that?
20:46 danslo joined #git
20:46 aidalgol joined #git
20:46 ercx2x I think it did work as intended but my projects files aren't exactly the same as when I made the commit
20:47 nedbat ercx2x: you want to undo your very last commit?
20:47 ercx2x No, I did some changes since my last commit
20:47 ercx2x I want to simply go to that commit which I think I've done
20:47 ercx2x by doing that command
20:47 jast normally 'git reset --hard' does what you want, if I understood you correctly... but it leaves untracked files alone
20:47 ercx2x alright
20:47 abh joined #git
20:48 ercx2x I think I screwed up the db that my project is on then
20:48 ercx2x -.-
20:48 jast db?
20:48 cdesai joined #git
20:48 ercx2x yeah, i'm working on a project and its basically a website blog
20:48 ercx2x i did the reset --hard to get it back to its working state
20:48 ercx2x but now when I go to a page that is connected to my db it errors
20:49 jast oh, right
20:49 niels__ joined #git
20:49 jast did the changes you make change the db schema or something? :)
20:50 ercx2x yeah, for some reason I figured it was in the same folder as my .git file
20:50 alex1a joined #git
20:50 ercx2x i didn't think it thru
20:50 shgysk8zer0 joined #git
20:50 LBV_User joined #git
20:50 jast happens to the best of us...
20:51 jast interestingly I'm currently working on a tiny little blog engine that doesn't use a DB and just produces static files served by your garden variety web server
20:51 jast because there are only 438 existing tools that do the same :}
20:52 jast I've gotten tired of using blog stuff that needs a DB and eats up who knows how many CPU cycles for each page view
20:52 Atm0spher1c joined #git
20:53 alex1a joined #git
20:54 jast anyway, good luck getting it working again, and next time use a copy of the DB ;)
20:55 blackRose joined #git
20:55 romerocesar joined #git
20:55 le_melomane joined #git
20:56 overlord_tm joined #git
20:56 citizen-stig joined #git
20:57 clemf joined #git
20:57 shgysk8zer0 joined #git
20:59 ochorocho__ joined #git
21:00 blackRose joined #git
21:00 blackRose left #git
21:02 clemf joined #git
21:03 Gsham joined #git
21:03 yaymukund joined #git
21:05 hobodave joined #git
21:06 bauruine joined #git
21:06 ercx2x uh ok actually it had nothing to do with my db
21:06 ercx2x i noticed that git reset --hard didn't revert everything
21:07 ercx2x and then i checked out my github page for the project and the folder app is not accessible? https://github.com/ericjlima/ericremakelapotp
21:07 ercx2x Is there something that is preventing git from interacting with this folder?
21:07 danslo joined #git
21:07 Limes_ joined #git
21:11 hahuang61 joined #git
21:16 eizua joined #git
21:18 actinide joined #git
21:18 cdown joined #git
21:18 harry1 joined #git
21:19 le_melomane joined #git
21:21 vulture joined #git
21:21 TheL joined #git
21:23 e14 joined #git
21:24 nurey_ joined #git
21:24 WayToDoor joined #git
21:25 fedepad joined #git
21:26 neilthereildeil joined #git
21:26 mischat joined #git
21:27 Gsham joined #git
21:27 neilthereildeil hey guys. I checked out an old commit that is not at my branch tip. then i committed something. does that automatically create a branch? how can i reach this commit in the future after moving away from it?
21:28 _ikke_ neilthereildeil: It creates a branch in the diverged history sense, but no branch ref is pointing to it, so the commit will be lost soonish
21:28 neilthereildeil so that means i can never get back to it?
21:28 _ikke_ Just cherry-pick it on a branch
21:28 TheL left #git
21:29 red82 joined #git
21:29 _ikke_ neilthereildeil: The reflog keeps it referenced for ~90 days
21:29 _ikke_ after that, the first gc will remove it
21:29 neilthereildeil what would cherrypicking do?
21:29 vassagus joined #git
21:30 _ikke_ copy the commit
21:30 _ikke_ onto it's proper place
21:30 vassagus joined #git
21:30 neilthereildeil lets say i was on my my branch A tip, and i checked out A~1, and made another commit. can i make branch A point to my new commit rather than where it was before?
21:31 jast ercx2x: 'app' is a submodule, meaning that its contents live in another repository
21:31 neilthereildeil its liek a fork with 2 children, and i want the "branch" to point to one child rather than the other
21:31 vassagus joined #git
21:31 _ikke_ neilthereildeil: You can
21:31 _ikke_ that will mean you abandon one child :P
21:31 jast ercx2x: chances are that this happened by accident... if you use submodules intentionally you have a .gitmodules file at the top of your source tree
21:31 neilthereildeil yea thats fine. i wanna destory that child actually (not trynna sound too dark here haha)
21:32 _ikke_ haha
21:32 _ikke_ You're not on that branch right now, correct?
21:32 neilthereildeil right. im on the latest commit which was A~1
21:32 _ikke_ git checkout -B <branchname>
21:32 _ikke_ that will force create the branch at the commit you are currently on
21:32 d10n-work joined #git
21:32 _ikke_ and check that branch out
21:33 snthsnth joined #git
21:33 neilthereildeil can i just do git branch? why do i need to checkout?
21:33 _ikke_ You can
21:34 _ikke_ Just a conviniance
21:34 nitric_ joined #git
21:34 _ikke_ conveniance
21:34 jast convenience
21:34 jast keep trying ;P
21:34 _ikke_ haha :P
21:35 _ikke_ One day I'll learn to properly type english
21:35 jast just add another entry to the to-do list
21:35 jast mine is at 2e193 items, give or take a few orders of magnitude
21:35 _ikke_ hehe
21:36 neilthereildeil _ikke_: thanks
21:36 _ikke_ More like a to forget list :P
21:36 gappleto97 joined #git
21:37 gappleto97 I'm trying to set up a subdomain on my website which points at my github repo. I managed to get this to work in a browser, but every time I try to git clone over it it fails. Can y'all help me out?
21:37 neilthereildeil _ikke_: now the abandoned child commit will be reclaimed by GC, right?
21:37 _ikke_ neilthereildeil: eventually, yes
21:37 _ikke_ gappleto97: what error do you get?
21:38 gappleto97 fatal: repository 'https://github.com/gappleto97/' not found
21:38 gappleto97 But when I visit in browser it points to the correct link
21:39 _ikke_ That link is no a repository, but a user page. The repository part is missing
21:39 _ikke_ https://github.com/user/project.git
21:39 gappleto97 That's the format it's redirecting in
21:39 gappleto97 When I go in the browser, git.p2p.today links to github.com/gappleto97/p2p-project.git
21:40 olalonde joined #git
21:40 gappleto97 In git clone, it links to github.com/gappleto97 for some reason
21:40 jast I believe Git doesn't fully follow HTTP redirects
21:40 alex1a joined #git
21:40 jast 303, never seen that one in the wild before...
21:41 gappleto97 Is there a way I could do this without that? When I tried going via CNAME Github decided I had a bad cert
21:41 _ikke_ which makes sense
21:41 gappleto97 It does, but it's also problematic
21:42 _ikke_ jast: It's odd it does follow the redirect, but skipping a part
21:43 cyan__ joined #git
21:43 Dougie187 left #git
21:44 _ikke_ gappleto97: ah
21:44 _ikke_ The redirect seems incorrect
21:44 gappleto97 Incorrect how?
21:44 jast gappleto97: I just checked this. your redirect server breaks the redirect when git issues it (/info/refs?service=git-upload-pack suffix)
21:44 _ikke_ 23:43:00.446934 http.c:517              <= Recv header: Location: http://github.com/gappleto97/in​fo/refs?service=git-upload-pack
21:44 jast if that suffix is there, the redirect misses the repo name
21:45 jast for future reference, you can debug these types of issues using GIT_CURL_VERBOSE=1 git clone/fetch ...
21:45 gappleto97 Weird. So this is a problem with Hover's redirection?
21:45 jast apparently, though I don't know what Hover is
21:45 _ikke_ dns registrar
21:45 jast right
21:45 jast you should go complain loudly to them ;)
21:46 gappleto97 I think I just might.
21:46 rahtgaz joined #git
21:46 alex1a joined #git
21:46 gappleto97 At least I get why it doesn't work over https, but you'd think this would work correctly over http
21:47 _ikke_ jast: GIT_CURL_VERBOSE will become GIT_TRACE_CURL btw
21:47 jast it only doesn't work over https because they're too lazy to create certificates :)
21:47 _ikke_ and add it to all their infrastructure
21:48 vulture is there a way to do a git diff for a file between two commit#'s where there may be multiple commits(and thus diffs) for that file but instead only generate one diff between first and last and not include the middle stuff?
21:48 gappleto97 And to be honest, I don't particularly care about https there. It's redirecting to https anyhow
21:48 sgrover joined #git
21:48 jast a potential workaround: add a trailing slash to the redirect target in Hover's config. it *might* help.
21:49 _ikke_ vulture: when you do a diff in git, it just compares two tress
21:49 _ikke_ trees
21:49 _ikke_ (two commits)
21:49 vulture ok but that applies to my question how?
21:49 jast vulture: so, yes, you can, and it's the default, and it's easy :)
21:49 jast git diff commit1 commit2 file
21:49 vulture when I do that I get e.g. two different diffs for the intermediate commits
21:50 vulture a=>b=>c  I just want a=>c in one diff
21:50 _ikke_ yes, because those changes are part of that commit
21:50 _ikke_ git has now way to exclude commits in between
21:50 _ikke_ (it does not look at them, ie, explicitly add them)
21:50 jast can I see your command plus the output, in a !pastebin?
21:50 gitinfo [!paste] Please use a pastebin for snippets longer than one line. https://gist.github.com and https://vomitb.in both work well.
21:50 sgrover I need to update an older feature branch to ensure it uses the latest code in our develop branch.  Usually I would checkout the branch, merge develop into it, resolve any conflicts, and then checkout develop and merge my branch.  Is this where rebasing would be better?  I'm not really familiar with rebase
21:50 vulture I'm asking you if there is any command or tool that does this. for example, sourcetree (ugh) and github can do this
21:50 vulture but I want something that can generate .patch format ;P
21:50 jast I'm not sure I'm understanding you correctly
21:51 jast sgrover: rebase is problematic if other people have copies of the feature branch, it's only ever a good idea if the commits you're rebasing haven't been shared with anyone so far
21:51 jast if that's the case, rebases tend to make the history look cleaner
21:51 sgrover vulture - can't you just do a  git diff BranchA BranchG
21:52 _ikke_ vulture: git diff a c would create a diff from a => c
21:52 vulture for me it's outputting a=>b=>c
21:52 jast what's the exact command you used?
21:52 vulture let me double check + which options
21:52 mischat joined #git
21:52 mikecmpbll joined #git
21:52 sgrover jast: thanks.  Shared code to other devs, so the old way then...
21:52 gappleto97 I'll try adding the slash. I'm talking to Hover support right now, so hopefully they can answer the question
21:53 vassagus joined #git
21:53 _ikke_ vulture: Don't you just want the diff from B to C then?
21:53 e14 joined #git
21:53 mischat joined #git
21:53 _ikke_ because that only includes the changes that C introduce
21:53 vulture nah, a=>c. but that command may be working now. I was trying all sorts of different commands, diff, format-patch, etc etc with different options, I guess the simplest one is working for me now :P
21:54 mischat joined #git
21:54 jast trying too many things, that never fails to get me confused :)
21:55 mischat joined #git
21:55 mischat joined #git
21:56 gappleto97 Trailing slash seems to have fixed things
21:57 gappleto97 I'm trying to convince the support person to raise this issue to some developers though.
21:58 vulture well I started changing options to try to get it to output individual .patch files for each individual file that had changes. now I need to figure out how to make that work again with the simple git diff part working :P
21:58 alex1a joined #git
21:58 sgrover gotta love first tier support.  I once had sonicwall first tier support tell me that TCP/IP worked differently in Canada than in the US.
22:01 gappleto97 Can I get someone on here to try cloning http://git.p2p.today for me?
22:01 gappleto97 I want to verify that it works on other systems
22:02 alex1a joined #git
22:02 gappleto97 _ikke_: can you try?
22:03 LeBlaaanc joined #git
22:03 jast gappleto97: works for me (git 2.10.0, curl 7.50.3)
22:03 gappleto97 Thanks, that's what I was hoping to hear
22:03 jast let me try on a really old system... :)
22:04 ahr3n_ joined #git
22:04 cdown joined #git
22:04 jast doesn't work with git 1.7.10.4 and libcurl 7.26.0
22:05 yaymukund joined #git
22:05 gappleto97 Well, there's only so much you can ask for
22:05 vulture yeah huh how do I do that git diff and have it output individual .patch files now?
22:05 gappleto97 Thanks y'all
22:05 blackwind_123 joined #git
22:05 jast does work in git 2.1.4
22:06 jast vulture: .patch files are generated by 'git format-patch' only. git diff never outputs more than one diff (except of course it can output for multiple files).
22:06 vulture well git diff outputs a concatenated set of diffs it seems like
22:07 vulture I'd like one for each file similar to out format-patch was doing it for me
22:07 vulture (except that format-patch didnt work to combine a=>b=>c to a=>c)
22:07 jast format-patch does one per commit
22:07 sythe joined #git
22:07 jast since 'git diff' only ever compares two things (e.g. two commits), it can't possibly do that
22:07 _ikke_ jast: works in 2.1.0 for me
22:07 _ikke_ (just compiled it)
22:07 vulture well the output appears to be concatenated with 'git diff'
22:07 jast _ikke_: yeah, as did 2.1.4
22:08 jast what is concatenated?
22:08 vulture I assumed there would be an option to write to file instead of concatenating.. I could probably post-process the output
22:08 _ikke_ jast: ah, thought you were asking a question
22:08 jast _ikke_: no question mark, no subject ;)
22:09 sangy joined #git
22:09 tgunr joined #git
22:09 vulture the output of git diff...    it shows "diff --git a/whatever b/whatever" --- +++ patch stuff here; and then for every subsequent file you see a similar "diff --git a/whatever2 b/whatever2" patch stuff here...
22:09 jast okay, that's normal but doesn't mean it shows different commits, just different files affected in the range you gave it
22:09 _ikke_ yes, that's the patch format, every file just in one patch
22:09 vulture yes I'd like that but in an individual .patch file for each file that changed :P
22:09 jast format-patch does the same, but it additionally separates by commit
22:10 prawnzy joined #git
22:10 vulture except that format-patch doesnt combine commits
22:10 jast format-patch doesn't split its .patch files by affected files, only by commits
22:10 vulture so you cant condense a=>b=>c to a=>c
22:10 _ikke_ vulture: git format-patch is mean to create patches per commit, yet
22:10 _ikke_ yes
22:10 _ikke_ mean*
22:10 jast so what you describe is possible with neither 'git diff' nor 'git format-patch'
22:10 vulture I'm telling you what I want
22:10 vulture as opposed to "what does format-patch do"
22:10 vulture ok
22:10 _ikke_ vulture: right, there is nothing in git that does exactly what you want
22:10 vulture is there something that does that? or is post-processing git diff my best possibility
22:11 vulture ok
22:11 _ikke_ a patch resembles a commit
22:11 _ikke_ in git
22:11 jast for i in file1 file2...; do git diff commit1 commit2 $i >$i.patch; done
22:11 jast magic!
22:11 vulture lol
22:12 vulture that will take quite a while for a repo with 100k files :P
22:12 vulture but I think postprocessing will be fast, the output format looks pretty machine readable
22:12 vulture (from git diff)
22:12 Gsham joined #git
22:13 _ikke_ because it's meant to be
22:14 jast proof of concept: git diff HEAD~99 HEAD | perl -e 'local $/; my @a = split(/^(?=diff)/m, <STDIN>); print join("\n\n=====\n\n", @a);'
22:16 red82 joined #git
22:16 t0by joined #git
22:16 mizu_no_oto joined #git
22:17 ismaris joined #git
22:18 Gsham joined #git
22:19 CrazyBonz joined #git
22:19 Sasazuka joined #git
22:20 jeffreylevesque joined #git
22:26 afuentes joined #git
22:27 MattMaker joined #git
22:29 lolmac joined #git
22:30 bronson joined #git
22:33 nwkj86 joined #git
22:35 MattMaker joined #git
22:35 clemf joined #git
22:37 MattMaker joined #git
22:37 nitric joined #git
22:37 cdown joined #git
22:38 bronson joined #git
22:42 dob1 joined #git
22:46 dob1 hi, sorry i am a bit confused, i have a file in a directory that is tracked by git, now i want to stop tracking it (and all the files in the directory but keep them), so i put a .gitignore in the directory with the !.gitignore into it, the file is still tracked, now i am on egit (eclipse git) i have these options, "remove from index", "assume unchanged" "untrack"
22:46 dob1 remove from index will remove the file, right?
22:47 amaged__ joined #git
22:47 michaelsharpe joined #git
22:48 michaelsharpe joined #git
22:48 pskhadke joined #git
22:48 anuxivm joined #git
22:48 e14 joined #git
22:48 amaged__ Hi, when we branch and merge using 'git branch', will it alter the local repo or just highlight the differences ?
22:49 clemf joined #git
22:49 masuberu joined #git
22:50 MattMaker joined #git
22:51 osse amaged__: alter
22:51 osse amaged__: git branch itself isn't used for merging, but it can still make alterations
22:51 LeBlaaanc joined #git
22:52 amaged__ osse: Thanks, so when we fetch from master to the branch it alter the code in the branch right ?
22:52 osse amaged__: do you mean pull? yes. do you actually mean fetch? no.
22:53 andlabs joined #git
22:53 bronson joined #git
22:53 amaged__ osse: I meant fetch, thanks got it
22:53 osse amaged__: fetch only updates !remote_tr
22:53 gitinfo amaged__: [!remote_tracking_branch] Remote-tracking branches (branches which start with e.g. 'origin/', listed by 'git branch -r') are read-only mirrors of the corresponding branches in another repository. They're updated by 'git fetch'. You can't edit them directly (trying to check them out results in a !detached HEAD), but you can create a new local branch based on a remote-tracking branch using e.g. 'git checkout -b <branc
22:53 snthsnth joined #git
22:54 gbs joined #git
22:56 InfoTest1 joined #git
22:57 amaged__ osse: i am not exactly clear on what update means here
22:57 mischat joined #git
22:57 osse amaged__: change what commit it points to
22:58 dsdeiz joined #git
22:58 dsdeiz joined #git
22:58 dsantiago joined #git
23:00 gbs hi, is there a way to run a custom script when doing a git-svn import?
23:00 fstd joined #git
23:01 amaged__ osse:  sorry I am a bit confused, we started a repo, updated the local one and now when we were trying to push it to the branch, we were asked to 'fetch', thats why I am trying to find out if this is the right thing to do or not, in order to update the repro from the local copy.
23:01 osse amaged__: push is how you updated a remote remote with changes from a local one
23:02 osse *update
23:02 osse what told you to fetch?
23:02 amaged__ osse: thats why i am confused, when i tried to push, git repo suggested i should fetch.
23:02 bronson_ joined #git
23:02 osse git repo?
23:03 osse you mean it printed that when you tried to run git push?
23:03 vassagus joined #git
23:03 osse or when you ran git status afterwards?
23:03 osse or is "git repo" another tool?
23:03 anonymuse joined #git
23:04 amaged__ osse: one second, i am going to find the msg exactly.
23:06 yaymukund joined #git
23:07 thierryp joined #git
23:07 harry1 joined #git
23:08 Gsham joined #git
23:09 dsdeiz joined #git
23:09 red82 joined #git
23:09 Darren_ joined #git
23:13 elastix joined #git
23:14 dodobrain joined #git
23:14 bronson joined #git
23:16 raijin joined #git
23:17 pijiu joined #git
23:17 madewokherd joined #git
23:18 miklcct joined #git
23:19 whitby joined #git
23:19 NeverDie joined #git
23:19 Milijus joined #git
23:20 prawnzy joined #git
23:20 Pyrogerg joined #git
23:21 Milijus joined #git
23:23 bronson joined #git
23:24 Cavallari joined #git
23:24 fstd joined #git
23:25 anonymuse joined #git
23:25 raijin joined #git
23:25 Sucks joined #git
23:26 Atm0spher1c joined #git
23:28 pskhadke joined #git
23:28 cagedwisdom joined #git
23:28 Cavallari Everytime I use git fetch --prune and git rebase origin/master, my files from vendor directory (wich is in .gitignore) are removed... anyone have any idea?
23:28 bronson_ joined #git
23:32 bronson joined #git
23:34 clemf joined #git
23:34 mizu_no_oto joined #git
23:36 wrpn joined #git
23:38 bronson joined #git
23:39 duderono_ joined #git
23:40 Lyqyd joined #git
23:40 e14 joined #git
23:43 dharrigan joined #git
23:43 bronson joined #git
23:46 pothepanda joined #git
23:47 bronson joined #git
23:48 hdon joined #git
23:48 dsdeiz joined #git
23:48 hdon hi all :) i've just merged a feature branch into master and i want the to delete the feature branch. is this advisable?
23:49 AlexxNica joined #git
23:49 ismaris joined #git
23:51 dsantiago joined #git
23:52 boombatower joined #git
23:52 pothepanda if i git clone a local repo, then git treats it as a remote, from where i can pull any changes and so on and so forth right ?
23:52 bronson_ joined #git
23:53 dsdeiz joined #git
23:53 thiago_ joined #git
23:55 nedbat pothepanda: yes, you can have local clones, and pull changes from them.
23:56 bronson joined #git
23:56 pothepanda nedbat: that happens as a "remote" branch (by default called origin)
23:56 pothepanda ?
23:56 EvilPenguin joined #git
23:56 nedbat pothepanda: it's not a branch, it's a remote
23:57 pothepanda nedbat: yes thats right
23:57 pothepanda thanks :)
23:57 mischat joined #git
23:58 hdon pothepanda, you can enumerate remotes in a given repo with "git remote -v"
23:59 hdon pothepanda, you can then add remotes with "git remote add <name> <url|path>"
23:59 hdon pothepanda, you can remove the local "origin" remote with "git remote remove origin" i believe
23:59 pothepanda hdon: so i could git init then add the remote, then pull it, right?
23:59 pothepanda aye no i like it there :D
23:59 hdon pothepanda, git init will create an empty repository

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