Create a GitHub Merge Batch File

By  on  

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:

  1. Going out to GitHub, grabbing the current "Core", and putting it into a branch called "coco."
  2. Merging it with my current local copy.
  3. 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.

Recent Features

  • By
    Introducing MooTools Templated

    One major problem with creating UI components with the MooTools JavaScript framework is that there isn't a great way of allowing customization of template and ease of node creation. As of today, there are two ways of creating: new Element Madness The first way to create UI-driven...

  • By
    5 More HTML5 APIs You Didn’t Know Existed

    The HTML5 revolution has provided us some awesome JavaScript and HTML APIs.  Some are APIs we knew we've needed for years, others are cutting edge mobile and desktop helpers.  Regardless of API strength or purpose, anything to help us better do our job is a...

Incredible Demos

  • By
    Pure CSS Slide Up and Slide Down

    If I can avoid using JavaScript for element animations, I'm incredibly happy and driven to do so.  They're more efficient, don't require a JavaScript framework to manage steps, and they're more elegant.  One effect that is difficult to nail down with pure CSS is sliding up...

  • By
    MooTools FontChecker Plugin

    There's a very interesting piece of code on Google Code called FontAvailable which does a jQuery-based JavaScript check on a string to check whether or not your system has a specific font based upon its output width. I've ported this functionality to MooTools. The MooTools...

Discussion

  1. do once:
    git remote add mootools git://github.com/mootools/mootools-core.git

    then do:
    git pull mootools master

    done.

  2. Ha Chris . .beat me too it!

    And yeah, the above would be a lot easier

    /Matt

  3. Thanks for the tip Chris and Matt!

  4. Way to automate, David :)

  5. Laziness FTW!

  6. 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…

  7. @Aaron Newton: Good call. Removed from my local file.

  8. 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.

Wrap your code in <pre class="{language}"></pre> tags, link to a GitHub gist, JSFiddle fiddle, or CodePen pen to embed!