latest 5 messages by swills
+
[2017-05-18T15:05:05Z]
swills
just discovered that github.com is still not accessible via IPv6. :(
+
[2014-12-08T03:22:03Z]
swills
well, commit --amend and push got it to go, but there's something i'm not getting here.
+
[2014-12-08T03:19:04Z]
swills
ok, so i've created a branch based on where upstream was when i did my work, created and checked out a new branch and cherry picked my work onto that branch. now git says there's nothing to commit. i'm confused.
+
[2014-12-08T02:53:07Z]
swills
so from what i gather, the only way to sort this out is either for me to create all changes i want merged in a branch ahead of time or for the merger to cherry pick my changes. is that right?
+
[2014-12-08T02:34:22Z]
swills
can someone look at this pull request and tell me what i need to do to make it not include already merged commits and my merge of that? https://github.com/swills/manatee/compare/joyent:master...master