Can you explain why you did a fast forward only merge? I almost always do my merges/pulls as --no-ff in order to preserve history, especially when it comes to branches. At least that's how I understood things to work.<div><br></div><div>And yes, git is pretty freaking awesome. Joel Splosky said it was arguably the greatest advance in software development in the past 10 years. I didn't believe him at first, but it didn't take long to see his point.</div><div><br></div><div>Michael</div><div><br><br>On Wednesday, July 24, 2013 8:29:08 AM UTC-5, jay.hannah wrote:<blockquote class="gmail_quote" style="margin: 0;margin-left: 0.8ex;border-left: 1px #ccc solid;padding-left: 1ex;">The fact that this kind of shit Just Works is a freaking miracle.
<br>
<br>git merge, I love you.
<br>
<br>j
<br>
<br>
<br>
<br>➜ Jay-Hannahs-iMac:Template2 git:(master) git remote -v
<br>origin git@github.com:j<wbr>hannah/Template2.git (fetch)
<br>origin git@github.com:j<wbr>hannah/Template2.git (push)
<br>➜ Jay-Hannahs-iMac:Template2 git:(master) git remote add abw git@github.com:abw/Template2.<wbr>git
<br>➜ Jay-Hannahs-iMac:Template2 git:(master) git fetch abw
<br>remote: Counting objects: 106, done.
<br>remote: Compressing objects: 100% (39/39), done.
<br>remote: Total 64 (delta 49), reused 39 (delta 25)
<br>Unpacking objects: 100% (64/64), done.
<br>From github.com:abw/Template2
<br> * [new branch] master -> abw/master
<br>➜ Jay-Hannahs-iMac:Template2 git:(master) git merge --ff-only abw/master
<br>Updating 4aceb01..0ab6797
<br>Fast-forward
<br> Changes | 27 ++++++++++++++++++++------
<br> HACKING | 8 ++++----
<br> INSTALL | 22 +++++++++++-----------
<br> README | 11 +++++++----
<br> lib/Template.pm | 8 ++++----
<br> lib/Template/Base.pm | 4 ++--
<br> lib/Template/Config.pm | 9 +++++----
<br> lib/Template/Constants.pm | 4 ++--
<br> lib/Template/Context.pm | 6 +++---
<br> lib/Template/Directive.pm | 2 +-
<br> lib/Template/Document.pm | 4 ++--
<br> lib/Template/FAQ.pod | 2 +-
<br> lib/Template/Filters.pm | 2 +-
<br> lib/Template/Iterator.pm | 2 +-
<br> lib/Template/Manual.pod | 2 +-
<br> lib/Template/Manual/Config.<wbr>pod | 8 ++++----
<br> lib/Template/Manual/Credits.<wbr>pod | 22 ++++++++++++----------
<br> lib/Template/Manual/<wbr>Directives.pod | 10 +++++-----
<br> lib/Template/Manual/<wbr>Internals.pod | 77 ++++++++++++------------------<wbr>------------------------------<wbr>---------------
<br> lib/Template/Manual/Plugins.<wbr>pod | 4 ++--
<br> lib/Template/Manual/Views.pod | 6 +++---
<br> lib/Template/Parser.pm | 8 ++++----
<br> lib/Template/Plugin.pm | 2 +-
<br> lib/Template/Plugin/Assert.pm | 2 +-
<br> lib/Template/Plugin/Filter.pm | 2 +-
<br> lib/Template/Plugin/HTML.pm | 2 +-
<br> lib/Template/Plugin/Image.pm | 4 ++--
<br> lib/Template/Plugin/String.pm | 4 ++--
<br> lib/Template/Plugin/Table.pm | 2 +-
<br> lib/Template/Provider.pm | 4 ++--
<br> lib/Template/Stash.pm | 6 +++---
<br> lib/Template/Tutorial/<wbr>Datafile.pod | 6 +++---
<br> lib/Template/Tutorial/Web.pod | 2 +-
<br> lib/Template/VMethods.pm | 19 +++++++++++++++++++
<br> lib/Template/View.pm | 6 +++---
<br> 35 files changed, 148 insertions(+), 161 deletions(-)
<br>
<br>
<br>
<br>
<br></blockquote></div>