HiQ, any chances the attached patch reveals a git bug? Cheers,
diff -Nru old/git-bug.sh new/git-bug.sh --- old/git-bug.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/git-bug.sh 2008-09-16 09:52:18.000000000 +0200 @@ -0,0 +1,24 @@ +#!/bin/bash + +mkdir bug +cd bug +git init-db + +echo one > file1 +git add file1 +echo "Bug Test Example" | git commit --all -F - + +git checkout -b branch +echo two >> file1 +echo "Branch modification" | git commit --all -F - + +git checkout master +git mv file1 file2 + +echo "Master rename" | git commit --all -F - + +echo three >> file2 + +echo "Master modification" | git commit --all -F - + +git merge -s recursive branch
