Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-05

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

All times shown according to UTC.

Time Nick Message
00:01 neanderslob joined #git
00:05 xlegoman joined #git
00:06 e14 joined #git
00:08 akurniawan joined #git
00:09 nicksloa_ joined #git
00:11 mellernoia joined #git
00:14 Jahhein joined #git
00:15 e14 left #git
00:15 lvns joined #git
00:16 dreiss joined #git
00:18 nckpz joined #git
00:21 Jahhein joined #git
00:23 netj joined #git
00:28 Rickmasta joined #git
00:31 zezba9000 left #git
00:32 aax joined #git
00:35 ahammond joined #git
00:41 ahammond I want to use git subtree to grab a sub-directory from a source repo into a destination repo under a prefix. I'd like to be able to push changes back up to the source repo.
00:41 red82 joined #git
00:46 ejb joined #git
00:47 renlo joined #git
00:48 cyphase joined #git
00:49 cagedwisdom joined #git
00:52 Siegfried joined #git
00:54 infernix joined #git
00:56 manuel joined #git
00:56 anuxivm left #git
00:58 menip joined #git
01:00 helohello joined #git
01:02 SwiftMatt joined #git
01:03 hue joined #git
01:03 fission6 joined #git
01:04 venmx joined #git
01:04 CheckDavid joined #git
01:07 nd_ joined #git
01:08 mycelium joined #git
01:11 helohello joined #git
01:12 helohello hey is anyone here?
01:12 wgrant joined #git
01:12 durham_ joined #git
01:12 helohello this problem is driving me nuts...
01:12 helohello I use a push to deploy setup for my websites, where a bare repo exists on my server with a post-receive hook exists to push files to the website directory
01:12 helohello I'm trying to git pull production master and git just hangs after "Auto packing the repository for optimum performance"
01:13 helohello strace just shows wait(-1
01:13 helohello I have no idea whats wrong
01:15 theskillwithin do you have oh my zsh?
01:16 theskillwithin i feel like there was an alias for it in oh my zsh https://github.com/robbyrussell​/oh-my-zsh/wiki/Cheatsheet#git
01:18 kpease joined #git
01:18 ejb joined #git
01:19 Rickmasta joined #git
01:25 ejb joined #git
01:25 HoierM joined #git
01:26 fstd joined #git
01:30 infernix joined #git
01:32 raijin joined #git
01:34 chris123456 joined #git
01:36 Eryn_1983_FL joined #git
01:39 ejb joined #git
01:42 matsaman joined #git
01:48 snthsnth joined #git
01:49 Goplat joined #git
01:50 hck89 joined #git
01:56 xall_ joined #git
01:58 liuzhen joined #git
01:58 Pursuit_ left #git
01:58 Pursuit joined #git
01:59 Pursuit I'm having some trouble with git subtree. I've got a tree that I've split off from my main repository and I'm trying to merge changes back from it. I'm getting `fatal: refusing to merge unrelated histories` when I try to do so. Any ideas as to what I'm doing wrong?
02:00 drawkula joined #git
02:05 mrpackethead joined #git
02:05 finalbeta joined #git
02:06 Pursuit Minimal example of what i'm doing: http://pastebin.com/XUtPTvQs
02:09 kulelu88 joined #git
02:13 diogenese joined #git
02:13 matsaman joined #git
02:14 matsaman joined #git
02:16 def_jam joined #git
02:16 eb0t_ joined #git
02:17 matsaman joined #git
02:17 Limes joined #git
02:23 mablae joined #git
02:24 watabou joined #git
02:25 ToxicFrog joined #git
02:25 jstimm joined #git
02:28 Starky joined #git
02:29 red82 joined #git
02:31 pks joined #git
02:34 venmx joined #git
02:37 haavard left #git
02:38 Siegfried joined #git
02:39 rbern joined #git
02:46 d^sh joined #git
02:46 xall_ joined #git
02:55 denimsoft joined #git
02:58 bannakaffalatta joined #git
03:00 sgtbigman joined #git
03:01 pks joined #git
03:03 justanotheruser joined #git
03:05 Electrometro joined #git
03:08 Dougie187 joined #git
03:09 yohnnyjoe joined #git
03:13 glebm joined #git
03:15 jaguarmagenta joined #git
03:19 f4 joined #git
03:25 mda1 joined #git
03:27 fatalhalt joined #git
03:27 f4 joined #git
03:27 Anupkumar joined #git
03:28 infernix joined #git
03:34 offtopik left #git
03:34 Dougie187 left #git
03:35 mda1 joined #git
03:35 f4 joined #git
03:35 jaguarmagenta joined #git
03:38 hexagoxel joined #git
03:38 Rodya_ joined #git
03:39 f4 joined #git
03:41 menip joined #git
03:41 chachasmooth joined #git
03:41 lagothrix joined #git
03:43 f4 joined #git
03:46 einnjo joined #git
03:46 f4 joined #git
03:49 User458764 joined #git
03:53 f4 joined #git
03:53 mrpackethead joined #git
03:57 Balthasar|EB840 joined #git
03:57 fission6 joined #git
03:58 dimi1947 joined #git
04:00 wxg joined #git
04:00 jost_ joined #git
04:02 f4 joined #git
04:05 venmx joined #git
04:10 mehola joined #git
04:12 f4 joined #git
04:14 Vortex35 joined #git
04:15 axisys joined #git
04:15 User458764 joined #git
04:19 f4 joined #git
04:20 svm_invictvs joined #git
04:23 snthsnth joined #git
04:27 whitby joined #git
04:28 dsantiago joined #git
04:30 zulutango joined #git
04:31 xall_ joined #git
04:33 f4 joined #git
04:34 railssmith joined #git
04:41 f4 joined #git
04:42 ochorocho__ joined #git
04:43 xall joined #git
04:46 RiPer_ left #git
04:46 RiPer_ joined #git
04:48 RiPer_ what is the best way to 'git pull' all git projects I am using? I wrote a bash script, but it requires me to manually add every repo. Seeing if there was a global setting I missed. Thanks!
04:49 f4 joined #git
04:55 preaction that's not built-in to git. there are apps like "gitgot" that do it
04:56 pks joined #git
05:03 SpeakerToMeat joined #git
05:04 f4 joined #git
05:06 Random832 RiPer_: you could keep all your repos in one directory and do "for repo in *"
05:10 jaafar joined #git
05:11 RiPer_ ok that works. Thanks, will probably stick with my script, will make it so it adds the repo with git clone and adds it to working list to update. seems to be the cleanest in my mind anyway. thanks fellas!
05:13 PioneerAxon joined #git
05:15 User458764 joined #git
05:17 Jameser joined #git
05:20 f4 joined #git
05:22 lvns joined #git
05:25 inflames joined #git
05:29 jaguarmagenta joined #git
05:31 xall joined #git
05:31 gigq joined #git
05:33 rmbeer left #git
05:33 Cabanossi joined #git
05:34 liuzhen joined #git
05:35 f4 joined #git
05:35 venmx joined #git
05:41 mrpackethead joined #git
05:42 ngperfex joined #git
05:43 ochorocho__ joined #git
05:44 diamonds_sent_me joined #git
05:47 bmahe joined #git
05:50 f4 joined #git
05:55 subhojit777 joined #git
05:56 phanimahesh joined #git
05:57 done joined #git
06:03 Balthasar|EB840 joined #git
06:04 lindenle joined #git
06:04 mda1 joined #git
06:05 f4 joined #git
06:09 cqi joined #git
06:10 dimi1947 joined #git
06:12 mtso[m] joined #git
06:12 hahuang61 joined #git
06:12 f4 joined #git
06:13 snthsnth joined #git
06:19 lindenle joined #git
06:20 f4 joined #git
06:20 shubhnik joined #git
06:22 User458764 joined #git
06:25 dimi1947 joined #git
06:34 flavius joined #git
06:34 sangy joined #git
06:35 f4 joined #git
06:36 ShapeShifter499 joined #git
06:37 liuzhen joined #git
06:39 cdesai joined #git
06:39 laumann joined #git
06:39 shubhnik joined #git
06:47 phaleth joined #git
06:52 xall joined #git
06:53 rchavik joined #git
06:54 strugee joined #git
06:54 f4 joined #git
06:56 nilg joined #git
06:57 vuoto joined #git
07:01 nawwmz joined #git
07:02 venmx joined #git
07:02 aeontech joined #git
07:05 resurtm joined #git
07:09 apotry joined #git
07:09 jstimm joined #git
07:09 meauses joined #git
07:10 chandu20 joined #git
07:11 diogenese joined #git
07:14 vuoto joined #git
07:19 f4 joined #git
07:21 howdoi joined #git
07:21 rishi` joined #git
07:28 _cyril_ joined #git
07:28 rivarun joined #git
07:28 sea-gull joined #git
07:32 bocaneri joined #git
07:33 sea-gull_ joined #git
07:34 lordjancso joined #git
07:34 f4 joined #git
07:37 xall joined #git
07:38 f4 joined #git
07:41 LucaTM joined #git
07:44 renlo joined #git
07:47 cdesai joined #git
07:47 vuoto joined #git
07:49 venmx joined #git
07:57 aax joined #git
07:58 done joined #git
07:58 cyan__ joined #git
07:59 pks joined #git
08:09 tvw joined #git
08:17 ngperfex joined #git
08:19 yohnnyjoe joined #git
08:22 xall joined #git
08:22 Jameser joined #git
08:24 jknetl joined #git
08:24 ArchNoob joined #git
08:24 ahmedelgabri joined #git
08:26 mobileware joined #git
08:30 Jameser joined #git
08:35 meauses joined #git
08:38 jstimm joined #git
08:39 lindenle joined #git
08:40 netj joined #git
08:46 ochorocho__ joined #git
08:48 PCatinean joined #git
09:02 phil22 joined #git
09:03 Puffball joined #git
09:06 Gloomy joined #git
09:11 solf1re joined #git
09:14 Jackneill joined #git
09:20 User458764 joined #git
09:22 inflames joined #git
09:28 venmx joined #git
09:28 eivarv joined #git
09:29 ochorocho__ joined #git
09:29 _cyril_ joined #git
09:31 jokajak joined #git
09:32 t0by joined #git
09:34 ocbtec joined #git
09:40 Ferris_ joined #git
09:42 netj joined #git
09:42 chandu20 joined #git
09:43 Puffball joined #git
09:46 Puffball_ joined #git
09:47 liuzhen joined #git
09:53 f4 joined #git
09:56 cebor joined #git
09:57 jbitdrop joined #git
09:59 GavinMagnus joined #git
10:00 meauses joined #git
10:01 f4 joined #git
10:06 cebor joined #git
10:07 Discovery joined #git
10:09 IlNominePatre joined #git
10:19 subhojit777 joined #git
10:20 King_Hual joined #git
10:21 djb-irc joined #git
10:21 meauses joined #git
10:22 afuentes joined #git
10:22 resurtm joined #git
10:23 _cyril_ joined #git
10:24 Darcidride joined #git
10:25 User458764 joined #git
10:30 anuxivm joined #git
10:44 laumann joined #git
10:46 sea-gull joined #git
10:47 User458764 joined #git
10:54 sq-one joined #git
10:57 mikecmpbll joined #git
10:59 robin joined #git
11:01 robin hello all.  I am reading the following tutorial https://codewords.recurse.com/is​sues/two/git-from-the-inside-out which encourages you to explore the .git directory
11:01 robin it says: The index is a list that contains every file that Git has been told to keep track of. It is stored as a file at .git/index. Each line of the file maps a tracked file to the hash of its content at the moment it was added.
11:02 robin however, when i open .git/index in vim, it seems to be a kind of compressed blob type thing
11:03 grawity it doesn't say it's a *human-readable* list
11:03 robin is there any way to view the contents of .git/index in a way where i can read it?
11:03 grawity git ls-files
11:03 robin thanks
11:03 _cyril_ joined #git
11:04 grawity with -s or --debug, it'll dump most of the data stored in there
11:04 GenZai joined #git
11:04 robin i have been using git show and git cat-file to view files when i have a sha-1
11:04 dede_ joined #git
11:05 robin which as far as I understand basically uncompresses the files.  Is git ls-files doing something similar for the .git/index file, or have I completely misunderstood?
11:05 grawity close enough
11:05 grawity the index isn't an object, though
11:05 grawity it's a separate structure on its own
11:06 nettoweb joined #git
11:06 danslo_ joined #git
11:06 robin thank you
11:07 robin so when i pass --stage to git ls-files, that's now effectively saying 'here's a list of every file Git has been told to keep track of, and here's the sha-1 reference to the version of those files which is currently in the staged area/the index'
11:08 PilkinsonSport joined #git
11:08 grawity yes
11:08 grawity well, "every file *in the working tree*"
11:08 grawity the index deals specifically with the worktree
11:11 jaafar joined #git
11:11 robin I think I have misunderstood then, because I didn't think git held any reference to files until they were put in the index (staging area) - and I had interpreted the sha-1 reference from git ls-files --stage as a reference to blobs of files (in .git/objects) that'd beed added to the index/staging area
11:12 sea-gull joined #git
11:13 Repox joined #git
11:13 grawity no, the *primary* references are in refs/ & packed-refs
11:13 grawity that is, branches (or tags, etc.) pointing to commits pointing to trees pointing to files
11:14 grawity a bare (server) repo wouldn't have a worktree or an index at all; only objects/ and refs/
11:15 zaherdirkey joined #git
11:16 zaherdirkey when i pull my remote, i want to override untracked file, without resetting before, cuz i want to keep other untracked file, is that possible?
11:17 robin thank you - that's really helpful - i think i need to do some more reading.  Particularly helpful that you said a bare repo doesn't have an index - i hadn't noticed that (when i'd created one before i had kind of assumed it basically contained the same as .git of my local repo)
11:17 murr4y joined #git
11:18 netj joined #git
11:18 danslo_ joined #git
11:26 robotroll joined #git
11:26 kenden joined #git
11:28 Limes joined #git
11:29 lvns joined #git
11:29 lvns joined #git
11:32 kenden joined #git
11:34 bl0w3d_0ut joined #git
11:35 Ariadeno joined #git
11:39 P4nther joined #git
11:40 manuel joined #git
11:42 Learath2 joined #git
11:43 LucaTM joined #git
11:45 _ADN_ joined #git
11:47 vsanc joined #git
11:53 xall joined #git
11:57 satifant joined #git
11:58 yohnnyjoe joined #git
12:01 cagedwisdom joined #git
12:02 xall_ joined #git
12:03 chandu20 joined #git
12:06 cdg joined #git
12:07 regfop joined #git
12:08 SuperSeriousCat joined #git
12:12 Starky joined #git
12:13 davix joined #git
12:15 jstein_ joined #git
12:15 Murii joined #git
12:15 xall_ joined #git
12:16 zaherdirkey left #git
12:17 mischat joined #git
12:19 kenden joined #git
12:25 User458764 joined #git
12:27 troulouliou_div2 joined #git
12:30 PioneerAxon joined #git
12:31 jknetl joined #git
12:38 Gamecubic joined #git
12:38 sdlnv joined #git
12:39 nettoweb joined #git
12:40 mellernoia joined #git
12:41 PioneerAxon joined #git
12:43 GavinMagnus joined #git
12:44 sea-gull_ joined #git
12:45 robotroll joined #git
12:45 snowkidind joined #git
12:48 ejb joined #git
12:49 chandu20 joined #git
12:49 fission6 joined #git
12:51 sdothum joined #git
12:57 nettoweb joined #git
12:57 GavinMagnus joined #git
12:58 usm4n joined #git
13:00 ngperfex joined #git
13:00 ieee joined #git
13:00 mikatone joined #git
13:01 mikatone where can I propose a new future for existent software in a bitbucket repository ? is there any available option in web interface?
13:02 DistantS1ar joined #git
13:04 GavinMagnus left #git
13:04 grawity bitbucket? see if the repo has an 'issues' section
13:04 grawity or see the project's README
13:04 HoierM joined #git
13:05 GavinMagnus joined #git
13:05 GavinMagnus left #git
13:06 mikatone grawity the project it is mine i just want to add new futures in order to have a tide control in development ;)
13:06 mikatone I need some proposal list ...
13:07 mikatone I see it :)
13:08 nikivi joined #git
13:09 DistantS1ar left #git
13:09 aard_ joined #git
13:13 mikatone grawity thank you very much :D
13:13 CheckDavid joined #git
13:15 vuoto joined #git
13:18 Achylles joined #git
13:24 usm4n_ joined #git
13:25 chandu20 joined #git
13:30 Rodya_ joined #git
13:35 rgrinberg joined #git
13:39 dreiss joined #git
13:41 strk joined #git
13:41 strk how do I find where a git subcommand is defined ? ie: `git hub` works fine here, but where do I find the `hub` command ?
13:42 strk (trying to figure out why it works, how it was installed etc.)
13:42 brillenfux joined #git
13:42 eivarv joined #git
13:42 canton7 strk, 'which git-hub'
13:43 canton7 if you put an executable called 'git-something' in your PATH, and you run 'git something', git will find and run the 'git-something' executable
13:44 xall_ joined #git
13:44 strk got it, thanks, I was puzzled by 'go get .../hub' making it work, but finally found out it was working even before :
13:44 akurniawan joined #git
13:46 Ryanar joined #git
13:46 fahadash joined #git
13:50 brillenfux joined #git
13:50 j416 strk: 'go get' has nothing to do with 'git-hub'
13:52 jaguarmagenta joined #git
13:52 grawity it does, in a way
13:52 grawity it compiles the git-hub binary
13:52 grawity and puts it in $GOPATH/bin, I think
13:52 j416 oh, I did not understand that he was _getting_ the git-hub project
13:54 j416 I need more coffee
13:55 justanotheruser joined #git
13:55 tjone270 joined #git
13:57 troulouliou_div2 joined #git
13:58 cdg_ joined #git
13:59 strk I know j416
14:00 strk left #git
14:00 ArchNoob joined #git
14:01 daey_ joined #git
14:01 byte512 joined #git
14:02 daey_ if i 'git checkout an_older_state' and make changes to it and want that new state to become the new head of master, how do i do that?
14:03 LucaTM left #git
14:05 meth joined #git
14:07 WayToDoor joined #git
14:09 meth joined #git
14:11 xall_ joined #git
14:11 j416 daey_: you can try to just 'git checkout master' and the uncommitted changes will follow
14:12 daey_ j416: but if i do that git will change the folder into the master stage, essentially destroying my changes. it will most likely ask to stash stuff before it does it but still
14:12 cagedwisdom joined #git
14:12 j416 daey_: if you committed something, git will say something like "leaving commits behind, warning warning", in which case you can for instance "git merge --ff-only <thelastcommit>" from master
14:12 daey_ i created a new branch, and commited to it
14:12 j416 daey_: it will not destroy anything
14:12 j416 daey_: it will "float" the changes over if it can, if not, it will abort
14:12 daey_ hm
14:12 oskarkv_ joined #git
14:13 j416 daey_: you may also use git-cherry-pick to pick individual commits into master. (git checkout master ; git cherry-pick <commit>)
14:13 PioneerAxon joined #git
14:14 j416 daey_: but that will change their hash, if you care about that.
14:14 daey_ im happy if i can bring order in this chaos :D
14:16 a3Dman joined #git
14:17 daey_ another thing. if i push changes to a remote server i specify the branch. but if i do a merge, it should affect two branches, or doesnt it?
14:18 sq-one joined #git
14:18 phil22 joined #git
14:18 Eryn_1983_FL joined #git
14:23 Rodya_ joined #git
14:25 robotroll joined #git
14:26 Rodya__ joined #git
14:30 j416 daey_: no. You merge into the branch you are on, it does not affect the branch that you merge in.
14:31 daey_ j416: ok. i thought that maybe git would want to set some kind of a pointer at the branch that gets merged into the master.
14:33 j416 daey_: why do you believe this?
14:33 daey_ j416: i kinda imagine it like a linked list. which probably is wrong
14:33 j416 it's not wrong
14:33 j416 it's similar
14:34 j416 when you merge a diverged branch into another, git creates a commit on the branch you merge into, that is the result of the merge. That commit has two parents, the first parent is the branch you merged into (the current branch), the second is the branch you merged.
14:35 daey_ ah so its reversed
14:35 resurtm joined #git
14:35 j416 (if you merge more than one branch at a time, the commit will have more than two parents)
14:35 daey_ the child is linking the parents
14:35 j416 the child has a reference to its parents yes
14:35 daey_ ok then i understand
14:35 j416 that's why you can never go from a parent to a child
14:36 j416 i.e., you can go back in history, but not the other way, without knowing explicitly where to go
14:36 daey_ and this is probably why the newest commit is shown ontop and not on the bottom in 'git log'
14:37 j416 daey_: you can "git log --reverse" if you prefer
14:37 daey_ :D
14:38 daey_ i was thinking in haskell linked list terms. i.e. "new commit":[]
14:38 j416 (but it will still walk the log from child to parent, not the other way)
14:38 daey_ that also explains why the newest commit is called head
14:38 j416 yup
14:39 j416 it's similar I guess.
14:39 ccx9 joined #git
14:41 ToBeCloud joined #git
14:42 mrpackethead joined #git
14:42 Domhack joined #git
14:45 ShekharReddy joined #git
14:46 p4trix joined #git
14:50 re1 joined #git
14:50 HoierM joined #git
14:50 boomlol23 joined #git
14:53 sleepee joined #git
14:59 Noldorin joined #git
15:00 sgtbigman joined #git
15:02 pijiu joined #git
15:06 wrouesnel joined #git
15:08 Siegfried joined #git
15:09 manuel joined #git
15:09 resurtm joined #git
15:11 mikecmpb_ joined #git
15:12 aeontech joined #git
15:15 vrld joined #git
15:16 quackgyver joined #git
15:16 mikecmpbll joined #git
15:18 User458764 joined #git
15:19 GavinMagnus1 joined #git
15:22 brk_ joined #git
15:23 thiago joined #git
15:25 zumba_ad_ joined #git
15:29 jaguarmagenta joined #git
15:31 alhariel joined #git
15:34 msonntag joined #git
15:35 pks_ joined #git
15:38 dreiss joined #git
15:42 lindenle joined #git
15:43 leeN joined #git
15:50 joki- joined #git
15:51 kenden joined #git
15:57 dodobrain joined #git
15:58 GavinMagnus1 left #git
15:59 fees joined #git
16:01 brk_ joined #git
16:02 fission6 joined #git
16:02 rbern joined #git
16:02 Orphis joined #git
16:03 kaldoran joined #git
16:05 shinnya joined #git
16:05 Endarked joined #git
16:06 phanimahesh joined #git
16:09 akurniawan joined #git
16:09 ojdo joined #git
16:10 tristanp joined #git
16:10 akurniawan joined #git
16:11 akurniawan joined #git
16:11 dodobrain joined #git
16:12 akurniawan joined #git
16:12 akurniawan joined #git
16:13 zumba_ad_ joined #git
16:15 kadoban joined #git
16:18 madewokherd joined #git
16:20 t0by joined #git
16:22 Rickmasta joined #git
16:24 Learath2 joined #git
16:24 cdg joined #git
16:26 renlo joined #git
16:26 glebm joined #git
16:27 red82 joined #git
16:36 cloudcell_ joined #git
16:36 kenden_ joined #git
16:36 sdothum joined #git
16:38 johnlage joined #git
16:38 Siegfried joined #git
16:40 cdg_ joined #git
16:45 lindenle joined #git
16:47 led_belly joined #git
16:47 jozwior joined #git
16:49 nikivi joined #git
16:51 jstimm joined #git
16:52 raijin joined #git
16:53 shubhnik joined #git
16:53 nettoweb joined #git
16:59 Balthasar|EB840 joined #git
16:59 rkazak joined #git
17:01 Electrometro joined #git
17:01 Gloomy joined #git
17:02 Electrometro joined #git
17:03 Siegfried joined #git
17:04 SwiftMatt joined #git
17:04 kulelu88 joined #git
17:15 renlo joined #git
17:16 cdg joined #git
17:16 NeverDie joined #git
17:17 Goplat joined #git
17:19 janjoris joined #git
17:19 doener joined #git
17:21 ArchNoob joined #git
17:21 mquin joined #git
17:22 denimsoft joined #git
17:25 morenoh149 joined #git
17:25 morenoh149 is there a way to tell git to clear the screen before displaying `git diff`?
17:26 cdown joined #git
17:26 bmahe joined #git
17:27 PerlJam morenoh149: clear; git diff  # :-)
17:27 yohnnyjoe joined #git
17:27 tvw joined #git
17:27 PerlJam morenoh149: you could actually make that a git alias if you wanted
17:29 morenoh149 PerlJam: thanks
17:30 NwS joined #git
17:30 InfoTest joined #git
17:33 Learath2 joined #git
17:35 hariel joined #git
17:36 zumba_ad_ joined #git
17:39 denimsoft joined #git
17:43 lacour joined #git
17:43 mehola joined #git
17:45 robattila256 joined #git
17:46 Siegfried joined #git
17:47 jaguarmagenta joined #git
17:47 cdg_ joined #git
17:48 ArchNoob joined #git
17:52 JanC_ joined #git
17:54 robotroll joined #git
17:57 GavinMagnus joined #git
17:58 gebruiker joined #git
17:59 janjoris joined #git
18:00 jottr joined #git
18:02 ircuser5678 joined #git
18:02 raijin joined #git
18:04 EricPoe joined #git
18:05 ircuser5678 Hi. A short question about .gitignore... I want to exclude everything and then include only those folders and files that I need. Excluding all works with "/*" and including a folder in the root with it's files with "!/scripts/*" but how do I include the files in "/scripts" but NOT all (newly created) subfolders?
18:05 stoned I fixed it!
18:05 stoned ircuser5678: when you start the repository, only git add what you want.
18:07 ircuser5678 That's not what I want, stoned. I'm currently trying GitKraken and it seems the only way to not list files / folders that it want to stage is by using ignore patterns in .gitignore
18:07 stoned ircuser5678: I think that you'd have to track the things you want git to version control.
18:07 dreiss joined #git
18:08 stoned Ijust use git on the command line.
18:08 ircuser5678 And this system is much more flexible (for me) as well because all newly created files (that are not excluded by default) are recognized. I don't need to add them manually
18:08 stoned That's interesting.
18:08 stoned I'll look into this gitkraken thing
18:10 stoned ircuser5678: what about python with inotify bindinds and generate a .gitginore(update as needed) sa changes are made to the file system?
18:11 ircuser5678 Windows...
18:11 stoned Oh.
18:13 User458764 joined #git
18:14 SwiftMatt joined #git
18:14 EricPoe joined #git
18:14 stoned https://github.com/gorakhargosh/watchdog/
18:15 stoned Windows (ReadDirectoryChangesW with I/O completion ports; ReadDirectoryChangesW worker threads)
18:15 stoned If one were inclined, one could hack together something do create/update a gitignore file as changes happen within a monitored directory
18:15 ircuser5678 I don't need a file / folder event watcher. I just need a correct include / exclude pattern
18:16 stoned Perhaps I have misunderstood your query, I apologize.
18:16 manuel joined #git
18:17 stoned You want to ignore /* everything, and then you want to allow /scripts (only files) but not subdirectories within /scripts ?
18:17 ircuser5678 Again, I'm excluding everything in my project folder. And then include specific files & folders afterwards. But for a few specific folders I want the files in it to be included (again) but not their subfolders (even newly created ones)
18:17 stoned I'm misunderstanding something in te "even newly created ones"
18:17 ircuser5678 look
18:18 ircuser5678 !/files/*
18:18 overlord_tm joined #git
18:18 mrpackethead joined #git
18:18 ircuser5678 this includes all files (and unfortunately all folders) in /files
18:18 manuel joined #git
18:18 mehola joined #git
18:18 stoned What's the pattern previous to the negated one?
18:18 stoned It is what is included
18:19 ircuser5678 but I don't want it to include subfolders in /files. But not by specifing them one by one (a handful exists) but with a pattern that disregards just all of them
18:19 ircuser5678 _/* is the first line. remove the _
18:20 ircuser5678 and everything else get's included with a negating pattern like !/files/*, !/examples/* so I get all files in them
18:20 ircuser5678 but I don't want subfolders from e.g. /files/... or /examples/...
18:20 stoned Ignore everything. Negate /files/*. Now you want only files to be tracked, but not subdirectories
18:22 stoned Try **
18:22 stoned !/files/**
18:22 stoned That would allow files only, if I am thinking rightly
18:22 stoned And would still ignore /* which would include subdirectories
18:22 stoned (I think(
18:22 littlepython joined #git
18:23 littlepython guys how can i move a free git repo in github to my repo i created
18:23 ircuser5678 Doesn't work...
18:24 tobiasvl littlepython: what do you mean exactly? do you want to clone it?
18:24 littlepython i cloned it to my local repo in my system.how can i now put it in github
18:24 littlepython i hav created a repo in github
18:24 littlepython do i have to use git push?
18:25 stoned littlepython: you can just clone it and you'll have the repo locally. Then you can completely delete the .git/ directory and again git init, and add the local master repository. Or add a remote origin again, whatever
18:25 stoned Oh.
18:26 stoned I think just remove the origin and add a new one?
18:26 littlepython and where do we specify the git account.. in git config?
18:26 SteffanW joined #git
18:27 stoned littlepython: are you trying to fork another project fo contributions?
18:27 littlepython i have user.email=something@something.com
18:28 littlepython so if i do a git push origin master.does it mean that i should have created a github account with something@something.com mail?
18:29 stoned https://help.github.com/articles/set-up-git/
18:29 stoned Tell Git the email address that will be associated with your Git commits. The email you specify should be the same one found in your email settings.
18:30 stoned A real email is expected. A fabricted one might cause issues?
18:30 thiago joined #git
18:32 nettoweb joined #git
18:32 stoned The /* rule will only ignore items in the root of the repo’s directory structure, so as soon as you whitelist a directory, all of the directory’s contents will be allowed as well, even without using the * or ** wildcards.
18:33 stoned https://jasonstitt.com/giti​gnore-whitelisting-patterns something I found here ircuser5678
18:34 GavinMagnus left #git
18:35 littlepython stoned: i created a repo in github.how can i push the contents of the current local repo to the specified repo folder in git hub
18:35 littlepython i hav did git add . and git commit -am
18:35 littlepython hw can i use git push now
18:36 stoned littlepython: I'm not sure, I don't really use github at all. https://help.github.com/articles/adding-a-remote/
18:36 AfroThundr joined #git
18:36 stoned I imagine you'd add your repo as a remote to the local one, and then push to your remote, instead of origin.
18:37 stoned If you want to change the origin to your remote, I'm not sure how using git, but I just delete the .git/ diectory/files and then git init. and then add my remote.
18:37 stoned I maybe profoundly wrong in my method.
18:37 tobiasvl yeah that's how it works
18:37 tobiasvl but
18:37 tobiasvl deleting .git ??
18:37 stoned See
18:37 tobiasvl that will lose all history
18:37 stoned I didn't know that.
18:37 tobiasvl please don't do that littlepython
18:37 grawity that's where the history is...
18:37 stoned I'm noob. but I learn fast.
18:38 stoned Sorry!
18:38 grawity I mean, sure, since Git is a DVCS, *every clone* of that repo has a full copy of the history
18:38 yohnnyjoe joined #git
18:38 grawity but that still means you'll need, at minimum, to get it again from another clone or something
18:38 littlepython oh
18:38 stoned That's what I figured. What could I lose? The repository is already elsewhere.
18:38 grawity and if this was the *only* clone... well, it's gone
18:38 stoned As soon as I clone it, I'm good to go.
18:38 stoned I think.
18:39 stoned But I didn't know that. I admit, I use git.
18:39 stoned Like an imbecile.
18:39 tobiasvl littlepython: the rest of what stoned said is correct – just add the new github repo as a remote and push to it. (or change the existing remote URL, which can be done in .git/config)
18:39 grawity (for the purpose of above explanation, a Github repo is equivalent to a clone)
18:39 tobiasvl still, the local repo could have staged changes, stashes, etc
18:40 stoned I n eed to learn more git.
18:40 tobiasvl so please don't delete (or advise people to delete) .git
18:40 stoned I shall be sure to avoid that advice as if it were the plague.
18:40 littlepython tobiasvl: $ cat config [core]         repositoryformatversion = 0         filemode = false         bare = false         logallrefupdates = true         symlinks = false         ignorecase = true
18:40 rom1504 .git is sacred
18:41 littlepython how to add github repo as remote
18:41 stoned Ty for the correction!
18:41 tobiasvl littlepython: man git remote
18:41 gitinfo littlepython: the git-remote manpage is available at http://jk.gs/git-remote.html
18:41 grawity littlepython: git remote add <name> <url>
18:41 nicoulaj joined #git
18:42 resurtm2 joined #git
18:42 littlepython huh feels difficult
18:42 littlepython thinkking of giving up
18:42 grawity ikr
18:42 grawity who would have thought that the command for adding stuff is 'add'
18:42 grawity not intuitive at all
18:42 rkazak joined #git
18:43 Atrumx joined #git
18:48 _cyril_ joined #git
18:50 cdown joined #git
18:51 AfroThundr joined #git
18:52 fission6 joined #git
18:53 jaguarmagenta joined #git
18:55 fahadash joined #git
18:55 cdg joined #git
18:57 akurniawan joined #git
18:57 _cyril_ joined #git
18:58 red82 joined #git
18:59 kruncher_ joined #git
19:04 thiago joined #git
19:04 f4 joined #git
19:06 afuentes joined #git
19:06 misterpink joined #git
19:07 netj joined #git
19:08 stevenspasbo joined #git
19:10 red82 joined #git
19:10 barteks2x joined #git
19:18 rahtgaz joined #git
19:19 Rickmasta Hey guys
19:19 Rickmasta so I did git reset xxxxx --hard
19:19 Rickmasta to go back to a commit where I'd like to restart from there
19:19 Rickmasta how do I now make this the master?
19:20 Rickmasta and basically delete/forget everything I've done since this commit?
19:20 Random832 Rickmasta: the reset should have done it if you were on the master branch, unless you mean changing it in a remote repository too or something
19:20 preaction if you did git reset, you've already done that to the local master
19:20 Rickmasta I did it on the the remote server
19:21 Rickmasta should I have done int lcoally?
19:21 Random832 just do it again locally
19:21 Rickmasta because even though I did it on the remote server, the files have changed locally
19:21 Random832 and fetch
19:22 nettoweb joined #git
19:23 Rickmasta I'm doing something wrong because everytime I do git checkout -f master
19:23 Rickmasta it reverts back to the latest commit, that I don't want
19:24 grawity your master is not the same as the origin repo's master
19:24 LucaTM joined #git
19:24 grawity to get new commits, you have to merge them
19:24 grawity which is e.g. what `git pull` does
19:24 tristanp joined #git
19:25 e that's a bit of an extreme simplification
19:26 dreiss joined #git
19:27 glebm joined #git
19:28 robotroll joined #git
19:28 jstimm joined #git
19:29 kruncher_ joined #git
19:30 tristanp joined #git
19:36 inflames joined #git
19:36 ayjay_t joined #git
19:37 hashpuppy joined #git
19:38 ayjay_t i've got libcurl, i've got expat, i can't clone http cause of remote helper
19:38 ayjay_t i tried this: http://blog.acidpop.kr/228 but it was in korean :-/
19:38 cagedwisdom joined #git
19:39 nidr0x joined #git
19:40 tristanp joined #git
19:41 davimore joined #git
19:43 svm_invictvs joined #git
19:45 dviola joined #git
19:47 Achylles joined #git
19:51 _cyril_ joined #git
19:52 paul424 joined #git
19:52 ArchNoob joined #git
19:53 Siegfried joined #git
19:54 malber_ joined #git
19:55 red82 joined #git
19:56 Darren_ joined #git
19:58 dan2k3k4 joined #git
20:00 malber joined #git
20:02 barteks2x joined #git
20:03 cust_ joined #git
20:06 mrpackethead joined #git
20:06 f4_ joined #git
20:07 BlackMaria joined #git
20:11 Rickmasta joined #git
20:13 Seveas ayjay_t: twelve steps back please. What are you trying to do?
20:13 Rickmast_ joined #git
20:15 kenden joined #git
20:16 LeBlaaanc joined #git
20:17 LeBlaaanc if i want to "revert" a merge type commit and -m 1 ends up merge conflicting what should I do?
20:17 GenZai joined #git
20:17 nilg joined #git
20:17 ayjay_t Seveas: git clone http://www.github.com/ntfreak/openocd
20:18 ayjay_t "not remote helper for http"
20:18 ayjay_t /not/no
20:18 hanthings joined #git
20:18 Seveas ayjay_t: how did you install git?
20:19 ayjay_t ./configure && make && sudo make install
20:19 ayjay_t actually, theres a make configure first
20:19 Seveas any particular reason to build from source?
20:20 ayjay_t yeah thinking about experimenting with it later
20:20 Seveas which os are you on?
20:20 resurtm2 joined #git
20:20 ayjay_t debian
20:21 Seveas sudo apt-get build-dep git
20:21 Seveas that'll get you all build dependencies
20:21 morenoh149 joined #git
20:21 Seveas and you may also want to apt-get source git and look at debian/rules to see how git is built for the debian package
20:21 Seveas you'll need to rebuild and reinstall git after installing the build dependencies
20:23 ayjay_t hmm ill try it but i checked the ./configure log and it looks pretty good to me
20:23 ayjay_t i guess thats a apt-get command i can use in the future for any package i wanna build from source
20:23 ayjay_t good to know, thanks seveas
20:25 Seveas ayjay_t: another thing to note is that './configure' is optional in git
20:25 Seveas just 'make' should work just fine, if all build dependencies are installed
20:27 ayjay_t didddn't work
20:28 tribly joined #git
20:29 Seveas because not all build dependencies were installed :)
20:30 ayjay_t hha even with build-dep?
20:30 Seveas hmm, after that it should work. could you try in a clean clone of git.git and pastebin the output?
20:31 Seveas I always just build with 'make', but I may of course have extra packages installed.
20:31 ayjay_t no curl_ssl_make
20:31 Seveas ?
20:32 ayjay_t sorry, from the config output, theres a Curl_ssl_init in -lcurl ... no
20:32 Siegfried joined #git
20:32 ayjay_t since so many people cite curl as the issue i figure that might have something to do with it
20:32 Seveas that's configure, not make. Try a fresh clone and just running make
20:32 ayjay_t okay
20:32 Seveas so, not 'make configure', just 'make' with no arguments
20:33 clemf joined #git
20:34 mt joined #git
20:36 xlegoman joined #git
20:37 led_belly joined #git
20:40 ayjay_t lol nope, sorry seveas
20:40 ayjay_t wait!
20:40 led_belly joined #git
20:41 ayjay_t nope.
20:42 mt joined #git
20:43 justan0theruser joined #git
20:44 akurniawan joined #git
20:45 Darren_ joined #git
20:45 clemf joined #git
20:46 GavinMagnus joined #git
20:53 cyphase joined #git
20:53 tvw joined #git
20:57 phil22 joined #git
20:58 stevenspasbo joined #git
21:01 f4__ joined #git
21:05 mehola joined #git
21:06 cdown joined #git
21:07 tvw joined #git
21:07 glebm joined #git
21:07 rahtgaz joined #git
21:08 ExeciN joined #git
21:11 [cust] joined #git
21:12 f4__ joined #git
21:18 jorg[m] joined #git
21:28 boombatower joined #git
21:30 tristanp joined #git
21:30 f4__ joined #git
21:32 aidalgol joined #git
21:33 cydrobolt joined #git
21:33 cydrobolt joined #git
21:33 tristanp joined #git
21:33 justanotheruser joined #git
21:34 f4_ joined #git
21:42 zarel joined #git
21:42 WaReZ joined #git
21:45 zumba_ad_ joined #git
21:46 sweatsuit joined #git
21:47 jorg[m] left #git
21:50 clemf joined #git
21:50 zumba_ad_ joined #git
21:52 f4_ joined #git
21:52 LeBlaaanc joined #git
21:54 mrpackethead joined #git
21:55 ShekharReddy joined #git
21:55 brk_ joined #git
21:57 Siegfried joined #git
22:01 cdg joined #git
22:03 cdg_ joined #git
22:04 JamesBaxter joined #git
22:06 cdg__ joined #git
22:07 cdg joined #git
22:11 stemid joined #git
22:12 stemid if I accidentally committed large files into a repo where they didn't belong, will git reset HEAD~ delete the space those large files would have used in my .git objects? I did not push yet.
22:13 Pent left #git
22:13 _ikke_ stemid: not immediately, but eventually
22:14 stemid oic, then that's fine with me. thanks
22:14 stemid I was just worrying about this story that large files will slow it down.
22:14 stemid I don't actually know how that works
22:15 Vinnie_win_w joined #git
22:15 _vy_ joined #git
22:16 _ikke_ depends on how many and how large
22:17 grumble joined #git
22:19 xameada_ joined #git
22:22 jast joined #git
22:23 resurtm2 joined #git
22:23 matumbo joined #git
22:26 Hello71 joined #git
22:30 ruliwg joined #git
22:30 prying joined #git
22:33 akurniawan joined #git
22:33 manuel joined #git
22:33 snthsnth joined #git
22:34 ruliwg left #git
22:34 spacenomad joined #git
22:38 cdg_ joined #git
22:39 cdg_ joined #git
22:41 spacenomad dunno if there's a better channel for this question, but anyone here have an opinion on Unfuddle as a proj mgmt tool? Or is there a point to even using it as GitHub offers its own proj mgmt features now?
22:43 stemid github offers a kanban board basically. if you want a scrum tool I can recommend Taiga. never used unfuddle myself though.
22:44 theskillwithin joined #git
22:45 zulutango joined #git
22:46 sangy joined #git
22:48 Limes joined #git
22:53 snowkidind joined #git
22:58 Rickmasta joined #git
22:59 cagedwisdom joined #git
23:03 satifant joined #git
23:05 glebm joined #git
23:09 Endarked joined #git
23:10 svm_invictvs joined #git
23:11 f3r70rr35f joined #git
23:11 ThunderChicken joined #git
23:11 ThunderChicken joined #git
23:13 Fissure joined #git
23:16 morenoh149 joined #git
23:17 PaulCapestany joined #git
23:24 tristanp joined #git
23:25 PaulCapestany joined #git
23:29 sea-gull joined #git
23:31 Jellyg00se joined #git
23:31 tristanp joined #git
23:33 glebm joined #git
23:33 JamesBaxter joined #git
23:36 nettoweb joined #git
23:37 codebam I have a folder in my gitignore but files inside there are still being staged when I "git add ."?
23:37 hariel joined #git
23:37 codebam files which are too large to upload
23:37 codebam so intentionally ignored
23:37 codebam but they're being staged and commit for some reason
23:38 Endarked joined #git
23:40 hariel joined #git
23:42 mrpackethead joined #git
23:46 systemovich joined #git
23:47 meauses joined #git
23:49 tristanp joined #git
23:49 Emperor_Earth joined #git
23:50 xall_ joined #git
23:59 akurniawan joined #git

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