summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Fonseca <jonas.fonseca@gmail.com>2017-05-06 10:36:47 -0400
committerJonas Fonseca <jonas.fonseca@gmail.com>2017-05-06 10:36:47 -0400
commitf0b41d1f75d42ade6781a79f60590f2afb4aa401 (patch)
tree2ebf4f42d6be724c1863d654260cc9d913e9a7ef
parent1addd5c801394b0014eb2786e7f44a672d944cba (diff)
tig-2.2.2tig-2.2.2
-rw-r--r--INSTALL.adoc4
-rw-r--r--Makefile2
-rw-r--r--NEWS.adoc6
-rw-r--r--doc/tigrc.5.adoc2
-rw-r--r--tools/aspell.dict9
5 files changed, 14 insertions, 9 deletions
diff --git a/INSTALL.adoc b/INSTALL.adoc
index 75f958cb..75986bf1 100644
--- a/INSTALL.adoc
+++ b/INSTALL.adoc
@@ -6,8 +6,8 @@ Download a tarball from https://github.com/jonas/tig/releases[] or clone the Tig
repository http://github.com/jonas/tig[git://github.com/jonas/tig.git].
The latest version is:
-https://github.com/jonas/tig/releases/download/tig-2.2.1/tig-2.2.1.tar.gz[tig-2.2.1]
-https://github.com/jonas/tig/releases/download/tig-2.2.1/tig-2.2.1.tar.gz.md5[(md5)]
+https://github.com/jonas/tig/releases/download/tig-2.2.2/tig-2.2.2.tar.gz[tig-2.2.2]
+https://github.com/jonas/tig/releases/download/tig-2.2.2/tig-2.2.2.tar.gz.md5[(md5)]
*Note:* Do not use the tar.gz file for version 2.0 because it will fail
to compile due to issue https://github.com/jonas/tig/pull/283[#283] and
diff --git a/Makefile b/Makefile
index b974649d..184533f0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# The last tagged version. Can be overridden either by the version from
# git or from the value of the DIST_VERSION environment variable.
-VERSION = 2.2.1
+VERSION = 2.2.2
all:
diff --git a/NEWS.adoc b/NEWS.adoc
index 8f28047a..bbb6d542 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -1,8 +1,8 @@
Release notes
=============
-master
-------
+tig-2.2.2
+---------
Upgrade instructions:
@@ -14,7 +14,7 @@ Improvements:
- Use `diff-options` when preparing the diff in the stage view to make the diff
state configurable. (GH #545)
- - Add 'status-show-untracked-files' option mirroring git's
+ - Add 'status-show-untracked-files' option mirroring Git's
'status.showUntrackedFiles' to toggle display of untracked files. in the
status view. On by default. (GH #562)
- Update `ax_with_curses.m4` and use `pkg-config` to detect. (GH #546)
diff --git a/doc/tigrc.5.adoc b/doc/tigrc.5.adoc
index cef1e41d..c426cb82 100644
--- a/doc/tigrc.5.adoc
+++ b/doc/tigrc.5.adoc
@@ -244,7 +244,7 @@ The following variables can be set:
'status-show-untracked-files' (bool)::
- Show untracked files in the status view (mirrors git's
+ Show untracked files in the status view (mirrors Git's
`status.showUntrackedFiles` option). On by default.
'tab-size' (int)::
diff --git a/tools/aspell.dict b/tools/aspell.dict
index a243c465..aa27346a 100644
--- a/tools/aspell.dict
+++ b/tools/aspell.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 261
+personal_ws-1.1 en 266
CJK
del
goto
@@ -7,6 +7,7 @@ refspec
Shorthands
Gedit
cmd
+noprefix
dev
cdup
ident
@@ -167,11 +168,13 @@ mainargs
tig's
dirs
ld
+showUntrackedFiles
newmode
keymaps
endif
namespace
commitencoding
+nitro
subdirectory
utils
delim
@@ -182,6 +185,7 @@ automake
nodelay
VLINE
extdiff
+checksums
keybindings
ifndef
subdirectories
@@ -198,14 +202,15 @@ wclear
Homebrew
chunked
BUILTIN
+tinfo
drwxr
ascii
Baudis
substring
PID
tz
-DocBook
docbook
+DocBook
submodule
strndup
startup