[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update |
Date: |
Wed, 17 May 2017 08:14:03 -0400 (EDT) |
branch: scratch/add-vdiff
commit 3a32c4e1e29d4c6e59e381e61db00c65dbe40c55
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
README: Update
---
README.org | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/README.org b/README.org
index 16c1a6e..8fc21a2 100644
--- a/README.org
+++ b/README.org
@@ -163,10 +163,7 @@ map. Bind =vdiff-hydra/body= directly to customize this
key binding.
Loading =vdiff-magit= will pull in functions that will allow vdiff to be used
with [[https://github.com/magit/magit][magit]]. In order to use these
functions you need to call the vdiff functions
instead of the magit-ediff ones. Here is a very basic setup which replaces the
-basic ediff key bindings in magit.
-
-Please note that this is a new feature and probably contains some bugs, so use
-it with caution and please report oddities.
+basic ediff key bindings in magit.
#+BEGIN_SRC emacs-lisp
(require 'vdiff-magit)
@@ -180,8 +177,23 @@ it with caution and please report oddities.
;; support 3-way merges. Please see the docstring of this variable for more
;; information
;; (setq vdiff-magit-use-ediff-for-merges nil)
+
+ ;; Whether vdiff-magit-dwim runs show variants on hunks. If non-nil,
+ ;; vdiff-magit-show-staged or vdiff-magit-show-unstaged are called based on
what
+ ;; section the hunk is in. Otherwise, vdiff-magit-dwim runs
vdiff-magit-stage
+ ;; when point is on an uncommitted hunk.
+ ;; (setq vdiff-magit-dwim-show-on-hunks nil)
+
+ ;; Whether vdiff-magit-show-stash shows the state of the index.
+ ;; (setq vdiff-magit-show-stash-with-index t)
+
+ ;; Only use two buffers (working file and index) for vdiff-magit-stage
+ ;; (setq vdiff-magit-stage-is-2way nil)
#+END_SRC
+Please note that this is a new feature and probably contains some bugs, so use
+it with caution and please report oddities.
+
** Further customization
The current customization options and there defaults are
- [elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler, (continued)
- [elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused magit-ediff code, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6f89757 231/258: vdiff-magit: Resurrect resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0f8dd15 239/258: vdiff: Improve a couple of docstrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8cfb8f 243/258: vdiff: Don't use scroll-lock-mode programmatically, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bc5a9a8 242/258: vdiff-magit: Remove unnecessary local bindings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c32fe46 251/258: vdiff: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 875b0d5 252/258: README: Improve vdiff-magit-popup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8a3dff3 254/258: vdiff-magit: Add vdiff-magit-stage-is-2way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update,
Justin Burkett <=
- [elpa] scratch/add-vdiff d4883de 256/258: vdiff-magit: Remove use of camel case names for consistency, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 819ea4b 258/258: Add 'packages/vdiff/' from commit 'f11c7c2eeef33a0b75fe4e025818e7e672c57397', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 14abb75 078/258: Allow jumping to subtraction overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a15b0e5 084/258: Move point before closing fold, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 425d50b 085/258: Add vdiff-close-other-folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6516112 075/258: Minor formatting, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 968047f 093/258: Change wording in a docstring, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ad0e8c3 091/258: Make mirrored-commands private and rename, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 309e912 108/258: Refresh automatically on idle after change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5b1b342 119/258: Remove duplicated code in vdiff-files, Justin Burkett, 2017/05/17