git

What is the recommended way of vendoring rails for a production application?

Rather than using the latest Rails gem for my application, I like to have the code local in my own git repository, which means putting it in vendor/rails. There are a couple of ways of doing this: downloading the source for the particular branch/tag I want to run and committing it to my repository, or using git submodules. Submodule...

Do I need a server to use git?

If I need to get access to my files on my home computer from work or whatever, do I need to have a network server and check-in the files on there? If I'm using git, do I still need to have a server or am I actually saving files on their server? ...

How can I check out a particular version of one file in Git?

How can I check out a particular version of one file in git? I found this mail on the mailing list, which said: $ git checkout HEAD~43 Makefile $ git reset Makefile But I don't understand how to find out 'HEAD~43', if I do a git log aFile, how can I find out which 'HEAD~43' I should use? And why do I need to run git reset for that f...

git: can I subtree merge just a subpath of a repository?

Hi, I have the remotes Foo and Bar. Foo is a web application that has lots of directories, relevent amongst them is /public which cointains assorted files and other directories. Bar is a set of libraries and whatnot used on the front end, as such, it should go in /public/bar in Foo. Foo has no files there. That would all be piece of c...

Set up Gitosis, but can't clone

I've set up Gitosis on a remote Ubuntu box which I will refer to as linuxserver as my host in the following commands. I'm also connecting from a Windows box using Cygwin. I followed the instructions according to: http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way I had no problems up until I needed to clone...

Git or Subversion for a TFS user

I have been on TFS since 2005 Beta 2, installed it, admined it, and used it on a daily basis at work. I would like a source control solution for my home projects, written with Visual Studio 2008 Professional, and I cannot afford TFS. After merging, the big thing for me is the integration into Visual Studio, I have just become too accus...

capistrano problem

Hi all I am having a problem with deploying my application to my server. I have msysgit, github and capistrano installed and working. I have successfully pushed my app to github and can successfully run cap deploy:setup to setup on my server from my local machine. BUT.. When I run cap deploy:cold it asks me for my passphrase t...

Hudson git clone error

I have created free-style software project in Hudson. I want to clone a public Git repository: git://github.com/bret/watir.git Build fails with error message: Started by user anonymous Checkout:workspace / C:\Documents and Settings\Administrator\.hudson\jobs\watir\workspace - hudson.remoting.LocalChannel@1a1f370 Last Build : #4 Checko...

Browse and display files in a git repo without cloning

Is there a way to browse and display files in a git repo without cloning it first? I can do those in svn using the commands: svn ls /path/to/repo svn cat /path/to/repo/file-in-repo I can supposedly use git show but doing: git show /path/to/repo git show HEAD:/path/to/repo result to fatal: Not a git repository ...

How can I move a set of commits from master to a separate branch?

I have a series of commits (20+) that pertain to a particular feature that I am trying to remove from our master branch and into a separate branch. I have a tag (rel_2009_07_18) on the commit that represents our latest stable release, so when on master, git log rel_2009_07_18..HEAD gets me the set of commits that I want to move to a sep...

How can I put a WebDAV filesystem in my DVCS when I can't write to the root?

I have WebDAV access to a filesystem where I can't write to the root of the filesystem, but can write to 2 folders beneath it. I'd like to: track my changes in a single DVCS repo (git/hg preferred) work directly on the WebDAV connection rather than constantly pulling changes into it (this would hurt my workflow quite a bit) Assume th...

Is there an opposite of 'git status' command

Hi, I use the 'git status' command to find out what I change locally in my git working directory. But is there an 'opposite' of that command? What I mean is I would like to find out what others have checkin to my remote/tracking branch (I am not sure if remote branch is same as tracking branch, in git) but these changes are not here in ...

Disappearing head in git repo

Hello. I've faced strange problem with my git repo. In process of cloning it looses all it's heads except master. Isn't head is just a file-reference to the commit id? Or it should be registered somewhere else to be cloned? It looks exactly as William Pursell described: cd a $ git branch master * test $ cd .. $ git clone a b...

git status takes a long time to complete

I'm using git to manage files in a local directory on a windows machine - no network is involved here, I'm not pushing or pulling to/from another machine. My directory has maybe 100 files in it, all test files, pretty small. When I run "git status", it regularly takes 20-30 seconds to complete. Is this normal? Is there anything I can...

Need help with Git commands for development workflow

I've been using Git as source code management tool. For now my workflow is simple: think about a minimal new feature/refactoring code it review the diff with HEAD commit I would like to improve this workflow, by making it more flexible. The reason is that I've encountered the following situation a couple of times, which I think is a ...

Getting existing git branches to track remote branches.

My usual workflow when working with git, is something like this: create a local repository do some work in that repository, add/change files etc. decide that I want a central remote location for the repository, and create one push all the commits from my local repository to this new remote repository Now, however, I want to be able t...

How to modify a specified commit?

I usually submit a list of commits for review, so I have a problem: If I have commit1, commit2,commit3, head. I know that I can modify head commit with git commit --amend, but how can I modify commit1 that is not head commit. ...

Is there a way to configure some central push repository to reject history changing pushes?

Is it possible? ...

CLI grammar checker for determining tense

I like to use the present tense in my Git logs (for example, "Add feature" instead of "Added feature"). Currently, I have an extremely naive Git hook that aborts the commit if the first word of the log message ends in 'ed', but I'd like a more robust solution (where 'more robust' means 'not totally lame'). Is there a grammar checker th...

Git, Windows and COM binaries

Hi I've been using git on windows in a semi-manual mode. I have several repositories for various versions. Each version has a different set of binaries so if I change versions I need to unregister the old binaries and and register the new. Previously I have simply been creating a new git repo for each version, then reg'ing/unreg'ing the...