git commit –amend -m “your new message”

Further, _any_ commit can be changed with the right commands. But that’s dangerous and breaks history (if others pulled from you)

No related posts.

1. Get hg-fast-export: git clone git://repo.or.cz/fast-export.git
2. Go to your mercurial [sic!] repo.
3. git init
4. /path/to/hg-fast-export.sh -r /path/to/hg_repo
5. win! add remaining files, commit and push to github!

And if you are using macports you probably get this error instead:
ImportError: No module named mercurial
That’s easy to fix. Add this to your ~/.bash_profile:
[CC lang="bash"]
export LC_CTYPE=en_US.UTF-8
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
export PYTHONPATH=/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages:/opt/local/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/mercurial:$PYTHONPATH
[/CC]
got that from here and the ImportError-fix from here.

Related posts:

1. git and cvs turnaround ‘guerilla style’
2. Fix man-pages in mac os & macports

• Create your dir of choice
• git init
• git svn init -T  <svnrepo>
• git svn fetch
• git gc (to speed things up)
• git remote add origin <yourgitpushurl>
• git push origin master

Keep stuff in sync

• git svn rebase
• git push origin master

That’s it, folks! Now you can be a cool GitHubber
Yeah, works for any other git repo too… btw here’s the original source.

Related posts:

1. Git! Git!
2. Github… love hate relationship
3. git and cvs turnaround ‘guerilla style’

Can’t they just make it fast???

Related posts:

1. How to Mirror an SVN repository on GitHub
2. The Vendor Client relationship – in real world situations

Here’s how to set-up globally a set of excludes when using GIT, in this case setting up GIT to ignore .DS_Store files on a Mac.

First add a common ignore file to the GIT configuration, in this case stored in the users home directory called .gitignore

NOTE: you’ll need to use the Terminal application found in the Utilities directory of the Applications folder on your Mac to run these commands.

git config --global core.excludesfile ~/.gitignore

Next add the exclude line for .DS_Store to the .gitignore file either with your favourite editor or simply with this command which will create it if it doesn’t already exist as well.

echo .DS_Store >> ~/.gitignore

Your done!

Related posts:

1. Use Xcode+git to automatically version your apps
2. Managing your dot files with git

Remember (to myself)

[CC]
git reset –soft HEAD^ Undo commit & keep changes in the working tree
git reset –hard HEAD^ Reset the working tree to the last commit
[/CC]

Get the git magic! (or the pdf)

Theres also the Git Community Book

Related posts:

1. git and cvs turnaround ‘guerilla style’

This is about some real-life experience using git (for developing) and cvs (because you have to). Why? Because git is faster, easier, you are no longer dependent on a server and it’s just cool to leave stone age. I’m so sorry, Charlie

Preparations

I assume you have a working environment where git, cvs, cvsps is installed. (use cygwin, macports, apt-get, …) If you access your cvs repository over ssh (:ext:), you have to set-up a public key for ssh-agent (git-cvsimport wants to log in without password request, and you’ll love it, too).

Create a git repository from cvs

If you are like me and connect via ssh, you should add this line to your ~/.bashrc – you’ll need it every time you make a rebase. (Or just export the variable for now)

[CC]
export CVS_RSH=ssh
[/CC]

Next, cd into the directory where you want your git repo.

[CC]
export CVSROOT=:ext:username@server:/directory/dir/dir
mkdir myproject.git
git cvsimport -v -r cvs -k -d $CVSROOT myproject
[/CC]

You can read all git cvsimport-options on the manpage. The initial import may take a while, so get a coffee while it’s working.

Tweaking the Config

Setup some more cvs infos for git. (Type this in the console and it goes straight to .git/config – you can edit there anytime)

[CC]
git config cvsimport.module cvs_module_to_checkout
git config cvsimport.r cvs
git config cvsimport.d $CVSROOT
[/CC]

Incremential Imports

Make sure you are in the git root dir and on the master branch.
[CC]
git cvsimport
[/CC]

Code in git!

Work in your git repo. Always use a branch & checkin often. (see: The Git development cycle)

Get the changes back into CVS

You wanna be nice to Charlie? git cvsexportcommit is your friend. It exports A SINGLE commit back to cvs.

Before you export commits, you need a fresh cvs directory of your project. So find a convenient location and checkout in cvs:

[CC]
cvs init
cvs co myproject
[/CC]

Then tell git where this checkout can be found (use pwd to get the full dir)

[CC]
# within your git project directory
git config cvsexportcommit.cvsdir /path/to/your/cvs/checkout/withmodule/
[/CC]

Now we prepared everything. Note, as of git 1.5.6 you can combine both your git and your cvs directory with the option -W. Read this for more info.

To export a single commit from git->cvs you can use this:

[CC]
git cvsexportcommit -u -p -c 987654 (your sha-1 commit id)
[/CC]

But you committed often, didn’t you? If you developed your feature in a branch and are about to merge, you can do it this way:

[CC]
git checkout master
git merge –no-ff –log -m “Optional commit message here” topic/branch/name
git cvsexportcommit -u -p -c ORIG_HEAD HEAD
[/CC]

Your branch is now merged and you can delete it with

[CC]
git branch -D new_branch
[/CC]

Need more Information? Stackoverflow has an excellent article!

Update: You can automate this with a script. I put it in /opt/local/bin/gce

[CC]
#!/bin/sh
#
# Export a branch from git to CVS.
if test -z “$1″; then
echo Incorrect number of arguments
exit 1
fi

git checkout master
git merge –no-ff –log $1
git cvsexportcommit -u -p -c ORIG_HEAD HEAD
[/CC]

Make it executable:

[CC]
sudo chmod /opt/local/bin/gce +x
[/CC]

Now you can commit that way:

[CC]
gce my_branch
[/CC]

Related posts:

1. Convert mercurial repos to git
2. Git Aliases for bash