add support for microsecond periods
Hurf. I wonder if this mess can be salvaged by cherry-picking all of your commits ("manual rebase") onto master?
 Yeah, sorry about that. I should have asked before merging with upstream. How would I go about this? I thought I was past the git n00b stage, but I guess not.
 If you have to, rebase on top of upstream. Do _not_ merge
 Can you try to convert the diff into a single commit on top of master? I don't care that much about preserving the code history but would rather not have the merge commits
 So something like `git diff master 0eeff49` and then make a patch out of that, fork the current pandas git master and apply the patch then resubmit?
 Yes

Sent from my mobile device

On Jan 8, 2013, at 6:22 PM, Phillip Cloud notifications@github.com wrote:

So something like git diff master 0eeff49 and then make a patch out of
that, fork the current pandas git master and apply the patch then resubmit?

—
Reply to this email directly or view it on
GitHubhttps://github.com/pydata/pandas/pull/2662#issuecomment-12023015.
