Index: gist/README.md
===================================================================
--- gist.orig/README.md
+++ gist/README.md
@@ -1,9 +1,9 @@
-gist(1) -- upload code to https://gist.github.com
-=================================================
+gist-paste(1) -- upload code to https://gist.github.com
+=======================================================
 
 ## Synopsis
 
-The gist gem provides a `gist` command that you can use from your terminal to
+The gist gem provides a `gist-paste` command that you can use from your terminal to
 upload content to https://gist.github.com/.
 
 ## Installation
@@ -25,57 +25,57 @@ upload content to https://gist.github.co
 
 ‌To upload the contents of `a.rb` just:
 
-    gist a.rb
+    gist-paste a.rb
 
 ‌Upload multiple files:
 
-    gist a b c
-    gist *.rb
+    gist-paste a b c
+    gist-paste *.rb
 
 ‌By default it reads from STDIN, and you can set a filename with `-f`.
 
-    gist -f test.rb <a.rb
+    gist-paste -f test.rb <a.rb
 
 ‌Alternatively, you can just paste from the clipboard:
 
-    gist -P
+    gist-paste -P
 
 ‌Use `-p` to make the gist private:
 
-    gist -p a.rb
+    gist-paste -p a.rb
 
 ‌Use `-d` to add a description:
 
-    gist -d "Random rbx bug" a.rb
+    gist-paste -d "Random rbx bug" a.rb
 
 ‌You can update existing gists with `-u`:
 
-    gist -u GIST_ID FILE_NAME
-    gist -u 42f2c239d2eb57299408 test.txt
+    gist-paste -u GIST_ID FILE_NAME
+    gist-paste -u 42f2c239d2eb57299408 test.txt
 
 ‌If you'd like to copy the resulting URL to your clipboard, use `-c`.
 
-    gist -c <a.rb
+    gist-paste -c <a.rb
 
 ‌If you'd like to copy the resulting embeddable URL to your clipboard, use `-e`.
 
-    gist -e <a.rb
+    gist-paste -e <a.rb
 
 ‌And you can just ask gist to open a browser window directly with `-o`.
 
-    gist -o <a.rb
+    gist-paste -o <a.rb
 
 ‌To list (public gists or all gists for authed user) gists for user
 
-    gist -l : all gists for authed user
-    gist -l defunkt : list defunkt's public gists
+    gist-paste -l : all gists for authed user
+    gist-paste -l defunkt : list defunkt's public gists
 
 To read a gist and print it to STDOUT
 
-    gist -r GIST_ID
-    gist -r 374130
+    gist-paste -r GIST_ID
+    gist-paste -r 374130
 
-‌See `gist --help` for more detail.
+‌See `gist-paste --help` for more detail.
 
 ## Login
 
@@ -83,7 +83,7 @@ If you want to associate your gists with
 with gist. It doesn't store your username and password, it just uses them to get
 an OAuth2 token (with the "gist" permission).
 
-    gist --login
+    gist-paste --login
     Obtaining OAuth2 access_token from github.
     GitHub username: ConradIrwin
     GitHub password:
@@ -96,7 +96,7 @@ file.
 
 ‌After you've done this, you can still upload gists anonymously with `-a`.
 
-    gist -a a.rb
+    gist-paste -a a.rb
 
 #### Password-less login
 
@@ -118,7 +118,7 @@ you need to export the `GITHUB_URL` envi
 
     export GITHUB_URL=http://github.internal.example.com/
 
-Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist will
+Once you've done this and restarted your terminal (or run `source ~/.bashrc`), gist-paste will
 automatically use github enterprise instead of the public github.com
 
 Your token for GitHub Enterprise will be stored in `.gist.<protocol>.<server.name>[.<port>]` (e.g.
@@ -133,7 +133,7 @@ setting it to the public URL will not wo
 If you cannot use passwords, as most Enterprise installations do, you can generate the token via the web interface
 and then simply save the string in the correct file. Avoid line breaks or you might see:
 ```
-$ gist -l
+$ gist-paste -l
 Error: Bad credentials
 ```
 
@@ -170,12 +170,12 @@ in `~/.gist`, where it can later be read
 
 ## Configuration
 
-‌If you'd like `-o` or `-c` to be the default when you use the gist executable, add an
+‌If you'd like `-o` or `-c` to be the default when you use the gist-paste executable, add an
 alias to your `~/.bashrc` (or equivalent). For example:
 
-    alias gist='gist -c'
+    alias gist='gist-paste -c'
 
-‌If you'd prefer gist to open a different browser, then you can export the BROWSER
+‌If you'd prefer gist-paste to open a different browser, then you can export the BROWSER
 environment variable:
 
     export BROWSER=google-chrome
@@ -184,7 +184,7 @@ If clipboard or browser integration don'
 (more ideally) a pull request.
 
 If you need to use an HTTP proxy to access the internet, export the `HTTP_PROXY` or
-`http_proxy` environment variable and gist will use it.
+`http_proxy` environment variable and gist-paste will use it.
 
 ## Meta-fu
 
Index: gist/Rakefile
===================================================================
--- gist.orig/Rakefile
+++ gist/Rakefile
@@ -14,7 +14,7 @@ task :man do
   File.write "README.md.ron", File.read("README.md").gsub("\u200c", "* ")
   sh 'ronn --roff --manual="Gist manual" README.md.ron'
   rm 'README.md.ron'
-  mv 'README.1', 'build/gist.1'
+  mv 'README.1', 'build/gist-paste.1'
 end
 
 task :standalone do
Index: gist/gist.gemspec
===================================================================
--- gist.orig/gist.gemspec
+++ gist/gist.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
 
-  s.executables << 'gist'
+  s.executables << 'gist-paste'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'ronn'
Index: gist/build/gist.1
===================================================================
--- gist.orig/build/gist.1
+++ gist/build/gist.1
@@ -37,67 +37,67 @@ brew install gist
 To upload the contents of \fBa\.rb\fR just:
 .
 .IP
-gist a\.rb
+gist-paste a\.rb
 .
 .IP "\(bu" 4
 Upload multiple files:
 .
 .IP
-gist a b c gist *\.rb
+gist-paste a b c gist *\.rb
 .
 .IP "\(bu" 4
 By default it reads from STDIN, and you can set a filename with \fB\-f\fR\.
 .
 .IP
-gist \-f test\.rb <a\.rb
+gist-paste \-f test\.rb <a\.rb
 .
 .IP "\(bu" 4
 Alternatively, you can just paste from the clipboard:
 .
 .IP
-gist \-P
+gist-paste \-P
 .
 .IP "\(bu" 4
 Use \fB\-p\fR to make the gist private:
 .
 .IP
-gist \-p a\.rb
+gist-paste \-p a\.rb
 .
 .IP "\(bu" 4
 Use \fB\-d\fR to add a description:
 .
 .IP
-gist \-d "Random rbx bug" a\.rb
+gist-paste \-d "Random rbx bug" a\.rb
 .
 .IP "\(bu" 4
 You can update existing gists with \fB\-u\fR:
 .
 .IP
-gist \-u GIST_ID FILE_NAME gist \-u 42f2c239d2eb57299408 test\.txt
+gist-paste \-u GIST_ID FILE_NAME gist \-u 42f2c239d2eb57299408 test\.txt
 .
 .IP "\(bu" 4
 If you\'d like to copy the resulting URL to your clipboard, use \fB\-c\fR\.
 .
 .IP
-gist \-c <a\.rb
+gist-paste \-c <a\.rb
 .
 .IP "\(bu" 4
 If you\'d like to copy the resulting embeddable URL to your clipboard, use \fB\-e\fR\.
 .
 .IP
-gist \-e <a\.rb
+gist-paste \-e <a\.rb
 .
 .IP "\(bu" 4
 And you can just ask gist to open a browser window directly with \fB\-o\fR\.
 .
 .IP
-gist \-o <a\.rb
+gist-paste \-o <a\.rb
 .
 .IP "\(bu" 4
 To list (public gists or all gists for authed user) gists for user
 .
 .IP
-gist \-l : all gists for authed user gist \-l defunkt : list defunkt\'s public gists
+gist-paste \-l : all gists for authed user gist \-l defunkt : list defunkt\'s public gists
 .
 .IP "" 0
 .
@@ -127,7 +127,7 @@ If you want to associate your gists with
 .
 .nf
 
-gist \-\-login
+gist-paste \-\-login
 Obtaining OAuth2 access_token from github\.
 GitHub username: ConradIrwin
 GitHub password:
@@ -145,7 +145,7 @@ This token is stored in \fB~/\.gist\fR a
 After you\'ve done this, you can still upload gists anonymously with \fB\-a\fR\.
 .
 .IP
-gist \-a a\.rb
+gist-paste \-a a\.rb
 .
 .IP "" 0
 .
