git

how to change remove+add to move in git history

i have a git repository that is a mix of some old svn repos. when i mixed everything i didn't realized to do git mv instead of just moving the files so now the svn history for most of the files is lost. is there a way of fixing this? the old structure was something like: svn1 |_apps/ |_tests/ |_... svn2 |_src |_libs svn3 |_src |_libs...

git gc on machine with quota

Simple question, I'm trying to run git gc on a machine with a quota. Pre-gc, I'm at about 18GB of usage, almost all of which is my cloned git repository. My disk limit is 25GB. During the git gc operation, enough temporary files are written to disk to hit my limit and thus cause the git gc operation to fail. I can delete the .git/object...

Git Version numbering with a centralized workflow

We are using Git with a central server, and our code needs to include a version number in a file. The way this is currently done is like this: A new developer does a "git clone" In his local copy, he edits .git/hooks/pre-commit to call version.sh version.sh (which is included in the project root) takes a version number from "git desc...

git - what have I done ?

I did: git clone git://github.com/xyz/xyz.git git tag -l release-1.0.0 release-1.0.1 release-1.0.2 git checkout release-1.0.2 git checkout -b xyzfilter and now I think that I have a new branch, called xyzfilter, based on the tag 'release-1.0.2'. Did I do this correctly ? ...

How do I install a rails plugin from git via ssh?

Installing a rails plugin using the git:// protocol is easy, you just type script/plugin install git://server.local/my_git_repo.git How do I install a plugin from a git repo hosted over ssh? When I type script/plugin install [email protected]:plugin.git I get "Plugin not found" I know it's not a git issue because the installer ...

Git import/export into SVN as a regular workflow?

Randal Schwartz says that he uses Git's SVN import/export feature when he has to interact with SVN repositories. He pulls the project from SVN, does all his local edits/saves with Git then once done pushes the changes back to the SVN repository. Is this really a worthwhile process for daily use with a SVN repositories rather than just us...

Codaset, Codebasehq, Unfuddle, Trac or Redmine?

I have a handful of small Git repositories I would like to host remotely. They're all private projects, most of them in Java. Codaset, Codebasehq, Unfuddle, Trac, Redmine.. There seems to be an abundance of solutions out there. They're all packed with features and useful functionality. Putting aside pricing and the glossy layouts, what...

Which version control system or platform is the best one for tracking and distributing personal Emacs configurations?

I currently use subversion to track my configuration changes of Emacs and to sync my '.emacs.d' directory to different platforms. A lot of packages like Ido, Muse or Org-mode are part of Emacs distributions which come with Debian or Carbon Emacs (osx). But other packages which I'm also using are not part of those distributions so I have...

Git workflow for corporate Linux kernel development

I work for a company which builds embedded systems using Linux. Historically we've always used CVS to store our kernel work. Our kernels end up being a collection of: Drivers for our proprietary hardware Random fixes for bits of Linux we use Non-proprietary hardware drivers Random yukky hacks to tailor Linux for our application We're...

git remote update

Is git remote update the equivalent of git fetch? ...

git: how to add/commit removals made via vanilla rm?

I deleted a bunch of files / directories from a git repository using rm, the Finder, etc. I'm looking for a git command that'll record these to the index as marked for removal. (As if I had called git rm on them.) I understand git add -u will do this, along with a bunch of other things. I'd like my command to exclusively handle removal...

Convert from remote hosted SVN to GIT

I have SVN hosted and want to convert to Git and put it back into the hosted repository as Git. I am on windows. I have been using Tortoise Git since I've been using Tortoise SVN and love it. And so I've set out to created a Git clone from the SVN. And then intend to take that clone and put it into the newly created hosted Git reposi...

How to git svn fetch older history?

I have checkout'ed svn repo through git, but not from the first svn commit. Now I would like to extend the history a little back into past. Is it possible? ...

Git client throwing error

I am trying to clone a project from GitHub but I keep getting this error: github.com[0: 207.97.227.239]: errno=Result too large fatal: unable to connect a socket (Result too large) This is the version of the Git client I am using: git-gui version 0.12.0.23.ga91be git version 1.6.4.msysgit.0 Has anyone seen this before? ...

Why does git show "dev/null" in status after interactive add of renamed file?

I get an unexpected appearance of "dev/null" in my git status output after interactively adding a patch for a file that was renamed. I'm wondering if this is expected and there is some good reason for this behavior, or if this could be a bug. Below is a simple illustration of how to reproduce this. In my real-world scenario, it's a bit ...

How can I sync files in two different git repositories (not clones) and maintain history?

I maintain two different git repos that need to share some files, and I'd like the commits in one repo to show up in the other. What's a good way to do that for ongoing maintenance? I've been one of the maintainers of the perlfaq (Github), and recently I fell into the role of maintaining the Perl core documentation, which is also in git...

Git - exclude file

Hello everybody. 2 weeks ago i commited config of my application. It is not very useful. How I can exclude the file from changings history? ...

Git - how to tell which commit a tag points to

I have a bunch of unannotated tags in the repository and I want to work out which commit they point to. Is there a command that that will just list the tags and their commit SHAs? Checking out the tag and looking at the HEAD seems a bit too labourious to me. Edit: I realised after I went through the responses that what I actually wanted...

Regenerate a git repository

Is there a single command that automatically regenerates a git repository? I want to not just automatically add and update files that I've manually created or updated in my file system (as would git add .), but also to automatically delete files from the repository that I've manually removed from the app in my file system (something lik...

Unable to push code to git remote

I am trying to add remote using git remote add and than am trying to push to that remote but am getting following errors: fatal: 'adoshi_01': unable to chdir or not a git archive and fatal: The remote end hung up unexpectedly Steps followed: First of all I cloned from git/repos/scripts to home/adoshi/repos/scripts using command git c...