diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-23 09:56:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-23 09:56:04 -0400 |
| commit | 23e765b67c38a9f02b3b5152e7e123819bb696de (patch) | |
| tree | 0e18d06b500e48f84cc0a33556160ef2ea4f442d /doc/internals.mdwn | |
| parent | 9672496a9357c84a4436ead109ba2dc7bc010e8c (diff) | |
update re git-annex branch direct modification
Diffstat (limited to 'doc/internals.mdwn')
| -rw-r--r-- | doc/internals.mdwn | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/internals.mdwn b/doc/internals.mdwn index 419096744..aaa125599 100644 --- a/doc/internals.mdwn +++ b/doc/internals.mdwn @@ -21,9 +21,14 @@ deleting or changing the file contents. This branch is managed by git-annex, with the contents listed below. -Note that it assumes only it will modify the branch. If you go in and make -changes, be sure to remove `.git/index.git-annex` before running git-annex, -otherwise it will probably revert your changes in its next commit to the branch. +Note that git-annex assumes only it will modify this branch. If you go in +and make changes directly, it will probably revert your changes in its next +commit to the branch. + +The best way to make changes to the git-annex branch is instead +to create a branch of it, with a name like "my/git-annex", and then +use "git annex merge" to automerge your branch into the main git-annex +branch. ### `uuid.log` |