index a7ec05ec822cc20d7fc6edb89766f9029714f1a8..bbee7baaa06e76f9ac553f47241e2d4e1568829f 100644 (file)
--- a/README
+++ b/README
Call `odctool help` to learn how to use it.
-Integration with Git
+Integration with git
--------------------
1. Compile odctool.
[merge "odctool"]
name = BlackBox Compound Document merge driver
- driver = /path/to/odctool merge -p %P -o %A %A %O %B
+ driver = odctool merge -p %P -o %A %A %O %B
[diff "odctool"]
name = BlackBox Compound Document diff driver
- command = /path/to/odctool-gitdiff
+ command = odctool-gitdiff
4. Add to .git/info/attributes:
*.osf
odc[0-9][0-9][0-9][0-9][0-9]
-Now you can see diffs using `git diff' and resolve conflicts from BlackBox.
+
+Now you can see diffs using `git diff' and resolve conflicts without converting odc to text.
Integration with ranger
...
# BlackBox Compound Document
- odc)
- odctool -C cat "${FILE_PATH}" && exit 5
- exit 1;;
+ odc)
+ odctool -C cat "${FILE_PATH}" && exit 5
+ exit 1;;
esac
}