git

Where am I? * (no branch)

I've been getting familiar with creating, merging and deleting branches. I like to know where I am so I don't commit work into the wrong branch. I use git branch -a to see which branches I have. I think the asterix * shows which branch I'm currently on. What does it mean when I get: * (no branch) master origin/HEAD Because when I ...

git submodule, ignoring the wrong directory

I am new to git but have spent a good deal of time reading through documentation and gotchas on git submodules before trying them. I am having a problem that I feel -- probably naively -- is a bug in git: I have a project, in that root directory I have a plugins folder, which has a submodule called myplugin. I added it with git subm...

Git + Capistrano = Automatic Release Notes Generator ?

We use git (github) and capistrano (like 99% of the Rails shops out there) to deploy our app to production. What I'd like to do is, after every cap * deploy generate a text file containing all the git commit comments since the last deploy. I can then take that list of commit comments, clean it up, and put it somewhere for consumption. ...

What is the difference between git commit and git push?

In a Git tutorial I'm going through, git commit is used to store the changes you've made. What is git push used for then? Thanks for reading! ...

Can you set up Git source code control with a ring-topology?

I was wondering if anyone has ever set up a Git source control system with a ring topology (http://en.wikipedia.org/wiki/Ring_topology). I think this should work, but I was wondering if anyone has verified it. Say I have a small company with 4 remote developers: Alex, Bob, Carrie, and Dan Assume that each member of the team has a Git r...

How do I add the go language to gitg's list of viewable sources?

Hoping a 'git' guru will help out here. I am just beginning to "git" for the first time and have (among other things :-) ) git and gitg installed from Ubuntu 10.4 / AMD64 distribution (ie. maybe not 'latest' version but not ancient). I am trying to look at the go code I've committed via gitg and in the "tree tab" it says: Cannot dis...

How to make changes that only i can see?

For example Id like to modify the login page, so it auto-logs me. I want those changes to ONLY work on my development station and dont be visible in push. if I make it on a branch than i would have to somehow un-merge that change before every push. is that supported by git? ...

Using GitNub with Git

I'm trying to use GitNub, a graphical GUI for Git, and for some reason upon installing the software running the command 'nub' in the terminal doesn't seem to launch anything for me. I am running Mac OS X version 10.6.3 Gitnub version 0.9.1 I have copied the GitNub.app to my applications folder and created a new folder under /usr/local...

How to load / open / suck an repository from GitHub into GitX?

I downloaded Git and GitX for mac and installed it. Now, just for fun, I want to know how I could obtain an repository from GitHub like http://github.com/zoul/Finch.git ?? For me all this Git stuff looks like I have a client and connect to a server in order to get some data from some repository. Like FTP, well not really. But similar. ...

Convert SVN Subdirectory to Git

I would like to ditch SVN for Git. My current SVN repository setup has projects under trunk (/trunk/projecta, /trunk/projectb, etc. with tags and branches at /tags/projecta-1.0, etc.). I would like to create distinct Git repos for each of these projects by pulling them out of SVN using git-svn. I've successfully pulled the entire SVN re...

I accidentally created a git local branch called --track, how can I delete it?

I mistyped a git command which resulted in the creation of a local branch called, '--track'. I've tried the following: git branch -m --track delme (this renames the current branch to delme, not the branch called --track) git checkout --track > fatal: --track needs a branch name git branch -d --track (does nothing, reports nothing) g...

Copying Android source code directory from one computer to an other one

I have downloaded the Android source code on my computer using the repo sync command. Since I have no experience with git and repo , I would like to know if it is possible to copy the mydroid directory (which contains Android source code) to an other computer by just burning it on a DVD and then processing the build without problems. Th...

Mirror a git repository by pulling?

I am wondering if there is an easy way, ie like a simple cron job, to regularly pull from a remote git repository to a local read only mirror for backup purposes? Ideally it would pull all branches and tags, but the master/trunk/head would be sufficient. I just need a way to make sure that if the master git server dies, we have a backu...

svn (with git frontend) branch merging with different directory structure

I have a subversion repository with a directory structure: frontend backend + a + b In a other branch, someone had put the sub-folders a and b in the root directory and delete the other stuff (frontend, backend). a b Now i have to merge this branch back into the trunk (backend-folder). How can I do that to dont lose the history...

How can I get git to work with a remote server?

I am the CM person for a small company that just started using Git. We have two Git repositories currently hosted on a Windows box that is our all-purpose Windows server. But, we just set up a dedicated server for our CM software on an Ubuntu Linux server named "Callisto". So I created a test Git repository on Callisto. I gave its direc...

Why doesn't git commit -a add new files?

I'm a bit new to git, and I fail to understand why git commit -a only stages changed and deleted files but not new files. Can anyone explain why is it like this, and why there is no other commit flag to enable adding files and committing in one command? BTW, hg commit -A adds both new and deleted files to the commit ...

Is there a way to easily convert a series of tarballs of a source tree into a git repository?

I'm new to git and I have a moderately large number of weekly tarballs from a long running project. Each tarball has on average a few hundred files in it. I'm looking for a git strategy that will allow me to add the expanded contents of each tarball to a new git repository, starting from version 1.001 and going through version 1.650. ...

Does Mercurial have an equivalent to git clean?

hg clean does not seem to exist, which kinda bothers me. Is this a feature that Mercurial doesn't have or did they just name it differently? ...

Keeping Drupal updated with Git

I'm trying to figure out how to use the Drupal mirror on Git hub. I'm new to git but have worked out the following: Set up a git Drupal repo * git init * git remote add drupal git://github.com/drupal/drupal.git * git fetch drupal * git tag * git merge <tag_name> Make a branch for my site * git branch <my_site> * git checkout <my_si...

Why would you use Dropbox but also Git for your Emacs initialization file?

I hear a lot of Emacs users have their init file (.emacs or init.el) under git version control and sync the git repository over Dropbox, when they run Emacs on multiple systems. Why would you use git in this situation exactly? Usually checking which system you're on and which things to load and set depending on that can happen in one a...