response

1 files changed, 13 insertions, 0 deletions

diff --git a/doc/forum/working_without_git-annex_commits.mdwn b/doc/forum/working_without_git-annex_commits.mdwn
index 88c2804c5..00a61f3f0 100644
--- a/doc/forum/working_without_git-annex_commits.mdwn
+++ b/doc/forum/working_without_git-annex_commits.mdwn
@@ -5,3 +5,16 @@ I consider these changes to be volatile, and irrelevant to the archive history.
 As a minimal solution, I configured a repository to ``.gitignore`` ``.git-annex/*:*.log``, but even when using modes that do not require that information (``git annex copy --from`` instead of ``git annex get``), that failes when git-annex tried to git-add ignored files.
 
 A more elaborate solution might be to keep location tracking information in a branch on its own (as suggested in [[todo/branching]]), keeping the main tree clean of such commits. A stealth user could then configure that branch to never be pushed. (Alternatively, if git-annex respects .gitignore and doesn't try to check in changes on ignored files, he could locally ``.gitignore`` ``.git-annex/*:*.log``.)
+
+> A stealth user can simply avoid pushing, and so keep their repository 
+> in a forked state, that can still pull changes from origin.
+> 
+> Beyond that, [[todo/branching]] is the best solution.
+> 
+> I don't think that gitignoring the log files is a good plan, because
+> if the files are left modified and uncommitted, git will not be able to 
+> merge other changes it pulls. The automerging of log files only works
+> if any local changes to them have been committed.
+> 
+> It would be possible to add a knob that
+> simply blocks all local modifications to the log files. --[[Joey]]