[git-users] sub-tree merge and submodules

2013-03-12 Thread Scott Haynes
I'm currently working on a git project( vwf - virtualworldframework ), and we need to get a couple of files from another repository( threes ). We've forked threejs into our repository, but I need to be able to grab only those few files that I need. I thought I wanted to do a sub-tree merge,

Re: [git-users] HELP! "stash pop" is failing and I can't get my work out

2013-03-12 Thread Konstantin Khomoutov
On Sat, 9 Mar 2013 09:44:34 -0800 Piers Haken wrote: > >> i must be missing something, but i just don't see it. what is that > >> SVN is doing wrong by making this so simple? > > > > Let's cite the `git merge` manual: > > > > Warning: Running git merge with uncommitted changes is discouraged:

[git-users] untracked content, submodules, and other things

2013-03-12 Thread FlashBurn
I'm using git to manage my vim plugins. I did read a git book, http://git-scm.com/book, but I'm having trouble understanding some of the concepts. Right now I'm facing a problem with git submodules. Currently when I run git status it shows that all of my submodules are untracked. Here is part o

Re: [git-users] not clear about submodules

2013-03-12 Thread FlashBurn
On Monday, March 4, 2013 4:57:56 PM UTC-5, Gergely Polonkai wrote: > > I'm not tottally sure about it, but AFAIK > > git submodule update > > fetches the latest commit of the "master" branch, and then checks it out, > leaving the submodule directory in a detached state. You can, however, > chec

Re: [git-users] Empty directories with submodules

2013-03-12 Thread FlashBurn
On Monday, March 4, 2013 6:27:23 PM UTC-5, Rahmat Budiharso wrote: > > Have you try do a 'git submodule update --init' ? > On Mar 5, 2013 12:48 AM, "FlashBurn" > > wrote: > >> I added a few submodules to my project (I already had some and needed a >> few others) at home and then I tried ran a p