diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-27 17:38:06 -0400 |
| commit | df81023501e2b0d930ec90cc6f5a6c6735f84818 (patch) | |
| tree | 5bd3b9d8f91464bd27c9d86f700b975a76067147 /doc/internals.mdwn | |
| parent | 1e07d61b9669f85a02551d7858177bd33ffaea6f (diff) | |
Repository tuning parameters can now be passed when initializing a repository for the first time.
* init: Repository tuning parameters can now be passed when initializing a
repository for the first time. For details, see
http://git-annex.branchable.com/tuning/
* merge: Refuse to merge changes from a git-annex branch of a repo
that has been tuned in incompatable ways.
Diffstat (limited to 'doc/internals.mdwn')
| -rw-r--r-- | doc/internals.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/internals.mdwn b/doc/internals.mdwn index b8cb559b6..4eb72ceac 100644 --- a/doc/internals.mdwn +++ b/doc/internals.mdwn @@ -257,3 +257,12 @@ Example: ForgetGitHistory 1387325539.685136s ForgetDeadRemotes 1387325539.685136s + +## `difference.log` + +Used when a repository has fundamental differences from other repositories, +that should prevent merging. + +Example: + + e605dca6-446a-11e0-8b2a-002170d25c55 [Version 5] timestamp=1422387398.30395s |