git

Git instaweb httpd configuration to use apache2 on OSX Leopard server

Hello, By default git instaweb is expecting lighttpd web server, whereas on OSX Leopard server apache2 is the default one. Adding the following to .git/config : [instaweb] local = true httpd = apache2 -f port = 4321 modulepath = /usr/libexec/apache2 and running 'git instaweb' results in : apache2 not found. Install apache2 or use...

Git over ssh without Git being installed on server

I have full access to some folder on a remote Linux server over ssh and scp. I can upload and download files but not install apps. Now I want to put a git repository on this server. When I try to clone from an over scp copied repository I get the following error message: sgit-upload-pack: Command not found fatal: The remote end hung ...

I want something like github, but internal for my company. Recommendations?

I need some sort of web-based source code repository slash issue-tracker. The point is to have greater visibility of our various internal projects. Any recommendations? Open source is a requirement. A ready-made virtual appliance would be nice. Internal github would be perfect, but AFAIK this costs money. Does anyone have experiences ...

Trying to fix line-endings with git filter-branch, but having no luck

I have been bitten by the windows/linux line-ending issue with git. It seems, via github, msysgit, and other sources, that the best solution is to have your local repos set to use linux-style line endings, but set core.autocrlf to true. Unfortunately, I didn't do this early enough, so now every time I pull changes the line endings are ...

Git: Patching another branch

Often when I work on a feature branch with git, I find a bug and start fixing it right away. I don't want to switch since the new feature is often what I need to reproduce the bug. After a while I have 2-3 files that contains the bug fix plus some other non-committed files containing the new feature I'm working on. Now I would like to m...

In git, what are some good conventions to format multiple comments to a single commit.

I was wondering how people normally separate out the multiple comments in a single commit. Stars? Commas? Separate lines? Just wondering what you find to be the best. I'm using this now when I add comments via Emacs, but not sure I like it: Added error messaging Cleaned up sign-up UI Added recaptcha # Please enter the commit message ...

Git for game server configuring?

I was wondering if git is suitable for this. So here is the scenario: We are thinking about hosting a game server. However it is not the case of just downloading files and running the server. It needs to be carefully configured and maintained. It also has scripting capabilities. Also, there will be quite a few "developers" who are going...

How do I delete a local repository in git?

I cant find the command, tried google: git "delete a repository" Thanks ...

Magit not recognising git repositories

I'm currently trying to use Magit with Emacs 23.1 on Win7 64-bit but Magit does not recognise my git repositories. Please bear in mind I'm a complete Emacs newbie. I run the magit-status command and it asks for a directory containing the repo, which I obviously type in and then it just says every time I try: "There is no Git repository...

Git gui client for Linux

Which is the best gui client on Linux for Git. Update: After checking out all of the GUIs mentioned here, git cola seems to work well for committing/pushing gitk seem to work the best for examining history and giggle is awesome for watching the diffs. I use command line for committing, web trac interface for viewing history, in a ...

How do I change the Gitweb default diff format to `--color-words`?

I want gitweb to output the same diff format as git diff --color-words. Does anybody know how I can do this? I looked at HTML::FromANSI but couldn't get it working with git diff --color-words from the command line. ...

Git how to create remote branch

I created a local branch which I want to 'push' upstream. There is a similar question here on Stackoverflow on how to track a newly created remote branch. However, my workflow is slightly different. FIRST I want to create a local branch. And I will only push it upstream when I'm satisfied and want to share my branch. How would I do th...

remove data from a svn synchronized git repository

hello, we have a fairly huge svn repository that i access using git. so far everything was working fine. now someone accidentally added some huge chunks of binary data to the svn repository. (hundreds of MB!) of course git also sucked in those chunks (using git-svn). Is there a way to selectively remove some files from git without distu...

Reading GIT Merge Markers

Sorry, this is a very simple question. What does this merge marker mean in GIT >>>>>>> next-release:db/schema.rb when it's got no accompanying? ======= Also, is there some way to tell GIT to just choose one version over another? ...

New to Git: git push origin master = "ssh_exchange_identifiction: Connection closed by remote host. Fatal: The remote end hung up unexpectedly"

I'm trying out git for the first time and am trying to follow instructions supplied by github. However, I seem to be failing on the last step. The following steps are provided by github: Global setup: Download and install Git git config --global user.name "Your Name" git config --global user.email Next steps: mkdir SomeFo...

What can I do while I wait for the TeamCity Git plugin to get pre-tested commit support?

I'm brand new to CI. I want to submit my code changes to TeamCity and have it run all the tests and, if they pass, commit to source. However, I use Git and it looks like the Git plugin doesn't have support for pre-tested commits or personal builds yet. If you use Git and TeamCity, how do you deal with this? ...

Clarifying/clearing up line ending issues in GIT

We have a repository that was exported from subversion into git. This repository is used by Mac, Linux, and PC users. Needless to say the line endings are a mess. Some files end in CRLF, LF, or CR and some have a mix between all two or three in one file. Adding autocrlf = true seems to fix things slightly. However the diffs come up quit...

merging dev branch to head with only one log message

Just say you have a development branch with 100 mostly pointless commit/log messages. Is it possible to merge the dev branch to the master/head and have only one log message in the master branch? ie one log message on the head/master branch might say "Adds features XYZ" It seems there are two correct answers. Using squash allows you to ...

Using capistrano to deploy from different git branches

I am using capistrano to deploy a RoR application. The codebase is in a git repository, and branching is widely used in development. Capistrano uses deploy.rb file for it's settings, one of them being the branch to deploy from. My problem is this: let's say I create a new branch A from master. The deploy file will reference master bran...

Best way to manage non-code resources in a Git repo

At the moment I am using SVN for my projects, with a folder structure like so: /trunk /design /flash /resources /scrap /www I keep all of the website source files (psds, etc) inside the design folder, which adds up to few hundred MB or more. I do this because I am usually the only developer on a project and I regu...