[git-users] two different submodules in the same directory

2012-10-09 Thread Herbert Maschke
Hi everyone, in my project i have two different git submodules that needs to be appended into the same directory. one project contains of different subdirectories: user/ profile/ role/ while the other project only has a cms/ folder. I need both repositories appended into a modules/ folder

[git-users] Re: [Short edition] Importing Subversion vendor-branches to Git

2012-10-09 Thread Thomas Ferris Nicolaisen
So, if you want to make an upgrade of for example lua, you first download and unzip it into /vendor/ExtLibs/lua/, make some adaptions, and then merge it into trunk and any other branch where you want to perform the upgrade. Is this correct? As a thought-experiment: Set aside the git-svn

[git-users] Re: [Short edition] Importing Subversion vendor-branches to Git

2012-10-09 Thread Carsten Fuchs
Hi Thomas, Am 09.10.2012 09:35, schrieb Thomas Ferris Nicolaisen: So, if you want to make an upgrade of for example lua, you first download and unzip it into /vendor/ExtLibs/lua/, make some adaptions, and then merge it into trunk and any other branch where you want to perform the upgrade.

[git-users] Re: [Short edition] Importing Subversion vendor-branches to Git

2012-10-09 Thread Thomas Ferris Nicolaisen
On Tuesday, October 9, 2012 11:14:48 AM UTC+2, Carsten wrote: Hi Thomas, Am 09.10.2012 09:35, schrieb Thomas Ferris Nicolaisen: So, if you want to make an upgrade of for example lua, you first download and unzip it into /vendor/ExtLibs/lua/, make some adaptions, and then merge it

[git-users] Re: git mentor needed

2012-10-09 Thread Thom Parkin
So it knows that are different yet it says they are identical (instead of 1 commit behind) in the SmartGit branch switcher. That's screwed up! Perhaps your trouble is in the SmartGit branch switcher. It sounds like git has captured your history correctly. The CLI has never failed me. I don't

Re: [git-users] git clone algorithm

2012-10-09 Thread Konstantin Khomoutov
On Tue, 9 Oct 2012 09:35:03 -0700 (PDT) Cristea Bogdan crist...@gmail.com wrote: I am wondering what algorithm is used by git clone command ? When cloning from remote repositories, if there is a link failure and the same command is issued again, the process should be smart enough to figure

Re: [git-users] git clone algorithm

2012-10-09 Thread Bogdan Cristea
On Tuesday 09 October 2012 21:10:00 Konstantin Khomoutov wrote: On Tue, 9 Oct 2012 09:35:03 -0700 (PDT) Cristea Bogdan crist...@gmail.com wrote: I am wondering what algorithm is used by git clone command ? When cloning from remote repositories, if there is a link failure and the same

[git-users] Re: [Short edition] Importing Subversion vendor-branches to Git

2012-10-09 Thread Carsten Fuchs
Hi Thomas, Am 2012-10-09 12:35, schrieb Thomas Ferris Nicolaisen: A branch in Git is uusally a branch of *what is the main contents of the repository*, not some arbitrary content. As I said above, submodules were invented for this purpose, to avoid filling up your own repositories with

[git-users] Re: [Short edition] Importing Subversion vendor-branches to Git

2012-10-09 Thread Damien Robert
Carsten Fuchs wrote in message : and transform them into having the structure you want. See the man page for filter-branch, there's an example for /To move the whole tree into a subdirectory/. Ahh!! Thank you very much! That was the crucial step that I was missing before! Hi