git

Merging two folders using git

I'm working on a project with some people who have never used git before. Not knowing the capabilities of git, they created two version of the project: development and production. These two versions are both present in the current environment. To complicate things further, this other user created these folders in addition to the old dev...

Why does "git push origin master" fail to github ?

hi there, Here are the steps I took. I created a repository on github and generated a rails project on my windows vista home premium (which has msys git 1.7.0.2). git init I then committed the generated files git remote add origin [email protected]:anjanb/Jobs2Go.git git push origin master On the 5th step, I get the following error...

Git already up to date unless I reset

I have a cloned repo I use for the live site and I have it pull from a bare repo. For some reason every time I execute "git pull" I get the already up to date message. But it's not up to date and not updated. If I do a git reset --hard HEAD^ and then git pull again, the changes come in. What's the problem here and how do I fix it so tha...

how to add revision and build date to source

Hi! I have a gcc project and would like to automatically add defines for build date and revision number (from git) to my sources. What's the best way to do this? My goal is simple to be able to do something like this on startup: printf("Test app build on %s, revision %d", BUILD_DATE, REVISION) For building I'm using make with a simple...

strange behaviour of git

Hi, i have strange behaviour of git - push is working, but clone is not :( alec$ git clone git://host/repo.git Initialized empty Git repository in /Users/alec/Temp/repo/.git/ host[0: x.x.x.x]: errno=Connection refused fatal: unable to connect a socket (Connection refused) whats wrong? ...

Find a specific couple of lines of code from large git repo

So i remember that i once did something in another project and (later removed it), that could be useful now. Thanks to some other SO post i managed to search the repository for a half remembered string.. git grep halfRemeberedNameOfFunction $(git log -g --pretty=format:%h) and Yay! got some results 2d0bcde:path/to/project/file.c: res...

svn ci after a git push on github

I have a project on github but I need to maintain a svn repo updated with every push. I have checked this question but I want to do it automatically. Is there a way to tell github to do a svn ci when a push occurs? ...

Git : How to revert bulk commits on multiple repos

To update my multiple repos, I did: git bulk fetch origin git bulk pull origin master Now it appears that some of the functionality which was working initially is not working now and so I want to revert back to previous state of my repos. How can this be done ? I tried doing git reset --soft commit id & git reset --hard commit id f...

Mirror git to svn

I have a primary git repository for an opensource project I want to mirror all commits to svn repository (on code.google.com), does it possible ? ...

How do I search git history for a disappeared line?

I need to search the history of a specific file in a git repository to find a line that is gone. The commit message will not have any relevant text to search on. What command do I use? Further details: this is the history of my todo list out of our non-stellar task tracking software. I've been keeping it for two years because there's...

using git on android

Hi all, I have a desktop application using git for synchronization. I have also an android application which do the same as the desktop, but I don't know how to do the synchronization part on it. I haven't found any implementation of git on android. I found a jgit, but its unwell documented and I was not able to do even a commit with th...

git merge with renamed files

I have a large website that I am moving into a new framework and in the process adding git. The current site doesn't have any version control on it. I started by copying the site into a new git repository. I made a new branch and made all of the changes that were needed to make it work with the new framework. One of those steps was chan...

Git fails when pushing commit to github

I cloned a git repo that I have hosted on github to my laptop. I was able to successfully push a couple of commits to github without problem. However, now I get the following error: Compressing objects: 100% (792/792), done. error: RPC failed; result=22, HTTP code = 411 Writing objects: 100% (1148/1148), 18.79 MiB | 13.81 MiB/s, done...

Git is ignoring .git directories in subdirectories

I'm using git as a backup tool and 'roaming profile' for my $HOME directory between laptop and desktop. My problem is that under my $HOME I have a Development directory with multiple git projects I'm working on. Git will not allow me to add the subdirectories .git folders. So to commit to these projects I have to push the changes into m...

Creating a new project from a project skeleton using git

In order to get a new django project up and running faster, I'd like to maintain a separate "project skeleton" on which I base all my new projects. It would be great if, as I improved the skeleton, I could bring those improvements into my active projects. How can I accomplish this with git? So, maybe in my remote git repository machine ...

Describe your workflow of using version control (VCS or DVCS)

I'd like to learn other people workflow when using either vcs or dvcs. Please describe your strategy to handle the following tasks: Implement a feature Fixing bugs (during development and deployed app) Code Review Refactoring code (post code-review) Incorporate patches Releasing the newer version of your app (desktop, web, mobile, w...

How do I build git on Red Hat Enterprise Linux 3?

When you try to build git v1.7.0.6 on Red Hat Enterprise Linux 3, you get an error: In file included from /usr/include/openssl/ssl.h:179, from git-compat-util.h:139, from builtin.h:4, from fast-import.c:147: /usr/include/openssl/kssl.h:72:18: krb5.h: No such file or directory I have the answer to...

Git: Finding what branch a commit came from

I'm pretty sure this isn't possible, but is there anyway to find out what branch a commit comes from given its sha1? Bonus points if you can tell me how to accomplish this using grit. :) ...

How do I convert my SVN repository to Git while preserving branches?

Some help please. This doesn't seem to do it for me: git svn clone --stdlayout --authors-file=../authors.txt file:///home/path ...

Write directly to a remote Git repository, without adding objects to a local index/repo?

Does Git support any commands that would allow me to commit directly from a local/working tree into a remote repository? The normal workflow requires a "git add", at least, to populate the object database with copies of the file contents, etc. I understand that this is NOT the normal, expected Git workflow. But I noticed that Git alread...