Tmp corr tools

[kshedden]

Here is a rebased version of the correlation tools PR. Hopefully it is OK to merge, but let me know if there are issues.

[jseabold]

Hmm, it looks like maybe you are merging master into your branch? Have a look at the changeset for that last commit. It's got every change from master in it, which isn't right. If the commit before looks good I can rebase it for you and you can work off my branch if need be, or if you want to learn we can work through it. How exactly did you do the rebase?

[kshedden]

Help is appreciated... I tried to do as suggested in your earlier email.

Something was messed up in my master when I started this branch, hence
there are some unwanted dotplot commits at the beginning. I eventually
removed those files, but the commit messages are still there in the
history. There should be only three files affected in this PR. I checked
and I think that the files are correct and up to date. It's just the
commit history that is messed up.

On Mon, Apr 7, 2014 at 9:46 AM, Skipper Seabold notifications@github.comwrote:

Hmm, it looks like maybe you are merging master into your branch? Have a
look at the changeset for that last commit. It's got every change from
master in it, which isn't right. If the commit before looks good I can
rebase it for you and you can work off my branch if need be, or if you want
to learn we can work through it. How exactly did you do the rebase?

Reply to this email directly or view it on GitHubhttps://github.com//pull/1567#issuecomment-39690277
.

[josef-pkt]

Sorry, I had forgotten about the included dotplot commits.
This might be better done with an interactive rebase, maybe based on the original PR.

If there are no changes, git makes an "empty" commit, but I think usually the git messages still show up, unless the commit is identified as being the same as a previous commit IIRC.

The network graph shows this branch as a fork of the original and as a merge of master into it, not as a rebase.

I think we can wait for an easier rebase for Kerby to figure out some of the tricky git tricks.

I'lll look into the rebase and merge.