Skip to content

Commit

Permalink
v0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mystor committed Jan 5, 2022
1 parent df0f687 commit 0595a93
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 13 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Changelog

## vNEXT
## v0.7.0

* Add support for `git-rerere`, to record and replay conflict resolutions (#75)
* Fix autosquash order of multiple fixup commits with the same target (#72)
* Use `GIT_SEQUENCE_EDITOR` instead of `SEQUENCE_EDITOR` (#71)
* Fix handling of multiline commit subjects (#86)
* Add support for interactively revising or autosquashing the root commit via `--root`
* Add support for `commit.gpgSign` (#46)
* Improved support for git-for-windows (#112)

## v0.6.0

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# -- Project information -----------------------------------------------------

project = "git-revise"
copyright = "2018-2019, Nika Layzell"
copyright = "2018-2022, Nika Layzell"
author = "Nika Layzell <[email protected]>"

# The short X.Y version
Expand Down
11 changes: 8 additions & 3 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ checking, :command:`pylint` for linting, :command:`pytest` for testing, and

.. code-block:: shell
$ tox # All python versions
$ tox -e py36 # Python 3.6
$ tox -e py37 # Python 3.7
$ tox # All python versions
$ tox -e py38 # Python 3.8
$ tox -e py39 # Python 3.9
$ tox -e py310 # Python 3.10
$ tox -e mypy # Mypy Typechecking
$ tox -e pylint # Linting
$ tox -e black # Check Formatting
Code Formatting
---------------
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Installing
==========

:command:`git-revise` can be installed from PyPi_. Python 3.6 or higher is
:command:`git-revise` can be installed from PyPi_. Python 3.8 or higher is
required.

.. code-block:: bash
Expand Down
27 changes: 21 additions & 6 deletions git-revise.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.\" Man page generated from reStructuredText.
.
.TH "GIT-REVISE" "1" "Jan 05, 2022" "0.7.0" "git-revise"
.SH NAME
git-revise \- Efficiently update, split, and rearrange git commits
.
.nr rst2man-indent-level 0
.
Expand Down Expand Up @@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
..
.TH "GIT-REVISE" "1" "Jul 30, 2021" "0.6.0" "git-revise"
.SH NAME
git-revise \- Efficiently update, split, and rearrange git commits
.SH SYNOPSIS
.sp
\fIgit revise\fP [<options>] [<target>]
Expand All @@ -50,8 +50,10 @@ writing them when necessary. This allows it to be significantly faster on
large codebases, and avoid invalidating builds.
.sp
If \fI\%\-\-autosquash\fP or \fI\%\-\-interactive\fP is specified, the
<target> argument is optional. If it is omitted, \fBgit revise\fP will
consider a range of unpublished commits on the current branch.
<target> argument may be omitted or given as the special value \fI:option:\-\-root\fP\&.
If it is omitted, \fBgit revise\fP will consider a range of unpublished
commits on the current branch. If given as \fI:option:\-\-root\fP, all commits
including the root commit will be considered.
.SH OPTIONS
.SS General options
.INDENT 0.0
Expand Down Expand Up @@ -201,6 +203,19 @@ git revise \-i <after\-this\-commit>
.UNINDENT
.UNINDENT
.sp
The special target \fI\-\-root\fP is available to revise everything up to the root
commit:
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
git revise \-i \-\-root
.ft P
.fi
.UNINDENT
.UNINDENT
.sp
An editor will be fired up with the commits in your current branch after the
given commit. If the index has any staged but uncommitted changes, a \fB<git
index>\fP entry will also be present.
Expand Down Expand Up @@ -300,6 +315,6 @@ Code, documentation and other contributions are also welcomed.
\fBgit\-rebase(1)\fP
\fBgit\-add(1)\fP
.SH COPYRIGHT
2018-2019, Nika Layzell
2018-2022, Nika Layzell
.\" Generated by docutils manpage writer.
.
2 changes: 1 addition & 1 deletion gitrevise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
in-memory merges and rebases.
"""

__version__ = "0.6.0"
__version__ = "0.7.0"

0 comments on commit 0595a93

Please sign in to comment.