diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-24 11:38:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-24 11:38:17 -0400 |
| commit | e37a965161ffffd179bd35dcbd98c845d2717e8f (patch) | |
| tree | 43e813174ff5d62700fbfe0e41bc283fc2568bf2 /doc | |
| parent | ace78ffefe080520fb066ca8d966afd34cacded9 (diff) | |
| parent | 49743655e0e99e37e000c40c1e7d03bcda1aeae2 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/design/assistant.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/wishlist:_disable_automatic_commits.mdwn | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/doc/design/assistant.mdwn b/doc/design/assistant.mdwn index f3e35c3f2..a090f2397 100644 --- a/doc/design/assistant.mdwn +++ b/doc/design/assistant.mdwn @@ -27,6 +27,8 @@ We are, approximately, here: * [[deltas]] * [[leftovers]] +There is also a [[general_todo_for_git_annex|todo]] (not just for the assistant). + ## blog I'm blogging about my progress in the [[blog]] on a semi-daily basis. diff --git a/doc/todo/wishlist:_disable_automatic_commits.mdwn b/doc/todo/wishlist:_disable_automatic_commits.mdwn new file mode 100644 index 000000000..871ed12b6 --- /dev/null +++ b/doc/todo/wishlist:_disable_automatic_commits.mdwn @@ -0,0 +1,9 @@ +In some of my repositories, I would like to retain manual control over the granularity and contents of the commit history. Some motivating reasons: + +* manually specified commit messages makes the history easier to follow +* make a series of minor changes to a file over a period of a few hours would result in a single commit rather than capturing intermediate incomplete edits +* manual choice of which files to annex (based on predicted usage) could be useful, e.g. a repo might contain a 4MB PDF which you want available in *every* remote even without `git annex get`, and also some 2MB images which are only required in some remotes + +Obviously this needs to be configurable at least per repository, and ideally perhaps even per remote, since usage habits can vary from machine to machine (e.g. I could choose to commit manually from my desktop machine which has a nice comfy keyboard and large screen, but this would be too much pain to do from my tiny netbook). + +According to Joey, it should be easy to arrange for the watcher thread not to run, but would need some more work for the assistant to notice manual commits in order to sync them; however the assistant already does some crazy inotify watching of git refs, in order to detect incoming pushes, so detecting manual commits wouldn't be a stretch. |