RE: proper way to merge?

===Re:=== Huh? filter-branch *is* in msysgit. Why do you think it is not? ===end===

Because when I tried it I got " git: 'filter-branch' is not a git-command. See 'git --help'." Then I looked in the Git installation directory and did not find any file with that name. Then I looked at the ReleaseNotes.rtf file in the top of the Git installation tree and saw, " * Some commands are not yet supported on Windows and excluded from the installation; namely: git archimport, git cvsexportcommit, git cvsimport, git cvsserver, git filter-branch, git instaweb, git send-email, git shell, git svn."

So I wonder why you think it *is* in msysgit? This is the latest version from their site.

--John (please excuse the footer; it's not my idea)

TradeStation Group, Inc. is a publicly-traded holding company (NASDAQ GS: TRAD) of three operating subsidiaries, TradeStation Securities, Inc. (Member NYSE, FINRA, SIPC and NFA), TradeStation Technologies, Inc., a trading software and subscription company, and TradeStation Europe Limited, a United Kingdom, FSA-authorized introducing brokerage firm. None of these companies provides trading or investment advice, recommendations or endorsements of any kind. The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited.
  If you received this in error, please contact the sender and delete the material from any computer.