git-notary 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bc3c85919493ebeba10a5a6cf9c9dfe019aef2
-  data.tar.gz: ed249b61fbf7d34bee76f79e5823bb728885bf9a
+  metadata.gz: cd13c449b8a349832f681f3a33aaa10b0bdccca4
+  data.tar.gz: ae987bf0934e143e5c96f8e0642d50dd5f57e78e
 SHA512:
-  metadata.gz: d32339385bed770bf8db4e134de7eed35d67f16262d472e2664bf1beea3925c6ec4db736ad6baf0e88da8bc837d1db0ee0cbaef0eaefb846699413f2cc35b645
-  data.tar.gz: ae9e115bd46b960ad43eb26cd37acde89669cc72dd9f256fa6cdc1104ecf2a902240c710566e5df430824c534941550bd9192dbadc8983b0e2e7b820a6ebb71c
+  metadata.gz: 58a5e5bcfbcdc9ae335b1fc5ce6260665d70dc901a50ba745ff63dde760b66bdcd6cb5db1087cfe0a2e294a66c04fc573d7dfe7f8b9e88e973434140b051313e
+  data.tar.gz: fc43ab5e9dc9b1fc3be894220d8250aa6b518b4ded93f9a98e0979f21e28c8221cdb15468d2b613127f4ed47e023c8c052f28c1b6396f1c36f459c7ea3041e8d

data/bin/git-notary

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GIT_NOTARY_VERSION=2.2.1
+GIT_NOTARY_VERSION=2.3.0
 GIT_NOTARY_NAMESPACE=${GIT_NOTARY_NAMESPACE:-'versioning'}
 
 # notes [branch] [base] [namespace]
@@ -130,6 +130,16 @@ fetch() {
     git fetch ${REMOTE} ${FORCE}refs/notes/${NAMESPACE}:refs/notes/${NAMESPACE}
 }
 
+# pull [remote] [namespace] [strategy]
+pull() {
+    REMOTE=${1:-'origin'}
+    NAMESPACE=${2:-${GIT_NOTARY_NAMESPACE}}
+    STRATEGY=${3:-'theirs'}
+
+    git fetch  ${REMOTE} refs/notes/${NAMESPACE}
+    env GIT_NOTES_REF=refs/notes/${NAMESPACE} git notes merge -s ${STRATEGY} FETCH_HEAD
+}
+
 # push [remote] [namespace]
 push() {
     REMOTE=${1:-'origin'}
@@ -230,6 +240,8 @@ notary() {
             push ${@};;
         f|fetch)
             fetch ${@};;
+        fm|fetch-merge|pull)
+            pull ${@};;
         M|major)
             new MAJOR ${@};;
         m|minor)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-notary
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Chris Olstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: chris@olstrom.com