git

Is there a commercial grade Git server product

Does anyone know of commercial server product for managing GIT repos analogous to FogCreek's Kiln? If any, it would be nice to get some rundown of some most notable features it boasts. PS - it does not have to be necessarily commercial software ... commercially supported would do just as fine, but it has to be installable server softwa...

Can I get GIT style branch visualisations from Team Foundation Server (TFS)?

Hi, As an avid user of GIT, I've come to absolutely love its branch support, in particular being able to visualise all the branches in a repository over time. Unfortunately though we have a requirement to use TFS, but I know it has some strong visualisation features. I know you can visualise 'ChangeSets', but as far as I'm aware, this...

git-svn-rebase is commiting to an SVN tag

I'm just starting with git and using it to interact with an SVN repository. The svn repo is in a standard format so I configured my sandbox as git svn clone <repo> -s All seemed fine initially but after several rebases, dcommits and tags I appear to be always commiting to an SVN tag. Doing a dcommit dry run returns: $ git svn dcomm...

Git for Web Developing

I'm attempting to create a set of git repositories and web folders in a server using the post-update hook. It would be something like: //server/dev (for dev files) and //server/web (the apache main path) The post-update hook for the //server/dev git repositories: #!/bin/sh unset GIT_DIR PROJECT=`basename $(pwd)` cd ../../web/${PROJEC...

How to modify git repository to add submodules in ALL the past revisions?

I migrated my SVN repository successfully with Tags into Git using git svn-clone. However, git svn-clone does not migrate svn:externals. Hence, I decided to modify branch tree using git filter-branch. For svn:externals, first I created a separate Git repository for each svn:externals and then I tried using the following, but it didn't w...

Deriving application build version from `git describe` - how to get a relatively straightforward string?

I want to compose application build version that is automatically derived from GIT branch name I am on (when building) and the number of commits since the branch "start". I believe this will be unique for any commit in my GIT repository? Branch names are unique, and commits are linked to each other along a branch? If and when I tag a com...

Git: Correct way to change Active Branch in a bare repository?

I have a bare repository that's used as the central store for my project. All the developers do "git clone " to share with it. When they do the clone, they get a checkout of the master branch (unless they do "git clone -n") because repo.git/HEAD contains "ref: refs/heads/master", making this the Active Branch. The question is, how do ...

Showing new commits in remote Git repository

Hey, we have a Git remote repository (in a way, our "central" repository) on the server of our site and the site is run off that repository. Just pushing to the repository does not update the site, we have to run a little script on the server first. Now I want to display a little warning when there are new commits that haven't been app...

How to merge branch and retain the authorship

let's say that my colleage John has created a branch called 'john'. It has 10 committs by John. When it comes to merging back to master they ask me to do merging. This is what I do git checkout -b john origin/john git rebase master git checkout master git merge john --squashed git add . git commit -m 'merged branch john' However now ...

Are multiple `.gitignore`s frowned on?

Unless a repo consisted of several independent projects, it seems it would be simplest to just have one .gitignore file at the root of the repo than various ones throughout. Is there a standard best practice on this or some analysis online of when one approach is better than the other? ...

buildbot using msysGit causing intermittent datastreram error

We are using buildbot to run continuous integration. The built-in Git build step generates this command line: C:\Program Files\Git\bin\git.EXE fetch -t file:///s:/Repositories/repo +master s: is a samba share on a debian server mapped on the buildbot slave. It fails intermittently (once in ~50 builds) with this error: error: inflate:...

How to make an existing git branch track a remote SVN branch?

Similar to this question, how can I make an existing Git branch track a remote SVN branch? I often find that I start work in a local branch that I then need to push to an SVN server. Is this possible? ...

Controlling eGit's treatment of symbolic links

I am setting up a project that will be shared among several programmers at my organization. We are using git--to which I am a newcomer. The project directory includes symbolic links to documentation directories that should not be under version control. I want to maintain the symlinks under version control as symlinks, rather than havi...

If I have a GIT repo (bare) on my server, can I move it to another server easily?

I have a server that is hosting my 'bare' GIT repo for a few projects. I want to know what it takes to move the GIT to another server? ...

How to convert existing non-empty directory into a Git working directory and push files to a remote repository.

(1) I have a non-empty directory (eg /etc/something) with files that cannot be renamed, moved, or deleted. (2) I want to check this directory into git in place. (3) I want to be able to push the state of this repository to a remote repository (on another machine) using "git push" or something similar. This is trivial using Subversion ...

Writing Git hooks in python/bash scripts

I have recently needed to write git hooks, for all commits to reference a particular ticket. I was hoping for a place to start learning. All the stuff in the pro git book is written in Ruby. Since Ruby is not my strong suit, can anybody share tutorials about git hooks written in other languages? (I'd particularly prefer Python or Bash s...

Get history/log of a (potentially removed) file in Git

How can I view history on a particular file (which may have been deleted already in the current trunk)? Also, what diff tool do you suggest for mac? ...

In Git, how do you apply a commit of bug fix to the other newer branches?

If I have a public Git repository that contains 3 branches like the following: (release-to-customerA) | U (master) / | A---B---C---D---E ... S---T | (release-to-customerB) where commit 'B' was the original release version and commit 'U' resolved some bugs in 'B'. I want ...

What are the limitations of Git on Windows?

Everywhere I read about Mercurial and Git they generally throw in a line or two which implies Git has limited ability on Windows (because of some Shell scrips cannot be ported, etc.) but I've never come across some page which explicitly mentions them. And most pages are a tad old. What are the limitations of Git on Windows in terms of f...

Git is really slow for 100,000 objects. Any fixes?

I have a "fresh" git-svn repo (11.13 GB) that has over a 100,000 objects in it. I have preformed git fsck git gc on the repo after the initial checkout. I then tried to do a git status The time it takes to do a git status is anywhere from 2m25.578s and 2m53.901s I tested git status by issuing the command time git status 5 tim...