Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-03-02

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

All times shown according to UTC.

Time Nick Message
00:00 joshszep joined #git
00:01 Darren_ joined #git
00:07 madewokherd joined #git
00:09 years joined #git
00:11 dreiss joined #git
00:12 Gustavo6046 joined #git
00:12 llamapixel elisa87: looks like a simple login error
00:12 elisa87 please have a look at my git error in more details here llamapixel http://stackoverflow.com/questions/4254​4568/permission-denied-publickey-fatal-​could-not-read-from-remote-repository
00:14 llamapixel It looks a common one you can stack exchange to solve elisa87 http://stackoverflow.com/questions/13509293/gi​t-fatal-could-not-read-from-remote-repository
00:14 sbasso joined #git
00:16 Whiskey strange
00:16 suttonwilliamd_ joined #git
00:16 Rodya_ joined #git
00:16 dgonzo joined #git
00:17 elisa87 I have been stack exchanging for the past 30 min and using their solution none worked :(
00:17 aidalgol joined #git
00:17 sunri5e joined #git
00:17 dendazen joined #git
00:19 tuor_ joined #git
00:20 cmn joined #git
00:22 SwiftMatt joined #git
00:25 inflames joined #git
00:27 DarkPsydeLord joined #git
00:27 venmx joined #git
00:28 GT4066 joined #git
00:32 CussBot_ joined #git
00:32 himmAllRight joined #git
00:33 matoro joined #git
00:34 dgonzo_ joined #git
00:34 jdelreal joined #git
00:37 years joined #git
00:38 MattMake_ joined #git
00:38 DolpheenDream joined #git
00:45 cqi joined #git
00:47 dgonzo joined #git
00:47 elisa871 joined #git
00:48 elisa871 can you please help figure this? http://pastebin.com/TifCpRET
00:49 newbie1 joined #git
00:49 kadoban elisa871: Did you ... read the error message, specifically the first one? Don't just guess at command line arguments.
00:49 kadoban Especially don't just randomly add '-f' to commands, that's a horrible idea. You're lucky if it just errors out, usually it'll do something potentially harmful.
00:50 elisa871 this is an empty repo on github
00:50 elisa871 git pull -f master
00:50 elisa871 why shouldn't git pull -f master work kadoban
00:50 kadoban Why the hell would it? Wtf is -f?
00:51 lgff joined #git
00:52 cjohnson there is a -f for pull but I agree on not just arbitrarily adding arguments
00:52 cjohnson if you can't explain why you used the arg then you shouldn't be using it
00:52 buro joined #git
00:52 cjohnson and the error message very clearly explains what went wrong
00:52 cjohnson When git fetch is used with <rbranch>:<lbranch> refspec, it refuses to update the local branch <lbranch> unless the remote branch <rbranch> it fetches is a descendant of
00:52 cjohnson <lbranch>. This option overrides that check.
00:53 pur3eval joined #git
00:54 DonVitoCorleone joined #git
00:57 NeXTSUN joined #git
00:57 jmckind joined #git
01:00 diego1 joined #git
01:00 diego1 joined #git
01:02 akkad joined #git
01:03 wxg joined #git
01:05 TheTank111 joined #git
01:05 MattMaker joined #git
01:06 xRob_ joined #git
01:07 whaley joined #git
01:08 xRob_ I need to 'pull' https://github.com/pypa/pip
01:08 llamapixel cd to the folder you want xRob_  and git clone https://github.com/pypa/pip.git  then pull
01:09 llamapixel You won’t have to pull if it is up to date.
01:09 xRob_ llamapixel: sweet, ty :D Now, does that folder contain the same hierarchy the page shows?
01:09 llamapixel yeah
01:10 xRob_ ahh, cool. Ty
01:10 llamapixel np
01:10 matoro joined #git
01:10 chandu20 joined #git
01:11 gugah joined #git
01:14 buglebudabey joined #git
01:15 buglebudabey hello, i have two folders that have changes but i am unable to 'git add' them, when i do and commit no changes are committed, how can i make sure the changes are being tracked?
01:17 kadoban buglebudabey: What does 'git status' say? What kind of changes are they, to file content or something else? Are the files already tracked? Are they ignored, if not?
01:17 llamapixel buglebudabey:  so starting with | git status
01:17 bremner or git status --ignored
01:17 lu_zero joined #git
01:17 lu_zero joined #git
01:19 buglebudabey so in reality on my remote the two folders simply aren't there, and i'm trying to push these two folders to my remote. when i type git status the other files i have changes to show up, but not these two folders
01:19 snowalpaca joined #git
01:19 buglebudabey i also looked at the ignored files and i only have the .DS_Store's ignored
01:19 llamapixel As bremner it might be in your ignored folders so do they match?
01:21 buglebudabey llamapixel bremner tried that, that's not the problem
01:21 akkad joined #git
01:21 benlieb joined #git
01:21 llamapixel Assuming you have then added them for a commit and then performed a commit next buglebudabey, all you need to do is push the changes.
01:21 buglebudabey this is the output when i try to do the steps: http://lpaste.net/353116
01:22 buglebudabey llamapixel ^
01:22 orzo joined #git
01:22 bremner buglebudabey: do you have any non-ignored files in those folders?
01:22 bremner if not, you're trying to add an empty folder, which won't work
01:22 buglebudabey bremner yes, in bottlenecks i have 2 folders and in inception there is many
01:23 bremner yes, but are there actual files?
01:23 buglebudabey bremner yup
01:23 bremner ok
01:24 buglebudabey i'm currently trying to remove the folders even though they aren't in the remote repository itself and it seems im able to
01:29 durham_ joined #git
01:31 venmx joined #git
01:31 mda1 joined #git
01:35 bgerber joined #git
01:39 robattila256 joined #git
01:41 dorkmafia joined #git
01:47 svm_invictvs joined #git
01:50 brent__ joined #git
01:52 dave0x6d joined #git
01:52 nd joined #git
01:53 pur3eval joined #git
01:53 cmyers_ left #git
01:58 chigang joined #git
01:59 Gsham joined #git
02:00 mehola joined #git
02:01 Sasazuka__ joined #git
02:03 benlieb joined #git
02:03 thebope joined #git
02:04 chipotle joined #git
02:08 xall joined #git
02:08 raijin joined #git
02:09 cyphase joined #git
02:11 cqi joined #git
02:13 chipotle_ joined #git
02:15 PaulCapestany joined #git
02:17 rivarun joined #git
02:18 dreiss joined #git
02:18 DolpheenDream joined #git
02:18 gelei007 joined #git
02:19 Sasazuka joined #git
02:20 jimsio joined #git
02:20 lionhart280 joined #git
02:21 chipotle joined #git
02:22 jameser joined #git
02:22 ezzieyguywuf joined #git
02:25 rchavik joined #git
02:25 Guest79896 joined #git
02:29 finalbeta joined #git
02:29 chipotle_ joined #git
02:31 Sasazuka joined #git
02:32 gopar joined #git
02:33 jailbox joined #git
02:35 Vortex34 joined #git
02:36 dwmw2_gone joined #git
02:37 d^sh joined #git
02:38 chandu20 joined #git
02:38 lu_zero joined #git
02:38 lu_zero joined #git
02:39 orzo joined #git
02:42 Vampire0_ joined #git
02:46 pks joined #git
02:46 orzo joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:49 MasterNayru joined #git
02:50 matoro joined #git
02:51 bgerber joined #git
02:51 mar77i_ joined #git
02:51 rafalcpp joined #git
02:51 nicolai86 joined #git
02:53 _28_ria joined #git
02:54 pur3eval joined #git
02:54 hexagoxel joined #git
02:55 kbs` joined #git
02:56 galerito joined #git
02:57 kbs` left #git
02:57 kbs joined #git
02:59 LionsMane joined #git
02:59 dserodio joined #git
03:01 thebope joined #git
03:01 al-damiri joined #git
03:03 ojdo joined #git
03:04 cdg joined #git
03:04 fstd_ joined #git
03:05 nickname_ joined #git
03:06 aw1 joined #git
03:08 dserodio joined #git
03:08 dserodio joined #git
03:08 Rodya_ joined #git
03:09 dwmw2_gone joined #git
03:09 thiago joined #git
03:10 elisa87 joined #git
03:10 hexagoxel joined #git
03:12 bruce_lee joined #git
03:12 bruce_lee joined #git
03:14 svm_invictvs joined #git
03:16 raijin joined #git
03:17 Vortex34 joined #git
03:18 MrWoohoo joined #git
03:20 red82 joined #git
03:23 aavrug joined #git
03:25 fatalhalt joined #git
03:27 ResidentBiscuit joined #git
03:27 marianina8 joined #git
03:29 Sample joined #git
03:29 PaulCapestany joined #git
03:33 peterbecich joined #git
03:33 jstimm joined #git
03:34 PaulCapestany joined #git
03:35 howdoi joined #git
03:38 ffilozov joined #git
03:39 PaulCapestany joined #git
03:42 Darren_ joined #git
03:43 durham joined #git
03:43 menip joined #git
03:43 streetwitch_ joined #git
03:43 streetwitch_ My local repository is working fine, but I can't get it to transfer to github and then to my cloud server
03:44 durham joined #git
03:44 streetwitch_ Could anyone help me?
03:44 streetwitch_ I've done this thing before but it just won't work tonight
03:44 sunri5e joined #git
03:46 cdown joined #git
03:47 PaulCapestany joined #git
03:49 cdown_ joined #git
03:51 thiago how are you trying to transfer?
03:51 thiago and how do you know it's failing?
03:53 streetwitch_ thiago you still there man?
03:54 rubyonrailed joined #git
03:54 streetwitch_ I have three directories, and I uploaded all of them to github.
03:54 streetwitch_ Then I cloned them into the cloud server
03:54 streetwitch_ Locally if I type 'evennia start' in one directory it loads the server
03:54 streetwitch_ but the output I get now on the cloud server is 'evennia: command not found'
03:55 streetwitch_ When I upload the files I get a strange error as well
03:55 PaulCapestany joined #git
03:55 streetwitch_ It says sommething about how the upload to github was changing the line endings
03:55 streetwitch_ But I don't understand why
03:56 Goplat joined #git
03:56 xissburg joined #git
03:57 jstimm joined #git
03:57 PaulCapestany joined #git
03:58 streetwitch_ Oh hmm...
03:58 streetwitch_ I think I figured out the problem
03:59 xall joined #git
04:01 lowercaseman joined #git
04:01 PaulCapestany joined #git
04:01 jimsio joined #git
04:01 fracting joined #git
04:02 chachasmooth joined #git
04:04 PaulCapestany joined #git
04:04 rkazak joined #git
04:04 gtristan joined #git
04:07 PaulCapestany joined #git
04:07 snowalpaca joined #git
04:09 hexagoxel joined #git
04:10 pur3eval joined #git
04:10 nowhere_man joined #git
04:13 robattila256 joined #git
04:13 EV3RYDAYPR0GRESS joined #git
04:14 PaulCape_ joined #git
04:18 SantaClauze joined #git
04:18 thiago streetwitch_: what was it?
04:18 thiago sorry, got called away
04:18 cyphase joined #git
04:19 PaulCapestany joined #git
04:21 cdown_ joined #git
04:23 PaulCapestany joined #git
04:25 duderonomy joined #git
04:28 wxg joined #git
04:29 navidr joined #git
04:36 mizu_no_oto joined #git
04:36 mehola joined #git
04:41 sargentmki joined #git
04:41 netj joined #git
04:46 b1tchcak_ joined #git
04:52 ahrs joined #git
04:56 SwiftMatt joined #git
04:58 pks joined #git
04:59 Cabanoss- joined #git
04:59 hexagoxel joined #git
05:02 rivarun joined #git
05:03 svm_invictvs joined #git
05:09 benlieb joined #git
05:10 lucido-cl joined #git
05:11 pur3eval joined #git
05:12 pks joined #git
05:12 ismithers joined #git
05:17 _28_ria joined #git
05:17 sbulage joined #git
05:23 ayogi joined #git
05:24 theparadoxer02 joined #git
05:27 matt_m joined #git
05:27 pks joined #git
05:29 Murr- joined #git
05:30 tunjin joined #git
05:32 pur3eval joined #git
05:36 kasual joined #git
05:39 akkad joined #git
05:39 gtristan joined #git
05:42 math-alpha joined #git
05:46 astrofog joined #git
05:47 howdoi joined #git
05:53 jason237 joined #git
05:54 Limes_ joined #git
05:54 jstimm joined #git
05:55 Sample joined #git
05:56 SwiftMatt joined #git
05:57 gelei007 joined #git
05:57 austin987 joined #git
06:01 MineCoins joined #git
06:03 dec0n joined #git
06:06 rubyonrailed joined #git
06:07 aw1 joined #git
06:08 rscata joined #git
06:08 pks joined #git
06:09 aw1 joined #git
06:10 aw1 joined #git
06:11 aw1 joined #git
06:12 aw1 joined #git
06:16 hexagoxel joined #git
06:17 thebope joined #git
06:17 glebihan joined #git
06:21 bocaneri joined #git
06:24 bocaneri joined #git
06:25 overlord_tm joined #git
06:29 bocaneri joined #git
06:35 _28_ria joined #git
06:35 Silenced joined #git
06:37 Silenced joined #git
06:37 bashcoder joined #git
06:37 bashcoder joined #git
06:38 ResidentBiscuit joined #git
06:40 MattMaker joined #git
06:46 pijiu joined #git
06:47 aw1 joined #git
06:47 brent__ joined #git
06:47 peterbecich joined #git
06:48 sarri joined #git
06:48 sarri joined #git
06:50 _28_ria joined #git
06:55 peterbec` joined #git
06:56 venmx joined #git
06:57 m4sk1n joined #git
06:57 Raging_Hog joined #git
07:01 DaYwalKer joined #git
07:03 ankit01ojha joined #git
07:06 chele joined #git
07:08 rivarun joined #git
07:14 JeroenT joined #git
07:16 bschindler joined #git
07:16 bschindler Is there a way to get a warning if a filter mentioned in .gitattributes failed to execute in a way that does not require local configuration?
07:21 zeroed joined #git
07:21 zeroed joined #git
07:23 qt-x joined #git
07:27 ocelotsloth joined #git
07:28 hwoarang joined #git
07:29 TheWild joined #git
07:30 TheWild hello
07:30 TheWild I put my changes on stash, changed things on a clean tree, commited, popped from stash.
07:30 TheWild and there were conflicts
07:30 TheWild I've resolved them by hand
07:31 nivag joined #git
07:31 TheWild now I want to stash the things again, but git tells me that some files needs merge, some are unmerged.
07:32 TheWild I don't want to create a merge commit. How I can let git just forget that there were conflicts?
07:35 TheWild ok, done. I had to git add on some files after resolving conflicts.
07:36 marianina8 joined #git
07:37 d0nn1e joined #git
07:40 humboldt joined #git
07:41 marianina8 joined #git
07:42 MattMaker joined #git
07:44 Peetz0r joined #git
07:45 miczac joined #git
07:46 overlord_tm joined #git
07:50 jnavila joined #git
07:58 mda1 joined #git
08:04 peterbec` joined #git
08:05 thebope joined #git
08:06 Nevik joined #git
08:08 rvgate joined #git
08:09 _28_ria joined #git
08:14 chigang joined #git
08:15 venmx joined #git
08:15 emin joined #git
08:17 jast according to this analysis, GitHub's new terms of service conflict with copyleft/BSD/CC-licensed code... https://www.mirbsd.org/permal​inks/wlog-10_e20170301-tg.htm
08:18 dersand joined #git
08:20 miczac joined #git
08:22 elect joined #git
08:25 King_Hual joined #git
08:25 King_Hual joined #git
08:25 aLeSD joined #git
08:25 aLeSD hi all
08:25 emin joined #git
08:25 aLeSD I have an old commit that is wrong
08:25 dreiss joined #git
08:25 aLeSD is it possible to create a branch from the pre-wrong-commit ... apply all the past-wrong-commit ?
08:26 aLeSD I mean apply all the modifications after the wrong commit o
08:28 jast yes, but there's an even simpler way. create a new branch that's the same as your current one, then use !interactive_rebase to delete that one bad commit
08:28 gitinfo Interactive rebase sounds similar to rebase but has completely different abilities. It can do this to commits: change the order, squash some of them together, remove some, add random existing commits from other branches, split them, and more... it's very powerful. Documentation is in the section "Interactive Rebase" in 'man git-rebase'.
08:29 tvl joined #git
08:30 ocelotsloth @jast yeah there was a bit of discussion of that on Hacker News https://news.ycombinator.com/item?id=13766933
08:30 ocelotsloth tl;dr not many people there seemed to share the opinion that it was in conflict
08:31 venmx joined #git
08:32 pur3eval joined #git
08:32 miczac joined #git
08:32 Murr joined #git
08:34 math-alpha joined #git
08:35 TheWild jast: so will we see projects disappearing from GitHub?
08:37 ShapeShifter499 joined #git
08:38 lyxus joined #git
08:40 flaviodesousa joined #git
08:41 Balliad joined #git
08:41 tlaxkit joined #git
08:43 MattMaker joined #git
08:44 jast TheWild: I can't speak for anyone else... I'm considering moving but haven't made a decision yet
08:53 ntonjeta joined #git
08:54 TheWild "git diff" does not show anything, but definitely there were changes.
08:55 b100s joined #git
08:55 gelei007 joined #git
08:55 TheWild that's because I've staged everything. Darn, git is confusing.
08:56 tobiasvl TheWild: you probably want "git diff --staged"
08:56 jast ocelotsloth: I believe people are missing the point of the post (but I'm not a lawyer so whatever). there is no problem at all if you upload GPL code of your own making, for example, or it is absolutely clear that all of the contributors have accepted GitHub's new ToS. however, if any other contributor has not agreed to the terms, it does definitely seem like you are in violation of your repository's license if you accept GitHub's ToS (or you're simply not capable of
08:57 tobiasvl jast: you were cut off after "simply not capable of"
08:58 dvaske joined #git
08:58 jast simply not capable of abiding with GitHub's ToS, same difference)
08:58 jast TheWild: there's also git diff HEAD which compares your working tree to the topmost commit
08:59 jast tobiasvl: that's weird, almost like freenode reduced the message limit to even less than 512
08:59 thebope joined #git
09:00 gelei007 joined #git
09:00 TheWild yeah, worked. Thanks jast
09:01 marenz__ joined #git
09:02 TheWild I have modified one file and git status shows that it is simultaneously not staged for commit and to be commited.
09:02 osse TheWild: one change has been added and the other hasn't
09:03 brent__ joined #git
09:03 kurkale6ka joined #git
09:03 TheWild oh, got it. Thanks osse.
09:04 Kurvivor joined #git
09:04 Kurvivor hello! how can i reset the tip of the branch to some earlier commit?
09:05 gtristan joined #git
09:05 Kurvivor i could do that in git extensions interface, but what command is used for that in command line?
09:06 osse Kurvivor: the current branch? git reset {earlier_commit}
09:06 osse add --soft or --hard as you wish
09:07 Kurvivor i thought reset mostly affected working directory
09:07 Kurvivor thanks
09:08 mikecmpbll joined #git
09:09 miczac joined #git
09:09 osse Kurvivor: yes, that's what happens when you don't supply the {earlier_commit} argument
09:09 osse because then HEAD is assumed
09:09 jast Kurvivor: actually the working directory is affected only if --hard is used
09:09 ShapeShifter499 joined #git
09:14 marcogmonteiro joined #git
09:14 pickfire joined #git
09:14 smurfendrek123 joined #git
09:15 bongjovi joined #git
09:15 drodger joined #git
09:19 tvw joined #git
09:22 wxg joined #git
09:22 Snugglebash joined #git
09:22 finalbeta joined #git
09:24 absinthe joined #git
09:24 johnny56 joined #git
09:24 hexagoxel joined #git
09:25 finalbeta joined #git
09:26 raijin joined #git
09:27 mehola joined #git
09:29 Ayush joined #git
09:29 Ayush left #git
09:30 Kurvivor i was also under impression (i seems, a wrong one) that reset "moved" detached HEAD to supplied commit, not tip of the branch
09:30 dorkmafia joined #git
09:30 notebox joined #git
09:30 _ikke_ Kurvivor: reset does not affect working tree unless you supply (--hard|--keep|--merge)
09:31 YuGiOhJCJ joined #git
09:34 Sound joined #git
09:34 sbasso joined #git
09:36 raijin joined #git
09:39 gtristan How is the commit sha abbreviation reasoned in git ? Is there an algorithm determining how many characters are necessary to identify uniqueness ? or a hard setting ?
09:39 _ikke_ gtristan: it's dynamic
09:39 _ikke_ (there was a fairly recently thread / adjustment made to it)
09:39 gtristan nice
09:39 venmx joined #git
09:41 ocelotsloth joined #git
09:42 apotry joined #git
09:43 Whiskey git log -1 --date=short --pretty=format:%cd <- give me date of last commit, is it someway to get it both return date and sha?
09:43 Snugglebash joined #git
09:43 seni joined #git
09:44 MattMaker joined #git
09:44 grawity well, sure, --pretty=format:"%cd %H"
09:44 grawity or --format="%cd %H" for that matter
09:44 Whiskey aaa i missed the ""
09:46 seni1 joined #git
09:46 cr34ton joined #git
09:48 mkoskar joined #git
09:48 aard_ joined #git
09:48 clmsy joined #git
09:50 gelei007 joined #git
09:50 manuelschneid3r joined #git
09:50 Silenced joined #git
09:53 thebope joined #git
09:55 pks joined #git
09:56 Guest82 joined #git
09:57 freimatz joined #git
09:58 ankit01ojha joined #git
10:00 mda1 joined #git
10:00 chachasmooth joined #git
10:02 killua joined #git
10:03 hexagoxel joined #git
10:05 marcogmonteiro joined #git
10:05 killua If I make a new branch where is the folder?
10:05 Silex^^ joined #git
10:06 JeroenT_ joined #git
10:06 JeroenT_ joined #git
10:07 chll_ joined #git
10:07 muhannad_______ joined #git
10:09 jast killua: what folder?
10:10 jast ping timeout, that simplifies things
10:11 shtrb joined #git
10:12 xaa joined #git
10:12 JeroenT joined #git
10:12 shtrb Any win10 users now how to workaround very slow push / dcommits ? or what clients do not have that issue at all . I'm using msysgit tried versions 2.8.0 and 2.11.0 getting the same issue on both systems. tried with and without system cache
10:13 selckin git svn is slow no way around it
10:13 selckin maybe beause perl is slow in msys, and then svn is slow, and windows fs is slow
10:13 selckin *mainly
10:13 shtrb I was using git-svn for ages that is something new (20-30 minutes of delay )
10:14 selckin obviously 30min can no tbe described as slow
10:14 shtrb (*) it something that started recently
10:14 shtrb 30 minutes is not slow ??
10:14 * shtrb running on an ssd
10:14 selckin no thats like saying it takes a long time to walk to my car when its parked in the ocean instead of your driveway
10:15 shtrb let me try to rephrase, there is a delay of 20-30 before it start to upload
10:16 killua joined #git
10:16 shtrb just a few months ago , there was no such delay (the only difference is windows updates in the mean time)
10:16 killua Yo
10:16 killua Anyone on ?
10:17 mazert_ joined #git
10:17 peterbec` joined #git
10:17 jast !anyone
10:17 gitinfo Usually, it does not help to ask for someone specific to help you. Without knowing your specific problem, nobody knows if they can be of assistance. Please ask your questions and wait until somebody speaks up.
10:18 jast well, that's not entirely what I was looking for, but I guess it gets the idea across :)
10:18 robattila256 joined #git
10:18 matumbo joined #git
10:18 jast I guess I wanted !justask
10:18 gitinfo [!just_ask] You can just ask your question. If anybody knows the answer, they will answer soon (most of the time)
10:18 killua Thanks
10:19 jast you got disconnected after asking your question... so let me repeat myself:
10:19 jast what folder? :)
10:19 killua I opened a new branch on git , switched to the branch, how do I edit the files ?
10:20 snowalpaca joined #git
10:20 corentin killua: just run your text editor at the files?
10:20 jast just edit them
10:20 jast the files in your working tree are always the ones from the branch that is checked out right now
10:20 ferr1 joined #git
10:20 killua It's still looks like the same folder
10:21 jast yeah, a new branch defaults to being based on where your previous branch was at at the time
10:21 killua Ok was confused
10:22 killua I expected a new folder
10:26 afuentes joined #git
10:27 acetakwas joined #git
10:32 ahr3n joined #git
10:32 borkr joined #git
10:32 xall joined #git
10:33 shtrb selckin, by any chance are you using win10 ?
10:33 shtrb *or anyone else is using win10 with git-svn here
10:34 selckin shtrb: sometimes, i vaguely remember something with wierd premissions that can cause something like that, but i'd have to google it again
10:36 shtrb I see
10:41 acetakwas joined #git
10:41 venmx joined #git
10:43 hexagoxel joined #git
10:44 g105b joined #git
10:45 MattMaker joined #git
10:49 cdown joined #git
10:50 b100s joined #git
10:52 Whiskey git log --date=short --pretty=format:'%cd %H' -n 10] <- gives me fatal: ambiguous argument '%H'': unknown revision or path not in the working tree.
10:53 ShapeShifter499 joined #git
10:53 _ikke_ That command works for me
10:53 _ikke_ What version of git are you using?
10:53 Whiskey yeh its when i do it in tcl, it works in my console to
10:54 Whiskey but fun is if i remove %H it works fine
10:55 gelei007 joined #git
10:58 _ikke_ ah, tcl
10:58 _ikke_ Do you split on space?
10:58 osse then you need to learn how to properly write a command in ticl
10:58 osse tcl
10:58 _ikke_ split arguments
10:58 _ikke_ ?
10:58 _ikke_ because you need to keep these together
10:59 Whiskey its just one line
10:59 Whiskey [exec git log --date=short --pretty=format:'%cd %H' -n 10]
10:59 gtristan anyone familiar with git-lfs extension ?
10:59 osse Whiskey: try " " instead of ' '
10:59 Whiskey osse: it give the same
10:59 osse then find out how to use tcl's exec
10:59 gtristan I'm working with many local git mirrors, and would like to ensure that I cache at least whatever is needed for a given commit sha in my local mirror
10:59 Whiskey all other commands work whit it
11:00 osse tcl is the problem here, not git
11:00 gtristan so that I dont ever require network at checkout time from the local mirror, I'm not sure the particulars how this works with git lfs
11:00 osse you can tell from the error that the quotes become just parts of the command
11:02 Whiskey whit other words it don´t read the qoutes
11:02 DaYwalKer joined #git
11:02 osse correct
11:02 ntonjeta joined #git
11:03 Whiskey well it does but not as qoutes :D
11:04 brent__ joined #git
11:04 nevodka joined #git
11:07 osse you can try --pretty=format:%cd\ %H
11:08 osse but that's just a wild guess. I don't know Tcl
11:08 osse but surely it must be possible somehow
11:08 SwiftMatt joined #git
11:09 TheWild Is there a way to get a list of files and SHA1 checksums that were at given commit without resetting to this commit?
11:10 canton7 TheWild, man git ls-tree ?
11:10 gitinfo TheWild: the git-ls-tree manpage is available at http://jk.gs/git-ls-tree.html
11:12 cdg joined #git
11:14 TheWild canton7: well, it returns e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 on an emory file (expected sha1('') = da39a3ee5e6b4b0d3255bfef95601890afd80709)
11:14 TheWild *empty
11:14 canton7 TheWild, yeah, the sha1 hashes used by git aren't a raw hash of the contents: there's a header in there too
11:15 canton7 so if you want a hash of the contents of a file, you'll have to read the file and hash it yourself
11:15 canton7 `git cat-file -p gits_hash_of_the_object` for instance
11:16 canton7 alternatively, you can 'git show commit:path/to/file'
11:21 osse printf 'blob 0\0' | sha1sum
11:21 osse e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
11:22 TheWild now other side. I have a repo and from trash bin I took a file that's possibly in the repository, Is there a way to quickly find a commit at which that file was exactly like this?
11:22 osse TheWild: the sha1 you is is the sha1 of :  blob space bytesize null contents
11:23 TheWild osse: yay! Thanks. I think I can generate hashes and seek for files.
11:23 TheWild canton7: thank you too
11:25 dwmw2_gone joined #git
11:25 JeroenT joined #git
11:28 dsdeiz joined #git
11:28 dsdeiz joined #git
11:28 mehola joined #git
11:29 osse huh, I can't recreate a sha1 now
11:30 TheWild I tested in php and it worked: sha1('blob ' . strlen($blob) . "\0" . $blob);
11:30 osse ohhh
11:30 osse newlines
11:31 * osse shoots self
11:31 osse the file on disk is CRLF but in the repo it's LF
11:33 harmlessdrudge joined #git
11:33 jimi_ joined #git
11:38 TheWild I did git read-tree thinking it's "read" command. It messed up my index. My changes doesn't seem lost though.
11:38 TheWild If I do git reset, will it be fixed?
11:39 ResidentBiscuit joined #git
11:41 TheWild ok, did it and yeah, it's fixed now.
11:42 gusnan joined #git
11:42 ccapndave joined #git
11:42 venmx joined #git
11:42 Tobbi joined #git
11:42 ccapndave Hey there - I have a repository where I want to keep the last 11 commits, but squash all the previous ones down to a single commit.  There are a bit too many of them to use interactive rebase.  Is there a way to do it from the command line?
11:45 tobiasvl ccapndave: I didn't know interactive rebase had a limit?
11:45 ccapndave tobiasvl: Ah, I just mean it would be annoying to change all the lines to "squash"
11:45 ccapndave Although I expect there is some cunning vim way to do it (which I don't know)
11:45 tobiasvl your editor can't do it easily?
11:45 MattMaker joined #git
11:46 ccapndave I know :q, :w and press i to make it into an editor :)
11:46 TheWild ccapndave: I think you can git reset --soft to specific commit, then commit as usual.
11:46 ccapndave TheWild: I actually tried that just now, but somehow it didn't seem to work
11:47 tobiasvl in vim I'd probably just V at the beginning of the line of the last commit to squash, G to go to the bottom (first commit), move four characters to the right so the block extends over all instances of "pick", c to edit, write "squash", esc
11:47 ccapndave Ah - so that did squash everything down, but the original branch still had all the commit, so rebasing wouldn't have just the last 11
11:47 tobiasvl probably easier ways to do it too
11:47 thebope joined #git
11:47 ccapndave tobiasvl: Right
11:47 ccapndave I'll try that
11:47 miczac joined #git
11:47 watersoul joined #git
11:48 ccapndave Is there a special SHA syntax for the very first commit?
11:49 osse ccapndave: assumnig current branch is master:   git checkout --orphan master~11; git commit -m 'Initial commit'; git cherry-pick master~11..master; git branch -M master
11:49 tobiasvl ccapndave: you can do "git rebase -i --root"
11:50 ccapndave osse tobiasvl: Thanks!
11:51 netj joined #git
11:52 ccapndave osse: master~7 is not a valid branch name.  That's weird isn't it?
11:52 osse oops
11:52 osse ccapndave: git checkout --orphan tmp master~11
11:52 osse or 7
11:52 ccapndave aha
11:55 POQDavid joined #git
11:55 stoopkid joined #git
11:55 rnsanchez joined #git
11:55 rominronin joined #git
11:56 rvgate joined #git
11:56 suttonwilliamd joined #git
11:56 pschmitz joined #git
11:57 JeroenT joined #git
11:57 pschmitz joined #git
11:57 pschmitz what could be a reason why .gitignore is not taking effect? I have .gitignore in a subfolder, and relative to that lies .idea/gradle.xml, the file I want to ignore. I put ".idea/gradle.xml" in the .gitignore file but git status still shows it as modified.
11:57 osse ccapndave: easier:   git rebase -i master~12; mark the first 'e'. git checkout --orphan tmp; git commit -m 'Initial commit'; git branch -M master; git rebase --continue
11:58 invisbl joined #git
11:59 ccapndave osse: I'm getting conflicts the other way so I'll try that
11:59 osse ccapndave: are there any merges in that range?
12:00 ccapndave osse: Yes - a bunch of subtrees were added so there are some 'Squashed blah blah' leading into each merge commit
12:01 davimore joined #git
12:01 ccapndave osse: https://snag.gy/0pBze7.jpg
12:01 osse i think that might make it more difficult
12:01 osse rebase doesn't like merges
12:01 ccapndave Basically the goal is to squash everything from 32711d7 down into a single 'Imported codebase' commit
12:02 pschmitz ah i get it, the files are tracked and thus changes are displayed. need to remove them from the repo first.
12:02 osse might be worth adding -p
12:02 jagob joined #git
12:02 osse !ignore_tr > pschmitz
12:02 gitinfo [!ignore_tracked] Git only applies ignore patterns to untracked files. You can't use ignore patterns to ignore changes to files that are already tracked by git. To remove files only from git, but keeping them on disk, use git rm --cached <file>. Still, see https://gist.github.com/1423106 for ways people have worked around the problem.
12:03 pschmitz osse: thanks!
12:03 ccapndave "This uses the --interactive machinery internally, but combining it with the --interactive option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
12:03 ccapndave :)
12:03 osse oh
12:03 ccapndave Disclaimer: I have no idea what I am doing
12:04 osse i think you may have to unsheathe the sword named "filter branch"
12:04 ccapndave That is something I have only ever copied and pasted with great trepidation a few times
12:05 osse ccapndave: ok, there we go. new idea
12:05 osse git replace \o/
12:05 ccapndave Never heard of that one
12:05 osse 3237 is the commit you want should become the new initial commit?
12:06 jameser joined #git
12:06 osse 32711d7
12:06 ccapndave Right
12:07 smurfendrek123 joined #git
12:08 osse ccapndave: git replace --graft 32711d7
12:09 ccapndave Hey!
12:09 ccapndave Did that do it?
12:09 ccapndave It didn't even think about it
12:09 osse ccapndave: that's a temporary hack, but you can use git filter-branch to write it in stone
12:09 osse i think it's as easy as running 'git filter-branch' without args
12:09 ccapndave I would like to do that
12:10 ccapndave Amazing :)
12:10 ccapndave That worked beautifully
12:10 ccapndave Thanks so much
12:10 aax joined #git
12:10 dwmw2_gone joined #git
12:11 osse prasie gaben
12:11 ^7heo wait, is there the sales yet?
12:12 osse not sure
12:12 ccapndave osse: Yup, confirmed to work.  Praising Gaben now.
12:12 ccapndave Thanks again :)
12:13 matt_m joined #git
12:16 scoobertron joined #git
12:16 maroloccio joined #git
12:16 suttonwilliamd_ joined #git
12:19 matt_m joined #git
12:19 jimsio joined #git
12:19 amrits joined #git
12:21 shinnya joined #git
12:21 matt_m joined #git
12:23 gelei007 joined #git
12:23 zeroed joined #git
12:29 thebird joined #git
12:29 canton7 joined #git
12:33 clmsy joined #git
12:34 jameser joined #git
12:35 JuliusN when trying to push to master, what does error "pre-receive hook declined" mean?
12:36 lb1c joined #git
12:36 gingitsune joined #git
12:37 Munt joined #git
12:37 osse JuliusN: It means that there's a script installed on the server that checks the pushed commits and that script said "nope"
12:37 gingitsune is it possible to get this https://github.com/OCA/server-tools/pull/580 as a branch localy?
12:37 suttonwilliamd joined #git
12:38 osse gingitsune: https://help.github.com/articles/c​hecking-out-pull-requests-locally/
12:39 JeroenT_ joined #git
12:39 JuliusN osse: so the reason for rejection can be anything, depending on how the script is configured?
12:39 osse JuliusN: Yes. Usually hooks like that print meaningful error messages
12:40 JuliusN ok, ty
12:40 JeroenT__ joined #git
12:42 JeroenT joined #git
12:43 venmx joined #git
12:46 marcogmonteiro joined #git
12:46 MattMaker joined #git
12:51 explody joined #git
12:52 jameser joined #git
12:54 Peetz0r joined #git
12:55 treehug88 joined #git
12:55 acetakwas joined #git
12:55 nevodka joined #git
12:58 onmeac joined #git
13:02 explody joined #git
13:03 inflames joined #git
13:03 xaa__ joined #git
13:03 tvw joined #git
13:05 jameser joined #git
13:05 nd_ joined #git
13:05 b100s joined #git
13:06 the_last_uchiha joined #git
13:07 jameser joined #git
13:07 muhannad_______ joined #git
13:08 wxg joined #git
13:08 dendazen joined #git
13:11 johnny56 joined #git
13:12 uhmgawa joined #git
13:17 snowinferno joined #git
13:19 brent__ joined #git
13:21 Bob8989 joined #git
13:22 felixjet joined #git
13:22 cyliatero joined #git
13:23 ronskisika joined #git
13:24 Munt joined #git
13:26 hide joined #git
13:27 kpease joined #git
13:27 scottjl joined #git
13:28 Bob8989|2 joined #git
13:28 cdown joined #git
13:30 matt_m joined #git
13:30 treehug88 joined #git
13:31 marcogmonteiro joined #git
13:32 seni1 joined #git
13:37 pks joined #git
13:38 oaaao joined #git
13:39 diego1 joined #git
13:39 Starky joined #git
13:40 diego1 joined #git
13:40 explody joined #git
13:43 Starky joined #git
13:43 JeroenT joined #git
13:43 venmx joined #git
13:46 grayjoc joined #git
13:47 hvxgr joined #git
13:47 aviraldg Does anyone know what happens if you cherry-pick a commit to another branch, rebase a bunch of commits including that one, and then try to merge back into the other branch? Do you end up with duplicate commits? Why/why not?
13:47 MattMaker joined #git
13:47 Starky joined #git
13:48 brent__ joined #git
13:48 jast aviraldg: merging does not de-duplicate anything, you'll end up with a merge that has one version of the commit on one side and the other version on the other side
13:48 canton7 aviraldg, so the only point at which duplication will happen is when you cherry-pick that commit, since you'll have the original commit and your new cherry-picked copy of it
13:48 aviraldg right, I thought so
13:48 jast though if you rebase that second branch against the first branch, rebase might actually figure out the copied commit can go away and skip it
13:49 jast it depends on factors that are hard to make sense of ;)
13:49 canton7 yeah, if what I imagine is happening is actually happening, the rebase should strip it out
13:49 canton7 but you don't say what you rebase onto, so I can't know for sure
13:50 Snugglebash joined #git
13:50 aviraldg oh, right, the commit hashes will be different when you cherry-pick anyway
13:51 aviraldg does anyone have an article/document that explains how git resolves these things in detail?
13:51 jast it's called source code :P
13:51 jast what do you want to know?
13:53 aviraldg well, without digging that deep into git internals -- how rebase/merge compare commits
13:55 _ikke_ aviraldg: compare in what sense?
13:55 n1ce_ joined #git
13:56 aviraldg > though if you rebase that second branch against the first branch, rebase might actually figure out the copied commit can go away and skip it
13:56 _ikke_ aviraldg: man git patch-id
13:56 gitinfo aviraldg: the git-patch-id manpage is available at http://jk.gs/git-patch-id.html
13:56 canton7 it tries to apply the cherry-picked commit, but realises that applying it does nothing, afaik
13:57 aviraldg ah, thanks
13:58 jameser joined #git
13:59 tvw joined #git
13:59 RxMcDonald joined #git
14:00 RxMcDonald Hello, anyone knows why git is asking me to merge if I changed absolutely nothing and did git pull?
14:00 rvgate_ joined #git
14:00 rwb joined #git
14:00 RxMcDonald git diff = nothing, git pull ask me to merge, dafuq?
14:00 _ikke_ RxMcDonald: git diff does not show whether merging is necessary
14:01 canton7 RxMcDonald, output of !lol, please. Let's see what's going on
14:01 gitinfo RxMcDonald: A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
14:01 wrouesnel1 joined #git
14:01 chris2_ joined #git
14:02 Bizkit joined #git
14:06 Gsham joined #git
14:06 rafalcpp joined #git
14:07 _Vi joined #git
14:10 DarkPsydeLord joined #git
14:11 Munt joined #git
14:11 boombatower joined #git
14:15 masuberu joined #git
14:15 masuberu joined #git
14:16 cdg joined #git
14:16 jstimm joined #git
14:17 tvw joined #git
14:17 hvxgr joined #git
14:18 smurfendrek123 joined #git
14:19 kbs joined #git
14:19 luke_penn joined #git
14:21 DarkPsydeLord joined #git
14:21 peacememories joined #git
14:21 rubyonrailed joined #git
14:26 notebox joined #git
14:26 cdg joined #git
14:29 thebope joined #git
14:32 aax joined #git
14:32 seni1 how can I check which off of which branch another branch is based on?
14:34 seni1 used commits
14:34 DaYwalKer joined #git
14:35 m4sk1n joined #git
14:35 Derperperd joined #git
14:35 scottjl joined #git
14:36 tuor_ Hi, i want to configure git to use a different ssh-key for the specific project only. How can I do that?
14:38 tobiasvl tuor_: what kind of "project"?
14:38 tuor_ tobiasvl, ah, a git repo.
14:39 adamm tuor_: different hosts?
14:39 tuor_ Same host. Both are on github.
14:39 pifon joined #git
14:39 dec0n joined #git
14:39 miczac joined #git
14:39 tuor_ I want to use a different ssh-key for this repo, then for the other repos.
14:39 tobiasvl on github?
14:39 tobiasvl is this a git or github question?
14:40 tobiasvl is what I'm trying to get at
14:40 adamm it's a SSH question
14:40 adamm use ~/.ssh/config for that
14:40 tobiasvl there's no problem having multiple ssh keys locally and adding the correct public key to github, for example
14:40 adamm you cna specify Match
14:40 heftig[m] left #git
14:40 kbs seni1: there's probably a cleverer way to do this, I just do the dumb thing of git log --oneline --graph --decorate and seeing what's going on
14:41 adamm yes, ssh will try all keys, but I think it can close connection if you try too many
14:41 adamm specify Match condition in ~/.ssh/config and then you can specify correct IdentityFile.
14:42 tuor_ It's about git. I know how to use a different key with ssh. I just specify the key with ssh -i ~/.ssh/my_special_privat_key.
14:42 whaley joined #git
14:42 JeroenT joined #git
14:42 tuor_ It's the same host (github) and the same user (git). How can I difference the 2 cases then?
14:42 marianina8 joined #git
14:43 tuor_ For ssh it's exaclty the same. But I could create 2 hosts called "github-1" and "github-2" then use this names in the git config. This should do the job.
14:43 mahpoul22 joined #git
14:44 corentin tuor_: one section Host host1 and another Host host2
14:44 tvw joined #git
14:44 corentin then you can use host1 or host2 on your ssh command lines
14:44 tuor_ corentin, yea, this i what I ment.
14:44 venmx joined #git
14:45 corentin tuor_: ah sorry I missed your last line
14:45 VladGh joined #git
14:45 corentin tuor_: so you're good?
14:46 tuor_ should be. I'm trying.
14:46 tuor_ Thx.
14:46 JeroenT joined #git
14:46 tuor_ Yea, I can connect with ssh github-priv or ssh github-work to github now. :) I just have to use them in the git config now. Thx all!
14:47 VladGh joined #git
14:47 corentin yw
14:47 Darcidride joined #git
14:48 MattMaker joined #git
14:51 algun_ joined #git
14:51 aw1 joined #git
14:53 tuor_ Worked with out issues. :)
14:53 Es0teric joined #git
14:55 AaronMT joined #git
14:57 huzaifafaruqui joined #git
14:57 marianina8 joined #git
14:58 huzaifafaruqui I modified and renamed a file. However when I "git add" it shows 1-deletion & 1-insertion
14:58 nilg joined #git
14:59 huzaifafaruqui why is it not 1 changes & 1 rename?
14:59 Snugglebash joined #git
15:00 arooni joined #git
15:00 gelei007 joined #git
15:02 dgonzo joined #git
15:03 VladGh joined #git
15:06 leah2_ joined #git
15:06 kexmex joined #git
15:08 oskarkv joined #git
15:08 cyphase joined #git
15:09 kbs basically because it only tracks the begin and end state, rather than the steps to get there
15:09 cdg_ joined #git
15:10 kbs if it's important, probably simplest to have one commit that renames the file, then make the modifications in a separate commit maybe?
15:10 Disgeae joined #git
15:11 nickabbey joined #git
15:13 marcogmonteiro joined #git
15:13 dendazen joined #git
15:14 Guest76598 joined #git
15:14 seni joined #git
15:18 rafalcpp joined #git
15:20 GT4066 joined #git
15:20 CatKiller joined #git
15:21 CatKiller Hi there! A quick question: I'm trying to locate a "lost" commit (somebody reset a branch) which is still in my reflog. I have a list of all dangling commits from git-fsck --lost-found
15:22 diogenese joined #git
15:22 CatKiller I wrote a small bash script to iterate over those and call git show -s --pretty=%an $commit
15:22 einnjo joined #git
15:22 robotroll joined #git
15:22 CatKiller except that running that brings up the patch and doesn't actually follow my --pretty guidelines
15:22 CatKiller if I call that outside of the script for any commits in lost_found it brings up less and the whole patch
15:23 CatKiller if I do that for a commit that's in a branch (say HEAD in master) it gives me a one line output with the author, as I need
15:23 CatKiller any idea why the behaviour of git-show is messed up when using it against untracked commits?
15:23 Asenar joined #git
15:24 leeN joined #git
15:24 gingitsune joined #git
15:25 crose joined #git
15:25 gtristan joined #git
15:25 e14 joined #git
15:25 matoro joined #git
15:27 moritz what is an "untracked commit"?
15:28 gelei007 joined #git
15:30 mehola joined #git
15:30 harmlessdrudge joined #git
15:30 ToxicFrog 'git show' normally gives me the entire diff no matter whether the commit is "in a branch" or not.
15:30 ToxicFrog That said
15:30 Endarked joined #git
15:30 ToxicFrog CatKiller: if you have the lost commit in the reflog, what do you need the list of dangling commits for?
15:30 ToxicFrog Just use the commit ID from the reflog.
15:30 kbs CatKiller: fwiw, my version (2.11) seems to not have the behavior you describe - shows just theauthor in both cases
15:31 CatKiller ToxicFrog: Maybe I just went overboard, will check the reflog
15:31 CatKiller kbs: Weird, my version is git version 2.11.0-rc0
15:32 ToxicFrog The whole point of the reflog is to save you from having to futz about with git-fsck or similar to recover lost commits.
15:34 dreiss joined #git
15:36 CatKiller mhhh maybe it got garbage collected since
15:36 CatKiller I'm missing a whole bunch of commits
15:38 Error323 joined #git
15:38 Mahpoul22 joined #git
15:38 Error323 left #git
15:38 Error323 joined #git
15:39 xissburg joined #git
15:39 math-alpha joined #git
15:40 ResidentBiscuit joined #git
15:41 math-alpha_ joined #git
15:41 xissburg joined #git
15:41 Remramm joined #git
15:41 Remramm joined #git
15:42 miklcct_ joined #git
15:42 JeroenT joined #git
15:44 hhee joined #git
15:45 venmx joined #git
15:45 chardan joined #git
15:45 bsanford joined #git
15:47 grayjoc joined #git
15:49 MattMaker joined #git
15:49 al67 joined #git
15:49 Derperperd joined #git
15:50 bannakaffalatta joined #git
15:52 harmlessdrudge joined #git
15:52 publio joined #git
15:54 madewokherd joined #git
15:58 hhee joined #git
16:01 ExoUNX joined #git
16:03 hvxgr joined #git
16:05 diegoll joined #git
16:06 peacememories joined #git
16:06 Rodya_ joined #git
16:07 ronny joined #git
16:08 scottjl joined #git
16:08 Munt joined #git
16:09 b100s joined #git
16:09 b100s hi2all
16:10 gitinfo b100s: [!welcome] Welcome to #git, a place full of helpful gits. If you have a question,  feel free to just go ahead and ask—somebody should answer shortly.  For more info on this channel, see http://jk.gs/git/  Take backups (type !backup to learn how) before taking advice.
16:10 jast slowpoke bot
16:11 Vampire0 jast, yeah, I'm just too slow :-D
16:11 Oatmeal joined #git
16:11 LeBlaaanc joined #git
16:12 skered joined #git
16:12 Snugglebash joined #git
16:13 CatKiller left #git
16:14 b100s i do: git diff branchA branchB and see next: in branchA i haven't few lines which is in branchB; no surpirsed, usual thing; but i want to find commit in which that line was deleted
16:15 TomyWork joined #git
16:16 Snugglebash joined #git
16:17 Salz git blame manpage suggests: git log -S'search string'
16:17 jimi_ joined #git
16:18 jast Vampire0: oh, right. :) normally the bot auto-welcomes people when they say hi for the first time, but 'hi2all' doesn't match the pattern
16:21 King_Hual joined #git
16:21 Phylock joined #git
16:21 b100s Salz, thanks
16:22 Vampire0 jast, exactly. there are some other patterns that are not reconized either but probably should, but I don't know anymore which I have seen
16:22 thebope joined #git
16:23 dsteplight__ joined #git
16:23 nickabbey joined #git
16:24 publio joined #git
16:24 thiago joined #git
16:24 Starky joined #git
16:25 IntruderSRB joined #git
16:25 jast Vampire0: whenever you see something, send me a message and I'll take care of it as soon as the next shipment of round tuits arrives
16:25 nowhere_man joined #git
16:27 nickabbey joined #git
16:28 david__ joined #git
16:30 raynold joined #git
16:31 ejb joined #git
16:31 Vampire0 jast, round tuits?
16:32 Vampire0 jast, ok, I'll try to remember
16:32 hvxgr joined #git
16:33 Gabemo joined #git
16:33 LionsMane joined #git
16:33 bashcoder joined #git
16:33 bashcoder joined #git
16:34 kpease joined #git
16:35 diegoll joined #git
16:37 brent__ joined #git
16:38 chachasmooth joined #git
16:38 troulouliou_div2 joined #git
16:38 mock joined #git
16:38 brent__ joined #git
16:39 jast Vampire0: objectification of getting "around to it"
16:39 jast I'm using the phrase for hysterical raisins
16:41 Vampire0 jast, oookay, typical case of not understanding because of not being a native speaker I guess :-)
16:42 jast I'm not a native speaker either, I figured it out. what's your excuse? :P
16:42 Vampire0 jast, of course you figured it out, you invented it o_O
16:43 dreiss joined #git
16:44 jstimm joined #git
16:44 JuliusN left #git
16:44 jast no, I just copied it
16:45 jast "proof": https://en.wiktionary.org/wiki/round_tuit
16:45 jagob joined #git
16:45 canton7 http://4.bp.blogspot.com/-s5bgT1lyoDQ/UsrQgF​ycFlI/AAAAAAAABuo/AGjez03wCis/s1600/Round%2B​tuit%2Bframed%2Band%2Bwith%2Bwatermark.jpg
16:46 cdown joined #git
16:46 canton7 yeah, one of those
16:46 nydel07 joined #git
16:46 venmx joined #git
16:46 Vampire0 jast, ah, I see
16:47 Vampire0 nice one canton7 :-)
16:47 thebird joined #git
16:48 matoro joined #git
16:49 marcogmonteiro joined #git
16:49 MattMaker joined #git
16:49 cdown_ joined #git
16:50 bannakaf_ joined #git
16:51 Munt joined #git
16:52 diegoll joined #git
16:53 Murii joined #git
16:54 cdown_ joined #git
16:55 matsaman joined #git
16:56 username1 joined #git
16:57 Snugglebash joined #git
16:57 thebird joined #git
16:58 plugwash joined #git
16:58 plugwash is there a command to replace a subtree of the working tree with the corresponding subtree of a particular commit?
16:59 scottjl joined #git
16:59 ToxicFrog plugwash: git checkout <commit> -- <path/to/subtree>
17:01 Es0teric joined #git
17:02 ayogi joined #git
17:03 chachasmooth joined #git
17:07 s1scha joined #git
17:07 ejb joined #git
17:08 regedit joined #git
17:09 Gustavo6046 joined #git
17:11 sbasso joined #git
17:12 al-damiri joined #git
17:12 multi_io joined #git
17:17 thebope joined #git
17:18 durham joined #git
17:19 blackwind_123 joined #git
17:19 orbyt_ joined #git
17:20 skered joined #git
17:23 jottr joined #git
17:25 amrits joined #git
17:25 xall joined #git
17:28 jottr joined #git
17:28 jottr joined #git
17:31 HurricaneHarry joined #git
17:31 mehola joined #git
17:31 xall joined #git
17:31 nickabbey joined #git
17:32 jottr joined #git
17:32 jnavila joined #git
17:32 Derperperd joined #git
17:32 acetakwas joined #git
17:36 perlpilot_ joined #git
17:37 troulouliou_div2 joined #git
17:38 livingstn joined #git
17:39 acetakwas joined #git
17:41 chardan joined #git
17:42 acetakwas joined #git
17:44 svm_invictvs joined #git
17:47 venmx joined #git
17:47 jottr joined #git
17:47 snowalpaca joined #git
17:48 diegoll joined #git
17:49 ansimation joined #git
17:49 Rodya_ joined #git
17:50 ansimation joined #git
17:50 MattMaker joined #git
17:51 nickabbey joined #git
17:52 jimi_ joined #git
17:53 dorkmafia joined #git
17:57 MTecknology joined #git
17:58 MTecknology Guys?..
17:58 MTecknology git bisect? OMG!
17:58 peterbecich joined #git
17:58 Sadeukko joined #git
17:58 demize MTecknology: Welcome into the light.
17:59 MTecknology Words can't describe how nice that was! I like this light! :D
18:00 chachasmooth joined #git
18:00 peterbecich joined #git
18:00 jstimm joined #git
18:01 Guma_ joined #git
18:01 rubyonrailed joined #git
18:02 jason237 joined #git
18:04 mock left #git
18:04 ejb joined #git
18:11 thebope joined #git
18:14 Hedgework <3
18:15 ccolorado left #git
18:20 omar__ joined #git
18:21 dreiss joined #git
18:21 stevenspasbo joined #git
18:21 MTecknology I didn't get to use git run, though :(
18:21 rubyonrailed joined #git
18:21 nickabbey joined #git
18:22 Sadeukko joined #git
18:23 e14 joined #git
18:25 Tobbi joined #git
18:26 _Vi joined #git
18:27 chachasmooth joined #git
18:28 ejb joined #git
18:28 nickabbey joined #git
18:30 joki joined #git
18:31 cschneid_ joined #git
18:31 bgerber joined #git
18:32 sargentmki joined #git
18:34 jost joined #git
18:34 nowhere_man joined #git
18:34 bgerber joined #git
18:34 MTecknology How can I say "no, I meant that last revision was bad, not good?
18:35 joshszep joined #git
18:37 matoro joined #git
18:38 Sadeukko joined #git
18:39 Seveas git bisect bad <sha1> I believe
18:40 harmlessdrudge joined #git
18:40 tonyj joined #git
18:41 Es0teric joined #git
18:42 MTecknology I got an error about the commit being marked good and bad not being acceptable.
18:43 Rodya_ joined #git
18:44 raspado joined #git
18:45 MTecknology I'll have to spend some time breaking git bisect so I can figure out how to fix it. :)
18:46 peterbec` joined #git
18:46 ahr3n joined #git
18:47 aw1 joined #git
18:47 venmx joined #git
18:48 aw1 joined #git
18:50 Gustavo6046 joined #git
18:51 MattMaker joined #git
18:52 xissburg joined #git
18:53 acetakwas joined #git
18:53 hhee joined #git
18:54 duderonomy joined #git
18:54 Es0teric joined #git
18:54 diegoll joined #git
18:58 MattMaker joined #git
18:58 rubyonrailed joined #git
18:59 Darren_ joined #git
18:59 Sample joined #git
18:59 muhannad_______ joined #git
18:59 gopar joined #git
19:01 qqx I think if you need to maka a mistake you need to use `git bisect log` + `git bised replay`. At least that's what the man page suggests.
19:01 bvcosta joined #git
19:01 tyreld joined #git
19:02 acetakwas joined #git
19:04 MTecknology ah, nice, I can't read..
19:05 chachasmooth joined #git
19:06 peeps[lappy] joined #git
19:06 oleksiyp joined #git
19:06 Sasazuka__ joined #git
19:07 m4sk1n joined #git
19:07 MACscr why would git pull always show that a local branch is up to date when its not?
19:08 MACscr i have to do git fetch --all and then a reset everytime for it to get the newest files
19:08 Sound joined #git
19:08 diegoll joined #git
19:10 m0viefreak joined #git
19:13 thiago joined #git
19:14 matoro joined #git
19:16 math-alpha joined #git
19:16 ojacobson MACscr: "up-to-date" means the branch being merged is already an ancestor of the current branch
19:16 ojacobson it's a topological assertion
19:16 ojacobson the state of the code is a consequence of the topology and of your work
19:17 ojacobson have a look at !lol immediately after a pull that doesn't do what you expect
19:17 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
19:17 UrsoBranco joined #git
19:21 mikecmpbll joined #git
19:22 harmlessdrudge joined #git
19:25 Anja joined #git
19:26 chachasmooth joined #git
19:27 davimore_ joined #git
19:27 marianina8 joined #git
19:28 fahadash joined #git
19:30 StuartMI joined #git
19:30 satifant joined #git
19:30 mu joined #git
19:31 einnjo joined #git
19:31 marianina8 joined #git
19:31 overlord_tm joined #git
19:32 mu does anyone have a thought on how to reconcile a public github repo with private configuration keys, without making it a manual process? I'm thinking a submodule might be the way to go, so I can have a config repo that is private, containing centralized keys/etc, but I'm wondering if this is a sensible direction
19:32 eroux joined #git
19:34 Eugene !configs
19:34 gitinfo [!configfiles] It is recommended to store local configuration data in a file which is not tracked by git, but certain deployment scenarios(such as Heroku) may require otherwise. See https://gist.github.com/1423106 for some ideas
19:34 mu thanks Eugene!
19:34 Eugene submodule is probably not a good fit if you're going to publish the parent repo but not the child - you'll get clone errors
19:35 Eugene If you have a lot of config data then you should break it out of your application. Orchestration/management tools (like SaltStack and Puppet) have provisos for this
19:35 Eugene (basically, store it in a separate repo)
19:35 MTecknology Salt!!!
19:35 markovh joined #git
19:35 Eugene If you're feeling generous, make a "empty" repo with bogus secrets and link it in the README
19:36 Eugene Also remember that pushing secrets to Github, even in a private repo, will result in them being blacklisted
19:36 Eugene IAM keys, SSH keys, and I think they work with some SSL providers nowadays too
19:36 mu Well... it's sort of trivial configuration. One file that needs to point to a database and SMTP server. I guess I'll write up a deployment doc for private consumption outside of git, redact the file and provide example config
19:36 mu Hmm, blacklisted?
19:37 Eugene Yup. If you push a private key to github they will stop trusting it
19:38 jnavila joined #git
19:38 mu My usage of "key" was colloquial, I just meant some passwords/etc -- not PGP or so on
19:38 mu I assume you're talking about signed keys?
19:38 Eugene SSH private keys
19:38 mu Sure. Good to know
19:38 Eugene Passwords are "fine", but you really shouldn't put those on Github(from an opsec perspective)
19:40 mu Yeah. It was mostly necessary from the POV of moving fast. Now that we're readying for launch, not a good idea to let curious people figure out how to access the database ;)
19:40 blr joined #git
19:40 bgerber joined #git
19:42 jnewt_ joined #git
19:43 jottr_ joined #git
19:43 cdg joined #git
19:43 timmy joined #git
19:43 jeffd joined #git
19:44 bejeb joined #git
19:46 frqmand joined #git
19:46 hashpuppy joined #git
19:47 marsmellow joined #git
19:48 Cymew joined #git
19:48 venmx joined #git
19:51 Guest4035 I'm new to git and I'm getting an error I don't understand how to fix
19:52 Guest4035 The git repo is on Windows server. git version 2.12
19:52 frqmand left #git
19:53 elisa87 joined #git
19:53 Guest4035 The repo work fine when I interact with it. When I try to make a commit automatically via a php script I get:
19:53 Guest4035 Fatal error: Uncaught exception 'Exception' with message 'fatal: Unable to create 'D:/path/.git/index.lock': Permission denied
19:53 nickabbey joined #git
19:54 Sample joined #git
19:54 Guest4035 There is no D:/path/.git/index.lock file. If I touch D:/path/.git/index.lock it creates one but I still get the error
19:55 Munt joined #git
19:55 Guest4035 In the .git/config file I set sharedRepository = world but I still get the error.
19:55 Guest4035 Any thoughts on what to look at?
19:59 thebope joined #git
20:00 ToBeCloud joined #git
20:00 phale joined #git
20:00 phale So I've done major changes to my repository like moved files and made new directories and removed some directories. How do I push without making conflicting changes?
20:00 phale I mean I haven't really commited yet
20:00 phale either
20:02 hasc joined #git
20:02 harmlessdrudge joined #git
20:02 scarcry joined #git
20:03 hanneso joined #git
20:03 whaley joined #git
20:03 sQVe joined #git
20:04 Gsham joined #git
20:06 Hobbyboy joined #git
20:06 robattila256 joined #git
20:09 barteks2x joined #git
20:10 MattMaker joined #git
20:10 phale left #git
20:12 nowhere_man joined #git
20:14 askb joined #git
20:15 chrisa_ joined #git
20:16 fatalhalt joined #git
20:19 todd_dsm joined #git
20:23 jnavila joined #git
20:24 nowhere_man joined #git
20:27 petersaints joined #git
20:27 MineCoins joined #git
20:29 Snugglebash joined #git
20:32 wgrant joined #git
20:33 peacememories joined #git
20:33 Cavallari joined #git
20:34 harmlessdrudge joined #git
20:35 xissburg joined #git
20:37 pifon joined #git
20:39 dorkmafia joined #git
20:41 kadoban joined #git
20:45 tvw joined #git
20:49 venmx joined #git
20:52 harmlessdrudge joined #git
20:55 Tobbi joined #git
20:56 Jackneill_ joined #git
20:57 omarramo joined #git
20:58 kulelu88 joined #git
20:59 omarramo hey guys, I have a svn repo and a git repo that I want to merge as described in the correct answer of this thread http://stackoverflow.com/questions/11148755/​how-to-import-local-git-repository-into-svn. the problem is that my svn repository also has been commited to already.
20:59 Jackneill_ joined #git
21:00 omarramo when I type in git pull origin master, it says that it wont merge two unrelated histories
21:00 omarramo how can I modify it so that git will merge them?
21:00 JanC_ joined #git
21:02 marianina8 joined #git
21:03 diegoll joined #git
21:03 lewnidas_ joined #git
21:04 hio left #git
21:05 wgrant joined #git
21:08 einnjo joined #git
21:08 MattMaker joined #git
21:09 wilbert joined #git
21:09 username1 joined #git
21:12 BSaboia joined #git
21:17 thiago joined #git
21:18 dsdeiz joined #git
21:18 Rodya_ joined #git
21:18 sobersabre joined #git
21:19 sobersabre hi. I would like to reorganize a branch I want it to do while its current state is used by others.
21:19 sobersabre i.e. to duplicate a branch.
21:19 manuelschneid3r joined #git
21:19 grayjoc joined #git
21:20 sobersabre is there a way to go around git checkout ${parent}; git checkout -b mycopy; git cherry-pick mysrc..something ?
21:20 sobersabre any better way to do it ?
21:20 bremner git checkout -b newbranch oldbranch
21:21 bremner any rewrite of newbranch won't change oldbranch
21:25 sathed joined #git
21:26 mock joined #git
21:28 peterbecich joined #git
21:29 orbyt_ joined #git
21:31 m0viefreak joined #git
21:31 matoro joined #git
21:32 a_thakur joined #git
21:32 mehola joined #git
21:32 finalbeta joined #git
21:33 dendazen guys my hook for post commit does this when i push for some random files "remote: error: could not lock config file /opt/levelup-etc/.git/config: File exists
21:34 dendazen or remote: fatal: failed to copy file to '/staging/levelup-etc/.git/objects/1e/8​09b9ede470c551f333abb912bd6ead6f6e72f': File exists
21:34 marianina8 joined #git
21:35 dendazen and is i do in the hook is  "rm -rf /staging/levelup-etc; git clone /home/atlassian/stash/home/s​hared/data/repositories/268 /staging/levelup-etc; GIT_WORK_TREE="/staging/levelup-etc" git checkout -f master"
21:35 dendazen it did not happen before, hooked just worked, but after upgrading from stash to bitbucket it started happening
21:35 dendazen I would appreciate any hints
21:37 a_thakur_ joined #git
21:37 inflames joined #git
21:39 a_thakur joined #git
21:40 Kehet left #git
21:40 cdg joined #git
21:42 chachasmooth joined #git
21:43 cbreak dendazen: what do you do in your hook?
21:44 dendazen just that above
21:44 dendazen remove previous content
21:44 dendazen rm -rf /staging/levelup-etc
21:44 dendazen and then
21:44 cbreak why would you do that after a commit?
21:44 cbreak makes no sense
21:44 dendazen git clone /home/atlassian/stash/home/s​hared/data/repositories/268 /staging/levelup-etc; GIT_WORK_TREE="/staging/levelup-etc" git checkout -f master"
21:44 dendazen because i need to deploy new content on the push
21:45 cbreak so?
21:45 dendazen repo has configuration files
21:45 cbreak no need to have a post commit hook
21:45 maroloccio joined #git
21:45 Darren_ joined #git
21:45 a_thakur_ joined #git
21:45 dendazen i need to deploy new content to 20 other hosts
21:45 cbreak doesn't matter
21:46 cbreak post-commit hooks are for doing things after a commit
21:46 cbreak they are 100% unrelated to pushing
21:47 cbreak also, git cloning in such a hook makes no sense
21:47 ertes joined #git
21:47 dendazen this is not post-commit
21:47 dendazen this is post-receive hook
21:47 mock left #git
21:47 thebope joined #git
21:48 cbreak clone in a post receive hook also makes zero sense
21:48 elisa87 joined #git
21:48 Elzington joined #git
21:48 bulletmark joined #git
21:49 dendazen how can i get a new content checked out somewhere otherwise?
21:49 cbreak git checkout
21:49 dendazen in non-interactive way
21:49 cbreak but you have to realize that hooks are run in repositories
21:49 cbreak you don't need to clone because you already HAVE a repository
21:49 dendazen I see what you are saying
21:50 venmx joined #git
21:50 dendazen but it will have to be cloned initially
21:50 cbreak if you want to check out a commit, use git checkout
21:50 cbreak dendazen: no
21:50 dendazen to that path
21:50 Oatmeal joined #git
21:50 cbreak you already have a repo
21:50 cbreak otherwise you couldn't push
21:50 aielima joined #git
21:51 jottr_ joined #git
21:51 dendazen but i have bare repo, no?
21:51 dendazen in that stash path
21:52 cbreak dendazen: that's enough
21:52 cbreak if you push to it, you have a repo
21:52 cbreak you can use git archive to get a snapshot of any treeish (like a commit)
21:52 cbreak and untar that where ever you want
21:52 cbreak or you can do as you do now and set GIT_WORK_TREE and uuse checkout or reset --hard
21:53 dendazen oh i am not familiar with git archive
21:53 nicolai86 joined #git
21:53 dendazen i see, thank you for your suggestions, i will work though farther
21:54 wgrant joined #git
21:57 AustinMatherne joined #git
21:57 inovas joined #git
21:59 jgornick joined #git
21:59 timthowtdi joined #git
22:00 arooni joined #git
22:00 rideh joined #git
22:01 venmx joined #git
22:01 HedgeMage joined #git
22:02 HandheldPenguin joined #git
22:03 TomyLobo joined #git
22:03 ntonjeta joined #git
22:04 cschneid joined #git
22:04 matt_m joined #git
22:04 Hedgework joined #git
22:05 thiago joined #git
22:05 marianina8 joined #git
22:05 lucido-cl joined #git
22:06 blackwind_123 joined #git
22:08 Atm0spher1c joined #git
22:09 pR0Ps joined #git
22:10 Sasazuka joined #git
22:11 mekeor joined #git
22:13 Atm0spher1c joined #git
22:13 cagomez joined #git
22:14 Guma_ joined #git
22:15 Derperperd joined #git
22:15 Guma joined #git
22:15 ISmithers joined #git
22:16 pR0Ps joined #git
22:17 rwb joined #git
22:22 ertes joined #git
22:25 YuGiOhJCJ joined #git
22:25 chardan joined #git
22:26 diegoll joined #git
22:26 Bizkit joined #git
22:27 Bizkit joined #git
22:27 Es0teric joined #git
22:29 DanDevX joined #git
22:29 imMute joined #git
22:30 Guma_ joined #git
22:31 LaptopBrain joined #git
22:32 dsteplight__ joined #git
22:32 aard_ joined #git
22:32 muhannad_______ joined #git
22:34 Kamilion joined #git
22:34 mrkake joined #git
22:35 AfroThundr joined #git
22:35 jimi_ joined #git
22:36 wgrant joined #git
22:36 SwiftMatt joined #git
22:36 iota_pi joined #git
22:37 Es0teric joined #git
22:39 nowhere_man joined #git
22:40 plugwash is there an easy way to create a new commit using the author and timestamp from an existing commit?
22:41 Darren_ joined #git
22:41 thebope joined #git
22:42 ppppp5 joined #git
22:44 MaximusColourum joined #git
22:46 fdkl joined #git
22:48 cxreg joined #git
22:48 osse plugwash: use -c
22:49 leonarth joined #git
22:50 chachasmooth joined #git
22:51 plugwash fatal: Option -m cannot be combined with -c/-C/-F/--fixup :(
22:52 DolpheenDream joined #git
22:52 Iqfi joined #git
22:57 e14 joined #git
23:01 fmeerkoetter joined #git
23:02 venmx joined #git
23:03 lucido-cl joined #git
23:04 Munt joined #git
23:05 plugwash seems the working soloution is to use -C to make the commit, then use --amend to set the commit message
23:06 plugwash thanks
23:07 diegoll joined #git
23:07 osse plugwash: -c will open the editor
23:07 plugwash I don't want it to open the editor, i'm trying to script this
23:08 plugwash I want it to take the author/date from an existing commit and the commit message from the command line
23:12 bannakaffalatta joined #git
23:12 Sasazuka_ joined #git
23:12 faux___ joined #git
23:13 jottr_ joined #git
23:14 einnjo joined #git
23:14 barteks2x joined #git
23:14 Hobbyboy joined #git
23:14 Efnau joined #git
23:15 apotry joined #git
23:19 mehola joined #git
23:19 chrisml joined #git
23:19 CheckDavid joined #git
23:20 scoobertron joined #git
23:22 dendazen joined #git
23:23 osse plugwash: if you're scripting then use --date and --author
23:23 osse --date=$(git log -1 --format=%ad ..) etc
23:26 harmlessdrudge joined #git
23:26 ntonjeta joined #git
23:27 d0nn1e joined #git
23:33 cr34ton joined #git
23:35 Bizkit joined #git
23:36 dave0x6d joined #git
23:39 Kaisyu joined #git
23:39 mozzarella joined #git
23:39 rivarun joined #git
23:40 wxg joined #git
23:43 AciD` joined #git
23:43 AciD` joined #git
23:46 jmckind joined #git
23:48 menip joined #git
23:50 peterbecich joined #git
23:51 client_ joined #git
23:52 caratelin joined #git
23:52 jmckind joined #git
23:52 madewokherd joined #git
23:53 marianina8 joined #git
23:55 Guest44373 joined #git
23:56 LionsMane joined #git

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