git-up 0.5.7 → 0.5.8

data/README.md

@@ -1,9 +1,12 @@
 git-up
 ======
 
-So `git pull` merges by default, when it [should really rebase](http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html). You can [ask it to rebase instead](http://d.strelau.net/post/47338904/git-pull-rebase-by-default), but it still won't touch anything other than the currently checked-out branch. If you're tracking a bunch of remote branches, you'll get non-fast-forward complaints next time you push.
+`git pull` has two problems:
 
-Solve it once and for all:
+* It merges upstream changes by default, when it's really more polite to [rebase over them](http://www.gitready.com/advanced/2009/02/11/pull-with-rebase.html), unless your collaborators enjoy a commit graph that looks like bedhead.
+* It only updates the branch you're currently on, which means `git push` will shout at you for being behind on branches you don't particularly care about right now.
+
+Solve them once and for all:
 
 ![gem install git-up](http://dl.dropbox.com/u/166030/nonsense/git-up.png)
 
@@ -46,6 +49,10 @@ Normally, `git-up` will only fetch remotes for which there is at least one local
 
 If this option is set, its contents will be used by `git-up` as additional arguments when it calls `git rebase`. For example, setting this to `--preserve-merges` will recreate your merge commits in the rebased branch.
 
+### `git-up.rebase.auto [true|false]`
+
+If this option is set to false, `git-up` will not rebase branches for you. Instead, it will print a message saying they are diverged and let you handle rebasing them later. This can be useful if you have a lot of in-progress work that you don't want to deal with at once, but still want to update other branches.
+
 ### `git-up.rebase.log-hook "COMMAND"`
 
 Runs COMMAND every time a branch is rebased or fast-forwarded, with the old head as $1 and the new head as $2. This can be used to view logs or diffs of incoming changes. For example: `'echo "changes on $1:"; git log --oneline --decorate $1..$2'`

data/lib/git-up.rb

@@ -29,11 +29,6 @@ class GitUp
   def rebase_all_branches
     col_width = branches.map { |b| b.name.length }.max + 1
 
-    branches.sort_by! do |b|
-      # perhaps add some way to customize sorting?
-      b.name
-    end
-
     branches.each do |branch|
       remote = remote_map[branch.name]
 
@@ -53,6 +48,9 @@ class GitUp
 
       if base == branch.commit.sha
         puts "fast-forwarding...".yellow
+      elsif config("rebase.auto") == 'false'
+        puts "diverged".red
+        next
       else
         puts "rebasing...".yellow
       end
@@ -79,7 +77,7 @@ class GitUp
   end
 
   def branches
-    @branches ||= repo.branches.select { |b| remote_map.has_key?(b.name) }
+    @branches ||= repo.branches.select { |b| remote_map.has_key?(b.name) }.sort_by { |b| b.name }
   end
 
   def remotes

data/lib/git-up/version.rb

@@ -1,3 +1,3 @@
 class GitUp
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-up
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70162618687840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,15 +24,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70162618687840
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70162618687340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -40,15 +35,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *70162618687340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70162618686920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,12 +46,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70162618686920
 description: 
 email:
 - aanand.prasad@gmail.com
@@ -96,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: git command to fetch and rebase all branches