From a4f287017ae3bbc61fa94c77ae16dfbd4ea74666 Mon Sep 17 00:00:00 2001 From: Markus Siemens Date: Tue, 16 Dec 2014 17:50:33 +0100 Subject: [PATCH] Version bump to v1.2.1 --- README.rst | 8 +++++++- setup.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index df6dc57..541e6bf 100644 --- a/README.rst +++ b/README.rst @@ -156,13 +156,19 @@ The original ``git-up`` has been written by aanand: Changelog --------- +v1.2.1 (*2014-12-16*) +~~~~~~~~~~~~~~~~~~~~~ + +- Fixed a problem with ``setuptools 8.x`` (`#19 `__). +- 3rd party dependencies have been updated + v1.2.0 (*2014-12-10*) ~~~~~~~~~~~~~~~~~~~~~ - Added an option to show hashes when fast-forwarding/rebasing like ``git pull`` does (``git-up.rebase.show-hashes``). - Fixed a bug when having branches with both local tracking branches and - remote tracking branches (`#18 `__). + remote tracking branches (`#17 `__). v1.1.5 (*2014-11-19*) ~~~~~~~~~~~~~~~~~~~~~ diff --git a/setup.py b/setup.py index 2b287e4..6e4537b 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name="git-up", - version="1.2.0", + version="1.2.1", packages=find_packages(exclude=["tests"]), scripts=['PyGitUp/gitup.py'], install_requires=['GitPython==0.3.2.1', 'colorama==0.3.2',