index bbee7baaa06e76f9ac553f47241e2d4e1568829f..286a5acf3fc19ed4e3465f6a2315d47096638158 100644 (file)
--- a/README
+++ b/README
2. Create script odctool-gitdiff:
#! /bin/sh
2. Create script odctool-gitdiff:
#! /bin/sh
- odctool diff -C -p "$1" "$2" "$5"
+ odctool diff -x -X -C -p "$1" "$2" "$5"
3. Add to .git/config:
[merge "odctool"]
name = BlackBox Compound Document merge driver
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
[diff "odctool"]
name = BlackBox Compound Document diff driver
command = odctool-gitdiff
# BlackBox Compound Document
odc)
# 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:
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
Current state