tig-1.2.1tig-1.2.1

4 files changed, 28 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 970e0be7..6e0a68be 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	= 1.2
+VERSION	= 1.2.1
 
 all:
 
diff --git a/NEWS b/NEWS
index 6abfda48..ddb04ed2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,8 @@
 Release notes
 =============
 
-master
-------
+tig-1.2.1
+---------
 
 Incompatibilities:
 
@@ -13,6 +13,8 @@ Improvements:
 
  - Show blob sizes in the tree view either as bytes or using binary unit
    prefixes. Example: `set show-file-size = units`. (GH #163)
+ - Reduce main view memory usage and startup time, especially when revision
+   graph rendering is disabled. (GH #160)
 
 Bug fixes:
 
@@ -37,7 +39,7 @@ Improvements:
  - Show line numbers in the branch view. (GH #135)
  - Add toggles for showing author email or email user names. (GH #115)
  - Open editor at the selected line by prefixing the file argument with
-   `+<lineno>`. Tested in vi, vim, emacs, nano, gedit, geany. Disable
+   `+<lineno>`. Tested in vi, Vim, Emacs, Nano, Gedit, Geany. Disable
    by adding `set editor-line-number = no` to ~/.tigrc. (GH #118, #119)
  - Add toggle-files to control whether to show full commit diff or only
    the diff concerning the currently selected file, e.g. for blame.
diff --git a/contrib/aspell.dict b/contrib/aspell.dict
index ad58a553..6399fd8f 100644
--- a/contrib/aspell.dict
+++ b/contrib/aspell.dict
@@ -1,13 +1,16 @@
-personal_ws-1.1 en 201 
+personal_ws-1.1 en 214 
 CJK
 del
 Ctrl
 refspec
+Gedit
 cmd
 dev
 cdup
 ident
+sudo
 AuthorDate
+TMPDIR
 tig
 dir
 keybinding
@@ -20,6 +23,7 @@ args
 asciidoc
 AsciiDoc
 unstanged
+gitattributes
 revgraph
 revargs
 topo
@@ -41,6 +45,7 @@ bgcolor
 env
 lrwxrwxrwx
 backend
+ESC
 doctype
 gitlink
 colorN
@@ -52,6 +57,7 @@ signoff
 utf
 Cogito
 keymap
+Nano
 DSSL
 manpages
 LDLIBS
@@ -67,24 +73,27 @@ diffstat
 distclean
 README
 submodules
+Reenable
 xhtml
-gitattributes
 aterm
+mkstemps
 iconv
 sysconfdir
 Scrool
 ELinks
 subdir
 Debian
+subdirectories
 gui
+bindir
 tigmanual
+reachability
 PgUp
 wrt
 libiconv
 unicode
 multi
 Naïvely
-reachability
 autoconf
 xpm
 filesystem
@@ -97,23 +106,28 @@ charset
 tigblob
 autobuild
 diffargs
+commitencoding
 erasechar
 lds
 bg
 cd
 oldmode
+repos
 subshells
 gitconfig
 xmlto
 rebase
 chdir
+html
 jsh
 Online
 qgit
 PageDown
 gc
+Solaris
 GH
 mergetool
+setenv
 stderr
 togglable
 tabsize
@@ -128,12 +142,11 @@ Git's
 tig's
 dirs
 ld
+subdirectory
 newmode
 keymaps
 endif
 namespace
-commitencoding
-subdirectory
 utils
 delim
 unstaged
@@ -144,10 +157,10 @@ VLINE
 extdiff
 keybindings
 ifndef
-subdirectories
 COLORTERM
 ncursesw
 PDF
+CFLAGS
 linenumber
 fileargs
 UI
@@ -176,12 +189,12 @@ Yy
 fgcolor
 localtime
 filename
+backgrounded
 lncursesw
 waitpid
 wgetch
 Pre
 waddch
-backgrounded
 subcommand
 errno
 XXXXXX
diff --git a/doc/manual.asciidoc b/doc/manual.asciidoc
index 0a52fca2..b77a9c22 100644
--- a/doc/manual.asciidoc
+++ b/doc/manual.asciidoc
@@ -243,11 +243,11 @@ reference name surrounded by '[' and ']':
 -----------------------------------------------------------------------------
 
 If you want to limit what branches are shown, say only show branches named
-`master` or those which start with the `jf/` prefix, you can do it by setting
+`master` or those which start with the `feature/` prefix, you can do it by setting
 the following variable:
 
 -----------------------------------------------------------------------------
-$ TIG_LS_REMOTE="git ls-remote . master jf/*" tig
+$ TIG_LS_REMOTE="git ls-remote . master feature/*" tig
 -----------------------------------------------------------------------------
 
 Or set the variable permanently in your environment.