git

Using git properly

I have been reading up and trying Git for the last few days and I have one more thing that i can't seem to find good information on. I read that with Git it's common to set up a public and a private repository clone on each developer's machine that way the developer can do private commits as many times as he/she wants and then only push...

Git Extensions not showing all files to commit at once

I'm Using Git Extensions GUI for GIT on Windows. With a new project with some hundred files, not all new files are shown for a commit, I have to to multiple Commits to get all the files.. is there somewhere a option, a limit to set this behaviour? (yes, I know .gitignore, the files are not ignored, but only shown in chunks of ca. 20 fil...

Is it possible to have a git repository as a "vendor branch" in subversion?

Hi Is it possible to have a git repository as a "vendor branch" in subversion? In this project we will have several parts, but some parts will use svn and some will use git. So I am looking into a "project root" from where we can have the other projects as vendor branches (or similar). And the question is if it is possible manage thi...

Is it possible to have a subversion repository as a "submodule" in git?

Hi Is it possible to have a subversion repository as a "submodule" in git? In this project we will have several parts, but some parts will use svn and some will use git. So I am looking into a "project root" from where we can have the other projects as submodules (or similar). And the question is if it is possible manage this "project...

Is good idea to use gerrit to host the git repository instead of gitolite or gitosis ?

Originally I try to use gitosis to manage the git repositories in the company, and later notice gitolite is kind of enhancement of gitosis. And also I heard gerrit could be used for the same purpose, but from the description, gerrit is mainly used for code review. So which is the best way for setting up git server using gitolite (fo...

Procedure for cloning Git repos that use subtree

I'm using Git's subtree command to pull a couple of libraries in to a project. If I then clone the project in the normal way, I end up with all the code that I need, but I lose the subtree relationships - in the clone there is no remote for each of the libraries, and there is no -push branch for either of them. What's the best way to ...

git --shared permissions reset

I have a whole bunch of git repositories in /srv/git manually administrated (not using gitosis), which I have obviously buggered up the permissions for, since I now get error: failed to push some refs to type errors, after some poor chmod invocations on the server. I also mistakenly added +x to all hooks and I need to remove that and ad...

How to change the source of a Git subtree merge

I have a project where I've merged in a library using Git subtree. I've pushed and pulled a few minor changes between the library and the project. Later on, a new repository has been created which is the definitive home for the library. It contains essentially the same version of the library code as my project did, with perhaps one or t...

How to know the list of files changed when you do a fetch using git

How do you get to view the files which have changed, the following fetch / update command seems to fetching some data but I don't have a clear picture of what got changed in the last run. c:\examples>git fetch got fac9a16c714aaa993267269676980f6433430797 walk fac9a16c714aaa993267269676980f6433430797 got 8751f9c82175ca08d1d1a2549b24479a7...

git ignore exception

I have a gitignore file that makes git ignore *.dll files, and that is actually the behavior I want. However, if I want an exception ( i.e. to be able to commit foo.dll), how can I achieve this? ...

Distributed issue tracker for git with usable Eclipse Mylyn support?

I'm using git for version control but I'm currently lacking a good issue/bug/ticket tracker with Eclipse Mylyn integration. The features I'm looking for: Open source implementation (so that I can add the features I need in the future. GPL, LGPL, MIT or BSD license preferred). Distributed (the issues must be stored in git the repositor...

gitolite: allow to change only selelected files

How to configure git and gitolite to allow specific user to change just files that are inside specific directory? e.g. files in origin master branch: /dir1/ /dir2/file1 /dir2/file2 /dir3/file1 User kathrine, allow to change only /dir2/file1 and /dir2/file2 $kathrine: git clone [email protected]:test.git results in: /dir2/file1 /dir...

How to make an informational web site from a git repository

I would like to see some statistic and visual states of my git repository. Is there any nice tools around? I found http://gitstats.sourceforge.net/ but I would like to know if there are alternatives. ...

Can I perform git operations (add/diff/commit) on files in a repository when my current directory isn't in the repository

Hi, With svn, I was able to run commands on files in a checkout, without having cd into that checkout first. For example: # Located in /tmp, running svn operation on /home/d5ve/checkout d5ve@host:/tmp> svn add /home/d5ve/checkout/myfile.txt d5ve@host:/tmp> svn diff /home/d5ve/checkout/myfile.txt d5ve@host:/tmp> svn commit /home/d5ve/ch...

Push local master commits to remote branch

I've been working on a local clone of a remote git repository, committing my changes to my local master branch. Now, I want to push my commits to the remote repository. However, I want to keep my local commits separate from the remote master branch, so that I don't break anything. How can I push my local commits to a new remote branch? ...

What is the correct way to convert SVN remote branches and tags into local Git branches/tags during SVN to Git migration

What is the correct way to make the remote branches/tags that exist after a git-svn init/git-svn fetch into local Git branches/tags before pushing to my remote Git repo and abandoning SVN altogether. I have: Run git svn init Updated the svn-remote "svn" section of my .git/config file to the following: url = file:///Users/Developers/...

How line ending conversions work with git core.autocrlf between different operating systems

I've read a lot of different questions and answers on Stack Overflow as well as git documentation on how the core.autocrlf setting works. This is my understanding from what I've read: Unix and Mac clients use LF line endings. Windows clients use CRLF line endings. When core.autocrlf is set to true on the client, the git repository alw...

Telling rspec to not load files

I'm trying to add some commit hooks to my git repo. I want to leverage Rspec and create commit message specs that will run each time I commit. I have figured out how to run rspec outside of the 'spec' command, but I now have an interesting problem. Here is my current code: .git/hooks/commit-msg #!/usr/bin/env ruby require 'rubygems' ...

Git unmerged path issue...

I merged branch dog into animal. When I go to commit, I get the following: Unmerged paths: (use "git reset HEAD <file>..." to unstage) (use "git add <file>..." to mark resolution both deleted: ../public/images/originals/dog.ai added by them: ../public/images/original_files/dog.ai To make a long story short, I had different...

How do I open source my Rails' apps without giving away the app's secret keys and credentials.

I have a number of Rails apps hosted on GitHub. They are all currently private, and I often will deploy them from their GitHub repository. I'd like to be able to make some of them open source, just like the ones you can find on http://opensourcerails.com. My question is: How can I make these repositories public without giving away super...