git

git stash equivalents in other revision control systems?

Does hg, svn or others have an option like git stash? ...

Connecting git branch to git hub fork

I came to git via terminal, not github and I am wondering how I make a connection between the two. From a checkout I have, I created a branch in terminal by running this command: git checkout -b newbranchname From my understanding, github calls this forking. How do I connect the branch on my box to a fork of a checkout on github? (...

How can I use Git with multiple remote repositories?

I use currently use Heroku for rails hosting which uses a Git repository for deployment. I also have a hosted Git repository that I use as my main source control for history/backup purposes. I would like to have 1 local folder that has my working copy of my application, then be able to commit my changes to either the Heroku repository,...

Why not check in AssemblyInfo.cs

I was watching a video on Git and the guy went out of his way to ignore the AssemblyInfo.cs. Why should I not check that file in? If I don't check the file in won't Visual Studio complain for the next user when he checks my code out? ...

Why does my .git folder get deleted randomly when I restart my computer ?

My .git folder disappears from times to times. The first time I thought that I had erase it by mistake, but this is the 3rd times it occurs, so there must be something. I use git-svn and cygwin over windows, it seems to occurs mostly after a PC restart, could it be something with rxvt, that could kill references to some folders ? I can't...

How do I import an existing GIT project into SVN, preserving GIT history on master branch?

I've a project developed with GIT and have a few hundred commits. I only have one master branch and the commits are linear. Now I'm asked to put the source into an existing SVN and ultimately I'd like to preserve the master commit history (the messages and the diffs, author is preset by SVN access). It's like I need to replay the whole...

git-svn fetch/rebase failing after trying to repair a corrupted file.

Hi all, I recently had a corrupted object in my repository, pointing on my HEAD (the object was empty) . It happened after interrupting a git-svn command. Then, I restored my repository by changing manually the refs on this object. Now, I want to synchronize my git repository with SVN, but git svn fetch returns: fatal: Invalid revisi...

jira and git linking up.

I recently moved to jira for my bug management tool. I have installed the most recent copy which 4.1. We use Git as our version control system, I am looking to set it up, so looking around i found this one to be the most popular https://plugins.atlassian.com/plugin/details/4984 Unfortunately, like all things that happen in my day, its...

Have git rerere automatically mark files as resolved?

I'm using git rerere, and it is useful, but there is one problem: When it automatically resolves a file, it does not mark it as resolved (eg with git add). So if I run 'git mergetool', it opens up the file as if it still has all the conflicts in it. So far, I've made a small shell script which I can call, which scans all files marked a...

github no address associated with name

hi, I kept having problem with github these days, i created a new repository on github, then from local machine I tried to push my code to github: git remote add origin [email protected]:tmi/logger.git fatal: remote origin already exists git push origin master ssh: github.com:uhdyi: no address associated with name fatal: the remote end...

Is there a Bazaar equivalent of Git default branching?

Using git, I can create branches conceptually, without having to branch my directory structure. When I switch between branches (assuming that everything has been committed), it will change the contents of the files that I'm working on to reflect whatever the status of the "current" branch is. I really like being able to do this - it fit...

Can a Git hook automatically add files to the commit?

I'd like to add an automatically generated file to the same commit using a pre- or post-commit hook in Git, dependent on the files that were modified in that commit. How would I go about this? I've tried this as a pre-commit hook, but no luck: #!/bin/sh files=`git diff --cached --name-status` re="<files of importance>" if [[ $files =~...

How to organize and setup mirrored backup servers for Git repositories?

I am moving some svn repositories to Git. So, what I basically try to do is this: Setup one server with bare Git repositories from which I will pull and push to Setup a few backup servers for all of my repositories that are on the 1st server. So, let's say i have a directory on my server, like: $HOME/git/, which has bare repositories...

Git Ignore Pattern for XCode Build Directory

I am new to Git, and this is my first project using Git rather than SVN as my source control. I am working in XCode on an iPhone project. I want Git to ignore the build directory, which is in the root folder of the XCode project. I've found several other questions here and also found articles on google that provide examples on how to cre...

Reinitialize Git Repo

Hi All, I have a git repository hosted on a server. We are 5 members in the team and all have cloned from this same repo. Since the start .log and .yml files are being tracked. Is there a simple way to make Git not to track these files. We have tried --assume-unchanged but we were not able to get through. Could anyone suggest step by...

Cloning git repo with all refs

Hi, I'm trying to get all refs from an external repository when cloning. I exported them all before, by doing push --mirror, so the external repository should have them, as far as I know. How can I force all refs to be pulled? ...

git-svn branching: how to configure git config

Hi, a few months ago i configured a git with an svn repository. Until now i only used the svn repository to keep up-to-date with the supplied application on it. But now i also want to commit stuff back. To do this every feature i'm going to commit needs to be in a separate branch. I read about how you should create a new branch etc. But ...

Can I make git diff ignore permission changes

I unadvertedly change the permissions of my entire tree and commit that change alone with other content changes. I use something like : tar -czf deploy.tar git diff --name-only v1 v2 to generate a tar with the modified files between two tags, the problem is that now because of the permissions change almost all my tree is listed as mod...

Using Git to update one file with the changes made to a second file

I'm new to git; I know the basic commands, but I'm not as familiar with the optimal way to organize projects. I have two versions of a file that do nearly the same thing. The only difference between the two files is the way that they scan a particular file, and the differences are confined to one area of code. As I add functionality to ...

Which files generated by Autotools should I keep in Git repository ?

Hi everyone. I am new to autotools and I am working on a C project. I want to add my project to a git repository but I am not sure, which files generated by the autotools I need to track and which should be ignored. Please provide some hints with regard to this. Thanks ...