Create a GitHub Merge Batch File
Before I start updating my local clone of the MooTools More or Core libraries, I need to update to the most current version on GitHub. Call me lazy, but I'm tired of typing the commands lines into msysgit all the time. I've created a batch file that does the work for me.
The Batch Script
git fetch git://github.com/mootools/mootools-core.git master:coco
git merge coco
What I'm doing is:
- Going out to GitHub, grabbing the current "Core", and putting it into a branch called "coco."
- Merging it with my current local copy.
Pushing it to my GitHub account.
I know that's not a lot to type, but this script lets me move things along a tiny bit faster. The "push" updates my repository at GitHub right away too. It's also probably important to mention that my operating system is Windows XP.
![9 Mind-Blowing WebGL Demos]()
As much as developers now loathe Flash, we're still playing a bit of catch up to natively duplicate the animation capabilities that Adobe's old technology provided us. Of course we have canvas, an awesome technology, one which I highlighted 9 mind-blowing demos. Another technology available...
![CSS vs. JS Animation: Which is Faster?]()
How is it possible that JavaScript-based animation has secretly always been as fast — or faster — than CSS transitions? And, how is it possible that Adobe and Google consistently release media-rich mobile sites that rival the performance of native apps?
This article serves as a point-by-point...
![Animated AJAX Record Deletion Using jQuery]()
I'm a huge fan of WordPress' method of individual article deletion. You click the delete link, the menu item animates red, and the item disappears. Here's how to achieve that functionality with jQuery JavaScript.
The PHP - Content & Header
The following snippet goes at the...
![MooTools Font-Size Scroller with Cookie Save]()
Providing users as many preferences as possible always puts a smile on the user's face. One of those important preferences is font size. I can see fine but the next guy may have difficulty with the font size I choose. That's why...
do once:
git remote add mootools git://github.com/mootools/mootools-core.git
then do:
git pull mootools master
done.
Ha Chris . .beat me too it!
And yeah, the above would be a lot easier
/Matt
Thanks for the tip Chris and Matt!
Way to automate, David :)
Laziness FTW!
I think this is mildly dangerous. Whenever you merge w/ another codebase you should ensure that the chnaged files are updating things you want. But it’s not uncommon for the changes to create merge conflicts. Having the push in your batch file means that you’re going to try and push those changes without the opportunity to review them.
For what it’s worth, I prefer to use rebase instead of merge when I can…
@Aaron Newton: Good call. Removed from my local file.
You could make a little tutorial on how to checkout, merge, commit stuff to the mootools project hehe, i would be one to appreciate it.
Thanks for sharing.