Git Error while merging

I have a lot of untracked files in my local git repo. Someone accidentially pushed a lot of those untracked files. Now, I want to merge origin/master and I receive: error: The following untracked working tree files would be overwritten by checkout I want that untracked files stay in my repo as untracked and I […]

In Git how can you check which repo in Github you are pushing to from the command line?

I have several projects I am working on. I am constantly pulling and pushing. Recently I made some changes to one of my files, added and committed and decided to push my project A, however it pushed into my Github Project B. I then did git pull for kicks and it this happened. branch master […]

Why can't Bundler locate this gem?

Why can’t bundler locate the Mechanize gem? The following is in my Rails project’s Gemfile: gem ‘mechanize’, :git => ‘git://’ Running bundle install throws the following error: Updating git:// Fetching source index for Could not find gem ‘mechanize (>= 0)’ in git:// (at master). Source does not contain any versions of ‘mechanize (>= 0)’ […]

How to have Heroku build my development branch on a staging server?

I have a production application on master branch running all fine on heroku. I would like to run a second Heroku application but ‘fed’ from a local staging branch. These are the commands that i’ve run in my failed attempt to do this: git checkout -b develop heroku create –remote staging git push staging develop […]

Backup a Git stash to GitHub

I want to stash work in progress, but I also want what I’ve stashed to be backed up on GitHub. Previously I’ve normally committed with a comment saying “WIP: blah blah blah”, but I’d rather commit in completed stages rather than loads of “WIP:” commits which are really just a way to backup my work […]

Import a local (existing) git repo into Aptana 3

I had installed Git, edited files with Notepad++ and used GitBash to commit my changes in some local repositories. Some of them are published to GitHub, some were cloned from project sites. But now, Notepad++ is not satisfying any more. So, I’m trying to get Aptana to work. Of course, I want to use the […]

Move git commit to new branch

With git I committed some changes and now would like to have them in a new branch. How to acchieve this is explained in several places, for example here My confusion is more related to the local/remote aspect of this task. I started by forking a repository on github to myForkOnGitHubRepo. Then I cloned that […]

extra output in zsh when define git log output format

when I try using git log –pretty=format:”%h %ad | %s%d [%an]” –graph –date=short in zsh, there’s always some extra output like: 27m/Users/tyraeltong/tmp/git-immersion/hello [n]’ –graph –date=…* b1ca0c6 2012-01-08 | Added README (HEAD, master) [Tyrael Tong] * 6844069 2012-01-08 | Added a Rakefile [Tyrael Tong] * 99430f3 2012-01-08 | Moved hello.rb to lib [Tyrael Tong] * da616c8 […]

Where to place Git repository

I just started using Git and I want to know if this is the right way of using it. I started a Rails app with: rails newapp Then I did: cd newapp git init git add . git commit -a So is it “right” to init my git inside my working directory?

how do find whether I am using 32 bit or 64 bit version of Git

I want to find out what version of Git I am running on windows- 32 bit or 64 bit. Any idea how to find that out? I am pasting whatever information I have. $ git version git version 1.7.10.msysgit.1 vkaul@NBVK ~ $ git config -l core.symlinks=false core.autocrlf=true color.diff=auto color.status=auto color.branch=auto color.interactive=true pack.packsizelimit=2g help.format=html http.sslcainfo=/bin/curl-ca-bundle.crt sendemail.smtpserver=/bin/msmtp.exe […]

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