Merge branch 'v1.0'

Author: bootleq

CHANGES.md

@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+## 1.0.0 (2014-10-04)
+
+* **CHANGE** meaning of "_previous_" commit for `gitdiffall @{commit}`, `gitdiffall <n>` shortcuts.  
+  "_previous_" is used to say previous linear commit shown in git log,
+  and has changed to first parent of current commit (i.e., `commit^`).
+* Start 3-way merge during unmerged conflicts.
+* Better `GitDiffInfo` display, with Vim's preview window.
+* Add `gitdiffall j`, `gitdiffall k` shortcuts.
+* Add `log_format`, `rebase_log_format` and `keep_info_window` options.
+* gitdiffall.rb can skip a merge commit before open Vim.
+
 ## 0.1.1 (2011-12-03)
 
 * gitdiffall.rb can skip unmerged files before send them to Vim.

README.md

@@ -5,6 +5,7 @@ View git diff in Vim tabs.
 
 - `gitdiffall` command for zsh (**requires ruby** for running _gitdiffall.rb_).
 - `GitDiff`, `GitDiffInfo`, `GitDiffOff` commands for Vim.
+- 3-way diff during merge conflicts.
 
 
 Install
@@ -32,11 +33,12 @@ In zsh, use `gitdiffall` to open git diff in Vim tabs, examples:
 
 For convenience, some special notations are available:
 
-- `gitdiffall @dae86e`  will be expanded to `<previous-rev>..dae86e`,  
-  where `<previous-rev>` is the previous entry of "dae86e" in `git log` (may be different to `dae86e^`).  
+- `gitdiffall @dae86e` expands to `dae86e^..dae86e`,  
   This is a shrotcut for checking changes in a specified commit.
 - `gitdiffall 1`  is similar to `@<rev>`,  
   where `<rev>` is the nth previous commit from HEAD, starts from 1.
+- `gitdiffall j` and `gitdiffall k`  shortcut to _next_/_previous_ commit from last evaluated `gitdiffall <n>`.  
+  (use enviroment variable `$_GITDIFFALL_LAST_SHORTCUT`)
 
 You can specified `@<rev>` for the oldest commit you care about,  
 the shortcut number `<n>` of that commit will be shown in command line.