diff options
Diffstat (limited to 'doc')
6 files changed, 53 insertions, 3 deletions
diff --git a/doc/bugs/problems_with_utf8_names/comment_4_93bee35f5fa7744834994bc7a253a6f9._comment b/doc/bugs/problems_with_utf8_names/comment_4_93bee35f5fa7744834994bc7a253a6f9._comment new file mode 100644 index 000000000..5e11af6ab --- /dev/null +++ b/doc/bugs/problems_with_utf8_names/comment_4_93bee35f5fa7744834994bc7a253a6f9._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 4" + date="2011-12-24T16:49:13Z" + content=""" +Adam, this bug was fixed a long time ago, first using option #2 above, but later switching to option #3 -- git-annex treats filenames as opaque binary blobs and never decodes them in any encoding; haskell's normal encoding support for stdio is disabled. + +And it never resulted in a failure like you show. I cannot reproduce your problem, but it is a different bug, please open a new bug report. +"""]] diff --git a/doc/forum/git_pull_remote_git-annex/comment_8_7e76ee9b6520cbffaf484c9299a63ad3._comment b/doc/forum/git_pull_remote_git-annex/comment_8_7e76ee9b6520cbffaf484c9299a63ad3._comment new file mode 100644 index 000000000..5943d9312 --- /dev/null +++ b/doc/forum/git_pull_remote_git-annex/comment_8_7e76ee9b6520cbffaf484c9299a63ad3._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="git tweak-fetch" + date="2011-12-26T18:50:35Z" + content=""" +The git tweak-fetch hook that I have been developing, and hope will be accepted into git soon, provides some abilities that could be used to make \"git pull remote\" always merge remote/master. Normall, git can only be configured to do that merge automatically for one remote (ie, origin). But the tweak-fetch hook can flag arbitrary branches as needing merge. + +So, it could always flag tracking branches of the currently checked out branch for merge. This would be enabled by some setting, probably, since it's not necessarily the case that everyone wants to auto-merge when they pull like this. (Which is why git doesn't do it by default after all.) + +(The tweak-fetch hook will also entirely eliminate the need to run git annex merge manually, since it can always take care of merging the git-annex branch.) +"""]] diff --git a/doc/forum/pure_git-annex_only_workflow/comment_10_683768c9826b0bf0f267e8734b9eb872._comment b/doc/forum/pure_git-annex_only_workflow/comment_10_683768c9826b0bf0f267e8734b9eb872._comment new file mode 100644 index 000000000..dc499cbc9 --- /dev/null +++ b/doc/forum/pure_git-annex_only_workflow/comment_10_683768c9826b0bf0f267e8734b9eb872._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://www.joachim-breitner.de/" + nickname="nomeata" + subject="Finally some code" + date="2011-12-29T19:58:31Z" + content=""" +The repository at http://git.nomeata.de/?p=git-annex.git;a=summary contains changes to Commands/Sync.hs (and to the manpage) that implements this behavior. The functionality should be fine; the progress output is not very nice yet, but I’m not sure if I really understood the various Command types. It also should be more easily discoverable how to activate the behavior (by running \"git branch synced/master\") by providing a helpful message, at least unless git annex init creates the branch by default. +"""]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 2c0e23e9c..320453f18 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -252,7 +252,7 @@ subdirectories). By default, only lists annexed files whose content is currently present. This can be changed by specifying file matching options. To list all annexed files, present or not, specify --include "*". To list all - annexed files whose content is not present, specify --not --in "." + annexed files whose content is not present, specify --not --in="." To output filenames terminated with nulls, for use with xargs -0, specify --print0. Or, a custom output formatting can be specified using @@ -459,7 +459,7 @@ limit which files git-annex acts on. Arbitrarily complicated expressions can be built using these options. For example: - --exclude '*.mp3' --and --not -( --in usbdrive --or --in archive -) + --exclude '*.mp3' --and --not -( --in=usbdrive --or --in=archive -) The above example prevents git-annex from working on mp3 files whose file contents are present at either of two repositories. diff --git a/doc/tips/using_gitolite_with_git-annex.mdwn b/doc/tips/using_gitolite_with_git-annex.mdwn index a51d6539b..0d89a255b 100644 --- a/doc/tips/using_gitolite_with_git-annex.mdwn +++ b/doc/tips/using_gitolite_with_git-annex.mdwn @@ -21,7 +21,7 @@ gitolite installation, just with different paths. Set `$GL_ADC_PATH` in `.gitolite.rc`, if you have not already done so. <pre> -echo '$GL_ADC_PATH = "/usr/local/lib/gitolite/adc/;' >>~gitolite/.gitolite.rc +echo '$GL_ADC_PATH = "/usr/local/lib/gitolite/adc/;"' >>~gitolite/.gitolite.rc </pre> Make the ADC directory, and a "ua" subdirectory. @@ -75,3 +75,15 @@ sent 2606 bytes received 31 bytes 1758.00 bytes/sec total size is 2502 speedup is 0.95 ok </pre> + + +### Troubleshooting + +I got an error like this when setting up gitolite *after* setting up a local git repo and git annex: + +<pre> +git-annex-shell: First run: git-annex init +Command ssh ["git@git.example.com","git-annex-shell 'configlist' '/~/myrepo.git'"] failed; exit code 1 +</pre> + +because I forgot to "git push --all" after adding the new gitolite remote. diff --git a/doc/tips/using_gitolite_with_git-annex/comment_2_d8efea4ab9576555fadbb47666ecefa9._comment b/doc/tips/using_gitolite_with_git-annex/comment_2_d8efea4ab9576555fadbb47666ecefa9._comment new file mode 100644 index 000000000..007a009ea --- /dev/null +++ b/doc/tips/using_gitolite_with_git-annex/comment_2_d8efea4ab9576555fadbb47666ecefa9._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-24T16:54:31Z" + content=""" +I've fixed the typo (anyone can edit pages in this wiki FWIW.) +"""]] |