Re: [git-users] How to change default git commit message

2016-01-19 Thread Adrian Banasiak
Thanks it works but I would now is there any chance to edit this default commit message? # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit. # Explicit paths specified without -i nor -o; assuming --only paths..

[git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Berin Loritsch
We're a C# development shop, and I've gone through the trouble of making a script that will safely migrate stand-alone SVN projects into a Git repository without problems. There's a lot of support for Git to promote subdirectories up the directory structure, but not much support to push them d

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Konstantin Khomoutov
On Tue, 19 Jan 2016 05:41:57 -0800 (PST) Berin Loritsch wrote: > We're a C# development shop, and I've gone through the trouble of > making a script that will safely migrate stand-alone SVN projects > into a Git repository without problems. [...] > Let's say we have the following SVN structure: >

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Alexandru Pătrănescu
Hi Berin, If you manged to convert individual svn repositories to git, each with corresponding directories inside, than it's a piece of cake to finish it. A git repository can have multiple trees in it. Just push all repositories into one but on different branch naming and then merge those branch

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Berin Loritsch
I did initially attempt to create a Linux VM, but all the Linnux installers these days assume you have a live connection to the internet. Gone are the good old days where you could actually have a complete offline install experience. My source code is on an isolated network and the pain of se

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Berin Loritsch
If I do this, will I lose all the branches from the remotes? The intent here is to have a fully implemented repository with all the history from the different projects in one repo. If that makes sense. My script for converting a single project goes through and converts all remote branches to

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Berin Loritsch
The StackOverflow question/answer you pointed to me doesn't work on Windows. It complains about the index.new file not being found. On Tuesday, January 19, 2016 at 11:12:21 AM UTC-5, Konstantin Khomoutov wrote: > > On Tue, 19 Jan 2016 05:41:57 -0800 (PST) > Berin Loritsch > wrote: > > > We're

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Alexandru Pătrănescu
But you can push all the branches to the main repository; it works fine. Renaming the branch with a prefix (while moving) I think it's not a bad idea. It might help to identify it faster. And eventually you will need to merge the common master into each of the branches, for them to contain the oth

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Konstantin Khomoutov
On Tue, 19 Jan 2016 08:54:26 -0800 (PST) Berin Loritsch wrote: > I did initially attempt to create a Linux VM, but all the Linnux > installers these days assume you have a live connection to the > internet. Gone are the good old days where you could actually have a > complete offline install exp

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Konstantin Khomoutov
On Tue, 19 Jan 2016 08:59:03 -0800 (PST) Berin Loritsch wrote: > The StackOverflow question/answer you pointed to me doesn't work on > Windows. It complains about the index.new file not being found. I have no idea. If I were you, I'd google for git+filter+branch+move+under+directory myself, r

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Berin Loritsch
It sounds like the subtree route might be the one I need to try. I've tried every combo of words I could think of with googling to come up with a solution to my problem, and came up empty. Which is why I'm here. The main problem with the index filtering approach is that I don't understand what

[git-users] Recovering a corrupted repo (missing blobs)

2016-01-19 Thread Olivier Mengué
Hi, My hard disk is starting to show its old age. On my Ubuntu system I occasionally get in a state where the root filesystem is switched to read only mode. Today this happened during a "git fetch" (or maybe a "git rebase") that triggered a "git gc". After reboot+fsck, my git repo is corrupted

Re: [git-users] Help with Migrating Git to SVN--merging projects

2016-01-19 Thread Konstantin Khomoutov
On Tue, 19 Jan 2016 10:03:59 -0800 (PST) Berin Loritsch wrote: [...] > The main problem with the index filtering approach is that I don't > understand what the script is doing completely. I've broken it apart > and run specific parts alone, but the whole file rename/index > updating seems to be