Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-12-01

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

All times shown according to UTC.

Time Nick Message
00:04 tnecniv joined #git
00:05 user19050 joined #git
00:06 dreiss joined #git
00:06 ramsub07 joined #git
00:06 ramsub07 hi, i have by mistake committed a file. how do i remove that ?
00:08 fmcgeough joined #git
00:09 bodhi joined #git
00:09 b1tchcakes joined #git
00:09 vktec ramsub07: Have you pushed?
00:09 ramsub07 vktec: nope
00:10 vktec This will undo the commit: git reset --soft HEAD~1
00:10 vktec As long as it's the last commit you did
00:10 vktec You could also just git rm --cached file; git commit --amend
00:13 mkilivan joined #git
00:15 daopu[m] joined #git
00:16 CEnnis91 joined #git
00:22 jeffreylevesque joined #git
00:26 mkilivan joined #git
00:27 qqx davidfetter_ge: There is a diff.orderFile setting in the config, of course that setting can't travel with a commit.
00:28 davidfetter_ge qqx, yeah, i don't actually care what order the commit does things, but it's nice to be able to order the presentation of the hunks to a reviewer. :)
00:29 davidfetter_ge qqx, anyhow, thanks for the tip :) :)
00:29 qqx You could add a suitable file in the commit, and recommend setting that option in the commit message.
00:29 texinwien_ joined #git
00:30 davidfetter_ge i see from googling that somebody went and did this over 3 years ago, so it couldn't just have been me that thinks it's handy
00:32 emg joined #git
00:32 nickabbey joined #git
00:32 meauses joined #git
00:33 madewokherd joined #git
00:33 askb joined #git
00:35 re1 joined #git
00:38 texinwien joined #git
00:38 DolphinDream joined #git
00:40 emg joined #git
00:41 f4 joined #git
00:46 emg joined #git
00:46 mischat joined #git
00:52 Nysar joined #git
00:54 pigeon joined #git
00:54 tnecniv joined #git
00:55 nikivi joined #git
00:56 jaguarmagenta joined #git
00:56 perrier-jouet joined #git
00:57 SwiftMatt joined #git
01:04 netj joined #git
01:04 Derperperd joined #git
01:07 pikajude joined #git
01:10 asdse joined #git
01:13 causasui joined #git
01:13 causasui joined #git
01:13 Gsham joined #git
01:14 Charliechin joined #git
01:17 ejb joined #git
01:18 dodobrain joined #git
01:21 elsevero joined #git
01:21 inflames joined #git
01:21 al-damiri joined #git
01:24 isysd joined #git
01:27 venmx joined #git
01:28 dirtyroshi joined #git
01:34 railssmi_ joined #git
01:36 jaguarmagenta joined #git
01:36 Synthead joined #git
01:39 hariel joined #git
01:40 qpdb_ joined #git
01:41 drbean joined #git
01:45 GavinMagnus joined #git
01:52 ome joined #git
01:59 shgysk8zer0 joined #git
02:01 nettoweb joined #git
02:02 ochorocho__ joined #git
02:06 heroux joined #git
02:06 ToBeCloud joined #git
02:07 GavinMagnus left #git
02:07 rafalcpp_ joined #git
02:07 rts-sander joined #git
02:08 Vampire0_ joined #git
02:10 finalbeta joined #git
02:10 baryon joined #git
02:13 netj joined #git
02:14 Nilesh_ joined #git
02:15 brent__ joined #git
02:17 pks_ joined #git
02:22 checkItOut joined #git
02:28 arescorpio joined #git
02:30 d^sh joined #git
02:38 jeffreylevesque joined #git
02:39 sangy joined #git
02:40 thiago joined #git
02:46 sssilver joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and serious business | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | The git-jokes project has been suspended for lack of contribution. Help revive it! https://madeitwor.se/git-jokes
02:49 [cust] joined #git
02:50 durham joined #git
02:52 buffal0 joined #git
02:53 aavrug joined #git
02:53 durham joined #git
02:54 Dougie187 joined #git
02:54 aavrug joined #git
02:55 Dougie187 left #git
02:57 jaguarmagenta joined #git
02:57 Limes_ joined #git
03:00 Dougie187 joined #git
03:02 Gamecubic joined #git
03:02 alex1a joined #git
03:04 khfeng joined #git
03:06 bocaneri joined #git
03:07 Dougie187 joined #git
03:08 tnecniv joined #git
03:08 chachasmooth joined #git
03:09 joshszep joined #git
03:10 hexagoxel joined #git
03:14 eb0t joined #git
03:15 sunri5e joined #git
03:15 dreiss joined #git
03:19 DolphinDream joined #git
03:21 shgysk8zer0 joined #git
03:23 PioneerAxon joined #git
03:28 venmx joined #git
03:28 rafalcpp_ joined #git
03:29 Atrumx joined #git
03:30 diogenese joined #git
03:32 dsantiago joined #git
03:32 sbulage joined #git
03:34 sgtbigman joined #git
03:35 RustyShackleford joined #git
03:35 Electrometro joined #git
03:35 RustyShackleford I'm trying to configure ssh keys for github.com on my work laptop, so behind a proxy
03:36 RustyShackleford setting the https_proxy environment variable is what lets me use http, but since I set up 2FA I need to configure git to use ssh
03:36 RustyShackleford I set up the key pair, which i've done before. Now when I git clone, it will hang indefinitely
03:36 Goplat joined #git
03:37 kadoban RustyShackleford: Does 'ssh git@github.com' work? It should give you a message saying who you are and then hang up.
03:37 kadoban Also I don't quite understand what you mean, why does 2fa mean you *have* to use SSH?
03:37 RustyShackleford or an access token
03:37 RustyShackleford which would be rather painful to type out
03:38 RustyShackleford with 2FA, your password no longer works on the command line, apparantly
03:39 kadoban Hmm, alright. I never really use HTTPS on the command line so I guess I wouldn't know.
03:42 diogenese joined #git
03:43 Lyqyd joined #git
03:46 kadoban RustyShackleford: Anyway, did you try that ssh command?
03:46 treehug88 joined #git
03:46 t-mart__ joined #git
03:49 mischat joined #git
03:50 fahadash joined #git
03:51 a_thakur joined #git
03:51 hahuang65 joined #git
03:54 tnecniv joined #git
03:54 mda1 joined #git
03:54 RustyShackleford kadoban: sorry I meant to respond back
03:55 RustyShackleford I can't ping github.com either, no
03:55 RustyShackleford I'm putting all my eggs in the access token basket right now
03:55 RustyShackleford I know how to get through the proxy that way
03:55 RustyShackleford (https)
03:56 Nysar joined #git
03:57 RustyShackleford bingo
03:57 svm_invictvs joined #git
03:57 durham joined #git
03:58 durham joined #git
04:02 durham joined #git
04:03 ochorocho__ joined #git
04:03 GT4066 joined #git
04:03 b1tchcakes joined #git
04:05 diogenese joined #git
04:06 jnewt joined #git
04:11 cdg joined #git
04:13 cdg joined #git
04:14 PsionTheory joined #git
04:15 buzzLightBeer joined #git
04:15 ojacobson I use 2FA on Github all the time
04:15 ojacobson the token is easy, feed it to git's https credentials cache once and move on
04:15 ojacobson you can also use an SSH key
04:15 Vortex34 joined #git
04:15 railssmith joined #git
04:17 diogenese joined #git
04:19 ace_33 joined #git
04:20 display joined #git
04:34 fstd_ joined #git
04:35 hahuang65 joined #git
04:36 c1arknova joined #git
04:38 johnny56 joined #git
04:39 buffal0 joined #git
04:42 subhojit777 joined #git
04:42 tnecniv joined #git
04:46 b1tchcakes joined #git
04:48 iamrohit7 joined #git
04:49 iamrohit7 how to undo modifications from all staged files?
04:49 Oatmeal joined #git
04:49 iamrohit7 i tried "git checkout -- *" but it doesn't seem to work that way
04:50 mischat joined #git
04:53 kadoban iamrohit7: What do you want to happen to the index?
04:53 dreiss joined #git
04:57 iamrohit7 kadoban: i copied a repository to a harddrive and recopied it back. now the repository seems to have all modified files.
04:58 modlin joined #git
04:58 CEnnis91 joined #git
04:59 jaguarmagenta joined #git
05:04 ayogi joined #git
05:05 b1tchcakes joined #git
05:08 venmx joined #git
05:13 alhariel joined #git
05:15 InfoTest joined #git
05:16 ismithers joined #git
05:19 wxg joined #git
05:24 sdothum joined #git
05:25 User458764 joined #git
05:26 nickabbey joined #git
05:27 a_thakur joined #git
05:29 Vangelis joined #git
05:30 sdothum joined #git
05:32 rchavik joined #git
05:34 sdothum joined #git
05:35 roygbiv joined #git
05:40 scarabx joined #git
05:40 User458764 joined #git
05:40 bmahe joined #git
05:41 sdothum joined #git
05:45 holodoc joined #git
05:49 you_ joined #git
05:51 mischat joined #git
05:51 AciD` nezZario -> so by first ignoring `dist/*` the force-add those files, it means when creating pull request with thoses dist files in the commits, those won't be compared to the already committed dist files?
05:51 AciD` *then
05:52 shgysk8zer0 joined #git
05:58 cyan__ joined #git
05:59 AciD` also, I committed a very big commit 63f83f, on top of the previous commit d80516. Now, I want to split the last commit 63f83f, in 12 separates commits (yeah, I know I should have commit thoses before but there I am). My idea is to reset the head to d80516, checkout myFile.js from 63f83f, remove by hand everything I do not want to keep it the first of twelve commit, then commit to a newBranch,
05:59 AciD` then repeat
06:00 AciD` am I complexifing things? Should I rebase?
06:00 Sasazuka joined #git
06:02 xberg joined #git
06:02 Cabanossi joined #git
06:08 GodGinrai joined #git
06:12 qws-user-1228 joined #git
06:12 InfoTest joined #git
06:14 ashokrajar joined #git
06:18 ace_33 joined #git
06:19 InfoTest joined #git
06:19 overlord_tm joined #git
06:20 Peng_ joined #git
06:21 atrus AciD`: my approach would be to check out 63f83f, then reset (not hard, just git reset d80516), and use git add -p (or git add -p <file> if you want to do one file at a time) to select which parts you want to stage for the first commit, commit them, then git add -p again for the next commit, and commit them, etc etc.
06:21 howdoi joined #git
06:21 nickabbey joined #git
06:21 Bombe +1 for add -p. It’s awesome.
06:22 lindenle joined #git
06:23 ColdKeyboard joined #git
06:24 dreiss joined #git
06:25 nidr0x joined #git
06:26 kaldoran joined #git
06:27 sbulage joined #git
06:32 Caelum joined #git
06:37 xall joined #git
06:37 jpX joined #git
06:37 tubaman joined #git
06:39 peepsalot joined #git
06:40 ochorocho__ joined #git
06:40 aidalgol joined #git
06:47 SwiftMatt joined #git
06:47 LucaTM joined #git
06:50 govg joined #git
06:50 jpX joined #git
06:52 mischat joined #git
06:52 hahuang65 joined #git
06:56 zeroed joined #git
06:59 _UniFreak joined #git
06:59 nowhere_man joined #git
07:00 elsevero joined #git
07:01 User458764 joined #git
07:01 venmx joined #git
07:02 Raging_Hog joined #git
07:02 jpX joined #git
07:03 peepsalot joined #git
07:08 xall joined #git
07:08 mns joined #git
07:13 shashin joined #git
07:13 derk0pf joined #git
07:15 chele joined #git
07:16 zeroed joined #git
07:16 zeroed joined #git
07:17 ok91 joined #git
07:20 ybden joined #git
07:22 sea-gull_ joined #git
07:23 roelmonnens joined #git
07:25 troulouliou_div2 joined #git
07:26 harrymoreno joined #git
07:29 peepsalot joined #git
07:29 Keridos joined #git
07:31 mindriot101 joined #git
07:31 danimal2 joined #git
07:32 elect joined #git
07:35 freimatz joined #git
07:40 mseyne joined #git
07:43 Alienpruts joined #git
07:45 cyan__ joined #git
07:45 peepsalot joined #git
07:46 mindriot101 joined #git
07:51 GodEater joined #git
07:51 GodEater joined #git
07:52 ace_33 joined #git
07:54 Sceorem joined #git
07:55 TomyWork joined #git
07:57 mischat joined #git
07:59 neanderslob joined #git
08:02 GodEater joined #git
08:02 GodEater joined #git
08:04 Balliad joined #git
08:06 spacelord_ joined #git
08:06 jnavila joined #git
08:07 arand__ joined #git
08:07 zeroed joined #git
08:07 a_thakur joined #git
08:08 mindriot101 joined #git
08:09 nickabbey joined #git
08:11 xberg joined #git
08:11 cheater joined #git
08:11 aviraldg joined #git
08:11 aviraldg joined #git
08:12 PCatinean joined #git
08:12 _main_ joined #git
08:14 Regwerk joined #git
08:18 Regwerk left #git
08:20 xall joined #git
08:20 djb-irc joined #git
08:20 elect_ joined #git
08:21 elect__ joined #git
08:22 cheater joined #git
08:22 alex1a_ joined #git
08:23 rivarun joined #git
08:25 troulouliou_div2 joined #git
08:26 djb-irc joined #git
08:26 k_sze[work] joined #git
08:27 Mowgli joined #git
08:27 Jackneillll joined #git
08:29 SwiftMatt joined #git
08:29 Hello71 joined #git
08:29 ok91 joined #git
08:30 Renter joined #git
08:30 nebg joined #git
08:30 ws2k3 joined #git
08:30 yanome joined #git
08:30 jerrcs joined #git
08:30 lightstalker joined #git
08:31 Timvde joined #git
08:31 joelsmith joined #git
08:31 kline joined #git
08:31 blunaxela joined #git
08:31 jab416171 joined #git
08:31 mozzarella joined #git
08:31 Xe joined #git
08:33 strugee joined #git
08:33 sbulage joined #git
08:33 jgornick joined #git
08:33 stnly joined #git
08:34 cxreg joined #git
08:35 m0ltar joined #git
08:36 jab416171 joined #git
08:36 Darcidride joined #git
08:36 lightstalker joined #git
08:37 atomi joined #git
08:37 marvi joined #git
08:37 muelli joined #git
08:37 grift joined #git
08:37 Rhonda joined #git
08:38 bmahe joined #git
08:38 sawk joined #git
08:39 elsevero joined #git
08:40 Takumo joined #git
08:40 Takumo joined #git
08:40 elsevero joined #git
08:41 cdown joined #git
08:41 ochorocho__ joined #git
08:42 jstimm joined #git
08:42 chll_ joined #git
08:43 sawk joined #git
08:44 User458764 joined #git
08:46 nickthetait joined #git
08:47 djb-irc joined #git
08:47 xall joined #git
08:48 govg joined #git
08:48 holodoc joined #git
08:49 raspado joined #git
08:49 SwiftMatt joined #git
08:52 P4nther joined #git
08:53 hahuang65 joined #git
08:54 blahdodo joined #git
08:56 vrlx joined #git
08:56 gfixler joined #git
09:01 elect joined #git
09:04 ahmedelgabri joined #git
09:05 mikecmpbll joined #git
09:06 encod3 joined #git
09:08 jknetl joined #git
09:13 User458764 joined #git
09:13 bongjovi joined #git
09:13 spm_draget joined #git
09:14 thiago joined #git
09:16 SwiftMatt joined #git
09:19 www-bukolay-net joined #git
09:24 jstimm joined #git
09:25 kurkale6ka joined #git
09:25 elect_ joined #git
09:25 byte512 joined #git
09:25 disi joined #git
09:26 venmx joined #git
09:26 solf1re joined #git
09:27 _Patrick_ joined #git
09:27 ahmed_elgabri joined #git
09:29 brillenfux joined #git
09:29 rorro joined #git
09:29 mnms_ joined #git
09:30 mnms_ Hi guys. Without thinking I reset changes to some older commit and I of course lost few commits. Is there any way to restore it ?
09:30 mnms_ I guess commits are stil there but HEAD is in new position yes ?
09:31 alcohol mnms_: can you tell us specifically what command(s) you ran?
09:31 railssmith joined #git
09:31 mnms_ I made it from gui (tortoise git)
09:32 blahdodo joined #git
09:32 mnms_ alcohol: ^^^^
09:32 alcohol surely it has some log showing you what you ran
09:33 __main__ joined #git
09:33 selckin !reflog
09:33 gitinfo The git reflog (`git log -g`) records the SHAs of your HEADs for 2+ weeks. `git checkout -b myrestore OLDSHA` and `git reset --hard OLDSHA` will relink to that state via a new and current branch respectively, see http://sethrobertson.github.com/GitFixUm/ for full details.  WARNING: reset --hard will trash any uncommitted changes!  Visualize with: gitk --all --date-order `git log -g --pretty=%H`
09:35 mnms_ alcohol, selckin: in reflog I have "action: reset, message: moving to COMMIT_HASH"
09:35 selckin use the gitk, reading reflog is very confusing to me too :/
09:37 clmsy joined #git
09:37 jstimm joined #git
09:37 bschindler joined #git
09:37 thiago joined #git
09:38 bschindler Hi - I'm in an interactive rebase and would like to take out one change I did to a file... what is the easiest way of doing so?
09:38 selckin so in the 'edit' at the commit?
09:38 mnms_ selckin, alcohol: In reflog I see in second position last right commit
09:39 mnms_ Use option reset master to this ?
09:39 jgornick joined #git
09:40 selckin mnms_: yes reset from the bot will make that commit the head of master
09:40 NwS joined #git
09:40 mischat joined #git
09:40 mnms_ selckin: I made it. Looks right
09:41 disi joined #git
09:41 bschindler selckin, yes
09:41 ramsub07 joined #git
09:42 selckin bschindler: you can just undo it and commit --amend, or like git checkout -p HEAD^ -- file
09:42 bschindler well, I was curious whether there is an efficient way of doing the first - undo it
09:42 bschindler commit --amend is then clear
09:43 selckin the latter is like add -p
09:43 selckin right other way around
09:43 bschindler interesting
09:44 bschindler patch failed
09:44 rorro joined #git
09:44 selckin i usuaully just git reset HEAD^; then add everything again without that bit, then commit, but that might not be easy in your eyes :)
09:44 bschindler Something in the setup we have here is odd - I have to apply patches using --binary
09:44 bschindler its probably due to newline issues because the repo stems from a git-svn import
09:45 bschindler so basically I do: git checkout -p HEAD^ file
09:45 bschindler it asks for a hunk, I press y
09:45 bschindler error: patch failed: Libs/BaseModules/Lang/Property/PropertySerializer.cpp:453
09:45 bschindler error: Libs/BaseModules/Lang/Property/PropertySerializer.cpp: patch does not apply
09:46 selckin yeah that might not work, think i was wrong there
09:46 selckin need to compare the one before the current commit so that would be
09:47 derk0pf joined #git
09:47 giraffe joined #git
09:48 ok91 joined #git
09:49 holodoc joined #git
09:49 SwiftMatt joined #git
09:50 Serpent7776 joined #git
09:51 raijin joined #git
09:53 blahdodo joined #git
09:54 ace_33 joined #git
09:55 cheater joined #git
09:55 InfoTest joined #git
09:55 mischat_ joined #git
09:56 mischat_ joined #git
09:57 jaggz_ joined #git
09:57 ignarps joined #git
10:00 Schrostfutz joined #git
10:00 bronson joined #git
10:01 tristanp joined #git
10:01 dodobrain joined #git
10:01 Schrostfutz Hi, how do I reset the changes made by git mv? I did not commit yet but have changes to other files I'd like to keep
10:01 mischat joined #git
10:03 vktec You could just move them back :P
10:03 dogmatic69_ joined #git
10:03 ghoti_ joined #git
10:03 vktec Or reset only those files, if you've not made any other changes to them
10:03 dustinm- joined #git
10:04 brokensyntax_ joined #git
10:04 a_thakur joined #git
10:04 tchan1 joined #git
10:05 mablae joined #git
10:05 mischat joined #git
10:05 holodoc joined #git
10:05 InfoTest joined #git
10:06 yaiyan joined #git
10:07 manuel joined #git
10:09 derk0pf joined #git
10:10 wizardedit joined #git
10:10 wizardedit joined #git
10:11 blahdodo joined #git
10:13 kerrick joined #git
10:13 irqq joined #git
10:14 mindriot101 joined #git
10:17 jordila joined #git
10:20 rnsanchez joined #git
10:20 interrobangd joined #git
10:20 texinwien joined #git
10:24 finalbeta joined #git
10:25 PCatinean how do I push one commit from one repository to another?
10:25 PCatinean I cannot cherry-pick since they are not in the same repo
10:26 osse you can fetch one into the other, then cherry-pick
10:26 osse or produce a patch file to apply
10:26 osse or push a branch that only has that commit unique to it
10:26 cebor joined #git
10:27 PCatinean and when pushing it would not push anything from the first repo I fetched no?
10:27 PCatinean it's just going to be local
10:28 osse which of my solutions are you referring to now?
10:28 Schrostfutz joined #git
10:28 mischat_ joined #git
10:28 PCatinean osse, fetching a cherry-picking
10:28 PCatinean I have one repo with 3 modules and 3 repos with one module per repo
10:28 PCatinean I go to each individual repo and fetch from the first repo
10:29 PCatinean then cherry-pick the commits I want and push
10:29 osse sounds good
10:29 osse you won't accidentally push any of the fetched data unless you actually merge it in
10:29 jast creates a lot of overhead, though... personally I might go with 'git format-patch' in the source and 'git am' in the target
10:29 osse or write a pretty involved push command that's hard to get right even if you try :p
10:29 PCatinean ah ook great, thanks osse
10:29 jast it's a matter of taste, I guess
10:30 PCatinean Blah but I just realised i did a lot of ammends in the first repo, darn it
10:30 osse taste is in the eye of the toungeholder
10:30 jast I'm not holding anyone's tongue
10:31 tazle__ joined #git
10:31 ToBeCloud joined #git
10:31 osse buth how tho ethplain this taht ?
10:31 * osse talks in muffled voice
10:31 blahdodo joined #git
10:32 MajorPay1e joined #git
10:32 rawtaz_ joined #git
10:32 rewt`` joined #git
10:34 Mowgli joined #git
10:34 ygeLN joined #git
10:35 disi joined #git
10:36 tvw joined #git
10:36 pkiller_ joined #git
10:37 Eryn_1983_FL joined #git
10:37 macay joined #git
10:38 catsup_ joined #git
10:38 lucz- joined #git
10:38 KnownSyntax_ joined #git
10:38 rebrec_ joined #git
10:38 babilen_ joined #git
10:38 unbalancedparen joined #git
10:38 d0nn1e_ joined #git
10:38 macay joined #git
10:38 cmosguy_ joined #git
10:38 Orion3k joined #git
10:39 derk0pf joined #git
10:39 Log1x joined #git
10:39 Log1x joined #git
10:40 kier joined #git
10:40 PHPanos joined #git
10:40 seishun joined #git
10:41 tristanp_ joined #git
10:41 Raging_Hog joined #git
10:42 ochorocho__ joined #git
10:43 ignarps joined #git
10:43 cheater joined #git
10:43 inflames joined #git
10:43 azerus joined #git
10:43 alcohol joined #git
10:43 andschwa joined #git
10:43 snowinferno joined #git
10:43 sostenuto joined #git
10:43 shampine joined #git
10:43 warthog9 joined #git
10:43 tmz joined #git
10:43 blr joined #git
10:43 thinkpad joined #git
10:43 Ankhers joined #git
10:43 sharkz joined #git
10:43 beckyconning__ joined #git
10:43 fcrick joined #git
10:43 jwest joined #git
10:43 ilogger2 joined #git
10:44 jknetl joined #git
10:48 ghostlight joined #git
10:49 Mission-Critical joined #git
10:53 bernardio joined #git
10:54 phox joined #git
10:54 stamina joined #git
10:55 z8z joined #git
10:59 re1 joined #git
11:03 qws-user-1228 joined #git
11:11 muahah joined #git
11:15 phox joined #git
11:19 a_thakur joined #git
11:21 User458764 joined #git
11:23 InfoTest joined #git
11:23 macay joined #git
11:24 yaiyan left #git
11:24 Yaiyan joined #git
11:26 cdown joined #git
11:28 pypi__ joined #git
11:29 baryon joined #git
11:29 jordila joined #git
11:31 OOPMan joined #git
11:32 ronskisika joined #git
11:34 PHPanos joined #git
11:35 qws-user-1228 joined #git
11:35 paladinn joined #git
11:37 slayerjain joined #git
11:42 ochorocho__ joined #git
11:44 User458764 joined #git
11:48 johnnyfive joined #git
11:48 mischat joined #git
11:50 buffal0 joined #git
11:55 hahuang65 joined #git
11:56 inflames joined #git
11:59 ashokrajar joined #git
11:59 maret joined #git
12:01 inflames joined #git
12:03 Karazhan joined #git
12:03 roelmonn_ joined #git
12:04 mindriot101 joined #git
12:05 rorro joined #git
12:06 PHPanos joined #git
12:08 dsdeiz joined #git
12:09 paladinn joined #git
12:10 ace_33_ joined #git
12:10 dsantiago joined #git
12:11 PHPanos joined #git
12:12 ace_33 joined #git
12:17 iliv joined #git
12:21 zeroed joined #git
12:21 zeroed joined #git
12:21 ace_33 joined #git
12:23 a_thakur joined #git
12:25 mindriot101 joined #git
12:30 mindriot101 joined #git
12:32 derk0pf joined #git
12:35 aspiers joined #git
12:37 roelmonnens joined #git
12:38 maret joined #git
12:38 roelmonn_ joined #git
12:39 Balliad joined #git
12:40 zeroed joined #git
12:40 zeroed joined #git
12:40 afuentes joined #git
12:42 Gloomy joined #git
12:42 roelmonnens joined #git
12:45 PHPanos joined #git
12:47 muahah joined #git
12:48 isysd joined #git
12:49 mischat joined #git
12:51 mizu_no_oto joined #git
12:53 qws-user-1228 joined #git
12:53 a_thakur joined #git
12:53 Peetz0r joined #git
12:54 shinnya joined #git
12:54 DolphinDream joined #git
12:56 gnieheh joined #git
12:56 ace_33 joined #git
12:59 oaao joined #git
13:01 ramsub07 joined #git
13:01 johnmilton joined #git
13:01 PioneerAxon joined #git
13:03 mischat joined #git
13:03 Mowgli joined #git
13:04 achadwick joined #git
13:04 mindriot101 joined #git
13:06 WayToDoor joined #git
13:07 rolha joined #git
13:07 ashokrajar joined #git
13:07 pR0Ps joined #git
13:09 mindriot101 joined #git
13:09 InfoTest joined #git
13:10 mindriot101 joined #git
13:10 mischat_ joined #git
13:10 pR0Ps joined #git
13:12 fees joined #git
13:12 hariel joined #git
13:12 PioneerAxon joined #git
13:12 enckse joined #git
13:13 iliv joined #git
13:15 InfoTest joined #git
13:16 tvw joined #git
13:17 storrgie joined #git
13:17 jeffreylevesque joined #git
13:18 roelmonnens joined #git
13:18 Khisanth joined #git
13:19 roelmonnens joined #git
13:21 User458764 joined #git
13:22 User458764 joined #git
13:22 dermoth_ joined #git
13:23 xall joined #git
13:25 Siegfried joined #git
13:28 icey joined #git
13:28 icey joined #git
13:28 WayToDoor joined #git
13:29 Ryanar joined #git
13:30 enckse joined #git
13:31 rafalcpp joined #git
13:31 Lope joined #git
13:31 Lope can I undo 2 `git undo` that I did in a row? :)
13:31 Lope Like `git redo` :p ?
13:31 nd joined #git
13:31 Lope I forgot to grab the code
13:32 nowhere_man joined #git
13:32 _ikke_ Lope: git has no undo/redo commands
13:32 xberg joined #git
13:32 bremner git: 'undo' is not a git command. See 'git --help'.
13:32 Lope it's in git-extras
13:33 Lope i see `git undo` is soft by default.
13:33 Lope but my git log is not showing the undone commits
13:34 * bremner has no idea what "git-extras" is.
13:35 storrgie joined #git
13:37 lb ' bremner ' is in 'git-pure'
13:38 _ikke_ most of us are in git-pure
13:38 Lope I'm in git pure but I've got extras too.
13:38 Lope Here's the man page: https://github.com/tj/git-extras/blob/master/man/git-undo.md
13:39 Lope This is the default, only rolls back the commit but changes remain un-staged.
13:39 Lope So is my rolled back commit gone?
13:39 Lope I ran `git undo` 2x. Now I've only got my working copy and my git log only shows my 3rd last commit.
13:40 gnieheh joined #git
13:41 Lope here's the git-undo script https://github.com/tj/git-extras/blob/master/bin/git-undo
13:42 roelmonnens joined #git
13:43 Lope So basically the command I effectively ran 2x was `git reset --soft HEAD1; git reset`
13:43 Lope So is there any way to recover the last 2 commits?
13:43 lb Lope since it's only a reset, everything that was commited is still available through git reflog or other tools
13:44 lb (uncommited things + reset --hard are not recoverable via git)
13:44 Lope lb: thanks I tried git log, but it's not showing up there?
13:44 lb man git reflog
13:44 gitinfo the git-reflog manpage is available at http://jk.gs/git-reflog.html
13:44 lb reflog not log
13:45 Lope okay I see my commits there in reflog. So what does it mean when  stuff is rolled back softly?
13:45 _ikke_ Lope: Only the branch ref was moved
13:46 Lope i see. So the commit is floating in no-mans-land? :)
13:46 _ikke_ Lope: Well, the reflog is still covering it
13:46 _ikke_ But otherwise, yes
13:47 Lope _ikke_: lb: awesome :) thanks for your help.
13:47 Lope So can I delete commits from the reflog?
13:48 Lope now that I'm going to fix my mess up, i'll want to delete them for-real :p
13:48 _ikke_ Lope: 99% of the time, there is no need to
13:48 _ikke_ it will expire automatically
13:48 Nysar joined #git
13:48 lb and it won't be pushed around
13:48 _ikke_ right, the reflog is local only
13:48 Lope _ikke_: so unreferenced commits expire and get dropped?
13:48 lb jup
13:48 lb man gc
13:49 lb man git gc
13:49 gitinfo the git-gc manpage is available at http://jk.gs/git-gc.html
13:49 Lope wow :)
13:49 Lope deep :)
13:49 thib joined #git
13:50 rolha joined #git
13:50 fuzzmz joined #git
13:51 muahah joined #git
13:52 noecc joined #git
13:53 tvw joined #git
13:53 Urbany joined #git
13:54 snowkidind joined #git
13:55 tnecniv joined #git
13:55 hahuang65 joined #git
13:56 WizJin joined #git
13:56 mischat joined #git
13:57 troulouliou_div2 joined #git
13:58 Lope Thanks so much guys :) :)
13:58 chele_ joined #git
13:58 rnsanchez_ joined #git
13:59 mischat_ joined #git
13:59 chele__ joined #git
14:00 mischat__ joined #git
14:00 sdothum joined #git
14:03 vktec left #git
14:04 maret joined #git
14:04 chele_ joined #git
14:05 harrymoreno joined #git
14:06 robattila256 joined #git
14:07 cdg joined #git
14:08 mozzarella joined #git
14:09 nickabbey joined #git
14:09 LionsMane joined #git
14:10 nickabbey joined #git
14:11 cybersphinx joined #git
14:12 _Cyclone_ joined #git
14:12 niels_ joined #git
14:14 ExoUNX joined #git
14:15 jaguarmagenta joined #git
14:15 CEnnis91 joined #git
14:17 WayToDoor joined #git
14:17 oxsyn joined #git
14:18 xberg joined #git
14:18 InfoTest joined #git
14:18 frobnic joined #git
14:19 the_cybersphinx joined #git
14:19 Macaveli joined #git
14:19 jimi_ joined #git
14:20 Silox| joined #git
14:22 King_Hual joined #git
14:22 King_Hual joined #git
14:25 lindenle joined #git
14:25 Mowgli joined #git
14:26 iliv joined #git
14:27 eduardas_m joined #git
14:27 axl_ joined #git
14:29 helloo joined #git
14:30 blackwind_123 joined #git
14:33 todd_dsm joined #git
14:33 moop joined #git
14:33 helloo left #git
14:34 _Cyclone_ joined #git
14:35 User458764 joined #git
14:35 User458764 joined #git
14:36 Gsham joined #git
14:37 anonymuse joined #git
14:37 kier joined #git
14:38 ki0 joined #git
14:40 ash_workz joined #git
14:42 eduardas_m joined #git
14:42 ShekharReddy joined #git
14:45 ejb joined #git
14:48 systemovich joined #git
14:52 Guest86877 joined #git
14:53 mischat joined #git
14:57 Dougie187 joined #git
14:58 dan2k3k4 joined #git
14:58 niels_ joined #git
14:59 lss8 joined #git
14:59 chardan joined #git
15:00 thebope joined #git
15:00 hahuang65 joined #git
15:00 niels_ joined #git
15:01 blahdodo joined #git
15:02 b4x joined #git
15:03 anonymuse joined #git
15:03 sandroqz joined #git
15:03 User458764 joined #git
15:05 niels_ joined #git
15:05 sammyo joined #git
15:06 HoierM joined #git
15:07 niels__ joined #git
15:07 al-damiri joined #git
15:08 GodGinrai joined #git
15:09 Darcidride joined #git
15:09 sandroqz joined #git
15:09 mustmodify joined #git
15:10 mustmodify Hi team. I don't necessarily need to know... no current issues. But I see something strange. I think if I understood it I'd really know something useful.
15:10 mustmodify https://gist.github.com/mustmodify/23bd1a3070f427ccb56f7dc98831d179
15:10 mustmodify Why are there duplicate commits? I have verified that 1f9ae and 941486 have the same change.
15:10 AaronMT joined #git
15:11 mischat joined #git
15:11 osse mustmodify: most probable reason is that rebase was done on already pushed commits, then a pull
15:11 osse with then merges the "old" and the "new" commits
15:11 osse try this command:  !lol
15:11 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
15:11 osse might want to replace --all with the relevant branch(es)
15:12 IrishPrime joined #git
15:12 ResidentBiscuit joined #git
15:13 cdown joined #git
15:14 mustmodify http://ft.trillian.im/85353d38f4d2f94dfd75830e8d48517cc62ddc94/6MqSUm2OJiUXfqGxVujweB5Gk0rHr.jpg
15:14 sandroqz joined #git
15:14 mustmodify slightly crazy looking in the middle there...
15:14 tvw joined #git
15:14 synthroid joined #git
15:14 mustmodify Oh I see.
15:15 jordila left #git
15:15 mustmodify lol, it's like a Manhattan subway map.
15:15 osse 0074207 is a merge. the left hand right sides contain those dupes
15:15 osse one on each
15:15 osse ehh, the left AND right
15:16 mustmodify Well, I guess in my merging they somehow got duplicated.
15:16 mustmodify I don't use the rebase command but perhaps it was a side-effect of something I did.
15:17 osse commit --amend ?
15:17 osse cherry-pick ?
15:18 mustmodify Ahhh... yeah, I sometimes do those. Could be an ammend. Good thought.
15:18 mustmodify ok thanks.
15:18 ehh123 joined #git
15:20 osse mustmodify: see the problem is that once you do that a bunch of commits change IDs. Further more if these have already been pushed then git status says "your branch and origin/foo have diverged", which, technically, is true. but git status recommends to pull. that leads to this
15:20 sandroqz joined #git
15:21 kbs joined #git
15:21 hhee joined #git
15:22 bluepixel joined #git
15:22 e14 joined #git
15:23 Peuc joined #git
15:24 Dougie187 joined #git
15:24 eivarv joined #git
15:26 the_cybersphinx joined #git
15:26 subhojit777 joined #git
15:27 frobnic_ joined #git
15:28 Starky joined #git
15:30 mustmodify so if I want to fast forward a branch to a certain commit, and that branch already exists, do I just merge with the commit hash?
15:30 madewokherd joined #git
15:31 hanthings joined #git
15:31 osse yes
15:31 rorro joined #git
15:32 TinFury joined #git
15:33 mustmodify osse: Ah... I do remember cherry-picking at least one of those! Not sure why it's just coming to me.
15:33 viccuad|work joined #git
15:34 _Cyclone_ joined #git
15:34 Phylock joined #git
15:35 viccuad|work left #git
15:37 viccuad joined #git
15:38 viccuad Hi folks. Is there a way to mount locally a git repo in a server? I have a git repo with docs in a server, and want to use gitit as a frontend for it. But I don't want to set up the git docs repo in a machine, the gitit frontend repo in another, plus hooks for keeping them in sync
15:39 viccuad Ideally, I would just "mount" the git doc repo on the gitit server, and then I don't need hooks
15:39 viccuad Any idea/buzzwords on how to do this? thanks in advance
15:40 mustmodify osse: thanks for all your help.
15:40 mustmodify left #git
15:42 crose joined #git
15:42 dreamseeker_ joined #git
15:44 ochorocho__ joined #git
15:45 GavinMagnus joined #git
15:46 Electrometro joined #git
15:46 mischat_ joined #git
15:46 tnecniv joined #git
15:47 mischat_ joined #git
15:47 boombatower joined #git
15:47 xberg_ joined #git
15:49 a_thakur joined #git
15:49 LBV_User joined #git
15:50 NeverDie_ joined #git
15:53 GodGinrai joined #git
15:54 chardan joined #git
15:54 sangy joined #git
15:55 viccuad is there something like gitfs, but without automatically committing of changes? (in my case, gigit would do the commits)
15:56 cyan__ joined #git
15:57 ochorocho__ joined #git
15:59 jstimm joined #git
16:00 tnecniv joined #git
16:00 alex1a joined #git
16:01 hahuang65 joined #git
16:01 xberg joined #git
16:01 GodGinrai viccuad: so a read-only gitfs?
16:02 osse viccuad: you say "mout". How about actually mounting it? Eg. SSHFS
16:02 viccuad GodGinrai: yes, but seems that gitfs makes commits itsef when changes are applied, I want gigit to make those changes
16:03 meth joined #git
16:03 viccuad osse: sshfs seems like a good solution. I wonder how will the commits look in the gitlab side, give that you need to ssh with a key created for just the mount
16:04 GodGinrai viccuad: how about using gitfs in an overlay filesystem?  Include gitfs as readonly, and have the top layer be a read-write layer
16:05 roelmonn_ joined #git
16:05 mindriot_ joined #git
16:05 aarobc joined #git
16:05 osse viccuad: sshfs doesn't really have anything to do with git.  it's just a way to mount a network disk resource. so you can use it as if it was local
16:05 GodGinrai since your writes go to a layer that is not gitfs, then gitfs won't commit
16:05 grapheti_ joined #git
16:06 mindrio__ joined #git
16:07 mischat joined #git
16:09 dviola joined #git
16:09 _Cyclone_ joined #git
16:09 grapheti_ left #git
16:10 jstimm joined #git
16:11 niels_ joined #git
16:12 ojdo joined #git
16:12 davidfetter_ge joined #git
16:13 Derperperd joined #git
16:14 niels_ joined #git
16:15 dreiss joined #git
16:16 NeverDie joined #git
16:22 xberg joined #git
16:24 xberg_ joined #git
16:24 Dougie187 joined #git
16:25 Dougie187 joined #git
16:26 edaught joined #git
16:26 tang^ joined #git
16:27 ehh123 joined #git
16:28 xberg__ joined #git
16:28 ShekharReddy joined #git
16:29 Dougie187 joined #git
16:29 nicksloan joined #git
16:29 cheater joined #git
16:30 tax joined #git
16:31 Endarked joined #git
16:32 ehh joined #git
16:32 peoliye joined #git
16:33 peoliye i have this weird problem: whenever i checkout a different branch my bitbake build system goes bad and i have to do cleanbuild. Is there any way to debug this?
16:34 rads joined #git
16:35 User458764 joined #git
16:35 Dougie187 left #git
16:35 leeN joined #git
16:36 Mowgli joined #git
16:36 Dougie187 joined #git
16:37 brent__ joined #git
16:37 thiago peoliye: not a Git question, sorry.
16:39 feodaron joined #git
16:40 Lope joined #git
16:42 salamanderrake joined #git
16:43 Darcidride joined #git
16:44 jccn joined #git
16:45 jaguarmagenta joined #git
16:46 ahmedelgabri joined #git
16:48 Macaveli joined #git
16:48 binBlob joined #git
16:48 skift joined #git
16:51 cagedwisdom joined #git
16:51 binBlob Hi, I am currently testing git rebase with interactive and merge-preserve, I want to change some commits that follow after a merge commit, unfortunately git takes the wrong branch. How do I specify the right one?
16:53 tax left #git
16:53 e14 joined #git
16:54 oskarkv joined #git
16:55 Domhack joined #git
16:55 thiago binBlob: rule of thumb: don't rebase merge commits
16:56 ramsub07 joined #git
16:57 binBlob thiago: yes I know, but I want to learn how this combination works in general, this is one of the problems I found
16:57 thiago interactive and merge-preserve doesn't work, AFAIK
16:57 zeroed joined #git
16:59 jaguarmagenta joined #git
16:59 binBlob it actually does work pretty well so far on simple things, only the entangled cases are problematic
16:59 lordjancso joined #git
16:59 madewokherd joined #git
17:00 Derperperd joined #git
17:01 e14 joined #git
17:01 watabou joined #git
17:02 tyreld joined #git
17:02 watabou joined #git
17:04 [0xAA] joined #git
17:04 Derperperd joined #git
17:06 ejb joined #git
17:06 davimore joined #git
17:06 rads joined #git
17:07 sarbs_ joined #git
17:08 Guest55 joined #git
17:10 davimore joined #git
17:10 derk0pf joined #git
17:10 hanthings joined #git
17:12 svm_invictvs joined #git
17:12 troulouliou_div2 joined #git
17:12 xberg joined #git
17:13 sagerdearia joined #git
17:13 donught joined #git
17:14 xall joined #git
17:15 jpX joined #git
17:17 rads joined #git
17:18 jstimm joined #git
17:20 jstimm joined #git
17:24 InfoTest joined #git
17:27 durham joined #git
17:28 durham joined #git
17:29 jpX joined #git
17:29 mischat joined #git
17:30 navidr joined #git
17:33 djb-irc joined #git
17:34 binBlob Ok I found a solution by using a ref of a later parent commit, but even than its kinda super non initiative. Somehow it worked .... almost randomly
17:35 binBlob *intuative
17:35 g105b joined #git
17:36 Salander27 joined #git
17:37 govg joined #git
17:38 ejb joined #git
17:39 anonymuse joined #git
17:39 robotroll joined #git
17:41 nicksloan joined #git
17:42 davimore joined #git
17:46 hhee guys, how can i add local script for execute after git push?
17:46 hhee actually i need to execure one command
17:46 hhee execute*
17:47 mda1 joined #git
17:50 jaguarmagenta joined #git
17:50 dilfridge joined #git
17:50 djb-irc joined #git
17:50 hhee in dir hooks i see some examples
17:50 hhee but which one i need to edit to exec after git push?
17:51 armin joined #git
17:52 hhee also read https://git-scm.com/book/en/v2/Customizing-Git-Git-Hooks#Client-Side-Hooks
17:52 vrlx joined #git
17:52 Ryanar joined #git
17:53 benlieb joined #git
17:54 benlieb I’m trying to configure a short view for my logs. I’ve got something I can use, but I don’t really understand what the “refnames” option really is telling me. Could someone put a couple of the following into words: i.e., HEAD -> sub means that ‘…’ https://gist.github.com/benlieb/94f7aeb739b4de9d18661a3dc545a9ec
17:56 CheckDavid joined #git
17:56 hhee im someone interesting, i've found http://stackoverflow.com/questions/1797074/local-executing-hook-after-a-git-push
17:56 hhee if*
17:57 ehh123 joined #git
17:57 dreamseeker_ joined #git
17:58 benlieb I’m interesting too ;)
17:58 thiago joined #git
17:59 hhee benlieb, added you to friend list in hexchat :-P
18:00 mda1 joined #git
18:01 dreiss joined #git
18:01 hahuang65 joined #git
18:02 tinti joined #git
18:02 utanapischti joined #git
18:03 PioneerAxon joined #git
18:03 m___ joined #git
18:04 mischat_ joined #git
18:04 jknetl joined #git
18:04 demize joined #git
18:06 PioneerAxon joined #git
18:07 kulelu88 joined #git
18:08 mikecmpbll joined #git
18:09 Peuc joined #git
18:10 User458764 joined #git
18:10 TomyLobo joined #git
18:11 converge joined #git
18:11 converge joined #git
18:12 muelli joined #git
18:14 nunchuck joined #git
18:21 e14 joined #git
18:21 WayToDoor joined #git
18:24 chardan joined #git
18:27 mozzarella joined #git
18:27 m0viefreak joined #git
18:30 krillr joined #git
18:31 xberg joined #git
18:31 Dragonbird joined #git
18:32 seishun joined #git
18:35 fahadash joined #git
18:36 Domhack joined #git
18:37 lindenle joined #git
18:39 e14 joined #git
18:41 scarabx joined #git
18:42 finalbeta joined #git
18:43 e14 joined #git
18:44 railssmith joined #git
18:46 Pseudocrat joined #git
18:46 Pseudocrat joined #git
18:50 Rodya_ joined #git
18:50 seishun joined #git
18:51 joshszep joined #git
18:52 renlo joined #git
18:53 renlo if I have branch Foo with commits A, B, C, D; and I have a branch Bar with commits A, B, what happens when I merge Bar into Foo?
18:53 renlo Foo has commits A, B, C, D
18:54 renlo ie, what happens when I try to perform a merge with a branch that has all of the commits I currently have, but the head is a previous commit. Nothing, right?
18:54 renlo or am I mistaken here
18:56 hamdjan joined #git
18:57 Dragonbird joined #git
18:57 renlo I just tested it out, it does nothing!
19:00 spacelord_ joined #git
19:01 invisbl_ joined #git
19:01 invisbl_ joined #git
19:02 mindriot101 joined #git
19:02 Sasazuka joined #git
19:04 cjohnson renlo: are these commits A and B the actual same commit with same hash?
19:04 cjohnson or is it same commit content but different hashes
19:04 renlo same exact commit
19:04 renlo It does nothing (I thought it would, just wasnt sure)
19:05 Cavallari joined #git
19:06 ejb joined #git
19:06 bmahe joined #git
19:07 Ryanar joined #git
19:08 thiago joined #git
19:12 finalbeta joined #git
19:12 ahmedelgabri joined #git
19:12 Cavallari joined #git
19:13 GodGinrai why would you merge a branch if it is already a subset of the branch you are merging into?
19:13 GodGinrai just delete the branch...
19:16 streetwitch joined #git
19:17 streetwitch Hello.  I am using PyCharm, and trying to put my project on github.  When it uploads it doesn't upload all the files.  So I'm trying to do it on the command line, and I get an error whenever I try to push it onto github.
19:19 ejb joined #git
19:19 GodGinrai streetwitch: You need to tell us what commands you used and what error you got or we won't get anywhere
19:19 streetwitch Ok np
19:20 GodGinrai also, please give the verbatim message
19:20 GodGinrai if it's long, you can throw it into a gist
19:20 krillr joined #git
19:20 madewokherd` joined #git
19:21 troppie joined #git
19:21 streetwitch http://www.hastebin.com/aqexemamek.pas
19:21 Cavallari1 joined #git
19:21 streetwitch GodGinrai, how about that?
19:21 Rodya_ joined #git
19:22 sssilver joined #git
19:22 Rodya__ joined #git
19:23 streetwitch GodGinrai are you there?
19:25 mangoleaf joined #git
19:25 giraffe joined #git
19:25 roygbiv joined #git
19:25 mangoleaf left #git
19:26 pikajude joined #git
19:26 mangoleaf joined #git
19:27 GodGinrai streetwitch: yea, sorry, was looking at somethine else
19:27 GodGinrai streetwitch: I'll take a look
19:27 ejb joined #git
19:27 Cavallari joined #git
19:27 Eugene joined #git
19:28 GodGinrai streetwitch: you can't push because the branch on github is ahead of your local
19:28 streetwitch Ok
19:28 streetwitch I don't see how that would happen
19:28 GodGinrai probably from your attempted upload earlier
19:29 GodGinrai is anyone else using your repo?
19:32 streetwitch GodGinrai, I deleted the repo
19:32 streetwitch and made anew one
19:33 rwb joined #git
19:33 nicksloan joined #git
19:35 hashpuppy joined #git
19:37 GodGinrai streetwitch: did that fix it for you?
19:38 koen_ joined #git
19:38 koen_ git clone git@github.com:https://github.com/houami/drupal-site.git /var/www/html/drupal/
19:38 koen_ what is git@github.com
19:38 dendazen joined #git
19:39 aard_ joined #git
19:39 kadoban That looks like you're trying to mix SSH syntax and HTTPS syntax
19:39 kadoban Should probably just be   git@github.com:houami/drupal-site.git  or just the HTTPS part
19:40 Seveas joined #git
19:40 renlo joined #git
19:42 streetwitch GodEater, No
19:42 streetwitch I need help
19:42 irqq joined #git
19:42 renlo joined #git
19:42 streetwitch :~/PycharmProjects/world$ git remote add origin https://github.com/Treatz/evennia_world.git
19:42 streetwitch fatal: remote origin already exists.
19:42 dan2k3k4 joined #git
19:42 _rnsanchez_ joined #git
19:43 Cavallari1 joined #git
19:43 jstimm joined #git
19:44 mindriot101 joined #git
19:45 davimore_ joined #git
19:45 koen_ kadoban: i want to clone a repo from github to my local folder
19:45 koen_ how to do that
19:46 cdown joined #git
19:46 blackwind_123 joined #git
19:47 kadoban koen_: I think I just provided enough hint. If that's not enough, check on the github website, it gives you the desired command directly somewhere.
19:47 koen_ is there a way to bypass that fingerprint prompting us to tell yes or no
19:48 kadoban It's not something you should bypass, you should check that the fingerprint matches and then type yes. It doesn't ask in the future typically.
19:48 paul424 joined #git
19:49 jaguarmagenta joined #git
19:50 armin joined #git
19:51 noecc left #git
19:51 koen_ aah ok
19:52 irco joined #git
19:52 mkoskar joined #git
19:52 harrymoreno joined #git
19:58 Garen joined #git
19:59 jimi_ joined #git
20:01 dodobrain joined #git
20:01 jpX joined #git
20:02 _Cyclone_ joined #git
20:05 Mobutils joined #git
20:05 yottabyte joined #git
20:06 yottabyte hi, I did git rebase master in my branch, resolved merge conflicts, now I can't do git push. I did git pull and there's nothing to pull. git status says I'm 30 commits ahead in my branch
20:08 leftriver97 joined #git
20:09 Garen joined #git
20:09 Darren_ joined #git
20:10 GodGinrai yottabyte: what's the error git push gives you?
20:11 e14 joined #git
20:13 BrianBlaze420 joined #git
20:15 ToBeCloud joined #git
20:16 johnmilton joined #git
20:17 afuentes joined #git
20:18 tnecniv joined #git
20:19 ehh123 joined #git
20:19 jas4711 joined #git
20:19 spacelord_ joined #git
20:23 Starky joined #git
20:23 ehh joined #git
20:25 troulouliou_div2 joined #git
20:25 ki0 joined #git
20:30 ejb joined #git
20:31 fission6 joined #git
20:31 fission6 i accidentally commited something to the wrong branch, i did not push upstream
20:31 binBlob joined #git
20:32 fission6 how do i undo the commit
20:32 kadoban I think !fixup has it in there *looks*
20:32 gitinfo So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
20:33 kadoban fission6: It was the last thing you did, right?
20:33 Hello71 !undo
20:33 gitinfo [!fixup] So you lost or broke something or need to otherwise find, fix, or delete commits? Look at http://sethrobertson.github.com/GitFixUm/ for full instructions, or !fixup_hints for the tl;dr. Warning: changing old commits will require you to !rewrite published history!
20:33 Hello71 meh
20:33 binBlob fission6: if not pushed yet do git reset --hard HEAD~ ... the --hard completly removes the cahnges, without it they remain in your stage
20:33 e14 joined #git
20:34 aidalgol joined #git
20:34 kadoban fission6: So my choice would be 'git reset HEAD~1', which is from "Removing the last commit" and then check out the branch you meant to commit it on, and commit it.
20:34 kadoban Ya ... you probably don't want --hard
20:35 armin joined #git
20:35 binBlob alternativley fix you mistakes and use git amend
20:36 kadoban amend would be unlikely to help here
20:36 kadoban (also that's not the command)
20:36 ljc joined #git
20:36 Starkythefox joined #git
20:36 rorro joined #git
20:37 pypi_ joined #git
20:38 binBlob ohh right its my alias :)
20:38 kadoban Ahh :)
20:38 alhariel joined #git
20:38 ejb joined #git
20:40 khfeng joined #git
20:41 [0xAA] joined #git
20:42 mischat joined #git
20:43 PioneerAxon joined #git
20:45 FederationOfNULL joined #git
20:46 mda1 joined #git
20:49 armin joined #git
20:50 jas4711 joined #git
20:52 overlord_tm joined #git
20:53 Jackneill joined #git
20:53 polyrob_ joined #git
20:54 publio joined #git
20:55 dan2k3k4 joined #git
20:57 nwkj86 joined #git
20:58 e14 joined #git
21:01 cjbrambo joined #git
21:02 e14 joined #git
21:02 Ryanar joined #git
21:02 cdg joined #git
21:03 Dougie187 joined #git
21:05 shashin joined #git
21:06 cbreak joined #git
21:07 sssilver joined #git
21:08 e14 joined #git
21:09 xall_ joined #git
21:09 dan2k3k4 joined #git
21:10 dmc joined #git
21:11 ejb joined #git
21:12 aznloren joined #git
21:14 DolphinDream joined #git
21:14 DolphinDream howdy
21:14 DolphinDream can I push remote references to another remote ?
21:15 cjbrambo joined #git
21:15 ojacobson you can but you generally don't want to
21:15 ojacobson !xy
21:15 gitinfo 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...
21:15 dsdeiz joined #git
21:15 DolphinDream i have a repoA with some remote branches not currentlyc hecked out (remote/origin/branchA).. and I'm pushing repoA to another remote.. and I want the remote refs to be also pushed (essentially making a clone of repo at remoteA to a remoteB)
21:16 invisbl joined #git
21:16 invisbl joined #git
21:17 ojacobson oh you probably want `git clone --mirror repoA some-temp-path && cd some-temp-path && git push --mirror repoB` then
21:17 invisbl joined #git
21:17 ojacobson note that this will destroy any refs in repoB that are not in repoA
21:17 HoierM joined #git
21:20 jstimm joined #git
21:21 iliv joined #git
21:22 JanC joined #git
21:22 DolphinDream thx ojacobson
21:23 saml joined #git
21:23 GavinMagnus joined #git
21:25 dan2k3k4 joined #git
21:26 blackjid joined #git
21:26 qws-user-1228 joined #git
21:27 [0xAA] joined #git
21:27 dodobrain joined #git
21:29 blackwind_123 joined #git
21:34 texinwien joined #git
21:35 d5sx43 joined #git
21:36 ki0 joined #git
21:36 benlieb joined #git
21:36 cheater joined #git
21:37 Guest55 joined #git
21:40 jas4711 joined #git
21:40 mindriot101 joined #git
21:40 crose joined #git
21:42 vuoto joined #git
21:44 e14 joined #git
21:48 Rodya_ joined #git
21:48 mkoskar joined #git
21:49 mindriot101 joined #git
21:51 sssilver joined #git
21:52 rebrec joined #git
21:54 rebrec joined #git
21:54 NeverDie joined #git
21:54 crayon joined #git
21:58 bulletmark joined #git
21:59 mellernoia joined #git
22:01 jas4711 joined #git
22:03 ramsub07 joined #git
22:04 jpX joined #git
22:05 fission6 joined #git
22:10 Gsham joined #git
22:11 svm_invictvs joined #git
22:12 mizu_no_oto joined #git
22:13 Dougie187 joined #git
22:14 bmahe joined #git
22:19 hamdjan left #git
22:20 denisMone joined #git
22:22 ash_workz I get an abort on error when trying to pull 'local changes... overwritten..' and 'The following untracked...' ... can't I just overwrite them?
22:24 cdown joined #git
22:24 polyrob joined #git
22:25 cheater joined #git
22:26 fission6 joined #git
22:27 cagedwisdom joined #git
22:27 Spec-Chum joined #git
22:28 pasky joined #git
22:31 mezod joined #git
22:31 mezod hello, I forgot to create the branch before starting doing some mods.. can I stage the changes, git checkout -b newbranch, and commit them there?
22:33 tobiasvl ash_workz: yes you can, but git doesn't want to do it without you specifically telling it, as that would make you lose your work
22:33 yottabyte left #git
22:33 binBlob 90% sure that git will take you changes into the new branch with -b
22:34 mezod yeah im 95% sure
22:34 tobiasvl yeah !float
22:34 gitinfo If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there.  If the files you changed differ between branches, the checkout will fail.  In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.
22:34 mezod but wanted some confirmation x)
22:34 nidr0x joined #git
22:34 tobiasvl mezod: ^
22:34 binBlob there is always the reflog
22:34 mezod great thanks
22:34 mezod i just created the branch in the api project and not the app one, and been deving for like 6 hours
22:35 mezod if I lose that I'll jump from the window
22:35 mezod x)
22:35 mezod still there :_
22:35 tobiasvl better to commit one time too many than too few
22:35 binBlob please read what the reflog ist .. is will make everything sooo much easier
22:35 mezod yeah...
22:35 mdiehl1 joined #git
22:36 mezod binBlob: i've used it before ... i just got very immersed with deving hehe
22:36 mezod thanks guys
22:36 mdiehl1 Hi all.  Newbie question for you:
22:37 mdiehl1 How do you handle the case where some of your src code contains login credentials?
22:37 mdiehl1 I don't want to publish that, of course.
22:37 mdiehl1 But that's what I've done when I did a git push.
22:37 tobiasvl mdiehl1: !sensitive
22:37 gitinfo mdiehl1: [!filter_sensitive] You can use filter-branch to remove sensitive data from a repository's history. https://help.github.com/articles/remove-sensitive-data/
22:37 renlo joined #git
22:37 mdiehl1 I'll start reading.  Thank you.
22:38 tanuki joined #git
22:40 gitlover joined #git
22:44 mindriot101 joined #git
22:46 chardan joined #git
22:48 Gsham joined #git
22:49 Rodya_ joined #git
22:50 NeverDie_ joined #git
22:54 CheckDavid joined #git
22:56 Sheogorath[m] joined #git
22:57 ramsub08 joined #git
23:00 Puffball joined #git
23:01 fmeerkoetter joined #git
23:01 rahtgaz joined #git
23:03 sssilver joined #git
23:04 blackwind_123 joined #git
23:04 mdiehl1 That did it.  Thank you.
23:05 tnecniv joined #git
23:05 mdiehl1 So, is there a way that I can have one version of a file with all of the sensitive data in it for testing, but push a different version so that anyone who pulls the repo will get something that will at least compile?
23:07 Noldorin joined #git
23:08 chardan joined #git
23:09 binBlob hmm, depending on how simple it is you could have an extra branch with private commits that are pushed with a rebase on top of changes  ... I hope there is something simpler
23:10 GavinMagnus left #git
23:10 tnecniv joined #git
23:10 dirtyroshi joined #git
23:10 Dougie187 joined #git
23:11 mdiehl1 I'll do some research.  In the mean time, I'm just going to add a config.h.dist file and ignore my config.h file.
23:11 mdiehl1 Not pretty, but I'll fix it later.
23:14 tobiasvl mdiehl1: !config has some ideas maybe
23:14 gitinfo mdiehl1: [!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
23:16 dendazen joined #git
23:16 rorro joined #git
23:16 Dougie187 joined #git
23:17 mdiehl1 I'll read some more!  thanks again.
23:18 SwiftMatt joined #git
23:19 jaguarmagenta joined #git
23:21 mdiehl1 OK, at this point, I'm too new to git to even think about the gitattributes method.  I'll just have to run with what I have for now.
23:21 mdiehl1 Thanks, again.
23:23 inflames joined #git
23:23 spacelord_ joined #git
23:32 dsdeiz joined #git
23:34 NeverDie joined #git
23:34 Schrostfutz joined #git
23:35 Limes_ joined #git
23:40 Schrostfutz joined #git
23:40 ril_ joined #git
23:42 GavinMagnus joined #git
23:46 Guest55 joined #git
23:46 tvw joined #git
23:47 ReenignE joined #git
23:47 ReenignE joined #git
23:49 DolpheenDream joined #git
23:49 Ryanar joined #git
23:50 Rodya_ joined #git
23:50 pypi__ joined #git
23:58 mischat joined #git

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