Hi. This week I wanted do a rebase from a branch to master in openbsd-wip. The problem is a bad commit from a unrelated branch merged in master was breaking the rebase (same problem with merge), so I only had two solutions "push --force" without the commit or broke the history of the last month and the repos of a ten of devs.
I did the former but the side effect is that git now shows to me as the commiter (the author of each change is the original) of the changes of the last month. Sorry, I've investigated the last days the better solution and I had no other option. The next "git pull" will show you this message: "master -> origin/master (forced update)" And sorry for the noise in the list. Cheers. -- Juan Francisco Cantero Hurtado http://juanfra.info
