mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2012-06-23 10:23:53 -04:00
commit af5e6156ba
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/bugs/Possible_issues_with_git_1.7.10_and_newer___40__merge_command_now_asks_for_a_commit_message__34__.mdwn Normal file
View file

@ -0,0 +1,4 @@
running 'git annex sync' doesn't merge the branches as expected (from the limited testing I have done) with git 1.7.10, the behaviour of merge has changed, it now asks for a commit message. I would expect setting _GIT_MERGE_AUTOEDIT=no_ should resolve this issue.
I had to manually do a merge (or set that variable) to get the branches back in sync again, this confused me a bit when git-annex watch was running in the background on a remote and it did not pick up the changes.

1
doc/forum/Wishlist:_logging_to_file_when_running_as_a_daemon___40__for_the_assistant__41__.mdwn Normal file
View file

@ -0,0 +1 @@
Logging to file would be nice when running git-annex as a daemon so when something fails or when certain events happens one can look at the logs to see what has failed, unless I'm missing something this probably should be on the wishlist or roadmap.

12
doc/special_remotes/directory/comment_1_e8a53592adb13f7d7f212a2eb5a18a31._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlc1og3PqIGudOMkFNrCCNg66vB7s-jLpc"
nickname="Paul"
subject="how is this different than rsync?"
date="2012-06-22T22:10:19Z"
content="""
Thanks for this great tool! I was wondering what the differences are between using `type=directory`, `type=rsync`, or a bare git repo for directories?
I guess I can't use just a regular repo because my USB drive is formatted as `vfat` -- which threw me for a loop the first time I heard about `git-annex` about a year ago, because I followed the walkthrough, and it didn't work as expected and gave up (now I know it was just a case of PEBKAC). It might be worth adding a note about [vfat](http://git-annex.branchable.com/bugs/fat_support/) to the \"Adding a remote\" section of the [walkthrough](http://git-annex.branchable.com/walkthrough/), since the unstated assumption there is that the USB drive is formatted as a filesystem that supports symlinks.
Thanks again, my scientific data management just got a lot more sane!
"""]]