Made rebasing local things on remote changes before commits much, much, much more...
tree069ccc03f1e1d94650eb21696f0e08ad60d83814
-rw-r--r-- 14 .gitignore
drwxr-xr-x - bin
-rwxr-xr-x 568 cvs2git-modmerge.sh