From b1dfd5859c32a1d41b9b9382676578a1f1b8d5ba Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:00:40 +0800 Subject: [PATCH 1/6] Update demo gif --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f7e64e..d9540d7 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,11 @@ To use the plugin, follow these steps: 2. Open the command palette (Ctrl/Cmd + P) 3. Search for "File Diff" 4. Select the file you want to compare with the current file + ## Demo GIF of a demo show this plugin ## Contributing From 12aaa70bcbfbd76fbe3a44db0f52560a00968743 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:01:05 +0800 Subject: [PATCH 2/6] Remove WIP warning --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d9540d7..3eeb484 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ ![GitHub stars](https://img.shields.io/github/stars/friebetill/obsidian-file-diff?style=flat) -## ⚠️ This plugin is in development and not working at the moment. ⚠️ ## Purpose From afab65eb9be9bb7df02fca7d498b9c40a63e36a4 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:04:39 +0800 Subject: [PATCH 3/6] Increase width of gif --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3eeb484..a18851b 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ To use the plugin, follow these steps: +alt="GIF of a demo show this plugin" width="730" /> ## Contributing From 477e74d5afa35a669da7f9bb9f296bed700da0a2 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:05:49 +0800 Subject: [PATCH 4/6] Increase width of gif even more :) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a18851b..0c58b72 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ To use the plugin, follow these steps: +alt="GIF of a demo show this plugin" width="900" /> ## Contributing From 06a270469f0c490d7f70dd6e74867986160ebd9c Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:09:39 +0800 Subject: [PATCH 5/6] Add support me note --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 0c58b72..9b4714f 100644 --- a/README.md +++ b/README.md @@ -58,3 +58,5 @@ pull request. ## Support For support, please open an issue on the repository. + +If you're interested in supporting me, it would mean a lot if you could buy me a coffee through GitHub Sponsors, located on the right side. From f631a5db1c3dd396e9dd8f902ce410ee522e2491 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Sat, 4 Feb 2023 13:30:30 +0800 Subject: [PATCH 6/6] Add a command overview --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9b4714f..2eda8ce 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ ![GitHub stars](https://img.shields.io/github/stars/friebetill/obsidian-file-diff?style=flat) -## Purpose +## Commands -This plugin adds a file difference command to [Obsidian](https://obsidian.md/), -allowing users to compare and merge changes between different versions of a -file. +`Compare`: Compare your active file with another file and look at the differences. + +`Compare and merge`: Compare your active file with another file and look at the differences. You'll then have the chance to choose which changes you'd like to keep. ## Compatibility