git

SASS files management in Git version control system in Ruby on Rails

I'm using SASS files in Rails development. And I wonder if I should gitignore generated CSS files. The problem with adding CSS files in Git is that they are simply redundant. SASS files at public/stylesheets/sass are the files I need. So I have the following lines in gitignore: # public/stylesheets/*.css But if I do this, when I pus...

Securing a Git Repository

I have a shared hosting package and I have installed git from source. I created a repo and intend to create a couple more, but I was wondering if there is any way to secure the git repository. Currently I access it over regular http. I do have a shared SSL cert, but I'm pretty sure that won't be of use here. Edit: by secure, I mean auth...

Have remote git repository refuse merge commits on push

What I want to do: I want to disallow any merge commits to be pushed to the central repository. The only exception being if the merge is between branches that exist in the central repository. I want to enforce this at the central repository. Explanation of why I want to do this: Note: If this explanation throws you off the trail of ...

How can I get the latest revision of CakePHP 1.3?

Hi All, This seems like a pretty beginner question; however, I have no idea what the link for the latest revision of cake 1.3 is. I have git and svn working with eclipse. I think cake is using git now instead of SVN (perhaps I am mistaken). If it is using git could someone give me some instruction? ...

GIT: How to see pulled/pushed changes in origin

I've just started using Git (previously Subversion). I'm having real problems getting my head round being unable to see pushed or pulled changes in the original repository. My 'architecture' is this: MAIN CODEBASE -->Development repository 1 -->Development repository 2 When I push changes from one of the dev repos back up to the ...

How to rename a git project name?

I know ''git mv'' can be used to rename a file or dir. But I don't know how to rename a project's name? ...

How to reinitialize a git-svn repository

Following the advice of this tutorial, I cloned an svn repository which did not have the standard layout. git-svn clone -s http://example.com/my_subversion_repo local_dir The -s is there to signify that my Subversion repository has a standard layout (trunk/, branches/, and tags/.) If your repository doesn’t have a standard layout...

What is a .git.dmp file and how can I use it?

I just backed up my unfuddle account and it sent a zip file with my git repositories as a .git.dmp file. Do I just remove the .dmp ending and use it like a normal .git repository? ...

Can I copy a Git working copy onto another machine?

Hi, I am in the process of creating a Git working copy from our SVN server with 'git svn clone'. But this takes quite some time (we have > 20.000 revs and almost 10.000 files). I have some other machines (for other developers) that I would like to setup the same way. Will it be possible to copy the resulting files from the first mach...

What is :scm_verbose on capistrano?

I searched on capistrano documentation but I didn't find. ...

sourcecontrol - pulling in only specific revisions

I am familiar with SVN and TFS for source control. One issue which I usually encounter is the same file is modified for different bugs (say bugP is fixed with revision/changeset (N), bugQ is fixed with revision(N+1) and bugR is fixed in revision/changeset(N+2) Each revision/changeset work on different part of the same file and there is ...

Git-ing a branch from GitHub

I want to clone this edge branch of a github repo. The following command is identically listed in the readme for both master and edge git clone --depth 1 git://github.com/bborn/communityengine.git vendor/plugins/community_engine How do I specify to git that I want the edge branch? ...

Determine if directory is under git control

How can I tell if a given directory is part of a git respository? (The following is in python, but bash or something would be fine.) os.path.isdir('.svn') will tell you if the current directory is controlled by Subversion. Mercurial and Git just have a .hg/.git at the top of the repository, so for hg I can use os.system('hg -q stat ...

Prohibit remote pushing to the master branch in git

Is there any way to modify central repository's configuration to disallow any remote pushing to master branch (using git)? It would only be updated via branch merging by a release owner. It is possible to do in child repositories but unfortunately it's not always fool-proof enough, easy to forget to do it on new machine - no way to pro...

How to use repo as repository on Hudson

I work on a project using repo to control over a hundred git repositories and Hudson as continuous integration server. The file structure of the project is like: ./.repo ./a/.git ./b/.git ./b/c/.git ./b/c/d/.git ... more than a hundred gits The whole project must be built together, in other words, each git repository cannot be built ...

Use of git rebase in publicy feature branchs

You can see all over the web people advising to not use git rebase in a public branch, but I can't see what's the problem if you always rebase a feature branch. My team always use branchs for features (wow), we are used to have it just locally, so rebase isn't a problem, but sometimes we wanna show the code of a partially done feature t...

Revision control system with multiple similar projects (one customized for each customer of a same product)

I have multiple SW projects from different customers with which I am implementing git version control system and I would like to know what is the best way to do it. The projects are similar and most often derived from existing ones but unique for each customer. Would I create a repo for each customer or would I create new branches inste...

backing up project which uses git

I'm burning my stuff on a dvd, before a quick reinstall. Never done that with git, being a recent user. So I'm just checking with you guys. If I understood correctly, I just need to backup my project directory project_name (which has .git inside it) watching for hidden files along with it, and when I copy it onto the "new" machine, and i...

git bisect doesn't work, no output

I tried to use git bisect lately, but it just didn't work. The tree remained in master and I saw no output from git bisect whatsoever. Here's what I've tried: git bisect start git bisect bad # no output, tried a couple of times git bisect good # no output git bisect reset #-> Already on 'master' I tried this on two different repos....

How to delete a file from git repo?

I have added a file says "file1.txt" to git repo. After that I committed it and add few directories says dir1 and dir2 and committed to git repo. Now the current repo has a file1.txt and dir1 and dir2 . How to delete file1.txt without affecting others like dir1 and dir2. ...