[tasks] 01/02: Add some more docs, and make it work with git-in-jessie

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository tasks.

commit b0f22a6687ed52e5c352095a16676acdbe9f1cf9
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Oct 28 19:59:45 2016 +0200

    Add some more docs, and make it work with git-in-jessie
---
 README | 16 ++++++++++++++++
 task   |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 1b1440e..16891ef 100644
--- a/README
+++ b/README
@@ -11,6 +11,22 @@ If you're not familiar with it, please take some time to read the docs here:
 
 https://taskwarrior.org/docs/
 
+Using this repository
+=====================
+
+Your general work flow is:
+
+$ git pull                    # or git pull --rebase
+$ ./task $hack $hack $hack    # will automatically create a git commit
+$ git push
+
+The raw data is stored in pending.data.
+
+From time to time you might have to manually merge it, e.g. if someone edited
+the same tasks as you. This may or may not be painful, time will tell... do
+note one case you have to handle with some care, see below. Everything else
+should just be a case of merging the fields of the task together.
+
 IMPORTANT
 =========
 
diff --git a/task b/task
index 3ea4611..39f492f 100755
--- a/task
+++ b/task
@@ -4,7 +4,7 @@ workdir="$(git rev-parse --show-toplevel)"
 
 # Set up task-history-git
 git submodule update --init
-ln -rsf "$workdir/task-history-git/post-merge" "$(git rev-parse --git-path hooks)/post-merge"
+ln -rsf "$workdir/task-history-git/post-merge" "$(git rev-parse --git-dir)/hooks/post-merge"
 
 # Ensure local file exists
 test -f "$workdir/taskrc.local" || touch "$workdir/taskrc.local"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/tasks.git