git

Net Start SSHD HELPMSG 3534

Hi Guys, I am trying to setup git on windows box - and so far all appears to be working ... except this :) net start shhd - gets the error NETHELPSMG 3534 When I type cygrunsrv --start sshd I get - QueryServiceStatus: Win32 error 1062 Any ideas how to fix this ? ...

Why "git push helloworld +master:master" instead of just "git push helloworld"?

I tried to push my (first ever!) git repo like this initially: $ git push helloworld But I got this back: To [email protected]:helloworld.git ! [rejected] HEAD -> master (non-fast forward) error: failed to push some refs to '[email protected]:helloworld git' So I found another StackO...

Git smudge filter

I am trying to setup a filter so that on checkout it will inject some git related information to my file and on commit it will remove this information. I have verified that when I commit the file it is properly cleaned. Also if I delete the file and then do a checkout the file is properly smudged. My problem is the following. If I make ...

Git hangs with 100% cpu usage (it was disk issue)

There are some operations that hang on one of my repositories: git gc: hangs with 100% usage at "Counting objects: 7409" when I launch gitk, it launches this command, which also hangs with 100% CPU usage: git log --no-color -z --pretty=raw --parents --boundary 6ca9fbc0393cbc05e6ef7d67768ff1570e3fc42e 5741492043ebbc19013baf8c1c162b32b0...

Git Setup on Windows

Hi Guys, So on my friends local Windows machine we are trying to setup GIT. Basically, we've been following this guide which has been great. The problem we are facing is as follows: All works until we get to Using Gitosis When we use the command git clone git@INSERT_IP_HERE:gitosis-admin.git We keep getting Initialized...

Which open-source git hosting software should I install on my company's intranet?

Instead of hosting my company's source code on Github, I would like to host it on our intranet under our control. What software could I use to simulate the same kinds of Git-based source-control features that are offered by sites like Github? Ideally this solution would be associated with a Ruby-based web application. ...

Git rebase / merge for public releases

I've been digging through the git merge and rebase docs, and something isn't sinking in. I'm actively working on a project in Git, and need to share specific milestones with other developers. I want to share the code exactly as it is at each milestone / release, but not all of my small commits leading up to each release. How do I crea...

Transitioned from Subversion to Git, how do I push to heroku gracefully?

I had been using a Subversion for my source control, combined with git ONLY to deploy (push) to heroku. My pattern was: Update local working copy from latest master at remote subversion repository. Then do git commit and git push heroku (Git was set to ignore .svn stuff). This working copy I only used to push to heroku, I had another sub...

How to correctly preserve branch/merge history of an SVN repository when migrating to GIT

Hi everyone, I'm trying to migrate a small SVN repository w/ 2000+ revs with 10+ branches to GIT. Branches sometimes merge contents from other branches. My main choice, was obvisously to use: git svn clone -s URL However, my GIT history only preserved the branching information and never shows a merge. Having an hard time googling for...

Is there a git plugin for the Delphi IDE?

Is there some nice git-intregation that makes life easier for the Delphi IDE (2010)? ...

Setup a Git server with msysgit on Windows

My friends and I are trying to setup Git for Windows using the tutorial Git Server: Gitosis and Cygwin on Windows, but we just keep running into problems. What would a "Setup Git Server" guide for Windows using msysgit be like? There is a comment in the tutorial above suggesting it can't be done with msysgit because gitosis requires t...

git-receive-pack: command not found in Windows

Hi Guys, Wondering how to fix this problem in Windows ? When i try and use the command "git push origin master" I get git-receive-pack: command not found Any idea how I can fix this in windows ? The path to GIT is in c:/program files/Git/Bin/ but unsure how to set this ? Thx Edit: doing git--exec-path c:\Program Files...

Installed git on OS X; What should I add to my PATH?

I just installed git 1.6.4.4 after downloading a DMG package from here. I now have /usr/local/git. But it isn't in my PATH. So I need to add it. My question is, should I add just /usr/local/git/bin, or do I also need to add one or more of these other directories? $ cd /usr/local/git/ $ ls -al total 0 drwxr-xr-x 3 joefleen wheel 102...

How does bug tracker/version control integration work with typical git workflows?

Here's are examples of git workflows: http://wiki.github.com/bard/sameplace/typical-git-workflow http://www.nabble.com/Git-workflow-overview-td16340337.html http://osteele.com/archives/2008/05/my-git-workflow Let's say you wanted to take advantage of bug tracker integration with your version control system. Where/how would that f...

How to merge two git repositories containing Xcode projects

Picture the following scenario. I have an iPhone application contained in Xcode project A, and an iPhone application contained project B, each one of these Xcode projects is contained in a separate git repository. There are a bunch of things that I would like to do: Be able to create a library or Framework from parts of project B that...

How to migrate GIT repository from one server to a new one.

I have a server that I'm taking down. The only thing I have left to migrate is my repository. This server is listed as the origin (master) for one of my projects. What is the proper way to move the repository to keep the history. ...

Actually pulling with git

I have a git repo in GitHub. I've been mostly using git gui to manage it up to now, but now I'm starting to use the shell. What I want to know is, how do I fetch all the branches in a remote and merge them into the respective branches on my local repo automatically? For example, if I have branches master and development, and thus origin/...

How do I change a Git remote HEAD to point to something besides "master"

Short version: How do I set a Git remote's HEAD ref to point to something besides "master"? My project has a policy not to use a "master" branch (all branches are to have meaningful names). Furthermore, the canonical master repository is only accessible via ssh://, with no shell access (like GitHub or Unfuddle). My problem is that the ...

Which Git commit stats are easy to pull

Previously I have enjoyed TortoiseSvn's ability to generate simple commit stats for a given SVN repository. I wonder what is available in Git and am particularly interested in : Number of commits per user Number of lines changed per user activity over time (for instance aggregated weekly changes) Any ideas? ...

Github error: Repository under migration.

Hello together, There are two accounts on github I'd like to use. The first, my private one, is working correctly, I'm able to set up new repositorys, clone and push as I like. Then I signed up with a second user two days ago. It is meant to be my 'official' working account. So I try to set up some repositorys from this user. It seems ...