RE: new file leaked onto release branch
- From
Brown, Len <len.brown@intel.com>
- Date
- Dec 14, 2005, 18:27 UTC
- Message-ID
- <F7DC2337C7631D4386A2DF6E8FB22B300567F3B8@hdsmsx401.amr.corp.intel.com>
>Len, how old a git are you using? "git-merge" really should >_never_ have done this, but old (and I mean really old) >git merges sometimes got confused with the base parent >and would create a merge even when it was unnecessary.
should be the top of tree on the day the merge was made.
I generally pull from git://git.kernel.org/pub/scm/git/git.git at the beginning of the day, build it and install it.
Right now git --version answers 0.99.9.GIT
-Len