Tag Archives: Git

msysGit Tip: Files Constantly Reported as Modified Fix

Posted by on 18 July, 2009 6 comments | Views: 575

I copied my Mono mcs Git working copy from Linux to Windows for use with MSysGit only to find out that even after git reset –hard almost all files were being reported as modified by git status. It turns out …

Read more »

Git bisect – the awesome way to find the Mr. Bug commit

Posted by on 27 March, 2009 5 comments | Views: 6,571

I had my first experience with git bisect the other day and it’s awesome. What happened is that I introduced a regression which was uncovered by a failing test. Yes,  yes I know I should have ran the full test …

Read more »

Git automatic smart ChangeLog merging

Posted by on 19 March, 2009 No comments | Views: 726

This might be old news for some, but there is a merge driver for Git that can automatically perform smart merges of ChangeLogs. I’ve used it for months now and it has always worked flawlessly. 1) Install git-merge-changelog which is …

Read more »

Selective import of SVN branches into a git/git-svn repository

Posted by on 15 January, 2009 6 comments | Views: 4,307

Use Case You are using Git and git-svn on a big project which has lots of branches and tags but you only need to work with a small selection of those and you don’t want to import all of the …

Read more »