Re: [git-users] Using git for multiple projects

2014-04-08 Thread Maurizio Vitale
I've never used multiple git repositories in large scale multi-committer projects (the closest is a new language frontend for llvm that uses submodules for beinging in clang and llvm, but I'm the only committer). I see people advocating splitting large code bases into multiple git repository and t

Re: [git-users] bad repo

2014-04-08 Thread Dale R. Worley
One thing you can do is run "git fsck" on the repo. It will check whether it thinks the repository is properly structured. > From: Konstantin Khomoutov > 1) Copy (literally) the whole project directory onto a >filesystem/storage which is in the known good state. > 2) Copy it again somewhere

Re: [git-users] What does "ai/topic_in_next" mean?

2014-04-08 Thread Chuck Irvine
Thanks, Phillip. I never would have guessed that! Makes sense now. On Tuesday, April 8, 2014 1:36:42 PM UTC-5, Philip Oakley wrote: > >  > That describes the way that Junio, the maintainer, keeps track of all the > different contributors. > > In this case "ai" is someone with the initials A I

Re: [git-users] What does "ai/topic_in_next" mean?

2014-04-08 Thread Philip Oakley
That describes the way that Junio, the maintainer, keeps track of all the different contributors. In this case "ai" is someone with the initials A I, and her/his contribution is held in that part of the refs directory. Thus if I make a contribution it appears under "po/my_topic". http://git-bl

[git-users] What does "ai/topic_in_next" mean?

2014-04-08 Thread Chuck Irvine
In https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.htmlappears the snippet below. Sorry, I can’t figure out what “ai/topic_in_next*” means, especially the “ai/” part. A little help please…..? Branch management for next and pu after a feature release After a feature release, th

Re: [git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Alex Rodrigues
> > for "*git rebase temp-branch*", did you actually mean "#Reapply your > commits *from* your temp branch"? > > Someone in my org just suggested the same kind of solution, so am > definitely going to explore that option. But as you rightly mentioned, a > rebase can be dangerous and might be so

Re: [git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Nelson Efrain A. Cruz
Hi, you can create a new branch starting on "masterF", then you can rebase it: git checkout topic #you must be in your topic branch git branch temp-branch masterF #create a branch starting in your F commit git rebase temp-branch #Reaply your commits over your temp branch git branch -d temp-branch

[git-users] Looking for suggestions on git workflows

2014-04-08 Thread Alex Rodrigues
Like some other folks here, I am relatively new to git and am trying to figure out a good workflow for our development team, and appreciate any thoughts & suggestions. We have several project teams that require to work in isolation on their respective branches. (a project here consists of a set

[git-users] Change branch creation point of a topic branch after it has been created?

2014-04-08 Thread Alex Rodrigues
I have a git repository with a master branch and a topic branch (created at master'B) and the topic branch has received some merges from master. A - B - D - F - H<- "master" branch \ \ C - E - G <- "topic" branch Is it possible to changed the point on ma

Re: [git-users] bad repo

2014-04-08 Thread Konstantin Khomoutov
On Mon, 7 Apr 2014 19:41:27 -0700 (PDT) fpefpe wrote: > One of my GIT repo got corrupted -- are there any tools to figure out > what when wrong? In addition to what John asked -- what do you mean by "corrupted"? The problem is that this word mean different things to different people. If you mea

Re: [git-users] bad repo

2014-04-08 Thread John McKown
You might want to post which OS - Linux, Mac, or Windows. Which version of git. And any error messages you have gotten. BTW - I have _no_ idea myself on how to diagnose this sort of thing. But I know that the "old, wise ones" will want the information. On Mon, Apr 7, 2014 at 9:41 PM, fpefpe wr

Re: [git-users] advice for migration

2014-04-08 Thread Magnus Therning
On Tue, Apr 8, 2014 at 1:16 AM, Phil Cruz wrote: > On Thursday, April 3, 2014 12:46:41 PM UTC-7, Magnus Therning wrote: >> On Thu, Apr 03, 2014 at 10:28:12AM -0700, Phil Cruz wrote: >> > I need some guidance on how to import our existing SVN repo to Git. The >> > structure of the repo is not exact