Wording tweaks; update brew instructions (fixes earwig#13)

Author: earwig

README.md

@@ -12,7 +12,7 @@ version of git and at least Python 2.7 installed.
 
 With [Homebrew](http://brew.sh/):
 
-    brew install pr0d1r2/contrib/gitup && brew link gitup
+    brew install gitup
 
 ## From source
 
@@ -85,9 +85,9 @@ By default, gitup will fetch all remotes in a repository. Pass `--current-only`
 (or `-c`) to make it only fetch the remote tracked by the current branch.
 
 gitup will _merge_ upstream branches by default unless `pull.rebase` or
-`branch.<name>.rebase` is specified in git's config. Pass `--rebase` or `-r` to
-make it always _rebase_ (like doing `git pull --rebase=preserve`). Pass
-`--merge` or `-m` to make it always merge.
+`branch.<name>.rebase` is specified in your git config. Pass `--rebase` or `-r`
+to make it always _rebase_ (this is like doing `git pull --rebase=preserve`).
+Pass `--merge` or `-m` to make it always merge.
 
 For a list of all command arguments and abbreviations:
 

gitup/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8  -*-
 #
 # Copyright (C) 2011-2015 Ben Kurtovic <[email protected]>
-# See the LICENSE file for details.
+# Released under the terms of the MIT License. See LICENSE for details.
 
 """
 gitup: the git repository updater

gitup/config.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8  -*-
 #
 # Copyright (C) 2011-2015 Ben Kurtovic <[email protected]>
-# See the LICENSE file for details.
+# Released under the terms of the MIT License. See LICENSE for details.
 
 from __future__ import print_function
 

gitup/script.py

@@ -1,26 +1,27 @@
 # -*- coding: utf-8  -*-
 #
 # Copyright (C) 2011-2015 Ben Kurtovic <[email protected]>
-# See the LICENSE file for details.
+# Released under the terms of the MIT License. See LICENSE for details.
 
 from __future__ import print_function
 
 import argparse
 
 from colorama import init as color_init, Style
 
-from . import __version__, __email__
+from . import __version__
 from .config import (get_bookmarks, add_bookmarks, delete_bookmarks,
                      list_bookmarks)
 from .update import update_bookmarks, update_directories
 
 def main():
     """Parse arguments and then call the appropriate function(s)."""
     parser = argparse.ArgumentParser(
-        description="""Easily update multiple git repositories at once.""",
+        description="Easily update multiple git repositories at once.",
         epilog="""
             Both relative and absolute paths are accepted by all arguments.
-            Questions? Comments? Email the author at {0}.""".format(__email__),
+            Direct bug reports and feature requests to:
+            https://github.com/earwig/git-repo-updater.""",
         add_help=False)
 
     group_u = parser.add_argument_group("updating repositories")
@@ -41,7 +42,7 @@ def main():
     rebase_or_merge.add_argument(
         '-r', '--rebase', action="store_true", help="""always rebase upstream
         branches instead of following `pull.rebase` and `branch.<name>.rebase`
-        in git config (like `git pull --rebase=preserve`)""")
+        in git config (behaves like `git pull --rebase=preserve`)""")
     rebase_or_merge.add_argument(
         '-m', '--merge', action="store_true", help="""like --rebase, but merge
         instead""")
@@ -59,7 +60,7 @@ def main():
         '-h', '--help', action="help", help="show this help message and exit")
     group_m.add_argument(
         '-v', '--version', action="version",
-        version="gitup version " + __version__)
+        version="gitup " + __version__)
 
     color_init(autoreset=True)
     args = parser.parse_args()

gitup/update.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8  -*-
 #
 # Copyright (C) 2011-2015 Ben Kurtovic <[email protected]>
-# See the LICENSE file for details.
+# Released under the terms of the MIT License. See LICENSE for details.
 
 from __future__ import print_function
 

setup.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8  -*-
 #
 # Copyright (C) 2011-2015 Ben Kurtovic <[email protected]>
-# See the LICENSE file for details.
+# Released under the terms of the MIT License. See LICENSE for details.
 
 import sys
 
@@ -23,7 +23,7 @@
     version = __version__,
     author = "Ben Kurtovic",
     author_email = "[email protected]",
-    description = "Easily pull to multiple git repositories at once.",
+    description = "Easily pull to multiple git repositories at once",
     long_description = long_desc,
     license = "MIT License",
     keywords = "git repository pull update",