diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-27 12:58:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-27 12:58:08 -0400 |
| commit | abafae2d855927568347178a9c678db6348e2b6f (patch) | |
| tree | 1ed9c52136b0d938e915b0a73b9658788830a755 /doc | |
| parent | 48732de48c4dbb4b1699c032d7ca895181743c41 (diff) | |
| parent | c6e69212e9b59806fe5e96110e98a1dfe87047ba (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
Diffstat (limited to 'doc')
4 files changed, 34 insertions, 0 deletions
diff --git a/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes/comment_2_6172dcd7db2322084483a18d4f3cc2d6._comment b/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes/comment_2_6172dcd7db2322084483a18d4f3cc2d6._comment new file mode 100644 index 000000000..98b297868 --- /dev/null +++ b/doc/bugs/5.20140517_fails_to_talk_to_other_5.x_git-annex_remotes/comment_2_6172dcd7db2322084483a18d4f3cc2d6._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://id.koumbit.net/anarcat" + ip="72.0.72.144" + subject="comment 2" + date="2014-05-27T03:00:48Z" + content=""" +marcos has had git-annex installed ever since i started using git-annex, which is around version 4.x. furthermore, i have assumed that the procedure i detailed in the last part were enough to reproduce the bug, but i may be mistaken. +"""]] diff --git a/doc/bugs/configurable_path_to_git-annex-shell/comment_5_178452f3c2671830d1a9f5e1d11accb4._comment b/doc/bugs/configurable_path_to_git-annex-shell/comment_5_178452f3c2671830d1a9f5e1d11accb4._comment new file mode 100644 index 000000000..cc4742587 --- /dev/null +++ b/doc/bugs/configurable_path_to_git-annex-shell/comment_5_178452f3c2671830d1a9f5e1d11accb4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.176" + subject="comment 5" + date="2014-05-27T16:13:09Z" + content=""" +See [[devblog/day_166__catching_up]] +"""]] diff --git a/doc/forum/Manual_commit_message_in_direct_mode/comment_1_32f95eefec25bb127ed96248446c21b1._comment b/doc/forum/Manual_commit_message_in_direct_mode/comment_1_32f95eefec25bb127ed96248446c21b1._comment new file mode 100644 index 000000000..bb53d4458 --- /dev/null +++ b/doc/forum/Manual_commit_message_in_direct_mode/comment_1_32f95eefec25bb127ed96248446c21b1._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.176" + subject="comment 1" + date="2014-05-27T16:10:29Z" + content=""" +Yes, you can use the `-c core.bare=false` trick to bypass the direct mode guard if you want to. Just bear in mind that it's very easy to shoot yourself in the foot by passing -a or filenames to git commit, which then checks the whole large file into git.. +"""]] diff --git a/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment b/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment new file mode 100644 index 000000000..e649ff759 --- /dev/null +++ b/doc/install/Fedora/comment_8_80e167cde1a6511683a8f6e8029c0da6._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="209.250.56.176" + subject="comment 8" + date="2014-05-27T16:08:14Z" + content=""" +@Michele, you seem to have an old version of the haskell DAV library installed. The simple solutions is probably `cabal install DAV` to upgrade to the new one. + +(The complex solution is to edit the file and copy the line 2 lines above the error, or fix the ifdefs somehow to work with whatever combination of versions of DAV and http-client or http-conduit you have installed.) +"""]] |