Git : Why Do I See Previously Committed Changes?

I made a mistake with my git repositories(edited files from the “main” one), and I had to use “git push -f” to force my “main” repository to accept my local revision. I went back to my remote main repository and did a git status. I see that the changes to be committed are old and […]

SSH problem using Netbeans and Git

I have looked at the other posts from the other folks regarding this issue but I still have problems getting ssh to work with netbeans & git on windows 7. I am new to git so I am sure I am missing something somewhere. I have done init git on my Ubuntu server. I have […]

Problem converting git to mercurial

I’m getting an error trying to convert a git repository to mercurial. When I run: hg convert gitdir hgdir I get this: UnboundLocalError: local variable ‘tz’ referenced before assignment Background: I just installed TortoiseHg and enabled the convert extension. It looks like nmercurial convert is having a problem with the git repository. I’ve been managing […]

Problems cloning a git repository (Newbie problems)

Trying to set-up a git server on my local dev machine and have been following this website so far but am a little stuck when trying to clone a repository. In git bash, here’s my output: $ git clone ssh://Administrator@ Initialized empty Git repository in C:/Git/project1/.git/ Permission denied (publickey,keyboard-interactive). fatal: The remote end hung up […]

Git – “shorthand” for hashes not working?

Anyone know why this could be? $ git log –pretty=oneline –abrev-commit adaa8c4 added a third line 6f80266 added a second line 9c631a4 initial commit $ git checkout 9c $ error: pathspec ‘9c’ did not match any file(s) known to git. $ git checkout 9c631a4 …works… I was under the impression that I was supposed to […]

understanding commit and merge

I am a little bit confused as to how a branch needs to be merged once work is completed. So I have created a repo which has the following: I’ve based each branch according to issue/feature. Master Development branch-1 – jira issue 1 branch-2 – jira issue 2 branch-3 – jira issue 3 branch-4 – […]

Use odt2txt for Diff on Gitweb

I followed the instructions here and I cannot get them to work. I am using Git and Gitweb 1.7.5 on shared hosting, custom compiled and deployed using GNU Stow but basically following this howto on Dreamhost (just forked, no modifications made to reflect Stow and other stuff). Essentially I modfied my ~/.gitconfig and /path/to/repo/.gitattributes and/or […]

How do I cleanup remote git branches that have already been merged?

I have a few repos that I want to clean up, and they have hundreds of branches that have already been merged to master. This is what I have so far git branch -r –merged | grep -v master | xargs git push origin –delete The issue I haven’t been able to get past is […]

osx – gitolite: login with git user from terminal

I have gitolite running on my OSX Snow Leopard server, with my git user and all is going right. I have a web server here so I need to pull from the server itself and I have no problem doing it from the server. But what I want to do is to be able to […]

Are there any caveats of using a git repository inside another git repository? Is it considered as a good practice?

(I know there are some similar questions but I think none apply exactly to this one, so I decided to ask it.) I never did repository nesting myself, but I’m in a situation that it would become handy. I just would like to know if there is any kind of know caveat it can cause […]

Git Baby is a git and github fan, let's start git clone.