Closed kchr closed 10 years ago
Thank you!
I've merged it manually from the terminal, after a rebase.
Basically if you have a branch that you are working on, and have some commits like "oops forgot that" that you don't want to keep around, you can do
git rebase -i master
It will rebase the branch on master and also ask you which commits you intend to keep or discard.
You can pick
the interesting ones and squash
the others. They will be merged to the interesting ones.
Thanks again.
On Sun, Feb 16, 2014 at 02:05:43AM -0800, ltworf wrote:
Thank you!
I've merged it manually from the terminal, after a rebase.
Awesome! Quick response
Basically if you have a branch that you are working on, and have some commits like "oops forgot that" that you don't want to keep around, you can do
git rebase -i master It will rebase the branch on master and also ask you which commits you intend to keep or discard. You can `pick` the interesting ones and `squash` the others. They will be merged to the interesting ones.
Ah, I was scoping the manuals and git book for an example of how to do that; rebasing never crossed my mind since i've written it off as something used to split/manage way larger repos...
Thanks for clarifying this voodoo part of git, makes totally sense :-)
One learns something new every day, let's keep it that way <3
Regards, kchr
For more reliable (and standardized) JSON decoding of responses, I removed the callback parameter that were sent with all requests. This parameter creates a JS function scope around the response data, which is supposed to be passed to a browser handler when done, in some capacity.
When this was removed, the additional substr massage of response data went along as well.
As a bonus I also added parsing of datetime parameter in the board method.
This pull request should be updated with the latest HEAD from ltworf/master.