git_pr 0.0.3.beta2 → 0.0.3.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f007a6246a5d8188043fa4f245f508ff49346647
-  data.tar.gz: 6dba6dd1e4fe153a0b7258af176dc901d2d9750b
+  metadata.gz: 500d2550b8280131e32a0c1eff8e2057df2191d9
+  data.tar.gz: 5d7efd26e444627c7f9f335a6d5751022bc0c182
 SHA512:
-  metadata.gz: 8fc6a3bc87581d4d6f761a3436e00ff5eaf1910eeecfa64e3ca7906f9c9b3693aee52ee2aeffd7ad3d6a4687e91bcf09dfa7b9661ce36dd9820585567f32a50b
-  data.tar.gz: da8fcf7f4e3e23e3dc98240103d4923910ef6842e6d6acfe09105c88f00ec27ae36b82d3ee83d095e309dfa6cb9b2fe718878af12eb8503db33742ec97156037
+  metadata.gz: 9135813b87b365b3fba2f2728eed74d4490ac57c26270f3fa6fbda853667a2ddce57d2932176e7fea45f5f828d034726438edbc2de32ef7c2f24b9f33ba589c7
+  data.tar.gz: 6bbd1731bf4ca6fc4fff49bc6fc63065b9dde359c0a26e5be3f7bb38e9523d1806b0b9cf53367c05d37183a9b02cb54c0a8ac64bc0d8ef9b41090e8f0f136cbb

data/bin/git-pr

@@ -43,7 +43,9 @@ eos
           "--project [REMOTE|PROJECT]",
           "The GitHub project to access. Can be a named remote, or a GitHub project in",
           "<user>/<project> form. Defaults to the GitHub project that the \"origin\"",
-          "or \"upstream\" remote points to.") do |project|
+          "or \"upstream\" remote points to. You can override the default remote",
+          "with git config. Run: 'git config --add pr.defaultremote <remote_name>'"
+          ) do |project|
     options.project = project
   end
   opts.on("-h", "--help", "Show help") do
@@ -60,6 +62,8 @@ eos
   opts.separator <<eos
 
 Valid subcommands:
+    diff: Use "git diff" to display a diff for a pull request
+    difftool: Like "diff", but uses "git difftool" instead
     merge: Merge and close a pull request
     list: List open pull requests
 

data/lib/git_pr/github.rb

@@ -81,8 +81,12 @@ module GitPr
     def self.determine_project_name_from_command_line git, project_name, default_remotes
       # Figure out what GitHub project we're dealing with. First, did they pass us a name of
       # an existing remote, or did they pass a GitHub project?
+      default_remote_from_gitconfig = git.config "pr.defaultremote"
       if project_name
         project_remote = git.remotes.find { |x| x.name == project_name }
+      elsif default_remote_from_gitconfig
+        puts "Using pr.defaultremote setting '#{default_remote_from_gitconfig}' from gitconfig" if $verbose
+        project_remote = git.remotes.find { |x| x.name == default_remote_from_gitconfig }
       else
         project_remote = git.remotes.find { |x| default_remotes.include? x.name }
       end

data/lib/git_pr/version.rb

@@ -1,3 +1,3 @@
 module GitPr
-  VERSION = "0.0.3.beta2"
+  VERSION = "0.0.3.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_pr
 version: !ruby/object:Gem::Version
-  version: 0.0.3.beta2
+  version: 0.0.3.beta3
 platform: ruby
 authors:
 - Brian Sharon