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.
![Write Better JavaScript with Promises]()
You've probably heard the talk around the water cooler about how promises are the future. All of the cool kids are using them, but you don't see what makes them so special. Can't you just use a callback? What's the big deal? In this article, we'll...
![Welcome to My New Office]()
My first professional web development was at a small print shop where I sat in a windowless cubical all day. I suffered that boxed in environment for almost five years before I was able to find a remote job where I worked from home. The first...
![background-size Matters]()
It's something that makes all men live in fear, and are often uncertain of. It's never spoken, but the curiosity is always there. Nine out of ten women agree in the affirmative. Advertisers do their best to make us feel inadequate but...
![HTML5 Placeholder Styling with CSS]()
Last week I showed you how you could style selected text with CSS. I've searched for more interesting CSS style properties and found another: INPUT placeholder styling. Let me show you how to style placeholder text within INPUTelements with some unique CSS code.
The CSS
Firefox...
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.