git

What are git's thin packs?

I haven't found much on thin packs, and the man pages' information is rather cryptic about this. I know it has something to do with slow connections, but what would be a "slow connection"? What are its pros and cons? When should I use it, when should I not use it? ...

How to "freeze" git submodule

I'm using a few repository which I do not host myself and I thinking what if I deploy my application while they are not available? This simply just can't happen. Is there a way to "freeze" the submodule somehow that when I pull from my repository the submodules are already init and update? Any help is appreciated. ...

Converting svn to git, how to get the branches not to be just remote in the svn repo?

I'm quite new to git and I'm trying to move a svn repository to git. I followed the guide below so now I have a git repo on my server http://pauldowman.com/2008/07/26/how-to-convert-from-subversion-to-git/ So, if I do "git branch" git replies "* master" and if I do "git branch -r" i get a list of all the branches in the svn repository. ...

how to identify branches that need to get merged in git

I make a lot of bugfix and feature branches and in the end merge them all into a release candidate (rc). but when i test the rc I am not sure if i have merged in all the branches. How can I find out which branches are missing? I tried gitk, but it seems it shows only the branches that are already merged in the branch that I am on. But I...

How do I show the changes which have been staged?

I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I'm aware of git status, but I'd like to see the actual diffs - not just the names of files which are staged. I saw that the git-diff(1) man page says git diff [--options] [--] […] This form is to view the changes y...

Using git as a centralized version server

Hi, I currently use svn at work. Our setup is: everyone has a working copy and we commit to a svn server served by apache2. So I commit changed, the other update, and everyone can work on the copy as they wish. So it's pretty easy to deploy. But now, I'd like to do the same thing but with Git. Would it be possible? I'd like to have ...

git-clone memory allocation error

I'm trying to run git clone and am receiving the following error: fatal: Out of memory, malloc failed fatal: index-pack died with error code 128 fetch-pack from 'user@server:git' failed. I was able to successfully do a clone on my local machine, but it's failing when I try to clone to another server. Still somewhat new to this whole ...

Git: reset other branch to current without a checkout

I'm writing some scripts for my Git workflow. I need to reset other (existing) branch to the current one, without checkout. Before: CurrentBranch: commit A OtherBranch: commit B After: CurrentBranch: commit A OtherBranch: commit A Equivalent of $ git checkout otherbranch $ git reset --soft currentbranch $ git checkout cu...

Git Web Interface

I am trying to make the viewgit interface work for my projects. However I am running into this curious issue with PHP exec: These 2 unix commands work from inside my viewgit/ directory: /viewgit-> GIT_DIR=/usr/local/apache2/htdocs/repo/.git git rev-list --header --max-count=1 c19e231ad87413798b6a1387a98ec814836fda1e 19e231ad87413798b...

Need to handle git-submodules in git-archive

I need to pack git submodules inside of tarball which I create with git-archive. I see that in 1.6.5 git-archive does not support git submodules. I see several scripts to handle this case in the net, but I'm not sure which one to pick. What is the best / most official way to do this? I've ended up using with working copy on a dedicat...

How to programmatically determine the current checked out Git branch

In a Unix or GNU scripting environment (e.g. a Linux distro, Cygwin, OSX), what is the best way to determine which Git branch is currently checked out in a working directory? One use of this technique would be automatically labeling a release (like svnversion would do with Subversion). Please also see my related question: How to progra...

How to programmatically determine whether the Git checkout is a tag and if so, what is the tag name

In a Unix or GNU scripting environment (e.g. a Linux distro, Cygwin, OSX), what is the best way to determine whether the current checkout is a Git tag. If it is a tag, how can I determine the tag name? One use of this technique would be automatically labeling a release (like svnversion would do with Subversion). See my related question...

How to make part of an existing GIT repository a submodule

I have this git repository which contains to folders binary-search and poker: http://github.com/soulnafein/code-katas I would like to make this folders two submodules and I would like to keep the change history. How can I do that? ...

Can git format patch so it can be used with patch program?

I'd need to create simple patches from git repository that can be applied with plain simple patch command line utility. Can it be done? ...

Local commits pushing to a central server

Hello, At work we use perforce and are encouraged to make regular commits to it (something I am fine with). However, I'd like to run something like mercurial so I can locally commit stuff that is work in progress and doesn't necessarily compile/run and then from this do my regular commits to the central perforce server. My question her...

How to get a list of all blobs in a repository in Git

Hello, How can I list all versions of all files in a git repository? (For example for listing all files that ever contained a certain string) This list could be used to cat the file. ...

Configuring Git over SSH

I have cloned my git repository over ssh. So, each time I communicate with the origin master by pushing or pulling, I have to reenter my passphrase. How can I configure git so that I do not need to enter my passphrase multiple times? Update: I should have said "password" instead of "passphrase". ...

Is it better to use a separate commit message for a git merge?

I come from an SVN background so I'm not sure what the typical git workflow looks like. When you merge in SVN, you provide a commit message describing the merge. This is necessary because SVN's merge-tracking has historically been poor. I noticed that git's default behavior is to automatically commit the results of the merge if it is su...

Making Teamcity clone a git repository

Hi, I have a build process that relies on git-describe so I want TeamCity to clone the repository instead of only putting the source without git into the /work folder. I'm using the JetBrains Git plugin, is there another plugin that does that or should I just write another script that does a git clone before doing a build? Thanks! ...

How to change case of a file in git under cygwin ?

We work in a mixed case sensitive/insensitive environment (cywgin/linux), and today someone created a small havoc in our workflow by renaming a file, changing an S to an s. This caused all sorts of interesting merge issues across branches, and to be quite honest no-one's entirely sure of what happened. What is the most appropriate way t...