added mode that show invisible spaces/tabs

[bbdiff.git] / README

diff --git a/README b/README
index bbee7baaa06e76f9ac553f47241e2d4e1568829f..bf0fb5ab025f9bc4198e887acac9e44fae5e8371 100644 (file)
--- a/README
+++ b/README
@@ -41,13 +41,13 @@ Integration with git
 2. Create script odctool-gitdiff:
 
        #! /bin/sh
-       odctool diff -C -p "$1" "$2" "$5"
+       odctool diff -x -X -E -C -p "$1" "$2" "$5"
 
 3. Add to .git/config:
 
        [merge "odctool"]
                name = BlackBox Compound Document merge driver
-               driver = odctool merge -p %P -o %A %A %O %B
+               driver = odctool merge -o %A -p HEAD %A -p PARENT %O -p BRANCH %B
        [diff "odctool"]
                name = BlackBox Compound Document diff driver
                command = odctool-gitdiff
@@ -79,14 +79,14 @@ Integration with ranger
 
                        # BlackBox Compound Document
                        odc)
-                               odctool -C cat "${FILE_PATH}" && exit 5
+                               odctool -C -X cat "${FILE_PATH}" && exit 5
                                exit 1;;
                esac
        }
 
 2. To open/read documents add to $HOME/.config/ranger/rifle.conf:
 
-       ext odc, has odctool, terminal, file = odctool -C cat "$1" | less --tabs=2 -S
+       ext odc, has odctool, terminal, file = odctool -C -X cat "$1" | less --tabs=2 -S
 
 
 Current state