git

What's the most straightforward way to clone an empty, *bare* git repository?

I've just finished cruising the Google search results that contain all the email rants about how stupid it is that git can't clone an empty repository. Some kind soul even submitted a patch. Until git is upgraded, what is the simplest, most straightforward method to clone an empty, bare git repository? The ideal solution will support ...

How do I publish to <me>.github.com?

I've read the guide, which tells you to do the following: create a .github.com repository check it out to path/to/repo cd /path/to/repo git symbolic-ref HEAD refs/heads/gh-pages rm .git/index git clean -fdx echo "My GitHub Page" > index.html git add . git commit -a -m "First pages commit" git push origin gh-pages I've done that. And ...

How can I use Git locally in an SVN+Visual Studio environment

I've been playing around with git at home and I really like the idea of local commits. Being able to commit smaller changes without spreading my potentially broken code to everyone is nice, as well as being able to revert smaller changes because of the more frequent commits. I've been reading about the git-svn command, but I'm not sure ...

In gitk, why is my yellow button above master?

I couldn't find any documentation on gitk about what the colors mean, but the problem here I think is that my yellow button has passed my master. Now when I try to do: git push origin master It doesn't work. How did my yellow button get over master and how do I get them back together so I can do push origin master? This is what it loo...

How to control access permission with git.

I'm using the rental server which hostingrails.com , I operate Rails in FastCGI here, by the relations that SuExec used, the which was than 755 seems not to have been able to set permission and considerably fitted in. (For example, I can't use with 775) I used git for development. I set to 775 and cannot use the thing which I checked out...

Installing Git on OS X

I am trying to install Git on Mac OS X Leopard. I'm trying to avoid the MacPorts/Fink route. I'm also trying to avoid the installer on Google because I've gotten very far on my own, but if I have to I'll go ahead and download the installer. Anyway, I have Git installed. /usr/local/bin/git. The problem is that none of the documentation i...

Does Git publicly expose my e-mail address?

The guides I've read so far on Git say that I should go into the config and specify my name and my e-mail address. They don't elaborate; they just say to do it. Why does Git need my e-mail address? And, more importantly, if I make my repo publicly available, via GitHub for example, will my e-mail address be visible to everyone (includin...

How to "split" files with git

If I had to following file on my development branch: # file.rb class Code def methodA 'aA1' end def methodB 'bB2' end end but on my master branch I wanted to separate the methods into different files: # in file.rb class Code def methodA 'aA1' end end # in extra.rb class Code def methodB 'bB2' end end I cou...

Transferring legacy code base from cvs to distributed repository (e.g. git or mercurial). Suggestions needed for initial repository design.

Introduction and Background We are in the process of changing source control system and we are currently evaluating git and mercurial. The total code base is around 6 million lines of code, so not massive and not really small either. Let me first start off with a very brief introduction to how the current repository design looks. Pictu...

Git: checking out a file from a previous commit and amending it to HEAD

I recently committed a file to the HEAD of my branch which has errors in it. I need to do the following things: Get that file from one commit previous to HEAD Commit that file back into HEAD What's the best way of going about that? ...

Why doesn't git know I merged? Is there a way to tell it?

I'm using git-svn; I typically create a topic branch, make commits to it, then checkout master, git svn rebase, git merge --squash topic_branch, git commit -m "summary comment", then git svn dcommit. That works fine, but git doesn't seem to know I merged the branch changes into master. I tried this without svn involved: # Make a reposi...

Does GIT accelerate operations when there's latency between the main repository and some of the developers machines?

Our shop is geographically distributed, and our current source control is centralized, slowing the source control operations (check-in/check-out) for developers far from it. If we migrate to GIT, would it make any of these operations faster? ...

Can I use a GIT repository with SVN clients?

Currently I'm using the following SVN clients: TortoiseSVN for Windows and AnkhSVN for Visual Studio 2005+. I heard that GIT has a great level of interoperability with SVN. Would my tools work with a GIT repository? ...

Why 'git-merge-file current base other' make an empty 'current' file if current = base = other ?

Well, imagine current.txt file : asdf base.txt file : asdf other.txt file : asdf when I do a three-way merge with git merge-file current.txt base.txt other.txt current.txt file become empty, why ? In other case current.txt file become a merge of the 3 files ...

Unable to update my Local Git repo based on SVN

I know the thread which command updates files for me at my current version number, not the newest files. I run unsuccessfully at a Google-code project's trunk git svn update and I get fatal: Not a git repository (or any of the parent directories): .git Already at toplevel, but .git not found at /opt/local/libexec/git-core/git-svn l...

Unable to understand Git branch, merge and rebase

I know the thread which says that rebase is for small changes of teamMates, while merge for large changes. I keep three Gits of three teamMates in the following directory structure where we all have the same initial code: project | - I | - myTeamMate1 | - myTeamMate2 The branches are not in the same Git. This means...

gitosis configure problem

Hi, all I'm confronted with some problems when trying to configure gitosis on my Archlinux http://wiki.archlinux.org/index.php/Setting_Up_Git_ACL_Using_gitosis I referrer to this wiki article and successfully installed gitosis $ sudo pacman -U gitosis-git-20090525-1-i686.pkg.tar.gz $ sudo -H -u gitosis gitosis-init < /tmp/id_rsa...

There is any way to synchronize GIT and Subversion repositories?

I want to access a repository using both GIT and SVN clients. A way I imagined to do that is through automatic two-way migration: when a user PUSHes into the GIT repository, it is also COMMITed in the SVN repository and vice-versa. There is any tool that would help me to do that? ...

How to version project schedules, to-dos, wikis etc. in Git?

In almost all of my projects I have few files that are "project wide" in the sense that their contents should be shared across all branches. These files usually include project schedules, to-do lists, wikis, and the like. Currently I have them included .gitignore so that they are not versioned but remain the same no matter what branch I ...

How do I create a new git branch from the changes I have in the working tree?

I have edits to my working tree which I would like to continue working on in a branch. Will git checkout -b new_branch wipe out my current changes to the working tree? If so, how do I create a new branch and switch to it without reverting my working tree? ...