It seems that a couple of days ago I managed to create a commit
that contained lots of changes from an earlier failed merge with
Linus.  While this left the contents of the files ok (as all the
extra changes were legitimately part of Linus' tree), it meant
that I had a commit with my Signed-off-by line that included
changes to ten files that I didn't want to change.

I've done some open-heart surgery on the test branch to fix this
(luckily I only had a few changes after this point ... and my
new strategy of having changes stashed in other branches in my
local tree made this even easier to fix).

But this does mean that anyone who has done a "git pull" from
my test branch might have some "interesting" times when they
next update from that branch.  You will definitely have some
cruft in your objects data base for all the commit objects that
I recreated when fixing this.

Sorry for any inconvenience.

-Tony
-
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to