git-utils 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 865ddb9facc2194894dd11204c25524e97699025
-  data.tar.gz: 556b36d014cea2bb18826c921cb3667b2853f5d1
+  metadata.gz: a4989aaf3c2043e0352d357cc280bb2f092948b7
+  data.tar.gz: f64e3d0b193157f93789ea4bd9d9de03f192cbd7
 SHA512:
-  metadata.gz: 0d5b3eb4c2947b6f5afcb507c0434f4d16b54c141cb7c975315bfcc52ec538fdca27ce3645bfeb070604a106315b4ec06fde0a81332b43d1428f4e244cd3ea5b
-  data.tar.gz: fd1e6cfb43bcf5b825bd97c2adfc6a95bcbe831728f75b56c394fce259ac634e7dc823a153aa69332df989aa1f963e3008c6aa3a5380e85c405f72c19a99eb86
+  metadata.gz: 1acc87da702c992c97084d24b36010f81a75b76a664e49a70e596a1c6d4d3397d10cb771184d7633b646c422b8cd308defe50a3de13c06f4ab506742711473b7
+  data.tar.gz: 6cb161be0803993673827b688b0d30c0a9ca2820a7eb9283a389524fc1b861509dca611741251a75fe4ec913413aa1135a80391f1c94ccabbaed0bdecdcd4a38

data/README.md

@@ -11,9 +11,9 @@ The `git-utils` used to be pure Bash scripts, but they are now available as a Ru
 ## Commands
 
 * `git amend`: alias for `git commit --amend`
-* `git anal` (use with caution): makes a commit with the message "Make anal changes"
+* `git anal` (*use with caution*): makes a commit with the message "Make anal changes"
 * `git bump`: makes a commit with the message "Bump version number"
-* `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `staging`, and `development`)
+* `git cleanup`: deletes every branch already merged into current branch (apart from `master`, `staging`, `development`, and any branches listed in `~/.git-cleanup-preserved`)
 * `git merge-branch [branch]`: merges current branch into given branch (defaults to `master`)
 * `git open`: opens the remote page for the repo (OS X only)
 * `git polish`: makes a commit with the message "Polish"
@@ -69,15 +69,15 @@ These options can be overriden (and thus restored to their defaults) by passing
     $ git pull
     $ git checkout add-markdown-support
 
-The purpose of `git sync` is to prepare the current branch for rebasing against `master`:
+The main purpose of `git sync` is to prepare the current branch for merging with `master`:
 
     $ git sync
-    $ git rebase master
+    $ git merge master
 
 (This is essentially equivalent to
 
     $ git fetch
-    $ git rebase origin/master
+    $ git merge origin/master
 
 but I don't like having `master` and `origin/master` be different since that means you have to remember to run `git pull` on `master` some time down the line.)
 

data/bin/git-cleanup

@@ -2,8 +2,16 @@
 
 # Deletes (almost) every branch already merged into current branch.
 # Exceptions are `master`, `staging`, and `development`, and the current
-# branch, which are preserved.
-preserved = "(master|staging|development)"
-cmd  = %(git branch --merged | grep -v "\*" | egrep -v "#{preserved}" | )
+# branch, which are preserved. We also support custom configuration via the
+# `~/.git-cleanup-preserved` file.
+preserved = "master|staging|development"
+preserved_file = File.join(Dir.home, '.git-cleanup-preserved')
+if File.exist?(preserved_file)
+  additional_preserved = File.read(preserved_file).strip.split("\n")
+  unless additional_preserved.empty?
+    preserved += '|' + additional_preserved.join('|')
+  end
+end
+cmd  = %(git branch --merged | grep -v "\*" | egrep -v "(#{preserved})" | )
 cmd += 'xargs -n 1 git branch -d'
 system cmd

data/lib/git-utils/version.rb

@@ -1,5 +1,5 @@
 module Git
   module Utils
-    VERSION = "0.5.8"
+    VERSION = "0.5.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-utils
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Michael Hartl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Add some Git utilities
 email: