From ac2fc0b61a7aa929cdc5746936a0703096e59045 Mon Sep 17 00:00:00 2001 From: Markus Siemens Date: Fri, 26 Oct 2018 13:26:03 +0200 Subject: [PATCH] Version bump to v1.6.0 --- README.rst | 8 ++++++++ setup.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 04f545f..bbc9ba5 100644 --- a/README.rst +++ b/README.rst @@ -167,6 +167,14 @@ The original ``git-up`` has been written by aanand: Changelog --------- +v1.6.0 (*2018-10-26*) +~~~~~~~~~~~~~~~~~~~~~ + +- Skip stashing changes when possible. Thanks `@Chronial `_ + for `Pull Request #86 `_. +- Added faster fast-forward on branches that are not checked out. Thanks `@Chronial `_ + for `Pull Request #83 `_. + v1.5.2 (*2018-09-28*) ~~~~~~~~~~~~~~~~~~~~~ diff --git a/setup.py b/setup.py index 8edeedf..66fbbec 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name="git-up", - version="1.5.2", + version="1.6.0", packages=find_packages(), install_requires=['GitPython>=2.1.8', 'colorama>=0.3.7', 'termcolor>=1.1.0', 'click>=6.0.0,<7.0.0',