From 8439805e38c44c96ba8cc22daa33d0f1d0e5d024 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Fri, 29 May 2015 21:30:43 -0400 Subject: [PATCH] Wording tweaks; update brew instructions (fixes #13) --- README.md | 8 ++++---- gitup/__init__.py | 2 +- gitup/config.py | 2 +- gitup/script.py | 13 +++++++------ gitup/update.py | 2 +- setup.py | 4 ++-- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 05c345b..49b4ffd 100644 --- a/README.md +++ b/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..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..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: diff --git a/gitup/__init__.py b/gitup/__init__.py index d259d59..0e4e734 100644 --- a/gitup/__init__.py +++ b/gitup/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Ben Kurtovic -# See the LICENSE file for details. +# Released under the terms of the MIT License. See LICENSE for details. """ gitup: the git repository updater diff --git a/gitup/config.py b/gitup/config.py index 9fed6f4..c34dcb4 100644 --- a/gitup/config.py +++ b/gitup/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Ben Kurtovic -# See the LICENSE file for details. +# Released under the terms of the MIT License. See LICENSE for details. from __future__ import print_function diff --git a/gitup/script.py b/gitup/script.py index 42e78a5..7349c97 100644 --- a/gitup/script.py +++ b/gitup/script.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Ben Kurtovic -# See the LICENSE file for details. +# Released under the terms of the MIT License. See LICENSE for details. from __future__ import print_function @@ -9,7 +9,7 @@ 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 @@ -17,10 +17,11 @@ 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..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() diff --git a/gitup/update.py b/gitup/update.py index e58f850..f0b8ae6 100644 --- a/gitup/update.py +++ b/gitup/update.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Ben Kurtovic -# See the LICENSE file for details. +# Released under the terms of the MIT License. See LICENSE for details. from __future__ import print_function diff --git a/setup.py b/setup.py index 4c6f565..d61a0d9 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # # Copyright (C) 2011-2015 Ben Kurtovic -# See the LICENSE file for details. +# Released under the terms of the MIT License. See LICENSE for details. import sys @@ -23,7 +23,7 @@ setup( version = __version__, author = "Ben Kurtovic", author_email = "ben.kurtovic@gmail.com", - 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",