[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Omaha.pm] git merge, I love you
The fact that this kind of shit Just Works is a freaking miracle.
git merge, I love you.
j
➜ Jay-Hannahs-iMac:Template2 git:(master) git remote -v
origin git@github.com:jhannah/Template2.git (fetch)
origin git@github.com:jhannah/Template2.git (push)
➜ Jay-Hannahs-iMac:Template2 git:(master) git remote add abw git@github.com:abw/Template2.git
➜ Jay-Hannahs-iMac:Template2 git:(master) git fetch abw
remote: Counting objects: 106, done.
remote: Compressing objects: 100% (39/39), done.
remote: Total 64 (delta 49), reused 39 (delta 25)
Unpacking objects: 100% (64/64), done.
From github.com:abw/Template2
* [new branch] master -> abw/master
➜ Jay-Hannahs-iMac:Template2 git:(master) git merge --ff-only abw/master
Updating 4aceb01..0ab6797
Fast-forward
Changes | 27 ++++++++++++++++++++------
HACKING | 8 ++++----
INSTALL | 22 +++++++++++-----------
README | 11 +++++++----
lib/Template.pm | 8 ++++----
lib/Template/Base.pm | 4 ++--
lib/Template/Config.pm | 9 +++++----
lib/Template/Constants.pm | 4 ++--
lib/Template/Context.pm | 6 +++---
lib/Template/Directive.pm | 2 +-
lib/Template/Document.pm | 4 ++--
lib/Template/FAQ.pod | 2 +-
lib/Template/Filters.pm | 2 +-
lib/Template/Iterator.pm | 2 +-
lib/Template/Manual.pod | 2 +-
lib/Template/Manual/Config.pod | 8 ++++----
lib/Template/Manual/Credits.pod | 22 ++++++++++++----------
lib/Template/Manual/Directives.pod | 10 +++++-----
lib/Template/Manual/Internals.pod | 77 ++++++++++++---------------------------------------------------------------
lib/Template/Manual/Plugins.pod | 4 ++--
lib/Template/Manual/Views.pod | 6 +++---
lib/Template/Parser.pm | 8 ++++----
lib/Template/Plugin.pm | 2 +-
lib/Template/Plugin/Assert.pm | 2 +-
lib/Template/Plugin/Filter.pm | 2 +-
lib/Template/Plugin/HTML.pm | 2 +-
lib/Template/Plugin/Image.pm | 4 ++--
lib/Template/Plugin/String.pm | 4 ++--
lib/Template/Plugin/Table.pm | 2 +-
lib/Template/Provider.pm | 4 ++--
lib/Template/Stash.pm | 6 +++---
lib/Template/Tutorial/Datafile.pod | 6 +++---
lib/Template/Tutorial/Web.pod | 2 +-
lib/Template/VMethods.pm | 19 +++++++++++++++++++
lib/Template/View.pm | 6 +++---
35 files changed, 148 insertions(+), 161 deletions(-)