[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff a81d62a 240/258: README: Update recent changes
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff a81d62a 240/258: README: Update recent changes |
Date: |
Wed, 17 May 2017 08:14:01 -0400 (EDT) |
branch: scratch/add-vdiff
commit a81d62a0af13008123f9bea12196c30d1d6fbcab
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
README: Update recent changes
---
README.org | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.org b/README.org
index 1541b95..499f896 100644
--- a/README.org
+++ b/README.org
@@ -35,6 +35,7 @@ vdiff has not been extensively tested yet, so please report
any issues you
find. Contributions and suggestions are very welcome.
** Recent (Significant) Changes
+ - [2017-02-01] Added magit integration functions in =vdiff-magit.el=. See
[[#magit-integration][Magit integration]].
- [2016-07-25] Added three-way diff support. See =vdiff-buffers3= and
=vdiff-files3=.
** Screenshot
@@ -134,6 +135,7 @@ map. Bind =vdiff-hydra/body= directly to customize this key
binding.
[[file:img/hydra.png]]
** Magit integration
+ #+NAME: #magit-integration
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
- [elpa] scratch/add-vdiff 8aa5c45 250/258: vdiff-magit: Fix paren, (continued)
- [elpa] scratch/add-vdiff 8aa5c45 250/258: vdiff-magit: Fix paren, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 466b852 173/258: Fix subtraction overlay addition, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f3b6cec 179/258: Center on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 667a7e4 144/258: Generalize data structures to prepare for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 059d288 208/258: Update gitignore, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cfad650 207/258: Provide missing function for emacs-nox users, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e567468 221/258: vdiff-magit: Port show-working-tree, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 30b0f9c 213/258: Add vdiff-magit.el with two functions, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 64430c3 215/258: Cleanup merge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 19f4616 217/258: vdiff-magit: Port compare and show-commit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a81d62a 240/258: README: Update recent changes,
Justin Burkett <=
- [elpa] scratch/add-vdiff 9be4fe3 066/258: Update install instructions in README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff eda4b1b 204/258: Force update of window-start in manual calls to scroll func, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7d60015 201/258: Add some doctrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup references in dwim, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 615e7bd 228/258: vdiff-magit: Fix killing of buffers in stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a040a4b 246/258: vdiff: Add vdiff-merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7fbb20e 205/258: Nil temp-session after using it, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 048d544 198/258: Pass session explicitly from refresh sentinel, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ed25084 224/258: vdiff-magit: Fix some strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 432534d 230/258: vdiff-magit: Don't use vdiff-magit-resolve yet, Justin Burkett, 2017/05/17